From 08a6149c733c6c292fea2b60b63a7d9022bd983e Mon Sep 17 00:00:00 2001
From: Arunoda Susiripala <arunoda.susiripala@gmail.com>
Date: Sun, 15 Jan 2017 07:49:47 +0530
Subject: [PATCH] Update dist.

---
 dist/server/config.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dist/server/config.js b/dist/server/config.js
index 6e040f40d98a..7223fd32da10 100644
--- a/dist/server/config.js
+++ b/dist/server/config.js
@@ -60,6 +60,8 @@ exports.default = function (configType, baseConfig, configDir) {
   customConfig.module = customConfig.module || {};
 
   var newConfig = (0, _extends3.default)({}, customConfig, config, {
+    // Override with custom devtool if provided
+    devtool: customConfig.devtool || config.devtool,
     // 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, customConfig.module, {