diff --git a/package.json b/package.json index 38059293..a293d57a 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "license": "MIT", "dependencies": { - "lodash-es": "^4.17.21" + "lodash": "^4.17.21" }, "workspaces": [ "packages/**" diff --git a/packages/core/acme-client/package.json b/packages/core/acme-client/package.json index f3c72060..ca401fe1 100644 --- a/packages/core/acme-client/package.json +++ b/packages/core/acme-client/package.json @@ -2,7 +2,7 @@ "name": "@certd/acme-client", "description": "Simple and unopinionated ACME client", "author": "nmorsman", - "version": "0.3.1", + "version": "0.3.0", "main": "src/index.js", "types": "types", "license": "MIT", diff --git a/packages/core/pipeline/package.json b/packages/core/pipeline/package.json index 1c18cc54..efd5351e 100644 --- a/packages/core/pipeline/package.json +++ b/packages/core/pipeline/package.json @@ -34,8 +34,7 @@ "@midwayjs/typeorm": "^3.9.0", "@midwayjs/validate": "^3.9.0", "@types/chai": "^4.3.3", - "@types/lodash": "^4.14.186", - "@types/lodash-es": "^4.17.6", + "@types/lodash": "^4.14.194", "@types/mocha": "^10.0.0", "@types/node-forge": "^1.3.0", "@typescript-eslint/eslint-plugin": "^5.38.1", diff --git a/packages/core/pipeline/src/plugin/abstract-plugin.ts b/packages/core/pipeline/src/plugin/abstract-plugin.ts deleted file mode 100644 index 2f2fdbfe..00000000 --- a/packages/core/pipeline/src/plugin/abstract-plugin.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { AbstractRegistrable } from "../registry"; -import { Logger } from "log4js"; -import { IContext } from "../core/context"; -import { PluginDefine, TaskInput, TaskOutput, TaskPlugin } from "./api"; -import { IAccessService } from "../access"; -import { AxiosInstance } from "axios"; - -export abstract class AbstractPlugin extends AbstractRegistrable implements TaskPlugin { - logger!: Logger; - // @ts-ignore - accessService: IAccessService; - // @ts-ignore - pipelineContext: IContext; - // @ts-ignore - userContext: IContext; - http!: AxiosInstance; - - async doInit(options: { accessService: IAccessService; pipelineContext: IContext; userContext: IContext; logger: Logger; http: AxiosInstance }) { - this.accessService = options.accessService; - this.pipelineContext = options.pipelineContext; - this.userContext = options.userContext; - this.logger = options.logger; - this.http = options.http; - await this.onInit(); - } - - protected async onInit(): Promise { - // - } - - abstract execute(input: TaskInput): Promise; -} diff --git a/packages/core/pipeline/vite.config.ts b/packages/core/pipeline/vite.config.ts index c758c7c0..a3f2fd3c 100644 --- a/packages/core/pipeline/vite.config.ts +++ b/packages/core/pipeline/vite.config.ts @@ -8,13 +8,13 @@ export default defineConfig({ name: "pipeline", }, rollupOptions: { - external: ["vue", "lodash-es", "dayjs", "@fast-crud/fast-crud"], + external: ["vue", "lodash", "dayjs", "@fast-crud/fast-crud"], output: { // Provide global variables to use in the UMD build // for externalized deps globals: { vue: "Vue", - "lodash-es": "_", + "lodash": "_", dayjs: "dayjs", "@fast-crud/fast-crud": "FastCrud", }, diff --git a/packages/plugins/plugin-aliyun/package.json b/packages/plugins/plugin-aliyun/package.json index 6c4cf8c9..d254b762 100644 --- a/packages/plugins/plugin-aliyun/package.json +++ b/packages/plugins/plugin-aliyun/package.json @@ -19,12 +19,13 @@ "@alicloud/cs20151215": "^3.0.3", "@alicloud/openapi-client": "^0.4.0", "@alicloud/pop-core": "^1.7.10", - "@certd/acme-client": "^0.3.0", + "@certd/acme-client": "workspace:^0.3.0", "dayjs": "^1.11.6", "lodash": "^4.17.21", "node-forge": "^0.10.0", - "@certd/pipeline": "^0.3.0", - "@certd/plugin-util": "^0.3.0" + "@certd/pipeline": "workspace:^0.3.0", + "@certd/plugin-cert": "workspace:^0.3.0", + "@certd/plugin-util": "workspace:^0.3.0" }, "devDependencies": { "log4js": "^6.7.1", diff --git a/packages/plugins/plugin-aliyun/vite.config.ts b/packages/plugins/plugin-aliyun/vite.config.ts index c758c7c0..a3f2fd3c 100644 --- a/packages/plugins/plugin-aliyun/vite.config.ts +++ b/packages/plugins/plugin-aliyun/vite.config.ts @@ -8,13 +8,13 @@ export default defineConfig({ name: "pipeline", }, rollupOptions: { - external: ["vue", "lodash-es", "dayjs", "@fast-crud/fast-crud"], + external: ["vue", "lodash", "dayjs", "@fast-crud/fast-crud"], output: { // Provide global variables to use in the UMD build // for externalized deps globals: { vue: "Vue", - "lodash-es": "_", + "lodash": "_", dayjs: "dayjs", "@fast-crud/fast-crud": "FastCrud", }, diff --git a/packages/plugins/plugin-all/package.json b/packages/plugins/plugin-all/package.json index 57b2a357..61dc8413 100644 --- a/packages/plugins/plugin-all/package.json +++ b/packages/plugins/plugin-all/package.json @@ -19,10 +19,11 @@ "@certd/plugin-aliyun": "workspace:^0.3.0", "@certd/plugin-tencent": "workspace:^0.3.0", "@certd/plugin-host": "workspace:^0.3.0", - "@certd/plugin-cert": "workspace:0.3.0" + "@certd/plugin-cert": "workspace:^0.3.0", + "@certd/plugin-huawei": "workspace:^0.3.0" }, "devDependencies": { - "@certd/pipeline": "workspace:0.3.0", + "@certd/pipeline": "workspace:^0.3.0", "log4js": "^6.7.1", "@types/lodash": "^4.14.186", "vue-tsc": "^0.38.9", diff --git a/packages/plugins/plugin-all/src/index.ts b/packages/plugins/plugin-all/src/index.ts index 97fd09b7..f089b455 100644 --- a/packages/plugins/plugin-all/src/index.ts +++ b/packages/plugins/plugin-all/src/index.ts @@ -1,4 +1,23 @@ +import * as cert from "@certd/plugin-cert"; +import * as aliyun from "@certd/plugin-aliyun"; +import * as tencent from "@certd/plugin-tencent"; +import * as host from "@certd/plugin-host"; +import * as huawei from "@certd/plugin-huawei"; + +function register(exports: any) { + for (const key in exports) { + const value = exports[key]; + console.log("value"); + } +} +register(cert); +register(aliyun); +register(tencent); +register(host); +register(huawei); + export * from "@certd/plugin-cert"; export * from "@certd/plugin-aliyun"; export * from "@certd/plugin-tencent"; export * from "@certd/plugin-host"; +export * from "@certd/plugin-huawei"; diff --git a/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts b/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts index dd7706f8..87e69267 100644 --- a/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts +++ b/packages/plugins/plugin-all/test/pipeline/pipeline.test.ts @@ -3,7 +3,7 @@ import "mocha"; import { Executor, RunHistory, FileStorage } from "@certd/pipeline"; import { pipeline } from "./pipeline.define"; import { AccessServiceTest } from "./access-service-test"; -import * as all from "../../src"; +import "../../src"; describe("pipeline", function () { it("#pipeline", async function () { this.timeout(120000); diff --git a/packages/plugins/plugin-all/vite.config.ts b/packages/plugins/plugin-all/vite.config.ts index c758c7c0..a3f2fd3c 100644 --- a/packages/plugins/plugin-all/vite.config.ts +++ b/packages/plugins/plugin-all/vite.config.ts @@ -8,13 +8,13 @@ export default defineConfig({ name: "pipeline", }, rollupOptions: { - external: ["vue", "lodash-es", "dayjs", "@fast-crud/fast-crud"], + external: ["vue", "lodash", "dayjs", "@fast-crud/fast-crud"], output: { // Provide global variables to use in the UMD build // for externalized deps globals: { vue: "Vue", - "lodash-es": "_", + "lodash": "_", dayjs: "dayjs", "@fast-crud/fast-crud": "FastCrud", }, diff --git a/packages/plugins/plugin-cert/package.json b/packages/plugins/plugin-cert/package.json index 1d00a554..0fc21a8f 100644 --- a/packages/plugins/plugin-cert/package.json +++ b/packages/plugins/plugin-cert/package.json @@ -1,6 +1,6 @@ { "name": "@certd/plugin-cert", - "private": true, + "private": false, "version": "0.3.0", "main": "./src/index.ts", "module": "./src/index.ts", @@ -16,9 +16,9 @@ "preview": "vite preview" }, "dependencies": { - "@certd/acme-client": "^0.3.0", + "@certd/acme-client": "workspace:^0.3.0", "node-forge": "^0.10.0", - "@certd/pipeline": "^0.3.0" + "@certd/pipeline": "workspace:^0.3.0" }, "devDependencies": { "log4js": "^6.7.1", diff --git a/packages/plugins/plugin-cert/vite.config.ts b/packages/plugins/plugin-cert/vite.config.ts index c758c7c0..a3f2fd3c 100644 --- a/packages/plugins/plugin-cert/vite.config.ts +++ b/packages/plugins/plugin-cert/vite.config.ts @@ -8,13 +8,13 @@ export default defineConfig({ name: "pipeline", }, rollupOptions: { - external: ["vue", "lodash-es", "dayjs", "@fast-crud/fast-crud"], + external: ["vue", "lodash", "dayjs", "@fast-crud/fast-crud"], output: { // Provide global variables to use in the UMD build // for externalized deps globals: { vue: "Vue", - "lodash-es": "_", + "lodash": "_", dayjs: "dayjs", "@fast-crud/fast-crud": "FastCrud", }, diff --git a/packages/plugins/plugin-host/package.json b/packages/plugins/plugin-host/package.json index 84540027..9c52bd98 100644 --- a/packages/plugins/plugin-host/package.json +++ b/packages/plugins/plugin-host/package.json @@ -16,7 +16,8 @@ "preview": "vite preview" }, "dependencies": { - "@certd/pipeline": "^0.3.0", + "@certd/pipeline": "workspace:^0.3.0", + "@certd/plugin-cert": "workspace:^0.3.0", "ssh2": "^0.8.9" }, "devDependencies": { @@ -39,7 +40,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.2.1", - "lodash-es": "^4.17.20", + "lodash": "^4.17.20", "log4js": "^6.3.0", "mocha": "^10.1.0", "ts-node": "^10.9.1", diff --git a/packages/plugins/plugin-host/src/lib/ssh.ts b/packages/plugins/plugin-host/src/lib/ssh.ts index 79246d2d..282575d9 100644 --- a/packages/plugins/plugin-host/src/lib/ssh.ts +++ b/packages/plugins/plugin-host/src/lib/ssh.ts @@ -27,7 +27,7 @@ export class SshClient { conn .on("ready", () => { this.logger.info("连接服务器成功"); - conn.sftp(async (err: Error, sftp: any) => { + conn.sftp(async (err: any, sftp: any) => { if (err) { throw err; } diff --git a/packages/plugins/plugin-host/vite.config.ts b/packages/plugins/plugin-host/vite.config.ts index e59f8305..e8bc4db1 100644 --- a/packages/plugins/plugin-host/vite.config.ts +++ b/packages/plugins/plugin-host/vite.config.ts @@ -8,13 +8,13 @@ export default defineConfig({ name: "pipeline", }, rollupOptions: { - external: ["vue", "lodash-es", "dayjs", "@fast-crud/fast-crud", "log4js", "lodash", "@certd/pipeline"], + external: ["vue", "lodash", "dayjs", "@fast-crud/fast-crud", "log4js", "lodash", "@certd/pipeline"], output: { // Provide global variables to use in the UMD build // for externalized deps globals: { vue: "Vue", - "lodash-es": "_", + "lodash": "_", lodash: "_", dayjs: "dayjs", "@fast-crud/fast-crud": "FastCrud", diff --git a/packages/plugins/plugin-huawei/package.json b/packages/plugins/plugin-huawei/package.json index 95b6cd2d..daf32eb9 100644 --- a/packages/plugins/plugin-huawei/package.json +++ b/packages/plugins/plugin-huawei/package.json @@ -1,5 +1,5 @@ { - "name": "@certd/plugin-hauwei", + "name": "@certd/plugin-huawei", "private": true, "version": "0.3.0", "main": "./src/index.ts", @@ -16,15 +16,13 @@ "preview": "vite preview" }, "dependencies": { - "@alicloud/cs20151215": "^3.0.3", - "@alicloud/openapi-client": "^0.4.0", - "@alicloud/pop-core": "^1.7.10", - "@certd/acme-client": "^0.3.0", + "@certd/acme-client": "workspace:^0.3.0", "dayjs": "^1.11.6", "lodash": "^4.17.21", "node-forge": "^0.10.0", - "@certd/pipeline": "^0.3.0", - "@certd/plugin-util": "^0.3.0" + "@certd/pipeline": "workspace:^0.3.0", + "@certd/plugin-util": "workspace:^0.3.0", + "@certd/plugin-cert": "workspace:^0.3.0" }, "devDependencies": { "log4js": "^6.7.1", diff --git a/packages/plugins/plugin-huawei/vite.config.ts b/packages/plugins/plugin-huawei/vite.config.ts index c758c7c0..a3f2fd3c 100644 --- a/packages/plugins/plugin-huawei/vite.config.ts +++ b/packages/plugins/plugin-huawei/vite.config.ts @@ -8,13 +8,13 @@ export default defineConfig({ name: "pipeline", }, rollupOptions: { - external: ["vue", "lodash-es", "dayjs", "@fast-crud/fast-crud"], + external: ["vue", "lodash", "dayjs", "@fast-crud/fast-crud"], output: { // Provide global variables to use in the UMD build // for externalized deps globals: { vue: "Vue", - "lodash-es": "_", + "lodash": "_", dayjs: "dayjs", "@fast-crud/fast-crud": "FastCrud", }, diff --git a/packages/plugins/plugin-tencent/package.json b/packages/plugins/plugin-tencent/package.json index 7f65ef36..cc08976a 100644 --- a/packages/plugins/plugin-tencent/package.json +++ b/packages/plugins/plugin-tencent/package.json @@ -16,16 +16,16 @@ "preview": "vite preview" }, "dependencies": { - "@certd/pipeline": "^0.3.0", - "@certd/plugin-util": "^0.3.0", - "@certd/plugin-cert": "^0.3.0", + "@certd/pipeline": "workspace:^0.3.0", + "@certd/plugin-util": "workspace:^0.3.0", + "@certd/plugin-cert": "workspace:^0.3.0", "tencentcloud-sdk-nodejs": "^4.0.44" }, "devDependencies": { "log4js": "^6.7.1", "axios": "^0.21.1", "dayjs": "^1.9.7", - "lodash-es": "^4.17.20", + "lodash": "^4.17.20", "@types/lodash": "^4.14.186", "vue-tsc": "^0.38.9", "@alicloud/cs20151215": "^3.0.3", @@ -44,7 +44,6 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^4.2.1", - "log4js": "^6.3.0", "mocha": "^10.1.0", "ts-node": "^10.9.1", "typescript": "^4.8.4", diff --git a/packages/plugins/plugin-tencent/vite.config.ts b/packages/plugins/plugin-tencent/vite.config.ts index 8d4b8bf1..22fe6fb3 100644 --- a/packages/plugins/plugin-tencent/vite.config.ts +++ b/packages/plugins/plugin-tencent/vite.config.ts @@ -8,13 +8,13 @@ export default defineConfig({ name: "pipeline", }, rollupOptions: { - external: ["vue", "lodash-es", "dayjs", "@fast-crud/fast-crud", "log4js", "lodash", "@certd/pipeline", "axios"], + external: ["vue", "lodash", "dayjs", "@fast-crud/fast-crud", "log4js", "lodash", "@certd/pipeline", "axios"], output: { // Provide global variables to use in the UMD build // for externalized deps globals: { vue: "Vue", - "lodash-es": "_", + "lodash": "_", lodash: "_", dayjs: "dayjs", "@fast-crud/fast-crud": "FastCrud", diff --git a/packages/plugins/plugin-util/package.json b/packages/plugins/plugin-util/package.json index 83725035..4187cd65 100644 --- a/packages/plugins/plugin-util/package.json +++ b/packages/plugins/plugin-util/package.json @@ -16,7 +16,7 @@ "preview": "vite preview" }, "dependencies": { - "@certd/pipeline": "^0.3.0", + "@certd/pipeline": "workspace:^0.3.0", "kubernetes-client": "^9.0.0" }, "devDependencies": { diff --git a/packages/plugins/plugin-util/vite.config.ts b/packages/plugins/plugin-util/vite.config.ts index c758c7c0..a3f2fd3c 100644 --- a/packages/plugins/plugin-util/vite.config.ts +++ b/packages/plugins/plugin-util/vite.config.ts @@ -8,13 +8,13 @@ export default defineConfig({ name: "pipeline", }, rollupOptions: { - external: ["vue", "lodash-es", "dayjs", "@fast-crud/fast-crud"], + external: ["vue", "lodash", "dayjs", "@fast-crud/fast-crud"], output: { // Provide global variables to use in the UMD build // for externalized deps globals: { vue: "Vue", - "lodash-es": "_", + "lodash": "_", dayjs: "dayjs", "@fast-crud/fast-crud": "FastCrud", }, diff --git a/packages/ui/certd-client/package.json b/packages/ui/certd-client/package.json index 914a99c1..f851347f 100644 --- a/packages/ui/certd-client/package.json +++ b/packages/ui/certd-client/package.json @@ -41,7 +41,7 @@ "dayjs": "^1.11.7", "deepdash-es": "5.3.5", "highlight.js": "^11.7.0", - "lodash-es": "^4.17.15", + "lodash": "^4.17.15", "mitt": "^3.0.0", "humanize-duration": "^3.27.3", "nanoid": "^4.0.0", @@ -60,7 +60,6 @@ "@rollup/plugin-commonjs": "^23.0.4", "@rollup/plugin-node-resolve": "^15.0.1", "@types/chai": "^4.3.4", - "@types/lodash-es": "^4.17.6", "@types/mocha": "^10.0.1", "@types/node": "^18.11.15", "@typescript-eslint/eslint-plugin": "^5.46.1", diff --git a/packages/ui/certd-client/src/api/service.ts b/packages/ui/certd-client/src/api/service.ts index cd8da796..41b08903 100644 --- a/packages/ui/certd-client/src/api/service.ts +++ b/packages/ui/certd-client/src/api/service.ts @@ -1,5 +1,5 @@ import axios from "axios"; -import { get } from "lodash-es"; +import { get } from "lodash"; import Adapter from "axios-mock-adapter"; import { errorLog, errorCreate } from "./tools"; import { env } from "/src/utils/util.env"; diff --git a/packages/ui/certd-client/src/layout/components/locale/index.vue b/packages/ui/certd-client/src/layout/components/locale/index.vue index 87f8d92a..4abda1ec 100644 --- a/packages/ui/certd-client/src/layout/components/locale/index.vue +++ b/packages/ui/certd-client/src/layout/components/locale/index.vue @@ -22,7 +22,7 @@