diff --git a/packages/babel-helper-module-transforms/src/index.ts b/packages/babel-helper-module-transforms/src/index.ts index 39cbe57037ba..b618b4510e4e 100644 --- a/packages/babel-helper-module-transforms/src/index.ts +++ b/packages/babel-helper-module-transforms/src/index.ts @@ -241,7 +241,7 @@ export function buildNamespaceInitStatements( const ReexportTemplate = { constant: template.statement`EXPORTS.EXPORT_NAME = NAMESPACE_IMPORT;`, constantComputed: template.statement`EXPORTS["EXPORT_NAME"] = NAMESPACE_IMPORT;`, - spec: template` + spec: template.statement` Object.defineProperty(EXPORTS, "EXPORT_NAME", { enumerable: true, get: function() { @@ -412,43 +412,92 @@ function buildExportInitializationStatements( constantReexports: boolean = false, noIncompleteNsImportDetection = false, ) { - const initStatements = []; + const initStatements: Array<[string, t.Statement | null]> = []; - const exportNames = []; for (const [localName, data] of metadata.local) { if (data.kind === "import") { // No-open since these are explicitly set with the "reexports" block. } else if (data.kind === "hoisted") { - initStatements.push( + initStatements.push([ + // data.names is always of length 1 because a hoisted export + // name must be id of a function declaration + data.names[0], buildInitStatement(metadata, data.names, identifier(localName)), - ); - } else { - exportNames.push(...data.names); + ]); + } else if (!noIncompleteNsImportDetection) { + for (const exportName of data.names) { + initStatements.push([exportName, null]); + } } } for (const data of metadata.source.values()) { if (!constantReexports) { - initStatements.push(...buildReexportsFromMeta(metadata, data, false)); + const reexportsStatements = buildReexportsFromMeta(metadata, data, false); + const reexports = [...data.reexports.keys()]; + for (let i = 0; i < reexportsStatements.length; i++) { + initStatements.push([reexports[i], reexportsStatements[i]]); + } } - for (const exportName of data.reexportNamespace) { - exportNames.push(exportName); + if (!noIncompleteNsImportDetection) { + for (const exportName of data.reexportNamespace) { + initStatements.push([exportName, null]); + } } } - if (!noIncompleteNsImportDetection) { - initStatements.push( - ...chunk(exportNames, 100).map(members => { - return buildInitStatement( - metadata, - members, - programPath.scope.buildUndefinedNode(), + // https://tc39.es/ecma262/#sec-module-namespace-exotic-objects + // The [Exports] list is ordered as if an Array of those String values + // had been sorted using %Array.prototype.sort% using undefined as comparefn + initStatements.sort((a, b) => (a[0] > b[0] ? 1 : -1)); + + const results = []; + if (noIncompleteNsImportDetection) { + for (const [, initStatement] of initStatements) { + results.push(initStatement); + } + } else { + // We generate init statements (`exports.a = exports.b = ... = void 0`) + // for every 100 exported names to avoid deeply-nested AST structures. + const chunkSize = 100; + for ( + let i = 0, uninitializedExportNames = []; + i < initStatements.length; + i += chunkSize + ) { + for (let j = 0; j < chunkSize && i + j < initStatements.length; j++) { + const [exportName, initStatement] = initStatements[i + j]; + if (initStatement !== null) { + if (uninitializedExportNames.length > 0) { + results.push( + buildInitStatement( + metadata, + uninitializedExportNames, + programPath.scope.buildUndefinedNode(), + ), + ); + // reset after uninitializedExportNames has been transformed + // to init statements + uninitializedExportNames = []; + } + results.push(initStatement); + } else { + uninitializedExportNames.push(exportName); + } + } + if (uninitializedExportNames.length > 0) { + results.push( + buildInitStatement( + metadata, + uninitializedExportNames, + programPath.scope.buildUndefinedNode(), + ), ); - }), - ); + } + } } - return initStatements; + return results; } /** @@ -477,11 +526,3 @@ function buildInitStatement(metadata: ModuleMetadata, exportNames, initExpr) { }, initExpr), ); } - -function chunk(array, size) { - const chunks = []; - for (let i = 0; i < array.length; i += size) { - chunks.push(array.slice(i, i + size)); - } - return chunks; -} diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-from-3/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-from-3/output.js index 67c7df5a73fd..130162e61d02 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-from-3/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-from-3/output.js @@ -4,16 +4,16 @@ define(["exports", "foo"], function (_exports, _foo) { Object.defineProperty(_exports, "__esModule", { value: true }); - Object.defineProperty(_exports, "foo", { + Object.defineProperty(_exports, "bar", { enumerable: true, get: function () { - return _foo.foo; + return _foo.bar; } }); - Object.defineProperty(_exports, "bar", { + Object.defineProperty(_exports, "foo", { enumerable: true, get: function () { - return _foo.bar; + return _foo.foo; } }); }); diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-from-6/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-from-6/output.js index b3416f4a11ef..64c2dd8b9989 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-from-6/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-from-6/output.js @@ -4,16 +4,16 @@ define(["exports", "foo"], function (_exports, _foo) { Object.defineProperty(_exports, "__esModule", { value: true }); - Object.defineProperty(_exports, "default", { + Object.defineProperty(_exports, "bar", { enumerable: true, get: function () { - return _foo.foo; + return _foo.bar; } }); - Object.defineProperty(_exports, "bar", { + Object.defineProperty(_exports, "default", { enumerable: true, get: function () { - return _foo.bar; + return _foo.foo; } }); }); diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-named-2/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-named-2/output.js index 1178bbfb61a0..358ac774f5c9 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-named-2/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-named-2/output.js @@ -4,7 +4,7 @@ define(["exports"], function (_exports) { Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.foo = void 0; + _exports.foo = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.foo = foo; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-named-5/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-named-5/output.js index f647f9a99ddd..c4dcf79bd759 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-named-5/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/export-named-5/output.js @@ -4,7 +4,7 @@ define(["exports"], function (_exports) { Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.default = void 0; + _exports.default = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.default = foo; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/exports-variable/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/exports-variable/output.js index 9aebe81d529e..a2a0beac4424 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/exports-variable/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/exports-variable/output.js @@ -4,8 +4,9 @@ define(["exports"], function (_exports) { Object.defineProperty(_exports, "__esModule", { value: true }); + _exports.foo7 = _exports.foo6 = _exports.foo5 = _exports.foo4 = _exports.foo3 = _exports.foo2 = _exports.foo = _exports.bar = void 0; _exports.foo8 = foo8; - _exports.foo9 = _exports.foo7 = _exports.foo6 = _exports.foo5 = _exports.foo4 = _exports.foo3 = _exports.bar = _exports.foo2 = _exports.foo = void 0; + _exports.foo9 = void 0; var foo = 1; _exports.foo = foo; var foo2 = 1, diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/hoist-function-exports/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/hoist-function-exports/output.js index 8eacaccfbe73..babc8faca32e 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/hoist-function-exports/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/hoist-function-exports/output.js @@ -4,8 +4,8 @@ define(["exports", "./evens"], function (_exports, _evens) { Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.nextOdd = nextOdd; _exports.isOdd = void 0; + _exports.nextOdd = nextOdd; function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/overview/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/overview/output.js index 7b4a2b29561f..83572d2ac23f 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/overview/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/overview/output.js @@ -4,7 +4,7 @@ define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (_exports, Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.default = _exports.test2 = _exports.test = void 0; + _exports.test2 = _exports.test = _exports.default = void 0; foo2 = babelHelpers.interopRequireWildcard(foo2); var test; _exports.test = test; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/remap/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/remap/output.js index f66b5b386217..ed299cfcd574 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/remap/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/remap/output.js @@ -4,7 +4,7 @@ define(["exports"], function (_exports) { Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.f = _exports.e = _exports.c = _exports.a = _exports.test = void 0; + _exports.test = _exports.f = _exports.e = _exports.c = _exports.a = void 0; var test = 2; _exports.test = test; _exports.test = test = 5; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/export-from-3/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/export-from-3/output.js index 0497fcd36acb..7ea503d42847 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/export-from-3/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/export-from-3/output.js @@ -4,7 +4,7 @@ define(["exports", "foo"], function (_exports, _foo) { Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.default = void 0; + _exports.default = _exports.bar = void 0; _exports.default = _foo.foo; _exports.bar = _foo.bar; }); diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/export-from-5/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/export-from-5/output.js index 64d68cdbf862..83687c1f4e40 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/export-from-5/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/export-from-5/output.js @@ -4,7 +4,7 @@ define(["exports", "foo"], function (_exports, _foo) { Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.foo = void 0; + _exports.foo = _exports.bar = void 0; _exports.foo = _foo.foo; _exports.bar = _foo.bar; }); diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js index 6b287f0edc4c..58d42d15c5ee 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js @@ -2,7 +2,7 @@ define(["exports"], function (_exports) { "use strict"; _exports.__esModule = true; - _exports.bar = _exports.defaultExports = void 0; + _exports.defaultExports = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.defaultExports = foo; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/export-named/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/export-named/output.js index 4dc3a095a381..753bc45e23f4 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/export-named/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/export-named/output.js @@ -2,7 +2,7 @@ define(["exports"], function (_exports) { "use strict"; _exports.__esModule = true; - _exports.bar = _exports["default exports"] = void 0; + _exports["default exports"] = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports["default exports"] = foo; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js index 4b9d00616b08..5b27811d5e03 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js @@ -4,7 +4,7 @@ define(["exports"], function (_exports) { Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.defaultExports = void 0; + _exports.defaultExports = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.defaultExports = foo; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/export-named/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/export-named/output.js index de6f074c65b6..451e81dc504f 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/export-named/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/export-named/output.js @@ -4,7 +4,7 @@ define(["exports"], function (_exports) { Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports["default exports"] = void 0; + _exports["default exports"] = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports["default exports"] = foo; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-from-3/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-from-3/output.js index ebb27ba6e8f5..b6ca87ba129b 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-from-3/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-from-3/output.js @@ -2,7 +2,7 @@ define(["exports", "foo"], function (_exports, _foo) { "use strict"; _exports.__esModule = true; - _exports.bar = _exports.foo = void 0; + _exports.foo = _exports.bar = void 0; _exports.foo = _foo.foo; _exports.bar = _foo.bar; }); diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-from-6/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-from-6/output.js index a27b4a9df06f..bb9f32dead3e 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-from-6/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-from-6/output.js @@ -2,7 +2,7 @@ define(["exports", "foo"], function (_exports, _foo) { "use strict"; _exports.__esModule = true; - _exports.bar = _exports.default = void 0; + _exports.default = _exports.bar = void 0; _exports.default = _foo.foo; _exports.bar = _foo.bar; }); diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-named-2/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-named-2/output.js index dc05c416fac3..f8862856c1b3 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-named-2/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-named-2/output.js @@ -2,7 +2,7 @@ define(["exports"], function (_exports) { "use strict"; _exports.__esModule = true; - _exports.bar = _exports.foo = void 0; + _exports.foo = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.foo = foo; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-named-5/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-named-5/output.js index 04a5a6218133..609492a6990d 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-named-5/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/export-named-5/output.js @@ -2,7 +2,7 @@ define(["exports"], function (_exports) { "use strict"; _exports.__esModule = true; - _exports.bar = _exports.default = void 0; + _exports.default = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.default = foo; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/exports-variable/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/exports-variable/output.js index 9fb1e1092b16..ff7827a186bd 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/exports-variable/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/exports-variable/output.js @@ -2,8 +2,9 @@ define(["exports"], function (_exports) { "use strict"; _exports.__esModule = true; + _exports.foo7 = _exports.foo6 = _exports.foo5 = _exports.foo4 = _exports.foo3 = _exports.foo2 = _exports.foo = _exports.bar = void 0; _exports.foo8 = foo8; - _exports.foo9 = _exports.foo7 = _exports.foo6 = _exports.foo5 = _exports.foo4 = _exports.foo3 = _exports.bar = _exports.foo2 = _exports.foo = void 0; + _exports.foo9 = void 0; var foo = 1; _exports.foo = foo; var foo2 = 1, diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/hoist-function-exports/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/hoist-function-exports/output.js index 5c29d86eac4b..ba9f2c14e537 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/hoist-function-exports/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/hoist-function-exports/output.js @@ -2,8 +2,8 @@ define(["exports", "./evens"], function (_exports, _evens) { "use strict"; _exports.__esModule = true; - _exports.nextOdd = nextOdd; _exports.isOdd = void 0; + _exports.nextOdd = nextOdd; function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/overview/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/overview/output.js index f3942d53ae8f..854ab24d74f2 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/overview/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/overview/output.js @@ -2,7 +2,7 @@ define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (_exports, "use strict"; _exports.__esModule = true; - _exports.default = _exports.test2 = _exports.test = void 0; + _exports.test2 = _exports.test = _exports.default = void 0; foo2 = babelHelpers.interopRequireWildcard(foo2); var test; _exports.test = test; diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/remap/output.js b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/remap/output.js index eaea92181c29..7da7e38d4ac4 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/remap/output.js +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/remap/output.js @@ -2,7 +2,7 @@ define(["exports"], function (_exports) { "use strict"; _exports.__esModule = true; - _exports.f = _exports.e = _exports.c = _exports.a = _exports.test = void 0; + _exports.test = _exports.f = _exports.e = _exports.c = _exports.a = void 0; var test = 2; _exports.test = test; _exports.test = test = 5; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/export-from-3/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/export-from-3/output.js index aef9e075e34e..d28187fe96bf 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/export-from-3/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/export-from-3/output.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = exports.default = void 0; +exports.default = exports.bar = void 0; var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/export-from-5/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/export-from-5/output.js index f9446e04700f..a3c78b3bd833 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/export-from-5/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/export-from-5/output.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-from-3/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-from-3/output.js index 57b882aca91f..6ff5270bca35 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-from-3/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-from-3/output.js @@ -1,7 +1,7 @@ "use strict"; exports.__esModule = true; -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-from-6/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-from-6/output.js index acba4f460c41..026e58c44747 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-from-6/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-from-6/output.js @@ -1,7 +1,7 @@ "use strict"; exports.__esModule = true; -exports.bar = exports.default = void 0; +exports.default = exports.bar = void 0; var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-named-2/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-named-2/output.js index 6ae303eaf2c6..ca3a5cbff9c6 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-named-2/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-named-2/output.js @@ -1,7 +1,7 @@ "use strict"; exports.__esModule = true; -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; var foo, bar; exports.bar = bar; exports.foo = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-named-5/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-named-5/output.js index 640afe55af99..707f2556c2ad 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-named-5/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/export-named-5/output.js @@ -1,7 +1,7 @@ "use strict"; exports.__esModule = true; -exports.bar = exports.default = void 0; +exports.default = exports.bar = void 0; var foo, bar; exports.bar = bar; exports.default = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/exports-variable/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/exports-variable/output.js index 7d388df542f4..0ae54a825eab 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/exports-variable/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/exports-variable/output.js @@ -1,8 +1,9 @@ "use strict"; exports.__esModule = true; +exports.foo7 = exports.foo6 = exports.foo5 = exports.foo4 = exports.foo3 = exports.foo2 = exports.foo = exports.bar = void 0; exports.foo8 = foo8; -exports.foo9 = exports.foo7 = exports.foo6 = exports.foo5 = exports.foo4 = exports.foo3 = exports.bar = exports.foo2 = exports.foo = void 0; +exports.foo9 = void 0; var foo = 1; exports.foo = foo; var foo2 = 1, diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/hoist-function-exports/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/hoist-function-exports/output.js index ca8fd7c8dd74..7de23c88af3a 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/hoist-function-exports/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/hoist-function-exports/output.js @@ -1,8 +1,8 @@ "use strict"; exports.__esModule = true; -exports.nextOdd = nextOdd; exports.isOdd = void 0; +exports.nextOdd = nextOdd; var _evens = require("./evens"); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/remap/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/remap/output.js index c6ac0e81a69e..f313009c0a55 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/remap/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/remap/output.js @@ -1,7 +1,7 @@ "use strict"; exports.__esModule = true; -exports.f = exports.e = exports.c = exports.a = exports.test = void 0; +exports.test = exports.f = exports.e = exports.c = exports.a = void 0; var test = 2; exports.test = test; exports.test = test = 5; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js index feb1e3fcb380..85f2b311cdda 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js @@ -1,7 +1,7 @@ "use strict"; exports.__esModule = true; -exports.bar = exports.defaultExports = void 0; +exports.defaultExports = exports.bar = void 0; var foo, bar; exports.bar = bar; exports.defaultExports = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/export-named/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/export-named/output.js index 2549e2e6d118..f039a78301ae 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/export-named/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/export-named/output.js @@ -1,7 +1,7 @@ "use strict"; exports.__esModule = true; -exports.bar = exports["default exports"] = void 0; +exports["default exports"] = exports.bar = void 0; var foo, bar; exports.bar = bar; exports["default exports"] = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js index f7012942afa0..caf9fb52cd81 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = exports.defaultExports = void 0; +exports.defaultExports = exports.bar = void 0; var foo, bar; exports.bar = bar; exports.defaultExports = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/export-named/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/export-named/output.js index 25095c45da76..7376641636a2 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/export-named/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/export-named/output.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = exports["default exports"] = void 0; +exports["default exports"] = exports.bar = void 0; var foo, bar; exports.bar = bar; exports["default exports"] = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-3/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-3/output.js index bb236a85811d..b665b721b4a1 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-3/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-3/output.js @@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); -Object.defineProperty(exports, "foo", { +Object.defineProperty(exports, "bar", { enumerable: true, get: function () { - return _foo.foo; + return _foo.bar; } }); -Object.defineProperty(exports, "bar", { +Object.defineProperty(exports, "foo", { enumerable: true, get: function () { - return _foo.bar; + return _foo.foo; } }); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-6/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-6/output.js index 52f7e58b36db..a3d5aac3072b 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-6/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-6/output.js @@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true }); -Object.defineProperty(exports, "default", { +Object.defineProperty(exports, "bar", { enumerable: true, get: function () { - return _foo.foo; + return _foo.bar; } }); -Object.defineProperty(exports, "bar", { +Object.defineProperty(exports, "default", { enumerable: true, get: function () { - return _foo.bar; + return _foo.foo; } }); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-8/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-8/output.js index d37be9030d29..da1e471c967d 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-8/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-from-8/output.js @@ -15,58 +15,16 @@ Object.defineProperty(exports, "foo1", { 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", { +Object.defineProperty(exports, "foo10", { enumerable: true, get: function () { - return _foo.foo9; + return _foo.foo10; } }); -Object.defineProperty(exports, "foo10", { +Object.defineProperty(exports, "foo100", { enumerable: true, get: function () { - return _foo.foo10; + return _foo.foo100; } }); Object.defineProperty(exports, "foo11", { @@ -123,6 +81,12 @@ Object.defineProperty(exports, "foo19", { return _foo.foo19; } }); +Object.defineProperty(exports, "foo2", { + enumerable: true, + get: function () { + return _foo.foo2; + } +}); Object.defineProperty(exports, "foo20", { enumerable: true, get: function () { @@ -183,6 +147,12 @@ Object.defineProperty(exports, "foo29", { return _foo.foo29; } }); +Object.defineProperty(exports, "foo3", { + enumerable: true, + get: function () { + return _foo.foo3; + } +}); Object.defineProperty(exports, "foo30", { enumerable: true, get: function () { @@ -243,6 +213,12 @@ Object.defineProperty(exports, "foo39", { return _foo.foo39; } }); +Object.defineProperty(exports, "foo4", { + enumerable: true, + get: function () { + return _foo.foo4; + } +}); Object.defineProperty(exports, "foo40", { enumerable: true, get: function () { @@ -303,6 +279,12 @@ Object.defineProperty(exports, "foo49", { return _foo.foo49; } }); +Object.defineProperty(exports, "foo5", { + enumerable: true, + get: function () { + return _foo.foo5; + } +}); Object.defineProperty(exports, "foo50", { enumerable: true, get: function () { @@ -363,6 +345,12 @@ Object.defineProperty(exports, "foo59", { return _foo.foo59; } }); +Object.defineProperty(exports, "foo6", { + enumerable: true, + get: function () { + return _foo.foo6; + } +}); Object.defineProperty(exports, "foo60", { enumerable: true, get: function () { @@ -423,6 +411,12 @@ Object.defineProperty(exports, "foo69", { return _foo.foo69; } }); +Object.defineProperty(exports, "foo7", { + enumerable: true, + get: function () { + return _foo.foo7; + } +}); Object.defineProperty(exports, "foo70", { enumerable: true, get: function () { @@ -483,6 +477,12 @@ Object.defineProperty(exports, "foo79", { return _foo.foo79; } }); +Object.defineProperty(exports, "foo8", { + enumerable: true, + get: function () { + return _foo.foo8; + } +}); Object.defineProperty(exports, "foo80", { enumerable: true, get: function () { @@ -543,6 +543,12 @@ Object.defineProperty(exports, "foo89", { return _foo.foo89; } }); +Object.defineProperty(exports, "foo9", { + enumerable: true, + get: function () { + return _foo.foo9; + } +}); Object.defineProperty(exports, "foo90", { enumerable: true, get: function () { @@ -603,11 +609,5 @@ Object.defineProperty(exports, "foo99", { return _foo.foo99; } }); -Object.defineProperty(exports, "foo100", { - enumerable: true, - get: function () { - return _foo.foo100; - } -}); var _foo = require("foo"); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-named-2/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-named-2/output.js index e4119f9583f9..544ccb4b6491 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-named-2/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-named-2/output.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; var foo, bar; exports.bar = bar; exports.foo = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-named-5/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-named-5/output.js index 5dfe23b4e526..8fea72610a7b 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-named-5/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/export-named-5/output.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = exports.default = void 0; +exports.default = exports.bar = void 0; var foo, bar; exports.bar = bar; exports.default = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/exports-variable/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/exports-variable/output.js index d667256ef929..2e9f833c9a00 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/exports-variable/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/exports-variable/output.js @@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true }); +exports.foo7 = exports.foo6 = exports.foo5 = exports.foo4 = exports.foo3 = exports.foo2 = exports.foo = exports.bar = void 0; exports.foo8 = foo8; -exports.foo9 = exports.foo7 = exports.foo6 = exports.foo5 = exports.foo4 = exports.foo3 = exports.bar = exports.foo2 = exports.foo = void 0; +exports.foo9 = void 0; var foo = 1; exports.foo = foo; var foo2 = 1, diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/hoist-function-exports/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/hoist-function-exports/output.js index 60e75d42d0e6..9c4736d9ce98 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/hoist-function-exports/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/hoist-function-exports/output.js @@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.nextOdd = nextOdd; exports.isOdd = void 0; +exports.nextOdd = nextOdd; var _evens = require("./evens"); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/remap/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/remap/output.js index b54ad1d491e6..f091718ee4ee 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/remap/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/remap/output.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.f = exports.e = exports.c = exports.a = exports.test = void 0; +exports.test = exports.f = exports.e = exports.c = exports.a = void 0; var test = 2; exports.test = test; exports.test = test = 5; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/for-of-in-export/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/for-of-in-export/output.js index 6375528d7646..55ccd8533193 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/for-of-in-export/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/for-of-in-export/output.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; let foo; exports.bar = exports.foo = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/T7160/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/T7160/output.js index 63fd9598e3c9..5c74ca3085f4 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/T7160/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/T7160/output.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; var foo = function foo(gen) { var ctx = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-all/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-all/output.js index d7ef4d0c5a7c..8837bf81e363 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-all/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-all/output.js @@ -12,15 +12,17 @@ var _exportNames = { f: true, c: true }; +exports.a = void 0; exports.b = b; -exports.default = _default; Object.defineProperty(exports, "c", { enumerable: true, get: function () { return _mod.c; } }); -exports.f = exports.e = exports.d = exports.a = exports.z = void 0; +exports.d = void 0; +exports.default = _default; +exports.z = exports.f = exports.e = void 0; var _mod = require("mod"); diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/output.js index ba63188a0144..b47fedb955ce 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-default-params/output.js @@ -1,6 +1,6 @@ "use strict"; -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; const [foo, bar = 2] = []; exports.bar = bar; exports.foo = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/output.js index 607df5ac803c..2fb96031b6ee 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array-rest/output.js @@ -1,6 +1,6 @@ "use strict"; -exports.baz = exports.bar = exports.foo = void 0; +exports.foo = exports.baz = exports.bar = void 0; const [foo, bar, ...baz] = []; exports.baz = baz; exports.bar = bar; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/output.js index bc64d7c33af7..955b52cec117 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-array/output.js @@ -1,6 +1,6 @@ "use strict"; -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; const [foo, bar] = []; exports.bar = bar; exports.foo = foo; diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/output.js index 40b5115dd8f7..cabf364724ee 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-default-params/output.js @@ -1,6 +1,6 @@ "use strict"; -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; const { foo, bar = 1 diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/output.js b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/output.js index 283fdabbbbab..6bd5f61687b4 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/output.js +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/export-const-destructuring-object-rest/output.js @@ -1,6 +1,6 @@ "use strict"; -exports.bar = exports.foo = void 0; +exports.foo = exports.bar = void 0; const { foo, ...bar diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/export-from-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/export-from-3/output.js index 6a46f9585f99..ddd703e807ac 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/export-from-3/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/export-from-3/output.js @@ -16,7 +16,7 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.default = void 0; + _exports.default = _exports.bar = void 0; _exports.default = _foo.foo; _exports.bar = _foo.bar; }); diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/export-from-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/export-from-5/output.js index ebcd9bd3ef61..66c63d5fac23 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/export-from-5/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/export-from-5/output.js @@ -16,7 +16,7 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.foo = void 0; + _exports.foo = _exports.bar = void 0; _exports.foo = _foo.foo; _exports.bar = _foo.bar; }); diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js index 5cca9b396963..ee8de5deef39 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/export-named-string-can-be-identifier/output.js @@ -14,7 +14,7 @@ "use strict"; _exports.__esModule = true; - _exports.bar = _exports.defaultExports = void 0; + _exports.defaultExports = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.defaultExports = foo; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/export-named/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/export-named/output.js index 4106ba476556..f11d6e6b570f 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/export-named/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/export-named/output.js @@ -14,7 +14,7 @@ "use strict"; _exports.__esModule = true; - _exports.bar = _exports["default exports"] = void 0; + _exports["default exports"] = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports["default exports"] = foo; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js index 6941dfae21dc..a5c04ae50a67 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/export-named-string-can-be-identifier/output.js @@ -16,7 +16,7 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.defaultExports = void 0; + _exports.defaultExports = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.defaultExports = foo; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/export-named/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/export-named/output.js index b9af0a8cd204..f286a6ec44bf 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/export-named/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/export-named/output.js @@ -16,7 +16,7 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports["default exports"] = void 0; + _exports["default exports"] = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports["default exports"] = foo; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-3/output.js index d6c735f4b8c8..e6e605663f2f 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-3/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-3/output.js @@ -14,7 +14,7 @@ "use strict"; _exports.__esModule = true; - _exports.bar = _exports.default = void 0; + _exports.default = _exports.bar = void 0; _exports.default = _foo.foo; _exports.bar = _foo.bar; }); diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-5/output.js index db35ffb83d9e..714ee35c9e77 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-5/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-from-5/output.js @@ -14,7 +14,7 @@ "use strict"; _exports.__esModule = true; - _exports.bar = _exports.foo = void 0; + _exports.foo = _exports.bar = void 0; _exports.foo = _foo.foo; _exports.bar = _foo.bar; }); diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-3/output.js index 4e96e316480b..846ed12be63c 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-3/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-3/output.js @@ -14,7 +14,7 @@ "use strict"; _exports.__esModule = true; - _exports.bar = _exports.default = void 0; + _exports.default = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.default = foo; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-5/output.js index c9353e2a5bd1..809798be007a 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-5/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/export-named-5/output.js @@ -14,7 +14,7 @@ "use strict"; _exports.__esModule = true; - _exports.bar = _exports.foo = void 0; + _exports.foo = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.foo = foo; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/exports-variable/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/exports-variable/output.js index d4aeec297660..e70912798bdf 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/exports-variable/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/exports-variable/output.js @@ -14,8 +14,9 @@ "use strict"; _exports.__esModule = true; + _exports.foo7 = _exports.foo6 = _exports.foo5 = _exports.foo4 = _exports.foo3 = _exports.foo2 = _exports.foo = _exports.bar = void 0; _exports.foo8 = foo8; - _exports.foo9 = _exports.foo7 = _exports.foo6 = _exports.foo5 = _exports.foo4 = _exports.foo3 = _exports.bar = _exports.foo2 = _exports.foo = void 0; + _exports.foo9 = void 0; var foo = 1; _exports.foo = foo; var foo2 = 1, diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/hoist-function-exports/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/hoist-function-exports/output.js index 640ce3bb776c..3198f253a2fe 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/hoist-function-exports/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/hoist-function-exports/output.js @@ -14,8 +14,8 @@ "use strict"; _exports.__esModule = true; - _exports.nextOdd = nextOdd; _exports.isOdd = void 0; + _exports.nextOdd = nextOdd; function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/overview/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/overview/output.js index 92177358c8c4..79dd195c54cc 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/overview/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/overview/output.js @@ -14,7 +14,7 @@ "use strict"; _exports.__esModule = true; - _exports.default = _exports.test2 = _exports.test = void 0; + _exports.test2 = _exports.test = _exports.default = void 0; foo2 = babelHelpers.interopRequireWildcard(foo2); var test; _exports.test = test; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/remap/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/remap/output.js index 03b4c1258a54..cf2cdf568afc 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/remap/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/remap/output.js @@ -14,7 +14,7 @@ "use strict"; _exports.__esModule = true; - _exports.f = _exports.e = _exports.c = _exports.a = _exports.test = void 0; + _exports.test = _exports.f = _exports.e = _exports.c = _exports.a = void 0; var test = 2; _exports.test = test; _exports.test = test = 5; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-3/output.js index 033dc64eadbe..cb1f9fa41f81 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-3/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-3/output.js @@ -16,16 +16,16 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - Object.defineProperty(_exports, "default", { + Object.defineProperty(_exports, "bar", { enumerable: true, get: function () { - return _foo.foo; + return _foo.bar; } }); - Object.defineProperty(_exports, "bar", { + Object.defineProperty(_exports, "default", { enumerable: true, get: function () { - return _foo.bar; + return _foo.foo; } }); }); diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-5/output.js index fd5bfbed33af..f44ee22cf5b0 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-5/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-from-5/output.js @@ -16,16 +16,16 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - Object.defineProperty(_exports, "foo", { + Object.defineProperty(_exports, "bar", { enumerable: true, get: function () { - return _foo.foo; + return _foo.bar; } }); - Object.defineProperty(_exports, "bar", { + Object.defineProperty(_exports, "foo", { enumerable: true, get: function () { - return _foo.bar; + return _foo.foo; } }); }); diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-3/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-3/output.js index 9b45a5008053..a755e5e26e29 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-3/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-3/output.js @@ -16,7 +16,7 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.default = void 0; + _exports.default = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.default = foo; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-5/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-5/output.js index 6966fb097e00..81fc1471d746 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-5/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/export-named-5/output.js @@ -16,7 +16,7 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.bar = _exports.foo = void 0; + _exports.foo = _exports.bar = void 0; var foo, bar; _exports.bar = bar; _exports.foo = foo; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/exports-variable/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/exports-variable/output.js index 9ad3023932a7..0433489e7ad9 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/exports-variable/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/exports-variable/output.js @@ -16,8 +16,9 @@ Object.defineProperty(_exports, "__esModule", { value: true }); + _exports.foo7 = _exports.foo6 = _exports.foo5 = _exports.foo4 = _exports.foo3 = _exports.foo2 = _exports.foo = _exports.bar = void 0; _exports.foo8 = foo8; - _exports.foo9 = _exports.foo7 = _exports.foo6 = _exports.foo5 = _exports.foo4 = _exports.foo3 = _exports.bar = _exports.foo2 = _exports.foo = void 0; + _exports.foo9 = void 0; var foo = 1; _exports.foo = foo; var foo2 = 1, diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/hoist-function-exports/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/hoist-function-exports/output.js index f6448a39188b..e5f9069c0f84 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/hoist-function-exports/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/hoist-function-exports/output.js @@ -16,8 +16,8 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.nextOdd = nextOdd; _exports.isOdd = void 0; + _exports.nextOdd = nextOdd; function nextOdd(n) { return (0, _evens.isEven)(n) ? n + 1 : n + 2; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/overview/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/overview/output.js index 294904dbbd39..de052169da13 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/overview/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/overview/output.js @@ -16,7 +16,7 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.default = _exports.test2 = _exports.test = void 0; + _exports.test2 = _exports.test = _exports.default = void 0; foo2 = babelHelpers.interopRequireWildcard(foo2); var test; _exports.test = test; diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/remap/output.js b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/remap/output.js index 33c36e34dc22..cf882a053b9b 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/remap/output.js +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/remap/output.js @@ -16,7 +16,7 @@ Object.defineProperty(_exports, "__esModule", { value: true }); - _exports.f = _exports.e = _exports.c = _exports.a = _exports.test = void 0; + _exports.test = _exports.f = _exports.e = _exports.c = _exports.a = void 0; var test = 2; _exports.test = test; _exports.test = test = 5;