From 45547d6f94481c45b23bc833f0edb5422bf316bc Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 5 Feb 2021 14:45:53 +0800 Subject: [PATCH] refactor: 0.1.12 --- packages/access-providers/package.json | 3 ++- packages/api/package.json | 2 +- packages/certd/package.json | 2 +- packages/dns-providers/package.json | 3 ++- packages/executor/package.json | 2 +- packages/plugins/package.json | 2 +- ui/certd-server/controllers/exports.js | 2 +- ui/certd-server/package.json | 3 ++- ui/certd-server/service/exports-service.js | 12 +++++++++--- ui/certd-ui/package.json | 3 ++- 10 files changed, 22 insertions(+), 12 deletions(-) diff --git a/packages/access-providers/package.json b/packages/access-providers/package.json index 60c2b397..c54c13ac 100644 --- a/packages/access-providers/package.json +++ b/packages/access-providers/package.json @@ -19,5 +19,6 @@ "eslint-plugin-import": "^2.22.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1" - } + }, + "gitHead": "4a421d5b142d453203c68ce6d1036e168ea2455b" } diff --git a/packages/api/package.json b/packages/api/package.json index e3fb2da0..45d8b54b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -22,5 +22,5 @@ "eslint-plugin-promise": "^4.2.1", "mocha": "^8.2.1" }, - "gitHead": "2942d39dfe64d60ce7dc0e0b2c0887866ca67f18" + "gitHead": "4a421d5b142d453203c68ce6d1036e168ea2455b" } diff --git a/packages/certd/package.json b/packages/certd/package.json index 72ea008d..b564ac01 100644 --- a/packages/certd/package.json +++ b/packages/certd/package.json @@ -26,5 +26,5 @@ "eslint-plugin-promise": "^4.2.1", "mocha": "^8.2.1" }, - "gitHead": "2942d39dfe64d60ce7dc0e0b2c0887866ca67f18" + "gitHead": "4a421d5b142d453203c68ce6d1036e168ea2455b" } diff --git a/packages/dns-providers/package.json b/packages/dns-providers/package.json index 1caadeb0..03991fd7 100644 --- a/packages/dns-providers/package.json +++ b/packages/dns-providers/package.json @@ -6,6 +6,7 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, + "private": false, "type": "module", "author": "Greper", "license": "MIT", @@ -24,5 +25,5 @@ "eslint-plugin-promise": "^4.2.1", "mocha": "^8.2.1" }, - "gitHead": "2942d39dfe64d60ce7dc0e0b2c0887866ca67f18" + "gitHead": "4a421d5b142d453203c68ce6d1036e168ea2455b" } diff --git a/packages/executor/package.json b/packages/executor/package.json index b5b47418..a67dd17d 100644 --- a/packages/executor/package.json +++ b/packages/executor/package.json @@ -34,5 +34,5 @@ "author": "Greper", "license": "MIT", "sideEffects": false, - "gitHead": "2942d39dfe64d60ce7dc0e0b2c0887866ca67f18" + "gitHead": "4a421d5b142d453203c68ce6d1036e168ea2455b" } diff --git a/packages/plugins/package.json b/packages/plugins/package.json index 02fda534..a28b7d81 100644 --- a/packages/plugins/package.json +++ b/packages/plugins/package.json @@ -24,5 +24,5 @@ }, "author": "Greper", "license": "MIT", - "gitHead": "2942d39dfe64d60ce7dc0e0b2c0887866ca67f18" + "gitHead": "4a421d5b142d453203c68ce6d1036e168ea2455b" } diff --git a/ui/certd-server/controllers/exports.js b/ui/certd-server/controllers/exports.js index 7d939614..bf67a1d9 100644 --- a/ui/certd-server/controllers/exports.js +++ b/ui/certd-server/controllers/exports.js @@ -1,7 +1,7 @@ import Router from 'koa-router' import fs from 'fs' import exportsService from '../service/exports-service.js' -// import executorPkg from '@certd/executor/package.json' + const router = Router() router.prefix('/exports') diff --git a/ui/certd-server/package.json b/ui/certd-server/package.json index 184d1349..7a567363 100644 --- a/ui/certd-server/package.json +++ b/ui/certd-server/package.json @@ -37,5 +37,6 @@ "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^4.2.1", "nodemon": "^1.19.1" - } + }, + "gitHead": "4a421d5b142d453203c68ce6d1036e168ea2455b" } diff --git a/ui/certd-server/service/exports-service.js b/ui/certd-server/service/exports-service.js index 4e8bd367..eab1eb8e 100644 --- a/ui/certd-server/service/exports-service.js +++ b/ui/certd-server/service/exports-service.js @@ -4,7 +4,8 @@ import pathUtil from '../utils/util.path.js' import cryptoRandomString from 'crypto-random-string' import zipUtil from '../utils/util.zip.js' import path from 'path' - +import executorPkg from '@certd/executor/package.json' +import templatePkg from '@/templates/certd-run/package.json' export default { async exportsToZip (options, dirName) { const tempDir = os.tmpdir() @@ -19,11 +20,16 @@ export default { console.log('targetProjectDir', targetProjectDir) fs.copySync(templateDir, targetProjectDir) - // const packageFilePath = path.join(targetProjectDir, 'package.json') + // options const optionsFilePath = path.join(targetProjectDir, 'options.json') - fs.writeJsonSync(optionsFilePath, options) + // 依赖版本 + const currentVersion = executorPkg.version + templatePkg.dependencies['@certd/executor'] = '^' + currentVersion + const pkgFilePath = path.join(targetProjectDir, 'package.json') + fs.writeJsonSync(pkgFilePath, templatePkg) + const zipName = dirName + '.zip' const outputFilePath = path.join(targetDir, zipName) diff --git a/ui/certd-ui/package.json b/ui/certd-ui/package.json index b4a2463d..2fe6cec9 100644 --- a/ui/certd-ui/package.json +++ b/ui/certd-ui/package.json @@ -56,5 +56,6 @@ "vue-cli-service lint", "git add" ] - } + }, + "gitHead": "4a421d5b142d453203c68ce6d1036e168ea2455b" }