From c8bfbafe5d9c4cb8b4f0a7a18e405d11d7718fcf Mon Sep 17 00:00:00 2001 From: souhe Date: Thu, 28 Jan 2016 00:05:19 +0100 Subject: [PATCH] Fixed Object.assign() for Travis CI --- package.json | 1 + webpack.dev.config.js | 3 ++- webpack.production.config.js | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8e5ddcf..65d74b6 100644 --- 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 index b6d7840..ff0e969 100644 --- 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 index 1843641..5b896f8 100644 --- 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(),