refactor: logic optimization

Author: zyao89

package.json

@@ -38,8 +38,8 @@
     },
     "license": "MIT",
     "peerDependencies": {
-        "@micro-app/cli": ">=0.3.6",
-        "@micro-app/plugin-webpack": ">=0.0.6"
+        "@micro-app/cli": ">=0.3.7",
+        "@micro-app/plugin-webpack": ">=0.0.8"
     },
     "devDependencies": {
         "@micro-app/plugin-deploy": "^0.0.6",
@@ -49,7 +49,7 @@
         "webpack": "^4.42.0"
     },
     "dependencies": {
-        "@micro-app/cli": "^0.3.6",
-        "@micro-app/plugin-webpack": "^0.0.6"
+        "@micro-app/cli": "^0.3.7",
+        "@micro-app/plugin-webpack": "^0.0.8"
     }
 }

src/constants.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+    builtIn: Symbol.for('built-in'),
+    skipTarget: 'vue-cli-plugin',
+};

src/index.js

@@ -1,29 +1,28 @@
 'use strict';
 
 const chainConfig = require('./service/chainConfig');
+const createService = require('./utils/createService');
+const CONSTANTS = require('./constants');
 
 module.exports = function(api, vueConfig) {
-
-    const { createService } = require('@micro-app/cli');
     const service = createService();
 
-    const builtIn = Symbol.for('built-in');
-
-    // 注册 webapck 插件
-    service.registerPlugin({
-        id: '@micro-app/plugin-webpack',
-        [builtIn]: true,
-    });
-
     // 注册插件
     service.registerPlugin({
-        id: 'vue-cli:plugin-command-return-config',
-        link: require.resolve('./plugins/return.js'),
-        [builtIn]: true,
+        id: 'vue-cli-plugin:plugin-command-return-config',
+        [CONSTANTS.builtIn]: true,
+        apply(_api) {
+            _api.registerCommand('return-config', {
+                description: 'return config of MicroApp.',
+                usage: 'micro-app return-config',
+            }, () => {
+                return _api.config;
+            });
+        },
     });
 
-    const config = service.runSync('return-config');
-    const webpackConfig = service.runSync('return-config', { _: [], key: 'config' });
+    // 第一次加载所有配置
+    const config = service.runSync('return-config', { _: [], target: CONSTANTS.skipTarget });
 
-    return chainConfig(api, vueConfig, config, webpackConfig);
+    return chainConfig(api, vueConfig, config);
 };

src/plugins/return.js

@@ -1,10 +1,11 @@
 'use strict';
 
-const { _, tryRequire } = require('@micro-app/shared-utils');
+const { _, tryRequire, fs } = require('@micro-app/shared-utils');
+const createService = require('../utils/createService');
+const CONSTANTS = require('../constants');
 
 // 以 vue-cli 配置为主
-module.exports = function chainDefault(api, vueConfig, options, webpackConfig) {
-    const webpackConfigAlias = webpackConfig.resolve.alias || {};
+module.exports = function chainDefault(api, vueConfig, options) {
 
     [ // string
         'publicPath',
@@ -28,9 +29,8 @@ module.exports = function chainDefault(api, vueConfig, options, webpackConfig) {
             }
         });
 
+    // 补充
     api.chainWebpack(webpackChain => {
-        const outputDir = api.resolve(options.outputDir);
-
         const nodeModulesPaths = options.nodeModulesPaths || [];
         webpackChain.resolve
             .set('symlinks', true)
@@ -44,30 +44,55 @@ module.exports = function chainDefault(api, vueConfig, options, webpackConfig) {
             .merge(nodeModulesPaths)
             .end();
 
-        const alias = Object.assign({}, options.resolveAlias || {}, webpackConfigAlias);
+        const alias = Object.assign({}, options.resolveAlias || {});
         // alias
         webpackChain.resolve
             .alias
             .merge(alias)
             .end();
 
-        // const entry = options.entry || {};
-        // // entry
-        // Object.keys(entry).forEach(key => {
-        //     webpackChain.entry(key).merge(entry[key]);
-        // });
-
-        const CopyWebpackPlugin = tryRequire('copy-webpack-plugin');
-        if (CopyWebpackPlugin) {
-            const staticPaths = options.staticPaths || [];
-            // 有的时候找不到原来的 CopyWebpackPlugin，不知道为什么
-            webpackChain.plugin('copyEx').use(CopyWebpackPlugin, [
-                staticPaths.map(staticPath => {
-                    return { from: staticPath, to: outputDir, ignore: [ '.*' ] };
-                }),
-            ]);
+        // copy static
+        const staticPaths = (options.staticPaths || []).filter(item => fs.existsSync(item));
+        if (staticPaths.length) {
+            const CopyWebpackPlugin = tryRequire('copy-webpack-plugin');
+            if (CopyWebpackPlugin) {
+                webpackChain
+                    .plugin('copy')
+                    .use(CopyWebpackPlugin, [ staticPaths.map(publicDir => {
+                        return {
+                            from: publicDir,
+                            toType: 'dir',
+                            ignore: [ '.*' ],
+                        };
+                    }) ]);
+            } else {
+                api.logger.warn('[webpack]', 'Not Found "copy-webpack-plugin"');
+            }
         }
 
         return webpackChain;
     });
+
+    // webpack 所有配置合入
+    api.chainWebpack(webpackChain => {
+        const service = createService();
+
+        // 注册插件
+        service.registerPlugin({
+            id: 'vue-cli-plugin:plugin-command-return-webpack-chain',
+            [CONSTANTS.builtIn]: true,
+            apply(_api) {
+                _api.registerCommand('return-webpack-chain', {
+                    description: 'return config of webpack-chain.',
+                    usage: 'micro-app return-webpack-chain',
+                }, () => {
+                    _api.createChainWebpackConfigInstance(webpackChain);
+                    return _api.resolveChainableWebpackConfig();
+                });
+            },
+        });
+
+        // 同步扩充 webpack-chain config
+        return service.runSync('return-webpack-chain', { _: [], target: CONSTANTS.skipTarget });
+    });
 };

src/service/chainConfig.js

@@ -0,0 +1,19 @@
+'use strict';
+
+const { createService } = require('@micro-app/cli');
+const CONSTANTS = require('../constants');
+
+module.exports = function() {
+    const service = createService();
+
+    const webpackPluginId = '@micro-app/plugin-webpack';
+    if (!service.hasPlugin(webpackPluginId)) {
+        // 注册 webapck 插件
+        service.registerPlugin({
+            id: webpackPluginId,
+            [CONSTANTS.builtIn]: true,
+        });
+    }
+
+    return service;
+};

src/utils/createService.js

@@ -0,0 +1,17 @@
+'use strict';
+
+/* global expect */
+
+describe('Vue CLI Plugin', () => {
+
+    const createService = require('../src/utils/createService');
+
+    it('createService', async () => {
+        const service = createService();
+
+        expect(typeof service === 'object').not.toBeUndefined();
+
+        await service.run('help');
+    });
+
+});

test/createService.spec.js

@@ -4,8 +4,19 @@
 
 describe('Vue CLI Plugin', () => {
 
+    const plugin = require('../src');
+
+    it('plugin', async () => {
+        const api = {
+            chainWebpack() {
+
+            },
+        };
+
+        plugin(api, {});
+    });
+
     it('plugin', async () => {
-        const plugin = require('../src');
 
         const api = {
             chainWebpack() {