fix: 修复动态别名的添加

Author: zyao89

package.json

@@ -45,7 +45,8 @@
         "@micro-app/plugin-deploy": "^0.0.5",
         "@types/jest": "^24.9.1",
         "eslint-config-2o3t": "^2.0.1",
-        "jest": "^24.9.0"
+        "jest": "^24.9.0",
+        "webpack": "^4.42.0"
     },
     "dependencies": {
         "@micro-app/cli": "^0.3.4",

simple/yarn.lock

@@ -93,10 +93,10 @@
     dotenv "^8.2.0"
     dotenv-expand "^5.1.0"
 
-"@micro-app/plugin-webpack@^0.0.5":
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/@micro-app/plugin-webpack/-/plugin-webpack-0.0.5.tgz#94010ee7492cd910cdac73953cac8814acf4adb1"
-  integrity sha512-k4Siq5TpA5HBBvIiNgjzINXyCG/ctyJkUcnRIv65WjO75BA7bQN13aL4KZNBBNTvfXZNMfanhZ+OKKTGDNukFg==
+"@micro-app/plugin-webpack@^0.0.6":
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/@micro-app/plugin-webpack/-/plugin-webpack-0.0.6.tgz#1c4e5bf45e30cd39f1c6bbee382f09c6d4826215"
+  integrity sha512-YM6MRIzUItDa8Uz2sMba4CwkxKUK4N3tqLd3AzwUChwgjgAeNH5CqdxK2Go03yHgnRYtoRC1I/Nm+GM3TN5rfA==
   dependencies:
     "@intervolga/optimize-cssnano-plugin" "^1.0.6"
     "@marshallofsound/webpack-asset-relocator-loader" "^0.5.0"
@@ -168,7 +168,7 @@
   version "0.0.1"
   dependencies:
     "@micro-app/cli" "^0.3.4"
-    "@micro-app/plugin-webpack" "^0.0.5"
+    "@micro-app/plugin-webpack" "^0.0.6"
 
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
@@ -1292,9 +1292,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030:
-  version "1.0.30001033"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz#60c328fb56860de60f9a2cb419c31fb80587cba0"
-  integrity sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A==
+  version "1.0.30001035"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz#2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"
+  integrity sha512-C1ZxgkuA4/bUEdMbU5WrGY4+UhMFFiXrgNAfxiMIqWgFTWfv/xsZCS2xEHT2LMq7xAZfuAnu6mcqyDl0ZR6wLQ==
 
 case-sensitive-paths-webpack-plugin@^2.3.0:
   version "2.3.0"
@@ -2339,9 +2339,9 @@ ejs@^2.6.1:
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
 electron-to-chromium@^1.3.363:
-  version "1.3.375"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.375.tgz#e290d59d316024e5499057944c10d05c518b7a24"
-  integrity sha512-zmaFnYVBtfpF8bGRYxgPeVAlXB7N3On8rjBE2ROc6wOpTPpzRWaiHo6KkbJMvlH07CH33uks/TEb6kuMMn8q6A==
+  version "1.3.376"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.376.tgz#7cb7b5205564a06c8f8ecfbe832cbd47a1224bb1"
+  integrity sha512-cv/PYVz5szeMz192ngilmezyPNFkUjuynuL2vNdiqIrio440nfTDdc0JJU0TS2KHLSVCs9gBbt4CFqM+HcBnjw==
 
 elliptic@^6.0.0:
   version "6.5.2"
@@ -4515,9 +4515,9 @@ minimist@0.0.8:
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
 minimist@^1.2.0:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz#3db5c0765545ab8637be71f333a104a965a9ca3f"
-  integrity sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.4.tgz#40357ef9582f8cd42ba8eaa274ddcf27f0c979b7"
+  integrity sha512-wTiNDqe4D2rbTJGZk1qcdZgFtY0/r+iuE6GDT7V0/+Gu5MLpIDm4+CssDECR79OJs/OxLPXMzdxy153b5Qy3hg==
 
 minipass-collect@^1.0.2:
   version "1.0.2"

src/index.js

@@ -22,6 +22,7 @@ module.exports = function(api, vueConfig) {
     });
 
     const config = service.runSync('return-config');
+    const webpackConfig = service.runSync('return-config', { _: [], key: 'config' });
 
-    return chainConfig(api, vueConfig, config);
+    return chainConfig(api, vueConfig, config, webpackConfig);
 };

src/service/chainConfig copy.js

@@ -2,7 +2,8 @@
 
 const { tryRequire } = require('@micro-app/shared-utils');
 
-module.exports = function chainDefault(api, vueConfig, options) {
+module.exports = function chainDefault(api, vueConfig, options, webpackConfig) {
+    const webpackConfigAlias = webpackConfig.module.alias || {};
 
     if (options.publicPath) {
         vueConfig.publicPath = options.publicPath;
@@ -41,14 +42,13 @@ module.exports = function chainDefault(api, vueConfig, options) {
             .merge(nodeModulesPaths)
             .end();
 
-        const alias = options.resolveAlias || {};
+        const alias = Object.assign({}, options.resolveAlias || {}, webpackConfigAlias);
         // alias
         webpackChain.resolve
             .alias
             .merge(alias)
             .end();
 
-        console.warn(vueConfig);
         // const entry = options.entry || {};
         // // entry
         // Object.keys(entry).forEach(key => {