chore: update config & dependencies

zyao89 · zyao89 · commit c70e84949662 · 2020-03-23T12:45:27.000+08:00
diff --git a/microapp/config.js b/microapp/config.js
@@ -38,4 +38,6 @@ module.exports = {
     plugins: [
         '@micro-app/plugin-deploy',
     ],
+
+    options: {}, // 合并
 };
diff --git a/package.json b/package.json
@@ -57,10 +57,10 @@
         "jest": "^24.9.0"
     },
     "dependencies": {
-        "@micro-app/core": "^0.3.12",
-        "@zkochan/cmd-shim": "^3.1.0",
-        "read-cmd-shim": "^1.0.5",
-        "update-notifier": "^3.0.1"
+        "@micro-app/core": "^0.3.15",
+        "@zkochan/cmd-shim": "^4.3.0",
+        "read-cmd-shim": "^2.0.0",
+        "update-notifier": "^4.1.0"
     },
     "engines": {
         "node": ">=8"
diff --git a/src/index.js b/src/index.js
@@ -10,10 +10,14 @@ const { _, logger, fs, tryRequire, path, yParser } = require('@micro-app/shared-
 const cmd = process.argv[2];
 const argv = yParser(process.argv.slice(3));
 
-// create instance
-function createService(_argv) {
+const Service = require('@micro-app/core');
 
-    const Service = require('@micro-app/core');
+/**
+ * create instance
+ * @param {Object} _argv context
+ * @return {Service} service instance
+ */
+function createService(_argv) {
 
     const service = new Service(_argv || _.cloneDeep(argv));
 
diff --git a/src/plugins/commands/bootstrap/index.js b/src/plugins/commands/bootstrap/index.js
@@ -2,158 +2,133 @@
 
 // TODO 需要整理目录结构，需要保留 package.json, 但是要更改内容
 
-const { Command } = require('@micro-app/core');
-
-class BootstrapCommand extends Command {
-
-    initialize(api) {
-        const { chalk, dedent } = require('@micro-app/shared-utils');
-
-        api.registerMethod('beforeCommandBootstrap', {
-            type: api.API_TYPE.EVENT,
-            description: 'bootstrap 前事件',
-        });
-        api.registerMethod('afterCommandBootstrap', {
-            type: api.API_TYPE.EVENT,
-            description: 'bootstrap 完毕后事件',
-        });
-
-        // start
-        api.registerCommand('bootstrap', {
-            description: 'bootstrap micro app project.',
-            usage: 'micro-app bootstrap [options]',
-            options: {
-                '-': 'bootstrap default.',
-            // '-n <name>': 'only bootstrap <name>.',
-            },
-            details: dedent`
-                Examples:
-                    ${chalk.gray('# bootstrap')}
-                    micro-app bootstrap`,
-        }, this.execute.bind(this));
-    }
-
-    execute(args) {
-        const { registry, npmClient = 'npm', npmClientArgs = [] } = this.options;
+module.exports = function BootstrapCommand(api, options = {}) {
+
+    const { chalk, dedent } = require('@micro-app/shared-utils');
+
+    api.registerMethod('beforeCommandBootstrap', {
+        type: api.API_TYPE.EVENT,
+        description: 'bootstrap 前事件',
+    });
+    api.registerMethod('afterCommandBootstrap', {
+        type: api.API_TYPE.EVENT,
+        description: 'bootstrap 完毕后事件',
+    });
+
+    // start
+    api.registerCommand('bootstrap', {
+        description: 'bootstrap micro app project.',
+        usage: 'micro-app bootstrap [options]',
+        options: {
+            '-': 'bootstrap default.',
+        // '-n <name>': 'only bootstrap <name>.',
+        },
+        details: dedent`
+            Examples:
+                ${chalk.gray('# bootstrap')}
+                micro-app bootstrap`,
+    }, args => {
+        const { registry, npmClient = 'npm', npmClientArgs = [] } = options;
         const { force = false } = args;
-        const api = this.api;
 
         const spinner = api.logger.spinner('bootstrap...');
 
+        const npmConfig = {
+            registry,
+            npmClient,
+            npmClientArgs,
+        };
+
         let chain = Promise.resolve();
 
         chain = chain.then(() => {
             spinner.start();
         });
 
-        chain = chain.then(() => api.applyPluginHooks('beforeCommandBootstrap', { args, options: this.options }));
-
-        chain = chain.then(() => {
-            this.npmConfig = {
-                registry,
-                npmClient,
-                npmClientArgs,
-            };
-        });
+        chain = chain.then(() => api.applyPluginHooks('beforeCommandBootstrap', { args, options, npmConfig }));
 
         chain = chain.then(() => {
             if (npmClient === 'yarn') {
-                this.npmConfig.npmClientArgs.unshift('--pure-lockfile');
+                npmConfig.npmClientArgs.unshift('--pure-lockfile');
             } else {
-                this.npmConfig.npmClientArgs.unshift('--no-save');
+                npmConfig.npmClientArgs.unshift('--no-save');
             }
         });
 
-        chain = chain.then(() => this.initPackages());
-
-        chain = chain.then(() => this.initTempFiles());
-
         // 判断 node_modules 是否存在
-        chain = chain.then(() => this.initNodeModules({ force }));
+        chain = chain.then(() => initNodeModules(api, { force, npmConfig }));
 
-        chain = chain.then(() => this.bootstrap({ force }));
+        chain = chain.then(() => filterPackages(api));
 
-        chain = chain.then(() => this.initSymlinks());
+        chain = chain.then(pkgs => bootstrap(api, { force, npmConfig, pkgs }));
 
-        chain = chain.then(() => api.applyPluginHooks('afterCommandBootstrap', { args, options: this.options }));
+        chain = chain.then(pkgs => initSymlinks(api, { pkgs }));
+
+        chain = chain.then(() => api.applyPluginHooks('afterCommandBootstrap', { args, options }));
 
         return chain.then(() => {
             spinner.succeed('finished!');
         }).catch(e => {
             spinner.fail(e.message);
         });
-    }
 
-    initPackages() {
-        const { _ } = require('@micro-app/shared-utils');
+    });
+};
 
-        const api = this.api;
-        const allPackages = api.packages;
 
-        if (_.isEmpty(allPackages)) {
-            return;
-        }
+function filterPackages(api) {
+    const { _ } = require('@micro-app/shared-utils');
 
-        // init git
-        const pkgs = allPackages.filter(item => {
-            return item.pkgInfo;
-        }).map(item => {
-            return item.pkgInfo;
-        });
+    const allPackages = api.packages;
 
-        api.logger.debug('[bootstrap > initPackages]', pkgs.length);
-        this.filteredPackages = pkgs;
+    if (_.isEmpty(allPackages)) {
+        return;
     }
 
-    initTempFiles() {
-        const { _ } = require('@micro-app/shared-utils');
-        const api = this.api;
-        const allPackages = api.packages;
-        if (_.isEmpty(allPackages)) {
-            return;
-        }
-        this.tempDir = api.tempDir;
-    }
+    // init git
+    const pkgs = allPackages.filter(item => {
+        return item.pkgInfo;
+    }).map(item => {
+        return item.pkgInfo;
+    });
 
-    initNodeModules() {
-        const { fs } = require('@micro-app/shared-utils');
-        const npmInstall = require('./npmInstall');
-        const api = this.api;
-        const currentNodeModules = api.nodeModulesPath;
-        if (fs.pathExistsSync(currentNodeModules)) {
-            api.logger.warn('[bootstrap]', 'skip root install!');
-            return;
-        }
-        const root = api.root;
-        return npmInstall(root, this.npmConfig);
-    }
+    api.logger.debug('[bootstrap > initPackages]', pkgs.length);
+    return pkgs;
+}
 
-    bootstrap({ force }) {
-        const { fs, path } = require('@micro-app/shared-utils');
-        const npmInstall = require('./npmInstall');
-        const api = this.api;
-        if (!force) {
-            if (fs.pathExistsSync(this.tempDir) && fs.pathExistsSync(path.join(this.tempDir, 'node_modles'))) {
-                api.logger.warn('[bootstrap]', `${this.tempDir} is not empty!`);
-                return;
-            }
-        }
-        return npmInstall.micros(this.filteredPackages, this.tempDir, this.npmConfig);
+function initNodeModules(api, { npmConfig }) {
+    const { fs } = require('@micro-app/shared-utils');
+    const npmInstall = require('./npmInstall');
+    const currentNodeModules = api.nodeModulesPath;
+    if (fs.pathExistsSync(currentNodeModules)) {
+        api.logger.warn('[bootstrap]', 'skip root install!');
+        return;
     }
+    const root = api.root;
+    return npmInstall(root, npmConfig);
+}
 
-    initSymlinks() {
-        const initSymlinks = require('./initSymlinks');
-        const filteredPackages = this.filteredPackages;
-        const api = this.api;
-
-        return initSymlinks(api, { filteredPackages }).then(() => {
-            api.logger.debug('[bootstrap > initSymlinks]', 'finished');
-        });
+function bootstrap(api, { force, npmConfig, pkgs }) {
+    const { fs, path } = require('@micro-app/shared-utils');
+    const npmInstall = require('./npmInstall');
+    const tempDir = api.tempDir;
+    fs.ensureDirSync(tempDir);
+    if (!force) {
+        if (fs.pathExistsSync(path.join(api.tempDir, 'node_modles'))) {
+            api.logger.warn('[bootstrap]', `${tempDir} is not empty!`);
+            return;
+        }
     }
+    return npmInstall.micros(pkgs, tempDir, npmConfig).then(() => pkgs);
 }
 
+function initSymlinks(api, { pkgs }) {
+    const initSymlinks = require('./initSymlinks');
 
-module.exports = BootstrapCommand;
+    return initSymlinks(api, { filteredPackages: pkgs }).then(() => {
+        api.logger.debug('[bootstrap > initSymlinks]', 'finished');
+    });
+}
 
 module.exports.configuration = {
     description: '初始化命令行',
diff --git a/src/plugins/commands/bootstrap/initSymlinks.js b/src/plugins/commands/bootstrap/initSymlinks.js
@@ -11,7 +11,7 @@ module.exports = function initSymlinks(api, { filteredPackages }) {
         return Promise.resolve();
     }
 
-    const tempDirPackageGraph = api.tempDirPackageGraph;
+    const tempDirPackageGraph = api.getTempDirPackageGraph();
     let names = filteredPackages.map(item => item.name);
 
     const dependencies = [];
diff --git a/src/plugins/commands/init/index.js b/src/plugins/commands/init/index.js
@@ -17,5 +17,5 @@ module.exports = function initCommand(api, opts) {
 
 
 module.exports.configuration = {
-    description: '增加初始化命令行',
+    description: '增强初始化命令行',
 };
diff --git a/src/plugins/extends/configSchema.js b/src/plugins/extends/configSchema.js
@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports = {
+    additionalProperties: true,
+    properties: {
+        server: {
+            description: '服务端配置. ( object )',
+            type: 'object',
+        },
+    },
+    type: 'object',
+};
diff --git a/src/plugins/extends/server/index.js b/src/plugins/extends/server/index.js
@@ -5,21 +5,14 @@ module.exports = function extendServer(api, opts) {
     const registerMethods = require('./methods');
     registerMethods(api);
 
-    const { _, smartMerge, yParser } = require('@micro-app/shared-utils');
+    const { _, smartMerge } = require('@micro-app/shared-utils');
 
     const logger = api.logger;
 
-    // 环境变量参数引用（动态）
-    let tempArgvs = {};
-    api.onRunCommand(({ args = {} }) => {
-        tempArgvs = args;
-    });
-
     api.extendMethod('parseArgv', {
         description: 'resolve parse command argv.',
     }, function() {
-        const argv = yParser(process.argv.slice(2)) || {};
-        return smartMerge({}, argv, tempArgvs);
+        return _.cloneDeep(api.context);
     });
 
     api.extendConfig('selfServerConfig', {
@@ -31,7 +24,7 @@ module.exports = function extendServer(api, opts) {
         const _serverConfig = _originalConfig.server || {};
         return {
             ..._serverConfig,
-            info: _.cloneDeep(microConfig),
+            info: microConfig.toJSON(),
             shared: microConfig.shared,
             sharedObj: microConfig.sharedObj,
             resolveShared: microConfig.resolveShared,
@@ -66,31 +59,28 @@ module.exports = function extendServer(api, opts) {
         return config;
     });
 
+    // ZAP: 需要优化时机 和 内容
+    // merge server config
     api.extendConfig('serverConfig', {
+        cache: true,
         description: '当前工程下服务端配置集合',
     }, function() {
-        return api.applyPluginHooks('modifyDefaultServerConfig', {});
+        const selfServerConfig = api.selfServerConfig;
+        const microsServerConfig = api.microsServerConfig;
+        const micros = api.micros;
+        // 组装 server 配置
+        const mergeConfig = smartMerge(...micros.map(key => {
+            const _msc = microsServerConfig[key];
+            if (!_msc) return {};
+            return _.pick(_msc, [
+                'shared',
+                'sharedObj',
+                'resolveShared',
+            ]);
+        }), selfServerConfig);
+        return Object.assign({}, mergeConfig);
     });
 
-    // merge server config
-    api.onInitWillDone(() => {
-        api.modifyDefaultServerConfig(_serverConfig => {
-            const selfServerConfig = api.selfServerConfig;
-            const microsServerConfig = api.microsServerConfig;
-            const micros = api.micros;
-            // 组装 server 配置
-            const mergeConfig = smartMerge(...micros.map(key => {
-                const _msc = microsServerConfig[key];
-                if (!_msc) return {};
-                return _.pick(_msc, [
-                    'shared',
-                    'sharedObj',
-                    'resolveShared',
-                ]);
-            }), selfServerConfig);
-            return Object.assign(_serverConfig, mergeConfig);
-        });
-    });
 };
 
 
diff --git a/src/plugins/extends/server/methods.js b/src/plugins/extends/server/methods.js
diff --git a/src/plugins/register.js b/src/plugins/register.js
diff --git a/src/utils/checker/index.js b/src/utils/checker/index.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ module.exports = function initSymlinks(api, { filteredPackages }) {`
`11`	`11`	`return Promise.resolve();`
`12`	`12`	`}`
`13`	`13`
`14`		`- const tempDirPackageGraph = api.tempDirPackageGraph;`
	`14`	`+ const tempDirPackageGraph = api.getTempDirPackageGraph();`
`15`	`15`	`let names = filteredPackages.map(item => item.name);`
`16`	`16`
`17`	`17`	`const dependencies = [];`