From 70b0844aab506edb0a8ec3760721ca91ecd5349c Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 31 May 2019 09:36:44 +0200 Subject: [PATCH] Do not produce undefined reexports when reexporting from entry points and refactor chunk linking (#2885) * Refactor chunk linking, fix undefined imports from entry chunks, use first letter for shortened exports if possible * Make facade creation a little nicer --- src/Chunk.ts | 183 +++++++++--------- src/Graph.ts | 25 +-- src/Module.ts | 48 +++-- .../asset-emission/_expected/es/main.js | 2 +- .../_expected/es/nested/chunk.js | 2 +- .../_expected/es/nested/chunk2.js | 2 +- .../asset-emission/_expected/system/main.js | 2 +- .../_expected/system/nested/chunk.js | 2 +- .../_expected/system/nested/chunk2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../basic-chunking/_expected/es/main1.js | 2 +- .../basic-chunking/_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../basic-chunking/_expected/system/main1.js | 2 +- .../basic-chunking/_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/generated-chunk2.js | 6 +- .../_expected/es/generated-chunk3.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/generated-chunk2.js | 8 +- .../_expected/system/generated-chunk3.js | 2 +- .../_expected/system/main1.js | 4 +- .../_expected/es/generated-chunk2.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/system/generated-chunk2.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 4 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../chunk-live-bindings/_expected/es/main1.js | 2 +- .../chunk-live-bindings/_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 12 +- .../_expected/system/main1.js | 4 +- .../_expected/system/main2.js | 4 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 4 +- .../_expected/system/main1.js | 4 +- .../_expected/system/main2.js | 2 +- .../chunk-naming/_expected/es/chunks/chunk.js | 2 +- .../_expected/es/chunks/chunk2.js | 2 +- .../_expected/es/chunks/chunk3.js | 2 +- .../_expected/es/custom/entryC.js | 4 +- .../chunk-naming/_expected/es/entryA.js | 4 +- .../chunk-naming/_expected/es/entryB.js | 4 +- .../_expected/system/chunks/chunk.js | 2 +- .../_expected/system/chunks/chunk2.js | 2 +- .../_expected/system/chunks/chunk3.js | 2 +- .../_expected/system/custom/entryC.js | 4 +- .../chunk-naming/_expected/system/entryA.js | 4 +- .../chunk-naming/_expected/system/entryB.js | 4 +- .../_expected/amd/generated-chunk.js | 2 +- .../chunking-compact/_expected/amd/main1.js | 2 +- .../chunking-compact/_expected/amd/main2.js | 2 +- .../_expected/cjs/generated-chunk.js | 2 +- .../chunking-compact/_expected/cjs/main1.js | 2 +- .../chunking-compact/_expected/cjs/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../chunking-compact/_expected/es/main1.js | 2 +- .../chunking-compact/_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../chunking-externals/_expected/es/main1.js | 2 +- .../chunking-externals/_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../deconflict-globals/_expected/es/main1.js | 2 +- .../deconflict-globals/_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/generated-dep2.js | 2 +- .../_expected/es/main.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/generated-dep2.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/generated-dynamic.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 4 +- .../_expected/system/generated-dynamic.js | 2 +- .../_expected/system/main2.js | 4 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main.js | 2 +- .../_expected/system/generated-chunk.js | 4 +- .../_expected/system/main.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main.js | 2 +- .../_expected/system/generated-chunk.js | 4 +- .../_expected/system/main.js | 2 +- .../_expected/es/chunks/chunk.js | 2 +- .../_expected/es/chunks/other.js | 2 +- .../dynamic-import/_expected/es/main.js | 2 +- .../_expected/system/chunks/chunk.js | 2 +- .../_expected/system/chunks/other.js | 2 +- .../dynamic-import/_expected/system/main.js | 2 +- .../_expected/es/generated-build-starter.js | 2 +- .../_expected/es/generated-buildStart.js | 2 +- .../emit-chunk-facade/_expected/es/main.js | 2 +- .../system/generated-build-starter.js | 4 +- .../_expected/system/generated-buildStart.js | 2 +- .../_expected/system/main.js | 4 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/es/main.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../system/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/system/main.js | 2 +- .../_expected/es/chunks/chunk.js | 2 +- .../_expected/es/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/es/main.js | 2 +- .../_expected/system/chunks/chunk.js | 2 +- .../_expected/system/chunks/worker.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/es/chunks/chunk.js | 2 +- .../_expected/es/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/es/main.js | 2 +- .../_expected/system/chunks/chunk.js | 4 +- .../_expected/system/chunks/worklet.js | 4 +- .../_expected/system/main.js | 4 +- .../_expected/es/generated-buildStart.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../samples/emit-chunk/_expected/es/main.js | 2 +- .../_expected/system/generated-buildStart.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../emit-chunk/_expected/system/main.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/es/generated-main2alias.js | 2 +- .../_expected/es/main1alias.js | 2 +- .../_expected/es/main2alias.js | 2 +- .../_expected/system/generated-main2alias.js | 4 +- .../_expected/system/main1alias.js | 4 +- .../_expected/system/main2alias.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../entrypoint-facade/_expected/es/main1.js | 2 +- .../entrypoint-facade/_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 4 +- .../_expected/system/main1.js | 4 +- .../_expected/system/main2.js | 2 +- ...d1d-esm.js => chunk-chunk-cc2b1346-esm.js} | 2 +- .../_expected/es/entry-main1-0152a638-esm.js | 3 - .../_expected/es/entry-main1-2901d8b1-esm.js | 3 + .../_expected/es/entry-main2-5a78ab60-esm.js | 1 - .../_expected/es/entry-main2-62d27906-esm.js | 1 + ...stem.js => chunk-chunk-63744fb4-system.js} | 4 +- ...stem.js => entry-main1-379caf56-system.js} | 6 +- ...stem.js => entry-main2-9e49ba04-system.js} | 4 +- .../_expected/es/generated-chunk.js | 2 +- .../grouping-multiple/_expected/es/main1.js | 2 +- .../grouping-multiple/_expected/es/main2.js | 2 +- .../grouping-multiple/_expected/es/main3.js | 2 +- .../_expected/system/generated-chunk.js | 6 +- .../_expected/system/main1.js | 4 +- .../_expected/system/main2.js | 4 +- .../_expected/system/main3.js | 4 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/generated-chunk2.js | 2 +- .../grouping-size/_expected/es/main1.js | 4 +- .../grouping-size/_expected/es/main2.js | 4 +- .../grouping-size/_expected/es/main3.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/generated-chunk2.js | 4 +- .../grouping-size/_expected/system/main1.js | 4 +- .../grouping-size/_expected/system/main2.js | 4 +- .../grouping-size/_expected/system/main3.js | 4 +- .../import-meta-url/_expected/es/main.js | 2 +- .../_expected/es/nested/chunk.js | 2 +- .../_expected/es/nested/chunk2.js | 2 +- .../import-meta-url/_expected/system/main.js | 2 +- .../_expected/system/nested/chunk.js | 2 +- .../_expected/system/nested/chunk2.js | 2 +- .../_expected/es/generated-outer.js | 2 +- .../_expected/es/main.js | 2 +- .../_expected/system/generated-outer.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/es/generated-other.js | 2 +- .../_expected/es/main.js | 2 +- .../_expected/system/generated-other.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/es/generated-deps2and3.js | 4 +- .../_expected/es/generated-lib1.js | 2 +- .../manual-chunks/_expected/es/main.js | 2 +- .../_expected/system/generated-deps2and3.js | 6 +- .../_expected/system/generated-lib1.js | 2 +- .../manual-chunks/_expected/system/main.js | 4 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/generated-chunk2.js | 2 +- .../_expected/es/generated-chunk3.js | 2 +- .../multi-chunking/_expected/es/main1.js | 4 +- .../multi-chunking/_expected/es/main2.js | 4 +- .../multi-chunking/_expected/es/main3.js | 4 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/generated-chunk2.js | 2 +- .../_expected/system/generated-chunk3.js | 2 +- .../multi-chunking/_expected/system/main1.js | 4 +- .../multi-chunking/_expected/system/main2.js | 4 +- .../multi-chunking/_expected/system/main3.js | 4 +- .../_expected/es/chunks/chunk.js | 2 +- .../_expected/es/main.js | 2 +- .../_expected/es/other.js | 2 +- .../_expected/system/chunks/chunk.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/system/other.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 4 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/generated-chunk2.js | 4 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/generated-chunk2.js | 4 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/es/generated-chunk.js | 4 +- .../namespace-reexports/_expected/es/main.js | 2 +- .../_expected/system/generated-chunk.js | 4 +- .../_expected/system/main.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main-a.js | 2 +- .../_expected/es/main-b.js | 2 +- .../_expected/system/generated-chunk.js | 4 +- .../_expected/system/main-a.js | 4 +- .../_expected/system/main-b.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/generated-chunk2.js | 2 +- .../_expected/es/generated-chunk3.js | 2 +- .../namespace-tracing/_expected/es/main-a.js | 4 +- .../namespace-tracing/_expected/es/main-b.js | 6 +- .../namespace-tracing/_expected/es/main-c.js | 4 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/generated-chunk2.js | 2 +- .../_expected/system/generated-chunk3.js | 2 +- .../_expected/system/main-a.js | 4 +- .../_expected/system/main-b.js | 6 +- .../_expected/system/main-c.js | 4 +- .../samples/reexport-from-entry/_config.js | 6 + .../_expected/amd/generated-chunk.js | 12 ++ .../reexport-from-entry/_expected/amd/main.js | 10 + .../_expected/amd/otherEntry.js | 10 + .../_expected/cjs/generated-chunk.js | 10 + .../reexport-from-entry/_expected/cjs/main.js | 10 + .../_expected/cjs/otherEntry.js | 10 + .../_expected/es/generated-chunk.js | 6 + .../reexport-from-entry/_expected/es/main.js | 1 + .../_expected/es/otherEntry.js | 1 + .../_expected/system/generated-chunk.js | 13 ++ .../_expected/system/main.js | 16 ++ .../_expected/system/otherEntry.js | 16 ++ .../samples/reexport-from-entry/common.js | 2 + .../samples/reexport-from-entry/main.js | 2 + .../samples/reexport-from-entry/otherEntry.js | 2 + .../_expected/es/generated-chunk.js | 2 +- .../reexport-shortpaths/_expected/es/main1.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/generated-lazy.js | 2 +- .../_expected/es/main.js | 2 +- .../_expected/system/generated-lazy.js | 2 +- .../_expected/system/main.js | 44 ++--- .../_expected/es/generated-chunk.js | 2 +- .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- 320 files changed, 655 insertions(+), 522 deletions(-) rename test/chunking-form/samples/filenames-patterns/_expected/es/{chunk-chunk-88db1d1d-esm.js => chunk-chunk-cc2b1346-esm.js} (72%) delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0152a638-esm.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-2901d8b1-esm.js delete mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-5a78ab60-esm.js create mode 100644 test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-62d27906-esm.js rename test/chunking-form/samples/filenames-patterns/_expected/system/{chunk-chunk-26e1391e-system.js => chunk-chunk-63744fb4-system.js} (76%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main1-2c874064-system.js => entry-main1-379caf56-system.js} (59%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{entry-main2-dd802b9d-system.js => entry-main2-9e49ba04-system.js} (55%) create mode 100644 test/chunking-form/samples/reexport-from-entry/_config.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-chunk.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-chunk.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/es/generated-chunk.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/es/main.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/system/generated-chunk.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/system/main.js create mode 100644 test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js create mode 100644 test/chunking-form/samples/reexport-from-entry/common.js create mode 100644 test/chunking-form/samples/reexport-from-entry/main.js create mode 100644 test/chunking-form/samples/reexport-from-entry/otherEntry.js diff --git a/src/Chunk.ts b/src/Chunk.ts index 3b55ad0c4b6..5071e9cc6bb 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -111,6 +111,20 @@ export function isChunkRendered(chunk: Chunk): boolean { } export default class Chunk { + static generateFacade(graph: Graph, facadedModule: Module): Chunk { + const chunk = new Chunk(graph, []); + chunk.dependencies = [facadedModule.chunk]; + chunk.dynamicDependencies = []; + chunk.facadeModule = facadedModule; + facadedModule.facadeChunk = chunk; + for (const exportName of facadedModule.getAllExportNames()) { + const tracedVariable = facadedModule.getVariableForExportName(exportName); + chunk.exports.add(tracedVariable); + chunk.exportNames[exportName] = tracedVariable; + } + return chunk; + } + entryModules: Module[] = []; execIndex: number; exportMode = 'named'; @@ -126,8 +140,8 @@ export default class Chunk { [moduleId: string]: RenderedModule; }; usedModules: Module[] = undefined as any; - variableName: string; + variableName: string; private chunkName: string | void; private dependencies: (ExternalModule | Chunk)[] = undefined as any; private dynamicDependencies: (ExternalModule | Chunk)[] = undefined as any; @@ -179,39 +193,42 @@ export default class Chunk { } } - generateEntryExportsOrMarkAsTainted() { - const exportVariableMaps = this.entryModules.map(module => ({ - map: this.getVariableExportNamesForModule(module), - module - })); - for (const { map } of exportVariableMaps) { - for (const exposedVariable of map.keys()) { - this.exports.add(exposedVariable); + canModuleBeFacade( + moduleExportNamesByVariable: Map, + moduleChunkAlias: string | null + ): boolean { + if (this.manualChunkAlias && moduleChunkAlias && this.manualChunkAlias !== moduleChunkAlias) { + return false; + } + for (const exposedVariable of this.exports) { + if (!moduleExportNamesByVariable.has(exposedVariable)) { + return false; } } - checkNextEntryModule: for (const { map, module } of exportVariableMaps) { - if (!this.graph.preserveModules) { + return true; + } + + generateFacades(): Chunk[] { + const facades: Chunk[] = []; + for (const module of this.entryModules) { + if (!this.facadeModule) { + const exportNamesByVariable = module.getExportNamesByVariable(); if ( - this.manualChunkAlias && - module.chunkAlias && - this.manualChunkAlias !== module.chunkAlias + this.graph.preserveModules || + this.canModuleBeFacade(exportNamesByVariable, module.chunkAlias) ) { - continue checkNextEntryModule; - } - for (const exposedVariable of this.exports) { - if (!map.has(exposedVariable)) { - continue checkNextEntryModule; + this.facadeModule = module; + for (const [variable, exportNames] of exportNamesByVariable) { + for (const exportName of exportNames) { + this.exportNames[exportName] = variable; + } } + continue; } } - this.facadeModule = module; - for (const [variable, exportNames] of map) { - for (const exportName of exportNames) { - this.exportNames[exportName] = variable; - } - } - return; + facades.push(Chunk.generateFacade(this.graph, module)); } + return facades; } generateId( @@ -261,15 +278,20 @@ export default class Chunk { this.sortedExportNames = null; if (mangle) { for (const variable of this.exports) { - do { - safeExportName = toBase64(++i); - // skip past leading number identifiers - if (safeExportName.charCodeAt(0) === 49 /* '1' */) { - i += 9 * 64 ** (safeExportName.length - 1); - safeExportName = toBase64(i); - } - } while (RESERVED_NAMES[safeExportName]); - this.exportNames[safeExportName] = variable; + const suggestedName = variable.name[0]; + if (!this.exportNames[suggestedName]) { + this.exportNames[suggestedName] = variable; + } else { + do { + safeExportName = toBase64(++i); + // skip past leading number identifiers + if (safeExportName.charCodeAt(0) === 49 /* '1' */) { + i += 9 * 64 ** (safeExportName.length - 1); + safeExportName = toBase64(i); + } + } while (RESERVED_NAMES[safeExportName] || this.exportNames[safeExportName]); + this.exportNames[safeExportName] = variable; + } } } else { for (const variable of this.exports) { @@ -324,22 +346,23 @@ export default class Chunk { return (this.renderedSourceLength = (this.renderedSource as MagicStringBundle).length()); } - getVariableExportName(variable: Variable) { + getVariableExportName(variable: Variable): string { if (this.graph.preserveModules && variable instanceof NamespaceVariable) { return '*'; } for (const exportName of Object.keys(this.exportNames)) { if (this.exportNames[exportName] === variable) return exportName; } + throw new Error(`Internal Error: Could not find export name for variable ${variable.name}.`); } link() { const dependencies: Set = new Set(); const dynamicDependencies: Set = new Set(); for (const module of this.orderedModules) { - this.addChunksFromDependencies(module.getTransitiveDependencies(), dependencies); - this.addChunksFromDependencies(module.dynamicDependencies, dynamicDependencies); - this.setUpModuleImports(module); + this.addDependenciesToChunk(module.getTransitiveDependencies(), dependencies); + this.addDependenciesToChunk(module.dynamicDependencies, dynamicDependencies); + this.setUpChunkImportsAndExportsForModule(module); } this.dependencies = Array.from(dependencies); this.dynamicDependencies = Array.from(dynamicDependencies); @@ -384,14 +407,12 @@ export default class Chunk { ) => { if (dep.imports) { for (const impt of dep.imports) { - impt.imported = this.getVariableExportName(oldExportNames[impt.imported]) as string; + impt.imported = this.getVariableExportName(oldExportNames[impt.imported]); } } if (dep.reexports) { for (const reexport of dep.reexports) { - reexport.imported = this.getVariableExportName( - oldExportNames[reexport.imported] - ) as string; + reexport.imported = this.getVariableExportName(oldExportNames[reexport.imported]); } } }; @@ -699,18 +720,6 @@ export default class Chunk { }); } - turnIntoFacade(facadedModule: Module) { - this.dependencies = [facadedModule.chunk]; - this.dynamicDependencies = []; - this.facadeModule = facadedModule; - facadedModule.facadeChunk = this; - for (const exportName of facadedModule.getAllExports()) { - const tracedVariable = facadedModule.getVariableForExportName(exportName); - this.exports.add(tracedVariable); - this.exportNames[exportName] = tracedVariable; - } - } - visitDependencies(handleDependency: (dependency: Chunk | ExternalModule) => void) { const toBeVisited: (Chunk | ExternalModule)[] = [this]; const visited: Set = new Set(); @@ -743,7 +752,7 @@ export default class Chunk { return visitDep(this); } - private addChunksFromDependencies( + private addDependenciesToChunk( moduleDependencies: (Module | ExternalModule)[], chunkDependencies: Set ) { @@ -844,11 +853,11 @@ export default class Chunk { const reexportDeclarations = new Map(); for (let exportName of this.getExportNames()) { - let exportModule: Chunk | ExternalModule; + let exportChunk: Chunk | ExternalModule; let importName: string; let needsLiveBinding = false; if (exportName[0] === '*') { - exportModule = this.graph.moduleById.get(exportName.substr(1)) as ExternalModule; + exportChunk = this.graph.moduleById.get(exportName.substr(1)) as ExternalModule; importName = exportName = '*'; } else { const variable = this.exportNames[exportName]; @@ -856,18 +865,18 @@ export default class Chunk { // skip local exports if (!module || module.chunk === this) continue; if (module instanceof Module) { - exportModule = module.chunk; - importName = module.chunk.getVariableExportName(variable) as string; + exportChunk = module.chunk; + importName = module.chunk.getVariableExportName(variable); needsLiveBinding = variable.isReassigned; } else { - exportModule = module; + exportChunk = module; importName = variable.name; needsLiveBinding = true; } } - let exportDeclaration = reexportDeclarations.get(exportModule); - if (!exportDeclaration) reexportDeclarations.set(exportModule, (exportDeclaration = [])); - exportDeclaration.push({ imported: importName, reexported: exportName, needsLiveBinding }); + let reexportDeclaration = reexportDeclarations.get(exportChunk); + if (!reexportDeclaration) reexportDeclarations.set(exportChunk, (reexportDeclaration = [])); + reexportDeclaration.push({ imported: importName, reexported: exportName, needsLiveBinding }); } const renderedImports = new Set(); @@ -885,12 +894,13 @@ export default class Chunk { !renderedImports.has(renderedVariable) ) { renderedImports.add(renderedVariable); - const local = variable.getName(); - const imported = - variable.module instanceof ExternalModule - ? variable.name - : (variable.module as Module).chunk.getVariableExportName(variable); - imports.push({ local, imported: imported as string }); + imports.push({ + imported: + variable.module instanceof ExternalModule + ? variable.name + : (variable.module as Module).chunk.getVariableExportName(variable), + local: variable.getName() + }); } } @@ -978,27 +988,6 @@ export default class Chunk { return exports; } - private getVariableExportNamesForModule(module: Module) { - const exportNamesByVariable: Map = new Map(); - for (const exportName of module.getAllExports()) { - const tracedVariable = module.getVariableForExportName(exportName); - if (!tracedVariable || !(tracedVariable.included || tracedVariable.isExternal)) { - continue; - } - const existingExportNames = exportNamesByVariable.get(tracedVariable); - if (existingExportNames) { - existingExportNames.push(exportName); - } else { - exportNamesByVariable.set(tracedVariable, [exportName]); - } - const exportingModule = tracedVariable.module; - if (exportingModule && exportingModule.chunk && exportingModule.chunk !== this) { - exportingModule.chunk.exports.add(tracedVariable); - } - } - return exportNamesByVariable; - } - private inlineChunkDependencies(chunk: Chunk, deep: boolean) { for (const dep of chunk.dependencies) { if (dep instanceof ExternalModule) { @@ -1077,7 +1066,7 @@ export default class Chunk { ); } - private setUpModuleImports(module: Module) { + private setUpChunkImportsAndExportsForModule(module: Module) { for (const variable of module.imports) { if ((variable.module as Module).chunk !== this) { this.imports.add(variable); @@ -1086,6 +1075,16 @@ export default class Chunk { } } } + if (module.isEntryPoint) { + const map = module.getExportNamesByVariable(); + for (const exportedVariable of map.keys()) { + this.exports.add(exportedVariable); + const exportingModule = exportedVariable.module; + if (exportingModule && exportingModule.chunk && exportingModule.chunk !== this) { + exportingModule.chunk.exports.add(exportedVariable); + } + } + } if (module.getOrCreateNamespace().included) { for (const reexportName of Object.keys(module.reexports)) { const reexport = module.reexports[reexportName]; diff --git a/src/Graph.ts b/src/Graph.ts index 2bfcad933a4..605cbb8f55d 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -299,33 +299,14 @@ export default class Graph { } } - // for each chunk module, set up its imports to other - // chunks, if those variables are included after treeshaking for (const chunk of chunks) { chunk.link(); } - - // filter out empty dependencies chunks = chunks.filter(isChunkRendered); - - // then go over and ensure all entry chunks export their variables + const facades: Chunk[] = []; for (const chunk of chunks) { - if (this.preserveModules || chunk.entryModules.length > 0) { - chunk.generateEntryExportsOrMarkAsTainted(); - } - } - - // create entry point facades for entry module chunks that have tainted exports - const facades = []; - if (!this.preserveModules) { - for (const chunk of chunks) { - for (const entryModule of chunk.entryModules) { - if (chunk.facadeModule !== entryModule) { - const entryPointFacade = new Chunk(this, []); - entryPointFacade.turnIntoFacade(entryModule); - facades.push(entryPointFacade); - } - } + for (const facade of chunk.generateFacades()) { + facades.push(facade); } } diff --git a/src/Module.ts b/src/Module.ts index 4f906cbca8c..63de02f482d 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -207,6 +207,7 @@ export default class Module { transformAssets: Asset[]; usesTopLevelAwait = false; + private allExportNames?: Set; private ast: Program; private astContext: AstContext; private context: string; @@ -271,21 +272,29 @@ export default class Module { error(props); } - getAllExports() { - const allExports = Object.assign(Object.create(null), this.exports, this.reexports); - - this.exportAllModules.forEach(module => { - if (module.isExternal) { - allExports[`*${module.id}`] = true; - return; + getAllExportNames(): Set { + if (this.allExportNames) { + return this.allExportNames; + } + const allExportNames = (this.allExportNames = new Set()); + for (const name of Object.keys(this.exports)) { + allExportNames.add(name); + } + for (const name of Object.keys(this.reexports)) { + allExportNames.add(name); + } + for (const module of this.exportAllModules) { + if (module instanceof ExternalModule) { + allExportNames.add(`*${module.id}`); + continue; } - for (const name of (module as Module).getAllExports()) { - if (name !== 'default') allExports[name] = true; + for (const name of module.getAllExportNames()) { + if (name !== 'default') allExportNames.add(name); } - }); + } - return Object.keys(allExports); + return allExportNames; } getDynamicImportExpressions(): (string | Node)[] { @@ -306,6 +315,23 @@ export default class Module { }); } + getExportNamesByVariable(): Map { + const exportNamesByVariable: Map = new Map(); + for (const exportName of this.getAllExportNames()) { + const tracedVariable = this.getVariableForExportName(exportName); + if (!tracedVariable || !(tracedVariable.included || tracedVariable.isExternal)) { + continue; + } + const existingExportNames = exportNamesByVariable.get(tracedVariable); + if (existingExportNames) { + existingExportNames.push(exportName); + } else { + exportNamesByVariable.set(tracedVariable, [exportName]); + } + } + return exportNamesByVariable; + } + getExports() { return Object.keys(this.exports); } diff --git a/test/chunking-form/samples/asset-emission/_expected/es/main.js b/test/chunking-form/samples/asset-emission/_expected/es/main.js index cd37d610503..0b696340c5e 100644 --- a/test/chunking-form/samples/asset-emission/_expected/es/main.js +++ b/test/chunking-form/samples/asset-emission/_expected/es/main.js @@ -1,4 +1,4 @@ -import { a as showImage } from './nested/chunk.js'; +import { s as showImage } from './nested/chunk.js'; var logo = new URL('assets/logo1-25253976.svg', import.meta.url).href; diff --git a/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk.js b/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk.js index 614dfc331dc..cf266147e36 100644 --- a/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk.js +++ b/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk.js @@ -7,4 +7,4 @@ function showImage(url) { } } -export { showImage as a }; +export { showImage as s }; diff --git a/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js b/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js index fe6455a36b8..e39c601ff41 100644 --- a/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js +++ b/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js @@ -1,4 +1,4 @@ -import { a as showImage } from './chunk.js'; +import { s as showImage } from './chunk.js'; var logo = new URL('../assets/logo2-25253976.svg', import.meta.url).href; diff --git a/test/chunking-form/samples/asset-emission/_expected/system/main.js b/test/chunking-form/samples/asset-emission/_expected/system/main.js index 92e22a533e7..cc36168b97d 100644 --- a/test/chunking-form/samples/asset-emission/_expected/system/main.js +++ b/test/chunking-form/samples/asset-emission/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./nested/chunk.js'], function (exports, module) { var showImage; return { setters: [function (module) { - showImage = module.a; + showImage = module.s; }], execute: function () { diff --git a/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk.js b/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk.js index 6e733ba1c92..ab95e6f2e52 100644 --- a/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk.js +++ b/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', showImage); + exports('s', showImage); function showImage(url) { console.log(url); diff --git a/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk2.js b/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk2.js index 95cb8f90a22..b748c0bd130 100644 --- a/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk2.js +++ b/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk2.js @@ -3,7 +3,7 @@ System.register(['./chunk.js'], function (exports, module) { var showImage; return { setters: [function (module) { - showImage = module.a; + showImage = module.s; }], execute: function () { diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/generated-chunk.js b/test/chunking-form/samples/basic-chunking/_expected/es/generated-chunk.js index 59e6977fdde..2f32c5bd454 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/basic-chunking/_expected/es/generated-chunk.js @@ -7,4 +7,4 @@ function fn$1 () { console.log('dep2 fn'); } -export { fn$1 as a }; +export { fn$1 as f }; diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/main1.js b/test/chunking-form/samples/basic-chunking/_expected/es/main1.js index 6d4f2531150..ca00ac41196 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/es/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as fn$1 } from './generated-chunk.js'; +import { f as fn$1 } from './generated-chunk.js'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/main2.js b/test/chunking-form/samples/basic-chunking/_expected/es/main2.js index ac6858dc5af..71b0c9a1bd5 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/es/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as fn$2 } from './generated-chunk.js'; +import { f as fn$2 } from './generated-chunk.js'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/generated-chunk.js b/test/chunking-form/samples/basic-chunking/_expected/system/generated-chunk.js index f0c8641d690..ca77846f899 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/basic-chunking/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', fn$1); + exports('f', fn$1); function fn () { console.log('lib2 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js index f99f3442d10..6b1bb5552aa 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var fn$1; return { setters: [function (module) { - fn$1 = module.a; + fn$1 = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js index 25e963f1174..bfe0d05d09a 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var fn$2; return { setters: [function (module) { - fn$2 = module.a; + fn$2 = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk.js index d351486840b..b90c581245b 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ var x = 42; -export { x as a }; +export { x }; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js index 2b1b3288238..ae1f188f66e 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js @@ -1,8 +1,8 @@ -import { a as x$1 } from './generated-chunk.js'; -import { a as x$2 } from './generated-chunk3.js'; +import { x as x$1 } from './generated-chunk.js'; +import { x as x$2 } from './generated-chunk3.js'; var x = x$1 + 1; var y = x$2 + 1; -export { x as a, y as b }; +export { x, y }; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk3.js index 41148d1af9b..b2caa9826a4 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk3.js @@ -1,3 +1,3 @@ var x = 43; -export { x as a }; +export { x }; 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 16c5ce10335..dedab6da860 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-chunk.js'; -import { a as x, b as y } from './generated-chunk2.js'; +import { x, y } from './generated-chunk2.js'; import './generated-chunk3.js'; console.log(x + y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk.js index 7e8859bd7e0..521f722a36b 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk.js @@ -4,7 +4,7 @@ System.register([], function (exports, module) { execute: function () { var x = 42; - exports('a', x); + exports('x', x); } }; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js index 94f6c6b5d9c..e631c284c55 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js @@ -3,15 +3,15 @@ System.register(['./generated-chunk.js', './generated-chunk3.js'], function (exp var x$1, x$2; return { setters: [function (module) { - x$1 = module.a; + x$1 = module.x; }, function (module) { - x$2 = module.a; + x$2 = module.x; }], execute: function () { - var x = exports('a', x$1 + 1); + var x = exports('x', x$1 + 1); - var y = exports('b', x$2 + 1); + var y = exports('y', x$2 + 1); } }; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk3.js index 9f3e89592dc..b5720600293 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk3.js @@ -4,7 +4,7 @@ System.register([], function (exports, module) { execute: function () { var x = 43; - exports('a', x); + exports('x', x); } }; 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 1f3748481d2..131e3c6a0d0 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 @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-c var x, y; return { setters: [function () {}, function (module) { - x = module.a; - y = module.b; + x = module.x; + y = module.y; }, function () {}], execute: function () { diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk2.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk2.js index 88830d6c71b..a72c32b4c0a 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk2.js @@ -1,4 +1,4 @@ const x = 0; console.log('112'); -export { x as a }; +export { x }; 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 c8d5ed63ace..251b780143e 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,5 +1,5 @@ import './generated-chunk.js'; -import { a as x } from './generated-chunk2.js'; +import { x } from './generated-chunk2.js'; import './generated-chunk3.js'; console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk2.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk2.js index 19724f3e855..5c8b8f3b61e 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk2.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - const x = exports('a', 0); + const x = exports('x', 0); console.log('112'); } 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 f12556fbfe5..4868354497b 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 @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-c var x; return { setters: [function () {}, function (module) { - x = module.a; + x = module.x; }, function () {}], execute: function () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-chunk.js index e2414d56caf..6c4e214bb63 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-chunk.js @@ -15,4 +15,4 @@ function fn$2 () { var text$1 = 'dep2 fn'; -export { fn$2 as a, fn$1 as b }; +export { fn$1 as a, fn$2 as f }; diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js index 070b8c5aef3..b945e58a593 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as fn } from './generated-chunk.js'; +import { f as fn } from './generated-chunk.js'; class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js index 373803be0b4..49d0df6cb5a 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { b as fn } from './generated-chunk.js'; +import { a as fn } from './generated-chunk.js'; class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-chunk.js index 8bb6c738e84..0575111e34d 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-chunk.js @@ -4,8 +4,8 @@ System.register([], function (exports, module) { execute: function () { exports({ - a: fn$2, - b: fn$1 + a: fn$1, + f: fn$2 }); function fn () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js index fb95f444cc3..a56e287cdeb 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var fn; return { setters: [function (module) { - fn = module.a; + fn = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js index 932773280f1..650cc337b2f 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var fn; return { setters: [function (module) { - fn = module.b; + fn = module.a; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-chunk.js index 2d0f10e82c6..34473c119fa 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-chunk.js @@ -6,4 +6,4 @@ class One { const ONE_CONSTANT = 'oneconstant'; -export { ONE_CONSTANT as a, One as b }; +export { One as O, ONE_CONSTANT as a }; diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/es/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/es/main1.js index 0f86de3341f..f2c11dd4a4b 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/es/main1.js @@ -1 +1 @@ -export { b as ItemOne } from './generated-chunk.js'; +export { O as ItemOne } from './generated-chunk.js'; diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-chunk.js index ffa51866644..63d82892f97 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-chunk.js @@ -7,7 +7,7 @@ System.register([], function (exports, module) { test() { return ONE_CONSTANT; } - } exports('b', One); + } exports('O', One); const ONE_CONSTANT = exports('a', 'oneconstant'); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js index b142780da7a..3478c9cfd3c 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js @@ -2,7 +2,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('ItemOne', module.b); + exports('ItemOne', module.O); }], execute: function () { diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-chunk.js index f09237e682b..45f2b1b4f90 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-chunk.js @@ -2,4 +2,4 @@ function emptyFunction () { } -export { emptyFunction as a }; +export { emptyFunction as e }; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main1.js index 5124820e88d..7ae1592867a 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as emptyFunction } from './generated-chunk.js'; +import { e as emptyFunction } from './generated-chunk.js'; function fn () { var emptyFunction$1 = emptyFunction; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-chunk.js index b46a1df1b17..41b6d9d348f 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', emptyFunction); + exports('e', emptyFunction); function emptyFunction () { diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js index 3860c007274..84055b7a8b7 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var emptyFunction; return { setters: [function (module) { - emptyFunction = module.a; + emptyFunction = module.e; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-chunk.js index 93294b34ed3..777f54e1970 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-chunk.js @@ -17,4 +17,4 @@ function fn$2 () { var text$1 = 'dep2 fn'; -export { fn$2 as a, text$1 as b, fn$1 as c, text as d }; +export { fn$1 as a, text as b, fn$2 as f, text$1 as t }; diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js index e5c475b0857..d347e5e679b 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as fn, b as text } from './generated-chunk.js'; +import { f as fn, t as text } from './generated-chunk.js'; class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js index 8ce76c15dc0..015cf2d2589 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { c as fn, d as text } from './generated-chunk.js'; +import { a as fn, b as text } from './generated-chunk.js'; class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-chunk.js index 84aa8721e8b..8434bcc69ab 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-chunk.js @@ -4,8 +4,8 @@ System.register([], function (exports, module) { execute: function () { exports({ - a: fn$2, - c: fn$1 + a: fn$1, + f: fn$2 }); function fn () { @@ -15,17 +15,17 @@ System.register([], function (exports, module) { function fn$1 () { fn(); console.log(text$1); - text = exports('d', 'dep1 fn after dep2'); + text = exports('b', 'dep1 fn after dep2'); } - var text = exports('d', 'dep1 fn'); + var text = exports('b', 'dep1 fn'); function fn$2 () { console.log(text); - text$1 = exports('b', 'dep2 fn after dep1'); + text$1 = exports('t', 'dep2 fn after dep1'); } - var text$1 = exports('b', 'dep2 fn'); + var text$1 = exports('t', 'dep2 fn'); } }; diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js index e9c68185e82..8466170dc26 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { var fn, text; return { setters: [function (module) { - fn = module.a; - text = module.b; + fn = module.f; + text = module.t; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js index fc89e0d8731..f71a48d8761 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { var fn, text; return { setters: [function (module) { - fn = module.c; - text = module.d; + fn = module.a; + text = module.b; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-chunk.js index 533b2b3a977..fb5aed46b54 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-chunk.js @@ -3,4 +3,4 @@ var commonjsGlobal = typeof window !== 'undefined' ? window : typeof global !== commonjsGlobal.data = [4, 5, 6]; var shared = commonjsGlobal.data; -export { commonjsGlobal as a, shared as b }; +export { commonjsGlobal as c, shared as d }; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js index 0f9a55a2cdf..f2f0d4cd0ea 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as commonjsGlobal, b as d } from './generated-chunk.js'; +import { c as commonjsGlobal, d } from './generated-chunk.js'; commonjsGlobal.fn = d => d + 1; var cjs = commonjsGlobal.fn; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js index ab97d5286d1..1029203efe8 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { b as d } from './generated-chunk.js'; +import { d } from './generated-chunk.js'; var main2 = d.map(d => d + 2); diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-chunk.js index ba5790a1ee7..c616844e3d7 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-chunk.js @@ -3,11 +3,11 @@ System.register([], function (exports, module) { return { execute: function () { - var commonjsGlobal = exports('a', typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {}); + var commonjsGlobal = exports('c', typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {}); commonjsGlobal.data = [4, 5, 6]; var shared = commonjsGlobal.data; - exports('b', shared); + exports('d', shared); } }; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js index 38160286c74..20335243d09 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { var commonjsGlobal, d; return { setters: [function (module) { - commonjsGlobal = module.a; - d = module.b; + commonjsGlobal = module.c; + d = module.d; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js index 6092d6d1d85..518c1827949 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var d; return { setters: [function (module) { - d = module.b; + d = module.d; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk.js b/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk.js index ad1e9198804..b002adbbe46 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk.js +++ b/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk.js @@ -1,3 +1,3 @@ var num = 1; -export { num as a }; +export { num as n }; diff --git a/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk2.js b/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk2.js index 5c0df4dad65..4ac88fc5e7a 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk2.js +++ b/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk2.js @@ -1,3 +1,3 @@ var num = 2; -export { num as a }; +export { num as n }; diff --git a/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk3.js b/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk3.js index 93d5524868b..de36f4567c1 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk3.js +++ b/test/chunking-form/samples/chunk-naming/_expected/es/chunks/chunk3.js @@ -1,3 +1,3 @@ var num = 3; -export { num as a }; +export { num as n }; diff --git a/test/chunking-form/samples/chunk-naming/_expected/es/custom/entryC.js b/test/chunking-form/samples/chunk-naming/_expected/es/custom/entryC.js index 4fa8b1ba4a9..a1b1cba12a5 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/es/custom/entryC.js +++ b/test/chunking-form/samples/chunk-naming/_expected/es/custom/entryC.js @@ -1,4 +1,4 @@ -import { a as num } from '../chunks/chunk.js'; -import { a as num$1 } from '../chunks/chunk3.js'; +import { n as num } from '../chunks/chunk.js'; +import { n as num$1 } from '../chunks/chunk3.js'; console.log(num + num$1); diff --git a/test/chunking-form/samples/chunk-naming/_expected/es/entryA.js b/test/chunking-form/samples/chunk-naming/_expected/es/entryA.js index 83df128f296..86a1fe2ba1d 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/es/entryA.js +++ b/test/chunking-form/samples/chunk-naming/_expected/es/entryA.js @@ -1,4 +1,4 @@ -import { a as num } from './chunks/chunk.js'; -import { a as num$1 } from './chunks/chunk2.js'; +import { n as num } from './chunks/chunk.js'; +import { n as num$1 } from './chunks/chunk2.js'; console.log(num + num$1); diff --git a/test/chunking-form/samples/chunk-naming/_expected/es/entryB.js b/test/chunking-form/samples/chunk-naming/_expected/es/entryB.js index 01ab9cfd7e3..fa520b140ec 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/es/entryB.js +++ b/test/chunking-form/samples/chunk-naming/_expected/es/entryB.js @@ -1,4 +1,4 @@ -import { a as num } from './chunks/chunk2.js'; -import { a as num$1 } from './chunks/chunk3.js'; +import { n as num } from './chunks/chunk2.js'; +import { n as num$1 } from './chunks/chunk3.js'; console.log(num + num$1); diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk.js b/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk.js index 6813a509356..1a32db69510 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk.js +++ b/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var num = exports('a', 1); + var num = exports('n', 1); } }; diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk2.js b/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk2.js index fc7094730e8..ee9fde8fbcf 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk2.js +++ b/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk2.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var num = exports('a', 2); + var num = exports('n', 2); } }; diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk3.js b/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk3.js index 2cd83bdf69f..f1aa55c527c 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk3.js +++ b/test/chunking-form/samples/chunk-naming/_expected/system/chunks/chunk3.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var num = exports('a', 3); + var num = exports('n', 3); } }; diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/custom/entryC.js b/test/chunking-form/samples/chunk-naming/_expected/system/custom/entryC.js index c65d8d5d7c0..60c6613414d 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/system/custom/entryC.js +++ b/test/chunking-form/samples/chunk-naming/_expected/system/custom/entryC.js @@ -3,9 +3,9 @@ System.register(['../chunks/chunk.js', '../chunks/chunk3.js'], function (exports var num, num$1; return { setters: [function (module) { - num = module.a; + num = module.n; }, function (module) { - num$1 = module.a; + num$1 = module.n; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/entryA.js b/test/chunking-form/samples/chunk-naming/_expected/system/entryA.js index 4461a5f785a..765530385b9 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/system/entryA.js +++ b/test/chunking-form/samples/chunk-naming/_expected/system/entryA.js @@ -3,9 +3,9 @@ System.register(['./chunks/chunk.js', './chunks/chunk2.js'], function (exports, var num, num$1; return { setters: [function (module) { - num = module.a; + num = module.n; }, function (module) { - num$1 = module.a; + num$1 = module.n; }], execute: function () { diff --git a/test/chunking-form/samples/chunk-naming/_expected/system/entryB.js b/test/chunking-form/samples/chunk-naming/_expected/system/entryB.js index 7517bacb792..f5eff513482 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/system/entryB.js +++ b/test/chunking-form/samples/chunk-naming/_expected/system/entryB.js @@ -3,9 +3,9 @@ System.register(['./chunks/chunk2.js', './chunks/chunk3.js'], function (exports, var num, num$1; return { setters: [function (module) { - num = module.a; + num = module.n; }, function (module) { - num$1 = module.a; + num$1 = module.n; }], execute: function () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/amd/generated-chunk.js index f793b3c38f3..a5696409b8b 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/amd/generated-chunk.js +++ b/test/chunking-form/samples/chunking-compact/_expected/amd/generated-chunk.js @@ -3,4 +3,4 @@ define(['exports'],function(exports){'use strict';function fn () { }function fn$1 () { fn(); console.log('dep2 fn'); -}exports.a=fn$1;}); \ No newline at end of file +}exports.f=fn$1;}); \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js b/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js index c4aa8295a3d..12d3a520ed4 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js @@ -3,6 +3,6 @@ define(['./generated-chunk'],function(__chunk_1){'use strict';function fn () { }class Main1 { constructor () { fn(); - __chunk_1.a(); + __chunk_1.f(); } }return Main1;}); \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js b/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js index 7ff5ce00cee..fa6b2a09851 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js @@ -7,6 +7,6 @@ define(['./generated-chunk','external'],function(__chunk_1,external){'use strict }class Main2 { constructor () { fn$1(); - __chunk_1.a(); + __chunk_1.f(); } }return Main2;}); \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/cjs/generated-chunk.js index 36b2112ae76..e46e5923a94 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/cjs/generated-chunk.js +++ b/test/chunking-form/samples/chunking-compact/_expected/cjs/generated-chunk.js @@ -3,4 +3,4 @@ }function fn$1 () { fn(); console.log('dep2 fn'); -}exports.a=fn$1; \ No newline at end of file +}exports.f=fn$1; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js index 380be6ced95..631d097e6f6 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js @@ -3,6 +3,6 @@ }class Main1 { constructor () { fn(); - __chunk_1.a(); + __chunk_1.f(); } }module.exports=Main1; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js index e2057eef22e..916428d57a9 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js @@ -7,6 +7,6 @@ }class Main2 { constructor () { fn$1(); - __chunk_1.a(); + __chunk_1.f(); } }module.exports=Main2; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/es/generated-chunk.js index b8c1ff4df40..644adb432f0 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunking-compact/_expected/es/generated-chunk.js @@ -3,4 +3,4 @@ function fn () { }function fn$1 () { fn(); console.log('dep2 fn'); -}export{fn$1 as a}; \ No newline at end of file +}export{fn$1 as f}; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/main1.js b/test/chunking-form/samples/chunking-compact/_expected/es/main1.js index 4d1a855433b..3f3bf5f95c7 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/es/main1.js @@ -1,4 +1,4 @@ -import {a as fn$1}from'./generated-chunk.js';function fn () { +import {f as fn$1}from'./generated-chunk.js';function fn () { console.log('dep1 fn'); }class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/main2.js b/test/chunking-form/samples/chunking-compact/_expected/es/main2.js index e72705fd87e..d211a97fe64 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/es/main2.js @@ -1,4 +1,4 @@ -import {a as fn$3}from'./generated-chunk.js';import {fn as fn$2}from'external';function fn () { +import {f as fn$3}from'./generated-chunk.js';import {fn as fn$2}from'external';function fn () { console.log('lib1 fn'); fn$2(); }function fn$1 () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/system/generated-chunk.js index 9cbeaf02c46..8d39b1cd2c9 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunking-compact/_expected/system/generated-chunk.js @@ -1,4 +1,4 @@ -System.register([],function(exports,module){'use strict';return{execute:function(){exports('a',fn$1);function fn () { +System.register([],function(exports,module){'use strict';return{execute:function(){exports('f',fn$1);function fn () { console.log('lib2 fn'); }function fn$1 () { fn(); diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/main1.js b/test/chunking-form/samples/chunking-compact/_expected/system/main1.js index ae68d73b0a0..4926c74c4a4 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'],function(exports,module){'use strict';var fn$1;return{setters:[function(module){fn$1=module.a;}],execute:function(){function fn () { +System.register(['./generated-chunk.js'],function(exports,module){'use strict';var fn$1;return{setters:[function(module){fn$1=module.f;}],execute:function(){function fn () { console.log('dep1 fn'); }class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/main2.js b/test/chunking-form/samples/chunking-compact/_expected/system/main2.js index d58784a5a7a..fc41d548b36 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js','external'],function(exports,module){'use strict';var fn$3,fn$2;return{setters:[function(module){fn$3=module.a;},function(module){fn$2=module.fn;}],execute:function(){function fn () { +System.register(['./generated-chunk.js','external'],function(exports,module){'use strict';var fn$3,fn$2;return{setters:[function(module){fn$3=module.f;},function(module){fn$2=module.fn;}],execute:function(){function fn () { console.log('lib1 fn'); fn$2(); }function fn$1 () { diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-externals/_expected/es/generated-chunk.js index 59e6977fdde..2f32c5bd454 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunking-externals/_expected/es/generated-chunk.js @@ -7,4 +7,4 @@ function fn$1 () { console.log('dep2 fn'); } -export { fn$1 as a }; +export { fn$1 as f }; diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/main1.js b/test/chunking-form/samples/chunking-externals/_expected/es/main1.js index 6d4f2531150..ca00ac41196 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as fn$1 } from './generated-chunk.js'; +import { f as fn$1 } from './generated-chunk.js'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/main2.js b/test/chunking-form/samples/chunking-externals/_expected/es/main2.js index 3743c96a40c..f742263cbbe 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as fn$3 } from './generated-chunk.js'; +import { f as fn$3 } from './generated-chunk.js'; import { fn as fn$2 } from 'external'; function fn () { diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-externals/_expected/system/generated-chunk.js index f0c8641d690..ca77846f899 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunking-externals/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', fn$1); + exports('f', fn$1); function fn () { console.log('lib2 fn'); diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/main1.js b/test/chunking-form/samples/chunking-externals/_expected/system/main1.js index f99f3442d10..6b1bb5552aa 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var fn$1; return { setters: [function (module) { - fn$1 = module.a; + fn$1 = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/main2.js b/test/chunking-form/samples/chunking-externals/_expected/system/main2.js index f418094a95e..9078e3a0e47 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js', 'external'], function (exports, module) var fn$3, fn$2; return { setters: [function (module) { - fn$3 = module.a; + fn$3 = module.f; }, function (module) { fn$2 = module.fn; }], diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js index f13bf141a76..c25a283ed38 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js @@ -7,5 +7,5 @@ function fn$1 () { console.log('dep2 fn'); } -export { fn$1 as a }; +export { fn$1 as f }; //# sourceMappingURL=generated-chunk.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js index f3bb708d5ae..8a8989c6776 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as fn$1 } from './generated-chunk.js'; +import { f as fn$1 } from './generated-chunk.js'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js index 808d3dfd2f8..cc4066eb98f 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as fn$2 } from './generated-chunk.js'; +import { f as fn$2 } from './generated-chunk.js'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js index 77d453a7104..76f35f32a82 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', fn$1); + exports('f', fn$1); function fn () { console.log('lib2 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js index e3e50420418..e110fba6476 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var fn$1; return { setters: [function (module) { - fn$1 = module.a; + fn$1 = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js index 723a0fb9c85..c99a9478c50 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var fn$2; return { setters: [function (module) { - fn$2 = module.a; + fn$2 = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/chunking-star-external/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-star-external/_expected/es/generated-chunk.js index c2cdf1a4ab0..3002abc9cb2 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/es/generated-chunk.js @@ -3,4 +3,4 @@ import 'external2'; var dep = 'dep'; -export { dep as a }; +export { dep as d }; 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 ff35d235c46..711370b13d9 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 @@ -2,7 +2,7 @@ export * from 'starexternal1'; export { e } from 'external1'; import 'starexternal2'; import 'external2'; -export { a as dep } from './generated-chunk.js'; +export { d as dep } from './generated-chunk.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 9d7609f7fc8..4abdf641215 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 { a as dep } from './generated-chunk.js'; +export { d as dep } from './generated-chunk.js'; var main = '2'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-star-external/_expected/system/generated-chunk.js index ece77805f4d..ad80881a5dd 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/generated-chunk.js @@ -4,7 +4,7 @@ System.register(['starexternal2', 'external2'], function (exports, module) { setters: [function () {}, function () {}], execute: function () { - var dep = exports('a', 'dep'); + var dep = exports('d', 'dep'); } }; 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 a5014a126f0..05ec616f62b 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 @@ -11,7 +11,7 @@ System.register(['starexternal1', 'external1', 'starexternal2', 'external2', './ }, function (module) { exports('e', module.e); }, function () {}, function () {}, function (module) { - exports('dep', module.a); + exports('dep', module.d); }], execute: function () { 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 5e0944b550f..2195036de0b 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 @@ -11,7 +11,7 @@ System.register(['starexternal2', 'external2', './generated-chunk.js'], function }, function (module) { exports('e', module.e); }, function (module) { - exports('dep', module.a); + exports('dep', module.d); }], execute: function () { diff --git a/test/chunking-form/samples/deconflict-globals/_expected/es/generated-chunk.js b/test/chunking-form/samples/deconflict-globals/_expected/es/generated-chunk.js index cb011160c44..42d814c429c 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ const x = 42; -export { x as a }; +export { x }; diff --git a/test/chunking-form/samples/deconflict-globals/_expected/es/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/es/main1.js index 2052f3c6b15..4436c56e0e7 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/es/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { a as x } from './generated-chunk.js'; +import { x } from './generated-chunk.js'; console.log(x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/es/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/es/main2.js index ac086ef15d8..fb76b1827a3 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/es/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { a as x$1 } from './generated-chunk.js'; +import { x as x$1 } from './generated-chunk.js'; console.log(x, x$1); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/system/generated-chunk.js b/test/chunking-form/samples/deconflict-globals/_expected/system/generated-chunk.js index 3a036eab566..06cfd0e651d 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - const x = exports('a', 42); + const x = exports('x', 42); } }; diff --git a/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js index b25cd155ee5..6a658f9df0b 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var x; return { setters: [function (module) { - x = module.a; + x = module.x; }], execute: function () { diff --git a/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js index d93652bc11f..37408fb2493 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var x$1; return { setters: [function (module) { - x$1 = module.a; + x$1 = module.x; }], execute: function () { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-chunk.js index 1127b4cd6fa..5bc823d3a50 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ const foo = {}; -export { foo as a, foo as b }; +export { foo as b, foo as f }; diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main1.js index 9b81ff8ea20..ae77e303194 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { a as bar } from './generated-chunk.js'; +import { f as bar } from './generated-chunk.js'; console.log(bar, bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main2.js index 9b81ff8ea20..ae77e303194 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { a as bar } from './generated-chunk.js'; +import { f as bar } from './generated-chunk.js'; console.log(bar, bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-chunk.js index ef91eda0278..9033a33bdef 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-chunk.js @@ -5,7 +5,7 @@ System.register([], function (exports, module) { const foo = {}; - exports('a', foo); + exports('f', foo); exports('b', foo); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js index 01df6b33d3c..d151450d36b 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var bar; return { setters: [function (module) { - bar = module.a; + bar = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js index 01df6b33d3c..d151450d36b 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var bar; return { setters: [function (module) { - bar = module.a; + bar = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-chunk.js index 1127b4cd6fa..5bc823d3a50 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ const foo = {}; -export { foo as a, foo as b }; +export { foo as b, foo as f }; diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main1.js index 9b81ff8ea20..ae77e303194 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { a as bar } from './generated-chunk.js'; +import { f as bar } from './generated-chunk.js'; console.log(bar, bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main2.js index 9b81ff8ea20..ae77e303194 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { a as bar } from './generated-chunk.js'; +import { f as bar } from './generated-chunk.js'; console.log(bar, bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-chunk.js index 5036f5bcd91..e7176ddf8fc 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - const foo = exports('a', {}); + const foo = exports('f', {}); exports('b', foo); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js index 01df6b33d3c..d151450d36b 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var bar; return { setters: [function (module) { - bar = module.a; + bar = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js index 01df6b33d3c..d151450d36b 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var bar; return { setters: [function (module) { - bar = module.a; + bar = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-chunk.js b/test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-chunk.js index 0e72974a787..11193df00bb 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ const data = [1, 2, 3]; -export { data as a }; +export { data as d }; diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js index 5e2ae12f26e..7751da1485f 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as d } from './generated-chunk.js'; +import { d } from './generated-chunk.js'; var main1 = d.map(d => d + 1); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js index b5b4434b163..1029203efe8 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as d } from './generated-chunk.js'; +import { d } from './generated-chunk.js'; var main2 = d.map(d => d + 2); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-chunk.js b/test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-chunk.js index d23e67adabb..deb47839a3a 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-chunk.js @@ -4,7 +4,7 @@ System.register([], function (exports, module) { execute: function () { const data = [1, 2, 3]; - exports('a', data); + exports('d', data); } }; diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js index 75db721a82c..723da3ce8dc 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var d; return { setters: [function (module) { - d = module.a; + d = module.d; }], execute: function () { diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js index c5e348faf5f..518c1827949 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var d; return { setters: [function (module) { - d = module.a; + d = module.d; }], execute: function () { diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-chunk.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-chunk.js index f112a633446..d53493b9946 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ var multiplier = 7; -export { multiplier as a }; +export { multiplier as m }; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep2.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep2.js index aad3df272d6..8655410d7af 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep2.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep2.js @@ -1,4 +1,4 @@ -import { a as multiplier } from './generated-chunk.js'; +import { m as multiplier } from './generated-chunk.js'; function mult (num) { return num + multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/main.js index d1c97541a75..5595d47dfdb 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/main.js @@ -1,4 +1,4 @@ -import { a as multiplier } from './generated-chunk.js'; +import { m as multiplier } from './generated-chunk.js'; function calc (num) { return num * multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-chunk.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-chunk.js index 134a5203f20..f81c64c43e5 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var multiplier = exports('a', 7); + var multiplier = exports('m', 7); } }; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js index 4ffb5a973b6..66ff1296e56 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var multiplier; return { setters: [function (module) { - multiplier = module.a; + multiplier = module.m; }], execute: function () { diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js index 361619daf83..5acaa3bb59c 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var multiplier; return { setters: [function (module) { - multiplier = module.a; + multiplier = module.m; }], execute: function () { diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js index 4150b42fb24..a0ce15fe84a 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js @@ -5,4 +5,4 @@ const dep = 'dep'; console.log('dynamic', dep); const dynamic = 'dynamic'; -export { dynamic as a, dep as b }; +export { dep as a, dynamic as d }; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic.js index 6ab7fc96e9f..44d1ba0252e 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic.js @@ -1 +1 @@ -export { a as dynamic } from './generated-chunk.js'; +export { d as dynamic } from './generated-chunk.js'; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/main2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/main2.js index deb7a5a8107..7ede9cb8d15 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/es/main2.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { a as dynamic, b as dep } from './generated-chunk.js'; +import { d as dynamic, a as dep } from './generated-chunk.js'; console.log('main2', dynamic, dep); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js index b5bf05575ae..749d862d623 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js @@ -5,10 +5,10 @@ System.register([], function (exports, module) { console.log('dep'); - const dep = exports('b', 'dep'); + const dep = exports('a', 'dep'); console.log('dynamic', dep); - const dynamic = exports('a', 'dynamic'); + const dynamic = exports('d', 'dynamic'); } }; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic.js index c0767b4cb35..c6dfdcca26b 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic.js @@ -2,7 +2,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('dynamic', module.a); + exports('dynamic', module.d); }], execute: function () { diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js index 6b4c4ec01e7..28d7c8ffa2c 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { var dynamic, dep; return { setters: [function (module) { - dynamic = module.a; - dep = module.b; + dynamic = module.d; + dep = module.a; }], execute: function () { diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-chunk.js index f577e771fb3..867796fbd1d 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-chunk.js @@ -12,4 +12,4 @@ var dep1 = /*#__PURE__*/Object.freeze({ bar: bar }); -export { foo as a, bar as b }; +export { bar as b, foo as f }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main.js index 041a8259337..7b5156785f9 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main.js @@ -1,3 +1,3 @@ -import { a as foo, b as bar } from './generated-chunk.js'; +import { f as foo, b as bar } from './generated-chunk.js'; console.log(foo(), bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-chunk.js index d370b2cc92c..ec918bd1dee 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-chunk.js @@ -4,8 +4,8 @@ System.register([], function (exports, module) { execute: function () { exports({ - a: foo, - b: bar + b: bar, + f: foo }); function foo() { diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js index 17283ce356e..8140e2f08ec 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var foo, bar; return { setters: [function (module) { - foo = module.a; + foo = module.f; bar = module.b; }], execute: function () { diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js index f577e771fb3..867796fbd1d 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js @@ -12,4 +12,4 @@ var dep1 = /*#__PURE__*/Object.freeze({ bar: bar }); -export { foo as a, bar as b }; +export { bar as b, foo as f }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js index 041a8259337..7b5156785f9 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js @@ -1,3 +1,3 @@ -import { a as foo, b as bar } from './generated-chunk.js'; +import { f as foo, b as bar } from './generated-chunk.js'; console.log(foo(), bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js index d370b2cc92c..ec918bd1dee 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js @@ -4,8 +4,8 @@ System.register([], function (exports, module) { execute: function () { exports({ - a: foo, - b: bar + b: bar, + f: foo }); function foo() { diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/main.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/main.js index 17283ce356e..8140e2f08ec 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var foo, bar; return { setters: [function (module) { - foo = module.a; + foo = module.f; bar = module.b; }], execute: function () { diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/chunk.js index 94dca2d35b3..d5f271b2232 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/chunk.js +++ b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/chunk.js @@ -1,3 +1,3 @@ const sharedValue = 'shared'; -export { sharedValue as a }; +export { sharedValue as s }; diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js index 614213eb1d2..f77a7605c9b 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js +++ b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js @@ -1 +1 @@ -export { a as value } from './chunk.js'; +export { s as value } from './chunk.js'; diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/main.js b/test/chunking-form/samples/dynamic-import/_expected/es/main.js index 0bc9c02af44..45fed222df0 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/es/main.js @@ -1,4 +1,4 @@ -import { a as sharedValue } from './chunks/chunk.js'; +import { s as sharedValue } from './chunks/chunk.js'; assert.equal(sharedValue, 'shared'); diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/chunk.js index f4a5045db1a..a078238c2c9 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/chunk.js +++ b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - const sharedValue = exports('a', 'shared'); + const sharedValue = exports('s', 'shared'); } }; diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js index 91d13a25f79..94ab520c0bd 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js +++ b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js @@ -2,7 +2,7 @@ System.register(['./chunk.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('value', module.a); + exports('value', module.s); }], execute: function () { diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/main.js b/test/chunking-form/samples/dynamic-import/_expected/system/main.js index cd01a25c888..ab84a618663 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./chunks/chunk.js'], function (exports, module) { var sharedValue; return { setters: [function (module) { - sharedValue = module.a; + sharedValue = module.s; }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-build-starter.js b/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-build-starter.js index 99728ea9c48..43deafdd0be 100644 --- a/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-build-starter.js +++ b/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-build-starter.js @@ -3,4 +3,4 @@ const otherValue = 43; console.log('startBuild', value); -export { value as a, otherValue as b }; +export { otherValue as o, value as v }; diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-buildStart.js b/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-buildStart.js index 56b50340df5..ffb305eac54 100644 --- a/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-buildStart.js +++ b/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-buildStart.js @@ -1 +1 @@ -export { a as buildStartValue } from './generated-build-starter.js'; +export { v as buildStartValue } from './generated-build-starter.js'; diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/es/main.js b/test/chunking-form/samples/emit-chunk-facade/_expected/es/main.js index eeb48762412..28caef9429d 100644 --- a/test/chunking-form/samples/emit-chunk-facade/_expected/es/main.js +++ b/test/chunking-form/samples/emit-chunk-facade/_expected/es/main.js @@ -1,3 +1,3 @@ -import { a as value, b as otherValue } from './generated-build-starter.js'; +import { v as value, o as otherValue } from './generated-build-starter.js'; console.log('main', value, otherValue); diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-build-starter.js b/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-build-starter.js index e3d0622be44..89a6d83fcb2 100644 --- a/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-build-starter.js +++ b/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-build-starter.js @@ -3,8 +3,8 @@ System.register([], function (exports, module) { return { execute: function () { - const value = exports('a', 42); - const otherValue = exports('b', 43); + const value = exports('v', 42); + const otherValue = exports('o', 43); console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-buildStart.js b/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-buildStart.js index 205a5d5e0f8..e91ec17260b 100644 --- a/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-buildStart.js +++ b/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-buildStart.js @@ -2,7 +2,7 @@ System.register(['./generated-build-starter.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('buildStartValue', module.a); + exports('buildStartValue', module.v); }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/system/main.js b/test/chunking-form/samples/emit-chunk-facade/_expected/system/main.js index bdb5d51f748..65d7f169f64 100644 --- a/test/chunking-form/samples/emit-chunk-facade/_expected/system/main.js +++ b/test/chunking-form/samples/emit-chunk-facade/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./generated-build-starter.js'], function (exports, module) { var value, otherValue; return { setters: [function (module) { - value = module.a; - otherValue = module.b; + value = module.v; + otherValue = module.o; }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-chunk.js index 637e70967d1..b7cbe038a73 100644 --- a/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ var value = 42; -export { value as a }; +export { value as v }; diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-nested/my-chunk.js index 27feabf6e10..015c2211ce2 100644 --- a/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-nested/my-chunk.js @@ -1,3 +1,3 @@ -import { a as value } from '../generated-chunk.js'; +import { v as value } from '../generated-chunk.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/es/main.js b/test/chunking-form/samples/emit-chunk-named/_expected/es/main.js index 6647a955386..9ccd67b1a67 100644 --- a/test/chunking-form/samples/emit-chunk-named/_expected/es/main.js +++ b/test/chunking-form/samples/emit-chunk-named/_expected/es/main.js @@ -1,3 +1,3 @@ -import { a as value } from './generated-chunk.js'; +import { v as value } from './generated-chunk.js'; console.log('main', value); diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-chunk.js index 28865ae6188..6064e844ef4 100644 --- a/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var value = exports('a', 42); + var value = exports('v', 42); } }; diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-nested/my-chunk.js index 2fb89fd0319..1681878c999 100644 --- a/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-nested/my-chunk.js @@ -3,7 +3,7 @@ System.register(['../generated-chunk.js'], function (exports, module) { var value; return { setters: [function (module) { - value = module.a; + value = module.v; }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/emit-chunk-named/_expected/system/main.js index 9db3c59931a..9a7867bab74 100644 --- a/test/chunking-form/samples/emit-chunk-named/_expected/system/main.js +++ b/test/chunking-form/samples/emit-chunk-named/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var value; return { setters: [function (module) { - value = module.a; + value = module.v; }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/chunk.js b/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/chunk.js index 7e7f4f90302..464379ccc95 100644 --- a/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/chunk.js +++ b/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/chunk.js @@ -1,3 +1,3 @@ const shared = 'shared'; -export { shared as a }; +export { shared as s }; diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/worker.js b/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/worker.js index c3bd7baebed..d4a13865f89 100644 --- a/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/worker.js +++ b/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/worker.js @@ -1,3 +1,3 @@ -import { a as shared } from './chunk.js'; +import { s as shared } from './chunk.js'; postMessage(`from worker: ${shared}`); diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/es/main.js b/test/chunking-form/samples/emit-chunk-worker/_expected/es/main.js index 69ed05a894e..542f42d06f6 100644 --- a/test/chunking-form/samples/emit-chunk-worker/_expected/es/main.js +++ b/test/chunking-form/samples/emit-chunk-worker/_expected/es/main.js @@ -1,4 +1,4 @@ -import { a as shared } from './chunks/chunk.js'; +import { s as shared } from './chunks/chunk.js'; const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker(new URL('chunks/worker-proxy.js', import.meta.url).href); diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/chunk.js b/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/chunk.js index 69b5ccbdda5..402868bf495 100644 --- a/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/chunk.js +++ b/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - const shared = exports('a', 'shared'); + const shared = exports('s', 'shared'); } }; diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/worker.js index 0436f8885e4..5fbf0bd9a7f 100644 --- a/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/worker.js +++ b/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/worker.js @@ -3,7 +3,7 @@ System.register(['./chunk.js'], function (exports, module) { var shared; return { setters: [function (module) { - shared = module.a; + shared = module.s; }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/emit-chunk-worker/_expected/system/main.js index 1d7867c7769..c1b3d8a5a2f 100644 --- a/test/chunking-form/samples/emit-chunk-worker/_expected/system/main.js +++ b/test/chunking-form/samples/emit-chunk-worker/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./chunks/chunk.js'], function (exports, module) { var shared; return { setters: [function (module) { - shared = module.a; + shared = module.s; }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/chunk.js b/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/chunk.js index 766aa80086a..cce16151201 100644 --- a/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/chunk.js +++ b/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/chunk.js @@ -1,4 +1,4 @@ const color = 'greenyellow'; const size = 6; -export { color as a, size as b }; +export { color as c, size as s }; diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/worklet.js b/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/worklet.js index 7e6de10220d..43f54d48cc8 100644 --- a/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/worklet.js +++ b/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/worklet.js @@ -1,4 +1,4 @@ -import { b as size, a as color } from './chunk.js'; +import { s as size, c as color } from './chunk.js'; registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/es/main.js b/test/chunking-form/samples/emit-chunk-worklet/_expected/es/main.js index a2e8f846702..cda6f00a5b0 100644 --- a/test/chunking-form/samples/emit-chunk-worklet/_expected/es/main.js +++ b/test/chunking-form/samples/emit-chunk-worklet/_expected/es/main.js @@ -1,4 +1,4 @@ -import { a as color, b as size } from './chunks/chunk.js'; +import { c as color, s as size } from './chunks/chunk.js'; CSS.paintWorklet.addModule(new URL('chunks/worklet.js', import.meta.url).href); diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/chunk.js b/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/chunk.js index d41169b77d4..ded5ee2be5d 100644 --- a/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/chunk.js +++ b/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/chunk.js @@ -3,8 +3,8 @@ System.register([], function (exports, module) { return { execute: function () { - const color = exports('a', 'greenyellow'); - const size = exports('b', 6); + const color = exports('c', 'greenyellow'); + const size = exports('s', 6); } }; diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/worklet.js index 0b48cd0f63e..00643bbfa63 100644 --- a/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/worklet.js +++ b/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/worklet.js @@ -3,8 +3,8 @@ System.register(['./chunk.js'], function (exports, module) { var size, color; return { setters: [function (module) { - size = module.b; - color = module.a; + size = module.s; + color = module.c; }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/emit-chunk-worklet/_expected/system/main.js index 7cf17827eee..b07122b3d50 100644 --- a/test/chunking-form/samples/emit-chunk-worklet/_expected/system/main.js +++ b/test/chunking-form/samples/emit-chunk-worklet/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./chunks/chunk.js'], function (exports, module) { var color, size; return { setters: [function (module) { - color = module.a; - size = module.b; + color = module.c; + size = module.s; }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk/_expected/es/generated-buildStart.js b/test/chunking-form/samples/emit-chunk/_expected/es/generated-buildStart.js index 0aa63110db2..e243252b0c2 100644 --- a/test/chunking-form/samples/emit-chunk/_expected/es/generated-buildStart.js +++ b/test/chunking-form/samples/emit-chunk/_expected/es/generated-buildStart.js @@ -1,3 +1,3 @@ -import { a as value } from './generated-chunk.js'; +import { v as value } from './generated-chunk.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-chunk/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-chunk/_expected/es/generated-chunk.js index 637e70967d1..b7cbe038a73 100644 --- a/test/chunking-form/samples/emit-chunk/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/emit-chunk/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ var value = 42; -export { value as a }; +export { value as v }; diff --git a/test/chunking-form/samples/emit-chunk/_expected/es/main.js b/test/chunking-form/samples/emit-chunk/_expected/es/main.js index 6647a955386..9ccd67b1a67 100644 --- a/test/chunking-form/samples/emit-chunk/_expected/es/main.js +++ b/test/chunking-form/samples/emit-chunk/_expected/es/main.js @@ -1,3 +1,3 @@ -import { a as value } from './generated-chunk.js'; +import { v as value } from './generated-chunk.js'; console.log('main', value); diff --git a/test/chunking-form/samples/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/emit-chunk/_expected/system/generated-buildStart.js index 77070033222..09cef3a4783 100644 --- a/test/chunking-form/samples/emit-chunk/_expected/system/generated-buildStart.js +++ b/test/chunking-form/samples/emit-chunk/_expected/system/generated-buildStart.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var value; return { setters: [function (module) { - value = module.a; + value = module.v; }], execute: function () { diff --git a/test/chunking-form/samples/emit-chunk/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-chunk/_expected/system/generated-chunk.js index 28865ae6188..6064e844ef4 100644 --- a/test/chunking-form/samples/emit-chunk/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/emit-chunk/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var value = exports('a', 42); + var value = exports('v', 42); } }; diff --git a/test/chunking-form/samples/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/emit-chunk/_expected/system/main.js index 9db3c59931a..9a7867bab74 100644 --- a/test/chunking-form/samples/emit-chunk/_expected/system/main.js +++ b/test/chunking-form/samples/emit-chunk/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var value; return { setters: [function (module) { - value = module.a; + value = module.v; }], execute: function () { diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-chunk.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-chunk.js index 489a82e7192..2feaa1ff203 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-chunk.js @@ -1,5 +1,5 @@ import m2 from './m2.js'; -export { default as b } from './m2.js'; +export { default as m } from './m2.js'; diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-chunk.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-chunk.js index 80d74a06a2a..1e78e1d95bd 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-chunk.js @@ -4,7 +4,7 @@ System.register(['./m2.js'], function (exports, module) { return { setters: [function (module) { m2 = module.default; - exports('b', module.default); + exports('m', module.default); }], execute: function () { diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2alias.js index 461268e5515..ff43f7f719e 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2alias.js @@ -6,4 +6,4 @@ function log (x) { } } -export { log as a, dep as b }; +export { dep as d, log as l }; diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main1alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main1alias.js index 18428f186b8..5053a9cfe5a 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main1alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main1alias.js @@ -1,3 +1,3 @@ -import { a as log, b as dep } from './generated-main2alias.js'; +import { l as log, d as dep } from './generated-main2alias.js'; log(dep); diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main2alias.js index b32a43d79a1..3b08b759c45 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main2alias.js @@ -1 +1 @@ -export { a as default } from './generated-main2alias.js'; +export { l as default } from './generated-main2alias.js'; diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2alias.js index 22516b5eba1..39e633e021a 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2alias.js @@ -3,9 +3,9 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', log); + exports('l', log); - var dep = exports('b', { x: 42 }); + var dep = exports('d', { x: 42 }); function log (x) { if (dep) { diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js index 2370e978008..0ed7fa81a98 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js @@ -3,8 +3,8 @@ System.register(['./generated-main2alias.js'], function (exports, module) { var log, dep; return { setters: [function (module) { - log = module.a; - dep = module.b; + log = module.l; + dep = module.d; }], execute: function () { diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js index 7f4658c4ff7..b950dd430b4 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js @@ -2,7 +2,7 @@ System.register(['./generated-main2alias.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('default', module.a); + exports('default', module.l); }], execute: function () { diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/es/generated-chunk.js b/test/chunking-form/samples/entrypoint-facade/_expected/es/generated-chunk.js index 461268e5515..ff43f7f719e 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/es/generated-chunk.js @@ -6,4 +6,4 @@ function log (x) { } } -export { log as a, dep as b }; +export { dep as d, log as l }; diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/es/main1.js b/test/chunking-form/samples/entrypoint-facade/_expected/es/main1.js index c647800f0c5..9e409ed6e90 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/es/main1.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { a as log, b as dep } from './generated-chunk.js'; +import { l as log, d as dep } from './generated-chunk.js'; log(dep); diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/es/main2.js b/test/chunking-form/samples/entrypoint-facade/_expected/es/main2.js index a16a620d03f..022c729be82 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/es/main2.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/es/main2.js @@ -1 +1 @@ -export { a as default } from './generated-chunk.js'; +export { l as default } from './generated-chunk.js'; diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/system/generated-chunk.js b/test/chunking-form/samples/entrypoint-facade/_expected/system/generated-chunk.js index 22516b5eba1..39e633e021a 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/system/generated-chunk.js @@ -3,9 +3,9 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', log); + exports('l', log); - var dep = exports('b', { x: 42 }); + var dep = exports('d', { x: 42 }); function log (x) { if (dep) { diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js b/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js index ab11cc92c57..9631a631529 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { var log, dep; return { setters: [function (module) { - log = module.a; - dep = module.b; + log = module.l; + dep = module.d; }], execute: function () { diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js b/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js index 2ec2077c897..2f068711437 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js @@ -2,7 +2,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('default', module.a); + exports('default', module.l); }], execute: function () { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-88db1d1d-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-cc2b1346-esm.js similarity index 72% rename from test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-88db1d1d-esm.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-cc2b1346-esm.js index 461268e5515..ff43f7f719e 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-88db1d1d-esm.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-cc2b1346-esm.js @@ -6,4 +6,4 @@ function log (x) { } } -export { log as a, dep as b }; +export { dep as d, log as l }; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0152a638-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0152a638-esm.js deleted file mode 100644 index e8e34075cbd..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-0152a638-esm.js +++ /dev/null @@ -1,3 +0,0 @@ -import { a as log, b as dep } from './chunk-chunk-88db1d1d-esm.js'; - -log(dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-2901d8b1-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-2901d8b1-esm.js new file mode 100644 index 00000000000..de7ec87b1cc --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-2901d8b1-esm.js @@ -0,0 +1,3 @@ +import { l as log, d as dep } from './chunk-chunk-cc2b1346-esm.js'; + +log(dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-5a78ab60-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-5a78ab60-esm.js deleted file mode 100644 index a3bc712a1a2..00000000000 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-5a78ab60-esm.js +++ /dev/null @@ -1 +0,0 @@ -export { a as default } from './chunk-chunk-88db1d1d-esm.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-62d27906-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-62d27906-esm.js new file mode 100644 index 00000000000..1b5ae3247da --- /dev/null +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-62d27906-esm.js @@ -0,0 +1 @@ +export { l as default } from './chunk-chunk-cc2b1346-esm.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-26e1391e-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-63744fb4-system.js similarity index 76% rename from test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-26e1391e-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-63744fb4-system.js index 22516b5eba1..39e633e021a 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-26e1391e-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-63744fb4-system.js @@ -3,9 +3,9 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', log); + exports('l', log); - var dep = exports('b', { x: 42 }); + var dep = exports('d', { x: 42 }); function log (x) { if (dep) { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-2c874064-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js similarity index 59% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-2c874064-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js index a1f541a5733..522cb5c34a1 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-2c874064-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js @@ -1,10 +1,10 @@ -System.register(['./chunk-chunk-26e1391e-system.js'], function (exports, module) { +System.register(['./chunk-chunk-63744fb4-system.js'], function (exports, module) { 'use strict'; var log, dep; return { setters: [function (module) { - log = module.a; - dep = module.b; + log = module.l; + dep = module.d; }], execute: function () { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-dd802b9d-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js similarity index 55% rename from test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-dd802b9d-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js index 29c79bc8437..406b3d0a39f 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-dd802b9d-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js @@ -1,8 +1,8 @@ -System.register(['./chunk-chunk-26e1391e-system.js'], function (exports, module) { +System.register(['./chunk-chunk-63744fb4-system.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('default', module.a); + exports('default', module.l); }], execute: function () { diff --git a/test/chunking-form/samples/grouping-multiple/_expected/es/generated-chunk.js b/test/chunking-form/samples/grouping-multiple/_expected/es/generated-chunk.js index 53a899a12f2..1b0cff90bad 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/es/generated-chunk.js @@ -4,4 +4,4 @@ const y = 2; const z = 3; -export { x as a, y as b, z as c }; +export { x, y, z }; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/es/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/es/main1.js index e59ba921edb..57030d5cb31 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/es/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as x, b as y } from './generated-chunk.js'; +import { x, y } from './generated-chunk.js'; var main1 = x + y; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/es/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/es/main2.js index 16850c1c9e1..78ebdd3affe 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/es/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as x, c as z } from './generated-chunk.js'; +import { x, z } from './generated-chunk.js'; var main2 = x + z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/es/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/es/main3.js index 5eca279286e..81053c79836 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/es/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/es/main3.js @@ -1,4 +1,4 @@ -import { b as y, c as z } from './generated-chunk.js'; +import { y, z } from './generated-chunk.js'; var main3 = y + z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/system/generated-chunk.js b/test/chunking-form/samples/grouping-multiple/_expected/system/generated-chunk.js index 3be5e409950..7deebfb4b02 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/generated-chunk.js @@ -3,11 +3,11 @@ System.register([], function (exports, module) { return { execute: function () { - const x = exports('a', 1); + const x = exports('x', 1); - const y = exports('b', 2); + const y = exports('y', 2); - const z = exports('c', 3); + const z = exports('z', 3); } }; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js index b811df53bb8..fce00c609fd 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { var x, y; return { setters: [function (module) { - x = module.a; - y = module.b; + x = module.x; + y = module.y; }], execute: function () { diff --git a/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js index 7c9486cd645..d7f2a2943ec 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { var x, z; return { setters: [function (module) { - x = module.a; - z = module.c; + x = module.x; + z = module.z; }], execute: function () { diff --git a/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js index f861cd60299..e74cedfa01b 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { var y, z; return { setters: [function (module) { - y = module.b; - z = module.c; + y = module.y; + z = module.z; }], execute: function () { diff --git a/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk.js b/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk.js index 22adb32024a..14b4dd4d8fe 100644 --- a/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk.js @@ -1,4 +1,4 @@ const x = 1; console.log('too large for grouping'); -export { x as a }; +export { x }; diff --git a/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk2.js index c255cd47697..edaf39d391f 100644 --- a/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk2.js @@ -2,4 +2,4 @@ const y = 2; const z = 3; -export { y as a, z as b }; +export { y, z }; diff --git a/test/chunking-form/samples/grouping-size/_expected/es/main1.js b/test/chunking-form/samples/grouping-size/_expected/es/main1.js index a8d6095a1a2..97c077c14bb 100644 --- a/test/chunking-form/samples/grouping-size/_expected/es/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/es/main1.js @@ -1,5 +1,5 @@ -import { a as x } from './generated-chunk.js'; -import { a as y } from './generated-chunk2.js'; +import { x } from './generated-chunk.js'; +import { y } from './generated-chunk2.js'; var main1 = x + y; diff --git a/test/chunking-form/samples/grouping-size/_expected/es/main2.js b/test/chunking-form/samples/grouping-size/_expected/es/main2.js index e05748fd8da..1ef06784c22 100644 --- a/test/chunking-form/samples/grouping-size/_expected/es/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/es/main2.js @@ -1,5 +1,5 @@ -import { a as x } from './generated-chunk.js'; -import { b as z } from './generated-chunk2.js'; +import { x } from './generated-chunk.js'; +import { z } from './generated-chunk2.js'; var main2 = x + z; diff --git a/test/chunking-form/samples/grouping-size/_expected/es/main3.js b/test/chunking-form/samples/grouping-size/_expected/es/main3.js index 9c2d8b00ff6..0e6aa638c19 100644 --- a/test/chunking-form/samples/grouping-size/_expected/es/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/es/main3.js @@ -1,4 +1,4 @@ -import { a as y, b as z } from './generated-chunk2.js'; +import { y, z } from './generated-chunk2.js'; var main3 = y + z; diff --git a/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk.js b/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk.js index 198a77eb894..dbf76724873 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - const x = exports('a', 1); + const x = exports('x', 1); console.log('too large for grouping'); } diff --git a/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk2.js index 26ffed6432a..5319156fed9 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk2.js @@ -3,9 +3,9 @@ System.register([], function (exports, module) { return { execute: function () { - const y = exports('a', 2); + const y = exports('y', 2); - const z = exports('b', 3); + const z = exports('z', 3); } }; diff --git a/test/chunking-form/samples/grouping-size/_expected/system/main1.js b/test/chunking-form/samples/grouping-size/_expected/system/main1.js index 05e8924f738..d7c3aaa8d76 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/main1.js @@ -3,9 +3,9 @@ System.register(['./generated-chunk.js', './generated-chunk2.js'], function (exp var x, y; return { setters: [function (module) { - x = module.a; + x = module.x; }, function (module) { - y = module.a; + y = module.y; }], execute: function () { diff --git a/test/chunking-form/samples/grouping-size/_expected/system/main2.js b/test/chunking-form/samples/grouping-size/_expected/system/main2.js index ca1e588531b..3d2999d277d 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/main2.js @@ -3,9 +3,9 @@ System.register(['./generated-chunk.js', './generated-chunk2.js'], function (exp var x, z; return { setters: [function (module) { - x = module.a; + x = module.x; }, function (module) { - z = module.b; + z = module.z; }], execute: function () { diff --git a/test/chunking-form/samples/grouping-size/_expected/system/main3.js b/test/chunking-form/samples/grouping-size/_expected/system/main3.js index d2ef31c04ba..0fd9f750a72 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/main3.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk2.js'], function (exports, module) { var y, z; return { setters: [function (module) { - y = module.a; - z = module.b; + y = module.y; + z = module.z; }], execute: function () { diff --git a/test/chunking-form/samples/import-meta-url/_expected/es/main.js b/test/chunking-form/samples/import-meta-url/_expected/es/main.js index 85486cf6309..ccb88a0c197 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/es/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/es/main.js @@ -1,4 +1,4 @@ -import { a as log } from './nested/chunk.js'; +import { l as log } from './nested/chunk.js'; log('main: ' + import.meta.url); import('./nested/chunk2.js'); diff --git a/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk.js b/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk.js index b666269f35d..9563d2b0194 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk.js +++ b/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk.js @@ -6,4 +6,4 @@ function log(url) { } } -export { log as a }; +export { log as l }; diff --git a/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk2.js b/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk2.js index 4dc8950a08f..43efad60e67 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk2.js +++ b/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk2.js @@ -1,3 +1,3 @@ -import { a as log } from './chunk.js'; +import { l as log } from './chunk.js'; log('nested: ' + import.meta.url); diff --git a/test/chunking-form/samples/import-meta-url/_expected/system/main.js b/test/chunking-form/samples/import-meta-url/_expected/system/main.js index b0fd79d49ee..17ede17b3f6 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/system/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./nested/chunk.js'], function (exports, module) { var log; return { setters: [function (module) { - log = module.a; + log = module.l; }], execute: function () { diff --git a/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js b/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js index 37d15663c1f..86e9a647f1a 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js +++ b/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', log); + exports('l', log); function log(url) { if (typeof document === 'undefined') { diff --git a/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk2.js b/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk2.js index 4c893092da0..e728a64ff99 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk2.js +++ b/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk2.js @@ -3,7 +3,7 @@ System.register(['./chunk.js'], function (exports, module) { var log; return { setters: [function (module) { - log = module.a; + log = module.l; }], execute: function () { diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/generated-outer.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/generated-outer.js index 799f32a0d48..f3fca144ffd 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/generated-outer.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/generated-outer.js @@ -4,4 +4,4 @@ console.log('main'); const value = 42; -export { value as a }; +export { value as v }; diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main.js index 5eb7786ffac..8e1e1150271 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main.js @@ -1 +1 @@ -export { a as value } from './generated-outer.js'; +export { v as value } from './generated-outer.js'; diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/generated-outer.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/generated-outer.js index 7addc0e2fc9..6c643ace670 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/generated-outer.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/generated-outer.js @@ -7,7 +7,7 @@ System.register([], function (exports, module) { console.log('main'); - const value = exports('a', 42); + const value = exports('v', 42); } }; diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main.js index 263739c45e1..d08b1c13cbd 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main.js @@ -2,7 +2,7 @@ System.register(['./generated-outer.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('value', module.a); + exports('value', module.v); }], execute: function () { diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/generated-other.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/generated-other.js index 799f32a0d48..f3fca144ffd 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/generated-other.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/generated-other.js @@ -4,4 +4,4 @@ console.log('main'); const value = 42; -export { value as a }; +export { value as v }; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main.js index 604a3884871..3c5b3c20c93 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main.js @@ -1 +1 @@ -export { a as value } from './generated-other.js'; +export { v as value } from './generated-other.js'; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/generated-other.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/generated-other.js index 7addc0e2fc9..6c643ace670 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/generated-other.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/generated-other.js @@ -7,7 +7,7 @@ System.register([], function (exports, module) { console.log('main'); - const value = exports('a', 42); + const value = exports('v', 42); } }; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main.js index 335cd2bb0ab..18940857900 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main.js @@ -2,7 +2,7 @@ System.register(['./generated-other.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('value', module.a); + exports('value', module.v); }], execute: function () { diff --git a/test/chunking-form/samples/manual-chunks/_expected/es/generated-deps2and3.js b/test/chunking-form/samples/manual-chunks/_expected/es/generated-deps2and3.js index d9be84c542f..ab74a6ccafd 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/es/generated-deps2and3.js +++ b/test/chunking-form/samples/manual-chunks/_expected/es/generated-deps2and3.js @@ -1,4 +1,4 @@ -import { a as fn$3 } from './generated-lib1.js'; +import { f as fn$3 } from './generated-lib1.js'; function fn () { console.log('lib2 fn'); @@ -14,4 +14,4 @@ function fn$2 () { console.log('dep3 fn'); } -export { fn$1 as a, fn$2 as b }; +export { fn$2 as a, fn$1 as f }; diff --git a/test/chunking-form/samples/manual-chunks/_expected/es/generated-lib1.js b/test/chunking-form/samples/manual-chunks/_expected/es/generated-lib1.js index de029172fe1..ae5cdca1483 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/es/generated-lib1.js +++ b/test/chunking-form/samples/manual-chunks/_expected/es/generated-lib1.js @@ -2,4 +2,4 @@ function fn () { console.log('lib1 fn'); } -export { fn as a }; +export { fn as f }; diff --git a/test/chunking-form/samples/manual-chunks/_expected/es/main.js b/test/chunking-form/samples/manual-chunks/_expected/es/main.js index 676f34a10e9..55591e37b6a 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunks/_expected/es/main.js @@ -1,4 +1,4 @@ -import { a as fn$1, b as fn$2 } from './generated-deps2and3.js'; +import { f as fn$1, a as fn$2 } from './generated-deps2and3.js'; import './generated-lib1.js'; function fn () { diff --git a/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js b/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js index 844ae56c574..b19f8738062 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js +++ b/test/chunking-form/samples/manual-chunks/_expected/system/generated-deps2and3.js @@ -3,13 +3,13 @@ System.register(['./generated-lib1.js'], function (exports, module) { var fn$3; return { setters: [function (module) { - fn$3 = module.a; + fn$3 = module.f; }], execute: function () { exports({ - a: fn$1, - b: fn$2 + a: fn$2, + f: fn$1 }); function fn () { diff --git a/test/chunking-form/samples/manual-chunks/_expected/system/generated-lib1.js b/test/chunking-form/samples/manual-chunks/_expected/system/generated-lib1.js index 63a25d861a7..f1cccb110c7 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/system/generated-lib1.js +++ b/test/chunking-form/samples/manual-chunks/_expected/system/generated-lib1.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', fn); + exports('f', fn); function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/manual-chunks/_expected/system/main.js b/test/chunking-form/samples/manual-chunks/_expected/system/main.js index e8d21361a0a..e0c7d193b46 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunks/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./generated-deps2and3.js', './generated-lib1.js'], function (e var fn$1, fn$2; return { setters: [function (module) { - fn$1 = module.a; - fn$2 = module.b; + fn$1 = module.f; + fn$2 = module.a; }, function () {}], execute: function () { diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk.js b/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk.js index ad1e9198804..b002adbbe46 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ var num = 1; -export { num as a }; +export { num as n }; diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk2.js index 5c0df4dad65..4ac88fc5e7a 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk2.js @@ -1,3 +1,3 @@ var num = 2; -export { num as a }; +export { num as n }; diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk3.js index 93d5524868b..de36f4567c1 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk3.js @@ -1,3 +1,3 @@ var num = 3; -export { num as a }; +export { num as n }; diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/main1.js b/test/chunking-form/samples/multi-chunking/_expected/es/main1.js index cd34e940ce8..283b9dd7f7b 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/es/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as num } from './generated-chunk.js'; -import { a as num$1 } from './generated-chunk2.js'; +import { n as num } from './generated-chunk.js'; +import { n as num$1 } from './generated-chunk2.js'; console.log(num + num$1); diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/main2.js b/test/chunking-form/samples/multi-chunking/_expected/es/main2.js index e2e3c06018a..f6ea4b201e1 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/es/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as num } from './generated-chunk2.js'; -import { a as num$1 } from './generated-chunk3.js'; +import { n as num } from './generated-chunk2.js'; +import { n as num$1 } from './generated-chunk3.js'; console.log(num + num$1); diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/main3.js b/test/chunking-form/samples/multi-chunking/_expected/es/main3.js index 68532b38eb2..9b2232a482a 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/es/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/es/main3.js @@ -1,4 +1,4 @@ -import { a as num } from './generated-chunk.js'; -import { a as num$1 } from './generated-chunk3.js'; +import { n as num } from './generated-chunk.js'; +import { n as num$1 } from './generated-chunk3.js'; console.log(num + num$1); diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk.js b/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk.js index 6813a509356..1a32db69510 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var num = exports('a', 1); + var num = exports('n', 1); } }; diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk2.js index fc7094730e8..ee9fde8fbcf 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk2.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var num = exports('a', 2); + var num = exports('n', 2); } }; diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk3.js index 2cd83bdf69f..f1aa55c527c 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk3.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var num = exports('a', 3); + var num = exports('n', 3); } }; diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/main1.js b/test/chunking-form/samples/multi-chunking/_expected/system/main1.js index 96d017fdc14..164723d6e01 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/main1.js @@ -3,9 +3,9 @@ System.register(['./generated-chunk.js', './generated-chunk2.js'], function (exp var num, num$1; return { setters: [function (module) { - num = module.a; + num = module.n; }, function (module) { - num$1 = module.a; + num$1 = module.n; }], execute: function () { diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/main2.js b/test/chunking-form/samples/multi-chunking/_expected/system/main2.js index 23045be3587..b1af892c9da 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/main2.js @@ -3,9 +3,9 @@ System.register(['./generated-chunk2.js', './generated-chunk3.js'], function (ex var num, num$1; return { setters: [function (module) { - num = module.a; + num = module.n; }, function (module) { - num$1 = module.a; + num$1 = module.n; }], execute: function () { diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/main3.js b/test/chunking-form/samples/multi-chunking/_expected/system/main3.js index ea33977114f..66d7d085791 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/main3.js @@ -3,9 +3,9 @@ System.register(['./generated-chunk.js', './generated-chunk3.js'], function (exp var num, num$1; return { setters: [function (module) { - num = module.a; + num = module.n; }, function (module) { - num$1 = module.a; + num$1 = module.n; }], execute: function () { diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/chunk.js b/test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/chunk.js index 94dca2d35b3..d5f271b2232 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/chunk.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/chunk.js @@ -1,3 +1,3 @@ const sharedValue = 'shared'; -export { sharedValue as a }; +export { sharedValue as s }; diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/es/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/es/main.js index 793646ecb4c..4f329e1fd8f 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/es/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/es/main.js @@ -1,3 +1,3 @@ -import { a as sharedValue } from './chunks/chunk.js'; +import { s as sharedValue } from './chunks/chunk.js'; assert.equal(sharedValue, 'shared'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/es/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/es/other.js index 8e3d65b216d..c31fc8ebe03 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/es/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/es/other.js @@ -1 +1 @@ -export { a as sharedValue } from './chunks/chunk.js'; +export { s as sharedValue } from './chunks/chunk.js'; diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/chunk.js b/test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/chunk.js index f4a5045db1a..a078238c2c9 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/chunk.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - const sharedValue = exports('a', 'shared'); + const sharedValue = exports('s', 'shared'); } }; diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js index 11b81781952..78070be8de1 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js @@ -3,7 +3,7 @@ System.register(['./chunks/chunk.js'], function (exports, module) { var sharedValue; return { setters: [function (module) { - sharedValue = module.a; + sharedValue = module.s; }], execute: function () { diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js index 81bcc1cf806..c88f4eb96fb 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js @@ -2,7 +2,7 @@ System.register(['./chunks/chunk.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { - exports('sharedValue', module.a); + exports('sharedValue', module.s); }], execute: function () { diff --git a/test/chunking-form/samples/namespace-object-import/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-object-import/_expected/es/generated-chunk.js index 42c30f97ff6..8b1a237368b 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/es/generated-chunk.js @@ -6,4 +6,4 @@ var main2 = /*#__PURE__*/Object.freeze({ b: b }); -export { a, main2 as b, b as c }; +export { a, b, main2 as m }; diff --git a/test/chunking-form/samples/namespace-object-import/_expected/es/main1.js b/test/chunking-form/samples/namespace-object-import/_expected/es/main1.js index 50d073052f2..312052b1e75 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/es/main1.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a, b as main2 } from './generated-chunk.js'; +import { a, m as main2 } from './generated-chunk.js'; console.log(a); diff --git a/test/chunking-form/samples/namespace-object-import/_expected/es/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/es/main2.js index 086197544e8..794f1dbe5a9 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/es/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/es/main2.js @@ -1 +1 @@ -export { a, c as b } from './generated-chunk.js'; +export { a, b } from './generated-chunk.js'; diff --git a/test/chunking-form/samples/namespace-object-import/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-object-import/_expected/system/generated-chunk.js index babff4580f7..16132b09f53 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/system/generated-chunk.js @@ -4,13 +4,13 @@ System.register([], function (exports, module) { execute: function () { var a = exports('a', 'a'); - var b = exports('c', 'a'); + var b = exports('b', 'a'); var main2 = /*#__PURE__*/Object.freeze({ a: a, b: b }); - exports('b', main2); + exports('m', main2); } }; diff --git a/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js b/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js index f067ddbe178..294cf626de6 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js @@ -4,7 +4,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { return { setters: [function (module) { a = module.a; - main2 = module.b; + main2 = module.m; }], execute: function () { diff --git a/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js index fb13e62e855..83f7bc091c9 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js @@ -4,7 +4,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { setters: [function (module) { var _setter = {}; _setter.a = module.a; - _setter.b = module.c; + _setter.b = module.b; exports(_setter); }], execute: function () { diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk.js index cad99a517ff..9e978ad7d52 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ const reexported = 1; -export { reexported as a }; +export { reexported as r }; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk2.js index 3403eb3dfb2..9abe01c7f87 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk2.js @@ -1,4 +1,4 @@ -import { a as reexported$1 } from './generated-chunk.js'; +import { r as reexported$1 } from './generated-chunk.js'; import { reexported } from 'external'; console.log(reexported); @@ -7,4 +7,4 @@ var lib = /*#__PURE__*/Object.freeze({ reexported: reexported$1 }); -export { lib as a }; +export { lib as l }; 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 2b3f6676e4d..62f034ff6a1 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 './generated-chunk.js'; import 'external'; -import { a as lib } from './generated-chunk2.js'; +import { l as lib } from './generated-chunk2.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 c6ad92fd6a3..5007839a655 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,4 +1,4 @@ -import { a as reexported } from './generated-chunk.js'; +import { r as reexported } from './generated-chunk.js'; import 'external'; import './generated-chunk2.js'; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk.js index 244dd349cd6..7da661ce0a0 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - const reexported = exports('a', 1); + const reexported = exports('r', 1); } }; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk2.js index 9434705024a..fe27ae981d6 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js', 'external'], function (exports, module) var reexported$1, reexported; return { setters: [function (module) { - reexported$1 = module.a; + reexported$1 = module.r; }, function (module) { reexported = module.reexported; }], @@ -14,7 +14,7 @@ System.register(['./generated-chunk.js', 'external'], function (exports, module) var lib = /*#__PURE__*/Object.freeze({ reexported: reexported$1 }); - exports('a', lib); + exports('l', lib); } }; 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 f90e3992d03..84046cb6dff 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 @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js', 'external', './generated-chunk2.js'], f var lib; return { setters: [function () {}, function () {}, function (module) { - lib = module.a; + lib = module.l; }], execute: function () { 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 49d0f9d44db..be5ba56d224 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 @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js', 'external', './generated-chunk2.js'], f var reexported; return { setters: [function (module) { - reexported = module.a; + reexported = module.r; }, function () {}, function () {}], execute: function () { diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-reexports/_expected/es/generated-chunk.js index fdae9a7b094..aa297829f3f 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/es/generated-chunk.js @@ -1,5 +1,5 @@ import hsl2hsv$1 from './hsl2hsv.js'; -export { default as b } from './hsl2hsv.js'; +export { default as h } from './hsl2hsv.js'; var hsl2hsv = 'asdf'; @@ -9,4 +9,4 @@ var lib = /*#__PURE__*/Object.freeze({ hsl2hsv: hsl2hsv$1 }); -export { lib as a }; +export { lib as l }; 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 d1c06ab9b87..4ebbb5a0a1d 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 { a as lib } from './generated-chunk.js'; +import { l as lib } from './generated-chunk.js'; console.log(p); var main = new Map(Object.entries(lib)); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-reexports/_expected/system/generated-chunk.js index e0ee5ac921d..8253f335902 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/generated-chunk.js @@ -4,7 +4,7 @@ System.register(['./hsl2hsv.js'], function (exports, module) { return { setters: [function (module) { hsl2hsv$1 = module.default; - exports('b', module.default); + exports('h', module.default); }], execute: function () { @@ -15,7 +15,7 @@ System.register(['./hsl2hsv.js'], function (exports, module) { var lib = /*#__PURE__*/Object.freeze({ hsl2hsv: hsl2hsv$1 }); - exports('a', lib); + exports('l', 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 30e0cc95052..fb8d5396315 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/main.js @@ -5,7 +5,7 @@ System.register(['./hsl2hsv.js', './generated-chunk.js'], function (exports, mod setters: [function (module) { p = module.p; }, function (module) { - lib = module.a; + lib = module.l; }], execute: function () { diff --git a/test/chunking-form/samples/namespace-retracing/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-retracing/_expected/es/generated-chunk.js index 390c88e901f..c626a253379 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/es/generated-chunk.js @@ -10,4 +10,4 @@ class Other { Other.doSomething = function() { console.log('other'); }; -export { Other as a, Broken as b }; +export { Broken as B, Other as O }; diff --git a/test/chunking-form/samples/namespace-retracing/_expected/es/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/es/main-a.js index 1ee0065ac0f..15c86ffaca0 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/es/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/es/main-a.js @@ -1,4 +1,4 @@ -import { a as Other, b as Broken } from './generated-chunk.js'; +import { O as Other, B as Broken } from './generated-chunk.js'; Other.doSomething(); Broken.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/es/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/es/main-b.js index bab4e76a543..2d07b85a658 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/es/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/es/main-b.js @@ -1,3 +1,3 @@ -import { a as Other } from './generated-chunk.js'; +import { O as Other } from './generated-chunk.js'; Other.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-retracing/_expected/system/generated-chunk.js index 20caca1e369..d45a684fd8a 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/system/generated-chunk.js @@ -4,14 +4,14 @@ System.register([], function (exports, module) { execute: function () { class Broken { - } exports('b', Broken); + } exports('B', Broken); Broken.doSomething = function() { console.log('broken'); }; Broken.doSomething(); class Other { - } exports('a', Other); + } exports('O', Other); Other.doSomething = function() { console.log('other'); }; diff --git a/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js index ff4bcc2fd6a..95853776912 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { var Other, Broken; return { setters: [function (module) { - Other = module.a; - Broken = module.b; + Other = module.O; + Broken = module.B; }], execute: function () { diff --git a/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js index 2d74c0ff32e..3f6eee6af6d 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var Other; return { setters: [function (module) { - Other = module.a; + Other = module.O; }], execute: function () { diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk.js index 3b70936ffc4..2e2462ea671 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk.js @@ -2,4 +2,4 @@ function broken() { console.log('broken'); } -export { broken as a }; +export { broken as b }; diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js index c828e560738..2d374209102 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js @@ -4,4 +4,4 @@ function foo() { console.log('foo'); } -export { foo as a }; +export { foo as f }; diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js index b7fe5dbfcfc..ccc1008b239 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js @@ -4,4 +4,4 @@ function bar() { console.log('bar'); } -export { bar as a }; +export { bar as b }; 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 1035221d02f..6e2804603b4 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 { a as broken } from './generated-chunk.js'; -import { a as foo } from './generated-chunk2.js'; +import { b as broken } from './generated-chunk.js'; +import { f as foo } from './generated-chunk2.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 5a7e2bf2541..2680a53a1cb 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 { a as broken } from './generated-chunk.js'; -import { a as foo } from './generated-chunk2.js'; -import { a as bar } from './generated-chunk3.js'; +import { b as broken } from './generated-chunk.js'; +import { f as foo } from './generated-chunk2.js'; +import { b as bar } from './generated-chunk3.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 29ae1cf76dd..444fdcd8d0d 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 { a as broken } from './generated-chunk.js'; -import { a as bar } from './generated-chunk3.js'; +import { b as broken } from './generated-chunk.js'; +import { b as bar } from './generated-chunk3.js'; bar(); broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk.js index 6f9e9f334df..a732598389e 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', broken); + exports('b', broken); function broken() { console.log('broken'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js index 7e84f230e55..a6f842e11eb 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js @@ -4,7 +4,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { setters: [function () {}], execute: function () { - exports('a', foo); + exports('f', foo); function foo() { console.log('foo'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js index 463fc6a9520..f2add1fb504 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js @@ -4,7 +4,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { setters: [function () {}], execute: function () { - exports('a', bar); + exports('b', bar); function bar() { console.log('bar'); 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 41625bec9df..0cda0b1334a 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 @@ -3,9 +3,9 @@ System.register(['./generated-chunk.js', './generated-chunk2.js'], function (exp var broken, foo; return { setters: [function (module) { - broken = module.a; + broken = module.b; }, function (module) { - foo = module.a; + foo = module.f; }], 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 3008a538d8f..417b1688063 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 @@ -3,11 +3,11 @@ System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-c var broken, foo, bar; return { setters: [function (module) { - broken = module.a; + broken = module.b; }, function (module) { - foo = module.a; + foo = module.f; }, function (module) { - bar = module.a; + bar = 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 5979803bea0..02d923e84e5 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 @@ -3,9 +3,9 @@ System.register(['./generated-chunk.js', './generated-chunk3.js'], function (exp var broken, bar; return { setters: [function (module) { - broken = module.a; + broken = module.b; }, function (module) { - bar = module.a; + bar = module.b; }], execute: function () { diff --git a/test/chunking-form/samples/reexport-from-entry/_config.js b/test/chunking-form/samples/reexport-from-entry/_config.js new file mode 100644 index 00000000000..ad0d2c5dfd1 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_config.js @@ -0,0 +1,6 @@ +module.exports = { + description: 'allows reexporting from other entry points', + options: { + input: ['main', 'otherEntry'] + } +}; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-chunk.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..9abcdf199e7 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-chunk.js @@ -0,0 +1,12 @@ +define(['exports'], function (exports) { 'use strict'; + + let a = {}; + let b = {}; + + let c = {}; + + exports.a = a; + exports.b = b; + exports.c = c; + +}); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js new file mode 100644 index 00000000000..08797ca7d91 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js @@ -0,0 +1,10 @@ +define(['exports', './generated-chunk'], function (exports, otherEntry) { 'use strict'; + + + + exports.a = otherEntry.a; + exports.c = otherEntry.c; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js new file mode 100644 index 00000000000..1165026a188 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js @@ -0,0 +1,10 @@ +define(['exports', './generated-chunk'], function (exports, otherEntry) { 'use strict'; + + + + exports.b = otherEntry.b; + exports.c = otherEntry.c; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..a803dae8a95 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-chunk.js @@ -0,0 +1,10 @@ +'use strict'; + +let a = {}; +let b = {}; + +let c = {}; + +exports.a = a; +exports.b = b; +exports.c = c; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js new file mode 100644 index 00000000000..0c5f311b215 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js @@ -0,0 +1,10 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var otherEntry = require('./generated-chunk.js'); + + + +exports.a = otherEntry.a; +exports.c = otherEntry.c; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js new file mode 100644 index 00000000000..43ada6a8da1 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js @@ -0,0 +1,10 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var otherEntry = require('./generated-chunk.js'); + + + +exports.b = otherEntry.b; +exports.c = otherEntry.c; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/es/generated-chunk.js b/test/chunking-form/samples/reexport-from-entry/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..3835176db86 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/es/generated-chunk.js @@ -0,0 +1,6 @@ +let a = {}; +let b = {}; + +let c = {}; + +export { a, b, c }; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/es/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/es/main.js new file mode 100644 index 00000000000..e4102b9ca06 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/es/main.js @@ -0,0 +1 @@ +export { a, c } from './generated-chunk.js'; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js new file mode 100644 index 00000000000..fe77963101f --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js @@ -0,0 +1 @@ +export { b, c } from './generated-chunk.js'; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/system/generated-chunk.js b/test/chunking-form/samples/reexport-from-entry/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..7ef5a4a89f9 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/system/generated-chunk.js @@ -0,0 +1,13 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + let a = exports('a', {}); + let b = exports('b', {}); + + let c = exports('c', {}); + + } + }; +}); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js new file mode 100644 index 00000000000..250931c3704 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js @@ -0,0 +1,16 @@ +System.register(['./generated-chunk.js'], function (exports, module) { + 'use strict'; + return { + setters: [function (module) { + var _setter = {}; + _setter.a = module.a; + _setter.c = module.c; + exports(_setter); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js new file mode 100644 index 00000000000..e3742078564 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js @@ -0,0 +1,16 @@ +System.register(['./generated-chunk.js'], function (exports, module) { + 'use strict'; + return { + setters: [function (module) { + var _setter = {}; + _setter.b = module.b; + _setter.c = module.c; + exports(_setter); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/reexport-from-entry/common.js b/test/chunking-form/samples/reexport-from-entry/common.js new file mode 100644 index 00000000000..1fd73650485 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/common.js @@ -0,0 +1,2 @@ +export let a = {}; +export let b = {}; diff --git a/test/chunking-form/samples/reexport-from-entry/main.js b/test/chunking-form/samples/reexport-from-entry/main.js new file mode 100644 index 00000000000..e603bcfabdc --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/main.js @@ -0,0 +1,2 @@ +export { a } from './common.js'; +export { c } from './otherEntry.js'; diff --git a/test/chunking-form/samples/reexport-from-entry/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/otherEntry.js new file mode 100644 index 00000000000..5c093c99fe7 --- /dev/null +++ b/test/chunking-form/samples/reexport-from-entry/otherEntry.js @@ -0,0 +1,2 @@ +export { b } from './common.js'; +export let c = {}; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-chunk.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-chunk.js index 4d010d48cdf..4533b2da3fe 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-chunk.js @@ -1,3 +1,3 @@ function foo() {} -export { foo as a }; +export { foo as f }; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js index 7b96c61f3b2..927e1ccf171 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a as foo } from './generated-chunk.js'; +import { f as foo } from './generated-chunk.js'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-chunk.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-chunk.js index fd69a6b1a0e..abe47096bf7 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - exports('a', foo); + exports('f', foo); function foo() {} diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js index e6e294fcdf1..65ad3564f99 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var foo; return { setters: [function (module) { - foo = module.a; + foo = module.f; }], execute: function () { diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-chunk.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-chunk.js index bd36d58c93a..f38d0101d46 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-chunk.js @@ -271,4 +271,4 @@ var v1, v271, v272; -export { v54 as $, v27 as A, v28 as B, v29 as C, v30 as D, v31 as E, v32 as F, v33 as G, v34 as H, v35 as I, v36 as J, v37 as K, v38 as L, v39 as M, v40 as N, v41 as O, v42 as P, v43 as Q, v44 as R, v45 as S, v46 as T, v47 as U, v48 as V, v49 as W, v50 as X, v51 as Y, v52 as Z, v53 as _, v1 as a, v118 as a$, v55 as a0, v56 as a1, v57 as a2, v58 as a3, v59 as a4, v60 as a5, v61 as a6, v62 as a7, v63 as a8, v64 as a9, v91 as aA, v92 as aB, v93 as aC, v94 as aD, v95 as aE, v96 as aF, v97 as aG, v98 as aH, v99 as aI, v100 as aJ, v101 as aK, v102 as aL, v103 as aM, v104 as aN, v105 as aO, v106 as aP, v107 as aQ, v108 as aR, v109 as aS, v110 as aT, v111 as aU, v112 as aV, v113 as aW, v114 as aX, v115 as aY, v116 as aZ, v117 as a_, v65 as aa, v66 as ab, v67 as ac, v68 as ad, v69 as ae, v70 as af, v71 as ag, v72 as ah, v73 as ai, v74 as aj, v75 as ak, v76 as al, v77 as am, v78 as an, v79 as ao, v80 as ap, v81 as aq, v82 as ar, v83 as as, v84 as at, v85 as au, v86 as av, v87 as aw, v88 as ax, v89 as ay, v90 as az, v2 as b, v182 as b$, v119 as b0, v120 as b1, v121 as b2, v122 as b3, v123 as b4, v124 as b5, v125 as b6, v126 as b7, v127 as b8, v128 as b9, v155 as bA, v156 as bB, v157 as bC, v158 as bD, v159 as bE, v160 as bF, v161 as bG, v162 as bH, v163 as bI, v164 as bJ, v165 as bK, v166 as bL, v167 as bM, v168 as bN, v169 as bO, v170 as bP, v171 as bQ, v172 as bR, v173 as bS, v174 as bT, v175 as bU, v176 as bV, v177 as bW, v178 as bX, v179 as bY, v180 as bZ, v181 as b_, v129 as ba, v130 as bb, v131 as bc, v132 as bd, v133 as be, v134 as bf, v135 as bg, v136 as bh, v137 as bi, v138 as bj, v139 as bk, v140 as bl, v141 as bm, v142 as bn, v143 as bo, v144 as bp, v145 as bq, v146 as br, v147 as bs, v148 as bt, v149 as bu, v150 as bv, v151 as bw, v152 as bx, v153 as by, v154 as bz, v3 as c, v246 as c$, v183 as c0, v184 as c1, v185 as c2, v186 as c3, v187 as c4, v188 as c5, v189 as c6, v190 as c7, v191 as c8, v192 as c9, v219 as cA, v220 as cB, v221 as cC, v222 as cD, v223 as cE, v224 as cF, v225 as cG, v226 as cH, v227 as cI, v228 as cJ, v229 as cK, v230 as cL, v231 as cM, v232 as cN, v233 as cO, v234 as cP, v235 as cQ, v236 as cR, v237 as cS, v238 as cT, v239 as cU, v240 as cV, v241 as cW, v242 as cX, v243 as cY, v244 as cZ, v245 as c_, v193 as ca, v194 as cb, v195 as cc, v196 as cd, v197 as ce, v198 as cf, v199 as cg, v200 as ch, v201 as ci, v202 as cj, v203 as ck, v204 as cl, v205 as cm, v206 as cn, v207 as co, v208 as cp, v209 as cq, v210 as cr, v211 as cs, v212 as ct, v213 as cu, v214 as cv, v215 as cw, v216 as cx, v217 as cy, v218 as cz, v4 as d, v247 as d0, v248 as d1, v249 as d2, v250 as d3, v251 as d4, v252 as d5, v253 as d6, v254 as d7, v255 as d8, v256 as d9, v257 as da, v258 as db, v259 as dc, v260 as dd, v261 as de, v262 as df, v263 as dg, v264 as dh, v265 as di, v266 as dj, v267 as dk, v268 as dl, v269 as dm, v270 as dn, v271 as dp, v272 as dq, v5 as e, v6 as f, v7 as g, v8 as h, v9 as i, v10 as j, v11 as k, v12 as l, v13 as m, v14 as n, v15 as o, v16 as p, v17 as q, v18 as r, v19 as s, v20 as t, v21 as u, v22 as v, v23 as w, v24 as x, v25 as y, v26 as z }; +export { v54 as $, v27 as A, v28 as B, v29 as C, v30 as D, v31 as E, v32 as F, v33 as G, v34 as H, v35 as I, v36 as J, v37 as K, v38 as L, v39 as M, v40 as N, v41 as O, v42 as P, v43 as Q, v44 as R, v45 as S, v46 as T, v47 as U, v48 as V, v49 as W, v50 as X, v51 as Y, v52 as Z, v53 as _, v2 as a, v118 as a$, v55 as a0, v56 as a1, v57 as a2, v58 as a3, v59 as a4, v60 as a5, v61 as a6, v62 as a7, v63 as a8, v64 as a9, v91 as aA, v92 as aB, v93 as aC, v94 as aD, v95 as aE, v96 as aF, v97 as aG, v98 as aH, v99 as aI, v100 as aJ, v101 as aK, v102 as aL, v103 as aM, v104 as aN, v105 as aO, v106 as aP, v107 as aQ, v108 as aR, v109 as aS, v110 as aT, v111 as aU, v112 as aV, v113 as aW, v114 as aX, v115 as aY, v116 as aZ, v117 as a_, v65 as aa, v66 as ab, v67 as ac, v68 as ad, v69 as ae, v70 as af, v71 as ag, v72 as ah, v73 as ai, v74 as aj, v75 as ak, v76 as al, v77 as am, v78 as an, v79 as ao, v80 as ap, v81 as aq, v82 as ar, v83 as as, v84 as at, v85 as au, v86 as av, v87 as aw, v88 as ax, v89 as ay, v90 as az, v3 as b, v182 as b$, v119 as b0, v120 as b1, v121 as b2, v122 as b3, v123 as b4, v124 as b5, v125 as b6, v126 as b7, v127 as b8, v128 as b9, v155 as bA, v156 as bB, v157 as bC, v158 as bD, v159 as bE, v160 as bF, v161 as bG, v162 as bH, v163 as bI, v164 as bJ, v165 as bK, v166 as bL, v167 as bM, v168 as bN, v169 as bO, v170 as bP, v171 as bQ, v172 as bR, v173 as bS, v174 as bT, v175 as bU, v176 as bV, v177 as bW, v178 as bX, v179 as bY, v180 as bZ, v181 as b_, v129 as ba, v130 as bb, v131 as bc, v132 as bd, v133 as be, v134 as bf, v135 as bg, v136 as bh, v137 as bi, v138 as bj, v139 as bk, v140 as bl, v141 as bm, v142 as bn, v143 as bo, v144 as bp, v145 as bq, v146 as br, v147 as bs, v148 as bt, v149 as bu, v150 as bv, v151 as bw, v152 as bx, v153 as by, v154 as bz, v4 as c, v246 as c$, v183 as c0, v184 as c1, v185 as c2, v186 as c3, v187 as c4, v188 as c5, v189 as c6, v190 as c7, v191 as c8, v192 as c9, v219 as cA, v220 as cB, v221 as cC, v222 as cD, v223 as cE, v224 as cF, v225 as cG, v226 as cH, v227 as cI, v228 as cJ, v229 as cK, v230 as cL, v231 as cM, v232 as cN, v233 as cO, v234 as cP, v235 as cQ, v236 as cR, v237 as cS, v238 as cT, v239 as cU, v240 as cV, v241 as cW, v242 as cX, v243 as cY, v244 as cZ, v245 as c_, v193 as ca, v194 as cb, v195 as cc, v196 as cd, v197 as ce, v198 as cf, v199 as cg, v200 as ch, v201 as ci, v202 as cj, v203 as ck, v204 as cl, v205 as cm, v206 as cn, v207 as co, v208 as cp, v209 as cq, v210 as cr, v211 as cs, v212 as ct, v213 as cu, v214 as cv, v215 as cw, v216 as cx, v217 as cy, v218 as cz, v5 as d, v247 as d0, v248 as d1, v249 as d2, v250 as d3, v251 as d4, v252 as d5, v253 as d6, v254 as d7, v255 as d8, v256 as d9, v257 as da, v258 as db, v259 as dc, v260 as dd, v261 as de, v262 as df, v263 as dg, v264 as dh, v265 as di, v266 as dj, v267 as dk, v268 as dl, v269 as dm, v270 as dn, v271 as dp, v272 as dq, v6 as e, v7 as f, v8 as g, v9 as h, v10 as i, v11 as j, v12 as k, v13 as l, v14 as m, v15 as n, v16 as o, v17 as p, v18 as q, v19 as r, v20 as s, v21 as t, v22 as u, v1 as v, v23 as w, v24 as x, v25 as y, v26 as z }; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js index 185bfdfc651..cab35d6029a 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js @@ -1,4 +1,4 @@ -import { a as v1 } from './generated-chunk.js'; +import { v as v1 } from './generated-chunk.js'; var lazy = () => v1; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/main.js index 8ce7e5984df..b706e857187 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/main.js @@ -1,4 +1,4 @@ -export { a as v1, j as v10, aJ as v100, aK as v101, aL as v102, aM as v103, aN as v104, aO as v105, aP as v106, aQ as v107, aR as v108, aS as v109, k as v11, aT as v110, aU as v111, aV as v112, aW as v113, aX as v114, aY as v115, aZ as v116, a_ as v117, a$ as v118, b0 as v119, l as v12, b1 as v120, b2 as v121, b3 as v122, b4 as v123, b5 as v124, b6 as v125, b7 as v126, b8 as v127, b9 as v128, ba as v129, m as v13, bb as v130, bc as v131, bd as v132, be as v133, bf as v134, bg as v135, bh as v136, bi as v137, bj as v138, bk as v139, n as v14, bl as v140, bm as v141, bn as v142, bo as v143, bp as v144, bq as v145, br as v146, bs as v147, bt as v148, bu as v149, o as v15, bv as v150, bw as v151, bx as v152, by as v153, bz as v154, bA as v155, bB as v156, bC as v157, bD as v158, bE as v159, p as v16, bF as v160, bG as v161, bH as v162, bI as v163, bJ as v164, bK as v165, bL as v166, bM as v167, bN as v168, bO as v169, q as v17, bP as v170, bQ as v171, bR as v172, bS as v173, bT as v174, bU as v175, bV as v176, bW as v177, bX as v178, bY as v179, r as v18, bZ as v180, b_ as v181, b$ as v182, c0 as v183, c1 as v184, c2 as v185, c3 as v186, c4 as v187, c5 as v188, c6 as v189, s as v19, c7 as v190, c8 as v191, c9 as v192, ca as v193, cb as v194, cc as v195, cd as v196, ce as v197, cf as v198, cg as v199, b as v2, t as v20, ch as v200, ci as v201, cj as v202, ck as v203, cl as v204, cm as v205, cn as v206, co as v207, cp as v208, cq as v209, u as v21, cr as v210, cs as v211, ct as v212, cu as v213, cv as v214, cw as v215, cx as v216, cy as v217, cz as v218, cA as v219, v as v22, cB as v220, cC as v221, cD as v222, cE as v223, cF as v224, cG as v225, cH as v226, cI as v227, cJ as v228, cK as v229, w as v23, cL as v230, cM as v231, cN as v232, cO as v233, cP as v234, cQ as v235, cR as v236, cS as v237, cT as v238, cU as v239, x as v24, cV as v240, cW as v241, cX as v242, cY as v243, cZ as v244, c_ as v245, c$ as v246, d0 as v247, d1 as v248, d2 as v249, y as v25, d3 as v250, d4 as v251, d5 as v252, d6 as v253, d7 as v254, d8 as v255, d9 as v256, da as v257, db as v258, dc as v259, z as v26, dd as v260, de as v261, df as v262, dg as v263, dh as v264, di as v265, dj as v266, dk as v267, dl as v268, dm as v269, A as v27, dn as v270, dp as v271, dq as v272, B as v28, C as v29, c as v3, D as v30, E as v31, F as v32, G as v33, H as v34, I as v35, J as v36, K as v37, L as v38, M as v39, d as v4, N as v40, O as v41, P as v42, Q as v43, R as v44, S as v45, T as v46, U as v47, V as v48, W as v49, e as v5, X as v50, Y as v51, Z as v52, _ as v53, $ as v54, a0 as v55, a1 as v56, a2 as v57, a3 as v58, a4 as v59, f as v6, a5 as v60, a6 as v61, a7 as v62, a8 as v63, a9 as v64, aa as v65, ab as v66, ac as v67, ad as v68, ae as v69, g as v7, af as v70, ag as v71, ah as v72, ai as v73, aj as v74, ak as v75, al as v76, am as v77, an as v78, ao as v79, h as v8, ap as v80, aq as v81, ar as v82, as as v83, at as v84, au as v85, av as v86, aw as v87, ax as v88, ay as v89, i as v9, az as v90, aA as v91, aB as v92, aC as v93, aD as v94, aE as v95, aF as v96, aG as v97, aH as v98, aI as v99 } from './generated-chunk.js'; +export { v as v1, i as v10, aJ as v100, aK as v101, aL as v102, aM as v103, aN as v104, aO as v105, aP as v106, aQ as v107, aR as v108, aS as v109, j as v11, aT as v110, aU as v111, aV as v112, aW as v113, aX as v114, aY as v115, aZ as v116, a_ as v117, a$ as v118, b0 as v119, k as v12, b1 as v120, b2 as v121, b3 as v122, b4 as v123, b5 as v124, b6 as v125, b7 as v126, b8 as v127, b9 as v128, ba as v129, l as v13, bb as v130, bc as v131, bd as v132, be as v133, bf as v134, bg as v135, bh as v136, bi as v137, bj as v138, bk as v139, m as v14, bl as v140, bm as v141, bn as v142, bo as v143, bp as v144, bq as v145, br as v146, bs as v147, bt as v148, bu as v149, n as v15, bv as v150, bw as v151, bx as v152, by as v153, bz as v154, bA as v155, bB as v156, bC as v157, bD as v158, bE as v159, o as v16, bF as v160, bG as v161, bH as v162, bI as v163, bJ as v164, bK as v165, bL as v166, bM as v167, bN as v168, bO as v169, p as v17, bP as v170, bQ as v171, bR as v172, bS as v173, bT as v174, bU as v175, bV as v176, bW as v177, bX as v178, bY as v179, q as v18, bZ as v180, b_ as v181, b$ as v182, c0 as v183, c1 as v184, c2 as v185, c3 as v186, c4 as v187, c5 as v188, c6 as v189, r as v19, c7 as v190, c8 as v191, c9 as v192, ca as v193, cb as v194, cc as v195, cd as v196, ce as v197, cf as v198, cg as v199, a as v2, s as v20, ch as v200, ci as v201, cj as v202, ck as v203, cl as v204, cm as v205, cn as v206, co as v207, cp as v208, cq as v209, t as v21, cr as v210, cs as v211, ct as v212, cu as v213, cv as v214, cw as v215, cx as v216, cy as v217, cz as v218, cA as v219, u as v22, cB as v220, cC as v221, cD as v222, cE as v223, cF as v224, cG as v225, cH as v226, cI as v227, cJ as v228, cK as v229, w as v23, cL as v230, cM as v231, cN as v232, cO as v233, cP as v234, cQ as v235, cR as v236, cS as v237, cT as v238, cU as v239, x as v24, cV as v240, cW as v241, cX as v242, cY as v243, cZ as v244, c_ as v245, c$ as v246, d0 as v247, d1 as v248, d2 as v249, y as v25, d3 as v250, d4 as v251, d5 as v252, d6 as v253, d7 as v254, d8 as v255, d9 as v256, da as v257, db as v258, dc as v259, z as v26, dd as v260, de as v261, df as v262, dg as v263, dh as v264, di as v265, dj as v266, dk as v267, dl as v268, dm as v269, A as v27, dn as v270, dp as v271, dq as v272, B as v28, C as v29, b as v3, D as v30, E as v31, F as v32, G as v33, H as v34, I as v35, J as v36, K as v37, L as v38, M as v39, c as v4, N as v40, O as v41, P as v42, Q as v43, R as v44, S as v45, T as v46, U as v47, V as v48, W as v49, d as v5, X as v50, Y as v51, Z as v52, _ as v53, $ as v54, a0 as v55, a1 as v56, a2 as v57, a3 as v58, a4 as v59, e as v6, a5 as v60, a6 as v61, a7 as v62, a8 as v63, a9 as v64, aa as v65, ab as v66, ac as v67, ad as v68, ae as v69, f as v7, af as v70, ag as v71, ah as v72, ai as v73, aj as v74, ak as v75, al as v76, am as v77, an as v78, ao as v79, g as v8, ap as v80, aq as v81, ar as v82, as as v83, at as v84, au as v85, av as v86, aw as v87, ax as v88, ay as v89, h as v9, az as v90, aA as v91, aB as v92, aC as v93, aD as v94, aE as v95, aF as v96, aG as v97, aH as v98, aI as v99 } from './generated-chunk.js'; const lazy = import('./generated-lazy.js'); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js index c800131b669..3e98e70ca38 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var v1; return { setters: [function (module) { - v1 = module.a; + v1 = module.v; }], execute: function () { diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js index 5ce83aac926..aa67b797808 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js @@ -3,8 +3,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { return { setters: [function (module) { var _setter = {}; - _setter.v1 = module.a; - _setter.v10 = module.j; + _setter.v1 = module.v; + _setter.v10 = module.i; _setter.v100 = module.aJ; _setter.v101 = module.aK; _setter.v102 = module.aL; @@ -15,7 +15,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v107 = module.aQ; _setter.v108 = module.aR; _setter.v109 = module.aS; - _setter.v11 = module.k; + _setter.v11 = module.j; _setter.v110 = module.aT; _setter.v111 = module.aU; _setter.v112 = module.aV; @@ -26,7 +26,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v117 = module.a_; _setter.v118 = module.a$; _setter.v119 = module.b0; - _setter.v12 = module.l; + _setter.v12 = module.k; _setter.v120 = module.b1; _setter.v121 = module.b2; _setter.v122 = module.b3; @@ -37,7 +37,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v127 = module.b8; _setter.v128 = module.b9; _setter.v129 = module.ba; - _setter.v13 = module.m; + _setter.v13 = module.l; _setter.v130 = module.bb; _setter.v131 = module.bc; _setter.v132 = module.bd; @@ -48,7 +48,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v137 = module.bi; _setter.v138 = module.bj; _setter.v139 = module.bk; - _setter.v14 = module.n; + _setter.v14 = module.m; _setter.v140 = module.bl; _setter.v141 = module.bm; _setter.v142 = module.bn; @@ -59,7 +59,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v147 = module.bs; _setter.v148 = module.bt; _setter.v149 = module.bu; - _setter.v15 = module.o; + _setter.v15 = module.n; _setter.v150 = module.bv; _setter.v151 = module.bw; _setter.v152 = module.bx; @@ -70,7 +70,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v157 = module.bC; _setter.v158 = module.bD; _setter.v159 = module.bE; - _setter.v16 = module.p; + _setter.v16 = module.o; _setter.v160 = module.bF; _setter.v161 = module.bG; _setter.v162 = module.bH; @@ -81,7 +81,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v167 = module.bM; _setter.v168 = module.bN; _setter.v169 = module.bO; - _setter.v17 = module.q; + _setter.v17 = module.p; _setter.v170 = module.bP; _setter.v171 = module.bQ; _setter.v172 = module.bR; @@ -92,7 +92,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v177 = module.bW; _setter.v178 = module.bX; _setter.v179 = module.bY; - _setter.v18 = module.r; + _setter.v18 = module.q; _setter.v180 = module.bZ; _setter.v181 = module.b_; _setter.v182 = module.b$; @@ -103,7 +103,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v187 = module.c4; _setter.v188 = module.c5; _setter.v189 = module.c6; - _setter.v19 = module.s; + _setter.v19 = module.r; _setter.v190 = module.c7; _setter.v191 = module.c8; _setter.v192 = module.c9; @@ -114,8 +114,8 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v197 = module.ce; _setter.v198 = module.cf; _setter.v199 = module.cg; - _setter.v2 = module.b; - _setter.v20 = module.t; + _setter.v2 = module.a; + _setter.v20 = module.s; _setter.v200 = module.ch; _setter.v201 = module.ci; _setter.v202 = module.cj; @@ -126,7 +126,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v207 = module.co; _setter.v208 = module.cp; _setter.v209 = module.cq; - _setter.v21 = module.u; + _setter.v21 = module.t; _setter.v210 = module.cr; _setter.v211 = module.cs; _setter.v212 = module.ct; @@ -137,7 +137,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v217 = module.cy; _setter.v218 = module.cz; _setter.v219 = module.cA; - _setter.v22 = module.v; + _setter.v22 = module.u; _setter.v220 = module.cB; _setter.v221 = module.cC; _setter.v222 = module.cD; @@ -198,7 +198,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v272 = module.dq; _setter.v28 = module.B; _setter.v29 = module.C; - _setter.v3 = module.c; + _setter.v3 = module.b; _setter.v30 = module.D; _setter.v31 = module.E; _setter.v32 = module.F; @@ -209,7 +209,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v37 = module.K; _setter.v38 = module.L; _setter.v39 = module.M; - _setter.v4 = module.d; + _setter.v4 = module.c; _setter.v40 = module.N; _setter.v41 = module.O; _setter.v42 = module.P; @@ -220,7 +220,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v47 = module.U; _setter.v48 = module.V; _setter.v49 = module.W; - _setter.v5 = module.e; + _setter.v5 = module.d; _setter.v50 = module.X; _setter.v51 = module.Y; _setter.v52 = module.Z; @@ -231,7 +231,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v57 = module.a2; _setter.v58 = module.a3; _setter.v59 = module.a4; - _setter.v6 = module.f; + _setter.v6 = module.e; _setter.v60 = module.a5; _setter.v61 = module.a6; _setter.v62 = module.a7; @@ -242,7 +242,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v67 = module.ac; _setter.v68 = module.ad; _setter.v69 = module.ae; - _setter.v7 = module.g; + _setter.v7 = module.f; _setter.v70 = module.af; _setter.v71 = module.ag; _setter.v72 = module.ah; @@ -253,7 +253,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v77 = module.am; _setter.v78 = module.an; _setter.v79 = module.ao; - _setter.v8 = module.h; + _setter.v8 = module.g; _setter.v80 = module.ap; _setter.v81 = module.aq; _setter.v82 = module.ar; @@ -264,7 +264,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { _setter.v87 = module.aw; _setter.v88 = module.ax; _setter.v89 = module.ay; - _setter.v9 = module.i; + _setter.v9 = module.h; _setter.v90 = module.az; _setter.v91 = module.aA; _setter.v92 = module.aB; diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-chunk.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-chunk.js index dd974400a82..bfa98cb4e2e 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-chunk.js @@ -4,4 +4,4 @@ var dep = return 0; })(); -export { dep as a }; +export { dep as d }; diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main1.js index 8d35a7f39c5..a4c64ad8e0f 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { a as dep } from './generated-chunk.js'; +import { d as dep } from './generated-chunk.js'; console.log('1', dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main2.js index b258b4ae92d..ad86f9a5010 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { a as dep } from './generated-chunk.js'; +import { d as dep } from './generated-chunk.js'; console.log('2', dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-chunk.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-chunk.js index 4e7dd796048..ad2b52965e3 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var dep = exports('a', + var dep = exports('d', /*#__PURE__*/ (function() { return 0; diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js index f7d96486980..2b90a6a8f1c 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var dep; return { setters: [function (module) { - dep = module.a; + dep = module.d; }], execute: function () { diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js index 343db13d020..35770d35f79 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register(['./generated-chunk.js'], function (exports, module) { var dep; return { setters: [function (module) { - dep = module.a; + dep = module.d; }], execute: function () {