fix: refactoring code

Author: zyao89

package.json

@@ -46,6 +46,6 @@
     },
     "dependencies": {
         "@micro-app/cli": "^0.3.15",
-        "@micro-app/plugin-webpack": "^0.0.11"
+        "@micro-app/plugin-webpack": "^0.0.12"
     }
 }

src/service/chainConfig.js

@@ -76,25 +76,34 @@ module.exports = function chainDefault(api, vueConfig, options) {
     });
 
     // webpack 所有配置合入
-    api.chainWebpack(webpackChain => {
-        return silentService(service => {
-        // 注册插件
-            service.registerPlugin({
-                id: 'vue-cli-plugin:plugin-command-return-webpack-chain',
-                [BUILT_IN]: 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');
+    return silentService(service => {
+    // 注册插件
+        service.registerPlugin({
+            id: 'vue-cli-plugin:plugin-command-return-webpack-chain',
+            [BUILT_IN]: true,
+            apply(_api) {
+                _api.registerCommand('return-webpack-chain', {
+                    description: 'return config of webpack-chain.',
+                    usage: 'micro-app return-webpack-chain',
+                }, () => {
+                    // global save vueConfig
+                    _api.setState('vueConfig', vueConfig);
+                    // 覆盖逻辑
+                    if (api.resolveWebpackConfig) {
+                        const originaFn = api.resolveWebpackConfig;
+                        api.resolveWebpackConfig = function(chainableConfig) {
+                            const finalWebpackChainConfig = api.resolveChainableWebpackConfig(chainableConfig);
+                            const webpackConfig = originaFn(finalWebpackChainConfig);
+                            const finalWebpackConfig = api.applyPluginHooks('modifyWebpackConfig', webpackConfig);
+                            api.setState('webpackConfig', finalWebpackConfig);
+                            return finalWebpackConfig;
+                        };
+                    }
+                });
+            },
         });
+
+        // 同步扩充 webpack-chain config
+        return service.runSync('return-webpack-chain');
     });
 };

src/utils/silentService.js

@@ -1,29 +1,36 @@
 'use strict';
 
 const { _, logger } = require('@micro-app/shared-utils');
-const { createService } = require('@micro-app/cli');
+const { createService, service: $s } = require('@micro-app/cli');
 const { SKIP_TARGET, BUILT_IN } = require('../constants');
 
+// 提前注册
+registerWebpackPlugin($s);
+
 // 无日志服务
 module.exports = function silentService(cb) {
     // record
     const ORIGINAL_LEVEL = logger.level;
     logger.level = 'error';
 
     const service = createService({ target: SKIP_TARGET });
-
-    const WEBPACK_PLUGIN_ID = '@micro-app/plugin-webpack';
-    if (!service.hasPlugin(WEBPACK_PLUGIN_ID)) {
-        // 注册 webapck 插件
-        service.registerPlugin({
-            id: WEBPACK_PLUGIN_ID,
-            [BUILT_IN]: true,
-        });
-    }
+    registerWebpackPlugin(service);
 
     const result = _.isFunction(cb) && cb(service);
 
     // recovery
     logger.level = ORIGINAL_LEVEL;
     return result;
 };
+
+
+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,
+        });
+    }
+}

yarn.lock

@@ -350,14 +350,14 @@
     "@release-it/conventional-changelog" "^1.1.0"
     release-it "^13.1.1"
 
-"@micro-app/plugin-webpack@^0.0.11":
-  version "0.0.11"
-  resolved "https://registry.yarnpkg.com/@micro-app/plugin-webpack/-/plugin-webpack-0.0.11.tgz#998664f039472ed0daa47e9451d5a12478405b4b"
-  integrity sha512-+Ku8V2UJUpAbAfwXgEse1dhcKxH+ybByFOeLL9KivNxKelxEmYI01XFY7V6wXKiSlDfgxl/IUoZXH35VrBxcsg==
+"@micro-app/plugin-webpack@^0.0.12":
+  version "0.0.12"
+  resolved "https://registry.yarnpkg.com/@micro-app/plugin-webpack/-/plugin-webpack-0.0.12.tgz#bbc646350badc54afe13b878322c1c4063416efe"
+  integrity sha512-V7UD8p4ETxrEBzzx2LjypgTqdiu1UQs74ZDaTmn7hF5S/7qAfd15GOTptgwqXBkC6GVOOf3nSGSdpw04rkCOWQ==
   dependencies:
     "@intervolga/optimize-cssnano-plugin" "^1.0.6"
     "@marshallofsound/webpack-asset-relocator-loader" "^0.5.0"
-    "@micro-app/shared-utils" "^0.1.16"
+    "@micro-app/shared-utils" "^0.1.17"
     "@soda/friendly-errors-webpack-plugin" "^1.7.1"
     address "^1.1.2"
     autoprefixer "^9.7.4"
@@ -383,46 +383,6 @@
     webpack-chain "^6.4.0"
     webpack-dev-server "^3"
 
-"@micro-app/shared-utils@^0.1.16":
-  version "0.1.16"
-  resolved "https://registry.yarnpkg.com/@micro-app/shared-utils/-/shared-utils-0.1.16.tgz#4952238c8caf17156548e33a43990ef42368e363"
-  integrity sha512-n4/E5gRFAijnMa33slUBF+REKVoPZ3SczY3xim3cRT0xI0vqG1uhyLZjEAwUq9mStGORgcllYN4ygUuJx0ki0Q==
-  dependencies:
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-    assert "^2.0.0"
-    chalk "^3.0.0"
-    cheerio "^1.0.0-rc.3"
-    debug "^4.1.1"
-    dedent "^0.7.0"
-    execa "^3.4.0"
-    fs-extra "^8.1.0"
-    git-url-parse "^11.1.2"
-    glob-parent "^5.1.0"
-    globby "^10.0.2"
-    hash-sum "^2.0.0"
-    import-fresh "^3.2.1"
-    inquirer "^7.1.0"
-    is-glob "^4.0.1"
-    lodash "^4.17.15"
-    lru-cache "^5.1.1"
-    multimatch "^4.0.0"
-    npm-package-arg "^6.1.1"
-    npmlog "^4.1.2"
-    open "^7.0.3"
-    ora "^3.4.0"
-    parse-json "^5.0.0"
-    semver "^6.3.0"
-    semver-regex "^3.1.1"
-    shelljs "^0.8.3"
-    signal-exit "^3.0.2"
-    stream-to-string "^1.2.0"
-    stringify-object "^3.3.0"
-    try-require "^1.2.1"
-    yaml "^1.8.2"
-    yargs-parser "^18.1.1"
-    yargs-unparser "^1.5.0"
-
 "@micro-app/shared-utils@^0.1.17":
   version "0.1.17"
   resolved "https://registry.yarnpkg.com/@micro-app/shared-utils/-/shared-utils-0.1.17.tgz#e99b9aa4385cf4eefe5f96f0f553162ab9342743"