babel · nicolo-ribaudo · Feb 15, 2023 · Feb 15, 2023
diff --git a/packages/babel-plugin-transform-runtime/src/index.ts b/packages/babel-plugin-transform-runtime/src/index.ts
@@ -30,6 +30,11 @@ export interface Options {
   regenerator?: boolean;
   useESModules?: boolean | "auto";
   version?: string;
+  moduleName?:
+    | "@babel/runtime"
+    | "@babel/runtime-corejs2"
+    | "@babel/runtime-corejs3"
+    | string;
 }
 
 interface CoreJS2PluginOptions {
@@ -71,6 +76,7 @@ export default declare((api, options: Options, dirname) => {
     useESModules = false,
     version: runtimeVersion = "7.0.0-beta.0",
     absoluteRuntime = false,
+    /* moduleName = ... default valued defined later */
   } = options;
 
   let proposals = false;
@@ -84,6 +90,16 @@ export default declare((api, options: Options, dirname) => {
   }
 
   const corejsVersion = rawVersion ? Number(rawVersion) : false;
+  const injectCoreJS2 = corejsVersion === 2;
+  const injectCoreJS3 = corejsVersion === 3;
+
+  const {
+    moduleName = injectCoreJS3
+      ? "@babel/runtime-corejs3"
+      : injectCoreJS2
+      ? "@babel/runtime-corejs2"
+      : "@babel/runtime",
+  } = options;
 
   if (![false, 2, 3].includes(corejsVersion)) {
     throw new Error(
@@ -171,27 +187,9 @@ export default declare((api, options: Options, dirname) => {
     }
   }
 
-  if (has(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.",
-    );
-  }
-
   const esModules =
     useESModules === "auto" ? api.caller(supportsStaticESM) : useESModules;
 
-  const injectCoreJS2 = corejsVersion === 2;
-  const injectCoreJS3 = corejsVersion === 3;
-
-  const moduleName = injectCoreJS3
-    ? "@babel/runtime-corejs3"
-    : injectCoreJS2
-    ? "@babel/runtime-corejs2"
-    : "@babel/runtime";
-
   const HEADER_HELPERS = ["interopRequireWildcard", "interopRequireDefault"];
 
   const modulePath = getRuntimePath(moduleName, dirname, absoluteRuntime);

diff --git a/...sform-runtime/test/fixtures/moduleName/core-js-in-helpers-with-polyfill-provider/input.js b/...sform-runtime/test/fixtures/moduleName/core-js-in-helpers-with-polyfill-provider/input.js
@@ -0,0 +1,3 @@
+class A {}
+
+Array.from(x);
diff --git a/...m-runtime/test/fixtures/moduleName/core-js-in-helpers-with-polyfill-provider/options.json b/...m-runtime/test/fixtures/moduleName/core-js-in-helpers-with-polyfill-provider/options.json
@@ -0,0 +1,8 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "transform-classes",
+    ["transform-runtime", { "moduleName": "@babel/runtime-corejs3" }],
+    ["babel-plugin-polyfill-corejs3", { "method": "usage-pure" }]
+  ]
+}
diff --git a/...orm-runtime/test/fixtures/moduleName/core-js-in-helpers-with-polyfill-provider/output.mjs b/...orm-runtime/test/fixtures/moduleName/core-js-in-helpers-with-polyfill-provider/output.mjs
@@ -0,0 +1,7 @@
+import _createClass from "@babel/runtime-corejs3/helpers/createClass";
+import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
+import _Array$from from "core-js-pure/stable/array/from.js";
+let A = /*#__PURE__*/_createClass(function A() {
+  _classCallCheck(this, A);
+});
+_Array$from(x);
diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/core-js-in-helpers/input.js b/packages/babel-plugin-transform-runtime/test/fixtures/moduleName/core-js-in-helpers/input.js
@@ -0,0 +1 @@
+class A {}
diff --git a/...s/babel-plugin-transform-runtime/test/fixtures/moduleName/core-js-in-helpers/options.json b/...s/babel-plugin-transform-runtime/test/fixtures/moduleName/core-js-in-helpers/options.json
@@ -0,0 +1,7 @@
+{
+  "sourceType": "module",
+  "plugins": [
+    "transform-classes",
+    ["transform-runtime", { "moduleName": "@babel/runtime-corejs3" }]
+  ]
+}
diff --git a/...ges/babel-plugin-transform-runtime/test/fixtures/moduleName/core-js-in-helpers/output.mjs b/...ges/babel-plugin-transform-runtime/test/fixtures/moduleName/core-js-in-helpers/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/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/...ges/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/input.js b/...ges/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/input.js
@@ -0,0 +1 @@
+class A {}
diff --git a/.../test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/classCallCheck.js b/.../test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/classCallCheck.js
diff --git a/...ime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/createClass.js b/...ime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/helpers/createClass.js
diff --git a/...sform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/package.json b/...sform-runtime/test/fixtures/moduleName/with-absoluteRuntime/node_modules/lol/package.json
diff --git a/...babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/options.json b/...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/...s/babel-plugin-transform-runtime/test/fixtures/moduleName/with-absoluteRuntime/output.mjs b/...s/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);
+});