Use customConfig rules completely and also support custom resolveLoader

ntucker · Apr 24, 2017 · d01b097 · d01b097
1 parent ff5c01b
commit d01b097
Show file tree

Hide file tree

Showing 4 changed files with 249 additions and 244 deletions.
diff --git a/dist/server/config.js b/dist/server/config.js
@@ -63,11 +63,12 @@ exports.default = function (configType, baseConfig, configDir) {
     // We need to use our and custom plugins.
     plugins: [].concat((0, _toConsumableArray3.default)(config.plugins), (0, _toConsumableArray3.default)(customConfig.plugins || [])),
     module: (0, _extends3.default)({}, config.module, customConfig.module, {
-      rules: [].concat((0, _toConsumableArray3.default)(config.module.rules), (0, _toConsumableArray3.default)(customConfig.module.rules || []))
+      rules: customConfig.module.rules || config.module.rules
     }),
     resolve: (0, _extends3.default)({}, config.resolve, customConfig.resolve, {
       alias: (0, _extends3.default)({}, config.alias, customConfig.resolve && customConfig.resolve.alias)
-    })
+    }),
+    resolveLoader: customConfig.resolveLoader || config.resolveLoader
   });
 
   return newConfig;

diff --git a/package.json b/package.json
@@ -69,6 +69,8 @@
   "devDependencies": {
     "babel-cli": "^6.24.1",
     "babel-eslint": "^7.2.3",
+    "babel-preset-es2015": "^6.24.1",
+    "babel-preset-es2016": "^6.24.1",
     "babel-preset-stage-0": "^6.24.1",
     "chai": "^3.5.0",
     "deep-equal": "^1.0.1",

diff --git a/src/server/config.js b/src/server/config.js
@@ -72,10 +72,7 @@ export default function (configType, baseConfig, configDir) {
       ...config.module,
       // We need to use our and custom rules.
       ...customConfig.module,
-      rules: [
-        ...config.module.rules,
-        ...customConfig.module.rules || [],
-      ],
+      rules: customConfig.module.rules || config.module.rules,
     },
     resolve: {
       ...config.resolve,
@@ -85,6 +82,7 @@ export default function (configType, baseConfig, configDir) {
         ...(customConfig.resolve && customConfig.resolve.alias),
       },
     },
+    resolveLoader: customConfig.resolveLoader || config.resolveLoader,
   };
 
   return newConfig;