Fixed Object.assign() for Travis CI

snphq · Jan 27, 2016 · c8bfbaf · c8bfbaf
1 parent d9c69d4
commit c8bfbaf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
     "less": "^2.5.1",
     "less-loader": "^2.2.1",
     "merge-stream": "^1.0.0",
+    "object-assign": "^4.0.1",
     "react-dom": "^0.14.0",
     "run-sequence": "^1.1.4",
     "style-loader": "^0.10.2",

diff --git a/webpack.dev.config.js b/webpack.dev.config.js
@@ -1,7 +1,8 @@
 'use strict'
 var baseConfig  = require('./webpack.base.config.js');
+var objectAssign = require('object-assign');
 
-var config = Object.assign({}, baseConfig);
+var config = objectAssign({}, baseConfig);
 
 config.devtool = "inline-source-map";
 

diff --git a/webpack.production.config.js b/webpack.production.config.js
@@ -2,8 +2,9 @@
 
 var webpack = require('webpack');
 var baseConfig  = require('./webpack.base.config.js');
+var objectAssign = require('object-assign');
 
-var config = Object.assign({}, baseConfig);
+var config = objectAssign({}, baseConfig);
 
 config.plugins = [
     new webpack.optimize.OccurenceOrderPlugin(),