Adds support for preLoaders in custom webpack config (storybookjs#107)

* Adds support for preLoaders in custom webpack config * Changes the way it loads custom webpacck config to more generic way. Support for postLoaders
wyattdanger · Apr 26, 2016 · 9a3da8d · 9a3da8d
1 parent a351234
commit 9a3da8d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dist/server/config.js b/dist/server/config.js
@@ -50,8 +50,7 @@ exports.default = function (baseConfig, configDir) {
   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, {
-      // We need to use our and custom loaders.
+    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
@@ -56,6 +56,7 @@ export default function (baseConfig, configDir) {
     module: {
       ...config.module,
       // We need to use our and custom loaders.
+      ...customConfig.module || {},
       loaders: [
         ...config.module.loaders,
         ...customConfig.module.loaders || [],