Skip to content

Commit 3eb24fd

Browse files
nicolo-ribaudoliuxingbaoyu
nicolo-ribaudo
and
liuxingbaoyu
authored
Respect moduleName for @babel/runtime/regenerator imports (#16329)
Co-authored-by: Babel Bot <30521560+liuxingbaoyu@users.noreply.github.com>
1 parent 17ddd6b commit 3eb24fd

22 files changed

Lines changed: 134 additions & 80 deletions

File tree

‎packages/babel-plugin-proposal-decorators/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@babel/helper-plugin-test-runner": "workspace:^",
3333
"@babel/traverse": "workspace:^",
3434
"array.prototype.concat": "^1.0.2",
35-
"babel-plugin-polyfill-es-shims": "^0.10.2",
35+
"babel-plugin-polyfill-es-shims": "^0.10.4",
3636
"object.getownpropertydescriptors": "^2.1.1"
3737
},
3838
"engines": {

‎packages/babel-plugin-proposal-json-modules/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"devDependencies": {
4040
"@babel/core": "workspace:^",
4141
"@babel/helper-plugin-test-runner": "workspace:^",
42-
"babel-plugin-polyfill-corejs3": "^0.8.7"
42+
"babel-plugin-polyfill-corejs3": "^0.10.1"
4343
},
4444
"engines": {
4545
"node": ">=6.9.0"

‎packages/babel-plugin-transform-async-generator-functions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"devDependencies": {
2929
"@babel/core": "workspace:^",
3030
"@babel/helper-plugin-test-runner": "workspace:^",
31-
"babel-plugin-polyfill-corejs3": "^0.9.0",
31+
"babel-plugin-polyfill-corejs3": "^0.10.1",
3232
"core-js-pure": "^3.30.2"
3333
},
3434
"engines": {

‎packages/babel-plugin-transform-regenerator/src/index.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export default declare(({ types: t, assertVersion }) => {
1111
inherits: regeneratorTransform.default,
1212

1313
visitor: {
14-
// We visit MemberExpression so that we always transform
15-
// regeneratorRuntime before babel-plugin-polyfill-regenerator.
16-
MemberExpression(path) {
14+
// We visit CallExpression so that we always transform
15+
// regeneratorRuntime.*() before babel-plugin-polyfill-regenerator.
16+
CallExpression(path) {
1717
if (!process.env.BABEL_8_BREAKING) {
1818
if (!this.availableHelper?.("regeneratorRuntime")) {
1919
// When using an older @babel/helpers version, fallback
@@ -23,7 +23,10 @@ export default declare(({ types: t, assertVersion }) => {
2323
}
2424
}
2525

26-
const obj = path.get("object");
26+
const callee = path.get("callee");
27+
if (!callee.isMemberExpression()) return;
28+
29+
const obj = callee.get("object");
2730
if (obj.isIdentifier({ name: "regeneratorRuntime" })) {
2831
const helper = this.addHelper("regeneratorRuntime") as
2932
| t.Identifier

‎packages/babel-plugin-transform-runtime/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"dependencies": {
2323
"@babel/helper-module-imports": "workspace:^",
2424
"@babel/helper-plugin-utils": "workspace:^",
25-
"babel-plugin-polyfill-corejs2": "condition:BABEL_8_BREAKING ? : ^0.4.8 (peer:@babel/core)",
26-
"babel-plugin-polyfill-corejs3": "condition:BABEL_8_BREAKING ? : ^0.9.0 (peer:@babel/core)",
27-
"babel-plugin-polyfill-regenerator": "condition:BABEL_8_BREAKING ? : ^0.5.5 (peer:@babel/core)",
25+
"babel-plugin-polyfill-corejs2": "condition:BABEL_8_BREAKING ? : ^0.4.10 (peer:@babel/core)",
26+
"babel-plugin-polyfill-corejs3": "condition:BABEL_8_BREAKING ? : ^0.10.1 (peer:@babel/core)",
27+
"babel-plugin-polyfill-regenerator": "condition:BABEL_8_BREAKING ? : ^0.6.1 (peer:@babel/core)",
2828
"semver": "condition:BABEL_8_BREAKING ? ^7.3.4 : ^6.3.1"
2929
},
3030
"peerDependencies": {
@@ -37,7 +37,7 @@
3737
"@babel/preset-env": "workspace:^",
3838
"@babel/runtime": "workspace:^",
3939
"@babel/runtime-corejs3": "workspace:^",
40-
"babel-plugin-polyfill-corejs3": "^0.9.0",
40+
"babel-plugin-polyfill-corejs3": "^0.10.1",
4141
"make-dir": "condition:BABEL_8_BREAKING ? : ^2.1.0"
4242
},
4343
"homepage": "https://babel.dev/docs/en/next/babel-plugin-transform-runtime",

‎packages/babel-plugin-transform-runtime/src/babel-7/polyfills.cjs‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function createRegeneratorPlugin(options, useRuntimeRegenerator, corejsPlugin) {
3030
}
3131

3232
module.exports = function createBasePolyfillsPlugin(
33-
{ corejs, regenerator = true },
33+
{ corejs, regenerator = true, moduleName },
3434
runtimeVersion,
3535
absoluteImports,
3636
) {
@@ -70,7 +70,12 @@ module.exports = function createBasePolyfillsPlugin(
7070
method: "usage-pure",
7171
absoluteImports,
7272
proposals,
73-
[pluginsCompat]: { useBabelRuntime: true, runtimeVersion, ext: "" },
73+
[pluginsCompat]: {
74+
useBabelRuntime: true,
75+
runtimeVersion,
76+
ext: "",
77+
moduleName,
78+
},
7479
};
7580

7681
return createRegeneratorPlugin(

‎packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-regenerator-external/input.mjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
regeneratorRuntime.mark(function () {});

‎packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-regenerator-external/options.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"plugins": [
3+
"transform-regenerator",
4+
[
5+
"transform-runtime",
6+
{ "moduleName": "@babel/runtime", "regenerator": false }
7+
],
8+
["babel-plugin-polyfill-corejs3", { "method": "usage-global" }],
9+
["babel-plugin-polyfill-regenerator", { "method": "usage-global" }]
10+
]
11+
}

‎packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-regenerator-external/output.mjs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import "regenerator-runtime/runtime.js";
2+
regeneratorRuntime.mark(function () {});

‎packages/babel-plugin-transform-runtime/test/fixtures/moduleName/with-regenerator/input.mjs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
regeneratorRuntime.mark(function () {});

0 commit comments

Comments
 (0)