From 5eff50e8fe4013b8d2dc0ba6256f0cca1e7bd8b4 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Thu, 25 May 2023 00:41:36 +0800 Subject: [PATCH] chore: 1 --- packages/core/pipeline/.npmignore | 2 + packages/core/pipeline/package.json | 78 ++++++++++--------- packages/core/pipeline/rollup.config.js | 35 +++++++++ packages/core/pipeline/src/index.ts | 1 + .../core/pipeline/src/midway/configuration.ts | 10 +-- packages/core/pipeline/test/echo-plugin.ts | 5 +- packages/core/pipeline/tsconfig.json | 11 ++- packages/core/pipeline/vite.config.js | 11 ++- packages/plugins/plugin-aliyun/.eslintrc | 1 + packages/plugins/plugin-aliyun/.npmignore | 2 + packages/plugins/plugin-aliyun/package.json | 35 +++++---- .../plugins/plugin-aliyun/rollup.config.js | 35 +++++++++ packages/plugins/plugin-aliyun/src/index.ts | 6 +- .../src/plugin/deploy-to-ack-ingress/index.ts | 2 +- .../plugins/plugin-aliyun/src/plugin/index.ts | 6 +- packages/plugins/plugin-aliyun/tsconfig.json | 11 ++- packages/plugins/plugin-aliyun/vite.config.ts | 1 + packages/plugins/plugin-all/.eslintrc | 1 + packages/plugins/plugin-all/.npmignore | 2 + packages/plugins/plugin-all/package.json | 34 ++++---- packages/plugins/plugin-all/rollup.config.js | 35 +++++++++ .../plugin-all/test/huawei/pipeline.test.ts | 1 + .../plugin-all/test/pipeline/pipeline.test.ts | 1 + packages/plugins/plugin-all/tsconfig.json | 7 +- packages/plugins/plugin-all/vite.config.ts | 5 +- packages/plugins/plugin-cert/.npmignore | 2 + packages/plugins/plugin-cert/package.json | 20 +++-- packages/plugins/plugin-cert/rollup.config.js | 35 +++++++++ .../plugins/plugin-cert/src/plugin/index.ts | 1 - packages/plugins/plugin-cert/tsconfig.json | 3 +- packages/plugins/plugin-cert/vite.config.ts | 2 +- packages/plugins/plugin-host/.npmignore | 2 + packages/plugins/plugin-host/package.json | 14 +++- packages/plugins/plugin-host/rollup.config.js | 35 +++++++++ packages/plugins/plugin-host/tsconfig.json | 3 +- packages/plugins/plugin-huawei/.npmignore | 2 + packages/plugins/plugin-huawei/package.json | 14 +++- .../plugins/plugin-huawei/rollup.config.js | 35 +++++++++ packages/plugins/plugin-huawei/tsconfig.json | 3 +- packages/plugins/plugin-tencent/.npmignore | 2 + packages/plugins/plugin-tencent/package.json | 14 +++- .../plugins/plugin-tencent/rollup.config.js | 35 +++++++++ packages/plugins/plugin-tencent/tsconfig.json | 2 +- packages/plugins/plugin-util/.mocharc.json | 5 -- packages/plugins/plugin-util/.npmignore | 2 + packages/plugins/plugin-util/package.json | 26 +++---- packages/plugins/plugin-util/rollup.config.js | 40 ++++++++++ packages/plugins/plugin-util/tsconfig.json | 2 +- packages/plugins/plugin-util/vite.config.ts | 10 ++- .../db/migration/v10001__certdv2.sql | 8 +- packages/ui/certd-server/package.json | 8 +- 51 files changed, 512 insertions(+), 151 deletions(-) create mode 100644 packages/core/pipeline/.npmignore create mode 100644 packages/core/pipeline/rollup.config.js create mode 100644 packages/plugins/plugin-aliyun/.npmignore create mode 100644 packages/plugins/plugin-aliyun/rollup.config.js create mode 100644 packages/plugins/plugin-all/.npmignore create mode 100644 packages/plugins/plugin-all/rollup.config.js create mode 100644 packages/plugins/plugin-cert/.npmignore create mode 100644 packages/plugins/plugin-cert/rollup.config.js create mode 100644 packages/plugins/plugin-host/.npmignore create mode 100644 packages/plugins/plugin-host/rollup.config.js create mode 100644 packages/plugins/plugin-huawei/.npmignore create mode 100644 packages/plugins/plugin-huawei/rollup.config.js create mode 100644 packages/plugins/plugin-tencent/.npmignore create mode 100644 packages/plugins/plugin-tencent/rollup.config.js delete mode 100644 packages/plugins/plugin-util/.mocharc.json create mode 100644 packages/plugins/plugin-util/.npmignore create mode 100644 packages/plugins/plugin-util/rollup.config.js diff --git a/packages/core/pipeline/.npmignore b/packages/core/pipeline/.npmignore new file mode 100644 index 00000000..bf40d278 --- /dev/null +++ b/packages/core/pipeline/.npmignore @@ -0,0 +1,2 @@ +node_modules +src \ No newline at end of file diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 78d48efa..6dba736b 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -3,8 +3,8 @@ "private": false, "version": "1.0.2", "main": "./src/index.ts", - "module": "./src/index.ts", - "types": "./src/index.ts", + "module": "./dist/pipeline.mjs", + "types": "./dist/d/index.d.ts", "publishConfig": { "main": "./dist/pipeline.umd.js", "module": "./dist/pipeline.mjs", @@ -12,51 +12,59 @@ }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build", + "build": "rollup -c", + "build2": "vue-tsc --noEmit && vite build", "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^1.0.2", - "axios": "^0.21.1", - "dayjs": "^1.11.6", + "@certd/acme-client": "workspace:^1.0.2", + "axios": "^1.4.0", + "dayjs": "^1.11.7", "lodash": "^4.17.21", - "log4js": "^6.3.0", - "node-forge": "^0.10.0", - "qs": "^6.9.4", + "log4js": "^6.9.1", + "node-forge": "^1.3.1", + "qs": "^6.11.2", "reflect-metadata": "^0.1.13" }, "devDependencies": { - "@alicloud/cs20151215": "^3.0.3", - "@alicloud/openapi-client": "^0.4.0", - "@alicloud/pop-core": "^1.7.10", - "@midwayjs/bootstrap": "^3.9.1", - "@midwayjs/cache": "^3.9.0", - "@midwayjs/cli": "^1.3.21", - "@midwayjs/core": "^3.0.0", - "@midwayjs/decorator": "^3.0.0", - "@midwayjs/koa": "^3.9.0", + "@alicloud/cs20151215": "^3.0.20", + "@alicloud/openapi-client": "^0.4.6", + "@alicloud/pop-core": "^1.7.13", + "@midwayjs/bootstrap": "^3.11.6", + "@midwayjs/cache": "^3.11.6", + "@midwayjs/cli": "^2.0.15", + "@midwayjs/core": "^3.11.6", + "@midwayjs/decorator": "^3.11.6", + "@midwayjs/koa": "^3.11.6", "@midwayjs/logger": "^2.17.0", - "@midwayjs/typeorm": "^3.9.0", - "@midwayjs/validate": "^3.9.0", - "@rollup/plugin-typescript": "^11.0.0", - "@types/chai": "^4.3.3", + "@midwayjs/typeorm": "^3.11.8", + "@midwayjs/validate": "^3.11.6", + "@types/chai": "^4.3.5", "@types/lodash": "^4.14.194", - "@types/mocha": "^10.0.0", - "@types/node-forge": "^1.3.0", - "@typescript-eslint/eslint-plugin": "^5.38.1", - "@typescript-eslint/parser": "^5.38.1", - "chai": "^4.3.6", - "eslint": "^8.24.0", - "eslint-config-prettier": "^8.5.0", - "eslint-plugin-import": "^2.26.0", + "@types/mocha": "^10.0.1", + "@types/node-forge": "^1.3.2", + "@typescript-eslint/eslint-plugin": "^5.59.7", + "@typescript-eslint/parser": "^5.59.7", + "@rollup/plugin-commonjs": "^23.0.4", + "@rollup/plugin-json": "^6.0.0", + "@rollup/plugin-node-resolve": "^15.0.1", + "@rollup/plugin-typescript": "^11.0.0", + "rollup-plugin-typescript2": "^0.34.1", + "rollup-plugin-visualizer": "^5.8.2", + "@rollup/plugin-terser": "^0.4.3", + "rollup": "^3.7.4", + "tslib": "^2.5.2", + "chai": "^4.3.7", + "eslint": "^8.41.0", + "eslint-config-prettier": "^8.8.0", + "eslint-plugin-import": "^2.27.5", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.2.1", - "mocha": "^10.1.0", + "mocha": "^10.2.0", "ts-node": "^10.9.1", - "typescript": "^4.8.4", - "vite": "^3.1.0", - "vue-tsc": "^0.38.9", - "rollup-plugin-visualizer": "^5.8.2" + "typescript": "^5.0.4", + "vite": "^4.3.8", + "vue-tsc": "^1.6.5" }, "gitHead": "5950e1cae7cf30ebfc5128c15c7d1b0d101cbbb8" } diff --git a/packages/core/pipeline/rollup.config.js b/packages/core/pipeline/rollup.config.js new file mode 100644 index 00000000..4614e1be --- /dev/null +++ b/packages/core/pipeline/rollup.config.js @@ -0,0 +1,35 @@ +const resolve = require("@rollup/plugin-node-resolve"); +const commonjs = require("@rollup/plugin-commonjs"); +const rollupTypescript = require("rollup-plugin-typescript2"); +const json = require("@rollup/plugin-json"); +const terser = require("@rollup/plugin-terser"); +module.exports = { + input: "src/index.ts", + output: { + file: "dist/bundle.js", + format: "cjs", + }, + plugins: [ + // 解析第三方依赖 + resolve(), + // 识别 commonjs 模式第三方依赖 + commonjs(), + rollupTypescript(), + json(), + terser(), + ], + external: [ + "vue", + "lodash", + "dayjs", + "@certd/acme-client", + "@certd/pipeline", + "@certd/plugin-cert", + "@certd/plugin-aliyun", + "@certd/plugin-tencent", + "@certd/plugin-huawei", + "@certd/plugin-host", + "@certd/plugin-tencent", + "@certd/plugin-util", + ], +}; diff --git a/packages/core/pipeline/src/index.ts b/packages/core/pipeline/src/index.ts index 91dd1a00..88e6917c 100644 --- a/packages/core/pipeline/src/index.ts +++ b/packages/core/pipeline/src/index.ts @@ -1,3 +1,4 @@ +import "util"; export * from "./core"; export * from "./d.ts"; export * from "./access"; diff --git a/packages/core/pipeline/src/midway/configuration.ts b/packages/core/pipeline/src/midway/configuration.ts index ab94ab88..46af4c34 100644 --- a/packages/core/pipeline/src/midway/configuration.ts +++ b/packages/core/pipeline/src/midway/configuration.ts @@ -1,6 +1,4 @@ -import { Config, Configuration, Inject, Logger } from "@midwayjs/decorator"; -// @ts-ignore -import { ILogger } from "@midwayjs/logger"; +import { Config, Configuration, Inject } from "@midwayjs/decorator"; import { IMidwayContainer, MidwayDecoratorService } from "@midwayjs/core"; // ... (see below) ... @@ -12,19 +10,13 @@ export class PipelineConfiguration { @Config() // @ts-ignore config; - @Logger() - // @ts-ignore - logger: ILogger; @Inject() // @ts-ignore decoratorService: MidwayDecoratorService; async onReady(container: IMidwayContainer) { - this.logger.info("pipeline install"); - //this.implPropertyDecorator(container); - this.logger.info("pipeline installed"); } // implPropertyDecorator(container: IMidwayContainer) { diff --git a/packages/core/pipeline/test/echo-plugin.ts b/packages/core/pipeline/test/echo-plugin.ts index 1361048c..da77790d 100644 --- a/packages/core/pipeline/test/echo-plugin.ts +++ b/packages/core/pipeline/test/echo-plugin.ts @@ -1,4 +1,4 @@ -import { Autowire, ILogger, IsTaskPlugin, ITaskPlugin, TaskInput, TaskOutput } from "../src"; +import { Autowire, IsTaskPlugin, ITaskPlugin, TaskInput, TaskOutput } from "../src"; @IsTaskPlugin({ name: "EchoPlugin", @@ -14,9 +14,6 @@ export class EchoPlugin implements ITaskPlugin { }) cert!: any; - @Autowire() - logger!: ILogger; - @TaskOutput({ title: "cert info", }) diff --git a/packages/core/pipeline/tsconfig.json b/packages/core/pipeline/tsconfig.json index a3c9536c..82be5b6f 100644 --- a/packages/core/pipeline/tsconfig.json +++ b/packages/core/pipeline/tsconfig.json @@ -1,8 +1,9 @@ { "compilerOptions": { + "importHelpers": false, "target": "ESNext", "useDefineForClassFields": true, - "module": "commonjs", + "module": "ESNext", "moduleResolution": "Node", "strict": true, "jsx": "preserve", @@ -13,8 +14,10 @@ "lib": ["ESNext", "DOM"], "skipLibCheck": true, "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "outDir": "./dist/ts" + "paths": { + "tslib" : ["./node_modules/tslib/tslib.d.ts"] + } }, - "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue","test/**/*.ts"], + + "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue","test/**/*.ts","rollup.config.ts"], } diff --git a/packages/core/pipeline/vite.config.js b/packages/core/pipeline/vite.config.js index 2792d51d..1dc116da 100644 --- a/packages/core/pipeline/vite.config.js +++ b/packages/core/pipeline/vite.config.js @@ -5,15 +5,16 @@ import typescript from "@rollup/plugin-typescript"; export default defineConfig({ plugins: [], build: { + target: "es2015", lib: { entry: "src/index.ts", - name: "pipeline", + name: "CertdPipeline", }, rollupOptions: { plugins: [ visualizer(), typescript({ - target: "esnext", + target: "es2015", rootDir: "src", declaration: true, declarationDir: "dist/d", @@ -33,6 +34,9 @@ export default defineConfig({ "@certd/plugin-host", "@certd/plugin-tencent", "@certd/plugin-util", + "log4js", + "@midwayjs/core", + "@midwayjs/decorator", ], output: { globals: { @@ -45,6 +49,9 @@ export default defineConfig({ "@certd/plugin-host": "CertdPluginHost", "@certd/plugin-huawei": "CertdPluginHuawei", "@certd/plugin-util": "CertdPluginUtil", + log4js: "log4js", + "@midwayjs/core": "MidwayjsCore", + "@midwayjs/decorator": "MidwayjsDecorator", }, }, }, diff --git a/packages/plugins/plugin-aliyun/.eslintrc b/packages/plugins/plugin-aliyun/.eslintrc index 751e28ba..a591578c 100644 --- a/packages/plugins/plugin-aliyun/.eslintrc +++ b/packages/plugins/plugin-aliyun/.eslintrc @@ -12,6 +12,7 @@ "mocha": true }, "rules": { + "@typescript-eslint/no-var-requires": "off", "@typescript-eslint/ban-ts-comment": "off", "@typescript-eslint/ban-ts-ignore": "off", "@typescript-eslint/no-explicit-any": "off", diff --git a/packages/plugins/plugin-aliyun/.npmignore b/packages/plugins/plugin-aliyun/.npmignore new file mode 100644 index 00000000..bf40d278 --- /dev/null +++ b/packages/plugins/plugin-aliyun/.npmignore @@ -0,0 +1,2 @@ +node_modules +src \ No newline at end of file diff --git a/packages/plugins/plugin-aliyun/package.json b/packages/plugins/plugin-aliyun/package.json index 5bbc75ce..f4779711 100644 --- a/packages/plugins/plugin-aliyun/package.json +++ b/packages/plugins/plugin-aliyun/package.json @@ -3,8 +3,8 @@ "private": false, "version": "1.0.2", "main": "./src/index.ts", - "module": "./src/index.ts", - "types": "./src/index.ts", + "module": "./dist/plugin-aliyun.mjs", + "types": "./dist/es/plugin-aliyun.d.ts", "publishConfig": { "main": "./dist/plugin-aliyun.umd.js", "module": "./dist/plugin-aliyun.mjs", @@ -12,27 +12,33 @@ }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build", + "build1": "vue-tsc --noEmit && vite build", + "build": "rollup -c", "preview": "vite preview" }, "dependencies": { "@alicloud/cs20151215": "^3.0.3", "@alicloud/openapi-client": "^0.4.0", "@alicloud/pop-core": "^1.7.10", + "node-forge": "^0.10.0" + }, + "devDependencies": { "@certd/acme-client": "^1.0.2", "@certd/pipeline": "^1.0.2", "@certd/plugin-cert": "^1.0.2", "@certd/plugin-util": "^1.0.2", - "dayjs": "^1.11.6", - "lodash": "^4.17.21", - "node-forge": "^0.10.0" - }, - "devDependencies": { - "@alicloud/cs20151215": "^3.0.3", - "@alicloud/openapi-client": "^0.4.0", - "@alicloud/pop-core": "^1.7.10", "@midwayjs/core": "^3.0.0", "@midwayjs/decorator": "^3.0.0", + "@rollup/plugin-commonjs": "^23.0.4", + "@rollup/plugin-json": "^6.0.0", + "@rollup/plugin-node-resolve": "^15.0.1", + "@rollup/plugin-typescript": "^11.0.0", + "rollup-plugin-typescript2": "^0.34.1", + "rollup-plugin-visualizer": "^5.8.2", + "@rollup/plugin-terser": "^0.4.3", + "rollup": "^3.7.4", + "ts-node": "^10.9.1", + "tslib": "^2.5.2", "@types/chai": "^4.3.3", "@types/lodash": "^4.14.186", "@types/mocha": "^10.0.0", @@ -40,19 +46,18 @@ "@typescript-eslint/eslint-plugin": "^5.38.1", "@typescript-eslint/parser": "^5.38.1", "chai": "^4.3.6", + "dayjs": "^1.11.6", "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.2.1", + "lodash": "^4.17.21", "log4js": "^6.7.1", "mocha": "^10.1.0", - "ts-node": "^10.9.1", "typescript": "^4.8.4", "vite": "^3.1.0", - "vue-tsc": "^0.38.9", - "rollup-plugin-visualizer": "^5.8.2", - "@rollup/plugin-typescript": "^11.0.0" + "vue-tsc": "^0.38.9" }, "gitHead": "5950e1cae7cf30ebfc5128c15c7d1b0d101cbbb8" } diff --git a/packages/plugins/plugin-aliyun/rollup.config.js b/packages/plugins/plugin-aliyun/rollup.config.js new file mode 100644 index 00000000..4614e1be --- /dev/null +++ b/packages/plugins/plugin-aliyun/rollup.config.js @@ -0,0 +1,35 @@ +const resolve = require("@rollup/plugin-node-resolve"); +const commonjs = require("@rollup/plugin-commonjs"); +const rollupTypescript = require("rollup-plugin-typescript2"); +const json = require("@rollup/plugin-json"); +const terser = require("@rollup/plugin-terser"); +module.exports = { + input: "src/index.ts", + output: { + file: "dist/bundle.js", + format: "cjs", + }, + plugins: [ + // 解析第三方依赖 + resolve(), + // 识别 commonjs 模式第三方依赖 + commonjs(), + rollupTypescript(), + json(), + terser(), + ], + external: [ + "vue", + "lodash", + "dayjs", + "@certd/acme-client", + "@certd/pipeline", + "@certd/plugin-cert", + "@certd/plugin-aliyun", + "@certd/plugin-tencent", + "@certd/plugin-huawei", + "@certd/plugin-host", + "@certd/plugin-tencent", + "@certd/plugin-util", + ], +}; diff --git a/packages/plugins/plugin-aliyun/src/index.ts b/packages/plugins/plugin-aliyun/src/index.ts index 777c9616..dcd70bc6 100644 --- a/packages/plugins/plugin-aliyun/src/index.ts +++ b/packages/plugins/plugin-aliyun/src/index.ts @@ -1,3 +1,3 @@ -export * from "./access"; -export * from "./dns-provider"; -export * from "./plugin"; +export * from "./access/index"; +export * from "./dns-provider/index"; +export * from "./plugin/index"; diff --git a/packages/plugins/plugin-aliyun/src/plugin/deploy-to-ack-ingress/index.ts b/packages/plugins/plugin-aliyun/src/plugin/deploy-to-ack-ingress/index.ts index fc68d8eb..25f55dc1 100644 --- a/packages/plugins/plugin-aliyun/src/plugin/deploy-to-ack-ingress/index.ts +++ b/packages/plugins/plugin-aliyun/src/plugin/deploy-to-ack-ingress/index.ts @@ -3,7 +3,7 @@ import { AbstractTaskPlugin, Autowire, IAccessService, ILogger, IsTaskPlugin, Ru import { ROAClient } from "@alicloud/pop-core"; import { AliyunAccess } from "../../access"; import { K8sClient } from "@certd/plugin-util"; -import { appendTimeSuffix } from "../../utils"; +import { appendTimeSuffix } from "../../utils/index"; import { CertInfo } from "@certd/plugin-cert"; @IsTaskPlugin({ diff --git a/packages/plugins/plugin-aliyun/src/plugin/index.ts b/packages/plugins/plugin-aliyun/src/plugin/index.ts index 7b5a4d10..795a2344 100644 --- a/packages/plugins/plugin-aliyun/src/plugin/index.ts +++ b/packages/plugins/plugin-aliyun/src/plugin/index.ts @@ -1,3 +1,3 @@ -export * from "./deploy-to-cdn"; -export * from "./deploy-to-ack-ingress"; -export * from "./upload-to-aliyun"; +export * from "./deploy-to-cdn/index"; +export * from "./deploy-to-ack-ingress/index"; +export * from "./upload-to-aliyun/index"; diff --git a/packages/plugins/plugin-aliyun/tsconfig.json b/packages/plugins/plugin-aliyun/tsconfig.json index 62621e72..82be5b6f 100644 --- a/packages/plugins/plugin-aliyun/tsconfig.json +++ b/packages/plugins/plugin-aliyun/tsconfig.json @@ -1,8 +1,9 @@ { "compilerOptions": { + "importHelpers": false, "target": "ESNext", "useDefineForClassFields": true, - "module": "commonjs", + "module": "ESNext", "moduleResolution": "Node", "strict": true, "jsx": "preserve", @@ -12,7 +13,11 @@ "esModuleInterop": true, "lib": ["ESNext", "DOM"], "skipLibCheck": true, - "experimentalDecorators": true + "experimentalDecorators": true, + "paths": { + "tslib" : ["./node_modules/tslib/tslib.d.ts"] + } }, - "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue","test/**/*.ts"], + + "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue","test/**/*.ts","rollup.config.ts"], } diff --git a/packages/plugins/plugin-aliyun/vite.config.ts b/packages/plugins/plugin-aliyun/vite.config.ts index b9ddc1f4..69834e29 100644 --- a/packages/plugins/plugin-aliyun/vite.config.ts +++ b/packages/plugins/plugin-aliyun/vite.config.ts @@ -1,6 +1,7 @@ import { defineConfig } from "vite"; import visualizer from "rollup-plugin-visualizer"; import typescript from "@rollup/plugin-typescript"; + // https://vitejs.dev/config/ export default defineConfig({ plugins: [], diff --git a/packages/plugins/plugin-all/.eslintrc b/packages/plugins/plugin-all/.eslintrc index 751e28ba..a591578c 100644 --- a/packages/plugins/plugin-all/.eslintrc +++ b/packages/plugins/plugin-all/.eslintrc @@ -12,6 +12,7 @@ "mocha": true }, "rules": { + "@typescript-eslint/no-var-requires": "off", "@typescript-eslint/ban-ts-comment": "off", "@typescript-eslint/ban-ts-ignore": "off", "@typescript-eslint/no-explicit-any": "off", diff --git a/packages/plugins/plugin-all/.npmignore b/packages/plugins/plugin-all/.npmignore new file mode 100644 index 00000000..bf40d278 --- /dev/null +++ b/packages/plugins/plugin-all/.npmignore @@ -0,0 +1,2 @@ +node_modules +src \ No newline at end of file diff --git a/packages/plugins/plugin-all/package.json b/packages/plugins/plugin-all/package.json index 48129f84..880b8f09 100644 --- a/packages/plugins/plugin-all/package.json +++ b/packages/plugins/plugin-all/package.json @@ -2,7 +2,7 @@ "name": "@certd/plugin-all", "private": false, "version": "1.0.2", - "main": "./dist/plugin-all.umd.js", + "main": "./src/index.ts", "module": "./dist/plugin-all.mjs", "types": "./dist/es/plugin-all.d.ts", "publishConfig": { @@ -12,40 +12,38 @@ }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build", + "build2": " vite build", + "build": "rollup -c", "preview": "vite preview" }, - "dependencies": { + "devDependencies": { + "@certd/pipeline": "^1.0.2", "@certd/plugin-aliyun": "^1.0.2", "@certd/plugin-cert": "^1.0.2", "@certd/plugin-host": "^1.0.2", "@certd/plugin-huawei": "^1.0.2", - "@certd/plugin-tencent": "^1.0.2" - }, - "devDependencies": { - "@alicloud/cs20151215": "^3.0.3", - "@alicloud/openapi-client": "^0.4.0", - "@alicloud/pop-core": "^1.7.10", - "@certd/pipeline": "^1.0.2", - "@midwayjs/core": "^3.0.0", - "@midwayjs/decorator": "^3.0.0", - "@types/chai": "^4.3.3", + "@certd/plugin-tencent": "^1.0.2", + "@rollup/plugin-commonjs": "^23.0.4", + "@rollup/plugin-json": "^6.0.0", + "@rollup/plugin-node-resolve": "^15.0.1", + "@rollup/plugin-terser": "^0.4.3", + "@rollup/plugin-typescript": "^11.0.0", + "@types/chai": "^4.3.5", + "@types/jest": "^26.0.24", "@types/lodash": "^4.14.186", - "@types/mocha": "^10.0.0", "@types/node-forge": "^1.3.0", "@typescript-eslint/eslint-plugin": "^5.38.1", "@typescript-eslint/parser": "^5.38.1", - "chai": "^4.3.6", "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.2.1", - "log4js": "^6.7.1", - "mocha": "^10.1.0", + "rollup": "^3.7.4", + "rollup-plugin-typescript2": "^0.34.1", "rollup-plugin-visualizer": "^5.8.2", - "@rollup/plugin-typescript": "^11.0.0", "ts-node": "^10.9.1", + "tslib": "^2.5.2", "typescript": "^4.8.4", "vite": "^3.1.0", "vue-tsc": "^0.38.9" diff --git a/packages/plugins/plugin-all/rollup.config.js b/packages/plugins/plugin-all/rollup.config.js new file mode 100644 index 00000000..4614e1be --- /dev/null +++ b/packages/plugins/plugin-all/rollup.config.js @@ -0,0 +1,35 @@ +const resolve = require("@rollup/plugin-node-resolve"); +const commonjs = require("@rollup/plugin-commonjs"); +const rollupTypescript = require("rollup-plugin-typescript2"); +const json = require("@rollup/plugin-json"); +const terser = require("@rollup/plugin-terser"); +module.exports = { + input: "src/index.ts", + output: { + file: "dist/bundle.js", + format: "cjs", + }, + plugins: [ + // 解析第三方依赖 + resolve(), + // 识别 commonjs 模式第三方依赖 + commonjs(), + rollupTypescript(), + json(), + terser(), + ], + external: [ + "vue", + "lodash", + "dayjs", + "@certd/acme-client", + "@certd/pipeline", + "@certd/plugin-cert", + "@certd/plugin-aliyun", + "@certd/plugin-tencent", + "@certd/plugin-huawei", + "@certd/plugin-host", + "@certd/plugin-tencent", + "@certd/plugin-util", + ], +}; diff --git a/packages/plugins/plugin-all/test/huawei/pipeline.test.ts b/packages/plugins/plugin-all/test/huawei/pipeline.test.ts index 8480fd99..5bd2ede8 100644 --- a/packages/plugins/plugin-all/test/huawei/pipeline.test.ts +++ b/packages/plugins/plugin-all/test/huawei/pipeline.test.ts @@ -7,6 +7,7 @@ import "../../src"; import "../plugin/echo-plugin"; describe("pipeline-hauwei-test", function () { it("#pipeline", async function () { + //@ts-ignore this.timeout(120000); async function onChanged(history: RunHistory) { console.log("changed:"); diff --git a/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts b/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts index ce64d068..408044e2 100644 --- a/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts +++ b/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts @@ -7,6 +7,7 @@ import "../plugin/echo-plugin"; describe("pipeline", function () { it("#pipeline", async function () { + //@ts-ignore this.timeout(120000); async function onChanged(history: RunHistory) { console.log("changed:"); diff --git a/packages/plugins/plugin-all/tsconfig.json b/packages/plugins/plugin-all/tsconfig.json index 62621e72..4e35083f 100644 --- a/packages/plugins/plugin-all/tsconfig.json +++ b/packages/plugins/plugin-all/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "target": "ESNext", "useDefineForClassFields": true, - "module": "commonjs", + "module": "ESNext", "moduleResolution": "Node", "strict": true, "jsx": "preserve", @@ -12,7 +12,10 @@ "esModuleInterop": true, "lib": ["ESNext", "DOM"], "skipLibCheck": true, - "experimentalDecorators": true + "experimentalDecorators": true, + "paths": { + "tslib" : ["./node_modules/tslib/tslib.d.ts"] + } }, "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue","test/**/*.ts"], } diff --git a/packages/plugins/plugin-all/vite.config.ts b/packages/plugins/plugin-all/vite.config.ts index b9ddc1f4..39189cca 100644 --- a/packages/plugins/plugin-all/vite.config.ts +++ b/packages/plugins/plugin-all/vite.config.ts @@ -2,16 +2,19 @@ import { defineConfig } from "vite"; import visualizer from "rollup-plugin-visualizer"; import typescript from "@rollup/plugin-typescript"; // https://vitejs.dev/config/ + export default defineConfig({ plugins: [], build: { lib: { entry: "src/index.ts", - name: "pipeline", + name: "CertdPluginAll", }, rollupOptions: { plugins: [ + // @ts-ignore visualizer(), + // @ts-ignore typescript({ target: "esnext", rootDir: "src", diff --git a/packages/plugins/plugin-cert/.npmignore b/packages/plugins/plugin-cert/.npmignore new file mode 100644 index 00000000..bf40d278 --- /dev/null +++ b/packages/plugins/plugin-cert/.npmignore @@ -0,0 +1,2 @@ +node_modules +src \ No newline at end of file diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 0f601de9..4925d18d 100644 --- a/packages/plugins/plugin-cert/package.json +++ b/packages/plugins/plugin-cert/package.json @@ -3,8 +3,8 @@ "private": false, "version": "1.0.2", "main": "./src/index.ts", - "module": "./src/index.ts", - "types": "./src/index.ts", + "module": "./dist/plugin-cert.mjs", + "types": "./dist/es/plugin-cert.d.ts", "publishConfig": { "main": "./dist/plugin-cert.umd.js", "module": "./dist/plugin-cert.mjs", @@ -12,7 +12,8 @@ }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build", + "build": "rollup -c", + "build2": "vue-tsc --noEmit && vite build", "preview": "vite preview" }, "dependencies": { @@ -32,6 +33,13 @@ "@types/node-forge": "^1.3.0", "@typescript-eslint/eslint-plugin": "^5.38.1", "@typescript-eslint/parser": "^5.38.1", + "@rollup/plugin-commonjs": "^23.0.4", + "@rollup/plugin-json": "^6.0.0", + "@rollup/plugin-node-resolve": "^15.0.1", + "@rollup/plugin-terser": "^0.4.3", + "@rollup/plugin-typescript": "^11.0.0", + "tslib": "^2.5.2", + "rollup": "^3.7.4", "chai": "^4.3.6", "dayjs": "^1.11.6", "eslint": "^8.24.0", @@ -42,12 +50,12 @@ "lodash": "^4.17.21", "log4js": "^6.7.1", "mocha": "^10.1.0", + "rollup-plugin-visualizer": "^5.8.2", "ts-node": "^10.9.1", + "tslib": "^2.5.2", "typescript": "^4.8.4", "vite": "^3.1.0", - "vue-tsc": "^0.38.9", - "rollup-plugin-visualizer": "^5.8.2", - "@rollup/plugin-typescript": "^11.0.0" + "vue-tsc": "^0.38.9" }, "gitHead": "5950e1cae7cf30ebfc5128c15c7d1b0d101cbbb8" } diff --git a/packages/plugins/plugin-cert/rollup.config.js b/packages/plugins/plugin-cert/rollup.config.js new file mode 100644 index 00000000..4614e1be --- /dev/null +++ b/packages/plugins/plugin-cert/rollup.config.js @@ -0,0 +1,35 @@ +const resolve = require("@rollup/plugin-node-resolve"); +const commonjs = require("@rollup/plugin-commonjs"); +const rollupTypescript = require("rollup-plugin-typescript2"); +const json = require("@rollup/plugin-json"); +const terser = require("@rollup/plugin-terser"); +module.exports = { + input: "src/index.ts", + output: { + file: "dist/bundle.js", + format: "cjs", + }, + plugins: [ + // 解析第三方依赖 + resolve(), + // 识别 commonjs 模式第三方依赖 + commonjs(), + rollupTypescript(), + json(), + terser(), + ], + external: [ + "vue", + "lodash", + "dayjs", + "@certd/acme-client", + "@certd/pipeline", + "@certd/plugin-cert", + "@certd/plugin-aliyun", + "@certd/plugin-tencent", + "@certd/plugin-huawei", + "@certd/plugin-host", + "@certd/plugin-tencent", + "@certd/plugin-util", + ], +}; diff --git a/packages/plugins/plugin-cert/src/plugin/index.ts b/packages/plugins/plugin-cert/src/plugin/index.ts index 06c4122d..5cc2a15b 100644 --- a/packages/plugins/plugin-cert/src/plugin/index.ts +++ b/packages/plugins/plugin-cert/src/plugin/index.ts @@ -1,2 +1 @@ export * from "./cert-plugin"; - diff --git a/packages/plugins/plugin-cert/tsconfig.json b/packages/plugins/plugin-cert/tsconfig.json index cce0228e..ce96f458 100644 --- a/packages/plugins/plugin-cert/tsconfig.json +++ b/packages/plugins/plugin-cert/tsconfig.json @@ -1,9 +1,8 @@ { "compilerOptions": { - "noImplicitAny": true, "target": "ESNext", "useDefineForClassFields": true, - "module": "commonjs", + "module": "ESNext", "moduleResolution": "Node", "strict": true, "jsx": "preserve", diff --git a/packages/plugins/plugin-cert/vite.config.ts b/packages/plugins/plugin-cert/vite.config.ts index b9ddc1f4..61cc1c7a 100644 --- a/packages/plugins/plugin-cert/vite.config.ts +++ b/packages/plugins/plugin-cert/vite.config.ts @@ -7,7 +7,7 @@ export default defineConfig({ build: { lib: { entry: "src/index.ts", - name: "pipeline", + name: "CertdPluginCert", }, rollupOptions: { plugins: [ diff --git a/packages/plugins/plugin-host/.npmignore b/packages/plugins/plugin-host/.npmignore new file mode 100644 index 00000000..bf40d278 --- /dev/null +++ b/packages/plugins/plugin-host/.npmignore @@ -0,0 +1,2 @@ +node_modules +src \ No newline at end of file diff --git a/packages/plugins/plugin-host/package.json b/packages/plugins/plugin-host/package.json index 680b9233..d5f547d9 100644 --- a/packages/plugins/plugin-host/package.json +++ b/packages/plugins/plugin-host/package.json @@ -3,8 +3,8 @@ "private": false, "version": "1.0.2", "main": "./src/index.ts", - "module": "./src/index.ts", - "types": "./src/index.ts", + "module": "./dist/plugin-host.mjs", + "types": "./dist/es/plugin-host.d.ts", "publishConfig": { "main": "./dist/plugin-host.umd.js", "module": "./dist/plugin-host.mjs", @@ -12,7 +12,8 @@ }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build", + "build": "rollup -c", + "build2": "vue-tsc --noEmit && vite build", "preview": "vite preview" }, "dependencies": { @@ -33,6 +34,13 @@ "@types/ssh2": "^1.11.6", "@typescript-eslint/eslint-plugin": "^5.38.1", "@typescript-eslint/parser": "^5.38.1", + "@rollup/plugin-commonjs": "^23.0.4", + "@rollup/plugin-json": "^6.0.0", + "@rollup/plugin-node-resolve": "^15.0.1", + "@rollup/plugin-terser": "^0.4.3", + "@rollup/plugin-typescript": "^11.0.0", + "tslib": "^2.5.2", + "rollup": "^3.7.4", "chai": "^4.3.6", "dayjs": "^1.9.7", "eslint": "^8.24.0", diff --git a/packages/plugins/plugin-host/rollup.config.js b/packages/plugins/plugin-host/rollup.config.js new file mode 100644 index 00000000..4614e1be --- /dev/null +++ b/packages/plugins/plugin-host/rollup.config.js @@ -0,0 +1,35 @@ +const resolve = require("@rollup/plugin-node-resolve"); +const commonjs = require("@rollup/plugin-commonjs"); +const rollupTypescript = require("rollup-plugin-typescript2"); +const json = require("@rollup/plugin-json"); +const terser = require("@rollup/plugin-terser"); +module.exports = { + input: "src/index.ts", + output: { + file: "dist/bundle.js", + format: "cjs", + }, + plugins: [ + // 解析第三方依赖 + resolve(), + // 识别 commonjs 模式第三方依赖 + commonjs(), + rollupTypescript(), + json(), + terser(), + ], + external: [ + "vue", + "lodash", + "dayjs", + "@certd/acme-client", + "@certd/pipeline", + "@certd/plugin-cert", + "@certd/plugin-aliyun", + "@certd/plugin-tencent", + "@certd/plugin-huawei", + "@certd/plugin-host", + "@certd/plugin-tencent", + "@certd/plugin-util", + ], +}; diff --git a/packages/plugins/plugin-host/tsconfig.json b/packages/plugins/plugin-host/tsconfig.json index cce0228e..ce96f458 100644 --- a/packages/plugins/plugin-host/tsconfig.json +++ b/packages/plugins/plugin-host/tsconfig.json @@ -1,9 +1,8 @@ { "compilerOptions": { - "noImplicitAny": true, "target": "ESNext", "useDefineForClassFields": true, - "module": "commonjs", + "module": "ESNext", "moduleResolution": "Node", "strict": true, "jsx": "preserve", diff --git a/packages/plugins/plugin-huawei/.npmignore b/packages/plugins/plugin-huawei/.npmignore new file mode 100644 index 00000000..bf40d278 --- /dev/null +++ b/packages/plugins/plugin-huawei/.npmignore @@ -0,0 +1,2 @@ +node_modules +src \ No newline at end of file diff --git a/packages/plugins/plugin-huawei/package.json b/packages/plugins/plugin-huawei/package.json index 2ade5029..1a0bd4b4 100644 --- a/packages/plugins/plugin-huawei/package.json +++ b/packages/plugins/plugin-huawei/package.json @@ -3,8 +3,8 @@ "private": false, "version": "1.0.2", "main": "./src/index.ts", - "module": "./src/index.ts", - "types": "./src/index.ts", + "module": "./dist/plugin-huawei.mjs", + "types": "./dist/es/plugin-huawei.d.ts", "publishConfig": { "main": "./dist/plugin-huawei.umd.js", "module": "./dist/plugin-huawei.mjs", @@ -12,7 +12,8 @@ }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build", + "build": "rollup -c", + "build2": "vue-tsc --noEmit && vite build", "preview": "vite preview" }, "dependencies": { @@ -37,6 +38,13 @@ "@types/node-forge": "^1.3.0", "@typescript-eslint/eslint-plugin": "^5.38.1", "@typescript-eslint/parser": "^5.38.1", + "@rollup/plugin-commonjs": "^23.0.4", + "@rollup/plugin-json": "^6.0.0", + "@rollup/plugin-node-resolve": "^15.0.1", + "@rollup/plugin-terser": "^0.4.3", + "@rollup/plugin-typescript": "^11.0.0", + "tslib": "^2.5.2", + "rollup": "^3.7.4", "chai": "^4.3.6", "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", diff --git a/packages/plugins/plugin-huawei/rollup.config.js b/packages/plugins/plugin-huawei/rollup.config.js new file mode 100644 index 00000000..4614e1be --- /dev/null +++ b/packages/plugins/plugin-huawei/rollup.config.js @@ -0,0 +1,35 @@ +const resolve = require("@rollup/plugin-node-resolve"); +const commonjs = require("@rollup/plugin-commonjs"); +const rollupTypescript = require("rollup-plugin-typescript2"); +const json = require("@rollup/plugin-json"); +const terser = require("@rollup/plugin-terser"); +module.exports = { + input: "src/index.ts", + output: { + file: "dist/bundle.js", + format: "cjs", + }, + plugins: [ + // 解析第三方依赖 + resolve(), + // 识别 commonjs 模式第三方依赖 + commonjs(), + rollupTypescript(), + json(), + terser(), + ], + external: [ + "vue", + "lodash", + "dayjs", + "@certd/acme-client", + "@certd/pipeline", + "@certd/plugin-cert", + "@certd/plugin-aliyun", + "@certd/plugin-tencent", + "@certd/plugin-huawei", + "@certd/plugin-host", + "@certd/plugin-tencent", + "@certd/plugin-util", + ], +}; diff --git a/packages/plugins/plugin-huawei/tsconfig.json b/packages/plugins/plugin-huawei/tsconfig.json index cce0228e..ce96f458 100644 --- a/packages/plugins/plugin-huawei/tsconfig.json +++ b/packages/plugins/plugin-huawei/tsconfig.json @@ -1,9 +1,8 @@ { "compilerOptions": { - "noImplicitAny": true, "target": "ESNext", "useDefineForClassFields": true, - "module": "commonjs", + "module": "ESNext", "moduleResolution": "Node", "strict": true, "jsx": "preserve", diff --git a/packages/plugins/plugin-tencent/.npmignore b/packages/plugins/plugin-tencent/.npmignore new file mode 100644 index 00000000..bf40d278 --- /dev/null +++ b/packages/plugins/plugin-tencent/.npmignore @@ -0,0 +1,2 @@ +node_modules +src \ No newline at end of file diff --git a/packages/plugins/plugin-tencent/package.json b/packages/plugins/plugin-tencent/package.json index 2bd68117..033661d9 100644 --- a/packages/plugins/plugin-tencent/package.json +++ b/packages/plugins/plugin-tencent/package.json @@ -3,8 +3,8 @@ "private": false, "version": "1.0.2", "main": "./src/index.ts", - "module": "./src/index.ts", - "types": "./src/index.ts", + "module": "./dist/plugin-tencent.mjs", + "types": "./dist/es/plugin-tencent.d.ts", "publishConfig": { "main": "./dist/plugin-tencent.umd.js", "module": "./dist/plugin-tencent.mjs", @@ -12,7 +12,8 @@ }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build", + "build": "rollup -c", + "build2": "vue-tsc --noEmit && vite build", "preview": "vite preview" }, "dependencies": { @@ -33,6 +34,13 @@ "@types/node-forge": "^1.3.0", "@typescript-eslint/eslint-plugin": "^5.38.1", "@typescript-eslint/parser": "^5.38.1", + "@rollup/plugin-commonjs": "^23.0.4", + "@rollup/plugin-json": "^6.0.0", + "@rollup/plugin-node-resolve": "^15.0.1", + "@rollup/plugin-terser": "^0.4.3", + "@rollup/plugin-typescript": "^11.0.0", + "tslib": "^2.5.2", + "rollup": "^3.7.4", "axios": "^0.21.1", "chai": "^4.3.6", "dayjs": "^1.9.7", diff --git a/packages/plugins/plugin-tencent/rollup.config.js b/packages/plugins/plugin-tencent/rollup.config.js new file mode 100644 index 00000000..4614e1be --- /dev/null +++ b/packages/plugins/plugin-tencent/rollup.config.js @@ -0,0 +1,35 @@ +const resolve = require("@rollup/plugin-node-resolve"); +const commonjs = require("@rollup/plugin-commonjs"); +const rollupTypescript = require("rollup-plugin-typescript2"); +const json = require("@rollup/plugin-json"); +const terser = require("@rollup/plugin-terser"); +module.exports = { + input: "src/index.ts", + output: { + file: "dist/bundle.js", + format: "cjs", + }, + plugins: [ + // 解析第三方依赖 + resolve(), + // 识别 commonjs 模式第三方依赖 + commonjs(), + rollupTypescript(), + json(), + terser(), + ], + external: [ + "vue", + "lodash", + "dayjs", + "@certd/acme-client", + "@certd/pipeline", + "@certd/plugin-cert", + "@certd/plugin-aliyun", + "@certd/plugin-tencent", + "@certd/plugin-huawei", + "@certd/plugin-host", + "@certd/plugin-tencent", + "@certd/plugin-util", + ], +}; diff --git a/packages/plugins/plugin-tencent/tsconfig.json b/packages/plugins/plugin-tencent/tsconfig.json index 62621e72..ce96f458 100644 --- a/packages/plugins/plugin-tencent/tsconfig.json +++ b/packages/plugins/plugin-tencent/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "target": "ESNext", "useDefineForClassFields": true, - "module": "commonjs", + "module": "ESNext", "moduleResolution": "Node", "strict": true, "jsx": "preserve", diff --git a/packages/plugins/plugin-util/.mocharc.json b/packages/plugins/plugin-util/.mocharc.json deleted file mode 100644 index 24b75f3e..00000000 --- a/packages/plugins/plugin-util/.mocharc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extension": ["ts"], - "spec": "test/**/*.test.ts", - "require": "ts-node/register" -} \ No newline at end of file diff --git a/packages/plugins/plugin-util/.npmignore b/packages/plugins/plugin-util/.npmignore new file mode 100644 index 00000000..bf40d278 --- /dev/null +++ b/packages/plugins/plugin-util/.npmignore @@ -0,0 +1,2 @@ +node_modules +src \ No newline at end of file diff --git a/packages/plugins/plugin-util/package.json b/packages/plugins/plugin-util/package.json index a1c0be53..94a8d48b 100644 --- a/packages/plugins/plugin-util/package.json +++ b/packages/plugins/plugin-util/package.json @@ -3,8 +3,8 @@ "private": false, "version": "1.0.2", "main": "./src/index.ts", - "module": "./src/index.ts", - "types": "./src/index.ts", + "module": "./dist/plugin-util.mjs", + "types": "./dist/es/plugin-util.d.ts", "publishConfig": { "main": "./dist/plugin-util.umd.js", "module": "./dist/plugin-util.mjs", @@ -12,33 +12,31 @@ }, "scripts": { "dev": "vite", - "build": "vue-tsc --noEmit && vite build", + "build": "rollup -c", + "build2": "vue-tsc --noEmit && vite build", "preview": "vite preview" }, "dependencies": { - "@certd/pipeline": "^1.0.2", "kubernetes-client": "^9.0.0" }, "devDependencies": { - "@alicloud/cs20151215": "^3.0.3", - "@alicloud/openapi-client": "^0.4.0", - "@alicloud/pop-core": "^1.7.10", - "@midwayjs/core": "^3.0.0", - "@midwayjs/decorator": "^3.0.0", + "@certd/pipeline": "^1.0.2", "@types/chai": "^4.3.3", "@types/lodash": "^4.14.186", - "@types/mocha": "^10.0.0", - "@types/node-forge": "^1.3.0", "@typescript-eslint/eslint-plugin": "^5.38.1", "@typescript-eslint/parser": "^5.38.1", - "chai": "^4.3.6", "eslint": "^8.24.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.2.1", - "log4js": "^6.7.1", - "mocha": "^10.1.0", + "@rollup/plugin-commonjs": "^23.0.4", + "@rollup/plugin-json": "^6.0.0", + "@rollup/plugin-node-resolve": "^15.0.1", + "@rollup/plugin-terser": "^0.4.3", + "@rollup/plugin-typescript": "^11.0.0", + "tslib": "^2.5.2", + "rollup": "^3.7.4", "ts-node": "^10.9.1", "typescript": "^4.8.4", "vite": "^3.1.0", diff --git a/packages/plugins/plugin-util/rollup.config.js b/packages/plugins/plugin-util/rollup.config.js new file mode 100644 index 00000000..ca63f8df --- /dev/null +++ b/packages/plugins/plugin-util/rollup.config.js @@ -0,0 +1,40 @@ +const resolve = require("@rollup/plugin-node-resolve"); +const commonjs = require("@rollup/plugin-commonjs"); +const rollupTypescript = require("rollup-plugin-typescript2"); +const json = require("@rollup/plugin-json"); +const terser = require("@rollup/plugin-terser"); +module.exports = { + input: "src/index.ts", + output: { + file: "dist/bundle.js", + format: "cjs", + }, + plugins: [ + // 解析第三方依赖 + resolve(), + // 识别 commonjs 模式第三方依赖 + commonjs({ + // dynamicRequireTargets: true, + ignoreDynamicRequires: true, + }), + rollupTypescript(), + json(), + terser(), + ], + external: [ + "vue", + "lodash", + "dayjs", + "@certd/acme-client", + "@certd/pipeline", + "@certd/plugin-cert", + "@certd/plugin-aliyun", + "@certd/plugin-tencent", + "@certd/plugin-huawei", + "@certd/plugin-host", + "@certd/plugin-tencent", + "@certd/plugin-util", + "@certd/plugin-util", + "kubernetes-client", + ], +}; diff --git a/packages/plugins/plugin-util/tsconfig.json b/packages/plugins/plugin-util/tsconfig.json index 62621e72..ce96f458 100644 --- a/packages/plugins/plugin-util/tsconfig.json +++ b/packages/plugins/plugin-util/tsconfig.json @@ -2,7 +2,7 @@ "compilerOptions": { "target": "ESNext", "useDefineForClassFields": true, - "module": "commonjs", + "module": "ESNext", "moduleResolution": "Node", "strict": true, "jsx": "preserve", diff --git a/packages/plugins/plugin-util/vite.config.ts b/packages/plugins/plugin-util/vite.config.ts index b9ddc1f4..91856ddc 100644 --- a/packages/plugins/plugin-util/vite.config.ts +++ b/packages/plugins/plugin-util/vite.config.ts @@ -33,7 +33,10 @@ export default defineConfig({ "@certd/plugin-huawei", "@certd/plugin-host", "@certd/plugin-tencent", - "@certd/plugin-util", + "log4js", + "@midwayjs/core", + "@midwayjs/decorator", + "kubernetes-client", ], output: { globals: { @@ -46,7 +49,10 @@ export default defineConfig({ "@certd/plugin-aliyun": "CertdPluginAliyun", "@certd/plugin-host": "CertdPluginHost", "@certd/plugin-huawei": "CertdPluginHuawei", - "@certd/plugin-util": "CertdPluginUtil", + log4js: "log4js", + "@midwayjs/core": "MidwayjsCore", + "@midwayjs/decorator": "MidwayjsDecorator", + "kubernetes-client": "kubernetesClient", }, }, }, diff --git a/packages/ui/certd-server/db/migration/v10001__certdv2.sql b/packages/ui/certd-server/db/migration/v10001__certdv2.sql index b690b23d..c5498cd7 100644 --- a/packages/ui/certd-server/db/migration/v10001__certdv2.sql +++ b/packages/ui/certd-server/db/migration/v10001__certdv2.sql @@ -1,7 +1,7 @@ -CREATE TABLE "pi_history" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "pipeline_id" integer NOT NULL, "pipeline" varchar(40960), "status" varchar(20), "end_time" datetime, "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)) +CREATE TABLE "pi_history" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "pipeline_id" integer NOT NULL, "pipeline" varchar(40960), "status" varchar(20), "end_time" datetime, "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -CREATE TABLE "pi_history_log" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "pipeline_id" integer NOT NULL, "history_id" integer NOT NULL, "node_id" varchar(100), "logs" varchar(40960), "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)) +CREATE TABLE "pi_history_log" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "pipeline_id" integer NOT NULL, "history_id" integer NOT NULL, "node_id" varchar(100), "logs" varchar(40960), "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -CREATE TABLE "pi_pipeline" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "title" integer NOT NULL, "content" varchar(40960) NOT NULL, "keep_history_count" integer, "remark" varchar(100), "status" varchar(100), "disabled" boolean DEFAULT (0), "last_history_time" integer, "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)) +CREATE TABLE "pi_pipeline" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "title" integer NOT NULL, "content" varchar(40960) NOT NULL, "keep_history_count" integer, "remark" varchar(100), "status" varchar(100), "disabled" boolean DEFAULT (0), "last_history_time" integer, "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)); -CREATE TABLE "pi_storage" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "scope" varchar NOT NULL, "namespace" varchar NOT NULL, "version" varchar(100),"key" varchar(100), "value" varchar(40960), "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)) +CREATE TABLE "pi_storage" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "user_id" integer NOT NULL, "scope" varchar NOT NULL, "namespace" varchar NOT NULL, "version" varchar(100),"key" varchar(100), "value" varchar(40960), "create_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP), "update_time" datetime NOT NULL DEFAULT (CURRENT_TIMESTAMP)); diff --git a/packages/ui/certd-server/package.json b/packages/ui/certd-server/package.json index b70e2b7d..bdd84e5e 100644 --- a/packages/ui/certd-server/package.json +++ b/packages/ui/certd-server/package.json @@ -21,9 +21,15 @@ "mig": "typeorm migration:create -n name" }, "dependencies": { - "@alicloud/pop-core": "^1.7.12", + "kubernetes-client": "^9.0.0", + "@certd/acme-client": "^1.0.2", "@certd/pipeline": "^1.0.2", "@certd/plugin-all": "^1.0.2", + "@certd/plugin-aliyun": "^1.0.2", + "@certd/plugin-util": "^1.0.2", + "@certd/plugin-tencent": "^1.0.2", + "@certd/plugin-huawei": "^1.0.2", + "@certd/plugin-host": "^1.0.2", "@certd/plugin-cert": "^1.0.2", "@koa/cors": "^3.4.3", "@midwayjs/bootstrap": "^3.9.1",