chore: refactor code & update deps

Author: zyao89

microapp/config.js

@@ -4,8 +4,34 @@ const config = {
     type: '', // types 类型
 };
 
-config.plugins = [
-    '@micro-app/plugin-deploy', // test
-];
+if (process.env.NODE_ENV === 'test') {
+    config.plugins = [
+        '@micro-app/plugin-deploy', // test
+    ];
+
+    Object.assign(config, {
+        entry: {
+            main: './client/main.js',
+        },
+
+        // staticPath: '',
+
+        htmls: [
+            {
+                filename: 'index.html',
+                hash: true,
+                chunks: [ 'common', 'main' ],
+                template: './client/index.html',
+            },
+        ],
+        alias: { // 前端共享
+            api: './client/api.js',
+            config: {
+                type: 'server', // 后端共享
+                link: './server/config.js',
+            },
+        },
+    });
+}
 
 module.exports = config;

package.json

@@ -37,10 +37,6 @@
         "email": "[email protected]"
     },
     "license": "MIT",
-    "peerDependencies": {
-        "@micro-app/cli": ">=0.3.7",
-        "@micro-app/plugin-webpack": ">=0.0.8"
-    },
     "devDependencies": {
         "@micro-app/plugin-deploy": "^0.0.6",
         "@types/jest": "^24.9.1",
@@ -49,7 +45,7 @@
         "webpack": "^4.42.0"
     },
     "dependencies": {
-        "@micro-app/cli": "^0.3.7",
-        "@micro-app/plugin-webpack": "^0.0.8"
+        "@micro-app/core": "^0.3.18",
+        "@micro-app/plugin-webpack": "^0.0.11"
     }
 }

src/constants.js

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

src/index.js

@@ -2,27 +2,13 @@
 
 const chainConfig = require('./service/chainConfig');
 const createService = require('./utils/createService');
-const CONSTANTS = require('./constants');
 
 module.exports = function(api, vueConfig) {
     const service = createService();
 
-    // 注册插件
-    service.registerPlugin({
-        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', { _: [], target: CONSTANTS.skipTarget });
+    // 加载获取所有配置
+    service.initSync();
+    const config = service.config;
 
     return chainConfig(api, vueConfig, config);
 };

src/service/chainConfig.js

@@ -2,7 +2,7 @@
 
 const { _, tryRequire, fs } = require('@micro-app/shared-utils');
 const createService = require('../utils/createService');
-const CONSTANTS = require('../constants');
+const { BUILT_IN } = require('../constants');
 
 // 以 vue-cli 配置为主
 module.exports = function chainDefault(api, vueConfig, options) {
@@ -14,7 +14,9 @@ module.exports = function chainDefault(api, vueConfig, options) {
     ]
         .forEach(key => {
             if (!_.isUndefined(options[key])) {
-                vueConfig[key] = options[key];
+                if (_.isUndefined(vueConfig[key])) { // vueConfig 中是否已经存在配置了
+                    vueConfig[key] = options[key];
+                }
             }
         });
 
@@ -80,8 +82,11 @@ module.exports = function chainDefault(api, vueConfig, options) {
         // 注册插件
         service.registerPlugin({
             id: 'vue-cli-plugin:plugin-command-return-webpack-chain',
-            [CONSTANTS.builtIn]: true,
+            [BUILT_IN]: true,
             apply(_api) {
+                // 修改默认配置
+
+
                 _api.registerCommand('return-webpack-chain', {
                     description: 'return config of webpack-chain.',
                     usage: 'micro-app return-webpack-chain',
@@ -93,6 +98,6 @@ module.exports = function chainDefault(api, vueConfig, options) {
         });
 
         // 同步扩充 webpack-chain config
-        return service.runSync('return-webpack-chain', { _: [], target: CONSTANTS.skipTarget });
+        return service.runSync('return-webpack-chain');
     });
 };

src/utils/createService.js

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

test/createService.spec.js

@@ -9,9 +9,21 @@ describe('Vue CLI Plugin', () => {
     it('createService', async () => {
         const service = createService();
 
-        expect(typeof service === 'object').not.toBeUndefined();
+        expect(typeof service === 'object').toBeTruthy();
 
         await service.run('help');
     });
 
+    it('getConfig', () => {
+        const service = createService();
+
+        // 加载获取所有配置
+        service.initSync();
+        const config = service.config;
+
+        expect(typeof config === 'object').toBeTruthy();
+
+        console.warn('config:', config);
+    });
+
 });

test/index.spec.js

@@ -16,15 +16,4 @@ describe('Vue CLI Plugin', () => {
         plugin(api, {});
     });
 
-    it('plugin', async () => {
-
-        const api = {
-            chainWebpack() {
-
-            },
-        };
-
-        plugin(api, {});
-    });
-
 });