From a27d1b3d86f9d60aba52b52a90f7ff7827263976 Mon Sep 17 00:00:00 2001
From: Rushan <rushenn123@gmail.com>
Date: Wed, 15 Mar 2017 03:32:20 +0530
Subject: [PATCH] Browser: Use babel-polyfill to support new ES6 built-ins in
 older browsers (#3900)

---
 browser/app/index.js      | 2 --
 browser/package.json      | 2 +-
 browser/webpack.config.js | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/browser/app/index.js b/browser/app/index.js
index 5c2a33749..26a1cc1d3 100644
--- a/browser/app/index.js
+++ b/browser/app/index.js
@@ -44,8 +44,6 @@ import Web from './js/web'
 window.Web = Web
 
 import storage from 'local-storage-fallback'
-import objectAssign from 'es6-object-assign'
-objectAssign.polyfill()
 
 const store = applyMiddleware(thunkMiddleware)(createStore)(reducer)
 const Browse = connect(state => state)(_Browse)
diff --git a/browser/package.json b/browser/package.json
index a60f80759..227efdf5d 100644
--- a/browser/package.json
+++ b/browser/package.json
@@ -26,6 +26,7 @@
     "babel-loader": "^6.2.5",
     "babel-plugin-syntax-object-rest-spread": "^6.13.0",
     "babel-plugin-transform-object-rest-spread": "^6.8.0",
+    "babel-polyfill": "^6.23.0",
     "babel-preset-es2015": "^6.14.0",
     "babel-preset-react": "^6.11.1",
     "babel-register": "^6.14.0",
@@ -67,7 +68,6 @@
   "dependencies": {
     "bootstrap": "^3.3.6",
     "classnames": "^2.2.3",
-    "es6-object-assign": "^1.0.3",
     "font-awesome": "^4.7.0",
     "humanize": "0.0.9",
     "json-loader": "^0.5.4",
diff --git a/browser/webpack.config.js b/browser/webpack.config.js
index 769b84c56..b8e86ff94 100644
--- a/browser/webpack.config.js
+++ b/browser/webpack.config.js
@@ -22,6 +22,7 @@ var purify = require("purifycss-webpack-plugin")
 var exports = {
   context: __dirname,
   entry: [
+    "babel-polyfill",
     path.resolve(__dirname, 'app/index.js')
   ],
   output: {
@@ -100,6 +101,7 @@ 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')