fix: 升级依赖，修复注册冲突

Author: zyao89

Diff for: package.json

@@ -38,7 +38,7 @@
     },
     "license": "MIT",
     "peerDependencies": {
-        "@micro-app/cli": ">=0.3.4",
+        "@micro-app/cli": ">=0.3.5",
         "@micro-app/plugin-webpack": ">=0.0.6"
     },
     "devDependencies": {
@@ -49,7 +49,7 @@
         "webpack": "^4.42.0"
     },
     "dependencies": {
-        "@micro-app/cli": "^0.3.4",
+        "@micro-app/cli": "^0.3.5",
         "@micro-app/plugin-webpack": "^0.0.6"
     }
 }

Diff for: src/index.js

@@ -4,7 +4,8 @@ const chainConfig = require('./service/chainConfig');
 
 module.exports = function(api, vueConfig) {
 
-    const { service } = require('@micro-app/cli');
+    const { createService } = require('@micro-app/cli');
+    const service = createService();
 
     const builtIn = Symbol.for('built-in');
 

Diff for: src/service/chainConfig.js

@@ -1,29 +1,31 @@
 'use strict';
 
-const { tryRequire } = require('@micro-app/shared-utils');
+const { _, tryRequire } = require('@micro-app/shared-utils');
 
 module.exports = function chainDefault(api, vueConfig, options, webpackConfig) {
     const webpackConfigAlias = webpackConfig.module.alias || {};
 
-    [
+    [ // string
         'publicPath',
         'outputDir',
         'assetsDir',
     ]
         .forEach(key => {
-            if (options[key] !== undefined) {
+            if (!_.isUndefined(options[key])) {
                 vueConfig[key] = options[key];
             }
         });
 
-    // devServer
-    vueConfig.devServer = Object.assign({}, vueConfig.devServer || {}, options.devServer || {});
-
-    // pages
-    vueConfig.pages = Object.assign({}, vueConfig.pages || {}, options.pages || {});
-
-    // css
-    vueConfig.css = Object.assign({}, vueConfig.css || {}, options.css || {});
+    [ // object
+        'devServer',
+        'pages',
+        'css',
+    ]
+        .forEach(key => {
+            if (!_.isEmpty(options[key]) && !_.isUndefined(options[key])) {
+                vueConfig[key] = Object.assign({}, vueConfig[key] || {}, options[key] || {});
+            }
+        });
 
     api.chainWebpack(webpackChain => {
         const outputDir = api.resolve(options.outputDir);

Diff for: yarn.lock

@@ -323,10 +323,10 @@
   dependencies:
     sourcemap-codec "^1.4.4"
 
-"@micro-app/cli@^0.3.4":
-  version "0.3.4"
-  resolved "https://registry.npm.taobao.org/@micro-app/cli/download/@micro-app/cli-0.3.4.tgz#4d3e5db945e613f9ddfbb45efc0f73289e84df58"
-  integrity sha1-TT5duUXmE/nd+7Re/A9zKJ6E31g=
+"@micro-app/cli@^0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@micro-app/cli/-/cli-0.3.5.tgz#a582a13f53951e4e1b1e1356ed8d88dc364c9858"
+  integrity sha512-uqaBX7JtAzuyWLqYbKnhz0uysCnulio1GVJGSWty/clhX4KsPbgjr+w4WexSOfmR/Jjp6Po4j+VZg2zC3eMPPA==
   dependencies:
     "@micro-app/core" "^0.3.10"
     "@zkochan/cmd-shim" "^3.1.0"