Add a fix to webpack custom resolve.alias not working. (#465)

storybookjs · Sep 19, 2016 · a6c07f1 · a6c07f1
1 parent 44cc7bf
commit a6c07f1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/server/config.js b/src/server/config.js
@@ -136,7 +136,7 @@ export default function (configType, baseConfig, configDir) {
       ...customConfig.resolve,
       alias: {
         ...config.alias,
-        ...customConfig.alias,
+        ...(customConfig.resolve && customConfig.resolve.alias),
       }
     }
   };