From d31ad274b4f8d44f75bd40834a9232bb92d7e83d Mon Sep 17 00:00:00 2001
From: Louy Alakkad <louy@alakkad.me>
Date: Tue, 5 Apr 2016 00:29:56 +0100
Subject: [PATCH 1/2] Update webpack.config.js

Load `resolve` option from custom webpack config file
---
 src/server/webpack.config.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/server/webpack.config.js b/src/server/webpack.config.js
index 4bd1d36e2dba..d67344e9c159 100644
--- a/src/server/webpack.config.js
+++ b/src/server/webpack.config.js
@@ -77,6 +77,24 @@ if (fs.existsSync(customConfigPath)) {
     logger.info(' => Loading custom webpack plugins.');
     config.plugins = config.plugins.concat(customConfig.plugins);
   }
+  
+  // load resolve.extensions
+  if (customConfig.resolve && customConfig.resolve.extensions) {
+    config.resolve = config.resolve || {};
+    config.resolve.extensions = customConfig.resolve.extensions.slice();
+    if (config.resolve.extensions.indexOf('.js') === -1) {
+      config.resolve.extensions.push('.js');
+    }
+  }
+  
+  // load resolve.modulesDirectories
+  if (customConfig.resolve && customConfig.resolve.modulesDirectories) {
+    config.resolve = config.resolve || {};
+    config.resolve.modulesDirectories = customConfig.resolve.modulesDirectories.slice();
+    if (config.resolve.modulesDirectories.indexOf('node_modules') === -1) {
+      config.resolve.modulesDirectories.push('node_modules');
+    }
+  }
 }
 
 export default config;

From bedbb65634f94fb77493d8c5f1a8d2a637d7785d Mon Sep 17 00:00:00 2001
From: Louy Alakkad <louy@alakkad.me>
Date: Tue, 5 Apr 2016 00:31:52 +0100
Subject: [PATCH 2/2] Cleanup

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

diff --git a/src/server/webpack.config.js b/src/server/webpack.config.js
index d67344e9c159..6618ca6aa251 100644
--- a/src/server/webpack.config.js
+++ b/src/server/webpack.config.js
@@ -26,6 +26,7 @@ const config = {
     new webpack.optimize.OccurenceOrderPlugin(),
     new webpack.HotModuleReplacementPlugin(),
   ],
+  resolve: {},
   module: {
     loaders: [
       {
@@ -80,7 +81,6 @@ if (fs.existsSync(customConfigPath)) {
   
   // load resolve.extensions
   if (customConfig.resolve && customConfig.resolve.extensions) {
-    config.resolve = config.resolve || {};
     config.resolve.extensions = customConfig.resolve.extensions.slice();
     if (config.resolve.extensions.indexOf('.js') === -1) {
       config.resolve.extensions.push('.js');
@@ -89,7 +89,6 @@ if (fs.existsSync(customConfigPath)) {
   
   // load resolve.modulesDirectories
   if (customConfig.resolve && customConfig.resolve.modulesDirectories) {
-    config.resolve = config.resolve || {};
     config.resolve.modulesDirectories = customConfig.resolve.modulesDirectories.slice();
     if (config.resolve.modulesDirectories.indexOf('node_modules') === -1) {
       config.resolve.modulesDirectories.push('node_modules');