From 9769cbedf1b08dc8aca9f03a05cad434c509a05b Mon Sep 17 00:00:00 2001
From: Garrett Conaty <garrett@conaty.net>
Date: Tue, 14 Feb 2017 12:21:33 -0800
Subject: [PATCH] fix for webpack 2 DefinePlugin

---
 src/server/config/utils.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/server/config/utils.js b/src/server/config/utils.js
index 3241c7aa8f7c..082abc2d567a 100644
--- a/src/server/config/utils.js
+++ b/src/server/config/utils.js
@@ -41,8 +41,18 @@ export function loadEnv(options = {}) {
     .forEach((name) => {
       env[name] = process.env[name];
     });
-
-  return {
-    'process.env': JSON.stringify(env),
-  };
+  
+  if (webpackVersion == 2) {
+    Object.keys(env).forEach((name) => {
+      env[name] = JSON.stringify(env[name])
+    })
+    return {
+      'process.env': env
+    }
+  }
+  else {
+    return {
+      'process.env': JSON.stringify(env),
+    };
+  }
 }