Skip to content

Commit a6d77d0

Browse files
[babel 8] Remove @babel/runtime@<=7.13.0 compat check (#14120)
1 parent 910ece5 commit a6d77d0

File tree

43 files changed

+85
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+85
-70
lines changed

packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"externalHelpers": false,
33
"plugins": [
4-
"transform-runtime",
4+
["transform-runtime", { "version": "7.100.0" }],
55
"transform-template-literals",
66
["transform-modules-commonjs", { "loose": true }]
77
]

packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
3+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
44

55
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
66

packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"externalHelpers": false,
33
"plugins": [
44
["transform-modules-commonjs", { "loose": true }],
5-
"transform-runtime",
5+
["transform-runtime", { "version": "7.100.0" }],
66
"./plugin"
77
]
88
}

packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault");
3+
var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault").default;
44

55
exports.__esModule = true;
66

packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/options.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"externalHelpers": false,
33
"plugins": [
4-
"transform-runtime",
4+
["transform-runtime", { "version": "7.100.0" }],
55
"transform-template-literals",
66
"transform-modules-commonjs"
77
]

packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
3+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
44

55
var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
66

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
{
22
"externalHelpers": false,
3-
"plugins": ["transform-modules-commonjs", "transform-runtime", "./plugin"]
3+
"plugins": [
4+
"transform-modules-commonjs",
5+
["transform-runtime", { "version": "7.100.0" }],
6+
"./plugin"
7+
]
48
}

packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault");
3+
var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault").default;
44

55
Object.defineProperty(exports, "__esModule", {
66
value: true

packages/babel-plugin-transform-runtime/src/index.ts

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,14 @@ export default declare((api, options, dirname) => {
8585
throw new Error(`The 'version' option must be a version string.`);
8686
}
8787

88-
// In recent @babel/runtime versions, we can use require("helper").default
89-
// instead of require("helper") so that it has the same interface as the
90-
// ESM helper, and bundlers can better exchange one format for the other.
91-
// TODO(Babel 8): Remove this check, it's always true
92-
const DUAL_MODE_RUNTIME = "7.13.0";
93-
const supportsCJSDefault = hasMinVersion(DUAL_MODE_RUNTIME, runtimeVersion);
88+
if (!process.env.BABEL_8_BREAKING) {
89+
// In recent @babel/runtime versions, we can use require("helper").default
90+
// instead of require("helper") so that it has the same interface as the
91+
// ESM helper, and bundlers can better exchange one format for the other.
92+
const DUAL_MODE_RUNTIME = "7.13.0";
93+
// eslint-disable-next-line no-var
94+
var supportsCJSDefault = hasMinVersion(DUAL_MODE_RUNTIME, runtimeVersion);
95+
}
9496

9597
function has(obj, key) {
9698
return Object.prototype.hasOwnProperty.call(obj, key);
@@ -260,8 +262,13 @@ export default declare((api, options, dirname) => {
260262
cached = t.cloneNode(cached);
261263
} else {
262264
cached = addDefault(file.path, source, {
263-
importedInterop:
264-
isHelper && supportsCJSDefault ? "compiled" : "uncompiled",
265+
importedInterop: (
266+
process.env.BABEL_8_BREAKING
267+
? isHelper
268+
: isHelper && supportsCJSDefault
269+
)
270+
? "compiled"
271+
: "uncompiled",
265272
nameHint,
266273
blockHoist,
267274
});
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"plugins": [
33
"transform-classes",
4-
["transform-runtime", { "absoluteRuntime": "./subfolder" }]
4+
["transform-runtime", { "absoluteRuntime": "./subfolder", "version": "7.100.0" }]
55
]
66
}

0 commit comments

Comments
 (0)