From 9fd2629150d903e71a086050e0dbf63b5918a5c0 Mon Sep 17 00:00:00 2001
From: Arunoda Susiripala <arunoda.susiripala@gmail.com>
Date: Mon, 19 Sep 2016 22:25:21 +0530
Subject: [PATCH] Add a fix to webpack custom resolve.alias not working.

---
 src/server/config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server/config.js b/src/server/config.js
index 030df867e333..d7acb1bfd35a 100644
--- 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),
       }
     }
   };