From fbfb4fc5a0223300740a7db2e35e786d226d2ae1 Mon Sep 17 00:00:00 2001 From: Rushan Date: Wed, 22 Mar 2017 02:18:07 +0530 Subject: [PATCH] Browser: Use polyfill to support Object.assign in IE11 (#3942) --- browser/.babelrc | 15 ++++++++------- browser/app/index.js | 2 +- browser/webpack.config.js | 2 -- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/browser/.babelrc b/browser/.babelrc index 9cd3d553f..f9e96ea25 100644 --- a/browser/.babelrc +++ b/browser/.babelrc @@ -1,8 +1,9 @@ { - "presets": [ - "es2015", - "react" - ], - - "plugins": ["transform-object-rest-spread"] -} + "presets": [ + "es2015", + "react" + ], + "plugins": [ + "transform-object-rest-spread" + ] +} \ No newline at end of file diff --git a/browser/app/index.js b/browser/app/index.js index 26a1cc1d3..e0a0a6e11 100644 --- a/browser/app/index.js +++ b/browser/app/index.js @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import 'babel-polyfill' import './less/main.less' @@ -44,7 +45,6 @@ import Web from './js/web' window.Web = Web import storage from 'local-storage-fallback' - const store = applyMiddleware(thunkMiddleware)(createStore)(reducer) const Browse = connect(state => state)(_Browse) const Login = connect(state => state)(_Login) diff --git a/browser/webpack.config.js b/browser/webpack.config.js index b8e86ff94..769b84c56 100644 --- a/browser/webpack.config.js +++ b/browser/webpack.config.js @@ -22,7 +22,6 @@ var purify = require("purifycss-webpack-plugin") var exports = { context: __dirname, entry: [ - "babel-polyfill", path.resolve(__dirname, 'app/index.js') ], output: { @@ -101,7 +100,6 @@ var exports = { if (process.env.NODE_ENV === 'dev') { exports.entry = [ - "babel-polyfill", 'webpack/hot/dev-server', 'webpack-dev-server/client?http://localhost:8080', path.resolve(__dirname, 'app/index.js')