Allow separate helpers to be excluded in Babel 8 (#16323)

* helpers * fix env * fix test * update
babel · Mar 14, 2024 · c6cf0d7 · c6cf0d7
1 parent da821bd
commit c6cf0d7
Show file tree

Hide file tree

Showing 45 changed files with 95 additions and 72 deletions.
diff --git a/packages/babel-helpers/scripts/generate-helpers.js b/packages/babel-helpers/scripts/generate-helpers.js
@@ -6,6 +6,7 @@ import { minify } from "terser";
 import { transformSync } from "@babel/core";
 import presetTypescript from "@babel/preset-typescript";
 import { gzipSync } from "zlib";
+import { IS_BABEL_8 } from "$repo-utils";
 
 const HELPERS_FOLDER = new URL("../src/helpers", import.meta.url);
 const IGNORED_FILES = new Set(["package.json"]);
@@ -51,6 +52,10 @@ export default Object.freeze({
     }
     const { minVersion } = minVersionMatch.groups;
 
+    if (IS_BABEL_8() && code.includes("@onlyBabel7")) {
+      continue;
+    }
+
     const mangleFns = code.includes("@mangleFns");
     const noMangleFns = [];
 
@@ -101,7 +106,12 @@ export default Object.freeze({
           keep_fnames: mangleFns ? new RegExp(noMangleFns.join("|")) : true,
         },
         // The _typeof helper has a custom directive that we must keep
-        compress: { directives: false, passes: 10 },
+        compress: {
+          directives: false,
+          passes: 10,
+          unsafe: true,
+          unsafe_proto: true,
+        },
       })
     ).code;
 

diff --git a/packages/babel-helpers/src/helpers-generated.ts b/packages/babel-helpers/src/helpers-generated.ts
diff --git a/packages/babel-helpers/src/helpers/applyDecs.js b/packages/babel-helpers/src/helpers/applyDecs.js
@@ -1,4 +1,5 @@
 /* @minVersion 7.17.8 */
+/* @onlyBabel7 */
 
 import setFunctionName from "setFunctionName";
 import toPropertyKey from "toPropertyKey";

diff --git a/packages/babel-helpers/src/helpers/applyDecs2203.js b/packages/babel-helpers/src/helpers/applyDecs2203.js
@@ -1,4 +1,5 @@
 /* @minVersion 7.19.0 */
+/* @onlyBabel7 */
 
 /**
  * NOTE: This is an old version of the helper, used for 2022-03 decorators.

diff --git a/packages/babel-helpers/src/helpers/applyDecs2203R.js b/packages/babel-helpers/src/helpers/applyDecs2203R.js
@@ -1,4 +1,5 @@
 /* @minVersion 7.20.0 */
+/* @onlyBabel7 */
 
 import setFunctionName from "setFunctionName";
 import toPropertyKey from "toPropertyKey";

diff --git a/packages/babel-helpers/src/helpers/applyDecs2301.js b/packages/babel-helpers/src/helpers/applyDecs2301.js
@@ -1,4 +1,5 @@
 /* @minVersion 7.21.0 */
+/* @onlyBabel7 */
 
 import checkInRHS from "checkInRHS";
 import setFunctionName from "setFunctionName";

diff --git a/packages/babel-helpers/src/helpers/applyDecs2305.ts b/packages/babel-helpers/src/helpers/applyDecs2305.ts
@@ -1,5 +1,6 @@
 /* @minVersion 7.21.0 */
 /* @mangleFns */
+/* @onlyBabel7 */
 
 import checkInRHS from "./checkInRHS.ts";
 import setFunctionName from "./setFunctionName.ts";

diff --git a/packages/babel-helpers/src/helpers/dispose.js b/packages/babel-helpers/src/helpers/dispose.js
@@ -1,4 +1,6 @@
 /* @minVersion 7.22.0 */
+/* @onlyBabel7 */
+
 function dispose_SuppressedError(error, suppressed) {
   if (typeof SuppressedError !== "undefined") {
     // eslint-disable-next-line no-undef

diff --git a/packages/babel-helpers/src/helpers/using.js b/packages/babel-helpers/src/helpers/using.js
@@ -1,4 +1,5 @@
 /* @minVersion 7.22.0 */
+/* @onlyBabel7 */
 
 export default function _using(stack, value, isAwait) {
   if (value === null || value === void 0) return value;

diff --git a/...es/babel-helpers/test/fixtures/misc/declaration-name-conflict-helper-entrypoint/output.js b/...es/babel-helpers/test/fixtures/misc/declaration-name-conflict-helper-entrypoint/output.js
diff --git a/...babel-plugin-transform-async-generator-functions/test/fixtures/regression/13801/output.js b/...babel-plugin-transform-async-generator-functions/test/fixtures/regression/13801/output.js
diff --git a/...in-transform-class-properties/test/fixtures/public-loose/class-shadow-builtins/output.mjs b/...in-transform-class-properties/test/fixtures/public-loose/class-shadow-builtins/output.mjs
@@ -1,5 +1,5 @@
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class _TypeError2 {
   constructor() {

diff --git a/...l-plugin-transform-class-properties/test/fixtures/public/class-shadow-builtins/output.mjs b/...l-plugin-transform-class-properties/test/fixtures/public/class-shadow-builtins/output.mjs
@@ -1,5 +1,5 @@
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 class _TypeError2 {
   constructor() {

diff --git a/packages/babel-plugin-transform-class-static-block/test/plugin-ordering.test.js b/packages/babel-plugin-transform-class-static-block/test/plugin-ordering.test.js
@@ -22,7 +22,7 @@ describe("plugin ordering", () => {
     ).toMatchInlineSnapshot(`
       "var _Foo;
       function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-      function _toPropertyKey(t) { var i = _toPrimitive(t, \\"string\\"); return \\"symbol\\" == typeof i ? i : String(i); }
+      function _toPropertyKey(t) { var i = _toPrimitive(t, \\"string\\"); return \\"symbol\\" == typeof i ? i : i + \\"\\"; }
       function _toPrimitive(t, r) { if (\\"object\\" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || \\"default\\"); if (\\"object\\" != typeof i) return i; throw new TypeError(\\"@@toPrimitive must return a primitive value.\\"); } return (\\"string\\" === r ? String : Number)(t); }
       class Foo {}
       _Foo = Foo;

diff --git a/...-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters-star/output.js b/...-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters-star/output.js
@@ -7,4 +7,4 @@ exports.foo = void 0;
 var foo = _interopRequireWildcard(require("./moduleWithGetter"));
 exports.foo = foo;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
diff --git a/...babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters/output.js b/...babel-plugin-transform-modules-commonjs/test/fixtures/misc/copy-getters-setters/output.js
@@ -17,4 +17,4 @@ Object.defineProperty(exports, "baz", {
 });
 var _moduleWithGetter = _interopRequireWildcard(require("./moduleWithGetter"));
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
diff --git a/...s/babel-plugin-transform-modules-commonjs/test/fixtures/misc/import-const-throw/output.js b/...s/babel-plugin-transform-modules-commonjs/test/fixtures/misc/import-const-throw/output.js
@@ -4,7 +4,7 @@ var _foo = _interopRequireDefault(require("foo"));
 var Bar = _interopRequireWildcard(require("bar"));
 var _baz = require("baz");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 _foo.default = (42, function () {
   throw new Error('"' + "Foo" + '" is read-only.');

diff --git a/...abel-plugin-transform-modules-systemjs/test/fixtures/preset-env/requeue-helpers/output.js b/...abel-plugin-transform-modules-systemjs/test/fixtures/preset-env/requeue-helpers/output.js
@@ -6,7 +6,7 @@ System.register([], function (_export, _context) {
   function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
   function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
   function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
   function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
   function _typeof(o) { "@babel/helpers - typeof"; return _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; }, _typeof(o); }
   function objectWithPrimitive(prim) {