separate hasMultiTargets & add extendLoader (electrode-io#1209)

synsuman · Apr 15, 2019 · 34382d2 · 34382d2
1 parent cbe0da0
commit 34382d2
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/packages/electrode-archetype-react-app-dev/config/archetype.js b/packages/electrode-archetype-react-app-dev/config/archetype.js
@@ -80,6 +80,11 @@ const babelConfigSpec = {
     env: "ENV_TARGET",
     type: "string",
     default: "default"
+  },
+  // `extendLoader` is used to override `babel-loader` only when `hasMultiTargets=true`
+  extendLoader: {
+    type: "json",
+    default: {}
   }
 };
 
@@ -114,3 +119,7 @@ module.exports = Object.assign(
   config,
   xenvConfig(topConfigSpec, _.pick(userConfig, Object.keys(topConfigSpec)), { merge })
 );
+module.exports.babel.hasMultiTargets =
+  Object.keys(module.exports.babel.envTargets)
+    .sort()
+    .join(",") !== "default,node";
diff --git a/packages/electrode-archetype-react-app-dev/config/babel/babelrc-client.js b/packages/electrode-archetype-react-app-dev/config/babel/babelrc-client.js
@@ -109,11 +109,7 @@ const plugins = basePlugins.concat(
 );
 
 const targets = archetype.babel.envTargets[archetype.babel.target];
-const hasOtherTargets =
-  Object.keys(archetype.babel.envTargets)
-    .sort()
-    .join(",") !== "default,node";
-const useBuiltIns = hasOtherTargets
+const useBuiltIns = archetype.babel.hasMultiTargets
   ? { useBuiltIns: "entry", corejs: "2" }
   : {};
 

diff --git a/packages/electrode-archetype-react-app-dev/config/webpack/partial/babel.js b/packages/electrode-archetype-react-app-dev/config/webpack/partial/babel.js
@@ -34,7 +34,13 @@ module.exports = function(options) {
 
   return {
     module: {
-      rules: [assign({}, babelLoaderConfig, archetype.webpack.extendBabelLoader)]
+      rules: [
+        assign(
+          {},
+          babelLoaderConfig,
+          archetype.babel.hasMultiTargets ? archetype.babel.extendLoader : {}
+        )
+      ]
     }
   };
 };
diff --git a/packages/electrode-archetype-react-app-dev/config/webpack/partial/output.js b/packages/electrode-archetype-react-app-dev/config/webpack/partial/output.js
@@ -6,17 +6,13 @@ const { AppMode, babel } = archetype;
 
 const inspectpack = process.env.INSPECTPACK_DEBUG === "true";
 
-const { target, envTargets } = babel;
-const hasOtherTargets =
-  Object.keys(envTargets).filter(x => x !== "default" && x !== "node").length > 0;
-
 const getOutputFilename = () => {
   let filename = "[name].bundle.[hash].js";
 
   if (AppMode.hasSubApps) {
     filename = "[name].bundle.js";
-  } else if (hasOtherTargets) {
-    filename = `${target}.[name].bundle.js`;
+  } else if (babel.hasMultiTargets) {
+    filename = `${babel.target}.[name].bundle.js`;
   }
 
   return filename;
@@ -26,7 +22,7 @@ const getOutputPath = () => {
   if (process.env.WEBPACK_DEV === "true") {
     return "/"; // simulate the behavior of webpack-dev-server, which sets output path to /
   } else {
-    return Path.resolve(target !== "default" ? `dist-${target}` : "dist", "js");
+    return Path.resolve(babel.target !== "default" ? `dist-${babel.target}` : "dist", "js");
   }
 };
 
@@ -35,7 +31,7 @@ module.exports = {
     path: getOutputPath(),
     pathinfo: inspectpack, // Enable path information for inspectpack
     publicPath: "/js/",
-    chunkFilename: hasOtherTargets ? `${target}.[hash].[name].js` : "[hash].[name].js",
+    chunkFilename: babel.hasMultiTargets ? `${babel.target}.[hash].[name].js` : "[hash].[name].js",
     filename: getOutputFilename()
   }
 };