Add back moduleName option to plugin-transform-runtime (#16241)

nicolo-ribaudo · web-flow · commit 82a936c315a3 · 2024-02-27T16:24:16.000+01:00
diff --git a/packages/babel-plugin-transform-runtime/src/index.ts b/packages/babel-plugin-transform-runtime/src/index.ts
@@ -14,6 +14,7 @@ export interface Options {
   corejs?: string | number | { version: string | number; proposals?: boolean };
   helpers?: boolean;
   version?: string;
+  moduleName?: null | string;
 }
 
 export default declare((api, options: Options, dirname) => {
@@ -27,6 +28,7 @@ export default declare((api, options: Options, dirname) => {
     helpers: useRuntimeHelpers = true,
     version: runtimeVersion = "7.0.0-beta.0",
     absoluteRuntime = false,
+    moduleName = null,
   } = options;
 
   if (typeof useRuntimeHelpers !== "boolean") {
@@ -46,6 +48,10 @@ export default declare((api, options: Options, dirname) => {
     throw new Error(`The 'version' option must be a version string.`);
   }
 
+  if (moduleName !== null && typeof moduleName !== "string") {
+    throw new Error("The 'moduleName' option must be null or a string.");
+  }
+
   if (!process.env.BABEL_8_BREAKING) {
     // In recent @babel/runtime versions, we can use require("helper").default
     // instead of require("helper") so that it has the same interface as the
@@ -85,15 +91,6 @@ export default declare((api, options: Options, dirname) => {
     }
   }
 
-  if (Object.hasOwn(options, "moduleName")) {
-    throw new Error(
-      "The 'moduleName' option has been removed. @babel/transform-runtime " +
-        "no longer supports arbitrary runtimes. If you were using this to " +
-        "set an absolute path for Babel's standard runtimes, please use the " +
-        "'absoluteRuntime' option.",
-    );
-  }
-
   if (process.env.BABEL_8_BREAKING) {
     if (Object.hasOwn(options, "regenerator")) {
       throw new Error(
@@ -157,7 +154,9 @@ export default declare((api, options: Options, dirname) => {
 
       file.set("helperGenerator", (name: string) => {
         modulePath ??= getRuntimePath(
-          file.get("runtimeHelpersModuleName") ?? "@babel/runtime",
+          moduleName ??
+            file.get("runtimeHelpersModuleName") ??
+            "@babel/runtime",
           dirname,
           absoluteRuntime,
         );
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/custom/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/custom/input.js
@@ -0,0 +1 @@
+class A {}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/custom/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/custom/options.json
@@ -0,0 +1,7 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "transform-classes",
+    ["transform-runtime", { "moduleName": "lol" }]
+  ]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/custom/output.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/custom/output.mjs
@@ -0,0 +1,5 @@
+import _createClass from "lol/helpers/createClass";
+import _classCallCheck from "lol/helpers/classCallCheck";
+let A = /*#__PURE__*/_createClass(function A() {
+  _classCallCheck(this, A);
+});
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/defaults-to-polyfill-provider/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/defaults-to-polyfill-provider/input.js
@@ -0,0 +1 @@
+class A {}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/defaults-to-polyfill-provider/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/defaults-to-polyfill-provider/options.json
@@ -0,0 +1,8 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "transform-classes",
+    ["transform-runtime", { "moduleName": null }],
+    ["babel-plugin-polyfill-corejs3", { "method": "usage-pure" }]
+  ]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/defaults-to-polyfill-provider/output.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/defaults-to-polyfill-provider/output.mjs
@@ -0,0 +1,5 @@
+import _createClass from "@babel/runtime-corejs3/helpers/createClass";
+import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
+let A = /*#__PURE__*/_createClass(function A() {
+  _classCallCheck(this, A);
+});
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/overwrite-polyfill-provider/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/overwrite-polyfill-provider/input.js
@@ -0,0 +1 @@
+class A {}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/overwrite-polyfill-provider/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/overwrite-polyfill-provider/options.json
@@ -0,0 +1,8 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "transform-classes",
+    ["transform-runtime", { "moduleName": "lol" }],
+    ["babel-plugin-polyfill-corejs3", { "method": "usage-pure" }]
+  ]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/overwrite-polyfill-provider/output.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/overwrite-polyfill-provider/output.mjs
@@ -0,0 +1,5 @@
+import _createClass from "lol/helpers/createClass";
+import _classCallCheck from "lol/helpers/classCallCheck";
+let A = /*#__PURE__*/_createClass(function A() {
+  _classCallCheck(this, A);
+});
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/input.js
@@ -0,0 +1 @@
+class A {}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/classCallCheck.js b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/classCallCheck.js
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/createClass.js b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/createClass.js
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/package.json b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/package.json
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/options.json
@@ -0,0 +1,7 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "transform-classes",
+    ["transform-runtime", { "moduleName": "lol", "absoluteRuntime": true }]
+  ]
+}
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/output.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/output.mjs
@@ -0,0 +1,5 @@
+import _createClass from "<CWD>/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/createClass.js";
+import _classCallCheck from "<CWD>/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/classCallCheck.js";
+let A = /*#__PURE__*/_createClass(function A() {
+  _classCallCheck(this, A);
+});
