Merge remote-tracking branch 'origin/master'

spolnik · spolnik · commit 2a4a767e1644 · 2018-09-21T15:30:25.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -87,6 +87,7 @@
     "@babel/plugin-proposal-class-properties": "^7.0.0-rc.1",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0-rc.1",
     "@babel/plugin-transform-modules-commonjs": "^7.0.0-rc.1",
+    "@babel/polyfill": "^7.0.0",
     "@babel/preset-env": "^7.0.0-rc.1",
     "@babel/preset-react": "^7.0.0-rc.1",
     "@babel/preset-typescript": "^7.0.0-rc.1",
diff --git a/src/client/index.tsx b/src/client/index.tsx
@@ -1,5 +1,6 @@
 import {updateConfig, websocketInit} from "./common/actions";
 
+import "@babel/polyfill";
 require('es6-promise').polyfill();
 
 import 'isomorphic-fetch';
diff --git a/webpack.client.config.js b/webpack.client.config.js
@@ -19,7 +19,7 @@ module.exports = {
     },
     entry: {
         vendors: "./src/client/vendors",
-        index: "./src/client/index"
+        index: ["@babel/polyfill", "./src/client/index"]
     },
     output: {
         path: path.resolve(__dirname, outputDirectory),
