Do not use deprecated @babel/polyfill - Close #429

5 files changed, 19 insertions, 17 deletions

diff --git a/js/bin/HttpServer.js b/js/bin/HttpServer.js
index 01ec47a6cca..26466bef266 100644
--- a/js/bin/HttpServer.js
+++ b/js/bin/HttpServer.js
@@ -70,7 +70,8 @@ function Init()
             var testpath = path.resolve(path.join(this._basePath, "test", matchController[1]))
             var worker = req.url.query.worker == "True";
             var scripts = es5 ? [
-                "/node_modules/@babel/polyfill/dist/polyfill.js",
+                "/node_modules/core-js-bundle/minified.js",
+                "/node_modules/regenerator-runtime/runtime.js",
                 "/lib/es5/Ice.js",
                 "/test/es5/Common/TestHelper.js",
                 "/test/es5/Common/Controller.js",
diff --git a/js/gulpfile.js b/js/gulpfile.js
index db89de90085..2726f074c90 100644
--- a/js/gulpfile.js
+++ b/js/gulpfile.js
@@ -370,7 +370,8 @@ gulp.task("test:common:babel",
 gulp.task("test:common:controllerworker",
           cb =>
           {
-              pump([gulp.src(["node_modules/@babel/polyfill/dist/polyfill.js",
+              pump([gulp.src(["node_modules/core-js-bundle/minified.js",
+                              "node_modules/regenerator-runtime/runtime.js",
                               "test/es5/Common/ControllerWorker.js"]),
                     concat("ControllerWorker.js"),
                     gulp.dest("test/es5/Common/")], cb);
diff --git a/js/package-lock.json b/js/package-lock.json
index 18668e10bbe..e0b017e6a6f 100644
--- a/js/package-lock.json
+++ b/js/package-lock.json
@@ -740,16 +740,6 @@
         "regexpu-core": "^4.5.4"
       }
     },
-    "@babel/polyfill": {
-      "version": "7.4.4",
-      "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.4.4.tgz",
-      "integrity": "sha512-WlthFLfhQQhh+A2Gn5NSFl0Huxz36x86Jn+E9OW7ibK8edKPq+KLy4apM1yDpQ8kJOVi1OVjpP4vSDLdrI04dg==",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.6.5",
-        "regenerator-runtime": "^0.13.2"
-      }
-    },
     "@babel/preset-env": {
       "version": "7.5.0",
       "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.5.0.tgz",
@@ -1662,9 +1652,15 @@
       }
     },
     "core-js": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz",
-      "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz",
+      "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==",
+      "dev": true
+    },
+    "core-js-bundle": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/core-js-bundle/-/core-js-bundle-3.1.4.tgz",
+      "integrity": "sha512-z6XvMCy2LH2LI31KttZd23n4UYoDx+P205iRamWsAZ2qRgr8stWmM7n5kMno/d+PucvPKpZZPb17caOSGjScVQ==",
       "dev": true
     },
     "core-js-compat": {
diff --git a/js/package.json b/js/package.json
index 6831be1df63..35ef4609401 100644
--- a/js/package.json
+++ b/js/package.json
@@ -20,9 +20,10 @@
     "@babel/cli": "^7.5.0",
     "@babel/core": "^7.5.0",
     "@babel/plugin-transform-async-to-generator": "^7.5.0",
-    "@babel/polyfill": "^7.4.4",
     "@babel/preset-env": "^7.5.0",
     "babel-plugin-rewrite-require": "^1.14.5",
+    "core-js": "^3.1.4",
+    "core-js-bundle": "^3.1.4",
     "del": "^3.0.0",
     "esprima": "^4.0.1",
     "gulp": "^4.0.2",
@@ -42,6 +43,7 @@
     "jshint": "^2.10.2",
     "plugin-error": "^1.0.1",
     "pump": "^3.0.0",
+    "regenerator-runtime": "^0.13.2",
     "rollup": "^1.16.6",
     "source-map": "^0.7.3",
     "through2": "^3.0.1",
diff --git a/js/src/es5/index.js b/js/src/es5/index.js
index 4955e6fc8ee..dcd714c820c 100644
--- a/js/src/es5/index.js
+++ b/js/src/es5/index.js
@@ -2,7 +2,9 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 
-require("@babel/polyfill");
+require("core-js/stable");
+require("regenerator-runtime/runtime");
+
 module.exports.Ice = require("./Ice/Ice").Ice;
 module.exports.IceMX = require("./Ice/Ice").IceMX;
 module.exports.IceSSL = require("./Ice/Ice").IceSSL;