From af19c5413d14d040ddcef2bf60acb9bd9b83f8a9 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Mon, 5 Aug 2019 18:06:24 +0200 Subject: [PATCH] Use id of last module in chunk as name base for auto-generated chunks (#3025) * Use id of last module in chunk as name base for auto-generated chunks * Unified file emission api (#2999) * Use new FileEmitter for basic cases around assets. TODO: Replace asset hooks completely, create tests for assets using the new hooks. * Migrate assets to new file emitter * Remove assetsById from Graph * Implement emitFile for assets * Internally use EmittedFile in the file emitter * Deprecate emitAsset and ROLLUP_ASSET_URL * Deprecate getAssetFileName * Merge chunk emission into unified API and deprecated previous API * Allow emitting files with fixed names * Support unnamed assets * Improve chunk name assignment * Initial support for chunk file names * Allow specifying explicit file names for emitted chunks * Fix some TODOs * Test ids remain stable when the transform hook is cached and make test more stable * Refine error handling * Test some more errors * Refine file emission * Refactor file emitter to have a single code path for asset finalization * Deduplicated emitted assets without a specific file name * Only use the alias as name for a manual chunk if the chunk is not facade for an entry point * Generate separate facades for duplicate named user-defined entry points * Always create facades for explicit file names * Test edge cases * Test and refactor handling of dynamic relative imports * Use async-await in generate function, remove error condition * Improve and test pattern validation * Test file emitter edge cases * Improve plugin error handling * Add documentation * Switch to a code-splitting build and update dependencies (#3020) * Switch to a code-splitting build and update dependencies * Fix case where default exports were not properly deconflicted against chunk names --- .gitignore | 2 - {bin/src => cli}/help.md | 0 {bin/src => cli}/index.ts | 2 +- {bin/src => cli}/logging.ts | 4 +- {bin/src => cli}/run/batchWarnings.ts | 4 +- {bin/src => cli}/run/build.ts | 18 +- {bin/src => cli}/run/index.ts | 6 +- {bin/src => cli}/run/loadConfigFile.ts | 8 +- {bin/src => cli}/run/resetScreen.ts | 0 {bin/src => cli}/run/timings.ts | 2 +- {bin/src => cli}/run/watch.ts | 22 +- {bin/src => cli}/sourceMappingUrl.ts | 0 package-lock.json | 475 ++++++++++++------ package.json | 36 +- rollup.config.js | 172 +++---- src/Chunk.ts | 5 +- src/ast/variables/ExportDefaultVariable.ts | 11 +- src/watch/index.ts | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../basic-chunking/_expected/amd/main1.js | 2 +- .../basic-chunking/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../basic-chunking/_expected/cjs/main1.js | 2 +- .../basic-chunking/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../basic-chunking/_expected/es/main1.js | 2 +- .../basic-chunking/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../basic-chunking/_expected/system/main1.js | 2 +- .../basic-chunking/_expected/system/main2.js | 2 +- .../_expected/amd/generated-chunk2.js | 10 - .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk3.js => generated-dep2.js} | 0 .../_expected/amd/generated-shared2.js | 10 + .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../_expected/amd/main4.js | 2 +- .../_expected/cjs/generated-chunk2.js | 11 - .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk3.js => generated-dep2.js} | 0 .../_expected/cjs/generated-shared2.js | 11 + .../_expected/cjs/main1.js | 6 +- .../_expected/cjs/main2.js | 6 +- .../_expected/cjs/main3.js | 2 +- .../_expected/cjs/main4.js | 2 +- .../_expected/es/generated-chunk2.js | 8 - .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk3.js => generated-dep2.js} | 0 .../_expected/es/generated-shared2.js | 8 + .../_expected/es/main1.js | 6 +- .../_expected/es/main2.js | 6 +- .../_expected/es/main3.js | 2 +- .../_expected/es/main4.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk3.js => generated-dep2.js} | 0 ...nerated-chunk2.js => generated-shared2.js} | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../_expected/system/main4.js | 2 +- .../_expected/amd/generated-chunk3.js | 5 - .../_expected/amd/generated-dep11.js | 5 + ...generated-chunk.js => generated-dep111.js} | 0 ...enerated-chunk2.js => generated-dep112.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../_expected/amd/main4.js | 2 +- .../_expected/cjs/generated-chunk3.js | 6 - .../_expected/cjs/generated-dep11.js | 6 + ...generated-chunk.js => generated-dep111.js} | 0 ...enerated-chunk2.js => generated-dep112.js} | 0 .../_expected/cjs/main1.js | 6 +- .../_expected/cjs/main2.js | 6 +- .../_expected/cjs/main3.js | 2 +- .../_expected/cjs/main4.js | 2 +- .../_expected/es/generated-chunk3.js | 4 - .../_expected/es/generated-dep11.js | 4 + ...generated-chunk.js => generated-dep111.js} | 0 ...enerated-chunk2.js => generated-dep112.js} | 0 .../_expected/es/main1.js | 6 +- .../_expected/es/main2.js | 6 +- .../_expected/es/main3.js | 2 +- .../_expected/es/main4.js | 2 +- ...generated-chunk3.js => generated-dep11.js} | 2 +- ...generated-chunk.js => generated-dep111.js} | 0 ...enerated-chunk2.js => generated-dep112.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../_expected/system/main4.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-one.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-one.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-one.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-one.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-lib.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-lib.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-lib.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-lib.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../chunk-live-bindings/_expected/es/main1.js | 2 +- .../chunk-live-bindings/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../chunk-variable-name-conflict/_config.js | 6 + .../_expected/amd/generated-dep.js | 9 + .../_expected/amd/main1.js | 5 + .../_expected/amd/main2.js | 6 + .../_expected/cjs/generated-dep.js | 7 + .../_expected/cjs/main1.js | 5 + .../_expected/cjs/main2.js | 6 + .../_expected/es/generated-dep.js | 4 + .../_expected/es/main1.js | 3 + .../_expected/es/main2.js | 4 + .../_expected/system/generated-dep.js | 11 + .../_expected/system/main1.js | 15 + .../_expected/system/main2.js | 15 + .../chunk-variable-name-conflict/dep.js | 2 + .../chunk-variable-name-conflict/main1.js | 2 + .../chunk-variable-name-conflict/main2.js | 3 + .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-compact/_expected/amd/main1.js | 2 +- .../chunking-compact/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-compact/_expected/cjs/main1.js | 2 +- .../chunking-compact/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-compact/_expected/es/main1.js | 2 +- .../chunking-compact/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-externals/_expected/amd/main1.js | 2 +- .../chunking-externals/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-externals/_expected/cjs/main1.js | 2 +- .../chunking-externals/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-externals/_expected/es/main1.js | 2 +- .../chunking-externals/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../chunking-reexport/_expected/amd/main1.js | 2 +- .../chunking-reexport/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../chunking-reexport/_expected/cjs/main1.js | 2 +- .../chunking-reexport/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../chunking-reexport/_expected/es/main1.js | 2 +- .../chunking-reexport/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/amd/generated-chunk.js.map | 1 - .../{generated-chunk.js => generated-dep2.js} | 2 +- .../_expected/amd/generated-dep2.js.map | 1 + .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/cjs/generated-chunk.js.map | 1 - .../{generated-chunk.js => generated-dep2.js} | 2 +- .../_expected/cjs/generated-dep2.js.map | 1 + .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../_expected/es/generated-chunk.js.map | 1 - .../{generated-chunk.js => generated-dep2.js} | 2 +- .../_expected/es/generated-dep2.js.map | 1 + .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js.map | 1 - .../{generated-chunk.js => generated-dep2.js} | 2 +- .../_expected/system/generated-dep2.js.map | 1 + .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../deconflict-globals/_expected/amd/main1.js | 2 +- .../deconflict-globals/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../deconflict-globals/_expected/cjs/main1.js | 2 +- .../deconflict-globals/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../deconflict-globals/_expected/es/main1.js | 2 +- .../deconflict-globals/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...generated-chunk.js => generated-proxy2.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...generated-chunk.js => generated-proxy2.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...generated-chunk.js => generated-proxy2.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...generated-chunk.js => generated-proxy2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...{generated-chunk.js => generated-proxy.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...{generated-chunk.js => generated-proxy.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...{generated-chunk.js => generated-proxy.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...{generated-chunk.js => generated-proxy.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...enerated-chunk.js => generated-module3.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...enerated-chunk.js => generated-module3.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...enerated-chunk.js => generated-module3.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...enerated-chunk.js => generated-module3.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../amd/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/amd/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../cjs/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/cjs/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/es/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/es/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../system/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/system/main.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/amd/main.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/cjs/main.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/es/main.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/chunks/worker.js | 2 +- .../_expected/system/main.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/amd/main.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/cjs/main.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/es/main.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/chunks/worklet.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/amd/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/amd/main.js | 2 +- .../_expected/cjs/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/cjs/main.js | 2 +- .../_expected/es/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/es/main.js | 2 +- .../_expected/system/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/system/main.js | 2 +- .../_expected/amd/generated-dep2.js | 2 +- .../{generated-chunk.js => generated-dep4.js} | 0 .../_expected/amd/main.js | 2 +- .../_expected/cjs/generated-dep2.js | 2 +- .../{generated-chunk.js => generated-dep4.js} | 0 .../_expected/cjs/main.js | 2 +- .../_expected/es/generated-dep2.js | 2 +- .../{generated-chunk.js => generated-dep4.js} | 0 .../_expected/es/main.js | 2 +- .../_expected/system/generated-dep2.js | 2 +- .../{generated-chunk.js => generated-dep4.js} | 0 .../_expected/system/main.js | 2 +- .../_expected/amd/generated-chunk.js | 13 - .../_expected/amd/generated-dynamic.js | 10 +- .../_expected/amd/generated-dynamic2.js | 7 + .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/cjs/generated-chunk.js | 11 - .../_expected/cjs/generated-dynamic.js | 8 +- .../_expected/cjs/generated-dynamic2.js | 7 + .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../_expected/es/generated-chunk.js | 8 - .../_expected/es/generated-dynamic.js | 9 +- .../_expected/es/generated-dynamic2.js | 1 + .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 15 - .../_expected/system/generated-dynamic.js | 10 +- .../_expected/system/generated-dynamic2.js | 13 + .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/amd/generated-dep1.js | 17 +- .../_expected/amd/generated-dep12.js | 7 + .../_expected/amd/main.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/cjs/generated-dep1.js | 15 +- .../_expected/cjs/generated-dep12.js | 7 + .../_expected/cjs/main.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../_expected/es/generated-dep1.js | 16 +- .../_expected/es/generated-dep12.js | 1 + .../_expected/es/main.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-dep1.js | 22 +- .../_expected/system/generated-dep12.js | 13 + .../_expected/system/main.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/amd/generated-chunk.js | 20 - .../_expected/amd/generated-dep1.js} | 0 .../_expected/amd/main.js | 2 +- .../_expected/cjs/generated-chunk.js | 18 - .../_expected/cjs/generated-dep1.js} | 0 .../_expected/cjs/main.js | 2 +- .../_expected/es/generated-chunk.js | 15 - .../_expected/es/generated-dep1.js} | 0 .../_expected/es/main.js | 2 +- .../_expected/system/generated-chunk.js | 27 - .../_expected/system/generated-dep1.js} | 0 .../_expected/system/main.js | 2 +- .../_expected/amd/chunks/other.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../dynamic-import/_expected/amd/main.js | 2 +- .../_expected/cjs/chunks/other.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../dynamic-import/_expected/cjs/main.js | 2 +- .../_expected/es/chunks/other.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../dynamic-import/_expected/es/main.js | 2 +- .../_expected/system/chunks/other.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../dynamic-import/_expected/system/main.js | 2 +- .../emit-file/emit-chunk-filename/_config.js | 2 +- .../_expected/amd/custom/build-start-chunk.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk-filename/_expected/amd/main.js | 2 +- .../_expected/cjs/custom/build-start-chunk.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk-filename/_expected/cjs/main.js | 2 +- .../_expected/es/custom/build-start-chunk.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk-filename/_expected/es/main.js | 2 +- .../system/custom/build-start-chunk.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../amd/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/amd/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../cjs/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/cjs/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/es/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/es/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../system/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/system/main.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/amd/main.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/cjs/main.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/es/main.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/chunks/worker.js | 2 +- .../_expected/system/main.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/amd/main.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/cjs/main.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/es/main.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/chunks/worklet.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/amd/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/amd/main.js | 2 +- .../_expected/cjs/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/cjs/main.js | 2 +- .../_expected/es/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-file/emit-chunk/_expected/es/main.js | 2 +- .../_expected/system/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/system/main.js | 2 +- .../{generated-chunk.js => generated-m1.js} | 0 .../_expected/amd/m1.js | 2 +- .../_expected/amd/main.js | 2 +- .../{generated-chunk.js => generated-m1.js} | 0 .../_expected/cjs/m1.js | 2 +- .../_expected/cjs/main.js | 2 +- .../{generated-chunk.js => generated-m1.js} | 0 .../_expected/es/m1.js | 2 +- .../_expected/es/main.js | 2 +- .../{generated-chunk.js => generated-m1.js} | 0 .../_expected/system/m1.js | 2 +- .../_expected/system/main.js | 2 +- ...rated-main2alias.js => generated-main2.js} | 0 .../_expected/amd/main1alias.js | 2 +- .../_expected/amd/main2alias.js | 2 +- ...rated-main2alias.js => generated-main2.js} | 0 .../_expected/cjs/main1alias.js | 2 +- .../_expected/cjs/main2alias.js | 2 +- ...rated-main2alias.js => generated-main2.js} | 0 .../_expected/es/main1alias.js | 2 +- .../_expected/es/main2alias.js | 2 +- ...rated-main2alias.js => generated-main2.js} | 0 .../_expected/system/main1alias.js | 2 +- .../_expected/system/main2alias.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../entrypoint-facade/_expected/amd/main1.js | 2 +- .../entrypoint-facade/_expected/amd/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../entrypoint-facade/_expected/cjs/main1.js | 2 +- .../entrypoint-facade/_expected/cjs/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../entrypoint-facade/_expected/es/main1.js | 2 +- .../entrypoint-facade/_expected/es/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...c19-amd.js => chunk-main2-6bb39c19-amd.js} | 0 .../_expected/amd/entry-main1-e7c7d1b5-amd.js | 2 +- .../_expected/amd/entry-main2-f9a2200a-amd.js | 2 +- ...40d-cjs.js => chunk-main2-33c8b40d-cjs.js} | 0 .../_expected/cjs/entry-main1-639831da-cjs.js | 2 +- .../_expected/cjs/entry-main2-4508233a-cjs.js | 2 +- ...346-esm.js => chunk-main2-cc2b1346-esm.js} | 0 .../_expected/es/entry-main1-2901d8b1-esm.js | 2 +- .../_expected/es/entry-main2-62d27906-esm.js | 2 +- ...stem.js => chunk-main2-63744fb4-system.js} | 0 .../system/entry-main1-379caf56-system.js | 2 +- .../system/entry-main2-9e49ba04-system.js | 2 +- .../{generated-chunk.js => generated-dep3.js} | 0 .../grouping-multiple/_expected/amd/main1.js | 2 +- .../grouping-multiple/_expected/amd/main2.js | 2 +- .../grouping-multiple/_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep3.js} | 0 .../grouping-multiple/_expected/cjs/main1.js | 2 +- .../grouping-multiple/_expected/cjs/main2.js | 2 +- .../grouping-multiple/_expected/cjs/main3.js | 2 +- .../{generated-chunk.js => generated-dep3.js} | 0 .../grouping-multiple/_expected/es/main1.js | 2 +- .../grouping-multiple/_expected/es/main2.js | 2 +- .../grouping-multiple/_expected/es/main3.js | 2 +- .../{generated-chunk.js => generated-dep3.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep3.js} | 0 .../grouping-size/_expected/amd/main1.js | 2 +- .../grouping-size/_expected/amd/main2.js | 2 +- .../grouping-size/_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep3.js} | 0 .../grouping-size/_expected/cjs/main1.js | 4 +- .../grouping-size/_expected/cjs/main2.js | 4 +- .../grouping-size/_expected/cjs/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep3.js} | 0 .../grouping-size/_expected/es/main1.js | 4 +- .../grouping-size/_expected/es/main2.js | 4 +- .../grouping-size/_expected/es/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep3.js} | 0 .../grouping-size/_expected/system/main1.js | 2 +- .../grouping-size/_expected/system/main2.js | 2 +- .../grouping-size/_expected/system/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep2.js} | 0 ...{generated-chunk3.js => generated-dep3.js} | 0 .../multi-chunking/_expected/amd/main1.js | 2 +- .../multi-chunking/_expected/amd/main2.js | 2 +- .../multi-chunking/_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep2.js} | 0 ...{generated-chunk3.js => generated-dep3.js} | 0 .../multi-chunking/_expected/cjs/main1.js | 4 +- .../multi-chunking/_expected/cjs/main2.js | 4 +- .../multi-chunking/_expected/cjs/main3.js | 4 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep2.js} | 0 ...{generated-chunk3.js => generated-dep3.js} | 0 .../multi-chunking/_expected/es/main1.js | 4 +- .../multi-chunking/_expected/es/main2.js | 4 +- .../multi-chunking/_expected/es/main3.js | 4 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep2.js} | 0 ...{generated-chunk3.js => generated-dep3.js} | 0 .../multi-chunking/_expected/system/main1.js | 2 +- .../multi-chunking/_expected/system/main2.js | 2 +- .../multi-chunking/_expected/system/main3.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/main.js | 2 +- .../_expected/amd/other.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/main.js | 2 +- .../_expected/cjs/other.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/main.js | 2 +- .../_expected/es/other.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/main.js | 2 +- .../_expected/system/other.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 ...generated-chunk2.js => generated-index.js} | 2 +- .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 ...generated-chunk2.js => generated-index.js} | 2 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../_expected/cjs/main3.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 ...generated-chunk2.js => generated-index.js} | 2 +- .../_expected/es/main1.js | 4 +- .../_expected/es/main2.js | 4 +- .../_expected/es/main3.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 ...generated-chunk2.js => generated-index.js} | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- ...{generated-chunk.js => generated-index.js} | 0 .../_expected/amd/index.js | 2 +- .../namespace-reexports/_expected/amd/main.js | 2 +- ...{generated-chunk.js => generated-index.js} | 0 .../_expected/cjs/index.js | 2 +- .../namespace-reexports/_expected/cjs/main.js | 2 +- ...{generated-chunk.js => generated-index.js} | 0 .../namespace-reexports/_expected/es/index.js | 2 +- .../namespace-reexports/_expected/es/main.js | 2 +- ...{generated-chunk.js => generated-index.js} | 0 .../_expected/system/index.js | 2 +- .../_expected/system/main.js | 2 +- ...{generated-chunk.js => generated-other.js} | 0 .../_expected/amd/main-a.js | 2 +- .../_expected/amd/main-b.js | 2 +- ...{generated-chunk.js => generated-other.js} | 0 .../_expected/cjs/main-a.js | 2 +- .../_expected/cjs/main-b.js | 2 +- ...{generated-chunk.js => generated-other.js} | 0 .../_expected/es/main-a.js | 2 +- .../_expected/es/main-b.js | 2 +- ...{generated-chunk.js => generated-other.js} | 0 .../_expected/system/main-a.js | 2 +- .../_expected/system/main-b.js | 2 +- .../_expected/amd/generated-bar.js | 9 + ...generated-chunk.js => generated-broken.js} | 0 .../_expected/amd/generated-chunk2.js | 9 - .../_expected/amd/generated-chunk3.js | 9 - .../_expected/amd/generated-foo.js | 9 + .../namespace-tracing/_expected/amd/main-a.js | 2 +- .../namespace-tracing/_expected/amd/main-b.js | 2 +- .../namespace-tracing/_expected/amd/main-c.js | 2 +- .../{generated-chunk3.js => generated-bar.js} | 2 +- ...generated-chunk.js => generated-broken.js} | 0 .../{generated-chunk2.js => generated-foo.js} | 2 +- .../namespace-tracing/_expected/cjs/main-a.js | 4 +- .../namespace-tracing/_expected/cjs/main-b.js | 6 +- .../namespace-tracing/_expected/cjs/main-c.js | 4 +- .../{generated-chunk3.js => generated-bar.js} | 2 +- ...generated-chunk.js => generated-broken.js} | 0 .../{generated-chunk2.js => generated-foo.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 +- .../{generated-chunk3.js => generated-bar.js} | 2 +- ...generated-chunk.js => generated-broken.js} | 0 .../{generated-chunk2.js => generated-foo.js} | 2 +- .../_expected/system/main-a.js | 2 +- .../_expected/system/main-b.js | 2 +- .../_expected/system/main-c.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../nested-chunks/_expected/amd/main1.js | 2 +- .../_expected/amd/nested/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../nested-chunks/_expected/cjs/main1.js | 2 +- .../_expected/cjs/nested/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../nested-chunks/_expected/es/main1.js | 2 +- .../_expected/es/nested/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../nested-chunks/_expected/system/main1.js | 2 +- .../_expected/system/nested/main2.js | 2 +- ...rated-chunk.js => generated-otherEntry.js} | 0 .../reexport-from-entry/_expected/amd/main.js | 2 +- .../_expected/amd/otherEntry.js | 2 +- ...rated-chunk.js => generated-otherEntry.js} | 0 .../reexport-from-entry/_expected/cjs/main.js | 2 +- .../_expected/cjs/otherEntry.js | 2 +- ...rated-chunk.js => generated-otherEntry.js} | 0 .../reexport-from-entry/_expected/es/main.js | 2 +- .../_expected/es/otherEntry.js | 2 +- ...rated-chunk.js => generated-otherEntry.js} | 0 .../_expected/system/main.js | 2 +- .../_expected/system/otherEntry.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../_expected/cjs/main3.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../reexport-shortpaths/_expected/es/main1.js | 2 +- .../reexport-shortpaths/_expected/es/main2.js | 2 +- .../reexport-shortpaths/_expected/es/main3.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../amd/{chunk-chunk.js => chunk-dep2.js} | 4 +- .../render-chunk/_expected/amd/main1.js | 4 +- .../render-chunk/_expected/amd/main2.js | 4 +- .../cjs/{chunk-chunk.js => chunk-dep2.js} | 4 +- .../render-chunk/_expected/cjs/main1.js | 4 +- .../render-chunk/_expected/cjs/main2.js | 4 +- .../es/{chunk-chunk.js => chunk-dep2.js} | 4 +- .../render-chunk/_expected/es/main1.js | 4 +- .../render-chunk/_expected/es/main2.js | 4 +- .../system/{chunk-chunk.js => chunk-dep2.js} | 4 +- .../render-chunk/_expected/system/main1.js | 4 +- .../render-chunk/_expected/system/main2.js | 4 +- ...erated-chunk.js => generated-constants.js} | 0 .../_expected/amd/generated-lazy.js | 2 +- .../_expected/amd/main.js | 2 +- ...erated-chunk.js => generated-constants.js} | 0 .../_expected/cjs/generated-lazy.js | 2 +- .../_expected/cjs/main.js | 2 +- ...erated-chunk.js => generated-constants.js} | 0 .../_expected/es/generated-lazy.js | 2 +- .../_expected/es/main.js | 2 +- ...erated-chunk.js => generated-constants.js} | 0 .../_expected/system/generated-lazy.js | 2 +- .../_expected/system/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- test/cli/index.js | 3 +- test/hooks/index.js | 6 +- test/misc/bundle-information.js | 18 +- test/misc/misc.js | 2 +- tsconfig.json | 2 +- 760 files changed, 1319 insertions(+), 1036 deletions(-) rename {bin/src => cli}/help.md (100%) rename {bin/src => cli}/index.ts (89%) rename {bin/src => cli}/logging.ts (89%) rename {bin/src => cli}/run/batchWarnings.ts (98%) rename {bin/src => cli}/run/build.ts (89%) rename {bin/src => cli}/run/index.ts (93%) rename {bin/src => cli}/run/loadConfigFile.ts (89%) rename {bin/src => cli}/run/resetScreen.ts (100%) rename {bin/src => cli}/run/timings.ts (87%) rename {bin/src => cli}/run/watch.ts (91%) rename {bin/src => cli}/sourceMappingUrl.ts (100%) rename test/chunking-form/samples/basic-chunking/_expected/amd/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/basic-chunking/_expected/cjs/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/basic-chunking/_expected/es/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/basic-chunking/_expected/system/{generated-chunk.js => generated-dep2.js} (100%) delete mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/{generated-chunk3.js => generated-dep2.js} (100%) create mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-shared2.js delete mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/{generated-chunk3.js => generated-dep2.js} (100%) create mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-shared2.js delete mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/{generated-chunk3.js => generated-dep2.js} (100%) create mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-shared2.js rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/{generated-chunk3.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/{generated-chunk2.js => generated-shared2.js} (73%) delete mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js create mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep11.js rename test/chunking-form/samples/chunk-execution-order/_expected/amd/{generated-chunk.js => generated-dep111.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/amd/{generated-chunk2.js => generated-dep112.js} (100%) delete mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk3.js create mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep11.js rename test/chunking-form/samples/chunk-execution-order/_expected/cjs/{generated-chunk.js => generated-dep111.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/cjs/{generated-chunk2.js => generated-dep112.js} (100%) delete mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk3.js create mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep11.js rename test/chunking-form/samples/chunk-execution-order/_expected/es/{generated-chunk.js => generated-dep111.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/es/{generated-chunk2.js => generated-dep112.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/system/{generated-chunk3.js => generated-dep11.js} (61%) rename test/chunking-form/samples/chunk-execution-order/_expected/system/{generated-chunk.js => generated-dep111.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/system/{generated-chunk2.js => generated-dep112.js} (100%) rename test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-export-deshadowing/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-export-deshadowing/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-export-renaming/_expected/amd/{generated-chunk.js => generated-one.js} (100%) rename test/chunking-form/samples/chunk-export-renaming/_expected/cjs/{generated-chunk.js => generated-one.js} (100%) rename test/chunking-form/samples/chunk-export-renaming/_expected/es/{generated-chunk.js => generated-one.js} (100%) rename test/chunking-form/samples/chunk-export-renaming/_expected/system/{generated-chunk.js => generated-one.js} (100%) rename test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/{generated-chunk.js => generated-lib.js} (100%) rename test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/{generated-chunk.js => generated-lib.js} (100%) rename test/chunking-form/samples/chunk-import-deshadowing/_expected/es/{generated-chunk.js => generated-lib.js} (100%) rename test/chunking-form/samples/chunk-import-deshadowing/_expected/system/{generated-chunk.js => generated-lib.js} (100%) rename test/chunking-form/samples/chunk-live-bindings/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-live-bindings/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-live-bindings/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-live-bindings/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/chunk-namespace-boundary/_expected/es/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/chunk-namespace-boundary/_expected/system/{generated-chunk.js => generated-shared.js} (100%) create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_config.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/generated-dep.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/main1.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/main2.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/generated-dep.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/main1.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/main2.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/generated-dep.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/main1.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/main2.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/generated-dep.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main1.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main2.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/dep.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/main1.js create mode 100644 test/chunking-form/samples/chunk-variable-name-conflict/main2.js rename test/chunking-form/samples/chunking-compact/_expected/amd/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-compact/_expected/cjs/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-compact/_expected/es/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-compact/_expected/system/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-externals/_expected/amd/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-externals/_expected/cjs/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-externals/_expected/es/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-externals/_expected/system/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-reexport/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-reexport/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-reexport/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-reexport/_expected/system/{generated-chunk.js => generated-dep.js} (100%) delete mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js.map rename test/chunking-form/samples/chunking-source-maps/_expected/amd/{generated-chunk.js => generated-dep2.js} (81%) create mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js.map delete mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js.map rename test/chunking-form/samples/chunking-source-maps/_expected/cjs/{generated-chunk.js => generated-dep2.js} (75%) create mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js.map delete mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js.map rename test/chunking-form/samples/chunking-source-maps/_expected/es/{generated-chunk.js => generated-dep2.js} (73%) create mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js.map delete mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js.map rename test/chunking-form/samples/chunking-source-maps/_expected/system/{generated-chunk.js => generated-dep2.js} (86%) create mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js.map rename test/chunking-form/samples/chunking-star-external/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-star-external/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-star-external/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-star-external/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deconflict-globals/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deconflict-globals/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deconflict-globals/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deconflict-globals/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/{generated-chunk.js => generated-proxy2.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/{generated-chunk.js => generated-proxy2.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/{generated-chunk.js => generated-proxy2.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/{generated-chunk.js => generated-proxy2.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/{generated-chunk.js => generated-proxy.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/{generated-chunk.js => generated-proxy.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/{generated-chunk.js => generated-proxy.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/{generated-chunk.js => generated-proxy.js} (100%) rename test/chunking-form/samples/default-export-name-conflict/_expected/amd/{generated-chunk.js => generated-module3.js} (100%) rename test/chunking-form/samples/default-export-name-conflict/_expected/cjs/{generated-chunk.js => generated-module3.js} (100%) rename test/chunking-form/samples/default-export-name-conflict/_expected/es/{generated-chunk.js => generated-module3.js} (100%) rename test/chunking-form/samples/default-export-name-conflict/_expected/system/{generated-chunk.js => generated-module3.js} (100%) rename test/chunking-form/samples/default-identifier-renaming/_expected/amd/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/default-identifier-renaming/_expected/cjs/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/default-identifier-renaming/_expected/es/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/default-identifier-renaming/_expected/system/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/dynamic-import-chunking/_expected/amd/{generated-chunk.js => generated-dep4.js} (100%) rename test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/{generated-chunk.js => generated-dep4.js} (100%) rename test/chunking-form/samples/dynamic-import-chunking/_expected/es/{generated-chunk.js => generated-dep4.js} (100%) rename test/chunking-form/samples/dynamic-import-chunking/_expected/system/{generated-chunk.js => generated-dep4.js} (100%) delete mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-chunk.js create mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic2.js delete mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-chunk.js create mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic2.js delete mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js create mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic2.js delete mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js create mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic2.js create mode 100644 test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep12.js create mode 100644 test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep12.js create mode 100644 test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep12.js create mode 100644 test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep12.js delete mode 100644 test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-chunk.js rename test/chunking-form/samples/{dynamic-import-statically-imported-2/_expected/amd/generated-chunk.js => dynamic-import-statically-imported/_expected/amd/generated-dep1.js} (100%) delete mode 100644 test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-chunk.js rename test/chunking-form/samples/{dynamic-import-statically-imported-2/_expected/cjs/generated-chunk.js => dynamic-import-statically-imported/_expected/cjs/generated-dep1.js} (100%) delete mode 100644 test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js rename test/chunking-form/samples/{dynamic-import-statically-imported-2/_expected/es/generated-chunk.js => dynamic-import-statically-imported/_expected/es/generated-dep1.js} (100%) delete mode 100644 test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js rename test/chunking-form/samples/{dynamic-import-statically-imported-2/_expected/system/generated-chunk.js => dynamic-import-statically-imported/_expected/system/generated-dep1.js} (100%) rename test/chunking-form/samples/dynamic-import/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/dynamic-import/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/dynamic-import/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/entry-point-without-own-code/_expected/amd/{generated-chunk.js => generated-m1.js} (100%) rename test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/{generated-chunk.js => generated-m1.js} (100%) rename test/chunking-form/samples/entry-point-without-own-code/_expected/es/{generated-chunk.js => generated-m1.js} (100%) rename test/chunking-form/samples/entry-point-without-own-code/_expected/system/{generated-chunk.js => generated-m1.js} (100%) rename test/chunking-form/samples/entrypoint-aliasing/_expected/amd/{generated-main2alias.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/{generated-main2alias.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-aliasing/_expected/es/{generated-main2alias.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-aliasing/_expected/system/{generated-main2alias.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-facade/_expected/amd/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-facade/_expected/cjs/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-facade/_expected/es/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-facade/_expected/system/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/amd/{chunk-chunk-6bb39c19-amd.js => chunk-main2-6bb39c19-amd.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/cjs/{chunk-chunk-33c8b40d-cjs.js => chunk-main2-33c8b40d-cjs.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/es/{chunk-chunk-cc2b1346-esm.js => chunk-main2-cc2b1346-esm.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{chunk-chunk-63744fb4-system.js => chunk-main2-63744fb4-system.js} (100%) rename test/chunking-form/samples/grouping-multiple/_expected/amd/{generated-chunk.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-multiple/_expected/cjs/{generated-chunk.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-multiple/_expected/es/{generated-chunk.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-multiple/_expected/system/{generated-chunk.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/amd/{generated-chunk2.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/cjs/{generated-chunk2.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/es/{generated-chunk2.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/system/{generated-chunk2.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/amd/{generated-chunk2.js => generated-dep2.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/amd/{generated-chunk3.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/cjs/{generated-chunk2.js => generated-dep2.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/cjs/{generated-chunk3.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/es/{generated-chunk2.js => generated-dep2.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/es/{generated-chunk3.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/system/{generated-chunk2.js => generated-dep2.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/system/{generated-chunk3.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/namespace-object-import/_expected/amd/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/namespace-object-import/_expected/cjs/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/namespace-object-import/_expected/es/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/namespace-object-import/_expected/system/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/{generated-chunk2.js => generated-index.js} (57%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/{generated-chunk2.js => generated-index.js} (80%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/{generated-chunk2.js => generated-index.js} (73%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/{generated-chunk2.js => generated-index.js} (82%) rename test/chunking-form/samples/namespace-reexports/_expected/amd/{generated-chunk.js => generated-index.js} (100%) rename test/chunking-form/samples/namespace-reexports/_expected/cjs/{generated-chunk.js => generated-index.js} (100%) rename test/chunking-form/samples/namespace-reexports/_expected/es/{generated-chunk.js => generated-index.js} (100%) rename test/chunking-form/samples/namespace-reexports/_expected/system/{generated-chunk.js => generated-index.js} (100%) rename test/chunking-form/samples/namespace-retracing/_expected/amd/{generated-chunk.js => generated-other.js} (100%) rename test/chunking-form/samples/namespace-retracing/_expected/cjs/{generated-chunk.js => generated-other.js} (100%) rename test/chunking-form/samples/namespace-retracing/_expected/es/{generated-chunk.js => generated-other.js} (100%) rename test/chunking-form/samples/namespace-retracing/_expected/system/{generated-chunk.js => generated-other.js} (100%) create mode 100644 test/chunking-form/samples/namespace-tracing/_expected/amd/generated-bar.js rename test/chunking-form/samples/namespace-tracing/_expected/amd/{generated-chunk.js => generated-broken.js} (100%) delete mode 100644 test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js delete mode 100644 test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js create mode 100644 test/chunking-form/samples/namespace-tracing/_expected/amd/generated-foo.js rename test/chunking-form/samples/namespace-tracing/_expected/cjs/{generated-chunk3.js => generated-bar.js} (69%) rename test/chunking-form/samples/namespace-tracing/_expected/cjs/{generated-chunk.js => generated-broken.js} (100%) rename test/chunking-form/samples/namespace-tracing/_expected/cjs/{generated-chunk2.js => generated-foo.js} (69%) rename test/chunking-form/samples/namespace-tracing/_expected/es/{generated-chunk3.js => generated-bar.js} (66%) rename test/chunking-form/samples/namespace-tracing/_expected/es/{generated-chunk.js => generated-broken.js} (100%) rename test/chunking-form/samples/namespace-tracing/_expected/es/{generated-chunk2.js => generated-foo.js} (66%) rename test/chunking-form/samples/namespace-tracing/_expected/system/{generated-chunk3.js => generated-bar.js} (74%) rename test/chunking-form/samples/namespace-tracing/_expected/system/{generated-chunk.js => generated-broken.js} (100%) rename test/chunking-form/samples/namespace-tracing/_expected/system/{generated-chunk2.js => generated-foo.js} (74%) rename test/chunking-form/samples/nested-chunks/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/nested-chunks/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/nested-chunks/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/nested-chunks/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/reexport-from-entry/_expected/amd/{generated-chunk.js => generated-otherEntry.js} (100%) rename test/chunking-form/samples/reexport-from-entry/_expected/cjs/{generated-chunk.js => generated-otherEntry.js} (100%) rename test/chunking-form/samples/reexport-from-entry/_expected/es/{generated-chunk.js => generated-otherEntry.js} (100%) rename test/chunking-form/samples/reexport-from-entry/_expected/system/{generated-chunk.js => generated-otherEntry.js} (100%) rename test/chunking-form/samples/reexport-shortpaths/_expected/amd/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/reexport-shortpaths/_expected/cjs/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/reexport-shortpaths/_expected/es/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/reexport-shortpaths/_expected/system/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/render-chunk/_expected/amd/{chunk-chunk.js => chunk-dep2.js} (72%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{chunk-chunk.js => chunk-dep2.js} (65%) rename test/chunking-form/samples/render-chunk/_expected/es/{chunk-chunk.js => chunk-dep2.js} (63%) rename test/chunking-form/samples/render-chunk/_expected/system/{chunk-chunk.js => chunk-dep2.js} (75%) rename test/chunking-form/samples/sanitize-internal-exports/_expected/amd/{generated-chunk.js => generated-constants.js} (100%) rename test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/{generated-chunk.js => generated-constants.js} (100%) rename test/chunking-form/samples/sanitize-internal-exports/_expected/es/{generated-chunk.js => generated-constants.js} (100%) rename test/chunking-form/samples/sanitize-internal-exports/_expected/system/{generated-chunk.js => generated-constants.js} (100%) rename test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/{generated-chunk.js => generated-dep.js} (100%) diff --git a/.gitignore b/.gitignore index 71d99ce63e2..988fb26eb0a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,8 +7,6 @@ _actual.js coverage .commithash .idea -bin/rollup -bin/rollup.map test/_tmp test/hooks/tmp test/tmp diff --git a/bin/src/help.md b/cli/help.md similarity index 100% rename from bin/src/help.md rename to cli/help.md diff --git a/bin/src/index.ts b/cli/index.ts similarity index 89% rename from bin/src/index.ts rename to cli/index.ts index 95f26a55998..e54fcb04502 100644 --- a/bin/src/index.ts +++ b/cli/index.ts @@ -1,7 +1,7 @@ import help from 'help.md'; import minimist from 'minimist'; import { version } from 'package.json'; -import { commandAliases } from '../../src/utils/mergeOptions'; +import { commandAliases } from '../src/utils/mergeOptions'; import run from './run/index'; const command = minimist(process.argv.slice(2), { diff --git a/bin/src/logging.ts b/cli/logging.ts similarity index 89% rename from bin/src/logging.ts rename to cli/logging.ts index 04c22192584..3c428240856 100644 --- a/bin/src/logging.ts +++ b/cli/logging.ts @@ -1,6 +1,6 @@ import tc from 'turbocolor'; -import { RollupError } from '../../src/rollup/types'; -import relativeId from '../../src/utils/relativeId'; +import { RollupError } from '../src/rollup/types'; +import relativeId from '../src/utils/relativeId'; // log to stderr to keep `rollup main.js > bundle.js` from breaking export const stderr = console.error.bind(console); diff --git a/bin/src/run/batchWarnings.ts b/cli/run/batchWarnings.ts similarity index 98% rename from bin/src/run/batchWarnings.ts rename to cli/run/batchWarnings.ts index 463ec8e69d0..bc45b2f7eab 100644 --- a/bin/src/run/batchWarnings.ts +++ b/cli/run/batchWarnings.ts @@ -1,6 +1,6 @@ import tc from 'turbocolor'; -import { RollupWarning } from '../../../src/rollup/types'; -import relativeId from '../../../src/utils/relativeId'; +import { RollupWarning } from '../../src/rollup/types'; +import relativeId from '../../src/utils/relativeId'; import { stderr } from '../logging'; export interface BatchWarnings { diff --git a/bin/src/run/build.ts b/cli/run/build.ts similarity index 89% rename from bin/src/run/build.ts rename to cli/run/build.ts index 274194c909f..cc8b01d9985 100644 --- a/bin/src/run/build.ts +++ b/cli/run/build.ts @@ -1,15 +1,8 @@ import ms from 'pretty-ms'; -import * as rollup from 'rollup'; import tc from 'turbocolor'; -import { - InputOptions, - OutputAsset, - OutputChunk, - OutputOptions, - RollupBuild, - SourceMap -} from '../../../src/rollup/types'; -import relativeId from '../../../src/utils/relativeId'; +import * as rollup from '../../src/node-entry'; +import { InputOptions, OutputAsset, OutputChunk, OutputOptions, RollupBuild, SourceMap } from '../../src/rollup/types'; +import relativeId from '../../src/utils/relativeId'; import { handleError, stderr } from '../logging'; import SOURCEMAPPING_URL from '../sourceMappingUrl'; import { BatchWarnings } from './batchWarnings'; @@ -42,7 +35,7 @@ export default function build( } return rollup - .rollup(inputOptions) + .rollup(inputOptions as any) .then((bundle: RollupBuild) => { if (useStdout) { const output = outputOptions[0]; @@ -69,6 +62,7 @@ export default function build( process.stdout.write('\n' + tc.cyan(tc.bold('//→ ' + file.fileName + ':')) + '\n'); process.stdout.write(source); } + return null }); } @@ -76,7 +70,7 @@ export default function build( () => bundle ); }) - .then((bundle?: RollupBuild) => { + .then((bundle: RollupBuild | null) => { if (!silent) { warnings.flush(); stderr( diff --git a/bin/src/run/index.ts b/cli/run/index.ts similarity index 93% rename from bin/src/run/index.ts rename to cli/run/index.ts index 3e2e58c4479..53825ce2c1e 100644 --- a/bin/src/run/index.ts +++ b/cli/run/index.ts @@ -1,8 +1,8 @@ import { realpathSync } from 'fs'; import relative from 'require-relative'; -import { WarningHandler } from '../../../src/rollup/types'; -import mergeOptions, { GenericConfigObject } from '../../../src/utils/mergeOptions'; -import { getAliasName } from '../../../src/utils/relativeId'; +import { WarningHandler } from '../../src/rollup/types'; +import mergeOptions, { GenericConfigObject } from '../../src/utils/mergeOptions'; +import { getAliasName } from '../../src/utils/relativeId'; import { handleError } from '../logging'; import batchWarnings from './batchWarnings'; import build from './build'; diff --git a/bin/src/run/loadConfigFile.ts b/cli/run/loadConfigFile.ts similarity index 89% rename from bin/src/run/loadConfigFile.ts rename to cli/run/loadConfigFile.ts index 09ec485ad6f..cbebf4d8c62 100644 --- a/bin/src/run/loadConfigFile.ts +++ b/cli/run/loadConfigFile.ts @@ -1,9 +1,9 @@ import path from 'path'; -import rollup from 'rollup'; import tc from 'turbocolor'; -import { RollupBuild, RollupOutput } from '../../../src/rollup/types'; -import { GenericConfigObject } from '../../../src/utils/mergeOptions'; -import relativeId from '../../../src/utils/relativeId'; +import * as rollup from '../../src/node-entry'; +import { RollupBuild, RollupOutput } from '../../src/rollup/types'; +import { GenericConfigObject } from '../../src/utils/mergeOptions'; +import relativeId from '../../src/utils/relativeId'; import { handleError, stderr } from '../logging'; import batchWarnings from './batchWarnings'; diff --git a/bin/src/run/resetScreen.ts b/cli/run/resetScreen.ts similarity index 100% rename from bin/src/run/resetScreen.ts rename to cli/run/resetScreen.ts diff --git a/bin/src/run/timings.ts b/cli/run/timings.ts similarity index 87% rename from bin/src/run/timings.ts rename to cli/run/timings.ts index eb9735fca2a..b4680e49744 100644 --- a/bin/src/run/timings.ts +++ b/cli/run/timings.ts @@ -1,6 +1,6 @@ import prettyBytes from 'pretty-bytes'; import tc from 'turbocolor'; -import { SerializedTimings } from '../../../src/rollup/types'; +import { SerializedTimings } from '../../src/rollup/types'; export function printTimings(timings: SerializedTimings) { Object.keys(timings).forEach(label => { diff --git a/bin/src/run/watch.ts b/cli/run/watch.ts similarity index 91% rename from bin/src/run/watch.ts rename to cli/run/watch.ts index 7eda81d6c99..74297a9f8c6 100644 --- a/bin/src/run/watch.ts +++ b/cli/run/watch.ts @@ -1,19 +1,20 @@ import dateTime from 'date-time'; import fs from 'fs'; import ms from 'pretty-ms'; -import * as rollup from 'rollup'; import onExit from 'signal-exit'; import tc from 'turbocolor'; +import * as rollup from '../../src/node-entry'; import { InputOption, RollupBuild, RollupError, + RollupWatcher, RollupWatchOptions, WarningHandler, WatcherOptions -} from '../../../src/rollup/types'; -import mergeOptions, { GenericConfigObject } from '../../../src/utils/mergeOptions'; -import relativeId from '../../../src/utils/relativeId'; +} from '../../src/rollup/types'; +import mergeOptions, { GenericConfigObject } from '../../src/utils/mergeOptions'; +import relativeId from '../../src/utils/relativeId'; import { handleError, stderr } from '../logging'; import batchWarnings from './batchWarnings'; import loadConfigFile from './loadConfigFile'; @@ -29,11 +30,6 @@ interface WatchEvent { result?: RollupBuild; } -interface Watcher { - close: () => void; - on: (event: string, fn: (event: WatchEvent) => void) => void; -} - export default function watch( configFile: string, configs: GenericConfigObject[], @@ -48,8 +44,8 @@ export default function watch( ); const resetScreen = getResetScreen(isTTY && clearScreen); - let watcher: Watcher; - let configWatcher: Watcher; + let watcher: RollupWatcher; + let configWatcher: RollupWatcher; function processConfigs(configs: GenericConfigObject[]): RollupWatchOptions[] { return configs.map(options => { @@ -77,7 +73,7 @@ export default function watch( } function start(configs: RollupWatchOptions[]) { - watcher = rollup.watch(configs); + watcher = rollup.watch(configs as any); watcher.on('event', (event: WatchEvent) => { switch (event.code) { @@ -190,7 +186,7 @@ export default function watch( restarting = true; loadConfigFile(configFile, command) - .then((_configs: RollupWatchOptions[]) => { + .then(() => { restarting = false; if (aborted) { diff --git a/bin/src/sourceMappingUrl.ts b/cli/sourceMappingUrl.ts similarity index 100% rename from bin/src/sourceMappingUrl.ts rename to cli/sourceMappingUrl.ts diff --git a/package-lock.json b/package-lock.json index 352a2cf7f6a..b9ac9334bb7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -142,6 +142,32 @@ "to-fast-properties": "^2.0.0" } }, + "@nodelib/fs.scandir": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz", + "integrity": "sha512-NT/skIZjgotDSiXs0WqYhgcuBKhUMgfekCmCGtkUAiLqZdOnrdjmZr9wRl3ll64J9NF79uZ4fk16Dx0yMc/Xbg==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.1", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.1.tgz", + "integrity": "sha512-+RqhBlLn6YRBGOIoVYthsG0J9dfpO79eJyN7BYBkZJtfqrBwf2KK+rD/M/yjZR6WBmIhAgOV7S60eCgaSWtbFw==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.2.tgz", + "integrity": "sha512-J/DR3+W12uCzAJkw7niXDcqcKBg6+5G5Q/ZpThpGNzAUz70eOR6RV4XnnSN01qHZiVl0eavoxJsBypQoKsV2QQ==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.1", + "fastq": "^1.6.0" + } + }, "@samverschueren/stream-to-observable": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz", @@ -219,9 +245,9 @@ "dev": true }, "@types/node": { - "version": "12.6.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.3.tgz", - "integrity": "sha512-7TEYTQT1/6PP53NftXXabIZDaZfaoBdeBm8Md/i7zsWRoBe0YwOXguyK8vhHs8ehgB/w9U4K/6EWuTyp0W6nIA==" + "version": "12.6.9", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.6.9.tgz", + "integrity": "sha512-+YB9FtyxXGyD54p8rXwWaN1EWEyar5L58GlGWgtH2I9rGmLGBQcw63+0jw+ujqVavNuO47S1ByAjm9zdHMnskw==" }, "@types/normalize-package-data": { "version": "2.4.0", @@ -256,9 +282,9 @@ "optional": true }, "acorn": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.0.tgz", - "integrity": "sha512-8oe72N3WPMjA+2zVG71Ia0nXZ8DpQH+QyyHO+p06jT8eg8FGG3FbcUIi8KziHlAfheJQZeoqbvq1mQSQHXKYLw==" + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.2.1.tgz", + "integrity": "sha512-JD0xT5FCRDNyjDda3Lrg/IxFscp9q4tiYtxE1/nOzlKCk7hIRuYjhq1kCNkbPjMRMZuFq20HNQn1I9k8Oj0E+Q==" }, "acorn-bigint": { "version": "0.4.0", @@ -300,9 +326,9 @@ } }, "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", + "version": "6.10.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", + "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -463,18 +489,9 @@ } }, "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true }, "array-unique": { @@ -1236,26 +1253,18 @@ } }, "del": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", - "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/del/-/del-5.0.0.tgz", + "integrity": "sha512-TfU3nUY0WDIhN18eq+pgpbLY9AfL5RfiE9czKaTSolc6aK7qASXfDErvYgjV1UqCR4sNXDoxO0/idPmhDUt2Sg==", "dev": true, "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", + "globby": "^10.0.0", "is-path-cwd": "^2.0.0", "is-path-in-cwd": "^2.0.0", "p-map": "^2.0.0", - "pify": "^4.0.1", "rimraf": "^2.6.3" }, "dependencies": { - "pify": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", - "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", - "dev": true - }, "rimraf": { "version": "2.6.3", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", @@ -1287,6 +1296,23 @@ "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, + "dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "requires": { + "path-type": "^4.0.0" + }, + "dependencies": { + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true + } + } + }, "doctrine": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -1403,9 +1429,9 @@ "dev": true }, "eslint": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.0.1.tgz", - "integrity": "sha512-DyQRaMmORQ+JsWShYsSg4OPTjY56u1nCjAmICrE8vLWqyLKxhFXOthwMj1SA8xwfrv0CofLNVnqbfyhwCkaO0w==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.1.0.tgz", + "integrity": "sha512-QhrbdRD7ofuV09IuE2ySWBz0FyXCq0rriLTZXZqaWSI79CVtHVRdkFuFTViiqzZhkCgfOh9USpriuGN2gIpZDQ==", "dev": true, "requires": { "@babel/code-frame": "^7.0.0", @@ -1414,7 +1440,7 @@ "cross-spawn": "^6.0.5", "debug": "^4.0.1", "doctrine": "^3.0.0", - "eslint-scope": "^4.0.3", + "eslint-scope": "^5.0.0", "eslint-utils": "^1.3.1", "eslint-visitor-keys": "^1.0.0", "espree": "^6.0.0", @@ -1422,30 +1448,37 @@ "esutils": "^2.0.2", "file-entry-cache": "^5.0.1", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^3.1.0", + "glob-parent": "^5.0.0", "globals": "^11.7.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^6.2.2", + "inquirer": "^6.4.1", "is-glob": "^4.0.0", "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", "levn": "^0.3.0", - "lodash": "^4.17.11", + "lodash": "^4.17.14", "minimatch": "^3.0.4", "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", "optionator": "^0.8.2", "progress": "^2.0.0", "regexpp": "^2.0.1", - "semver": "^5.5.1", - "strip-ansi": "^4.0.0", - "strip-json-comments": "^2.0.1", + "semver": "^6.1.2", + "strip-ansi": "^5.2.0", + "strip-json-comments": "^3.0.1", "table": "^5.2.3", - "text-table": "^0.2.0" + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" }, "dependencies": { + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", @@ -1455,11 +1488,52 @@ "ms": "^2.1.1" } }, + "glob-parent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", + "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + }, + "dependencies": { + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + } + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + }, + "strip-json-comments": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz", + "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==", + "dev": true } } }, @@ -1474,9 +1548,9 @@ } }, "eslint-module-utils": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz", - "integrity": "sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw==", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz", + "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==", "dev": true, "requires": { "debug": "^2.6.8", @@ -1484,9 +1558,9 @@ } }, "eslint-plugin-import": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.0.tgz", - "integrity": "sha512-PZpAEC4gj/6DEMMoU2Df01C5c50r7zdGIN52Yfi7CvvWaYssG7Jt5R9nFG5gmqodxNOz9vQS87xk6Izdtpdrig==", + "version": "2.18.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz", + "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==", "dev": true, "requires": { "array-includes": "^3.0.3", @@ -1496,8 +1570,8 @@ "eslint-import-resolver-node": "^0.3.2", "eslint-module-utils": "^2.4.0", "has": "^1.0.3", - "lodash": "^4.17.11", "minimatch": "^3.0.4", + "object.values": "^1.1.0", "read-pkg-up": "^2.0.0", "resolve": "^1.11.0" }, @@ -1513,9 +1587,9 @@ } }, "resolve": { - "version": "1.11.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz", - "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", + "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", "dev": true, "requires": { "path-parse": "^1.0.6" @@ -1524,9 +1598,9 @@ } }, "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.0.0.tgz", + "integrity": "sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==", "dev": true, "requires": { "esrecurse": "^4.1.0", @@ -1534,10 +1608,13 @@ } }, "eslint-utils": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.3.1.tgz", - "integrity": "sha512-Z7YjnIldX+2XMcjr7ZkgEsOj/bREONV60qYeB/bjMAqqqZ4zxKyWX+BOUkdmRmA9riiIPVvo5x86m5elviOk0Q==", - "dev": true + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.0.tgz", + "integrity": "sha512-7ehnzPaP5IIEh1r1tkjuIrxqhNkzUJa9z3R92tLJdZIVdWaczEhr3EbhGtsMrVxi1KeR8qA7Off6SWc5WNQqyQ==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.0.0" + } }, "eslint-visitor-keys": { "version": "1.0.0", @@ -1689,9 +1766,9 @@ } }, "external-editor": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.0.3.tgz", - "integrity": "sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, "requires": { "chardet": "^0.7.0", @@ -1770,6 +1847,40 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, + "fast-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.0.4.tgz", + "integrity": "sha512-wkIbV6qg37xTJwqSsdnIphL1e+LaGz4AIQqr00mIubMaEhv1/HEmJ0uuCGZRNRUkZZmOB5mJKO0ZUTVq+SxMQg==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.1", + "@nodelib/fs.walk": "^1.2.1", + "glob-parent": "^5.0.0", + "is-glob": "^4.0.1", + "merge2": "^1.2.3", + "micromatch": "^4.0.2" + }, + "dependencies": { + "glob-parent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", + "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + }, + "is-glob": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz", + "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + } + } + }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", @@ -1782,6 +1893,15 @@ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", "dev": true }, + "fastq": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.6.0.tgz", + "integrity": "sha512-jmxqQ3Z/nXoeyDmWAzF9kH1aGZSis6e/SbfPmJpUnyZ0ogr6iscHQaml4wsEepEWSdtmpy+eVXmCRIMpxaXqOA==", + "dev": true, + "requires": { + "reusify": "^1.0.0" + } + }, "figures": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", @@ -2221,16 +2341,27 @@ "dev": true }, "globby": { - "version": "6.1.0", - "resolved": "http://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-10.0.1.tgz", + "integrity": "sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==", "dev": true, "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "@types/glob": "^7.1.1", + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.0.3", + "glob": "^7.1.3", + "ignore": "^5.1.1", + "merge2": "^1.2.3", + "slash": "^3.0.0" + }, + "dependencies": { + "ignore": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.2.tgz", + "integrity": "sha512-vdqWBp7MyzdmHkkRWV5nY+PfGRbYbahfuvsBCh277tq+w9zyNi7h5CYJCK0kmzti9kU+O/cB7sE8HvKv6aXAKQ==", + "dev": true + } } }, "graceful-fs": { @@ -2407,11 +2538,12 @@ } }, "husky": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/husky/-/husky-3.0.0.tgz", - "integrity": "sha512-lKMEn7bRK+7f5eWPNGclDVciYNQt0GIkAQmhKl+uHP1qFzoN0h92kmH9HZ8PCwyVA2EQPD8KHf0FYWqnTxau+Q==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/husky/-/husky-3.0.2.tgz", + "integrity": "sha512-WXCtaME2x0o4PJlKY4ap8BzLA+D0zlvefqAvLCPriOOu+x0dpO5uc5tlB7CY6/0SE2EESmoZsj4jW5D09KrJoA==", "dev": true, "requires": { + "chalk": "^2.4.2", "cosmiconfig": "^5.2.1", "execa": "^1.0.0", "get-stdin": "^7.0.0", @@ -2424,6 +2556,17 @@ "slash": "^3.0.0" }, "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, "execa": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", @@ -2513,13 +2656,15 @@ "dev": true }, "parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", "dev": true, "requires": { + "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", - "json-parse-better-errors": "^1.0.1" + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" } }, "path-exists": { @@ -2538,15 +2683,15 @@ } }, "read-pkg": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.1.1.tgz", - "integrity": "sha512-dFcTLQi6BZ+aFUaICg7er+/usEoqFdQxiEBsEMNGoipenihtxxtdrQuBXvyANCEI8VuUIVYFgeHGx9sLLvim4w==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, "requires": { "@types/normalize-package-data": "^2.4.0", "normalize-package-data": "^2.5.0", - "parse-json": "^4.0.0", - "type-fest": "^0.4.1" + "parse-json": "^5.0.0", + "type-fest": "^0.6.0" } } } @@ -2626,9 +2771,9 @@ "dev": true }, "inquirer": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.4.1.tgz", - "integrity": "sha512-/Jw+qPZx4EDYsaT6uz7F4GJRNFMRdKNeUZw3ZnKV8lyuUgz/YWRCSUAJMZSVhSq4Ec0R2oYnyi6b3d4JXcL5Nw==", + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.0.tgz", + "integrity": "sha512-scfHejeG/lVZSpvCXpsB4j/wQNPM5JC8kiElOI0OUTwmc1RTpXr4H32/HOlQHcZiYl2z2VElwuCVDRG8vFmbnA==", "dev": true, "requires": { "ansi-escapes": "^3.2.0", @@ -2637,7 +2782,7 @@ "cli-width": "^2.0.0", "external-editor": "^3.0.3", "figures": "^2.0.0", - "lodash": "^4.17.11", + "lodash": "^4.17.12", "mute-stream": "0.0.7", "run-async": "^2.2.0", "rxjs": "^6.4.0", @@ -3175,6 +3320,12 @@ "type-check": "~0.3.2" } }, + "lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", + "dev": true + }, "linkify-it": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.1.0.tgz", @@ -3185,9 +3336,9 @@ } }, "lint-staged": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-9.2.0.tgz", - "integrity": "sha512-K/CQWcxYunc8lGMNTFvtI4+ybJcHW3K4Ghudz2OrJhIWdW/i1WWu9rGiVj4yJ0+D/xh8a08kp5slt89VZC9Eqg==", + "version": "9.2.1", + "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-9.2.1.tgz", + "integrity": "sha512-3lGgJfBddCy/WndKdNko+uJbwyYjBD1k+V+SA+phBYWzH265S95KQya/Wln/UL+hOjc7NcjtFYVCUWuAcqYHhg==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -3195,8 +3346,8 @@ "cosmiconfig": "^5.2.1", "debug": "^4.1.1", "dedent": "^0.7.0", - "del": "^4.1.1", - "execa": "^2.0.1", + "del": "^5.0.0", + "execa": "^2.0.3", "listr": "^0.14.3", "log-symbols": "^3.0.0", "micromatch": "^4.0.2", @@ -3225,15 +3376,6 @@ "ms": "^2.1.1" } }, - "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", - "dev": true, - "requires": { - "chalk": "^2.4.2" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -3415,12 +3557,25 @@ "dev": true }, "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", + "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", "dev": true, "requires": { - "chalk": "^2.0.1" + "chalk": "^2.4.2" + }, + "dependencies": { + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + } } }, "log-update": { @@ -3610,6 +3765,12 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, + "merge2": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.2.4.tgz", + "integrity": "sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==", + "dev": true + }, "micromatch": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", @@ -3742,9 +3903,9 @@ } }, "mocha": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.1.4.tgz", - "integrity": "sha512-PN8CIy4RXsIoxoFJzS4QNnCH4psUCPWc4/rPrst/ecSJJbLBkubMiyGCP2Kj/9YnWbotFqAoeXyXMucj7gwCFg==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.2.0.tgz", + "integrity": "sha512-qwfFgY+7EKAAUAdv7VYMZQknI7YJSGesxHyhn6qD52DV8UcSZs5XwCifcZGMVIE4a5fbmhvbotxC0DLQ0oKohQ==", "dev": true, "requires": { "ansi-colors": "3.2.3", @@ -3800,6 +3961,15 @@ "path-exists": "^3.0.0" } }, + "log-symbols": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", + "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", + "dev": true, + "requires": { + "chalk": "^2.0.1" + } + }, "ms": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", @@ -4240,6 +4410,18 @@ "isobject": "^3.0.1" } }, + "object.values": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz", + "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.12.0", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -4530,21 +4712,6 @@ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", "dev": true }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "^2.0.0" - } - }, "pkg-dir": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", @@ -4582,9 +4749,9 @@ "dev": true }, "pretty-bytes": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.2.0.tgz", - "integrity": "sha512-ujANBhiUsl9AhREUDUEY1GPOharMGm8x8juS7qOHybcLi7XsKfrYQ88hSly1l2i0klXHTDYrlL8ihMCG55Dc3w==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.3.0.tgz", + "integrity": "sha512-hjGrh+P926p4R4WbaB6OckyRtO0F0/lQBiT+0gnxjV+5kjPBrfVBFCsCLbMqVQeydvIoouYTCmmEURiH3R1Bdg==", "dev": true }, "pretty-ms": { @@ -4889,6 +5056,12 @@ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", "dev": true }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true + }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", @@ -4899,13 +5072,13 @@ } }, "rollup": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.17.0.tgz", - "integrity": "sha512-k/j1m0NIsI4SYgCJR4MWPstGJOWfJyd6gycKoMhyoKPVXxm+L49XtbUwZyFsrSU2YXsOkM4u1ll9CS/ZgJBUpw==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.18.0.tgz", + "integrity": "sha512-MBAWr6ectF948gW/bs/yfi0jW7DzwI8n0tEYG/ZMQutmK+blF/Oazyhg3oPqtScCGV8bzCtL9KzlzPtTriEOJA==", "dev": true, "requires": { "@types/estree": "0.0.39", - "@types/node": "^12.6.2", + "@types/node": "^12.6.3", "acorn": "^6.2.0" } }, @@ -5062,6 +5235,12 @@ "integrity": "sha512-kc120TBlQ3mih1LSzdAJXo4xn/GWS2ec0l3S+syHDXP9uRr0JAT8Qd3mdMuyjqCzeZktgP3try92cEgf9Nks8A==", "dev": true }, + "run-parallel": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz", + "integrity": "sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q==", + "dev": true + }, "rxjs": { "version": "6.5.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", @@ -5350,9 +5529,9 @@ } }, "source-map-support": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", - "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", + "version": "0.5.13", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", + "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -5538,19 +5717,19 @@ "dev": true }, "systemjs": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-4.1.0.tgz", - "integrity": "sha512-nJrwicPmCKJBgRsFfNhXZVD6GJLnd+CyRZlUTP1XlAnXOXf6ePLX3seF1scLmUS3pnZKiUFURCjTkCixqoGT1g==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-5.0.0.tgz", + "integrity": "sha512-hnD/IMQhH0UmawiIGlYVnkCPUbbO/WDQjOC+Q4PewHBdsagI1OHH1re1sg1AYFqq7p9ps6b1Bsx4xCeoeIZSCw==", "dev": true }, "table": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.1.tgz", - "integrity": "sha512-E6CK1/pZe2N75rGZQotFOdmzWQ1AILtgYbMAbAjvms0S1l5IDB47zG3nCnFGB/w+7nB3vKofbLXCH7HPBo864w==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.5.tgz", + "integrity": "sha512-oGa2Hl7CQjfoaogtrOHEJroOcYILTx7BZWLGsJIlzoWmB2zmguhNfPJZsWPKYek/MgCxfco54gEi31d1uN2hFA==", "dev": true, "requires": { - "ajv": "^6.9.1", - "lodash": "^4.17.11", + "ajv": "^6.10.2", + "lodash": "^4.17.14", "slice-ansi": "^2.1.0", "string-width": "^3.0.0" }, @@ -5877,9 +6056,9 @@ } }, "type-fest": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.4.1.tgz", - "integrity": "sha512-IwzA/LSfD2vC1/YDYMv/zHP4rDF1usCwllsDpbolT3D4fUepIO7f9K70jjmUewU/LmGUKJcwcVtDCpnKk4BPMw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", + "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", "dev": true }, "typescript": { @@ -6046,6 +6225,12 @@ "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", "dev": true }, + "v8-compile-cache": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz", + "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==", + "dev": true + }, "validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", diff --git a/package.json b/package.json index 073b21af6d5..6ac97a595df 100644 --- a/package.json +++ b/package.json @@ -4,15 +4,14 @@ "description": "Next-generation ES module bundler", "main": "dist/rollup.js", "module": "dist/rollup.es.js", - "jsnext:main": "dist/rollup.es.js", "typings": "dist/rollup.d.ts", "bin": { - "rollup": "./bin/rollup" + "rollup": "./dist/bin/rollup.js" }, "scripts": { - "build": "shx rm -rf dist && git rev-parse HEAD > .commithash && rollup -c && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x bin/rollup", - "build:test": "shx rm -rf dist && rollup -c --configTest && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x bin/rollup", - "build:bootstrap": "bin/rollup -c && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x bin/rollup", + "build": "shx rm -rf dist && git rev-parse HEAD > .commithash && rollup -c && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup", + "build:test": "shx rm -rf dist && rollup -c --configTest && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup", + "build:bootstrap": "dist/bin/rollup -c && shx cp src/rollup/types.d.ts dist/rollup.d.ts && shx chmod a+x dist/bin/rollup", "ci:lint": "npm run lint:nofix && npm run security", "ci:test": "npm run build:test && npm run build:bootstrap && npm run test:all", "ci:coverage": "npm run build:test && nyc --reporter lcovonly mocha && codecov", @@ -59,8 +58,8 @@ "homepage": "https://github.com/rollup/rollup", "dependencies": { "@types/estree": "0.0.39", - "@types/node": "^12.6.3", - "acorn": "^6.2.0" + "@types/node": "^12.6.9", + "acorn": "^6.2.1" }, "devDependencies": { "@types/chokidar": "^2.1.3", @@ -79,28 +78,28 @@ "date-time": "^3.1.0", "es5-shim": "^4.5.13", "es6-shim": "^0.35.5", - "eslint": "^6.0.1", - "eslint-plugin-import": "^2.18.0", + "eslint": "^6.1.0", + "eslint-plugin-import": "^2.18.2", "execa": "^2.0.3", "fixturify": "^1.2.0", "hash.js": "^1.1.7", - "husky": "^3.0.0", + "husky": "^3.0.2", "immutable": "^4.0.0-rc.12", "is-reference": "^1.1.3", - "lint-staged": "^9.2.0", + "lint-staged": "^9.2.1", "locate-character": "^2.0.5", "magic-string": "^0.25.3", "markdownlint-cli": "^0.17.0", "micromatch": "^4.0.2", "minimist": "^1.2.0", - "mocha": "^6.1.4", + "mocha": "^6.2.0", "nyc": "^14.1.1", "prettier": "^1.18.2", - "pretty-bytes": "^5.2.0", + "pretty-bytes": "^5.3.0", "pretty-ms": "^5.0.0", "require-relative": "^0.8.7", "requirejs": "^2.3.6", - "rollup": "^1.17.0", + "rollup": "^1.18.0", "rollup-plugin-alias": "^1.5.2", "rollup-plugin-buble": "^0.19.8", "rollup-plugin-commonjs": "^10.0.1", @@ -115,9 +114,9 @@ "shx": "^0.3.2", "signal-exit": "^3.0.2", "source-map": "^0.6.1", - "source-map-support": "^0.5.12", + "source-map-support": "^0.5.13", "sourcemap-codec": "^1.4.6", - "systemjs": "^4.1.0", + "systemjs": "^5.0.0", "terser": "^4.1.2", "tslib": "^1.10.0", "tslint": "^5.18.0", @@ -126,8 +125,7 @@ "url-parse": "^1.4.7" }, "files": [ - "dist/*.js", - "dist/*.d.ts", - "bin/rollup" + "dist/**/*.js", + "dist/*.d.ts" ] } diff --git a/rollup.config.js b/rollup.config.js index fca8a93f426..69106d26aa8 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,4 +1,5 @@ import fs from 'fs'; +import MagicString from 'magic-string'; import path from 'path'; import alias from 'rollup-plugin-alias'; import commonjs from 'rollup-plugin-commonjs'; @@ -40,6 +41,19 @@ const onwarn = warning => { throw new Error(warning.message); }; +function addSheBang() { + return { + name: 'add-bin-shebang', + renderChunk(code, chunkInfo) { + if (chunkInfo.fileName === 'bin/rollup') { + const magicString = new MagicString(code); + magicString.prepend('#!/usr/bin/env node\n\n'); + return { code: magicString.toString(), map: magicString.generateMap({hires: true}) }; + } + } + }; +} + const expectedAcornImport = "import acorn__default, { tokTypes, Parser } from 'acorn';"; const newAcornImport = "import * as acorn__default from 'acorn';\nimport { tokTypes, Parser } from 'acorn';"; @@ -49,20 +63,18 @@ const newAcornImport = function fixAcornEsmImport() { return { name: 'fix-acorn-esm-import', - renderChunk(code, chunk, options) { - if (/esm?/.test(options.format)) { - let found = false; - const fixedCode = code.replace(expectedAcornImport, () => { - found = true; - return newAcornImport; - }); - if (!found) { - this.error( - 'Could not find expected acorn import, please deactive this plugin and examine generated code.' - ); - } - return fixedCode; + renderChunk(code) { + let found = false; + const fixedCode = code.replace(expectedAcornImport, () => { + found = true; + return newAcornImport; + }); + if (!found) { + this.error( + 'Could not find expected acorn import, please deactive this plugin and examine generated code.' + ); } + return fixedCode; } }; } @@ -70,7 +82,7 @@ function fixAcornEsmImport() { const moduleAliases = { resolve: ['.js', '.json', '.md'], 'acorn-dynamic-import': path.resolve('node_modules/acorn-dynamic-import/src/index.js'), - 'help.md': path.resolve('bin/src/help.md'), + 'help.md': path.resolve('cli/help.md'), 'package.json': path.resolve('package.json') }; @@ -80,80 +92,72 @@ const treeshake = { tryCatchDeoptimization: false }; +const nodePlugins = [ + alias(moduleAliases), + resolve(), + json(), + string({ include: '**/*.md' }), + commonjs({ include: 'node_modules/**' }), + typescript({ include: '**/*.{ts,js}' }) +]; + export default command => { - const nodeBuilds = [ - /* Rollup core node builds */ - { - input: 'src/node-entry.ts', - onwarn, - plugins: [ - alias(moduleAliases), - resolve(), - json(), - commonjs({ include: 'node_modules/**' }), - typescript({ include: '**/*.{ts,js}' }), - fixAcornEsmImport() - ], - // acorn needs to be external as some plugins rely on a shared acorn instance - external: ['fs', 'path', 'events', 'module', 'util', 'acorn'], - treeshake, - output: [{ file: 'dist/rollup.js', format: 'cjs', sourcemap: true, banner }].concat( - command.configTest ? [] : [{ file: 'dist/rollup.es.js', format: 'esm', banner }] - ) + const commonJSBuild = { + input: { + 'rollup.js': 'src/node-entry.ts', + 'bin/rollup': 'cli/index.ts' }, - /* Rollup CLI */ - { - input: 'bin/src/index.ts', - onwarn, - plugins: [ - alias(moduleAliases), - resolve(), - json(), - string({ include: '**/*.md' }), - commonjs({ include: 'node_modules/**' }), - typescript({ include: '**/*.{ts,js}' }) - ], - external: ['fs', 'path', 'module', 'assert', 'events', 'rollup'], - treeshake, - output: { - file: 'bin/rollup', - format: 'cjs', - banner: '#!/usr/bin/env node', - paths: { - rollup: '../dist/rollup.js' - }, - sourcemap: true - } + onwarn, + plugins: [...nodePlugins, addSheBang()], + // acorn needs to be external as some plugins rely on a shared acorn instance + external: ['acorn', 'assert', 'events', 'fs', 'module', 'path', 'util'], + treeshake, + output: { + banner, + chunkFileNames: 'shared/[name].js', + dir: 'dist', + entryFileNames: '[name]', + externalLiveBindings: false, + format: 'cjs', + freeze: false, + interop: false, + sourcemap: true } - ]; + }; if (command.configTest) { - return nodeBuilds; + return commonJSBuild; } - return nodeBuilds.concat([ - /* Rollup core browser builds */ - { - input: 'src/browser-entry.ts', - onwarn, - plugins: [ - alias(moduleAliases), - resolve({ browser: true }), - json(), - { - load: id => { - if (~id.indexOf('fs.ts')) return fs.readFileSync('browser/fs.ts', 'utf-8'); - if (~id.indexOf('path.ts')) return fs.readFileSync('browser/path.ts', 'utf-8'); - } - }, - commonjs(), - typescript({ include: '**/*.{ts,js}' }), - terser({ module: true, output: { comments: 'some' } }) - ], - treeshake, - output: [ - { file: 'dist/rollup.browser.js', format: 'umd', name: 'rollup', banner }, - { file: 'dist/rollup.browser.es.js', format: 'esm', banner } - ] - } - ]); + + const esmBuild = Object.assign({}, commonJSBuild, { + input: 'src/node-entry.ts', + plugins: [...nodePlugins, fixAcornEsmImport()], + output: { file: 'dist/rollup.es.js', format: 'esm', banner } + }); + + const browserBuilds = { + input: 'src/browser-entry.ts', + onwarn, + plugins: [ + alias(moduleAliases), + resolve({ browser: true }), + json(), + { + load: id => { + if (~id.indexOf('fs.ts')) return fs.readFileSync('browser/fs.ts', 'utf-8'); + if (~id.indexOf('path.ts')) return fs.readFileSync('browser/path.ts', 'utf-8'); + } + }, + commonjs(), + typescript({ include: '**/*.{ts,js}' }), + terser({ module: true, output: { comments: 'some' } }) + ], + treeshake, + output: [ + { file: 'dist/rollup.browser.js', format: 'umd', name: 'rollup', banner }, + { file: 'dist/rollup.browser.es.js', format: 'esm', banner } + ] + }; + + return [commonJSBuild, esmBuild, browserBuilds]; }; diff --git a/src/Chunk.ts b/src/Chunk.ts index 738e6ebf45c..c751139466b 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -999,10 +999,7 @@ export default class Chunk { if (this.fileName) { return getAliasName(this.fileName); } - for (const module of this.orderedModules) { - if (module.chunkName) return module.chunkName; - } - return 'chunk'; + return getAliasName(this.orderedModules[this.orderedModules.length - 1].id); } private getRelativePath(targetPath: string): string { diff --git a/src/ast/variables/ExportDefaultVariable.ts b/src/ast/variables/ExportDefaultVariable.ts index 8f2e38adf7f..b4027f28f20 100644 --- a/src/ast/variables/ExportDefaultVariable.ts +++ b/src/ast/variables/ExportDefaultVariable.ts @@ -41,6 +41,15 @@ export default class ExportDefaultVariable extends LocalVariable { return (this.originalId && this.originalId.name) || null; } + getBaseVariableName(): string { + const original = this.getOriginalVariable(); + if (original === this) { + return super.getBaseVariableName(); + } else { + return original.getBaseVariableName(); + } + } + getName() { const original = this.getOriginalVariable(); if (original === this) { @@ -83,5 +92,3 @@ export default class ExportDefaultVariable extends LocalVariable { } } } - -ExportDefaultVariable.prototype.getBaseVariableName = ExportDefaultVariable.prototype.getName; diff --git a/src/watch/index.ts b/src/watch/index.ts index f2757497549..8184ee6813b 100644 --- a/src/watch/index.ts +++ b/src/watch/index.ts @@ -279,6 +279,6 @@ export class Task { } } -export default function watch(configs: GenericConfigObject[]): EventEmitter { +export default function watch(configs: GenericConfigObject[]): RollupWatcher { return new Watcher(configs).emitter; } diff --git a/test/chunking-form/samples/basic-chunking/_expected/amd/generated-chunk.js b/test/chunking-form/samples/basic-chunking/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/basic-chunking/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/basic-chunking/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js b/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js index 108e509e2f3..ab0a692d55b 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js b/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js index 362f7851a1c..af93aebe675 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/basic-chunking/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/basic-chunking/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/basic-chunking/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js b/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js index d5090945ce7..66d8235034e 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js b/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js index 360eacc9f9b..35fc9355a24 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/generated-chunk.js b/test/chunking-form/samples/basic-chunking/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/basic-chunking/_expected/es/generated-chunk.js rename to test/chunking-form/samples/basic-chunking/_expected/es/generated-dep2.js 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 ca00ac41196..f2e4ef52928 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 { f as fn$1 } from './generated-chunk.js'; +import { f as fn$1 } from './generated-dep2.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 71b0c9a1bd5..ac12b7f136e 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 { f as fn$2 } from './generated-chunk.js'; +import { f as fn$2 } from './generated-dep2.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-dep2.js similarity index 100% rename from test/chunking-form/samples/basic-chunking/_expected/system/generated-chunk.js rename to test/chunking-form/samples/basic-chunking/_expected/system/generated-dep2.js 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 6d693637dce..287fda7c0e7 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$1; return { 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 f89c1969cba..2ca1781350a 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$2; return { diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js deleted file mode 100644 index ee7aed4131e..00000000000 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js +++ /dev/null @@ -1,10 +0,0 @@ -define(['exports', './generated-chunk', './generated-chunk3'], function (exports, dep1, dep2) { 'use strict'; - - var x = dep1.x + 1; - - var y = dep2.x + 1; - - exports.x = x; - exports.y = y; - -}); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk3.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-shared2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-shared2.js new file mode 100644 index 00000000000..04c631986fa --- /dev/null +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-shared2.js @@ -0,0 +1,10 @@ +define(['exports', './generated-dep1', './generated-dep2'], function (exports, dep1, dep2) { 'use strict'; + + var x = dep1.x + 1; + + var y = dep2.x + 1; + + exports.x = x; + exports.y = y; + +}); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js index 0e65131f4fd..6db24f20d99 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep1, shared2, dep2) { 'use strict'; +define(['./generated-dep1', './generated-shared2', './generated-dep2'], function (dep1, shared2, dep2) { 'use strict'; console.log(shared2.x + shared2.y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js index 4a881f3542f..2d15ef40f6e 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep1, shared2, dep2) { 'use strict'; +define(['./generated-dep1', './generated-shared2', './generated-dep2'], function (dep1, shared2, dep2) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js index bd74061e2d8..02a46daf2cd 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js index 1fc33edde0c..8806f30b198 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js @@ -1,4 +1,4 @@ -define(['./generated-chunk3'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js deleted file mode 100644 index 1869f3a0186..00000000000 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -var dep1 = require('./generated-chunk.js'); -var dep2 = require('./generated-chunk3.js'); - -var x = dep1.x + 1; - -var y = dep2.x + 1; - -exports.x = x; -exports.y = y; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk3.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-shared2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-shared2.js new file mode 100644 index 00000000000..5482042bab1 --- /dev/null +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-shared2.js @@ -0,0 +1,11 @@ +'use strict'; + +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep2.js'); + +var x = dep1.x + 1; + +var y = dep2.x + 1; + +exports.x = x; +exports.y = y; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js index 395b4cbab96..e1b073c3c46 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -require('./generated-chunk.js'); -var shared2 = require('./generated-chunk2.js'); -require('./generated-chunk3.js'); +require('./generated-dep1.js'); +var shared2 = require('./generated-shared2.js'); +require('./generated-dep2.js'); console.log(shared2.x + shared2.y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js index 486e3d559d5..291f1954f45 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-chunk.js'); -require('./generated-chunk2.js'); -require('./generated-chunk3.js'); +require('./generated-dep1.js'); +require('./generated-shared2.js'); +require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main3.js index cd3e1d69188..ccb8d98ce68 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main3.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep1.js'); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main4.js index afdcfc1fbb8..8bcaed1c530 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main4.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk3.js'); +require('./generated-dep2.js'); 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 deleted file mode 100644 index ae1f188f66e..00000000000 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js +++ /dev/null @@ -1,8 +0,0 @@ -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, y }; 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-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-dep1.js 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-dep2.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk3.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-dep2.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-shared2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-shared2.js new file mode 100644 index 00000000000..15af511db49 --- /dev/null +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-shared2.js @@ -0,0 +1,8 @@ +import { x as x$1 } from './generated-dep1.js'; +import { x as x$2 } from './generated-dep2.js'; + +var x = x$1 + 1; + +var y = x$2 + 1; + +export { x, y }; 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 dedab6da860..df90cab25c7 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 { x, y } from './generated-chunk2.js'; -import './generated-chunk3.js'; +import './generated-dep1.js'; +import { x, y } from './generated-shared2.js'; +import './generated-dep2.js'; console.log(x + y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js index 4a3b3c2f889..09d60765311 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js @@ -1,3 +1,3 @@ -import './generated-chunk.js'; -import './generated-chunk2.js'; -import './generated-chunk3.js'; +import './generated-dep1.js'; +import './generated-shared2.js'; +import './generated-dep2.js'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main3.js index 5d03e846db5..934a68ee7f1 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main3.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep1.js'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main4.js index f3cda5f3b3f..e38989d38f2 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main4.js @@ -1 +1 @@ -import './generated-chunk3.js'; +import './generated-dep2.js'; 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-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-dep1.js 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-dep2.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk3.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-dep2.js 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-shared2.js similarity index 73% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-shared2.js index 51118121202..a72e59cac53 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-shared2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk3.js'], function (exports) { +System.register(['./generated-dep1.js', './generated-dep2.js'], function (exports) { 'use strict'; var x$1, x$2; return { 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 32946cf076f..e1227b6045a 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep1.js', './generated-shared2.js', './generated-dep2.js'], function () { 'use strict'; var x, y; return { diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js index b03ec442333..4b34c33770f 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep1.js', './generated-shared2.js', './generated-dep2.js'], function () { 'use strict'; return { setters: [function () {}, function () {}, function () {}], diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js index 0546a48da7c..5668bec5d4f 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep1.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js index 1445de70bec..73473efce7c 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk3.js'], function () { +System.register(['./generated-dep2.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js deleted file mode 100644 index 872a82acb49..00000000000 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-chunk', './generated-chunk2'], function (dep111, dep112) { 'use strict'; - - console.log('11'); - -}); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep11.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep11.js new file mode 100644 index 00000000000..8a7b5d70482 --- /dev/null +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep11.js @@ -0,0 +1,5 @@ +define(['./generated-dep111', './generated-dep112'], function (dep111, dep112) { 'use strict'; + + console.log('11'); + +}); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep111.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep111.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep112.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk2.js rename to test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep112.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js index 6748631337f..111e385a36a 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep111, dep112, dep11) { 'use strict'; +define(['./generated-dep111', './generated-dep112', './generated-dep11'], function (dep111, dep112, dep11) { 'use strict'; console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js index b8d58e21dee..b4448a037ae 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep111, dep112, dep11) { 'use strict'; +define(['./generated-dep111', './generated-dep112', './generated-dep11'], function (dep111, dep112, dep11) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js index f4841ed82fe..6b57c04c178 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep111) { 'use strict'; +define(['./generated-dep111'], function (dep111) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js index bc6715800f4..bcc4d6bb6d1 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js @@ -1,4 +1,4 @@ -define(['./generated-chunk2'], function (dep112) { 'use strict'; +define(['./generated-dep112'], function (dep112) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk3.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk3.js deleted file mode 100644 index e0237f0a354..00000000000 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk3.js +++ /dev/null @@ -1,6 +0,0 @@ -'use strict'; - -require('./generated-chunk.js'); -require('./generated-chunk2.js'); - -console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep11.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep11.js new file mode 100644 index 00000000000..d53656de00a --- /dev/null +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep11.js @@ -0,0 +1,6 @@ +'use strict'; + +require('./generated-dep111.js'); +require('./generated-dep112.js'); + +console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep111.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep111.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep112.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep112.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js index b2a67e5bc37..5cb69cbe4bf 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js @@ -1,8 +1,8 @@ 'use strict'; -require('./generated-chunk.js'); -var dep112 = require('./generated-chunk2.js'); -require('./generated-chunk3.js'); +require('./generated-dep111.js'); +var dep112 = require('./generated-dep112.js'); +require('./generated-dep11.js'); console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js index 486e3d559d5..d68bb5324b6 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-chunk.js'); -require('./generated-chunk2.js'); -require('./generated-chunk3.js'); +require('./generated-dep111.js'); +require('./generated-dep112.js'); +require('./generated-dep11.js'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main3.js index cd3e1d69188..03f5bcb4802 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main3.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep111.js'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main4.js index 6830e0e1cfa..9efc879ddeb 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main4.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk2.js'); +require('./generated-dep112.js'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk3.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk3.js deleted file mode 100644 index e837e788147..00000000000 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk3.js +++ /dev/null @@ -1,4 +0,0 @@ -import './generated-chunk.js'; -import './generated-chunk2.js'; - -console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep11.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep11.js new file mode 100644 index 00000000000..113045c45f4 --- /dev/null +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep11.js @@ -0,0 +1,4 @@ +import './generated-dep111.js'; +import './generated-dep112.js'; + +console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep111.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep111.js 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-dep112.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep112.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js index 251b780143e..fec6c00831b 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js @@ -1,6 +1,6 @@ -import './generated-chunk.js'; -import { x } from './generated-chunk2.js'; -import './generated-chunk3.js'; +import './generated-dep111.js'; +import { x } from './generated-dep112.js'; +import './generated-dep11.js'; console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js index 4a3b3c2f889..f7b18be422f 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js @@ -1,3 +1,3 @@ -import './generated-chunk.js'; -import './generated-chunk2.js'; -import './generated-chunk3.js'; +import './generated-dep111.js'; +import './generated-dep112.js'; +import './generated-dep11.js'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main3.js index 5d03e846db5..7fab442816a 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main3.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep111.js'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main4.js index da772d22419..7d06babc396 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main4.js @@ -1 +1 @@ -import './generated-chunk2.js'; +import './generated-dep112.js'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk3.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js similarity index 61% rename from test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk3.js rename to test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js index 2325334df60..639ef3bdbab 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function () { +System.register(['./generated-dep111.js', './generated-dep112.js'], function () { 'use strict'; return { setters: [function () {}, function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep111.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep111.js 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-dep112.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep112.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js index d3eed3ab319..8987e5bcdb7 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep111.js', './generated-dep112.js', './generated-dep11.js'], function () { 'use strict'; var x; return { diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js index b03ec442333..58cd5cb31fd 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep111.js', './generated-dep112.js', './generated-dep11.js'], function () { 'use strict'; return { setters: [function () {}, function () {}, function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js index 0546a48da7c..84a63039a8d 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep111.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js index 32b933bbc4f..2ce7e7a8ab3 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk2.js'], function () { +System.register(['./generated-dep112.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js index fff81b46661..76c150bb232 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js index 7665de6f99c..483ff435cb6 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js index 57540c44ee0..835f075e3b6 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js index f03cd93dc87..71e1239cab9 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); class Main2 { constructor () { 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-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-dep1.js 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 b945e58a593..d08c5b42593 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 { f as fn } from './generated-chunk.js'; +import { f as fn } from './generated-dep1.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 49d0df6cb5a..dc15f820234 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 { a as fn } from './generated-chunk.js'; +import { a as fn } from './generated-dep1.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-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-dep1.js 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 0c039cedaa5..21a22fa46ea 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep1.js'], function (exports) { 'use strict'; var fn; return { 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 feb990ed1a8..a105cc04181 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep1.js'], function (exports) { 'use strict'; var fn; return { diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/generated-one.js similarity index 100% rename from test/chunking-form/samples/chunk-export-renaming/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-export-renaming/_expected/amd/generated-one.js diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js index 4bc5739ac53..18a0182c07a 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, one) { 'use strict'; +define(['exports', './generated-one'], function (exports, one) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js index 28aa6948e70..781a4cbc0bb 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, one) { 'use strict'; +define(['exports', './generated-one'], function (exports, one) { 'use strict'; class Two { test() { diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/generated-one.js similarity index 100% rename from test/chunking-form/samples/chunk-export-renaming/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-export-renaming/_expected/cjs/generated-one.js diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js index 6a6c1b487cc..357f059b4fd 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var one = require('./generated-chunk.js'); +var one = require('./generated-one.js'); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js index e0adf1b39da..d990bcc5d17 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var one = require('./generated-chunk.js'); +var one = require('./generated-one.js'); class Two { test() { 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-one.js similarity index 100% rename from test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-one.js 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 f2c11dd4a4b..fe75206da7e 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 { O as ItemOne } from './generated-chunk.js'; +export { O as ItemOne } from './generated-one.js'; diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/es/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/es/main2.js index 9e807f7f881..fccdd26cf28 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as ONE_CONSTANT } from './generated-chunk.js'; +import { a as ONE_CONSTANT } from './generated-one.js'; class Two { test() { 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-one.js similarity index 100% rename from test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-one.js 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 d76ff21e960..4ef53c4cb8c 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-one.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js index 26ccfa8c843..98c75710b26 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-one.js'], function (exports) { 'use strict'; var ONE_CONSTANT; return { diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/generated-lib.js similarity index 100% rename from test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/generated-lib.js diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js index fcc3e22f67b..b0baf5a2dbf 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (lib) { 'use strict'; +define(['./generated-lib'], function (lib) { 'use strict'; function fn () { var emptyFunction = lib.emptyFunction; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js index 09d13545f2a..8eaddd1b192 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (lib) { 'use strict'; +define(['./generated-lib'], function (lib) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/generated-lib.js similarity index 100% rename from test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/generated-lib.js diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js index 245b14fc81c..7018f1f5678 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var lib = require('./generated-chunk.js'); +var lib = require('./generated-lib.js'); function fn () { var emptyFunction = lib.emptyFunction; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main2.js index cd3e1d69188..a4c4529c43f 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main2.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-lib.js'); 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-lib.js similarity index 100% rename from test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-lib.js 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 7ae1592867a..8d4d0f8f6d5 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 { e as emptyFunction } from './generated-chunk.js'; +import { e as emptyFunction } from './generated-lib.js'; function fn () { var emptyFunction$1 = emptyFunction; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main2.js index 5d03e846db5..1de20fb6656 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main2.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-lib.js'; 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-lib.js similarity index 100% rename from test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-lib.js 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 4b216f95f3c..8029d14b1ee 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-lib.js'], function () { 'use strict'; var emptyFunction; return { diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js index f26bc7ab25f..eb8c6d4539e 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-lib.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-live-bindings/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-live-bindings/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js index 9de2c058385..7f1158b9f9b 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js index cd376312505..82f94dbe2f0 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-live-bindings/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-live-bindings/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js index 60027ffe8ee..27d86d3824c 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js index d3a7b6358b0..e0cfed4d826 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); class Main2 { constructor () { 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-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-dep1.js 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 d347e5e679b..4ab6a281f36 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 { f as fn, t as text } from './generated-chunk.js'; +import { f as fn, t as text } from './generated-dep1.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 015cf2d2589..07b5d8e9ba6 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 { a as fn, b as text } from './generated-chunk.js'; +import { a as fn, b as text } from './generated-dep1.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-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-dep1.js 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 abfa0773b80..4082f2bc13a 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep1.js'], function (exports) { 'use strict'; var fn, text; return { 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 fad90019042..d7c6ceee584 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep1.js'], function (exports) { 'use strict'; var fn, text; return { diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/generated-shared.js similarity index 100% rename from test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/generated-shared.js diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js index 91c28dd2e42..edf92beb77d 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (shared) { 'use strict'; +define(['./generated-shared'], function (shared) { 'use strict'; shared.commonjsGlobal.fn = d => d + 1; var cjs = shared.commonjsGlobal.fn; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js index b80ae0d3892..9f1de21690f 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (shared) { 'use strict'; +define(['./generated-shared'], function (shared) { 'use strict'; var main2 = shared.d.map(d => d + 2); diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/generated-shared.js similarity index 100% rename from test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/generated-shared.js diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js index b75d97e0ced..3fff58119e2 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./generated-chunk.js'); +var shared = require('./generated-shared.js'); shared.commonjsGlobal.fn = d => d + 1; var cjs = shared.commonjsGlobal.fn; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js index ce051f9dca8..d4cd65916b3 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./generated-chunk.js'); +var shared = require('./generated-shared.js'); var main2 = shared.d.map(d => d + 2); 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-shared.js similarity index 100% rename from test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-shared.js 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 f2f0d4cd0ea..2aefb855ca2 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 { c as commonjsGlobal, d } from './generated-chunk.js'; +import { c as commonjsGlobal, d } from './generated-shared.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 1029203efe8..45d7c4f0e3f 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 { d } from './generated-chunk.js'; +import { d } from './generated-shared.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-shared.js similarity index 100% rename from test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-shared.js 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 f3b25331f17..36acb82d941 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-shared.js'], function (exports) { 'use strict'; var commonjsGlobal, d; return { 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 15f9ff21e60..b872e5d5df4 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-shared.js'], function (exports) { 'use strict'; var d; return { diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_config.js b/test/chunking-form/samples/chunk-variable-name-conflict/_config.js new file mode 100644 index 00000000000..bded69227e6 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_config.js @@ -0,0 +1,6 @@ +module.exports = { + description: 'chunk variable name conflict', + options: { + input: ['main1.js', 'main2.js'] + } +}; diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/generated-dep.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/generated-dep.js new file mode 100644 index 00000000000..27508b4e569 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/generated-dep.js @@ -0,0 +1,9 @@ +define(['exports'], function (exports) { 'use strict'; + + var value = 42; + const x = 3; + + exports.value = value; + exports.x = x; + +}); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/main1.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/main1.js new file mode 100644 index 00000000000..f8cf7bcec88 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/main1.js @@ -0,0 +1,5 @@ +define(['./generated-dep'], function (dep$1) { 'use strict'; + + [43].map(dep => console.log(dep, dep$1.value, dep$1.x)); + +}); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/main2.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/main2.js new file mode 100644 index 00000000000..dfbe4d1c21e --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/amd/main2.js @@ -0,0 +1,6 @@ +define(['./generated-dep'], function (dep$1) { 'use strict'; + + var dep = 44; + console.log(dep, dep$1.value); + +}); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/generated-dep.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/generated-dep.js new file mode 100644 index 00000000000..427976f2c38 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/generated-dep.js @@ -0,0 +1,7 @@ +'use strict'; + +var value = 42; +const x = 3; + +exports.value = value; +exports.x = x; diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/main1.js new file mode 100644 index 00000000000..85f93fa67e1 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +var dep = require('./generated-dep.js'); + +[43].map(dep$1 => console.log(dep$1, dep.value, dep.x)); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/main2.js new file mode 100644 index 00000000000..da6807a8e6f --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/cjs/main2.js @@ -0,0 +1,6 @@ +'use strict'; + +var dep$1 = require('./generated-dep.js'); + +var dep = 44; +console.log(dep, dep$1.value); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/generated-dep.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/generated-dep.js new file mode 100644 index 00000000000..4f5a085f8d2 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/generated-dep.js @@ -0,0 +1,4 @@ +var value = 42; +const x = 3; + +export { value as v, x }; diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/main1.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/main1.js new file mode 100644 index 00000000000..33d5ef7c13f --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/main1.js @@ -0,0 +1,3 @@ +import { v as value, x } from './generated-dep.js'; + +[43].map(dep => console.log(dep, value, x)); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/main2.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/main2.js new file mode 100644 index 00000000000..3fbc57c4744 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/es/main2.js @@ -0,0 +1,4 @@ +import { v as value } from './generated-dep.js'; + +var dep = 44; +console.log(dep, value); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/generated-dep.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/generated-dep.js new file mode 100644 index 00000000000..d48918f6dca --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/generated-dep.js @@ -0,0 +1,11 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var value = exports('v', 42); + const x = exports('x', 3); + + } + }; +}); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main1.js new file mode 100644 index 00000000000..c3a57d0d021 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main1.js @@ -0,0 +1,15 @@ +System.register(['./generated-dep.js'], function () { + 'use strict'; + var value, x; + return { + setters: [function (module) { + value = module.v; + x = module.x; + }], + execute: function () { + + [43].map(dep => console.log(dep, value, x)); + + } + }; +}); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main2.js new file mode 100644 index 00000000000..ab8d56f3a9a --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/_expected/system/main2.js @@ -0,0 +1,15 @@ +System.register(['./generated-dep.js'], function () { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.v; + }], + execute: function () { + + var dep = 44; + console.log(dep, value); + + } + }; +}); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/dep.js b/test/chunking-form/samples/chunk-variable-name-conflict/dep.js new file mode 100644 index 00000000000..8d6f20e8104 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/dep.js @@ -0,0 +1,2 @@ +export default 42; +export const x = 3; diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/main1.js b/test/chunking-form/samples/chunk-variable-name-conflict/main1.js new file mode 100644 index 00000000000..02013e35948 --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/main1.js @@ -0,0 +1,2 @@ +import value, {x} from './dep.js'; +[43].map(dep => console.log(dep, value, x)); diff --git a/test/chunking-form/samples/chunk-variable-name-conflict/main2.js b/test/chunking-form/samples/chunk-variable-name-conflict/main2.js new file mode 100644 index 00000000000..6c9c208065b --- /dev/null +++ b/test/chunking-form/samples/chunk-variable-name-conflict/main2.js @@ -0,0 +1,3 @@ +import value from './dep.js'; +var dep = 44; +console.log(dep, value); diff --git a/test/chunking-form/samples/chunking-compact/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-compact/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-compact/_expected/amd/generated-dep2.js 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 1d2a2737c70..56ee749a02b 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'],function(dep2){'use strict';function fn () { +define(['./generated-dep2'],function(dep2){'use strict';function fn () { console.log('dep1 fn'); }class Main1 { constructor () { 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 85ff93f21c8..309081d4e2e 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk','external'],function(dep2,external){'use strict';function fn () { +define(['./generated-dep2','external'],function(dep2,external){'use strict';function fn () { console.log('lib1 fn'); external.fn(); }function fn$1 () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-compact/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-compact/_expected/cjs/generated-dep2.js 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 6dc9d76ea1f..e5002543a29 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js @@ -1,4 +1,4 @@ -'use strict';var dep2=require('./generated-chunk.js');function fn () { +'use strict';var dep2=require('./generated-dep2.js');function fn () { console.log('dep1 fn'); }class Main1 { constructor () { 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 854dd48c92e..bc53429ccde 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js @@ -1,4 +1,4 @@ -'use strict';var dep2=require('./generated-chunk.js'),external=require('external');function fn () { +'use strict';var dep2=require('./generated-dep2.js'),external=require('external');function fn () { console.log('lib1 fn'); external.fn(); }function fn$1 () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-compact/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-compact/_expected/es/generated-dep2.js 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 3f3bf5f95c7..b761b539ad2 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 {f as fn$1}from'./generated-chunk.js';function fn () { +import {f as fn$1}from'./generated-dep2.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 d211a97fe64..05a22e7cfa8 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 {f as fn$3}from'./generated-chunk.js';import {fn as fn$2}from'external';function fn () { +import {f as fn$3}from'./generated-dep2.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-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-compact/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-compact/_expected/system/generated-dep2.js 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 f8b5e0df27e..cc51b4e2739 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){'use strict';var fn$1;return{setters:[function(module){fn$1=module.f;}],execute:function(){function fn () { +System.register(['./generated-dep2.js'],function(exports){'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 17ddf05a6a4..7e360eb7cd5 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){'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 () { +System.register(['./generated-dep2.js','external'],function(exports){'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/amd/generated-chunk.js b/test/chunking-form/samples/chunking-externals/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-externals/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-externals/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js b/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js index 108e509e2f3..ab0a692d55b 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js b/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js index 7cfbb3515ea..355062b5084 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', 'external'], function (dep2, external) { 'use strict'; +define(['./generated-dep2', 'external'], function (dep2, external) { 'use strict'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/chunking-externals/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-externals/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-externals/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-externals/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js index d5090945ce7..66d8235034e 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js index 357ed56270f..c34f2f4cd35 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); var external = require('external'); function fn () { diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-externals/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-externals/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-externals/_expected/es/generated-dep2.js 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 ca00ac41196..f2e4ef52928 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 { f as fn$1 } from './generated-chunk.js'; +import { f as fn$1 } from './generated-dep2.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 f742263cbbe..abd4c70ed24 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 { f as fn$3 } from './generated-chunk.js'; +import { f as fn$3 } from './generated-dep2.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-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-externals/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-externals/_expected/system/generated-dep2.js 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 6d693637dce..287fda7c0e7 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$1; return { 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 c29d8e1b2ca..dc5df3486a5 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', 'external'], function (exports) { +System.register(['./generated-dep2.js', 'external'], function (exports) { 'use strict'; var fn$3, fn$2; return { diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-reexport/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-reexport/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js index 08b071d4e0a..b6fd812827f 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', 'external', './generated-chunk'], function (exports, external, dep) { 'use strict'; +define(['exports', 'external', './generated-dep'], function (exports, external, dep) { 'use strict'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js index 08b071d4e0a..b6fd812827f 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', 'external', './generated-chunk'], function (exports, external, dep) { 'use strict'; +define(['exports', 'external', './generated-dep'], function (exports, external, dep) { 'use strict'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-reexport/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-reexport/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js index 870bcdb1f33..62208a32170 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -require('./generated-chunk.js'); +require('./generated-dep.js'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js index 870bcdb1f33..62208a32170 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -require('./generated-chunk.js'); +require('./generated-dep.js'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-reexport/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-reexport/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-reexport/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js index 0cbd4e3b197..1fed25e3162 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js @@ -1,2 +1,2 @@ export { asdf as dep } from 'external'; -import './generated-chunk.js'; +import './generated-dep.js'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js index 0cbd4e3b197..1fed25e3162 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js @@ -1,2 +1,2 @@ export { asdf as dep } from 'external'; -import './generated-chunk.js'; +import './generated-dep.js'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-reexport/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js index faadde80394..06b06689d51 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['external', './generated-chunk.js'], function (exports) { +System.register(['external', './generated-dep.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js index faadde80394..06b06689d51 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['external', './generated-chunk.js'], function (exports) { +System.register(['external', './generated-dep.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js.map deleted file mode 100644 index 889b063cea7..00000000000 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"generated-chunk.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;EAAO,SAAS,EAAE,IAAI;EACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;GAAC,DCAM,SAASA,IAAE,IAAI;EACtB,EAAEC,EAAK,EAAE,CAAC;EACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js similarity index 81% rename from test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js index e40b3592122..a425552f5bd 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js @@ -12,4 +12,4 @@ define(['exports'], function (exports) { 'use strict'; exports.fn = fn$1; }); -//# sourceMappingURL=generated-chunk.js.map +//# sourceMappingURL=generated-dep2.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js.map new file mode 100644 index 00000000000..59ecdb33e93 --- /dev/null +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"generated-dep2.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;EAAO,SAAS,EAAE,IAAI;EACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;GAAC,DCAM,SAASA,IAAE,IAAI;EACtB,EAAEC,EAAK,EAAE,CAAC;EACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js index 0afd0b1be07..81c55bbb6dd 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js index ede2faa9fa4..15ec43aa23f 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js.map deleted file mode 100644 index d3b0b7b652f..00000000000 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"generated-chunk.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js similarity index 75% rename from test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js index 7f8cbaf709e..92b096d5d75 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js @@ -10,4 +10,4 @@ function fn$1 () { } exports.fn = fn$1; -//# sourceMappingURL=generated-chunk.js.map +//# sourceMappingURL=generated-dep2.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js.map new file mode 100644 index 00000000000..2c922a47bea --- /dev/null +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"generated-dep2.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js index 4f1ae2dd061..ddd5bdb5938 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js index 575b4056b99..c0adb3595f3 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js.map deleted file mode 100644 index 774134b72a1..00000000000 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"generated-chunk.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":"AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;;;"} \ No newline at end of file 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-dep2.js similarity index 73% rename from test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js index c25a283ed38..4eb77fee44a 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-dep2.js @@ -8,4 +8,4 @@ function fn$1 () { } export { fn$1 as f }; -//# sourceMappingURL=generated-chunk.js.map +//# sourceMappingURL=generated-dep2.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js.map new file mode 100644 index 00000000000..11f05890cad --- /dev/null +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"generated-dep2.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":"AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;;;"} \ No newline at end of file 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 8a8989c6776..4075e0cecd4 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 { f as fn$1 } from './generated-chunk.js'; +import { f as fn$1 } from './generated-dep2.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 cc4066eb98f..6f468343738 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 { f as fn$2 } from './generated-chunk.js'; +import { f as fn$2 } from './generated-dep2.js'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js.map deleted file mode 100644 index c111870654d..00000000000 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"generated-chunk.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;;;;;;MAAO,SAAS,EAAE,IAAI;MACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;OAAC,DCAM,SAASA,IAAE,IAAI;MACtB,EAAEC,EAAK,EAAE,CAAC;MACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;;;;;"} \ No newline at end of file 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-dep2.js similarity index 86% rename from test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js index e9142c04be5..a0e17d1c7b9 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-dep2.js @@ -17,4 +17,4 @@ System.register([], function (exports) { } }; }); -//# sourceMappingURL=generated-chunk.js.map +//# sourceMappingURL=generated-dep2.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js.map new file mode 100644 index 00000000000..272d56b572b --- /dev/null +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"generated-dep2.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;;;;;;MAAO,SAAS,EAAE,IAAI;MACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;OAAC,DCAM,SAASA,IAAE,IAAI;MACtB,EAAEC,EAAK,EAAE,CAAC;MACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;;;;;"} \ No newline at end of file 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 93359f8e776..2ac9cf86864 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$1; return { 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 841980499c9..3ebabf501c0 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$2; return { diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-star-external/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-star-external/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js index 18a8affa0de..1422f08ba64 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', 'starexternal1', 'external1', 'starexternal2', 'external2', './generated-chunk'], function (exports, starexternal1, external1, starexternal2, external2, dep) { 'use strict'; +define(['exports', 'starexternal1', 'external1', 'starexternal2', 'external2', './generated-dep'], function (exports, starexternal1, external1, starexternal2, external2, dep) { 'use strict'; var main = '1'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js index 3f3fc18f276..acee5c2945f 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', 'starexternal2', 'external2', './generated-chunk'], function (exports, starexternal2, external2, dep) { 'use strict'; +define(['exports', 'starexternal2', 'external2', './generated-dep'], function (exports, starexternal2, external2, dep) { 'use strict'; var main = '2'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-star-external/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-star-external/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js index c4e5c7b17c1..762a44d3e1b 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js @@ -6,7 +6,7 @@ var starexternal1 = require('starexternal1'); var external1 = require('external1'); require('starexternal2'); require('external2'); -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); var main = '1'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js index 4f085285c75..d3309a99969 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var starexternal2 = require('starexternal2'); var external2 = require('external2'); -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); var main = '2'; 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-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-star-external/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-star-external/_expected/es/generated-dep.js 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 711370b13d9..9f996c19901 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 { d as dep } from './generated-chunk.js'; +export { d as dep } from './generated-dep.js'; var main = '1'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js index 4abdf641215..20781a113c7 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js @@ -1,6 +1,6 @@ export * from 'starexternal2'; export { e } from 'external2'; -export { d as dep } from './generated-chunk.js'; +export { d as dep } from './generated-dep.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-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-star-external/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js 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 db0f67ab147..ae0521bfa48 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['starexternal1', 'external1', 'starexternal2', 'external2', './generated-chunk.js'], function (exports) { +System.register(['starexternal1', 'external1', 'starexternal2', 'external2', './generated-dep.js'], function (exports) { 'use strict'; var _starExcludes = { main: 1, default: 1, e: 1, dep: 1 }; return { 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 6e8f2c8a535..b98ca0ce76e 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['starexternal2', 'external2', './generated-chunk.js'], function (exports) { +System.register(['starexternal2', 'external2', './generated-dep.js'], function (exports) { 'use strict'; var _starExcludes = { main: 1, default: 1, e: 1, dep: 1 }; return { diff --git a/test/chunking-form/samples/deconflict-globals/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deconflict-globals/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deconflict-globals/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deconflict-globals/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js index edaa6114189..ac552c3f721 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log(dep.x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js index 37f699e7206..d7edef3bc09 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log(x, dep.x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deconflict-globals/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deconflict-globals/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deconflict-globals/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js index 537c99d18e8..0c77a6eb075 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log(dep.x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js index 5da40c6f426..5e3d1c896ad 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log(x, dep.x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/es/generated-chunk.js b/test/chunking-form/samples/deconflict-globals/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deconflict-globals/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deconflict-globals/_expected/es/generated-dep.js 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 4436c56e0e7..720f2805c01 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 { x } from './generated-chunk.js'; +import { x } from './generated-dep.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 fb76b1827a3..a6a74bf24d0 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 { x as x$1 } from './generated-chunk.js'; +import { x as x$1 } from './generated-dep.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-dep.js similarity index 100% rename from test/chunking-form/samples/deconflict-globals/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deconflict-globals/_expected/system/generated-dep.js 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 15286672325..d1b8162d68e 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var x; return { 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 1c6ae62b1de..66912a652cf 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var x$1; return { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/generated-proxy2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/generated-proxy2.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js index feee89f7078..852bac0cf6c 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (proxy2) { 'use strict'; +define(['./generated-proxy2'], function (proxy2) { 'use strict'; console.log(proxy2.bar, proxy2.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js index feee89f7078..852bac0cf6c 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (proxy2) { 'use strict'; +define(['./generated-proxy2'], function (proxy2) { 'use strict'; console.log(proxy2.bar, proxy2.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/generated-proxy2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/generated-proxy2.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js index 7b26323fcee..6383790cc0b 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var proxy2 = require('./generated-chunk.js'); +var proxy2 = require('./generated-proxy2.js'); console.log(proxy2.bar, proxy2.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js index 7b26323fcee..6383790cc0b 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var proxy2 = require('./generated-chunk.js'); +var proxy2 = require('./generated-proxy2.js'); console.log(proxy2.bar, proxy2.bar); 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-proxy2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-proxy2.js 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 ae77e303194..b71bc0a690d 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 { f as bar } from './generated-chunk.js'; +import { f as bar } from './generated-proxy2.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 ae77e303194..b71bc0a690d 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 { f as bar } from './generated-chunk.js'; +import { f as bar } from './generated-proxy2.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-proxy2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-proxy2.js 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 95ef8b50f7f..b3f6f3d4d4c 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-proxy2.js'], function () { 'use strict'; var bar; return { 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 95ef8b50f7f..b3f6f3d4d4c 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-proxy2.js'], function () { 'use strict'; var bar; return { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/generated-proxy.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/generated-proxy.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js index 2d85f4f5f0d..1980708e4d1 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (proxy) { 'use strict'; +define(['./generated-proxy'], function (proxy) { 'use strict'; console.log(proxy.bar, proxy.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js index 2d85f4f5f0d..1980708e4d1 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (proxy) { 'use strict'; +define(['./generated-proxy'], function (proxy) { 'use strict'; console.log(proxy.bar, proxy.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/generated-proxy.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/generated-proxy.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js index 55c9b13cb7e..9c53aa9f1d2 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var proxy = require('./generated-chunk.js'); +var proxy = require('./generated-proxy.js'); console.log(proxy.bar, proxy.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js index 55c9b13cb7e..9c53aa9f1d2 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var proxy = require('./generated-chunk.js'); +var proxy = require('./generated-proxy.js'); console.log(proxy.bar, proxy.bar); 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-proxy.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-proxy.js 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 ae77e303194..c3422bfdcdf 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 { f as bar } from './generated-chunk.js'; +import { f as bar } from './generated-proxy.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 ae77e303194..c3422bfdcdf 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 { f as bar } from './generated-chunk.js'; +import { f as bar } from './generated-proxy.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-proxy.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-proxy.js 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 95ef8b50f7f..ce5d2ec5a67 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-proxy.js'], function () { 'use strict'; var bar; return { 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 95ef8b50f7f..ce5d2ec5a67 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-proxy.js'], function () { 'use strict'; var bar; return { diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/generated-chunk.js b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/generated-module3.js similarity index 100% rename from test/chunking-form/samples/default-export-name-conflict/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/default-export-name-conflict/_expected/amd/generated-module3.js diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js index be83c4e0d05..ebd2ea34dc8 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (module3) { 'use strict'; +define(['./generated-module3'], function (module3) { 'use strict'; console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js index be83c4e0d05..ebd2ea34dc8 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (module3) { 'use strict'; +define(['./generated-module3'], function (module3) { 'use strict'; console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/generated-module3.js similarity index 100% rename from test/chunking-form/samples/default-export-name-conflict/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/default-export-name-conflict/_expected/cjs/generated-module3.js diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js index 4bead314162..d6c9a2821fe 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var module3 = require('./generated-chunk.js'); +var module3 = require('./generated-module3.js'); console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js index 4bead314162..d6c9a2821fe 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var module3 = require('./generated-chunk.js'); +var module3 = require('./generated-module3.js'); console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/es/generated-chunk.js b/test/chunking-form/samples/default-export-name-conflict/_expected/es/generated-module3.js similarity index 100% rename from test/chunking-form/samples/default-export-name-conflict/_expected/es/generated-chunk.js rename to test/chunking-form/samples/default-export-name-conflict/_expected/es/generated-module3.js diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/es/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/es/main1.js index 2e9179b6dc9..9fd5cf8f8e8 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/es/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { a as b } from './generated-chunk.js'; +import { a as b } from './generated-module3.js'; console.log(b, b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/es/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/es/main2.js index 2e9179b6dc9..9fd5cf8f8e8 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/es/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { a as b } from './generated-chunk.js'; +import { a as b } from './generated-module3.js'; console.log(b, b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/system/generated-chunk.js b/test/chunking-form/samples/default-export-name-conflict/_expected/system/generated-module3.js similarity index 100% rename from test/chunking-form/samples/default-export-name-conflict/_expected/system/generated-chunk.js rename to test/chunking-form/samples/default-export-name-conflict/_expected/system/generated-module3.js diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js index 123cb9a65df..eb97faed58a 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-module3.js'], function () { 'use strict'; var b; return { diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js index 123cb9a65df..eb97faed58a 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-module3.js'], function () { 'use strict'; var b; return { diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/generated-chunk.js b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/generated-shared.js similarity index 100% rename from test/chunking-form/samples/default-identifier-renaming/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/default-identifier-renaming/_expected/amd/generated-shared.js diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js index 9fe0088b29a..250e2287d45 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (shared) { 'use strict'; +define(['./generated-shared'], function (shared) { 'use strict'; var main1 = shared.d.map(d => d + 1); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js index b80ae0d3892..9f1de21690f 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (shared) { 'use strict'; +define(['./generated-shared'], function (shared) { 'use strict'; var main2 = shared.d.map(d => d + 2); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/generated-shared.js similarity index 100% rename from test/chunking-form/samples/default-identifier-renaming/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/default-identifier-renaming/_expected/cjs/generated-shared.js diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js index 36e411ab23e..d31052f2951 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./generated-chunk.js'); +var shared = require('./generated-shared.js'); var main1 = shared.d.map(d => d + 1); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js index ce051f9dca8..d4cd65916b3 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./generated-chunk.js'); +var shared = require('./generated-shared.js'); var main2 = shared.d.map(d => d + 2); 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-shared.js similarity index 100% rename from test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-chunk.js rename to test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-shared.js 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 7751da1485f..0147e14293c 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 { d } from './generated-chunk.js'; +import { d } from './generated-shared.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 1029203efe8..45d7c4f0e3f 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 { d } from './generated-chunk.js'; +import { d } from './generated-shared.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-shared.js similarity index 100% rename from test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-chunk.js rename to test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-shared.js 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 4b7d94d9d89..227a431f5a9 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-shared.js'], function (exports) { 'use strict'; var d; return { 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 15f9ff21e60..b872e5d5df4 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-shared.js'], function (exports) { 'use strict'; var d; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js index eb910f88982..5b7a3c5e857 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js @@ -1,4 +1,4 @@ -define(['../generated-chunk'], function (dep) { 'use strict'; +define(['../generated-dep'], function (dep) { 'use strict'; console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js index 2fe39264b7d..764805deda3 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js index 95376156df4..b69626e539a 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('../generated-chunk.js'); +var dep = require('../generated-dep.js'); console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js index c199d16a106..4c79b32a701 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js index 015c2211ce2..cceb51002be 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js @@ -1,3 +1,3 @@ -import { v as value } from '../generated-chunk.js'; +import { v as value } from '../generated-dep.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js index 9ccd67b1a67..da4e855f39a 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js index f366fbd644f..2655f9f646f 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js @@ -1,4 +1,4 @@ -System.register(['../generated-chunk.js'], function () { +System.register(['../generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js index 8a46bd2bdb1..13eec5478ac 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js index 9ec11065a3b..de59be73c36 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js @@ -1,4 +1,4 @@ -define(['./chunk'], function (shared) { 'use strict'; +define(['./shared'], function (shared) { 'use strict'; postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js index faaeaec8554..cc2e4dd2ca3 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; +define(['require', './chunks/shared'], function (require, shared) { 'use strict'; const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker(new URL(require.toUrl('./chunks/worker-proxy.js'), document.baseURI).href); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js index 4b96dadad63..c12a25e95f5 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js @@ -1,5 +1,5 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js index 5da3cf5ccfe..f8fd02b76dc 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worker-proxy.js').href : new URL('chunks/worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js index d4a13865f89..376c9cd1a99 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js @@ -1,3 +1,3 @@ -import { s as shared } from './chunk.js'; +import { s as shared } from './shared.js'; postMessage(`from worker: ${shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js index 542f42d06f6..19521653160 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js @@ -1,4 +1,4 @@ -import { s as shared } from './chunks/chunk.js'; +import { s as shared } from './chunks/shared.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/deprecated/emit-chunk-worker/_expected/system/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js index b8ae183e3d0..1013f55b394 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function () { +System.register(['./shared.js'], function () { 'use strict'; var shared; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js index c1b3d8a5a2f..4ee1bb4ab60 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var shared; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js index 9ce3b8ea497..f96f283ad52 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js @@ -1,4 +1,4 @@ -define(['./chunk'], function (shared) { 'use strict'; +define(['./shared'], function (shared) { 'use strict'; registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js index 4f1f66e5fe0..bf73a6f1543 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; +define(['require', './chunks/shared'], function (require, shared) { 'use strict'; CSS.paintWorklet.addModule(new URL(require.toUrl('./chunks/worklet.js'), document.baseURI).href); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js index c825979c594..55c46f65372 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js index 112043ba7d4..6ba79bfb0e6 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); CSS.paintWorklet.addModule((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worklet.js').href : new URL('chunks/worklet.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js index 43f54d48cc8..7ae737842e0 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js @@ -1,4 +1,4 @@ -import { s as size, c as color } from './chunk.js'; +import { s as size, c as color } from './shared.js'; registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js index cda6f00a5b0..fc0e00f5183 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js @@ -1,4 +1,4 @@ -import { c as color, s as size } from './chunks/chunk.js'; +import { c as color, s as size } from './chunks/shared.js'; CSS.paintWorklet.addModule(new URL('chunks/worklet.js', import.meta.url).href); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js index 95fe01bb0b4..9cb6055973e 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function () { +System.register(['./shared.js'], function () { 'use strict'; var size, color; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js index b07122b3d50..3165374294e 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var color, size; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js index e71ca60c322..05dda0e01f3 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js index 2fe39264b7d..764805deda3 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js index 01502f79482..cfa8c788f1d 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js index c199d16a106..4c79b32a701 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js index e243252b0c2..fbe237d2ce7 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js index 9ccd67b1a67..da4e855f39a 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js index a19c2c2d671..08465151e63 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js index 8a46bd2bdb1..13eec5478ac 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep2.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep2.js index 0ff0154a980..d2c7c803984 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep2.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep2.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, dep4) { 'use strict'; +define(['exports', './generated-dep4'], function (exports, dep4) { 'use strict'; function mult (num) { return num + dep4.multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-chunk.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep4.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep4.js diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/main.js index f5e55c8be42..5c0dffc9c3c 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './generated-chunk'], function (require, dep4) { 'use strict'; +define(['require', './generated-dep4'], function (require, dep4) { 'use strict'; function calc (num) { return num * dep4.multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep2.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep2.js index 9ffd19ad726..b163fd7ef4b 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep2.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep4 = require('./generated-chunk.js'); +var dep4 = require('./generated-dep4.js'); function mult (num) { return num + dep4.multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep4.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep4.js diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/main.js index a1ce7cc13ec..7cb456918e0 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var dep4 = require('./generated-chunk.js'); +var dep4 = require('./generated-dep4.js'); function calc (num) { return num * dep4.multiplier; 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 8655410d7af..fa5260712e6 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 { m as multiplier } from './generated-chunk.js'; +import { m as multiplier } from './generated-dep4.js'; function mult (num) { return num + multiplier; 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-dep4.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep4.js 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 5595d47dfdb..8b874a64bb6 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 { m as multiplier } from './generated-chunk.js'; +import { m as multiplier } from './generated-dep4.js'; function calc (num) { return num * multiplier; 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 e732ae148d1..d7b8dfdb5f6 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep4.js'], function (exports) { 'use strict'; var multiplier; return { 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-dep4.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep4.js 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 5acaa3bb59c..72783a72455 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports, module) { +System.register(['./generated-dep4.js'], function (exports, module) { 'use strict'; var multiplier; return { diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-chunk.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-chunk.js deleted file mode 100644 index 7c2370c19a3..00000000000 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-chunk.js +++ /dev/null @@ -1,13 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - console.log('dep'); - - const dep = 'dep'; - - console.log('dynamic', dep); - const dynamic = 'dynamic'; - - exports.dep = dep; - exports.dynamic = dynamic; - -}); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic.js index f5831da416e..7c2370c19a3 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic.js @@ -1,7 +1,13 @@ -define(['exports', './generated-chunk'], function (exports, dynamic) { 'use strict'; +define(['exports'], function (exports) { 'use strict'; + console.log('dep'); + const dep = 'dep'; - exports.dynamic = dynamic.dynamic; + console.log('dynamic', dep); + const dynamic = 'dynamic'; + + exports.dep = dep; + exports.dynamic = dynamic; }); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic2.js new file mode 100644 index 00000000000..549cac73f1e --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic2.js @@ -0,0 +1,7 @@ +define(['exports', './generated-dynamic'], function (exports, dynamic) { 'use strict'; + + + + exports.dynamic = dynamic.dynamic; + +}); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main1.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main1.js index 4dc4a80e97f..0f84ec99a44 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main1.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main1.js @@ -1,5 +1,5 @@ define(['require'], function (require) { 'use strict'; - new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }).then(({dynamic}) => console.log('main1', dynamic)); + new Promise(function (resolve, reject) { require(['./generated-dynamic2'], resolve, reject) }).then(({dynamic}) => console.log('main1', dynamic)); }); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main2.js index 0efdba2aa84..1974c7d9afd 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main2.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dynamic) { 'use strict'; +define(['./generated-dynamic'], function (dynamic) { 'use strict'; console.log('main2', dynamic.dynamic, dynamic.dep); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-chunk.js deleted file mode 100644 index 210a1e1c5bc..00000000000 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-chunk.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -console.log('dep'); - -const dep = 'dep'; - -console.log('dynamic', dep); -const dynamic = 'dynamic'; - -exports.dep = dep; -exports.dynamic = dynamic; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic.js index 9ce0252a483..210a1e1c5bc 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic.js @@ -1,7 +1,11 @@ 'use strict'; -var dynamic = require('./generated-chunk.js'); +console.log('dep'); +const dep = 'dep'; +console.log('dynamic', dep); +const dynamic = 'dynamic'; -exports.dynamic = dynamic.dynamic; +exports.dep = dep; +exports.dynamic = dynamic; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic2.js new file mode 100644 index 00000000000..db9f8d3d094 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic2.js @@ -0,0 +1,7 @@ +'use strict'; + +var dynamic = require('./generated-dynamic.js'); + + + +exports.dynamic = dynamic.dynamic; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main1.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main1.js index 94c55f49481..0a1d6b0432e 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main1.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main1.js @@ -1,3 +1,3 @@ 'use strict'; -new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }).then(({dynamic}) => console.log('main1', dynamic)); +new Promise(function (resolve) { resolve(require('./generated-dynamic2.js')); }).then(({dynamic}) => console.log('main1', dynamic)); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main2.js index 924410b061d..3276a034886 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main2.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var dynamic = require('./generated-chunk.js'); +var dynamic = require('./generated-dynamic.js'); console.log('main2', dynamic.dynamic, dynamic.dep); 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 deleted file mode 100644 index a0ce15fe84a..00000000000 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js +++ /dev/null @@ -1,8 +0,0 @@ -console.log('dep'); - -const dep = 'dep'; - -console.log('dynamic', dep); -const dynamic = 'dynamic'; - -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 44d1ba0252e..a0ce15fe84a 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,8 @@ -export { d as dynamic } from './generated-chunk.js'; +console.log('dep'); + +const dep = 'dep'; + +console.log('dynamic', dep); +const dynamic = 'dynamic'; + +export { dep as a, dynamic as d }; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic2.js new file mode 100644 index 00000000000..ebf2d6f8467 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic2.js @@ -0,0 +1 @@ +export { d as dynamic } from './generated-dynamic.js'; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/main1.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/main1.js index 2fbb59a4af9..cf5d3a31f7e 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/es/main1.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/es/main1.js @@ -1 +1 @@ -import('./generated-dynamic.js').then(({dynamic}) => console.log('main1', dynamic)); +import('./generated-dynamic2.js').then(({dynamic}) => console.log('main1', dynamic)); 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 7ede9cb8d15..90795a3d8bd 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 { d as dynamic, a as dep } from './generated-chunk.js'; +import { d as dynamic, a as dep } from './generated-dynamic.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 deleted file mode 100644 index 0605f07ef7e..00000000000 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js +++ /dev/null @@ -1,15 +0,0 @@ -System.register([], function (exports) { - 'use strict'; - return { - execute: function () { - - console.log('dep'); - - const dep = exports('a', 'dep'); - - console.log('dynamic', dep); - 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 1ed42711b01..0605f07ef7e 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 @@ -1,12 +1,14 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register([], function (exports) { 'use strict'; return { - setters: [function (module) { - exports('dynamic', module.d); - }], execute: function () { + console.log('dep'); + const dep = exports('a', 'dep'); + + console.log('dynamic', dep); + const dynamic = exports('d', 'dynamic'); } }; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic2.js new file mode 100644 index 00000000000..4d3438486d2 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic2.js @@ -0,0 +1,13 @@ +System.register(['./generated-dynamic.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('dynamic', module.d); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main1.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main1.js index c49f55149f2..2cb9535c9b4 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main1.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - module.import('./generated-dynamic.js').then(({dynamic}) => console.log('main1', dynamic)); + module.import('./generated-dynamic2.js').then(({dynamic}) => console.log('main1', dynamic)); } }; 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 5801a3edbbe..48bd74f53c6 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dynamic.js'], function () { 'use strict'; var dynamic, dep; return { diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep1.js index 4c6c80f1699..2ec5ef78f0c 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep1.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep1.js @@ -1,7 +1,20 @@ -define(['exports', './generated-chunk'], function (exports, dep1) { 'use strict'; +define(['exports'], function (exports) { 'use strict'; + function foo() { + return 'dep2'; + } + Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - exports.bar = dep1.bar; + function bar() { + return foo(); + } + + var dep1 = /*#__PURE__*/Object.freeze({ + bar: bar + }); + + exports.bar = bar; + exports.foo = foo; }); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep12.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep12.js new file mode 100644 index 00000000000..4bd11b297c4 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep12.js @@ -0,0 +1,7 @@ +define(['exports', './generated-dep1'], function (exports, dep1) { 'use strict'; + + + + exports.bar = dep1.bar; + +}); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main.js index 5f16b4ed626..cac66392a39 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; console.log(dep1.foo(), dep1.bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main2.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main2.js index 86ec013aaab..4fd363667ff 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main2.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main2.js @@ -1,5 +1,5 @@ define(['require'], function (require) { 'use strict'; - new Promise(function (resolve, reject) { require(['./generated-dep1'], resolve, reject) }).then(({ bar }) => console.log(bar())); + new Promise(function (resolve, reject) { require(['./generated-dep12'], resolve, reject) }).then(({ bar }) => console.log(bar())); }); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep1.js index cf4187f08c2..957dd6916a7 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep1.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep1.js @@ -1,7 +1,18 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +function foo() { + return 'dep2'; +} +Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); +function bar() { + return foo(); +} -exports.bar = dep1.bar; +var dep1 = /*#__PURE__*/Object.freeze({ + bar: bar +}); + +exports.bar = bar; +exports.foo = foo; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep12.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep12.js new file mode 100644 index 00000000000..cd30893ebe8 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep12.js @@ -0,0 +1,7 @@ +'use strict'; + +var dep1 = require('./generated-dep1.js'); + + + +exports.bar = dep1.bar; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main.js index 12c7a0a7c3b..d054aa0a11c 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); console.log(dep1.foo(), dep1.bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main2.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main2.js index b910e11fb85..d87b8141b66 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main2.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main2.js @@ -1,3 +1,3 @@ 'use strict'; -new Promise(function (resolve) { resolve(require('./generated-dep1.js')); }).then(({ bar }) => console.log(bar())); +new Promise(function (resolve) { resolve(require('./generated-dep12.js')); }).then(({ bar }) => console.log(bar())); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep1.js index 2fb7ac4adeb..867796fbd1d 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep1.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep1.js @@ -1 +1,15 @@ -export { b as bar } from './generated-chunk.js'; +function foo() { + return 'dep2'; +} + +Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); + +function bar() { + return foo(); +} + +var dep1 = /*#__PURE__*/Object.freeze({ + bar: bar +}); + +export { bar as b, foo as f }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep12.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep12.js new file mode 100644 index 00000000000..d22ddbff25b --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep12.js @@ -0,0 +1 @@ +export { b as bar } from './generated-dep1.js'; 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 7b5156785f9..793f396d0ba 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 { f as foo, b as bar } from './generated-chunk.js'; +import { f as foo, b as bar } from './generated-dep1.js'; console.log(foo(), bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main2.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main2.js index 00aba354edb..970b0eb472e 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main2.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main2.js @@ -1 +1 @@ -import('./generated-dep1.js').then(({ bar }) => console.log(bar())); +import('./generated-dep12.js').then(({ bar }) => console.log(bar())); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep1.js index dfd0e6bfdcf..7c01c4d8b46 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep1.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep1.js @@ -1,12 +1,26 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register([], function (exports) { 'use strict'; return { - setters: [function (module) { - exports('bar', module.b); - }], execute: function () { + exports({ + b: bar, + f: foo + }); + function foo() { + return 'dep2'; + } + + Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); + + function bar() { + return foo(); + } + + var dep1 = /*#__PURE__*/Object.freeze({ + bar: bar + }); } }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep12.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep12.js new file mode 100644 index 00000000000..b9da72c55c7 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep12.js @@ -0,0 +1,13 @@ +System.register(['./generated-dep1.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('bar', module.b); + }], + execute: function () { + + + + } + }; +}); 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 c6ba95561cb..1f0c72ea5a1 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep1.js'], function () { 'use strict'; var foo, bar; return { diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main2.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main2.js index 2f2c41db6e5..32925b05438 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main2.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - module.import('./generated-dep1.js').then(({ bar }) => console.log(bar())); + module.import('./generated-dep12.js').then(({ bar }) => console.log(bar())); } }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-chunk.js deleted file mode 100644 index 2ec5ef78f0c..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-chunk.js +++ /dev/null @@ -1,20 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - function foo() { - return 'dep2'; - } - - Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - - function bar() { - return foo(); - } - - var dep1 = /*#__PURE__*/Object.freeze({ - bar: bar - }); - - exports.bar = bar; - exports.foo = foo; - -}); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/main.js index 5f16b4ed626..cac66392a39 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; console.log(dep1.foo(), dep1.bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-chunk.js deleted file mode 100644 index 957dd6916a7..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-chunk.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; - -function foo() { - return 'dep2'; -} - -Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - -function bar() { - return foo(); -} - -var dep1 = /*#__PURE__*/Object.freeze({ - bar: bar -}); - -exports.bar = bar; -exports.foo = foo; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js index 12c7a0a7c3b..d054aa0a11c 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); console.log(dep1.foo(), dep1.bar()); 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 deleted file mode 100644 index 867796fbd1d..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js +++ /dev/null @@ -1,15 +0,0 @@ -function foo() { - return 'dep2'; -} - -Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - -function bar() { - return foo(); -} - -var dep1 = /*#__PURE__*/Object.freeze({ - bar: bar -}); - -export { bar as b, foo as f }; 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/_expected/es/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-dep1.js 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 7b5156785f9..793f396d0ba 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 { f as foo, b as bar } from './generated-chunk.js'; +import { f as foo, b as bar } from './generated-dep1.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 deleted file mode 100644 index 7c01c4d8b46..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js +++ /dev/null @@ -1,27 +0,0 @@ -System.register([], function (exports) { - 'use strict'; - return { - execute: function () { - - exports({ - b: bar, - f: foo - }); - - function foo() { - return 'dep2'; - } - - Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - - function bar() { - return foo(); - } - - var dep1 = /*#__PURE__*/Object.freeze({ - bar: 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/_expected/system/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-dep1.js 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 c6ba95561cb..1f0c72ea5a1 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep1.js'], function () { 'use strict'; var foo, bar; return { diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/other.js index ac567d0a690..9015a82be2e 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/other.js +++ b/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/other.js @@ -1,4 +1,4 @@ -define(['exports', './chunk'], function (exports, shared) { 'use strict'; +define(['exports', './shared'], function (exports, shared) { 'use strict'; diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/dynamic-import/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/dynamic-import/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js index 3578eb39061..c6b551a83c2 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', 'exports', './chunks/chunk'], function (require, exports, shared) { 'use strict'; +define(['require', 'exports', './chunks/shared'], function (require, exports, shared) { 'use strict'; assert.equal(shared.sharedValue, 'shared'); diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js index 84df05fe8fd..90d22b547c6 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js +++ b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js index 64eec88f4c8..d3c2764b413 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); assert.equal(shared.sharedValue, 'shared'); 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 f77a7605c9b..ff838bd038b 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 { s as value } from './chunk.js'; +export { s as value } from './shared.js'; diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/dynamic-import/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/dynamic-import/_expected/es/chunks/shared.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 45fed222df0..4c4ca183a1e 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 { s as sharedValue } from './chunks/chunk.js'; +import { s as sharedValue } from './chunks/shared.js'; assert.equal(sharedValue, '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 49bbf27adb6..201777a5cbe 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 @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function (exports) { +System.register(['./shared.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/dynamic-import/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/dynamic-import/_expected/system/chunks/shared.js 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 ab84a618663..a8d72ea45f1 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var sharedValue; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js index 4a511049e9a..abad92080cc 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js @@ -20,7 +20,7 @@ module.exports = { assert.deepStrictEqual(Object.keys(bundle).map(key => bundle[key].name), [ 'build-start-chunk', 'main', - 'chunk' + 'dep' ]); } } diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js index c7f12af1025..bc0871d46b1 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js @@ -1,4 +1,4 @@ -define(['exports', '../generated-chunk'], function (exports, dep) { 'use strict'; +define(['exports', '../generated-dep'], function (exports, dep) { 'use strict'; const id = 'startBuild'; console.log(id, dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js index 5ab113347f0..1ee89bd0e67 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './custom/build-start-chunk'], function (dep, buildStart) { 'use strict'; +define(['./generated-dep', './custom/build-start-chunk'], function (dep, buildStart) { 'use strict'; console.log(buildStart.id); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js index c619394654a..54e70b3a4af 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var dep = require('../generated-chunk.js'); +var dep = require('../generated-dep.js'); const id = 'startBuild'; console.log(id, dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js index 33c4c2c445e..036ef6a6055 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); var buildStart = require('./custom/build-start-chunk.js'); console.log(buildStart.id); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js index 8125f265dc7..c9077d82bfd 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js @@ -1,4 +1,4 @@ -import { v as value } from '../generated-chunk.js'; +import { v as value } from '../generated-dep.js'; const id = 'startBuild'; console.log(id, value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js index c07ac33243f..b291dee7947 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js @@ -1,4 +1,4 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; import { id } from './custom/build-start-chunk.js'; console.log(id); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js index e740725842c..e830592fd37 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js @@ -1,4 +1,4 @@ -System.register(['../generated-chunk.js'], function (exports) { +System.register(['../generated-dep.js'], function (exports) { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js index d95239821e0..cc7bf937631 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './custom/build-start-chunk.js'], function () { +System.register(['./generated-dep.js', './custom/build-start-chunk.js'], function () { 'use strict'; var value, id; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js index eb910f88982..5b7a3c5e857 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js @@ -1,4 +1,4 @@ -define(['../generated-chunk'], function (dep) { 'use strict'; +define(['../generated-dep'], function (dep) { 'use strict'; console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js index 2fe39264b7d..764805deda3 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js index 95376156df4..b69626e539a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('../generated-chunk.js'); +var dep = require('../generated-dep.js'); console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js index c199d16a106..4c79b32a701 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js index 015c2211ce2..cceb51002be 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js @@ -1,3 +1,3 @@ -import { v as value } from '../generated-chunk.js'; +import { v as value } from '../generated-dep.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js index 9ccd67b1a67..da4e855f39a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js index f366fbd644f..2655f9f646f 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js @@ -1,4 +1,4 @@ -System.register(['../generated-chunk.js'], function () { +System.register(['../generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js index 8a46bd2bdb1..13eec5478ac 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js index 9ec11065a3b..de59be73c36 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js @@ -1,4 +1,4 @@ -define(['./chunk'], function (shared) { 'use strict'; +define(['./shared'], function (shared) { 'use strict'; postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js index faaeaec8554..cc2e4dd2ca3 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; +define(['require', './chunks/shared'], function (require, shared) { 'use strict'; const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker(new URL(require.toUrl('./chunks/worker-proxy.js'), document.baseURI).href); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js index 4b96dadad63..c12a25e95f5 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js @@ -1,5 +1,5 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js index 5da3cf5ccfe..f8fd02b76dc 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worker-proxy.js').href : new URL('chunks/worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js index d4a13865f89..376c9cd1a99 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js @@ -1,3 +1,3 @@ -import { s as shared } from './chunk.js'; +import { s as shared } from './shared.js'; postMessage(`from worker: ${shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js index 542f42d06f6..19521653160 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js @@ -1,4 +1,4 @@ -import { s as shared } from './chunks/chunk.js'; +import { s as shared } from './chunks/shared.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-file/emit-chunk-worker/_expected/system/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js index b8ae183e3d0..1013f55b394 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function () { +System.register(['./shared.js'], function () { 'use strict'; var shared; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js index c1b3d8a5a2f..4ee1bb4ab60 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var shared; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js index 9ce3b8ea497..f96f283ad52 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js @@ -1,4 +1,4 @@ -define(['./chunk'], function (shared) { 'use strict'; +define(['./shared'], function (shared) { 'use strict'; registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js index 4f1f66e5fe0..bf73a6f1543 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; +define(['require', './chunks/shared'], function (require, shared) { 'use strict'; CSS.paintWorklet.addModule(new URL(require.toUrl('./chunks/worklet.js'), document.baseURI).href); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js index c825979c594..55c46f65372 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js index 112043ba7d4..6ba79bfb0e6 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); CSS.paintWorklet.addModule((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worklet.js').href : new URL('chunks/worklet.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js index 43f54d48cc8..7ae737842e0 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js @@ -1,4 +1,4 @@ -import { s as size, c as color } from './chunk.js'; +import { s as size, c as color } from './shared.js'; registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js index cda6f00a5b0..fc0e00f5183 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js @@ -1,4 +1,4 @@ -import { c as color, s as size } from './chunks/chunk.js'; +import { c as color, s as size } from './chunks/shared.js'; CSS.paintWorklet.addModule(new URL('chunks/worklet.js', import.meta.url).href); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js index 95fe01bb0b4..9cb6055973e 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function () { +System.register(['./shared.js'], function () { 'use strict'; var size, color; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js index b07122b3d50..3165374294e 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var color, size; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js index e71ca60c322..05dda0e01f3 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js index 2fe39264b7d..764805deda3 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js index 01502f79482..cfa8c788f1d 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js index c199d16a106..4c79b32a701 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js index e243252b0c2..fbe237d2ce7 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js index 9ccd67b1a67..da4e855f39a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js index a19c2c2d671..08465151e63 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js index 8a46bd2bdb1..13eec5478ac 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/generated-chunk.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/generated-m1.js similarity index 100% rename from test/chunking-form/samples/entry-point-without-own-code/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/entry-point-without-own-code/_expected/amd/generated-m1.js diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js index 2e73f2c4072..b95c6ca797c 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js @@ -1,4 +1,4 @@ -define(['exports', './m2', './generated-chunk'], function (exports, m2, m1) { 'use strict'; +define(['exports', './m2', './generated-m1'], function (exports, m2, m1) { 'use strict'; diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js index c56ed5a438c..fd4897a745b 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./m2', './generated-chunk'], function (m2, m1) { 'use strict'; +define(['./m2', './generated-m1'], function (m2, m1) { 'use strict'; console.log(m1.ms); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/generated-m1.js similarity index 100% rename from test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/generated-m1.js diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js index 69e845c1c87..9b97781f444 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var m2 = require('./m2.js'); -require('./generated-chunk.js'); +require('./generated-m1.js'); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js index cab9d88907e..a7ba4a72c65 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; require('./m2.js'); -var m1 = require('./generated-chunk.js'); +var m1 = require('./generated-m1.js'); console.log(m1.ms); 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-m1.js similarity index 100% rename from test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-chunk.js rename to test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-m1.js diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m1.js index 60888641454..a0461824120 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m1.js @@ -1,2 +1,2 @@ export { default as m2 } from './m2.js'; -import './generated-chunk.js'; +import './generated-m1.js'; diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js index b68936e6d94..107671de693 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js @@ -1,4 +1,4 @@ import './m2.js'; -import { a as ms } from './generated-chunk.js'; +import { a as ms } from './generated-m1.js'; console.log(ms); 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-m1.js similarity index 100% rename from test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-chunk.js rename to test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js index 4474abd1206..5f74314c76e 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js @@ -1,4 +1,4 @@ -System.register(['./m2.js', './generated-chunk.js'], function (exports) { +System.register(['./m2.js', './generated-m1.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js index 6f7bc939a64..6c433a4d441 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./m2.js', './generated-chunk.js'], function () { +System.register(['./m2.js', './generated-m1.js'], function () { 'use strict'; var ms; return { diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/generated-main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-aliasing/_expected/amd/generated-main2alias.js rename to test/chunking-form/samples/entrypoint-aliasing/_expected/amd/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main1alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main1alias.js index bac6f259fff..c58fe8910da 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main1alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main1alias.js @@ -1,4 +1,4 @@ -define(['./generated-main2alias'], function (main2alias) { 'use strict'; +define(['./generated-main2'], function (main2alias) { 'use strict'; main2alias.log(main2alias.dep); diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main2alias.js index 2747e887cd9..61ab8e7d7a6 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main2alias.js @@ -1,4 +1,4 @@ -define(['./generated-main2alias'], function (main2alias) { 'use strict'; +define(['./generated-main2'], function (main2alias) { 'use strict'; diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/generated-main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/generated-main2alias.js rename to test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main1alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main1alias.js index 9f4d3bf034c..528760feda2 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main1alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main1alias.js @@ -1,5 +1,5 @@ 'use strict'; -var main2alias = require('./generated-main2alias.js'); +var main2alias = require('./generated-main2.js'); main2alias.log(main2alias.dep); diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main2alias.js index 449c18d87bb..69b1826b762 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main2alias.js @@ -1,6 +1,6 @@ 'use strict'; -var main2alias = require('./generated-main2alias.js'); +var main2alias = require('./generated-main2.js'); diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2alias.js rename to test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2.js 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 5053a9cfe5a..7ad3b06e91d 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 { l as log, d as dep } from './generated-main2alias.js'; +import { l as log, d as dep } from './generated-main2.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 3b08b759c45..d74b87aba77 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 { l as default } from './generated-main2alias.js'; +export { l as default } from './generated-main2.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-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2alias.js rename to test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2.js 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 97c73a3bfa6..8eddd1df106 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js @@ -1,4 +1,4 @@ -System.register(['./generated-main2alias.js'], function () { +System.register(['./generated-main2.js'], function () { 'use strict'; var log, dep; return { 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 c5d63486e0e..94afaca11b1 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js @@ -1,4 +1,4 @@ -System.register(['./generated-main2alias.js'], function (exports) { +System.register(['./generated-main2.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/amd/generated-chunk.js b/test/chunking-form/samples/entrypoint-facade/_expected/amd/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-facade/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/entrypoint-facade/_expected/amd/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/amd/main1.js b/test/chunking-form/samples/entrypoint-facade/_expected/amd/main1.js index 4b813479b19..b319e7ebff9 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/amd/main1.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (main2) { 'use strict'; +define(['./generated-main2'], function (main2) { 'use strict'; main2.log(main2.dep); diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/amd/main2.js b/test/chunking-form/samples/entrypoint-facade/_expected/amd/main2.js index dca57e6bdbb..e4a115ee883 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/amd/main2.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (main2) { 'use strict'; +define(['./generated-main2'], function (main2) { 'use strict'; diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-facade/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/entrypoint-facade/_expected/cjs/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main1.js b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main1.js index 0f9129ef76b..6c0864d0770 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main1.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var main2 = require('./generated-chunk.js'); +var main2 = require('./generated-main2.js'); main2.log(main2.dep); diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main2.js b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main2.js index 30320fc1844..1cca608acf8 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main2.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var main2 = require('./generated-chunk.js'); +var main2 = require('./generated-main2.js'); diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/es/generated-chunk.js b/test/chunking-form/samples/entrypoint-facade/_expected/es/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-facade/_expected/es/generated-chunk.js rename to test/chunking-form/samples/entrypoint-facade/_expected/es/generated-main2.js 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 9e409ed6e90..7ad3b06e91d 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 { l as log, d as dep } from './generated-chunk.js'; +import { l as log, d as dep } from './generated-main2.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 022c729be82..d74b87aba77 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 { l as default } from './generated-chunk.js'; +export { l as default } from './generated-main2.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-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-facade/_expected/system/generated-chunk.js rename to test/chunking-form/samples/entrypoint-facade/_expected/system/generated-main2.js 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 e42bfafc58b..8eddd1df106 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-main2.js'], function () { 'use strict'; var log, dep; return { 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 8f75a67173f..94afaca11b1 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-main2.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-chunk-6bb39c19-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-6bb39c19-amd.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-chunk-6bb39c19-amd.js rename to test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-6bb39c19-amd.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-e7c7d1b5-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-e7c7d1b5-amd.js index 16b886110fd..791e2547a0f 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-e7c7d1b5-amd.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-e7c7d1b5-amd.js @@ -1,4 +1,4 @@ -define(['./chunk-chunk-6bb39c19-amd'], function (main2) { 'use strict'; +define(['./chunk-main2-6bb39c19-amd'], function (main2) { 'use strict'; main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-f9a2200a-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-f9a2200a-amd.js index eb0faba5282..0e357dbc084 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-f9a2200a-amd.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-f9a2200a-amd.js @@ -1,4 +1,4 @@ -define(['./chunk-chunk-6bb39c19-amd'], function (main2) { 'use strict'; +define(['./chunk-main2-6bb39c19-amd'], function (main2) { 'use strict'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-chunk-33c8b40d-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-33c8b40d-cjs.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-chunk-33c8b40d-cjs.js rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-33c8b40d-cjs.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-639831da-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-639831da-cjs.js index c6c3e337b7a..df68f3f3591 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-639831da-cjs.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-639831da-cjs.js @@ -1,5 +1,5 @@ 'use strict'; -var main2 = require('./chunk-chunk-33c8b40d-cjs.js'); +var main2 = require('./chunk-main2-33c8b40d-cjs.js'); main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-4508233a-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-4508233a-cjs.js index b4586862b9a..60dc76f979f 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-4508233a-cjs.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-4508233a-cjs.js @@ -1,6 +1,6 @@ 'use strict'; -var main2 = require('./chunk-chunk-33c8b40d-cjs.js'); +var main2 = require('./chunk-main2-33c8b40d-cjs.js'); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-cc2b1346-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-cc2b1346-esm.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-cc2b1346-esm.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-cc2b1346-esm.js 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 index de7ec87b1cc..d269251063e 100644 --- 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 @@ -1,3 +1,3 @@ -import { l as log, d as dep } from './chunk-chunk-cc2b1346-esm.js'; +import { l as log, d as dep } from './chunk-main2-cc2b1346-esm.js'; log(dep); 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 index 1b5ae3247da..780b6aba3d3 100644 --- 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 @@ -1 +1 @@ -export { l as default } from './chunk-chunk-cc2b1346-esm.js'; +export { l as default } from './chunk-main2-cc2b1346-esm.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-63744fb4-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-63744fb4-system.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-63744fb4-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-63744fb4-system.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js index f39349ff449..56fe0f70e2c 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-chunk-63744fb4-system.js'], function () { +System.register(['./chunk-main2-63744fb4-system.js'], function () { 'use strict'; var log, dep; return { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js index d17fe961092..74ee594635c 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-chunk-63744fb4-system.js'], function (exports) { +System.register(['./chunk-main2-63744fb4-system.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/generated-chunk.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-multiple/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/grouping-multiple/_expected/amd/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js index 7a8cf74c70d..f72ae9595ae 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep3'], function (dep1) { 'use strict'; var main1 = dep1.x + dep1.y; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js index ef71c5734fc..cd2e2da56fa 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep3'], function (dep1) { 'use strict'; var main2 = dep1.x + dep1.z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js index b0e9a23338c..d350c7f13da 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep3'], function (dep1) { 'use strict'; var main3 = dep1.y + dep1.z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-multiple/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/grouping-multiple/_expected/cjs/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js index 980f499b8ae..74fc4840ff8 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep3.js'); var main1 = dep1.x + dep1.y; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js index f006c706a6a..a27a78410d3 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep3.js'); var main2 = dep1.x + dep1.z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js index 63736fc903f..4cde9988a58 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep3.js'); var main3 = dep1.y + dep1.z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/es/generated-chunk.js b/test/chunking-form/samples/grouping-multiple/_expected/es/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-multiple/_expected/es/generated-chunk.js rename to test/chunking-form/samples/grouping-multiple/_expected/es/generated-dep3.js 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 57030d5cb31..171ce283868 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 { x, y } from './generated-chunk.js'; +import { x, y } from './generated-dep3.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 78ebdd3affe..eafaf36a946 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 { x, z } from './generated-chunk.js'; +import { x, z } from './generated-dep3.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 81053c79836..27a13fc9109 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 { y, z } from './generated-chunk.js'; +import { y, z } from './generated-dep3.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-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-multiple/_expected/system/generated-chunk.js rename to test/chunking-form/samples/grouping-multiple/_expected/system/generated-dep3.js 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 8cd2edf972f..297ef97c4cb 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep3.js'], function (exports) { 'use strict'; var x, y; return { 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 5dd376c685b..c79b02efd87 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep3.js'], function (exports) { 'use strict'; var x, z; return { 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 511c66a1978..b691d6096e2 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep3.js'], function (exports) { 'use strict'; var y, z; return { diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/generated-chunk.js b/test/chunking-form/samples/grouping-size/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/grouping-size/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/amd/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/amd/generated-chunk2.js rename to test/chunking-form/samples/grouping-size/_expected/amd/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/main1.js b/test/chunking-form/samples/grouping-size/_expected/amd/main1.js index bc68133afaf..4f472918845 100644 --- a/test/chunking-form/samples/grouping-size/_expected/amd/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2'], function (dep1, dep2) { 'use strict'; +define(['./generated-dep1', './generated-dep3'], function (dep1, dep2) { 'use strict'; var main1 = dep1.x + dep2.y; diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/main2.js b/test/chunking-form/samples/grouping-size/_expected/amd/main2.js index 2ce5dd206fd..14edb878030 100644 --- a/test/chunking-form/samples/grouping-size/_expected/amd/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2'], function (dep1, dep2) { 'use strict'; +define(['./generated-dep1', './generated-dep3'], function (dep1, dep2) { 'use strict'; var main2 = dep1.x + dep2.z; diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/main3.js b/test/chunking-form/samples/grouping-size/_expected/amd/main3.js index fdbaf782254..9250229bf8d 100644 --- a/test/chunking-form/samples/grouping-size/_expected/amd/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk2'], function (dep2) { 'use strict'; +define(['./generated-dep3'], function (dep2) { 'use strict'; var main3 = dep2.y + dep2.z; diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/grouping-size/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/grouping-size/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/cjs/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/grouping-size/_expected/cjs/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js b/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js index 6859a03fbff..1e013c8c562 100644 --- a/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); -var dep2 = require('./generated-chunk2.js'); +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep3.js'); var main1 = dep1.x + dep2.y; diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js b/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js index d64360e5a40..2aba4b69579 100644 --- a/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js @@ -1,7 +1,7 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); -var dep2 = require('./generated-chunk2.js'); +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep3.js'); var main2 = dep1.x + dep2.z; diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js b/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js index 8295c0efa78..71eb5e920f7 100644 --- a/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk2.js'); +var dep2 = require('./generated-dep3.js'); var main3 = dep2.y + dep2.z; diff --git a/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk.js b/test/chunking-form/samples/grouping-size/_expected/es/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/es/generated-chunk.js rename to test/chunking-form/samples/grouping-size/_expected/es/generated-dep1.js diff --git a/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/es/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/grouping-size/_expected/es/generated-dep3.js 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 97c077c14bb..a5da120e3f0 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 { x } from './generated-chunk.js'; -import { y } from './generated-chunk2.js'; +import { x } from './generated-dep1.js'; +import { y } from './generated-dep3.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 1ef06784c22..dc474b4b2fc 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 { x } from './generated-chunk.js'; -import { z } from './generated-chunk2.js'; +import { x } from './generated-dep1.js'; +import { z } from './generated-dep3.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 0e6aa638c19..27a13fc9109 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 { y, z } from './generated-chunk2.js'; +import { y, z } from './generated-dep3.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-dep1.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/system/generated-chunk.js rename to test/chunking-form/samples/grouping-size/_expected/system/generated-dep1.js diff --git a/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/system/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/grouping-size/_expected/system/generated-dep3.js 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 2178827b1bd..27aca0a7647 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function (exports) { +System.register(['./generated-dep1.js', './generated-dep3.js'], function (exports) { 'use strict'; var x, y; return { 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 3c03de1b558..9b1886c4026 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function (exports) { +System.register(['./generated-dep1.js', './generated-dep3.js'], function (exports) { 'use strict'; var x, z; return { 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 48858805f74..b691d6096e2 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk2.js'], function (exports) { +System.register(['./generated-dep3.js'], function (exports) { 'use strict'; var y, z; return { diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk.js b/test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk2.js rename to test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk3.js rename to test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep3.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js b/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js index 241f3b4decf..d80fcec60b9 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2'], function (dep1, dep2) { 'use strict'; +define(['./generated-dep1', './generated-dep2'], function (dep1, dep2) { 'use strict'; console.log(dep1.num + dep2.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js b/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js index be42a710778..a1004c1c5e5 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk2', './generated-chunk3'], function (dep2, dep3) { 'use strict'; +define(['./generated-dep2', './generated-dep3'], function (dep2, dep3) { 'use strict'; console.log(dep2.num + dep3.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js b/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js index 7ac5d88e84b..d7f5a6375ad 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk3'], function (dep1, dep3) { 'use strict'; +define(['./generated-dep1', './generated-dep3'], function (dep1, dep3) { 'use strict'; console.log(dep1.num + dep3.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk3.js rename to test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep3.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js index 97a9e5c06ee..8b5a4997485 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); -var dep2 = require('./generated-chunk2.js'); +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep2.js'); console.log(dep1.num + dep2.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js index aa5a8a1765e..d94a40ca098 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk2.js'); -var dep3 = require('./generated-chunk3.js'); +var dep2 = require('./generated-dep2.js'); +var dep3 = require('./generated-dep3.js'); console.log(dep2.num + dep3.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js index 825f821e4ee..3ec0b7eeba4 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); -var dep3 = require('./generated-chunk3.js'); +var dep1 = require('./generated-dep1.js'); +var dep3 = require('./generated-dep3.js'); console.log(dep1.num + dep3.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk.js b/test/chunking-form/samples/multi-chunking/_expected/es/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk.js rename to test/chunking-form/samples/multi-chunking/_expected/es/generated-dep1.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/multi-chunking/_expected/es/generated-dep2.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/es/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk3.js rename to test/chunking-form/samples/multi-chunking/_expected/es/generated-dep3.js 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 283b9dd7f7b..bdc757ad123 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 { n as num } from './generated-chunk.js'; -import { n as num$1 } from './generated-chunk2.js'; +import { n as num } from './generated-dep1.js'; +import { n as num$1 } from './generated-dep2.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 f6ea4b201e1..910ca24c1bf 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 { n as num } from './generated-chunk2.js'; -import { n as num$1 } from './generated-chunk3.js'; +import { n as num } from './generated-dep2.js'; +import { n as num$1 } from './generated-dep3.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 9b2232a482a..dd0e733e824 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 { n as num } from './generated-chunk.js'; -import { n as num$1 } from './generated-chunk3.js'; +import { n as num } from './generated-dep1.js'; +import { n as num$1 } from './generated-dep3.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-dep1.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk.js rename to test/chunking-form/samples/multi-chunking/_expected/system/generated-dep1.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/system/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/multi-chunking/_expected/system/generated-dep2.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/system/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk3.js rename to test/chunking-form/samples/multi-chunking/_expected/system/generated-dep3.js 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 da512ecf173..3225e3904ba 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function () { +System.register(['./generated-dep1.js', './generated-dep2.js'], function () { 'use strict'; var num, num$1; return { 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 38a4353f3f4..36473866c15 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep2.js', './generated-dep3.js'], function () { 'use strict'; var num, num$1; return { 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 08c6b10c8df..969f68fdd31 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep1.js', './generated-dep3.js'], function () { 'use strict'; var num, num$1; return { diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js index 3a71fb0a580..d9da2d72b7c 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./chunks/chunk'], function (shared) { 'use strict'; +define(['./chunks/shared'], function (shared) { 'use strict'; assert.equal(shared.sharedValue, 'shared'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js index f956e7d89dd..dbb13d1f811 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js @@ -1,4 +1,4 @@ -define(['exports', './chunks/chunk'], function (exports, shared) { 'use strict'; +define(['exports', './chunks/shared'], function (exports, shared) { 'use strict'; diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js index 21f7a767310..713701b7e81 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); assert.equal(shared.sharedValue, 'shared'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js index dd37c515620..40cf77c3578 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); 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/shared.js similarity index 100% rename from test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/shared.js 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 4f329e1fd8f..9af3da63084 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 { s as sharedValue } from './chunks/chunk.js'; +import { s as sharedValue } from './chunks/shared.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 c31fc8ebe03..7500959c939 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 { s as sharedValue } from './chunks/chunk.js'; +export { s as sharedValue } from './chunks/shared.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/shared.js similarity index 100% rename from test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/shared.js 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 8c2f77a463e..e1235fab616 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 @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function () { +System.register(['./chunks/shared.js'], function () { 'use strict'; var sharedValue; return { 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 4a10ce2e599..3dac21b55e7 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 @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports) { +System.register(['./chunks/shared.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/namespace-object-import/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-object-import/_expected/amd/generated-main2.js similarity index 100% rename from test/chunking-form/samples/namespace-object-import/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-object-import/_expected/amd/generated-main2.js diff --git a/test/chunking-form/samples/namespace-object-import/_expected/amd/main1.js b/test/chunking-form/samples/namespace-object-import/_expected/amd/main1.js index 585aa959563..78484e848f0 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/amd/main1.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (main2) { 'use strict'; +define(['./generated-main2'], function (main2) { 'use strict'; console.log(main2.a); diff --git a/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js index ab807b27492..58cbd115137 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, main2) { 'use strict'; +define(['exports', './generated-main2'], function (exports, main2) { 'use strict'; diff --git a/test/chunking-form/samples/namespace-object-import/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-object-import/_expected/cjs/generated-main2.js similarity index 100% rename from test/chunking-form/samples/namespace-object-import/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-object-import/_expected/cjs/generated-main2.js diff --git a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main1.js b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main1.js index 09ee475014d..76c02e55904 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main1.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var main2 = require('./generated-chunk.js'); +var main2 = require('./generated-main2.js'); console.log(main2.a); diff --git a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js index ad7ea0780cc..688bfd2c811 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var main2 = require('./generated-chunk.js'); +var main2 = require('./generated-main2.js'); 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-main2.js similarity index 100% rename from test/chunking-form/samples/namespace-object-import/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-object-import/_expected/es/generated-main2.js 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 312052b1e75..be5e5bf30b0 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, m as main2 } from './generated-chunk.js'; +import { a, m as main2 } from './generated-main2.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 794f1dbe5a9..221b2d2b14c 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, b } from './generated-chunk.js'; +export { a, b } from './generated-main2.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-main2.js similarity index 100% rename from test/chunking-form/samples/namespace-object-import/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-object-import/_expected/system/generated-main2.js 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 d2b38ecf6aa..7e0b6ecc415 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-main2.js'], function () { 'use strict'; var a, main2; return { 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 5e3927b3b23..b72cf2e0366 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-main2.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-index.js similarity index 57% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-index.js index 42413614a36..8609967a094 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-index.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk', 'external'], function (exports, dep, external) { 'use strict'; +define(['exports', './generated-dep', 'external'], function (exports, dep, external) { 'use strict'; console.log(external.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js index 27080798f40..e27605e3143 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', 'external', './generated-chunk2'], function (dep, external, index) { 'use strict'; +define(['./generated-dep', 'external', './generated-index'], function (dep, external, index) { 'use strict'; console.log(index.lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js index e054ba744c3..2187075bd38 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', 'external', './generated-chunk2'], function (dep, external, index) { 'use strict'; +define(['./generated-dep', 'external', './generated-index'], function (dep, external, index) { 'use strict'; console.log(dep.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js index 60c4edba0a2..6401b09a1e2 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-index.js similarity index 80% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-index.js index 52d701a5760..2615d5c1483 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-index.js @@ -1,6 +1,6 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); var external = require('external'); console.log(external.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js index a39cf01b525..76ea0a89824 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep.js'); require('external'); -var index = require('./generated-chunk2.js'); +var index = require('./generated-index.js'); console.log(index.lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js index 4c77f2beb0f..a97a14db2d7 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js @@ -1,7 +1,7 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); require('external'); -require('./generated-chunk2.js'); +require('./generated-index.js'); console.log(dep.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main3.js index cd3e1d69188..9fcaf192db3 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main3.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main3.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep.js'); 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-dep.js similarity index 100% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-dep.js 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-index.js similarity index 73% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-index.js index 9abe01c7f87..78e52033db5 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-index.js @@ -1,4 +1,4 @@ -import { r as reexported$1 } from './generated-chunk.js'; +import { r as reexported$1 } from './generated-dep.js'; import { reexported } from 'external'; console.log(reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js index 62f034ff6a1..2de2224803a 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 './generated-dep.js'; import 'external'; -import { l as lib } from './generated-chunk2.js'; +import { l as lib } from './generated-index.js'; console.log(lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js index 5007839a655..0ad3b767a61 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js @@ -1,5 +1,5 @@ -import { r as reexported } from './generated-chunk.js'; +import { r as reexported } from './generated-dep.js'; import 'external'; -import './generated-chunk2.js'; +import './generated-index.js'; console.log(reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main3.js index 5d03e846db5..81875f89bf4 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main3.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main3.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep.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-dep.js similarity index 100% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-dep.js 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-index.js similarity index 82% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-index.js index 3fe5c861605..5acfbcac078 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-index.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', 'external'], function (exports) { +System.register(['./generated-dep.js', 'external'], function (exports) { 'use strict'; var reexported$1, reexported; return { 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 f3ba426750f..aa87cd2e3bb 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', 'external', './generated-chunk2.js'], function () { +System.register(['./generated-dep.js', 'external', './generated-index.js'], function () { 'use strict'; var lib; return { 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 a2deeafcd55..776944744d8 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', 'external', './generated-chunk2.js'], function () { +System.register(['./generated-dep.js', 'external', './generated-index.js'], function () { 'use strict'; var reexported; return { diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js index 0546a48da7c..0b6277f0f56 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js similarity index 100% rename from test/chunking-form/samples/namespace-reexports/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js index 403b5f70f60..1c0eff2a0ca 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js @@ -1,4 +1,4 @@ -define(['exports', './hsl2hsv', './generated-chunk'], function (exports, hsl2hsv$1, index) { 'use strict'; +define(['exports', './hsl2hsv', './generated-index'], function (exports, hsl2hsv$1, index) { 'use strict'; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js index 95dbd44f35d..ab833f3837e 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['exports', './hsl2hsv', './generated-chunk'], function (exports, hsl2hsv$1, index) { 'use strict'; +define(['exports', './hsl2hsv', './generated-index'], function (exports, hsl2hsv$1, index) { 'use strict'; console.log(hsl2hsv$1.p); var main = new Map(Object.entries(index.lib)); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js similarity index 100% rename from test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js index dc695449285..cd95edf7d26 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var hsl2hsv$1 = require('./hsl2hsv.js'); -require('./generated-chunk.js'); +require('./generated-index.js'); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js index 19c3b6a8ff6..f56ee42c2ad 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var hsl2hsv$1 = require('./hsl2hsv.js'); -var index = require('./generated-chunk.js'); +var index = require('./generated-index.js'); console.log(hsl2hsv$1.p); var main = new Map(Object.entries(index.lib)); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-reexports/_expected/es/generated-index.js similarity index 100% rename from test/chunking-form/samples/namespace-reexports/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-reexports/_expected/es/generated-index.js diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/index.js b/test/chunking-form/samples/namespace-reexports/_expected/es/index.js index bd43de91785..18fe44189f4 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/es/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/es/index.js @@ -1,2 +1,2 @@ export { default as hsl2hsv } from './hsl2hsv.js'; -import './generated-chunk.js'; +import './generated-index.js'; 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 4ebbb5a0a1d..3b20f239985 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/es/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/es/main.js @@ -1,5 +1,5 @@ import { p } from './hsl2hsv.js'; -import { l as lib } from './generated-chunk.js'; +import { l as lib } from './generated-index.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-index.js similarity index 100% rename from test/chunking-form/samples/namespace-reexports/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js index e5b95ce7584..3df535ca051 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js @@ -1,4 +1,4 @@ -System.register(['./hsl2hsv.js', './generated-chunk.js'], function (exports) { +System.register(['./hsl2hsv.js', './generated-index.js'], function (exports) { 'use strict'; return { setters: [function (module) { 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 59f90f5cdd4..bcb4935821d 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./hsl2hsv.js', './generated-chunk.js'], function (exports) { +System.register(['./hsl2hsv.js', './generated-index.js'], function (exports) { 'use strict'; var p, lib; return { diff --git a/test/chunking-form/samples/namespace-retracing/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-retracing/_expected/amd/generated-other.js similarity index 100% rename from test/chunking-form/samples/namespace-retracing/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-retracing/_expected/amd/generated-other.js diff --git a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js index 716dfb53d76..8dae1d07429 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (other) { 'use strict'; +define(['./generated-other'], function (other) { 'use strict'; other.Other.doSomething(); other.Broken.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js index e1dd9238e1c..0466893c505 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (other) { 'use strict'; +define(['./generated-other'], function (other) { 'use strict'; other.Other.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-retracing/_expected/cjs/generated-other.js similarity index 100% rename from test/chunking-form/samples/namespace-retracing/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-retracing/_expected/cjs/generated-other.js diff --git a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js index a7b7bb36ca6..2cdbc64098d 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js @@ -1,6 +1,6 @@ 'use strict'; -var other = require('./generated-chunk.js'); +var other = require('./generated-other.js'); other.Other.doSomething(); other.Broken.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js index 2434778310d..0d2c9c16c86 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js @@ -1,5 +1,5 @@ 'use strict'; -var other = require('./generated-chunk.js'); +var other = require('./generated-other.js'); other.Other.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-retracing/_expected/es/generated-other.js similarity index 100% rename from test/chunking-form/samples/namespace-retracing/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-retracing/_expected/es/generated-other.js 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 15c86ffaca0..a6d3bd5379d 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 { O as Other, B as Broken } from './generated-chunk.js'; +import { O as Other, B as Broken } from './generated-other.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 2d07b85a658..affda9718cc 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 { O as Other } from './generated-chunk.js'; +import { O as Other } from './generated-other.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-other.js similarity index 100% rename from test/chunking-form/samples/namespace-retracing/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-retracing/_expected/system/generated-other.js 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 94cfa6183b7..8e17f8f314a 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-other.js'], function () { 'use strict'; var Other, Broken; return { 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 0d1c1119146..8d057522e89 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-other.js'], function () { 'use strict'; var Other; return { diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-bar.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-bar.js new file mode 100644 index 00000000000..43cc41e1615 --- /dev/null +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-bar.js @@ -0,0 +1,9 @@ +define(['exports', './generated-broken'], function (exports, broken) { 'use strict'; + + function bar() { + console.log('bar'); + } + + exports.bar = bar; + +}); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-broken.js similarity index 100% rename from test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-tracing/_expected/amd/generated-broken.js diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js deleted file mode 100644 index 9c8503e7aee..00000000000 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js +++ /dev/null @@ -1,9 +0,0 @@ -define(['exports', './generated-chunk'], function (exports, broken) { 'use strict'; - - function foo() { - console.log('foo'); - } - - exports.foo = foo; - -}); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js deleted file mode 100644 index ef36cc32878..00000000000 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js +++ /dev/null @@ -1,9 +0,0 @@ -define(['exports', './generated-chunk'], function (exports, broken) { 'use strict'; - - function bar() { - console.log('bar'); - } - - exports.bar = bar; - -}); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-foo.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-foo.js new file mode 100644 index 00000000000..d08ae86cc78 --- /dev/null +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-foo.js @@ -0,0 +1,9 @@ +define(['exports', './generated-broken'], function (exports, broken) { 'use strict'; + + function foo() { + console.log('foo'); + } + + exports.foo = foo; + +}); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js index 3913f749429..57ff8799c78 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2'], function (broken, foo) { 'use strict'; +define(['./generated-broken', './generated-foo'], function (broken, foo) { 'use strict'; foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js index fdce3215734..a765544075c 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (broken, foo, bar) { 'use strict'; +define(['./generated-broken', './generated-foo', './generated-bar'], function (broken, foo, bar) { 'use strict'; foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js index 2d8063dc6b7..3294fe2a7fc 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk3'], function (broken, bar) { 'use strict'; +define(['./generated-broken', './generated-bar'], function (broken, bar) { 'use strict'; bar.bar(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-bar.js similarity index 69% rename from test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk3.js rename to test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-bar.js index 7dcb4144d19..c1ada01763e 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk3.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-bar.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-broken.js'); function bar() { console.log('bar'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-broken.js similarity index 100% rename from test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-broken.js diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-foo.js similarity index 69% rename from test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-foo.js index c84a8c1f21a..cf2842741a0 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-foo.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-broken.js'); function foo() { console.log('foo'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js index d62d63dc1a3..dc1c5e9f6f3 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js @@ -1,7 +1,7 @@ 'use strict'; -var broken = require('./generated-chunk.js'); -var foo = require('./generated-chunk2.js'); +var broken = require('./generated-broken.js'); +var foo = require('./generated-foo.js'); foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js index 4d042398ce2..6ee2b541f99 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js @@ -1,8 +1,8 @@ 'use strict'; -var broken = require('./generated-chunk.js'); -var foo = require('./generated-chunk2.js'); -var bar = require('./generated-chunk3.js'); +var broken = require('./generated-broken.js'); +var foo = require('./generated-foo.js'); +var bar = require('./generated-bar.js'); foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js index fbe86e301ea..54cdd8631bb 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js @@ -1,7 +1,7 @@ 'use strict'; -var broken = require('./generated-chunk.js'); -var bar = require('./generated-chunk3.js'); +var broken = require('./generated-broken.js'); +var bar = require('./generated-bar.js'); bar.bar(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-bar.js similarity index 66% rename from test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js rename to test/chunking-form/samples/namespace-tracing/_expected/es/generated-bar.js index ccc1008b239..f6d2390fb6c 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-bar.js @@ -1,4 +1,4 @@ -import './generated-chunk.js'; +import './generated-broken.js'; function bar() { console.log('bar'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-broken.js similarity index 100% rename from test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-tracing/_expected/es/generated-broken.js diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-foo.js similarity index 66% rename from test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/namespace-tracing/_expected/es/generated-foo.js index 2d374209102..9792caf6b29 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-foo.js @@ -1,4 +1,4 @@ -import './generated-chunk.js'; +import './generated-broken.js'; function foo() { console.log('foo'); 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 6e2804603b4..36c262d3265 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js @@ -1,5 +1,5 @@ -import { b as broken } from './generated-chunk.js'; -import { f as foo } from './generated-chunk2.js'; +import { b as broken } from './generated-broken.js'; +import { f as foo } from './generated-foo.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 2680a53a1cb..6da3133e340 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js @@ -1,6 +1,6 @@ -import { b as broken } from './generated-chunk.js'; -import { f as foo } from './generated-chunk2.js'; -import { b as bar } from './generated-chunk3.js'; +import { b as broken } from './generated-broken.js'; +import { f as foo } from './generated-foo.js'; +import { b as bar } from './generated-bar.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 444fdcd8d0d..ba24b661e25 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js @@ -1,5 +1,5 @@ -import { b as broken } from './generated-chunk.js'; -import { b as bar } from './generated-chunk3.js'; +import { b as broken } from './generated-broken.js'; +import { b as bar } from './generated-bar.js'; bar(); broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-bar.js similarity index 74% rename from test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js rename to test/chunking-form/samples/namespace-tracing/_expected/system/generated-bar.js index f0764f0e98c..ffd4c4e677a 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-bar.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-broken.js'], function (exports) { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-broken.js similarity index 100% rename from test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-tracing/_expected/system/generated-broken.js diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-foo.js similarity index 74% rename from test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/namespace-tracing/_expected/system/generated-foo.js index d354d7ad489..4a975af238b 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-foo.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-broken.js'], function (exports) { 'use strict'; return { setters: [function () {}], 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 8707b6feebd..a6734308369 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function () { +System.register(['./generated-broken.js', './generated-foo.js'], function () { 'use strict'; var broken, foo; return { 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 2115d848c3e..720016f85f6 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-broken.js', './generated-foo.js', './generated-bar.js'], function () { 'use strict'; var broken, foo, bar; return { 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 cafc635a882..7a4c645212e 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk3.js'], function () { +System.register(['./generated-broken.js', './generated-bar.js'], function () { 'use strict'; var broken, bar; return { diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/nested-chunks/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/nested-chunks/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js index e844cf32aa9..3321e9b5522 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['require', './generated-chunk'], function (require, dep) { 'use strict'; +define(['require', './generated-dep'], function (require, dep) { 'use strict'; function _interopNamespace(e) { if (e && e.__esModule) { return e; } else { diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js index 9dd19fb5de2..4cc20c12c2d 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js @@ -1,4 +1,4 @@ -define(['require', '../generated-chunk'], function (require, dep) { 'use strict'; +define(['require', '../generated-dep'], function (require, dep) { 'use strict'; function _interopNamespace(e) { if (e && e.__esModule) { return e; } else { diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/nested-chunks/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/nested-chunks/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js index bbaad8b217c..52074306591 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js @@ -19,7 +19,7 @@ function _interopNamespace(e) { } } -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main1', dep.value); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js index d32364b2355..3566c8527df 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js @@ -19,7 +19,7 @@ function _interopNamespace(e) { } } -var dep = require('../generated-chunk.js'); +var dep = require('../generated-dep.js'); console.log('main2', dep.value); diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/nested-chunks/_expected/es/generated-chunk.js rename to test/chunking-form/samples/nested-chunks/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/main1.js b/test/chunking-form/samples/nested-chunks/_expected/es/main1.js index 4151def9fa9..3f3e65f4aa6 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/es/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main1', value); diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js index c6e95061a3d..85a5ad91b96 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js @@ -1,4 +1,4 @@ -import { v as value } from '../generated-chunk.js'; +import { v as value } from '../generated-dep.js'; console.log('main2', value); diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/nested-chunks/_expected/system/generated-chunk.js rename to test/chunking-form/samples/nested-chunks/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/main1.js b/test/chunking-form/samples/nested-chunks/_expected/system/main1.js index ed575d5ed4f..079ee4a97fb 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/system/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports, module) { +System.register(['./generated-dep.js'], function (exports, module) { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js index 18862f8a50e..9b7473ec5cf 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js @@ -1,4 +1,4 @@ -System.register(['../generated-chunk.js'], function (exports, module) { +System.register(['../generated-dep.js'], function (exports, module) { 'use strict'; var value; return { 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-otherEntry.js similarity index 100% rename from test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-otherEntry.js 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 index 08797ca7d91..a917dd64a09 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, otherEntry) { 'use strict'; +define(['exports', './generated-otherEntry'], function (exports, otherEntry) { 'use strict'; 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 index 1165026a188..67cdcc8d4ad 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, otherEntry) { 'use strict'; +define(['exports', './generated-otherEntry'], function (exports, otherEntry) { 'use strict'; 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-otherEntry.js similarity index 100% rename from test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-otherEntry.js 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 index 0c5f311b215..f20f54e462f 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var otherEntry = require('./generated-chunk.js'); +var otherEntry = require('./generated-otherEntry.js'); 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 index 43ada6a8da1..683a67be054 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var otherEntry = require('./generated-chunk.js'); +var otherEntry = require('./generated-otherEntry.js'); 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-otherEntry.js similarity index 100% rename from test/chunking-form/samples/reexport-from-entry/_expected/es/generated-chunk.js rename to test/chunking-form/samples/reexport-from-entry/_expected/es/generated-otherEntry.js 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 index e4102b9ca06..f3332346bba 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/es/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/es/main.js @@ -1 +1 @@ -export { a, c } from './generated-chunk.js'; +export { a, c } from './generated-otherEntry.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 index fe77963101f..55b811935d3 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js @@ -1 +1 @@ -export { b, c } from './generated-chunk.js'; +export { b, c } from './generated-otherEntry.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-otherEntry.js similarity index 100% rename from test/chunking-form/samples/reexport-from-entry/_expected/system/generated-chunk.js rename to test/chunking-form/samples/reexport-from-entry/_expected/system/generated-otherEntry.js 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 index e606d15fab6..ed7997ea08b 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-otherEntry.js'], function (exports) { 'use strict'; return { setters: [function (module) { 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 index f2975a5a236..54a7527b442 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-otherEntry.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/generated-chunk.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/reexport-shortpaths/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/reexport-shortpaths/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js index 01aa9f8c94c..c20bbae9105 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js index d41d6fbb8d7..8806f30b198 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js index d41d6fbb8d7..8806f30b198 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/reexport-shortpaths/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/reexport-shortpaths/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js index 15404e8950b..660ed01c2f9 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main2.js index cd3e1d69188..8bcaed1c530 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main2.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main3.js index cd3e1d69188..8bcaed1c530 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main3.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-chunk.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-chunk.js rename to test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-dep2.js 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 927e1ccf171..fb0148dad4a 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 { f as foo } from './generated-chunk.js'; +import { f as foo } from './generated-dep2.js'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main2.js index 5d03e846db5..e38989d38f2 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main2.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep2.js'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main3.js index 5d03e846db5..e38989d38f2 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main3.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep2.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-dep2.js similarity index 100% rename from test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-chunk.js rename to test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-dep2.js 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 0197c25f351..3de029c4f12 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var foo; return { diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js index 0546a48da7c..73473efce7c 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep2.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js index 0546a48da7c..73473efce7c 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep2.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js similarity index 72% rename from test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js rename to test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js index a106c2a7287..ab30e5c7536 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js @@ -5,8 +5,8 @@ define(['exports'], function (exports) { 'use strict'; exports.num = num; }); -console.log('fileName', 'chunk-chunk.js'); +console.log('fileName', 'chunk-dep2.js'); console.log('imports', ''); console.log('isEntry', false); -console.log('name', 'chunk'); +console.log('name', 'dep2'); console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main1.js b/test/chunking-form/samples/render-chunk/_expected/amd/main1.js index 0de55adbbf9..ea52a11c0f9 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./chunk-chunk'], function (dep2) { 'use strict'; +define(['./chunk-dep2'], function (dep2) { 'use strict'; var num = 1; @@ -6,7 +6,7 @@ define(['./chunk-chunk'], function (dep2) { 'use strict'; }); console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main1'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main2.js b/test/chunking-form/samples/render-chunk/_expected/amd/main2.js index 07f680de4a4..9dee74671ae 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./chunk-chunk'], function (dep2) { 'use strict'; +define(['./chunk-dep2'], function (dep2) { 'use strict'; var num = 3; @@ -6,7 +6,7 @@ define(['./chunk-chunk'], function (dep2) { 'use strict'; }); console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main2'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js similarity index 65% rename from test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js index 2e50e4012ed..ad01f5c7b03 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js @@ -3,8 +3,8 @@ var num = 2; exports.num = num; -console.log('fileName', 'chunk-chunk.js'); +console.log('fileName', 'chunk-dep2.js'); console.log('imports', ''); console.log('isEntry', false); -console.log('name', 'chunk'); +console.log('name', 'dep2'); console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js index bdde6363441..86d308be0b0 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js @@ -1,12 +1,12 @@ 'use strict'; -var dep2 = require('./chunk-chunk.js'); +var dep2 = require('./chunk-dep2.js'); var num = 1; console.log(num + dep2.num); console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main1'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js index 74049b711a3..f142d493e16 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js @@ -1,12 +1,12 @@ 'use strict'; -var dep2 = require('./chunk-chunk.js'); +var dep2 = require('./chunk-dep2.js'); var num = 3; console.log(dep2.num + num); console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main2'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js similarity index 63% rename from test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js rename to test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js index 872040311d2..20ae277758e 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js @@ -1,8 +1,8 @@ var num = 2; export { num as n }; -console.log('fileName', 'chunk-chunk.js'); +console.log('fileName', 'chunk-dep2.js'); console.log('imports', ''); console.log('isEntry', false); -console.log('name', 'chunk'); +console.log('name', 'dep2'); console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/main1.js b/test/chunking-form/samples/render-chunk/_expected/es/main1.js index 0f011a9040f..c4b243a3998 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/main1.js @@ -1,10 +1,10 @@ -import { n as num$1 } from './chunk-chunk.js'; +import { n as num$1 } from './chunk-dep2.js'; var num = 1; console.log(num + num$1); console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main1'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/main2.js b/test/chunking-form/samples/render-chunk/_expected/es/main2.js index f015e249192..2666225853f 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/main2.js @@ -1,10 +1,10 @@ -import { n as num$1 } from './chunk-chunk.js'; +import { n as num$1 } from './chunk-dep2.js'; var num = 3; console.log(num$1 + num); console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main2'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js similarity index 75% rename from test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js rename to test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js index b84f63c3869..e408a3daf21 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js @@ -8,8 +8,8 @@ System.register([], function (exports) { } }; }); -console.log('fileName', 'chunk-chunk.js'); +console.log('fileName', 'chunk-dep2.js'); console.log('imports', ''); console.log('isEntry', false); -console.log('name', 'chunk'); +console.log('name', 'dep2'); console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main1.js b/test/chunking-form/samples/render-chunk/_expected/system/main1.js index 3988f51e28e..4120600f1c7 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./chunk-chunk.js'], function () { +System.register(['./chunk-dep2.js'], function () { 'use strict'; var num$1; return { @@ -15,7 +15,7 @@ System.register(['./chunk-chunk.js'], function () { }; }); console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main1'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main2.js b/test/chunking-form/samples/render-chunk/_expected/system/main2.js index 5f06d114583..952563b2e78 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./chunk-chunk.js'], function () { +System.register(['./chunk-dep2.js'], function () { 'use strict'; var num$1; return { @@ -15,7 +15,7 @@ System.register(['./chunk-chunk.js'], function () { }; }); console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main2'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-chunk.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-constants.js similarity index 100% rename from test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-constants.js diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js index 3d7f4c33046..0f399e25ebf 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, constants) { 'use strict'; +define(['exports', './generated-constants'], function (exports, constants) { 'use strict'; var lazy = () => constants.v1; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js index 779c4810f2d..b301e43cc8a 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', 'exports', './generated-chunk'], function (require, exports, constants) { 'use strict'; +define(['require', 'exports', './generated-constants'], function (require, exports, constants) { 'use strict'; const lazy = new Promise(function (resolve, reject) { require(['./generated-lazy'], resolve, reject) }); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-constants.js similarity index 100% rename from test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-constants.js diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js index c8f3fa4490e..39df6fd6001 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js @@ -1,6 +1,6 @@ 'use strict'; -var constants = require('./generated-chunk.js'); +var constants = require('./generated-constants.js'); var lazy = () => constants.v1; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js index 13c0d7a30f6..45d50ce8b88 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var constants = require('./generated-chunk.js'); +var constants = require('./generated-constants.js'); const lazy = new Promise(function (resolve) { resolve(require('./generated-lazy.js')); }); 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-constants.js similarity index 100% rename from test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-chunk.js rename to test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-constants.js 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 cab35d6029a..0ed413ad194 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 { v as v1 } from './generated-chunk.js'; +import { v as v1 } from './generated-constants.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 b706e857187..9f6233b1f85 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 { 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'; +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-constants.js'; const lazy = import('./generated-lazy.js'); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-chunk.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-constants.js similarity index 100% rename from test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-chunk.js rename to test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-constants.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 ef89b9a8ad8..c3492d0d8b7 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-constants.js'], function (exports) { 'use strict'; var v1; return { 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 aa67b797808..2a78e71a87d 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports, module) { +System.register(['./generated-constants.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/generated-chunk.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js index b31a9f2a0c9..70e8b91dfca 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('1', dep.dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js index 802b4783d5b..16bc0f7b408 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('2', dep.dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js index b90e46d1ef6..a553cd08cb3 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('1', dep.dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js index f1bf31c4b92..bb5673f82f5 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('2', dep.dep); 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-dep.js similarity index 100% rename from test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-chunk.js rename to test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-dep.js 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 a4c64ad8e0f..f30deaee122 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 { d as dep } from './generated-chunk.js'; +import { d as dep } from './generated-dep.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 ad86f9a5010..831adcfdfad 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 { d as dep } from './generated-chunk.js'; +import { d as dep } from './generated-dep.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-dep.js similarity index 100% rename from test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-chunk.js rename to test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-dep.js 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 1bb19ac8f71..8daf064dae0 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var dep; return { 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 47e6f097d27..23664a93e78 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 @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var dep; return { diff --git a/test/cli/index.js b/test/cli/index.js index 1420d5db11d..13f496c171d 100644 --- a/test/cli/index.js +++ b/test/cli/index.js @@ -23,7 +23,8 @@ runTestSuiteWithSamples( done => { process.chdir(config.cwd || dir); - const command = 'node ' + path.resolve(__dirname, '../../bin') + path.sep + config.command; + const command = + 'node ' + path.resolve(__dirname, '../../dist/bin') + path.sep + config.command; const childProcess = exec(command, { timeout: 40000 }, (err, code, stderr) => { if (err && !err.killed) { diff --git a/test/hooks/index.js b/test/hooks/index.js index bad495a77c3..658b7ce8280 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -997,17 +997,17 @@ describe('hooks', () => { }, { fileName: 'generated-a.js', - imports: ['generated-chunk.js'], + imports: ['generated-c.js'], modules: ['d', 'a'] }, { - fileName: 'generated-chunk.js', + fileName: 'generated-c.js', imports: [], modules: ['c'] }, { fileName: 'generated-b.js', - imports: ['generated-chunk.js'], + imports: ['generated-c.js'], modules: ['b'] } ]); diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index 734cb3423f3..cc0e6aa8bde 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -26,21 +26,21 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1-91cf8b5e.js', 'input2-28e1210a.js', 'generated-chunk-e9283962.js'], + ['input1-91cf8b5e.js', 'input2-28e1210a.js', 'generated-shared-e9283962.js'], 'fileName' ); assert.deepEqual( output.map(chunk => chunk.code), [ - `import './generated-chunk-e9283962.js';\n\nconsole.log("input1");const out = true;\n\nexport { out };\n`, - `import './generated-chunk-e9283962.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport default input2;\n`, + `import './generated-shared-e9283962.js';\n\nconsole.log("input1");const out = true;\n\nexport { out };\n`, + `import './generated-shared-e9283962.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport default input2;\n`, 'console.log("shared");\n' ], 'code' ); assert.deepEqual(output.map(chunk => chunk.map), [null, null, null], 'map'); assert.deepEqual(output.map(chunk => chunk.isEntry), [true, true, false], 'isEntry'); - assert.deepEqual(output.map(chunk => chunk.name), ['input1', 'input2', 'chunk'], 'name'); + assert.deepEqual(output.map(chunk => chunk.name), ['input1', 'input2', 'shared'], 'name'); assert.deepEqual( output.map(chunk => chunk.facadeModuleId), ['input1', 'input2', null], @@ -48,7 +48,7 @@ describe('The bundle object', () => { ); assert.deepEqual( output.map(chunk => chunk.imports), - [['generated-chunk-e9283962.js'], ['generated-chunk-e9283962.js'], []], + [['generated-shared-e9283962.js'], ['generated-shared-e9283962.js'], []], 'imports' ); assert.deepEqual(output.map(chunk => chunk.dynamicImports), [[], [], []], 'dynamicImports'); @@ -109,7 +109,7 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1.js', 'input2.js', 'generated-chunk.js'], + ['input1.js', 'input2.js', 'generated-input2.js'], 'fileName' ); assert.deepEqual( @@ -150,7 +150,7 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1.js', 'input2.js', 'chunk.js'], + ['input1.js', 'input2.js', 'input22.js'], 'fileName' ); assert.deepEqual( @@ -239,7 +239,7 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1.js', 'input2.js', 'generated-chunk.js', 'generated-dynamic.js'], + ['input1.js', 'input2.js', 'generated-dynamic.js', 'generated-dynamic2.js'], 'fileName' ); assert.deepEqual( @@ -259,7 +259,7 @@ describe('The bundle object', () => { ); assert.deepEqual( output.map(chunk => chunk.dynamicImports), - [['generated-chunk.js'], [], [], []], + [['generated-dynamic.js'], [], [], []], 'dynamicImports' ); }); diff --git a/test/misc/misc.js b/test/misc/misc.js index 1a59e2a0fd5..4640a9fcbd7 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -91,7 +91,7 @@ describe('misc', () => { assert.deepEqual(output.map(({ fileName }) => fileName), [ 'main1.js', 'main2.js', - 'chunk-9d1272f4.js', + 'dep-9d1272f4.js', 'dyndep-80285050.js' ]); }); diff --git a/tsconfig.json b/tsconfig.json index 47182080643..ff70763ff03 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,6 +12,6 @@ "strict": true, "target": "es2015" }, - "include": ["typings/**/*.d.ts", "src", "bin", "browser"], + "include": ["typings/**/*.d.ts", "src", "cli", "browser"], "exclude": ["dist", "node_modules", "test/typescript"] }