diff --git a/src/Chunk.ts b/src/Chunk.ts index 808c0dd9171..a8d5c670e27 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -36,12 +36,12 @@ import { errUnexpectedNamespaceReexport } from './utils/error'; import { escapeId } from './utils/escapeId'; -import { sortByExecutionOrder } from './utils/executionOrder'; import { assignExportsToMangledNames, assignExportsToNames } from './utils/exportNames'; import getExportMode from './utils/getExportMode'; import { getId } from './utils/getId'; import getIndentString from './utils/getIndentString'; import { getOrCreate } from './utils/getOrCreate'; +import { getStaticDependencies } from './utils/getStaticDependencies'; import { makeLegal } from './utils/identifierHelpers'; import { defaultInteropHelpersByInteropType, @@ -546,8 +546,8 @@ export default class Chunk { } link() { + this.dependencies = getStaticDependencies(this, this.orderedModules, this.chunkByModule); for (const module of this.orderedModules) { - this.addDependenciesToChunk(module.getDependenciesToBeIncluded(), this.dependencies); this.addDependenciesToChunk(module.dynamicDependencies, this.dynamicDependencies); this.addDependenciesToChunk(module.implicitlyLoadedBefore, this.implicitlyLoadedBefore); this.setUpChunkImportsAndExportsForModule(module); @@ -585,9 +585,6 @@ export default class Chunk { if (dep instanceof Chunk) this.inlineChunkDependencies(dep); } } - const sortedDependencies = [...this.dependencies]; - sortByExecutionOrder(sortedDependencies); - this.dependencies = new Set(sortedDependencies); this.prepareDynamicImportsAndImportMetas(); this.setIdentifierRenderResolutions(options); diff --git a/src/Module.ts b/src/Module.ts index 8510b24920d..331b4c640ff 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -333,8 +333,9 @@ export default class Module { getDependenciesToBeIncluded(): Set { if (this.relevantDependencies) return this.relevantDependencies; const relevantDependencies = new Set(); - const additionalSideEffectModules = new Set(); - const possibleDependencies = new Set(this.dependencies); + const necessaryDependencies = new Set(); + const alwaysCheckedDependencies = new Set(); + let dependencyVariables = this.imports; if ( this.info.isEntry || @@ -354,36 +355,25 @@ export default class Module { const { modules, original } = variable.getOriginalVariableAndDeclarationModules(); variable = original; for (const module of modules) { - additionalSideEffectModules.add(module); - possibleDependencies.add(module); + alwaysCheckedDependencies.add(module); } } - relevantDependencies.add(variable.module!); + necessaryDependencies.add(variable.module!); } if (this.options.treeshake && this.info.hasModuleSideEffects !== 'no-treeshake') { - for (const dependency of possibleDependencies) { - if ( - !( - dependency.info.hasModuleSideEffects || - additionalSideEffectModules.has(dependency as Module) - ) || - relevantDependencies.has(dependency) - ) { - continue; - } - if (dependency instanceof ExternalModule || dependency.hasEffects()) { - relevantDependencies.add(dependency); - } else { - for (const transitiveDependency of dependency.dependencies) { - possibleDependencies.add(transitiveDependency); - } - } - } + this.addRelevantSideEffectDependencies( + relevantDependencies, + necessaryDependencies, + alwaysCheckedDependencies + ); } else { for (const dependency of this.dependencies) { relevantDependencies.add(dependency); } } + for (const dependency of necessaryDependencies) { + relevantDependencies.add(dependency); + } return (this.relevantDependencies = relevantDependencies); } @@ -960,6 +950,38 @@ export default class Module { } } + private addRelevantSideEffectDependencies( + relevantDependencies: Set, + necessaryDependencies: Set, + alwaysCheckedDependencies: Set + ) { + const handledDependencies = new Set(); + + function addSideEffectDependencies(possibleDependencies: Set) { + for (const dependency of possibleDependencies) { + if (handledDependencies.has(dependency)) { + continue; + } + handledDependencies.add(dependency); + if (necessaryDependencies.has(dependency)) { + relevantDependencies.add(dependency); + continue; + } + if (!(dependency.info.hasModuleSideEffects || alwaysCheckedDependencies.has(dependency))) { + continue; + } + if (dependency instanceof ExternalModule || dependency.hasEffects()) { + relevantDependencies.add(dependency); + continue; + } + addSideEffectDependencies(dependency.dependencies); + } + } + + addSideEffectDependencies(this.dependencies); + addSideEffectDependencies(alwaysCheckedDependencies); + } + private includeAndGetAdditionalMergedNamespaces(): Variable[] { const mergedNamespaces: Variable[] = []; for (const module of this.exportAllModules) { diff --git a/src/utils/getStaticDependencies.ts b/src/utils/getStaticDependencies.ts new file mode 100644 index 00000000000..5d3a447c9f5 --- /dev/null +++ b/src/utils/getStaticDependencies.ts @@ -0,0 +1,52 @@ +import Chunk from '../Chunk'; +import ExternalModule from '../ExternalModule'; +import Module from '../Module'; + +export function getStaticDependencies( + chunk: Chunk, + orderedModules: Module[], + chunkByModule: Map +): Set { + const staticDependencyBlocks: (Chunk | ExternalModule)[][] = []; + const handledDependencies = new Set(); + for (let modulePos = orderedModules.length - 1; modulePos >= 0; modulePos--) { + const module = orderedModules[modulePos]; + if (!handledDependencies.has(module)) { + const staticDependencies: (Chunk | ExternalModule)[] = []; + addStaticDependencies(module, staticDependencies, handledDependencies, chunk, chunkByModule); + staticDependencyBlocks.unshift(staticDependencies); + } + } + const dependencies = new Set(); + for (const block of staticDependencyBlocks) { + for (const dependency of block) { + dependencies.add(dependency); + } + } + return dependencies; +} + +function addStaticDependencies( + module: Module, + staticDependencies: (Chunk | ExternalModule)[], + handledModules: Set, + chunk: Chunk, + chunkByModule: Map +): void { + const dependencies = module.getDependenciesToBeIncluded(); + for (const dependency of dependencies) { + if (dependency instanceof ExternalModule) { + staticDependencies.push(dependency); + continue; + } + const dependencyChunk = chunkByModule.get(dependency)!; + if (dependencyChunk !== chunk) { + staticDependencies.push(dependencyChunk); + continue; + } + if (!handledModules.has(dependency)) { + handledModules.add(dependency); + addStaticDependencies(dependency, staticDependencies, handledModules, chunk, chunkByModule); + } + } +} diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js index 6db24f20d99..5569e16d827 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-dep1', './generated-shared2', './generated-dep2'], function (dep1, shared2, dep2) { 'use strict'; +define(['./generated-shared2', './generated-dep1', './generated-dep2'], function (shared2, dep1, dep2) { 'use strict'; console.log(shared2.x + shared2.y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js index 2d15ef40f6e..6820cdc5219 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-dep1', './generated-shared2', './generated-dep2'], function (dep1, shared2, dep2) { 'use strict'; +define(['./generated-shared2', './generated-dep1', './generated-dep2'], function (shared2, dep1, dep2) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js index e1b073c3c46..e7c819ca823 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -require('./generated-dep1.js'); var shared2 = require('./generated-shared2.js'); +require('./generated-dep1.js'); require('./generated-dep2.js'); console.log(shared2.x + shared2.y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js index 291f1954f45..3a2eedeb32c 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-dep1.js'); require('./generated-shared2.js'); +require('./generated-dep1.js'); require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main1.js index df90cab25c7..4ecb3793798 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main1.js @@ -1,5 +1,5 @@ -import './generated-dep1.js'; import { x, y } from './generated-shared2.js'; +import './generated-dep1.js'; import './generated-dep2.js'; console.log(x + y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js index 09d60765311..ad419134b5a 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js @@ -1,3 +1,3 @@ -import './generated-dep1.js'; import './generated-shared2.js'; +import './generated-dep1.js'; import './generated-dep2.js'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js index e1227b6045a..e0735768bea 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js @@ -1,11 +1,11 @@ -System.register(['./generated-dep1.js', './generated-shared2.js', './generated-dep2.js'], function () { +System.register(['./generated-shared2.js', './generated-dep1.js', './generated-dep2.js'], function () { 'use strict'; var x, y; return { - setters: [function () {}, function (module) { + setters: [function (module) { x = module.x; y = module.y; - }, function () {}], + }, function () {}, function () {}], execute: function () { console.log(x + y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js index 4b34c33770f..b37f5d5a852 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-dep1.js', './generated-shared2.js', './generated-dep2.js'], function () { +System.register(['./generated-shared2.js', './generated-dep1.js', './generated-dep2.js'], function () { 'use strict'; return { setters: [function () {}, function () {}, function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js index 111e385a36a..ae3cc192d00 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-dep111', './generated-dep112', './generated-dep11'], function (dep111, dep112, dep11) { 'use strict'; +define(['./generated-dep11', './generated-dep112', './generated-dep111'], function (dep11, dep112, dep111) { 'use strict'; console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js index b4448a037ae..39a25a82033 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-dep111', './generated-dep112', './generated-dep11'], function (dep111, dep112, dep11) { 'use strict'; +define(['./generated-dep11', './generated-dep111', './generated-dep112'], function (dep11, dep111, dep112) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js index 5cb69cbe4bf..e61cfc76ea0 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js @@ -1,8 +1,8 @@ 'use strict'; -require('./generated-dep111.js'); -var dep112 = require('./generated-dep112.js'); require('./generated-dep11.js'); +var dep112 = require('./generated-dep112.js'); +require('./generated-dep111.js'); console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js index d68bb5324b6..7bcc0f1f5c7 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; +require('./generated-dep11.js'); require('./generated-dep111.js'); require('./generated-dep112.js'); -require('./generated-dep11.js'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js index fec6c00831b..8ccac0f4e96 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js @@ -1,6 +1,6 @@ -import './generated-dep111.js'; -import { x } from './generated-dep112.js'; import './generated-dep11.js'; +import { x } from './generated-dep112.js'; +import './generated-dep111.js'; console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js index f7b18be422f..85ab1d519aa 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js @@ -1,3 +1,3 @@ +import './generated-dep11.js'; import './generated-dep111.js'; import './generated-dep112.js'; -import './generated-dep11.js'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js index 8987e5bcdb7..faf8082f0c3 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-dep111.js', './generated-dep112.js', './generated-dep11.js'], function () { +System.register(['./generated-dep11.js', './generated-dep112.js', './generated-dep111.js'], function () { 'use strict'; var x; return { diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js index 58cd5cb31fd..ce4453cda62 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-dep111.js', './generated-dep112.js', './generated-dep11.js'], function () { +System.register(['./generated-dep11.js', './generated-dep111.js', './generated-dep112.js'], function () { 'use strict'; return { setters: [function () {}, function () {}, function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/dep11.js b/test/chunking-form/samples/chunk-execution-order/dep11.js index 97363e7263a..73087a34aa3 100644 --- a/test/chunking-form/samples/chunk-execution-order/dep11.js +++ b/test/chunking-form/samples/chunk-execution-order/dep11.js @@ -1,3 +1,3 @@ -import './dep111'; +import './dep111.js'; export { x } from './dep112.js'; console.log('11'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js index b6fd812827f..01e41b3d04f 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', 'external', './generated-dep'], function (exports, external, dep) { 'use strict'; +define(['exports', './generated-dep', 'external'], function (exports, dep, external) { 'use strict'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js index b6fd812827f..01e41b3d04f 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', 'external', './generated-dep'], function (exports, external, dep) { 'use strict'; +define(['exports', './generated-dep', 'external'], function (exports, dep, external) { 'use strict'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js index 62208a32170..c12bad5371c 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js @@ -2,8 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var external = require('external'); require('./generated-dep.js'); +var external = require('external'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js index 62208a32170..c12bad5371c 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js @@ -2,8 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var external = require('external'); require('./generated-dep.js'); +var external = require('external'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js index 1fed25e3162..d751b5a173c 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js @@ -1,2 +1,2 @@ -export { asdf as dep } from 'external'; import './generated-dep.js'; +export { asdf as dep } from 'external'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js index 1fed25e3162..d751b5a173c 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js @@ -1,2 +1,2 @@ -export { asdf as dep } from 'external'; import './generated-dep.js'; +export { asdf as dep } from 'external'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js index 06b06689d51..91fd8399052 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js @@ -1,9 +1,9 @@ -System.register(['external', './generated-dep.js'], function (exports) { +System.register(['./generated-dep.js', 'external'], function (exports) { 'use strict'; return { - setters: [function (module) { + setters: [function () {}, function (module) { exports('dep', module.asdf); - }, function () {}], + }], execute: function () { diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js index 06b06689d51..91fd8399052 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js @@ -1,9 +1,9 @@ -System.register(['external', './generated-dep.js'], function (exports) { +System.register(['./generated-dep.js', 'external'], function (exports) { 'use strict'; return { - setters: [function (module) { + setters: [function () {}, function (module) { exports('dep', module.asdf); - }, function () {}], + }], execute: function () { diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js index 1422f08ba64..2c27908828a 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', 'starexternal1', 'external1', 'starexternal2', 'external2', './generated-dep'], function (exports, starexternal1, external1, starexternal2, external2, dep) { 'use strict'; +define(['exports', 'starexternal1', 'external1', './generated-dep', 'starexternal2', 'external2'], function (exports, starexternal1, external1, dep, starexternal2, external2) { 'use strict'; var main = '1'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js index acee5c2945f..95cba85b89f 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', 'starexternal2', 'external2', './generated-dep'], function (exports, starexternal2, external2, dep) { 'use strict'; +define(['exports', './generated-dep', 'external2', 'starexternal2'], function (exports, dep, external2, starexternal2) { 'use strict'; var main = '2'; @@ -10,13 +10,13 @@ define(['exports', 'starexternal2', 'external2', './generated-dep'], function (e } }); }); + exports.dep = dep.dep; Object.defineProperty(exports, 'e', { enumerable: true, get: function () { return external2.e; } }); - exports.dep = dep.dep; exports.main = main; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js index 762a44d3e1b..ef847f28b4b 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js @@ -4,9 +4,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); var starexternal1 = require('starexternal1'); var external1 = require('external1'); +var dep = require('./generated-dep.js'); require('starexternal2'); require('external2'); -var dep = require('./generated-dep.js'); var main = '1'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js index d3309a99969..5da3f44ccc4 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js @@ -2,9 +2,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var starexternal2 = require('starexternal2'); -var external2 = require('external2'); var dep = require('./generated-dep.js'); +var external2 = require('external2'); +var starexternal2 = require('starexternal2'); var main = '2'; @@ -16,11 +16,11 @@ Object.keys(starexternal2).forEach(function (k) { } }); }); +exports.dep = dep.dep; Object.defineProperty(exports, 'e', { enumerable: true, get: function () { return external2.e; } }); -exports.dep = dep.dep; exports.main = main; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/es/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/es/main1.js index 9f996c19901..eee6367bb44 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/es/main1.js @@ -1,8 +1,8 @@ export * from 'starexternal1'; export { e } from 'external1'; +export { d as dep } from './generated-dep.js'; import 'starexternal2'; import 'external2'; -export { d as dep } from './generated-dep.js'; var main = '1'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js index 20781a113c7..50f4537ad48 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js @@ -1,6 +1,6 @@ -export * from 'starexternal2'; -export { e } from 'external2'; export { d as dep } from './generated-dep.js'; +export { e } from 'external2'; +export * from 'starexternal2'; var main = '2'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js index ae0521bfa48..bad9531bb69 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['starexternal1', 'external1', 'starexternal2', 'external2', './generated-dep.js'], function (exports) { +System.register(['starexternal1', 'external1', './generated-dep.js', 'starexternal2', 'external2'], function (exports) { 'use strict'; var _starExcludes = { main: 1, default: 1, e: 1, dep: 1 }; return { @@ -10,9 +10,9 @@ System.register(['starexternal1', 'external1', 'starexternal2', 'external2', './ exports(_setter); }, function (module) { exports('e', module.e); - }, function () {}, function () {}, function (module) { + }, function (module) { exports('dep', module.d); - }], + }, function () {}, function () {}], execute: function () { var main = exports('main', '1'); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js index b98ca0ce76e..91b5984d5ea 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js @@ -1,17 +1,17 @@ -System.register(['starexternal2', 'external2', './generated-dep.js'], function (exports) { +System.register(['./generated-dep.js', 'external2', 'starexternal2'], function (exports) { 'use strict'; - var _starExcludes = { main: 1, default: 1, e: 1, dep: 1 }; + var _starExcludes = { main: 1, default: 1, dep: 1, e: 1 }; return { setters: [function (module) { + exports('dep', module.d); + }, function (module) { + exports('e', module.e); + }, function (module) { var _setter = {}; for (var _$p in module) { if (!_starExcludes[_$p]) _setter[_$p] = module[_$p]; } exports(_setter); - }, function (module) { - exports('e', module.e); - }, function (module) { - exports('dep', module.d); }], execute: function () { diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js index 7c53593aa26..bb9152d6ae4 100644 --- a/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js +++ b/test/chunking-form/samples/circular-manual-chunks/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['exports', './generated-lib2', './generated-lib1'], function (exports, lib2, lib1) { 'use strict'; +define(['exports', './generated-lib1', './generated-lib2'], function (exports, lib1, lib2) { 'use strict'; diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js index 7a6f3d231a7..8ca369a5e0b 100644 --- a/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js +++ b/test/chunking-form/samples/circular-manual-chunks/_expected/cjs/main.js @@ -2,8 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -require('./generated-lib2.js'); var lib1 = require('./generated-lib1.js'); +require('./generated-lib2.js'); diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/es/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/es/main.js index 160cdb23d43..93f53841e6a 100644 --- a/test/chunking-form/samples/circular-manual-chunks/_expected/es/main.js +++ b/test/chunking-form/samples/circular-manual-chunks/_expected/es/main.js @@ -1,2 +1,2 @@ -import './generated-lib2.js'; export { l as lib1 } from './generated-lib1.js'; +import './generated-lib2.js'; diff --git a/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js b/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js index cfb378bc462..2bbc4fab8c6 100644 --- a/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js +++ b/test/chunking-form/samples/circular-manual-chunks/_expected/system/main.js @@ -1,9 +1,9 @@ -System.register(['./generated-lib2.js', './generated-lib1.js'], function (exports) { +System.register(['./generated-lib1.js', './generated-lib2.js'], function (exports) { 'use strict'; return { - setters: [function () {}, function (module) { + setters: [function (module) { exports('lib1', module.l); - }], + }, function () {}], execute: function () { diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js index 7c53593aa26..bb9152d6ae4 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['exports', './generated-lib2', './generated-lib1'], function (exports, lib2, lib1) { 'use strict'; +define(['exports', './generated-lib1', './generated-lib2'], function (exports, lib1, lib2) { 'use strict'; diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js index 7a6f3d231a7..8ca369a5e0b 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/cjs/main.js @@ -2,8 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -require('./generated-lib2.js'); var lib1 = require('./generated-lib1.js'); +require('./generated-lib2.js'); diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/es/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/es/main.js index 160cdb23d43..93f53841e6a 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/es/main.js @@ -1,2 +1,2 @@ -import './generated-lib2.js'; export { l as lib1 } from './generated-lib1.js'; +import './generated-lib2.js'; diff --git a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js index cfb378bc462..2bbc4fab8c6 100644 --- a/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/circular-manual-chunks/_expected/system/main.js @@ -1,9 +1,9 @@ -System.register(['./generated-lib2.js', './generated-lib1.js'], function (exports) { +System.register(['./generated-lib1.js', './generated-lib2.js'], function (exports) { 'use strict'; return { - setters: [function () {}, function (module) { + setters: [function (module) { exports('lib1', module.l); - }], + }, function () {}], execute: function () { diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js index 38be52d66a0..9e02e78d24e 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/amd/main.js @@ -1,9 +1,9 @@ -define(['exports', './components/sub/index', './components/index'], function (exports, index$1, index) { 'use strict'; +define(['exports', './components/index', './components/sub/index'], function (exports, index, index$1) { 'use strict'; - exports.foo = index$1.foo; exports.baz = index.baz; + exports.foo = index$1.foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js index 088354d51fd..e8c88da6582 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/cjs/main.js @@ -2,10 +2,10 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var index$1 = require('./components/sub/index.js'); var index = require('./components/index.js'); +var index$1 = require('./components/sub/index.js'); -exports.foo = index$1.foo; exports.baz = index.baz; +exports.foo = index$1.foo; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/es/main.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/es/main.js index 4b8f56eba17..d3455118d1b 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/es/main.js @@ -1,2 +1,2 @@ -export { foo } from './components/sub/index.js'; export { baz } from './components/index.js'; +export { foo } from './components/sub/index.js'; diff --git a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/main.js b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/main.js index a5e92b9bf5d..8aafd8ee3a0 100644 --- a/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/indirect-reexports-preserve-modules/_expected/system/main.js @@ -1,10 +1,10 @@ -System.register('bundle', ['./components/sub/index.js', './components/index.js'], function (exports) { +System.register('bundle', ['./components/index.js', './components/sub/index.js'], function (exports) { 'use strict'; return { setters: [function (module) { - exports('foo', module.foo); - }, function (module) { exports('baz', module.baz); + }, function (module) { + exports('foo', module.foo); }], execute: function () { diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/amd/main.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/amd/main.js index 5ec5a9952d4..28fbd1e66ae 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-manual-inner', './generated-manual-middle', './generated-manual-outer'], function (manualInner, manualMiddle, manualOuter) { 'use strict'; +define(['./generated-manual-outer', './generated-manual-middle', './generated-manual-inner'], function (manualOuter, manualMiddle, manualInner) { 'use strict'; console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/cjs/main.js index 7b5cf110cf4..70f46474792 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/cjs/main.js @@ -1,7 +1,7 @@ 'use strict'; -require('./generated-manual-inner.js'); -require('./generated-manual-middle.js'); require('./generated-manual-outer.js'); +require('./generated-manual-middle.js'); +require('./generated-manual-inner.js'); console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/es/main.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/es/main.js index de3b67e6685..10b9ca2eb9b 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/es/main.js @@ -1,5 +1,5 @@ -import './generated-manual-inner.js'; -import './generated-manual-middle.js'; import './generated-manual-outer.js'; +import './generated-manual-middle.js'; +import './generated-manual-inner.js'; console.log('main'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js index 07ba8910bbb..9719fd4976c 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-different-nested/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-manual-inner.js', './generated-manual-middle.js', './generated-manual-outer.js'], function () { +System.register(['./generated-manual-outer.js', './generated-manual-middle.js', './generated-manual-inner.js'], function () { 'use strict'; return { setters: [function () {}, function () {}, function () {}], diff --git a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/amd/main-a.js b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/amd/main-a.js index 939b5e414df..35ee425f7c8 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/amd/main-a.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/amd/main-a.js @@ -1,4 +1,4 @@ -define(['./generated-chunk-b', './generated-chunk-c'], function (chunkB, chunkC) { 'use strict'; +define(['./generated-chunk-c', './generated-chunk-b'], function (chunkC, chunkB) { 'use strict'; console.log('dep1'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/cjs/main-a.js b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/cjs/main-a.js index d65da8d78b5..2d8f820fd93 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/cjs/main-a.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/cjs/main-a.js @@ -1,7 +1,7 @@ 'use strict'; -require('./generated-chunk-b.js'); require('./generated-chunk-c.js'); +require('./generated-chunk-b.js'); console.log('dep1'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/es/main-a.js b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/es/main-a.js index ae2fdbf85e5..d3864b7146c 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/es/main-a.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/es/main-a.js @@ -1,5 +1,5 @@ -import './generated-chunk-b.js'; import './generated-chunk-c.js'; +import './generated-chunk-b.js'; console.log('dep1'); diff --git a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js index 69e6ce429d3..c897b06437a 100644 --- a/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js +++ b/test/chunking-form/samples/deprecated/manual-chunks-function/_expected/system/main-a.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk-b.js', './generated-chunk-c.js'], function () { +System.register(['./generated-chunk-c.js', './generated-chunk-b.js'], function () { 'use strict'; return { setters: [function () {}, function () {}], diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js index 7f84fe83631..ee86eabf5e9 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['external', './commonjs'], function (external, commonjs) { 'use strict'; +define(['./commonjs', 'external'], function (commonjs, external) { 'use strict'; function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js index ecc2cb7ff30..4d7f52a73a2 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/cjs/main.js @@ -1,7 +1,7 @@ 'use strict'; -var external = require('external'); var commonjs = require('./commonjs.js'); +var external = require('external'); function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/main.js index 6d5496583e4..8b62c696521 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/es/main.js @@ -1,4 +1,4 @@ -import external from 'external'; import commonjs from './commonjs.js'; +import external from 'external'; console.log(commonjs, external); diff --git a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js index 8ff0da14a79..c6fe1949db6 100644 --- a/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/preserve-modules-commonjs/_expected/system/main.js @@ -1,11 +1,11 @@ -System.register(['external', './commonjs.js'], function () { +System.register(['./commonjs.js', 'external'], function () { 'use strict'; - var external, commonjs; + var commonjs, external; return { setters: [function (module) { - external = module.default; - }, function (module) { commonjs = module.default; + }, function (module) { + external = module.default; }], execute: function () { diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js index fd4897a745b..2a34eca4872 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./m2', './generated-m1'], function (m2, m1) { 'use strict'; +define(['./generated-m1', './m2'], function (m1, m2) { 'use strict'; console.log(m1.ms); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js index a7ba4a72c65..7cbfccf1a76 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -require('./m2.js'); var m1 = require('./generated-m1.js'); +require('./m2.js'); console.log(m1.ms); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js index 161f7abae87..4ac52211fb9 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js @@ -1,4 +1,4 @@ -import './m2.js'; import { m as ms } from './generated-m1.js'; +import './m2.js'; console.log(ms); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js index a210bd11cb5..c2269622e03 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js @@ -1,10 +1,10 @@ -System.register(['./m2.js', './generated-m1.js'], function () { +System.register(['./generated-m1.js', './m2.js'], function () { 'use strict'; var ms; return { - setters: [function () {}, function (module) { + setters: [function (module) { ms = module.m; - }], + }, function () {}], execute: function () { console.log(ms); diff --git a/test/chunking-form/samples/external-imports/_expected/amd/main-named.js b/test/chunking-form/samples/external-imports/_expected/amd/main-named.js index def8563c1c0..f5a7f6572d7 100644 --- a/test/chunking-form/samples/external-imports/_expected/amd/main-named.js +++ b/test/chunking-form/samples/external-imports/_expected/amd/main-named.js @@ -1,4 +1,4 @@ -define(['external-all', 'external-default-named', 'external-named', 'external-named-namespace'], function (foo, baz, externalNamed, quux) { 'use strict'; +define(['external-all', 'external-named', 'external-default-named', 'external-named-namespace'], function (foo, externalNamed, baz, quux) { 'use strict'; console.log(foo.foo, externalNamed.bar, baz.baz, quux.quux); diff --git a/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js index da233d39c41..e038a7abed4 100644 --- a/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/amd/main-namespace.js @@ -1,4 +1,4 @@ -define(['external-all', 'external-default-namespace', 'external-named-namespace', 'external-namespace'], function (foo, quux, quux$1, bar) { 'use strict'; +define(['external-all', 'external-namespace', 'external-default-namespace', 'external-named-namespace'], function (foo, bar, quux, quux$1) { 'use strict'; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -21,9 +21,9 @@ define(['external-all', 'external-default-namespace', 'external-named-namespace' } var foo__namespace = /*#__PURE__*/_interopNamespace(foo); + var bar__namespace = /*#__PURE__*/_interopNamespace(bar); var quux__namespace = /*#__PURE__*/_interopNamespace(quux); var quux__namespace$1 = /*#__PURE__*/_interopNamespace(quux$1); - var bar__namespace = /*#__PURE__*/_interopNamespace(bar); console.log(foo__namespace, bar__namespace, quux__namespace, quux__namespace$1); diff --git a/test/chunking-form/samples/external-imports/_expected/cjs/main-named.js b/test/chunking-form/samples/external-imports/_expected/cjs/main-named.js index 2150e108531..58214f8baa1 100644 --- a/test/chunking-form/samples/external-imports/_expected/cjs/main-named.js +++ b/test/chunking-form/samples/external-imports/_expected/cjs/main-named.js @@ -1,8 +1,8 @@ 'use strict'; var foo = require('external-all'); -var baz = require('external-default-named'); var externalNamed = require('external-named'); +var baz = require('external-default-named'); var quux = require('external-named-namespace'); console.log(foo.foo, externalNamed.bar, baz.baz, quux.quux); diff --git a/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js index ad9ee36c8e5..0417d88a1cc 100644 --- a/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/cjs/main-namespace.js @@ -1,9 +1,9 @@ 'use strict'; var foo = require('external-all'); +var bar = require('external-namespace'); var quux = require('external-default-namespace'); var quux$1 = require('external-named-namespace'); -var bar = require('external-namespace'); function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -26,8 +26,8 @@ function _interopNamespace(e) { } var foo__namespace = /*#__PURE__*/_interopNamespace(foo); +var bar__namespace = /*#__PURE__*/_interopNamespace(bar); var quux__namespace = /*#__PURE__*/_interopNamespace(quux); var quux__namespace$1 = /*#__PURE__*/_interopNamespace(quux$1); -var bar__namespace = /*#__PURE__*/_interopNamespace(bar); console.log(foo__namespace, bar__namespace, quux__namespace, quux__namespace$1); diff --git a/test/chunking-form/samples/external-imports/_expected/es/main-named.js b/test/chunking-form/samples/external-imports/_expected/es/main-named.js index 65552b6e07b..8e9cc37e4b4 100644 --- a/test/chunking-form/samples/external-imports/_expected/es/main-named.js +++ b/test/chunking-form/samples/external-imports/_expected/es/main-named.js @@ -1,6 +1,6 @@ import { foo } from 'external-all'; -import { baz } from 'external-default-named'; import { bar } from 'external-named'; +import { baz } from 'external-default-named'; import { quux } from 'external-named-namespace'; console.log(foo, bar, baz, quux); diff --git a/test/chunking-form/samples/external-imports/_expected/es/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/es/main-namespace.js index 3aeb5284158..740f4ddee84 100644 --- a/test/chunking-form/samples/external-imports/_expected/es/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/es/main-namespace.js @@ -1,6 +1,6 @@ import * as foo from 'external-all'; +import * as bar from 'external-namespace'; import * as quux from 'external-default-namespace'; import * as quux$1 from 'external-named-namespace'; -import * as bar from 'external-namespace'; console.log(foo, bar, quux, quux$1); diff --git a/test/chunking-form/samples/external-imports/_expected/system/main-named.js b/test/chunking-form/samples/external-imports/_expected/system/main-named.js index 29d1bba7591..ae0b8189756 100644 --- a/test/chunking-form/samples/external-imports/_expected/system/main-named.js +++ b/test/chunking-form/samples/external-imports/_expected/system/main-named.js @@ -1,13 +1,13 @@ -System.register(['external-all', 'external-default-named', 'external-named', 'external-named-namespace'], function () { +System.register(['external-all', 'external-named', 'external-default-named', 'external-named-namespace'], function () { 'use strict'; - var foo, baz, bar, quux; + var foo, bar, baz, quux; return { setters: [function (module) { foo = module.foo; - }, function (module) { - baz = module.baz; }, function (module) { bar = module.bar; + }, function (module) { + baz = module.baz; }, function (module) { quux = module.quux; }], diff --git a/test/chunking-form/samples/external-imports/_expected/system/main-namespace.js b/test/chunking-form/samples/external-imports/_expected/system/main-namespace.js index 4e4582bb4a7..efb58b88879 100644 --- a/test/chunking-form/samples/external-imports/_expected/system/main-namespace.js +++ b/test/chunking-form/samples/external-imports/_expected/system/main-namespace.js @@ -1,15 +1,15 @@ -System.register(['external-all', 'external-default-namespace', 'external-named-namespace', 'external-namespace'], function () { +System.register(['external-all', 'external-namespace', 'external-default-namespace', 'external-named-namespace'], function () { 'use strict'; - var foo, quux, quux$1, bar; + var foo, bar, quux, quux$1; return { setters: [function (module) { foo = module; + }, function (module) { + bar = module; }, function (module) { quux = module; }, function (module) { quux$1 = module; - }, function (module) { - bar = module; }], execute: function () { diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js index 41436a44069..28207c22da5 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-named.js @@ -1,4 +1,4 @@ -define(['exports', 'external-all', 'external-default-named', 'external-named', 'external-named-namespace'], function (exports, externalAll, externalDefaultNamed, externalNamed, externalNamedNamespace) { 'use strict'; +define(['exports', 'external-all', 'external-named', 'external-default-named', 'external-named-namespace'], function (exports, externalAll, externalNamed, externalDefaultNamed, externalNamedNamespace) { 'use strict'; @@ -8,16 +8,16 @@ define(['exports', 'external-all', 'external-default-named', 'external-named', ' return externalAll.foo; } }); - Object.defineProperty(exports, 'baz', { + Object.defineProperty(exports, 'bar', { enumerable: true, get: function () { - return externalDefaultNamed.baz; + return externalNamed.bar; } }); - Object.defineProperty(exports, 'bar', { + Object.defineProperty(exports, 'baz', { enumerable: true, get: function () { - return externalNamed.bar; + return externalDefaultNamed.baz; } }); Object.defineProperty(exports, 'quux', { diff --git a/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js index faf4f3e4a61..255a9264b36 100644 --- a/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/amd/main-namespace.js @@ -1,4 +1,4 @@ -define(['exports', 'external-all', 'external-default-namespace', 'external-named-namespace', 'external-namespace'], function (exports, externalAll, externalDefaultNamespace, externalNamedNamespace, externalNamespace$1) { 'use strict'; +define(['exports', 'external-all', 'external-namespace', 'external-default-namespace', 'external-named-namespace'], function (exports, externalAll, externalNamespace$1, externalDefaultNamespace, externalNamedNamespace) { 'use strict'; function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -21,18 +21,18 @@ define(['exports', 'external-all', 'external-default-namespace', 'external-named } var externalAll__namespace = /*#__PURE__*/_interopNamespace(externalAll); + var externalNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamespace$1); var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespace(externalDefaultNamespace); var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamedNamespace); - var externalNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamespace$1); const externalNamespace = 1; const externalNamespace__ns = 1; console.log(externalNamespace, externalNamespace__ns); exports.foo = externalAll__namespace; + exports.bar = externalNamespace__namespace; exports.baz = externalDefaultNamespace__namespace; exports.quux = externalNamedNamespace__namespace; - exports.bar = externalNamespace__namespace; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js index 0178de78b3a..15dc96d6de7 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-named.js @@ -3,8 +3,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); var externalAll = require('external-all'); -var externalDefaultNamed = require('external-default-named'); var externalNamed = require('external-named'); +var externalDefaultNamed = require('external-default-named'); var externalNamedNamespace = require('external-named-namespace'); @@ -15,16 +15,16 @@ Object.defineProperty(exports, 'foo', { return externalAll.foo; } }); -Object.defineProperty(exports, 'baz', { +Object.defineProperty(exports, 'bar', { enumerable: true, get: function () { - return externalDefaultNamed.baz; + return externalNamed.bar; } }); -Object.defineProperty(exports, 'bar', { +Object.defineProperty(exports, 'baz', { enumerable: true, get: function () { - return externalNamed.bar; + return externalDefaultNamed.baz; } }); Object.defineProperty(exports, 'quux', { diff --git a/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js index eef14c3307c..8d3df6ca7ac 100644 --- a/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/cjs/main-namespace.js @@ -3,9 +3,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); var externalAll = require('external-all'); +var externalNamespace$1 = require('external-namespace'); var externalDefaultNamespace = require('external-default-namespace'); var externalNamedNamespace = require('external-named-namespace'); -var externalNamespace$1 = require('external-namespace'); function _interopNamespace(e) { if (e && e.__esModule) return e; @@ -28,15 +28,15 @@ function _interopNamespace(e) { } var externalAll__namespace = /*#__PURE__*/_interopNamespace(externalAll); +var externalNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamespace$1); var externalDefaultNamespace__namespace = /*#__PURE__*/_interopNamespace(externalDefaultNamespace); var externalNamedNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamedNamespace); -var externalNamespace__namespace = /*#__PURE__*/_interopNamespace(externalNamespace$1); const externalNamespace = 1; const externalNamespace__ns = 1; console.log(externalNamespace, externalNamespace__ns); exports.foo = externalAll__namespace; +exports.bar = externalNamespace__namespace; exports.baz = externalDefaultNamespace__namespace; exports.quux = externalNamedNamespace__namespace; -exports.bar = externalNamespace__namespace; diff --git a/test/chunking-form/samples/external-reexports/_expected/es/main-named.js b/test/chunking-form/samples/external-reexports/_expected/es/main-named.js index 00c24ef7e0e..14249608cde 100644 --- a/test/chunking-form/samples/external-reexports/_expected/es/main-named.js +++ b/test/chunking-form/samples/external-reexports/_expected/es/main-named.js @@ -1,4 +1,4 @@ export { foo } from 'external-all'; -export { baz } from 'external-default-named'; export { bar } from 'external-named'; +export { baz } from 'external-default-named'; export { quux } from 'external-named-namespace'; diff --git a/test/chunking-form/samples/external-reexports/_expected/es/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/es/main-namespace.js index db1a9c7a3fc..c14a1672f7a 100644 --- a/test/chunking-form/samples/external-reexports/_expected/es/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/es/main-namespace.js @@ -1,11 +1,11 @@ import * as externalAll from 'external-all'; export { externalAll as foo }; +import * as externalNamespace$1 from 'external-namespace'; +export { externalNamespace$1 as bar }; import * as externalDefaultNamespace from 'external-default-namespace'; export { externalDefaultNamespace as baz }; import * as externalNamedNamespace from 'external-named-namespace'; export { externalNamedNamespace as quux }; -import * as externalNamespace$1 from 'external-namespace'; -export { externalNamespace$1 as bar }; const externalNamespace = 1; const externalNamespace__ns = 1; diff --git a/test/chunking-form/samples/external-reexports/_expected/system/main-named.js b/test/chunking-form/samples/external-reexports/_expected/system/main-named.js index fc6c31dd1fa..c0d4f81aab3 100644 --- a/test/chunking-form/samples/external-reexports/_expected/system/main-named.js +++ b/test/chunking-form/samples/external-reexports/_expected/system/main-named.js @@ -1,12 +1,12 @@ -System.register(['external-all', 'external-default-named', 'external-named', 'external-named-namespace'], function (exports) { +System.register(['external-all', 'external-named', 'external-default-named', 'external-named-namespace'], function (exports) { 'use strict'; return { setters: [function (module) { exports('foo', module.foo); - }, function (module) { - exports('baz', module.baz); }, function (module) { exports('bar', module.bar); + }, function (module) { + exports('baz', module.baz); }, function (module) { exports('quux', module.quux); }], diff --git a/test/chunking-form/samples/external-reexports/_expected/system/main-namespace.js b/test/chunking-form/samples/external-reexports/_expected/system/main-namespace.js index 5964a07ad02..0116bef7af3 100644 --- a/test/chunking-form/samples/external-reexports/_expected/system/main-namespace.js +++ b/test/chunking-form/samples/external-reexports/_expected/system/main-namespace.js @@ -1,14 +1,14 @@ -System.register(['external-all', 'external-default-namespace', 'external-named-namespace', 'external-namespace'], function (exports) { +System.register(['external-all', 'external-namespace', 'external-default-namespace', 'external-named-namespace'], function (exports) { 'use strict'; return { setters: [function (module) { exports('foo', module); + }, function (module) { + exports('bar', module); }, function (module) { exports('baz', module); }, function (module) { exports('quux', module); - }, function (module) { - exports('bar', module); }], execute: function () { diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main1.js index a5cf9852295..b8530d391f5 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-dep', './generated-shared'], function (dep, shared) { 'use strict'; +define(['./generated-shared', './generated-dep'], function (shared, dep) { 'use strict'; console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main2.js index 307016a4280..be30778a331 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-dep', './generated-shared'], function (dep, shared) { 'use strict'; +define(['./generated-shared', './generated-dep'], function (shared, dep) { 'use strict'; console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main1.js index e793a195670..41bfb383feb 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-dep.js'); require('./generated-shared.js'); +require('./generated-dep.js'); console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main2.js index 9baf0ec210c..eec49d4274a 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-dep.js'); require('./generated-shared.js'); +require('./generated-dep.js'); console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main1.js index 16fe8ba2630..c56d4b0fb4f 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main1.js @@ -1,4 +1,4 @@ -import './generated-dep.js'; import './generated-shared.js'; +import './generated-dep.js'; console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main2.js index 728f3a05eca..a9581da4b49 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main2.js @@ -1,4 +1,4 @@ -import './generated-dep.js'; import './generated-shared.js'; +import './generated-dep.js'; console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js index bc48044fddb..2e44d944de9 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-dep.js', './generated-shared.js'], function () { +System.register(['./generated-shared.js', './generated-dep.js'], function () { 'use strict'; return { setters: [function () {}, function () {}], diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js index fe9fd050034..569ffa4f137 100644 --- a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-dep.js', './generated-shared.js'], function () { +System.register(['./generated-shared.js', './generated-dep.js'], function () { 'use strict'; return { setters: [function () {}, function () {}], diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js index 38be52d66a0..9e02e78d24e 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/amd/main.js @@ -1,9 +1,9 @@ -define(['exports', './components/sub/index', './components/index'], function (exports, index$1, index) { 'use strict'; +define(['exports', './components/index', './components/sub/index'], function (exports, index, index$1) { 'use strict'; - exports.foo = index$1.foo; exports.baz = index.baz; + exports.foo = index$1.foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js index 088354d51fd..e8c88da6582 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/cjs/main.js @@ -2,10 +2,10 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var index$1 = require('./components/sub/index.js'); var index = require('./components/index.js'); +var index$1 = require('./components/sub/index.js'); -exports.foo = index$1.foo; exports.baz = index.baz; +exports.foo = index$1.foo; diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/es/main.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/es/main.js index 4b8f56eba17..d3455118d1b 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/es/main.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/es/main.js @@ -1,2 +1,2 @@ -export { foo } from './components/sub/index.js'; export { baz } from './components/index.js'; +export { foo } from './components/sub/index.js'; diff --git a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/main.js b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/main.js index a5e92b9bf5d..8aafd8ee3a0 100644 --- a/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/main.js +++ b/test/chunking-form/samples/indirect-reexports-preserve-modules/_expected/system/main.js @@ -1,10 +1,10 @@ -System.register('bundle', ['./components/sub/index.js', './components/index.js'], function (exports) { +System.register('bundle', ['./components/index.js', './components/sub/index.js'], function (exports) { 'use strict'; return { setters: [function (module) { - exports('foo', module.foo); - }, function (module) { exports('baz', module.baz); + }, function (module) { + exports('foo', module.foo); }], execute: function () { diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/main.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/main.js index 5ec5a9952d4..28fbd1e66ae 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-manual-inner', './generated-manual-middle', './generated-manual-outer'], function (manualInner, manualMiddle, manualOuter) { 'use strict'; +define(['./generated-manual-outer', './generated-manual-middle', './generated-manual-inner'], function (manualOuter, manualMiddle, manualInner) { 'use strict'; console.log('main'); diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/cjs/main.js index 7b5cf110cf4..70f46474792 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/cjs/main.js @@ -1,7 +1,7 @@ 'use strict'; -require('./generated-manual-inner.js'); -require('./generated-manual-middle.js'); require('./generated-manual-outer.js'); +require('./generated-manual-middle.js'); +require('./generated-manual-inner.js'); console.log('main'); diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/es/main.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/es/main.js index de3b67e6685..10b9ca2eb9b 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/es/main.js @@ -1,5 +1,5 @@ -import './generated-manual-inner.js'; -import './generated-manual-middle.js'; import './generated-manual-outer.js'; +import './generated-manual-middle.js'; +import './generated-manual-inner.js'; console.log('main'); diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js index 07ba8910bbb..9719fd4976c 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-manual-inner.js', './generated-manual-middle.js', './generated-manual-outer.js'], function () { +System.register(['./generated-manual-outer.js', './generated-manual-middle.js', './generated-manual-inner.js'], function () { 'use strict'; return { setters: [function () {}, function () {}, function () {}], diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js index 939b5e414df..35ee425f7c8 100644 --- a/test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js +++ b/test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js @@ -1,4 +1,4 @@ -define(['./generated-chunk-b', './generated-chunk-c'], function (chunkB, chunkC) { 'use strict'; +define(['./generated-chunk-c', './generated-chunk-b'], function (chunkC, chunkB) { 'use strict'; console.log('dep1'); diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/cjs/main-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/cjs/main-a.js index d65da8d78b5..2d8f820fd93 100644 --- a/test/chunking-form/samples/manual-chunks-function/_expected/cjs/main-a.js +++ b/test/chunking-form/samples/manual-chunks-function/_expected/cjs/main-a.js @@ -1,7 +1,7 @@ 'use strict'; -require('./generated-chunk-b.js'); require('./generated-chunk-c.js'); +require('./generated-chunk-b.js'); console.log('dep1'); diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/es/main-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/es/main-a.js index ae2fdbf85e5..d3864b7146c 100644 --- a/test/chunking-form/samples/manual-chunks-function/_expected/es/main-a.js +++ b/test/chunking-form/samples/manual-chunks-function/_expected/es/main-a.js @@ -1,5 +1,5 @@ -import './generated-chunk-b.js'; import './generated-chunk-c.js'; +import './generated-chunk-b.js'; console.log('dep1'); diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js index 69e6ce429d3..c897b06437a 100644 --- a/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js +++ b/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk-b.js', './generated-chunk-c.js'], function () { +System.register(['./generated-chunk-c.js', './generated-chunk-b.js'], function () { 'use strict'; return { setters: [function () {}, function () {}], diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js index e27605e3143..9a63a48b663 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-dep', 'external', './generated-index'], function (dep, external, index) { 'use strict'; +define(['./generated-index', './generated-dep', 'external'], function (index, dep, external) { 'use strict'; console.log(index.lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js index 2187075bd38..29fd4bfafc4 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-dep', 'external', './generated-index'], function (dep, external, index) { 'use strict'; +define(['./generated-index', './generated-dep', 'external'], function (index, dep, external) { 'use strict'; console.log(dep.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js index 76ea0a89824..825f50ff91c 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; +var index = require('./generated-index.js'); require('./generated-dep.js'); require('external'); -var index = require('./generated-index.js'); console.log(index.lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js index a97a14db2d7..23ef86706a3 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js @@ -1,7 +1,7 @@ 'use strict'; +require('./generated-index.js'); var dep = require('./generated-dep.js'); require('external'); -require('./generated-index.js'); console.log(dep.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js index 2de2224803a..9d3be1fa5a2 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js @@ -1,5 +1,5 @@ +import { l as lib } from './generated-index.js'; import './generated-dep.js'; import 'external'; -import { l as lib } from './generated-index.js'; console.log(lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js index 0ad3b767a61..eaef3e7d3ee 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js @@ -1,5 +1,5 @@ +import './generated-index.js'; import { r as reexported } from './generated-dep.js'; import 'external'; -import './generated-index.js'; console.log(reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js index aa87cd2e3bb..4f903980c6c 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js @@ -1,10 +1,10 @@ -System.register(['./generated-dep.js', 'external', './generated-index.js'], function () { +System.register(['./generated-index.js', './generated-dep.js', 'external'], function () { 'use strict'; var lib; return { - setters: [function () {}, function () {}, function (module) { + setters: [function (module) { lib = module.l; - }], + }, function () {}, function () {}], execute: function () { console.log(lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js index 776944744d8..1b7f0f1e9ab 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js @@ -1,10 +1,10 @@ -System.register(['./generated-dep.js', 'external', './generated-index.js'], function () { +System.register(['./generated-index.js', './generated-dep.js', 'external'], function () { 'use strict'; var reexported; return { - setters: [function (module) { + setters: [function () {}, function (module) { reexported = module.r; - }, function () {}, function () {}], + }, function () {}], execute: function () { console.log(reexported); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js index 47919c68682..66a16c83d6c 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['exports', './hsl2hsv', './generated-index'], function (exports, hsl2hsv, index) { 'use strict'; +define(['exports', './generated-index', './hsl2hsv'], function (exports, index, hsl2hsv) { 'use strict'; console.log(hsl2hsv.p); var main = new Map(Object.entries(index.lib)); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js index 2ca1ab022e7..4ac898f1a3f 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js @@ -2,8 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var hsl2hsv = require('./hsl2hsv.js'); var index = require('./generated-index.js'); +var hsl2hsv = require('./hsl2hsv.js'); console.log(hsl2hsv.p); var main = new Map(Object.entries(index.lib)); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/main.js b/test/chunking-form/samples/namespace-reexports/_expected/es/main.js index 3b20f239985..716aeaba0fa 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/es/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/es/main.js @@ -1,5 +1,5 @@ -import { p } from './hsl2hsv.js'; import { l as lib } from './generated-index.js'; +import { p } from './hsl2hsv.js'; console.log(p); var main = new Map(Object.entries(lib)); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/main.js b/test/chunking-form/samples/namespace-reexports/_expected/system/main.js index bcb4935821d..cb3c1c8b4ec 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/main.js @@ -1,11 +1,11 @@ -System.register(['./hsl2hsv.js', './generated-index.js'], function (exports) { +System.register(['./generated-index.js', './hsl2hsv.js'], function (exports) { 'use strict'; - var p, lib; + var lib, p; return { setters: [function (module) { - p = module.p; - }, function (module) { lib = module.l; + }, function (module) { + p = module.p; }], execute: function () { diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js index 57ff8799c78..5b5590c79d7 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js @@ -1,4 +1,4 @@ -define(['./generated-broken', './generated-foo'], function (broken, foo) { 'use strict'; +define(['./generated-foo', './generated-broken'], function (foo, broken) { 'use strict'; foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js index a765544075c..70d5de78739 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js @@ -1,4 +1,4 @@ -define(['./generated-broken', './generated-foo', './generated-bar'], function (broken, foo, bar) { 'use strict'; +define(['./generated-foo', './generated-bar', './generated-broken'], function (foo, bar, broken) { 'use strict'; foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js index 3294fe2a7fc..da9307f8f27 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js @@ -1,4 +1,4 @@ -define(['./generated-broken', './generated-bar'], function (broken, bar) { 'use strict'; +define(['./generated-bar', './generated-broken'], function (bar, broken) { 'use strict'; bar.bar(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js index dc1c5e9f6f3..d1ae3079950 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js @@ -1,7 +1,7 @@ 'use strict'; -var broken = require('./generated-broken.js'); var foo = require('./generated-foo.js'); +var broken = require('./generated-broken.js'); foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js index 6ee2b541f99..8af754c0361 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js @@ -1,8 +1,8 @@ 'use strict'; -var broken = require('./generated-broken.js'); var foo = require('./generated-foo.js'); var bar = require('./generated-bar.js'); +var broken = require('./generated-broken.js'); foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js index 54cdd8631bb..520e431fe61 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js @@ -1,7 +1,7 @@ 'use strict'; -var broken = require('./generated-broken.js'); var bar = require('./generated-bar.js'); +var broken = require('./generated-broken.js'); bar.bar(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js index 36c262d3265..bb705dba651 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js @@ -1,5 +1,5 @@ -import { b as broken } from './generated-broken.js'; import { f as foo } from './generated-foo.js'; +import { b as broken } from './generated-broken.js'; foo(); broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js index 6da3133e340..09e3b0f5a52 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js @@ -1,6 +1,6 @@ -import { b as broken } from './generated-broken.js'; import { f as foo } from './generated-foo.js'; import { b as bar } from './generated-bar.js'; +import { b as broken } from './generated-broken.js'; foo(); broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js index ba24b661e25..e5cc6a87806 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js @@ -1,5 +1,5 @@ -import { b as broken } from './generated-broken.js'; import { b as bar } from './generated-bar.js'; +import { b as broken } from './generated-broken.js'; bar(); broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js index a6734308369..baeeced58ea 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js @@ -1,11 +1,11 @@ -System.register(['./generated-broken.js', './generated-foo.js'], function () { +System.register(['./generated-foo.js', './generated-broken.js'], function () { 'use strict'; - var broken, foo; + var foo, broken; return { setters: [function (module) { - broken = module.b; - }, function (module) { foo = module.f; + }, function (module) { + broken = module.b; }], execute: function () { diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js index 720016f85f6..557263c8f57 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js @@ -1,13 +1,13 @@ -System.register(['./generated-broken.js', './generated-foo.js', './generated-bar.js'], function () { +System.register(['./generated-foo.js', './generated-bar.js', './generated-broken.js'], function () { 'use strict'; - var broken, foo, bar; + var foo, bar, broken; return { setters: [function (module) { - broken = module.b; - }, function (module) { foo = module.f; }, function (module) { bar = module.b; + }, function (module) { + broken = module.b; }], execute: function () { diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js index 7a4c645212e..eb1d3899180 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js @@ -1,11 +1,11 @@ -System.register(['./generated-broken.js', './generated-bar.js'], function () { +System.register(['./generated-bar.js', './generated-broken.js'], function () { 'use strict'; - var broken, bar; + var bar, broken; return { setters: [function (module) { - broken = module.b; - }, function (module) { bar = module.b; + }, function (module) { + broken = module.b; }], execute: function () { diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js index 7f84fe83631..ee86eabf5e9 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['external', './commonjs'], function (external, commonjs) { 'use strict'; +define(['./commonjs', 'external'], function (commonjs, external) { 'use strict'; function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js index ecc2cb7ff30..4d7f52a73a2 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js @@ -1,7 +1,7 @@ 'use strict'; -var external = require('external'); var commonjs = require('./commonjs.js'); +var external = require('external'); function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; } diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/main.js index 6d5496583e4..8b62c696521 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/es/main.js @@ -1,4 +1,4 @@ -import external from 'external'; import commonjs from './commonjs.js'; +import external from 'external'; console.log(commonjs, external); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js index 8ff0da14a79..c6fe1949db6 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/system/main.js @@ -1,11 +1,11 @@ -System.register(['external', './commonjs.js'], function () { +System.register(['./commonjs.js', 'external'], function () { 'use strict'; - var external, commonjs; + var commonjs, external; return { setters: [function (module) { - external = module.default; - }, function (module) { commonjs = module.default; + }, function (module) { + external = module.default; }], execute: function () { diff --git a/test/function/index.js b/test/function/index.js index 703d670bb27..0f2a85d63a5 100644 --- a/test/function/index.js +++ b/test/function/index.js @@ -3,8 +3,9 @@ const assert = require('assert'); const rollup = require('../../dist/rollup'); const { compareError, compareWarnings, runTestSuiteWithSamples } = require('../utils.js'); -function requireWithContext(code, context, module) { - const contextWithExports = Object.assign({}, context, { module, exports: module.exports }); +function requireWithContext(code, context, exports) { + const module = { exports }; + const contextWithExports = Object.assign({}, context, { module, exports }); const contextKeys = Object.keys(contextWithExports); const contextValues = contextKeys.map(key => contextWithExports[key]); try { @@ -30,7 +31,7 @@ function runCodeSplitTest(codeMap, entryId, configContext) { return (exportsMap[outputId] = requireWithContext( code, Object.assign({ require: requireFromOutputVia(outputId) }, context), - (exportsMap[outputId] = { exports: {} }) + (exportsMap[outputId] = {}) )); } else { return require(importee); diff --git a/test/function/samples/chunk-external-dependency-execution-order/_config.js b/test/function/samples/chunk-external-dependency-execution-order/_config.js new file mode 100644 index 00000000000..2fde7185af1 --- /dev/null +++ b/test/function/samples/chunk-external-dependency-execution-order/_config.js @@ -0,0 +1,20 @@ +const assert = require('assert'); +const executionOrder = []; + +module.exports = { + description: + 'Uses correct execution order when several modules in a chunk have external dependencies', + context: { + executionOrder, + require(id) { + executionOrder.push(id); + return {}; + } + }, + options: { + external: ['external-first', 'external-second'] + }, + exports() { + assert.deepStrictEqual(executionOrder, ['external-first', 'external-second', 'dep', 'main']); + } +}; diff --git a/test/function/samples/chunk-external-dependency-execution-order/dep.js b/test/function/samples/chunk-external-dependency-execution-order/dep.js new file mode 100644 index 00000000000..e37ed9b73de --- /dev/null +++ b/test/function/samples/chunk-external-dependency-execution-order/dep.js @@ -0,0 +1,2 @@ +import 'external-second'; +executionOrder.push('dep'); diff --git a/test/function/samples/chunk-external-dependency-execution-order/main.js b/test/function/samples/chunk-external-dependency-execution-order/main.js new file mode 100644 index 00000000000..87a6fbf96f1 --- /dev/null +++ b/test/function/samples/chunk-external-dependency-execution-order/main.js @@ -0,0 +1,3 @@ +import 'external-first'; +import './dep.js'; +executionOrder.push('main'); diff --git a/test/function/samples/preserve-modules-circular-order/_config.js b/test/function/samples/preserve-modules-circular-order/_config.js new file mode 100644 index 00000000000..7bd9f5d3bc5 --- /dev/null +++ b/test/function/samples/preserve-modules-circular-order/_config.js @@ -0,0 +1,40 @@ +const assert = require('assert'); +const executionOrder = []; + +module.exports = { + description: 'preserves execution order for circular dependencies when preserving modules', + options: { + output: { preserveModules: true } + }, + context: { + executionOrder + }, + exports() { + assert.deepStrictEqual(executionOrder, [ + 'index', + 'tag', + 'data', + 'main: Tag: Tag data Tag data' + ]); + }, + warnings: [ + { + code: 'CIRCULAR_DEPENDENCY', + cycle: ['data.js', 'tag.js', 'data.js'], + importer: 'data.js', + message: 'Circular dependency: data.js -> tag.js -> data.js' + }, + { + code: 'CIRCULAR_DEPENDENCY', + cycle: ['data.js', 'tag.js', 'index.js', 'data.js'], + importer: 'data.js', + message: 'Circular dependency: data.js -> tag.js -> index.js -> data.js' + }, + { + code: 'CIRCULAR_DEPENDENCY', + cycle: ['tag.js', 'index.js', 'tag.js'], + importer: 'tag.js', + message: 'Circular dependency: tag.js -> index.js -> tag.js' + } + ] +}; diff --git a/test/function/samples/preserve-modules-circular-order/data.js b/test/function/samples/preserve-modules-circular-order/data.js new file mode 100644 index 00000000000..9c6b35a2ad6 --- /dev/null +++ b/test/function/samples/preserve-modules-circular-order/data.js @@ -0,0 +1,7 @@ +import { Tag } from './tag.js'; +import './index.js'; + +executionOrder.push('data'); + +export const data = () => 'data'; +export const Data = () => `Tag: ${Tag()}`; diff --git a/test/function/samples/preserve-modules-circular-order/index.js b/test/function/samples/preserve-modules-circular-order/index.js new file mode 100644 index 00000000000..c14367a2bce --- /dev/null +++ b/test/function/samples/preserve-modules-circular-order/index.js @@ -0,0 +1,6 @@ +import { Data, data } from './data.js'; +import { Tag } from './tag.js'; + +executionOrder.push('index'); + +export { Data, data, Tag }; diff --git a/test/function/samples/preserve-modules-circular-order/main.js b/test/function/samples/preserve-modules-circular-order/main.js new file mode 100644 index 00000000000..3d342b53c17 --- /dev/null +++ b/test/function/samples/preserve-modules-circular-order/main.js @@ -0,0 +1,5 @@ +import { Data } from './data.js'; +import { Tag } from './tag.js'; +import './index.js'; + +executionOrder.push(`main: ${Data()} ${Tag()}`); diff --git a/test/function/samples/preserve-modules-circular-order/tag.js b/test/function/samples/preserve-modules-circular-order/tag.js new file mode 100644 index 00000000000..31a478eed7c --- /dev/null +++ b/test/function/samples/preserve-modules-circular-order/tag.js @@ -0,0 +1,8 @@ +import * as D from './data.js'; +import './index.js'; + +executionOrder.push('tag'); + +export function Tag() { + return `Tag ${D.data()}`; +}