From b10ff5b6ee0eaef29b235f59fee38242b23946b5 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Tue, 18 Oct 2022 23:15:36 +0800 Subject: [PATCH] refactor: ui edit cert --- .gitignore | 4 +++- packages/basic/acme-client | 2 +- packages/core/api/package.json | 9 +++++++-- packages/core/api/rollup.config.js | 13 +++++++++++++ .../api/src/dns-provider/abstract-dns-provider.js | 2 +- packages/core/api/src/utils/util.common.js | 2 +- packages/plugins/plugin-aliyun/package.json | 9 +++++++-- packages/plugins/plugin-aliyun/rollup.config.js | 13 +++++++++++++ .../plugin-aliyun/src/dns-providers/aliyun.js | 2 +- packages/plugins/plugin-aliyun/src/index.js | 2 +- packages/plugins/plugin-common/package.json | 10 ++++++++-- packages/plugins/plugin-common/rollup.config.js | 13 +++++++++++++ packages/plugins/plugin-host/package.json | 9 +++++++-- packages/plugins/plugin-host/rollup.config.js | 13 +++++++++++++ packages/plugins/plugin-host/src/index.js | 2 +- packages/plugins/plugin-host/src/plugins/ssh.js | 2 +- packages/plugins/plugin-tencent/package.json | 9 +++++++-- packages/plugins/plugin-tencent/rollup.config.js | 13 +++++++++++++ .../plugin-tencent/src/dns-providers/dnspod.js | 2 +- packages/plugins/plugin-tencent/src/index.js | 2 +- packages/server/certd-client | 2 +- packages/server/certd-server | 2 +- 22 files changed, 115 insertions(+), 22 deletions(-) create mode 100644 packages/core/api/rollup.config.js create mode 100644 packages/plugins/plugin-aliyun/rollup.config.js create mode 100644 packages/plugins/plugin-common/rollup.config.js create mode 100644 packages/plugins/plugin-host/rollup.config.js create mode 100644 packages/plugins/plugin-tencent/rollup.config.js diff --git a/.gitignore b/.gitignore index ed4d57ac..806a9df7 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,9 @@ yarn-error.log yarn.lock package-lock.json /.idea/ - +*/**/dist +*/**/pnpm-lock.yaml +*/**/stats.html .idea *.iml out diff --git a/packages/basic/acme-client b/packages/basic/acme-client index 21126e0b..23f1e36a 160000 --- a/packages/basic/acme-client +++ b/packages/basic/acme-client @@ -1 +1 @@ -Subproject commit 21126e0bd7390946aecc277b745baa0fab8f4899 +Subproject commit 23f1e36aa82d5d7837033a555c5ea04614cfcbcc diff --git a/packages/core/api/package.json b/packages/core/api/package.json index 81a3a2a0..9c9bf721 100644 --- a/packages/core/api/package.json +++ b/packages/core/api/package.json @@ -2,10 +2,14 @@ "name": "@certd/api", "version": "0.2.1", "description": "", - "main": "src/index.js", "type": "module", "author": "Greper", "license": "MIT", + "main": "./dist/index.cjs", + "module": "./dist/fast-crud.es.js", + "scripts": { + "build": "rollup -c" + }, "dependencies": { "axios": "^0.21.1", "dayjs": "^1.9.7", @@ -20,7 +24,8 @@ "eslint-plugin-import": "^2.22.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", - "mocha": "^8.2.1" + "mocha": "^8.2.1", + "rollup": "^3.2.3" }, "gitHead": "5fbd7742665c0a949333d805153e9b6af91c0a71" } diff --git a/packages/core/api/rollup.config.js b/packages/core/api/rollup.config.js new file mode 100644 index 00000000..c67735ae --- /dev/null +++ b/packages/core/api/rollup.config.js @@ -0,0 +1,13 @@ +export default { + input: 'src/index.js', + output: [ + { + file: 'dist/index.cjs', + format: 'cjs' + }, + { + file: 'dist/index.es.js', + format: 'es' + } + ] +} diff --git a/packages/core/api/src/dns-provider/abstract-dns-provider.js b/packages/core/api/src/dns-provider/abstract-dns-provider.js index 40b4181b..3b429ecb 100644 --- a/packages/core/api/src/dns-provider/abstract-dns-provider.js +++ b/packages/core/api/src/dns-provider/abstract-dns-provider.js @@ -1,4 +1,4 @@ -import _ from 'lodash-es' +import _ from 'lodash' import logger from '../utils/util.log.js' import commonUtil from '../utils/util.common.js' export class AbstractDnsProvider { diff --git a/packages/core/api/src/utils/util.common.js b/packages/core/api/src/utils/util.common.js index 47e6b51a..68ae13b7 100644 --- a/packages/core/api/src/utils/util.common.js +++ b/packages/core/api/src/utils/util.common.js @@ -1,4 +1,4 @@ -import _ from 'lodash-es' +import _ from 'lodash' export default { arrayToMap (array) { if (!array) { diff --git a/packages/plugins/plugin-aliyun/package.json b/packages/plugins/plugin-aliyun/package.json index ba12ee1c..a0df74f9 100644 --- a/packages/plugins/plugin-aliyun/package.json +++ b/packages/plugins/plugin-aliyun/package.json @@ -2,8 +2,12 @@ "name": "@certd/plugin-aliyun", "version": "0.2.2", "description": "", - "main": "src/index.js", "type": "module", + "main": "./dist/index.cjs", + "module": "./dist/fast-crud.es.js", + "scripts": { + "build": "rollup -c" + }, "dependencies": { "@alicloud/cs20151215": "^3.0.3", "@alicloud/openapi-client": "^0.4.0", @@ -21,7 +25,8 @@ "eslint-plugin-import": "^2.22.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", - "mocha": "^8.2.1" + "mocha": "^8.2.1", + "rollup": "^3.2.3" }, "author": "Greper", "license": "MIT", diff --git a/packages/plugins/plugin-aliyun/rollup.config.js b/packages/plugins/plugin-aliyun/rollup.config.js new file mode 100644 index 00000000..c67735ae --- /dev/null +++ b/packages/plugins/plugin-aliyun/rollup.config.js @@ -0,0 +1,13 @@ +export default { + input: 'src/index.js', + output: [ + { + file: 'dist/index.cjs', + format: 'cjs' + }, + { + file: 'dist/index.es.js', + format: 'es' + } + ] +} diff --git a/packages/plugins/plugin-aliyun/src/dns-providers/aliyun.js b/packages/plugins/plugin-aliyun/src/dns-providers/aliyun.js index 5fb0d911..1242c6ed 100644 --- a/packages/plugins/plugin-aliyun/src/dns-providers/aliyun.js +++ b/packages/plugins/plugin-aliyun/src/dns-providers/aliyun.js @@ -1,6 +1,6 @@ import { AbstractDnsProvider } from '@certd/api' import Core from '@alicloud/pop-core' -import _ from 'lodash-es' +import _ from 'lodash' export class AliyunDnsProvider extends AbstractDnsProvider { static define () { return { diff --git a/packages/plugins/plugin-aliyun/src/index.js b/packages/plugins/plugin-aliyun/src/index.js index 441081b8..a7e9941c 100644 --- a/packages/plugins/plugin-aliyun/src/index.js +++ b/packages/plugins/plugin-aliyun/src/index.js @@ -1,4 +1,4 @@ -import _ from 'lodash-es' +import _ from 'lodash' import { AliyunDnsProvider } from './dns-providers/aliyun.js' import { AliyunAccessProvider } from './access-providers/aliyun.js' diff --git a/packages/plugins/plugin-common/package.json b/packages/plugins/plugin-common/package.json index 918c3923..02ac14ae 100644 --- a/packages/plugins/plugin-common/package.json +++ b/packages/plugins/plugin-common/package.json @@ -2,9 +2,14 @@ "name": "@certd/plugin-common", "version": "0.2.1", "description": "", - "main": "src/index.js", "type": "module", + "main": "./dist/index.cjs", + "module": "./dist/fast-crud.es.js", + "scripts": { + "build": "rollup -c" + }, "dependencies": { + "@certd/api": "^0.2.1", "kubernetes-client": "^9.0.0" }, "devDependencies": { @@ -15,7 +20,8 @@ "eslint-plugin-import": "^2.22.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", - "mocha": "^8.2.1" + "mocha": "^8.2.1", + "rollup": "^3.2.3" }, "author": "Greper", "license": "MIT", diff --git a/packages/plugins/plugin-common/rollup.config.js b/packages/plugins/plugin-common/rollup.config.js new file mode 100644 index 00000000..c67735ae --- /dev/null +++ b/packages/plugins/plugin-common/rollup.config.js @@ -0,0 +1,13 @@ +export default { + input: 'src/index.js', + output: [ + { + file: 'dist/index.cjs', + format: 'cjs' + }, + { + file: 'dist/index.es.js', + format: 'es' + } + ] +} diff --git a/packages/plugins/plugin-host/package.json b/packages/plugins/plugin-host/package.json index 5ea1ac5d..6bb3dc86 100644 --- a/packages/plugins/plugin-host/package.json +++ b/packages/plugins/plugin-host/package.json @@ -2,8 +2,12 @@ "name": "@certd/plugin-host", "version": "0.2.1", "description": "", - "main": "src/index.js", "type": "module", + "main": "./dist/index.cjs", + "module": "./dist/fast-crud.es.js", + "scripts": { + "build": "rollup -c" + }, "dependencies": { "@certd/api": "^0.2.1", "dayjs": "^1.9.7", @@ -18,7 +22,8 @@ "eslint-plugin-import": "^2.22.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", - "mocha": "^8.2.1" + "mocha": "^8.2.1", + "rollup": "^3.2.3" }, "author": "Greper", "license": "MIT", diff --git a/packages/plugins/plugin-host/rollup.config.js b/packages/plugins/plugin-host/rollup.config.js new file mode 100644 index 00000000..c67735ae --- /dev/null +++ b/packages/plugins/plugin-host/rollup.config.js @@ -0,0 +1,13 @@ +export default { + input: 'src/index.js', + output: [ + { + file: 'dist/index.cjs', + format: 'cjs' + }, + { + file: 'dist/index.es.js', + format: 'es' + } + ] +} diff --git a/packages/plugins/plugin-host/src/index.js b/packages/plugins/plugin-host/src/index.js index caedccd5..1c975a04 100644 --- a/packages/plugins/plugin-host/src/index.js +++ b/packages/plugins/plugin-host/src/index.js @@ -1,4 +1,4 @@ -import _ from 'lodash-es' +import _ from 'lodash' import { SSHAccessProvider } from './access-providers/ssh.js' diff --git a/packages/plugins/plugin-host/src/plugins/ssh.js b/packages/plugins/plugin-host/src/plugins/ssh.js index 78d18361..8dc40351 100644 --- a/packages/plugins/plugin-host/src/plugins/ssh.js +++ b/packages/plugins/plugin-host/src/plugins/ssh.js @@ -1,7 +1,7 @@ import ssh2 from 'ssh2' import path from 'path' import { util } from '@certd/api' -import _ from 'lodash-es' +import _ from 'lodash' const logger = util.logger export class SshClient { /** diff --git a/packages/plugins/plugin-tencent/package.json b/packages/plugins/plugin-tencent/package.json index 30fa88b6..b7ad98ca 100644 --- a/packages/plugins/plugin-tencent/package.json +++ b/packages/plugins/plugin-tencent/package.json @@ -2,8 +2,12 @@ "name": "@certd/plugin-tencent", "version": "0.2.2", "description": "", - "main": "src/index.js", "type": "module", + "main": "./dist/index.cjs", + "module": "./dist/fast-crud.es.js", + "scripts": { + "build": "rollup -c" + }, "dependencies": { "@certd/api": "^0.2.1", "@certd/plugin-common": "^0.2.1", @@ -20,7 +24,8 @@ "eslint-plugin-import": "^2.22.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", - "mocha": "^8.2.1" + "mocha": "^8.2.1", + "rollup": "^3.2.3" }, "author": "Greper", "license": "MIT", diff --git a/packages/plugins/plugin-tencent/rollup.config.js b/packages/plugins/plugin-tencent/rollup.config.js new file mode 100644 index 00000000..c67735ae --- /dev/null +++ b/packages/plugins/plugin-tencent/rollup.config.js @@ -0,0 +1,13 @@ +export default { + input: 'src/index.js', + output: [ + { + file: 'dist/index.cjs', + format: 'cjs' + }, + { + file: 'dist/index.es.js', + format: 'es' + } + ] +} diff --git a/packages/plugins/plugin-tencent/src/dns-providers/dnspod.js b/packages/plugins/plugin-tencent/src/dns-providers/dnspod.js index 5b87f29c..7cf6ac48 100644 --- a/packages/plugins/plugin-tencent/src/dns-providers/dnspod.js +++ b/packages/plugins/plugin-tencent/src/dns-providers/dnspod.js @@ -1,5 +1,5 @@ import { AbstractDnsProvider, util } from '@certd/api' -import _ from 'lodash-es' +import _ from 'lodash' const request = util.request export class DnspodDnsProvider extends AbstractDnsProvider { static define () { diff --git a/packages/plugins/plugin-tencent/src/index.js b/packages/plugins/plugin-tencent/src/index.js index ecb22ef8..f9dc0b2c 100644 --- a/packages/plugins/plugin-tencent/src/index.js +++ b/packages/plugins/plugin-tencent/src/index.js @@ -1,4 +1,4 @@ -import _ from 'lodash-es' +import _ from 'lodash' import { TencentAccessProvider } from './access-providers/tencent.js' import { DnspodAccessProvider } from './access-providers/dnspod.js' diff --git a/packages/server/certd-client b/packages/server/certd-client index 67cf0708..a34edc57 160000 --- a/packages/server/certd-client +++ b/packages/server/certd-client @@ -1 +1 @@ -Subproject commit 67cf07082c4b1d61ea4dbbd3fd2f363bf1f4c4c9 +Subproject commit a34edc5753ba6e33a7968df4e4bf0c3dcc8f8e85 diff --git a/packages/server/certd-server b/packages/server/certd-server index 5ecaa2b3..213988fd 160000 --- a/packages/server/certd-server +++ b/packages/server/certd-server @@ -1 +1 @@ -Subproject commit 5ecaa2b375ad0edf53bc6839c8e6c4c382602eb7 +Subproject commit 213988fd18b0eb68437b8c0c616095be8e603db4