From 4b416c94f0303c222ba71f5459938511ddd9ecf9 Mon Sep 17 00:00:00 2001
From: Stewart Duffy <duffy.stewart@gmail.com>
Date: Wed, 13 Apr 2016 19:29:45 +1200
Subject: [PATCH 1/2] Adds support for preLoaders in custom webpack config

---
 dist/server/config.js | 1 +
 src/server/config.js  | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/dist/server/config.js b/dist/server/config.js
index f0d0abe3378f..c4fd0cfe72d2 100644
--- a/dist/server/config.js
+++ b/dist/server/config.js
@@ -52,6 +52,7 @@ exports.default = function (baseConfig, configDir) {
     plugins: [].concat((0, _toConsumableArray3.default)(config.plugins), (0, _toConsumableArray3.default)(customConfig.plugins || [])),
     module: (0, _extends3.default)({}, config.module, {
       // We need to use our and custom loaders.
+      preLoaders: [].concat((0, _toConsumableArray3.default)(customConfig.module.preLoaders || [])),
       loaders: [].concat((0, _toConsumableArray3.default)(config.module.loaders), (0, _toConsumableArray3.default)(customConfig.module.loaders || []))
     })
   });
diff --git a/src/server/config.js b/src/server/config.js
index 2be900af9404..00bc9d7b38ea 100644
--- a/src/server/config.js
+++ b/src/server/config.js
@@ -56,6 +56,9 @@ export default function (baseConfig, configDir) {
     module: {
       ...config.module,
       // We need to use our and custom loaders.
+      preLoaders: [
+        ...customConfig.module.preLoaders || [],
+      ],
       loaders: [
         ...config.module.loaders,
         ...customConfig.module.loaders || [],

From 2005b270e468c8e83366ab4b94fd9946c18d4abe Mon Sep 17 00:00:00 2001
From: Stewart Duffy <duffy.stewart@gmail.com>
Date: Thu, 14 Apr 2016 08:26:05 +1200
Subject: [PATCH 2/2] Changes the way it loads custom webpacck config to more
 generic way. Support for postLoaders

---
 dist/server/config.js | 4 +---
 src/server/config.js  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dist/server/config.js b/dist/server/config.js
index c4fd0cfe72d2..7f55f32c4bd7 100644
--- a/dist/server/config.js
+++ b/dist/server/config.js
@@ -50,9 +50,7 @@ exports.default = function (baseConfig, configDir) {
   return (0, _extends3.default)({}, customConfig, config, {
     // We need to use our and custom plugins.
     plugins: [].concat((0, _toConsumableArray3.default)(config.plugins), (0, _toConsumableArray3.default)(customConfig.plugins || [])),
-    module: (0, _extends3.default)({}, config.module, {
-      // We need to use our and custom loaders.
-      preLoaders: [].concat((0, _toConsumableArray3.default)(customConfig.module.preLoaders || [])),
+    module: (0, _extends3.default)({}, config.module, customConfig.module || {}, {
       loaders: [].concat((0, _toConsumableArray3.default)(config.module.loaders), (0, _toConsumableArray3.default)(customConfig.module.loaders || []))
     })
   });
diff --git a/src/server/config.js b/src/server/config.js
index 00bc9d7b38ea..1393904998dd 100644
--- a/src/server/config.js
+++ b/src/server/config.js
@@ -56,9 +56,7 @@ export default function (baseConfig, configDir) {
     module: {
       ...config.module,
       // We need to use our and custom loaders.
-      preLoaders: [
-        ...customConfig.module.preLoaders || [],
-      ],
+      ...customConfig.module || {},
       loaders: [
         ...config.module.loaders,
         ...customConfig.module.loaders || [],