Compare commits

...

5 Commits

Author SHA1 Message Date
xiaojunnuo 5f88da1985 build: release 2026-05-11 10:26:12 +08:00
xiaojunnuo 043b80a298 chore: 1 2026-05-11 09:41:47 +08:00
xiaojunnuo ed0da28896 Merge branch 'v2-dev' of https://github.com/certd/certd into v2-dev 2026-05-11 09:40:22 +08:00
xiaojunnuo 61a0d69d58 chore: 打包报错, 固定pnpm@10.33.4 2026-05-11 09:39:04 +08:00
xiaojunnuo d8f132919d chore: 1 2026-05-08 15:50:28 +08:00
3 changed files with 80 additions and 52 deletions
+3 -3
View File
@@ -10,9 +10,9 @@ FROM node:22-alpine3.21 AS builder
WORKDIR /workspace/
COPY . /workspace/
# armv7 目前只能用node18 pnpm9不支持node18,所以pnpm只能用8.15.7版本
# https://github.com/nodejs/docker-node/issues/1946
RUN npm install -g pnpm
# pnpm v11打包会报错([ERR_PNPM_IGNORED_BUILDS] Ignored build scripts),暂时固定10.33.4版本
# https://pnpm.io/zh/migration
RUN npm install -g pnpm@10.33.4
#RUN cd /workspace/certd-client && pnpm install && npm run build
RUN cp /workspace/certd-client/dist/* /workspace/certd-server/public/ -rf
+76 -48
View File
@@ -238,7 +238,7 @@ importers:
version: link:../basic
'@certd/plus-core':
specifier: ^1.39.13
version: link:../../pro/plus-core
version: 1.39.13
dayjs:
specifier: ^1.11.7
version: 1.11.13
@@ -516,7 +516,7 @@ importers:
version: link:../../plugins/plugin-lib
'@certd/plus-core':
specifier: ^1.39.13
version: link:../../pro/plus-core
version: 1.39.13
'@midwayjs/cache':
specifier: 3.14.0
version: 3.14.0
@@ -768,7 +768,7 @@ importers:
version: link:../../core/pipeline
'@certd/plus-core':
specifier: ^1.39.13
version: link:../../pro/plus-core
version: 1.39.13
'@kubernetes/client-node':
specifier: 0.21.0
version: 0.21.0
@@ -867,16 +867,16 @@ importers:
packages/pro/commercial-core:
dependencies:
'@certd/basic':
specifier: ^1.39.13
specifier: ^1.39.7
version: link:../../core/basic
'@certd/lib-server':
specifier: ^1.39.13
specifier: ^1.39.7
version: link:../../libs/lib-server
'@certd/pipeline':
specifier: ^1.39.13
specifier: ^1.39.7
version: link:../../core/pipeline
'@certd/plus-core':
specifier: ^1.39.13
specifier: ^1.39.7
version: link:../plus-core
'@midwayjs/core':
specifier: 3.20.11
@@ -912,9 +912,6 @@ importers:
'@types/chai':
specifier: ^4.3.3
version: 4.3.20
'@types/mocha':
specifier: ^10.0.1
version: 10.0.10
'@types/node':
specifier: ^18
version: 18.19.100
@@ -924,9 +921,6 @@ importers:
'@typescript-eslint/parser':
specifier: ^8.26.1
version: 8.32.1(eslint@8.57.0)(typescript@5.9.3)
cross-env:
specifier: ^7.0.3
version: 7.0.3
eslint:
specifier: ^8.24.0
version: 8.57.0
@@ -936,12 +930,6 @@ importers:
eslint-plugin-prettier:
specifier: ^4.2.1
version: 4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8)
esmock:
specifier: ^2.7.5
version: 2.7.5
mocha:
specifier: ^10.2.0
version: 10.8.2
prettier:
specifier: ^2.8.8
version: 2.8.8
@@ -954,9 +942,6 @@ importers:
rollup-plugin-visualizer:
specifier: ^5.8.2
version: 5.14.0(rollup@3.29.5)
ts-node:
specifier: ^10.9.2
version: 10.9.2(@types/node@18.19.100)(typescript@5.9.3)
tslib:
specifier: ^2.8.1
version: 2.8.1
@@ -967,16 +952,16 @@ importers:
packages/pro/plugin-plus:
dependencies:
'@certd/basic':
specifier: ^1.39.13
specifier: ^1.39.7
version: link:../../core/basic
'@certd/pipeline':
specifier: ^1.39.13
specifier: ^1.39.7
version: link:../../core/pipeline
'@certd/plugin-lib':
specifier: ^1.39.13
specifier: ^1.39.7
version: link:../../plugins/plugin-lib
'@certd/plus-core':
specifier: ^1.39.13
specifier: ^1.39.7
version: link:../plus-core
crypto-js:
specifier: ^4.2.0
@@ -1021,9 +1006,6 @@ importers:
chai:
specifier: 4.3.10
version: 4.3.10
cross-env:
specifier: ^7.0.3
version: 7.0.3
eslint:
specifier: ^8.41.0
version: 8.57.0
@@ -1033,9 +1015,6 @@ importers:
eslint-plugin-prettier:
specifier: ^4.2.1
version: 4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8)
esmock:
specifier: ^2.7.5
version: 2.7.5
mocha:
specifier: ^10.2.0
version: 10.8.2
@@ -1048,9 +1027,6 @@ importers:
rollup:
specifier: ^3.7.4
version: 3.29.5
ts-node:
specifier: ^10.9.2
version: 10.9.2(@types/node@18.19.100)(typescript@5.9.3)
tslib:
specifier: ^2.8.1
version: 2.8.1
@@ -1061,7 +1037,7 @@ importers:
packages/pro/plus-core:
dependencies:
'@certd/basic':
specifier: ^1.39.13
specifier: ^1.39.7
version: link:../../core/basic
dayjs:
specifier: ^1.11.7
@@ -1094,9 +1070,6 @@ importers:
chai:
specifier: 4.3.10
version: 4.3.10
cross-env:
specifier: ^7.0.3
version: 7.0.3
eslint:
specifier: ^8.41.0
version: 8.57.0
@@ -1106,9 +1079,6 @@ importers:
eslint-plugin-prettier:
specifier: ^4.2.1
version: 4.2.1(eslint-config-prettier@8.10.0(eslint@8.57.0))(eslint@8.57.0)(prettier@2.8.8)
esmock:
specifier: ^2.7.5
version: 2.7.5
mocha:
specifier: ^10.2.0
version: 10.8.2
@@ -1121,9 +1091,6 @@ importers:
rollup:
specifier: ^3.7.4
version: 3.29.5
ts-node:
specifier: ^10.9.2
version: 10.9.2(@types/node@18.19.100)(typescript@5.9.3)
tslib:
specifier: ^2.8.1
version: 2.8.1
@@ -1580,7 +1547,7 @@ importers:
version: link:../../core/basic
'@certd/commercial-core':
specifier: ^1.39.13
version: link:../../pro/commercial-core
version: 1.39.13(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.9.3))
'@certd/cv4pve-api-javascript':
specifier: ^8.4.2
version: 8.4.2
@@ -1610,10 +1577,10 @@ importers:
version: link:../../plugins/plugin-lib
'@certd/plugin-plus':
specifier: ^1.39.13
version: link:../../pro/plugin-plus
version: 1.39.13
'@certd/plus-core':
specifier: ^1.39.13
version: link:../../pro/plus-core
version: 1.39.13
'@google-cloud/dns':
specifier: ^5.3.1
version: 5.3.1
@@ -3033,9 +3000,18 @@ packages:
'@better-scroll/zoom@2.5.1':
resolution: {integrity: sha512-aGvFY5ooeZWS4RcxQLD+pGLpQHQxpPy0sMZV3yadcd2QK53PK9gS4Dp+BYfRv8lZ4/P2LoNEhr6Wq1DN6+uPlA==}
'@certd/commercial-core@1.39.13':
resolution: {integrity: sha512-AvHmxpgWdYt/QQBEGLA4ASa1YUcXN0jUAHo7sUu2Czon+jpP16YDo328kUsPAhtY4DMzUj1Ozr7HI2n/O81CQQ==}
'@certd/cv4pve-api-javascript@8.4.2':
resolution: {integrity: sha512-udGce7ewrVl4DmZvX+17PjsnqsdDIHEDatr8QP0AVrY2p+8JkaSPW4mXCKiLGf82C9K2+GXgT+qNIqgW7tfF9Q==}
'@certd/plugin-plus@1.39.13':
resolution: {integrity: sha512-Q7ddg3NMj6ikT1hnxUxxmFOOkAwDa1RWZsocZashNDXcQkyTGCLg596EIxtuNDKTJa/7Ggb4zHLrkY9OOdEcNg==}
'@certd/plus-core@1.39.13':
resolution: {integrity: sha512-5VpUKrt18pK048Z6n5M8R3REUomKkKiID6IfDK8zYlIErSrDofsOuDwUPEofuJM7gZQ8Ovkc6l14KLhSvjLvnw==}
'@certd/vue-js-cron-core@6.0.3':
resolution: {integrity: sha512-kqzoAMhYz9j6FGNWEODRYtt4NpUEUwjpkU89z5WVg2tCtOcI5VhwyUGOd8AxiBCRfd6PtXvzuqw85PaOps9wrQ==}
@@ -15564,12 +15540,64 @@ snapshots:
dependencies:
'@better-scroll/core': 2.5.1
'@certd/commercial-core@1.39.13(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.9.3))':
dependencies:
'@certd/basic': link:packages/core/basic
'@certd/lib-server': link:packages/libs/lib-server
'@certd/pipeline': link:packages/core/pipeline
'@certd/plus-core': 1.39.13
'@midwayjs/core': 3.20.11
'@midwayjs/koa': 3.20.13
'@midwayjs/logger': 3.4.2
'@midwayjs/swagger': 3.20.11
'@midwayjs/typeorm': 3.20.11
dayjs: 1.11.13
typeorm: 0.3.24(better-sqlite3@11.10.0)(mysql2@3.14.1)(pg@8.16.0)(reflect-metadata@0.2.2)(ts-node@10.9.2(@types/node@18.19.100)(typescript@5.9.3))
transitivePeerDependencies:
- '@google-cloud/spanner'
- '@sap/hana-client'
- babel-plugin-macros
- better-sqlite3
- hdb-pool
- ioredis
- mongodb
- mssql
- mysql2
- oracledb
- pg
- pg-native
- pg-query-stream
- redis
- reflect-metadata
- sql.js
- sqlite3
- supports-color
- ts-node
- typeorm-aurora-data-api-driver
'@certd/cv4pve-api-javascript@8.4.2':
dependencies:
debug: 4.4.3(supports-color@8.1.1)
transitivePeerDependencies:
- supports-color
'@certd/plugin-plus@1.39.13':
dependencies:
'@certd/basic': link:packages/core/basic
'@certd/pipeline': link:packages/core/pipeline
'@certd/plugin-lib': link:packages/plugins/plugin-lib
'@certd/plus-core': 1.39.13
crypto-js: 4.2.0
dayjs: 1.11.13
form-data: 4.0.2
jsrsasign: 11.1.0
querystring: 0.2.1
'@certd/plus-core@1.39.13':
dependencies:
'@certd/basic': link:packages/core/basic
dayjs: 1.11.13
'@certd/vue-js-cron-core@6.0.3':
dependencies:
mustache: 4.2.0
+1 -1
View File
@@ -1 +1 @@
23:28
10:26