Fix loader concatentation bug (#173)

storybookjs · May 9, 2016 · 1053fe2 · 1053fe2
1 parent bdf72b7
commit 1053fe2
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/dist/manager.js b/dist/manager.js
diff --git a/dist/manager.js.map b/dist/manager.js.map
diff --git a/dist/server/build.js b/dist/server/build.js
diff --git a/dist/server/config.js b/dist/server/config.js
@@ -61,10 +61,12 @@ exports.default = function (configType, baseConfig, configDir) {
 
   logger.info('=> Loading custom webpack config.');
 
+  customConfig.module = customConfig.module || {};
+
   return (0, _extends3.default)({}, customConfig, config, {
     // 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 || {}, {
+    module: (0, _extends3.default)({}, config.module, customConfig.module, {
       loaders: [].concat((0, _toConsumableArray3.default)(config.module.loaders), (0, _toConsumableArray3.default)(customConfig.module.loaders || []))
     })
   });

diff --git a/src/server/config.js b/src/server/config.js
@@ -74,6 +74,8 @@ export default function (configType, baseConfig, configDir) {
 
   logger.info('=> Loading custom webpack config.');
 
+  customConfig.module = customConfig.module || {};
+
   return {
     ...customConfig,
     // We'll always load our configurations after the custom config.
@@ -87,7 +89,7 @@ export default function (configType, baseConfig, configDir) {
     module: {
       ...config.module,
       // We need to use our and custom loaders.
-      ...customConfig.module || {},
+      ...customConfig.module,
       loaders: [
         ...config.module.loaders,
         ...customConfig.module.loaders || [],