ff-stream-web

commit 52802ef41d6912e7648e8bc92ebdf7b1c372d1b8
parent 243c60ce05414ddf0cacdef8f555d66ad5866f1e
Author: Konstantin Tarkus <koistya@gmail.com>
Date:   Thu, 13 Aug 2015 20:27:03 +0300

Merge pull request #206 from tadjik1/patch-1

fix problem with global define
Diffstat:
M
tools/config.js
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/config.js b/tools/config.js
@@ -115,7 +115,7 @@ const appConfig = merge({}, config, {
   devtool: DEBUG ? 'source-map' : false,
   plugins: [
     ...config.plugins,
-    new DefinePlugin(merge(GLOBALS, {'__SERVER__': false})),
+    new DefinePlugin(merge({}, GLOBALS, {'__SERVER__': false})),
     ...(DEBUG ? [] : [
       new webpack.optimize.DedupePlugin(),
       new webpack.optimize.UglifyJsPlugin({compress: {warnings: VERBOSE}}),
@@ -166,7 +166,7 @@ const serverConfig = merge({}, config, {
   devtool: DEBUG ? 'source-map' : 'cheap-module-source-map',
   plugins: [
     ...config.plugins,
-    new DefinePlugin(merge(GLOBALS, {'__SERVER__': true})),
+    new DefinePlugin(merge({}, GLOBALS, {'__SERVER__': true})),
     new BannerPlugin('require("source-map-support").install();',
       { raw: true, entryOnly: false })
   ],