fix: refactoring code

Author: zyao89

package.json

@@ -38,7 +38,7 @@
     },
     "license": "MIT",
     "peerDependencies": {
-        "@micro-app/core": "^0.3.24"
+        "@micro-app/core": "^0.3.25"
     },
     "devDependencies": {
         "@micro-app/plugin-deploy": "^0.0.7",

src/index.js

@@ -1,41 +1,38 @@
 'use strict';
 
 const chainConfig = require('./service/chainConfig');
-const silentService = require('./utils/silentService');
-const { BUILT_IN } = require('./constants');
+const service = require('./utils/createService');
 
+let IPLUGIN_ID;
 module.exports = function(api, vueConfig) {
     if (api.$isMicroAppPluginAPI) { // micro-app plugin
         const registerMethod = require('./utils/registerMethod');
         registerMethod(api);
-        // 重写
-        api.extendMethod('resolveWebpackConfig', {
+        IPLUGIN_ID = api.id;
+    } else { // vue-cli plugin
+        const plugin = IPLUGIN_ID ? service.findPlugin(IPLUGIN_ID) : service.plugins[0]; // 随便取个plugin
+        const _mapi = plugin[Symbol.for('api')];
+
+        // 重写 resolveWebpackConfig
+        _mapi.extendMethod('resolveWebpackConfig', {
             description: 'resolve webpack config.',
             override: true,
         }, webpackConfig => {
-            const finalWebpackConfig = api.applyPluginHooks('modifyWebpackConfig', webpackConfig);
-            api.setState('webpackConfig', finalWebpackConfig);
+            const finalWebpackConfig = _mapi.applyPluginHooks('modifyWebpackConfig', webpackConfig);
+            _mapi.setState('webpackConfig', finalWebpackConfig);
             return finalWebpackConfig;
         });
-    } else { // vue-cli plugin
-        silentService(service => {
-            // 注册插件
-            service.registerPlugin({
-                id: 'vue-cli-plugin:plugin-modifyVueConfig-apply',
-                [BUILT_IN]: true,
-                apply(_api) {
-                    // 修改默认配置
-                    _api.onInitDone(() => {
-                        const newVueConfig = _api.applyPluginHooks('modifyVueConfig', vueConfig);
-                        Object.assign(vueConfig, newVueConfig || {});
 
-                        return chainConfig(api, vueConfig, _api);
-                    });
-                },
-            });
+        // 修改默认配置
+        const newVueConfig = _mapi.applyPluginHooks('modifyVueConfig', vueConfig);
+        Object.assign(vueConfig, newVueConfig || {});
 
-            // 加载获取所有配置
-            return service.initSync();
-        });
+        chainConfig(api, vueConfig, _mapi);
+
+        // 覆盖逻辑
+        const originaFn = api.resolveWebpackConfig;
+        api.resolveWebpackConfig = function(chainableConfig) {
+            return _mapi.resolveWebpackConfig(originaFn.apply(api, chainableConfig));
+        };
     }
 };

src/service/chainConfig.js

@@ -74,16 +74,11 @@ module.exports = function chainDefault(api, vueConfig, _mapi) {
             }
         }
 
-        return _mapi.resolveChainableWebpackConfig(webpackChain);
+        return webpackChain;
     });
 
     // webpack 所有配置合入
-    const _service = api.service;
-    // 覆盖逻辑
-    if (_service) {
-        const originaFn = _service.resolveWebpackConfig;
-        _service.resolveWebpackConfig = function(chainableConfig) {
-            return _mapi.resolveWebpackConfig(originaFn.apply(_service, chainableConfig));
-        };
-    }
+    api.chainWebpack(webpackChain => {
+        return _mapi.resolveChainableWebpackConfig(webpackChain);
+    });
 };

src/utils/createService.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const { service } = require('@micro-app/cli');
+const { SKIP_TARGET } = require('../constants');
+
+service.context.target = SKIP_TARGET;
+
+// 提前注册
+const registerWebpackPlugin = require('./registerWebpackPlugin');
+registerWebpackPlugin(service);
+
+module.exports = service;

src/utils/registerWebpackPlugin.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const { BUILT_IN } = require('../constants');
+
+module.exports = function registerWebpackPlugin(s) {
+    const WEBPACK_PLUGIN_ID = '@micro-app/plugin-webpack';
+    if (!s.hasPlugin(WEBPACK_PLUGIN_ID)) {
+        // 注册 webapck 插件
+        s.registerPlugin({
+            id: WEBPACK_PLUGIN_ID,
+            [BUILT_IN]: true,
+        });
+    }
+};