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 cb014def7c22..d17f42975dae 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,8 +1,8 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault.js"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); -var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral.js")); +var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral")); function _templateObject() { const data = (0, _taggedTemplateLiteral2.default)(["foo"]); 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 a14b440e0a15..fc02ffa1536e 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,9 +1,9 @@ "use strict"; -var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault.js"); +var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault"); exports.__esModule = true; -var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault.js")); +var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault")); console.log(_interopRequireDefault2.default); 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 cb014def7c22..d17f42975dae 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,8 +1,8 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault.js"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); -var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral.js")); +var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral")); function _templateObject() { const data = (0, _taggedTemplateLiteral2.default)(["foo"]); 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 ef2c4d88034a..2e762d530630 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,11 +1,11 @@ "use strict"; -var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault.js"); +var _interopRequireDefault3 = require("@babel/runtime/helpers/interopRequireDefault"); Object.defineProperty(exports, "__esModule", { value: true }); -var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault.js")); +var _interopRequireDefault2 = _interopRequireDefault3(require("@babel/runtime/helpers/interopRequireDefault")); console.log(_interopRequireDefault2.default); diff --git a/packages/babel-plugin-transform-modules-umd/src/index.js b/packages/babel-plugin-transform-modules-umd/src/index.js index 87ab37eff91d..33e3ce046b80 100644 --- a/packages/babel-plugin-transform-modules-umd/src/index.js +++ b/packages/babel-plugin-transform-modules-umd/src/index.js @@ -133,6 +133,10 @@ export default declare((api, options) => { return { name: "transform-modules-umd", + pre() { + this.file.set("@babel/plugin-transform-modules-*", "umd"); + }, + visitor: { Program: { exit(path) { diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/output.js b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/output.js index 2ec4fecf3982..43d65d4fefd1 100644 --- a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/output.js +++ b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/output.js @@ -1,4 +1,4 @@ -var _regeneratorRuntime = require("@babel/runtime/regenerator/index.js"); +var _regeneratorRuntime = require("@babel/runtime/regenerator/index"); var _marked = /*#__PURE__*/ diff --git a/packages/babel-plugin-transform-runtime/src/index.js b/packages/babel-plugin-transform-runtime/src/index.js index 532be2a590d4..9527c1dde738 100644 --- a/packages/babel-plugin-transform-runtime/src/index.js +++ b/packages/babel-plugin-transform-runtime/src/index.js @@ -254,7 +254,14 @@ export default declare((api, options, dirname) => { if (cached) { cached = t.cloneNode(cached); } else { - cached = addDefault(file.path, source, { + const moduleTransforms = file.get( + "@babel/plugin-transform-modules-*", + ); + // Remove the trailing `.js` requires by ES Module when module transforms presents + const validSource = moduleTransforms + ? source.replace(/\.js$/, "") + : source; + cached = addDefault(file.path, validSource, { importedInterop: "uncompiled", nameHint, blockHoist, 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 045066bf2dc5..8b91c079a609 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,10 +1,10 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault.js"); +var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault"); -var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck.js")); +var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/classCallCheck")); -var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass.js")); +var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs2/helpers/createClass")); var _foo = _interopRequireDefault(require("foo")); 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 79ad15d13c20..c3eab7f58ed2 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 @@ -1,10 +1,10 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault.js"); +var _interopRequireDefault = require("@babel/runtime-corejs2/helpers/interopRequireDefault"); -var _Object$keys = require("@babel/runtime-corejs2/core-js/object/keys.js"); +var _Object$keys = require("@babel/runtime-corejs2/core-js/object/keys"); -var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property.js"); +var _Object$defineProperty = require("@babel/runtime-corejs2/core-js/object/define-property"); _Object$defineProperty(exports, "__esModule", { value: true 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 1d71f49dc87c..cef08c661a7f 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,10 +1,10 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault.js"); +var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault"); -var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck.js")); +var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/classCallCheck")); -var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass.js")); +var _createClass2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/createClass")); var _foo = _interopRequireDefault(require("foo")); 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 7b6c4da4e724..2a1a8fe7aa92 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 @@ -1,12 +1,12 @@ "use strict"; -var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys.js"); +var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys"); -var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each.js"); +var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each"); var _context; -var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault.js"); +var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault"); exports.__esModule = true; var _exportNames = { 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 f429ca11c01d..75793607c414 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 @@ -1,14 +1,14 @@ "use strict"; -var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys.js"); +var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys"); -var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each.js"); +var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each"); var _context; -var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault.js"); +var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault"); -var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property.js"); +var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property"); _Object$defineProperty(exports, "__esModule", { value: true diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-amd/input.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-amd/input.mjs new file mode 100644 index 000000000000..368b10631035 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-amd/input.mjs @@ -0,0 +1,5 @@ +import foo from "foo"; + +class Example { + method() {} +} diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-amd/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-amd/options.json new file mode 100644 index 000000000000..34e94c31b3c2 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-amd/options.json @@ -0,0 +1,7 @@ +{ + "plugins": [ + "transform-runtime", + "transform-modules-amd", + "transform-classes" + ] +} diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-amd/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-amd/output.js new file mode 100644 index 000000000000..3bd4594a69e4 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-amd/output.js @@ -0,0 +1,23 @@ +define(["@babel/runtime/helpers/classCallCheck", "@babel/runtime/helpers/createClass", "foo"], function (_classCallCheck2, _createClass2, _foo) { + "use strict"; + + var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); + + _classCallCheck2 = _interopRequireDefault(_classCallCheck2); + _createClass2 = _interopRequireDefault(_createClass2); + _foo = _interopRequireDefault(_foo); + + let Example = + /*#__PURE__*/ + function () { + function Example() { + (0, _classCallCheck2.default)(this, Example); + } + + (0, _createClass2.default)(Example, [{ + key: "method", + value: function method() {} + }]); + return Example; + }(); +}); diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-commonjs/input.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-commonjs/input.mjs new file mode 100644 index 000000000000..368b10631035 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-commonjs/input.mjs @@ -0,0 +1,5 @@ +import foo from "foo"; + +class Example { + method() {} +} diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-commonjs/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-commonjs/options.json new file mode 100644 index 000000000000..c5691c929384 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-commonjs/options.json @@ -0,0 +1,7 @@ +{ + "plugins": [ + "transform-runtime", + "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-commonjs/output.js similarity index 84% rename from packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/output.js rename to packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-commonjs/output.js index 900ad7f56f43..7a95ad78e496 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-commonjs/output.js @@ -1,10 +1,10 @@ "use strict"; -var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault.js"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); -var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck.js")); +var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck")); -var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass.js")); +var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass")); var _foo = _interopRequireDefault(require("foo")); diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-systemjs/input.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-systemjs/input.mjs new file mode 100644 index 000000000000..368b10631035 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-systemjs/input.mjs @@ -0,0 +1,5 @@ +import foo from "foo"; + +class Example { + method() {} +} diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-systemjs/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-systemjs/options.json new file mode 100644 index 000000000000..34e94c31b3c2 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-systemjs/options.json @@ -0,0 +1,7 @@ +{ + "plugins": [ + "transform-runtime", + "transform-modules-amd", + "transform-classes" + ] +} diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-systemjs/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-systemjs/output.js new file mode 100644 index 000000000000..3bd4594a69e4 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-systemjs/output.js @@ -0,0 +1,23 @@ +define(["@babel/runtime/helpers/classCallCheck", "@babel/runtime/helpers/createClass", "foo"], function (_classCallCheck2, _createClass2, _foo) { + "use strict"; + + var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); + + _classCallCheck2 = _interopRequireDefault(_classCallCheck2); + _createClass2 = _interopRequireDefault(_createClass2); + _foo = _interopRequireDefault(_foo); + + let Example = + /*#__PURE__*/ + function () { + function Example() { + (0, _classCallCheck2.default)(this, Example); + } + + (0, _createClass2.default)(Example, [{ + key: "method", + value: function method() {} + }]); + return Example; + }(); +}); diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-umd/input.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-umd/input.mjs new file mode 100644 index 000000000000..368b10631035 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-umd/input.mjs @@ -0,0 +1,5 @@ +import foo from "foo"; + +class Example { + method() {} +} diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-umd/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-umd/options.json new file mode 100644 index 000000000000..bb6b326e112b --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-umd/options.json @@ -0,0 +1,7 @@ +{ + "plugins": [ + "transform-runtime", + "transform-modules-umd", + "transform-classes" + ] +} diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-umd/output.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-umd/output.js new file mode 100644 index 000000000000..e17a63c5a8f0 --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers-umd/output.js @@ -0,0 +1,35 @@ +(function (global, factory) { + if (typeof define === "function" && define.amd) { + define(["@babel/runtime/helpers/classCallCheck", "@babel/runtime/helpers/createClass", "foo"], factory); + } else if (typeof exports !== "undefined") { + factory(require("@babel/runtime/helpers/classCallCheck"), require("@babel/runtime/helpers/createClass"), require("foo")); + } else { + var mod = { + exports: {} + }; + factory(global.classCallCheck, global.createClass, global.foo); + global.input = mod.exports; + } +})(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function (_classCallCheck2, _createClass2, _foo) { + "use strict"; + + var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); + + _classCallCheck2 = _interopRequireDefault(_classCallCheck2); + _createClass2 = _interopRequireDefault(_createClass2); + _foo = _interopRequireDefault(_foo); + + let Example = + /*#__PURE__*/ + function () { + function Example() { + (0, _classCallCheck2.default)(this, Example); + } + + (0, _createClass2.default)(Example, [{ + key: "method", + value: function method() {} + }]); + return Example; + }(); +}); diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/input.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/input.mjs index 368b10631035..2643e8aecd07 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/input.mjs +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/input.mjs @@ -1,5 +1,6 @@ import foo from "foo"; class Example { - method() {} + property } + 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 c5691c929384..508ad099d119 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,7 +1,6 @@ { "plugins": [ "transform-runtime", - "transform-modules-commonjs", - "transform-classes" + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/output.mjs b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/output.mjs new file mode 100644 index 000000000000..7e81f2b2c3ec --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules-helpers/output.mjs @@ -0,0 +1,9 @@ +import _defineProperty from "@babel/runtime/helpers/defineProperty.js"; +import foo from "foo"; + +class Example { + constructor() { + _defineProperty(this, "property", void 0); + } + +} 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 eaa575fa1a59..260de19e94a1 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.js"); +var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault"); Object.defineProperty(exports, "__esModule", { value: true