diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-2892/expected.js b/packages/babel-core/test/fixtures/transformation/misc/regression-2892/expected.js index c60aac7133..cab001a0b6 100644 --- a/packages/babel-core/test/fixtures/transformation/misc/regression-2892/expected.js +++ b/packages/babel-core/test/fixtures/transformation/misc/regression-2892/expected.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/default-arrow-export/expected.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/default-arrow-export/expected.js index df13b1a462..d35d390792 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/default-arrow-export/expected.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/default-arrow-export/expected.js @@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = babelHelpers.asyncToGenerator(function* () { +exports.default = void 0; + +var _default = babelHelpers.asyncToGenerator(function* () { return yield foo(); }); + +exports.default = _default; diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/default-export/expected.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/default-export/expected.js index fd858fd374..1419a69982 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/default-export/expected.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/default-export/expected.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; let myFunc = (() => { var _ref = babelHelpers.asyncToGenerator(function* () {}); diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/import-and-export/expected.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/import-and-export/expected.js index 883285363e..05c71d3b83 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/import-and-export/expected.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/import-and-export/expected.js @@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", { }); exports.foo = void 0; -let foo = exports.foo = (() => { +var _bar = babelHelpers.interopRequireDefault(require("bar")); + +let foo = (() => { var _ref = babelHelpers.asyncToGenerator(function* () {}); return function foo() { @@ -13,6 +15,4 @@ let foo = exports.foo = (() => { }; })(); -var _bar = require("bar"); - -var _bar2 = babelHelpers.interopRequireDefault(_bar); +exports.foo = foo; diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/lone-export/expected.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/lone-export/expected.js index f8e524af4c..3a169b53d8 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/lone-export/expected.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/lone-export/expected.js @@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.foo = void 0; -let foo = exports.foo = (() => { +let foo = (() => { var _ref = babelHelpers.asyncToGenerator(function* () {}); return function foo() { return _ref.apply(this, arguments); }; })(); + +exports.foo = foo; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2663/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2663/expected.js index bc39f62003..1c2a731682 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2663/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2663/expected.js @@ -5,15 +5,11 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = void 0; -var _net = require("net"); - -var _net2 = babelHelpers.interopRequireDefault(_net); +var _net = babelHelpers.interopRequireDefault(require("net")); var _events = require("events"); -var _binarySerializer = require("./helpers/binary-serializer"); - -var _binarySerializer2 = babelHelpers.interopRequireDefault(_binarySerializer); +var _binarySerializer = babelHelpers.interopRequireDefault(require("./helpers/binary-serializer")); // import ... var Connection = @@ -35,7 +31,7 @@ function (_EventEmitter) { babelHelpers.createClass(Connection, [{ key: "send", value: function send(message) { - this.sock.write(_binarySerializer2.default.serializeMessage(message)); + this.sock.write(_binarySerializer.default.serializeMessage(message)); } }, { key: "disconnect", diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2694/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2694/expected.js index a2d9deefc8..ab5839f81d 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2694/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2694/expected.js @@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = void 0; -var _BaseFoo2 = require("./BaseFoo"); - -var _BaseFoo3 = babelHelpers.interopRequireDefault(_BaseFoo2); +var _BaseFoo2 = babelHelpers.interopRequireDefault(require("./BaseFoo")); var SubFoo = /*#__PURE__*/ @@ -27,6 +25,6 @@ function (_BaseFoo) { } }]); return SubFoo; -}(_BaseFoo3.default); +}(_BaseFoo2.default); exports.default = SubFoo; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2775/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2775/expected.js index 2ea1c99675..599a3a5438 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2775/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2775/expected.js @@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = void 0; -var _react = require("react"); - -var _react2 = babelHelpers.interopRequireDefault(_react); +var _react = babelHelpers.interopRequireDefault(require("react")); var RandomComponent = /*#__PURE__*/ @@ -22,9 +20,9 @@ function (_Component) { babelHelpers.createClass(RandomComponent, [{ key: "render", value: function render() { - return _react2.default.createElement("div", { + return _react.default.createElement("div", { className: "sui-RandomComponent" - }, _react2.default.createElement("h2", null, "Hi there!")); + }, _react.default.createElement("h2", null, "Hi there!")); } }]); return RandomComponent; diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2941/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2941/expected.js index 933d6c74f8..3e311d72a6 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2941/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/2941/expected.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; var _class = function _class() { babelHelpers.classCallCheck(this, _class); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/3028/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/3028/expected.js index f57d436de6..aa11c0529d 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/3028/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/3028/expected.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; var b = function b() { babelHelpers.classCallCheck(this, b); diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6750/expected.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6750/expected.js index 03d35bff33..dc1613a68f 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6750/expected.js +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/regression/T6750/expected.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = _default; function _default() { return ( @@ -20,5 +21,3 @@ function _default() { }() ); } - -exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-2/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-2/expected.js index e86a353cbc..c652c1e207 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-2/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-2/expected.js @@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; -exports.default = function () { +var _default = function _default() { return { x: function x(_ref) { var _x = _ref.x; } }; }; + +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-3/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-3/expected.js index 26194e8fa1..f7a52d1c29 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-3/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-3/expected.js @@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; -exports.default = function (_ref) { +var _default = function _default(_ref) { var _onClick = _ref.onClick; return React.createElement("div", { onClick: function onClick() { @@ -12,3 +13,5 @@ exports.default = function (_ref) { } }); }; + +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-es3/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-es3/expected.js index 16905a167a..53451a21ce 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-es3/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming-es3/expected.js @@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports["default"] = void 0; -exports["default"] = function (_a) { +var _default = function _default(_a) { return { a: function a() { return _a; } }; }; + +exports["default"] = _default; diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming/expected.js index fce6f22d2d..c1c4fcfeb3 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/export-default-arrow-renaming/expected.js @@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; -exports.default = function (_a) { +var _default = function _default(_a) { return { a: function a() { return _a; } }; }; + +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-2/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-2/expected.js index 4b675130c8..863ef1dec5 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-2/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules-2/expected.js @@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = void 0; -var _last2 = require("lodash/last"); - -var _last3 = babelHelpers.interopRequireDefault(_last2); +var _last2 = babelHelpers.interopRequireDefault(require("lodash/last")); let Container = /*#__PURE__*/ @@ -23,7 +21,7 @@ function () { return; } - return (0, _last3.default)(this.tokens.get(key)); + return (0, _last2.default)(this.tokens.get(key)); } }]); return Container; diff --git a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules/expected.js b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules/expected.js index 8b4988f106..43ca96ddf4 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules/expected.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/fixtures/function-name/modules/expected.js @@ -1,8 +1,6 @@ "use strict"; -var _events2 = require("events"); - -var _events3 = babelHelpers.interopRequireDefault(_events2); +var _events2 = babelHelpers.interopRequireDefault(require("events")); let Template = /*#__PURE__*/ @@ -14,7 +12,7 @@ function () { babelHelpers.createClass(Template, [{ key: "events", value: function events() { - return _events3.default; + return _events2.default; } }]); return Template; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/package.json b/packages/babel-plugin-transform-es2015-modules-commonjs/package.json index 2446cb7267..34287c087c 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/package.json +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/package.json @@ -6,8 +6,7 @@ "license": "MIT", "main": "lib/index.js", "dependencies": { - "babel-plugin-transform-strict-mode": "7.0.0-beta.0", - "babel-template": "7.0.0-beta.0", + "babel-helper-modules": "7.0.0-beta.0", "babel-types": "7.0.0-beta.0" }, "keywords": [ diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js b/packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js index 1ef20d4938..b12c8be3e4 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js @@ -1,609 +1,73 @@ -import { basename, extname } from "path"; -import template from "babel-template"; -import * as t from "babel-types"; -import transformStrictMode from "babel-plugin-transform-strict-mode"; - -const buildRequire = template(` - require($0); -`); - -const buildExportsModuleDeclaration = template(` - Object.defineProperty(exports, "__esModule", { - value: true - }); -`); - -const buildExportsFrom = template(` - Object.defineProperty(exports, $0, { - enumerable: true, - get: function () { - return $1; - } - }); -`); - -const buildLooseExportsModuleDeclaration = template(` - exports.__esModule = true; -`); - -const buildExportsAssignment = template(` - exports.$0 = $1; -`); - -const buildExportAll = template(` - Object.keys(OBJECT).forEach(function (key) { - if (key === "default" || key === "__esModule") return; - Object.defineProperty(exports, key, { - enumerable: true, - get: function () { - return OBJECT[key]; - } - }); - }); -`); - -const THIS_BREAK_KEYS = [ - "FunctionExpression", - "FunctionDeclaration", - "ClassProperty", - "ClassMethod", - "ObjectMethod", -]; - -export default function() { - const REASSIGN_REMAP_SKIP = Symbol(); - - const reassignmentVisitor = { - ReferencedIdentifier(path) { - const name = path.node.name; - const remap = this.remaps[name]; - if (!remap) return; - - // redeclared in this scope - if (this.scope.getBinding(name) !== path.scope.getBinding(name)) return; - - if (path.parentPath.isCallExpression({ callee: path.node })) { - path.replaceWith(t.sequenceExpression([t.numericLiteral(0), remap])); - } else if (path.isJSXIdentifier() && t.isMemberExpression(remap)) { - const { object, property } = remap; - path.replaceWith( - t.JSXMemberExpression( - t.JSXIdentifier(object.name), - t.JSXIdentifier(property.name), - ), - ); - } else { - path.replaceWith( - // Clone the node before inserting it to ensure that different nodes in the AST are represented - // by different objects. - t.cloneWithoutLoc(remap), - ); - } - this.requeueInParent(path); - }, - - AssignmentExpression(path) { - let node = path.node; - if (node[REASSIGN_REMAP_SKIP]) return; - - const left = path.get("left"); - if (left.isIdentifier()) { - const name = left.node.name; - const exports = this.exports[name]; - if (!exports) return; - - // redeclared in this scope - if (this.scope.getBinding(name) !== path.scope.getBinding(name)) return; - - node[REASSIGN_REMAP_SKIP] = true; - - for (const reid of exports) { - node = buildExportsAssignment(reid, node).expression; - } - - path.replaceWith(node); - this.requeueInParent(path); - } else if (left.isObjectPattern()) { - for (const property of left.node.properties) { - const name = property.value.name; - - const exports = this.exports[name]; - if (!exports) continue; - - // redeclared in this scope - if (this.scope.getBinding(name) !== path.scope.getBinding(name)) { - return; - } - - node[REASSIGN_REMAP_SKIP] = true; - - path.insertAfter( - buildExportsAssignment(t.identifier(name), t.identifier(name)), - ); - } - } else if (left.isArrayPattern()) { - for (const element of left.node.elements) { - if (!element) continue; - - const name = element.name; - - const exports = this.exports[name]; - if (!exports) continue; - - // redeclared in this scope - if (this.scope.getBinding(name) !== path.scope.getBinding(name)) { - return; - } - - node[REASSIGN_REMAP_SKIP] = true; - - path.insertAfter( - buildExportsAssignment(t.identifier(name), t.identifier(name)), - ); - } - } - }, - - UpdateExpression(path) { - const arg = path.get("argument"); - if (!arg.isIdentifier()) return; - - const name = arg.node.name; - const exports = this.exports[name]; - if (!exports) return; - - // redeclared in this scope - if (this.scope.getBinding(name) !== path.scope.getBinding(name)) return; - - const node = t.assignmentExpression( - path.node.operator[0] + "=", - arg.node, - t.numericLiteral(1), - ); - - if ( - (path.parentPath.isExpressionStatement() && - !path.isCompletionRecord()) || - path.node.prefix - ) { - path.replaceWith(node); - this.requeueInParent(path); - return; - } - - const nodes = []; - nodes.push(node); - - let operator; - if (path.node.operator === "--") { - operator = "+"; - } else { - // "++" - operator = "-"; - } - nodes.push(t.binaryExpression(operator, arg.node, t.numericLiteral(1))); - - path.replaceWithMultiple(t.sequenceExpression(nodes)); - }, - }; +import { + rewriteModuleStatementsAndPrepareHeader, + getSourceMetadataArray, + buildNamespaceInitStatements, + ensureStatementsHoisted, + wrapInterop, +} from "babel-helper-modules"; +export default function({ types: t }) { return { - inherits: transformStrictMode, - visitor: { - ThisExpression(path, state) { - // If other plugins run after this plugin's Program#exit handler, we allow them to - // insert top-level `this` values. This allows the AMD and UMD plugins to - // function properly. - if (this.ranCommonJS) return; - - if ( - state.opts.allowTopLevelThis !== true && - !path.findParent(path => THIS_BREAK_KEYS.indexOf(path.type) >= 0) - ) { - path.replaceWith(path.scope.buildUndefinedNode()); - } - }, - Program: { - exit(path) { - this.ranCommonJS = true; + exit(path, state) { + const { + loose, + allowTopLevelThis, + strict, + strictMode, + noInterop, + } = state.opts; - const strict = !!this.opts.strict; - const noInterop = !!this.opts.noInterop; + // Rename the bindings auto-injected into the scope so there is no + // risk of conflict between the bindings. + path.scope.rename("exports"); + path.scope.rename("module"); + path.scope.rename("require"); + path.scope.rename("__filename"); + path.scope.rename("__dirname"); - const { scope } = path; + let moduleName = this.getModuleName(); + if (moduleName) moduleName = t.stringLiteral(moduleName); - // rename these commonjs variables if they're declared in the file - scope.rename("module"); - scope.rename("exports"); - scope.rename("require"); + const { + meta, + headers, + } = rewriteModuleStatementsAndPrepareHeader(path, { + exportName: "exports", + loose, + strict, + strictMode, + allowTopLevelThis, + noInterop, + }); - let hasExports = false; - let hasImports = false; - - const body: Array = path.get("body"); - const imports = Object.create(null); - const exports = Object.create(null); - - const nonHoistedExportNames = Object.create(null); - - const topNodes = []; - const remaps = Object.create(null); - - const requires = Object.create(null); - - function addRequire(source, blockHoist) { - const cached = requires[source]; - if (cached) return cached; - - const ref = path.scope.generateUidIdentifier( - basename(source, extname(source)), - ); - - const varDecl = t.variableDeclaration("var", [ - t.variableDeclarator( - ref, - buildRequire(t.stringLiteral(source)).expression, - ), + getSourceMetadataArray( + meta, + ).forEach(([source, metadata, isSideEffect]) => { + const loadExpr = t.callExpression(t.identifier("require"), [ + t.stringLiteral(source), ]); - // Copy location from the original import statement for sourcemap - // generation. - if (imports[source]) { - varDecl.loc = imports[source].loc; - } - - if (typeof blockHoist === "number" && blockHoist > 0) { - varDecl._blockHoist = blockHoist; - } - - topNodes.push(varDecl); - - return (requires[source] = ref); - } - - function addTo(obj, key, arr) { - const existing = obj[key] || []; - obj[key] = existing.concat(arr); - } - - for (const path of body) { - if (path.isExportDeclaration()) { - hasExports = true; - - const specifiers = [].concat( - path.get("declaration"), - path.get("specifiers"), - ); - for (const specifier of specifiers) { - const ids = specifier.getBindingIdentifiers(); - if (ids.__esModule) { - throw specifier.buildCodeFrameError( - 'Illegal export "__esModule"', - ); - } - } - } - - if (path.isImportDeclaration()) { - hasImports = true; - - const key = path.node.source.value; - const importsEntry = imports[key] || { - specifiers: [], - maxBlockHoist: 0, - loc: path.node.loc, - }; - - importsEntry.specifiers.push(...path.node.specifiers); - - if (typeof path.node._blockHoist === "number") { - importsEntry.maxBlockHoist = Math.max( - path.node._blockHoist, - importsEntry.maxBlockHoist, - ); - } - - imports[key] = importsEntry; - - path.remove(); - } else if (path.isExportDefaultDeclaration()) { - const declaration = path.get("declaration"); - if (declaration.isFunctionDeclaration()) { - const id = declaration.node.id; - const defNode = t.identifier("default"); - if (id) { - addTo(exports, id.name, defNode); - topNodes.push(buildExportsAssignment(defNode, id)); - path.replaceWith(declaration.node); - } else { - topNodes.push( - buildExportsAssignment( - defNode, - t.toExpression(declaration.node), - ), - ); - path.remove(); - } - } else if (declaration.isClassDeclaration()) { - const id = declaration.node.id; - const defNode = t.identifier("default"); - if (id) { - addTo(exports, id.name, defNode); - path.replaceWithMultiple([ - declaration.node, - buildExportsAssignment(defNode, id), - ]); - } else { - path.replaceWith( - buildExportsAssignment( - defNode, - t.toExpression(declaration.node), - ), - ); - - // Manualy re-queue `export default class {}` expressions so that the ES3 transform - // has an opportunity to convert them. Ideally this would happen automatically from the - // replaceWith above. See #4140 for more info. - path.parentPath.requeue(path.get("expression.left")); - } - } else { - path.replaceWith( - buildExportsAssignment( - t.identifier("default"), - declaration.node, - ), - ); - - // Manualy re-queue `export default foo;` expressions so that the ES3 transform - // has an opportunity to convert them. Ideally this would happen automatically from the - // replaceWith above. See #4140 for more info. - path.parentPath.requeue(path.get("expression.left")); - } - } else if (path.isExportNamedDeclaration()) { - const declaration = path.get("declaration"); - if (declaration.node) { - if (declaration.isFunctionDeclaration()) { - const id = declaration.node.id; - addTo(exports, id.name, id); - topNodes.push(buildExportsAssignment(id, id)); - path.replaceWith(declaration.node); - } else if (declaration.isClassDeclaration()) { - const id = declaration.node.id; - addTo(exports, id.name, id); - path.replaceWithMultiple([ - declaration.node, - buildExportsAssignment(id, id), - ]); - nonHoistedExportNames[id.name] = true; - } else if (declaration.isVariableDeclaration()) { - const ids = declaration.getBindingIdentifierPaths(); - const exportsToInsert = []; - for (const name in ids) { - const id = ids[name]; - const { parentPath, node } = id; - - addTo(exports, name, node); - nonHoistedExportNames[name] = true; - - if (parentPath.isVariableDeclarator()) { - const init = parentPath.get("init"); - const assignment = buildExportsAssignment( - node, - init.node || path.scope.buildUndefinedNode(), - ); - init.replaceWith(assignment.expression); - } else { - exportsToInsert.push(buildExportsAssignment(node, node)); - } - } - path.insertAfter(exportsToInsert); - path.replaceWith(declaration.node); - } - continue; - } - - const specifiers = path.get("specifiers"); - const nodes = []; - const source = path.node.source; - if (source) { - const ref = addRequire(source.value, path.node._blockHoist); - - for (const specifier of specifiers) { - if (specifier.isExportNamespaceSpecifier()) { - // todo - } else if (specifier.isExportDefaultSpecifier()) { - // todo - } else if (specifier.isExportSpecifier()) { - if (!noInterop && specifier.node.local.name === "default") { - topNodes.push( - buildExportsFrom( - t.stringLiteral(specifier.node.exported.name), - t.memberExpression( - t.callExpression( - this.addHelper("interopRequireDefault"), - [ref], - ), - specifier.node.local, - ), - ), - ); - } else { - topNodes.push( - buildExportsFrom( - t.stringLiteral(specifier.node.exported.name), - t.memberExpression(ref, specifier.node.local), - ), - ); - } - nonHoistedExportNames[specifier.node.exported.name] = true; - } - } - } else { - for (const specifier of specifiers) { - if (specifier.isExportSpecifier()) { - addTo( - exports, - specifier.node.local.name, - specifier.node.exported, - ); - nonHoistedExportNames[specifier.node.exported.name] = true; - nodes.push( - buildExportsAssignment( - specifier.node.exported, - specifier.node.local, - ), - ); - } - } - } - path.replaceWithMultiple(nodes); - } else if (path.isExportAllDeclaration()) { - const exportNode = buildExportAll({ - OBJECT: addRequire( - path.node.source.value, - path.node._blockHoist, - ), - }); - exportNode.loc = path.node.loc; - topNodes.push(exportNode); - path.remove(); - } - } - - for (const source in imports) { - const { specifiers, maxBlockHoist } = imports[source]; - if (specifiers.length) { - const uid = addRequire(source, maxBlockHoist); - - let wildcard; - - for (let i = 0; i < specifiers.length; i++) { - const specifier = specifiers[i]; - if (t.isImportNamespaceSpecifier(specifier)) { - if (strict || noInterop) { - remaps[specifier.local.name] = uid; - } else { - const varDecl = t.variableDeclaration("var", [ - t.variableDeclarator( - specifier.local, - t.callExpression( - this.addHelper("interopRequireWildcard"), - [uid], - ), - ), - ]); - - if (maxBlockHoist > 0) { - varDecl._blockHoist = maxBlockHoist; - } - - topNodes.push(varDecl); - } - wildcard = specifier.local; - } else if (t.isImportDefaultSpecifier(specifier)) { - specifiers[i] = t.importSpecifier( - specifier.local, - t.identifier("default"), - ); - } - } - - for (const specifier of specifiers) { - if (t.isImportSpecifier(specifier)) { - let target = uid; - if (specifier.imported.name === "default") { - if (wildcard) { - target = wildcard; - } else if (!noInterop) { - target = wildcard = path.scope.generateUidIdentifier( - uid.name, - ); - const varDecl = t.variableDeclaration("var", [ - t.variableDeclarator( - target, - t.callExpression( - this.addHelper("interopRequireDefault"), - [uid], - ), - ), - ]); - - if (maxBlockHoist > 0) { - varDecl._blockHoist = maxBlockHoist; - } - - topNodes.push(varDecl); - } - } - remaps[specifier.local.name] = t.memberExpression( - target, - t.cloneWithoutLoc(specifier.imported), - ); - } - } + let header; + if (isSideEffect) { + header = t.expressionStatement(loadExpr); } else { - // bare import - const requireNode = buildRequire(t.stringLiteral(source)); - requireNode.loc = imports[source].loc; - topNodes.push(requireNode); + header = t.variableDeclaration("var", [ + t.variableDeclarator( + t.identifier(metadata.name), + wrapInterop(path, loadExpr, metadata.interop) || loadExpr, + ), + ]); } - } + header.loc = metadata.loc; - if (hasImports && Object.keys(nonHoistedExportNames).length) { - // avoid creating too long of export assignment to prevent stack overflow - const maxHoistedExportsNodeAssignmentLength = 100; - const nonHoistedExportNamesArr = Object.keys(nonHoistedExportNames); - - for ( - let currentExportsNodeAssignmentLength = 0; - currentExportsNodeAssignmentLength < - nonHoistedExportNamesArr.length; - currentExportsNodeAssignmentLength += maxHoistedExportsNodeAssignmentLength - ) { - const nonHoistedExportNamesChunk = nonHoistedExportNamesArr.slice( - currentExportsNodeAssignmentLength, - currentExportsNodeAssignmentLength + - maxHoistedExportsNodeAssignmentLength, - ); - - let hoistedExportsNode = scope.buildUndefinedNode(); - - nonHoistedExportNamesChunk.forEach(function(name) { - hoistedExportsNode = buildExportsAssignment( - t.identifier(name), - hoistedExportsNode, - ).expression; - }); - - const node = t.expressionStatement(hoistedExportsNode); - node._blockHoist = 3; - - topNodes.unshift(node); - } - } - - // add __esModule declaration if this file has any exports - if (hasExports && !strict) { - let buildTemplate = buildExportsModuleDeclaration; - if (this.opts.loose) { - buildTemplate = buildLooseExportsModuleDeclaration; - } - - const declar = buildTemplate(); - declar._blockHoist = 3; - - topNodes.unshift(declar); - } - - path.unshiftContainer("body", topNodes); - path.traverse(reassignmentVisitor, { - remaps, - scope, - exports, - requeueInParent: newPath => path.requeue(newPath), + headers.push(header); + headers.push(...buildNamespaceInitStatements(meta, metadata)); }); + + ensureStatementsHoisted(headers); + path.unshiftContainer("body", headers); }, }, }, diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/copied-nodes.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/copied-nodes.js index ee0c38fec5..8fb72e3db8 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/copied-nodes.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/copied-nodes.js @@ -8,12 +8,26 @@ test("Doesn't use the same object for two different nodes in the AST", function( plugins: [[require("../"), { loose: true }]], }).ast; + assert.equal(ast.program.body[0].declarations[0].id.type, "Identifier"); + assert.equal(ast.program.body[2].expression.type, "MemberExpression"); + assert.equal(ast.program.body[2].expression.object.type, "Identifier"); assert.equal(ast.program.body[3].expression.type, "MemberExpression"); - assert.equal(ast.program.body[4].expression.type, "MemberExpression"); + assert.equal(ast.program.body[3].expression.object.type, "Identifier"); - assert.notEqual( - ast.program.body[3].expression, - ast.program.body[4].expression, - "Expected different nodes in the AST to not be the same object", + assert.notStrictEqual( + ast.program.body[2].expression.object, + ast.program.body[3].expression.object, + "Expected different nodes in the AST to not be the same object (one)", + ); + + assert.notStrictEqual( + ast.program.body[0].declarations[0].id, + ast.program.body[3].expression.object, + "Expected different nodes in the AST to not be the same object (two)", + ); + assert.notStrictEqual( + ast.program.body[0].declarations[0].id, + ast.program.body[2].expression.object, + "Expected different nodes in the AST to not be the same object (three)", ); }); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/actual.js index 57240b883c..fba80306cd 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/actual.js @@ -6,6 +6,7 @@ import * as foo2 from "foo3"; import {bar} from "foo4"; import {foo as bar2} from "foo5"; +var test; export {test}; export var test2 = 5; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/expected.js index c615e629a4..5ce6650470 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/auxiliary-comment/overview/expected.js @@ -25,25 +25,16 @@ require("./directory/foo-bar") var /*before*/ -_foo = require("foo2") +_foo2 = babelHelpers.interopRequireDefault(require("foo2")) /*after*/ ; -/*before*/ -var _foo2 = babelHelpers.interopRequireDefault(_foo); - -/*after*/ var /*before*/ -_foo3 = require("foo3") +foo2 = babelHelpers.interopRequireWildcard(require("foo3")) /*after*/ ; -/*before*/ -var -/*after*/ -foo2 = babelHelpers.interopRequireWildcard(_foo3); - var /*before*/ _foo4 = require("foo4") @@ -56,15 +47,18 @@ _foo5 = require("foo5") /*after*/ ; +var test; + /*before*/ -exports. +exports.test = test; + /*after*/ -test = test; -var test2 = +var test2 = 5; + /*before*/ -exports. +exports.test2 = test2; + /*after*/ -test2 = 5; /*before*/ (0, _foo4.bar) diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-10/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-10/expected.js index e5fc96fa9d..7c27427bd4 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-10/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-10/expected.js @@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; -exports.default = function () { +var _default = function () { return "foo"; }(); + +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-11/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-11/expected.js index 858fd6f311..c25c5529c1 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-11/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-11/expected.js @@ -4,6 +4,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.Cachier = Cachier; -exports.default = new Cachier(); +exports.default = void 0; + +var _default = new Cachier(); + +exports.default = _default; function Cachier(databaseName) {} diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-2/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-2/expected.js index 2e3913b6f2..28681ad2c6 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-2/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-2/expected.js @@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = {}; +exports.default = void 0; +var _default = {}; +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-3/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-3/expected.js index 4592507bf0..8816d90ba2 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-3/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-3/expected.js @@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = []; +exports.default = void 0; +var _default = []; +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-4/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-4/expected.js index e0fbdd6b61..bef79284b3 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-4/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-4/expected.js @@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = foo; +exports.default = void 0; +var _default = foo; +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-5/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-5/expected.js index b50a019b99..e6b2a764b9 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-5/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-5/expected.js @@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = _default; -exports.default = function () {}; +function _default() {} diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-6/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-6/expected.js index efed824742..5bb76bb764 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-6/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-6/expected.js @@ -3,4 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = class {}; +exports.default = void 0; + +class _default {} + +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-8/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-8/expected.js index ee8a141703..a3cc464ef0 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-8/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-8/expected.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; class Foo {} diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-9/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-9/actual.js index 62396a536c..9d6ebe46ed 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-9/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-9/actual.js @@ -1,2 +1,3 @@ +var foo; export { foo as default }; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-9/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-9/expected.js index e0fbdd6b61..fb73dfd01d 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-9/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default-9/expected.js @@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; +var foo; exports.default = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default/expected.js index 8fcd2eab10..dc397e61aa 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-default/expected.js @@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = 42; +exports.default = void 0; +var _default = 42; +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-destructured/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-destructured/expected.js index f3c6fc9139..993ff03dd0 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-destructured/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-destructured/expected.js @@ -7,8 +7,11 @@ exports.f1 = f1; exports.f2 = f2; exports.f3 = f3; exports.f4 = f4; -let x = exports.x = 0; -let y = exports.y = 0; +exports.y = exports.x = void 0; +let x = 0; +exports.x = x; +let y = 0; +exports.y = y; function f1() { ({ @@ -27,18 +30,15 @@ function f2() { x: 2, y: 3 }); - exports.y = y; - exports.x = x; + exports.x = x, exports.y = y; } function f3() { [x, y, z] = [3, 4, 5]; - exports.y = y; - exports.x = x; + exports.x = x, exports.y = y; } function f4() { [x,, y] = [3, 4, 5]; - exports.y = y; - exports.x = x; + exports.x = x, exports.y = y; } diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-2/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-2/expected.js index 616c35b810..6110f501be 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-2/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-2/expected.js @@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); - -var _foo = require("foo"); - Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return _foo.foo; } }); + +var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-3/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-3/expected.js index 954fca1419..bb236a8581 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-3/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-3/expected.js @@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); - -var _foo = require("foo"); - Object.defineProperty(exports, "foo", { enumerable: true, get: function () { @@ -18,3 +15,5 @@ Object.defineProperty(exports, "bar", { return _foo.bar; } }); + +var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-4/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-4/expected.js index 39a2bbff5c..5e38e740fb 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-4/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-4/expected.js @@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); - -var _foo = require("foo"); - Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return _foo.foo; } }); + +var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-5/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-5/expected.js index 01cd810b33..8962b46ea5 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-5/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-5/expected.js @@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); - -var _foo = require("foo"); - Object.defineProperty(exports, "default", { enumerable: true, get: function () { return _foo.foo; } }); + +var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-6/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-6/expected.js index a291a400b9..52f7e58b36 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-6/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-6/expected.js @@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); - -var _foo = require("foo"); - Object.defineProperty(exports, "default", { enumerable: true, get: function () { @@ -18,3 +15,5 @@ Object.defineProperty(exports, "bar", { return _foo.bar; } }); + +var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-7/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-7/expected.js index d1f9819f60..3f26c85a64 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-7/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-7/expected.js @@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); - -var _foo = require("foo"); - Object.defineProperty(exports, "foo", { enumerable: true, get: function () { - return babelHelpers.interopRequireDefault(_foo).default; + return _foo.default; } }); + +var _foo = babelHelpers.interopRequireDefault(require("foo")); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-8/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-8/expected.js index a8a60e50ac..d37be9030d 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-8/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-from-8/expected.js @@ -3,109 +3,611 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo100 = void 0; -exports.foo99 = exports.foo98 = exports.foo97 = exports.foo96 = exports.foo95 = exports.foo94 = exports.foo93 = exports.foo92 = exports.foo91 = exports.foo90 = exports.foo89 = exports.foo88 = exports.foo87 = exports.foo86 = exports.foo85 = exports.foo84 = exports.foo83 = exports.foo82 = exports.foo81 = exports.foo80 = exports.foo79 = exports.foo78 = exports.foo77 = exports.foo76 = exports.foo75 = exports.foo74 = exports.foo73 = exports.foo72 = exports.foo71 = exports.foo70 = exports.foo69 = exports.foo68 = exports.foo67 = exports.foo66 = exports.foo65 = exports.foo64 = exports.foo63 = exports.foo62 = exports.foo61 = exports.foo60 = exports.foo59 = exports.foo58 = exports.foo57 = exports.foo56 = exports.foo55 = exports.foo54 = exports.foo53 = exports.foo52 = exports.foo51 = exports.foo50 = exports.foo49 = exports.foo48 = exports.foo47 = exports.foo46 = exports.foo45 = exports.foo44 = exports.foo43 = exports.foo42 = exports.foo41 = exports.foo40 = exports.foo39 = exports.foo38 = exports.foo37 = exports.foo36 = exports.foo35 = exports.foo34 = exports.foo33 = exports.foo32 = exports.foo31 = exports.foo30 = exports.foo29 = exports.foo28 = exports.foo27 = exports.foo26 = exports.foo25 = exports.foo24 = exports.foo23 = exports.foo22 = exports.foo21 = exports.foo20 = exports.foo19 = exports.foo18 = exports.foo17 = exports.foo16 = exports.foo15 = exports.foo14 = exports.foo13 = exports.foo12 = exports.foo11 = exports.foo10 = exports.foo9 = exports.foo8 = exports.foo7 = exports.foo6 = exports.foo5 = exports.foo4 = exports.foo3 = exports.foo2 = exports.foo1 = exports.foo = void 0; +Object.defineProperty(exports, "foo", { + enumerable: true, + get: function () { + return _foo.foo; + } +}); +Object.defineProperty(exports, "foo1", { + enumerable: true, + get: function () { + return _foo.foo1; + } +}); +Object.defineProperty(exports, "foo2", { + enumerable: true, + get: function () { + return _foo.foo2; + } +}); +Object.defineProperty(exports, "foo3", { + enumerable: true, + get: function () { + return _foo.foo3; + } +}); +Object.defineProperty(exports, "foo4", { + enumerable: true, + get: function () { + return _foo.foo4; + } +}); +Object.defineProperty(exports, "foo5", { + enumerable: true, + get: function () { + return _foo.foo5; + } +}); +Object.defineProperty(exports, "foo6", { + enumerable: true, + get: function () { + return _foo.foo6; + } +}); +Object.defineProperty(exports, "foo7", { + enumerable: true, + get: function () { + return _foo.foo7; + } +}); +Object.defineProperty(exports, "foo8", { + enumerable: true, + get: function () { + return _foo.foo8; + } +}); +Object.defineProperty(exports, "foo9", { + enumerable: true, + get: function () { + return _foo.foo9; + } +}); +Object.defineProperty(exports, "foo10", { + enumerable: true, + get: function () { + return _foo.foo10; + } +}); +Object.defineProperty(exports, "foo11", { + enumerable: true, + get: function () { + return _foo.foo11; + } +}); +Object.defineProperty(exports, "foo12", { + enumerable: true, + get: function () { + return _foo.foo12; + } +}); +Object.defineProperty(exports, "foo13", { + enumerable: true, + get: function () { + return _foo.foo13; + } +}); +Object.defineProperty(exports, "foo14", { + enumerable: true, + get: function () { + return _foo.foo14; + } +}); +Object.defineProperty(exports, "foo15", { + enumerable: true, + get: function () { + return _foo.foo15; + } +}); +Object.defineProperty(exports, "foo16", { + enumerable: true, + get: function () { + return _foo.foo16; + } +}); +Object.defineProperty(exports, "foo17", { + enumerable: true, + get: function () { + return _foo.foo17; + } +}); +Object.defineProperty(exports, "foo18", { + enumerable: true, + get: function () { + return _foo.foo18; + } +}); +Object.defineProperty(exports, "foo19", { + enumerable: true, + get: function () { + return _foo.foo19; + } +}); +Object.defineProperty(exports, "foo20", { + enumerable: true, + get: function () { + return _foo.foo20; + } +}); +Object.defineProperty(exports, "foo21", { + enumerable: true, + get: function () { + return _foo.foo21; + } +}); +Object.defineProperty(exports, "foo22", { + enumerable: true, + get: function () { + return _foo.foo22; + } +}); +Object.defineProperty(exports, "foo23", { + enumerable: true, + get: function () { + return _foo.foo23; + } +}); +Object.defineProperty(exports, "foo24", { + enumerable: true, + get: function () { + return _foo.foo24; + } +}); +Object.defineProperty(exports, "foo25", { + enumerable: true, + get: function () { + return _foo.foo25; + } +}); +Object.defineProperty(exports, "foo26", { + enumerable: true, + get: function () { + return _foo.foo26; + } +}); +Object.defineProperty(exports, "foo27", { + enumerable: true, + get: function () { + return _foo.foo27; + } +}); +Object.defineProperty(exports, "foo28", { + enumerable: true, + get: function () { + return _foo.foo28; + } +}); +Object.defineProperty(exports, "foo29", { + enumerable: true, + get: function () { + return _foo.foo29; + } +}); +Object.defineProperty(exports, "foo30", { + enumerable: true, + get: function () { + return _foo.foo30; + } +}); +Object.defineProperty(exports, "foo31", { + enumerable: true, + get: function () { + return _foo.foo31; + } +}); +Object.defineProperty(exports, "foo32", { + enumerable: true, + get: function () { + return _foo.foo32; + } +}); +Object.defineProperty(exports, "foo33", { + enumerable: true, + get: function () { + return _foo.foo33; + } +}); +Object.defineProperty(exports, "foo34", { + enumerable: true, + get: function () { + return _foo.foo34; + } +}); +Object.defineProperty(exports, "foo35", { + enumerable: true, + get: function () { + return _foo.foo35; + } +}); +Object.defineProperty(exports, "foo36", { + enumerable: true, + get: function () { + return _foo.foo36; + } +}); +Object.defineProperty(exports, "foo37", { + enumerable: true, + get: function () { + return _foo.foo37; + } +}); +Object.defineProperty(exports, "foo38", { + enumerable: true, + get: function () { + return _foo.foo38; + } +}); +Object.defineProperty(exports, "foo39", { + enumerable: true, + get: function () { + return _foo.foo39; + } +}); +Object.defineProperty(exports, "foo40", { + enumerable: true, + get: function () { + return _foo.foo40; + } +}); +Object.defineProperty(exports, "foo41", { + enumerable: true, + get: function () { + return _foo.foo41; + } +}); +Object.defineProperty(exports, "foo42", { + enumerable: true, + get: function () { + return _foo.foo42; + } +}); +Object.defineProperty(exports, "foo43", { + enumerable: true, + get: function () { + return _foo.foo43; + } +}); +Object.defineProperty(exports, "foo44", { + enumerable: true, + get: function () { + return _foo.foo44; + } +}); +Object.defineProperty(exports, "foo45", { + enumerable: true, + get: function () { + return _foo.foo45; + } +}); +Object.defineProperty(exports, "foo46", { + enumerable: true, + get: function () { + return _foo.foo46; + } +}); +Object.defineProperty(exports, "foo47", { + enumerable: true, + get: function () { + return _foo.foo47; + } +}); +Object.defineProperty(exports, "foo48", { + enumerable: true, + get: function () { + return _foo.foo48; + } +}); +Object.defineProperty(exports, "foo49", { + enumerable: true, + get: function () { + return _foo.foo49; + } +}); +Object.defineProperty(exports, "foo50", { + enumerable: true, + get: function () { + return _foo.foo50; + } +}); +Object.defineProperty(exports, "foo51", { + enumerable: true, + get: function () { + return _foo.foo51; + } +}); +Object.defineProperty(exports, "foo52", { + enumerable: true, + get: function () { + return _foo.foo52; + } +}); +Object.defineProperty(exports, "foo53", { + enumerable: true, + get: function () { + return _foo.foo53; + } +}); +Object.defineProperty(exports, "foo54", { + enumerable: true, + get: function () { + return _foo.foo54; + } +}); +Object.defineProperty(exports, "foo55", { + enumerable: true, + get: function () { + return _foo.foo55; + } +}); +Object.defineProperty(exports, "foo56", { + enumerable: true, + get: function () { + return _foo.foo56; + } +}); +Object.defineProperty(exports, "foo57", { + enumerable: true, + get: function () { + return _foo.foo57; + } +}); +Object.defineProperty(exports, "foo58", { + enumerable: true, + get: function () { + return _foo.foo58; + } +}); +Object.defineProperty(exports, "foo59", { + enumerable: true, + get: function () { + return _foo.foo59; + } +}); +Object.defineProperty(exports, "foo60", { + enumerable: true, + get: function () { + return _foo.foo60; + } +}); +Object.defineProperty(exports, "foo61", { + enumerable: true, + get: function () { + return _foo.foo61; + } +}); +Object.defineProperty(exports, "foo62", { + enumerable: true, + get: function () { + return _foo.foo62; + } +}); +Object.defineProperty(exports, "foo63", { + enumerable: true, + get: function () { + return _foo.foo63; + } +}); +Object.defineProperty(exports, "foo64", { + enumerable: true, + get: function () { + return _foo.foo64; + } +}); +Object.defineProperty(exports, "foo65", { + enumerable: true, + get: function () { + return _foo.foo65; + } +}); +Object.defineProperty(exports, "foo66", { + enumerable: true, + get: function () { + return _foo.foo66; + } +}); +Object.defineProperty(exports, "foo67", { + enumerable: true, + get: function () { + return _foo.foo67; + } +}); +Object.defineProperty(exports, "foo68", { + enumerable: true, + get: function () { + return _foo.foo68; + } +}); +Object.defineProperty(exports, "foo69", { + enumerable: true, + get: function () { + return _foo.foo69; + } +}); +Object.defineProperty(exports, "foo70", { + enumerable: true, + get: function () { + return _foo.foo70; + } +}); +Object.defineProperty(exports, "foo71", { + enumerable: true, + get: function () { + return _foo.foo71; + } +}); +Object.defineProperty(exports, "foo72", { + enumerable: true, + get: function () { + return _foo.foo72; + } +}); +Object.defineProperty(exports, "foo73", { + enumerable: true, + get: function () { + return _foo.foo73; + } +}); +Object.defineProperty(exports, "foo74", { + enumerable: true, + get: function () { + return _foo.foo74; + } +}); +Object.defineProperty(exports, "foo75", { + enumerable: true, + get: function () { + return _foo.foo75; + } +}); +Object.defineProperty(exports, "foo76", { + enumerable: true, + get: function () { + return _foo.foo76; + } +}); +Object.defineProperty(exports, "foo77", { + enumerable: true, + get: function () { + return _foo.foo77; + } +}); +Object.defineProperty(exports, "foo78", { + enumerable: true, + get: function () { + return _foo.foo78; + } +}); +Object.defineProperty(exports, "foo79", { + enumerable: true, + get: function () { + return _foo.foo79; + } +}); +Object.defineProperty(exports, "foo80", { + enumerable: true, + get: function () { + return _foo.foo80; + } +}); +Object.defineProperty(exports, "foo81", { + enumerable: true, + get: function () { + return _foo.foo81; + } +}); +Object.defineProperty(exports, "foo82", { + enumerable: true, + get: function () { + return _foo.foo82; + } +}); +Object.defineProperty(exports, "foo83", { + enumerable: true, + get: function () { + return _foo.foo83; + } +}); +Object.defineProperty(exports, "foo84", { + enumerable: true, + get: function () { + return _foo.foo84; + } +}); +Object.defineProperty(exports, "foo85", { + enumerable: true, + get: function () { + return _foo.foo85; + } +}); +Object.defineProperty(exports, "foo86", { + enumerable: true, + get: function () { + return _foo.foo86; + } +}); +Object.defineProperty(exports, "foo87", { + enumerable: true, + get: function () { + return _foo.foo87; + } +}); +Object.defineProperty(exports, "foo88", { + enumerable: true, + get: function () { + return _foo.foo88; + } +}); +Object.defineProperty(exports, "foo89", { + enumerable: true, + get: function () { + return _foo.foo89; + } +}); +Object.defineProperty(exports, "foo90", { + enumerable: true, + get: function () { + return _foo.foo90; + } +}); +Object.defineProperty(exports, "foo91", { + enumerable: true, + get: function () { + return _foo.foo91; + } +}); +Object.defineProperty(exports, "foo92", { + enumerable: true, + get: function () { + return _foo.foo92; + } +}); +Object.defineProperty(exports, "foo93", { + enumerable: true, + get: function () { + return _foo.foo93; + } +}); +Object.defineProperty(exports, "foo94", { + enumerable: true, + get: function () { + return _foo.foo94; + } +}); +Object.defineProperty(exports, "foo95", { + enumerable: true, + get: function () { + return _foo.foo95; + } +}); +Object.defineProperty(exports, "foo96", { + enumerable: true, + get: function () { + return _foo.foo96; + } +}); +Object.defineProperty(exports, "foo97", { + enumerable: true, + get: function () { + return _foo.foo97; + } +}); +Object.defineProperty(exports, "foo98", { + enumerable: true, + get: function () { + return _foo.foo98; + } +}); +Object.defineProperty(exports, "foo99", { + enumerable: true, + get: function () { + return _foo.foo99; + } +}); +Object.defineProperty(exports, "foo100", { + enumerable: true, + get: function () { + return _foo.foo100; + } +}); var _foo = require("foo"); - -exports.foo = _foo.foo; -exports.foo1 = _foo.foo1; -exports.foo2 = _foo.foo2; -exports.foo3 = _foo.foo3; -exports.foo4 = _foo.foo4; -exports.foo5 = _foo.foo5; -exports.foo6 = _foo.foo6; -exports.foo7 = _foo.foo7; -exports.foo8 = _foo.foo8; -exports.foo9 = _foo.foo9; -exports.foo10 = _foo.foo10; -exports.foo11 = _foo.foo11; -exports.foo12 = _foo.foo12; -exports.foo13 = _foo.foo13; -exports.foo14 = _foo.foo14; -exports.foo15 = _foo.foo15; -exports.foo16 = _foo.foo16; -exports.foo17 = _foo.foo17; -exports.foo18 = _foo.foo18; -exports.foo19 = _foo.foo19; -exports.foo20 = _foo.foo20; -exports.foo21 = _foo.foo21; -exports.foo22 = _foo.foo22; -exports.foo23 = _foo.foo23; -exports.foo24 = _foo.foo24; -exports.foo25 = _foo.foo25; -exports.foo26 = _foo.foo26; -exports.foo27 = _foo.foo27; -exports.foo28 = _foo.foo28; -exports.foo29 = _foo.foo29; -exports.foo30 = _foo.foo30; -exports.foo31 = _foo.foo31; -exports.foo32 = _foo.foo32; -exports.foo33 = _foo.foo33; -exports.foo34 = _foo.foo34; -exports.foo35 = _foo.foo35; -exports.foo36 = _foo.foo36; -exports.foo37 = _foo.foo37; -exports.foo38 = _foo.foo38; -exports.foo39 = _foo.foo39; -exports.foo40 = _foo.foo40; -exports.foo41 = _foo.foo41; -exports.foo42 = _foo.foo42; -exports.foo43 = _foo.foo43; -exports.foo44 = _foo.foo44; -exports.foo45 = _foo.foo45; -exports.foo46 = _foo.foo46; -exports.foo47 = _foo.foo47; -exports.foo48 = _foo.foo48; -exports.foo49 = _foo.foo49; -exports.foo50 = _foo.foo50; -exports.foo51 = _foo.foo51; -exports.foo52 = _foo.foo52; -exports.foo53 = _foo.foo53; -exports.foo54 = _foo.foo54; -exports.foo55 = _foo.foo55; -exports.foo56 = _foo.foo56; -exports.foo57 = _foo.foo57; -exports.foo58 = _foo.foo58; -exports.foo59 = _foo.foo59; -exports.foo60 = _foo.foo60; -exports.foo61 = _foo.foo61; -exports.foo62 = _foo.foo62; -exports.foo63 = _foo.foo63; -exports.foo64 = _foo.foo64; -exports.foo65 = _foo.foo65; -exports.foo66 = _foo.foo66; -exports.foo67 = _foo.foo67; -exports.foo68 = _foo.foo68; -exports.foo69 = _foo.foo69; -exports.foo70 = _foo.foo70; -exports.foo71 = _foo.foo71; -exports.foo72 = _foo.foo72; -exports.foo73 = _foo.foo73; -exports.foo74 = _foo.foo74; -exports.foo75 = _foo.foo75; -exports.foo76 = _foo.foo76; -exports.foo77 = _foo.foo77; -exports.foo78 = _foo.foo78; -exports.foo79 = _foo.foo79; -exports.foo80 = _foo.foo80; -exports.foo81 = _foo.foo81; -exports.foo82 = _foo.foo82; -exports.foo83 = _foo.foo83; -exports.foo84 = _foo.foo84; -exports.foo85 = _foo.foo85; -exports.foo86 = _foo.foo86; -exports.foo87 = _foo.foo87; -exports.foo88 = _foo.foo88; -exports.foo89 = _foo.foo89; -exports.foo90 = _foo.foo90; -exports.foo91 = _foo.foo91; -exports.foo92 = _foo.foo92; -exports.foo93 = _foo.foo93; -exports.foo94 = _foo.foo94; -exports.foo95 = _foo.foo95; -exports.foo96 = _foo.foo96; -exports.foo97 = _foo.foo97; -exports.foo98 = _foo.foo98; -exports.foo99 = _foo.foo99; -exports.foo100 = _foo.foo100; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-2/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-2/actual.js index fdbc942750..b2bb6f25f1 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-2/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-2/actual.js @@ -1 +1,2 @@ +var foo, bar; export {foo, bar}; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-2/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-2/expected.js index ac14a31674..e4119f9583 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-2/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-2/expected.js @@ -3,5 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.foo = foo; +exports.bar = exports.foo = void 0; +var foo, bar; exports.bar = bar; +exports.foo = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-3/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-3/actual.js index e7820a6f02..0e20b2a7c2 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-3/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-3/actual.js @@ -1 +1,2 @@ +var foo; export {foo as bar}; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-3/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-3/expected.js index e9455ae6cf..2f884db24f 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-3/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-3/expected.js @@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.bar = void 0; +var foo; exports.bar = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-4/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-4/actual.js index 5d32a24de0..6cf31d7c35 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-4/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-4/actual.js @@ -1 +1,2 @@ +var foo; export {foo as default}; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-4/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-4/expected.js index e0fbdd6b61..fb73dfd01d 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-4/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-4/expected.js @@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; +var foo; exports.default = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-5/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-5/actual.js index ff57927839..d8d18266bb 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-5/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-5/actual.js @@ -1 +1,2 @@ +var foo, bar; export {foo as default, bar}; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-5/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-5/expected.js index a6ea414e5b..5dfe23b4e5 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-5/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named-5/expected.js @@ -3,5 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.default = foo; +exports.bar = exports.default = void 0; +var foo, bar; exports.bar = bar; +exports.default = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named/actual.js index df5f5e609e..8da11199f4 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named/actual.js @@ -1 +1,2 @@ +var foo; export {foo}; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named/expected.js index ecd2979ee8..5da9e78b56 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/export-named/expected.js @@ -3,4 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.foo = void 0; +var foo; exports.foo = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/exports-variable/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/exports-variable/expected.js index 6ad52ad534..d667256ef9 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/exports-variable/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/exports-variable/expected.js @@ -4,16 +4,25 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.foo8 = foo8; -var foo = exports.foo = 1; -var foo2 = exports.foo2 = 1, - bar = exports.bar = 2; +exports.foo9 = exports.foo7 = exports.foo6 = exports.foo5 = exports.foo4 = exports.foo3 = exports.bar = exports.foo2 = exports.foo = void 0; +var foo = 1; +exports.foo = foo; +var foo2 = 1, + bar = 2; +exports.bar = bar; +exports.foo2 = foo2; -var foo3 = exports.foo3 = function () {}; +var foo3 = function () {}; -var foo4 = exports.foo4 = void 0; -let foo5 = exports.foo5 = 2; -let foo6 = exports.foo6 = void 0; -const foo7 = exports.foo7 = 3; +exports.foo3 = foo3; +var foo4; +exports.foo4 = foo4; +let foo5 = 2; +exports.foo5 = foo5; +let foo6; +exports.foo6 = foo6; +const foo7 = 3; +exports.foo7 = foo7; function foo8() {} diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/hoist-function-exports/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/hoist-function-exports/expected.js index b2ceb8af48..60e75d42d0 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/hoist-function-exports/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/hoist-function-exports/expected.js @@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.isOdd = void 0; exports.nextOdd = nextOdd; +exports.isOdd = void 0; var _evens = require("./evens"); @@ -12,8 +12,10 @@ function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; } -var isOdd = exports.isOdd = function (isEven) { +var isOdd = function (isEven) { return function (n) { return !isEven(n); }; }(_evens.isEven); + +exports.isOdd = isOdd; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/illegal-export-esmodule-2/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/illegal-export-esmodule-2/actual.js index 2d4f3f2cd7..78d11110fc 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/illegal-export-esmodule-2/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/illegal-export-esmodule-2/actual.js @@ -1 +1,2 @@ +var __esModule; export { __esModule }; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-default/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-default/expected.js index e22ca9bb6e..afd7fbee4d 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-default/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-default/expected.js @@ -1,8 +1,6 @@ "use strict"; -var _foo = require("foo"); +var _foo = babelHelpers.interopRequireDefault(require("foo")); -var _foo2 = babelHelpers.interopRequireDefault(_foo); - -_foo2.default; -_foo2.default; +_foo.default; +_foo.default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-glob/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-glob/expected.js index 084f13285f..ee841e5215 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-glob/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-glob/expected.js @@ -1,5 +1,3 @@ "use strict"; -var _foo = require("foo"); - -var foo = babelHelpers.interopRequireWildcard(_foo); +var foo = babelHelpers.interopRequireWildcard(require("foo")); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js index 86a1f39430..c48d60f6e2 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-hoisting/expected.js @@ -1,10 +1,8 @@ "use strict"; -var _taggedTemplateLiteral2 = require("babel-runtime/helpers/taggedTemplateLiteral"); +var _taggedTemplateLiteral2 = _interopRequireDefault(require("babel-runtime/helpers/taggedTemplateLiteral")); -var _taggedTemplateLiteral3 = _interopRequireDefault(_taggedTemplateLiteral2); - -var _templateObject = (0, _taggedTemplateLiteral3.default)(["foo"], ["foo"]); +var _templateObject = (0, _taggedTemplateLiteral2.default)(["foo"], ["foo"]); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-mixing/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-mixing/expected.js index eb8a956071..2238731921 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-mixing/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-mixing/expected.js @@ -1,8 +1,6 @@ "use strict"; -var _foo = require("foo"); +var _foo = babelHelpers.interopRequireDefault(require("foo")); -var _foo2 = babelHelpers.interopRequireDefault(_foo); - -_foo2.default; +_foo.default; _foo.baz; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-ordering/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-ordering/expected.js index f0f13ca357..c975f56f96 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-ordering/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/imports-ordering/expected.js @@ -2,9 +2,7 @@ require("./foo"); -var _bar = require("./bar"); - -var _bar2 = babelHelpers.interopRequireDefault(_bar); +var _bar = babelHelpers.interopRequireDefault(require("./bar")); require("./derp"); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/module-shadow/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/module-shadow/expected.js index 0ce97a5c15..f6a92cc04b 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/module-shadow/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/module-shadow/expected.js @@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.module = _module; function _module() {} - -exports.module = _module; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/overview/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/overview/actual.js index aafee855f8..71e464640d 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/overview/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/overview/actual.js @@ -6,6 +6,7 @@ import * as foo2 from "foo3"; import {bar} from "foo4"; import {foo as bar2} from "foo5"; +var test; export {test}; export var test2 = 5; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/overview/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/overview/expected.js index f2fe07463f..2c35e0ebc4 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/overview/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/overview/expected.js @@ -11,20 +11,18 @@ require("foo-bar"); require("./directory/foo-bar"); -var _foo = require("foo2"); +var _foo2 = babelHelpers.interopRequireDefault(require("foo2")); -var _foo2 = babelHelpers.interopRequireDefault(_foo); - -var _foo3 = require("foo3"); - -var foo2 = babelHelpers.interopRequireWildcard(_foo3); +var foo2 = babelHelpers.interopRequireWildcard(require("foo3")); var _foo4 = require("foo4"); var _foo5 = require("foo5"); +var test; exports.test = test; -var test2 = exports.test2 = 5; +var test2 = 5; +exports.test2 = test2; _foo4.bar; _foo5.foo; _foo2.default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/remap/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/remap/expected.js index fa3b0a573f..9d5d989969 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/remap/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/interop/remap/expected.js @@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); -var test = exports.test = 2; +exports.f = exports.e = exports.c = exports.a = exports.test = void 0; +var test = 2; +exports.test = test; exports.test = test = 5; exports.test = test += 1; @@ -20,6 +22,5 @@ var b = 2; exports.c = b; exports.c = b = 3; var d = 3; -exports.e = d; -exports.f = d; +exports.f = exports.e = d; exports.f = exports.e = d = 4; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/misc/import-const-throw/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/misc/import-const-throw/actual.js new file mode 100644 index 0000000000..899f1394bb --- /dev/null +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/misc/import-const-throw/actual.js @@ -0,0 +1,17 @@ +import Foo from "foo"; + +import * as Bar from "bar"; + +import { Baz } from "baz"; + +Foo = 42; +Bar = 43; +Baz = 44; + +({Foo} = {}); +({Bar} = {}); +({Baz} = {}); + +({prop: Foo} = {}); +({prop: Bar} = {}); +({prop: Baz} = {}); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/misc/import-const-throw/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/misc/import-const-throw/expected.js new file mode 100644 index 0000000000..0e20561dd7 --- /dev/null +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/misc/import-const-throw/expected.js @@ -0,0 +1,43 @@ +"use strict"; + +var _foo = _interopRequireDefault(require("foo")); + +var Bar = _interopRequireWildcard(require("bar")); + +var _baz = require("baz"); + +function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } } + +function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } + +_foo.default = (42, function () { + throw new Error('"' + "Foo" + '" is read-only.'); +}()); +Bar = (43, function () { + throw new Error('"' + "Bar" + '" is read-only.'); +}()); +_baz.Baz = (44, function () { + throw new Error('"' + "Baz" + '" is read-only.'); +}()); +({ + Foo: _foo.default +} = {}); +({ + Bar +} = ({}, function () { + throw new Error('"' + "Bar" + '" is read-only.'); +}())); +({ + Baz: _baz.Baz +} = {}); +({ + prop: _foo.default +} = {}); +({ + prop: Bar +} = ({}, function () { + throw new Error('"' + "Bar" + '" is read-only.'); +}())); +({ + prop: _baz.Baz +} = {}); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/misc/options.json b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/misc/options.json new file mode 100644 index 0000000000..f7a8b05624 --- /dev/null +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/misc/options.json @@ -0,0 +1,5 @@ +{ + "plugins": [ + "transform-es2015-modules-commonjs" + ] +} diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/noInterop/export-from/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/noInterop/export-from/expected.js index 9fa3b19d02..59daa20c96 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/noInterop/export-from/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/noInterop/export-from/expected.js @@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); - -var _foo = require("foo"); - Object.defineProperty(exports, "default", { enumerable: true, get: function () { return _foo.default; } }); + +var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/noInterop/import-wildcard/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/noInterop/import-wildcard/expected.js index 6c9b6b3fe5..d50fc39abc 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/noInterop/import-wildcard/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/noInterop/import-wildcard/expected.js @@ -1,7 +1,6 @@ "use strict"; -var _foo = require("foo"); +var foo = require("foo"); -_foo.bar(); - -_foo.baz(); +foo.bar(); +foo.baz(); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/4462-T7565/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/4462-T7565/expected.js index c6b3872193..d9c0a4a724 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/4462-T7565/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/4462-T7565/expected.js @@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.yy = yy; -exports.zz = zz; +exports.zz = exports.yy = void 0; + +var _old; + var yy = 0; -var zz = (exports.yy = yy += 1, yy - 1); +exports.yy = yy; +var zz = (_old = yy, exports.yy = yy = _old + 1, _old); +exports.zz = zz; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7160/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7160/expected.js index 099dfed8d4..63fd9598e3 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7160/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7160/expected.js @@ -3,11 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.bar = exports.foo = void 0; -var foo = exports.foo = function foo(gen) { +var foo = function foo(gen) { var ctx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; }; -var bar = exports.bar = function bar(gen) { +exports.foo = foo; + +var bar = function bar(gen) { var ctx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; }; + +exports.bar = bar; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7165/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7165/expected.js index 919cb4e62e..cc5fe3b4a0 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7165/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7165/expected.js @@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); +var _foo = _interopRequireDefault(require("foo")); + var _bar = require("bar"); Object.keys(_bar).forEach(function (key) { @@ -16,10 +18,6 @@ Object.keys(_bar).forEach(function (key) { }); }); -var _foo = require("foo"); - -var _foo2 = _interopRequireDefault(_foo); - function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var anything = {}; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7199/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7199/expected.js index defefddc57..1178539e40 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7199/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7199/expected.js @@ -1,11 +1,9 @@ "use strict"; +var _foo = _interopRequireDefault(require("foo")); + var _slicedToArray = function () { function sliceIterator(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; } return function (arr, i) { if (Array.isArray(arr)) { return arr; } else if (Symbol.iterator in Object(arr)) { return sliceIterator(arr, i); } else { throw new TypeError("Invalid attempt to destructure non-iterable instance"); } }; }(); -var _foo = require("foo"); - -var _foo2 = _interopRequireDefault(_foo); - function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } const _bar = bar, diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7272/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7272/expected.js index 925d05023b..62573221ce 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7272/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/T7272/expected.js @@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.state = void 0; -var state = exports.state = function state(_state) { +var state = function state(_state) { return _state.a; }; + +exports.state = state; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-class/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-class/expected.js index b9daa5a713..42e94f176e 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-class/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-class/expected.js @@ -3,4 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports["default"] = class {}; +exports["default"] = void 0; + +class _default {} + +exports["default"] = _default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-function/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-function/expected.js index 97a39325f3..e3dc1c1984 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-function/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-function/expected.js @@ -3,5 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports["default"] = _default; -exports["default"] = function () {}; +function _default() {} diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-named-class/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-named-class/expected.js index 1a36e45934..28ef84dedd 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-named-class/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility-named-class/expected.js @@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports["default"] = void 0; class Foo {} diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility/expected.js index f22aee1ae2..369ed812a5 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/regression/es3-compatibility/expected.js @@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports["default"] = void 0; -var _foo = require("foo"); - -var _foo2 = _interopRequireDefault(_foo); +var _foo = _interopRequireDefault(require("foo")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } -console.log(_foo2["default"]); -exports["default"] = 5; +console.log(_foo["default"]); +var _default = 5; +exports["default"] = _default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/source-map/exec.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/source-map/exec.js index 76c054a7b2..bf072c4e04 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/source-map/exec.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/source-map/exec.js @@ -14,8 +14,8 @@ var tests = [ 'export default function(){};', 'export default function f(){};', 'export default 42;', - 'export {foo};', - 'export { foo as default };', + 'export {foo}; var foo;', + 'export { foo as default }; var foo;', 'export * from "foo";', 'export {foo} from "foo";', 'export {default as foo} from "foo";', diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-1/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-1/expected.js index e9df8580c4..8bfba016ae 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-1/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-1/expected.js @@ -1,3 +1,5 @@ "use strict"; -exports.default = foo; +exports.default = void 0; +var _default = foo; +exports.default = _default; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-2/actual.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-2/actual.js index 95daad9d96..f52d2a9030 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-2/actual.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-2/actual.js @@ -1 +1,2 @@ +var foo; export { foo as default }; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-2/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-2/expected.js index e9df8580c4..e12e44dae8 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-2/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-2/expected.js @@ -1,3 +1,5 @@ "use strict"; +exports.default = void 0; +var foo; exports.default = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-3/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-3/expected.js index 025da33fb4..dd9a2dce26 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-3/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-3/expected.js @@ -1,3 +1,3 @@ "use strict"; -var _foo = require("foo"); +require("foo"); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/expected.js index 124bbfcc78..ba63188a01 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/expected.js @@ -1,5 +1,6 @@ "use strict"; +exports.bar = exports.foo = void 0; const [foo, bar = 2] = []; -exports.foo = foo; exports.bar = bar; +exports.foo = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/expected.js index c975988eb9..607df5ac80 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/expected.js @@ -1,6 +1,7 @@ "use strict"; +exports.baz = exports.bar = exports.foo = void 0; const [foo, bar, ...baz] = []; -exports.foo = foo; -exports.bar = bar; exports.baz = baz; +exports.bar = bar; +exports.foo = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/expected.js index e2fafbd5ca..bc64d7c33a 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/expected.js @@ -1,5 +1,6 @@ "use strict"; +exports.bar = exports.foo = void 0; const [foo, bar] = []; -exports.foo = foo; exports.bar = bar; +exports.foo = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-deep/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-deep/expected.js index cf3ceec161..672427ba60 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-deep/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-deep/expected.js @@ -1,9 +1,10 @@ "use strict"; +exports.qux = exports.baz = void 0; const { foo: { bar: [baz, qux] } } = {}; -exports.baz = baz; exports.qux = qux; +exports.baz = baz; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/expected.js index 106f56ca03..40b5115dd8 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/expected.js @@ -1,8 +1,9 @@ "use strict"; +exports.bar = exports.foo = void 0; const { foo, bar = 1 } = {}; -exports.foo = foo; exports.bar = bar; +exports.foo = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/expected.js index af4c78e86a..283fdabbbb 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/expected.js @@ -1,8 +1,9 @@ "use strict"; +exports.bar = exports.foo = void 0; const { foo, ...bar } = {}; -exports.foo = foo; exports.bar = bar; +exports.foo = foo; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object/expected.js index 80268a32e1..d7cedfae97 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/export-const-destructuring-object/expected.js @@ -1,8 +1,9 @@ "use strict"; +exports.baz = exports.bar = void 0; const { foo: bar, baz } = {}; -exports.bar = bar; exports.baz = baz; +exports.bar = bar; diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import-wildcard/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import-wildcard/expected.js index 6c9b6b3fe5..d50fc39abc 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import-wildcard/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import-wildcard/expected.js @@ -1,7 +1,6 @@ "use strict"; -var _foo = require("foo"); +var foo = require("foo"); -_foo.bar(); - -_foo.baz(); +foo.bar(); +foo.baz(); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/expected.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/expected.js index 260f28745b..b4eb261837 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/expected.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/expected.js @@ -1,8 +1,7 @@ "use strict"; -var _foo = require("foo"); - -_foo.default; -_foo.default; -_foo.foo3; -(0, _foo.foo3)(); +var foo4 = babelHelpers.interopRequireDefault(require("foo")); +foo4.default; +foo4.default; +foo4.foo3; +(0, foo4.foo3)(); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/source-mappings.json b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/source-mappings.json index 0db931042d..47777660b5 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/source-mappings.json +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/fixtures/strict/import/source-mappings.json @@ -3,41 +3,41 @@ "line": 6, "column": 0 }, "generated": { - "line": 5, "column": 0 + "line": 4, "column": 0 } },{ "original": { "line": 6, "column": 0 }, "generated": { - "line": 5, "column": 12 + "line": 4, "column": 12 } },{ "original": { "line": 8, "column": 0 }, + "generated": { + "line": 6, "column": 0 + } +},{ + "original": { + "line": 8, "column": 0 + }, + "generated": { + "line": 6, "column": 9 + } +},{ + "original": { + "line": 9, "column": 0 + }, "generated": { "line": 7, "column": 0 } },{ "original": { - "line": 8, "column": 0 + "line": 9, "column": 0 }, "generated": { "line": 7, "column": 9 } -},{ - "original": { - "line": 9, "column": 0 - }, - "generated": { - "line": 8, "column": 0 - } -},{ - "original": { - "line": 9, "column": 0 - }, - "generated": { - "line": 8, "column": 9 - } }] diff --git a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/regression/6057-expanded/expected.js b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/regression/6057-expanded/expected.js index 96bb36e6b6..9da87d567f 100644 --- a/packages/babel-plugin-transform-es2015-parameters/test/fixtures/regression/6057-expanded/expected.js +++ b/packages/babel-plugin-transform-es2015-parameters/test/fixtures/regression/6057-expanded/expected.js @@ -5,14 +5,12 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = void 0; +var _args = _interopRequireDefault(require("utils/url/args")); + var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }(); -var _args = require("utils/url/args"); - -var _args2 = _interopRequireDefault(_args); - function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } @@ -48,7 +46,7 @@ function (_Component) { _createClass(App, [{ key: "componentDidMount", value: function componentDidMount() { - this.exportType = _args2.default.get('type', window.location.href); + this.exportType = _args.default.get('type', window.location.href); } }]); diff --git a/packages/babel-plugin-transform-object-rest-spread/test/fixtures/regression/T7178/expected.js b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/regression/T7178/expected.js index 90cb2dc0cd..328e6aaa23 100644 --- a/packages/babel-plugin-transform-object-rest-spread/test/fixtures/regression/T7178/expected.js +++ b/packages/babel-plugin-transform-object-rest-spread/test/fixtures/regression/T7178/expected.js @@ -1,10 +1,8 @@ "use strict"; -var _props = require("props"); +var _props = babelHelpers.interopRequireDefault(require("props")); -var _props2 = babelHelpers.interopRequireDefault(_props); - -console.log(_props2.default); +console.log(_props.default); (function () { const props = babelHelpers.objectWithoutProperties(this.props, []); diff --git a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/member-expression/expected.js b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/member-expression/expected.js index b67fe6a7c9..fa4e99bf5e 100644 --- a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/member-expression/expected.js +++ b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/member-expression/expected.js @@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.default = void 0; var _reactBootstrap = require("react-bootstrap"); -exports.default = CustomModal = () => babelHelpers.jsx(_reactBootstrap.Modal.Header, {}, void 0, "foobar"); +var _default = CustomModal = () => babelHelpers.jsx(_reactBootstrap.Modal.Header, {}, void 0, "foobar"); + +exports.default = _default; diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js index 89a2c92037..a92d32a6a9 100644 --- a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js +++ b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/T7041/expected.js @@ -1,23 +1,19 @@ "use strict"; -var _regenerator = require("babel-runtime/regenerator"); +var _regenerator = _interopRequireDefault(require("babel-runtime/regenerator")); -var _regenerator2 = _interopRequireDefault(_regenerator); - -var _keys = require("babel-runtime/core-js/object/keys"); - -var _keys2 = _interopRequireDefault(_keys); +var _keys = _interopRequireDefault(require("babel-runtime/core-js/object/keys")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } var _marked = /*#__PURE__*/ -_regenerator2.default.mark(fn); +_regenerator.default.mark(fn); -(0, _keys2.default)({}); +(0, _keys.default)({}); function fn() { - return _regenerator2.default.wrap(function fn$(_context) { + return _regenerator.default.wrap(function fn$(_context) { while (1) { switch (_context.prev = _context.next) { case 0: diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js index 8aa8c49226..bbd4e001f8 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js +++ b/packages/babel-plugin-transform-runtime/test/fixtures/runtime/modules/expected.js @@ -1,9 +1,7 @@ "use strict"; -var _bar = require("bar"); - -var _bar2 = _interopRequireDefault(_bar); +var _bar = _interopRequireDefault(require("bar")); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -_bar2.default; +_bar.default;