chore: update deps

Author: zyao89

package.json

@@ -45,7 +45,7 @@
         "webpack": "^4.42.1"
     },
     "dependencies": {
-        "@micro-app/cli": "^0.3.12",
+        "@micro-app/cli": "^0.3.13",
         "@micro-app/plugin-webpack": "^0.0.11"
     }
 }

src/index.js

@@ -1,31 +1,33 @@
 'use strict';
 
 const chainConfig = require('./service/chainConfig');
-const createService = require('./utils/createService');
+const silentService = require('./utils/silentService');
 const { BUILT_IN } = require('./constants');
 
 module.exports = function(api, vueConfig) {
-    const service = createService();
-
-    // 注册插件
-    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 || {});
+    if (api.__isMicroAppPluginAPI) { // micro-app plugin
+        const registerMethod = require('./utils/registerMethod');
+        registerMethod(api);
+    } else { // vue-cli plugin
+        const config = 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 || {});
+                    });
+                },
             });
-        },
-    });
 
-    // 加载获取所有配置
-    service.initSync();
-    const config = service.config;
+            // 加载获取所有配置
+            service.initSync();
+            return service.config;
+        });
 
-    return chainConfig(api, vueConfig, config);
+        return chainConfig(api, vueConfig, config);
+    }
 };
-
-// 外部服务提前注册方法
-module.exports.registerMethod = require('./utils/registerMethod');

src/service/chainConfig.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const { _, tryRequire, fs } = require('@micro-app/shared-utils');
-const createService = require('../utils/createService');
+const { _, tryRequire, fs, logger } = require('@micro-app/shared-utils');
+const silentService = require('../utils/silentService');
 const { BUILT_IN } = require('../constants');
 
 // 以 vue-cli 配置为主
@@ -68,7 +68,7 @@ module.exports = function chainDefault(api, vueConfig, options) {
                         };
                     }) ]);
             } else {
-                api.logger.warn('[webpack]', 'Not Found "copy-webpack-plugin"');
+                logger.warn('[webpack]', 'Not Found "copy-webpack-plugin"');
             }
         }
 
@@ -77,24 +77,24 @@ module.exports = function chainDefault(api, vueConfig, options) {
 
     // webpack 所有配置合入
     api.chainWebpack(webpackChain => {
-        const service = createService();
-
+        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();
-                });
-            },
-        });
+            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');
+            // 同步扩充 webpack-chain config
+            return service.runSync('return-webpack-chain');
+        });
     });
 };

src/utils/createService.js src/utils/silentService.jssrc/utils/createService.js renamed to src/utils/silentService.js

@@ -1,9 +1,15 @@
 'use strict';
 
+const { _, logger } = require('@micro-app/shared-utils');
 const { createService } = require('@micro-app/cli');
 const { SKIP_TARGET, BUILT_IN } = require('../constants');
 
-module.exports = function() {
+// 无日志服务
+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';
@@ -15,5 +21,9 @@ module.exports = function() {
         });
     }
 
-    return service;
+    const result = _.isFunction(cb) && cb(service);
+
+    // recovery
+    logger.level = ORIGINAL_LEVEL;
+    return result;
 };

yarn.lock

@@ -323,22 +323,22 @@
   dependencies:
     sourcemap-codec "^1.4.4"
 
-"@micro-app/cli@^0.3.12":
-  version "0.3.12"
-  resolved "https://registry.yarnpkg.com/@micro-app/cli/-/cli-0.3.12.tgz#6fde028d5aa0a66d6a84009ca80c922b61882f7f"
-  integrity sha512-VR6m+abGKpsWwlVfbGqSG/gKD6xxSL9yRuNKvhYorIdIBOCaYb7ksNiq/9YFeLGVxlaKeBXl0fpSAGRIoD9DiA==
+"@micro-app/cli@^0.3.13":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@micro-app/cli/-/cli-0.3.13.tgz#0459c31e738795272c3d3d136958b5aa38c9b1f5"
+  integrity sha512-itUAu2OIccz/Cb/LNBfo1et5rEDRJRkd9gqhnhagdN5bbW/YHBdPZebWqtvIsJxvtXnRCzAJLTQwBR6ZnF/fyw==
   dependencies:
-    "@micro-app/core" "^0.3.21"
+    "@micro-app/core" "^0.3.22"
     "@zkochan/cmd-shim" "^4.3.0"
     read-cmd-shim "^2.0.0"
     update-notifier "^4.1.0"
 
-"@micro-app/core@^0.3.21":
-  version "0.3.21"
-  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.3.21.tgz#43315fa1713580d7500900f5ef90e183b9455b56"
-  integrity sha512-k7KOtQ6pxJbRAaMW8xF3jmuJxOQXjHXLCHtLNayU3ma1SNxOTGBbGbF7VyOBoo7V1sGlC40UjMaMJiqfvdE5lw==
+"@micro-app/core@^0.3.22":
+  version "0.3.22"
+  resolved "https://registry.yarnpkg.com/@micro-app/core/-/core-0.3.22.tgz#acbe705b363f754da81470cf33c4b92d1f8b5fc6"
+  integrity sha512-Jr/eREz19m34ROb5e8a18MV02uI9mIz0WQStAucaK5Y4pZVh2+uN/IFpd11UudcCvPGAQoT8Z0f7Ov00dgYb4Q==
   dependencies:
-    "@micro-app/shared-utils" "^0.1.16"
+    "@micro-app/shared-utils" "^0.1.17"
     dotenv "^8.2.0"
     dotenv-expand "^5.1.0"
 
@@ -423,6 +423,46 @@
     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"
+  integrity sha512-XI1uFnvjPaFZvLLMoARZeUqUya2i2z4aJ1oT23bahQL+5dHgXj2p1o/1agJ7G0K1KStasLRjPXNuHEpBpK1Weg==
+  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"
+
 "@nodelib/[email protected]":
   version "2.1.3"
   resolved "https://registry.npm.taobao.org/@nodelib/fs.scandir/download/@nodelib/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"