Skip to content

Commit

Permalink
[babel 8] Remove @babel/runtime@<=7.13.0 compat check (#14120)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolo-ribaudo committed Jan 8, 2022
1 parent 910ece5 commit a6d77d0
Show file tree
Hide file tree
Showing 43 changed files with 85 additions and 70 deletions.
@@ -1,7 +1,7 @@
{
"externalHelpers": false,
"plugins": [
"transform-runtime",
["transform-runtime", { "version": "7.100.0" }],
"transform-template-literals",
["transform-modules-commonjs", { "loose": true }]
]
Expand Down
@@ -1,6 +1,6 @@
"use strict";

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

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

Expand Down
Expand Up @@ -2,7 +2,7 @@
"externalHelpers": false,
"plugins": [
["transform-modules-commonjs", { "loose": true }],
"transform-runtime",
["transform-runtime", { "version": "7.100.0" }],
"./plugin"
]
}
@@ -1,6 +1,6 @@
"use strict";

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

exports.__esModule = true;

Expand Down
@@ -1,7 +1,7 @@
{
"externalHelpers": false,
"plugins": [
"transform-runtime",
["transform-runtime", { "version": "7.100.0" }],
"transform-template-literals",
"transform-modules-commonjs"
]
Expand Down
@@ -1,6 +1,6 @@
"use strict";

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

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

Expand Down
@@ -1,4 +1,8 @@
{
"externalHelpers": false,
"plugins": ["transform-modules-commonjs", "transform-runtime", "./plugin"]
"plugins": [
"transform-modules-commonjs",
["transform-runtime", { "version": "7.100.0" }],
"./plugin"
]
}
@@ -1,6 +1,6 @@
"use strict";

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

Object.defineProperty(exports, "__esModule", {
value: true
Expand Down
23 changes: 15 additions & 8 deletions packages/babel-plugin-transform-runtime/src/index.ts
Expand Up @@ -85,12 +85,14 @@ export default declare((api, options, dirname) => {
throw new Error(`The 'version' option must be a version string.`);
}

// In recent @babel/runtime versions, we can use require("helper").default
// instead of require("helper") so that it has the same interface as the
// ESM helper, and bundlers can better exchange one format for the other.
// TODO(Babel 8): Remove this check, it's always true
const DUAL_MODE_RUNTIME = "7.13.0";
const supportsCJSDefault = hasMinVersion(DUAL_MODE_RUNTIME, runtimeVersion);
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
// ESM helper, and bundlers can better exchange one format for the other.
const DUAL_MODE_RUNTIME = "7.13.0";
// eslint-disable-next-line no-var
var supportsCJSDefault = hasMinVersion(DUAL_MODE_RUNTIME, runtimeVersion);
}

function has(obj, key) {
return Object.prototype.hasOwnProperty.call(obj, key);
Expand Down Expand Up @@ -260,8 +262,13 @@ export default declare((api, options, dirname) => {
cached = t.cloneNode(cached);
} else {
cached = addDefault(file.path, source, {
importedInterop:
isHelper && supportsCJSDefault ? "compiled" : "uncompiled",
importedInterop: (
process.env.BABEL_8_BREAKING
? isHelper
: isHelper && supportsCJSDefault
)
? "compiled"
: "uncompiled",
nameHint,
blockHoist,
});
Expand Down
@@ -1,6 +1,6 @@
{
"plugins": [
"transform-classes",
["transform-runtime", { "absoluteRuntime": "./subfolder" }]
["transform-runtime", { "absoluteRuntime": "./subfolder", "version": "7.100.0" }]
]
}
@@ -1,6 +1,6 @@
var _createClass = require("<CWD>/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/subfolder/node_modules/@babel/runtime/helpers/createClass.js");
var _createClass = require("<CWD>/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/subfolder/node_modules/@babel/runtime/helpers/createClass.js").default;

var _classCallCheck = require("<CWD>/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/subfolder/node_modules/@babel/runtime/helpers/classCallCheck.js");
var _classCallCheck = require("<CWD>/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/subfolder/node_modules/@babel/runtime/helpers/classCallCheck.js").default;

let Foo = /*#__PURE__*/_createClass(function Foo() {
"use strict";
Expand Down
@@ -1,6 +1,6 @@
{
"plugins": [
"transform-classes",
["transform-runtime", { "absoluteRuntime": true, "useESModules": true }]
["transform-runtime", { "absoluteRuntime": true, "useESModules": true, "version": "7.100.0" }]
]
}
@@ -1,6 +1,6 @@
var _createClass = require("<CWD>/packages/babel-runtime/helpers/createClass.js");
var _createClass = require("<CWD>/packages/babel-runtime/helpers/createClass.js").default;

var _classCallCheck = require("<CWD>/packages/babel-runtime/helpers/classCallCheck.js");
var _classCallCheck = require("<CWD>/packages/babel-runtime/helpers/classCallCheck.js").default;

let Foo = /*#__PURE__*/_createClass(function Foo() {
"use strict";
Expand Down
@@ -1,6 +1,6 @@
{
"plugins": [
"transform-classes",
["transform-runtime", { "absoluteRuntime": true }]
["transform-runtime", { "absoluteRuntime": true, "version": "7.100.0" }]
]
}
@@ -1,6 +1,6 @@
var _createClass = require("<CWD>/packages/babel-runtime/helpers/createClass.js");
var _createClass = require("<CWD>/packages/babel-runtime/helpers/createClass.js").default;

var _classCallCheck = require("<CWD>/packages/babel-runtime/helpers/classCallCheck.js");
var _classCallCheck = require("<CWD>/packages/babel-runtime/helpers/classCallCheck.js").default;

let Foo = /*#__PURE__*/_createClass(function Foo() {
"use strict";
Expand Down
@@ -1,4 +1,5 @@
{
"BABEL_8_BREAKING": false,
"plugins": [
"transform-runtime",
"transform-classes",
Expand Down
@@ -1,3 +1,4 @@
{
"BABEL_8_BREAKING": false,
"plugins": ["transform-runtime", "transform-classes"]
}
@@ -1,3 +1,4 @@
{
"BABEL_8_BREAKING": false,
"plugins": ["transform-runtime", "transform-classes"]
}
@@ -1,4 +1,5 @@
{
"BABEL_8_BREAKING": false,
"plugins": [
["transform-runtime", { "useESModules": true }],
"transform-classes"
Expand Down
@@ -1,3 +1,6 @@
{
"plugins": [["transform-runtime", { "corejs": 2 }], "transform-classes"]
"plugins": [
["transform-runtime", { "corejs": 2, "version": "7.100.0" }],
"transform-classes"
]
}
@@ -1,6 +1,6 @@
var _createClass = require("@babel/runtime-corejs2/helpers/createClass");
var _createClass = require("@babel/runtime-corejs2/helpers/createClass").default;

var _classCallCheck = require("@babel/runtime-corejs2/helpers/classCallCheck");
var _classCallCheck = require("@babel/runtime-corejs2/helpers/classCallCheck").default;

let Foo = /*#__PURE__*/_createClass(function Foo() {
"use strict";
Expand Down
@@ -1,6 +1,6 @@
{
"plugins": [
["transform-runtime", { "corejs": 2 }],
["transform-runtime", { "corejs": 2, "version": "7.100.0" }],
"transform-modules-commonjs",
"transform-classes"
]
Expand Down
@@ -1,6 +1,6 @@
"use strict";

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

var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck"));

Expand Down
@@ -1,6 +1,6 @@
{
"plugins": [
["transform-runtime", { "corejs": 2 }],
["transform-runtime", { "corejs": 2, "version": "7.100.0" }],
"transform-modules-commonjs"
]
}
Expand Up @@ -4,7 +4,7 @@ var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/defi

var _Object$keys = require("@babel/runtime-corejs2/core-js/object/keys");

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

_Object$defineProperty(exports, "__esModule", {
value: true
Expand Down
@@ -1,3 +1,6 @@
{
"plugins": [["transform-runtime", { "corejs": 3 }], "transform-classes"]
"plugins": [
["transform-runtime", { "corejs": 3, "version": "7.100.0" }],
"transform-classes"
]
}
@@ -1,6 +1,6 @@
var _createClass = require("@babel/runtime-corejs3/helpers/createClass");
var _createClass = require("@babel/runtime-corejs3/helpers/createClass").default;

var _classCallCheck = require("@babel/runtime-corejs3/helpers/classCallCheck");
var _classCallCheck = require("@babel/runtime-corejs3/helpers/classCallCheck").default;

let Foo = /*#__PURE__*/_createClass(function Foo() {
"use strict";
Expand Down
@@ -1,6 +1,6 @@
{
"plugins": [
["transform-runtime", { "corejs": 3 }],
["transform-runtime", { "corejs": 3, "version": "7.100.0" }],
"transform-modules-commonjs",
"transform-classes"
]
Expand Down
@@ -1,6 +1,6 @@
"use strict";

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

var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck"));

Expand Down
@@ -1,6 +1,6 @@
{
"plugins": [
["transform-runtime", { "corejs": 3 }],
["transform-runtime", { "corejs": 3, "version": "7.100.0" }],
["transform-modules-commonjs", { "loose": true }]
]
}
Expand Up @@ -6,7 +6,7 @@ var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/in

var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");

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

exports.__esModule = true;
var _exportNames = {
Expand Down
@@ -1,6 +1,6 @@
{
"plugins": [
["transform-runtime", { "corejs": 3 }],
["transform-runtime", { "corejs": 3, "version": "7.100.0" }],
"transform-modules-commonjs"
]
}
Expand Up @@ -8,7 +8,7 @@ var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/in

var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");

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

_Object$defineProperty(exports, "__esModule", {
value: true
Expand Down
@@ -1,3 +1,6 @@
{
"plugins": ["transform-runtime", "transform-classes"]
"plugins": [
["transform-runtime", { "version": "7.100.0" }],
"transform-classes"
]
}
@@ -1,6 +1,6 @@
var _createClass = require("@babel/runtime/helpers/createClass");
var _createClass = require("@babel/runtime/helpers/createClass").default;

var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
var _classCallCheck = require("@babel/runtime/helpers/classCallCheck").default;

let Foo = /*#__PURE__*/_createClass(function Foo() {
"use strict";
Expand Down
@@ -1,6 +1,6 @@
{
"plugins": [
"transform-runtime",
["transform-runtime", { "version": "7.100.0" }],
"transform-modules-commonjs",
"transform-classes"
]
Expand Down
@@ -1,6 +1,6 @@
"use strict";

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

var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));

Expand Down
@@ -1,3 +1,6 @@
{
"plugins": ["transform-runtime", "transform-modules-commonjs"]
"plugins": [
["transform-runtime", { "version": "7.100.0" }],
"transform-modules-commonjs"
]
}
@@ -1,6 +1,6 @@
"use strict";

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

Object.defineProperty(exports, "__esModule", {
value: true
Expand Down
Expand Up @@ -4,7 +4,7 @@
"supportsStaticESM": true
},
"plugins": [
["transform-runtime", { "useESModules": "auto" }],
["transform-runtime", { "useESModules": "auto", "version": "7.100.0" }],
"transform-classes"
]
}
@@ -1,16 +1,10 @@
var _createClass = require("@babel/runtime/helpers/createClass");
var _createClass = require("@babel/runtime/helpers/createClass").default;

var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
var _classCallCheck = require("@babel/runtime/helpers/classCallCheck").default;

var _inherits = require("@babel/runtime/helpers/inherits");
var _inherits = require("@babel/runtime/helpers/inherits").default;

var _possibleConstructorReturn = require("@babel/runtime/helpers/possibleConstructorReturn");

var _getPrototypeOf = require("@babel/runtime/helpers/getPrototypeOf");

function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }

function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
var _createSuper = require("@babel/runtime/helpers/createSuper").default;

let Foo = /*#__PURE__*/function (_Bar) {
"use strict";
Expand Down
Expand Up @@ -4,7 +4,7 @@
"supportsStaticESM": true
},
"plugins": [
["transform-runtime", { "useESModules": true }],
["transform-runtime", { "useESModules": true, "version": "7.100.0" }],
"transform-classes"
]
}

0 comments on commit a6d77d0

Please sign in to comment.