diff --git a/src/utils/chunkColouring.ts b/src/utils/chunkColouring.ts index 3c8efadefb0..86793db1739 100644 --- a/src/utils/chunkColouring.ts +++ b/src/utils/chunkColouring.ts @@ -2,74 +2,175 @@ import ExternalModule from '../ExternalModule'; import Module from '../Module'; import { randomUint8Array, Uint8ArrayXor } from './entryHashing'; +type DependentModuleMap = Map>; + export function assignChunkColouringHashes( entryModules: Module[], manualChunkModules: Record ) { - let currentEntry: Module, currentEntryHash: Uint8Array; - let modulesVisitedForCurrentEntry: Set; - const handledEntryPoints: Set = new Set(); - const dynamicImports: Module[] = []; + const { dependentEntryPointsByModule, dynamicImportersByModule } = analyzeModuleGraph( + entryModules + ); + const dynamicDependentEntryPointsByDynamicEntry: DependentModuleMap = getDynamicDependentEntryPoints( + dependentEntryPointsByModule, + dynamicImportersByModule + ); - const addCurrentEntryColourToModule = (module: Module) => { - if (currentEntry.manualChunkAlias) { - module.manualChunkAlias = currentEntry.manualChunkAlias; - module.entryPointsHash = currentEntryHash; - } else { - Uint8ArrayXor(module.entryPointsHash, currentEntryHash); - } + if (manualChunkModules) { + for (const chunkName of Object.keys(manualChunkModules)) { + const entryHash = randomUint8Array(10); - for (const dependency of module.dependencies) { - if ( - dependency instanceof ExternalModule || - modulesVisitedForCurrentEntry.has(dependency.id) - ) { - continue; - } - modulesVisitedForCurrentEntry.add(dependency.id); - if (!handledEntryPoints.has(dependency.id) && !dependency.manualChunkAlias) { - addCurrentEntryColourToModule(dependency); + for (const entry of manualChunkModules[chunkName]) { + addColourToModuleDependencies( + entry, + entryHash, + null, + dependentEntryPointsByModule, + dynamicDependentEntryPointsByDynamicEntry + ); } } + } - for (const { resolution } of module.dynamicImports) { - if ( - resolution instanceof Module && - resolution.dynamicallyImportedBy.length > 0 && - !resolution.manualChunkAlias - ) { - dynamicImports.push(resolution); - } + for (const entry of entryModules) { + if (!entry.manualChunkAlias) { + const entryHash = randomUint8Array(10); + addColourToModuleDependencies( + entry, + entryHash, + null, + dependentEntryPointsByModule, + dynamicDependentEntryPointsByDynamicEntry + ); } - }; + } - if (manualChunkModules) { - for (const chunkName of Object.keys(manualChunkModules)) { - currentEntryHash = randomUint8Array(10); + for (const entry of dynamicImportersByModule.keys()) { + if (!entry.manualChunkAlias) { + const entryHash = randomUint8Array(10); + addColourToModuleDependencies( + entry, + entryHash, + dynamicDependentEntryPointsByDynamicEntry.get(entry)!, + dependentEntryPointsByModule, + dynamicDependentEntryPointsByDynamicEntry + ); + } + } +} - for (currentEntry of manualChunkModules[chunkName]) { - modulesVisitedForCurrentEntry = new Set(currentEntry.id); - addCurrentEntryColourToModule(currentEntry); +function analyzeModuleGraph( + entryModules: Module[] +): { + dependentEntryPointsByModule: DependentModuleMap; + dynamicImportersByModule: DependentModuleMap; +} { + const dynamicImportersByModule: DependentModuleMap = new Map(); + const dependentEntryPointsByModule: DependentModuleMap = new Map(); + const entriesToHandle = new Set(entryModules); + for (const currentEntry of entriesToHandle) { + const modulesToHandle = new Set([currentEntry]); + for (const module of modulesToHandle) { + getDependentModules(dependentEntryPointsByModule, module).add(currentEntry); + for (const dependency of module.dependencies) { + if (!(dependency instanceof ExternalModule)) { + modulesToHandle.add(dependency); + } + } + for (const { resolution } of module.dynamicImports) { + if ( + resolution instanceof Module && + resolution.dynamicallyImportedBy.length > 0 && + !resolution.manualChunkAlias + ) { + getDependentModules(dynamicImportersByModule, resolution).add(module); + entriesToHandle.add(resolution); + } } } } + return { dependentEntryPointsByModule, dynamicImportersByModule }; +} - for (currentEntry of entryModules) { - handledEntryPoints.add(currentEntry.id); - currentEntryHash = randomUint8Array(10); - modulesVisitedForCurrentEntry = new Set(currentEntry.id); - if (!currentEntry.manualChunkAlias) { - addCurrentEntryColourToModule(currentEntry); +function getDependentModules(moduleMap: DependentModuleMap, module: Module): Set { + const dependentModules = moduleMap.get(module) || new Set(); + moduleMap.set(module, dependentModules); + return dependentModules; +} + +function getDynamicDependentEntryPoints( + dependentEntryPointsByModule: DependentModuleMap, + dynamicImportersByModule: DependentModuleMap +): DependentModuleMap { + const dynamicDependentEntryPointsByDynamicEntry: DependentModuleMap = new Map(); + for (const [dynamicEntry, importers] of dynamicImportersByModule.entries()) { + const dynamicDependentEntryPoints = getDependentModules( + dynamicDependentEntryPointsByDynamicEntry, + dynamicEntry + ); + for (const importer of importers) { + for (const entryPoint of dependentEntryPointsByModule.get(importer)!) { + dynamicDependentEntryPoints.add(entryPoint); + } } } + return dynamicDependentEntryPointsByDynamicEntry; +} - for (currentEntry of dynamicImports) { - if (handledEntryPoints.has(currentEntry.id)) { +function addColourToModuleDependencies( + entry: Module, + colour: Uint8Array, + dynamicDependentEntryPoints: Set | null, + dependentEntryPointsByModule: DependentModuleMap, + dynamicDependentEntryPointsByDynamicEntry: DependentModuleMap +) { + const manualChunkAlias = entry.manualChunkAlias; + const modulesToHandle = new Set([entry]); + for (const module of modulesToHandle) { + if (manualChunkAlias) { + module.manualChunkAlias = manualChunkAlias; + module.entryPointsHash = colour; + } else if ( + dynamicDependentEntryPoints && + areEntryPointsContainedOrDynamicallyDependent( + dynamicDependentEntryPoints, + dependentEntryPointsByModule.get(module)!, + dynamicDependentEntryPointsByDynamicEntry + ) + ) { continue; + } else { + Uint8ArrayXor(module.entryPointsHash, colour); + } + for (const dependency of module.dependencies) { + if (!(dependency instanceof ExternalModule || dependency.manualChunkAlias)) { + modulesToHandle.add(dependency); + } + } + } +} + +function areEntryPointsContainedOrDynamicallyDependent( + entryPoints: Set, + superSet: Set, + dynamicDependentEntryPointsByDynamicEntry: DependentModuleMap +): boolean { + for (const module of entryPoints) { + if (!superSet.has(module)) { + const dynamicDependentEntryPoints = dynamicDependentEntryPointsByDynamicEntry.get(module); + if ( + !( + dynamicDependentEntryPoints && + areEntryPointsContainedOrDynamicallyDependent( + dynamicDependentEntryPoints, + superSet, + dynamicDependentEntryPointsByDynamicEntry + ) + ) + ) { + return false; + } } - handledEntryPoints.add(currentEntry.id); - currentEntryHash = randomUint8Array(10); - modulesVisitedForCurrentEntry = new Set(currentEntry.id); - addCurrentEntryColourToModule(currentEntry); } + return true; } diff --git a/src/utils/entryHashing.ts b/src/utils/entryHashing.ts index ae19ff8a6ae..77327a7fd6e 100644 --- a/src/utils/entryHashing.ts +++ b/src/utils/entryHashing.ts @@ -1,12 +1,12 @@ const CHAR_CODE_A = 97; const CHAR_CODE_0 = 48; -function intToHex(num: number) { +function intToHex(num: number): string { if (num < 10) return String.fromCharCode(CHAR_CODE_0 + num); else return String.fromCharCode(CHAR_CODE_A + (num - 10)); } -export function Uint8ArrayToHexString(buffer: Uint8Array) { +export function Uint8ArrayToHexString(buffer: Uint8Array): string { let str = ''; // hex conversion - 2 chars per 8 bit component for (let i = 0; i < buffer.length; i++) { @@ -18,24 +18,17 @@ export function Uint8ArrayToHexString(buffer: Uint8Array) { return str; } -export function Uint8ArrayXor(to: Uint8Array, from: Uint8Array) { - for (let i = 0; i < to.length; i++) to[i] = to[i] ^ from[i]; - return to; -} - -export function randomUint8Array(len: number) { +export function randomUint8Array(len: number): Uint8Array { const buffer = new Uint8Array(len); for (let i = 0; i < buffer.length; i++) buffer[i] = Math.random() * (2 << 8); return buffer; } -export function Uint8ArrayEqual(bufferA: Uint8Array, bufferB: Uint8Array) { - for (let i = 0; i < bufferA.length; i++) { - if (bufferA[i] !== bufferB[i]) return false; - } - return true; +export function Uint8ArrayXor(to: Uint8Array, from: Uint8Array): Uint8Array { + for (let i = 0; i < to.length; i++) to[i] = to[i] ^ from[i]; + return to; } -export function randomHexString(len: number) { +export function randomHexString(len: number): string { return Uint8ArrayToHexString(randomUint8Array(Math.floor(len / 2))); } diff --git a/test/chunking-form/samples/circular-entry-points/_expected/amd/generated-main1.js b/test/chunking-form/samples/circular-entry-points/_expected/amd/generated-main1.js new file mode 100644 index 00000000000..63702b9ecf5 --- /dev/null +++ b/test/chunking-form/samples/circular-entry-points/_expected/amd/generated-main1.js @@ -0,0 +1,26 @@ +define(['exports'], function (exports) { 'use strict'; + + class C { + fn (num) { + console.log(num - p$1); + } + } + + var p = 43; + + new C().fn(p); + + class C$1 { + fn (num) { + console.log(num - p); + } + } + + var p$1 = 42; + + new C$1().fn(p$1); + + exports.p = p; + exports.p$1 = p$1; + +}); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js index 85ab96efabc..0ab330944b0 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/amd/main1.js @@ -1,17 +1,9 @@ -define(['exports', './main2'], function (exports, main2) { 'use strict'; +define(['exports', './generated-main1'], function (exports, main2) { 'use strict'; - class C { - fn (num) { - console.log(num - main2.p); - } - } - var p = 42; - new C().fn(p); + exports.p = main2.p$1; - exports.p = p; - - Object.defineProperty(exports, '__esModule', { value: true }); + Object.defineProperty(exports, '__esModule', { value: true }); }); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js index 3eb8db12220..31b181d41f3 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/amd/main2.js @@ -1,17 +1,9 @@ -define(['exports', './main1'], function (exports, main1) { 'use strict'; +define(['exports', './generated-main1'], function (exports, main2) { 'use strict'; - class C { - fn (num) { - console.log(num - main1.p); - } - } - var p = 43; - new C().fn(p); + exports.p = main2.p; - exports.p = p; - - Object.defineProperty(exports, '__esModule', { value: true }); + Object.defineProperty(exports, '__esModule', { value: true }); }); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/cjs/generated-main1.js b/test/chunking-form/samples/circular-entry-points/_expected/cjs/generated-main1.js new file mode 100644 index 00000000000..4a8867edea5 --- /dev/null +++ b/test/chunking-form/samples/circular-entry-points/_expected/cjs/generated-main1.js @@ -0,0 +1,24 @@ +'use strict'; + +class C { + fn (num) { + console.log(num - p$1); + } +} + +var p = 43; + +new C().fn(p); + +class C$1 { + fn (num) { + console.log(num - p); + } +} + +var p$1 = 42; + +new C$1().fn(p$1); + +exports.p = p; +exports.p$1 = p$1; diff --git a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js index 0dbaf2d8d0e..a5ec2910766 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main1.js @@ -2,16 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var main2 = require('./main2.js'); +var main2 = require('./generated-main1.js'); -class C { - fn (num) { - console.log(num - main2.p); - } -} -var p = 42; -new C().fn(p); - -exports.p = p; +exports.p = main2.p$1; diff --git a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js index 84e7cd4e825..0b9366cd0e2 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/cjs/main2.js @@ -2,16 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var main1 = require('./main1.js'); +var main2 = require('./generated-main1.js'); -class C { - fn (num) { - console.log(num - main1.p); - } -} -var p = 43; -new C().fn(p); - -exports.p = p; +exports.p = main2.p; diff --git a/test/chunking-form/samples/circular-entry-points/_expected/es/generated-main1.js b/test/chunking-form/samples/circular-entry-points/_expected/es/generated-main1.js new file mode 100644 index 00000000000..eec0c2fcd92 --- /dev/null +++ b/test/chunking-form/samples/circular-entry-points/_expected/es/generated-main1.js @@ -0,0 +1,21 @@ +class C { + fn (num) { + console.log(num - p$1); + } +} + +var p = 43; + +new C().fn(p); + +class C$1 { + fn (num) { + console.log(num - p); + } +} + +var p$1 = 42; + +new C$1().fn(p$1); + +export { p$1 as a, p }; diff --git a/test/chunking-form/samples/circular-entry-points/_expected/es/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/es/main1.js index 42544cfe1a8..0a83cdd426e 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/es/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/es/main1.js @@ -1,13 +1 @@ -import { p as p$1 } from './main2.js'; - -class C { - fn (num) { - console.log(num - p$1); - } -} - -var p = 42; - -new C().fn(p); - -export { p }; +export { a as p } from './generated-main1.js'; diff --git a/test/chunking-form/samples/circular-entry-points/_expected/es/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/es/main2.js index 9c6d6a82ad4..b1a60375e3b 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/es/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/es/main2.js @@ -1,13 +1 @@ -import { p as p$1 } from './main1.js'; - -class C { - fn (num) { - console.log(num - p$1); - } -} - -var p = 43; - -new C().fn(p); - -export { p }; +export { p } from './generated-main1.js'; diff --git a/test/chunking-form/samples/circular-entry-points/_expected/system/generated-main1.js b/test/chunking-form/samples/circular-entry-points/_expected/system/generated-main1.js new file mode 100644 index 00000000000..a0dad543e24 --- /dev/null +++ b/test/chunking-form/samples/circular-entry-points/_expected/system/generated-main1.js @@ -0,0 +1,28 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + class C { + fn (num) { + console.log(num - p$1); + } + } + + var p = exports('p', 43); + + new C().fn(p); + + class C$1 { + fn (num) { + console.log(num - p); + } + } + + var p$1 = exports('a', 42); + + new C$1().fn(p$1); + + } + }; +}); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js b/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js index 1632ea1c0aa..491c2be1e9f 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/system/main1.js @@ -1,22 +1,13 @@ -System.register(['./main2.js'], function (exports) { - 'use strict'; - var p$1; - return { - setters: [function (module) { - p$1 = module.p; - }], - execute: function () { +System.register(['./generated-main1.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('p', module.a); + }], + execute: function () { - class C { - fn (num) { - console.log(num - p$1); - } - } - var p = exports('p', 42); - new C().fn(p); - - } - }; + } + }; }); diff --git a/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js b/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js index 03413d21297..21397d608ec 100644 --- a/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js +++ b/test/chunking-form/samples/circular-entry-points/_expected/system/main2.js @@ -1,22 +1,13 @@ -System.register(['./main1.js'], function (exports) { - 'use strict'; - var p$1; - return { - setters: [function (module) { - p$1 = module.p; - }], - execute: function () { +System.register(['./generated-main1.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('p', module.p); + }], + execute: function () { - class C { - fn (num) { - console.log(num - p$1); - } - } - var p = exports('p', 43); - new C().fn(p); - - } - }; + } + }; }); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js index 337791a6921..428b2853e86 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js @@ -1,8 +1,5 @@ -define(['require', './nested/chunk'], function (require, showImage) { 'use strict'; +define(['./nested/chunk'], function (main) { 'use strict'; - var logo = new URL(require.toUrl('./assets/logo1-a5ec488b.svg'), document.baseURI).href; - showImage.showImage(logo); - new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }); }); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js index 37057bda9a9..1922edf1019 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js @@ -1,4 +1,6 @@ -define(['exports'], function (exports) { 'use strict'; +define(['require', 'exports'], function (require, exports) { 'use strict'; + + var logo = new URL(require.toUrl('../assets/logo1-a5ec488b.svg'), document.baseURI).href; function showImage(url) { console.log(url); @@ -9,6 +11,9 @@ define(['exports'], function (exports) { 'use strict'; } } + showImage(logo); + new Promise(function (resolve, reject) { require(['./chunk2'], resolve, reject) }); + exports.showImage = showImage; }); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk2.js index 92ac9ba4db0..42f6b4c01d9 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk2.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk2.js @@ -1,7 +1,7 @@ -define(['require', './chunk'], function (require, showImage) { 'use strict'; +define(['require', './chunk'], function (require, main) { 'use strict'; var logo = new URL(require.toUrl('../assets/logo2-6d5979e4.svg'), document.baseURI).href; - showImage.showImage(logo); + main.showImage(logo); }); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js index 5078a894cce..9cfd3ef8efe 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js @@ -1,8 +1,4 @@ 'use strict'; -var showImage = require('./nested/chunk.js'); +require('./nested/chunk.js'); -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-a5ec488b.svg').href : new URL('assets/logo1-a5ec488b.svg', document.currentScript && document.currentScript.src || document.baseURI).href); - -showImage.showImage(logo); -new Promise(function (resolve) { resolve(require('./nested/chunk2.js')); }); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js index ddb8d67c1f2..15b31289674 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js @@ -1,5 +1,7 @@ 'use strict'; +var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo1-a5ec488b.svg').href : new URL('../assets/logo1-a5ec488b.svg', document.currentScript && document.currentScript.src || document.baseURI).href); + function showImage(url) { console.log(url); if (typeof document !== 'undefined') { @@ -9,4 +11,7 @@ function showImage(url) { } } +showImage(logo); +new Promise(function (resolve) { resolve(require('./chunk2.js')); }); + exports.showImage = showImage; diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk2.js index 510d2678d19..2202346b0af 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk2.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk2.js @@ -1,7 +1,7 @@ 'use strict'; -var showImage = require('./chunk.js'); +var main = require('./chunk.js'); var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-6d5979e4.svg').href : new URL('../assets/logo2-6d5979e4.svg', document.currentScript && document.currentScript.src || document.baseURI).href); -showImage.showImage(logo); +main.showImage(logo); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js index 6145c907395..a941d5953ff 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js @@ -1,6 +1 @@ -import { s as showImage } from './nested/chunk.js'; - -var logo = new URL('assets/logo1-a5ec488b.svg', import.meta.url).href; - -showImage(logo); -import('./nested/chunk2.js'); +import './nested/chunk.js'; diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js index cf266147e36..6f40accccb2 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js @@ -1,3 +1,5 @@ +var logo = new URL('../assets/logo1-a5ec488b.svg', import.meta.url).href; + function showImage(url) { console.log(url); if (typeof document !== 'undefined') { @@ -7,4 +9,7 @@ function showImage(url) { } } +showImage(logo); +import('./chunk2.js'); + export { showImage as s }; diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js index 3cef21c3600..8a6c6cc2c9f 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js @@ -1,16 +1,10 @@ -System.register(['./nested/chunk.js'], function (exports, module) { +System.register(['./nested/chunk.js'], function () { 'use strict'; - var showImage; return { - setters: [function (module) { - showImage = module.s; - }], + setters: [function () {}], execute: function () { - var logo = new URL('assets/logo1-a5ec488b.svg', module.meta.url).href; - showImage(logo); - module.import('./nested/chunk2.js'); } }; diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js index 11e47945a7d..39386dc6991 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js @@ -1,10 +1,12 @@ -System.register([], function (exports) { +System.register([], function (exports, module) { 'use strict'; return { execute: function () { exports('s', showImage); + var logo = new URL('../assets/logo1-a5ec488b.svg', module.meta.url).href; + function showImage(url) { console.log(url); if (typeof document !== 'undefined') { @@ -14,6 +16,9 @@ System.register([], function (exports) { } } + showImage(logo); + module.import('./chunk2.js'); + } }; }); 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 d2c7c803984..2e2174a2c9b 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,7 +1,7 @@ -define(['exports', './generated-dep4'], function (exports, dep4) { 'use strict'; +define(['exports', './generated-main'], function (exports, main) { 'use strict'; function mult (num) { - return num + dep4.multiplier; + return num + main.multiplier; } exports.mult = mult; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep4.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep4.js deleted file mode 100644 index 972a328006d..00000000000 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep4.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - var multiplier = 7; - - exports.multiplier = multiplier; - -}); diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-main.js new file mode 100644 index 00000000000..edcc94c0953 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-main.js @@ -0,0 +1,28 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + var multiplier = 7; + + function calc (num) { + return num * multiplier; + } + + function fn (num) { + return num * calc(num); + } + + function dynamic (num) { + return new Promise(function (resolve, reject) { require(['./generated-dep2'], resolve, reject) }) + .then(dep2 => { + return dep2.mult(num); + }); + } + + console.log(fn(5)); + + dynamic(10).then(num => { + console.log(num); + }); + + exports.multiplier = multiplier; + +}); 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 5c0dffc9c3c..4cef940ab88 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,24 +1,5 @@ -define(['require', './generated-dep4'], function (require, dep4) { 'use strict'; +define(['./generated-main'], function (main) { 'use strict'; - function calc (num) { - return num * dep4.multiplier; - } - function fn (num) { - return num * calc(num); - } - - function dynamic (num) { - return new Promise(function (resolve, reject) { require(['./generated-dep2'], resolve, reject) }) - .then(dep2 => { - return dep2.mult(num); - }); - } - - console.log(fn(5)); - - dynamic(10).then(num => { - console.log(num); - }); }); 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 b163fd7ef4b..f45aa10d2bc 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,9 +1,9 @@ 'use strict'; -var dep4 = require('./generated-dep4.js'); +var main = require('./generated-main.js'); function mult (num) { - return num + dep4.multiplier; + return num + main.multiplier; } exports.mult = mult; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep4.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep4.js deleted file mode 100644 index 6c19ba5bed9..00000000000 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep4.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var multiplier = 7; - -exports.multiplier = multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-main.js new file mode 100644 index 00000000000..8ab76d9efb1 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-main.js @@ -0,0 +1,26 @@ +'use strict'; + +var multiplier = 7; + +function calc (num) { + return num * multiplier; +} + +function fn (num) { + return num * calc(num); +} + +function dynamic (num) { + return new Promise(function (resolve) { resolve(require('./generated-dep2.js')); }) + .then(dep2 => { + return dep2.mult(num); + }); +} + +console.log(fn(5)); + +dynamic(10).then(num => { + console.log(num); +}); + +exports.multiplier = multiplier; 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 7cb456918e0..464b4ce8e34 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,24 +1,4 @@ 'use strict'; -var dep4 = require('./generated-dep4.js'); +require('./generated-main.js'); -function calc (num) { - return num * dep4.multiplier; -} - -function fn (num) { - return num * calc(num); -} - -function dynamic (num) { - return new Promise(function (resolve) { resolve(require('./generated-dep2.js')); }) - .then(dep2 => { - return dep2.mult(num); - }); -} - -console.log(fn(5)); - -dynamic(10).then(num => { - console.log(num); -}); 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 fa5260712e6..e1de3c81fe3 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-dep4.js'; +import { m as multiplier } from './generated-main.js'; function mult (num) { return num + multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep4.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep4.js deleted file mode 100644 index d53493b9946..00000000000 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep4.js +++ /dev/null @@ -1,3 +0,0 @@ -var multiplier = 7; - -export { multiplier as m }; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-main.js new file mode 100644 index 00000000000..860e897d919 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-main.js @@ -0,0 +1,24 @@ +var multiplier = 7; + +function calc (num) { + return num * multiplier; +} + +function fn (num) { + return num * calc(num); +} + +function dynamic (num) { + return import('./generated-dep2.js') + .then(dep2 => { + return dep2.mult(num); + }); +} + +console.log(fn(5)); + +dynamic(10).then(num => { + console.log(num); +}); + +export { multiplier as m }; 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 8b874a64bb6..bc3090f4a30 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,22 +1 @@ -import { m as multiplier } from './generated-dep4.js'; - -function calc (num) { - return num * multiplier; -} - -function fn (num) { - return num * calc(num); -} - -function dynamic (num) { - return import('./generated-dep2.js') - .then(dep2 => { - return dep2.mult(num); - }); -} - -console.log(fn(5)); - -dynamic(10).then(num => { - console.log(num); -}); +import './generated-main.js'; 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 d7b8dfdb5f6..7172491c255 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-dep4.js'], function (exports) { +System.register(['./generated-main.js'], function (exports) { 'use strict'; var multiplier; return { diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-main.js new file mode 100644 index 00000000000..73b8ed1255c --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-main.js @@ -0,0 +1,31 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + var multiplier = exports('m', 7); + + function calc (num) { + return num * multiplier; + } + + function fn (num) { + return num * calc(num); + } + + function dynamic (num) { + return module.import('./generated-dep2.js') + .then(dep2 => { + return dep2.mult(num); + }); + } + + console.log(fn(5)); + + dynamic(10).then(num => { + console.log(num); + }); + + } + }; +}); 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 72783a72455..1312c7a3bd6 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,33 +1,11 @@ -System.register(['./generated-dep4.js'], function (exports, module) { - 'use strict'; - var multiplier; - return { - setters: [function (module) { - multiplier = module.m; - }], - execute: function () { +System.register(['./generated-main.js'], function () { + 'use strict'; + return { + setters: [function () {}], + execute: function () { - function calc (num) { - return num * multiplier; - } - function fn (num) { - return num * calc(num); - } - function dynamic (num) { - return module.import('./generated-dep2.js') - .then(dep2 => { - return dep2.mult(num); - }); - } - - console.log(fn(5)); - - dynamic(10).then(num => { - console.log(num); - }); - - } - }; + } + }; }); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-inlined.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-inlined.js deleted file mode 100644 index eeab6552e64..00000000000 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/generated-inlined.js +++ /dev/null @@ -1,9 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - var inlined = 'inlined'; - const x = 1; - - exports.default = inlined; - exports.x = x; - -}); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js index ab477ff73b1..744d5b098dc 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/amd/main1.js @@ -1,9 +1,18 @@ -define(['require', 'exports', './generated-inlined', './generated-separate'], function (require, exports, inlined$1, separate$1) { 'use strict'; +define(['require', 'exports', './generated-separate'], function (require, exports, separate$1) { 'use strict'; - const inlined = new Promise(function (resolve, reject) { require(['./generated-inlined'], resolve, reject) }); + var inlined = 'inlined'; + const x = 1; + + var inlined$1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + 'default': inlined, + x: x + }); + + const inlined$2 = Promise.resolve().then(function () { return inlined$1; }); const separate = new Promise(function (resolve, reject) { require(['./generated-separate'], resolve, reject) }); - exports.inlined = inlined; + exports.inlined = inlined$2; exports.separate = separate; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-inlined.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-inlined.js deleted file mode 100644 index 42f7789b8cf..00000000000 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/generated-inlined.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -var inlined = 'inlined'; -const x = 1; - -exports.default = inlined; -exports.x = x; diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js index 4b2bcc7fdd5..dc66435748d 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/cjs/main1.js @@ -2,11 +2,19 @@ Object.defineProperty(exports, '__esModule', { value: true }); -require('./generated-inlined.js'); require('./generated-separate.js'); -const inlined = new Promise(function (resolve) { resolve(require('./generated-inlined.js')); }); +var inlined = 'inlined'; +const x = 1; + +var inlined$1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + 'default': inlined, + x: x +}); + +const inlined$2 = Promise.resolve().then(function () { return inlined$1; }); const separate = new Promise(function (resolve) { resolve(require('./generated-separate.js')); }); -exports.inlined = inlined; +exports.inlined = inlined$2; exports.separate = separate; diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/generated-inlined.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/generated-inlined.js deleted file mode 100644 index d13cbecbfa4..00000000000 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/generated-inlined.js +++ /dev/null @@ -1,5 +0,0 @@ -var inlined = 'inlined'; -const x = 1; - -export default inlined; -export { x }; diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/main1.js index 4a8004df29f..36f87038dd8 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/es/main1.js @@ -1,7 +1,15 @@ -import './generated-inlined.js'; import './generated-separate.js'; -const inlined = import('./generated-inlined.js'); +var inlined = 'inlined'; +const x = 1; + +var inlined$1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + 'default': inlined, + x: x +}); + +const inlined$2 = Promise.resolve().then(function () { return inlined$1; }); const separate = import('./generated-separate.js'); -export { inlined, separate }; +export { inlined$2 as inlined, separate }; diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js index 9523ff96e05..6db94a041c5 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js +++ b/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/main1.js @@ -1,10 +1,19 @@ -System.register(['./generated-inlined.js', './generated-separate.js'], function (exports, module) { +System.register(['./generated-separate.js'], function (exports, module) { 'use strict'; return { - setters: [function () {}, function () {}], + setters: [function () {}], execute: function () { - const inlined = exports('inlined', module.import('./generated-inlined.js')); + var inlined = 'inlined'; + const x = 1; + + var inlined$1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + 'default': inlined, + x: x + }); + + const inlined$2 = exports('inlined', Promise.resolve().then(function () { return inlined$1; })); const separate = exports('separate', module.import('./generated-separate.js')); } diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-dep1.js deleted file mode 100644 index d1ed622ba34..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-dep1.js +++ /dev/null @@ -1,21 +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({ - __proto__: null, - bar: bar - }); - - exports.bar = bar; - exports.foo = foo; - -}); 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 cac66392a39..5a7c901f9d8 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,5 +1,20 @@ -define(['./generated-dep1'], function (dep1) { 'use strict'; +define(function () { 'use strict'; - console.log(dep1.foo(), dep1.bar()); + function foo() { + return 'dep2'; + } + + Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); + + function bar() { + return foo(); + } + + var dep1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + bar: bar + }); + + console.log(foo(), bar()); }); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-dep1.js deleted file mode 100644 index 8404868bf0f..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-dep1.js +++ /dev/null @@ -1,19 +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({ - __proto__: null, - bar: bar -}); - -exports.bar = bar; -exports.foo = foo; 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 d054aa0a11c..097718c1f1e 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,18 @@ 'use strict'; -var dep1 = require('./generated-dep1.js'); +function foo() { + return 'dep2'; +} -console.log(dep1.foo(), dep1.bar()); +Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); + +function bar() { + return foo(); +} + +var dep1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + bar: bar +}); + +console.log(foo(), bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-dep1.js deleted file mode 100644 index 861a4f7b643..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-dep1.js +++ /dev/null @@ -1,16 +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({ - __proto__: null, - bar: bar -}); - -export { bar as b, foo as f }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js index 793f396d0ba..860438239a2 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,16 @@ -import { f as foo, b as bar } from './generated-dep1.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({ + __proto__: null, + bar: bar +}); console.log(foo(), bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-dep1.js deleted file mode 100644 index f88ae2d042e..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-dep1.js +++ /dev/null @@ -1,28 +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({ - __proto__: null, - bar: bar - }); - - } - }; -}); 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 1f0c72ea5a1..524ed74f1fd 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,13 +1,23 @@ -System.register(['./generated-dep1.js'], function () { +System.register([], function () { 'use strict'; - var foo, bar; return { - setters: [function (module) { - foo = module.f; - bar = module.b; - }], execute: function () { + function foo() { + return 'dep2'; + } + + Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); + + function bar() { + return foo(); + } + + var dep1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + bar: bar + }); + console.log(foo(), bar()); } diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/main.js b/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/main.js new file mode 100644 index 00000000000..ea3b3d8d9f1 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/main.js @@ -0,0 +1,14 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const sharedValue = 'shared'; + + assert.equal(sharedValue, 'shared'); + + const promise = new Promise(function (resolve, reject) { require(['./other'], resolve, reject) }).then(result => + assert.deepEqual(result, { value: 'shared' }) + ); + + exports.promise = promise; + exports.sharedValue = sharedValue; + +}); 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 9015a82be2e..c5536e87042 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,7 +1,7 @@ -define(['exports', './shared'], function (exports, shared) { 'use strict'; +define(['exports', './main'], function (exports, main) { 'use strict'; - exports.value = shared.sharedValue; + exports.value = main.sharedValue; }); diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/shared.js b/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/shared.js deleted file mode 100644 index 65e59158953..00000000000 --- a/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/shared.js +++ /dev/null @@ -1,7 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - const sharedValue = 'shared'; - - exports.sharedValue = sharedValue; - -}); 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 c6b551a83c2..d7fa3f63973 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js @@ -1,12 +1,8 @@ -define(['require', 'exports', './chunks/shared'], function (require, exports, shared) { 'use strict'; +define(['exports', './chunks/main'], function (exports, main) { 'use strict'; - assert.equal(shared.sharedValue, 'shared'); - const promise = new Promise(function (resolve, reject) { require(['./chunks/other'], resolve, reject) }).then(result => - assert.deepEqual(result, { value: 'shared' }) - ); - exports.promise = promise; + exports.promise = main.promise; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/main.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/main.js new file mode 100644 index 00000000000..fe43df39192 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/main.js @@ -0,0 +1,12 @@ +'use strict'; + +const sharedValue = 'shared'; + +assert.equal(sharedValue, 'shared'); + +const promise = new Promise(function (resolve) { resolve(require('./other.js')); }).then(result => + assert.deepEqual(result, { value: 'shared' }) +); + +exports.promise = promise; +exports.sharedValue = sharedValue; 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 90d22b547c6..5e903eb86e5 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,7 +1,7 @@ 'use strict'; -var shared = require('./shared.js'); +var main = require('./main.js'); -exports.value = shared.sharedValue; +exports.value = main.sharedValue; diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/shared.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/shared.js deleted file mode 100644 index 5a6d40af489..00000000000 --- a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/shared.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -const sharedValue = 'shared'; - -exports.sharedValue = sharedValue; 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 d3c2764b413..4f5cbe2bc72 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js @@ -2,12 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var shared = require('./chunks/shared.js'); +var main = require('./chunks/main.js'); -assert.equal(shared.sharedValue, 'shared'); -const promise = new Promise(function (resolve) { resolve(require('./chunks/other.js')); }).then(result => - assert.deepEqual(result, { value: 'shared' }) -); -exports.promise = promise; +exports.promise = main.promise; diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/main.js b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/main.js new file mode 100644 index 00000000000..1d6d7916ddf --- /dev/null +++ b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/main.js @@ -0,0 +1,9 @@ +const sharedValue = 'shared'; + +assert.equal(sharedValue, 'shared'); + +const promise = import('./other.js').then(result => + assert.deepEqual(result, { value: 'shared' }) +); + +export { promise as p, sharedValue as s }; diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js index ff838bd038b..5750af52a03 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 './shared.js'; +export { s as value } from './main.js'; diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/shared.js b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/shared.js deleted file mode 100644 index d5f271b2232..00000000000 --- a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/shared.js +++ /dev/null @@ -1,3 +0,0 @@ -const sharedValue = 'shared'; - -export { sharedValue as s }; 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 4c4ca183a1e..32329dc6a75 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/es/main.js @@ -1,9 +1 @@ -import { s as sharedValue } from './chunks/shared.js'; - -assert.equal(sharedValue, 'shared'); - -const promise = import('./chunks/other.js').then(result => - assert.deepEqual(result, { value: 'shared' }) -); - -export { promise }; +export { p as promise } from './chunks/main.js'; diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/main.js b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/main.js new file mode 100644 index 00000000000..5a2e6f0e106 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/main.js @@ -0,0 +1,16 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const sharedValue = exports('s', 'shared'); + + assert.equal(sharedValue, 'shared'); + + const promise = exports('p', module.import('./other.js').then(result => + assert.deepEqual(result, { value: '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 201777a5cbe..51028be8b37 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(['./shared.js'], function (exports) { +System.register(['./main.js'], function (exports) { 'use strict'; return { setters: [function (module) { 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 a8d72ea45f1..bbae28dc22e 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/system/main.js @@ -1,17 +1,12 @@ -System.register(['./chunks/shared.js'], function (exports, module) { +System.register(['./chunks/main.js'], function (exports) { 'use strict'; - var sharedValue; return { setters: [function (module) { - sharedValue = module.s; + exports('promise', module.p); }], execute: function () { - assert.equal(sharedValue, 'shared'); - const promise = exports('promise', module.import('./chunks/other.js').then(result => - assert.deepEqual(result, { value: 'shared' }) - )); } }; 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 abad92080cc..391c8457fbc 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 @@ -17,11 +17,10 @@ module.exports = { assert.strictEqual(this.getFileName(referenceId), 'custom/build-start-chunk.js'); }, generateBundle(options, bundle) { - assert.deepStrictEqual(Object.keys(bundle).map(key => bundle[key].name), [ - 'build-start-chunk', - 'main', - 'dep' - ]); + assert.deepStrictEqual( + Object.keys(bundle).map(key => bundle[key].name), + ['build-start-chunk', 'main', 'buildStart'] + ); } } } 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 bc0871d46b1..24c734da490 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,9 +1,8 @@ -define(['exports', '../generated-dep'], function (exports, dep) { 'use strict'; +define(['exports', '../generated-buildStart'], function (exports, buildStart) { 'use strict'; - const id = 'startBuild'; - console.log(id, dep.value); - exports.id = id; + + exports.id = buildStart.id; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-dep.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-buildStart.js similarity index 59% rename from test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-dep.js rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-buildStart.js index 5e2f9f02968..7b9e28ac4ab 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-dep.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-buildStart.js @@ -2,6 +2,10 @@ define(['exports'], function (exports) { 'use strict'; var value = 42; + const id = 'startBuild'; + console.log(id, value); + + exports.id = id; exports.value = value; }); 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 1ee89bd0e67..985270c09e1 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,7 +1,7 @@ -define(['./generated-dep', './custom/build-start-chunk'], function (dep, buildStart) { 'use strict'; +define(['./generated-buildStart'], function (buildStart) { 'use strict'; console.log(buildStart.id); - console.log('main', dep.value); + console.log('main', buildStart.value); }); 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 54e70b3a4af..6aaa72e953f 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,9 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var dep = require('../generated-dep.js'); +var buildStart = require('../generated-buildStart.js'); -const id = 'startBuild'; -console.log(id, dep.value); -exports.id = id; + +exports.id = buildStart.id; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-buildStart.js new file mode 100644 index 00000000000..162e5866104 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-buildStart.js @@ -0,0 +1,9 @@ +'use strict'; + +var value = 42; + +const id = 'startBuild'; +console.log(id, value); + +exports.id = id; +exports.value = value; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-dep.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-dep.js deleted file mode 100644 index 6cec42c9a07..00000000000 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-dep.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var value = 42; - -exports.value = value; 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 036ef6a6055..3359c26be41 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,8 +1,7 @@ 'use strict'; -var dep = require('./generated-dep.js'); -var buildStart = require('./custom/build-start-chunk.js'); +var buildStart = require('./generated-buildStart.js'); console.log(buildStart.id); -console.log('main', dep.value); +console.log('main', buildStart.value); 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 c9077d82bfd..250fef22b3a 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,6 +1 @@ -import { v as value } from '../generated-dep.js'; - -const id = 'startBuild'; -console.log(id, value); - -export { id }; +export { i as id } from '../generated-buildStart.js'; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-buildStart.js new file mode 100644 index 00000000000..fcd74603b9a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-buildStart.js @@ -0,0 +1,6 @@ +var value = 42; + +const id = 'startBuild'; +console.log(id, value); + +export { id as i, value as v }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-dep.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-dep.js deleted file mode 100644 index b7cbe038a73..00000000000 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-dep.js +++ /dev/null @@ -1,3 +0,0 @@ -var value = 42; - -export { value as v }; 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 b291dee7947..b1094dbbac5 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,5 +1,4 @@ -import { v as value } from './generated-dep.js'; -import { id } from './custom/build-start-chunk.js'; +import { i as id, v as value } from './generated-buildStart.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 e830592fd37..e37489b03c5 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,14 +1,12 @@ -System.register(['../generated-dep.js'], function (exports) { +System.register(['../generated-buildStart.js'], function (exports) { 'use strict'; - var value; return { setters: [function (module) { - value = module.v; + exports('id', module.i); }], execute: function () { - const id = exports('id', 'startBuild'); - console.log(id, value); + } }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-buildStart.js new file mode 100644 index 00000000000..491bec60fad --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-buildStart.js @@ -0,0 +1,13 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var value = exports('v', 42); + + const id = exports('i', 'startBuild'); + console.log(id, value); + + } + }; +}); 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 cc7bf937631..55cc8972780 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,11 +1,10 @@ -System.register(['./generated-dep.js', './custom/build-start-chunk.js'], function () { +System.register(['./generated-buildStart.js'], function () { 'use strict'; - var value, id; + var id, value; return { setters: [function (module) { + id = module.i; value = module.v; - }, function (module) { - id = module.id; }], execute: function () { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_config.js index 73c99b57db2..b703d91d0bf 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_config.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_config.js @@ -26,11 +26,10 @@ console.log(id, value); }); }, generateBundle(options, bundle) { - assert.deepStrictEqual(Object.keys(bundle).map(key => bundle[key].name), [ - 'main', - 'dep', - 'emitted' - ]); + assert.deepStrictEqual( + Object.keys(bundle).map(key => bundle[key].name), + ['main', 'emitted', 'emitted'] + ); } } } diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted.js index a086c3ef515..17272f4c92f 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted.js @@ -1,10 +1,11 @@ -define(['exports', './generated-dep'], function (exports, dep) { 'use strict'; +define(['exports'], function (exports) { 'use strict'; + + var value = 42; const id = 'emitted'; - console.log(id, dep.value); + console.log(id, value); exports.id = id; - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.value = value; }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js new file mode 100644 index 00000000000..12e48a162a9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/generated-emitted2.js @@ -0,0 +1,9 @@ +define(['exports', './generated-emitted'], function (exports, emitted) { 'use strict'; + + + + exports.id = emitted.id; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/main.js index ceb3068a820..b2733720024 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/amd/main.js @@ -1,7 +1,7 @@ -define(['./generated-dep', './generated-emitted'], function (dep, emitted) { 'use strict'; +define(['./generated-emitted'], function (emitted) { 'use strict'; console.log(emitted.id); - console.log('main', dep.value); + console.log('main', emitted.value); }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-dep.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-dep.js deleted file mode 100644 index 6cec42c9a07..00000000000 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-dep.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var value = 42; - -exports.value = value; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted.js index e4aeef99a01..4d26cce8d2b 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted.js @@ -1,10 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - -var dep = require('./generated-dep.js'); +var value = 42; const id = 'emitted'; -console.log(id, dep.value); +console.log(id, value); exports.id = id; +exports.value = value; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js new file mode 100644 index 00000000000..cea7e87b55c --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/generated-emitted2.js @@ -0,0 +1,9 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var emitted = require('./generated-emitted.js'); + + + +exports.id = emitted.id; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/main.js index 7ab856e3140..32c995a2c38 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/cjs/main.js @@ -1,8 +1,7 @@ 'use strict'; -var dep = require('./generated-dep.js'); var emitted = require('./generated-emitted.js'); console.log(emitted.id); -console.log('main', dep.value); +console.log('main', emitted.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-dep.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-dep.js deleted file mode 100644 index b7cbe038a73..00000000000 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-dep.js +++ /dev/null @@ -1,3 +0,0 @@ -var value = 42; - -export { value as v }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-emitted.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-emitted.js index d2806a7a5e1..3e476543cad 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-emitted.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-emitted.js @@ -1,6 +1,6 @@ -import { v as value } from './generated-dep.js'; +var value = 42; const id = 'emitted'; console.log(id, value); -export { id }; +export { id as i, value as v }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-emitted2.js new file mode 100644 index 00000000000..d2169e58fbe --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/generated-emitted2.js @@ -0,0 +1 @@ +export { i as id } from './generated-emitted.js'; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/main.js index 2bd26d17681..791a7c2c665 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/es/main.js @@ -1,5 +1,4 @@ -import { v as value } from './generated-dep.js'; -import { id } from './generated-emitted.js'; +import { i as id, v as value } from './generated-emitted.js'; console.log(id); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted.js index 206bbbcae32..8b1783315ca 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted.js @@ -1,13 +1,11 @@ -System.register(['./generated-dep.js'], function (exports) { +System.register([], function (exports) { 'use strict'; - var value; return { - setters: [function (module) { - value = module.v; - }], execute: function () { - const id = exports('id', 'emitted'); + var value = exports('v', 42); + + const id = exports('i', 'emitted'); console.log(id, value); } diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted2.js new file mode 100644 index 00000000000..aca4a34d706 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-emitted2.js @@ -0,0 +1,13 @@ +System.register(['./generated-emitted.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('id', module.i); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/main.js index d429fca8d04..b66e323577b 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/main.js @@ -1,11 +1,10 @@ -System.register(['./generated-dep.js', './generated-emitted.js'], function () { +System.register(['./generated-emitted.js'], function () { 'use strict'; - var value, id; + var id, value; return { setters: [function (module) { + id = module.i; value = module.v; - }, function (module) { - id = module.id; }], execute: function () { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_config.js index fb858148512..4f5333bb654 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_config.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_config.js @@ -32,11 +32,10 @@ console.log(id, value); }); }, generateBundle(options, bundle) { - assert.deepStrictEqual(Object.keys(bundle).map(key => bundle[key].name), [ - 'main', - 'dep', - 'emitted' - ]); + assert.deepStrictEqual( + Object.keys(bundle).map(key => bundle[key].name), + ['main', 'emitted', 'emitted'] + ); } } } diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted.js index a086c3ef515..17272f4c92f 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted.js @@ -1,10 +1,11 @@ -define(['exports', './generated-dep'], function (exports, dep) { 'use strict'; +define(['exports'], function (exports) { 'use strict'; + + var value = 42; const id = 'emitted'; - console.log(id, dep.value); + console.log(id, value); exports.id = id; - - Object.defineProperty(exports, '__esModule', { value: true }); + exports.value = value; }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js new file mode 100644 index 00000000000..12e48a162a9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-emitted2.js @@ -0,0 +1,9 @@ +define(['exports', './generated-emitted'], function (exports, emitted) { 'use strict'; + + + + exports.id = emitted.id; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/main.js index ceb3068a820..b2733720024 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/main.js @@ -1,7 +1,7 @@ -define(['./generated-dep', './generated-emitted'], function (dep, emitted) { 'use strict'; +define(['./generated-emitted'], function (emitted) { 'use strict'; console.log(emitted.id); - console.log('main', dep.value); + console.log('main', emitted.value); }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-dep.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-dep.js deleted file mode 100644 index 6cec42c9a07..00000000000 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-dep.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -var value = 42; - -exports.value = value; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted.js index e4aeef99a01..4d26cce8d2b 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted.js @@ -1,10 +1,9 @@ 'use strict'; -Object.defineProperty(exports, '__esModule', { value: true }); - -var dep = require('./generated-dep.js'); +var value = 42; const id = 'emitted'; -console.log(id, dep.value); +console.log(id, value); exports.id = id; +exports.value = value; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js new file mode 100644 index 00000000000..cea7e87b55c --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/generated-emitted2.js @@ -0,0 +1,9 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var emitted = require('./generated-emitted.js'); + + + +exports.id = emitted.id; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/main.js index 7ab856e3140..32c995a2c38 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/cjs/main.js @@ -1,8 +1,7 @@ 'use strict'; -var dep = require('./generated-dep.js'); var emitted = require('./generated-emitted.js'); console.log(emitted.id); -console.log('main', dep.value); +console.log('main', emitted.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-dep.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-dep.js deleted file mode 100644 index b7cbe038a73..00000000000 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-dep.js +++ /dev/null @@ -1,3 +0,0 @@ -var value = 42; - -export { value as v }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-emitted.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-emitted.js index d2806a7a5e1..3e476543cad 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-emitted.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-emitted.js @@ -1,6 +1,6 @@ -import { v as value } from './generated-dep.js'; +var value = 42; const id = 'emitted'; console.log(id, value); -export { id }; +export { id as i, value as v }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-emitted2.js new file mode 100644 index 00000000000..d2169e58fbe --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/generated-emitted2.js @@ -0,0 +1 @@ +export { i as id } from './generated-emitted.js'; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/main.js index 2bd26d17681..791a7c2c665 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/es/main.js @@ -1,5 +1,4 @@ -import { v as value } from './generated-dep.js'; -import { id } from './generated-emitted.js'; +import { i as id, v as value } from './generated-emitted.js'; console.log(id); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted.js index 206bbbcae32..8b1783315ca 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted.js @@ -1,13 +1,11 @@ -System.register(['./generated-dep.js'], function (exports) { +System.register([], function (exports) { 'use strict'; - var value; return { - setters: [function (module) { - value = module.v; - }], execute: function () { - const id = exports('id', 'emitted'); + var value = exports('v', 42); + + const id = exports('i', 'emitted'); console.log(id, value); } diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted2.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted2.js new file mode 100644 index 00000000000..aca4a34d706 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-emitted2.js @@ -0,0 +1,13 @@ +System.register(['./generated-emitted.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('id', module.i); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/main.js index d429fca8d04..b66e323577b 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/main.js @@ -1,11 +1,10 @@ -System.register(['./generated-dep.js', './generated-emitted.js'], function () { +System.register(['./generated-emitted.js'], function () { 'use strict'; - var value, id; + var id, value; return { setters: [function (module) { + id = module.i; value = module.v; - }, function (module) { - id = module.id; }], execute: function () { diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js index 337791a6921..428b2853e86 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js @@ -1,8 +1,5 @@ -define(['require', './nested/chunk'], function (require, showImage) { 'use strict'; +define(['./nested/chunk'], function (main) { 'use strict'; - var logo = new URL(require.toUrl('./assets/logo1-a5ec488b.svg'), document.baseURI).href; - showImage.showImage(logo); - new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }); }); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js index 37057bda9a9..1922edf1019 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js @@ -1,4 +1,6 @@ -define(['exports'], function (exports) { 'use strict'; +define(['require', 'exports'], function (require, exports) { 'use strict'; + + var logo = new URL(require.toUrl('../assets/logo1-a5ec488b.svg'), document.baseURI).href; function showImage(url) { console.log(url); @@ -9,6 +11,9 @@ define(['exports'], function (exports) { 'use strict'; } } + showImage(logo); + new Promise(function (resolve, reject) { require(['./chunk2'], resolve, reject) }); + exports.showImage = showImage; }); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk2.js index 92ac9ba4db0..42f6b4c01d9 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk2.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk2.js @@ -1,7 +1,7 @@ -define(['require', './chunk'], function (require, showImage) { 'use strict'; +define(['require', './chunk'], function (require, main) { 'use strict'; var logo = new URL(require.toUrl('../assets/logo2-6d5979e4.svg'), document.baseURI).href; - showImage.showImage(logo); + main.showImage(logo); }); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js index 5078a894cce..9cfd3ef8efe 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js @@ -1,8 +1,4 @@ 'use strict'; -var showImage = require('./nested/chunk.js'); +require('./nested/chunk.js'); -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-a5ec488b.svg').href : new URL('assets/logo1-a5ec488b.svg', document.currentScript && document.currentScript.src || document.baseURI).href); - -showImage.showImage(logo); -new Promise(function (resolve) { resolve(require('./nested/chunk2.js')); }); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js index ddb8d67c1f2..15b31289674 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js @@ -1,5 +1,7 @@ 'use strict'; +var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo1-a5ec488b.svg').href : new URL('../assets/logo1-a5ec488b.svg', document.currentScript && document.currentScript.src || document.baseURI).href); + function showImage(url) { console.log(url); if (typeof document !== 'undefined') { @@ -9,4 +11,7 @@ function showImage(url) { } } +showImage(logo); +new Promise(function (resolve) { resolve(require('./chunk2.js')); }); + exports.showImage = showImage; diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk2.js index 510d2678d19..2202346b0af 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk2.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk2.js @@ -1,7 +1,7 @@ 'use strict'; -var showImage = require('./chunk.js'); +var main = require('./chunk.js'); var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-6d5979e4.svg').href : new URL('../assets/logo2-6d5979e4.svg', document.currentScript && document.currentScript.src || document.baseURI).href); -showImage.showImage(logo); +main.showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js index 6145c907395..a941d5953ff 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js @@ -1,6 +1 @@ -import { s as showImage } from './nested/chunk.js'; - -var logo = new URL('assets/logo1-a5ec488b.svg', import.meta.url).href; - -showImage(logo); -import('./nested/chunk2.js'); +import './nested/chunk.js'; diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js index cf266147e36..6f40accccb2 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js @@ -1,3 +1,5 @@ +var logo = new URL('../assets/logo1-a5ec488b.svg', import.meta.url).href; + function showImage(url) { console.log(url); if (typeof document !== 'undefined') { @@ -7,4 +9,7 @@ function showImage(url) { } } +showImage(logo); +import('./chunk2.js'); + export { showImage as s }; diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js b/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js index 3cef21c3600..8a6c6cc2c9f 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js @@ -1,16 +1,10 @@ -System.register(['./nested/chunk.js'], function (exports, module) { +System.register(['./nested/chunk.js'], function () { 'use strict'; - var showImage; return { - setters: [function (module) { - showImage = module.s; - }], + setters: [function () {}], execute: function () { - var logo = new URL('assets/logo1-a5ec488b.svg', module.meta.url).href; - showImage(logo); - module.import('./nested/chunk2.js'); } }; diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js index 11e47945a7d..39386dc6991 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js @@ -1,10 +1,12 @@ -System.register([], function (exports) { +System.register([], function (exports, module) { 'use strict'; return { execute: function () { exports('s', showImage); + var logo = new URL('../assets/logo1-a5ec488b.svg', module.meta.url).href; + function showImage(url) { console.log(url); if (typeof document !== 'undefined') { @@ -14,6 +16,9 @@ System.register([], function (exports) { } } + showImage(logo); + module.import('./chunk2.js'); + } }; }); diff --git a/test/chunking-form/samples/import-meta-url/_expected/amd/main.js b/test/chunking-form/samples/import-meta-url/_expected/amd/main.js index b7f5a800c4a..428b2853e86 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/amd/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/amd/main.js @@ -1,6 +1,5 @@ -define(['module', 'require', './nested/chunk'], function (module, require, log) { 'use strict'; +define(['./nested/chunk'], function (main) { 'use strict'; + - log.log('main: ' + new URL(module.uri, document.baseURI).href); - new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }); }); diff --git a/test/chunking-form/samples/import-meta-url/_expected/amd/nested/chunk.js b/test/chunking-form/samples/import-meta-url/_expected/amd/nested/chunk.js index 8df72136505..584f1b73864 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/amd/nested/chunk.js +++ b/test/chunking-form/samples/import-meta-url/_expected/amd/nested/chunk.js @@ -1,4 +1,4 @@ -define(['exports'], function (exports) { 'use strict'; +define(['module', 'require', 'exports'], function (module, require, exports) { 'use strict'; function log(url) { if (typeof document === 'undefined') { @@ -8,6 +8,9 @@ define(['exports'], function (exports) { 'use strict'; } } + log('main: ' + new URL(module.uri, document.baseURI).href); + new Promise(function (resolve, reject) { require(['./chunk2'], resolve, reject) }); + exports.log = log; }); diff --git a/test/chunking-form/samples/import-meta-url/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/import-meta-url/_expected/amd/nested/chunk2.js index 468fd8cd396..7c723b30362 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/amd/nested/chunk2.js +++ b/test/chunking-form/samples/import-meta-url/_expected/amd/nested/chunk2.js @@ -1,5 +1,5 @@ -define(['module', './chunk'], function (module, log) { 'use strict'; +define(['module', './chunk'], function (module, main) { 'use strict'; - log.log('nested: ' + new URL(module.uri, document.baseURI).href); + main.log('nested: ' + new URL(module.uri, document.baseURI).href); }); diff --git a/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js b/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js index bb1f021a939..9cfd3ef8efe 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/cjs/main.js @@ -1,6 +1,4 @@ 'use strict'; -var log = require('./nested/chunk.js'); +require('./nested/chunk.js'); -log.log('main: ' + (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('main.js', document.baseURI).href))); -new Promise(function (resolve) { resolve(require('./nested/chunk2.js')); }); diff --git a/test/chunking-form/samples/import-meta-url/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/import-meta-url/_expected/cjs/nested/chunk.js index b1d04a7cdab..261a18db9ba 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/cjs/nested/chunk.js +++ b/test/chunking-form/samples/import-meta-url/_expected/cjs/nested/chunk.js @@ -8,4 +8,7 @@ function log(url) { } } +log('main: ' + (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('nested/chunk.js', document.baseURI).href))); +new Promise(function (resolve) { resolve(require('./chunk2.js')); }); + exports.log = log; diff --git a/test/chunking-form/samples/import-meta-url/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/import-meta-url/_expected/cjs/nested/chunk2.js index a674059fbab..a28996d5f27 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/cjs/nested/chunk2.js +++ b/test/chunking-form/samples/import-meta-url/_expected/cjs/nested/chunk2.js @@ -1,5 +1,5 @@ 'use strict'; -var log = require('./chunk.js'); +var main = require('./chunk.js'); -log.log('nested: ' + (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('nested/chunk2.js', document.baseURI).href))); +main.log('nested: ' + (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('nested/chunk2.js', document.baseURI).href))); diff --git a/test/chunking-form/samples/import-meta-url/_expected/es/main.js b/test/chunking-form/samples/import-meta-url/_expected/es/main.js index ccb88a0c197..a941d5953ff 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/es/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/es/main.js @@ -1,4 +1 @@ -import { l as log } from './nested/chunk.js'; - -log('main: ' + import.meta.url); -import('./nested/chunk2.js'); +import './nested/chunk.js'; diff --git a/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk.js b/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk.js index 9563d2b0194..e75794fdcab 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk.js +++ b/test/chunking-form/samples/import-meta-url/_expected/es/nested/chunk.js @@ -6,4 +6,7 @@ function log(url) { } } +log('main: ' + import.meta.url); +import('./chunk2.js'); + export { log as l }; diff --git a/test/chunking-form/samples/import-meta-url/_expected/system/main.js b/test/chunking-form/samples/import-meta-url/_expected/system/main.js index 17ede17b3f6..8a6c6cc2c9f 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/system/main.js +++ b/test/chunking-form/samples/import-meta-url/_expected/system/main.js @@ -1,14 +1,10 @@ -System.register(['./nested/chunk.js'], function (exports, module) { +System.register(['./nested/chunk.js'], function () { 'use strict'; - var log; return { - setters: [function (module) { - log = module.l; - }], + setters: [function () {}], execute: function () { - log('main: ' + module.meta.url); - module.import('./nested/chunk2.js'); + } }; diff --git a/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js b/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js index a7b1c64c015..32501851dec 100644 --- a/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js +++ b/test/chunking-form/samples/import-meta-url/_expected/system/nested/chunk.js @@ -1,4 +1,4 @@ -System.register([], function (exports) { +System.register([], function (exports, module) { 'use strict'; return { execute: function () { @@ -13,6 +13,9 @@ System.register([], function (exports) { } } + log('main: ' + module.meta.url); + module.import('./chunk2.js'); + } }; }); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_config.js new file mode 100644 index 00000000000..ba9c4c3c981 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_config.js @@ -0,0 +1,3 @@ +module.exports = { + description: 'chained dynamic import that imports something already loaded' +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/generated-dynamic1.js new file mode 100644 index 00000000000..be41dd73ba2 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/generated-dynamic1.js @@ -0,0 +1,6 @@ +define(['require'], function (require) { 'use strict'; + + new Promise(function (resolve, reject) { require(['./generated-dynamic2'], resolve, reject) }); + console.log('dynamic1'); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/generated-dynamic2.js new file mode 100644 index 00000000000..5a52f14b76f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/generated-dynamic2.js @@ -0,0 +1,5 @@ +define(['./generated-main'], function (main) { 'use strict'; + + console.log('dynamic2', main.shared); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/generated-main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/generated-main.js new file mode 100644 index 00000000000..6a43f50a6c3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/generated-main.js @@ -0,0 +1,10 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const shared = 'shared'; + + new Promise(function (resolve, reject) { require(['./generated-dynamic1'], resolve, reject) }); + console.log('main', shared); + + exports.shared = shared; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js new file mode 100644 index 00000000000..4cef940ab88 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(['./generated-main'], function (main) { 'use strict'; + + + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/generated-dynamic1.js new file mode 100644 index 00000000000..988a64fd35e --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/generated-dynamic1.js @@ -0,0 +1,4 @@ +'use strict'; + +new Promise(function (resolve) { resolve(require('./generated-dynamic2.js')); }); +console.log('dynamic1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/generated-dynamic2.js new file mode 100644 index 00000000000..f13281b0bb3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/generated-dynamic2.js @@ -0,0 +1,5 @@ +'use strict'; + +var main = require('./generated-main.js'); + +console.log('dynamic2', main.shared); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/generated-main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/generated-main.js new file mode 100644 index 00000000000..738e1a6f23d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/generated-main.js @@ -0,0 +1,8 @@ +'use strict'; + +const shared = 'shared'; + +new Promise(function (resolve) { resolve(require('./generated-dynamic1.js')); }); +console.log('main', shared); + +exports.shared = shared; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js new file mode 100644 index 00000000000..464b4ce8e34 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/cjs/main.js @@ -0,0 +1,4 @@ +'use strict'; + +require('./generated-main.js'); + diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/generated-dynamic1.js new file mode 100644 index 00000000000..2db19197d94 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/generated-dynamic1.js @@ -0,0 +1,2 @@ +import('./generated-dynamic2.js'); +console.log('dynamic1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/generated-dynamic2.js new file mode 100644 index 00000000000..024bb6dcf20 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/generated-dynamic2.js @@ -0,0 +1,3 @@ +import { s as shared } from './generated-main.js'; + +console.log('dynamic2', shared); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/generated-main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/generated-main.js new file mode 100644 index 00000000000..ccb2e0d9161 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/generated-main.js @@ -0,0 +1,6 @@ +const shared = 'shared'; + +import('./generated-dynamic1.js'); +console.log('main', shared); + +export { shared as s }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/main.js new file mode 100644 index 00000000000..bc3090f4a30 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/es/main.js @@ -0,0 +1 @@ +import './generated-main.js'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic1.js new file mode 100644 index 00000000000..4885888ccf8 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic1.js @@ -0,0 +1,11 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + module.import('./generated-dynamic2.js'); + console.log('dynamic1'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic2.js new file mode 100644 index 00000000000..65f1561b327 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-dynamic2.js @@ -0,0 +1,14 @@ +System.register(['./generated-main.js'], function () { + 'use strict'; + var shared; + return { + setters: [function (module) { + shared = module.s; + }], + execute: function () { + + console.log('dynamic2', shared); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-main.js new file mode 100644 index 00000000000..57155410aab --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/generated-main.js @@ -0,0 +1,13 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const shared = exports('s', 'shared'); + + module.import('./generated-dynamic1.js'); + console.log('main', shared); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/main.js new file mode 100644 index 00000000000..1312c7a3bd6 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/_expected/system/main.js @@ -0,0 +1,11 @@ +System.register(['./generated-main.js'], function () { + 'use strict'; + return { + setters: [function () {}], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/dynamic1.js new file mode 100644 index 00000000000..a760f02104c --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/dynamic1.js @@ -0,0 +1,2 @@ +import('./dynamic2.js'); +console.log('dynamic1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/dynamic2.js new file mode 100644 index 00000000000..69ac7e42394 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/dynamic2.js @@ -0,0 +1,2 @@ +import { shared } from './shared.js'; +console.log('dynamic2', shared); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/main.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/main.js new file mode 100644 index 00000000000..1bfb9d87888 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/main.js @@ -0,0 +1,3 @@ +import { shared } from './shared.js'; +import('./dynamic1.js'); +console.log('main', shared); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/shared.js b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/shared.js new file mode 100644 index 00000000000..cd35843de7a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/chained-dynamic-with-shared/shared.js @@ -0,0 +1 @@ +export const shared = 'shared'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_config.js new file mode 100644 index 00000000000..f475a15a739 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_config.js @@ -0,0 +1,3 @@ +module.exports = { + description: 'inlines dynamic imports that are already statically imported' +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js new file mode 100644 index 00000000000..3fab3918be6 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/amd/main.js @@ -0,0 +1,29 @@ +define(['exports'], function (exports) { 'use strict'; + + Promise.resolve().then(function () { return main; }).then(console.log); + console.log('dep1'); + const value1 = 'dep1'; + + var dep1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value1: value1 + }); + + Promise.resolve().then(function () { return dep1; }).then(console.log); + console.log('dep2'); + const value2 = 'dep2'; + + Promise.resolve().then(function () { return main; }).then(console.log); + console.log('main', value1, value2); + const value = 'main'; + + var main = /*#__PURE__*/Object.freeze({ + __proto__: null, + value: value + }); + + exports.value = value; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js new file mode 100644 index 00000000000..cb766ee459d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/cjs/main.js @@ -0,0 +1,27 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +Promise.resolve().then(function () { return main; }).then(console.log); +console.log('dep1'); +const value1 = 'dep1'; + +var dep1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value1: value1 +}); + +Promise.resolve().then(function () { return dep1; }).then(console.log); +console.log('dep2'); +const value2 = 'dep2'; + +Promise.resolve().then(function () { return main; }).then(console.log); +console.log('main', value1, value2); +const value = 'main'; + +var main = /*#__PURE__*/Object.freeze({ + __proto__: null, + value: value +}); + +exports.value = value; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/es/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/es/main.js new file mode 100644 index 00000000000..ab2781aef36 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/es/main.js @@ -0,0 +1,23 @@ +Promise.resolve().then(function () { return main; }).then(console.log); +console.log('dep1'); +const value1 = 'dep1'; + +var dep1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value1: value1 +}); + +Promise.resolve().then(function () { return dep1; }).then(console.log); +console.log('dep2'); +const value2 = 'dep2'; + +Promise.resolve().then(function () { return main; }).then(console.log); +console.log('main', value1, value2); +const value = 'main'; + +var main = /*#__PURE__*/Object.freeze({ + __proto__: null, + value: value +}); + +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/system/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/system/main.js new file mode 100644 index 00000000000..30ad2f5698f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/_expected/system/main.js @@ -0,0 +1,30 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + Promise.resolve().then(function () { return main; }).then(console.log); + console.log('dep1'); + const value1 = 'dep1'; + + var dep1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value1: value1 + }); + + Promise.resolve().then(function () { return dep1; }).then(console.log); + console.log('dep2'); + const value2 = 'dep2'; + + Promise.resolve().then(function () { return main; }).then(console.log); + console.log('main', value1, value2); + const value = exports('value', 'main'); + + var main = /*#__PURE__*/Object.freeze({ + __proto__: null, + value: value + }); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/dep1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/dep1.js new file mode 100644 index 00000000000..5396c9c53d3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/dep1.js @@ -0,0 +1,3 @@ +import('./main.js').then(console.log); +console.log('dep1'); +export const value1 = 'dep1'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/dep2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/dep2.js new file mode 100644 index 00000000000..8bcaf7e8992 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/dep2.js @@ -0,0 +1,3 @@ +import('./dep1.js').then(console.log); +console.log('dep2'); +export const value2 = 'dep2'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/main.js new file mode 100644 index 00000000000..d8091f19910 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-1/main.js @@ -0,0 +1,6 @@ +import { value1 } from './dep1.js'; +import { value2 } from './dep2.js'; + +import('./main.js').then(console.log); +console.log('main', value1, value2); +export const value = 'main'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_config.js new file mode 100644 index 00000000000..8fb4c32176c --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_config.js @@ -0,0 +1,3 @@ +module.exports = { + description: 'inlines dynamic imports that are already statically imported by their importers' +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/amd/main.js new file mode 100644 index 00000000000..466b0dabc88 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/amd/main.js @@ -0,0 +1,23 @@ +define(function () { 'use strict'; + + Promise.resolve().then(function () { return dynamic2; }).then(console.log); + console.log('dynamic1'); + const value1 = 'dynamic1'; + + var dynamic1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value1: value1 + }); + + console.log('dynamic2'); + const value2 = 'dynamic2'; + + var dynamic2 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value2: value2 + }); + + Promise.resolve().then(function () { return dynamic1; }).then(console.log); + console.log('main', value1, value2); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/cjs/main.js new file mode 100644 index 00000000000..5b5e7618221 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/cjs/main.js @@ -0,0 +1,21 @@ +'use strict'; + +Promise.resolve().then(function () { return dynamic2; }).then(console.log); +console.log('dynamic1'); +const value1 = 'dynamic1'; + +var dynamic1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value1: value1 +}); + +console.log('dynamic2'); +const value2 = 'dynamic2'; + +var dynamic2 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value2: value2 +}); + +Promise.resolve().then(function () { return dynamic1; }).then(console.log); +console.log('main', value1, value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/es/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/es/main.js new file mode 100644 index 00000000000..d5bed32b8dc --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/es/main.js @@ -0,0 +1,19 @@ +Promise.resolve().then(function () { return dynamic2; }).then(console.log); +console.log('dynamic1'); +const value1 = 'dynamic1'; + +var dynamic1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value1: value1 +}); + +console.log('dynamic2'); +const value2 = 'dynamic2'; + +var dynamic2 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value2: value2 +}); + +Promise.resolve().then(function () { return dynamic1; }).then(console.log); +console.log('main', value1, value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/system/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/system/main.js new file mode 100644 index 00000000000..35382e9f21f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/_expected/system/main.js @@ -0,0 +1,28 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + Promise.resolve().then(function () { return dynamic2; }).then(console.log); + console.log('dynamic1'); + const value1 = 'dynamic1'; + + var dynamic1 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value1: value1 + }); + + console.log('dynamic2'); + const value2 = 'dynamic2'; + + var dynamic2 = /*#__PURE__*/Object.freeze({ + __proto__: null, + value2: value2 + }); + + Promise.resolve().then(function () { return dynamic1; }).then(console.log); + console.log('main', value1, value2); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/dynamic1.js new file mode 100644 index 00000000000..fb728362620 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/dynamic1.js @@ -0,0 +1,3 @@ +import('./dynamic2.js').then(console.log); +console.log('dynamic1'); +export const value1 = 'dynamic1'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/dynamic2.js new file mode 100644 index 00000000000..d99f0e75577 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/dynamic2.js @@ -0,0 +1,2 @@ +console.log('dynamic2'); +export const value2 = 'dynamic2'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/main.js new file mode 100644 index 00000000000..5fccea310d3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-already-contained-2/main.js @@ -0,0 +1,5 @@ +import { value1 } from './dynamic1.js'; +import { value2 } from './dynamic2.js'; + +import('./dynamic1.js').then(console.log); +console.log('main', value1, value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_config.js new file mode 100644 index 00000000000..d8b7a769273 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_config.js @@ -0,0 +1,3 @@ +module.exports = { + description: 'handles if a dynamically imported module imports another module dynamically' +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/generated-dynamic1.js new file mode 100644 index 00000000000..41b95d106c9 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/generated-dynamic1.js @@ -0,0 +1,5 @@ +define(['require'], function (require) { 'use strict'; + + new Promise(function (resolve, reject) { require(['./generated-dynamic2'], resolve, reject) }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/generated-dynamic2.js new file mode 100644 index 00000000000..b30754a60e8 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/generated-dynamic2.js @@ -0,0 +1,7 @@ +define(['exports', './main'], function (exports, main) { 'use strict'; + + console.log('dynamic2', main.value); + + exports.value = main.value; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js new file mode 100644 index 00000000000..1cc193e37b7 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/amd/main.js @@ -0,0 +1,12 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const value = 'shared'; + + console.log('dynamic1', value); + new Promise(function (resolve, reject) { require(['./generated-dynamic1'], resolve, reject) }); + + exports.value = value; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/generated-dynamic1.js new file mode 100644 index 00000000000..14c1997bdbb --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/generated-dynamic1.js @@ -0,0 +1,3 @@ +'use strict'; + +new Promise(function (resolve) { resolve(require('./generated-dynamic2.js')); }); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/generated-dynamic2.js new file mode 100644 index 00000000000..ae613ed0e60 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/generated-dynamic2.js @@ -0,0 +1,7 @@ +'use strict'; + +var main = require('./main.js'); + +console.log('dynamic2', main.value); + +exports.value = main.value; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js new file mode 100644 index 00000000000..3eb9d321be8 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/cjs/main.js @@ -0,0 +1,10 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +const value = 'shared'; + +console.log('dynamic1', value); +new Promise(function (resolve) { resolve(require('./generated-dynamic1.js')); }); + +exports.value = value; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic1.js new file mode 100644 index 00000000000..45c226aa4a3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic1.js @@ -0,0 +1 @@ +import('./generated-dynamic2.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic2.js new file mode 100644 index 00000000000..a092412cc30 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/generated-dynamic2.js @@ -0,0 +1,4 @@ +import { value } from './main.js'; +export { value } from './main.js'; + +console.log('dynamic2', value); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/main.js new file mode 100644 index 00000000000..a140614b88c --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/es/main.js @@ -0,0 +1,6 @@ +const value = 'shared'; + +console.log('dynamic1', value); +import('./generated-dynamic1.js'); + +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic1.js new file mode 100644 index 00000000000..0d19e5aa49b --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic1.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + module.import('./generated-dynamic2.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js new file mode 100644 index 00000000000..5bb722682d3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/generated-dynamic2.js @@ -0,0 +1,15 @@ +System.register(['./main.js'], function (exports) { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.value; + exports('value', module.value); + }], + execute: function () { + + console.log('dynamic2', value); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/main.js new file mode 100644 index 00000000000..fa1f161107b --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/_expected/system/main.js @@ -0,0 +1,13 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const value = exports('value', 'shared'); + + console.log('dynamic1', value); + module.import('./generated-dynamic1.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/dep.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/dep.js new file mode 100644 index 00000000000..1d4be9c15d0 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/dep.js @@ -0,0 +1 @@ +export const value = 'shared'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/dynamic1.js new file mode 100644 index 00000000000..ff23cb6b9eb --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/dynamic1.js @@ -0,0 +1 @@ +import('./dynamic2.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/dynamic2.js new file mode 100644 index 00000000000..04fadf2d7da --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/dynamic2.js @@ -0,0 +1,4 @@ +import { value } from './dep.js'; + +console.log('dynamic2', value); +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/main.js new file mode 100644 index 00000000000..e7836b4b69a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic-multi-stage/main.js @@ -0,0 +1,5 @@ +import { value } from './dep.js'; + +console.log('dynamic1', value); +import('./dynamic1.js'); +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_config.js new file mode 100644 index 00000000000..d8b7a769273 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_config.js @@ -0,0 +1,3 @@ +module.exports = { + description: 'handles if a dynamically imported module imports another module dynamically' +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/amd/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/amd/generated-dynamic1.js new file mode 100644 index 00000000000..50a4863d1b2 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/amd/generated-dynamic1.js @@ -0,0 +1,10 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const value = 'shared'; + + console.log('dynamic1', value); + new Promise(function (resolve, reject) { require(['./generated-dynamic2'], resolve, reject) }); + + exports.value = value; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/amd/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/amd/generated-dynamic2.js new file mode 100644 index 00000000000..b43d0ad04a5 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/amd/generated-dynamic2.js @@ -0,0 +1,7 @@ +define(['exports', './generated-dynamic1'], function (exports, dynamic1) { 'use strict'; + + console.log('dynamic2', dynamic1.value); + + exports.value = dynamic1.value; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/amd/main.js new file mode 100644 index 00000000000..935d1692f83 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(['require'], function (require) { 'use strict'; + + new Promise(function (resolve, reject) { require(['./generated-dynamic1'], resolve, reject) }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/cjs/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/cjs/generated-dynamic1.js new file mode 100644 index 00000000000..a7b3ae53ddb --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/cjs/generated-dynamic1.js @@ -0,0 +1,8 @@ +'use strict'; + +const value = 'shared'; + +console.log('dynamic1', value); +new Promise(function (resolve) { resolve(require('./generated-dynamic2.js')); }); + +exports.value = value; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/cjs/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/cjs/generated-dynamic2.js new file mode 100644 index 00000000000..35685a35ed6 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/cjs/generated-dynamic2.js @@ -0,0 +1,7 @@ +'use strict'; + +var dynamic1 = require('./generated-dynamic1.js'); + +console.log('dynamic2', dynamic1.value); + +exports.value = dynamic1.value; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/cjs/main.js new file mode 100644 index 00000000000..85605bbd0a6 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/cjs/main.js @@ -0,0 +1,3 @@ +'use strict'; + +new Promise(function (resolve) { resolve(require('./generated-dynamic1.js')); }); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic1.js new file mode 100644 index 00000000000..5876ac36d26 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic1.js @@ -0,0 +1,6 @@ +const value = 'shared'; + +console.log('dynamic1', value); +import('./generated-dynamic2.js'); + +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic2.js new file mode 100644 index 00000000000..83da591c684 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/generated-dynamic2.js @@ -0,0 +1,4 @@ +import { value } from './generated-dynamic1.js'; +export { value } from './generated-dynamic1.js'; + +console.log('dynamic2', value); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/main.js new file mode 100644 index 00000000000..b46872a8428 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/es/main.js @@ -0,0 +1 @@ +import('./generated-dynamic1.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic1.js new file mode 100644 index 00000000000..2730357cfe2 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic1.js @@ -0,0 +1,13 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const value = exports('value', 'shared'); + + console.log('dynamic1', value); + module.import('./generated-dynamic2.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js new file mode 100644 index 00000000000..934231e63ce --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/generated-dynamic2.js @@ -0,0 +1,15 @@ +System.register(['./generated-dynamic1.js'], function (exports) { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.value; + exports('value', module.value); + }], + execute: function () { + + console.log('dynamic2', value); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/main.js new file mode 100644 index 00000000000..6bf031d4fed --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/_expected/system/main.js @@ -0,0 +1,10 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + module.import('./generated-dynamic1.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/dep.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/dep.js new file mode 100644 index 00000000000..1d4be9c15d0 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/dep.js @@ -0,0 +1 @@ +export const value = 'shared'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/dynamic1.js new file mode 100644 index 00000000000..481d1476ae5 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/dynamic1.js @@ -0,0 +1,5 @@ +import { value } from './dep.js'; + +console.log('dynamic1', value); +import('./dynamic2.js'); +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/dynamic2.js new file mode 100644 index 00000000000..04fadf2d7da --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/dynamic2.js @@ -0,0 +1,4 @@ +import { value } from './dep.js'; + +console.log('dynamic2', value); +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/main.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/main.js new file mode 100644 index 00000000000..587eba57a0b --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-import-dynamic/main.js @@ -0,0 +1 @@ +import('./dynamic1.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_config.js new file mode 100644 index 00000000000..8d679763598 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_config.js @@ -0,0 +1,6 @@ +module.exports = { + description: 'keeps chunks separate when not in memory for all dynamic imports', + options: { + input: ['main1', 'main2', 'main3'] + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-dep.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/generated-dep.js similarity index 55% rename from test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-dep.js rename to test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/generated-dep.js index 5e2f9f02968..397a3e627a5 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/amd/generated-dep.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/generated-dep.js @@ -1,7 +1,7 @@ define(['exports'], function (exports) { 'use strict'; - var value = 42; + const value1 = 'dep'; - exports.value = value; + exports.value1 = value1; }); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/generated-dynamic.js new file mode 100644 index 00000000000..ddd658c3ee7 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/generated-dynamic.js @@ -0,0 +1,5 @@ +define(['./generated-dep'], function (dep) { 'use strict'; + + console.log('dynamic', dep.value1); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/generated-shared.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/generated-shared.js new file mode 100644 index 00000000000..f2465789fc3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/generated-shared.js @@ -0,0 +1,6 @@ +define(['require', './generated-dep'], function (require, dep) { 'use strict'; + + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + console.log('shared', dep.value1); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main1.js new file mode 100644 index 00000000000..a5cf9852295 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main1.js @@ -0,0 +1,5 @@ +define(['./generated-dep', './generated-shared'], function (dep, shared) { 'use strict'; + + console.log('main1'); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main2.js new file mode 100644 index 00000000000..307016a4280 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(['./generated-dep', './generated-shared'], function (dep, shared) { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main3.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main3.js new file mode 100644 index 00000000000..19f4b8f4188 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/amd/main3.js @@ -0,0 +1,7 @@ +define(['require'], function (require) { 'use strict'; + + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + + console.log('main3'); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/generated-dep.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/generated-dep.js new file mode 100644 index 00000000000..3327b999e9c --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/generated-dep.js @@ -0,0 +1,5 @@ +'use strict'; + +const value1 = 'dep'; + +exports.value1 = value1; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/generated-dynamic.js new file mode 100644 index 00000000000..1767cfb27a5 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/generated-dynamic.js @@ -0,0 +1,5 @@ +'use strict'; + +var dep = require('./generated-dep.js'); + +console.log('dynamic', dep.value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/generated-shared.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/generated-shared.js new file mode 100644 index 00000000000..46d1cbad0c3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/generated-shared.js @@ -0,0 +1,6 @@ +'use strict'; + +var dep = require('./generated-dep.js'); + +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); +console.log('shared', dep.value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main1.js new file mode 100644 index 00000000000..e793a195670 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main1.js @@ -0,0 +1,6 @@ +'use strict'; + +require('./generated-dep.js'); +require('./generated-shared.js'); + +console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main2.js new file mode 100644 index 00000000000..9baf0ec210c --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main2.js @@ -0,0 +1,6 @@ +'use strict'; + +require('./generated-dep.js'); +require('./generated-shared.js'); + +console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main3.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main3.js new file mode 100644 index 00000000000..a2318d8378f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/cjs/main3.js @@ -0,0 +1,5 @@ +'use strict'; + +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); + +console.log('main3'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/generated-dep.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/generated-dep.js new file mode 100644 index 00000000000..a8604cb90b1 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/generated-dep.js @@ -0,0 +1,3 @@ +const value1 = 'dep'; + +export { value1 as v }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/generated-dynamic.js new file mode 100644 index 00000000000..7aeff95b3d1 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/generated-dynamic.js @@ -0,0 +1,3 @@ +import { v as value1 } from './generated-dep.js'; + +console.log('dynamic', value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/generated-shared.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/generated-shared.js new file mode 100644 index 00000000000..9d415aaf7fd --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/generated-shared.js @@ -0,0 +1,4 @@ +import { v as value1 } from './generated-dep.js'; + +import('./generated-dynamic.js'); +console.log('shared', value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main1.js new file mode 100644 index 00000000000..16fe8ba2630 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main1.js @@ -0,0 +1,4 @@ +import './generated-dep.js'; +import './generated-shared.js'; + +console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main2.js new file mode 100644 index 00000000000..728f3a05eca --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main2.js @@ -0,0 +1,4 @@ +import './generated-dep.js'; +import './generated-shared.js'; + +console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main3.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main3.js new file mode 100644 index 00000000000..0d01aff3a9b --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/es/main3.js @@ -0,0 +1,3 @@ +import('./generated-dynamic.js'); + +console.log('main3'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-dep.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dep.js similarity index 72% rename from test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-dep.js rename to test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dep.js index e69dcc529da..a0da80f9923 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order2/_expected/system/generated-dep.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dep.js @@ -3,7 +3,7 @@ System.register([], function (exports) { return { execute: function () { - var value = exports('v', 42); + const value1 = exports('v', 'dep'); } }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dynamic.js new file mode 100644 index 00000000000..6a9c0e632e5 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-dynamic.js @@ -0,0 +1,14 @@ +System.register(['./generated-dep.js'], function () { + 'use strict'; + var value1; + return { + setters: [function (module) { + value1 = module.v; + }], + execute: function () { + + console.log('dynamic', value1); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-shared.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-shared.js new file mode 100644 index 00000000000..5ca1f03bd70 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/generated-shared.js @@ -0,0 +1,15 @@ +System.register(['./generated-dep.js'], function (exports, module) { + 'use strict'; + var value1; + return { + setters: [function (module) { + value1 = module.v; + }], + execute: function () { + + module.import('./generated-dynamic.js'); + console.log('shared', value1); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js new file mode 100644 index 00000000000..bc48044fddb --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main1.js @@ -0,0 +1,11 @@ +System.register(['./generated-dep.js', './generated-shared.js'], function () { + 'use strict'; + return { + setters: [function () {}, function () {}], + execute: function () { + + console.log('main1'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js new file mode 100644 index 00000000000..fe9fd050034 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main2.js @@ -0,0 +1,11 @@ +System.register(['./generated-dep.js', './generated-shared.js'], function () { + 'use strict'; + return { + setters: [function () {}, function () {}], + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main3.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main3.js new file mode 100644 index 00000000000..168b997d8da --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/_expected/system/main3.js @@ -0,0 +1,12 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + module.import('./generated-dynamic.js'); + + console.log('main3'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/dep.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/dep.js new file mode 100644 index 00000000000..1a46c066b1e --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/dep.js @@ -0,0 +1 @@ +export const value1 = 'dep'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/dynamic.js new file mode 100644 index 00000000000..bb6e27e9a67 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/dynamic.js @@ -0,0 +1,2 @@ +import { value1 } from './dep.js'; +console.log('dynamic', value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/main1.js new file mode 100644 index 00000000000..565a0a181c7 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/main1.js @@ -0,0 +1,3 @@ +import './shared.js'; + +console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/main2.js new file mode 100644 index 00000000000..a5e344325c9 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/main2.js @@ -0,0 +1,3 @@ +import './shared.js'; + +console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/main3.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/main3.js new file mode 100644 index 00000000000..93c89d4aa1f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/main3.js @@ -0,0 +1,3 @@ +import('./dynamic.js'); + +console.log('main3'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/shared.js b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/shared.js new file mode 100644 index 00000000000..97404c4e5d4 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/dynamic-not-in-memory/shared.js @@ -0,0 +1,3 @@ +import { value1 } from './dep.js'; +import('./dynamic.js'); +console.log('shared', value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_config.js new file mode 100644 index 00000000000..fd9e687a29a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_config.js @@ -0,0 +1,7 @@ +module.exports = { + description: + 'avoids chunks for always loaded dependencies if multiple entry points with different dependencies have dynamic imports', + options: { + input: ['main1', 'main2'] + } +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/generated-dynamic.js new file mode 100644 index 00000000000..10daf999052 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/generated-dynamic.js @@ -0,0 +1,8 @@ +define(['exports', './generated-from-main-1-and-dynamic', './generated-from-main-1-and-2'], function (exports, fromMain1AndDynamic, fromMain1And2) { 'use strict'; + + console.log('dynamic1', fromMain1AndDynamic.value1, fromMain1And2.value2); + + exports.value1 = fromMain1AndDynamic.value1; + exports.value2 = fromMain1And2.value2; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/generated-from-main-1-and-2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/generated-from-main-1-and-2.js new file mode 100644 index 00000000000..bd61814cfd4 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/generated-from-main-1-and-2.js @@ -0,0 +1,10 @@ +define(['exports'], function (exports) { 'use strict'; + + const value2 = 'all'; + + const value3 = 'main1 and main2'; + + exports.value2 = value2; + exports.value3 = value3; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/generated-from-main-1-and-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/generated-from-main-1-and-dynamic.js new file mode 100644 index 00000000000..003c64a967f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/generated-from-main-1-and-dynamic.js @@ -0,0 +1,7 @@ +define(['exports'], function (exports) { 'use strict'; + + const value1 = 'main1 and dynamic'; + + exports.value1 = value1; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js new file mode 100644 index 00000000000..eac3239623d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main1.js @@ -0,0 +1,12 @@ +define(['require', 'exports', './generated-from-main-1-and-dynamic', './generated-from-main-1-and-2'], function (require, exports, fromMain1AndDynamic, fromMain1And2) { 'use strict'; + + console.log('main1', fromMain1AndDynamic.value1, fromMain1And2.value2, fromMain1And2.value3); + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + + exports.value1 = fromMain1AndDynamic.value1; + exports.value2 = fromMain1And2.value2; + exports.value3 = fromMain1And2.value3; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js new file mode 100644 index 00000000000..5a746a349a7 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/amd/main2.js @@ -0,0 +1,11 @@ +define(['require', 'exports', './generated-from-main-1-and-2'], function (require, exports, fromMain1And2) { 'use strict'; + + console.log('main2', fromMain1And2.value2, fromMain1And2.value3); + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + + exports.value2 = fromMain1And2.value2; + exports.value3 = fromMain1And2.value3; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/generated-dynamic.js new file mode 100644 index 00000000000..bf960045a98 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/generated-dynamic.js @@ -0,0 +1,9 @@ +'use strict'; + +var fromMain1AndDynamic = require('./generated-from-main-1-and-dynamic.js'); +var fromMain1And2 = require('./generated-from-main-1-and-2.js'); + +console.log('dynamic1', fromMain1AndDynamic.value1, fromMain1And2.value2); + +exports.value1 = fromMain1AndDynamic.value1; +exports.value2 = fromMain1And2.value2; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/generated-from-main-1-and-2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/generated-from-main-1-and-2.js new file mode 100644 index 00000000000..84851ba695d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/generated-from-main-1-and-2.js @@ -0,0 +1,8 @@ +'use strict'; + +const value2 = 'all'; + +const value3 = 'main1 and main2'; + +exports.value2 = value2; +exports.value3 = value3; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/generated-from-main-1-and-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/generated-from-main-1-and-dynamic.js new file mode 100644 index 00000000000..d76ef574dc3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/generated-from-main-1-and-dynamic.js @@ -0,0 +1,5 @@ +'use strict'; + +const value1 = 'main1 and dynamic'; + +exports.value1 = value1; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js new file mode 100644 index 00000000000..21940f1e837 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main1.js @@ -0,0 +1,13 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var fromMain1AndDynamic = require('./generated-from-main-1-and-dynamic.js'); +var fromMain1And2 = require('./generated-from-main-1-and-2.js'); + +console.log('main1', fromMain1AndDynamic.value1, fromMain1And2.value2, fromMain1And2.value3); +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); + +exports.value1 = fromMain1AndDynamic.value1; +exports.value2 = fromMain1And2.value2; +exports.value3 = fromMain1And2.value3; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js new file mode 100644 index 00000000000..091642641b8 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/cjs/main2.js @@ -0,0 +1,11 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var fromMain1And2 = require('./generated-from-main-1-and-2.js'); + +console.log('main2', fromMain1And2.value2, fromMain1And2.value3); +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); + +exports.value2 = fromMain1And2.value2; +exports.value3 = fromMain1And2.value3; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-dynamic.js new file mode 100644 index 00000000000..27e2a2c6636 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-dynamic.js @@ -0,0 +1,6 @@ +import { v as value1 } from './generated-from-main-1-and-dynamic.js'; +export { v as value1 } from './generated-from-main-1-and-dynamic.js'; +import { v as value2 } from './generated-from-main-1-and-2.js'; +export { v as value2 } from './generated-from-main-1-and-2.js'; + +console.log('dynamic1', value1, value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-from-main-1-and-2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-from-main-1-and-2.js new file mode 100644 index 00000000000..6e3ba4e23cc --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-from-main-1-and-2.js @@ -0,0 +1,5 @@ +const value2 = 'all'; + +const value3 = 'main1 and main2'; + +export { value3 as a, value2 as v }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-from-main-1-and-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-from-main-1-and-dynamic.js new file mode 100644 index 00000000000..bafbb3545e4 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/generated-from-main-1-and-dynamic.js @@ -0,0 +1,3 @@ +const value1 = 'main1 and dynamic'; + +export { value1 as v }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main1.js new file mode 100644 index 00000000000..8762e90e0e4 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main1.js @@ -0,0 +1,7 @@ +import { v as value1 } from './generated-from-main-1-and-dynamic.js'; +export { v as value1 } from './generated-from-main-1-and-dynamic.js'; +import { v as value2, a as value3 } from './generated-from-main-1-and-2.js'; +export { v as value2, a as value3 } from './generated-from-main-1-and-2.js'; + +console.log('main1', value1, value2, value3); +import('./generated-dynamic.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main2.js new file mode 100644 index 00000000000..0967a06d772 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/es/main2.js @@ -0,0 +1,5 @@ +import { v as value2, a as value3 } from './generated-from-main-1-and-2.js'; +export { v as value2, a as value3 } from './generated-from-main-1-and-2.js'; + +console.log('main2', value2, value3); +import('./generated-dynamic.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js new file mode 100644 index 00000000000..348735eeb2c --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-dynamic.js @@ -0,0 +1,18 @@ +System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-main-1-and-2.js'], function (exports) { + 'use strict'; + var value1, value2; + return { + setters: [function (module) { + value1 = module.v; + exports('value1', module.v); + }, function (module) { + value2 = module.v; + exports('value2', module.v); + }], + execute: function () { + + console.log('dynamic1', value1, value2); + + } + }; +}); diff --git a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/generated-inlined.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-from-main-1-and-2.js similarity index 53% rename from test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/generated-inlined.js rename to test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-from-main-1-and-2.js index 1e8f4870e3d..31fbb093f29 100644 --- a/test/chunking-form/samples/dynamic-import-inline-colouring/_expected/system/generated-inlined.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-from-main-1-and-2.js @@ -3,8 +3,9 @@ System.register([], function (exports) { return { execute: function () { - var inlined = exports('default', 'inlined'); - const x = exports('x', 1); + const value2 = exports('v', 'all'); + + const value3 = exports('a', 'main1 and main2'); } }; diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/shared.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-from-main-1-and-dynamic.js similarity index 66% rename from test/chunking-form/samples/dynamic-import/_expected/system/chunks/shared.js rename to test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-from-main-1-and-dynamic.js index e50702721a5..0e97c43984d 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/shared.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/generated-from-main-1-and-dynamic.js @@ -3,7 +3,7 @@ System.register([], function (exports) { return { execute: function () { - const sharedValue = exports('s', 'shared'); + const value1 = exports('v', 'main1 and dynamic'); } }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js new file mode 100644 index 00000000000..b736d7a05fa --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main1.js @@ -0,0 +1,23 @@ +System.register(['./generated-from-main-1-and-dynamic.js', './generated-from-main-1-and-2.js'], function (exports, module) { + 'use strict'; + var value1, value2, value3; + return { + setters: [function (module) { + value1 = module.v; + exports('value1', module.v); + }, function (module) { + value2 = module.v; + value3 = module.a; + var _setter = {}; + _setter.value2 = module.v; + _setter.value3 = module.a; + exports(_setter); + }], + execute: function () { + + console.log('main1', value1, value2, value3); + module.import('./generated-dynamic.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js new file mode 100644 index 00000000000..1aca888b896 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/_expected/system/main2.js @@ -0,0 +1,20 @@ +System.register(['./generated-from-main-1-and-2.js'], function (exports, module) { + 'use strict'; + var value2, value3; + return { + setters: [function (module) { + value2 = module.v; + value3 = module.a; + var _setter = {}; + _setter.value2 = module.v; + _setter.value3 = module.a; + exports(_setter); + }], + execute: function () { + + console.log('main2', value2, value3); + module.import('./generated-dynamic.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/dynamic.js new file mode 100644 index 00000000000..c46f83ce91c --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/dynamic.js @@ -0,0 +1,4 @@ +import { value1 } from './from-main-1-and-dynamic.js'; +import { value2 } from './from-all.js'; +console.log('dynamic1', value1, value2); +export { value1, value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/from-all.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/from-all.js new file mode 100644 index 00000000000..f4be2aef1de --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/from-all.js @@ -0,0 +1 @@ +export const value2 = 'all'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/from-main-1-and-2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/from-main-1-and-2.js new file mode 100644 index 00000000000..8bd6ed7d91a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/from-main-1-and-2.js @@ -0,0 +1 @@ +export const value3 = 'main1 and main2'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/from-main-1-and-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/from-main-1-and-dynamic.js new file mode 100644 index 00000000000..4aaa44217d7 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/from-main-1-and-dynamic.js @@ -0,0 +1 @@ +export const value1 = 'main1 and dynamic'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/main1.js new file mode 100644 index 00000000000..045300b570d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/main1.js @@ -0,0 +1,6 @@ +import { value1 } from './from-main-1-and-dynamic.js'; +import { value2 } from './from-all.js'; +import { value3 } from './from-main-1-and-2.js'; +console.log('main1', value1, value2, value3); +import('./dynamic.js'); +export { value1, value2, value3 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/main2.js new file mode 100644 index 00000000000..0ea796ab885 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-and-shared-dependencies/main2.js @@ -0,0 +1,5 @@ +import { value2 } from './from-all.js'; +import { value3 } from './from-main-1-and-2.js'; +console.log('main2', value2, value3); +import('./dynamic.js'); +export { value2, value3 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_config.js new file mode 100644 index 00000000000..fd9e687a29a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_config.js @@ -0,0 +1,7 @@ +module.exports = { + description: + 'avoids chunks for always loaded dependencies if multiple entry points with different dependencies have dynamic imports', + options: { + input: ['main1', 'main2'] + } +}; diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/generated-existing.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/generated-dep1.js similarity index 53% rename from test/chunking-form/samples/resolve-dynamic-import/_expected/amd/generated-existing.js rename to test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/generated-dep1.js index e4849575ab9..aa83bc12cab 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/generated-existing.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/generated-dep1.js @@ -1,7 +1,7 @@ define(['exports'], function (exports) { 'use strict'; - const value = 'existing'; + const value1 = 'shared1'; - exports.value = value; + exports.value1 = value1; }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-dep.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/generated-dep2.js similarity index 53% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-dep.js rename to test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/generated-dep2.js index 5e2f9f02968..b728fc2ba24 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-dep.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/generated-dep2.js @@ -1,7 +1,7 @@ define(['exports'], function (exports) { 'use strict'; - var value = 42; + const value2 = 'shared2'; - exports.value = value; + exports.value2 = value2; }); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/generated-dynamic.js new file mode 100644 index 00000000000..35442e34c36 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/generated-dynamic.js @@ -0,0 +1,8 @@ +define(['exports', './generated-dep1', './generated-dep2'], function (exports, dep1, dep2) { 'use strict'; + + console.log('dynamic1', dep1.value1, dep2.value2); + + exports.value1 = dep1.value1; + exports.value2 = dep2.value2; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js new file mode 100644 index 00000000000..67e14ca6faa --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main1.js @@ -0,0 +1,13 @@ +define(['require', 'exports', './generated-dep1', './generated-dep2'], function (require, exports, dep1, dep2) { 'use strict'; + + const something = 'something'; + + console.log('main1', dep1.value1, dep2.value2, something); + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + + exports.value1 = dep1.value1; + exports.value2 = dep2.value2; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js new file mode 100644 index 00000000000..5411a5236e1 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/amd/main2.js @@ -0,0 +1,10 @@ +define(['require', 'exports', './generated-dep2'], function (require, exports, dep2) { 'use strict'; + + console.log('main2', dep2.value2); + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + + exports.value2 = dep2.value2; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/generated-dep1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/generated-dep1.js new file mode 100644 index 00000000000..5756d45c29d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/generated-dep1.js @@ -0,0 +1,5 @@ +'use strict'; + +const value1 = 'shared1'; + +exports.value1 = value1; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/generated-dep2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/generated-dep2.js new file mode 100644 index 00000000000..6cb88b6e527 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/generated-dep2.js @@ -0,0 +1,5 @@ +'use strict'; + +const value2 = 'shared2'; + +exports.value2 = value2; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/generated-dynamic.js new file mode 100644 index 00000000000..dd00791bbf3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/generated-dynamic.js @@ -0,0 +1,9 @@ +'use strict'; + +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep2.js'); + +console.log('dynamic1', dep1.value1, dep2.value2); + +exports.value1 = dep1.value1; +exports.value2 = dep2.value2; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js new file mode 100644 index 00000000000..26a684f8f5c --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main1.js @@ -0,0 +1,14 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep2.js'); + +const something = 'something'; + +console.log('main1', dep1.value1, dep2.value2, something); +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); + +exports.value1 = dep1.value1; +exports.value2 = dep2.value2; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js new file mode 100644 index 00000000000..0d4c779ab91 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/cjs/main2.js @@ -0,0 +1,10 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var dep2 = require('./generated-dep2.js'); + +console.log('main2', dep2.value2); +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); + +exports.value2 = dep2.value2; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dep1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dep1.js new file mode 100644 index 00000000000..ddf8e1f8c97 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dep1.js @@ -0,0 +1,3 @@ +const value1 = 'shared1'; + +export { value1 as v }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dep2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dep2.js new file mode 100644 index 00000000000..a4c763f7bf6 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dep2.js @@ -0,0 +1,3 @@ +const value2 = 'shared2'; + +export { value2 as v }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dynamic.js new file mode 100644 index 00000000000..f4548c7c3ac --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/generated-dynamic.js @@ -0,0 +1,6 @@ +import { v as value1 } from './generated-dep1.js'; +export { v as value1 } from './generated-dep1.js'; +import { v as value2 } from './generated-dep2.js'; +export { v as value2 } from './generated-dep2.js'; + +console.log('dynamic1', value1, value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main1.js new file mode 100644 index 00000000000..fa5963a970a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main1.js @@ -0,0 +1,9 @@ +import { v as value1 } from './generated-dep1.js'; +export { v as value1 } from './generated-dep1.js'; +import { v as value2 } from './generated-dep2.js'; +export { v as value2 } from './generated-dep2.js'; + +const something = 'something'; + +console.log('main1', value1, value2, something); +import('./generated-dynamic.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main2.js new file mode 100644 index 00000000000..eac967da533 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/es/main2.js @@ -0,0 +1,5 @@ +import { v as value2 } from './generated-dep2.js'; +export { v as value2 } from './generated-dep2.js'; + +console.log('main2', value2); +import('./generated-dynamic.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-dep.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dep1.js similarity index 70% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-dep.js rename to test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dep1.js index e69dcc529da..65ef243d0ae 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-dep.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dep1.js @@ -3,7 +3,7 @@ System.register([], function (exports) { return { execute: function () { - var value = exports('v', 42); + const value1 = exports('v', 'shared1'); } }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-dep.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dep2.js similarity index 70% rename from test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-dep.js rename to test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dep2.js index e69dcc529da..af5ad2b9e6d 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-order1/_expected/system/generated-dep.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dep2.js @@ -3,7 +3,7 @@ System.register([], function (exports) { return { execute: function () { - var value = exports('v', 42); + const value2 = exports('v', 'shared2'); } }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js new file mode 100644 index 00000000000..6db6e1afcbd --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/generated-dynamic.js @@ -0,0 +1,18 @@ +System.register(['./generated-dep1.js', './generated-dep2.js'], function (exports) { + 'use strict'; + var value1, value2; + return { + setters: [function (module) { + value1 = module.v; + exports('value1', module.v); + }, function (module) { + value2 = module.v; + exports('value2', module.v); + }], + execute: function () { + + console.log('dynamic1', value1, value2); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js new file mode 100644 index 00000000000..a9473f8ab02 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main1.js @@ -0,0 +1,21 @@ +System.register(['./generated-dep1.js', './generated-dep2.js'], function (exports, module) { + 'use strict'; + var value1, value2; + return { + setters: [function (module) { + value1 = module.v; + exports('value1', module.v); + }, function (module) { + value2 = module.v; + exports('value2', module.v); + }], + execute: function () { + + const something = 'something'; + + console.log('main1', value1, value2, something); + module.import('./generated-dynamic.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js new file mode 100644 index 00000000000..528d214357c --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/_expected/system/main2.js @@ -0,0 +1,16 @@ +System.register(['./generated-dep2.js'], function (exports, module) { + 'use strict'; + var value2; + return { + setters: [function (module) { + value2 = module.v; + exports('value2', module.v); + }], + execute: function () { + + console.log('main2', value2); + module.import('./generated-dynamic.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/dep1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/dep1.js new file mode 100644 index 00000000000..4223625bb2a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/dep1.js @@ -0,0 +1 @@ +export const value1 = 'shared1'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/dep2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/dep2.js new file mode 100644 index 00000000000..0899a373210 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/dep2.js @@ -0,0 +1 @@ +export const value2 = 'shared2'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/dynamic.js new file mode 100644 index 00000000000..f708b2904e6 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/dynamic.js @@ -0,0 +1,4 @@ +import { value1 } from './dep1.js'; +import { value2 } from './dep2.js'; +console.log('dynamic1', value1, value2); +export { value1, value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/main1.js new file mode 100644 index 00000000000..baa848be54f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/main1.js @@ -0,0 +1,6 @@ +import { value1 } from './dep1.js'; +import { value2 } from './dep2.js'; +import { something } from './only-from-main-1.js'; +console.log('main1', value1, value2, something); +import('./dynamic.js'); +export { value1, value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/main2.js new file mode 100644 index 00000000000..6f69e7f7fde --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/main2.js @@ -0,0 +1,4 @@ +import { value2 } from './dep2.js'; +console.log('main2', value2); +import('./dynamic.js'); +export { value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/only-from-main-1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/only-from-main-1.js new file mode 100644 index 00000000000..908a02317f6 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-different-dependencies/only-from-main-1.js @@ -0,0 +1 @@ +export const something = 'something'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_config.js new file mode 100644 index 00000000000..fd9e687a29a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_config.js @@ -0,0 +1,7 @@ +module.exports = { + description: + 'avoids chunks for always loaded dependencies if multiple entry points with different dependencies have dynamic imports', + options: { + input: ['main1', 'main2'] + } +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/generated-dep2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/generated-dep2.js new file mode 100644 index 00000000000..b728fc2ba24 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/generated-dep2.js @@ -0,0 +1,7 @@ +define(['exports'], function (exports) { 'use strict'; + + const value2 = 'shared2'; + + exports.value2 = value2; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/generated-dynamic1.js new file mode 100644 index 00000000000..42096a32cee --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/generated-dynamic1.js @@ -0,0 +1,7 @@ +define(['exports', './main1', './generated-dep2'], function (exports, main1, dep2) { 'use strict'; + + console.log('dynamic1', main1.value1); + + exports.value1 = main1.value1; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/generated-dynamic2.js new file mode 100644 index 00000000000..42269ebe1c5 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/generated-dynamic2.js @@ -0,0 +1,7 @@ +define(['exports', './generated-dep2'], function (exports, dep2) { 'use strict'; + + console.log('dynamic2', dep2.value2); + + exports.value2 = dep2.value2; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js new file mode 100644 index 00000000000..05e7ad09749 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main1.js @@ -0,0 +1,13 @@ +define(['require', 'exports', './generated-dep2'], function (require, exports, dep2) { 'use strict'; + + const value1 = 'shared1'; + + console.log('main1', value1, dep2.value2); + new Promise(function (resolve, reject) { require(['./generated-dynamic1'], resolve, reject) }); + + exports.value2 = dep2.value2; + exports.value1 = value1; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js new file mode 100644 index 00000000000..9f9a3f577e1 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/amd/main2.js @@ -0,0 +1,10 @@ +define(['require', 'exports', './generated-dep2'], function (require, exports, dep2) { 'use strict'; + + console.log('main2', dep2.value2); + new Promise(function (resolve, reject) { require(['./generated-dynamic2'], resolve, reject) }); + + exports.value2 = dep2.value2; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/generated-dep2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/generated-dep2.js new file mode 100644 index 00000000000..6cb88b6e527 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/generated-dep2.js @@ -0,0 +1,5 @@ +'use strict'; + +const value2 = 'shared2'; + +exports.value2 = value2; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/generated-dynamic1.js new file mode 100644 index 00000000000..c2169dce712 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/generated-dynamic1.js @@ -0,0 +1,8 @@ +'use strict'; + +var main1 = require('./main1.js'); +require('./generated-dep2.js'); + +console.log('dynamic1', main1.value1); + +exports.value1 = main1.value1; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/generated-dynamic2.js new file mode 100644 index 00000000000..ada72f52158 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/generated-dynamic2.js @@ -0,0 +1,7 @@ +'use strict'; + +var dep2 = require('./generated-dep2.js'); + +console.log('dynamic2', dep2.value2); + +exports.value2 = dep2.value2; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js new file mode 100644 index 00000000000..8057655fdc7 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main1.js @@ -0,0 +1,13 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var dep2 = require('./generated-dep2.js'); + +const value1 = 'shared1'; + +console.log('main1', value1, dep2.value2); +new Promise(function (resolve) { resolve(require('./generated-dynamic1.js')); }); + +exports.value2 = dep2.value2; +exports.value1 = value1; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js new file mode 100644 index 00000000000..ae76f9381f9 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/cjs/main2.js @@ -0,0 +1,10 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var dep2 = require('./generated-dep2.js'); + +console.log('main2', dep2.value2); +new Promise(function (resolve) { resolve(require('./generated-dynamic2.js')); }); + +exports.value2 = dep2.value2; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dep2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dep2.js new file mode 100644 index 00000000000..a4c763f7bf6 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dep2.js @@ -0,0 +1,3 @@ +const value2 = 'shared2'; + +export { value2 as v }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic1.js new file mode 100644 index 00000000000..eec2d5323f1 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic1.js @@ -0,0 +1,5 @@ +import { value1 } from './main1.js'; +export { value1 } from './main1.js'; +import './generated-dep2.js'; + +console.log('dynamic1', value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic2.js new file mode 100644 index 00000000000..ce16c9af379 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/generated-dynamic2.js @@ -0,0 +1,4 @@ +import { v as value2 } from './generated-dep2.js'; +export { v as value2 } from './generated-dep2.js'; + +console.log('dynamic2', value2); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main1.js new file mode 100644 index 00000000000..090f16af526 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main1.js @@ -0,0 +1,9 @@ +import { v as value2 } from './generated-dep2.js'; +export { v as value2 } from './generated-dep2.js'; + +const value1 = 'shared1'; + +console.log('main1', value1, value2); +import('./generated-dynamic1.js'); + +export { value1 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main2.js new file mode 100644 index 00000000000..7837ea7eca3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/es/main2.js @@ -0,0 +1,5 @@ +import { v as value2 } from './generated-dep2.js'; +export { v as value2 } from './generated-dep2.js'; + +console.log('main2', value2); +import('./generated-dynamic2.js'); diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep4.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dep2.js similarity index 70% rename from test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep4.js rename to test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dep2.js index 63fbd7708bf..af5ad2b9e6d 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep4.js +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dep2.js @@ -3,7 +3,7 @@ System.register([], function (exports) { return { execute: function () { - var multiplier = exports('m', 7); + const value2 = exports('v', 'shared2'); } }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js new file mode 100644 index 00000000000..7ec987e9404 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic1.js @@ -0,0 +1,15 @@ +System.register(['./main1.js', './generated-dep2.js'], function (exports) { + 'use strict'; + var value1; + return { + setters: [function (module) { + value1 = module.value1; + exports('value1', module.value1); + }, function () {}], + execute: function () { + + console.log('dynamic1', value1); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js new file mode 100644 index 00000000000..6a4117a6e7a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/generated-dynamic2.js @@ -0,0 +1,15 @@ +System.register(['./generated-dep2.js'], function (exports) { + 'use strict'; + var value2; + return { + setters: [function (module) { + value2 = module.v; + exports('value2', module.v); + }], + execute: function () { + + console.log('dynamic2', value2); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js new file mode 100644 index 00000000000..470b5052df5 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main1.js @@ -0,0 +1,18 @@ +System.register(['./generated-dep2.js'], function (exports, module) { + 'use strict'; + var value2; + return { + setters: [function (module) { + value2 = module.v; + exports('value2', module.v); + }], + execute: function () { + + const value1 = exports('value1', 'shared1'); + + console.log('main1', value1, value2); + module.import('./generated-dynamic1.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js new file mode 100644 index 00000000000..295aa292840 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/_expected/system/main2.js @@ -0,0 +1,16 @@ +System.register(['./generated-dep2.js'], function (exports, module) { + 'use strict'; + var value2; + return { + setters: [function (module) { + value2 = module.v; + exports('value2', module.v); + }], + execute: function () { + + console.log('main2', value2); + module.import('./generated-dynamic2.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dep1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dep1.js new file mode 100644 index 00000000000..4223625bb2a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dep1.js @@ -0,0 +1 @@ +export const value1 = 'shared1'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dep2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dep2.js new file mode 100644 index 00000000000..0899a373210 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dep2.js @@ -0,0 +1 @@ +export const value2 = 'shared2'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dynamic1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dynamic1.js new file mode 100644 index 00000000000..864435c1f0d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dynamic1.js @@ -0,0 +1,3 @@ +import { value1 } from './dep1.js'; +console.log('dynamic1', value1); +export { value1 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dynamic2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dynamic2.js new file mode 100644 index 00000000000..501a8d3a77b --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/dynamic2.js @@ -0,0 +1,3 @@ +import { value2 } from './dep2.js'; +console.log('dynamic2', value2); +export { value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/main1.js new file mode 100644 index 00000000000..7fd9712e07a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/main1.js @@ -0,0 +1,5 @@ +import { value1 } from './dep1.js'; +import { value2 } from './dep2.js'; +console.log('main1', value1, value2); +import('./dynamic1.js'); +export { value1, value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/main2.js new file mode 100644 index 00000000000..d15c0b3e153 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-partly-already-loaded-dynamic/main2.js @@ -0,0 +1,4 @@ +import { value2 } from './dep2.js'; +console.log('main2', value2); +import('./dynamic2.js'); +export { value2 }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_config.js new file mode 100644 index 00000000000..fd9e687a29a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_config.js @@ -0,0 +1,7 @@ +module.exports = { + description: + 'avoids chunks for always loaded dependencies if multiple entry points with different dependencies have dynamic imports', + options: { + input: ['main1', 'main2'] + } +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/generated-dynamic.js new file mode 100644 index 00000000000..12c490a65d7 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/generated-dynamic.js @@ -0,0 +1,5 @@ +define(['./generated-shared'], function (shared) { 'use strict'; + + console.log('dynamic', shared.value1); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/generated-shared.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/generated-shared.js new file mode 100644 index 00000000000..01bb5903aa3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/generated-shared.js @@ -0,0 +1,10 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const value1 = 'dep'; + + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + console.log('shared', value1); + + exports.value1 = value1; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/main1.js new file mode 100644 index 00000000000..c018fae72c1 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/main1.js @@ -0,0 +1,5 @@ +define(['./generated-shared'], function (shared) { 'use strict'; + + console.log('main1'); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/main2.js new file mode 100644 index 00000000000..dd385452003 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(['./generated-shared'], function (shared) { 'use strict'; + + console.log('main2'); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/generated-dynamic.js new file mode 100644 index 00000000000..7ce6f9960c3 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/generated-dynamic.js @@ -0,0 +1,5 @@ +'use strict'; + +var shared = require('./generated-shared.js'); + +console.log('dynamic', shared.value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/generated-shared.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/generated-shared.js new file mode 100644 index 00000000000..5d98c629a36 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/generated-shared.js @@ -0,0 +1,8 @@ +'use strict'; + +const value1 = 'dep'; + +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); +console.log('shared', value1); + +exports.value1 = value1; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/main1.js new file mode 100644 index 00000000000..b5f59c86576 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/main1.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./generated-shared.js'); + +console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/main2.js new file mode 100644 index 00000000000..bc4414ab2da --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/cjs/main2.js @@ -0,0 +1,5 @@ +'use strict'; + +require('./generated-shared.js'); + +console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/generated-dynamic.js new file mode 100644 index 00000000000..b537e444935 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/generated-dynamic.js @@ -0,0 +1,3 @@ +import { v as value1 } from './generated-shared.js'; + +console.log('dynamic', value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/generated-shared.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/generated-shared.js new file mode 100644 index 00000000000..21e157a3941 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/generated-shared.js @@ -0,0 +1,6 @@ +const value1 = 'dep'; + +import('./generated-dynamic.js'); +console.log('shared', value1); + +export { value1 as v }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/main1.js new file mode 100644 index 00000000000..28b73c45f94 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/main1.js @@ -0,0 +1,3 @@ +import './generated-shared.js'; + +console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/main2.js new file mode 100644 index 00000000000..eda69ef1b0f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/es/main2.js @@ -0,0 +1,3 @@ +import './generated-shared.js'; + +console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-dynamic.js new file mode 100644 index 00000000000..659a4e37473 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-dynamic.js @@ -0,0 +1,14 @@ +System.register(['./generated-shared.js'], function () { + 'use strict'; + var value1; + return { + setters: [function (module) { + value1 = module.v; + }], + execute: function () { + + console.log('dynamic', value1); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-shared.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-shared.js new file mode 100644 index 00000000000..03771769b9e --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/generated-shared.js @@ -0,0 +1,13 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const value1 = exports('v', 'dep'); + + module.import('./generated-dynamic.js'); + console.log('shared', value1); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js new file mode 100644 index 00000000000..494e5e24557 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main1.js @@ -0,0 +1,11 @@ +System.register(['./generated-shared.js'], function () { + 'use strict'; + return { + setters: [function () {}], + execute: function () { + + console.log('main1'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js new file mode 100644 index 00000000000..da2aaca8f06 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/_expected/system/main2.js @@ -0,0 +1,11 @@ +System.register(['./generated-shared.js'], function () { + 'use strict'; + return { + setters: [function () {}], + execute: function () { + + console.log('main2'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/dep.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/dep.js new file mode 100644 index 00000000000..1a46c066b1e --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/dep.js @@ -0,0 +1 @@ +export const value1 = 'dep'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/dynamic.js new file mode 100644 index 00000000000..bb6e27e9a67 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/dynamic.js @@ -0,0 +1,2 @@ +import { value1 } from './dep.js'; +console.log('dynamic', value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/main1.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/main1.js new file mode 100644 index 00000000000..565a0a181c7 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/main1.js @@ -0,0 +1,3 @@ +import './shared.js'; + +console.log('main1'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/main2.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/main2.js new file mode 100644 index 00000000000..a5e344325c9 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/main2.js @@ -0,0 +1,3 @@ +import './shared.js'; + +console.log('main2'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/shared.js b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/shared.js new file mode 100644 index 00000000000..97404c4e5d4 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/multi-entry-shared-static-with-dynamic-import/shared.js @@ -0,0 +1,3 @@ +import { value1 } from './dep.js'; +import('./dynamic.js'); +console.log('shared', value1); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_config.js new file mode 100644 index 00000000000..03f32f46185 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_config.js @@ -0,0 +1,4 @@ +module.exports = { + description: + 'does not create a separate chunk if a dynamically imported chunk shares a dependency with its importer, and dynamic chunk imported from multiple places' +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/generated-dynamic.js new file mode 100644 index 00000000000..1b7cd9e3d6d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/generated-dynamic.js @@ -0,0 +1,7 @@ +define(['exports', './main'], function (exports, main) { 'use strict'; + + console.log('dynamic', main.value); + + exports.value = main.value; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js new file mode 100644 index 00000000000..3f72fe8575e --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/amd/main.js @@ -0,0 +1,15 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const value = 'shared'; + + console.log('a', value); + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + + console.log('main', value); + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + + exports.value = value; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/generated-dynamic.js new file mode 100644 index 00000000000..13cb57f7224 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/generated-dynamic.js @@ -0,0 +1,7 @@ +'use strict'; + +var main = require('./main.js'); + +console.log('dynamic', main.value); + +exports.value = main.value; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js new file mode 100644 index 00000000000..e41fd75e41b --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/cjs/main.js @@ -0,0 +1,13 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +const value = 'shared'; + +console.log('a', value); +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); + +console.log('main', value); +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); + +exports.value = value; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/generated-dynamic.js new file mode 100644 index 00000000000..5726f3b9c9f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/generated-dynamic.js @@ -0,0 +1,4 @@ +import { value } from './main.js'; +export { value } from './main.js'; + +console.log('dynamic', value); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/main.js new file mode 100644 index 00000000000..723eb2d9d1a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/es/main.js @@ -0,0 +1,9 @@ +const value = 'shared'; + +console.log('a', value); +import('./generated-dynamic.js'); + +console.log('main', value); +import('./generated-dynamic.js'); + +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js new file mode 100644 index 00000000000..d709dd7477a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/generated-dynamic.js @@ -0,0 +1,15 @@ +System.register(['./main.js'], function (exports) { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.value; + exports('value', module.value); + }], + execute: function () { + + console.log('dynamic', value); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/main.js new file mode 100644 index 00000000000..0b98d98ec9e --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/_expected/system/main.js @@ -0,0 +1,16 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const value = exports('value', 'shared'); + + console.log('a', value); + module.import('./generated-dynamic.js'); + + console.log('main', value); + module.import('./generated-dynamic.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/a.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/a.js new file mode 100644 index 00000000000..82a2d8d39de --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/a.js @@ -0,0 +1,3 @@ +import { value } from './dep.js'; +console.log('a', value); +import('./dynamic.js'); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/dep.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/dep.js new file mode 100644 index 00000000000..1d4be9c15d0 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/dep.js @@ -0,0 +1 @@ +export const value = 'shared'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/dynamic.js new file mode 100644 index 00000000000..6962353973b --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/dynamic.js @@ -0,0 +1,3 @@ +import { value } from './dep.js'; +console.log('dynamic', value); +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/main.js new file mode 100644 index 00000000000..f2b38ee0b7d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic-multiple-imports/main.js @@ -0,0 +1,5 @@ +import { value } from './dep.js'; +import './a.js'; +console.log('main', value); +import('./dynamic.js'); +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_config.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_config.js new file mode 100644 index 00000000000..4ca923a9bb0 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_config.js @@ -0,0 +1,4 @@ +module.exports = { + description: + 'does not create a separate chunk if a dynamically imported chunk shares a dependency with its importer' +}; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/generated-dynamic.js new file mode 100644 index 00000000000..1b7cd9e3d6d --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/generated-dynamic.js @@ -0,0 +1,7 @@ +define(['exports', './main'], function (exports, main) { 'use strict'; + + console.log('dynamic', main.value); + + exports.value = main.value; + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js new file mode 100644 index 00000000000..714a305c85f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/amd/main.js @@ -0,0 +1,12 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const value = 'shared'; + + console.log('main', value); + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }); + + exports.value = value; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/generated-dynamic.js new file mode 100644 index 00000000000..13cb57f7224 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/generated-dynamic.js @@ -0,0 +1,7 @@ +'use strict'; + +var main = require('./main.js'); + +console.log('dynamic', main.value); + +exports.value = main.value; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js new file mode 100644 index 00000000000..b87c736b8fc --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/cjs/main.js @@ -0,0 +1,10 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +const value = 'shared'; + +console.log('main', value); +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }); + +exports.value = value; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/generated-dynamic.js new file mode 100644 index 00000000000..5726f3b9c9f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/generated-dynamic.js @@ -0,0 +1,4 @@ +import { value } from './main.js'; +export { value } from './main.js'; + +console.log('dynamic', value); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/main.js new file mode 100644 index 00000000000..45c58dd8e67 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/es/main.js @@ -0,0 +1,6 @@ +const value = 'shared'; + +console.log('main', value); +import('./generated-dynamic.js'); + +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js new file mode 100644 index 00000000000..d709dd7477a --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/generated-dynamic.js @@ -0,0 +1,15 @@ +System.register(['./main.js'], function (exports) { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.value; + exports('value', module.value); + }], + execute: function () { + + console.log('dynamic', value); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/main.js new file mode 100644 index 00000000000..b49c63ff160 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/_expected/system/main.js @@ -0,0 +1,13 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const value = exports('value', 'shared'); + + console.log('main', value); + module.import('./generated-dynamic.js'); + + } + }; +}); diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/dep.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/dep.js new file mode 100644 index 00000000000..1d4be9c15d0 --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/dep.js @@ -0,0 +1 @@ +export const value = 'shared'; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/dynamic.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/dynamic.js new file mode 100644 index 00000000000..6962353973b --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/dynamic.js @@ -0,0 +1,3 @@ +import { value } from './dep.js'; +console.log('dynamic', value); +export { value }; diff --git a/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/main.js b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/main.js new file mode 100644 index 00000000000..0d5b8fec28f --- /dev/null +++ b/test/chunking-form/samples/improved-dynamic-chunks/single-dynamic/main.js @@ -0,0 +1,4 @@ +import { value } from './dep.js'; +console.log('main', value); +import('./dynamic.js'); +export { value }; diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js index 34df2e25813..354d7117d0f 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './generated-existing', './direct-relative-external', 'to-indirect-relative-external', 'direct-absolute-external', 'to-indirect-absolute-external'], function (require, existing, directRelativeExternal, toIndirectRelativeExternal, directAbsoluteExternal, toIndirectAbsoluteExternal) { 'use strict'; +define(['require', './direct-relative-external', 'to-indirect-relative-external', 'direct-absolute-external', 'to-indirect-absolute-external'], function (require, directRelativeExternal, toIndirectRelativeExternal, directAbsoluteExternal, toIndirectAbsoluteExternal) { 'use strict'; function _interopNamespace(e) { if (e && e.__esModule) { return e; } else { @@ -20,14 +20,21 @@ define(['require', './generated-existing', './direct-relative-external', 'to-ind } // nested - new Promise(function (resolve, reject) { require(['./generated-existing'], resolve, reject) }); + Promise.resolve().then(function () { return existing; }); new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(_interopNamespace(m)); }, reject) }); new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(_interopNamespace(m)); }, reject) }); new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(_interopNamespace(m)); }, reject) }); new Promise(function (resolve, reject) { require(['to-indirect-absolute-external'], function (m) { resolve(_interopNamespace(m)); }, reject) }); + const value = 'existing'; + + var existing = /*#__PURE__*/Object.freeze({ + __proto__: null, + value: value + }); + //main - new Promise(function (resolve, reject) { require(['./generated-existing'], resolve, reject) }); + Promise.resolve().then(function () { return existing; }); new Promise(function (resolve, reject) { require(['./direct-relative-external'], function (m) { resolve(_interopNamespace(m)); }, reject) }); new Promise(function (resolve, reject) { require(['to-indirect-relative-external'], function (m) { resolve(_interopNamespace(m)); }, reject) }); new Promise(function (resolve, reject) { require(['direct-absolute-external'], function (m) { resolve(_interopNamespace(m)); }, reject) }); @@ -35,7 +42,7 @@ define(['require', './generated-existing', './direct-relative-external', 'to-ind new Promise(function (resolve, reject) { require(['dynamic-direct-external' + unknown], function (m) { resolve(_interopNamespace(m)); }, reject) }); new Promise(function (resolve, reject) { require(['to-dynamic-indirect-external'], function (m) { resolve(_interopNamespace(m)); }, reject) }); - new Promise(function (resolve, reject) { require(['./generated-existing'], resolve, reject) }); + Promise.resolve().then(function () { return existing; }); new Promise(function (resolve, reject) { require(['my' + 'replacement'], function (m) { resolve(_interopNamespace(m)); }, reject) }); }); diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/generated-existing.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/generated-existing.js deleted file mode 100644 index 561531ebe17..00000000000 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/generated-existing.js +++ /dev/null @@ -1,5 +0,0 @@ -'use strict'; - -const value = 'existing'; - -exports.value = value; diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js index 9f7a3cdf69a..fae2ceae79a 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/cjs/main.js @@ -19,21 +19,27 @@ function _interopNamespace(e) { } } -require('./generated-existing.js'); require('./direct-relative-external'); require('to-indirect-relative-external'); require('direct-absolute-external'); require('to-indirect-absolute-external'); // nested -new Promise(function (resolve) { resolve(require('./generated-existing.js')); }); +Promise.resolve().then(function () { return existing; }); new Promise(function (resolve) { resolve(_interopNamespace(require('./direct-relative-external'))); }); new Promise(function (resolve) { resolve(_interopNamespace(require('to-indirect-relative-external'))); }); new Promise(function (resolve) { resolve(_interopNamespace(require('direct-absolute-external'))); }); new Promise(function (resolve) { resolve(_interopNamespace(require('to-indirect-absolute-external'))); }); +const value = 'existing'; + +var existing = /*#__PURE__*/Object.freeze({ + __proto__: null, + value: value +}); + //main -new Promise(function (resolve) { resolve(require('./generated-existing.js')); }); +Promise.resolve().then(function () { return existing; }); new Promise(function (resolve) { resolve(_interopNamespace(require('./direct-relative-external'))); }); new Promise(function (resolve) { resolve(_interopNamespace(require('to-indirect-relative-external'))); }); new Promise(function (resolve) { resolve(_interopNamespace(require('direct-absolute-external'))); }); @@ -41,5 +47,5 @@ new Promise(function (resolve) { resolve(_interopNamespace(require('to-indirect- new Promise(function (resolve) { resolve(_interopNamespace(require('dynamic-direct-external' + unknown))); }); new Promise(function (resolve) { resolve(_interopNamespace(require('to-dynamic-indirect-external'))); }); -new Promise(function (resolve) { resolve(require('./generated-existing.js')); }); +Promise.resolve().then(function () { return existing; }); new Promise(function (resolve) { resolve(_interopNamespace(require('my' + 'replacement'))); }); diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/es/generated-existing.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/es/generated-existing.js deleted file mode 100644 index 4eca34c7282..00000000000 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/es/generated-existing.js +++ /dev/null @@ -1,3 +0,0 @@ -const value = 'existing'; - -export { value }; diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/es/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/es/main.js index 7dacf7a3eee..691f388d15d 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/es/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/es/main.js @@ -1,18 +1,24 @@ -import './generated-existing.js'; import './direct-relative-external'; import 'to-indirect-relative-external'; import 'direct-absolute-external'; import 'to-indirect-absolute-external'; // nested -import('./generated-existing.js'); +Promise.resolve().then(function () { return existing; }); import('./direct-relative-external'); import('to-indirect-relative-external'); import('direct-absolute-external'); import('to-indirect-absolute-external'); +const value = 'existing'; + +var existing = /*#__PURE__*/Object.freeze({ + __proto__: null, + value: value +}); + //main -import('./generated-existing.js'); +Promise.resolve().then(function () { return existing; }); import('./direct-relative-external'); import('to-indirect-relative-external'); import('direct-absolute-external'); @@ -20,5 +26,5 @@ import('to-indirect-absolute-external'); import('dynamic-direct-external' + unknown); import('to-dynamic-indirect-external'); -import('./generated-existing.js'); +Promise.resolve().then(function () { return existing; }); import('my' + 'replacement'); diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/system/generated-existing.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/system/generated-existing.js deleted file mode 100644 index 48b2a1a9823..00000000000 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/system/generated-existing.js +++ /dev/null @@ -1,10 +0,0 @@ -System.register([], function (exports) { - 'use strict'; - return { - execute: function () { - - const value = exports('value', 'existing'); - - } - }; -}); diff --git a/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js b/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js index ea036d03331..7d417f56ec1 100644 --- a/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js +++ b/test/chunking-form/samples/resolve-dynamic-import/_expected/system/main.js @@ -1,18 +1,25 @@ -System.register(['./generated-existing.js', './direct-relative-external', 'to-indirect-relative-external', 'direct-absolute-external', 'to-indirect-absolute-external'], function (exports, module) { +System.register(['./direct-relative-external', 'to-indirect-relative-external', 'direct-absolute-external', 'to-indirect-absolute-external'], function (exports, module) { 'use strict'; return { - setters: [function () {}, function () {}, function () {}, function () {}, function () {}], + setters: [function () {}, function () {}, function () {}, function () {}], execute: function () { // nested - module.import('./generated-existing.js'); + Promise.resolve().then(function () { return existing; }); module.import('./direct-relative-external'); module.import('to-indirect-relative-external'); module.import('direct-absolute-external'); module.import('to-indirect-absolute-external'); + const value = 'existing'; + + var existing = /*#__PURE__*/Object.freeze({ + __proto__: null, + value: value + }); + //main - module.import('./generated-existing.js'); + Promise.resolve().then(function () { return existing; }); module.import('./direct-relative-external'); module.import('to-indirect-relative-external'); module.import('direct-absolute-external'); @@ -20,7 +27,7 @@ System.register(['./generated-existing.js', './direct-relative-external', 'to-in module.import('dynamic-direct-external' + unknown); module.import('to-dynamic-indirect-external'); - module.import('./generated-existing.js'); + Promise.resolve().then(function () { return existing; }); module.import('my' + 'replacement'); } diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-constants.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-constants.js deleted file mode 100644 index 418773e8d02..00000000000 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-constants.js +++ /dev/null @@ -1,549 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - var v1, - v2, - v3, - v4, - v5, - v6, - v7, - v8, - v9, - v10, - v11, - v12, - v13, - v14, - v15, - v16, - v17, - v18, - v19, - v20, - v21, - v22, - v23, - v24, - v25, - v26, - v27, - v28, - v29, - v30, - v31, - v32, - v33, - v34, - v35, - v36, - v37, - v38, - v39, - v40, - v41, - v42, - v43, - v44, - v45, - v46, - v47, - v48, - v49, - v50, - v51, - v52, - v53, - v54, - v55, - v56, - v57, - v58, - v59, - v60, - v61, - v62, - v63, - v64, - v65, - v66, - v67, - v68, - v69, - v70, - v71, - v72, - v73, - v74, - v75, - v76, - v77, - v78, - v79, - v80, - v81, - v82, - v83, - v84, - v85, - v86, - v87, - v88, - v89, - v90, - v91, - v92, - v93, - v94, - v95, - v96, - v97, - v98, - v99, - v100, - v101, - v102, - v103, - v104, - v105, - v106, - v107, - v108, - v109, - v110, - v111, - v112, - v113, - v114, - v115, - v116, - v117, - v118, - v119, - v120, - v121, - v122, - v123, - v124, - v125, - v126, - v127, - v128, - v129, - v130, - v131, - v132, - v133, - v134, - v135, - v136, - v137, - v138, - v139, - v140, - v141, - v142, - v143, - v144, - v145, - v146, - v147, - v148, - v149, - v150, - v151, - v152, - v153, - v154, - v155, - v156, - v157, - v158, - v159, - v160, - v161, - v162, - v163, - v164, - v165, - v166, - v167, - v168, - v169, - v170, - v171, - v172, - v173, - v174, - v175, - v176, - v177, - v178, - v179, - v180, - v181, - v182, - v183, - v184, - v185, - v186, - v187, - v188, - v189, - v190, - v191, - v192, - v193, - v194, - v195, - v196, - v197, - v198, - v199, - v200, - v201, - v202, - v203, - v204, - v205, - v206, - v207, - v208, - v209, - v210, - v211, - v212, - v213, - v214, - v215, - v216, - v217, - v218, - v219, - v220, - v221, - v222, - v223, - v224, - v225, - v226, - v227, - v228, - v229, - v230, - v231, - v232, - v233, - v234, - v235, - v236, - v237, - v238, - v239, - v240, - v241, - v242, - v243, - v244, - v245, - v246, - v247, - v248, - v249, - v250, - v251, - v252, - v253, - v254, - v255, - v256, - v257, - v258, - v259, - v260, - v261, - v262, - v263, - v264, - v265, - v266, - v267, - v268, - v269, - v270, - v271, - v272; - - exports.v1 = v1; - exports.v10 = v10; - exports.v100 = v100; - exports.v101 = v101; - exports.v102 = v102; - exports.v103 = v103; - exports.v104 = v104; - exports.v105 = v105; - exports.v106 = v106; - exports.v107 = v107; - exports.v108 = v108; - exports.v109 = v109; - exports.v11 = v11; - exports.v110 = v110; - exports.v111 = v111; - exports.v112 = v112; - exports.v113 = v113; - exports.v114 = v114; - exports.v115 = v115; - exports.v116 = v116; - exports.v117 = v117; - exports.v118 = v118; - exports.v119 = v119; - exports.v12 = v12; - exports.v120 = v120; - exports.v121 = v121; - exports.v122 = v122; - exports.v123 = v123; - exports.v124 = v124; - exports.v125 = v125; - exports.v126 = v126; - exports.v127 = v127; - exports.v128 = v128; - exports.v129 = v129; - exports.v13 = v13; - exports.v130 = v130; - exports.v131 = v131; - exports.v132 = v132; - exports.v133 = v133; - exports.v134 = v134; - exports.v135 = v135; - exports.v136 = v136; - exports.v137 = v137; - exports.v138 = v138; - exports.v139 = v139; - exports.v14 = v14; - exports.v140 = v140; - exports.v141 = v141; - exports.v142 = v142; - exports.v143 = v143; - exports.v144 = v144; - exports.v145 = v145; - exports.v146 = v146; - exports.v147 = v147; - exports.v148 = v148; - exports.v149 = v149; - exports.v15 = v15; - exports.v150 = v150; - exports.v151 = v151; - exports.v152 = v152; - exports.v153 = v153; - exports.v154 = v154; - exports.v155 = v155; - exports.v156 = v156; - exports.v157 = v157; - exports.v158 = v158; - exports.v159 = v159; - exports.v16 = v16; - exports.v160 = v160; - exports.v161 = v161; - exports.v162 = v162; - exports.v163 = v163; - exports.v164 = v164; - exports.v165 = v165; - exports.v166 = v166; - exports.v167 = v167; - exports.v168 = v168; - exports.v169 = v169; - exports.v17 = v17; - exports.v170 = v170; - exports.v171 = v171; - exports.v172 = v172; - exports.v173 = v173; - exports.v174 = v174; - exports.v175 = v175; - exports.v176 = v176; - exports.v177 = v177; - exports.v178 = v178; - exports.v179 = v179; - exports.v18 = v18; - exports.v180 = v180; - exports.v181 = v181; - exports.v182 = v182; - exports.v183 = v183; - exports.v184 = v184; - exports.v185 = v185; - exports.v186 = v186; - exports.v187 = v187; - exports.v188 = v188; - exports.v189 = v189; - exports.v19 = v19; - exports.v190 = v190; - exports.v191 = v191; - exports.v192 = v192; - exports.v193 = v193; - exports.v194 = v194; - exports.v195 = v195; - exports.v196 = v196; - exports.v197 = v197; - exports.v198 = v198; - exports.v199 = v199; - exports.v2 = v2; - exports.v20 = v20; - exports.v200 = v200; - exports.v201 = v201; - exports.v202 = v202; - exports.v203 = v203; - exports.v204 = v204; - exports.v205 = v205; - exports.v206 = v206; - exports.v207 = v207; - exports.v208 = v208; - exports.v209 = v209; - exports.v21 = v21; - exports.v210 = v210; - exports.v211 = v211; - exports.v212 = v212; - exports.v213 = v213; - exports.v214 = v214; - exports.v215 = v215; - exports.v216 = v216; - exports.v217 = v217; - exports.v218 = v218; - exports.v219 = v219; - exports.v22 = v22; - exports.v220 = v220; - exports.v221 = v221; - exports.v222 = v222; - exports.v223 = v223; - exports.v224 = v224; - exports.v225 = v225; - exports.v226 = v226; - exports.v227 = v227; - exports.v228 = v228; - exports.v229 = v229; - exports.v23 = v23; - exports.v230 = v230; - exports.v231 = v231; - exports.v232 = v232; - exports.v233 = v233; - exports.v234 = v234; - exports.v235 = v235; - exports.v236 = v236; - exports.v237 = v237; - exports.v238 = v238; - exports.v239 = v239; - exports.v24 = v24; - exports.v240 = v240; - exports.v241 = v241; - exports.v242 = v242; - exports.v243 = v243; - exports.v244 = v244; - exports.v245 = v245; - exports.v246 = v246; - exports.v247 = v247; - exports.v248 = v248; - exports.v249 = v249; - exports.v25 = v25; - exports.v250 = v250; - exports.v251 = v251; - exports.v252 = v252; - exports.v253 = v253; - exports.v254 = v254; - exports.v255 = v255; - exports.v256 = v256; - exports.v257 = v257; - exports.v258 = v258; - exports.v259 = v259; - exports.v26 = v26; - exports.v260 = v260; - exports.v261 = v261; - exports.v262 = v262; - exports.v263 = v263; - exports.v264 = v264; - exports.v265 = v265; - exports.v266 = v266; - exports.v267 = v267; - exports.v268 = v268; - exports.v269 = v269; - exports.v27 = v27; - exports.v270 = v270; - exports.v271 = v271; - exports.v272 = v272; - exports.v28 = v28; - exports.v29 = v29; - exports.v3 = v3; - exports.v30 = v30; - exports.v31 = v31; - exports.v32 = v32; - exports.v33 = v33; - exports.v34 = v34; - exports.v35 = v35; - exports.v36 = v36; - exports.v37 = v37; - exports.v38 = v38; - exports.v39 = v39; - exports.v4 = v4; - exports.v40 = v40; - exports.v41 = v41; - exports.v42 = v42; - exports.v43 = v43; - exports.v44 = v44; - exports.v45 = v45; - exports.v46 = v46; - exports.v47 = v47; - exports.v48 = v48; - exports.v49 = v49; - exports.v5 = v5; - exports.v50 = v50; - exports.v51 = v51; - exports.v52 = v52; - exports.v53 = v53; - exports.v54 = v54; - exports.v55 = v55; - exports.v56 = v56; - exports.v57 = v57; - exports.v58 = v58; - exports.v59 = v59; - exports.v6 = v6; - exports.v60 = v60; - exports.v61 = v61; - exports.v62 = v62; - exports.v63 = v63; - exports.v64 = v64; - exports.v65 = v65; - exports.v66 = v66; - exports.v67 = v67; - exports.v68 = v68; - exports.v69 = v69; - exports.v7 = v7; - exports.v70 = v70; - exports.v71 = v71; - exports.v72 = v72; - exports.v73 = v73; - exports.v74 = v74; - exports.v75 = v75; - exports.v76 = v76; - exports.v77 = v77; - exports.v78 = v78; - exports.v79 = v79; - exports.v8 = v8; - exports.v80 = v80; - exports.v81 = v81; - exports.v82 = v82; - exports.v83 = v83; - exports.v84 = v84; - exports.v85 = v85; - exports.v86 = v86; - exports.v87 = v87; - exports.v88 = v88; - exports.v89 = v89; - exports.v9 = v9; - exports.v90 = v90; - exports.v91 = v91; - exports.v92 = v92; - exports.v93 = v93; - exports.v94 = v94; - exports.v95 = v95; - exports.v96 = v96; - exports.v97 = v97; - exports.v98 = v98; - exports.v99 = v99; - -}); 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 0f399e25ebf..2a891f78402 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,6 +1,6 @@ -define(['exports', './generated-constants'], function (exports, constants) { 'use strict'; +define(['exports', './main'], function (exports, main) { 'use strict'; - var lazy = () => constants.v1; + var lazy = () => main.v1; exports.default = lazy; 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 b301e43cc8a..8e5567e744a 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,280 +1,553 @@ -define(['require', 'exports', './generated-constants'], function (require, exports, constants) { 'use strict'; +define(['require', 'exports'], function (require, exports) { 'use strict'; + + var v1, + v2, + v3, + v4, + v5, + v6, + v7, + v8, + v9, + v10, + v11, + v12, + v13, + v14, + v15, + v16, + v17, + v18, + v19, + v20, + v21, + v22, + v23, + v24, + v25, + v26, + v27, + v28, + v29, + v30, + v31, + v32, + v33, + v34, + v35, + v36, + v37, + v38, + v39, + v40, + v41, + v42, + v43, + v44, + v45, + v46, + v47, + v48, + v49, + v50, + v51, + v52, + v53, + v54, + v55, + v56, + v57, + v58, + v59, + v60, + v61, + v62, + v63, + v64, + v65, + v66, + v67, + v68, + v69, + v70, + v71, + v72, + v73, + v74, + v75, + v76, + v77, + v78, + v79, + v80, + v81, + v82, + v83, + v84, + v85, + v86, + v87, + v88, + v89, + v90, + v91, + v92, + v93, + v94, + v95, + v96, + v97, + v98, + v99, + v100, + v101, + v102, + v103, + v104, + v105, + v106, + v107, + v108, + v109, + v110, + v111, + v112, + v113, + v114, + v115, + v116, + v117, + v118, + v119, + v120, + v121, + v122, + v123, + v124, + v125, + v126, + v127, + v128, + v129, + v130, + v131, + v132, + v133, + v134, + v135, + v136, + v137, + v138, + v139, + v140, + v141, + v142, + v143, + v144, + v145, + v146, + v147, + v148, + v149, + v150, + v151, + v152, + v153, + v154, + v155, + v156, + v157, + v158, + v159, + v160, + v161, + v162, + v163, + v164, + v165, + v166, + v167, + v168, + v169, + v170, + v171, + v172, + v173, + v174, + v175, + v176, + v177, + v178, + v179, + v180, + v181, + v182, + v183, + v184, + v185, + v186, + v187, + v188, + v189, + v190, + v191, + v192, + v193, + v194, + v195, + v196, + v197, + v198, + v199, + v200, + v201, + v202, + v203, + v204, + v205, + v206, + v207, + v208, + v209, + v210, + v211, + v212, + v213, + v214, + v215, + v216, + v217, + v218, + v219, + v220, + v221, + v222, + v223, + v224, + v225, + v226, + v227, + v228, + v229, + v230, + v231, + v232, + v233, + v234, + v235, + v236, + v237, + v238, + v239, + v240, + v241, + v242, + v243, + v244, + v245, + v246, + v247, + v248, + v249, + v250, + v251, + v252, + v253, + v254, + v255, + v256, + v257, + v258, + v259, + v260, + v261, + v262, + v263, + v264, + v265, + v266, + v267, + v268, + v269, + v270, + v271, + v272; const lazy = new Promise(function (resolve, reject) { require(['./generated-lazy'], resolve, reject) }); - exports.v1 = constants.v1; - exports.v10 = constants.v10; - exports.v100 = constants.v100; - exports.v101 = constants.v101; - exports.v102 = constants.v102; - exports.v103 = constants.v103; - exports.v104 = constants.v104; - exports.v105 = constants.v105; - exports.v106 = constants.v106; - exports.v107 = constants.v107; - exports.v108 = constants.v108; - exports.v109 = constants.v109; - exports.v11 = constants.v11; - exports.v110 = constants.v110; - exports.v111 = constants.v111; - exports.v112 = constants.v112; - exports.v113 = constants.v113; - exports.v114 = constants.v114; - exports.v115 = constants.v115; - exports.v116 = constants.v116; - exports.v117 = constants.v117; - exports.v118 = constants.v118; - exports.v119 = constants.v119; - exports.v12 = constants.v12; - exports.v120 = constants.v120; - exports.v121 = constants.v121; - exports.v122 = constants.v122; - exports.v123 = constants.v123; - exports.v124 = constants.v124; - exports.v125 = constants.v125; - exports.v126 = constants.v126; - exports.v127 = constants.v127; - exports.v128 = constants.v128; - exports.v129 = constants.v129; - exports.v13 = constants.v13; - exports.v130 = constants.v130; - exports.v131 = constants.v131; - exports.v132 = constants.v132; - exports.v133 = constants.v133; - exports.v134 = constants.v134; - exports.v135 = constants.v135; - exports.v136 = constants.v136; - exports.v137 = constants.v137; - exports.v138 = constants.v138; - exports.v139 = constants.v139; - exports.v14 = constants.v14; - exports.v140 = constants.v140; - exports.v141 = constants.v141; - exports.v142 = constants.v142; - exports.v143 = constants.v143; - exports.v144 = constants.v144; - exports.v145 = constants.v145; - exports.v146 = constants.v146; - exports.v147 = constants.v147; - exports.v148 = constants.v148; - exports.v149 = constants.v149; - exports.v15 = constants.v15; - exports.v150 = constants.v150; - exports.v151 = constants.v151; - exports.v152 = constants.v152; - exports.v153 = constants.v153; - exports.v154 = constants.v154; - exports.v155 = constants.v155; - exports.v156 = constants.v156; - exports.v157 = constants.v157; - exports.v158 = constants.v158; - exports.v159 = constants.v159; - exports.v16 = constants.v16; - exports.v160 = constants.v160; - exports.v161 = constants.v161; - exports.v162 = constants.v162; - exports.v163 = constants.v163; - exports.v164 = constants.v164; - exports.v165 = constants.v165; - exports.v166 = constants.v166; - exports.v167 = constants.v167; - exports.v168 = constants.v168; - exports.v169 = constants.v169; - exports.v17 = constants.v17; - exports.v170 = constants.v170; - exports.v171 = constants.v171; - exports.v172 = constants.v172; - exports.v173 = constants.v173; - exports.v174 = constants.v174; - exports.v175 = constants.v175; - exports.v176 = constants.v176; - exports.v177 = constants.v177; - exports.v178 = constants.v178; - exports.v179 = constants.v179; - exports.v18 = constants.v18; - exports.v180 = constants.v180; - exports.v181 = constants.v181; - exports.v182 = constants.v182; - exports.v183 = constants.v183; - exports.v184 = constants.v184; - exports.v185 = constants.v185; - exports.v186 = constants.v186; - exports.v187 = constants.v187; - exports.v188 = constants.v188; - exports.v189 = constants.v189; - exports.v19 = constants.v19; - exports.v190 = constants.v190; - exports.v191 = constants.v191; - exports.v192 = constants.v192; - exports.v193 = constants.v193; - exports.v194 = constants.v194; - exports.v195 = constants.v195; - exports.v196 = constants.v196; - exports.v197 = constants.v197; - exports.v198 = constants.v198; - exports.v199 = constants.v199; - exports.v2 = constants.v2; - exports.v20 = constants.v20; - exports.v200 = constants.v200; - exports.v201 = constants.v201; - exports.v202 = constants.v202; - exports.v203 = constants.v203; - exports.v204 = constants.v204; - exports.v205 = constants.v205; - exports.v206 = constants.v206; - exports.v207 = constants.v207; - exports.v208 = constants.v208; - exports.v209 = constants.v209; - exports.v21 = constants.v21; - exports.v210 = constants.v210; - exports.v211 = constants.v211; - exports.v212 = constants.v212; - exports.v213 = constants.v213; - exports.v214 = constants.v214; - exports.v215 = constants.v215; - exports.v216 = constants.v216; - exports.v217 = constants.v217; - exports.v218 = constants.v218; - exports.v219 = constants.v219; - exports.v22 = constants.v22; - exports.v220 = constants.v220; - exports.v221 = constants.v221; - exports.v222 = constants.v222; - exports.v223 = constants.v223; - exports.v224 = constants.v224; - exports.v225 = constants.v225; - exports.v226 = constants.v226; - exports.v227 = constants.v227; - exports.v228 = constants.v228; - exports.v229 = constants.v229; - exports.v23 = constants.v23; - exports.v230 = constants.v230; - exports.v231 = constants.v231; - exports.v232 = constants.v232; - exports.v233 = constants.v233; - exports.v234 = constants.v234; - exports.v235 = constants.v235; - exports.v236 = constants.v236; - exports.v237 = constants.v237; - exports.v238 = constants.v238; - exports.v239 = constants.v239; - exports.v24 = constants.v24; - exports.v240 = constants.v240; - exports.v241 = constants.v241; - exports.v242 = constants.v242; - exports.v243 = constants.v243; - exports.v244 = constants.v244; - exports.v245 = constants.v245; - exports.v246 = constants.v246; - exports.v247 = constants.v247; - exports.v248 = constants.v248; - exports.v249 = constants.v249; - exports.v25 = constants.v25; - exports.v250 = constants.v250; - exports.v251 = constants.v251; - exports.v252 = constants.v252; - exports.v253 = constants.v253; - exports.v254 = constants.v254; - exports.v255 = constants.v255; - exports.v256 = constants.v256; - exports.v257 = constants.v257; - exports.v258 = constants.v258; - exports.v259 = constants.v259; - exports.v26 = constants.v26; - exports.v260 = constants.v260; - exports.v261 = constants.v261; - exports.v262 = constants.v262; - exports.v263 = constants.v263; - exports.v264 = constants.v264; - exports.v265 = constants.v265; - exports.v266 = constants.v266; - exports.v267 = constants.v267; - exports.v268 = constants.v268; - exports.v269 = constants.v269; - exports.v27 = constants.v27; - exports.v270 = constants.v270; - exports.v271 = constants.v271; - exports.v272 = constants.v272; - exports.v28 = constants.v28; - exports.v29 = constants.v29; - exports.v3 = constants.v3; - exports.v30 = constants.v30; - exports.v31 = constants.v31; - exports.v32 = constants.v32; - exports.v33 = constants.v33; - exports.v34 = constants.v34; - exports.v35 = constants.v35; - exports.v36 = constants.v36; - exports.v37 = constants.v37; - exports.v38 = constants.v38; - exports.v39 = constants.v39; - exports.v4 = constants.v4; - exports.v40 = constants.v40; - exports.v41 = constants.v41; - exports.v42 = constants.v42; - exports.v43 = constants.v43; - exports.v44 = constants.v44; - exports.v45 = constants.v45; - exports.v46 = constants.v46; - exports.v47 = constants.v47; - exports.v48 = constants.v48; - exports.v49 = constants.v49; - exports.v5 = constants.v5; - exports.v50 = constants.v50; - exports.v51 = constants.v51; - exports.v52 = constants.v52; - exports.v53 = constants.v53; - exports.v54 = constants.v54; - exports.v55 = constants.v55; - exports.v56 = constants.v56; - exports.v57 = constants.v57; - exports.v58 = constants.v58; - exports.v59 = constants.v59; - exports.v6 = constants.v6; - exports.v60 = constants.v60; - exports.v61 = constants.v61; - exports.v62 = constants.v62; - exports.v63 = constants.v63; - exports.v64 = constants.v64; - exports.v65 = constants.v65; - exports.v66 = constants.v66; - exports.v67 = constants.v67; - exports.v68 = constants.v68; - exports.v69 = constants.v69; - exports.v7 = constants.v7; - exports.v70 = constants.v70; - exports.v71 = constants.v71; - exports.v72 = constants.v72; - exports.v73 = constants.v73; - exports.v74 = constants.v74; - exports.v75 = constants.v75; - exports.v76 = constants.v76; - exports.v77 = constants.v77; - exports.v78 = constants.v78; - exports.v79 = constants.v79; - exports.v8 = constants.v8; - exports.v80 = constants.v80; - exports.v81 = constants.v81; - exports.v82 = constants.v82; - exports.v83 = constants.v83; - exports.v84 = constants.v84; - exports.v85 = constants.v85; - exports.v86 = constants.v86; - exports.v87 = constants.v87; - exports.v88 = constants.v88; - exports.v89 = constants.v89; - exports.v9 = constants.v9; - exports.v90 = constants.v90; - exports.v91 = constants.v91; - exports.v92 = constants.v92; - exports.v93 = constants.v93; - exports.v94 = constants.v94; - exports.v95 = constants.v95; - exports.v96 = constants.v96; - exports.v97 = constants.v97; - exports.v98 = constants.v98; - exports.v99 = constants.v99; exports.lazy = lazy; + exports.v1 = v1; + exports.v10 = v10; + exports.v100 = v100; + exports.v101 = v101; + exports.v102 = v102; + exports.v103 = v103; + exports.v104 = v104; + exports.v105 = v105; + exports.v106 = v106; + exports.v107 = v107; + exports.v108 = v108; + exports.v109 = v109; + exports.v11 = v11; + exports.v110 = v110; + exports.v111 = v111; + exports.v112 = v112; + exports.v113 = v113; + exports.v114 = v114; + exports.v115 = v115; + exports.v116 = v116; + exports.v117 = v117; + exports.v118 = v118; + exports.v119 = v119; + exports.v12 = v12; + exports.v120 = v120; + exports.v121 = v121; + exports.v122 = v122; + exports.v123 = v123; + exports.v124 = v124; + exports.v125 = v125; + exports.v126 = v126; + exports.v127 = v127; + exports.v128 = v128; + exports.v129 = v129; + exports.v13 = v13; + exports.v130 = v130; + exports.v131 = v131; + exports.v132 = v132; + exports.v133 = v133; + exports.v134 = v134; + exports.v135 = v135; + exports.v136 = v136; + exports.v137 = v137; + exports.v138 = v138; + exports.v139 = v139; + exports.v14 = v14; + exports.v140 = v140; + exports.v141 = v141; + exports.v142 = v142; + exports.v143 = v143; + exports.v144 = v144; + exports.v145 = v145; + exports.v146 = v146; + exports.v147 = v147; + exports.v148 = v148; + exports.v149 = v149; + exports.v15 = v15; + exports.v150 = v150; + exports.v151 = v151; + exports.v152 = v152; + exports.v153 = v153; + exports.v154 = v154; + exports.v155 = v155; + exports.v156 = v156; + exports.v157 = v157; + exports.v158 = v158; + exports.v159 = v159; + exports.v16 = v16; + exports.v160 = v160; + exports.v161 = v161; + exports.v162 = v162; + exports.v163 = v163; + exports.v164 = v164; + exports.v165 = v165; + exports.v166 = v166; + exports.v167 = v167; + exports.v168 = v168; + exports.v169 = v169; + exports.v17 = v17; + exports.v170 = v170; + exports.v171 = v171; + exports.v172 = v172; + exports.v173 = v173; + exports.v174 = v174; + exports.v175 = v175; + exports.v176 = v176; + exports.v177 = v177; + exports.v178 = v178; + exports.v179 = v179; + exports.v18 = v18; + exports.v180 = v180; + exports.v181 = v181; + exports.v182 = v182; + exports.v183 = v183; + exports.v184 = v184; + exports.v185 = v185; + exports.v186 = v186; + exports.v187 = v187; + exports.v188 = v188; + exports.v189 = v189; + exports.v19 = v19; + exports.v190 = v190; + exports.v191 = v191; + exports.v192 = v192; + exports.v193 = v193; + exports.v194 = v194; + exports.v195 = v195; + exports.v196 = v196; + exports.v197 = v197; + exports.v198 = v198; + exports.v199 = v199; + exports.v2 = v2; + exports.v20 = v20; + exports.v200 = v200; + exports.v201 = v201; + exports.v202 = v202; + exports.v203 = v203; + exports.v204 = v204; + exports.v205 = v205; + exports.v206 = v206; + exports.v207 = v207; + exports.v208 = v208; + exports.v209 = v209; + exports.v21 = v21; + exports.v210 = v210; + exports.v211 = v211; + exports.v212 = v212; + exports.v213 = v213; + exports.v214 = v214; + exports.v215 = v215; + exports.v216 = v216; + exports.v217 = v217; + exports.v218 = v218; + exports.v219 = v219; + exports.v22 = v22; + exports.v220 = v220; + exports.v221 = v221; + exports.v222 = v222; + exports.v223 = v223; + exports.v224 = v224; + exports.v225 = v225; + exports.v226 = v226; + exports.v227 = v227; + exports.v228 = v228; + exports.v229 = v229; + exports.v23 = v23; + exports.v230 = v230; + exports.v231 = v231; + exports.v232 = v232; + exports.v233 = v233; + exports.v234 = v234; + exports.v235 = v235; + exports.v236 = v236; + exports.v237 = v237; + exports.v238 = v238; + exports.v239 = v239; + exports.v24 = v24; + exports.v240 = v240; + exports.v241 = v241; + exports.v242 = v242; + exports.v243 = v243; + exports.v244 = v244; + exports.v245 = v245; + exports.v246 = v246; + exports.v247 = v247; + exports.v248 = v248; + exports.v249 = v249; + exports.v25 = v25; + exports.v250 = v250; + exports.v251 = v251; + exports.v252 = v252; + exports.v253 = v253; + exports.v254 = v254; + exports.v255 = v255; + exports.v256 = v256; + exports.v257 = v257; + exports.v258 = v258; + exports.v259 = v259; + exports.v26 = v26; + exports.v260 = v260; + exports.v261 = v261; + exports.v262 = v262; + exports.v263 = v263; + exports.v264 = v264; + exports.v265 = v265; + exports.v266 = v266; + exports.v267 = v267; + exports.v268 = v268; + exports.v269 = v269; + exports.v27 = v27; + exports.v270 = v270; + exports.v271 = v271; + exports.v272 = v272; + exports.v28 = v28; + exports.v29 = v29; + exports.v3 = v3; + exports.v30 = v30; + exports.v31 = v31; + exports.v32 = v32; + exports.v33 = v33; + exports.v34 = v34; + exports.v35 = v35; + exports.v36 = v36; + exports.v37 = v37; + exports.v38 = v38; + exports.v39 = v39; + exports.v4 = v4; + exports.v40 = v40; + exports.v41 = v41; + exports.v42 = v42; + exports.v43 = v43; + exports.v44 = v44; + exports.v45 = v45; + exports.v46 = v46; + exports.v47 = v47; + exports.v48 = v48; + exports.v49 = v49; + exports.v5 = v5; + exports.v50 = v50; + exports.v51 = v51; + exports.v52 = v52; + exports.v53 = v53; + exports.v54 = v54; + exports.v55 = v55; + exports.v56 = v56; + exports.v57 = v57; + exports.v58 = v58; + exports.v59 = v59; + exports.v6 = v6; + exports.v60 = v60; + exports.v61 = v61; + exports.v62 = v62; + exports.v63 = v63; + exports.v64 = v64; + exports.v65 = v65; + exports.v66 = v66; + exports.v67 = v67; + exports.v68 = v68; + exports.v69 = v69; + exports.v7 = v7; + exports.v70 = v70; + exports.v71 = v71; + exports.v72 = v72; + exports.v73 = v73; + exports.v74 = v74; + exports.v75 = v75; + exports.v76 = v76; + exports.v77 = v77; + exports.v78 = v78; + exports.v79 = v79; + exports.v8 = v8; + exports.v80 = v80; + exports.v81 = v81; + exports.v82 = v82; + exports.v83 = v83; + exports.v84 = v84; + exports.v85 = v85; + exports.v86 = v86; + exports.v87 = v87; + exports.v88 = v88; + exports.v89 = v89; + exports.v9 = v9; + exports.v90 = v90; + exports.v91 = v91; + exports.v92 = v92; + exports.v93 = v93; + exports.v94 = v94; + exports.v95 = v95; + exports.v96 = v96; + exports.v97 = v97; + exports.v98 = v98; + exports.v99 = v99; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-constants.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-constants.js deleted file mode 100644 index 605ce9b90ec..00000000000 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-constants.js +++ /dev/null @@ -1,547 +0,0 @@ -'use strict'; - -var v1, - v2, - v3, - v4, - v5, - v6, - v7, - v8, - v9, - v10, - v11, - v12, - v13, - v14, - v15, - v16, - v17, - v18, - v19, - v20, - v21, - v22, - v23, - v24, - v25, - v26, - v27, - v28, - v29, - v30, - v31, - v32, - v33, - v34, - v35, - v36, - v37, - v38, - v39, - v40, - v41, - v42, - v43, - v44, - v45, - v46, - v47, - v48, - v49, - v50, - v51, - v52, - v53, - v54, - v55, - v56, - v57, - v58, - v59, - v60, - v61, - v62, - v63, - v64, - v65, - v66, - v67, - v68, - v69, - v70, - v71, - v72, - v73, - v74, - v75, - v76, - v77, - v78, - v79, - v80, - v81, - v82, - v83, - v84, - v85, - v86, - v87, - v88, - v89, - v90, - v91, - v92, - v93, - v94, - v95, - v96, - v97, - v98, - v99, - v100, - v101, - v102, - v103, - v104, - v105, - v106, - v107, - v108, - v109, - v110, - v111, - v112, - v113, - v114, - v115, - v116, - v117, - v118, - v119, - v120, - v121, - v122, - v123, - v124, - v125, - v126, - v127, - v128, - v129, - v130, - v131, - v132, - v133, - v134, - v135, - v136, - v137, - v138, - v139, - v140, - v141, - v142, - v143, - v144, - v145, - v146, - v147, - v148, - v149, - v150, - v151, - v152, - v153, - v154, - v155, - v156, - v157, - v158, - v159, - v160, - v161, - v162, - v163, - v164, - v165, - v166, - v167, - v168, - v169, - v170, - v171, - v172, - v173, - v174, - v175, - v176, - v177, - v178, - v179, - v180, - v181, - v182, - v183, - v184, - v185, - v186, - v187, - v188, - v189, - v190, - v191, - v192, - v193, - v194, - v195, - v196, - v197, - v198, - v199, - v200, - v201, - v202, - v203, - v204, - v205, - v206, - v207, - v208, - v209, - v210, - v211, - v212, - v213, - v214, - v215, - v216, - v217, - v218, - v219, - v220, - v221, - v222, - v223, - v224, - v225, - v226, - v227, - v228, - v229, - v230, - v231, - v232, - v233, - v234, - v235, - v236, - v237, - v238, - v239, - v240, - v241, - v242, - v243, - v244, - v245, - v246, - v247, - v248, - v249, - v250, - v251, - v252, - v253, - v254, - v255, - v256, - v257, - v258, - v259, - v260, - v261, - v262, - v263, - v264, - v265, - v266, - v267, - v268, - v269, - v270, - v271, - v272; - -exports.v1 = v1; -exports.v10 = v10; -exports.v100 = v100; -exports.v101 = v101; -exports.v102 = v102; -exports.v103 = v103; -exports.v104 = v104; -exports.v105 = v105; -exports.v106 = v106; -exports.v107 = v107; -exports.v108 = v108; -exports.v109 = v109; -exports.v11 = v11; -exports.v110 = v110; -exports.v111 = v111; -exports.v112 = v112; -exports.v113 = v113; -exports.v114 = v114; -exports.v115 = v115; -exports.v116 = v116; -exports.v117 = v117; -exports.v118 = v118; -exports.v119 = v119; -exports.v12 = v12; -exports.v120 = v120; -exports.v121 = v121; -exports.v122 = v122; -exports.v123 = v123; -exports.v124 = v124; -exports.v125 = v125; -exports.v126 = v126; -exports.v127 = v127; -exports.v128 = v128; -exports.v129 = v129; -exports.v13 = v13; -exports.v130 = v130; -exports.v131 = v131; -exports.v132 = v132; -exports.v133 = v133; -exports.v134 = v134; -exports.v135 = v135; -exports.v136 = v136; -exports.v137 = v137; -exports.v138 = v138; -exports.v139 = v139; -exports.v14 = v14; -exports.v140 = v140; -exports.v141 = v141; -exports.v142 = v142; -exports.v143 = v143; -exports.v144 = v144; -exports.v145 = v145; -exports.v146 = v146; -exports.v147 = v147; -exports.v148 = v148; -exports.v149 = v149; -exports.v15 = v15; -exports.v150 = v150; -exports.v151 = v151; -exports.v152 = v152; -exports.v153 = v153; -exports.v154 = v154; -exports.v155 = v155; -exports.v156 = v156; -exports.v157 = v157; -exports.v158 = v158; -exports.v159 = v159; -exports.v16 = v16; -exports.v160 = v160; -exports.v161 = v161; -exports.v162 = v162; -exports.v163 = v163; -exports.v164 = v164; -exports.v165 = v165; -exports.v166 = v166; -exports.v167 = v167; -exports.v168 = v168; -exports.v169 = v169; -exports.v17 = v17; -exports.v170 = v170; -exports.v171 = v171; -exports.v172 = v172; -exports.v173 = v173; -exports.v174 = v174; -exports.v175 = v175; -exports.v176 = v176; -exports.v177 = v177; -exports.v178 = v178; -exports.v179 = v179; -exports.v18 = v18; -exports.v180 = v180; -exports.v181 = v181; -exports.v182 = v182; -exports.v183 = v183; -exports.v184 = v184; -exports.v185 = v185; -exports.v186 = v186; -exports.v187 = v187; -exports.v188 = v188; -exports.v189 = v189; -exports.v19 = v19; -exports.v190 = v190; -exports.v191 = v191; -exports.v192 = v192; -exports.v193 = v193; -exports.v194 = v194; -exports.v195 = v195; -exports.v196 = v196; -exports.v197 = v197; -exports.v198 = v198; -exports.v199 = v199; -exports.v2 = v2; -exports.v20 = v20; -exports.v200 = v200; -exports.v201 = v201; -exports.v202 = v202; -exports.v203 = v203; -exports.v204 = v204; -exports.v205 = v205; -exports.v206 = v206; -exports.v207 = v207; -exports.v208 = v208; -exports.v209 = v209; -exports.v21 = v21; -exports.v210 = v210; -exports.v211 = v211; -exports.v212 = v212; -exports.v213 = v213; -exports.v214 = v214; -exports.v215 = v215; -exports.v216 = v216; -exports.v217 = v217; -exports.v218 = v218; -exports.v219 = v219; -exports.v22 = v22; -exports.v220 = v220; -exports.v221 = v221; -exports.v222 = v222; -exports.v223 = v223; -exports.v224 = v224; -exports.v225 = v225; -exports.v226 = v226; -exports.v227 = v227; -exports.v228 = v228; -exports.v229 = v229; -exports.v23 = v23; -exports.v230 = v230; -exports.v231 = v231; -exports.v232 = v232; -exports.v233 = v233; -exports.v234 = v234; -exports.v235 = v235; -exports.v236 = v236; -exports.v237 = v237; -exports.v238 = v238; -exports.v239 = v239; -exports.v24 = v24; -exports.v240 = v240; -exports.v241 = v241; -exports.v242 = v242; -exports.v243 = v243; -exports.v244 = v244; -exports.v245 = v245; -exports.v246 = v246; -exports.v247 = v247; -exports.v248 = v248; -exports.v249 = v249; -exports.v25 = v25; -exports.v250 = v250; -exports.v251 = v251; -exports.v252 = v252; -exports.v253 = v253; -exports.v254 = v254; -exports.v255 = v255; -exports.v256 = v256; -exports.v257 = v257; -exports.v258 = v258; -exports.v259 = v259; -exports.v26 = v26; -exports.v260 = v260; -exports.v261 = v261; -exports.v262 = v262; -exports.v263 = v263; -exports.v264 = v264; -exports.v265 = v265; -exports.v266 = v266; -exports.v267 = v267; -exports.v268 = v268; -exports.v269 = v269; -exports.v27 = v27; -exports.v270 = v270; -exports.v271 = v271; -exports.v272 = v272; -exports.v28 = v28; -exports.v29 = v29; -exports.v3 = v3; -exports.v30 = v30; -exports.v31 = v31; -exports.v32 = v32; -exports.v33 = v33; -exports.v34 = v34; -exports.v35 = v35; -exports.v36 = v36; -exports.v37 = v37; -exports.v38 = v38; -exports.v39 = v39; -exports.v4 = v4; -exports.v40 = v40; -exports.v41 = v41; -exports.v42 = v42; -exports.v43 = v43; -exports.v44 = v44; -exports.v45 = v45; -exports.v46 = v46; -exports.v47 = v47; -exports.v48 = v48; -exports.v49 = v49; -exports.v5 = v5; -exports.v50 = v50; -exports.v51 = v51; -exports.v52 = v52; -exports.v53 = v53; -exports.v54 = v54; -exports.v55 = v55; -exports.v56 = v56; -exports.v57 = v57; -exports.v58 = v58; -exports.v59 = v59; -exports.v6 = v6; -exports.v60 = v60; -exports.v61 = v61; -exports.v62 = v62; -exports.v63 = v63; -exports.v64 = v64; -exports.v65 = v65; -exports.v66 = v66; -exports.v67 = v67; -exports.v68 = v68; -exports.v69 = v69; -exports.v7 = v7; -exports.v70 = v70; -exports.v71 = v71; -exports.v72 = v72; -exports.v73 = v73; -exports.v74 = v74; -exports.v75 = v75; -exports.v76 = v76; -exports.v77 = v77; -exports.v78 = v78; -exports.v79 = v79; -exports.v8 = v8; -exports.v80 = v80; -exports.v81 = v81; -exports.v82 = v82; -exports.v83 = v83; -exports.v84 = v84; -exports.v85 = v85; -exports.v86 = v86; -exports.v87 = v87; -exports.v88 = v88; -exports.v89 = v89; -exports.v9 = v9; -exports.v90 = v90; -exports.v91 = v91; -exports.v92 = v92; -exports.v93 = v93; -exports.v94 = v94; -exports.v95 = v95; -exports.v96 = v96; -exports.v97 = v97; -exports.v98 = v98; -exports.v99 = v99; 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 39df6fd6001..fdaab011450 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,7 +1,7 @@ 'use strict'; -var constants = require('./generated-constants.js'); +var main = require('./main.js'); -var lazy = () => constants.v1; +var lazy = () => main.v1; exports.default = lazy; 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 45d50ce8b88..419204a47ac 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,280 +2,551 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var constants = require('./generated-constants.js'); +var v1, + v2, + v3, + v4, + v5, + v6, + v7, + v8, + v9, + v10, + v11, + v12, + v13, + v14, + v15, + v16, + v17, + v18, + v19, + v20, + v21, + v22, + v23, + v24, + v25, + v26, + v27, + v28, + v29, + v30, + v31, + v32, + v33, + v34, + v35, + v36, + v37, + v38, + v39, + v40, + v41, + v42, + v43, + v44, + v45, + v46, + v47, + v48, + v49, + v50, + v51, + v52, + v53, + v54, + v55, + v56, + v57, + v58, + v59, + v60, + v61, + v62, + v63, + v64, + v65, + v66, + v67, + v68, + v69, + v70, + v71, + v72, + v73, + v74, + v75, + v76, + v77, + v78, + v79, + v80, + v81, + v82, + v83, + v84, + v85, + v86, + v87, + v88, + v89, + v90, + v91, + v92, + v93, + v94, + v95, + v96, + v97, + v98, + v99, + v100, + v101, + v102, + v103, + v104, + v105, + v106, + v107, + v108, + v109, + v110, + v111, + v112, + v113, + v114, + v115, + v116, + v117, + v118, + v119, + v120, + v121, + v122, + v123, + v124, + v125, + v126, + v127, + v128, + v129, + v130, + v131, + v132, + v133, + v134, + v135, + v136, + v137, + v138, + v139, + v140, + v141, + v142, + v143, + v144, + v145, + v146, + v147, + v148, + v149, + v150, + v151, + v152, + v153, + v154, + v155, + v156, + v157, + v158, + v159, + v160, + v161, + v162, + v163, + v164, + v165, + v166, + v167, + v168, + v169, + v170, + v171, + v172, + v173, + v174, + v175, + v176, + v177, + v178, + v179, + v180, + v181, + v182, + v183, + v184, + v185, + v186, + v187, + v188, + v189, + v190, + v191, + v192, + v193, + v194, + v195, + v196, + v197, + v198, + v199, + v200, + v201, + v202, + v203, + v204, + v205, + v206, + v207, + v208, + v209, + v210, + v211, + v212, + v213, + v214, + v215, + v216, + v217, + v218, + v219, + v220, + v221, + v222, + v223, + v224, + v225, + v226, + v227, + v228, + v229, + v230, + v231, + v232, + v233, + v234, + v235, + v236, + v237, + v238, + v239, + v240, + v241, + v242, + v243, + v244, + v245, + v246, + v247, + v248, + v249, + v250, + v251, + v252, + v253, + v254, + v255, + v256, + v257, + v258, + v259, + v260, + v261, + v262, + v263, + v264, + v265, + v266, + v267, + v268, + v269, + v270, + v271, + v272; const lazy = new Promise(function (resolve) { resolve(require('./generated-lazy.js')); }); -exports.v1 = constants.v1; -exports.v10 = constants.v10; -exports.v100 = constants.v100; -exports.v101 = constants.v101; -exports.v102 = constants.v102; -exports.v103 = constants.v103; -exports.v104 = constants.v104; -exports.v105 = constants.v105; -exports.v106 = constants.v106; -exports.v107 = constants.v107; -exports.v108 = constants.v108; -exports.v109 = constants.v109; -exports.v11 = constants.v11; -exports.v110 = constants.v110; -exports.v111 = constants.v111; -exports.v112 = constants.v112; -exports.v113 = constants.v113; -exports.v114 = constants.v114; -exports.v115 = constants.v115; -exports.v116 = constants.v116; -exports.v117 = constants.v117; -exports.v118 = constants.v118; -exports.v119 = constants.v119; -exports.v12 = constants.v12; -exports.v120 = constants.v120; -exports.v121 = constants.v121; -exports.v122 = constants.v122; -exports.v123 = constants.v123; -exports.v124 = constants.v124; -exports.v125 = constants.v125; -exports.v126 = constants.v126; -exports.v127 = constants.v127; -exports.v128 = constants.v128; -exports.v129 = constants.v129; -exports.v13 = constants.v13; -exports.v130 = constants.v130; -exports.v131 = constants.v131; -exports.v132 = constants.v132; -exports.v133 = constants.v133; -exports.v134 = constants.v134; -exports.v135 = constants.v135; -exports.v136 = constants.v136; -exports.v137 = constants.v137; -exports.v138 = constants.v138; -exports.v139 = constants.v139; -exports.v14 = constants.v14; -exports.v140 = constants.v140; -exports.v141 = constants.v141; -exports.v142 = constants.v142; -exports.v143 = constants.v143; -exports.v144 = constants.v144; -exports.v145 = constants.v145; -exports.v146 = constants.v146; -exports.v147 = constants.v147; -exports.v148 = constants.v148; -exports.v149 = constants.v149; -exports.v15 = constants.v15; -exports.v150 = constants.v150; -exports.v151 = constants.v151; -exports.v152 = constants.v152; -exports.v153 = constants.v153; -exports.v154 = constants.v154; -exports.v155 = constants.v155; -exports.v156 = constants.v156; -exports.v157 = constants.v157; -exports.v158 = constants.v158; -exports.v159 = constants.v159; -exports.v16 = constants.v16; -exports.v160 = constants.v160; -exports.v161 = constants.v161; -exports.v162 = constants.v162; -exports.v163 = constants.v163; -exports.v164 = constants.v164; -exports.v165 = constants.v165; -exports.v166 = constants.v166; -exports.v167 = constants.v167; -exports.v168 = constants.v168; -exports.v169 = constants.v169; -exports.v17 = constants.v17; -exports.v170 = constants.v170; -exports.v171 = constants.v171; -exports.v172 = constants.v172; -exports.v173 = constants.v173; -exports.v174 = constants.v174; -exports.v175 = constants.v175; -exports.v176 = constants.v176; -exports.v177 = constants.v177; -exports.v178 = constants.v178; -exports.v179 = constants.v179; -exports.v18 = constants.v18; -exports.v180 = constants.v180; -exports.v181 = constants.v181; -exports.v182 = constants.v182; -exports.v183 = constants.v183; -exports.v184 = constants.v184; -exports.v185 = constants.v185; -exports.v186 = constants.v186; -exports.v187 = constants.v187; -exports.v188 = constants.v188; -exports.v189 = constants.v189; -exports.v19 = constants.v19; -exports.v190 = constants.v190; -exports.v191 = constants.v191; -exports.v192 = constants.v192; -exports.v193 = constants.v193; -exports.v194 = constants.v194; -exports.v195 = constants.v195; -exports.v196 = constants.v196; -exports.v197 = constants.v197; -exports.v198 = constants.v198; -exports.v199 = constants.v199; -exports.v2 = constants.v2; -exports.v20 = constants.v20; -exports.v200 = constants.v200; -exports.v201 = constants.v201; -exports.v202 = constants.v202; -exports.v203 = constants.v203; -exports.v204 = constants.v204; -exports.v205 = constants.v205; -exports.v206 = constants.v206; -exports.v207 = constants.v207; -exports.v208 = constants.v208; -exports.v209 = constants.v209; -exports.v21 = constants.v21; -exports.v210 = constants.v210; -exports.v211 = constants.v211; -exports.v212 = constants.v212; -exports.v213 = constants.v213; -exports.v214 = constants.v214; -exports.v215 = constants.v215; -exports.v216 = constants.v216; -exports.v217 = constants.v217; -exports.v218 = constants.v218; -exports.v219 = constants.v219; -exports.v22 = constants.v22; -exports.v220 = constants.v220; -exports.v221 = constants.v221; -exports.v222 = constants.v222; -exports.v223 = constants.v223; -exports.v224 = constants.v224; -exports.v225 = constants.v225; -exports.v226 = constants.v226; -exports.v227 = constants.v227; -exports.v228 = constants.v228; -exports.v229 = constants.v229; -exports.v23 = constants.v23; -exports.v230 = constants.v230; -exports.v231 = constants.v231; -exports.v232 = constants.v232; -exports.v233 = constants.v233; -exports.v234 = constants.v234; -exports.v235 = constants.v235; -exports.v236 = constants.v236; -exports.v237 = constants.v237; -exports.v238 = constants.v238; -exports.v239 = constants.v239; -exports.v24 = constants.v24; -exports.v240 = constants.v240; -exports.v241 = constants.v241; -exports.v242 = constants.v242; -exports.v243 = constants.v243; -exports.v244 = constants.v244; -exports.v245 = constants.v245; -exports.v246 = constants.v246; -exports.v247 = constants.v247; -exports.v248 = constants.v248; -exports.v249 = constants.v249; -exports.v25 = constants.v25; -exports.v250 = constants.v250; -exports.v251 = constants.v251; -exports.v252 = constants.v252; -exports.v253 = constants.v253; -exports.v254 = constants.v254; -exports.v255 = constants.v255; -exports.v256 = constants.v256; -exports.v257 = constants.v257; -exports.v258 = constants.v258; -exports.v259 = constants.v259; -exports.v26 = constants.v26; -exports.v260 = constants.v260; -exports.v261 = constants.v261; -exports.v262 = constants.v262; -exports.v263 = constants.v263; -exports.v264 = constants.v264; -exports.v265 = constants.v265; -exports.v266 = constants.v266; -exports.v267 = constants.v267; -exports.v268 = constants.v268; -exports.v269 = constants.v269; -exports.v27 = constants.v27; -exports.v270 = constants.v270; -exports.v271 = constants.v271; -exports.v272 = constants.v272; -exports.v28 = constants.v28; -exports.v29 = constants.v29; -exports.v3 = constants.v3; -exports.v30 = constants.v30; -exports.v31 = constants.v31; -exports.v32 = constants.v32; -exports.v33 = constants.v33; -exports.v34 = constants.v34; -exports.v35 = constants.v35; -exports.v36 = constants.v36; -exports.v37 = constants.v37; -exports.v38 = constants.v38; -exports.v39 = constants.v39; -exports.v4 = constants.v4; -exports.v40 = constants.v40; -exports.v41 = constants.v41; -exports.v42 = constants.v42; -exports.v43 = constants.v43; -exports.v44 = constants.v44; -exports.v45 = constants.v45; -exports.v46 = constants.v46; -exports.v47 = constants.v47; -exports.v48 = constants.v48; -exports.v49 = constants.v49; -exports.v5 = constants.v5; -exports.v50 = constants.v50; -exports.v51 = constants.v51; -exports.v52 = constants.v52; -exports.v53 = constants.v53; -exports.v54 = constants.v54; -exports.v55 = constants.v55; -exports.v56 = constants.v56; -exports.v57 = constants.v57; -exports.v58 = constants.v58; -exports.v59 = constants.v59; -exports.v6 = constants.v6; -exports.v60 = constants.v60; -exports.v61 = constants.v61; -exports.v62 = constants.v62; -exports.v63 = constants.v63; -exports.v64 = constants.v64; -exports.v65 = constants.v65; -exports.v66 = constants.v66; -exports.v67 = constants.v67; -exports.v68 = constants.v68; -exports.v69 = constants.v69; -exports.v7 = constants.v7; -exports.v70 = constants.v70; -exports.v71 = constants.v71; -exports.v72 = constants.v72; -exports.v73 = constants.v73; -exports.v74 = constants.v74; -exports.v75 = constants.v75; -exports.v76 = constants.v76; -exports.v77 = constants.v77; -exports.v78 = constants.v78; -exports.v79 = constants.v79; -exports.v8 = constants.v8; -exports.v80 = constants.v80; -exports.v81 = constants.v81; -exports.v82 = constants.v82; -exports.v83 = constants.v83; -exports.v84 = constants.v84; -exports.v85 = constants.v85; -exports.v86 = constants.v86; -exports.v87 = constants.v87; -exports.v88 = constants.v88; -exports.v89 = constants.v89; -exports.v9 = constants.v9; -exports.v90 = constants.v90; -exports.v91 = constants.v91; -exports.v92 = constants.v92; -exports.v93 = constants.v93; -exports.v94 = constants.v94; -exports.v95 = constants.v95; -exports.v96 = constants.v96; -exports.v97 = constants.v97; -exports.v98 = constants.v98; -exports.v99 = constants.v99; exports.lazy = lazy; +exports.v1 = v1; +exports.v10 = v10; +exports.v100 = v100; +exports.v101 = v101; +exports.v102 = v102; +exports.v103 = v103; +exports.v104 = v104; +exports.v105 = v105; +exports.v106 = v106; +exports.v107 = v107; +exports.v108 = v108; +exports.v109 = v109; +exports.v11 = v11; +exports.v110 = v110; +exports.v111 = v111; +exports.v112 = v112; +exports.v113 = v113; +exports.v114 = v114; +exports.v115 = v115; +exports.v116 = v116; +exports.v117 = v117; +exports.v118 = v118; +exports.v119 = v119; +exports.v12 = v12; +exports.v120 = v120; +exports.v121 = v121; +exports.v122 = v122; +exports.v123 = v123; +exports.v124 = v124; +exports.v125 = v125; +exports.v126 = v126; +exports.v127 = v127; +exports.v128 = v128; +exports.v129 = v129; +exports.v13 = v13; +exports.v130 = v130; +exports.v131 = v131; +exports.v132 = v132; +exports.v133 = v133; +exports.v134 = v134; +exports.v135 = v135; +exports.v136 = v136; +exports.v137 = v137; +exports.v138 = v138; +exports.v139 = v139; +exports.v14 = v14; +exports.v140 = v140; +exports.v141 = v141; +exports.v142 = v142; +exports.v143 = v143; +exports.v144 = v144; +exports.v145 = v145; +exports.v146 = v146; +exports.v147 = v147; +exports.v148 = v148; +exports.v149 = v149; +exports.v15 = v15; +exports.v150 = v150; +exports.v151 = v151; +exports.v152 = v152; +exports.v153 = v153; +exports.v154 = v154; +exports.v155 = v155; +exports.v156 = v156; +exports.v157 = v157; +exports.v158 = v158; +exports.v159 = v159; +exports.v16 = v16; +exports.v160 = v160; +exports.v161 = v161; +exports.v162 = v162; +exports.v163 = v163; +exports.v164 = v164; +exports.v165 = v165; +exports.v166 = v166; +exports.v167 = v167; +exports.v168 = v168; +exports.v169 = v169; +exports.v17 = v17; +exports.v170 = v170; +exports.v171 = v171; +exports.v172 = v172; +exports.v173 = v173; +exports.v174 = v174; +exports.v175 = v175; +exports.v176 = v176; +exports.v177 = v177; +exports.v178 = v178; +exports.v179 = v179; +exports.v18 = v18; +exports.v180 = v180; +exports.v181 = v181; +exports.v182 = v182; +exports.v183 = v183; +exports.v184 = v184; +exports.v185 = v185; +exports.v186 = v186; +exports.v187 = v187; +exports.v188 = v188; +exports.v189 = v189; +exports.v19 = v19; +exports.v190 = v190; +exports.v191 = v191; +exports.v192 = v192; +exports.v193 = v193; +exports.v194 = v194; +exports.v195 = v195; +exports.v196 = v196; +exports.v197 = v197; +exports.v198 = v198; +exports.v199 = v199; +exports.v2 = v2; +exports.v20 = v20; +exports.v200 = v200; +exports.v201 = v201; +exports.v202 = v202; +exports.v203 = v203; +exports.v204 = v204; +exports.v205 = v205; +exports.v206 = v206; +exports.v207 = v207; +exports.v208 = v208; +exports.v209 = v209; +exports.v21 = v21; +exports.v210 = v210; +exports.v211 = v211; +exports.v212 = v212; +exports.v213 = v213; +exports.v214 = v214; +exports.v215 = v215; +exports.v216 = v216; +exports.v217 = v217; +exports.v218 = v218; +exports.v219 = v219; +exports.v22 = v22; +exports.v220 = v220; +exports.v221 = v221; +exports.v222 = v222; +exports.v223 = v223; +exports.v224 = v224; +exports.v225 = v225; +exports.v226 = v226; +exports.v227 = v227; +exports.v228 = v228; +exports.v229 = v229; +exports.v23 = v23; +exports.v230 = v230; +exports.v231 = v231; +exports.v232 = v232; +exports.v233 = v233; +exports.v234 = v234; +exports.v235 = v235; +exports.v236 = v236; +exports.v237 = v237; +exports.v238 = v238; +exports.v239 = v239; +exports.v24 = v24; +exports.v240 = v240; +exports.v241 = v241; +exports.v242 = v242; +exports.v243 = v243; +exports.v244 = v244; +exports.v245 = v245; +exports.v246 = v246; +exports.v247 = v247; +exports.v248 = v248; +exports.v249 = v249; +exports.v25 = v25; +exports.v250 = v250; +exports.v251 = v251; +exports.v252 = v252; +exports.v253 = v253; +exports.v254 = v254; +exports.v255 = v255; +exports.v256 = v256; +exports.v257 = v257; +exports.v258 = v258; +exports.v259 = v259; +exports.v26 = v26; +exports.v260 = v260; +exports.v261 = v261; +exports.v262 = v262; +exports.v263 = v263; +exports.v264 = v264; +exports.v265 = v265; +exports.v266 = v266; +exports.v267 = v267; +exports.v268 = v268; +exports.v269 = v269; +exports.v27 = v27; +exports.v270 = v270; +exports.v271 = v271; +exports.v272 = v272; +exports.v28 = v28; +exports.v29 = v29; +exports.v3 = v3; +exports.v30 = v30; +exports.v31 = v31; +exports.v32 = v32; +exports.v33 = v33; +exports.v34 = v34; +exports.v35 = v35; +exports.v36 = v36; +exports.v37 = v37; +exports.v38 = v38; +exports.v39 = v39; +exports.v4 = v4; +exports.v40 = v40; +exports.v41 = v41; +exports.v42 = v42; +exports.v43 = v43; +exports.v44 = v44; +exports.v45 = v45; +exports.v46 = v46; +exports.v47 = v47; +exports.v48 = v48; +exports.v49 = v49; +exports.v5 = v5; +exports.v50 = v50; +exports.v51 = v51; +exports.v52 = v52; +exports.v53 = v53; +exports.v54 = v54; +exports.v55 = v55; +exports.v56 = v56; +exports.v57 = v57; +exports.v58 = v58; +exports.v59 = v59; +exports.v6 = v6; +exports.v60 = v60; +exports.v61 = v61; +exports.v62 = v62; +exports.v63 = v63; +exports.v64 = v64; +exports.v65 = v65; +exports.v66 = v66; +exports.v67 = v67; +exports.v68 = v68; +exports.v69 = v69; +exports.v7 = v7; +exports.v70 = v70; +exports.v71 = v71; +exports.v72 = v72; +exports.v73 = v73; +exports.v74 = v74; +exports.v75 = v75; +exports.v76 = v76; +exports.v77 = v77; +exports.v78 = v78; +exports.v79 = v79; +exports.v8 = v8; +exports.v80 = v80; +exports.v81 = v81; +exports.v82 = v82; +exports.v83 = v83; +exports.v84 = v84; +exports.v85 = v85; +exports.v86 = v86; +exports.v87 = v87; +exports.v88 = v88; +exports.v89 = v89; +exports.v9 = v9; +exports.v90 = v90; +exports.v91 = v91; +exports.v92 = v92; +exports.v93 = v93; +exports.v94 = v94; +exports.v95 = v95; +exports.v96 = v96; +exports.v97 = v97; +exports.v98 = v98; +exports.v99 = v99; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-constants.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-constants.js deleted file mode 100644 index f38d0101d46..00000000000 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-constants.js +++ /dev/null @@ -1,274 +0,0 @@ -var v1, - v2, - v3, - v4, - v5, - v6, - v7, - v8, - v9, - v10, - v11, - v12, - v13, - v14, - v15, - v16, - v17, - v18, - v19, - v20, - v21, - v22, - v23, - v24, - v25, - v26, - v27, - v28, - v29, - v30, - v31, - v32, - v33, - v34, - v35, - v36, - v37, - v38, - v39, - v40, - v41, - v42, - v43, - v44, - v45, - v46, - v47, - v48, - v49, - v50, - v51, - v52, - v53, - v54, - v55, - v56, - v57, - v58, - v59, - v60, - v61, - v62, - v63, - v64, - v65, - v66, - v67, - v68, - v69, - v70, - v71, - v72, - v73, - v74, - v75, - v76, - v77, - v78, - v79, - v80, - v81, - v82, - v83, - v84, - v85, - v86, - v87, - v88, - v89, - v90, - v91, - v92, - v93, - v94, - v95, - v96, - v97, - v98, - v99, - v100, - v101, - v102, - v103, - v104, - v105, - v106, - v107, - v108, - v109, - v110, - v111, - v112, - v113, - v114, - v115, - v116, - v117, - v118, - v119, - v120, - v121, - v122, - v123, - v124, - v125, - v126, - v127, - v128, - v129, - v130, - v131, - v132, - v133, - v134, - v135, - v136, - v137, - v138, - v139, - v140, - v141, - v142, - v143, - v144, - v145, - v146, - v147, - v148, - v149, - v150, - v151, - v152, - v153, - v154, - v155, - v156, - v157, - v158, - v159, - v160, - v161, - v162, - v163, - v164, - v165, - v166, - v167, - v168, - v169, - v170, - v171, - v172, - v173, - v174, - v175, - v176, - v177, - v178, - v179, - v180, - v181, - v182, - v183, - v184, - v185, - v186, - v187, - v188, - v189, - v190, - v191, - v192, - v193, - v194, - v195, - v196, - v197, - v198, - v199, - v200, - v201, - v202, - v203, - v204, - v205, - v206, - v207, - v208, - v209, - v210, - v211, - v212, - v213, - v214, - v215, - v216, - v217, - v218, - v219, - v220, - v221, - v222, - v223, - v224, - v225, - v226, - v227, - v228, - v229, - v230, - v231, - v232, - v233, - v234, - v235, - v236, - v237, - v238, - v239, - v240, - v241, - v242, - v243, - v244, - v245, - v246, - v247, - v248, - v249, - v250, - v251, - v252, - v253, - v254, - v255, - v256, - v257, - v258, - v259, - v260, - v261, - v262, - v263, - v264, - v265, - v266, - v267, - v268, - v269, - v270, - v271, - v272; - -export { v54 as $, v27 as A, v28 as B, v29 as C, v30 as D, v31 as E, v32 as F, v33 as G, v34 as H, v35 as I, v36 as J, v37 as K, v38 as L, v39 as M, v40 as N, v41 as O, v42 as P, v43 as Q, v44 as R, v45 as S, v46 as T, v47 as U, v48 as V, v49 as W, v50 as X, v51 as Y, v52 as Z, v53 as _, v2 as a, v118 as a$, v55 as a0, v56 as a1, v57 as a2, v58 as a3, v59 as a4, v60 as a5, v61 as a6, v62 as a7, v63 as a8, v64 as a9, v91 as aA, v92 as aB, v93 as aC, v94 as aD, v95 as aE, v96 as aF, v97 as aG, v98 as aH, v99 as aI, v100 as aJ, v101 as aK, v102 as aL, v103 as aM, v104 as aN, v105 as aO, v106 as aP, v107 as aQ, v108 as aR, v109 as aS, v110 as aT, v111 as aU, v112 as aV, v113 as aW, v114 as aX, v115 as aY, v116 as aZ, v117 as a_, v65 as aa, v66 as ab, v67 as ac, v68 as ad, v69 as ae, v70 as af, v71 as ag, v72 as ah, v73 as ai, v74 as aj, v75 as ak, v76 as al, v77 as am, v78 as an, v79 as ao, v80 as ap, v81 as aq, v82 as ar, v83 as as, v84 as at, v85 as au, v86 as av, v87 as aw, v88 as ax, v89 as ay, v90 as az, v3 as b, v182 as b$, v119 as b0, v120 as b1, v121 as b2, v122 as b3, v123 as b4, v124 as b5, v125 as b6, v126 as b7, v127 as b8, v128 as b9, v155 as bA, v156 as bB, v157 as bC, v158 as bD, v159 as bE, v160 as bF, v161 as bG, v162 as bH, v163 as bI, v164 as bJ, v165 as bK, v166 as bL, v167 as bM, v168 as bN, v169 as bO, v170 as bP, v171 as bQ, v172 as bR, v173 as bS, v174 as bT, v175 as bU, v176 as bV, v177 as bW, v178 as bX, v179 as bY, v180 as bZ, v181 as b_, v129 as ba, v130 as bb, v131 as bc, v132 as bd, v133 as be, v134 as bf, v135 as bg, v136 as bh, v137 as bi, v138 as bj, v139 as bk, v140 as bl, v141 as bm, v142 as bn, v143 as bo, v144 as bp, v145 as bq, v146 as br, v147 as bs, v148 as bt, v149 as bu, v150 as bv, v151 as bw, v152 as bx, v153 as by, v154 as bz, v4 as c, v246 as c$, v183 as c0, v184 as c1, v185 as c2, v186 as c3, v187 as c4, v188 as c5, v189 as c6, v190 as c7, v191 as c8, v192 as c9, v219 as cA, v220 as cB, v221 as cC, v222 as cD, v223 as cE, v224 as cF, v225 as cG, v226 as cH, v227 as cI, v228 as cJ, v229 as cK, v230 as cL, v231 as cM, v232 as cN, v233 as cO, v234 as cP, v235 as cQ, v236 as cR, v237 as cS, v238 as cT, v239 as cU, v240 as cV, v241 as cW, v242 as cX, v243 as cY, v244 as cZ, v245 as c_, v193 as ca, v194 as cb, v195 as cc, v196 as cd, v197 as ce, v198 as cf, v199 as cg, v200 as ch, v201 as ci, v202 as cj, v203 as ck, v204 as cl, v205 as cm, v206 as cn, v207 as co, v208 as cp, v209 as cq, v210 as cr, v211 as cs, v212 as ct, v213 as cu, v214 as cv, v215 as cw, v216 as cx, v217 as cy, v218 as cz, v5 as d, v247 as d0, v248 as d1, v249 as d2, v250 as d3, v251 as d4, v252 as d5, v253 as d6, v254 as d7, v255 as d8, v256 as d9, v257 as da, v258 as db, v259 as dc, v260 as dd, v261 as de, v262 as df, v263 as dg, v264 as dh, v265 as di, v266 as dj, v267 as dk, v268 as dl, v269 as dm, v270 as dn, v271 as dp, v272 as dq, v6 as e, v7 as f, v8 as g, v9 as h, v10 as i, v11 as j, v12 as k, v13 as l, v14 as m, v15 as n, v16 as o, v17 as p, v18 as q, v19 as r, v20 as s, v21 as t, v22 as u, v1 as v, v23 as w, v24 as x, v25 as y, v26 as z }; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js index 0ed413ad194..b2a43ed12d5 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-constants.js'; +import { v1 } from './main.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 9f6233b1f85..f4bfd3f396f 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,5 +1,276 @@ -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'; +var v1, + v2, + v3, + v4, + v5, + v6, + v7, + v8, + v9, + v10, + v11, + v12, + v13, + v14, + v15, + v16, + v17, + v18, + v19, + v20, + v21, + v22, + v23, + v24, + v25, + v26, + v27, + v28, + v29, + v30, + v31, + v32, + v33, + v34, + v35, + v36, + v37, + v38, + v39, + v40, + v41, + v42, + v43, + v44, + v45, + v46, + v47, + v48, + v49, + v50, + v51, + v52, + v53, + v54, + v55, + v56, + v57, + v58, + v59, + v60, + v61, + v62, + v63, + v64, + v65, + v66, + v67, + v68, + v69, + v70, + v71, + v72, + v73, + v74, + v75, + v76, + v77, + v78, + v79, + v80, + v81, + v82, + v83, + v84, + v85, + v86, + v87, + v88, + v89, + v90, + v91, + v92, + v93, + v94, + v95, + v96, + v97, + v98, + v99, + v100, + v101, + v102, + v103, + v104, + v105, + v106, + v107, + v108, + v109, + v110, + v111, + v112, + v113, + v114, + v115, + v116, + v117, + v118, + v119, + v120, + v121, + v122, + v123, + v124, + v125, + v126, + v127, + v128, + v129, + v130, + v131, + v132, + v133, + v134, + v135, + v136, + v137, + v138, + v139, + v140, + v141, + v142, + v143, + v144, + v145, + v146, + v147, + v148, + v149, + v150, + v151, + v152, + v153, + v154, + v155, + v156, + v157, + v158, + v159, + v160, + v161, + v162, + v163, + v164, + v165, + v166, + v167, + v168, + v169, + v170, + v171, + v172, + v173, + v174, + v175, + v176, + v177, + v178, + v179, + v180, + v181, + v182, + v183, + v184, + v185, + v186, + v187, + v188, + v189, + v190, + v191, + v192, + v193, + v194, + v195, + v196, + v197, + v198, + v199, + v200, + v201, + v202, + v203, + v204, + v205, + v206, + v207, + v208, + v209, + v210, + v211, + v212, + v213, + v214, + v215, + v216, + v217, + v218, + v219, + v220, + v221, + v222, + v223, + v224, + v225, + v226, + v227, + v228, + v229, + v230, + v231, + v232, + v233, + v234, + v235, + v236, + v237, + v238, + v239, + v240, + v241, + v242, + v243, + v244, + v245, + v246, + v247, + v248, + v249, + v250, + v251, + v252, + v253, + v254, + v255, + v256, + v257, + v258, + v259, + v260, + v261, + v262, + v263, + v264, + v265, + v266, + v267, + v268, + v269, + v270, + v271, + v272; const lazy = import('./generated-lazy.js'); -export { lazy }; +export { lazy, v1, v10, v100, v101, v102, v103, v104, v105, v106, v107, v108, v109, v11, v110, v111, v112, v113, v114, v115, v116, v117, v118, v119, v12, v120, v121, v122, v123, v124, v125, v126, v127, v128, v129, v13, v130, v131, v132, v133, v134, v135, v136, v137, v138, v139, v14, v140, v141, v142, v143, v144, v145, v146, v147, v148, v149, v15, v150, v151, v152, v153, v154, v155, v156, v157, v158, v159, v16, v160, v161, v162, v163, v164, v165, v166, v167, v168, v169, v17, v170, v171, v172, v173, v174, v175, v176, v177, v178, v179, v18, v180, v181, v182, v183, v184, v185, v186, v187, v188, v189, v19, v190, v191, v192, v193, v194, v195, v196, v197, v198, v199, v2, v20, v200, v201, v202, v203, v204, v205, v206, v207, v208, v209, v21, v210, v211, v212, v213, v214, v215, v216, v217, v218, v219, v22, v220, v221, v222, v223, v224, v225, v226, v227, v228, v229, v23, v230, v231, v232, v233, v234, v235, v236, v237, v238, v239, v24, v240, v241, v242, v243, v244, v245, v246, v247, v248, v249, v25, v250, v251, v252, v253, v254, v255, v256, v257, v258, v259, v26, v260, v261, v262, v263, v264, v265, v266, v267, v268, v269, v27, v270, v271, v272, v28, v29, v3, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v4, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v5, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v6, v60, v61, v62, v63, v64, v65, v66, v67, v68, v69, v7, v70, v71, v72, v73, v74, v75, v76, v77, v78, v79, v8, v80, v81, v82, v83, v84, v85, v86, v87, v88, v89, v9, v90, v91, v92, v93, v94, v95, v96, v97, v98, v99 }; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-constants.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-constants.js deleted file mode 100644 index e6ef61fd6c9..00000000000 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-constants.js +++ /dev/null @@ -1,556 +0,0 @@ -System.register([], function (exports) { - 'use strict'; - return { - execute: function () { - - exports({ - $: void 0, - A: void 0, - B: void 0, - C: void 0, - D: void 0, - E: void 0, - F: void 0, - G: void 0, - H: void 0, - I: void 0, - J: void 0, - K: void 0, - L: void 0, - M: void 0, - N: void 0, - O: void 0, - P: void 0, - Q: void 0, - R: void 0, - S: void 0, - T: void 0, - U: void 0, - V: void 0, - W: void 0, - X: void 0, - Y: void 0, - Z: void 0, - _: void 0, - a: void 0, - a$: void 0, - a0: void 0, - a1: void 0, - a2: void 0, - a3: void 0, - a4: void 0, - a5: void 0, - a6: void 0, - a7: void 0, - a8: void 0, - a9: void 0, - aA: void 0, - aB: void 0, - aC: void 0, - aD: void 0, - aE: void 0, - aF: void 0, - aG: void 0, - aH: void 0, - aI: void 0, - aJ: void 0, - aK: void 0, - aL: void 0, - aM: void 0, - aN: void 0, - aO: void 0, - aP: void 0, - aQ: void 0, - aR: void 0, - aS: void 0, - aT: void 0, - aU: void 0, - aV: void 0, - aW: void 0, - aX: void 0, - aY: void 0, - aZ: void 0, - a_: void 0, - aa: void 0, - ab: void 0, - ac: void 0, - ad: void 0, - ae: void 0, - af: void 0, - ag: void 0, - ah: void 0, - ai: void 0, - aj: void 0, - ak: void 0, - al: void 0, - am: void 0, - an: void 0, - ao: void 0, - ap: void 0, - aq: void 0, - ar: void 0, - as: void 0, - at: void 0, - au: void 0, - av: void 0, - aw: void 0, - ax: void 0, - ay: void 0, - az: void 0, - b: void 0, - b$: void 0, - b0: void 0, - b1: void 0, - b2: void 0, - b3: void 0, - b4: void 0, - b5: void 0, - b6: void 0, - b7: void 0, - b8: void 0, - b9: void 0, - bA: void 0, - bB: void 0, - bC: void 0, - bD: void 0, - bE: void 0, - bF: void 0, - bG: void 0, - bH: void 0, - bI: void 0, - bJ: void 0, - bK: void 0, - bL: void 0, - bM: void 0, - bN: void 0, - bO: void 0, - bP: void 0, - bQ: void 0, - bR: void 0, - bS: void 0, - bT: void 0, - bU: void 0, - bV: void 0, - bW: void 0, - bX: void 0, - bY: void 0, - bZ: void 0, - b_: void 0, - ba: void 0, - bb: void 0, - bc: void 0, - bd: void 0, - be: void 0, - bf: void 0, - bg: void 0, - bh: void 0, - bi: void 0, - bj: void 0, - bk: void 0, - bl: void 0, - bm: void 0, - bn: void 0, - bo: void 0, - bp: void 0, - bq: void 0, - br: void 0, - bs: void 0, - bt: void 0, - bu: void 0, - bv: void 0, - bw: void 0, - bx: void 0, - by: void 0, - bz: void 0, - c: void 0, - c$: void 0, - c0: void 0, - c1: void 0, - c2: void 0, - c3: void 0, - c4: void 0, - c5: void 0, - c6: void 0, - c7: void 0, - c8: void 0, - c9: void 0, - cA: void 0, - cB: void 0, - cC: void 0, - cD: void 0, - cE: void 0, - cF: void 0, - cG: void 0, - cH: void 0, - cI: void 0, - cJ: void 0, - cK: void 0, - cL: void 0, - cM: void 0, - cN: void 0, - cO: void 0, - cP: void 0, - cQ: void 0, - cR: void 0, - cS: void 0, - cT: void 0, - cU: void 0, - cV: void 0, - cW: void 0, - cX: void 0, - cY: void 0, - cZ: void 0, - c_: void 0, - ca: void 0, - cb: void 0, - cc: void 0, - cd: void 0, - ce: void 0, - cf: void 0, - cg: void 0, - ch: void 0, - ci: void 0, - cj: void 0, - ck: void 0, - cl: void 0, - cm: void 0, - cn: void 0, - co: void 0, - cp: void 0, - cq: void 0, - cr: void 0, - cs: void 0, - ct: void 0, - cu: void 0, - cv: void 0, - cw: void 0, - cx: void 0, - cy: void 0, - cz: void 0, - d: void 0, - d0: void 0, - d1: void 0, - d2: void 0, - d3: void 0, - d4: void 0, - d5: void 0, - d6: void 0, - d7: void 0, - d8: void 0, - d9: void 0, - da: void 0, - db: void 0, - dc: void 0, - dd: void 0, - de: void 0, - df: void 0, - dg: void 0, - dh: void 0, - di: void 0, - dj: void 0, - dk: void 0, - dl: void 0, - dm: void 0, - dn: void 0, - dp: void 0, - dq: void 0, - e: void 0, - f: void 0, - g: void 0, - h: void 0, - i: void 0, - j: void 0, - k: void 0, - l: void 0, - m: void 0, - n: void 0, - o: void 0, - p: void 0, - q: void 0, - r: void 0, - s: void 0, - t: void 0, - u: void 0, - v: void 0, - w: void 0, - x: void 0, - y: void 0, - z: void 0 - }); - - var v1, - v2, - v3, - v4, - v5, - v6, - v7, - v8, - v9, - v10, - v11, - v12, - v13, - v14, - v15, - v16, - v17, - v18, - v19, - v20, - v21, - v22, - v23, - v24, - v25, - v26, - v27, - v28, - v29, - v30, - v31, - v32, - v33, - v34, - v35, - v36, - v37, - v38, - v39, - v40, - v41, - v42, - v43, - v44, - v45, - v46, - v47, - v48, - v49, - v50, - v51, - v52, - v53, - v54, - v55, - v56, - v57, - v58, - v59, - v60, - v61, - v62, - v63, - v64, - v65, - v66, - v67, - v68, - v69, - v70, - v71, - v72, - v73, - v74, - v75, - v76, - v77, - v78, - v79, - v80, - v81, - v82, - v83, - v84, - v85, - v86, - v87, - v88, - v89, - v90, - v91, - v92, - v93, - v94, - v95, - v96, - v97, - v98, - v99, - v100, - v101, - v102, - v103, - v104, - v105, - v106, - v107, - v108, - v109, - v110, - v111, - v112, - v113, - v114, - v115, - v116, - v117, - v118, - v119, - v120, - v121, - v122, - v123, - v124, - v125, - v126, - v127, - v128, - v129, - v130, - v131, - v132, - v133, - v134, - v135, - v136, - v137, - v138, - v139, - v140, - v141, - v142, - v143, - v144, - v145, - v146, - v147, - v148, - v149, - v150, - v151, - v152, - v153, - v154, - v155, - v156, - v157, - v158, - v159, - v160, - v161, - v162, - v163, - v164, - v165, - v166, - v167, - v168, - v169, - v170, - v171, - v172, - v173, - v174, - v175, - v176, - v177, - v178, - v179, - v180, - v181, - v182, - v183, - v184, - v185, - v186, - v187, - v188, - v189, - v190, - v191, - v192, - v193, - v194, - v195, - v196, - v197, - v198, - v199, - v200, - v201, - v202, - v203, - v204, - v205, - v206, - v207, - v208, - v209, - v210, - v211, - v212, - v213, - v214, - v215, - v216, - v217, - v218, - v219, - v220, - v221, - v222, - v223, - v224, - v225, - v226, - v227, - v228, - v229, - v230, - v231, - v232, - v233, - v234, - v235, - v236, - v237, - v238, - v239, - v240, - v241, - v242, - v243, - v244, - v245, - v246, - v247, - v248, - v249, - v250, - v251, - v252, - v253, - v254, - v255, - v256, - v257, - v258, - v259, - v260, - v261, - v262, - v263, - v264, - v265, - v266, - v267, - v268, - v269, - v270, - v271, - v272; - - } - }; -}); 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 c3492d0d8b7..c74475324d0 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,9 +1,9 @@ -System.register(['./generated-constants.js'], function (exports) { +System.register(['./main.js'], function (exports) { 'use strict'; var v1; return { setters: [function (module) { - v1 = module.v; + v1 = module.v1; }], execute: function () { diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js index 2a78e71a87d..8cd65e22484 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,284 +1,556 @@ -System.register(['./generated-constants.js'], function (exports, module) { +System.register([], function (exports, module) { 'use strict'; return { - setters: [function (module) { - var _setter = {}; - _setter.v1 = module.v; - _setter.v10 = module.i; - _setter.v100 = module.aJ; - _setter.v101 = module.aK; - _setter.v102 = module.aL; - _setter.v103 = module.aM; - _setter.v104 = module.aN; - _setter.v105 = module.aO; - _setter.v106 = module.aP; - _setter.v107 = module.aQ; - _setter.v108 = module.aR; - _setter.v109 = module.aS; - _setter.v11 = module.j; - _setter.v110 = module.aT; - _setter.v111 = module.aU; - _setter.v112 = module.aV; - _setter.v113 = module.aW; - _setter.v114 = module.aX; - _setter.v115 = module.aY; - _setter.v116 = module.aZ; - _setter.v117 = module.a_; - _setter.v118 = module.a$; - _setter.v119 = module.b0; - _setter.v12 = module.k; - _setter.v120 = module.b1; - _setter.v121 = module.b2; - _setter.v122 = module.b3; - _setter.v123 = module.b4; - _setter.v124 = module.b5; - _setter.v125 = module.b6; - _setter.v126 = module.b7; - _setter.v127 = module.b8; - _setter.v128 = module.b9; - _setter.v129 = module.ba; - _setter.v13 = module.l; - _setter.v130 = module.bb; - _setter.v131 = module.bc; - _setter.v132 = module.bd; - _setter.v133 = module.be; - _setter.v134 = module.bf; - _setter.v135 = module.bg; - _setter.v136 = module.bh; - _setter.v137 = module.bi; - _setter.v138 = module.bj; - _setter.v139 = module.bk; - _setter.v14 = module.m; - _setter.v140 = module.bl; - _setter.v141 = module.bm; - _setter.v142 = module.bn; - _setter.v143 = module.bo; - _setter.v144 = module.bp; - _setter.v145 = module.bq; - _setter.v146 = module.br; - _setter.v147 = module.bs; - _setter.v148 = module.bt; - _setter.v149 = module.bu; - _setter.v15 = module.n; - _setter.v150 = module.bv; - _setter.v151 = module.bw; - _setter.v152 = module.bx; - _setter.v153 = module.by; - _setter.v154 = module.bz; - _setter.v155 = module.bA; - _setter.v156 = module.bB; - _setter.v157 = module.bC; - _setter.v158 = module.bD; - _setter.v159 = module.bE; - _setter.v16 = module.o; - _setter.v160 = module.bF; - _setter.v161 = module.bG; - _setter.v162 = module.bH; - _setter.v163 = module.bI; - _setter.v164 = module.bJ; - _setter.v165 = module.bK; - _setter.v166 = module.bL; - _setter.v167 = module.bM; - _setter.v168 = module.bN; - _setter.v169 = module.bO; - _setter.v17 = module.p; - _setter.v170 = module.bP; - _setter.v171 = module.bQ; - _setter.v172 = module.bR; - _setter.v173 = module.bS; - _setter.v174 = module.bT; - _setter.v175 = module.bU; - _setter.v176 = module.bV; - _setter.v177 = module.bW; - _setter.v178 = module.bX; - _setter.v179 = module.bY; - _setter.v18 = module.q; - _setter.v180 = module.bZ; - _setter.v181 = module.b_; - _setter.v182 = module.b$; - _setter.v183 = module.c0; - _setter.v184 = module.c1; - _setter.v185 = module.c2; - _setter.v186 = module.c3; - _setter.v187 = module.c4; - _setter.v188 = module.c5; - _setter.v189 = module.c6; - _setter.v19 = module.r; - _setter.v190 = module.c7; - _setter.v191 = module.c8; - _setter.v192 = module.c9; - _setter.v193 = module.ca; - _setter.v194 = module.cb; - _setter.v195 = module.cc; - _setter.v196 = module.cd; - _setter.v197 = module.ce; - _setter.v198 = module.cf; - _setter.v199 = module.cg; - _setter.v2 = module.a; - _setter.v20 = module.s; - _setter.v200 = module.ch; - _setter.v201 = module.ci; - _setter.v202 = module.cj; - _setter.v203 = module.ck; - _setter.v204 = module.cl; - _setter.v205 = module.cm; - _setter.v206 = module.cn; - _setter.v207 = module.co; - _setter.v208 = module.cp; - _setter.v209 = module.cq; - _setter.v21 = module.t; - _setter.v210 = module.cr; - _setter.v211 = module.cs; - _setter.v212 = module.ct; - _setter.v213 = module.cu; - _setter.v214 = module.cv; - _setter.v215 = module.cw; - _setter.v216 = module.cx; - _setter.v217 = module.cy; - _setter.v218 = module.cz; - _setter.v219 = module.cA; - _setter.v22 = module.u; - _setter.v220 = module.cB; - _setter.v221 = module.cC; - _setter.v222 = module.cD; - _setter.v223 = module.cE; - _setter.v224 = module.cF; - _setter.v225 = module.cG; - _setter.v226 = module.cH; - _setter.v227 = module.cI; - _setter.v228 = module.cJ; - _setter.v229 = module.cK; - _setter.v23 = module.w; - _setter.v230 = module.cL; - _setter.v231 = module.cM; - _setter.v232 = module.cN; - _setter.v233 = module.cO; - _setter.v234 = module.cP; - _setter.v235 = module.cQ; - _setter.v236 = module.cR; - _setter.v237 = module.cS; - _setter.v238 = module.cT; - _setter.v239 = module.cU; - _setter.v24 = module.x; - _setter.v240 = module.cV; - _setter.v241 = module.cW; - _setter.v242 = module.cX; - _setter.v243 = module.cY; - _setter.v244 = module.cZ; - _setter.v245 = module.c_; - _setter.v246 = module.c$; - _setter.v247 = module.d0; - _setter.v248 = module.d1; - _setter.v249 = module.d2; - _setter.v25 = module.y; - _setter.v250 = module.d3; - _setter.v251 = module.d4; - _setter.v252 = module.d5; - _setter.v253 = module.d6; - _setter.v254 = module.d7; - _setter.v255 = module.d8; - _setter.v256 = module.d9; - _setter.v257 = module.da; - _setter.v258 = module.db; - _setter.v259 = module.dc; - _setter.v26 = module.z; - _setter.v260 = module.dd; - _setter.v261 = module.de; - _setter.v262 = module.df; - _setter.v263 = module.dg; - _setter.v264 = module.dh; - _setter.v265 = module.di; - _setter.v266 = module.dj; - _setter.v267 = module.dk; - _setter.v268 = module.dl; - _setter.v269 = module.dm; - _setter.v27 = module.A; - _setter.v270 = module.dn; - _setter.v271 = module.dp; - _setter.v272 = module.dq; - _setter.v28 = module.B; - _setter.v29 = module.C; - _setter.v3 = module.b; - _setter.v30 = module.D; - _setter.v31 = module.E; - _setter.v32 = module.F; - _setter.v33 = module.G; - _setter.v34 = module.H; - _setter.v35 = module.I; - _setter.v36 = module.J; - _setter.v37 = module.K; - _setter.v38 = module.L; - _setter.v39 = module.M; - _setter.v4 = module.c; - _setter.v40 = module.N; - _setter.v41 = module.O; - _setter.v42 = module.P; - _setter.v43 = module.Q; - _setter.v44 = module.R; - _setter.v45 = module.S; - _setter.v46 = module.T; - _setter.v47 = module.U; - _setter.v48 = module.V; - _setter.v49 = module.W; - _setter.v5 = module.d; - _setter.v50 = module.X; - _setter.v51 = module.Y; - _setter.v52 = module.Z; - _setter.v53 = module._; - _setter.v54 = module.$; - _setter.v55 = module.a0; - _setter.v56 = module.a1; - _setter.v57 = module.a2; - _setter.v58 = module.a3; - _setter.v59 = module.a4; - _setter.v6 = module.e; - _setter.v60 = module.a5; - _setter.v61 = module.a6; - _setter.v62 = module.a7; - _setter.v63 = module.a8; - _setter.v64 = module.a9; - _setter.v65 = module.aa; - _setter.v66 = module.ab; - _setter.v67 = module.ac; - _setter.v68 = module.ad; - _setter.v69 = module.ae; - _setter.v7 = module.f; - _setter.v70 = module.af; - _setter.v71 = module.ag; - _setter.v72 = module.ah; - _setter.v73 = module.ai; - _setter.v74 = module.aj; - _setter.v75 = module.ak; - _setter.v76 = module.al; - _setter.v77 = module.am; - _setter.v78 = module.an; - _setter.v79 = module.ao; - _setter.v8 = module.g; - _setter.v80 = module.ap; - _setter.v81 = module.aq; - _setter.v82 = module.ar; - _setter.v83 = module.as; - _setter.v84 = module.at; - _setter.v85 = module.au; - _setter.v86 = module.av; - _setter.v87 = module.aw; - _setter.v88 = module.ax; - _setter.v89 = module.ay; - _setter.v9 = module.h; - _setter.v90 = module.az; - _setter.v91 = module.aA; - _setter.v92 = module.aB; - _setter.v93 = module.aC; - _setter.v94 = module.aD; - _setter.v95 = module.aE; - _setter.v96 = module.aF; - _setter.v97 = module.aG; - _setter.v98 = module.aH; - _setter.v99 = module.aI; - exports(_setter); - }], execute: function () { + exports({ + v1: void 0, + v10: void 0, + v100: void 0, + v101: void 0, + v102: void 0, + v103: void 0, + v104: void 0, + v105: void 0, + v106: void 0, + v107: void 0, + v108: void 0, + v109: void 0, + v11: void 0, + v110: void 0, + v111: void 0, + v112: void 0, + v113: void 0, + v114: void 0, + v115: void 0, + v116: void 0, + v117: void 0, + v118: void 0, + v119: void 0, + v12: void 0, + v120: void 0, + v121: void 0, + v122: void 0, + v123: void 0, + v124: void 0, + v125: void 0, + v126: void 0, + v127: void 0, + v128: void 0, + v129: void 0, + v13: void 0, + v130: void 0, + v131: void 0, + v132: void 0, + v133: void 0, + v134: void 0, + v135: void 0, + v136: void 0, + v137: void 0, + v138: void 0, + v139: void 0, + v14: void 0, + v140: void 0, + v141: void 0, + v142: void 0, + v143: void 0, + v144: void 0, + v145: void 0, + v146: void 0, + v147: void 0, + v148: void 0, + v149: void 0, + v15: void 0, + v150: void 0, + v151: void 0, + v152: void 0, + v153: void 0, + v154: void 0, + v155: void 0, + v156: void 0, + v157: void 0, + v158: void 0, + v159: void 0, + v16: void 0, + v160: void 0, + v161: void 0, + v162: void 0, + v163: void 0, + v164: void 0, + v165: void 0, + v166: void 0, + v167: void 0, + v168: void 0, + v169: void 0, + v17: void 0, + v170: void 0, + v171: void 0, + v172: void 0, + v173: void 0, + v174: void 0, + v175: void 0, + v176: void 0, + v177: void 0, + v178: void 0, + v179: void 0, + v18: void 0, + v180: void 0, + v181: void 0, + v182: void 0, + v183: void 0, + v184: void 0, + v185: void 0, + v186: void 0, + v187: void 0, + v188: void 0, + v189: void 0, + v19: void 0, + v190: void 0, + v191: void 0, + v192: void 0, + v193: void 0, + v194: void 0, + v195: void 0, + v196: void 0, + v197: void 0, + v198: void 0, + v199: void 0, + v2: void 0, + v20: void 0, + v200: void 0, + v201: void 0, + v202: void 0, + v203: void 0, + v204: void 0, + v205: void 0, + v206: void 0, + v207: void 0, + v208: void 0, + v209: void 0, + v21: void 0, + v210: void 0, + v211: void 0, + v212: void 0, + v213: void 0, + v214: void 0, + v215: void 0, + v216: void 0, + v217: void 0, + v218: void 0, + v219: void 0, + v22: void 0, + v220: void 0, + v221: void 0, + v222: void 0, + v223: void 0, + v224: void 0, + v225: void 0, + v226: void 0, + v227: void 0, + v228: void 0, + v229: void 0, + v23: void 0, + v230: void 0, + v231: void 0, + v232: void 0, + v233: void 0, + v234: void 0, + v235: void 0, + v236: void 0, + v237: void 0, + v238: void 0, + v239: void 0, + v24: void 0, + v240: void 0, + v241: void 0, + v242: void 0, + v243: void 0, + v244: void 0, + v245: void 0, + v246: void 0, + v247: void 0, + v248: void 0, + v249: void 0, + v25: void 0, + v250: void 0, + v251: void 0, + v252: void 0, + v253: void 0, + v254: void 0, + v255: void 0, + v256: void 0, + v257: void 0, + v258: void 0, + v259: void 0, + v26: void 0, + v260: void 0, + v261: void 0, + v262: void 0, + v263: void 0, + v264: void 0, + v265: void 0, + v266: void 0, + v267: void 0, + v268: void 0, + v269: void 0, + v27: void 0, + v270: void 0, + v271: void 0, + v272: void 0, + v28: void 0, + v29: void 0, + v3: void 0, + v30: void 0, + v31: void 0, + v32: void 0, + v33: void 0, + v34: void 0, + v35: void 0, + v36: void 0, + v37: void 0, + v38: void 0, + v39: void 0, + v4: void 0, + v40: void 0, + v41: void 0, + v42: void 0, + v43: void 0, + v44: void 0, + v45: void 0, + v46: void 0, + v47: void 0, + v48: void 0, + v49: void 0, + v5: void 0, + v50: void 0, + v51: void 0, + v52: void 0, + v53: void 0, + v54: void 0, + v55: void 0, + v56: void 0, + v57: void 0, + v58: void 0, + v59: void 0, + v6: void 0, + v60: void 0, + v61: void 0, + v62: void 0, + v63: void 0, + v64: void 0, + v65: void 0, + v66: void 0, + v67: void 0, + v68: void 0, + v69: void 0, + v7: void 0, + v70: void 0, + v71: void 0, + v72: void 0, + v73: void 0, + v74: void 0, + v75: void 0, + v76: void 0, + v77: void 0, + v78: void 0, + v79: void 0, + v8: void 0, + v80: void 0, + v81: void 0, + v82: void 0, + v83: void 0, + v84: void 0, + v85: void 0, + v86: void 0, + v87: void 0, + v88: void 0, + v89: void 0, + v9: void 0, + v90: void 0, + v91: void 0, + v92: void 0, + v93: void 0, + v94: void 0, + v95: void 0, + v96: void 0, + v97: void 0, + v98: void 0, + v99: void 0 + }); + + var v1, + v2, + v3, + v4, + v5, + v6, + v7, + v8, + v9, + v10, + v11, + v12, + v13, + v14, + v15, + v16, + v17, + v18, + v19, + v20, + v21, + v22, + v23, + v24, + v25, + v26, + v27, + v28, + v29, + v30, + v31, + v32, + v33, + v34, + v35, + v36, + v37, + v38, + v39, + v40, + v41, + v42, + v43, + v44, + v45, + v46, + v47, + v48, + v49, + v50, + v51, + v52, + v53, + v54, + v55, + v56, + v57, + v58, + v59, + v60, + v61, + v62, + v63, + v64, + v65, + v66, + v67, + v68, + v69, + v70, + v71, + v72, + v73, + v74, + v75, + v76, + v77, + v78, + v79, + v80, + v81, + v82, + v83, + v84, + v85, + v86, + v87, + v88, + v89, + v90, + v91, + v92, + v93, + v94, + v95, + v96, + v97, + v98, + v99, + v100, + v101, + v102, + v103, + v104, + v105, + v106, + v107, + v108, + v109, + v110, + v111, + v112, + v113, + v114, + v115, + v116, + v117, + v118, + v119, + v120, + v121, + v122, + v123, + v124, + v125, + v126, + v127, + v128, + v129, + v130, + v131, + v132, + v133, + v134, + v135, + v136, + v137, + v138, + v139, + v140, + v141, + v142, + v143, + v144, + v145, + v146, + v147, + v148, + v149, + v150, + v151, + v152, + v153, + v154, + v155, + v156, + v157, + v158, + v159, + v160, + v161, + v162, + v163, + v164, + v165, + v166, + v167, + v168, + v169, + v170, + v171, + v172, + v173, + v174, + v175, + v176, + v177, + v178, + v179, + v180, + v181, + v182, + v183, + v184, + v185, + v186, + v187, + v188, + v189, + v190, + v191, + v192, + v193, + v194, + v195, + v196, + v197, + v198, + v199, + v200, + v201, + v202, + v203, + v204, + v205, + v206, + v207, + v208, + v209, + v210, + v211, + v212, + v213, + v214, + v215, + v216, + v217, + v218, + v219, + v220, + v221, + v222, + v223, + v224, + v225, + v226, + v227, + v228, + v229, + v230, + v231, + v232, + v233, + v234, + v235, + v236, + v237, + v238, + v239, + v240, + v241, + v242, + v243, + v244, + v245, + v246, + v247, + v248, + v249, + v250, + v251, + v252, + v253, + v254, + v255, + v256, + v257, + v258, + v259, + v260, + v261, + v262, + v263, + v264, + v265, + v266, + v267, + v268, + v269, + v270, + v271, + v272; + const lazy = exports('lazy', module.import('./generated-lazy.js')); } diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index eb1a13f8e21..38519d3c019 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -38,9 +38,21 @@ describe('The bundle object', () => { ], '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', 'shared'], 'name'); + 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', 'shared'], + 'name' + ); assert.deepEqual( output.map(chunk => chunk.facadeModuleId), ['input1', 'input2', null], @@ -51,8 +63,16 @@ describe('The bundle object', () => { [['generated-shared-f6027271.js'], ['generated-shared-f6027271.js'], []], 'imports' ); - assert.deepEqual(output.map(chunk => chunk.dynamicImports), [[], [], []], 'dynamicImports'); - assert.deepEqual(output.map(chunk => chunk.exports), [['out'], ['default'], []], 'exports'); + assert.deepEqual( + output.map(chunk => chunk.dynamicImports), + [[], [], []], + 'dynamicImports' + ); + assert.deepEqual( + output.map(chunk => chunk.exports), + [['out'], ['default'], []], + 'exports' + ); assert.deepEqual( output.map(chunk => chunk.modules), [ @@ -117,7 +137,11 @@ describe('The bundle object', () => { [['input1'], [], ['shared', 'input2']], 'modules' ); - assert.deepEqual(output.map(chunk => chunk.isEntry), [true, true, false], 'isEntry'); + assert.deepEqual( + output.map(chunk => chunk.isEntry), + [true, true, false], + 'isEntry' + ); assert.deepEqual( output.map(chunk => chunk.facadeModuleId), ['input1', 'input2', null], @@ -187,7 +211,11 @@ describe('The bundle object', () => { ['input.js', 'dynamic1.js', 'generated-dynamic2.js'], 'fileName' ); - assert.deepEqual(output.map(chunk => chunk.isEntry), [true, true, false], 'isEntry'); + assert.deepEqual( + output.map(chunk => chunk.isEntry), + [true, true, false], + 'isEntry' + ); assert.deepEqual( output.map(chunk => chunk.code), [ @@ -285,9 +313,21 @@ describe('The bundle object', () => { }) ) .then(({ output }) => { - assert.deepEqual(output.map(chunk => chunk.fileName), ['input.js'], 'fileName'); - assert.deepEqual(output.map(chunk => chunk.imports), [[]], 'imports'); - assert.deepEqual(output.map(chunk => chunk.dynamicImports), [[]], 'dynamicImports'); + assert.deepEqual( + output.map(chunk => chunk.fileName), + ['input.js'], + 'fileName' + ); + assert.deepEqual( + output.map(chunk => chunk.imports), + [[]], + 'imports' + ); + assert.deepEqual( + output.map(chunk => chunk.dynamicImports), + [[]], + 'dynamicImports' + ); assert.deepEqual( output.map(chunk => chunk.modules), [ @@ -333,7 +373,11 @@ describe('The bundle object', () => { ['_virtual/input', '_virtual/dynamic1', '_virtual/other', '_virtual/dynamic2'], 'fileName' ); - assert.deepEqual(output.map(chunk => chunk.isEntry), [true, true, false, false], 'isEntry'); + assert.deepEqual( + output.map(chunk => chunk.isEntry), + [true, true, false, false], + 'isEntry' + ); assert.deepEqual( output.map(chunk => chunk.code), [ @@ -423,7 +467,8 @@ console.log(other);Promise.all([import('./dynamic1'), import('./dynamic2')]).the input: ['input'], plugins: [ loader({ - input: '/* removed header */ export { renderedFn, renderedClass, renderedConst } from "code"', + input: + '/* removed header */ export { renderedFn, renderedClass, renderedConst } from "code"', code: 'export function renderedFn() {}\nexport function removedFn() {}\n' + 'export class renderedClass {}\nexport class removedClass {}\n' +