From 6985e2ce7c9f55f7a5143383675b5fbe614fa17c Mon Sep 17 00:00:00 2001
From: Felipe Vargas <git@fvgs.ai>
Date: Thu, 13 Jul 2017 19:22:42 -0700
Subject: [PATCH] Fix issue when extending webpack config

---
 app/react/src/server/config.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/react/src/server/config.js b/app/react/src/server/config.js
index 36e2d30ec259..21d476051f4a 100644
--- 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,