bump json5, terser and webpack, further minimize babel helpers (#15833)

* bump json5, terser and webpack

* update built helpers

* update Makefile.js

* enable helpers mangling but keep fnames

* update test fixtures

packages/babel-core/package.json

@@ -59,7 +59,7 @@
     "convert-source-map": "^1.7.0",
     "debug": "^4.1.0",
     "gensync": "^1.0.0-beta.2",
-    "json5": "^2.2.2",
+    "json5": "^2.2.3",
     "semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : ^6.3.1"
   },
   "devDependencies": {

packages/babel-helpers/package.json

@@ -24,7 +24,7 @@
     "@babel/helper-plugin-test-runner": "workspace:^",
     "@babel/parser": "workspace:^",
     "regenerator-runtime": "^0.14.0",
-    "terser": "^5.9.0"
+    "terser": "^5.19.2"
   },
   "engines": {
     "node": ">=6.9.0"

packages/babel-helpers/scripts/generate-helpers.js

@@ -46,7 +46,7 @@ export default Object.freeze({
     const { minVersion } = minVersionMatch.groups;
 
     const source = await minify(fileContents, {
-      mangle: false,
+      mangle: { keep_fnames: true },
       // The _typeof helper has a custom directive that we must keep
       compress: { directives: false },
     });

packages/babel-preset-env/test/regressions.js

@@ -73,7 +73,7 @@ describe("regressions", () => {
         expect(consoleWarn).toHaveBeenCalled();
 
         expect(out.code).toMatchInlineSnapshot(`
-        "function _checkInRHS(value) { if (Object(value) !== value) throw TypeError(\\"right-hand side of 'in' should be an object, got \\" + (null !== value ? typeof value : \\"null\\")); return value; }
+        "function _checkInRHS(e) { if (Object(e) !== e) throw TypeError(\\"right-hand side of 'in' should be an object, got \\" + (null !== e ? typeof e : \\"null\\")); return e; }
         var _aBrandCheck = /*#__PURE__*/new WeakSet();
         class A {
           #a = void _aBrandCheck.add(this);

packages/babel-runtime-corejs2/helpers/typeof.js

@@ -1,12 +1,12 @@
 var _Symbol = require("core-js/library/fn/symbol/index.js");
 var _Symbol$iterator = require("core-js/library/fn/symbol/iterator.js");
-function _typeof(obj) {
+function _typeof(o) {
   "@babel/helpers - typeof";
 
-  return (module.exports = _typeof = "function" == typeof _Symbol && "symbol" == typeof _Symbol$iterator ? function (obj) {
-    return typeof obj;
-  } : function (obj) {
-    return obj && "function" == typeof _Symbol && obj.constructor === _Symbol && obj !== _Symbol.prototype ? "symbol" : typeof obj;
-  }, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(obj);
+  return (module.exports = _typeof = "function" == typeof _Symbol && "symbol" == typeof _Symbol$iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof _Symbol && o.constructor === _Symbol && o !== _Symbol.prototype ? "symbol" : typeof o;
+  }, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(o);
 }
 module.exports = _typeof, module.exports.__esModule = true, module.exports["default"] = module.exports;

packages/babel-runtime-corejs3/helpers/dispose.js

@@ -1,30 +1,30 @@
 var _SuppressedError = require("core-js-pure/features/suppressed-error.js");
 var _Object$create = require("core-js-pure/features/object/create.js");
 var _Promise = require("core-js-pure/features/promise/index.js");
-function dispose_SuppressedError(suppressed, error) {
-  return "undefined" != typeof _SuppressedError ? dispose_SuppressedError = _SuppressedError : (dispose_SuppressedError = function dispose_SuppressedError(suppressed, error) {
-    this.suppressed = suppressed, this.error = error, this.stack = new Error().stack;
+function dispose_SuppressedError(r, e) {
+  return "undefined" != typeof _SuppressedError ? dispose_SuppressedError = _SuppressedError : (dispose_SuppressedError = function dispose_SuppressedError(r, e) {
+    this.suppressed = r, this.error = e, this.stack = new Error().stack;
   }, dispose_SuppressedError.prototype = _Object$create(Error.prototype, {
     constructor: {
       value: dispose_SuppressedError,
       writable: !0,
       configurable: !0
     }
-  })), new dispose_SuppressedError(suppressed, error);
+  })), new dispose_SuppressedError(r, e);
 }
-function _dispose(stack, error, hasError) {
+function _dispose(r, e, s) {
   function next() {
-    for (; stack.length > 0;) try {
-      var r = stack.pop(),
-        p = r.d.call(r.v);
-      if (r.a) return _Promise.resolve(p).then(next, err);
-    } catch (e) {
-      return err(e);
+    for (; r.length > 0;) try {
+      var o = r.pop(),
+        p = o.d.call(o.v);
+      if (o.a) return _Promise.resolve(p).then(next, err);
+    } catch (r) {
+      return err(r);
     }
-    if (hasError) throw error;
+    if (s) throw e;
   }
-  function err(e) {
-    return error = hasError ? new dispose_SuppressedError(e, error) : e, hasError = !0, next();
+  function err(r) {
+    return e = s ? new dispose_SuppressedError(r, e) : r, s = !0, next();
   }
   return next();
 }

packages/babel-runtime/helpers/dispose.js

@@ -1,27 +1,27 @@
-function dispose_SuppressedError(suppressed, error) {
-  return "undefined" != typeof SuppressedError ? dispose_SuppressedError = SuppressedError : (dispose_SuppressedError = function dispose_SuppressedError(suppressed, error) {
-    this.suppressed = suppressed, this.error = error, this.stack = new Error().stack;
+function dispose_SuppressedError(r, e) {
+  return "undefined" != typeof SuppressedError ? dispose_SuppressedError = SuppressedError : (dispose_SuppressedError = function dispose_SuppressedError(r, e) {
+    this.suppressed = r, this.error = e, this.stack = new Error().stack;
   }, dispose_SuppressedError.prototype = Object.create(Error.prototype, {
     constructor: {
       value: dispose_SuppressedError,
       writable: !0,
       configurable: !0
     }
-  })), new dispose_SuppressedError(suppressed, error);
+  })), new dispose_SuppressedError(r, e);
 }
-function _dispose(stack, error, hasError) {
+function _dispose(r, e, s) {
   function next() {
-    for (; stack.length > 0;) try {
-      var r = stack.pop(),
-        p = r.d.call(r.v);
-      if (r.a) return Promise.resolve(p).then(next, err);
-    } catch (e) {
-      return err(e);
+    for (; r.length > 0;) try {
+      var o = r.pop(),
+        p = o.d.call(o.v);
+      if (o.a) return Promise.resolve(p).then(next, err);
+    } catch (r) {
+      return err(r);
     }
-    if (hasError) throw error;
+    if (s) throw e;
   }
-  function err(e) {
-    return error = hasError ? new dispose_SuppressedError(e, error) : e, hasError = !0, next();
+  function err(r) {
+    return e = s ? new dispose_SuppressedError(r, e) : r, s = !0, next();
   }
   return next();
 }

packages/babel-runtime/helpers/typeof.js

@@ -1,10 +1,10 @@
-function _typeof(obj) {
+function _typeof(o) {
   "@babel/helpers - typeof";
 
-  return (module.exports = _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
-    return typeof obj;
-  } : function (obj) {
-    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  }, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(obj);
+  return (module.exports = _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+  }, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(o);
 }
 module.exports = _typeof, module.exports.__esModule = true, module.exports["default"] = module.exports;

test/runtime-integration/webpack-5/package.json

@@ -4,7 +4,7 @@
   "exports": "./index.js",
   "devDependencies": {
     "@babel/runtime": "workspace:^",
-    "webpack": "^5.74.0",
+    "webpack": "^5.88.2",
     "webpack-cli": "^4.10.0"
   },
   "type": "commonjs"