From a6d77d07b461064deda6bdae308a0c70cacdd280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Sat, 8 Jan 2022 21:06:40 +0100 Subject: [PATCH] [babel 8] Remove `@babel/runtime@<=7.13.0` compat check (#14120) --- .../imports-hoisting/options.json | 2 +- .../interop-loose/imports-hoisting/output.js | 2 +- .../interop-loose/multi-load/options.json | 2 +- .../interop-loose/multi-load/output.js | 2 +- .../interop/imports-hoisting/options.json | 2 +- .../interop/imports-hoisting/output.js | 2 +- .../fixtures/interop/multi-load/options.json | 6 ++++- .../fixtures/interop/multi-load/output.js | 2 +- .../src/index.ts | 23 ++++++++++++------- .../absoluteRuntime/relative/options.json | 2 +- .../absoluteRuntime/relative/output.js | 4 ++-- .../true-use-es-modules/options.json | 2 +- .../true-use-es-modules/output.js | 4 ++-- .../absoluteRuntime/true/options.json | 2 +- .../fixtures/absoluteRuntime/true/output.js | 4 ++-- .../import-compiled-old-runtime/options.json | 1 + .../import-old-runtime/options.json | 1 + .../require-old-runtime/options.json | 1 + .../useESModules-old-runtime/options.json | 1 + .../runtime-corejs2/class/options.json | 5 +++- .../fixtures/runtime-corejs2/class/output.js | 4 ++-- .../modules-helpers/options.json | 2 +- .../runtime-corejs2/modules-helpers/output.js | 2 +- .../runtime-corejs2/modules/options.json | 2 +- .../runtime-corejs2/modules/output.js | 2 +- .../runtime-corejs3/class/options.json | 5 +++- .../fixtures/runtime-corejs3/class/output.js | 4 ++-- .../modules-helpers/options.json | 2 +- .../runtime-corejs3/modules-helpers/output.js | 2 +- .../modules-loose/options.json | 2 +- .../runtime-corejs3/modules-loose/output.js | 2 +- .../runtime-corejs3/modules/options.json | 2 +- .../runtime-corejs3/modules/output.js | 2 +- .../test/fixtures/runtime/class/options.json | 5 +++- .../test/fixtures/runtime/class/output.js | 4 ++-- .../runtime/modules-helpers/options.json | 2 +- .../runtime/modules-helpers/output.js | 2 +- .../fixtures/runtime/modules/options.json | 5 +++- .../test/fixtures/runtime/modules/output.js | 2 +- .../useESModules-cjs-auto/options.json | 2 +- .../useESModules-cjs-auto/output.js | 14 ++++------- .../use-options/useESModules-cjs/options.json | 2 +- .../use-options/useESModules-cjs/output.js | 14 ++++------- 43 files changed, 85 insertions(+), 70 deletions(-) diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/options.json index 264e555281..e4411dcac8 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/options.json @@ -1,7 +1,7 @@ { "externalHelpers": false, "plugins": [ - "transform-runtime", + ["transform-runtime", { "version": "7.100.0" }], "transform-template-literals", ["transform-modules-commonjs", { "loose": true }] ] diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/output.js index e7df6e2ab4..0f6a6e34bc 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/output.js @@ -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")); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/options.json index e2dad01fb9..e6c82dee6f 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/options.json @@ -2,7 +2,7 @@ "externalHelpers": false, "plugins": [ ["transform-modules-commonjs", { "loose": true }], - "transform-runtime", + ["transform-runtime", { "version": "7.100.0" }], "./plugin" ] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js index fc02ffa153..9b856482ff 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/output.js @@ -1,6 +1,6 @@ "use strict"; -var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault"); +var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault").default; exports.__esModule = true; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/options.json index facf2649e3..fb72682fa0 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/options.json @@ -1,7 +1,7 @@ { "externalHelpers": false, "plugins": [ - "transform-runtime", + ["transform-runtime", { "version": "7.100.0" }], "transform-template-literals", "transform-modules-commonjs" ] diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/output.js index e7df6e2ab4..0f6a6e34bc 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/output.js @@ -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")); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/options.json index ca9dde4856..b1df2c0b95 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/options.json @@ -1,4 +1,8 @@ { "externalHelpers": false, - "plugins": ["transform-modules-commonjs", "transform-runtime", "./plugin"] + "plugins": [ + "transform-modules-commonjs", + ["transform-runtime", { "version": "7.100.0" }], + "./plugin" + ] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js index 2e762d5306..a75a99c8a2 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/output.js @@ -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 diff --git a/packages/babel-plugin-transform-runtime/src/index.ts b/packages/babel-plugin-transform-runtime/src/index.ts index ebb54cbf11..23abb6565a 100644 --- a/packages/babel-plugin-transform-runtime/src/index.ts +++ b/packages/babel-plugin-transform-runtime/src/index.ts @@ -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); @@ -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, }); diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/options.json index 126af9dc11..01450ba531 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/options.json @@ -1,6 +1,6 @@ { "plugins": [ "transform-classes", - ["transform-runtime", { "absoluteRuntime": "./subfolder" }] + ["transform-runtime", { "absoluteRuntime": "./subfolder", "version": "7.100.0" }] ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/output.js index d63ee0b259..b70bf47a20 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/output.js @@ -1,6 +1,6 @@ -var _createClass = require("/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/subfolder/node_modules/@babel/runtime/helpers/createClass.js"); +var _createClass = require("/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/subfolder/node_modules/@babel/runtime/helpers/createClass.js").default; -var _classCallCheck = require("/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/relative/subfolder/node_modules/@babel/runtime/helpers/classCallCheck.js"); +var _classCallCheck = require("/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"; diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-use-es-modules/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-use-es-modules/options.json index 891cd52687..7723a6a764 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-use-es-modules/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-use-es-modules/options.json @@ -1,6 +1,6 @@ { "plugins": [ "transform-classes", - ["transform-runtime", { "absoluteRuntime": true, "useESModules": true }] + ["transform-runtime", { "absoluteRuntime": true, "useESModules": true, "version": "7.100.0" }] ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-use-es-modules/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-use-es-modules/output.js index 0fc6dc3135..1a94dee13f 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-use-es-modules/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-use-es-modules/output.js @@ -1,6 +1,6 @@ -var _createClass = require("/packages/babel-runtime/helpers/createClass.js"); +var _createClass = require("/packages/babel-runtime/helpers/createClass.js").default; -var _classCallCheck = require("/packages/babel-runtime/helpers/classCallCheck.js"); +var _classCallCheck = require("/packages/babel-runtime/helpers/classCallCheck.js").default; let Foo = /*#__PURE__*/_createClass(function Foo() { "use strict"; diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true/options.json index a8370f48c3..9b4d49306e 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true/options.json @@ -1,6 +1,6 @@ { "plugins": [ "transform-classes", - ["transform-runtime", { "absoluteRuntime": true }] + ["transform-runtime", { "absoluteRuntime": true, "version": "7.100.0" }] ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true/output.js index 0fc6dc3135..1a94dee13f 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true/output.js @@ -1,6 +1,6 @@ -var _createClass = require("/packages/babel-runtime/helpers/createClass.js"); +var _createClass = require("/packages/babel-runtime/helpers/createClass.js").default; -var _classCallCheck = require("/packages/babel-runtime/helpers/classCallCheck.js"); +var _classCallCheck = require("/packages/babel-runtime/helpers/classCallCheck.js").default; let Foo = /*#__PURE__*/_createClass(function Foo() { "use strict"; diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/import-compiled-old-runtime/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/import-compiled-old-runtime/options.json index 5ce56b1c41..6cae644c0a 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/import-compiled-old-runtime/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/import-compiled-old-runtime/options.json @@ -1,4 +1,5 @@ { + "BABEL_8_BREAKING": false, "plugins": [ "transform-runtime", "transform-classes", diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/import-old-runtime/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/import-old-runtime/options.json index 38c1e4364d..6c9ebe4178 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/import-old-runtime/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/import-old-runtime/options.json @@ -1,3 +1,4 @@ { + "BABEL_8_BREAKING": false, "plugins": ["transform-runtime", "transform-classes"] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/require-old-runtime/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/require-old-runtime/options.json index 38c1e4364d..6c9ebe4178 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/require-old-runtime/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/require-old-runtime/options.json @@ -1,3 +1,4 @@ { + "BABEL_8_BREAKING": false, "plugins": ["transform-runtime", "transform-classes"] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/useESModules-old-runtime/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/useESModules-old-runtime/options.json index 85e7d4c5c6..e2d32cf563 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/useESModules-old-runtime/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/useESModules-old-runtime/options.json @@ -1,4 +1,5 @@ { + "BABEL_8_BREAKING": false, "plugins": [ ["transform-runtime", { "useESModules": true }], "transform-classes" diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/class/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/class/options.json index 2972db7d1a..d9355c2cd4 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/class/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/class/options.json @@ -1,3 +1,6 @@ { - "plugins": [["transform-runtime", { "corejs": 2 }], "transform-classes"] + "plugins": [ + ["transform-runtime", { "corejs": 2, "version": "7.100.0" }], + "transform-classes" + ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/class/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/class/output.js index b59016a1c0..b9a1a3d34b 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/class/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/class/output.js @@ -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"; diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules-helpers/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules-helpers/options.json index 5d178b7e91..a185148cc2 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules-helpers/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules-helpers/options.json @@ -1,6 +1,6 @@ { "plugins": [ - ["transform-runtime", { "corejs": 2 }], + ["transform-runtime", { "corejs": 2, "version": "7.100.0" }], "transform-modules-commonjs", "transform-classes" ] diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules-helpers/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules-helpers/output.js index a76fee6466..aac2894984 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules-helpers/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules-helpers/output.js @@ -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")); diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/options.json index b1cff64aee..5dfa0d17be 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/options.json @@ -1,6 +1,6 @@ { "plugins": [ - ["transform-runtime", { "corejs": 2 }], + ["transform-runtime", { "corejs": 2, "version": "7.100.0" }], "transform-modules-commonjs" ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js index 74a5788edd..eb7e3ca604 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs2/modules/output.js @@ -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 diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/options.json index e7b25dd45e..4d32d2abf5 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/options.json @@ -1,3 +1,6 @@ { - "plugins": [["transform-runtime", { "corejs": 3 }], "transform-classes"] + "plugins": [ + ["transform-runtime", { "corejs": 3, "version": "7.100.0" }], + "transform-classes" + ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/output.js index 94ef25e73a..f222cdd368 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/class/output.js @@ -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"; diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/options.json index 364602872e..ff3325a473 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/options.json @@ -1,6 +1,6 @@ { "plugins": [ - ["transform-runtime", { "corejs": 3 }], + ["transform-runtime", { "corejs": 3, "version": "7.100.0" }], "transform-modules-commonjs", "transform-classes" ] diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/output.js index 0f285bd504..b1d42a5be3 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-helpers/output.js @@ -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")); diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/options.json index 259d5d9651..6fc666bb56 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/options.json @@ -1,6 +1,6 @@ { "plugins": [ - ["transform-runtime", { "corejs": 3 }], + ["transform-runtime", { "corejs": 3, "version": "7.100.0" }], ["transform-modules-commonjs", { "loose": true }] ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/output.js index 8fbedb2323..8d0bff31ea 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules-loose/output.js @@ -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 = { diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/options.json index 35b3816c5f..d933488265 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/options.json @@ -1,6 +1,6 @@ { "plugins": [ - ["transform-runtime", { "corejs": 3 }], + ["transform-runtime", { "corejs": 3, "version": "7.100.0" }], "transform-modules-commonjs" ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/output.js index 87dd127dc7..587b6b968a 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime-corejs3/modules/output.js @@ -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 diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/options.json index 38c1e4364d..228ff0612a 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/options.json @@ -1,3 +1,6 @@ { - "plugins": ["transform-runtime", "transform-classes"] + "plugins": [ + ["transform-runtime", { "version": "7.100.0" }], + "transform-classes" + ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/output.js index 8f10d38933..9b44cdc0c9 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/class/output.js @@ -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"; diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/options.json index c5691c9293..c61f9ad86c 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/options.json @@ -1,6 +1,6 @@ { "plugins": [ - "transform-runtime", + ["transform-runtime", { "version": "7.100.0" }], "transform-modules-commonjs", "transform-classes" ] diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/output.js index ea8efeab5c..47321a9034 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/output.js @@ -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")); diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/options.json index eebca61250..58cf92f965 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/options.json @@ -1,3 +1,6 @@ { - "plugins": ["transform-runtime", "transform-modules-commonjs"] + "plugins": [ + ["transform-runtime", { "version": "7.100.0" }], + "transform-modules-commonjs" + ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/output.js index 63f11cee72..642187efb6 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/output.js @@ -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 diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs-auto/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs-auto/options.json index ad753739a7..5850e6bd52 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs-auto/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs-auto/options.json @@ -4,7 +4,7 @@ "supportsStaticESM": true }, "plugins": [ - ["transform-runtime", { "useESModules": "auto" }], + ["transform-runtime", { "useESModules": "auto", "version": "7.100.0" }], "transform-classes" ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs-auto/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs-auto/output.js index 3c1e785b14..958a3f16d2 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs-auto/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs-auto/output.js @@ -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"; diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/options.json index 35cc8ccbfc..68030a89a4 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/options.json @@ -4,7 +4,7 @@ "supportsStaticESM": true }, "plugins": [ - ["transform-runtime", { "useESModules": true }], + ["transform-runtime", { "useESModules": true, "version": "7.100.0" }], "transform-classes" ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/output.js index 3c1e785b14..958a3f16d2 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/output.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/use-options/useESModules-cjs/output.js @@ -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";