:fix: 修复 config.target 锁死

Author: zyao89

src/extends/enhance/index.js

@@ -13,7 +13,7 @@ module.exports = function WebpackAdapter(api, opts) {
 
     api.extendMethod('resolveWebpackChain', {
         description: 'resolve webpack-chain config.',
-    }, (webpackChainConfig = new Config()) => {
+    }, (webpackChainConfig = new Config(), isServer = false) => {
         if (!initialized) {
             logger.throw('please call after "onInitWillDone" !');
         }
@@ -29,8 +29,12 @@ module.exports = function WebpackAdapter(api, opts) {
         webpackChainConfig.merge(_originalWebpackConfig);
 
         const target = api.target; // target, 默认 web
-        if ([ 'app', 'lib', 'web' ].includes(target)) { // 其它类型外部自己设置
-            webpackChainConfig.target('web');
+        if (!webpackChainConfig.get('target')) {
+            if (isServer) {
+                webpackChainConfig.target('node');
+            } else if ([ 'app', 'lib', 'web' ].includes(target)) { // 其它类型外部自己设置
+                webpackChainConfig.target('web');
+            }
         }
 
         const finalWebpackChainConfig = api.applyPluginHooks('modifyWebpackChain', webpackChainConfig);
@@ -42,8 +46,8 @@ module.exports = function WebpackAdapter(api, opts) {
 
     api.extendMethod('resolveWebpackConfig', {
         description: 'resolve webpack config.',
-    }, webpackChainConfig => {
-        const finalWebpackChainConfig = api.resolveWebpackChain(webpackChainConfig);
+    }, (webpackChainConfig, isServer = false) => {
+        const finalWebpackChainConfig = api.resolveWebpackChain(webpackChainConfig, isServer);
         const webpackConfig = finalWebpackChainConfig.toConfig();
         const finalWebpackConfig = api.applyPluginHooks('modifyWebpackConfig', webpackConfig);
         api.applyPluginHooks('onWebpcakConfig', finalWebpackConfig);

src/extends/submodule/configParser.js

@@ -52,8 +52,7 @@ module.exports = function configParser(selfConfig = {}) {
     }
 
     function namespace() {
-        const key = hash(selfConfig.key);
-        const _namespace = subModule.namespace || key;
+        const _namespace = subModule.namespace || selfConfig.namespace || hash(selfConfig.key);
         return _namespace;
     }
 
@@ -65,6 +64,7 @@ module.exports = function configParser(selfConfig = {}) {
         return `${prefix()}${namespace()}-${key}`;
     }
 
+    // 如果没有新的设置，默认会用主应用配置
     function outputDir() {
         const _outputDir = subModule.outputDir || false;
         return _outputDir;

src/extends/webpack/configParser.js

@@ -1,11 +1,10 @@
 'use strict';
 
-const { _, tryRequire, path } = require('@micro-app/shared-utils');
+const { _, hash, tryRequire, path } = require('@micro-app/shared-utils');
 
 const DEFAULT_KEY = 'main';
 
-module.exports = function configParser(obj, key, extraConfig = {}) {
-    const selfConfig = obj[key] || {};
+module.exports = function configParser(selfConfig, extraConfig = {}) {
     const originalConfig = selfConfig.originalConfig || {};
     const webpackConfig = originalConfig.webpack || {};
 
@@ -142,10 +141,16 @@ module.exports = function configParser(obj, key, extraConfig = {}) {
         return entry;
     }
 
+    function namespace() {
+        const _namespace = selfConfig.namespace || hash(selfConfig.key);
+        return _namespace;
+    }
+
     return {
         staticPaths,
         htmls,
         html,
         entry,
+        namespace,
     };
 };

src/extends/webpack/index.js

@@ -16,7 +16,7 @@ module.exports = function extendWebpack(api, opts) {
     const microsConfig = api.microsConfig;
     Object.keys(microsConfig).forEach(key => {
         const item = microsConfig[key];
-        const _configParser = configParser(microsConfig, key, microsExtraConfig[key]);
+        const _configParser = configParser(item, microsExtraConfig[key]);
         Object.assign(item, {
             entry: _configParser.entry(),
             html: _configParser.html(),