From 14572e1881db82adeb0b265f11a652a0236dfa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= Date: Sun, 26 Sep 2021 10:12:18 -0400 Subject: [PATCH] Sort module export names (#13788) * fix: sort export init statements by name * update test fixtures * refactor: reduce memory footprint * review comments --- .../src/index.ts | 97 +++++++++++----- .../test/fixtures/amd/export-from-3/output.js | 12 +- .../test/fixtures/amd/export-from-6/output.js | 12 +- .../fixtures/amd/export-named-2/output.js | 2 +- .../fixtures/amd/export-named-5/output.js | 2 +- .../fixtures/amd/exports-variable/output.js | 3 +- .../amd/hoist-function-exports/output.js | 2 +- .../test/fixtures/amd/overview/output.js | 2 +- .../test/fixtures/amd/remap/output.js | 2 +- .../export-from-3/output.js | 2 +- .../export-from-5/output.js | 2 +- .../output.js | 2 +- .../export-named/output.js | 2 +- .../output.js | 2 +- .../export-named/output.js | 2 +- .../fixtures/loose/export-from-3/output.js | 2 +- .../fixtures/loose/export-from-6/output.js | 2 +- .../fixtures/loose/export-named-2/output.js | 2 +- .../fixtures/loose/export-named-5/output.js | 2 +- .../fixtures/loose/exports-variable/output.js | 3 +- .../loose/hoist-function-exports/output.js | 2 +- .../test/fixtures/loose/overview/output.js | 2 +- .../test/fixtures/loose/remap/output.js | 2 +- .../export-from-3/output.js | 2 +- .../export-from-5/output.js | 2 +- .../interop-loose/export-from-3/output.js | 2 +- .../interop-loose/export-from-6/output.js | 2 +- .../interop-loose/export-named-2/output.js | 2 +- .../interop-loose/export-named-5/output.js | 2 +- .../interop-loose/exports-variable/output.js | 3 +- .../hoist-function-exports/output.js | 2 +- .../fixtures/interop-loose/remap/output.js | 2 +- .../output.js | 2 +- .../export-named/output.js | 2 +- .../output.js | 2 +- .../export-named/output.js | 2 +- .../fixtures/interop/export-from-3/output.js | 12 +- .../fixtures/interop/export-from-6/output.js | 12 +- .../fixtures/interop/export-from-8/output.js | 108 +++++++++--------- .../fixtures/interop/export-named-2/output.js | 2 +- .../fixtures/interop/export-named-5/output.js | 2 +- .../interop/exports-variable/output.js | 3 +- .../interop/hoist-function-exports/output.js | 2 +- .../test/fixtures/interop/remap/output.js | 2 +- .../fixtures/misc/for-of-in-export/output.js | 2 +- .../test/fixtures/regression/T7160/output.js | 2 +- .../test/fixtures/strict/export-all/output.js | 6 +- .../output.js | 2 +- .../output.js | 2 +- .../output.js | 2 +- .../output.js | 2 +- .../output.js | 2 +- .../export-from-3/output.js | 2 +- .../export-from-5/output.js | 2 +- .../output.js | 2 +- .../export-named/output.js | 2 +- .../output.js | 2 +- .../export-named/output.js | 2 +- .../fixtures/loose/export-from-3/output.js | 2 +- .../fixtures/loose/export-from-5/output.js | 2 +- .../fixtures/loose/export-named-3/output.js | 2 +- .../fixtures/loose/export-named-5/output.js | 2 +- .../fixtures/loose/exports-variable/output.js | 3 +- .../loose/hoist-function-exports/output.js | 2 +- .../test/fixtures/loose/overview/output.js | 2 +- .../test/fixtures/loose/remap/output.js | 2 +- .../test/fixtures/umd/export-from-3/output.js | 12 +- .../test/fixtures/umd/export-from-5/output.js | 12 +- .../fixtures/umd/export-named-3/output.js | 2 +- .../fixtures/umd/export-named-5/output.js | 2 +- .../fixtures/umd/exports-variable/output.js | 3 +- .../umd/hoist-function-exports/output.js | 2 +- .../test/fixtures/umd/overview/output.js | 2 +- .../test/fixtures/umd/remap/output.js | 2 +- 74 files changed, 234 insertions(+), 185 deletions(-) diff --git a/packages/babel-helper-module-transforms/src/index.ts b/packages/babel-helper-module-transforms/src/index.ts index 39cbe57037..b618b4510e 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 67c7df5a73..130162e61d 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", { - enumerable: true, - get: function () { - return _foo.foo; - } - }); Object.defineProperty(_exports, "bar", { enumerable: true, get: function () { return _foo.bar; } }); + Object.defineProperty(_exports, "foo", { + enumerable: true, + get: function () { + 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 b3416f4a11..64c2dd8b99 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", { - enumerable: true, - get: function () { - return _foo.foo; - } - }); Object.defineProperty(_exports, "bar", { enumerable: true, get: function () { return _foo.bar; } }); + Object.defineProperty(_exports, "default", { + enumerable: true, + get: function () { + 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 1178bbfb61..358ac774f5 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 f647f9a99d..c4dcf79bd7 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 9aebe81d52..a2a0beac44 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 8eacaccfbe..babc8faca3 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 7b4a2b2956..83572d2ac2 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 f66b5b3862..ed299cfcd5 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 0497fcd36a..7ea503d428 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 64d68cdbf8..83687c1f4e 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 6b287f0edc..58d42d15c5 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 4dc3a095a3..753bc45e23 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 4b9d00616b..5b27811d5e 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 de6f074c65..451e81dc50 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 ebb27ba6e8..b6ca87ba12 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 a27b4a9df0..bb9f32dead 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 dc05c416fa..f8862856c1 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 04a5a62181..609492a699 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 9fb1e1092b..ff7827a186 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 5c29d86eac..ba9f2c14e5 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 f3942d53ae..854ab24d74 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 eaea92181c..7da7e38d4a 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 aef9e075e3..d28187fe96 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 f9446e0470..a3c78b3bd8 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 57b882aca9..6ff5270bca 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 acba4f460c..026e58c447 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 6ae303eaf2..ca3a5cbff9 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 640afe55af..707f2556c2 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 7d388df542..0ae54a825e 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 ca8fd7c8dd..7de23c88af 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 c6ac0e81a6..f313009c0a 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 feb1e3fcb3..85f2b311cd 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 2549e2e6d1..f039a78301 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 f7012942af..caf9fb52cd 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 25095c45da..7376641636 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 bb236a8581..b665b721b4 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,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true }); -Object.defineProperty(exports, "foo", { - enumerable: true, - get: function () { - return _foo.foo; - } -}); Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return _foo.bar; } }); +Object.defineProperty(exports, "foo", { + enumerable: true, + get: function () { + return _foo.foo; + } +}); var _foo = require("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 52f7e58b36..a3d5aac307 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,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true }); -Object.defineProperty(exports, "default", { - enumerable: true, - get: function () { - return _foo.foo; - } -}); Object.defineProperty(exports, "bar", { enumerable: true, get: function () { return _foo.bar; } }); +Object.defineProperty(exports, "default", { + enumerable: true, + get: function () { + return _foo.foo; + } +}); var _foo = require("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 d37be9030d..da1e471c96 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,60 +15,18 @@ 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", { - enumerable: true, - get: function () { - return _foo.foo9; - } -}); Object.defineProperty(exports, "foo10", { enumerable: true, get: function () { return _foo.foo10; } }); +Object.defineProperty(exports, "foo100", { + enumerable: true, + get: function () { + return _foo.foo100; + } +}); Object.defineProperty(exports, "foo11", { enumerable: true, get: function () { @@ -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 e4119f9583..544ccb4b64 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 5dfe23b4e5..8fea72610a 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 d667256ef9..2e9f833c9a 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 60e75d42d0..9c4736d9ce 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 b54ad1d491..f091718ee4 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 6375528d76..55ccd85331 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 63fd9598e3..5c74ca3085 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 d7ef4d0c5a..8837bf81e3 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 ba63188a01..b47fedb955 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 607df5ac80..2fb96031b6 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 bc64d7c33a..955b52cec1 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 40b5115dd8..cabf364724 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 283fdabbbb..6bd5f61687 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 6a46f9585f..ddd703e807 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 ebcd9bd3ef..66c63d5fac 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 5cca9b3969..ee8de5deef 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 4106ba4765..f11d6e6b57 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 6941dfae21..a5c04ae50a 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 b9af0a8cd2..f286a6ec44 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 d6c735f4b8..e6e605663f 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 db35ffb83d..714ee35c9e 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 4e96e31648..846ed12be6 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 c9353e2a5b..809798be00 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 d4aeec2976..e70912798b 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 640ce3bb77..3198f253a2 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 92177358c8..79dd195c54 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 03b4c1258a..cf2cdf568a 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 033dc64ead..cb1f9fa41f 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", { - enumerable: true, - get: function () { - return _foo.foo; - } - }); Object.defineProperty(_exports, "bar", { enumerable: true, get: function () { return _foo.bar; } }); + Object.defineProperty(_exports, "default", { + enumerable: true, + get: function () { + 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 fd5bfbed33..f44ee22cf5 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", { - enumerable: true, - get: function () { - return _foo.foo; - } - }); Object.defineProperty(_exports, "bar", { enumerable: true, get: function () { return _foo.bar; } }); + Object.defineProperty(_exports, "foo", { + enumerable: true, + get: function () { + 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 9b45a50080..a755e5e26e 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 6966fb097e..81fc1471d7 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 9ad3023932..0433489e7a 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 f6448a3918..e5f9069c0f 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 294904dbbd..de052169da 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 33c36e34dc..cf882a053b 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;