Merge pull request #1468 from fvgs/fix-extend-webpack-config

Fix issue when extending webpack config
storybookjs · Jul 17, 2017 · 860e952 · 860e952
2 parents e2e1197 + 6985e2c
commit 860e952
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/react/src/server/config.js b/app/react/src/server/config.js
@@ -73,7 +73,10 @@ 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: [
+        ...config.module.rules,
+        ...((customConfig.module && customConfig.module.rules) || []),
+      ],
     },
     resolve: {
       ...config.resolve,