From 8beb5f6bff6b88a48bb1ecb6cd8e1e8830a2604e Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 5 Jul 2019 17:29:39 +0200 Subject: [PATCH 01/31] Use new FileEmitter for basic cases around assets. TODO: Replace asset hooks completely, create tests for assets using the new hooks. --- src/ModuleLoader.ts | 2 +- src/rollup/types.d.ts | 22 +++++++++ src/utils/FileEmitter.ts | 46 +++++++++++++++++++ src/utils/assetHooks.ts | 13 +++--- src/utils/pluginDriver.ts | 21 +++++---- src/utils/transform.ts | 3 +- .../emit-files-from-various-hooks/_config.js | 14 ++++++ .../_expected/amd/main.js | 5 ++ .../_expected/cjs/main.js | 3 ++ .../_expected/es/main.js | 1 + .../_expected/system/main.js | 10 ++++ .../emit-files-from-various-hooks/main.js | 1 + 12 files changed, 122 insertions(+), 19 deletions(-) create mode 100644 src/utils/FileEmitter.ts create mode 100644 test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_config.js create mode 100644 test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-files-from-various-hooks/main.js diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index 51c03d29bcc..61ae9354684 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -335,7 +335,7 @@ export class ModuleLoader { ) { if (cachedModule.transformAssets) { for (const { name, source } of cachedModule.transformAssets) - this.pluginDriver.emitAsset(name, source); + this.pluginDriver.emitFile({ type: 'asset', name, source }); } if (cachedModule.transformChunks) { for (const { id, options } of cachedModule.transformChunks) diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 36f5394eda6..0e3c6b62730 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -140,11 +140,33 @@ export interface MinimalPluginContext { export type EmitAsset = (name: string, source?: string | Buffer) => string; export type EmitChunk = (name: string, options?: { name?: string }) => string; +// TODO Lukas do not forget caching tests for files +export type EmittedFile = + | { + name: string; + source?: string | Buffer; + type: 'asset'; + } + | { + entryId: string; + name?: string; + type: 'chunk'; + } + | { + fileName: string; + source?: string | Buffer; + type: 'file'; + }; +export type EmitFile = (emittedFile: EmittedFile) => string; + export interface PluginContext extends MinimalPluginContext { addWatchFile: (id: string) => void; cache: PluginCache; + /** @deprecated Use `this.emitFile` instead */ emitAsset: EmitAsset; + /** @deprecated Use `this.emitFile` instead */ emitChunk: EmitChunk; + emitFile: EmitFile; error: (err: RollupError | string, pos?: number | { column: number; line: number }) => never; getAssetFileName: (assetReferenceId: string) => string; getChunkFileName: (chunkReferenceId: string) => string; diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts new file mode 100644 index 00000000000..774cbc4427d --- /dev/null +++ b/src/utils/FileEmitter.ts @@ -0,0 +1,46 @@ +import { Asset, EmittedFile } from '../rollup/types'; +import { + errAssetNotFinalisedForFileName, + errAssetReferenceIdNotFoundForFilename, + errAssetReferenceIdNotFoundForSetSource, + errAssetSourceAlreadySet, + errAssetSourceMissingForSetSource, + errInvalidAssetName, + error +} from './error'; +import { addWithNewReferenceId } from './referenceIds'; +import { isPlainName } from './relativeId'; + +export class FileEmitter { + private assetsByReferenceId: Map; + + constructor(assetsByReferenceId: Map) { + this.assetsByReferenceId = assetsByReferenceId; + } + + public emitFile = (emittedFile: EmittedFile): string => { + if (emittedFile.type !== 'asset') { + throw new Error(`Unhandlded file type ${emittedFile.type}`); + } + const { name, source } = emittedFile; + if (typeof name !== 'string' || !isPlainName(name)) error(errInvalidAssetName(name)); + const asset: Asset = { name, source: source as string | Buffer, fileName: undefined as any }; + return addWithNewReferenceId(asset, this.assetsByReferenceId, name); + }; + + public getFileName = (fileReferenceId: string) => { + const asset = this.assetsByReferenceId.get(fileReferenceId); + if (!asset) return error(errAssetReferenceIdNotFoundForFilename(fileReferenceId)); + if (asset.fileName === undefined) return error(errAssetNotFinalisedForFileName(asset)); + return asset.fileName; + }; + + public setFileSource = (fileReferenceId: string, source?: string | Buffer) => { + const asset = this.assetsByReferenceId.get(fileReferenceId); + if (!asset) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); + if (asset.source !== undefined) return error(errAssetSourceAlreadySet(asset)); + if (typeof source !== 'string' && !source) + return error(errAssetSourceMissingForSetSource(asset)); + asset.source = source; + }; +} diff --git a/src/utils/assetHooks.ts b/src/utils/assetHooks.ts index 7caadf1f7aa..f7a205ff954 100644 --- a/src/utils/assetHooks.ts +++ b/src/utils/assetHooks.ts @@ -1,5 +1,5 @@ import sha256 from 'hash.js/lib/hash/sha/256'; -import { Asset, EmitAsset, OutputBundle } from '../rollup/types'; +import { Asset, EmitFile, OutputBundle } from '../rollup/types'; import { errAssetNotFinalisedForFileName, errAssetReferenceIdNotFoundForFilename, @@ -15,7 +15,7 @@ import { addWithNewReferenceId } from './referenceIds'; import { isPlainName } from './relativeId'; import { makeUnique, renderNamePattern } from './renderNamePattern'; -export function getAssetFileName( +function getAssetFileName( asset: Asset, existingNames: Record, assetFileNames: string @@ -72,9 +72,8 @@ export function createAssetPluginHooks( getAssetFileName(assetReferenceId: string) { const asset = assetsByReferenceId.get(assetReferenceId); if (!asset) return error(errAssetReferenceIdNotFoundForFilename(assetReferenceId)); - if ((asset).fileName === undefined) - return error(errAssetNotFinalisedForFileName(asset)); - return (asset).fileName; + if (asset.fileName === undefined) return error(errAssetNotFinalisedForFileName(asset)); + return asset.fileName; } }; } @@ -91,13 +90,13 @@ export function finaliseAsset(asset: Asset, outputBundle: OutputBundle, assetFil export function createTransformEmitAsset( assetsByReferenceId: Map, - emitAsset: EmitAsset + emitFile: EmitFile ) { const assets: Asset[] = []; return { assets, emitAsset: (name: string, source?: string | Buffer) => { - const assetReferenceId = emitAsset(name, source); + const assetReferenceId = emitFile({ type: 'asset', name, source }); const asset = assetsByReferenceId.get(assetReferenceId) as Asset; assets.push({ fileName: undefined as any, diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index 436ff0e35a3..61fb1208812 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -4,8 +4,8 @@ import ExternalModule from '../ExternalModule'; import Graph from '../Graph'; import Module from '../Module'; import { - EmitAsset, EmitChunk, + EmitFile, InputOptions, Plugin, PluginCache, @@ -15,7 +15,6 @@ import { RollupWatcher, SerializablePluginCache } from '../rollup/types'; -import { createAssetPluginHooks } from './assetHooks'; import { BuildPhase } from './buildPhase'; import { getRollupDefaultPlugin } from './defaultPlugin'; import { @@ -23,13 +22,14 @@ import { errInvalidRollupPhaseForEmitChunk, error } from './error'; +import { FileEmitter } from './FileEmitter'; type Args = T extends (...args: infer K) => any ? K : never; type EnsurePromise = Promise ? K : T>; export interface PluginDriver { - emitAsset: EmitAsset; emitChunk: EmitChunk; + emitFile: EmitFile; hasLoadersOrTransforms: boolean; getAssetFileName(assetReferenceId: string): string; hookFirst>( @@ -119,7 +119,7 @@ export function createPluginDriver( ...(options.plugins as Plugin[]), getRollupDefaultPlugin(options.preserveSymlinks as boolean) ]; - const { emitAsset, getAssetFileName, setAssetSource } = createAssetPluginHooks(graph.assetsById); + const fileEmitter = new FileEmitter(graph.assetsById); const existingPluginKeys = new Set(); let hasLoadersOrTransforms = false; @@ -157,12 +157,15 @@ export function createPluginDriver( graph.watchFiles[id] = true; }, cache: cacheInstance, - emitAsset, + emitAsset: (name, source) => fileEmitter.emitFile({ type: 'asset', name, source }), emitChunk(id, options) { if (graph.phase > BuildPhase.LOAD_AND_PARSE) this.error(errInvalidRollupPhaseForEmitChunk()); return pluginDriver.emitChunk(id, options); }, + emitFile(emittedFile) { + throw new Error('Not implemented ' + emittedFile); + }, error(err): never { if (typeof err === 'string') err = { message: err }; if (err.code) err.pluginCode = err.code; @@ -170,7 +173,7 @@ export function createPluginDriver( err.plugin = plugin.name; return error(err); }, - getAssetFileName: getAssetFileName as (assetId: string) => string, + getAssetFileName: fileEmitter.getFileName, getChunkFileName(chunkReferenceId) { return graph.moduleLoader.getChunkFileName(chunkReferenceId); }, @@ -239,7 +242,7 @@ export function createPluginDriver( .then(resolveId => resolveId && resolveId.id); }; })(), - setAssetSource, + setAssetSource: fileEmitter.setFileSource, warn(warning) { if (typeof warning === 'string') warning = { message: warning } as RollupWarning; if (warning.code) warning.pluginCode = warning.code; @@ -355,14 +358,14 @@ export function createPluginDriver( } const pluginDriver: PluginDriver = { - emitAsset, + emitFile: fileEmitter.emitFile, emitChunk(id, options) { return graph.moduleLoader.addEntryModuleAndGetReferenceId({ alias: (options && options.name) || null, unresolvedId: id }); }, - getAssetFileName: getAssetFileName as (assetId: string) => string, + getAssetFileName: fileEmitter.getFileName, hasLoadersOrTransforms, // chains, ignores returns diff --git a/src/utils/transform.ts b/src/utils/transform.ts index 03185b922a7..c769eb4104b 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -31,7 +31,6 @@ export default function transform( const sourcemapChain: DecodedSourceMapOrMissing[] = []; let originalSourcemap = source.map === null ? null : decodedSourcemap(source.map); - const baseEmitAsset = graph.pluginDriver.emitAsset; const originalCode = source.code; let ast = source.ast; let transformDependencies: string[]; @@ -120,7 +119,7 @@ export default function transform( let emitAsset: EmitAsset; ({ assets: emittedAssets, emitAsset } = createTransformEmitAsset( graph.assetsById, - baseEmitAsset + graph.pluginDriver.emitFile )); return { ...pluginContext, diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_config.js b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_config.js new file mode 100644 index 00000000000..011e39805f7 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_config.js @@ -0,0 +1,14 @@ +// TODO Lukas implement this +module.exports = { + // solo: true, + skip: true, + description: 'supports emitting files from plugin hooks', + options: { + input: ['main.js'], + plugins: { + buildStart() { + this.emitFile({ type: 'file', fileName: 'buildStart.txt', source: 'This is buildStart' }); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/amd/main.js new file mode 100644 index 00000000000..126aa22ee83 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main'); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/cjs/main.js new file mode 100644 index 00000000000..d0ed06d8c90 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/cjs/main.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/es/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/es/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/system/main.js new file mode 100644 index 00000000000..c83499bc2d4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/system/main.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('main'); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/main.js b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/main.js @@ -0,0 +1 @@ +console.log('main'); From c27680db113317f0be06b9852b948a9daf911eeb Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sun, 7 Jul 2019 15:48:13 +0200 Subject: [PATCH 02/31] Migrate assets to new file emitter --- src/Graph.ts | 10 -- src/rollup/index.ts | 32 +---- src/rollup/types.d.ts | 1 + src/utils/FileEmitter.ts | 121 ++++++++++++++++-- src/utils/assetHooks.ts | 109 ---------------- src/utils/error.ts | 4 +- src/utils/pluginDriver.ts | 10 ++ src/utils/transform.ts | 20 +-- .../samples/asset-emission/_config.js | 1 + .../assets/logo1-a5ec488b.svg} | 2 +- ...{logo2-25253976.svg => logo2-c943ca3c.svg} | 2 +- .../asset-emission/_expected/amd/main.js | 2 +- .../_expected/amd/nested/chunk2.js | 2 +- ...{logo1-25253976.svg => logo1-a5ec488b.svg} | 2 +- ...{logo2-25253976.svg => logo2-c943ca3c.svg} | 2 +- .../asset-emission/_expected/cjs/main.js | 2 +- .../_expected/cjs/nested/chunk2.js | 2 +- .../_expected/es/assets/logo1-a5ec488b.svg | 3 + .../_expected/es/assets/logo2-25253976.svg | 3 - .../_expected/es/assets/logo2-c943ca3c.svg | 3 + .../asset-emission/_expected/es/main.js | 2 +- .../_expected/es/nested/chunk2.js | 2 +- .../system/assets/logo1-25253976.svg | 3 - .../system/assets/logo1-a5ec488b.svg | 3 + .../system/assets/logo2-25253976.svg | 3 - .../system/assets/logo2-c943ca3c.svg | 3 + .../asset-emission/_expected/system/main.js | 2 +- .../_expected/system/nested/chunk2.js | 2 +- .../samples/asset-emission/logo1.svg | 2 +- .../samples/asset-emission/logo2.svg | 2 +- .../samples/configure-file-url/_config.js | 1 + ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../configure-file-url/_expected/amd/main.js | 2 +- .../_expected/amd/nested/chunk2.js | 2 +- ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../configure-file-url/_expected/cjs/main.js | 2 +- .../_expected/cjs/nested/chunk2.js | 2 +- ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../configure-file-url/_expected/es/main.js | 2 +- .../_expected/es/nested/chunk2.js | 2 +- ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../_expected/system/main.js | 2 +- .../_expected/system/nested/chunk2.js | 2 +- test/form/samples/asset-emission/_config.js | 1 + .../samples/asset-emission/_expected/amd.js | 2 +- .../_expected/assets/logo-25253976.svg | 3 - .../_expected/assets/logo-25585ac1.svg} | 0 .../samples/asset-emission/_expected/cjs.js | 2 +- .../samples/asset-emission/_expected/es.js | 2 +- .../samples/asset-emission/_expected/iife.js | 2 +- .../asset-emission/_expected/system.js | 2 +- .../samples/asset-emission/_expected/umd.js | 2 +- .../samples/configure-file-url/_config.js | 1 + .../configure-file-url/_expected/amd.js | 4 +- ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../configure-file-url/_expected/cjs.js | 4 +- .../configure-file-url/_expected/es.js | 4 +- .../configure-file-url/_expected/iife.js | 4 +- .../configure-file-url/_expected/system.js | 4 +- .../configure-file-url/_expected/umd.js | 4 +- 70 files changed, 195 insertions(+), 220 deletions(-) delete mode 100644 src/utils/assetHooks.ts rename test/chunking-form/samples/asset-emission/_expected/{es/assets/logo1-25253976.svg => amd/assets/logo1-a5ec488b.svg} (99%) rename test/chunking-form/samples/asset-emission/_expected/amd/assets/{logo2-25253976.svg => logo2-c943ca3c.svg} (99%) rename test/chunking-form/samples/asset-emission/_expected/cjs/assets/{logo1-25253976.svg => logo1-a5ec488b.svg} (99%) rename test/chunking-form/samples/asset-emission/_expected/cjs/assets/{logo2-25253976.svg => logo2-c943ca3c.svg} (99%) create mode 100644 test/chunking-form/samples/asset-emission/_expected/es/assets/logo1-a5ec488b.svg delete mode 100644 test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-25253976.svg create mode 100644 test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-c943ca3c.svg delete mode 100644 test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-25253976.svg create mode 100644 test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-a5ec488b.svg delete mode 100644 test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-25253976.svg create mode 100644 test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-c943ca3c.svg rename test/chunking-form/samples/configure-file-url/_expected/amd/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/amd/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/amd/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/cjs/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/cjs/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/cjs/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/es/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/es/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/es/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/system/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/system/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/chunking-form/samples/configure-file-url/_expected/system/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) delete mode 100644 test/form/samples/asset-emission/_expected/assets/logo-25253976.svg rename test/{chunking-form/samples/asset-emission/_expected/amd/assets/logo1-25253976.svg => form/samples/asset-emission/_expected/assets/logo-25585ac1.svg} (100%) rename test/form/samples/configure-file-url/_expected/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/form/samples/configure-file-url/_expected/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/form/samples/configure-file-url/_expected/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) diff --git a/src/Graph.ts b/src/Graph.ts index 6326e50669d..e37b4d5cbb9 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -17,7 +17,6 @@ import { ManualChunksOption, ModuleJSON, ModuleSideEffectsOption, - OutputBundle, PureModulesOption, RollupCache, RollupWarning, @@ -26,7 +25,6 @@ import { TreeshakingOptions, WarningHandler } from './rollup/types'; -import { finaliseAsset } from './utils/assetHooks'; import { BuildPhase } from './utils/buildPhase'; import { assignChunkColouringHashes } from './utils/chunkColouring'; import { Uint8ArrayToHexString } from './utils/entryHashing'; @@ -327,14 +325,6 @@ export default class Graph { }); } - finaliseAssets(assetFileNames: string) { - const outputBundle: OutputBundle = Object.create(null); - this.assetsById.forEach(asset => { - if (asset.source !== undefined) finaliseAsset(asset, outputBundle, assetFileNames); - }); - return outputBundle; - } - getCache(): RollupCache { // handle plugin cache eviction for (const name in this.pluginCache) { diff --git a/src/rollup/index.ts b/src/rollup/index.ts index aaa93791824..6e6bc16d4d7 100644 --- a/src/rollup/index.ts +++ b/src/rollup/index.ts @@ -3,7 +3,6 @@ import Chunk from '../Chunk'; import { optimizeChunks } from '../chunk-optimization'; import Graph from '../Graph'; import { createAddons } from '../utils/addons'; -import { createAssetPluginHooks, finaliseAsset } from '../utils/assetHooks'; import { assignChunkIds } from '../utils/assignChunkIds'; import commondir from '../utils/commondir'; import { errDeprecation, error } from '../utils/error'; @@ -21,7 +20,6 @@ import { OutputChunk, OutputOptions, Plugin, - PluginContext, RollupBuild, RollupCache, RollupOutput, @@ -198,8 +196,9 @@ export default function rollup(rawInputOptions: GenericConfigObject): Promise { // run generateBundle hook - - // assets emitted during generateBundle are unique to that specific generate call - const assets = new Map(graph.assetsById); - const generateAssetPluginHooks = createAssetPluginHooks( - assets, - outputBundle, - assetFileNames - ); - return graph.pluginDriver - .hookSeq( - 'generateBundle', - [outputOptions, outputBundle, isWrite], - context => - ({ - ...context, - ...generateAssetPluginHooks - } as PluginContext) - ) - .then(() => { - // throw errors for assets not finalised with a source - assets.forEach(asset => { - if (asset.fileName === undefined) - finaliseAsset(asset, outputBundle, assetFileNames); - }); - }); + .hookSeq('generateBundle', [outputOptions, outputBundle, isWrite]) + .then(() => graph.pluginDriver.finaliseAssets()); }) .then(() => { timeEnd('GENERATE', 1); diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 0e3c6b62730..db37e965ad1 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -141,6 +141,7 @@ export type EmitAsset = (name: string, source?: string | Buffer) => string; export type EmitChunk = (name: string, options?: { name?: string }) => string; // TODO Lukas do not forget caching tests for files +// TODO Lukas can there be interactions in names between multiple outputs? export type EmittedFile = | { name: string; diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index 774cbc4427d..cfed790b371 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -1,4 +1,5 @@ -import { Asset, EmittedFile } from '../rollup/types'; +import sha256 from 'hash.js/lib/hash/sha/256'; +import { Asset, EmittedFile, OutputBundle } from '../rollup/types'; import { errAssetNotFinalisedForFileName, errAssetReferenceIdNotFoundForFilename, @@ -6,41 +7,143 @@ import { errAssetSourceAlreadySet, errAssetSourceMissingForSetSource, errInvalidAssetName, + errNoAssetSourceSet, error } from './error'; +import { extname } from './path'; import { addWithNewReferenceId } from './referenceIds'; import { isPlainName } from './relativeId'; +import { makeUnique, renderNamePattern } from './renderNamePattern'; +// TODO Lukas setFileSource in transform needs to be repeated as well +interface OutputSpecificAssetData { + assetFileNames: string; + // TODO Lukas instead replace this.assetsByReferenceId and keep a copy in this.buildAssetsByReferenceId + assetsByReferenceId: Map; + bundle: OutputBundle; +} + +function getAssetFileName( + name: string, + source: string | Buffer, + output: OutputSpecificAssetData +): string { + return makeUnique( + renderNamePattern(output.assetFileNames, 'assetFileNames', placeholder => { + switch (placeholder) { + case 'hash': + const hash = sha256(); + hash.update(name); + hash.update(':'); + hash.update(source); + return hash.digest('hex').substr(0, 8); + case 'name': + return name.substr(0, name.length - extname(name).length); + case 'extname': + return extname(name); + case 'ext': + return extname(name).substr(1); + } + // TODO Lukas test + return placeholder; + }), + output.bundle + ); +} + +function addAssetToBundle(asset: Asset, output: OutputSpecificAssetData) { + const fileName = getAssetFileName(asset.name, asset.source, output); + asset.fileName = fileName; + output.bundle[fileName] = { + fileName, + isAsset: true, + source: asset.source + }; +} + +// TODO Lukas general assumption: Having a source means having a reliable filename +// TODO Lukas only access filename during generate? Or disallow setSource if there is a fileName? export class FileEmitter { private assetsByReferenceId: Map; + private output: OutputSpecificAssetData | null = null; constructor(assetsByReferenceId: Map) { + // TODO Lukas can this be moved here solely? this.assetsByReferenceId = assetsByReferenceId; } public emitFile = (emittedFile: EmittedFile): string => { + console.log('emitFile', emittedFile); if (emittedFile.type !== 'asset') { - throw new Error(`Unhandlded file type ${emittedFile.type}`); + throw new Error(`Unhandled file type ${emittedFile.type}`); } const { name, source } = emittedFile; - if (typeof name !== 'string' || !isPlainName(name)) error(errInvalidAssetName(name)); + if (typeof name !== 'string' || !isPlainName(name)) { + return error(errInvalidAssetName(name as any)); + } + // TODO Lukas allow fileName to be undefined or null in type const asset: Asset = { name, source: source as string | Buffer, fileName: undefined as any }; - return addWithNewReferenceId(asset, this.assetsByReferenceId, name); + if (this.output && source !== undefined) { + addAssetToBundle(asset, this.output); + } + return addWithNewReferenceId( + asset, + this.output ? this.output.assetsByReferenceId : this.assetsByReferenceId, + name + ); }; + public finaliseAssets() { + const { assetsByReferenceId } = this.output as OutputSpecificAssetData; + for (const asset of assetsByReferenceId.values()) { + // TODO Lukas error: source not set + if (asset.source === undefined) error(errNoAssetSourceSet(asset.name)); + } + } + public getFileName = (fileReferenceId: string) => { - const asset = this.assetsByReferenceId.get(fileReferenceId); + const asset = (this.output ? this.output.assetsByReferenceId : this.assetsByReferenceId).get( + fileReferenceId + ); if (!asset) return error(errAssetReferenceIdNotFoundForFilename(fileReferenceId)); - if (asset.fileName === undefined) return error(errAssetNotFinalisedForFileName(asset)); + // TODO Lukas error: source not set for filename + if (asset.source === undefined) return error(errAssetNotFinalisedForFileName(asset)); return asset.fileName; }; public setFileSource = (fileReferenceId: string, source?: string | Buffer) => { - const asset = this.assetsByReferenceId.get(fileReferenceId); + const asset = (this.output ? this.output.assetsByReferenceId : this.assetsByReferenceId).get( + fileReferenceId + ); if (!asset) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); + // TODO Lukas can we allow this as long as output is not set? if (asset.source !== undefined) return error(errAssetSourceAlreadySet(asset)); - if (typeof source !== 'string' && !source) + // TODO Lukas check for string | Buffer instead? + if (typeof source !== 'string' && !source) { return error(errAssetSourceMissingForSetSource(asset)); - asset.source = source; + } + if (this.output) { + // We must not modify the original assets to not interact with other outputs + const assetWithSource = { ...asset, source }; + this.output.assetsByReferenceId.set(fileReferenceId, assetWithSource); + addAssetToBundle(assetWithSource, this.output); + } else { + asset.source = source; + } }; + + // TODO Lukas how do we unfinalize assets for different outputs that have their source set during generate? Test! + public startOutput(outputBundle: OutputBundle, assetFileNames: string) { + console.log('startOutput'); + this.output = { + assetFileNames, + assetsByReferenceId: new Map(this.assetsByReferenceId), + bundle: outputBundle + }; + for (const asset of this.assetsByReferenceId.values()) { + if (asset.source !== undefined) { + addAssetToBundle(asset, this.output); + } + } + } } diff --git a/src/utils/assetHooks.ts b/src/utils/assetHooks.ts deleted file mode 100644 index f7a205ff954..00000000000 --- a/src/utils/assetHooks.ts +++ /dev/null @@ -1,109 +0,0 @@ -import sha256 from 'hash.js/lib/hash/sha/256'; -import { Asset, EmitFile, OutputBundle } from '../rollup/types'; -import { - errAssetNotFinalisedForFileName, - errAssetReferenceIdNotFoundForFilename, - errAssetReferenceIdNotFoundForSetSource, - errAssetSourceAlreadySet, - errAssetSourceMissingForSetSource, - errInvalidAssetName, - errNoAssetSourceSet, - error -} from './error'; -import { extname } from './path'; -import { addWithNewReferenceId } from './referenceIds'; -import { isPlainName } from './relativeId'; -import { makeUnique, renderNamePattern } from './renderNamePattern'; - -function getAssetFileName( - asset: Asset, - existingNames: Record, - assetFileNames: string -) { - if (asset.source === undefined) error(errNoAssetSourceSet(asset)); - if (asset.fileName) return asset.fileName; - - return makeUnique( - renderNamePattern(assetFileNames, 'assetFileNames', name => { - switch (name) { - case 'hash': - const hash = sha256(); - hash.update(name); - hash.update(':'); - hash.update(asset.source); - return hash.digest('hex').substr(0, 8); - case 'name': - return asset.name.substr(0, asset.name.length - extname(asset.name).length); - case 'extname': - return extname(asset.name); - case 'ext': - return extname(asset.name).substr(1); - } - return undefined as any; - }), - existingNames - ); -} - -export function createAssetPluginHooks( - assetsByReferenceId: Map, - outputBundle?: OutputBundle, - assetFileNames?: string -) { - return { - emitAsset(name: string, source?: string | Buffer) { - if (typeof name !== 'string' || !isPlainName(name)) error(errInvalidAssetName(name)); - const asset: Asset = { name, source: source as string | Buffer, fileName: undefined as any }; - if (outputBundle && source !== undefined) - finaliseAsset(asset, outputBundle, assetFileNames as string); - return addWithNewReferenceId(asset, assetsByReferenceId, name); - }, - - setAssetSource(assetReferenceId: string, source?: string | Buffer) { - const asset = assetsByReferenceId.get(assetReferenceId); - if (!asset) return error(errAssetReferenceIdNotFoundForSetSource(assetReferenceId)); - if (asset.source !== undefined) return error(errAssetSourceAlreadySet(asset)); - if (typeof source !== 'string' && !source) - return error(errAssetSourceMissingForSetSource(asset)); - asset.source = source; - if (outputBundle) finaliseAsset(asset, outputBundle, assetFileNames as string); - }, - - getAssetFileName(assetReferenceId: string) { - const asset = assetsByReferenceId.get(assetReferenceId); - if (!asset) return error(errAssetReferenceIdNotFoundForFilename(assetReferenceId)); - if (asset.fileName === undefined) return error(errAssetNotFinalisedForFileName(asset)); - return asset.fileName; - } - }; -} - -export function finaliseAsset(asset: Asset, outputBundle: OutputBundle, assetFileNames: string) { - const fileName = getAssetFileName(asset, outputBundle, assetFileNames); - asset.fileName = fileName; - outputBundle[fileName] = { - fileName, - isAsset: true, - source: asset.source - }; -} - -export function createTransformEmitAsset( - assetsByReferenceId: Map, - emitFile: EmitFile -) { - const assets: Asset[] = []; - return { - assets, - emitAsset: (name: string, source?: string | Buffer) => { - const assetReferenceId = emitFile({ type: 'asset', name, source }); - const asset = assetsByReferenceId.get(assetReferenceId) as Asset; - assets.push({ - fileName: undefined as any, - name: asset.name, - source: asset.source - }); - return assetReferenceId; - } - }; -} diff --git a/src/utils/error.ts b/src/utils/error.ts index 120324499c8..0b083199183 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -93,10 +93,10 @@ export function errAssetSourceMissingForSetSource(asset: Asset) { }; } -export function errNoAssetSourceSet(asset: Asset) { +export function errNoAssetSourceSet(assetName: string) { return { code: Errors.ASSET_SOURCE_MISSING, - message: `Plugin error creating asset "${asset.name}" - no asset source set.` + message: `Plugin error creating asset "${assetName}" - no asset source set.` }; } diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index 61fb1208812..df734d45e64 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -7,6 +7,7 @@ import { EmitChunk, EmitFile, InputOptions, + OutputBundle, Plugin, PluginCache, PluginContext, @@ -31,6 +32,7 @@ export interface PluginDriver { emitChunk: EmitChunk; emitFile: EmitFile; hasLoadersOrTransforms: boolean; + finaliseAssets(): void; getAssetFileName(assetReferenceId: string): string; hookFirst>( hook: H, @@ -77,6 +79,7 @@ export interface PluginDriver { args: Args, context?: HookContext ): void; + startOutput(outputBundle: OutputBundle, assetFileNames: string): void; } export type Reduce = (reduction: T, result: R, plugin: Plugin) => T; @@ -365,6 +368,9 @@ export function createPluginDriver( unresolvedId: id }); }, + finaliseAssets() { + fileEmitter.finaliseAssets(); + }, getAssetFileName: fileEmitter.getFileName, hasLoadersOrTransforms, @@ -452,6 +458,10 @@ export function createPluginDriver( }); } return promise; + }, + + startOutput(outputBundle: OutputBundle, assetFileNames: string): void { + fileEmitter.startOutput(outputBundle, assetFileNames); } }; diff --git a/src/utils/transform.ts b/src/utils/transform.ts index c769eb4104b..a98cc6c62c6 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -4,7 +4,6 @@ import Module from '../Module'; import { Asset, DecodedSourceMapOrMissing, - EmitAsset, EmittedChunk, Plugin, PluginCache, @@ -15,7 +14,6 @@ import { TransformResult, TransformSourceDescription } from '../rollup/types'; -import { createTransformEmitAsset } from './assetHooks'; import { collapseSourcemap } from './collapseSourcemaps'; import { decodedSourcemap } from './decodedSourcemap'; import { augmentCodeLocation, error } from './error'; @@ -34,7 +32,7 @@ export default function transform( const originalCode = source.code; let ast = source.ast; let transformDependencies: string[]; - let emittedAssets: Asset[]; + const emittedAssets: Asset[] = []; const emittedChunks: EmittedChunk[] = []; let customTransformCache = false; let moduleSideEffects: boolean | null = null; @@ -115,12 +113,6 @@ export default function transform( curPlugin = plugin as Plugin; if (curPlugin.cacheKey) customTransformCache = true; else trackedPluginCache = trackPluginCache(pluginContext.cache); - - let emitAsset: EmitAsset; - ({ assets: emittedAssets, emitAsset } = createTransformEmitAsset( - graph.assetsById, - graph.pluginDriver.emitFile - )); return { ...pluginContext, cache: trackedPluginCache ? trackedPluginCache.cache : pluginContext.cache, @@ -138,11 +130,19 @@ export default function transform( err.hook = 'transform'; return pluginContext.error(err); }, - emitAsset, + emitAsset(name: string, source?: string | Buffer) { + emittedAssets.push({ + fileName: undefined as any, + name, + source: source as any + }); + return graph.pluginDriver.emitFile({ type: 'asset', name, source }); + }, emitChunk(id, options) { emittedChunks.push({ id, options }); return graph.pluginDriver.emitChunk(id, options); }, + // TODO Lukas this needs to be repeated as well addWatchFile(id: string) { if (!transformDependencies) transformDependencies = []; transformDependencies.push(id); diff --git a/test/chunking-form/samples/asset-emission/_config.js b/test/chunking-form/samples/asset-emission/_config.js index 9784a297436..f768c296e23 100644 --- a/test/chunking-form/samples/asset-emission/_config.js +++ b/test/chunking-form/samples/asset-emission/_config.js @@ -2,6 +2,7 @@ const fs = require('fs'); const path = require('path'); module.exports = { + solo: true, description: 'supports emitting assets from plugin hooks', options: { input: ['main.js'], diff --git a/test/chunking-form/samples/asset-emission/_expected/es/assets/logo1-25253976.svg b/test/chunking-form/samples/asset-emission/_expected/amd/assets/logo1-a5ec488b.svg similarity index 99% rename from test/chunking-form/samples/asset-emission/_expected/es/assets/logo1-25253976.svg rename to test/chunking-form/samples/asset-emission/_expected/amd/assets/logo1-a5ec488b.svg index 20bb5dfe639..cb7e52c5130 100644 --- a/test/chunking-form/samples/asset-emission/_expected/es/assets/logo1-25253976.svg +++ b/test/chunking-form/samples/asset-emission/_expected/amd/assets/logo1-a5ec488b.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/test/chunking-form/samples/asset-emission/_expected/amd/assets/logo2-25253976.svg b/test/chunking-form/samples/asset-emission/_expected/amd/assets/logo2-c943ca3c.svg similarity index 99% rename from test/chunking-form/samples/asset-emission/_expected/amd/assets/logo2-25253976.svg rename to test/chunking-form/samples/asset-emission/_expected/amd/assets/logo2-c943ca3c.svg index 20bb5dfe639..cb7e52c5130 100644 --- a/test/chunking-form/samples/asset-emission/_expected/amd/assets/logo2-25253976.svg +++ b/test/chunking-form/samples/asset-emission/_expected/amd/assets/logo2-c943ca3c.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/test/chunking-form/samples/asset-emission/_expected/amd/main.js b/test/chunking-form/samples/asset-emission/_expected/amd/main.js index ad49a69bf83..1d8142bda6e 100644 --- a/test/chunking-form/samples/asset-emission/_expected/amd/main.js +++ b/test/chunking-form/samples/asset-emission/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require', './nested/chunk'], function (require, __chunk_1) { 'use strict'; - var logo = new URL(require.toUrl('assets/logo1-25253976.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('assets/logo1-a5ec488b.svg'), document.baseURI).href; __chunk_1.showImage(logo); new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }); diff --git a/test/chunking-form/samples/asset-emission/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/asset-emission/_expected/amd/nested/chunk2.js index ad229a9409e..ef79ac29c13 100644 --- a/test/chunking-form/samples/asset-emission/_expected/amd/nested/chunk2.js +++ b/test/chunking-form/samples/asset-emission/_expected/amd/nested/chunk2.js @@ -1,6 +1,6 @@ define(['require', './chunk'], function (require, __chunk_1) { 'use strict'; - var logo = new URL(require.toUrl('../assets/logo2-25253976.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('../assets/logo2-c943ca3c.svg'), document.baseURI).href; __chunk_1.showImage(logo); diff --git a/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo1-25253976.svg b/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo1-a5ec488b.svg similarity index 99% rename from test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo1-25253976.svg rename to test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo1-a5ec488b.svg index 20bb5dfe639..cb7e52c5130 100644 --- a/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo1-25253976.svg +++ b/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo1-a5ec488b.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo2-25253976.svg b/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo2-c943ca3c.svg similarity index 99% rename from test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo2-25253976.svg rename to test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo2-c943ca3c.svg index 20bb5dfe639..cb7e52c5130 100644 --- a/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo2-25253976.svg +++ b/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo2-c943ca3c.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/test/chunking-form/samples/asset-emission/_expected/cjs/main.js b/test/chunking-form/samples/asset-emission/_expected/cjs/main.js index 16adc59ce96..2c01c808c16 100644 --- a/test/chunking-form/samples/asset-emission/_expected/cjs/main.js +++ b/test/chunking-form/samples/asset-emission/_expected/cjs/main.js @@ -2,7 +2,7 @@ var __chunk_1 = require('./nested/chunk.js'); -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo1-25253976.svg').href : new URL('assets/logo1-25253976.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +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); __chunk_1.showImage(logo); new Promise(function (resolve) { resolve(require('./nested/chunk2.js')); }); diff --git a/test/chunking-form/samples/asset-emission/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/asset-emission/_expected/cjs/nested/chunk2.js index 10f8b21bde6..360d0cbf6f9 100644 --- a/test/chunking-form/samples/asset-emission/_expected/cjs/nested/chunk2.js +++ b/test/chunking-form/samples/asset-emission/_expected/cjs/nested/chunk2.js @@ -2,6 +2,6 @@ var __chunk_1 = require('./chunk.js'); -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-25253976.svg').href : new URL('../assets/logo2-25253976.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-c943ca3c.svg').href : new URL('../assets/logo2-c943ca3c.svg', document.currentScript && document.currentScript.src || document.baseURI).href); __chunk_1.showImage(logo); diff --git a/test/chunking-form/samples/asset-emission/_expected/es/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/asset-emission/_expected/es/assets/logo1-a5ec488b.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/asset-emission/_expected/es/assets/logo1-a5ec488b.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-25253976.svg b/test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-25253976.svg deleted file mode 100644 index 20bb5dfe639..00000000000 --- a/test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-25253976.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-c943ca3c.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-c943ca3c.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/asset-emission/_expected/es/main.js b/test/chunking-form/samples/asset-emission/_expected/es/main.js index 0b696340c5e..6145c907395 100644 --- a/test/chunking-form/samples/asset-emission/_expected/es/main.js +++ b/test/chunking-form/samples/asset-emission/_expected/es/main.js @@ -1,6 +1,6 @@ import { s as showImage } from './nested/chunk.js'; -var logo = new URL('assets/logo1-25253976.svg', import.meta.url).href; +var logo = new URL('assets/logo1-a5ec488b.svg', import.meta.url).href; showImage(logo); import('./nested/chunk2.js'); diff --git a/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js b/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js index e39c601ff41..f0caa2f9e11 100644 --- a/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js +++ b/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js @@ -1,5 +1,5 @@ import { s as showImage } from './chunk.js'; -var logo = new URL('../assets/logo2-25253976.svg', import.meta.url).href; +var logo = new URL('../assets/logo2-c943ca3c.svg', import.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-25253976.svg b/test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-25253976.svg deleted file mode 100644 index 20bb5dfe639..00000000000 --- a/test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-25253976.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-a5ec488b.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-a5ec488b.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-25253976.svg b/test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-25253976.svg deleted file mode 100644 index 20bb5dfe639..00000000000 --- a/test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-25253976.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-c943ca3c.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-c943ca3c.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/asset-emission/_expected/system/main.js b/test/chunking-form/samples/asset-emission/_expected/system/main.js index cc36168b97d..3cef21c3600 100644 --- a/test/chunking-form/samples/asset-emission/_expected/system/main.js +++ b/test/chunking-form/samples/asset-emission/_expected/system/main.js @@ -7,7 +7,7 @@ System.register(['./nested/chunk.js'], function (exports, module) { }], execute: function () { - var logo = new URL('assets/logo1-25253976.svg', module.meta.url).href; + 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/asset-emission/_expected/system/nested/chunk2.js b/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk2.js index b748c0bd130..aaeaa9950e6 100644 --- a/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk2.js +++ b/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk2.js @@ -7,7 +7,7 @@ System.register(['./chunk.js'], function (exports, module) { }], execute: function () { - var logo = new URL('../assets/logo2-25253976.svg', module.meta.url).href; + var logo = new URL('../assets/logo2-c943ca3c.svg', module.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/asset-emission/logo1.svg b/test/chunking-form/samples/asset-emission/logo1.svg index 20bb5dfe639..cb7e52c5130 100644 --- a/test/chunking-form/samples/asset-emission/logo1.svg +++ b/test/chunking-form/samples/asset-emission/logo1.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/test/chunking-form/samples/asset-emission/logo2.svg b/test/chunking-form/samples/asset-emission/logo2.svg index 20bb5dfe639..cb7e52c5130 100644 --- a/test/chunking-form/samples/asset-emission/logo2.svg +++ b/test/chunking-form/samples/asset-emission/logo2.svg @@ -1,3 +1,3 @@ - \ No newline at end of file + diff --git a/test/chunking-form/samples/configure-file-url/_config.js b/test/chunking-form/samples/configure-file-url/_config.js index 9ee4fa22535..096d1a6ba36 100644 --- a/test/chunking-form/samples/configure-file-url/_config.js +++ b/test/chunking-form/samples/configure-file-url/_config.js @@ -1,4 +1,5 @@ module.exports = { + solo: true, description: 'allows to configure file urls', options: { output: { diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-resolved-dfc93baf.txt b/test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-resolved-dfc93baf.txt rename to test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-solved-9b321da2.txt b/test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-solved-9b321da2.txt rename to test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-unresolved-9548436d.txt b/test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-unresolved-9548436d.txt rename to test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/main.js b/test/chunking-form/samples/configure-file-url/_expected/amd/main.js index 75ab2148e8f..65913f1755d 100644 --- a/test/chunking-form/samples/configure-file-url/_expected/amd/main.js +++ b/test/chunking-form/samples/configure-file-url/_expected/amd/main.js @@ -3,7 +3,7 @@ define(['require'], function (require) { 'use strict'; const asset = 'resolved'; const chunk = 'resolved'; - const asset$1 = new URL(require.toUrl('assets/asset-unresolved-9548436d.txt'), document.baseURI).href; + const asset$1 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; const chunk$1 = new URL(require.toUrl('nested/chunk.js'), document.baseURI).href; new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }).then(result => console.log(result, chunk, chunk$1, asset, asset$1)); diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/configure-file-url/_expected/amd/nested/chunk2.js index bdb11983b26..c40e57b7bf5 100644 --- a/test/chunking-form/samples/configure-file-url/_expected/amd/nested/chunk2.js +++ b/test/chunking-form/samples/configure-file-url/_expected/amd/nested/chunk2.js @@ -1,6 +1,6 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; - const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=amd:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'; + const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=amd:relativePath=../assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=amd:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'; exports.asset = asset; diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-resolved-dfc93baf.txt b/test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-resolved-dfc93baf.txt rename to test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-solved-9b321da2.txt b/test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-solved-9b321da2.txt rename to test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-unresolved-9548436d.txt b/test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-unresolved-9548436d.txt rename to test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/main.js b/test/chunking-form/samples/configure-file-url/_expected/cjs/main.js index f365d118a36..dc2ba8a1434 100644 --- a/test/chunking-form/samples/configure-file-url/_expected/cjs/main.js +++ b/test/chunking-form/samples/configure-file-url/_expected/cjs/main.js @@ -3,7 +3,7 @@ const asset = 'resolved'; const chunk = 'resolved'; -const asset$1 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-9548436d.txt').href : new URL('assets/asset-unresolved-9548436d.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const asset$1 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const chunk$1 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/nested/chunk.js').href : new URL('nested/chunk.js', document.currentScript && document.currentScript.src || document.baseURI).href); new Promise(function (resolve) { resolve(require('./nested/chunk2.js')); }).then(result => console.log(result, chunk, chunk$1, asset, asset$1)); diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/configure-file-url/_expected/cjs/nested/chunk2.js index 1d4203c7455..2ea0d2caf6f 100644 --- a/test/chunking-form/samples/configure-file-url/_expected/cjs/nested/chunk2.js +++ b/test/chunking-form/samples/configure-file-url/_expected/cjs/nested/chunk2.js @@ -1,6 +1,6 @@ 'use strict'; -const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=cjs:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'; +const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=cjs:relativePath=../assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=cjs:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'; exports.asset = asset; diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-resolved-dfc93baf.txt b/test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-resolved-dfc93baf.txt rename to test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-solved-9b321da2.txt b/test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-solved-9b321da2.txt rename to test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-unresolved-9548436d.txt b/test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-unresolved-9548436d.txt rename to test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/main.js b/test/chunking-form/samples/configure-file-url/_expected/es/main.js index 3234da07909..4053f550431 100644 --- a/test/chunking-form/samples/configure-file-url/_expected/es/main.js +++ b/test/chunking-form/samples/configure-file-url/_expected/es/main.js @@ -1,7 +1,7 @@ const asset = 'resolved'; const chunk = 'resolved'; -const asset$1 = new URL('assets/asset-unresolved-9548436d.txt', import.meta.url).href; +const asset$1 = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; const chunk$1 = new URL('nested/chunk.js', import.meta.url).href; import('./nested/chunk2.js').then(result => console.log(result, chunk, chunk$1, asset, asset$1)); diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/nested/chunk2.js b/test/chunking-form/samples/configure-file-url/_expected/es/nested/chunk2.js index 63b7c7ebdf0..736b09b62c1 100644 --- a/test/chunking-form/samples/configure-file-url/_expected/es/nested/chunk2.js +++ b/test/chunking-form/samples/configure-file-url/_expected/es/nested/chunk2.js @@ -1,4 +1,4 @@ -const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=es:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'; +const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=es:relativePath=../assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=es:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'; export { asset, chunk }; diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-resolved-dfc93baf.txt b/test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-resolved-dfc93baf.txt rename to test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-solved-9b321da2.txt b/test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-solved-9b321da2.txt rename to test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-unresolved-9548436d.txt b/test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-unresolved-9548436d.txt rename to test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/main.js b/test/chunking-form/samples/configure-file-url/_expected/system/main.js index f45bae342b0..7b2eb79d1dd 100644 --- a/test/chunking-form/samples/configure-file-url/_expected/system/main.js +++ b/test/chunking-form/samples/configure-file-url/_expected/system/main.js @@ -6,7 +6,7 @@ System.register([], function (exports, module) { const asset = 'resolved'; const chunk = 'resolved'; - const asset$1 = new URL('assets/asset-unresolved-9548436d.txt', module.meta.url).href; + const asset$1 = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; const chunk$1 = new URL('nested/chunk.js', module.meta.url).href; module.import('./nested/chunk2.js').then(result => console.log(result, chunk, chunk$1, asset, asset$1)); diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/nested/chunk2.js b/test/chunking-form/samples/configure-file-url/_expected/system/nested/chunk2.js index bdec926656e..0ef79e2e19a 100644 --- a/test/chunking-form/samples/configure-file-url/_expected/system/nested/chunk2.js +++ b/test/chunking-form/samples/configure-file-url/_expected/system/nested/chunk2.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - const asset = exports('asset', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=system:relativePath=../assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'); + const asset = exports('asset', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=system:relativePath=../assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'); const chunk = exports('chunk', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=system:relativePath=chunk.js:assetReferenceId=null:chunkReferenceId=f6c25ae7'); } diff --git a/test/form/samples/asset-emission/_config.js b/test/form/samples/asset-emission/_config.js index bdf8e5fdfde..7cfcffc7a82 100644 --- a/test/form/samples/asset-emission/_config.js +++ b/test/form/samples/asset-emission/_config.js @@ -2,6 +2,7 @@ const fs = require('fs'); const path = require('path'); module.exports = { + solo: true, description: 'supports emitting assets from plugin hooks', options: { plugins: { diff --git a/test/form/samples/asset-emission/_expected/amd.js b/test/form/samples/asset-emission/_expected/amd.js index 38068b433f4..43a19504229 100644 --- a/test/form/samples/asset-emission/_expected/amd.js +++ b/test/form/samples/asset-emission/_expected/amd.js @@ -1,6 +1,6 @@ define(['require'], function (require) { 'use strict'; - var logo = new URL(require.toUrl('assets/logo-25253976.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('assets/logo-25585ac1.svg'), document.baseURI).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/asset-emission/_expected/assets/logo-25253976.svg b/test/form/samples/asset-emission/_expected/assets/logo-25253976.svg deleted file mode 100644 index 20bb5dfe639..00000000000 --- a/test/form/samples/asset-emission/_expected/assets/logo-25253976.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/test/chunking-form/samples/asset-emission/_expected/amd/assets/logo1-25253976.svg b/test/form/samples/asset-emission/_expected/assets/logo-25585ac1.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/amd/assets/logo1-25253976.svg rename to test/form/samples/asset-emission/_expected/assets/logo-25585ac1.svg diff --git a/test/form/samples/asset-emission/_expected/cjs.js b/test/form/samples/asset-emission/_expected/cjs.js index 6705b3c1d7c..f9a9dac3e1e 100644 --- a/test/form/samples/asset-emission/_expected/cjs.js +++ b/test/form/samples/asset-emission/_expected/cjs.js @@ -1,6 +1,6 @@ 'use strict'; -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25253976.svg').href : new URL('assets/logo-25253976.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25585ac1.svg').href : new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href); function showImage(url) { console.log(url); diff --git a/test/form/samples/asset-emission/_expected/es.js b/test/form/samples/asset-emission/_expected/es.js index 6ad86e3a083..d100d42e367 100644 --- a/test/form/samples/asset-emission/_expected/es.js +++ b/test/form/samples/asset-emission/_expected/es.js @@ -1,4 +1,4 @@ -var logo = new URL('assets/logo-25253976.svg', import.meta.url).href; +var logo = new URL('assets/logo-25585ac1.svg', import.meta.url).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/asset-emission/_expected/iife.js b/test/form/samples/asset-emission/_expected/iife.js index 713c4aa8f2a..97c9c3432a2 100644 --- a/test/form/samples/asset-emission/_expected/iife.js +++ b/test/form/samples/asset-emission/_expected/iife.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - var logo = new URL('assets/logo-25253976.svg', document.currentScript && document.currentScript.src || document.baseURI).href; + var logo = new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/asset-emission/_expected/system.js b/test/form/samples/asset-emission/_expected/system.js index 075df5052ee..0c3f132dc7f 100644 --- a/test/form/samples/asset-emission/_expected/system.js +++ b/test/form/samples/asset-emission/_expected/system.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var logo = new URL('assets/logo-25253976.svg', module.meta.url).href; + var logo = new URL('assets/logo-25585ac1.svg', module.meta.url).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/asset-emission/_expected/umd.js b/test/form/samples/asset-emission/_expected/umd.js index 2f993d8c725..39598a3ed2a 100644 --- a/test/form/samples/asset-emission/_expected/umd.js +++ b/test/form/samples/asset-emission/_expected/umd.js @@ -3,7 +3,7 @@ factory(); }(function () { 'use strict'; - var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25253976.svg').href : new URL('assets/logo-25253976.svg', document.currentScript && document.currentScript.src || document.baseURI).href); + var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25585ac1.svg').href : new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href); function showImage(url) { console.log(url); diff --git a/test/form/samples/configure-file-url/_config.js b/test/form/samples/configure-file-url/_config.js index 51f63117e90..e9e808faac5 100644 --- a/test/form/samples/configure-file-url/_config.js +++ b/test/form/samples/configure-file-url/_config.js @@ -1,4 +1,5 @@ module.exports = { + solo: true, description: 'allows to configure file urls', options: { plugins: [ diff --git a/test/form/samples/configure-file-url/_expected/amd.js b/test/form/samples/configure-file-url/_expected/amd.js index f11619a0acf..c5032caefa1 100644 --- a/test/form/samples/configure-file-url/_expected/amd.js +++ b/test/form/samples/configure-file-url/_expected/amd.js @@ -1,10 +1,10 @@ define(['require'], function (require) { 'use strict'; - var asset1 = 'chunkId=amd.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=amd:relativePath=assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'; + var asset1 = 'chunkId=amd.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=amd:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; var asset2 = 'resolved'; - var asset3 = new URL(require.toUrl('assets/asset-unresolved-9548436d.txt'), document.baseURI).href; + var asset3 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-resolved-dfc93baf.txt b/test/form/samples/configure-file-url/_expected/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/form/samples/configure-file-url/_expected/assets/asset-resolved-dfc93baf.txt rename to test/form/samples/configure-file-url/_expected/assets/asset-resolved-8bd22e6e.txt diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-solved-9b321da2.txt b/test/form/samples/configure-file-url/_expected/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/form/samples/configure-file-url/_expected/assets/asset-solved-9b321da2.txt rename to test/form/samples/configure-file-url/_expected/assets/asset-solved-28a7ac89.txt diff --git a/test/form/samples/configure-file-url/_expected/assets/asset-unresolved-9548436d.txt b/test/form/samples/configure-file-url/_expected/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/form/samples/configure-file-url/_expected/assets/asset-unresolved-9548436d.txt rename to test/form/samples/configure-file-url/_expected/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/form/samples/configure-file-url/_expected/cjs.js b/test/form/samples/configure-file-url/_expected/cjs.js index be58150cae8..0587c2c9ba5 100644 --- a/test/form/samples/configure-file-url/_expected/cjs.js +++ b/test/form/samples/configure-file-url/_expected/cjs.js @@ -1,9 +1,9 @@ 'use strict'; -var asset1 = 'chunkId=cjs.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=cjs:relativePath=assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'; +var asset1 = 'chunkId=cjs.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=cjs:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; var asset2 = 'resolved'; -var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-9548436d.txt').href : new URL('assets/asset-unresolved-9548436d.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/es.js b/test/form/samples/configure-file-url/_expected/es.js index df7dcc61d02..bbf31d97b7e 100644 --- a/test/form/samples/configure-file-url/_expected/es.js +++ b/test/form/samples/configure-file-url/_expected/es.js @@ -1,7 +1,7 @@ -var asset1 = 'chunkId=es.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=es:relativePath=assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'; +var asset1 = 'chunkId=es.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=es:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; var asset2 = 'resolved'; -var asset3 = new URL('assets/asset-unresolved-9548436d.txt', import.meta.url).href; +var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/iife.js b/test/form/samples/configure-file-url/_expected/iife.js index 2d562e6b043..52351802764 100644 --- a/test/form/samples/configure-file-url/_expected/iife.js +++ b/test/form/samples/configure-file-url/_expected/iife.js @@ -1,11 +1,11 @@ (function () { 'use strict'; - var asset1 = 'chunkId=iife.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=iife:relativePath=assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'; + var asset1 = 'chunkId=iife.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=iife:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; var asset2 = 'resolved'; - var asset3 = new URL('assets/asset-unresolved-9548436d.txt', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/system.js b/test/form/samples/configure-file-url/_expected/system.js index b819b26364a..44dadb673b2 100644 --- a/test/form/samples/configure-file-url/_expected/system.js +++ b/test/form/samples/configure-file-url/_expected/system.js @@ -3,11 +3,11 @@ System.register([], function (exports, module) { return { execute: function () { - var asset1 = 'chunkId=system.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=system:relativePath=assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'; + var asset1 = 'chunkId=system.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=system:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; var asset2 = 'resolved'; - var asset3 = new URL('assets/asset-unresolved-9548436d.txt', module.meta.url).href; + var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/configure-file-url/_expected/umd.js b/test/form/samples/configure-file-url/_expected/umd.js index 2fece7a5b8f..878c47d1876 100644 --- a/test/form/samples/configure-file-url/_expected/umd.js +++ b/test/form/samples/configure-file-url/_expected/umd.js @@ -3,11 +3,11 @@ factory(); }(function () { 'use strict'; - var asset1 = 'chunkId=umd.js:moduleId=solved:fileName=assets/asset-solved-9b321da2.txt:format=umd:relativePath=assets/asset-solved-9b321da2.txt:assetReferenceId=6296c678:chunkReferenceId=null'; + var asset1 = 'chunkId=umd.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=umd:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; var asset2 = 'resolved'; - var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-9548436d.txt').href : new URL('assets/asset-unresolved-9548436d.txt', document.currentScript && document.currentScript.src || document.baseURI).href); + var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); console.log(asset1, asset2, asset3); From be510febd5bf642edc5b12b28b0e5ec86d9d6e90 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sun, 7 Jul 2019 19:42:06 +0200 Subject: [PATCH 03/31] Remove assetsById from Graph --- src/Graph.ts | 2 - src/utils/FileEmitter.ts | 43 ++++++------------- src/utils/pluginDriver.ts | 2 +- .../samples/asset-emission/_config.js | 1 - .../samples/configure-file-url/_config.js | 1 - ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../configure-asset-url/_expected/amd/main.js | 2 +- .../_expected/amd/nested/chunk.js | 2 +- ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../configure-asset-url/_expected/cjs/main.js | 2 +- .../_expected/cjs/nested/chunk.js | 2 +- ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../configure-asset-url/_expected/es/main.js | 2 +- .../_expected/es/nested/chunk.js | 2 +- ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../_expected/system/main.js | 2 +- .../_expected/system/nested/chunk.js | 2 +- test/form/samples/asset-emission/_config.js | 1 - .../samples/configure-file-url/_config.js | 1 - .../configure-asset-url/_expected/amd.js | 4 +- ...c93baf.txt => asset-resolved-8bd22e6e.txt} | 0 ...9b321da2.txt => asset-solved-28a7ac89.txt} | 0 ...436d.txt => asset-unresolved-8dcd7fca.txt} | 0 .../configure-asset-url/_expected/cjs.js | 4 +- .../configure-asset-url/_expected/es.js | 4 +- .../configure-asset-url/_expected/iife.js | 4 +- .../configure-asset-url/_expected/system.js | 4 +- .../configure-asset-url/_expected/umd.js | 4 +- test/hooks/index.js | 40 ++++++++--------- 37 files changed, 54 insertions(+), 77 deletions(-) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) rename test/form/samples/deprecated/configure-asset-url/_expected/assets/{asset-resolved-dfc93baf.txt => asset-resolved-8bd22e6e.txt} (100%) rename test/form/samples/deprecated/configure-asset-url/_expected/assets/{asset-solved-9b321da2.txt => asset-solved-28a7ac89.txt} (100%) rename test/form/samples/deprecated/configure-asset-url/_expected/assets/{asset-unresolved-9548436d.txt => asset-unresolved-8dcd7fca.txt} (100%) diff --git a/src/Graph.ts b/src/Graph.ts index e37b4d5cbb9..307d6dfc068 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -10,7 +10,6 @@ import ExternalModule from './ExternalModule'; import Module, { defaultAcornOptions } from './Module'; import { ModuleLoader, UnresolvedModuleWithAlias } from './ModuleLoader'; import { - Asset, ExternalOption, GetManualChunk, InputOptions, @@ -64,7 +63,6 @@ function normalizeEntryModules( export default class Graph { acornOptions: acorn.Options; acornParser: typeof acorn.Parser; - assetsById = new Map(); cachedModules: Map; contextParse: (code: string, acornOptions?: acorn.Options) => ESTree.Program; curChunkIndex = 0; diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index cfed790b371..a8a9cae5d53 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -18,8 +18,6 @@ import { makeUnique, renderNamePattern } from './renderNamePattern'; // TODO Lukas setFileSource in transform needs to be repeated as well interface OutputSpecificAssetData { assetFileNames: string; - // TODO Lukas instead replace this.assetsByReferenceId and keep a copy in this.buildAssetsByReferenceId - assetsByReferenceId: Map; bundle: OutputBundle; } @@ -64,16 +62,12 @@ function addAssetToBundle(asset: Asset, output: OutputSpecificAssetData) { // TODO Lukas general assumption: Having a source means having a reliable filename // TODO Lukas only access filename during generate? Or disallow setSource if there is a fileName? export class FileEmitter { - private assetsByReferenceId: Map; + // TODO Lukas change everything to files instead of assets + private assetsByReferenceId: Map = new Map(); + private buildAssetsByReferenceId = this.assetsByReferenceId; private output: OutputSpecificAssetData | null = null; - constructor(assetsByReferenceId: Map) { - // TODO Lukas can this be moved here solely? - this.assetsByReferenceId = assetsByReferenceId; - } - public emitFile = (emittedFile: EmittedFile): string => { - console.log('emitFile', emittedFile); if (emittedFile.type !== 'asset') { throw new Error(`Unhandled file type ${emittedFile.type}`); } @@ -86,25 +80,17 @@ export class FileEmitter { if (this.output && source !== undefined) { addAssetToBundle(asset, this.output); } - return addWithNewReferenceId( - asset, - this.output ? this.output.assetsByReferenceId : this.assetsByReferenceId, - name - ); + return addWithNewReferenceId(asset, this.assetsByReferenceId, name); }; public finaliseAssets() { - const { assetsByReferenceId } = this.output as OutputSpecificAssetData; - for (const asset of assetsByReferenceId.values()) { - // TODO Lukas error: source not set + for (const asset of this.assetsByReferenceId.values()) { if (asset.source === undefined) error(errNoAssetSourceSet(asset.name)); } } public getFileName = (fileReferenceId: string) => { - const asset = (this.output ? this.output.assetsByReferenceId : this.assetsByReferenceId).get( - fileReferenceId - ); + const asset = this.assetsByReferenceId.get(fileReferenceId); if (!asset) return error(errAssetReferenceIdNotFoundForFilename(fileReferenceId)); // TODO Lukas error: source not set for filename if (asset.source === undefined) return error(errAssetNotFinalisedForFileName(asset)); @@ -112,9 +98,7 @@ export class FileEmitter { }; public setFileSource = (fileReferenceId: string, source?: string | Buffer) => { - const asset = (this.output ? this.output.assetsByReferenceId : this.assetsByReferenceId).get( - fileReferenceId - ); + const asset = this.assetsByReferenceId.get(fileReferenceId); if (!asset) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); // TODO Lukas can we allow this as long as output is not set? if (asset.source !== undefined) return error(errAssetSourceAlreadySet(asset)); @@ -125,7 +109,7 @@ export class FileEmitter { if (this.output) { // We must not modify the original assets to not interact with other outputs const assetWithSource = { ...asset, source }; - this.output.assetsByReferenceId.set(fileReferenceId, assetWithSource); + this.assetsByReferenceId.set(fileReferenceId, assetWithSource); addAssetToBundle(assetWithSource, this.output); } else { asset.source = source; @@ -134,12 +118,11 @@ export class FileEmitter { // TODO Lukas how do we unfinalize assets for different outputs that have their source set during generate? Test! public startOutput(outputBundle: OutputBundle, assetFileNames: string) { - console.log('startOutput'); - this.output = { - assetFileNames, - assetsByReferenceId: new Map(this.assetsByReferenceId), - bundle: outputBundle - }; + (this.assetsByReferenceId = new Map(this.buildAssetsByReferenceId)), + (this.output = { + assetFileNames, + bundle: outputBundle + }); for (const asset of this.assetsByReferenceId.values()) { if (asset.source !== undefined) { addAssetToBundle(asset, this.output); diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index df734d45e64..eebd749df1b 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -122,7 +122,7 @@ export function createPluginDriver( ...(options.plugins as Plugin[]), getRollupDefaultPlugin(options.preserveSymlinks as boolean) ]; - const fileEmitter = new FileEmitter(graph.assetsById); + const fileEmitter = new FileEmitter(); const existingPluginKeys = new Set(); let hasLoadersOrTransforms = false; diff --git a/test/chunking-form/samples/asset-emission/_config.js b/test/chunking-form/samples/asset-emission/_config.js index f768c296e23..9784a297436 100644 --- a/test/chunking-form/samples/asset-emission/_config.js +++ b/test/chunking-form/samples/asset-emission/_config.js @@ -2,7 +2,6 @@ const fs = require('fs'); const path = require('path'); module.exports = { - solo: true, description: 'supports emitting assets from plugin hooks', options: { input: ['main.js'], diff --git a/test/chunking-form/samples/configure-file-url/_config.js b/test/chunking-form/samples/configure-file-url/_config.js index 096d1a6ba36..9ee4fa22535 100644 --- a/test/chunking-form/samples/configure-file-url/_config.js +++ b/test/chunking-form/samples/configure-file-url/_config.js @@ -1,5 +1,4 @@ module.exports = { - solo: true, description: 'allows to configure file urls', options: { output: { diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-resolved-dfc93baf.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-resolved-dfc93baf.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-solved-9b321da2.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-solved-9b321da2.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-unresolved-9548436d.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-unresolved-9548436d.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js index b521ad4b012..75b9c9cfe8e 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js @@ -2,7 +2,7 @@ define(['require'], function (require) { 'use strict'; var asset2 = 'resolved'; - var asset3 = new URL(require.toUrl('assets/asset-unresolved-9548436d.txt'), document.baseURI).href; + var asset3 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; new Promise(function (resolve, reject) { require(['./nested/chunk'], resolve, reject) }).then(result => console.log(result, asset2, asset3)); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js index 2a8c640ebaf..c52ce8abedf 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/nested/chunk.js @@ -1,6 +1,6 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; - var solved = 'nested/chunk.js:solved:assets/asset-solved-9b321da2.txt:../assets/asset-solved-9b321da2.txt'; + var solved = 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'; exports.default = solved; diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-resolved-dfc93baf.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-resolved-dfc93baf.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-solved-9b321da2.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-solved-9b321da2.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-unresolved-9548436d.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-unresolved-9548436d.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/main.js index 8518bc0354c..3b5850e8d3c 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/main.js @@ -2,6 +2,6 @@ var asset2 = 'resolved'; -var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-9548436d.txt').href : new URL('assets/asset-unresolved-9548436d.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); new Promise(function (resolve) { resolve(require('./nested/chunk.js')); }).then(result => console.log(result, asset2, asset3)); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js index 42f557796ee..5ddc0c99e0d 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/cjs/nested/chunk.js @@ -1,5 +1,5 @@ 'use strict'; -var solved = 'nested/chunk.js:solved:assets/asset-solved-9b321da2.txt:../assets/asset-solved-9b321da2.txt'; +var solved = 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'; exports.default = solved; diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-resolved-dfc93baf.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-resolved-dfc93baf.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-solved-9b321da2.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-solved-9b321da2.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-unresolved-9548436d.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-unresolved-9548436d.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/main.js index f061c14feed..c78af2b3768 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/main.js @@ -1,5 +1,5 @@ var asset2 = 'resolved'; -var asset3 = new URL('assets/asset-unresolved-9548436d.txt', import.meta.url).href; +var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; import('./nested/chunk.js').then(result => console.log(result, asset2, asset3)); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js index 70feca23425..1af7c01e941 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/es/nested/chunk.js @@ -1,3 +1,3 @@ -var solved = 'nested/chunk.js:solved:assets/asset-solved-9b321da2.txt:../assets/asset-solved-9b321da2.txt'; +var solved = 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'; export default solved; diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-resolved-dfc93baf.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-resolved-dfc93baf.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-solved-9b321da2.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-solved-9b321da2.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-unresolved-9548436d.txt b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-unresolved-9548436d.txt rename to test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/main.js index ee045a93e6e..971fff86b4d 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/main.js @@ -5,7 +5,7 @@ System.register([], function (exports, module) { var asset2 = 'resolved'; - var asset3 = new URL('assets/asset-unresolved-9548436d.txt', module.meta.url).href; + var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; module.import('./nested/chunk.js').then(result => console.log(result, asset2, asset3)); diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/nested/chunk.js index 59d15ec5e1b..3bdc2610687 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/nested/chunk.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/system/nested/chunk.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var solved = exports('default', 'nested/chunk.js:solved:assets/asset-solved-9b321da2.txt:../assets/asset-solved-9b321da2.txt'); + var solved = exports('default', 'nested/chunk.js:solved:assets/asset-solved-28a7ac89.txt:../assets/asset-solved-28a7ac89.txt'); } }; diff --git a/test/form/samples/asset-emission/_config.js b/test/form/samples/asset-emission/_config.js index 7cfcffc7a82..bdf8e5fdfde 100644 --- a/test/form/samples/asset-emission/_config.js +++ b/test/form/samples/asset-emission/_config.js @@ -2,7 +2,6 @@ const fs = require('fs'); const path = require('path'); module.exports = { - solo: true, description: 'supports emitting assets from plugin hooks', options: { plugins: { diff --git a/test/form/samples/configure-file-url/_config.js b/test/form/samples/configure-file-url/_config.js index e9e808faac5..51f63117e90 100644 --- a/test/form/samples/configure-file-url/_config.js +++ b/test/form/samples/configure-file-url/_config.js @@ -1,5 +1,4 @@ module.exports = { - solo: true, description: 'allows to configure file urls', options: { plugins: [ diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/amd.js b/test/form/samples/deprecated/configure-asset-url/_expected/amd.js index f1ee229dca0..6ab335a4868 100644 --- a/test/form/samples/deprecated/configure-asset-url/_expected/amd.js +++ b/test/form/samples/deprecated/configure-asset-url/_expected/amd.js @@ -1,10 +1,10 @@ define(['require'], function (require) { 'use strict'; - var asset1 = 'amd.js:solved:assets/asset-solved-9b321da2.txt:assets/asset-solved-9b321da2.txt'; + var asset1 = 'amd.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; var asset2 = 'resolved'; - var asset3 = new URL(require.toUrl('assets/asset-unresolved-9548436d.txt'), document.baseURI).href; + var asset3 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-resolved-dfc93baf.txt b/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-resolved-dfc93baf.txt rename to test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-resolved-8bd22e6e.txt diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-solved-9b321da2.txt b/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-solved-9b321da2.txt rename to test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-solved-28a7ac89.txt diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-unresolved-9548436d.txt b/test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-unresolved-9548436d.txt rename to test/form/samples/deprecated/configure-asset-url/_expected/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/cjs.js b/test/form/samples/deprecated/configure-asset-url/_expected/cjs.js index 7b4374d5b06..bdd515403db 100644 --- a/test/form/samples/deprecated/configure-asset-url/_expected/cjs.js +++ b/test/form/samples/deprecated/configure-asset-url/_expected/cjs.js @@ -1,9 +1,9 @@ 'use strict'; -var asset1 = 'cjs.js:solved:assets/asset-solved-9b321da2.txt:assets/asset-solved-9b321da2.txt'; +var asset1 = 'cjs.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; var asset2 = 'resolved'; -var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-9548436d.txt').href : new URL('assets/asset-unresolved-9548436d.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/es.js b/test/form/samples/deprecated/configure-asset-url/_expected/es.js index 91697ce916a..35ee8b1dee0 100644 --- a/test/form/samples/deprecated/configure-asset-url/_expected/es.js +++ b/test/form/samples/deprecated/configure-asset-url/_expected/es.js @@ -1,7 +1,7 @@ -var asset1 = 'es.js:solved:assets/asset-solved-9b321da2.txt:assets/asset-solved-9b321da2.txt'; +var asset1 = 'es.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; var asset2 = 'resolved'; -var asset3 = new URL('assets/asset-unresolved-9548436d.txt', import.meta.url).href; +var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/iife.js b/test/form/samples/deprecated/configure-asset-url/_expected/iife.js index 6adb782db61..6ff9d4359f2 100644 --- a/test/form/samples/deprecated/configure-asset-url/_expected/iife.js +++ b/test/form/samples/deprecated/configure-asset-url/_expected/iife.js @@ -1,11 +1,11 @@ (function () { 'use strict'; - var asset1 = 'iife.js:solved:assets/asset-solved-9b321da2.txt:assets/asset-solved-9b321da2.txt'; + var asset1 = 'iife.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; var asset2 = 'resolved'; - var asset3 = new URL('assets/asset-unresolved-9548436d.txt', document.currentScript && document.currentScript.src || document.baseURI).href; + var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/system.js b/test/form/samples/deprecated/configure-asset-url/_expected/system.js index 1b2643e4385..f875262689a 100644 --- a/test/form/samples/deprecated/configure-asset-url/_expected/system.js +++ b/test/form/samples/deprecated/configure-asset-url/_expected/system.js @@ -3,11 +3,11 @@ System.register([], function (exports, module) { return { execute: function () { - var asset1 = 'system.js:solved:assets/asset-solved-9b321da2.txt:assets/asset-solved-9b321da2.txt'; + var asset1 = 'system.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; var asset2 = 'resolved'; - var asset3 = new URL('assets/asset-unresolved-9548436d.txt', module.meta.url).href; + var asset3 = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/umd.js b/test/form/samples/deprecated/configure-asset-url/_expected/umd.js index 8487ec43437..dcef1d548ee 100644 --- a/test/form/samples/deprecated/configure-asset-url/_expected/umd.js +++ b/test/form/samples/deprecated/configure-asset-url/_expected/umd.js @@ -3,11 +3,11 @@ factory(); }(function () { 'use strict'; - var asset1 = 'umd.js:solved:assets/asset-solved-9b321da2.txt:assets/asset-solved-9b321da2.txt'; + var asset1 = 'umd.js:solved:assets/asset-solved-28a7ac89.txt:assets/asset-solved-28a7ac89.txt'; var asset2 = 'resolved'; - var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-9548436d.txt').href : new URL('assets/asset-unresolved-9548436d.txt', document.currentScript && document.currentScript.src || document.baseURI).href); + var asset3 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); console.log(asset1, asset2, asset3); diff --git a/test/hooks/index.js b/test/hooks/index.js index 5d72300288f..b010229647e 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -447,13 +447,13 @@ describe('hooks', () => { .then(bundle => bundle.generate({ format: 'es' })) .then(({ output }) => { assert.equal(output[1].isAsset, true); - assert.equal(output[1].fileName, 'assets/test-19916f7d.ext'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); assert.equal(output[0].fileName, 'input.js'); assert.equal(output[0].isEntry, true); assert.equal( output[0].code, - `var input = new URL('assets/test-19916f7d.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` ); })); @@ -479,11 +479,11 @@ describe('hooks', () => { .then(({ output }) => { assert.equal( output[0].code, - `var input = new URL('assets/test-19916f7d.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` ); - assert.equal(output[1].fileName, 'assets/test-19916f7d.ext'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); - assert.equal(output[1].fileName, 'assets/test-19916f7d.ext'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); return rollup.rollup({ @@ -506,11 +506,11 @@ describe('hooks', () => { .then(({ output }) => { assert.equal( output[0].code, - `var input = new URL('assets/test-19916f7d.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` ); - assert.equal(output[1].fileName, 'assets/test-19916f7d.ext'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); - assert.equal(output[1].fileName, 'assets/test-19916f7d.ext'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); return rollup.rollup({ @@ -530,11 +530,11 @@ describe('hooks', () => { .then(({ output }) => { assert.equal( output[0].code, - `var input = new URL('assets/test-19916f7d.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` ); - assert.equal(output[1].fileName, 'assets/test-19916f7d.ext'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); - assert.equal(output[1].fileName, 'assets/test-19916f7d.ext'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); }); }); @@ -565,11 +565,11 @@ describe('hooks', () => { .then(({ output }) => { assert.equal( output[0].code, - `var input = new URL('assets/test-19916f7d.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` ); - assert.equal(output[1].fileName, 'assets/test-19916f7d.ext'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); - assert.equal(output[1].fileName, 'assets/test-19916f7d.ext'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); return rollup.rollup({ @@ -615,7 +615,7 @@ describe('hooks', () => { code, `'use strict'; -var input = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/test-19916f7d.ext').href : new URL('assets/test-19916f7d.ext', document.currentScript && document.currentScript.src || document.baseURI).href); +var input = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/test-0a676135.ext').href : new URL('assets/test-0a676135.ext', document.currentScript && document.currentScript.src || document.baseURI).href); module.exports = input; ` @@ -667,7 +667,7 @@ module.exports = input; }) .then(bundle => bundle.generate({ format: 'es' })) .then(({ output: [, output] }) => { - assert.equal(output.fileName, 'assets/test-19916f7d.ext'); + assert.equal(output.fileName, 'assets/test-0a676135.ext'); assert.equal(output.source, 'hello world'); }); }); @@ -816,10 +816,10 @@ module.exports = input; return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; }, generateBundle(options, outputBundle, isWrite) { - assert.equal(outputBundle['assets/test-19916f7d.ext'].source, 'hello world'); + assert.equal(outputBundle['assets/test-0a676135.ext'].source, 'hello world'); assert.equal( outputBundle['input.js'].code, - `var input = new URL('assets/test-19916f7d.ext', import.meta.url).href;\n\nexport default input;\n` + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` ); } } @@ -859,12 +859,12 @@ module.exports = input; assert.equal(output1.length, 3); assert.equal(output1[0].code, `alert('hello');\n`); assert.equal(output1[1].source, 'custom source'); - assert.equal(output1[2].source, `references assets/lateDepAsset-671f747d`); + assert.equal(output1[2].source, `references assets/lateDepAsset-91c07f3c`); assert.equal(output2.length, 3); assert.equal(output2[0].code, `'use strict';\n\nalert('hello');\n`); assert.equal(output2[1].source, 'different source'); - assert.equal(output2[2].source, `references assets/lateDepAsset-c107f5fc`); + assert.equal(output2[2].source, `references assets/lateDepAsset-0b0d4321`); })); it('supports errors thrown in the generateBundle hook', () => From 28258859f03509c6ad061995c8e2afef04265f8f Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sun, 7 Jul 2019 20:05:52 +0200 Subject: [PATCH 04/31] Implement emitFile for assets --- src/utils/pluginDriver.ts | 4 +- .../emit-files-from-various-hooks/_config.js | 14 ------ .../_config.js | 47 +++++++++++++++++++ .../_expected/amd/assets/banner-2b65cc0c.txt | 1 + .../amd/assets/buildEnd-4678f17a.txt | 1 + .../amd/assets/buildStart-5b740828.txt | 1 + .../_expected/amd/assets/footer-e1d2fccb.txt | 1 + .../amd/assets/generateBundle-22413744.txt | 1 + .../_expected/amd/assets/intro-520a8116.txt | 1 + .../_expected/amd/assets/load-a4cc2865.txt | 1 + .../amd/assets/outputOptions-d7fdb220.txt | 1 + .../_expected/amd/assets/outro-21f77720.txt | 1 + .../amd/assets/renderChunk-a91c7c32.txt | 1 + .../amd/assets/renderStart-66600c78.txt | 1 + .../amd/assets/resolveId-6d8063a5.txt | 1 + .../amd/assets/transform-d49df25a.txt | 1 + .../_expected/amd/main.js | 0 .../_expected/cjs/assets/banner-2b65cc0c.txt | 1 + .../cjs/assets/buildEnd-4678f17a.txt | 1 + .../cjs/assets/buildStart-5b740828.txt | 1 + .../_expected/cjs/assets/footer-e1d2fccb.txt | 1 + .../cjs/assets/generateBundle-22413744.txt | 1 + .../_expected/cjs/assets/intro-520a8116.txt | 1 + .../_expected/cjs/assets/load-a4cc2865.txt | 1 + .../cjs/assets/outputOptions-d7fdb220.txt | 1 + .../_expected/cjs/assets/outro-21f77720.txt | 1 + .../cjs/assets/renderChunk-a91c7c32.txt | 1 + .../cjs/assets/renderStart-66600c78.txt | 1 + .../cjs/assets/resolveId-6d8063a5.txt | 1 + .../cjs/assets/transform-d49df25a.txt | 1 + .../_expected/cjs/main.js | 0 .../_expected/es/assets/banner-2b65cc0c.txt | 1 + .../_expected/es/assets/buildEnd-4678f17a.txt | 1 + .../es/assets/buildStart-5b740828.txt | 1 + .../_expected/es/assets/footer-e1d2fccb.txt | 1 + .../es/assets/generateBundle-22413744.txt | 1 + .../_expected/es/assets/intro-520a8116.txt | 1 + .../_expected/es/assets/load-a4cc2865.txt | 1 + .../es/assets/outputOptions-d7fdb220.txt | 1 + .../_expected/es/assets/outro-21f77720.txt | 1 + .../es/assets/renderChunk-a91c7c32.txt | 1 + .../es/assets/renderStart-66600c78.txt | 1 + .../es/assets/resolveId-6d8063a5.txt | 1 + .../es/assets/transform-d49df25a.txt | 1 + .../_expected/es/main.js | 0 .../system/assets/banner-2b65cc0c.txt | 1 + .../system/assets/buildEnd-4678f17a.txt | 1 + .../system/assets/buildStart-5b740828.txt | 1 + .../system/assets/footer-e1d2fccb.txt | 1 + .../system/assets/generateBundle-22413744.txt | 1 + .../system/assets/intro-520a8116.txt | 1 + .../_expected/system/assets/load-a4cc2865.txt | 1 + .../system/assets/outputOptions-d7fdb220.txt | 1 + .../system/assets/outro-21f77720.txt | 1 + .../system/assets/renderChunk-a91c7c32.txt | 1 + .../system/assets/renderStart-66600c78.txt | 1 + .../system/assets/resolveId-6d8063a5.txt | 1 + .../system/assets/transform-d49df25a.txt | 1 + .../_expected/system/main.js | 0 .../main.js | 0 60 files changed, 100 insertions(+), 17 deletions(-) delete mode 100644 test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_config.js create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_config.js create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/intro-520a8116.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outro-21f77720.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt rename test/chunking-form/samples/emit-file/{emit-files-from-various-hooks => emits-assets-from-various-hooks}/_expected/amd/main.js (100%) create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt rename test/chunking-form/samples/emit-file/{emit-files-from-various-hooks => emits-assets-from-various-hooks}/_expected/cjs/main.js (100%) create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/intro-520a8116.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/load-a4cc2865.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outro-21f77720.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/transform-d49df25a.txt rename test/chunking-form/samples/emit-file/{emit-files-from-various-hooks => emits-assets-from-various-hooks}/_expected/es/main.js (100%) create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/intro-520a8116.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/load-a4cc2865.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outro-21f77720.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt create mode 100644 test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/transform-d49df25a.txt rename test/chunking-form/samples/emit-file/{emit-files-from-various-hooks => emits-assets-from-various-hooks}/_expected/system/main.js (100%) rename test/chunking-form/samples/emit-file/{emit-files-from-various-hooks => emits-assets-from-various-hooks}/main.js (100%) diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index eebd749df1b..00044177d21 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -166,9 +166,7 @@ export function createPluginDriver( this.error(errInvalidRollupPhaseForEmitChunk()); return pluginDriver.emitChunk(id, options); }, - emitFile(emittedFile) { - throw new Error('Not implemented ' + emittedFile); - }, + emitFile: fileEmitter.emitFile, error(err): never { if (typeof err === 'string') err = { message: err }; if (err.code) err.pluginCode = err.code; diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_config.js b/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_config.js deleted file mode 100644 index 011e39805f7..00000000000 --- a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_config.js +++ /dev/null @@ -1,14 +0,0 @@ -// TODO Lukas implement this -module.exports = { - // solo: true, - skip: true, - description: 'supports emitting files from plugin hooks', - options: { - input: ['main.js'], - plugins: { - buildStart() { - this.emitFile({ type: 'file', fileName: 'buildStart.txt', source: 'This is buildStart' }); - } - } - } -}; diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_config.js b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_config.js new file mode 100644 index 00000000000..79de2d6fa37 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_config.js @@ -0,0 +1,47 @@ +module.exports = { + description: 'supports emitting assets from plugin hooks', + options: { + input: ['main.js'], + plugins: { + buildStart() { + this.emitFile({ type: 'asset', name: 'buildStart.txt', source: 'buildStart' }); + }, + resolveId() { + this.emitFile({ type: 'asset', name: 'resolveId.txt', source: 'resolveId' }); + }, + load() { + this.emitFile({ type: 'asset', name: 'load.txt', source: 'load' }); + }, + transform() { + this.emitFile({ type: 'asset', name: 'transform.txt', source: 'transform' }); + }, + buildEnd() { + this.emitFile({ type: 'asset', name: 'buildEnd.txt', source: 'buildEnd' }); + }, + outputOptions() { + this.emitFile({ type: 'asset', name: 'outputOptions.txt', source: 'outputOptions' }); + }, + renderStart() { + this.emitFile({ type: 'asset', name: 'renderStart.txt', source: 'renderStart' }); + }, + banner() { + this.emitFile({ type: 'asset', name: 'banner.txt', source: 'banner' }); + }, + footer() { + this.emitFile({ type: 'asset', name: 'footer.txt', source: 'footer' }); + }, + intro() { + this.emitFile({ type: 'asset', name: 'intro.txt', source: 'intro' }); + }, + outro() { + this.emitFile({ type: 'asset', name: 'outro.txt', source: 'outro' }); + }, + renderChunk() { + this.emitFile({ type: 'asset', name: 'renderChunk.txt', source: 'renderChunk' }); + }, + generateBundle() { + this.emitFile({ type: 'asset', name: 'generateBundle.txt', source: 'generateBundle' }); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt new file mode 100644 index 00000000000..bbb07acb9fc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt @@ -0,0 +1 @@ +buildEnd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt new file mode 100644 index 00000000000..0cb77258e0a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt @@ -0,0 +1 @@ +buildStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt new file mode 100644 index 00000000000..de472563b28 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt @@ -0,0 +1 @@ +generateBundle \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/intro-520a8116.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/intro-520a8116.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt new file mode 100644 index 00000000000..024e67c1f24 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt @@ -0,0 +1 @@ +load \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt new file mode 100644 index 00000000000..46a687a3cb2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt @@ -0,0 +1 @@ +outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outro-21f77720.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outro-21f77720.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt new file mode 100644 index 00000000000..53029113abd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt @@ -0,0 +1 @@ +resolveId \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt new file mode 100644 index 00000000000..3f001116657 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt @@ -0,0 +1 @@ +transform \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/amd/main.js rename to test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/main.js diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt new file mode 100644 index 00000000000..bbb07acb9fc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt @@ -0,0 +1 @@ +buildEnd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt new file mode 100644 index 00000000000..0cb77258e0a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt @@ -0,0 +1 @@ +buildStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt new file mode 100644 index 00000000000..de472563b28 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt @@ -0,0 +1 @@ +generateBundle \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt new file mode 100644 index 00000000000..024e67c1f24 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt @@ -0,0 +1 @@ +load \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt new file mode 100644 index 00000000000..46a687a3cb2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt @@ -0,0 +1 @@ +outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt new file mode 100644 index 00000000000..53029113abd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt @@ -0,0 +1 @@ +resolveId \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt new file mode 100644 index 00000000000..3f001116657 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt @@ -0,0 +1 @@ +transform \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/cjs/main.js rename to test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/main.js diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt new file mode 100644 index 00000000000..bbb07acb9fc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt @@ -0,0 +1 @@ +buildEnd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt new file mode 100644 index 00000000000..0cb77258e0a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt @@ -0,0 +1 @@ +buildStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt new file mode 100644 index 00000000000..de472563b28 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt @@ -0,0 +1 @@ +generateBundle \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/intro-520a8116.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/intro-520a8116.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/load-a4cc2865.txt new file mode 100644 index 00000000000..024e67c1f24 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/load-a4cc2865.txt @@ -0,0 +1 @@ +load \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt new file mode 100644 index 00000000000..46a687a3cb2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt @@ -0,0 +1 @@ +outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outro-21f77720.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outro-21f77720.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt new file mode 100644 index 00000000000..53029113abd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt @@ -0,0 +1 @@ +resolveId \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/transform-d49df25a.txt new file mode 100644 index 00000000000..3f001116657 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/transform-d49df25a.txt @@ -0,0 +1 @@ +transform \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/es/main.js b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/es/main.js rename to test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/main.js diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt new file mode 100644 index 00000000000..bbb07acb9fc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt @@ -0,0 +1 @@ +buildEnd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt new file mode 100644 index 00000000000..0cb77258e0a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt @@ -0,0 +1 @@ +buildStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt new file mode 100644 index 00000000000..de472563b28 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt @@ -0,0 +1 @@ +generateBundle \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/intro-520a8116.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/intro-520a8116.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/load-a4cc2865.txt new file mode 100644 index 00000000000..024e67c1f24 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/load-a4cc2865.txt @@ -0,0 +1 @@ +load \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt new file mode 100644 index 00000000000..46a687a3cb2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt @@ -0,0 +1 @@ +outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outro-21f77720.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outro-21f77720.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt new file mode 100644 index 00000000000..53029113abd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt @@ -0,0 +1 @@ +resolveId \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/transform-d49df25a.txt new file mode 100644 index 00000000000..3f001116657 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/transform-d49df25a.txt @@ -0,0 +1 @@ +transform \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/system/main.js b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-files-from-various-hooks/_expected/system/main.js rename to test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/main.js diff --git a/test/chunking-form/samples/emit-file/emit-files-from-various-hooks/main.js b/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-files-from-various-hooks/main.js rename to test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/main.js From aeb81ff5ebd901d421c4977d0808e7d3ac6c0322 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Mon, 8 Jul 2019 08:36:47 +0200 Subject: [PATCH 05/31] Internally use EmittedFile in the file emitter --- src/rollup/types.d.ts | 13 +++--- src/utils/FileEmitter.ts | 91 ++++++++++++++++++++++----------------- src/utils/error.ts | 14 +++--- src/utils/referenceIds.ts | 1 + 4 files changed, 67 insertions(+), 52 deletions(-) diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index db37e965ad1..7b9e1bc607d 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -120,6 +120,7 @@ export interface EmittedChunk { options: { name?: string } | undefined; } +// TODO Lukas get rid of this type export interface Asset { fileName: string; name: string; @@ -142,12 +143,14 @@ export type EmitChunk = (name: string, options?: { name?: string }) => string; // TODO Lukas do not forget caching tests for files // TODO Lukas can there be interactions in names between multiple outputs? +export interface EmittedAsset { + name: string; + source?: string | Buffer; + type: 'asset'; +} + export type EmittedFile = - | { - name: string; - source?: string | Buffer; - type: 'asset'; - } + | EmittedAsset | { entryId: string; name?: string; diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index a8a9cae5d53..d6573a406c6 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -1,5 +1,5 @@ import sha256 from 'hash.js/lib/hash/sha/256'; -import { Asset, EmittedFile, OutputBundle } from '../rollup/types'; +import { EmittedAsset, EmittedFile, OutputBundle } from '../rollup/types'; import { errAssetNotFinalisedForFileName, errAssetReferenceIdNotFoundForFilename, @@ -16,15 +16,16 @@ import { isPlainName } from './relativeId'; import { makeUnique, renderNamePattern } from './renderNamePattern'; // TODO Lukas setFileSource in transform needs to be repeated as well -interface OutputSpecificAssetData { +interface OutputSpecificFileData { assetFileNames: string; + assignedFileNames: Map; bundle: OutputBundle; } function getAssetFileName( name: string, source: string | Buffer, - output: OutputSpecificAssetData + output: OutputSpecificFileData ): string { return makeUnique( renderNamePattern(output.assetFileNames, 'assetFileNames', placeholder => { @@ -49,9 +50,11 @@ function getAssetFileName( ); } -function addAssetToBundle(asset: Asset, output: OutputSpecificAssetData) { +type EmittedAssetWithSource = EmittedAsset & { source: string | Buffer }; + +function addAssetToBundle(asset: EmittedAssetWithSource, output: OutputSpecificFileData) { const fileName = getAssetFileName(asset.name, asset.source, output); - asset.fileName = fileName; + output.assignedFileNames.set(asset, fileName); output.bundle[fileName] = { fileName, isAsset: true, @@ -62,70 +65,78 @@ function addAssetToBundle(asset: Asset, output: OutputSpecificAssetData) { // TODO Lukas general assumption: Having a source means having a reliable filename // TODO Lukas only access filename during generate? Or disallow setSource if there is a fileName? export class FileEmitter { - // TODO Lukas change everything to files instead of assets - private assetsByReferenceId: Map = new Map(); - private buildAssetsByReferenceId = this.assetsByReferenceId; - private output: OutputSpecificAssetData | null = null; + private filesByReferenceId: Map = new Map(); + // tslint:disable member-ordering + private buildFilesByReferenceId = this.filesByReferenceId; + private output: OutputSpecificFileData | null = null; public emitFile = (emittedFile: EmittedFile): string => { if (emittedFile.type !== 'asset') { throw new Error(`Unhandled file type ${emittedFile.type}`); } - const { name, source } = emittedFile; - if (typeof name !== 'string' || !isPlainName(name)) { - return error(errInvalidAssetName(name as any)); + if (typeof emittedFile.name !== 'string' || !isPlainName(emittedFile.name)) { + return error(errInvalidAssetName(emittedFile.name)); } - // TODO Lukas allow fileName to be undefined or null in type - const asset: Asset = { name, source: source as string | Buffer, fileName: undefined as any }; - if (this.output && source !== undefined) { - addAssetToBundle(asset, this.output); + if (this.output && emittedFile.source !== undefined) { + addAssetToBundle(emittedFile as EmittedAssetWithSource, this.output); } - return addWithNewReferenceId(asset, this.assetsByReferenceId, name); + return addWithNewReferenceId(emittedFile, this.filesByReferenceId, emittedFile.name); }; public finaliseAssets() { - for (const asset of this.assetsByReferenceId.values()) { - if (asset.source === undefined) error(errNoAssetSourceSet(asset.name)); + for (const emittedFile of this.filesByReferenceId.values()) { + if (emittedFile.type === 'asset' && emittedFile.source === undefined) + error(errNoAssetSourceSet(emittedFile.name)); } } public getFileName = (fileReferenceId: string) => { - const asset = this.assetsByReferenceId.get(fileReferenceId); - if (!asset) return error(errAssetReferenceIdNotFoundForFilename(fileReferenceId)); - // TODO Lukas error: source not set for filename - if (asset.source === undefined) return error(errAssetNotFinalisedForFileName(asset)); - return asset.fileName; + const emittedFile = this.filesByReferenceId.get(fileReferenceId); + if (!emittedFile) return error(errAssetReferenceIdNotFoundForFilename(fileReferenceId)); + // TODO Lukas and there is no pre-assigned name + if (!this.output) { + // TODO Lukas proper error + throw new Error('Cannot get file name during build phase'); + } + const fileName = this.output.assignedFileNames.get(emittedFile); + if (typeof fileName !== 'string') { + return error(errAssetNotFinalisedForFileName(emittedFile.name)); + } + return fileName; }; + // TODO Lukas this should only be allowed + // - unlimited times during build phase or + // - at most once during generate phase if no source has been set yet public setFileSource = (fileReferenceId: string, source?: string | Buffer) => { - const asset = this.assetsByReferenceId.get(fileReferenceId); - if (!asset) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); - // TODO Lukas can we allow this as long as output is not set? - if (asset.source !== undefined) return error(errAssetSourceAlreadySet(asset)); + const emittedFile = this.filesByReferenceId.get(fileReferenceId); + if (!emittedFile) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); + if (emittedFile.source !== undefined) return error(errAssetSourceAlreadySet(emittedFile.name)); // TODO Lukas check for string | Buffer instead? if (typeof source !== 'string' && !source) { - return error(errAssetSourceMissingForSetSource(asset)); + return error(errAssetSourceMissingForSetSource(emittedFile.name)); } if (this.output) { // We must not modify the original assets to not interact with other outputs - const assetWithSource = { ...asset, source }; - this.assetsByReferenceId.set(fileReferenceId, assetWithSource); + const assetWithSource = { ...emittedFile, source }; + this.filesByReferenceId.set(fileReferenceId, assetWithSource); addAssetToBundle(assetWithSource, this.output); } else { - asset.source = source; + emittedFile.source = source; } }; // TODO Lukas how do we unfinalize assets for different outputs that have their source set during generate? Test! public startOutput(outputBundle: OutputBundle, assetFileNames: string) { - (this.assetsByReferenceId = new Map(this.buildAssetsByReferenceId)), - (this.output = { - assetFileNames, - bundle: outputBundle - }); - for (const asset of this.assetsByReferenceId.values()) { - if (asset.source !== undefined) { - addAssetToBundle(asset, this.output); + this.filesByReferenceId = new Map(this.buildFilesByReferenceId); + this.output = { + assetFileNames, + assignedFileNames: new Map(), + bundle: outputBundle + }; + for (const emittedFile of this.filesByReferenceId.values()) { + if (emittedFile.source !== undefined) { + addAssetToBundle(emittedFile as EmittedAssetWithSource, this.output); } } } diff --git a/src/utils/error.ts b/src/utils/error.ts index 0b083199183..7177425ec5b 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -1,6 +1,6 @@ import { locate } from 'locate-character'; import Module from '../Module'; -import { Asset, RollupError, RollupWarning } from '../rollup/types'; +import { RollupError, RollupWarning } from '../rollup/types'; import getCodeFrame from './getCodeFrame'; import relativeId from './relativeId'; @@ -51,10 +51,10 @@ export enum Errors { UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT' } -export function errAssetNotFinalisedForFileName(asset: Asset) { +export function errAssetNotFinalisedForFileName(name: string) { return { code: Errors.ASSET_NOT_FINALISED, - message: `Plugin error - Unable to get file name for asset "${asset.name}". Ensure that the source is set and that generate is called first.` + message: `Plugin error - Unable to get file name for asset "${name}". Ensure that the source is set and that generate is called first.` }; } @@ -79,17 +79,17 @@ export function errAssetReferenceIdNotFoundForSetSource(assetReferenceId: string }; } -export function errAssetSourceAlreadySet(asset: Asset) { +export function errAssetSourceAlreadySet(name: string) { return { code: Errors.ASSET_SOURCE_ALREADY_SET, - message: `Plugin error - Unable to set the source for asset "${asset.name}", source already set.` + message: `Plugin error - Unable to set the source for asset "${name}", source already set.` }; } -export function errAssetSourceMissingForSetSource(asset: Asset) { +export function errAssetSourceMissingForSetSource(name: string) { return { code: Errors.ASSET_SOURCE_MISSING, - message: `Plugin error creating asset "${asset.name}", setAssetSource call without a source.` + message: `Plugin error creating asset "${name}", setAssetSource call without a source.` }; } diff --git a/src/utils/referenceIds.ts b/src/utils/referenceIds.ts index f4e4665f525..1df779c6452 100644 --- a/src/utils/referenceIds.ts +++ b/src/utils/referenceIds.ts @@ -1,5 +1,6 @@ import sha256 from 'hash.js/lib/hash/sha/256'; +// TODO Lukas inline into FileEmitter export function addWithNewReferenceId(item: T, idMap: Map, hashBase: string): string { let referenceId: string | undefined; do { From 2d9e8fd3e9a7719546ee14e234bb4d2350edb6fc Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 10 Jul 2019 08:23:13 +0200 Subject: [PATCH 06/31] Deprecate emitAsset and ROLLUP_ASSET_URL --- src/Module.ts | 26 +- src/ModuleLoader.ts | 6 +- src/ast/nodes/MetaProperty.ts | 35 +- src/ast/nodes/VariableDeclaration.ts | 1 + src/rollup/index.ts | 1 + src/rollup/types.d.ts | 7 +- src/utils/FileEmitter.ts | 7 +- src/utils/pluginDriver.ts | 18 +- src/utils/transform.ts | 23 +- .../_config.js | 3 +- .../amd/assets/asset-resolved-8bd22e6e.txt | 0 .../amd/assets/asset-solved-28a7ac89.txt | 0 .../amd/assets/asset-unresolved-8dcd7fca.txt | 0 .../_expected/amd/main.js | 0 .../_expected/amd/nested/chunk.js | 0 .../_expected/amd/nested/chunk2.js | 0 .../cjs/assets/asset-resolved-8bd22e6e.txt | 0 .../cjs/assets/asset-solved-28a7ac89.txt | 0 .../cjs/assets/asset-unresolved-8dcd7fca.txt | 0 .../_expected/cjs/main.js | 0 .../_expected/cjs/nested/chunk.js | 0 .../_expected/cjs/nested/chunk2.js | 0 .../es/assets/asset-resolved-8bd22e6e.txt | 0 .../es/assets/asset-solved-28a7ac89.txt | 0 .../es/assets/asset-unresolved-8dcd7fca.txt | 0 .../_expected/es/main.js | 0 .../_expected/es/nested/chunk.js | 0 .../_expected/es/nested/chunk2.js | 0 .../system/assets/asset-resolved-8bd22e6e.txt | 0 .../system/assets/asset-solved-28a7ac89.txt | 0 .../assets/asset-unresolved-8dcd7fca.txt | 0 .../_expected/system/main.js | 0 .../_expected/system/nested/chunk.js | 0 .../_expected/system/nested/chunk2.js | 0 .../chunk.js | 0 .../main.js | 0 .../emit-asset}/_config.js | 1 + .../_expected/amd/assets/logo1-a5ec488b.svg | 0 .../_expected/amd/assets/logo2-c943ca3c.svg | 0 .../emit-asset}/_expected/amd/main.js | 0 .../emit-asset}/_expected/amd/nested/chunk.js | 0 .../_expected/amd/nested/chunk2.js | 0 .../_expected/cjs/assets/logo1-a5ec488b.svg | 0 .../_expected/cjs/assets/logo2-c943ca3c.svg | 0 .../emit-asset}/_expected/cjs/main.js | 0 .../emit-asset}/_expected/cjs/nested/chunk.js | 0 .../_expected/cjs/nested/chunk2.js | 0 .../_expected/es/assets/logo1-a5ec488b.svg | 0 .../_expected/es/assets/logo2-c943ca3c.svg | 0 .../emit-asset}/_expected/es/main.js | 0 .../emit-asset}/_expected/es/nested/chunk.js | 0 .../emit-asset}/_expected/es/nested/chunk2.js | 0 .../system/assets/logo1-a5ec488b.svg | 0 .../system/assets/logo2-c943ca3c.svg | 0 .../emit-asset}/_expected/system/main.js | 0 .../_expected/system/nested/chunk.js | 0 .../_expected/system/nested/chunk2.js | 0 .../emit-asset}/index-amd.html | 0 .../emit-asset}/index-es.html | 0 .../emit-asset}/index-system.html | 0 .../emit-asset}/logo1.svg | 0 .../emit-asset}/logo2.svg | 0 .../emit-asset}/main.js | 0 .../emit-asset}/nested.js | 0 .../emit-asset}/show-image.js | 0 .../emit-file/asset-file-names/_config.js | 15 + .../_expected/amd/main.js | 0 .../_expected/amd/txt/7468331f-test.txt | 1 + .../_expected/cjs/main.js | 0 .../_expected/cjs/txt/7468331f-test.txt | 1 + .../_expected/es/main.js | 0 .../_expected/es/txt/7468331f-test.txt | 1 + .../_expected/system/main.js | 0 .../_expected/system/txt/7468331f-test.txt | 1 + .../main.js | 0 .../_config.js | 0 .../_expected/amd/assets/banner-2b65cc0c.txt | 0 .../amd/assets/buildEnd-4678f17a.txt | 0 .../amd/assets/buildStart-5b740828.txt | 0 .../_expected/amd/assets/footer-e1d2fccb.txt | 0 .../amd/assets/generateBundle-22413744.txt | 0 .../_expected/amd/assets/intro-520a8116.txt | 0 .../_expected/amd/assets/load-a4cc2865.txt | 0 .../amd/assets/outputOptions-d7fdb220.txt | 0 .../_expected/amd/assets/outro-21f77720.txt | 0 .../amd/assets/renderChunk-a91c7c32.txt | 0 .../amd/assets/renderStart-66600c78.txt | 0 .../amd/assets/resolveId-6d8063a5.txt | 0 .../amd/assets/transform-d49df25a.txt | 0 .../_expected/amd/main.js} | 0 .../_expected/cjs/assets/banner-2b65cc0c.txt | 0 .../cjs/assets/buildEnd-4678f17a.txt | 0 .../cjs/assets/buildStart-5b740828.txt | 0 .../_expected/cjs/assets/footer-e1d2fccb.txt | 0 .../cjs/assets/generateBundle-22413744.txt | 0 .../_expected/cjs/assets/intro-520a8116.txt | 0 .../_expected/cjs/assets/load-a4cc2865.txt | 0 .../cjs/assets/outputOptions-d7fdb220.txt | 0 .../_expected/cjs/assets/outro-21f77720.txt | 0 .../cjs/assets/renderChunk-a91c7c32.txt | 0 .../cjs/assets/renderStart-66600c78.txt | 0 .../cjs/assets/resolveId-6d8063a5.txt | 0 .../cjs/assets/transform-d49df25a.txt | 0 .../_expected/cjs/main.js} | 0 .../_expected/es/assets/banner-2b65cc0c.txt | 0 .../_expected/es/assets/buildEnd-4678f17a.txt | 0 .../es/assets/buildStart-5b740828.txt | 0 .../_expected/es/assets/footer-e1d2fccb.txt | 0 .../es/assets/generateBundle-22413744.txt | 0 .../_expected/es/assets/intro-520a8116.txt | 0 .../_expected/es/assets/load-a4cc2865.txt | 0 .../es/assets/outputOptions-d7fdb220.txt | 0 .../_expected/es/assets/outro-21f77720.txt | 0 .../es/assets/renderChunk-a91c7c32.txt | 0 .../es/assets/renderStart-66600c78.txt | 0 .../es/assets/resolveId-6d8063a5.txt | 0 .../es/assets/transform-d49df25a.txt | 0 .../_expected/es/main.js} | 0 .../system/assets/banner-2b65cc0c.txt | 0 .../system/assets/buildEnd-4678f17a.txt | 0 .../system/assets/buildStart-5b740828.txt | 0 .../system/assets/footer-e1d2fccb.txt | 0 .../system/assets/generateBundle-22413744.txt | 0 .../system/assets/intro-520a8116.txt | 0 .../_expected/system/assets/load-a4cc2865.txt | 0 .../system/assets/outputOptions-d7fdb220.txt | 0 .../system/assets/outro-21f77720.txt | 0 .../system/assets/renderChunk-a91c7c32.txt | 0 .../system/assets/renderStart-66600c78.txt | 0 .../system/assets/resolveId-6d8063a5.txt | 0 .../system/assets/transform-d49df25a.txt | 0 .../_expected/system/main.js} | 0 .../emits-files-from-various-hooks/main.js | 1 + .../emit-file/reference-files/_config.js | 29 + .../_expected/amd/assets/logo1-a5ec488b.svg | 3 + .../_expected/amd/assets/logo2-c943ca3c.svg | 3 + .../reference-files/_expected/amd/main.js | 8 + .../_expected/amd/nested/chunk.js | 14 + .../_expected/amd/nested/chunk2.js | 7 + .../_expected/cjs/assets/logo1-a5ec488b.svg | 3 + .../_expected/cjs/assets/logo2-c943ca3c.svg | 3 + .../reference-files/_expected/cjs/main.js | 8 + .../_expected/cjs/nested/chunk.js | 12 + .../_expected/cjs/nested/chunk2.js | 7 + .../_expected/es/assets/logo1-a5ec488b.svg | 3 + .../_expected/es/assets/logo2-c943ca3c.svg | 3 + .../reference-files/_expected/es/main.js | 6 + .../_expected/es/nested/chunk.js | 10 + .../_expected/es/nested/chunk2.js | 5 + .../system/assets/logo1-a5ec488b.svg | 3 + .../system/assets/logo2-c943ca3c.svg | 3 + .../reference-files/_expected/system/main.js | 17 + .../_expected/system/nested/chunk.js | 19 + .../_expected/system/nested/chunk2.js | 16 + .../emit-file/reference-files/index-amd.html | 10 + .../emit-file/reference-files/index-es.html | 10 + .../reference-files/index-system.html | 11 + .../emit-file/reference-files/logo1.svg | 3 + .../emit-file/reference-files/logo2.svg | 3 + .../samples/emit-file/reference-files/main.js | 5 + .../emit-file/reference-files/nested.js | 4 + .../emit-file/reference-files/show-image.js | 8 + .../emit-file/set-asset-source/_config.js | 58 ++ .../_expected/amd/assets/banner-2b65cc0c.txt | 1 + .../_expected/amd/assets/footer-e1d2fccb.txt | 1 + .../amd/assets/generateBundle-ea61028d.txt | 1 + .../assets/generateBundle-format-78d67aa8.txt | 1 + .../_expected/amd/assets/intro-520a8116.txt | 1 + .../_expected/amd/assets/outro-21f77720.txt | 1 + .../amd/assets/renderChunk-a91c7c32.txt | 1 + .../amd/assets/renderStart-66600c78.txt | 1 + .../set-asset-source/_expected/amd/main.js | 17 + .../_expected/cjs/assets/banner-2b65cc0c.txt | 1 + .../_expected/cjs/assets/footer-e1d2fccb.txt | 1 + .../cjs/assets/generateBundle-7ba089df.txt | 1 + .../assets/generateBundle-format-ef46b0c8.txt | 1 + .../_expected/cjs/assets/intro-520a8116.txt | 1 + .../_expected/cjs/assets/outro-21f77720.txt | 1 + .../cjs/assets/renderChunk-a91c7c32.txt | 1 + .../cjs/assets/renderStart-66600c78.txt | 1 + .../set-asset-source/_expected/cjs/main.js | 15 + .../_expected/es/assets/banner-2b65cc0c.txt | 1 + .../_expected/es/assets/footer-e1d2fccb.txt | 1 + .../es/assets/generateBundle-7e84678a.txt | 1 + .../assets/generateBundle-format-8b573c58.txt | 1 + .../_expected/es/assets/intro-520a8116.txt | 1 + .../_expected/es/assets/outro-21f77720.txt | 1 + .../es/assets/renderChunk-a91c7c32.txt | 1 + .../es/assets/renderStart-66600c78.txt | 1 + .../set-asset-source/_expected/es/main.js | 7 + .../system/assets/banner-2b65cc0c.txt | 1 + .../system/assets/footer-e1d2fccb.txt | 1 + .../system/assets/generateBundle-dd5a26a4.txt | 1 + .../assets/generateBundle-format-7df86840.txt | 1 + .../system/assets/intro-520a8116.txt | 1 + .../system/assets/outro-21f77720.txt | 1 + .../system/assets/renderChunk-a91c7c32.txt | 1 + .../system/assets/renderStart-66600c78.txt | 1 + .../set-asset-source/_expected/system/main.js | 14 + .../emit-file/set-asset-source/main.js | 1 + .../samples/render-chunk/_config.js | 24 + .../render-chunk/_expected/amd/chunk-chunk.js | 12 + .../render-chunk/_expected/amd/main1.js | 12 + .../render-chunk/_expected/amd/main2.js | 12 + .../render-chunk/_expected/cjs/chunk-chunk.js | 10 + .../render-chunk/_expected/cjs/main1.js | 12 + .../render-chunk/_expected/cjs/main2.js | 12 + .../render-chunk/_expected/es/chunk-chunk.js | 8 + .../render-chunk/_expected/es/main1.js | 10 + .../render-chunk/_expected/es/main2.js | 10 + .../_expected/system/chunk-chunk.js | 15 + .../render-chunk/_expected/system/main1.js | 21 + .../render-chunk/_expected/system/main2.js | 21 + .../samples/render-chunk/dep1.js | 1 + .../samples/render-chunk/dep2.js | 1 + .../samples/render-chunk/dep3.js | 1 + .../samples/render-chunk/main1.js | 4 + .../samples/render-chunk/main2.js | 4 + .../samples/resolve-file-url/_config.js | 51 ++ .../amd/assets/asset-resolved-8bd22e6e.txt | 1 + .../amd/assets/asset-solved-28a7ac89.txt | 1 + .../amd/assets/asset-unresolved-8dcd7fca.txt | 1 + .../resolve-file-url/_expected/amd/main.js | 11 + .../_expected/amd/nested/chunk.js | 5 + .../_expected/amd/nested/chunk2.js | 9 + .../cjs/assets/asset-resolved-8bd22e6e.txt | 1 + .../cjs/assets/asset-solved-28a7ac89.txt | 1 + .../cjs/assets/asset-unresolved-8dcd7fca.txt | 1 + .../resolve-file-url/_expected/cjs/main.js | 9 + .../_expected/cjs/nested/chunk.js | 3 + .../_expected/cjs/nested/chunk2.js | 7 + .../es/assets/asset-resolved-8bd22e6e.txt | 1 + .../es/assets/asset-solved-28a7ac89.txt | 1 + .../es/assets/asset-unresolved-8dcd7fca.txt | 1 + .../resolve-file-url/_expected/es/main.js | 7 + .../_expected/es/nested/chunk.js | 1 + .../_expected/es/nested/chunk2.js | 4 + .../system/assets/asset-resolved-8bd22e6e.txt | 1 + .../system/assets/asset-solved-28a7ac89.txt | 1 + .../assets/asset-unresolved-8dcd7fca.txt | 1 + .../resolve-file-url/_expected/system/main.js | 16 + .../_expected/system/nested/chunk.js | 10 + .../_expected/system/nested/chunk2.js | 11 + .../samples/resolve-file-url/chunk.js | 1 + .../samples/resolve-file-url/main.js | 5 + .../samples/configure-file-url/_config.js | 20 +- .../configure-file-url/_expected/amd.js | 2 +- .../configure-file-url/_expected/cjs.js | 2 +- .../configure-file-url/_expected/es.js | 2 +- .../configure-file-url/_expected/iife.js | 2 +- .../configure-file-url/_expected/system.js | 2 +- .../configure-file-url/_expected/umd.js | 2 +- .../emit-asset}/_config.js | 1 + .../emit-asset}/_expected/amd.js | 0 .../_expected/assets/logo-25585ac1.svg | 0 .../emit-asset}/_expected/cjs.js | 0 .../emit-asset}/_expected/es.js | 0 .../emit-asset}/_expected/iife.js | 0 .../emit-asset}/_expected/system.js | 0 .../emit-asset}/_expected/umd.js | 0 .../emit-asset}/index-amd.html | 0 .../emit-asset}/index-cjs.html | 0 .../emit-asset}/index-es.html | 0 .../emit-asset}/index-iife.html | 0 .../emit-asset}/index-system.html | 0 .../emit-asset}/index-umd-amd.html | 0 .../index-umd-iife-queryparam.html | 0 .../emit-asset}/index-umd-iife.html | 0 .../emit-asset}/logo.svg | 0 .../emit-asset}/main.js | 0 test/form/samples/emit-asset-file/_config.js | 38 + .../samples/emit-asset-file/_expected/amd.js | 16 + .../_expected/assets/logo-25585ac1.svg} | 0 .../samples/emit-asset-file/_expected/cjs.js | 14 + .../samples/emit-asset-file/_expected/es.js | 12 + .../samples/emit-asset-file/_expected/iife.js | 17 + .../emit-asset-file/_expected/system.js | 21 + .../samples/emit-asset-file/_expected/umd.js | 19 + .../samples/emit-asset-file/index-amd.html | 10 + .../samples/emit-asset-file/index-cjs.html | 10 + .../samples/emit-asset-file/index-es.html | 10 + .../samples/emit-asset-file/index-iife.html | 10 + .../samples/emit-asset-file/index-system.html | 11 + .../emit-asset-file/index-umd-amd.html | 10 + .../index-umd-iife-queryparam.html | 10 + .../emit-asset-file/index-umd-iife.html | 10 + .../logo.svg | 0 test/form/samples/emit-asset-file/main.js | 12 + .../_config.js | 9 +- .../_expected/amd.js | 5 + .../_expected/assets/logo-25253976.svg | 3 + .../_expected/cjs.js | 3 + .../_expected/es.js | 1 + .../_expected/iife.js | 0 .../_expected/system.js | 10 + .../_expected/umd.js | 0 .../emit-file-tree-shaken-access/logo.svg | 3 + .../main.js | 0 .../asset-source-missing-2/_config.js | 1 + .../emit-asset/asset-source-missing-2/main.js | 0 .../asset-source-missing-3/_config.js | 1 + .../emit-asset/asset-source-missing-3/main.js | 0 .../asset-source-missing/_config.js | 1 + .../emit-asset/asset-source-missing/main.js | 0 .../emit-asset/invalid-asset-id/_config.js | 1 + .../emit-asset/invalid-asset-id/main.js | 0 .../emit-asset/invalid-asset-name/_config.js | 1 + .../emit-asset/invalid-asset-name/main.js | 0 .../invalid-set-asset-source-id/_config.js | 19 + .../invalid-set-asset-source-id/main.js | 0 .../set-asset-source-transform/_config.js | 3 +- .../set-asset-source-transform/main.js | 0 .../set-asset-source-twice/_config.js | 1 + .../emit-asset/set-asset-source-twice/main.js | 0 .../deprecations/ROLLUP_ASSET_URL/_config.js | 19 + .../deprecations/ROLLUP_ASSET_URL/main.js | 11 + .../deprecations/this-emitAsset/_config.js | 17 + .../deprecations/this-emitAsset/main.js | 11 + .../asset-source-missing-2/_config.js | 19 + .../emit-file/asset-source-missing-2/main.js | 1 + .../asset-source-missing-3/_config.js | 19 + .../emit-file/asset-source-missing-3/main.js | 1 + .../emit-file/asset-source-missing/_config.js | 15 + .../emit-file/asset-source-missing/main.js | 1 + .../emit-file/invalid-asset-id/_config.js | 15 + .../emit-file/invalid-asset-id/main.js | 1 + .../emit-file/invalid-asset-name/_config.js | 19 + .../emit-file/invalid-asset-name/main.js | 1 + .../invalid-set-asset-source-id/_config.js | 0 .../invalid-set-asset-source-id/main.js | 1 + .../set-asset-source-transform/_config.js | 24 + .../set-asset-source-transform/main.js | 1 + .../set-asset-source-twice/_config.js | 20 + .../emit-file/set-asset-source-twice/main.js | 1 + .../samples/plugin-error/buildEnd/_config.js | 19 + .../samples/plugin-error/buildEnd/main.js | 1 + .../plugin-error/buildStart/_config.js | 19 + .../samples/plugin-error/buildStart/main.js | 1 + .../plugin-error/generateBundle/_config.js | 19 + .../plugin-error/generateBundle/main.js | 1 + .../samples/plugin-error/load/_config.js | 21 + .../samples/plugin-error/load/main.js | 1 + .../plugin-error/renderChunk/_config.js | 19 + .../samples/plugin-error/renderChunk/main.js | 1 + .../plugin-error/renderStart/_config.js | 19 + .../samples/plugin-error/renderStart/main.js | 1 + .../samples/plugin-error/resolveId/_config.js | 19 + .../samples/plugin-error/resolveId/main.js | 1 + .../plugin-error/{ => transform}/_config.js | 2 +- .../plugin-error/{ => transform}/main.js | 0 test/hooks/index.js | 808 ++++++++---------- 351 files changed, 1855 insertions(+), 499 deletions(-) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_config.js (89%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/amd/assets/asset-resolved-8bd22e6e.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/amd/assets/asset-solved-28a7ac89.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/amd/assets/asset-unresolved-8dcd7fca.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/amd/main.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/amd/nested/chunk.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/amd/nested/chunk2.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/cjs/assets/asset-resolved-8bd22e6e.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/cjs/assets/asset-solved-28a7ac89.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/cjs/main.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/cjs/nested/chunk.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/cjs/nested/chunk2.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/es/assets/asset-resolved-8bd22e6e.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/es/assets/asset-solved-28a7ac89.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/es/assets/asset-unresolved-8dcd7fca.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/es/main.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/es/nested/chunk.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/es/nested/chunk2.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/system/assets/asset-resolved-8bd22e6e.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/system/assets/asset-solved-28a7ac89.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/system/assets/asset-unresolved-8dcd7fca.txt (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/system/main.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/system/nested/chunk.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/_expected/system/nested/chunk2.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/chunk.js (100%) rename test/chunking-form/samples/{configure-file-url => deprecated/configure-file-url-for-assets-and-chunks}/main.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_config.js (95%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/amd/assets/logo1-a5ec488b.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/amd/assets/logo2-c943ca3c.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/amd/main.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/amd/nested/chunk.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/amd/nested/chunk2.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/cjs/assets/logo1-a5ec488b.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/cjs/assets/logo2-c943ca3c.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/cjs/main.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/cjs/nested/chunk.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/cjs/nested/chunk2.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/es/assets/logo1-a5ec488b.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/es/assets/logo2-c943ca3c.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/es/main.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/es/nested/chunk.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/es/nested/chunk2.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/system/assets/logo1-a5ec488b.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/system/assets/logo2-c943ca3c.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/system/main.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/system/nested/chunk.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/_expected/system/nested/chunk2.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/index-amd.html (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/index-es.html (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/index-system.html (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/logo1.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/logo2.svg (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/main.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/nested.js (100%) rename test/chunking-form/samples/{asset-emission => deprecated/emit-asset}/show-image.js (100%) create mode 100644 test/chunking-form/samples/emit-file/asset-file-names/_config.js rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => asset-file-names}/_expected/amd/main.js (100%) create mode 100644 test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/7468331f-test.txt rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => asset-file-names}/_expected/cjs/main.js (100%) create mode 100644 test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/7468331f-test.txt rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => asset-file-names}/_expected/es/main.js (100%) create mode 100644 test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/7468331f-test.txt rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => asset-file-names}/_expected/system/main.js (100%) create mode 100644 test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/7468331f-test.txt rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => asset-file-names}/main.js (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_config.js (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/banner-2b65cc0c.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/buildEnd-4678f17a.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/buildStart-5b740828.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/footer-e1d2fccb.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/generateBundle-22413744.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/intro-520a8116.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/load-a4cc2865.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/outputOptions-d7fdb220.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/outro-21f77720.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/renderChunk-a91c7c32.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/renderStart-66600c78.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/resolveId-6d8063a5.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/amd/assets/transform-d49df25a.txt (100%) rename test/{form/samples/asset-emission-tree-shaken-access/_expected/amd.js => chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/main.js} (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/banner-2b65cc0c.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/buildEnd-4678f17a.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/buildStart-5b740828.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/footer-e1d2fccb.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/generateBundle-22413744.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/intro-520a8116.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/load-a4cc2865.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/outputOptions-d7fdb220.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/outro-21f77720.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/renderChunk-a91c7c32.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/renderStart-66600c78.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/resolveId-6d8063a5.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/cjs/assets/transform-d49df25a.txt (100%) rename test/{form/samples/asset-emission-tree-shaken-access/_expected/cjs.js => chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/main.js} (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/banner-2b65cc0c.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/buildEnd-4678f17a.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/buildStart-5b740828.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/footer-e1d2fccb.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/generateBundle-22413744.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/intro-520a8116.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/load-a4cc2865.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/outputOptions-d7fdb220.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/outro-21f77720.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/renderChunk-a91c7c32.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/renderStart-66600c78.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/resolveId-6d8063a5.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/es/assets/transform-d49df25a.txt (100%) rename test/{form/samples/asset-emission-tree-shaken-access/_expected/es.js => chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/main.js} (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/banner-2b65cc0c.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/buildEnd-4678f17a.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/buildStart-5b740828.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/footer-e1d2fccb.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/generateBundle-22413744.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/intro-520a8116.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/load-a4cc2865.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/outputOptions-d7fdb220.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/outro-21f77720.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/renderChunk-a91c7c32.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/renderStart-66600c78.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/resolveId-6d8063a5.txt (100%) rename test/chunking-form/samples/emit-file/{emits-assets-from-various-hooks => emits-files-from-various-hooks}/_expected/system/assets/transform-d49df25a.txt (100%) rename test/{form/samples/asset-emission-tree-shaken-access/_expected/system.js => chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/main.js} (100%) create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/main.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_config.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-a5ec488b.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-c943ca3c.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk2.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-a5ec488b.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-c943ca3c.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk2.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-a5ec488b.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-c943ca3c.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk2.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-a5ec488b.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-c943ca3c.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk2.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/index-amd.html create mode 100644 test/chunking-form/samples/emit-file/reference-files/index-es.html create mode 100644 test/chunking-form/samples/emit-file/reference-files/index-system.html create mode 100644 test/chunking-form/samples/emit-file/reference-files/logo1.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/logo2.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/main.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/nested.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/show-image.js create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_config.js create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-2b65cc0c.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-e1d2fccb.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-ea61028d.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-78d67aa8.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-520a8116.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-21f77720.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-a91c7c32.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-66600c78.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-2b65cc0c.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-e1d2fccb.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-7ba089df.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-ef46b0c8.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-520a8116.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-21f77720.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-a91c7c32.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-66600c78.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-2b65cc0c.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-e1d2fccb.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-7e84678a.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-8b573c58.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-520a8116.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-21f77720.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-a91c7c32.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-66600c78.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-2b65cc0c.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-e1d2fccb.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-dd5a26a4.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-7df86840.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-520a8116.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-21f77720.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-a91c7c32.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-66600c78.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/main.js create mode 100644 test/chunking-form/samples/render-chunk/_config.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/main1.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/amd/main2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/main1.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/cjs/main2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/es/main1.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/es/main2.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/system/main1.js create mode 100644 test/chunking-form/samples/render-chunk/_expected/system/main2.js create mode 100644 test/chunking-form/samples/render-chunk/dep1.js create mode 100644 test/chunking-form/samples/render-chunk/dep2.js create mode 100644 test/chunking-form/samples/render-chunk/dep3.js create mode 100644 test/chunking-form/samples/render-chunk/main1.js create mode 100644 test/chunking-form/samples/render-chunk/main2.js create mode 100644 test/chunking-form/samples/resolve-file-url/_config.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/amd/main.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk2.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk2.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-28a7ac89.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/es/main.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk2.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-28a7ac89.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/system/main.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js create mode 100644 test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk2.js create mode 100644 test/chunking-form/samples/resolve-file-url/chunk.js create mode 100644 test/chunking-form/samples/resolve-file-url/main.js rename test/form/samples/{asset-emission => deprecated/emit-asset}/_config.js (94%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/_expected/amd.js (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/_expected/assets/logo-25585ac1.svg (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/_expected/cjs.js (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/_expected/es.js (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/_expected/iife.js (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/_expected/system.js (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/_expected/umd.js (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/index-amd.html (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/index-cjs.html (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/index-es.html (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/index-iife.html (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/index-system.html (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/index-umd-amd.html (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/index-umd-iife-queryparam.html (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/index-umd-iife.html (100%) rename test/form/samples/{asset-emission-tree-shaken-access => deprecated/emit-asset}/logo.svg (100%) rename test/form/samples/{asset-emission => deprecated/emit-asset}/main.js (100%) create mode 100644 test/form/samples/emit-asset-file/_config.js create mode 100644 test/form/samples/emit-asset-file/_expected/amd.js rename test/form/samples/{asset-emission-tree-shaken-access/_expected/assets/logo-25253976.svg => emit-asset-file/_expected/assets/logo-25585ac1.svg} (100%) create mode 100644 test/form/samples/emit-asset-file/_expected/cjs.js create mode 100644 test/form/samples/emit-asset-file/_expected/es.js create mode 100644 test/form/samples/emit-asset-file/_expected/iife.js create mode 100644 test/form/samples/emit-asset-file/_expected/system.js create mode 100644 test/form/samples/emit-asset-file/_expected/umd.js create mode 100644 test/form/samples/emit-asset-file/index-amd.html create mode 100644 test/form/samples/emit-asset-file/index-cjs.html create mode 100644 test/form/samples/emit-asset-file/index-es.html create mode 100644 test/form/samples/emit-asset-file/index-iife.html create mode 100644 test/form/samples/emit-asset-file/index-system.html create mode 100644 test/form/samples/emit-asset-file/index-umd-amd.html create mode 100644 test/form/samples/emit-asset-file/index-umd-iife-queryparam.html create mode 100644 test/form/samples/emit-asset-file/index-umd-iife.html rename test/form/samples/{asset-emission => emit-asset-file}/logo.svg (100%) create mode 100644 test/form/samples/emit-asset-file/main.js rename test/form/samples/{asset-emission-tree-shaken-access => emit-file-tree-shaken-access}/_config.js (68%) create mode 100644 test/form/samples/emit-file-tree-shaken-access/_expected/amd.js create mode 100644 test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-25253976.svg create mode 100644 test/form/samples/emit-file-tree-shaken-access/_expected/cjs.js create mode 100644 test/form/samples/emit-file-tree-shaken-access/_expected/es.js rename test/form/samples/{asset-emission-tree-shaken-access => emit-file-tree-shaken-access}/_expected/iife.js (100%) create mode 100644 test/form/samples/emit-file-tree-shaken-access/_expected/system.js rename test/form/samples/{asset-emission-tree-shaken-access => emit-file-tree-shaken-access}/_expected/umd.js (100%) create mode 100644 test/form/samples/emit-file-tree-shaken-access/logo.svg rename test/form/samples/{asset-emission-tree-shaken-access => emit-file-tree-shaken-access}/main.js (100%) rename test/function/samples/{ => deprecated}/emit-asset/asset-source-missing-2/_config.js (94%) rename test/function/samples/{ => deprecated}/emit-asset/asset-source-missing-2/main.js (100%) rename test/function/samples/{ => deprecated}/emit-asset/asset-source-missing-3/_config.js (94%) rename test/function/samples/{ => deprecated}/emit-asset/asset-source-missing-3/main.js (100%) rename test/function/samples/{ => deprecated}/emit-asset/asset-source-missing/_config.js (91%) rename test/function/samples/{ => deprecated}/emit-asset/asset-source-missing/main.js (100%) rename test/function/samples/{ => deprecated}/emit-asset/invalid-asset-id/_config.js (92%) rename test/function/samples/{ => deprecated}/emit-asset/invalid-asset-id/main.js (100%) rename test/function/samples/{ => deprecated}/emit-asset/invalid-asset-name/_config.js (93%) rename test/function/samples/{ => deprecated}/emit-asset/invalid-asset-name/main.js (100%) create mode 100644 test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/_config.js rename test/function/samples/{ => deprecated}/emit-asset/invalid-set-asset-source-id/main.js (100%) rename test/function/samples/{ => deprecated}/emit-asset/set-asset-source-transform/_config.js (84%) rename test/function/samples/{ => deprecated}/emit-asset/set-asset-source-transform/main.js (100%) rename test/function/samples/{ => deprecated}/emit-asset/set-asset-source-twice/_config.js (94%) rename test/function/samples/{ => deprecated}/emit-asset/set-asset-source-twice/main.js (100%) create mode 100644 test/function/samples/deprecations/ROLLUP_ASSET_URL/_config.js create mode 100644 test/function/samples/deprecations/ROLLUP_ASSET_URL/main.js create mode 100644 test/function/samples/deprecations/this-emitAsset/_config.js create mode 100644 test/function/samples/deprecations/this-emitAsset/main.js create mode 100644 test/function/samples/emit-file/asset-source-missing-2/_config.js create mode 100644 test/function/samples/emit-file/asset-source-missing-2/main.js create mode 100644 test/function/samples/emit-file/asset-source-missing-3/_config.js create mode 100644 test/function/samples/emit-file/asset-source-missing-3/main.js create mode 100644 test/function/samples/emit-file/asset-source-missing/_config.js create mode 100644 test/function/samples/emit-file/asset-source-missing/main.js create mode 100644 test/function/samples/emit-file/invalid-asset-id/_config.js create mode 100644 test/function/samples/emit-file/invalid-asset-id/main.js create mode 100644 test/function/samples/emit-file/invalid-asset-name/_config.js create mode 100644 test/function/samples/emit-file/invalid-asset-name/main.js rename test/function/samples/{emit-asset => emit-file}/invalid-set-asset-source-id/_config.js (100%) create mode 100644 test/function/samples/emit-file/invalid-set-asset-source-id/main.js create mode 100644 test/function/samples/emit-file/set-asset-source-transform/_config.js create mode 100644 test/function/samples/emit-file/set-asset-source-transform/main.js create mode 100644 test/function/samples/emit-file/set-asset-source-twice/_config.js create mode 100644 test/function/samples/emit-file/set-asset-source-twice/main.js create mode 100644 test/function/samples/plugin-error/buildEnd/_config.js create mode 100644 test/function/samples/plugin-error/buildEnd/main.js create mode 100644 test/function/samples/plugin-error/buildStart/_config.js create mode 100644 test/function/samples/plugin-error/buildStart/main.js create mode 100644 test/function/samples/plugin-error/generateBundle/_config.js create mode 100644 test/function/samples/plugin-error/generateBundle/main.js create mode 100644 test/function/samples/plugin-error/load/_config.js create mode 100644 test/function/samples/plugin-error/load/main.js create mode 100644 test/function/samples/plugin-error/renderChunk/_config.js create mode 100644 test/function/samples/plugin-error/renderChunk/main.js create mode 100644 test/function/samples/plugin-error/renderStart/_config.js create mode 100644 test/function/samples/plugin-error/renderStart/main.js create mode 100644 test/function/samples/plugin-error/resolveId/_config.js create mode 100644 test/function/samples/plugin-error/resolveId/main.js rename test/function/samples/plugin-error/{ => transform}/_config.js (95%) rename test/function/samples/plugin-error/{ => transform}/main.js (100%) diff --git a/src/Module.ts b/src/Module.ts index bf30ec88ff2..24b6188a2e1 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -31,9 +31,9 @@ import Chunk from './Chunk'; import ExternalModule from './ExternalModule'; import Graph from './Graph'; import { - Asset, DecodedSourceMapOrMissing, EmittedChunk, + EmittedFile, ExistingDecodedSourceMap, ModuleJSON, ResolvedIdMap, @@ -92,9 +92,9 @@ export interface AstContext { deoptimizationTracker: EntityPathTracker; error: (props: RollupError, pos: number) => void; fileName: string; - getAssetFileName: (assetReferenceId: string) => string; getChunkFileName: (chunkReferenceId: string) => string; getExports: () => string[]; + getFileName: (fileReferenceId: string) => string; getModuleExecIndex: () => number; getModuleName: () => string; getReexports: () => string[]; @@ -114,6 +114,7 @@ export interface AstContext { tryCatchDeoptimization: boolean; usesTopLevelAwait: boolean; warn: (warning: RollupWarning, pos: number) => void; + warnDeprecation: (deprecation: string | RollupWarning, activeDeprecation: boolean) => void; } export const defaultAcornOptions: acorn.Options = { @@ -206,8 +207,8 @@ export default class Module { scope!: ModuleScope; sourcemapChain!: DecodedSourceMapOrMissing[]; sources: string[] = []; - transformAssets?: Asset[]; transformChunks?: EmittedChunk[]; + transformFiles?: EmittedFile[]; usesTopLevelAwait = false; private allExportNames?: Set; @@ -531,19 +532,19 @@ export default class Module { originalSourcemap, resolvedIds, sourcemapChain, - transformAssets, transformChunks, - transformDependencies + transformDependencies, + transformFiles }: TransformModuleJSON & { - transformAssets?: Asset[] | undefined; transformChunks?: EmittedChunk[] | undefined; + transformFiles?: EmittedFile[] | undefined; }) { this.code = code; this.originalCode = originalCode; this.originalSourcemap = originalSourcemap; this.sourcemapChain = sourcemapChain; - if (transformAssets) { - this.transformAssets = transformAssets; + if (transformFiles) { + this.transformFiles = transformFiles; } if (transformChunks) { this.transformChunks = transformChunks; @@ -586,9 +587,9 @@ export default class Module { deoptimizationTracker: this.graph.deoptimizationTracker, error: this.error.bind(this), fileName, // Needed for warnings - getAssetFileName: this.graph.pluginDriver.getAssetFileName, getChunkFileName: this.graph.moduleLoader.getChunkFileName.bind(this.graph.moduleLoader), getExports: this.getExports.bind(this), + getFileName: this.graph.pluginDriver.getFileName, getModuleExecIndex: () => this.execIndex, getModuleName: this.basename.bind(this), getReexports: this.getReexports.bind(this), @@ -610,7 +611,8 @@ export default class Module { tryCatchDeoptimization: (!this.graph.treeshakingOptions || this.graph.treeshakingOptions.tryCatchDeoptimization) as boolean, usesTopLevelAwait: false, - warn: this.warn.bind(this) + warn: this.warn.bind(this), + warnDeprecation: this.graph.warnDeprecation.bind(this.graph) }; this.scope = new ModuleScope(this.graph.scope, this.astContext); @@ -635,9 +637,9 @@ export default class Module { originalSourcemap: this.originalSourcemap, resolvedIds: this.resolvedIds, sourcemapChain: this.sourcemapChain, - transformAssets: this.transformAssets, transformChunks: this.transformChunks, - transformDependencies: this.transformDependencies + transformDependencies: this.transformDependencies, + transformFiles: this.transformFiles }; } diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index 61ae9354684..f7694829828 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -333,9 +333,9 @@ export class ModuleLoader { !cachedModule.customTransformCache && cachedModule.originalCode === sourceDescription.code ) { - if (cachedModule.transformAssets) { - for (const { name, source } of cachedModule.transformAssets) - this.pluginDriver.emitFile({ type: 'asset', name, source }); + if (cachedModule.transformFiles) { + for (const emittedFile of cachedModule.transformFiles) + this.pluginDriver.emitFile(emittedFile); } if (cachedModule.transformChunks) { for (const { id, options } of cachedModule.transformChunks) diff --git a/src/ast/nodes/MetaProperty.ts b/src/ast/nodes/MetaProperty.ts index 10ccb958f1d..c86a7122393 100644 --- a/src/ast/nodes/MetaProperty.ts +++ b/src/ast/nodes/MetaProperty.ts @@ -10,6 +10,7 @@ import { NodeBase } from './shared/Node'; const ASSET_PREFIX = 'ROLLUP_ASSET_URL_'; const CHUNK_PREFIX = 'ROLLUP_CHUNK_URL_'; +const FILE_PREFIX = 'ROLLUP_FILE_URL_'; export default class MetaProperty extends NodeBase { meta!: Identifier; @@ -33,7 +34,11 @@ export default class MetaProperty extends NodeBase { if (metaProperty) { if (metaProperty === 'url') { this.scope.addAccessedGlobalsByFormat(accessedMetaUrlGlobals); - } else if (metaProperty.startsWith(ASSET_PREFIX) || metaProperty.startsWith(CHUNK_PREFIX)) { + } else if ( + metaProperty.startsWith(FILE_PREFIX) || + metaProperty.startsWith(ASSET_PREFIX) || + metaProperty.startsWith(CHUNK_PREFIX) + ) { this.scope.addAccessedGlobalsByFormat(accessedFileUrlGlobals); } } @@ -54,20 +59,31 @@ export default class MetaProperty extends NodeBase { ): void { if (!this.included) return; const parent = this.parent; - const importMetaProperty = this.metaProperty as string | null; + const metaProperty = this.metaProperty as string | null; + // TODO Lukas deprecation warning if ( - importMetaProperty && - (importMetaProperty.startsWith(ASSET_PREFIX) || importMetaProperty.startsWith(CHUNK_PREFIX)) + metaProperty && + (metaProperty.startsWith(FILE_PREFIX) || + metaProperty.startsWith(ASSET_PREFIX) || + metaProperty.startsWith(CHUNK_PREFIX)) ) { + let referenceId: string | null = null; let assetReferenceId: string | null = null; let chunkReferenceId: string | null = null; let fileName: string; - if (importMetaProperty.startsWith(ASSET_PREFIX)) { - assetReferenceId = importMetaProperty.substr(ASSET_PREFIX.length); - fileName = this.context.getAssetFileName(assetReferenceId); + if (metaProperty.startsWith(FILE_PREFIX)) { + referenceId = metaProperty.substr(FILE_PREFIX.length); + fileName = this.context.getFileName(referenceId); + } else if (metaProperty.startsWith(ASSET_PREFIX)) { + assetReferenceId = metaProperty.substr(ASSET_PREFIX.length); + fileName = this.context.getFileName(assetReferenceId); + this.context.warnDeprecation( + `Using the "${ASSET_PREFIX}" prefix to reference files is deprecated. Use the "${FILE_PREFIX}" prefix instead.`, + false + ); } else { - chunkReferenceId = importMetaProperty.substr(CHUNK_PREFIX.length); + chunkReferenceId = metaProperty.substr(CHUNK_PREFIX.length); fileName = this.context.getChunkFileName(chunkReferenceId); } const relativePath = normalize(relative(dirname(chunkId), fileName)); @@ -92,6 +108,7 @@ export default class MetaProperty extends NodeBase { fileName, format, moduleId: this.context.module.id, + referenceId: referenceId || assetReferenceId || (chunkReferenceId as string), relativePath } ]); @@ -107,7 +124,7 @@ export default class MetaProperty extends NodeBase { } const replacement = pluginDriver.hookFirstSync('resolveImportMeta', [ - importMetaProperty, + metaProperty, { chunkId, format, diff --git a/src/ast/nodes/VariableDeclaration.ts b/src/ast/nodes/VariableDeclaration.ts index 8a84f93ef93..6925f49f7a8 100644 --- a/src/ast/nodes/VariableDeclaration.ts +++ b/src/ast/nodes/VariableDeclaration.ts @@ -131,6 +131,7 @@ export default class VariableDeclaration extends NodeBase { options: RenderOptions, { start = this.start, end = this.end, isNoStatement }: NodeRenderOptions ): void { + // TODO Lukas fix this const separatedNodes = getCommaSeparatedNodesWithBoundaries( this.declarations, code, diff --git a/src/rollup/index.ts b/src/rollup/index.ts index 6e6bc16d4d7..f84aa95bae0 100644 --- a/src/rollup/index.ts +++ b/src/rollup/index.ts @@ -198,6 +198,7 @@ export default function rollup(rawInputOptions: GenericConfigObject): Promise never; + /** @deprecated Use `this.getFileName` instead */ getAssetFileName: (assetReferenceId: string) => string; + /** @deprecated Use `this.getFileName` instead */ getChunkFileName: (chunkReferenceId: string) => string; + // TODO Lukas test + getFileName: (fileReferenceId: string) => string; getModuleInfo: ( moduleId: string ) => { @@ -304,6 +308,7 @@ export type ResolveFileUrlHook = ( fileName: string; format: string; moduleId: string; + referenceId: string; relativePath: string; } ) => string | null | undefined; diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index d6573a406c6..3431b8bbb36 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -15,9 +15,12 @@ import { addWithNewReferenceId } from './referenceIds'; import { isPlainName } from './relativeId'; import { makeUnique, renderNamePattern } from './renderNamePattern'; -// TODO Lukas setFileSource in transform needs to be repeated as well +// TODO Lukas setAssetSource in transform needs to be repeated as well +// TODO Lukas use EmittedFile and ConsumedEmittedFile types? interface OutputSpecificFileData { assetFileNames: string; + // TODO Lukas instead of this map and relying on references, how about replacing the emitted file in + // this.filesByReferenceId? assignedFileNames: Map; bundle: OutputBundle; } @@ -108,7 +111,7 @@ export class FileEmitter { // TODO Lukas this should only be allowed // - unlimited times during build phase or // - at most once during generate phase if no source has been set yet - public setFileSource = (fileReferenceId: string, source?: string | Buffer) => { + public setAssetSource = (fileReferenceId: string, source?: string | Buffer) => { const emittedFile = this.filesByReferenceId.get(fileReferenceId); if (!emittedFile) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); if (emittedFile.source !== undefined) return error(errAssetSourceAlreadySet(emittedFile.name)); diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index 00044177d21..f86458f8900 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -33,7 +33,7 @@ export interface PluginDriver { emitFile: EmitFile; hasLoadersOrTransforms: boolean; finaliseAssets(): void; - getAssetFileName(assetReferenceId: string): string; + getFileName(assetReferenceId: string): string; hookFirst>( hook: H, args: Args, @@ -160,7 +160,16 @@ export function createPluginDriver( graph.watchFiles[id] = true; }, cache: cacheInstance, - emitAsset: (name, source) => fileEmitter.emitFile({ type: 'asset', name, source }), + emitAsset: (name, source) => { + graph.warnDeprecation( + { + message: `The "this.emitAsset" plugin context function used by plugin ${plugin.name} is deprecated. The "this.emitFile" plugin context function should be used instead with "type: 'asset'".`, + plugin: plugin.name + }, + false + ); + return fileEmitter.emitFile({ type: 'asset', name, source }); + }, emitChunk(id, options) { if (graph.phase > BuildPhase.LOAD_AND_PARSE) this.error(errInvalidRollupPhaseForEmitChunk()); @@ -178,6 +187,7 @@ export function createPluginDriver( getChunkFileName(chunkReferenceId) { return graph.moduleLoader.getChunkFileName(chunkReferenceId); }, + getFileName: fileEmitter.getFileName, getModuleInfo(moduleId) { const foundModule = graph.moduleById.get(moduleId); if (foundModule == null) { @@ -243,7 +253,7 @@ export function createPluginDriver( .then(resolveId => resolveId && resolveId.id); }; })(), - setAssetSource: fileEmitter.setFileSource, + setAssetSource: fileEmitter.setAssetSource, warn(warning) { if (typeof warning === 'string') warning = { message: warning } as RollupWarning; if (warning.code) warning.pluginCode = warning.code; @@ -369,7 +379,7 @@ export function createPluginDriver( finaliseAssets() { fileEmitter.finaliseAssets(); }, - getAssetFileName: fileEmitter.getFileName, + getFileName: fileEmitter.getFileName, hasLoadersOrTransforms, // chains, ignores returns diff --git a/src/utils/transform.ts b/src/utils/transform.ts index a98cc6c62c6..3f0f57e4554 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -2,9 +2,9 @@ import MagicString, { SourceMap } from 'magic-string'; import Graph from '../Graph'; import Module from '../Module'; import { - Asset, DecodedSourceMapOrMissing, EmittedChunk, + EmittedFile, Plugin, PluginCache, PluginContext, @@ -32,8 +32,8 @@ export default function transform( const originalCode = source.code; let ast = source.ast; let transformDependencies: string[]; - const emittedAssets: Asset[] = []; const emittedChunks: EmittedChunk[] = []; + const emittedFiles: EmittedFile[] = []; let customTransformCache = false; let moduleSideEffects: boolean | null = null; let trackedPluginCache: { cache: PluginCache; used: boolean }; @@ -57,7 +57,7 @@ export default function transform( } } else { // assets/chunks emitted by a transform hook need to be emitted again if the hook is skipped - if (emittedAssets.length) module.transformAssets = emittedAssets; + if (emittedFiles.length) module.transformFiles = emittedFiles; if (emittedChunks.length) module.transformChunks = emittedChunks; if (result && typeof result === 'object' && Array.isArray(result.dependencies)) { @@ -131,17 +131,20 @@ export default function transform( return pluginContext.error(err); }, emitAsset(name: string, source?: string | Buffer) { - emittedAssets.push({ - fileName: undefined as any, - name, - source: source as any - }); - return graph.pluginDriver.emitFile({ type: 'asset', name, source }); + const emittedFile = { type: 'asset' as 'asset', name, source }; + emittedFiles.push({ ...emittedFile }); + return graph.pluginDriver.emitFile(emittedFile); }, emitChunk(id, options) { emittedChunks.push({ id, options }); return graph.pluginDriver.emitChunk(id, options); }, + emitFile(emittedFile: EmittedFile) { + // TODO Lukas test that we are creating a copy or in the future, do not mutate emitted files + // or prevent setAssetSource during build? + emittedFiles.push({ ...emittedFile }); + return graph.pluginDriver.emitFile(emittedFile); + }, // TODO Lukas this needs to be repeated as well addWatchFile(id: string) { if (!transformDependencies) transformDependencies = []; @@ -154,7 +157,7 @@ export default function transform( try { this.error({ code: 'INVALID_SETASSETSOURCE', - message: `setAssetSource cannot be called in transform for caching reasons. Use emitAsset with a source, or call setAssetSource in another hook.` + message: `setAssetSource cannot be called in transform for caching reasons. Use emitFile with a source, or call setAssetSource in another hook.` }); } catch (err) { setAssetSourceErr = err; diff --git a/test/chunking-form/samples/configure-file-url/_config.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js similarity index 89% rename from test/chunking-form/samples/configure-file-url/_config.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js index 9ee4fa22535..80859f986ad 100644 --- a/test/chunking-form/samples/configure-file-url/_config.js +++ b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'allows to configure file urls', options: { + strictDeprecations: false, output: { chunkFileNames: 'nested/chunk.js' }, @@ -13,7 +14,7 @@ module.exports = { }, load(id) { if (id.endsWith('solved')) { - const assetId = this.emitAsset(`asset-${id}.txt`, `Asset for: ${id}`); + const assetId = this.emitFile({type: 'asset', name: `asset-${id}.txt`, source: `Asset for: ${id}`}); const chunkId = this.emitChunk('chunk.js'); return ( `export const asset = import.meta.ROLLUP_ASSET_URL_${assetId};\n` + diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/amd/main.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/amd/nested/chunk.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk2.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/amd/nested/chunk2.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/nested/chunk2.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/cjs/main.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/main.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/cjs/nested/chunk.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk2.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/cjs/nested/chunk2.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/cjs/nested/chunk2.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-solved-28a7ac89.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/es/main.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/main.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/es/nested/chunk.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/es/nested/chunk2.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk2.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/es/nested/chunk2.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/es/nested/chunk2.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-resolved-8bd22e6e.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-resolved-8bd22e6e.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-solved-28a7ac89.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-solved-28a7ac89.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-solved-28a7ac89.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-unresolved-8dcd7fca.txt similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/assets/asset-unresolved-8dcd7fca.txt diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/system/main.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/main.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/nested/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/system/nested/chunk.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk.js diff --git a/test/chunking-form/samples/configure-file-url/_expected/system/nested/chunk2.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk2.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/_expected/system/nested/chunk2.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/system/nested/chunk2.js diff --git a/test/chunking-form/samples/configure-file-url/chunk.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/chunk.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/chunk.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/chunk.js diff --git a/test/chunking-form/samples/configure-file-url/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/main.js similarity index 100% rename from test/chunking-form/samples/configure-file-url/main.js rename to test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/main.js diff --git a/test/chunking-form/samples/asset-emission/_config.js b/test/chunking-form/samples/deprecated/emit-asset/_config.js similarity index 95% rename from test/chunking-form/samples/asset-emission/_config.js rename to test/chunking-form/samples/deprecated/emit-asset/_config.js index 9784a297436..6a83f6f385e 100644 --- a/test/chunking-form/samples/asset-emission/_config.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_config.js @@ -4,6 +4,7 @@ const path = require('path'); module.exports = { description: 'supports emitting assets from plugin hooks', options: { + strictDeprecations: false, input: ['main.js'], output: { chunkFileNames: 'nested/chunk.js' diff --git a/test/chunking-form/samples/asset-emission/_expected/amd/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo1-a5ec488b.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/amd/assets/logo1-a5ec488b.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo1-a5ec488b.svg diff --git a/test/chunking-form/samples/asset-emission/_expected/amd/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-c943ca3c.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/amd/assets/logo2-c943ca3c.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-c943ca3c.svg diff --git a/test/chunking-form/samples/asset-emission/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/amd/main.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/amd/main.js diff --git a/test/chunking-form/samples/asset-emission/_expected/amd/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/amd/nested/chunk.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk.js diff --git a/test/chunking-form/samples/asset-emission/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk2.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/amd/nested/chunk2.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk2.js diff --git a/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo1-a5ec488b.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo1-a5ec488b.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo1-a5ec488b.svg diff --git a/test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-c943ca3c.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/cjs/assets/logo2-c943ca3c.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-c943ca3c.svg diff --git a/test/chunking-form/samples/asset-emission/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/cjs/main.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/main.js diff --git a/test/chunking-form/samples/asset-emission/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/cjs/nested/chunk.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk.js diff --git a/test/chunking-form/samples/asset-emission/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk2.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/cjs/nested/chunk2.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk2.js diff --git a/test/chunking-form/samples/asset-emission/_expected/es/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo1-a5ec488b.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/es/assets/logo1-a5ec488b.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo1-a5ec488b.svg diff --git a/test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-c943ca3c.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/es/assets/logo2-c943ca3c.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-c943ca3c.svg diff --git a/test/chunking-form/samples/asset-emission/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/es/main.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/es/main.js diff --git a/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/es/nested/chunk.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk.js diff --git a/test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk2.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/es/nested/chunk2.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk2.js diff --git a/test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo1-a5ec488b.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/system/assets/logo1-a5ec488b.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo1-a5ec488b.svg diff --git a/test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-c943ca3c.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/system/assets/logo2-c943ca3c.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-c943ca3c.svg diff --git a/test/chunking-form/samples/asset-emission/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/system/main.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/system/main.js diff --git a/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/system/nested/chunk.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk.js diff --git a/test/chunking-form/samples/asset-emission/_expected/system/nested/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk2.js similarity index 100% rename from test/chunking-form/samples/asset-emission/_expected/system/nested/chunk2.js rename to test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk2.js diff --git a/test/chunking-form/samples/asset-emission/index-amd.html b/test/chunking-form/samples/deprecated/emit-asset/index-amd.html similarity index 100% rename from test/chunking-form/samples/asset-emission/index-amd.html rename to test/chunking-form/samples/deprecated/emit-asset/index-amd.html diff --git a/test/chunking-form/samples/asset-emission/index-es.html b/test/chunking-form/samples/deprecated/emit-asset/index-es.html similarity index 100% rename from test/chunking-form/samples/asset-emission/index-es.html rename to test/chunking-form/samples/deprecated/emit-asset/index-es.html diff --git a/test/chunking-form/samples/asset-emission/index-system.html b/test/chunking-form/samples/deprecated/emit-asset/index-system.html similarity index 100% rename from test/chunking-form/samples/asset-emission/index-system.html rename to test/chunking-form/samples/deprecated/emit-asset/index-system.html diff --git a/test/chunking-form/samples/asset-emission/logo1.svg b/test/chunking-form/samples/deprecated/emit-asset/logo1.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/logo1.svg rename to test/chunking-form/samples/deprecated/emit-asset/logo1.svg diff --git a/test/chunking-form/samples/asset-emission/logo2.svg b/test/chunking-form/samples/deprecated/emit-asset/logo2.svg similarity index 100% rename from test/chunking-form/samples/asset-emission/logo2.svg rename to test/chunking-form/samples/deprecated/emit-asset/logo2.svg diff --git a/test/chunking-form/samples/asset-emission/main.js b/test/chunking-form/samples/deprecated/emit-asset/main.js similarity index 100% rename from test/chunking-form/samples/asset-emission/main.js rename to test/chunking-form/samples/deprecated/emit-asset/main.js diff --git a/test/chunking-form/samples/asset-emission/nested.js b/test/chunking-form/samples/deprecated/emit-asset/nested.js similarity index 100% rename from test/chunking-form/samples/asset-emission/nested.js rename to test/chunking-form/samples/deprecated/emit-asset/nested.js diff --git a/test/chunking-form/samples/asset-emission/show-image.js b/test/chunking-form/samples/deprecated/emit-asset/show-image.js similarity index 100% rename from test/chunking-form/samples/asset-emission/show-image.js rename to test/chunking-form/samples/deprecated/emit-asset/show-image.js diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_config.js b/test/chunking-form/samples/emit-file/asset-file-names/_config.js new file mode 100644 index 00000000000..c1350154cbf --- /dev/null +++ b/test/chunking-form/samples/emit-file/asset-file-names/_config.js @@ -0,0 +1,15 @@ +module.exports = { + description: 'supports custom asset file names', + options: { + input: ['main.js'], + plugins: { + transform() { + this.emitFile({ type: 'asset', name: 'test.txt', source: 'hello world' }); + return null; + } + }, + output: { + assetFileNames: '[ext]/[hash]-[name][extname]' + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/main.js b/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/main.js rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/main.js diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/7468331f-test.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/asset-file-names/_expected/amd/txt/7468331f-test.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/main.js rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/main.js diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/7468331f-test.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/asset-file-names/_expected/cjs/txt/7468331f-test.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/main.js b/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/main.js rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/es/main.js diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/7468331f-test.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/asset-file-names/_expected/es/txt/7468331f-test.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/main.js b/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/main.js rename to test/chunking-form/samples/emit-file/asset-file-names/_expected/system/main.js diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/7468331f-test.txt b/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/7468331f-test.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/asset-file-names/_expected/system/txt/7468331f-test.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/main.js b/test/chunking-form/samples/emit-file/asset-file-names/main.js similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/main.js rename to test/chunking-form/samples/emit-file/asset-file-names/main.js diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_config.js b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_config.js rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/banner-2b65cc0c.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildEnd-4678f17a.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/buildStart-5b740828.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/footer-e1d2fccb.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/generateBundle-22413744.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-520a8116.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/intro-520a8116.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/load-a4cc2865.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-21f77720.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outro-21f77720.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderChunk-a91c7c32.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/renderStart-66600c78.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/resolveId-6d8063a5.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/transform-d49df25a.txt diff --git a/test/form/samples/asset-emission-tree-shaken-access/_expected/amd.js b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/main.js similarity index 100% rename from test/form/samples/asset-emission-tree-shaken-access/_expected/amd.js rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/main.js diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/banner-2b65cc0c.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildEnd-4678f17a.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/buildStart-5b740828.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/footer-e1d2fccb.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/generateBundle-22413744.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/intro-520a8116.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/load-a4cc2865.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outro-21f77720.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderChunk-a91c7c32.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/renderStart-66600c78.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/resolveId-6d8063a5.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/transform-d49df25a.txt diff --git a/test/form/samples/asset-emission-tree-shaken-access/_expected/cjs.js b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/main.js similarity index 100% rename from test/form/samples/asset-emission-tree-shaken-access/_expected/cjs.js rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/main.js diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/banner-2b65cc0c.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildEnd-4678f17a.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/buildStart-5b740828.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/footer-e1d2fccb.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/generateBundle-22413744.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-520a8116.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/intro-520a8116.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-a4cc2865.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/load-a4cc2865.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/load-a4cc2865.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-21f77720.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outro-21f77720.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderChunk-a91c7c32.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/renderStart-66600c78.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/resolveId-6d8063a5.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-d49df25a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/es/assets/transform-d49df25a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/transform-d49df25a.txt diff --git a/test/form/samples/asset-emission-tree-shaken-access/_expected/es.js b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/main.js similarity index 100% rename from test/form/samples/asset-emission-tree-shaken-access/_expected/es.js rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/main.js diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/banner-2b65cc0c.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildEnd-4678f17a.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/buildStart-5b740828.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/footer-e1d2fccb.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/generateBundle-22413744.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-520a8116.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/intro-520a8116.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/intro-520a8116.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/load-a4cc2865.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-a4cc2865.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/load-a4cc2865.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/load-a4cc2865.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-21f77720.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/outro-21f77720.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outro-21f77720.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderChunk-a91c7c32.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/renderStart-66600c78.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/resolveId-6d8063a5.txt diff --git a/test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/transform-d49df25a.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-d49df25a.txt similarity index 100% rename from test/chunking-form/samples/emit-file/emits-assets-from-various-hooks/_expected/system/assets/transform-d49df25a.txt rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/transform-d49df25a.txt diff --git a/test/form/samples/asset-emission-tree-shaken-access/_expected/system.js b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/main.js similarity index 100% rename from test/form/samples/asset-emission-tree-shaken-access/_expected/system.js rename to test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/main.js diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/main.js b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/reference-files/_config.js b/test/chunking-form/samples/emit-file/reference-files/_config.js new file mode 100644 index 00000000000..5744abe9064 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_config.js @@ -0,0 +1,29 @@ +const fs = require('fs'); +const path = require('path'); + +module.exports = { + description: 'allows referencing emitted files', + options: { + strictDeprecations: false, + input: ['main.js'], + output: { + chunkFileNames: 'nested/chunk.js' + }, + plugins: { + resolveId(id, importee) { + if (id.endsWith('.svg')) { + return path.resolve(path.dirname(importee), id); + } + }, + load(id) { + if (id.endsWith('.svg')) { + return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({ + type: 'asset', + name: path.basename(id), + source: fs.readFileSync(id) + })};`; + } + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-a5ec488b.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo1-a5ec488b.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-c943ca3c.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-c943ca3c.svg @@ -0,0 +1,3 @@ + + + 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 new file mode 100644 index 00000000000..1d8142bda6e --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/main.js @@ -0,0 +1,8 @@ +define(['require', './nested/chunk'], function (require, __chunk_1) { 'use strict'; + + var logo = new URL(require.toUrl('assets/logo1-a5ec488b.svg'), document.baseURI).href; + + __chunk_1.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 new file mode 100644 index 00000000000..37057bda9a9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk.js @@ -0,0 +1,14 @@ +define(['exports'], function (exports) { 'use strict'; + + function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } + } + + 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 new file mode 100644 index 00000000000..ef79ac29c13 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk2.js @@ -0,0 +1,7 @@ +define(['require', './chunk'], function (require, __chunk_1) { 'use strict'; + + var logo = new URL(require.toUrl('../assets/logo2-c943ca3c.svg'), document.baseURI).href; + + __chunk_1.showImage(logo); + +}); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-a5ec488b.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo1-a5ec488b.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-c943ca3c.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-c943ca3c.svg @@ -0,0 +1,3 @@ + + + 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 new file mode 100644 index 00000000000..2c01c808c16 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/main.js @@ -0,0 +1,8 @@ +'use strict'; + +var __chunk_1 = 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); + +__chunk_1.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 new file mode 100644 index 00000000000..ddb8d67c1f2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk.js @@ -0,0 +1,12 @@ +'use strict'; + +function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } +} + +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 new file mode 100644 index 00000000000..360d0cbf6f9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk2.js @@ -0,0 +1,7 @@ +'use strict'; + +var __chunk_1 = require('./chunk.js'); + +var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-c943ca3c.svg').href : new URL('../assets/logo2-c943ca3c.svg', document.currentScript && document.currentScript.src || document.baseURI).href); + +__chunk_1.showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-a5ec488b.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo1-a5ec488b.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-c943ca3c.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-c943ca3c.svg @@ -0,0 +1,3 @@ + + + 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 new file mode 100644 index 00000000000..6145c907395 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/main.js @@ -0,0 +1,6 @@ +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'); 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 new file mode 100644 index 00000000000..cf266147e36 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk.js @@ -0,0 +1,10 @@ +function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } +} + +export { showImage as s }; diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk2.js b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk2.js new file mode 100644 index 00000000000..f0caa2f9e11 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk2.js @@ -0,0 +1,5 @@ +import { s as showImage } from './chunk.js'; + +var logo = new URL('../assets/logo2-c943ca3c.svg', import.meta.url).href; + +showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-a5ec488b.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-a5ec488b.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo1-a5ec488b.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-c943ca3c.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-c943ca3c.svg @@ -0,0 +1,3 @@ + + + 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 new file mode 100644 index 00000000000..3cef21c3600 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/main.js @@ -0,0 +1,17 @@ +System.register(['./nested/chunk.js'], function (exports, module) { + 'use strict'; + var showImage; + return { + setters: [function (module) { + showImage = module.s; + }], + 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 new file mode 100644 index 00000000000..11e47945a7d --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk.js @@ -0,0 +1,19 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + exports('s', showImage); + + function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } + } + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk2.js b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk2.js new file mode 100644 index 00000000000..aaeaa9950e6 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk2.js @@ -0,0 +1,16 @@ +System.register(['./chunk.js'], function (exports, module) { + 'use strict'; + var showImage; + return { + setters: [function (module) { + showImage = module.s; + }], + execute: function () { + + var logo = new URL('../assets/logo2-c943ca3c.svg', module.meta.url).href; + + showImage(logo); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/reference-files/index-amd.html b/test/chunking-form/samples/emit-file/reference-files/index-amd.html new file mode 100644 index 00000000000..476b9ce3df1 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/index-amd.html @@ -0,0 +1,10 @@ + + + + + AMD + + + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/index-es.html b/test/chunking-form/samples/emit-file/reference-files/index-es.html new file mode 100644 index 00000000000..58ae4a61527 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/index-es.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/index-system.html b/test/chunking-form/samples/emit-file/reference-files/index-system.html new file mode 100644 index 00000000000..96c687c1eb7 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/index-system.html @@ -0,0 +1,11 @@ + + + + + SystemJS + + + + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/logo1.svg b/test/chunking-form/samples/emit-file/reference-files/logo1.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/logo1.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/logo2.svg b/test/chunking-form/samples/emit-file/reference-files/logo2.svg new file mode 100644 index 00000000000..cb7e52c5130 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/logo2.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/main.js b/test/chunking-form/samples/emit-file/reference-files/main.js new file mode 100644 index 00000000000..5c1787b77b4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/main.js @@ -0,0 +1,5 @@ +import logo from './logo1.svg'; +import { showImage } from './show-image'; + +showImage(logo); +import('./nested.js'); diff --git a/test/chunking-form/samples/emit-file/reference-files/nested.js b/test/chunking-form/samples/emit-file/reference-files/nested.js new file mode 100644 index 00000000000..ceb0a68e6e1 --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/nested.js @@ -0,0 +1,4 @@ +import logo from './logo2.svg'; +import { showImage } from './show-image'; + +showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/show-image.js b/test/chunking-form/samples/emit-file/reference-files/show-image.js new file mode 100644 index 00000000000..28c706ab24b --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/show-image.js @@ -0,0 +1,8 @@ +export function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } +} diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_config.js b/test/chunking-form/samples/emit-file/set-asset-source/_config.js new file mode 100644 index 00000000000..827a065e916 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_config.js @@ -0,0 +1,58 @@ +let renderStart; +let banner; +let footer; +let intro; +let outro; +let renderChunk; +let generateBundle; + +module.exports = { + description: 'supports setting the asset source during generate', + options: { + input: ['main.js'], + plugins: { + load() { + renderStart = this.emitFile({ type: 'asset', name: 'renderStart.txt' }); + banner = this.emitFile({ type: 'asset', name: 'banner.txt' }); + footer = this.emitFile({ type: 'asset', name: 'footer.txt' }); + intro = this.emitFile({ type: 'asset', name: 'intro.txt' }); + outro = this.emitFile({ type: 'asset', name: 'outro.txt' }); + renderChunk = this.emitFile({ type: 'asset', name: 'renderChunk.txt' }); + generateBundle = this.emitFile({ type: 'asset', name: 'generateBundle.txt' }); + return ( + `export const renderStart = import.meta.ROLLUP_FILE_URL_${renderStart};\n` + + `export const banner = import.meta.ROLLUP_FILE_URL_${banner};\n` + + `export const footer = import.meta.ROLLUP_FILE_URL_${footer};\n` + + `export const intro = import.meta.ROLLUP_FILE_URL_${intro};\n` + + `export const outro = import.meta.ROLLUP_FILE_URL_${outro};\n` + ); + }, + renderStart() { + this.setAssetSource(renderStart, 'renderStart'); + }, + banner() { + this.setAssetSource(banner, 'banner'); + }, + footer() { + this.setAssetSource(footer, 'footer'); + }, + intro() { + this.setAssetSource(intro, 'intro'); + }, + outro() { + this.setAssetSource(outro, 'outro'); + }, + renderChunk() { + this.setAssetSource(renderChunk, 'renderChunk'); + }, + generateBundle(options) { + const localAsset = this.emitFile({ type: 'asset', name: 'generateBundle-format.txt' }); + this.setAssetSource(localAsset, options.format); + this.setAssetSource( + generateBundle, + `generateBundle ${options.format} with ${this.getAssetFileName(localAsset)}` + ); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-2b65cc0c.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/banner-2b65cc0c.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-e1d2fccb.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/footer-e1d2fccb.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-ea61028d.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-ea61028d.txt new file mode 100644 index 00000000000..a11bda7ebad --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-ea61028d.txt @@ -0,0 +1 @@ +generateBundle amd with assets/generateBundle-format-78d67aa8.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-78d67aa8.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-78d67aa8.txt new file mode 100644 index 00000000000..1a4c4375014 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/generateBundle-format-78d67aa8.txt @@ -0,0 +1 @@ +amd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-520a8116.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/intro-520a8116.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-21f77720.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/outro-21f77720.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-a91c7c32.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderChunk-a91c7c32.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-66600c78.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/assets/renderStart-66600c78.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js new file mode 100644 index 00000000000..d14e3971593 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js @@ -0,0 +1,17 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const renderStart = new URL(require.toUrl('assets/renderStart-66600c78.txt'), document.baseURI).href; + const banner = new URL(require.toUrl('assets/banner-2b65cc0c.txt'), document.baseURI).href; + const footer = new URL(require.toUrl('assets/footer-e1d2fccb.txt'), document.baseURI).href; + const intro = new URL(require.toUrl('assets/intro-520a8116.txt'), document.baseURI).href; + const outro = new URL(require.toUrl('assets/outro-21f77720.txt'), document.baseURI).href; + + exports.banner = banner; + exports.footer = footer; + exports.intro = intro; + exports.outro = outro; + exports.renderStart = renderStart; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-2b65cc0c.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/banner-2b65cc0c.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-e1d2fccb.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/footer-e1d2fccb.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-7ba089df.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-7ba089df.txt new file mode 100644 index 00000000000..3f6be650ed5 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-7ba089df.txt @@ -0,0 +1 @@ +generateBundle cjs with assets/generateBundle-format-ef46b0c8.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-ef46b0c8.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-ef46b0c8.txt new file mode 100644 index 00000000000..8d0deb7e58a --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/generateBundle-format-ef46b0c8.txt @@ -0,0 +1 @@ +cjs \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-520a8116.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/intro-520a8116.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-21f77720.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/outro-21f77720.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-a91c7c32.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderChunk-a91c7c32.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-66600c78.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/assets/renderStart-66600c78.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js new file mode 100644 index 00000000000..0fbcb8b2da1 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js @@ -0,0 +1,15 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +const renderStart = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/renderStart-66600c78.txt').href : new URL('assets/renderStart-66600c78.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const banner = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/banner-2b65cc0c.txt').href : new URL('assets/banner-2b65cc0c.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const footer = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/footer-e1d2fccb.txt').href : new URL('assets/footer-e1d2fccb.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const intro = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/intro-520a8116.txt').href : new URL('assets/intro-520a8116.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const outro = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/outro-21f77720.txt').href : new URL('assets/outro-21f77720.txt', document.currentScript && document.currentScript.src || document.baseURI).href); + +exports.banner = banner; +exports.footer = footer; +exports.intro = intro; +exports.outro = outro; +exports.renderStart = renderStart; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-2b65cc0c.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/banner-2b65cc0c.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-e1d2fccb.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/footer-e1d2fccb.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-7e84678a.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-7e84678a.txt new file mode 100644 index 00000000000..70119149dc7 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-7e84678a.txt @@ -0,0 +1 @@ +generateBundle es with assets/generateBundle-format-8b573c58.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-8b573c58.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-8b573c58.txt new file mode 100644 index 00000000000..6c4381495c2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/generateBundle-format-8b573c58.txt @@ -0,0 +1 @@ +es \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-520a8116.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/intro-520a8116.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-21f77720.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/outro-21f77720.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-a91c7c32.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderChunk-a91c7c32.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-66600c78.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/assets/renderStart-66600c78.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js new file mode 100644 index 00000000000..111cbf4646e --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js @@ -0,0 +1,7 @@ +const renderStart = new URL('assets/renderStart-66600c78.txt', import.meta.url).href; +const banner = new URL('assets/banner-2b65cc0c.txt', import.meta.url).href; +const footer = new URL('assets/footer-e1d2fccb.txt', import.meta.url).href; +const intro = new URL('assets/intro-520a8116.txt', import.meta.url).href; +const outro = new URL('assets/outro-21f77720.txt', import.meta.url).href; + +export { banner, footer, intro, outro, renderStart }; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-2b65cc0c.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-2b65cc0c.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/banner-2b65cc0c.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-e1d2fccb.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-e1d2fccb.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/footer-e1d2fccb.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-dd5a26a4.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-dd5a26a4.txt new file mode 100644 index 00000000000..fdbb98a9d52 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-dd5a26a4.txt @@ -0,0 +1 @@ +generateBundle system with assets/generateBundle-format-7df86840.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-7df86840.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-7df86840.txt new file mode 100644 index 00000000000..5b8201173c8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/generateBundle-format-7df86840.txt @@ -0,0 +1 @@ +system \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-520a8116.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-520a8116.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/intro-520a8116.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-21f77720.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-21f77720.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/outro-21f77720.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-a91c7c32.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-a91c7c32.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderChunk-a91c7c32.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-66600c78.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-66600c78.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/assets/renderStart-66600c78.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js new file mode 100644 index 00000000000..0cbb0d54a65 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js @@ -0,0 +1,14 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const renderStart = exports('renderStart', new URL('assets/renderStart-66600c78.txt', module.meta.url).href); + const banner = exports('banner', new URL('assets/banner-2b65cc0c.txt', module.meta.url).href); + const footer = exports('footer', new URL('assets/footer-e1d2fccb.txt', module.meta.url).href); + const intro = exports('intro', new URL('assets/intro-520a8116.txt', module.meta.url).href); + const outro = exports('outro', new URL('assets/outro-21f77720.txt', module.meta.url).href); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/main.js b/test/chunking-form/samples/emit-file/set-asset-source/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/render-chunk/_config.js b/test/chunking-form/samples/render-chunk/_config.js new file mode 100644 index 00000000000..6c925c5e62a --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_config.js @@ -0,0 +1,24 @@ +const assert = require('assert'); + +module.exports = { + description: 'transforms chunks in the renderChunk hook', + options: { + input: ['main1', 'main2'], + plugins: { + renderChunk(code, chunk, options) { + assert.strictEqual(options.chunkFileNames, 'chunk-[name].js'); + return ( + code + + `\nconsole.log('fileName', '${chunk.fileName}');` + + `\nconsole.log('imports', '${chunk.imports.join(', ')}');` + + `\nconsole.log('isEntry', ${chunk.isEntry});` + + `\nconsole.log('name', '${chunk.name}');` + + `\nconsole.log('modules.length', ${Object.keys(chunk.modules).length});` + ); + } + }, + output: { + chunkFileNames: 'chunk-[name].js' + } + } +}; diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js new file mode 100644 index 00000000000..a106c2a7287 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js @@ -0,0 +1,12 @@ +define(['exports'], function (exports) { 'use strict'; + + var num = 2; + + exports.num = num; + +}); +console.log('fileName', 'chunk-chunk.js'); +console.log('imports', ''); +console.log('isEntry', false); +console.log('name', 'chunk'); +console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main1.js b/test/chunking-form/samples/render-chunk/_expected/amd/main1.js new file mode 100644 index 00000000000..afaf8762c8b --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/amd/main1.js @@ -0,0 +1,12 @@ +define(['./chunk-chunk'], function (__chunk_1) { 'use strict'; + + var num = 1; + + console.log(num + __chunk_1.num); + +}); +console.log('fileName', 'main1.js'); +console.log('imports', 'chunk-chunk.js'); +console.log('isEntry', true); +console.log('name', 'main1'); +console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main2.js b/test/chunking-form/samples/render-chunk/_expected/amd/main2.js new file mode 100644 index 00000000000..d83bca88519 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/amd/main2.js @@ -0,0 +1,12 @@ +define(['./chunk-chunk'], function (__chunk_1) { 'use strict'; + + var num = 3; + + console.log(__chunk_1.num + num); + +}); +console.log('fileName', 'main2.js'); +console.log('imports', 'chunk-chunk.js'); +console.log('isEntry', true); +console.log('name', 'main2'); +console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js new file mode 100644 index 00000000000..2e50e4012ed --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js @@ -0,0 +1,10 @@ +'use strict'; + +var num = 2; + +exports.num = num; +console.log('fileName', 'chunk-chunk.js'); +console.log('imports', ''); +console.log('isEntry', false); +console.log('name', 'chunk'); +console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js new file mode 100644 index 00000000000..89a507a1f86 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js @@ -0,0 +1,12 @@ +'use strict'; + +var __chunk_1 = require('./chunk-chunk.js'); + +var num = 1; + +console.log(num + __chunk_1.num); +console.log('fileName', 'main1.js'); +console.log('imports', 'chunk-chunk.js'); +console.log('isEntry', true); +console.log('name', 'main1'); +console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js new file mode 100644 index 00000000000..1f7969b15d1 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js @@ -0,0 +1,12 @@ +'use strict'; + +var __chunk_1 = require('./chunk-chunk.js'); + +var num = 3; + +console.log(__chunk_1.num + num); +console.log('fileName', 'main2.js'); +console.log('imports', 'chunk-chunk.js'); +console.log('isEntry', true); +console.log('name', 'main2'); +console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js new file mode 100644 index 00000000000..872040311d2 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js @@ -0,0 +1,8 @@ +var num = 2; + +export { num as n }; +console.log('fileName', 'chunk-chunk.js'); +console.log('imports', ''); +console.log('isEntry', false); +console.log('name', 'chunk'); +console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/main1.js b/test/chunking-form/samples/render-chunk/_expected/es/main1.js new file mode 100644 index 00000000000..0f011a9040f --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/es/main1.js @@ -0,0 +1,10 @@ +import { n as num$1 } from './chunk-chunk.js'; + +var num = 1; + +console.log(num + num$1); +console.log('fileName', 'main1.js'); +console.log('imports', 'chunk-chunk.js'); +console.log('isEntry', true); +console.log('name', 'main1'); +console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/main2.js b/test/chunking-form/samples/render-chunk/_expected/es/main2.js new file mode 100644 index 00000000000..f015e249192 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/es/main2.js @@ -0,0 +1,10 @@ +import { n as num$1 } from './chunk-chunk.js'; + +var num = 3; + +console.log(num$1 + num); +console.log('fileName', 'main2.js'); +console.log('imports', 'chunk-chunk.js'); +console.log('isEntry', true); +console.log('name', 'main2'); +console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js new file mode 100644 index 00000000000..b84f63c3869 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js @@ -0,0 +1,15 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var num = exports('n', 2); + + } + }; +}); +console.log('fileName', 'chunk-chunk.js'); +console.log('imports', ''); +console.log('isEntry', false); +console.log('name', 'chunk'); +console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main1.js b/test/chunking-form/samples/render-chunk/_expected/system/main1.js new file mode 100644 index 00000000000..3988f51e28e --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/system/main1.js @@ -0,0 +1,21 @@ +System.register(['./chunk-chunk.js'], function () { + 'use strict'; + var num$1; + return { + setters: [function (module) { + num$1 = module.n; + }], + execute: function () { + + var num = 1; + + console.log(num + num$1); + + } + }; +}); +console.log('fileName', 'main1.js'); +console.log('imports', 'chunk-chunk.js'); +console.log('isEntry', true); +console.log('name', 'main1'); +console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main2.js b/test/chunking-form/samples/render-chunk/_expected/system/main2.js new file mode 100644 index 00000000000..5f06d114583 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/_expected/system/main2.js @@ -0,0 +1,21 @@ +System.register(['./chunk-chunk.js'], function () { + 'use strict'; + var num$1; + return { + setters: [function (module) { + num$1 = module.n; + }], + execute: function () { + + var num = 3; + + console.log(num$1 + num); + + } + }; +}); +console.log('fileName', 'main2.js'); +console.log('imports', 'chunk-chunk.js'); +console.log('isEntry', true); +console.log('name', 'main2'); +console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/dep1.js b/test/chunking-form/samples/render-chunk/dep1.js new file mode 100644 index 00000000000..62673c31bfb --- /dev/null +++ b/test/chunking-form/samples/render-chunk/dep1.js @@ -0,0 +1 @@ +export var num = 1; \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/dep2.js b/test/chunking-form/samples/render-chunk/dep2.js new file mode 100644 index 00000000000..56d34fcf13c --- /dev/null +++ b/test/chunking-form/samples/render-chunk/dep2.js @@ -0,0 +1 @@ +export var num = 2; \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/dep3.js b/test/chunking-form/samples/render-chunk/dep3.js new file mode 100644 index 00000000000..bf0ad75ffef --- /dev/null +++ b/test/chunking-form/samples/render-chunk/dep3.js @@ -0,0 +1 @@ +export var num = 3; \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/main1.js b/test/chunking-form/samples/render-chunk/main1.js new file mode 100644 index 00000000000..4ae1e988647 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/main1.js @@ -0,0 +1,4 @@ +import { num as num1 } from './dep1'; +import { num as num2 } from './dep2'; + +console.log(num1 + num2); \ No newline at end of file diff --git a/test/chunking-form/samples/render-chunk/main2.js b/test/chunking-form/samples/render-chunk/main2.js new file mode 100644 index 00000000000..b825c4912b0 --- /dev/null +++ b/test/chunking-form/samples/render-chunk/main2.js @@ -0,0 +1,4 @@ +import { num as num1 } from './dep2'; +import { num as num2 } from './dep3'; + +console.log(num1 + num2); \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_config.js b/test/chunking-form/samples/resolve-file-url/_config.js new file mode 100644 index 00000000000..aad0d65e141 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_config.js @@ -0,0 +1,51 @@ +module.exports = { + description: 'allows to configure file urls', + options: { + output: { + chunkFileNames: 'nested/chunk.js' + }, + plugins: [ + { + resolveId(id) { + if (id.endsWith('solved')) { + return id; + } + }, + load(id) { + if (id.endsWith('solved')) { + const assetId = this.emitFile({ + type: 'asset', + name: `asset-${id}.txt`, + source: `Asset for: ${id}` + }); + const chunkId = this.emitChunk('chunk.js'); + return ( + `export const asset = import.meta.ROLLUP_FILE_URL_${assetId};\n` + + `export const chunk = import.meta.ROLLUP_CHUNK_URL_${chunkId};` + ); + } + }, + resolveFileUrl({ chunkId, fileName, format, moduleId, referenceId, relativePath }) { + if (!moduleId.endsWith('resolved')) { + return `'chunkId=${chunkId}:moduleId=${moduleId + .replace(/\\/g, '/') + .split('/') + .slice(-2) + .join( + '/' + )}:fileName=${fileName}:format=${format}:relativePath=${relativePath}:referenceId=${referenceId}'`; + } + return null; + } + }, + { + resolveFileUrl({ moduleId }) { + if (moduleId === 'resolved') { + return `'resolved'`; + } + return null; + } + } + ] + } +}; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt new file mode 100644 index 00000000000..31fb300f988 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-resolved-8bd22e6e.txt @@ -0,0 +1 @@ +Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt new file mode 100644 index 00000000000..07c7a096c7e --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-solved-28a7ac89.txt @@ -0,0 +1 @@ +Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt new file mode 100644 index 00000000000..fd3ad6261cc --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/assets/asset-unresolved-8dcd7fca.txt @@ -0,0 +1 @@ +Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js b/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js new file mode 100644 index 00000000000..65913f1755d --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js @@ -0,0 +1,11 @@ +define(['require'], function (require) { 'use strict'; + + const asset = 'resolved'; + const chunk = 'resolved'; + + const asset$1 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; + const chunk$1 = new URL(require.toUrl('nested/chunk.js'), document.baseURI).href; + + new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }).then(result => console.log(result, chunk, chunk$1, asset, asset$1)); + +}); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js new file mode 100644 index 00000000000..32f0814a584 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('chunk'); + +}); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk2.js b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk2.js new file mode 100644 index 00000000000..76a6be30872 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/nested/chunk2.js @@ -0,0 +1,9 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=amd:relativePath=../assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; + const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=amd:relativePath=chunk.js:referenceId=f6c25ae7'; + + exports.asset = asset; + exports.chunk = chunk; + +}); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt new file mode 100644 index 00000000000..31fb300f988 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-resolved-8bd22e6e.txt @@ -0,0 +1 @@ +Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt new file mode 100644 index 00000000000..07c7a096c7e --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-solved-28a7ac89.txt @@ -0,0 +1 @@ +Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt new file mode 100644 index 00000000000..fd3ad6261cc --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/assets/asset-unresolved-8dcd7fca.txt @@ -0,0 +1 @@ +Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js b/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js new file mode 100644 index 00000000000..dc2ba8a1434 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/main.js @@ -0,0 +1,9 @@ +'use strict'; + +const asset = 'resolved'; +const chunk = 'resolved'; + +const asset$1 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/asset-unresolved-8dcd7fca.txt').href : new URL('assets/asset-unresolved-8dcd7fca.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const chunk$1 = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/nested/chunk.js').href : new URL('nested/chunk.js', document.currentScript && document.currentScript.src || document.baseURI).href); + +new Promise(function (resolve) { resolve(require('./nested/chunk2.js')); }).then(result => console.log(result, chunk, chunk$1, asset, asset$1)); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js new file mode 100644 index 00000000000..9bd6f06e964 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('chunk'); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk2.js b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk2.js new file mode 100644 index 00000000000..79b46e5bd8f --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/cjs/nested/chunk2.js @@ -0,0 +1,7 @@ +'use strict'; + +const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=cjs:relativePath=../assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; +const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=cjs:relativePath=chunk.js:referenceId=f6c25ae7'; + +exports.asset = asset; +exports.chunk = chunk; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt new file mode 100644 index 00000000000..31fb300f988 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-resolved-8bd22e6e.txt @@ -0,0 +1 @@ +Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-28a7ac89.txt new file mode 100644 index 00000000000..07c7a096c7e --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-solved-28a7ac89.txt @@ -0,0 +1 @@ +Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt new file mode 100644 index 00000000000..fd3ad6261cc --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/es/assets/asset-unresolved-8dcd7fca.txt @@ -0,0 +1 @@ +Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/main.js b/test/chunking-form/samples/resolve-file-url/_expected/es/main.js new file mode 100644 index 00000000000..4053f550431 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/es/main.js @@ -0,0 +1,7 @@ +const asset = 'resolved'; +const chunk = 'resolved'; + +const asset$1 = new URL('assets/asset-unresolved-8dcd7fca.txt', import.meta.url).href; +const chunk$1 = new URL('nested/chunk.js', import.meta.url).href; + +import('./nested/chunk2.js').then(result => console.log(result, chunk, chunk$1, asset, asset$1)); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js new file mode 100644 index 00000000000..36b1d61dd25 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk.js @@ -0,0 +1 @@ +console.log('chunk'); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk2.js b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk2.js new file mode 100644 index 00000000000..295616b7273 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/es/nested/chunk2.js @@ -0,0 +1,4 @@ +const asset = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=es:relativePath=../assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; +const chunk = 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=es:relativePath=chunk.js:referenceId=f6c25ae7'; + +export { asset, chunk }; diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt new file mode 100644 index 00000000000..31fb300f988 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-resolved-8bd22e6e.txt @@ -0,0 +1 @@ +Asset for: resolved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-28a7ac89.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-28a7ac89.txt new file mode 100644 index 00000000000..07c7a096c7e --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-solved-28a7ac89.txt @@ -0,0 +1 @@ +Asset for: solved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt new file mode 100644 index 00000000000..fd3ad6261cc --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/system/assets/asset-unresolved-8dcd7fca.txt @@ -0,0 +1 @@ +Asset for: unresolved \ No newline at end of file diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/main.js b/test/chunking-form/samples/resolve-file-url/_expected/system/main.js new file mode 100644 index 00000000000..7b2eb79d1dd --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/system/main.js @@ -0,0 +1,16 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const asset = 'resolved'; + const chunk = 'resolved'; + + const asset$1 = new URL('assets/asset-unresolved-8dcd7fca.txt', module.meta.url).href; + const chunk$1 = new URL('nested/chunk.js', module.meta.url).href; + + module.import('./nested/chunk2.js').then(result => console.log(result, chunk, chunk$1, asset, asset$1)); + + } + }; +}); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js new file mode 100644 index 00000000000..9d080a80d2d --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('chunk'); + + } + }; +}); diff --git a/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk2.js b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk2.js new file mode 100644 index 00000000000..2749e0efa7c --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/_expected/system/nested/chunk2.js @@ -0,0 +1,11 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const asset = exports('asset', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=system:relativePath=../assets/asset-solved-28a7ac89.txt:referenceId=6296c678'); + const chunk = exports('chunk', 'chunkId=nested/chunk2.js:moduleId=solved:fileName=nested/chunk.js:format=system:relativePath=chunk.js:referenceId=f6c25ae7'); + + } + }; +}); diff --git a/test/chunking-form/samples/resolve-file-url/chunk.js b/test/chunking-form/samples/resolve-file-url/chunk.js new file mode 100644 index 00000000000..36b1d61dd25 --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/chunk.js @@ -0,0 +1 @@ +console.log('chunk'); diff --git a/test/chunking-form/samples/resolve-file-url/main.js b/test/chunking-form/samples/resolve-file-url/main.js new file mode 100644 index 00000000000..c7b101dfc5b --- /dev/null +++ b/test/chunking-form/samples/resolve-file-url/main.js @@ -0,0 +1,5 @@ +import { asset as asset1, chunk as chunk1 } from 'resolved'; +import { asset as asset2, chunk as chunk2 } from 'unresolved'; + +import('solved').then(result => console.log(result, chunk1, chunk2, asset1, asset2)); + diff --git a/test/form/samples/configure-file-url/_config.js b/test/form/samples/configure-file-url/_config.js index 51f63117e90..10db41d3835 100644 --- a/test/form/samples/configure-file-url/_config.js +++ b/test/form/samples/configure-file-url/_config.js @@ -10,19 +10,15 @@ module.exports = { }, load(id) { if (id.endsWith('solved')) { - const assetId = this.emitAsset(`asset-${id}.txt`, `Asset for: ${id}`); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; + const assetId = this.emitFile({ + type: 'asset', + name: `asset-${id}.txt`, + source: `Asset for: ${id}` + }); + return `export default import.meta.ROLLUP_FILE_URL_${assetId};`; } }, - resolveFileUrl({ - assetReferenceId, - chunkId, - chunkReferenceId, - fileName, - format, - moduleId, - relativePath - }) { + resolveFileUrl({ chunkId, fileName, format, moduleId, referenceId, relativePath }) { if (!moduleId.endsWith('resolved')) { return `'chunkId=${chunkId}:moduleId=${moduleId .replace(/\\/g, '/') @@ -30,7 +26,7 @@ module.exports = { .slice(-2) .join( '/' - )}:fileName=${fileName}:format=${format}:relativePath=${relativePath}:assetReferenceId=${assetReferenceId}:chunkReferenceId=${chunkReferenceId}'`; + )}:fileName=${fileName}:format=${format}:relativePath=${relativePath}:referenceId=${referenceId}'`; } return null; } diff --git a/test/form/samples/configure-file-url/_expected/amd.js b/test/form/samples/configure-file-url/_expected/amd.js index c5032caefa1..084e2ea462b 100644 --- a/test/form/samples/configure-file-url/_expected/amd.js +++ b/test/form/samples/configure-file-url/_expected/amd.js @@ -1,6 +1,6 @@ define(['require'], function (require) { 'use strict'; - var asset1 = 'chunkId=amd.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=amd:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; + var asset1 = 'chunkId=amd.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=amd:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; var asset2 = 'resolved'; diff --git a/test/form/samples/configure-file-url/_expected/cjs.js b/test/form/samples/configure-file-url/_expected/cjs.js index 0587c2c9ba5..3f400f8f30d 100644 --- a/test/form/samples/configure-file-url/_expected/cjs.js +++ b/test/form/samples/configure-file-url/_expected/cjs.js @@ -1,6 +1,6 @@ 'use strict'; -var asset1 = 'chunkId=cjs.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=cjs:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; +var asset1 = 'chunkId=cjs.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=cjs:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; var asset2 = 'resolved'; diff --git a/test/form/samples/configure-file-url/_expected/es.js b/test/form/samples/configure-file-url/_expected/es.js index bbf31d97b7e..07d1b27b495 100644 --- a/test/form/samples/configure-file-url/_expected/es.js +++ b/test/form/samples/configure-file-url/_expected/es.js @@ -1,4 +1,4 @@ -var asset1 = 'chunkId=es.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=es:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; +var asset1 = 'chunkId=es.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=es:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; var asset2 = 'resolved'; diff --git a/test/form/samples/configure-file-url/_expected/iife.js b/test/form/samples/configure-file-url/_expected/iife.js index 52351802764..0453c7222e4 100644 --- a/test/form/samples/configure-file-url/_expected/iife.js +++ b/test/form/samples/configure-file-url/_expected/iife.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - var asset1 = 'chunkId=iife.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=iife:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; + var asset1 = 'chunkId=iife.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=iife:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; var asset2 = 'resolved'; diff --git a/test/form/samples/configure-file-url/_expected/system.js b/test/form/samples/configure-file-url/_expected/system.js index 44dadb673b2..975f1607f00 100644 --- a/test/form/samples/configure-file-url/_expected/system.js +++ b/test/form/samples/configure-file-url/_expected/system.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - var asset1 = 'chunkId=system.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=system:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; + var asset1 = 'chunkId=system.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=system:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; var asset2 = 'resolved'; diff --git a/test/form/samples/configure-file-url/_expected/umd.js b/test/form/samples/configure-file-url/_expected/umd.js index 878c47d1876..4db9939e10b 100644 --- a/test/form/samples/configure-file-url/_expected/umd.js +++ b/test/form/samples/configure-file-url/_expected/umd.js @@ -3,7 +3,7 @@ factory(); }(function () { 'use strict'; - var asset1 = 'chunkId=umd.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=umd:relativePath=assets/asset-solved-28a7ac89.txt:assetReferenceId=6296c678:chunkReferenceId=null'; + var asset1 = 'chunkId=umd.js:moduleId=solved:fileName=assets/asset-solved-28a7ac89.txt:format=umd:relativePath=assets/asset-solved-28a7ac89.txt:referenceId=6296c678'; var asset2 = 'resolved'; diff --git a/test/form/samples/asset-emission/_config.js b/test/form/samples/deprecated/emit-asset/_config.js similarity index 94% rename from test/form/samples/asset-emission/_config.js rename to test/form/samples/deprecated/emit-asset/_config.js index bdf8e5fdfde..754262be404 100644 --- a/test/form/samples/asset-emission/_config.js +++ b/test/form/samples/deprecated/emit-asset/_config.js @@ -4,6 +4,7 @@ const path = require('path'); module.exports = { description: 'supports emitting assets from plugin hooks', options: { + strictDeprecations: false, plugins: { resolveId(id, importee) { if (id.endsWith('.svg')) { diff --git a/test/form/samples/asset-emission/_expected/amd.js b/test/form/samples/deprecated/emit-asset/_expected/amd.js similarity index 100% rename from test/form/samples/asset-emission/_expected/amd.js rename to test/form/samples/deprecated/emit-asset/_expected/amd.js diff --git a/test/form/samples/asset-emission/_expected/assets/logo-25585ac1.svg b/test/form/samples/deprecated/emit-asset/_expected/assets/logo-25585ac1.svg similarity index 100% rename from test/form/samples/asset-emission/_expected/assets/logo-25585ac1.svg rename to test/form/samples/deprecated/emit-asset/_expected/assets/logo-25585ac1.svg diff --git a/test/form/samples/asset-emission/_expected/cjs.js b/test/form/samples/deprecated/emit-asset/_expected/cjs.js similarity index 100% rename from test/form/samples/asset-emission/_expected/cjs.js rename to test/form/samples/deprecated/emit-asset/_expected/cjs.js diff --git a/test/form/samples/asset-emission/_expected/es.js b/test/form/samples/deprecated/emit-asset/_expected/es.js similarity index 100% rename from test/form/samples/asset-emission/_expected/es.js rename to test/form/samples/deprecated/emit-asset/_expected/es.js diff --git a/test/form/samples/asset-emission/_expected/iife.js b/test/form/samples/deprecated/emit-asset/_expected/iife.js similarity index 100% rename from test/form/samples/asset-emission/_expected/iife.js rename to test/form/samples/deprecated/emit-asset/_expected/iife.js diff --git a/test/form/samples/asset-emission/_expected/system.js b/test/form/samples/deprecated/emit-asset/_expected/system.js similarity index 100% rename from test/form/samples/asset-emission/_expected/system.js rename to test/form/samples/deprecated/emit-asset/_expected/system.js diff --git a/test/form/samples/asset-emission/_expected/umd.js b/test/form/samples/deprecated/emit-asset/_expected/umd.js similarity index 100% rename from test/form/samples/asset-emission/_expected/umd.js rename to test/form/samples/deprecated/emit-asset/_expected/umd.js diff --git a/test/form/samples/asset-emission/index-amd.html b/test/form/samples/deprecated/emit-asset/index-amd.html similarity index 100% rename from test/form/samples/asset-emission/index-amd.html rename to test/form/samples/deprecated/emit-asset/index-amd.html diff --git a/test/form/samples/asset-emission/index-cjs.html b/test/form/samples/deprecated/emit-asset/index-cjs.html similarity index 100% rename from test/form/samples/asset-emission/index-cjs.html rename to test/form/samples/deprecated/emit-asset/index-cjs.html diff --git a/test/form/samples/asset-emission/index-es.html b/test/form/samples/deprecated/emit-asset/index-es.html similarity index 100% rename from test/form/samples/asset-emission/index-es.html rename to test/form/samples/deprecated/emit-asset/index-es.html diff --git a/test/form/samples/asset-emission/index-iife.html b/test/form/samples/deprecated/emit-asset/index-iife.html similarity index 100% rename from test/form/samples/asset-emission/index-iife.html rename to test/form/samples/deprecated/emit-asset/index-iife.html diff --git a/test/form/samples/asset-emission/index-system.html b/test/form/samples/deprecated/emit-asset/index-system.html similarity index 100% rename from test/form/samples/asset-emission/index-system.html rename to test/form/samples/deprecated/emit-asset/index-system.html diff --git a/test/form/samples/asset-emission/index-umd-amd.html b/test/form/samples/deprecated/emit-asset/index-umd-amd.html similarity index 100% rename from test/form/samples/asset-emission/index-umd-amd.html rename to test/form/samples/deprecated/emit-asset/index-umd-amd.html diff --git a/test/form/samples/asset-emission/index-umd-iife-queryparam.html b/test/form/samples/deprecated/emit-asset/index-umd-iife-queryparam.html similarity index 100% rename from test/form/samples/asset-emission/index-umd-iife-queryparam.html rename to test/form/samples/deprecated/emit-asset/index-umd-iife-queryparam.html diff --git a/test/form/samples/asset-emission/index-umd-iife.html b/test/form/samples/deprecated/emit-asset/index-umd-iife.html similarity index 100% rename from test/form/samples/asset-emission/index-umd-iife.html rename to test/form/samples/deprecated/emit-asset/index-umd-iife.html diff --git a/test/form/samples/asset-emission-tree-shaken-access/logo.svg b/test/form/samples/deprecated/emit-asset/logo.svg similarity index 100% rename from test/form/samples/asset-emission-tree-shaken-access/logo.svg rename to test/form/samples/deprecated/emit-asset/logo.svg diff --git a/test/form/samples/asset-emission/main.js b/test/form/samples/deprecated/emit-asset/main.js similarity index 100% rename from test/form/samples/asset-emission/main.js rename to test/form/samples/deprecated/emit-asset/main.js diff --git a/test/form/samples/emit-asset-file/_config.js b/test/form/samples/emit-asset-file/_config.js new file mode 100644 index 00000000000..ae942ca0d5e --- /dev/null +++ b/test/form/samples/emit-asset-file/_config.js @@ -0,0 +1,38 @@ +const fs = require('fs'); +const path = require('path'); +const assert = require('assert'); + +module.exports = { + description: 'supports emitting assets from plugin hooks', + options: { + plugins: { + resolveId(id, importee) { + if (id.endsWith('.svg')) { + return path.resolve(path.dirname(importee), id); + } + }, + load(id) { + if (id.endsWith('.svg')) { + return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({ + type: 'asset', + name: path.basename(id), + source: fs.readFileSync(id) + })};`; + } + }, + generateBundle(options, outputBundle) { + const keys = Object.keys(outputBundle); + assert.strictEqual(keys.length, 2); + assert.strictEqual(keys[0], 'assets/logo-25585ac1.svg'); + const asset = outputBundle[keys[0]]; + assert.strictEqual(asset.fileName, 'assets/logo-25585ac1.svg'); + assert.strictEqual(asset.isAsset, true); + assert.ok( + asset.source.equals(fs.readFileSync(path.resolve(__dirname, 'logo.svg'))), + 'asset has correct source' + ); + assert.ok(keys[1].endsWith('.js'), `${keys[1]} ends with ".js"`); + } + } + } +}; diff --git a/test/form/samples/emit-asset-file/_expected/amd.js b/test/form/samples/emit-asset-file/_expected/amd.js new file mode 100644 index 00000000000..43a19504229 --- /dev/null +++ b/test/form/samples/emit-asset-file/_expected/amd.js @@ -0,0 +1,16 @@ +define(['require'], function (require) { 'use strict'; + + var logo = new URL(require.toUrl('assets/logo-25585ac1.svg'), document.baseURI).href; + + function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } + } + + showImage(logo); + +}); diff --git a/test/form/samples/asset-emission-tree-shaken-access/_expected/assets/logo-25253976.svg b/test/form/samples/emit-asset-file/_expected/assets/logo-25585ac1.svg similarity index 100% rename from test/form/samples/asset-emission-tree-shaken-access/_expected/assets/logo-25253976.svg rename to test/form/samples/emit-asset-file/_expected/assets/logo-25585ac1.svg diff --git a/test/form/samples/emit-asset-file/_expected/cjs.js b/test/form/samples/emit-asset-file/_expected/cjs.js new file mode 100644 index 00000000000..f9a9dac3e1e --- /dev/null +++ b/test/form/samples/emit-asset-file/_expected/cjs.js @@ -0,0 +1,14 @@ +'use strict'; + +var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25585ac1.svg').href : new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href); + +function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } +} + +showImage(logo); diff --git a/test/form/samples/emit-asset-file/_expected/es.js b/test/form/samples/emit-asset-file/_expected/es.js new file mode 100644 index 00000000000..d100d42e367 --- /dev/null +++ b/test/form/samples/emit-asset-file/_expected/es.js @@ -0,0 +1,12 @@ +var logo = new URL('assets/logo-25585ac1.svg', import.meta.url).href; + +function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } +} + +showImage(logo); diff --git a/test/form/samples/emit-asset-file/_expected/iife.js b/test/form/samples/emit-asset-file/_expected/iife.js new file mode 100644 index 00000000000..97c9c3432a2 --- /dev/null +++ b/test/form/samples/emit-asset-file/_expected/iife.js @@ -0,0 +1,17 @@ +(function () { + 'use strict'; + + var logo = new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href; + + function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } + } + + showImage(logo); + +}()); diff --git a/test/form/samples/emit-asset-file/_expected/system.js b/test/form/samples/emit-asset-file/_expected/system.js new file mode 100644 index 00000000000..0c3f132dc7f --- /dev/null +++ b/test/form/samples/emit-asset-file/_expected/system.js @@ -0,0 +1,21 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + var logo = new URL('assets/logo-25585ac1.svg', module.meta.url).href; + + function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } + } + + showImage(logo); + + } + }; +}); diff --git a/test/form/samples/emit-asset-file/_expected/umd.js b/test/form/samples/emit-asset-file/_expected/umd.js new file mode 100644 index 00000000000..39598a3ed2a --- /dev/null +++ b/test/form/samples/emit-asset-file/_expected/umd.js @@ -0,0 +1,19 @@ +(function (factory) { + typeof define === 'function' && define.amd ? define(factory) : + factory(); +}(function () { 'use strict'; + + var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/logo-25585ac1.svg').href : new URL('assets/logo-25585ac1.svg', document.currentScript && document.currentScript.src || document.baseURI).href); + + function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } + } + + showImage(logo); + +})); diff --git a/test/form/samples/emit-asset-file/index-amd.html b/test/form/samples/emit-asset-file/index-amd.html new file mode 100644 index 00000000000..e89cb396ea2 --- /dev/null +++ b/test/form/samples/emit-asset-file/index-amd.html @@ -0,0 +1,10 @@ + + + + + AMD + + + + + diff --git a/test/form/samples/emit-asset-file/index-cjs.html b/test/form/samples/emit-asset-file/index-cjs.html new file mode 100644 index 00000000000..c5b18ec148f --- /dev/null +++ b/test/form/samples/emit-asset-file/index-cjs.html @@ -0,0 +1,10 @@ + + + + + CommonJS + + + + + diff --git a/test/form/samples/emit-asset-file/index-es.html b/test/form/samples/emit-asset-file/index-es.html new file mode 100644 index 00000000000..5079fce53d8 --- /dev/null +++ b/test/form/samples/emit-asset-file/index-es.html @@ -0,0 +1,10 @@ + + + + + ES Module + + + + + diff --git a/test/form/samples/emit-asset-file/index-iife.html b/test/form/samples/emit-asset-file/index-iife.html new file mode 100644 index 00000000000..aaf475f1505 --- /dev/null +++ b/test/form/samples/emit-asset-file/index-iife.html @@ -0,0 +1,10 @@ + + + + + IIFE + + + + + diff --git a/test/form/samples/emit-asset-file/index-system.html b/test/form/samples/emit-asset-file/index-system.html new file mode 100644 index 00000000000..bef9897957b --- /dev/null +++ b/test/form/samples/emit-asset-file/index-system.html @@ -0,0 +1,11 @@ + + + + + SystemJS + + + + + + diff --git a/test/form/samples/emit-asset-file/index-umd-amd.html b/test/form/samples/emit-asset-file/index-umd-amd.html new file mode 100644 index 00000000000..e644ea36370 --- /dev/null +++ b/test/form/samples/emit-asset-file/index-umd-amd.html @@ -0,0 +1,10 @@ + + + + + UMD (AMD) + + + + + diff --git a/test/form/samples/emit-asset-file/index-umd-iife-queryparam.html b/test/form/samples/emit-asset-file/index-umd-iife-queryparam.html new file mode 100644 index 00000000000..fda3f3f6195 --- /dev/null +++ b/test/form/samples/emit-asset-file/index-umd-iife-queryparam.html @@ -0,0 +1,10 @@ + + + + + UMD (IIFE) + query parameter + + + + + diff --git a/test/form/samples/emit-asset-file/index-umd-iife.html b/test/form/samples/emit-asset-file/index-umd-iife.html new file mode 100644 index 00000000000..202c1dad8f0 --- /dev/null +++ b/test/form/samples/emit-asset-file/index-umd-iife.html @@ -0,0 +1,10 @@ + + + + + UMD (IIFE) + + + + + diff --git a/test/form/samples/asset-emission/logo.svg b/test/form/samples/emit-asset-file/logo.svg similarity index 100% rename from test/form/samples/asset-emission/logo.svg rename to test/form/samples/emit-asset-file/logo.svg diff --git a/test/form/samples/emit-asset-file/main.js b/test/form/samples/emit-asset-file/main.js new file mode 100644 index 00000000000..c63771af02d --- /dev/null +++ b/test/form/samples/emit-asset-file/main.js @@ -0,0 +1,12 @@ +import logo from './logo.svg'; + +function showImage(url) { + console.log(url); + if (typeof document !== 'undefined') { + const image = document.createElement('img'); + image.src = url; + document.body.appendChild(image); + } +} + +showImage(logo); diff --git a/test/form/samples/asset-emission-tree-shaken-access/_config.js b/test/form/samples/emit-file-tree-shaken-access/_config.js similarity index 68% rename from test/form/samples/asset-emission-tree-shaken-access/_config.js rename to test/form/samples/emit-file-tree-shaken-access/_config.js index cb600e60ce1..1feae6664f4 100644 --- a/test/form/samples/asset-emission-tree-shaken-access/_config.js +++ b/test/form/samples/emit-file-tree-shaken-access/_config.js @@ -12,10 +12,11 @@ module.exports = { }, load(id) { if (id.endsWith('.svg')) { - return `export default import.meta.ROLLUP_ASSET_URL_${this.emitAsset( - path.basename(id), - fs.readFileSync(id) - )};`; + return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({ + type: 'asset', + name: path.basename(id), + source: fs.readFileSync(id) + })};`; } } } diff --git a/test/form/samples/emit-file-tree-shaken-access/_expected/amd.js b/test/form/samples/emit-file-tree-shaken-access/_expected/amd.js new file mode 100644 index 00000000000..126aa22ee83 --- /dev/null +++ b/test/form/samples/emit-file-tree-shaken-access/_expected/amd.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main'); + +}); diff --git a/test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-25253976.svg b/test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-25253976.svg new file mode 100644 index 00000000000..20bb5dfe639 --- /dev/null +++ b/test/form/samples/emit-file-tree-shaken-access/_expected/assets/logo-25253976.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/test/form/samples/emit-file-tree-shaken-access/_expected/cjs.js b/test/form/samples/emit-file-tree-shaken-access/_expected/cjs.js new file mode 100644 index 00000000000..d0ed06d8c90 --- /dev/null +++ b/test/form/samples/emit-file-tree-shaken-access/_expected/cjs.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main'); diff --git a/test/form/samples/emit-file-tree-shaken-access/_expected/es.js b/test/form/samples/emit-file-tree-shaken-access/_expected/es.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/form/samples/emit-file-tree-shaken-access/_expected/es.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/form/samples/asset-emission-tree-shaken-access/_expected/iife.js b/test/form/samples/emit-file-tree-shaken-access/_expected/iife.js similarity index 100% rename from test/form/samples/asset-emission-tree-shaken-access/_expected/iife.js rename to test/form/samples/emit-file-tree-shaken-access/_expected/iife.js diff --git a/test/form/samples/emit-file-tree-shaken-access/_expected/system.js b/test/form/samples/emit-file-tree-shaken-access/_expected/system.js new file mode 100644 index 00000000000..c83499bc2d4 --- /dev/null +++ b/test/form/samples/emit-file-tree-shaken-access/_expected/system.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('main'); + + } + }; +}); diff --git a/test/form/samples/asset-emission-tree-shaken-access/_expected/umd.js b/test/form/samples/emit-file-tree-shaken-access/_expected/umd.js similarity index 100% rename from test/form/samples/asset-emission-tree-shaken-access/_expected/umd.js rename to test/form/samples/emit-file-tree-shaken-access/_expected/umd.js diff --git a/test/form/samples/emit-file-tree-shaken-access/logo.svg b/test/form/samples/emit-file-tree-shaken-access/logo.svg new file mode 100644 index 00000000000..20bb5dfe639 --- /dev/null +++ b/test/form/samples/emit-file-tree-shaken-access/logo.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/test/form/samples/asset-emission-tree-shaken-access/main.js b/test/form/samples/emit-file-tree-shaken-access/main.js similarity index 100% rename from test/form/samples/asset-emission-tree-shaken-access/main.js rename to test/form/samples/emit-file-tree-shaken-access/main.js diff --git a/test/function/samples/emit-asset/asset-source-missing-2/_config.js b/test/function/samples/deprecated/emit-asset/asset-source-missing-2/_config.js similarity index 94% rename from test/function/samples/emit-asset/asset-source-missing-2/_config.js rename to test/function/samples/deprecated/emit-asset/asset-source-missing-2/_config.js index 722c1b9c225..4b973d7d804 100644 --- a/test/function/samples/emit-asset/asset-source-missing-2/_config.js +++ b/test/function/samples/deprecated/emit-asset/asset-source-missing-2/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'throws when not setting the asset source and accessing the asset URL', options: { + strictDeprecations: false, plugins: { name: 'test-plugin', load() { diff --git a/test/function/samples/emit-asset/asset-source-missing-2/main.js b/test/function/samples/deprecated/emit-asset/asset-source-missing-2/main.js similarity index 100% rename from test/function/samples/emit-asset/asset-source-missing-2/main.js rename to test/function/samples/deprecated/emit-asset/asset-source-missing-2/main.js diff --git a/test/function/samples/emit-asset/asset-source-missing-3/_config.js b/test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js similarity index 94% rename from test/function/samples/emit-asset/asset-source-missing-3/_config.js rename to test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js index 8929ab542fb..6e1c9622897 100644 --- a/test/function/samples/emit-asset/asset-source-missing-3/_config.js +++ b/test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'throws when setting an empty asset source', options: { + strictDeprecations: false, plugins: { name: 'test-plugin', buildStart() { diff --git a/test/function/samples/emit-asset/asset-source-missing-3/main.js b/test/function/samples/deprecated/emit-asset/asset-source-missing-3/main.js similarity index 100% rename from test/function/samples/emit-asset/asset-source-missing-3/main.js rename to test/function/samples/deprecated/emit-asset/asset-source-missing-3/main.js diff --git a/test/function/samples/emit-asset/asset-source-missing/_config.js b/test/function/samples/deprecated/emit-asset/asset-source-missing/_config.js similarity index 91% rename from test/function/samples/emit-asset/asset-source-missing/_config.js rename to test/function/samples/deprecated/emit-asset/asset-source-missing/_config.js index e29179abf9e..59b5946f927 100644 --- a/test/function/samples/emit-asset/asset-source-missing/_config.js +++ b/test/function/samples/deprecated/emit-asset/asset-source-missing/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'throws when not setting the asset source', options: { + strictDeprecations: false, plugins: { name: 'test-plugin', load() { diff --git a/test/function/samples/emit-asset/asset-source-missing/main.js b/test/function/samples/deprecated/emit-asset/asset-source-missing/main.js similarity index 100% rename from test/function/samples/emit-asset/asset-source-missing/main.js rename to test/function/samples/deprecated/emit-asset/asset-source-missing/main.js diff --git a/test/function/samples/emit-asset/invalid-asset-id/_config.js b/test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js similarity index 92% rename from test/function/samples/emit-asset/invalid-asset-id/_config.js rename to test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js index 9e7898f97b8..012eee6ddad 100644 --- a/test/function/samples/emit-asset/invalid-asset-id/_config.js +++ b/test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'throws for invalid asset ids', options: { + strictDeprecations: false, plugins: { name: 'test-plugin', load() { diff --git a/test/function/samples/emit-asset/invalid-asset-id/main.js b/test/function/samples/deprecated/emit-asset/invalid-asset-id/main.js similarity index 100% rename from test/function/samples/emit-asset/invalid-asset-id/main.js rename to test/function/samples/deprecated/emit-asset/invalid-asset-id/main.js diff --git a/test/function/samples/emit-asset/invalid-asset-name/_config.js b/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js similarity index 93% rename from test/function/samples/emit-asset/invalid-asset-name/_config.js rename to test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js index ffbe4fa4a9b..33329f422ca 100644 --- a/test/function/samples/emit-asset/invalid-asset-name/_config.js +++ b/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'throws for invalid asset names', options: { + strictDeprecations: false, plugins: { name: 'test-plugin', buildStart() { diff --git a/test/function/samples/emit-asset/invalid-asset-name/main.js b/test/function/samples/deprecated/emit-asset/invalid-asset-name/main.js similarity index 100% rename from test/function/samples/emit-asset/invalid-asset-name/main.js rename to test/function/samples/deprecated/emit-asset/invalid-asset-name/main.js diff --git a/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/_config.js b/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/_config.js new file mode 100644 index 00000000000..1f536fd748d --- /dev/null +++ b/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'throws for invalid asset ids', + options: { + strictDeprecations: false, + plugins: { + name: 'test-plugin', + buildStart() { + this.setAssetSource('invalid', 'content'); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: 'Plugin error - Unable to set the source for unknown asset "invalid".', + plugin: 'test-plugin', + pluginCode: 'ASSET_NOT_FOUND' + } +}; diff --git a/test/function/samples/emit-asset/invalid-set-asset-source-id/main.js b/test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/main.js similarity index 100% rename from test/function/samples/emit-asset/invalid-set-asset-source-id/main.js rename to test/function/samples/deprecated/emit-asset/invalid-set-asset-source-id/main.js diff --git a/test/function/samples/emit-asset/set-asset-source-transform/_config.js b/test/function/samples/deprecated/emit-asset/set-asset-source-transform/_config.js similarity index 84% rename from test/function/samples/emit-asset/set-asset-source-transform/_config.js rename to test/function/samples/deprecated/emit-asset/set-asset-source-transform/_config.js index bb506dfd995..d24624e105f 100644 --- a/test/function/samples/emit-asset/set-asset-source-transform/_config.js +++ b/test/function/samples/deprecated/emit-asset/set-asset-source-transform/_config.js @@ -3,6 +3,7 @@ const path = require('path'); module.exports = { description: 'throws when setting the asset source in the transform hook', options: { + strictDeprecations: false, plugins: { name: 'test-plugin', transform(code) { @@ -17,7 +18,7 @@ module.exports = { hook: 'transform', id: path.join(__dirname, 'main.js'), message: - 'setAssetSource cannot be called in transform for caching reasons. Use emitAsset with a source, or call setAssetSource in another hook.', + 'setAssetSource cannot be called in transform for caching reasons. Use emitFile with a source, or call setAssetSource in another hook.', plugin: 'test-plugin', pluginCode: 'INVALID_SETASSETSOURCE' } diff --git a/test/function/samples/emit-asset/set-asset-source-transform/main.js b/test/function/samples/deprecated/emit-asset/set-asset-source-transform/main.js similarity index 100% rename from test/function/samples/emit-asset/set-asset-source-transform/main.js rename to test/function/samples/deprecated/emit-asset/set-asset-source-transform/main.js diff --git a/test/function/samples/emit-asset/set-asset-source-twice/_config.js b/test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js similarity index 94% rename from test/function/samples/emit-asset/set-asset-source-twice/_config.js rename to test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js index d009be672f8..ad08fb433fc 100644 --- a/test/function/samples/emit-asset/set-asset-source-twice/_config.js +++ b/test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'throws when setting the asset source twice', options: { + strictDeprecations: false, plugins: { name: 'test-plugin', buildEnd() { diff --git a/test/function/samples/emit-asset/set-asset-source-twice/main.js b/test/function/samples/deprecated/emit-asset/set-asset-source-twice/main.js similarity index 100% rename from test/function/samples/emit-asset/set-asset-source-twice/main.js rename to test/function/samples/deprecated/emit-asset/set-asset-source-twice/main.js diff --git a/test/function/samples/deprecations/ROLLUP_ASSET_URL/_config.js b/test/function/samples/deprecations/ROLLUP_ASSET_URL/_config.js new file mode 100644 index 00000000000..cc75750f1ab --- /dev/null +++ b/test/function/samples/deprecations/ROLLUP_ASSET_URL/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'marks ROLLUP_ASSET_URL as deprecated', + options: { + plugins: { + load(id) { + return `export default import.meta.ROLLUP_ASSET_URL_${this.emitFile({ + type: 'asset', + name: 'asset', + source: 'asset' + })};`; + } + } + }, + generateError: { + code: 'DEPRECATED_FEATURE', + message: + 'Using the "ROLLUP_ASSET_URL_" prefix to reference files is deprecated. Use the "ROLLUP_FILE_URL_" prefix instead.' + } +}; diff --git a/test/function/samples/deprecations/ROLLUP_ASSET_URL/main.js b/test/function/samples/deprecations/ROLLUP_ASSET_URL/main.js new file mode 100644 index 00000000000..f8a2d88d245 --- /dev/null +++ b/test/function/samples/deprecations/ROLLUP_ASSET_URL/main.js @@ -0,0 +1,11 @@ +const foo = {}; + +function doIt(x) { + if (foo[x]) { + return true; + } + foo[x] = true; +} + +doIt('x'); +assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/this-emitAsset/_config.js b/test/function/samples/deprecations/this-emitAsset/_config.js new file mode 100644 index 00000000000..b8c0d0fee50 --- /dev/null +++ b/test/function/samples/deprecations/this-emitAsset/_config.js @@ -0,0 +1,17 @@ +module.exports = { + description: 'marks this.emitAsset as deprecated', + options: { + plugins: { + buildStart() { + this.emitAsset('asset', 'asset'); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: `The "this.emitAsset" plugin context function used by plugin at position 1 is deprecated. The "this.emitFile" plugin context function should be used instead with "type: 'asset'".`, + plugin: 'at position 1', + pluginCode: 'DEPRECATED_FEATURE' + } +}; diff --git a/test/function/samples/deprecations/this-emitAsset/main.js b/test/function/samples/deprecations/this-emitAsset/main.js new file mode 100644 index 00000000000..f8a2d88d245 --- /dev/null +++ b/test/function/samples/deprecations/this-emitAsset/main.js @@ -0,0 +1,11 @@ +const foo = {}; + +function doIt(x) { + if (foo[x]) { + return true; + } + foo[x] = true; +} + +doIt('x'); +assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/emit-file/asset-source-missing-2/_config.js b/test/function/samples/emit-file/asset-source-missing-2/_config.js new file mode 100644 index 00000000000..7ba7af1ee9a --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing-2/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'throws when not setting the asset source and accessing the asset URL', + options: { + plugins: { + name: 'test-plugin', + load() { + return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({ + type: 'asset', + name: 'test.ext' + })};`; + } + } + }, + generateError: { + code: 'ASSET_NOT_FINALISED', + message: + 'Plugin error - Unable to get file name for asset "test.ext". Ensure that the source is set and that generate is called first.' + } +}; diff --git a/test/function/samples/emit-file/asset-source-missing-2/main.js b/test/function/samples/emit-file/asset-source-missing-2/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing-2/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/asset-source-missing-3/_config.js b/test/function/samples/emit-file/asset-source-missing-3/_config.js new file mode 100644 index 00000000000..bfc07ac697a --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing-3/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'throws when setting an empty asset source', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + const assetId = this.emitFile({ type: 'asset', name: 'test.ext' }); + this.setAssetSource(assetId, null); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: 'Plugin error creating asset "test.ext", setAssetSource call without a source.', + plugin: 'test-plugin', + pluginCode: 'ASSET_SOURCE_MISSING' + } +}; diff --git a/test/function/samples/emit-file/asset-source-missing-3/main.js b/test/function/samples/emit-file/asset-source-missing-3/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing-3/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/asset-source-missing/_config.js b/test/function/samples/emit-file/asset-source-missing/_config.js new file mode 100644 index 00000000000..bb97104870f --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing/_config.js @@ -0,0 +1,15 @@ +module.exports = { + description: 'throws when not setting the asset source', + options: { + plugins: { + name: 'test-plugin', + load() { + this.emitFile({ type: 'asset', name: 'test.ext' }); + } + } + }, + generateError: { + code: 'ASSET_SOURCE_MISSING', + message: 'Plugin error creating asset "test.ext" - no asset source set.' + } +}; diff --git a/test/function/samples/emit-file/asset-source-missing/main.js b/test/function/samples/emit-file/asset-source-missing/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/invalid-asset-id/_config.js b/test/function/samples/emit-file/invalid-asset-id/_config.js new file mode 100644 index 00000000000..3ff40dfdcdb --- /dev/null +++ b/test/function/samples/emit-file/invalid-asset-id/_config.js @@ -0,0 +1,15 @@ +module.exports = { + description: 'throws for invalid asset ids', + options: { + plugins: { + name: 'test-plugin', + load() { + return `export default import.meta.ROLLUP_FILE_URL_invalid;`; + } + } + }, + generateError: { + code: 'ASSET_NOT_FOUND', + message: 'Plugin error - Unable to get file name for unknown asset "invalid".' + } +}; diff --git a/test/function/samples/emit-file/invalid-asset-id/main.js b/test/function/samples/emit-file/invalid-asset-id/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/invalid-asset-id/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/invalid-asset-name/_config.js b/test/function/samples/emit-file/invalid-asset-name/_config.js new file mode 100644 index 00000000000..b9fc62b43a4 --- /dev/null +++ b/test/function/samples/emit-file/invalid-asset-name/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'throws for invalid asset names', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + this.emitFile({ type: 'asset', name: '/test.ext', source: 'content' }); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: + 'Plugin error creating asset, name "/test.ext" is not a plain (non relative or absolute URL) string name.', + plugin: 'test-plugin', + pluginCode: 'INVALID_ASSET_NAME' + } +}; diff --git a/test/function/samples/emit-file/invalid-asset-name/main.js b/test/function/samples/emit-file/invalid-asset-name/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/invalid-asset-name/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-asset/invalid-set-asset-source-id/_config.js b/test/function/samples/emit-file/invalid-set-asset-source-id/_config.js similarity index 100% rename from test/function/samples/emit-asset/invalid-set-asset-source-id/_config.js rename to test/function/samples/emit-file/invalid-set-asset-source-id/_config.js diff --git a/test/function/samples/emit-file/invalid-set-asset-source-id/main.js b/test/function/samples/emit-file/invalid-set-asset-source-id/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/invalid-set-asset-source-id/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/set-asset-source-transform/_config.js b/test/function/samples/emit-file/set-asset-source-transform/_config.js new file mode 100644 index 00000000000..97af013ab68 --- /dev/null +++ b/test/function/samples/emit-file/set-asset-source-transform/_config.js @@ -0,0 +1,24 @@ +const path = require('path'); + +module.exports = { + description: 'throws when setting the asset source in the transform hook', + options: { + plugins: { + name: 'test-plugin', + transform(code) { + const assetId = this.emitFile({ type: 'asset', name: 'test.ext' }); + this.setAssetSource(assetId, 'asdf'); + return code; + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'transform', + id: path.join(__dirname, 'main.js'), + message: + 'setAssetSource cannot be called in transform for caching reasons. Use emitFile with a source, or call setAssetSource in another hook.', + plugin: 'test-plugin', + pluginCode: 'INVALID_SETASSETSOURCE' + } +}; diff --git a/test/function/samples/emit-file/set-asset-source-transform/main.js b/test/function/samples/emit-file/set-asset-source-transform/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/set-asset-source-transform/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/set-asset-source-twice/_config.js b/test/function/samples/emit-file/set-asset-source-twice/_config.js new file mode 100644 index 00000000000..6405dbed625 --- /dev/null +++ b/test/function/samples/emit-file/set-asset-source-twice/_config.js @@ -0,0 +1,20 @@ +module.exports = { + description: 'throws when setting the asset source twice', + options: { + plugins: { + name: 'test-plugin', + buildEnd() { + const assetId = this.emitFile({ type: 'asset', name: 'test.ext' }); + this.setAssetSource(assetId, 'hello world'); + this.setAssetSource(assetId, 'another'); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildEnd', + message: 'Plugin error - Unable to set the source for asset "test.ext", source already set.', + plugin: 'test-plugin', + pluginCode: 'ASSET_SOURCE_ALREADY_SET' + } +}; diff --git a/test/function/samples/emit-file/set-asset-source-twice/main.js b/test/function/samples/emit-file/set-asset-source-twice/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/set-asset-source-twice/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/plugin-error/buildEnd/_config.js b/test/function/samples/plugin-error/buildEnd/_config.js new file mode 100644 index 00000000000..0f3c27d4143 --- /dev/null +++ b/test/function/samples/plugin-error/buildEnd/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'buildStart hooks can use this.error', + options: { + plugins: [ + { + name: 'test', + buildEnd() { + this.error('nope'); + } + } + ] + }, + error: { + code: 'PLUGIN_ERROR', + plugin: 'test', + message: 'nope', + hook: 'buildEnd' + } +}; diff --git a/test/function/samples/plugin-error/buildEnd/main.js b/test/function/samples/plugin-error/buildEnd/main.js new file mode 100644 index 00000000000..65804ade90a --- /dev/null +++ b/test/function/samples/plugin-error/buildEnd/main.js @@ -0,0 +1 @@ +assert.equal( 1, 1 ); diff --git a/test/function/samples/plugin-error/buildStart/_config.js b/test/function/samples/plugin-error/buildStart/_config.js new file mode 100644 index 00000000000..47657147100 --- /dev/null +++ b/test/function/samples/plugin-error/buildStart/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'buildStart hooks can use this.error', + options: { + plugins: [ + { + name: 'test', + buildStart() { + this.error('nope'); + } + } + ] + }, + error: { + code: 'PLUGIN_ERROR', + plugin: 'test', + message: 'nope', + hook: 'buildStart' + } +}; diff --git a/test/function/samples/plugin-error/buildStart/main.js b/test/function/samples/plugin-error/buildStart/main.js new file mode 100644 index 00000000000..65804ade90a --- /dev/null +++ b/test/function/samples/plugin-error/buildStart/main.js @@ -0,0 +1 @@ +assert.equal( 1, 1 ); diff --git a/test/function/samples/plugin-error/generateBundle/_config.js b/test/function/samples/plugin-error/generateBundle/_config.js new file mode 100644 index 00000000000..27ca00e7e9d --- /dev/null +++ b/test/function/samples/plugin-error/generateBundle/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'buildStart hooks can use this.error', + options: { + plugins: [ + { + name: 'test', + generateBundle() { + this.error('nope'); + } + } + ] + }, + generateError: { + code: 'PLUGIN_ERROR', + plugin: 'test', + message: 'nope', + hook: 'generateBundle' + } +}; diff --git a/test/function/samples/plugin-error/generateBundle/main.js b/test/function/samples/plugin-error/generateBundle/main.js new file mode 100644 index 00000000000..65804ade90a --- /dev/null +++ b/test/function/samples/plugin-error/generateBundle/main.js @@ -0,0 +1 @@ +assert.equal( 1, 1 ); diff --git a/test/function/samples/plugin-error/load/_config.js b/test/function/samples/plugin-error/load/_config.js new file mode 100644 index 00000000000..7fa21705116 --- /dev/null +++ b/test/function/samples/plugin-error/load/_config.js @@ -0,0 +1,21 @@ +const path = require('path'); + +module.exports = { + description: 'buildStart hooks can use this.error', + options: { + plugins: [ + { + name: 'test', + load() { + this.error('nope'); + } + } + ] + }, + error: { + code: 'PLUGIN_ERROR', + plugin: 'test', + message: `Could not load ${path.resolve(__dirname, 'main.js')}: nope`, + hook: 'load' + } +}; diff --git a/test/function/samples/plugin-error/load/main.js b/test/function/samples/plugin-error/load/main.js new file mode 100644 index 00000000000..65804ade90a --- /dev/null +++ b/test/function/samples/plugin-error/load/main.js @@ -0,0 +1 @@ +assert.equal( 1, 1 ); diff --git a/test/function/samples/plugin-error/renderChunk/_config.js b/test/function/samples/plugin-error/renderChunk/_config.js new file mode 100644 index 00000000000..3cf2fb6ad5c --- /dev/null +++ b/test/function/samples/plugin-error/renderChunk/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'buildStart hooks can use this.error', + options: { + plugins: [ + { + name: 'test', + renderChunk() { + this.error('nope'); + } + } + ] + }, + generateError: { + code: 'PLUGIN_ERROR', + plugin: 'test', + message: 'nope', + hook: 'renderChunk' + } +}; diff --git a/test/function/samples/plugin-error/renderChunk/main.js b/test/function/samples/plugin-error/renderChunk/main.js new file mode 100644 index 00000000000..65804ade90a --- /dev/null +++ b/test/function/samples/plugin-error/renderChunk/main.js @@ -0,0 +1 @@ +assert.equal( 1, 1 ); diff --git a/test/function/samples/plugin-error/renderStart/_config.js b/test/function/samples/plugin-error/renderStart/_config.js new file mode 100644 index 00000000000..5c7f9551f4f --- /dev/null +++ b/test/function/samples/plugin-error/renderStart/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'buildStart hooks can use this.error', + options: { + plugins: [ + { + name: 'test', + renderStart() { + this.error('nope'); + } + } + ] + }, + generateError: { + code: 'PLUGIN_ERROR', + plugin: 'test', + message: 'nope', + hook: 'renderStart' + } +}; diff --git a/test/function/samples/plugin-error/renderStart/main.js b/test/function/samples/plugin-error/renderStart/main.js new file mode 100644 index 00000000000..65804ade90a --- /dev/null +++ b/test/function/samples/plugin-error/renderStart/main.js @@ -0,0 +1 @@ +assert.equal( 1, 1 ); diff --git a/test/function/samples/plugin-error/resolveId/_config.js b/test/function/samples/plugin-error/resolveId/_config.js new file mode 100644 index 00000000000..640b704e011 --- /dev/null +++ b/test/function/samples/plugin-error/resolveId/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'buildStart hooks can use this.error', + options: { + plugins: [ + { + name: 'test', + resolveId() { + this.error('nope'); + } + } + ] + }, + error: { + code: 'PLUGIN_ERROR', + plugin: 'test', + message: 'nope', + hook: 'resolveId' + } +}; diff --git a/test/function/samples/plugin-error/resolveId/main.js b/test/function/samples/plugin-error/resolveId/main.js new file mode 100644 index 00000000000..65804ade90a --- /dev/null +++ b/test/function/samples/plugin-error/resolveId/main.js @@ -0,0 +1 @@ +assert.equal( 1, 1 ); diff --git a/test/function/samples/plugin-error/_config.js b/test/function/samples/plugin-error/transform/_config.js similarity index 95% rename from test/function/samples/plugin-error/_config.js rename to test/function/samples/plugin-error/transform/_config.js index 5cfd7e38358..02dd00ff809 100644 --- a/test/function/samples/plugin-error/_config.js +++ b/test/function/samples/plugin-error/transform/_config.js @@ -6,7 +6,7 @@ module.exports = { plugins: [ { name: 'test', - transform(code, id) { + transform() { this.error('nope', 22); } } diff --git a/test/function/samples/plugin-error/main.js b/test/function/samples/plugin-error/transform/main.js similarity index 100% rename from test/function/samples/plugin-error/main.js rename to test/function/samples/plugin-error/transform/main.js diff --git a/test/hooks/index.js b/test/hooks/index.js index b010229647e..2a6ba737319 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -242,117 +242,6 @@ describe('hooks', () => { assert.equal(output.code, `alert('hello');\n`); })); - it('passes bundle & output object to ongenerate & onwrite hooks, with deprecation warnings', () => { - let deprecationCnt = 0; - - return rollup - .rollup({ - input: 'input', - onwarn(warning) { - deprecationCnt++; - if (deprecationCnt === 1) { - assert.equal(warning.code, 'DEPRECATED_FEATURE'); - assert.equal( - warning.message, - 'The "ongenerate" hook used by plugin at position 2 is deprecated. The "generateBundle" hook should be used instead.' - ); - } else { - assert.equal(warning.code, 'DEPRECATED_FEATURE'); - assert.equal( - warning.message, - 'The "onwrite" hook used by plugin at position 2 is deprecated. The "generateBundle/writeBundle" hook should be used instead.' - ); - } - }, - plugins: [ - loader({ input: `alert('hello')` }), - { - ongenerate(bundle, out) { - out.ongenerate = true; - }, - - onwrite(bundle, out) { - assert.equal(out.ongenerate, true); - } - } - ] - }) - .then(bundle => - bundle.write({ - file: path.join(TEMP_DIR, 'bundle.js'), - format: 'es' - }) - ) - .then(() => { - assert.equal(deprecationCnt, 2); - return sander.rimraf(TEMP_DIR); - }); - }); - - it('calls ongenerate hooks in sequence', () => { - const result = []; - - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - ongenerate(info) { - result.push({ a: info.format }); - } - }, - { - ongenerate(info) { - result.push({ b: info.format }); - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'cjs' })) - .then(() => { - assert.deepEqual(result, [{ a: 'cjs' }, { b: 'cjs' }]); - }); - }); - - it('calls onwrite hooks in sequence', () => { - const result = []; - const file = path.join(TEMP_DIR, 'bundle.js'); - - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - onwrite(info) { - return new Promise(fulfil => { - setTimeout(() => { - result.push({ a: info.file, format: info.format }); - fulfil(); - }, 10); - }); - } - }, - { - onwrite(info) { - result.push({ b: info.file, format: info.format }); - } - } - ] - }) - .then(bundle => - bundle.write({ - file, - format: 'cjs' - }) - ) - .then(() => { - assert.deepEqual(result, [{ a: file, format: 'cjs' }, { b: file, format: 'cjs' }]); - return sander.rimraf(TEMP_DIR); - }); - }); - it('caches chunk emission in transform hook', () => { let cache; return rollup @@ -430,34 +319,7 @@ describe('hooks', () => { }); }); - it('supports asset emission', () => - rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: '' }), - { - transform() { - const assetId = this.emitAsset('test.ext', 'hello world'); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'es' })) - .then(({ output }) => { - assert.equal(output[1].isAsset, true); - assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); - assert.equal(output[1].source, 'hello world'); - assert.equal(output[0].fileName, 'input.js'); - assert.equal(output[0].isEntry, true); - assert.equal( - output[0].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` - ); - })); - - it('caches asset emission in transform hook', () => { + it('caches file emission in transform hook', () => { let cache; return rollup .rollup({ @@ -466,8 +328,11 @@ describe('hooks', () => { loader({ input: '' }), { transform() { - const assetId = this.emitAsset('test.ext', 'hello world'); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; + return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({ + type: 'asset', + name: 'test.ext', + source: 'hello world' + })};`; } } ] @@ -552,8 +417,12 @@ describe('hooks', () => { transform() { this.cache.set('asdf', 'asdf'); runs++; - const assetId = this.emitAsset('test.ext', 'hello world'); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; + const assetId = this.emitFile({ + type: 'asset', + name: 'test.ext', + source: 'hello world' + }); + return `export default import.meta.ROLLUP_FILE_URL_${assetId};`; } } ] @@ -595,296 +464,6 @@ describe('hooks', () => { }); }); - it('supports CommonJS asset urls', () => - rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: '' }), - { - transform() { - const assetId = this.emitAsset('test.ext', 'hello world'); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'cjs' })) - .then(({ output: [{ code }] }) => { - assert.equal( - code, - `'use strict'; - -var input = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/test-0a676135.ext').href : new URL('assets/test-0a676135.ext', document.currentScript && document.currentScript.src || document.baseURI).href); - -module.exports = input; -` - ); - })); - - it('supports custom asset file names', () => - rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - transform() { - this.emitAsset('test.ext', 'hello world'); - return ''; - } - } - ] - }) - .then(bundle => - bundle.generate({ - format: 'es', - assetFileNames: '[name][extname]' - }) - ) - .then(({ output: [, output] }) => { - assert.equal(output.fileName, 'test.ext'); - assert.equal(output.source, 'hello world'); - })); - - it('allows setting asset source separately', () => { - let assetId; - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - transform() { - assetId = this.emitAsset('test.ext'); - return ''; - }, - generateBundle() { - this.setAssetSource(assetId, 'hello world'); - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'es' })) - .then(({ output: [, output] }) => { - assert.equal(output.fileName, 'assets/test-0a676135.ext'); - assert.equal(output.source, 'hello world'); - }); - }); - - it('allows setting asset source at generateBundle', () => { - let assetId; - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - transform() { - return ''; - }, - generateBundle() { - assetId = this.emitAsset('test.ext'); - this.setAssetSource(assetId, 'hello world'); - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'es' })) - .then(({ output: [, output] }) => { - assert.equal(output.source, 'hello world'); - }); - }); - - it('supports transformChunk in place of transformBundle, with deprecation warning', () => { - let calledHook = false; - let deprecationCnt = 0; - return rollup - .rollup({ - input: 'input', - onwarn(warning) { - deprecationCnt++; - assert.equal(warning.code, 'DEPRECATED_FEATURE'); - assert.equal( - warning.message, - 'The "transformChunk" hook used by plugin at position 2 is deprecated. The "renderChunk" hook should be used instead.' - ); - }, - plugins: [ - loader({ input: `alert('hello')` }), - { - transformChunk(code, id) { - calledHook = true; - try { - this.emitAsset('test.ext', 'hello world'); - } catch (e) { - assert.equal(e.code, 'ASSETS_ALREADY_FINALISED'); - } - } - } - ] - }) - .then(bundle => - bundle.generate({ - format: 'es', - assetFileNames: '[name][extname]' - }) - ) - .then(() => { - assert.equal(deprecationCnt, 1); - assert.equal(calledHook, true); - }); - }); - - it('supports renderChunk in place of transformBundle and transformChunk', () => { - let calledHook = false; - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - renderChunk(code, chunk, options) { - calledHook = true; - assert.equal(chunk.fileName, 'input.js'); - assert.equal(chunk.isEntry, true); - assert.equal(chunk.exports.length, 0); - assert.ok(chunk.modules['input']); - try { - this.emitAsset('test.ext', 'hello world'); - } catch (e) { - assert.equal(e.code, 'ASSETS_ALREADY_FINALISED'); - } - } - } - ] - }) - .then(bundle => - bundle.generate({ - format: 'es', - assetFileNames: '[name][extname]' - }) - ) - .then(() => { - assert.equal(calledHook, true); - }); - }); - - it('supports renderChunk in place of transformBundle and transformChunk', () => { - let calledHook = false; - return rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - renderChunk(code, chunk, options) { - calledHook = true; - assert.equal(chunk.fileName, 'input.js'); - assert.equal(chunk.isEntry, true); - assert.equal(chunk.exports.length, 0); - assert.ok(chunk.modules['input']); - try { - this.emitAsset('test.ext', 'hello world'); - } catch (e) { - assert.equal(e.code, 'ASSETS_ALREADY_FINALISED'); - } - } - } - ] - }) - .then(bundle => - bundle.generate({ - format: 'es', - assetFileNames: '[name][extname]' - }) - ) - .then(() => { - assert.equal(calledHook, true); - }); - }); - - it('passes bundle object to generateBundle hook', () => - rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - transform() { - const assetId = this.emitAsset('test.ext', 'hello world'); - return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; - }, - generateBundle(options, outputBundle, isWrite) { - assert.equal(outputBundle['assets/test-0a676135.ext'].source, 'hello world'); - assert.equal( - outputBundle['input.js'].code, - `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` - ); - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'es' }))); - - it('supports assets uniquely defined in the generateBundle hook', () => - rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - generateBundle(options) { - if (options.format === 'es') { - const depAssetId = this.emitAsset('lateDepAsset', 'custom source'); - const source = `references ${this.getAssetFileName(depAssetId)}`; - this.emitAsset('lateMainAsset', source); - } else { - const depAssetId = this.emitAsset('lateDepAsset', 'different source'); - const source = `references ${this.getAssetFileName(depAssetId)}`; - this.emitAsset('lateMainAsset', source); - } - } - } - ] - }) - .then(bundle => - bundle - .generate({ format: 'es' }) - .then(outputBundle1 => - bundle.generate({ format: 'cjs' }).then(outputBundle2 => [outputBundle1, outputBundle2]) - ) - ) - .then(([{ output: output1 }, { output: output2 }]) => { - assert.equal(output1.length, 3); - assert.equal(output1[0].code, `alert('hello');\n`); - assert.equal(output1[1].source, 'custom source'); - assert.equal(output1[2].source, `references assets/lateDepAsset-91c07f3c`); - - assert.equal(output2.length, 3); - assert.equal(output2[0].code, `'use strict';\n\nalert('hello');\n`); - assert.equal(output2[1].source, 'different source'); - assert.equal(output2[2].source, `references assets/lateDepAsset-0b0d4321`); - })); - - it('supports errors thrown in the generateBundle hook', () => - rollup - .rollup({ - input: 'input', - plugins: [ - loader({ input: `alert('hello')` }), - { - generateBundle() { - this.error('test error'); - } - } - ] - }) - .then(bundle => bundle.generate({ format: 'es' })) - .catch(err => { - assert.equal(err.message, 'test error'); - })); - it('supports generateBundle hook including reporting rendered exports and source length', () => rollup .rollup({ @@ -1355,4 +934,367 @@ module.exports = input; ]); }); }); + + describe('deprecated', () => { + it('passes bundle & output object to ongenerate & onwrite hooks, with deprecation warnings', () => { + let deprecationCnt = 0; + + return rollup + .rollup({ + input: 'input', + onwarn(warning) { + deprecationCnt++; + if (deprecationCnt === 1) { + assert.equal(warning.code, 'DEPRECATED_FEATURE'); + assert.equal( + warning.message, + 'The "ongenerate" hook used by plugin at position 2 is deprecated. The "generateBundle" hook should be used instead.' + ); + } else { + assert.equal(warning.code, 'DEPRECATED_FEATURE'); + assert.equal( + warning.message, + 'The "onwrite" hook used by plugin at position 2 is deprecated. The "generateBundle/writeBundle" hook should be used instead.' + ); + } + }, + plugins: [ + loader({ input: `alert('hello')` }), + { + ongenerate(bundle, out) { + out.ongenerate = true; + }, + + onwrite(bundle, out) { + assert.equal(out.ongenerate, true); + } + } + ] + }) + .then(bundle => + bundle.write({ + file: path.join(TEMP_DIR, 'bundle.js'), + format: 'es' + }) + ) + .then(() => { + assert.equal(deprecationCnt, 2); + return sander.rimraf(TEMP_DIR); + }); + }); + + it('calls ongenerate hooks in sequence', () => { + const result = []; + + return rollup + .rollup({ + input: 'input', + plugins: [ + loader({ input: `alert('hello')` }), + { + ongenerate(info) { + result.push({ a: info.format }); + } + }, + { + ongenerate(info) { + result.push({ b: info.format }); + } + } + ] + }) + .then(bundle => bundle.generate({ format: 'cjs' })) + .then(() => { + assert.deepEqual(result, [{ a: 'cjs' }, { b: 'cjs' }]); + }); + }); + + it('calls onwrite hooks in sequence', () => { + const result = []; + const file = path.join(TEMP_DIR, 'bundle.js'); + + return rollup + .rollup({ + input: 'input', + plugins: [ + loader({ input: `alert('hello')` }), + { + onwrite(info) { + return new Promise(fulfil => { + setTimeout(() => { + result.push({ a: info.file, format: info.format }); + fulfil(); + }, 10); + }); + } + }, + { + onwrite(info) { + result.push({ b: info.file, format: info.format }); + } + } + ] + }) + .then(bundle => + bundle.write({ + file, + format: 'cjs' + }) + ) + .then(() => { + assert.deepEqual(result, [{ a: file, format: 'cjs' }, { b: file, format: 'cjs' }]); + return sander.rimraf(TEMP_DIR); + }); + }); + + it('supports transformChunk in place of transformBundle, with deprecation warning', () => { + let calledHook = false; + let deprecationCnt = 0; + return rollup + .rollup({ + input: 'input', + onwarn(warning) { + deprecationCnt++; + assert.equal(warning.code, 'DEPRECATED_FEATURE'); + assert.equal( + warning.message, + 'The "transformChunk" hook used by plugin at position 2 is deprecated. The "renderChunk" hook should be used instead.' + ); + }, + plugins: [ + loader({ input: `alert('hello')` }), + { + transformChunk(code, id) { + calledHook = true; + try { + this.emitAsset('test.ext', 'hello world'); + } catch (e) { + assert.equal(e.code, 'ASSETS_ALREADY_FINALISED'); + } + } + } + ] + }) + .then(bundle => + bundle.generate({ + format: 'es', + assetFileNames: '[name][extname]' + }) + ) + .then(() => { + assert.equal(deprecationCnt, 1); + assert.equal(calledHook, true); + }); + }); + + it('passes bundle object to generateBundle hook', () => + rollup + .rollup({ + input: 'input', + plugins: [ + loader({ input: `alert('hello')` }), + { + transform() { + const assetId = this.emitAsset('test.ext', 'hello world'); + return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; + }, + generateBundle(options, outputBundle, isWrite) { + assert.equal(outputBundle['assets/test-0a676135.ext'].source, 'hello world'); + assert.equal( + outputBundle['input.js'].code, + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + ); + } + } + ] + }) + .then(bundle => bundle.generate({ format: 'es' }))); + + it('caches asset emission in transform hook', () => { + let cache; + return rollup + .rollup({ + input: 'input', + plugins: [ + loader({ input: '' }), + { + transform() { + const assetId = this.emitAsset('test.ext', 'hello world'); + return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; + } + } + ] + }) + .then(bundle => { + cache = bundle.cache; + return bundle.generate({ format: 'es' }); + }) + .then(({ output }) => { + assert.equal( + output[0].code, + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + ); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); + assert.equal(output[1].source, 'hello world'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); + assert.equal(output[1].source, 'hello world'); + + return rollup.rollup({ + cache, + input: 'input', + plugins: [ + loader({ input: '' }), + { + transform() { + assert.fail('Should cache transform'); + } + } + ] + }); + }) + .then(bundle => { + cache = bundle.cache; + return bundle.generate({ format: 'es' }); + }) + .then(({ output }) => { + assert.equal( + output[0].code, + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + ); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); + assert.equal(output[1].source, 'hello world'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); + assert.equal(output[1].source, 'hello world'); + + return rollup.rollup({ + cache, + input: 'input', + plugins: [ + loader({ input: '' }), + { + transform() { + assert.fail('Should cache transform'); + } + } + ] + }); + }) + .then(bundle => bundle.generate({ format: 'es' })) + .then(({ output }) => { + assert.equal( + output[0].code, + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + ); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); + assert.equal(output[1].source, 'hello world'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); + assert.equal(output[1].source, 'hello world'); + }); + }); + + it('opts-out transform hook cache for custom cache', () => { + let runs = 0; + let cache; + return rollup + .rollup({ + input: 'input', + plugins: [ + loader({ input: '' }), + { + name: 'x', + transform() { + this.cache.set('asdf', 'asdf'); + runs++; + const assetId = this.emitAsset('test.ext', 'hello world'); + return `export default import.meta.ROLLUP_ASSET_URL_${assetId};`; + } + } + ] + }) + .then(bundle => { + cache = bundle.cache; + return bundle.generate({ format: 'es' }); + }) + .then(({ output }) => { + assert.equal( + output[0].code, + `var input = new URL('assets/test-0a676135.ext', import.meta.url).href;\n\nexport default input;\n` + ); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); + assert.equal(output[1].source, 'hello world'); + assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); + assert.equal(output[1].source, 'hello world'); + + return rollup.rollup({ + cache, + input: 'input', + plugins: [ + loader({ input: '' }), + { + name: 'x', + transform() { + runs++; + return `alert('hello world')`; + } + } + ] + }); + }) + .then(bundle => bundle.generate({ format: 'es' })) + .then(({ output }) => { + assert.equal(runs, 2); + assert.equal(output[0].code.trim(), `alert('hello world');`); + assert.equal(output.length, 1); + }); + }); + + it('allows setting asset source at generateBundle', () => { + let assetId; + return rollup + .rollup({ + input: 'input', + plugins: [ + loader({ input: `alert('hello')` }), + { + transform() { + return ''; + }, + generateBundle() { + assetId = this.emitAsset('test.ext'); + this.setAssetSource(assetId, 'hello world'); + } + } + ] + }) + .then(bundle => bundle.generate({ format: 'es' })) + .then(({ output: [, output] }) => { + assert.equal(output.source, 'hello world'); + }); + }); + + it('allows setting asset source separately', () => { + let assetId; + return rollup + .rollup({ + input: 'input', + plugins: [ + loader({ input: `alert('hello')` }), + { + transform() { + assetId = this.emitAsset('test.ext'); + return ''; + }, + generateBundle() { + this.setAssetSource(assetId, 'hello world'); + } + } + ] + }) + .then(bundle => bundle.generate({ format: 'es' })) + .then(({ output: [, output] }) => { + assert.equal(output.fileName, 'assets/test-0a676135.ext'); + assert.equal(output.source, 'hello world'); + }); + }); + }); }); From 022f25b1b571716d9a1d667da5aa459bf5ebd150 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 10 Jul 2019 17:23:10 +0200 Subject: [PATCH 07/31] Deprecate getAssetFileName --- src/rollup/types.d.ts | 8 -- src/utils/pluginDriver.ts | 100 ++++++++++-------- .../emit-file/set-asset-source/_config.js | 2 +- .../deprecations/this-emitAsset/_config.js | 2 +- .../this-getAssetFileName/_config.js | 18 ++++ .../this-getAssetFileName/main.js | 11 ++ 6 files changed, 87 insertions(+), 54 deletions(-) create mode 100644 test/function/samples/deprecations/this-getAssetFileName/_config.js create mode 100644 test/function/samples/deprecations/this-getAssetFileName/main.js diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 6200b2d0c62..7257224d165 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -120,13 +120,6 @@ export interface EmittedChunk { options: { name?: string } | undefined; } -// TODO Lukas get rid of this type -export interface Asset { - fileName: string; - name: string; - source: string | Buffer; -} - export interface PluginCache { delete(id: string): boolean; get(id: string): T; @@ -176,7 +169,6 @@ export interface PluginContext extends MinimalPluginContext { getAssetFileName: (assetReferenceId: string) => string; /** @deprecated Use `this.getFileName` instead */ getChunkFileName: (chunkReferenceId: string) => string; - // TODO Lukas test getFileName: (fileReferenceId: string) => string; getModuleInfo: ( moduleId: string diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index f86458f8900..98f90bbfc7f 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -118,6 +118,30 @@ export function createPluginDriver( watcher?: RollupWatcher ): PluginDriver { warnDeprecatedHooks(options.plugins as Plugin[], graph); + + function getDeprecatedHookHandler( + handler: H, + handlerName: string, + newHandlerName: string, + pluginName: string, + acitveDeprecation: boolean + ): H { + let deprecationWarningShown = false; + return (((...args: any[]) => { + if (!deprecationWarningShown) { + deprecationWarningShown = true; + graph.warnDeprecation( + { + message: `The "this.${handlerName}" plugin context function used by plugin ${pluginName} is deprecated. The "this.${newHandlerName}" plugin context function should be used instead.`, + plugin: pluginName + }, + acitveDeprecation + ); + } + return handler(...args); + }) as unknown) as H; + } + const plugins = [ ...(options.plugins as Plugin[]), getRollupDefaultPlugin(options.preserveSymlinks as boolean) @@ -160,16 +184,14 @@ export function createPluginDriver( graph.watchFiles[id] = true; }, cache: cacheInstance, - emitAsset: (name, source) => { - graph.warnDeprecation( - { - message: `The "this.emitAsset" plugin context function used by plugin ${plugin.name} is deprecated. The "this.emitFile" plugin context function should be used instead with "type: 'asset'".`, - plugin: plugin.name - }, - false - ); - return fileEmitter.emitFile({ type: 'asset', name, source }); - }, + emitAsset: getDeprecatedHookHandler( + (name: string, source?: string | Buffer) => + fileEmitter.emitFile({ type: 'asset', name, source }), + 'emitAsset', + 'emitFile', + plugin.name, + false + ), emitChunk(id, options) { if (graph.phase > BuildPhase.LOAD_AND_PARSE) this.error(errInvalidRollupPhaseForEmitChunk()); @@ -183,7 +205,13 @@ export function createPluginDriver( err.plugin = plugin.name; return error(err); }, - getAssetFileName: fileEmitter.getFileName, + getAssetFileName: getDeprecatedHookHandler( + fileEmitter.getFileName, + 'getAssetFileName', + 'getFileName', + plugin.name, + false + ), getChunkFileName(chunkReferenceId) { return graph.moduleLoader.getChunkFileName(chunkReferenceId); }, @@ -205,22 +233,14 @@ export function createPluginDriver( isExternal: foundModule instanceof ExternalModule }; }, - isExternal: (() => { - let deprecationWarningShown = false; - return (id: string, parentId: string, isResolved = false) => { - if (!deprecationWarningShown) { - deprecationWarningShown = true; - graph.warnDeprecation( - { - message: `The "this.isExternal" plugin context function used by plugin ${plugin.name} is deprecated. The "this.resolve" plugin context function should be used instead.`, - plugin: plugin.name - }, - false - ); - } - return graph.moduleLoader.isExternal(id, parentId, isResolved); - }; - })(), + isExternal: getDeprecatedHookHandler( + (id: string, parentId: string, isResolved = false) => + graph.moduleLoader.isExternal(id, parentId, isResolved), + 'isExternal', + 'resolve', + plugin.name, + false + ), meta: { rollupVersion }, @@ -235,24 +255,16 @@ export function createPluginDriver( options && options.skipSelf ? pidx : null ); }, - resolveId: (() => { - let deprecationWarningShown = false; - return (source: string, importer: string) => { - if (!deprecationWarningShown) { - deprecationWarningShown = true; - graph.warnDeprecation( - { - message: `The "this.resolveId" plugin context function used by plugin ${plugin.name} is deprecated. The "this.resolve" plugin context function should be used instead.`, - plugin: plugin.name - }, - false - ); - } - return graph.moduleLoader + resolveId: getDeprecatedHookHandler( + (source: string, importer: string) => + graph.moduleLoader .resolveId(source, importer) - .then(resolveId => resolveId && resolveId.id); - }; - })(), + .then(resolveId => resolveId && resolveId.id), + 'resolveId', + 'resolve', + plugin.name, + false + ), setAssetSource: fileEmitter.setAssetSource, warn(warning) { if (typeof warning === 'string') warning = { message: warning } as RollupWarning; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_config.js b/test/chunking-form/samples/emit-file/set-asset-source/_config.js index 827a065e916..6b4f7a8689a 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_config.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_config.js @@ -50,7 +50,7 @@ module.exports = { this.setAssetSource(localAsset, options.format); this.setAssetSource( generateBundle, - `generateBundle ${options.format} with ${this.getAssetFileName(localAsset)}` + `generateBundle ${options.format} with ${this.getFileName(localAsset)}` ); } } diff --git a/test/function/samples/deprecations/this-emitAsset/_config.js b/test/function/samples/deprecations/this-emitAsset/_config.js index b8c0d0fee50..1a7a563a557 100644 --- a/test/function/samples/deprecations/this-emitAsset/_config.js +++ b/test/function/samples/deprecations/this-emitAsset/_config.js @@ -10,7 +10,7 @@ module.exports = { error: { code: 'PLUGIN_ERROR', hook: 'buildStart', - message: `The "this.emitAsset" plugin context function used by plugin at position 1 is deprecated. The "this.emitFile" plugin context function should be used instead with "type: 'asset'".`, + message: `The "this.emitAsset" plugin context function used by plugin at position 1 is deprecated. The "this.emitFile" plugin context function should be used instead.`, plugin: 'at position 1', pluginCode: 'DEPRECATED_FEATURE' } diff --git a/test/function/samples/deprecations/this-getAssetFileName/_config.js b/test/function/samples/deprecations/this-getAssetFileName/_config.js new file mode 100644 index 00000000000..0be981440db --- /dev/null +++ b/test/function/samples/deprecations/this-getAssetFileName/_config.js @@ -0,0 +1,18 @@ +module.exports = { + description: 'marks this.emitAsset as deprecated', + options: { + plugins: { + renderChunk() { + this.getAssetFileName(this.emitFile({ type: 'asset', name: 'asset', source: 'asset' })); + } + } + }, + generateError: { + code: 'PLUGIN_ERROR', + hook: 'renderChunk', + message: + 'The "this.getAssetFileName" plugin context function used by plugin at position 1 is deprecated. The "this.getFileName" plugin context function should be used instead.', + plugin: 'at position 1', + pluginCode: 'DEPRECATED_FEATURE' + } +}; diff --git a/test/function/samples/deprecations/this-getAssetFileName/main.js b/test/function/samples/deprecations/this-getAssetFileName/main.js new file mode 100644 index 00000000000..f8a2d88d245 --- /dev/null +++ b/test/function/samples/deprecations/this-getAssetFileName/main.js @@ -0,0 +1,11 @@ +const foo = {}; + +function doIt(x) { + if (foo[x]) { + return true; + } + foo[x] = true; +} + +doIt('x'); +assert.ok(doIt('x'), 'foo was not reassigned'); From a6c0e17168c86536e0c2ea016adefb655cfce595 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 12 Jul 2019 07:21:04 +0200 Subject: [PATCH 08/31] Merge chunk emission into unified API and deprecated previous API --- src/Module.ts | 10 -- src/ModuleLoader.ts | 45 ------- src/ast/nodes/MetaProperty.ts | 10 +- src/rollup/types.d.ts | 35 +++--- src/utils/FileEmitter.ts | 111 ++++++++++++++---- src/utils/defaultPlugin.ts | 5 +- src/utils/error.ts | 29 ++--- src/utils/pluginDriver.ts | 39 +++--- src/utils/transform.ts | 11 +- .../configure-asset-url/_expected/amd/main.js | 2 +- .../_config.js | 2 +- .../_expected/amd/main.js | 4 +- .../emit-asset/_expected/amd/main.js | 2 +- .../deprecated/emit-asset/index-amd.html | 2 +- .../deprecated/emit-asset/index-system.html | 2 +- .../emit-chunk-existing/_config.js | 1 + .../_expected/amd/first-main.js | 0 .../_expected/amd/generated-dep.js | 0 .../_expected/amd/second-main.js | 0 .../_expected/cjs/first-main.js | 0 .../_expected/cjs/generated-dep.js | 0 .../_expected/cjs/second-main.js | 0 .../_expected/es/first-main.js | 0 .../_expected/es/generated-dep.js | 0 .../_expected/es/second-main.js | 0 .../_expected/system/first-main.js | 0 .../_expected/system/generated-dep.js | 0 .../_expected/system/second-main.js | 0 .../emit-chunk-existing/dep.js | 0 .../emit-chunk-existing/main1.js | 0 .../emit-chunk-existing/main2.js | 0 .../emit-chunk-facade/_config.js | 1 + .../_expected/amd/generated-build-starter.js | 0 .../_expected/amd/generated-buildStart.js | 0 .../emit-chunk-facade/_expected/amd/main.js | 0 .../_expected/cjs/generated-build-starter.js | 0 .../_expected/cjs/generated-buildStart.js | 0 .../emit-chunk-facade/_expected/cjs/main.js | 0 .../_expected/es/generated-build-starter.js | 0 .../_expected/es/generated-buildStart.js | 0 .../emit-chunk-facade/_expected/es/main.js | 0 .../system/generated-build-starter.js | 0 .../_expected/system/generated-buildStart.js | 0 .../_expected/system/main.js | 0 .../emit-chunk-facade/buildStart.js | 0 .../{ => deprecated}/emit-chunk-facade/dep.js | 0 .../emit-chunk-facade/main.js | 0 .../emit-chunk-named/_config.js | 1 + .../_expected/amd/generated-chunk.js | 0 .../amd/generated-nested/my-chunk.js | 0 .../emit-chunk-named/_expected/amd/main.js | 0 .../_expected/cjs/generated-chunk.js | 0 .../cjs/generated-nested/my-chunk.js | 0 .../emit-chunk-named/_expected/cjs/main.js | 0 .../_expected/es/generated-chunk.js | 0 .../_expected/es/generated-nested/my-chunk.js | 0 .../emit-chunk-named/_expected/es/main.js | 0 .../_expected/system/generated-chunk.js | 0 .../system/generated-nested/my-chunk.js | 0 .../emit-chunk-named/_expected/system/main.js | 0 .../emit-chunk-named/buildStart.js | 0 .../{ => deprecated}/emit-chunk-named/dep.js | 0 .../{ => deprecated}/emit-chunk-named/main.js | 0 .../emit-chunk-worker/_config.js | 1 + .../_expected/amd/chunks/chunk.js | 0 .../_expected/amd/chunks/nested.js | 2 +- .../_expected/amd/chunks/worker-proxy.js | 0 .../_expected/amd/chunks/worker.js | 0 .../emit-chunk-worker/_expected/amd/main.js | 2 +- .../_expected/cjs/chunks/chunk.js | 0 .../_expected/cjs/chunks/nested.js | 0 .../_expected/cjs/chunks/worker-proxy.js | 0 .../_expected/cjs/chunks/worker.js | 0 .../emit-chunk-worker/_expected/cjs/main.js | 0 .../_expected/es/chunks/chunk.js | 0 .../_expected/es/chunks/nested.js | 0 .../_expected/es/chunks/worker-proxy.js | 0 .../_expected/es/chunks/worker.js | 0 .../emit-chunk-worker/_expected/es/main.js | 0 .../_expected/system/chunks/chunk.js | 0 .../_expected/system/chunks/nested.js | 0 .../_expected/system/chunks/worker-proxy.js | 0 .../_expected/system/chunks/worker.js | 0 .../_expected/system/main.js | 0 .../emit-chunk-worker/index-amd.html | 0 .../emit-chunk-worker/index-system.html | 0 .../emit-chunk-worker/main.js | 0 .../emit-chunk-worker/shared.js | 0 .../emit-chunk-worker/worker.js | 0 .../emit-chunk-worklet/_config.js | 1 + .../_expected/amd/chunks/chunk.js | 0 .../_expected/amd/chunks/worklet.js | 0 .../emit-chunk-worklet/_expected/amd/main.js | 2 +- .../_expected/cjs/chunks/chunk.js | 0 .../_expected/cjs/chunks/worklet.js | 0 .../emit-chunk-worklet/_expected/cjs/main.js | 0 .../_expected/es/chunks/chunk.js | 0 .../_expected/es/chunks/worklet.js | 0 .../emit-chunk-worklet/_expected/es/main.js | 0 .../_expected/system/chunks/chunk.js | 0 .../_expected/system/chunks/worklet.js | 0 .../_expected/system/main.js | 0 .../emit-chunk-worklet/index-es.html | 0 .../emit-chunk-worklet/main.js | 0 .../emit-chunk-worklet/shared.js | 0 .../emit-chunk-worklet/worklet.js | 0 .../{ => deprecated}/emit-chunk/_config.js | 1 + .../_expected/amd/generated-buildStart.js | 0 .../_expected/amd/generated-chunk.js | 0 .../emit-chunk/_expected/amd/main.js | 0 .../_expected/cjs/generated-buildStart.js | 0 .../_expected/cjs/generated-chunk.js | 0 .../emit-chunk/_expected/cjs/main.js | 0 .../_expected/es/generated-buildStart.js | 0 .../_expected/es/generated-chunk.js | 0 .../emit-chunk/_expected/es/main.js | 0 .../_expected/system/generated-buildStart.js | 0 .../_expected/system/generated-chunk.js | 0 .../emit-chunk/_expected/system/main.js | 0 .../{ => deprecated}/emit-chunk/buildStart.js | 0 .../{ => deprecated}/emit-chunk/dep.js | 0 .../{ => deprecated}/emit-chunk/main.js | 0 .../emit-file/emit-chunk-facade/_config.js | 20 ++++ .../_expected/amd/generated-build-starter.js | 11 ++ .../_expected/amd/generated-buildStart.js | 9 ++ .../emit-chunk-facade/_expected/amd/main.js | 5 + .../_expected/cjs/generated-build-starter.js | 9 ++ .../_expected/cjs/generated-buildStart.js | 9 ++ .../emit-chunk-facade/_expected/cjs/main.js | 5 + .../_expected/es/generated-build-starter.js | 6 + .../_expected/es/generated-buildStart.js | 1 + .../emit-chunk-facade/_expected/es/main.js | 3 + .../system/generated-build-starter.js | 13 ++ .../_expected/system/generated-buildStart.js | 13 ++ .../_expected/system/main.js | 15 +++ .../emit-file/emit-chunk-facade/buildStart.js | 5 + .../emit-file/emit-chunk-facade/dep.js | 2 + .../emit-file/emit-chunk-facade/main.js | 3 + .../emit-file/emit-chunk-named/_config.js | 17 +++ .../_expected/amd/generated-chunk.js | 7 ++ .../amd/generated-nested/my-chunk.js | 5 + .../emit-chunk-named/_expected/amd/main.js | 5 + .../_expected/cjs/generated-chunk.js | 5 + .../cjs/generated-nested/my-chunk.js | 5 + .../emit-chunk-named/_expected/cjs/main.js | 5 + .../_expected/es/generated-chunk.js | 3 + .../_expected/es/generated-nested/my-chunk.js | 3 + .../emit-chunk-named/_expected/es/main.js | 3 + .../_expected/system/generated-chunk.js | 10 ++ .../system/generated-nested/my-chunk.js | 14 +++ .../emit-chunk-named/_expected/system/main.js | 14 +++ .../emit-file/emit-chunk-named/buildStart.js | 3 + .../samples/emit-file/emit-chunk-named/dep.js | 1 + .../emit-file/emit-chunk-named/main.js | 3 + .../emit-file/emit-chunk-worker/_config.js | 54 +++++++++ .../_expected/amd/chunks/chunk.js | 7 ++ .../_expected/amd/chunks/nested.js | 10 ++ .../_expected/amd/chunks/worker-proxy.js | 2 + .../_expected/amd/chunks/worker.js | 5 + .../emit-chunk-worker/_expected/amd/main.js | 15 +++ .../_expected/cjs/chunks/chunk.js | 5 + .../_expected/cjs/chunks/nested.js | 8 ++ .../_expected/cjs/chunks/worker-proxy.js | 3 + .../_expected/cjs/chunks/worker.js | 5 + .../emit-chunk-worker/_expected/cjs/main.js | 15 +++ .../_expected/es/chunks/chunk.js | 3 + .../_expected/es/chunks/nested.js | 6 + .../_expected/es/chunks/worker-proxy.js | 1 + .../_expected/es/chunks/worker.js | 3 + .../emit-chunk-worker/_expected/es/main.js | 13 ++ .../_expected/system/chunks/chunk.js | 10 ++ .../_expected/system/chunks/nested.js | 13 ++ .../_expected/system/chunks/worker-proxy.js | 2 + .../_expected/system/chunks/worker.js | 14 +++ .../_expected/system/main.js | 24 ++++ .../emit-chunk-worker/index-amd.html | 10 ++ .../emit-chunk-worker/index-system.html | 11 ++ .../emit-file/emit-chunk-worker/main.js | 9 ++ .../emit-file/emit-chunk-worker/shared.js | 1 + .../emit-file/emit-chunk-worker/worker.js | 3 + .../emit-file/emit-chunk-worklet/_config.js | 29 +++++ .../_expected/amd/chunks/chunk.js | 9 ++ .../_expected/amd/chunks/worklet.js | 17 +++ .../emit-chunk-worklet/_expected/amd/main.js | 7 ++ .../_expected/cjs/chunks/chunk.js | 7 ++ .../_expected/cjs/chunks/worklet.js | 17 +++ .../emit-chunk-worklet/_expected/cjs/main.js | 7 ++ .../_expected/es/chunks/chunk.js | 4 + .../_expected/es/chunks/worklet.js | 15 +++ .../emit-chunk-worklet/_expected/es/main.js | 5 + .../_expected/system/chunks/chunk.js | 11 ++ .../_expected/system/chunks/worklet.js | 27 +++++ .../_expected/system/main.js | 17 +++ .../emit-chunk-worklet/index-es.html | 10 ++ .../emit-file/emit-chunk-worklet/main.js | 4 + .../emit-file/emit-chunk-worklet/shared.js | 2 + .../emit-file/emit-chunk-worklet/worklet.js | 15 +++ .../samples/emit-file/emit-chunk/_config.js | 17 +++ .../_expected/amd/generated-buildStart.js | 5 + .../_expected/amd/generated-chunk.js | 7 ++ .../emit-chunk/_expected/amd/main.js | 5 + .../_expected/cjs/generated-buildStart.js | 5 + .../_expected/cjs/generated-chunk.js | 5 + .../emit-chunk/_expected/cjs/main.js | 5 + .../_expected/es/generated-buildStart.js | 3 + .../_expected/es/generated-chunk.js | 3 + .../emit-file/emit-chunk/_expected/es/main.js | 3 + .../_expected/system/generated-buildStart.js | 14 +++ .../_expected/system/generated-chunk.js | 10 ++ .../emit-chunk/_expected/system/main.js | 14 +++ .../emit-file/emit-chunk/buildStart.js | 3 + .../samples/emit-file/emit-chunk/dep.js | 1 + .../samples/emit-file/emit-chunk/main.js | 3 + .../emit-file/emits-existing-chunk/_config.js | 19 +++ .../_expected/amd/first-main.js | 5 + .../_expected/amd/generated-dep.js | 7 ++ .../_expected/amd/second-main.js | 5 + .../_expected/cjs/first-main.js | 5 + .../_expected/cjs/generated-dep.js | 5 + .../_expected/cjs/second-main.js | 5 + .../_expected/es/first-main.js | 3 + .../_expected/es/generated-dep.js | 3 + .../_expected/es/second-main.js | 3 + .../_expected/system/first-main.js | 14 +++ .../_expected/system/generated-dep.js | 10 ++ .../_expected/system/second-main.js | 14 +++ .../emit-file/emits-existing-chunk/dep.js | 1 + .../emit-file/emits-existing-chunk/main1.js | 3 + .../emit-file/emits-existing-chunk/main2.js | 3 + .../reference-files/_expected/amd/main.js | 2 +- .../emit-file/reference-files/index-amd.html | 2 +- .../reference-files/index-system.html | 2 +- .../set-asset-source/_expected/amd/main.js | 10 +- .../samples/resolve-file-url/_config.js | 4 +- .../resolve-file-url/_expected/amd/main.js | 4 +- .../configure-file-url/_expected/amd.js | 2 +- .../configure-asset-url/_expected/amd.js | 2 +- .../deprecated/emit-asset/_expected/amd.js | 2 +- .../deprecated/emit-asset/index-amd.html | 2 +- .../deprecated/emit-asset/index-system.html | 2 +- .../deprecated/emit-asset/index-umd-amd.html | 2 +- .../samples/emit-asset-file/_expected/amd.js | 2 +- .../emit-asset/invalid-asset-id/_config.js | 4 +- .../chunk-filename-not-available/_config.js | 1 + .../chunk-filename-not-available/chunk.js | 0 .../chunk-filename-not-available/main.js | 0 .../emit-chunk/chunk-not-found/_config.js | 1 + .../emit-chunk/chunk-not-found/main.js | 0 .../emit-chunk/invalid-chunk-id/_config.js | 5 +- .../emit-chunk/invalid-chunk-id/main.js | 0 .../emit-chunk/modules-loaded/_config.js | 3 +- .../emit-chunk/modules-loaded/chunk.js | 0 .../emit-chunk/modules-loaded/main.js | 0 .../emit-chunk/no-input/_config.js | 1 + .../emit-chunk/no-input/chunk.js | 0 .../deprecations/ROLLUP_CHUNK_URL/_config.js | 26 ++++ .../deprecations/ROLLUP_CHUNK_URL/main.js | 11 ++ .../deprecations/this-emitChunk/_config.js | 17 +++ .../deprecations/this-emitChunk/main.js | 11 ++ .../this-getAssetFileName/_config.js | 2 +- .../this-getChunkFileName/_config.js | 23 ++++ .../this-getChunkFileName/chunk.js | 1 + .../this-getChunkFileName/main.js | 11 ++ .../chunk-filename-not-available/_config.js | 21 ++++ .../chunk-filename-not-available/chunk.js | 1 + .../chunk-filename-not-available/main.js | 1 + .../emit-file/chunk-not-found/_config.js | 15 +++ .../samples/emit-file/chunk-not-found/main.js | 1 + .../_config.js | 6 +- .../main.js | 0 .../emit-file/modules-loaded/_config.js | 19 +++ .../samples/emit-file/modules-loaded/chunk.js | 1 + .../samples/emit-file/modules-loaded/main.js | 1 + .../samples/emit-file/no-input/_config.js | 12 ++ .../samples/emit-file/no-input/chunk.js | 1 + 275 files changed, 1263 insertions(+), 187 deletions(-) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_config.js (94%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/amd/first-main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/amd/generated-dep.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/amd/second-main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/cjs/first-main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/cjs/generated-dep.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/cjs/second-main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/es/first-main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/es/generated-dep.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/es/second-main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/system/first-main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/system/generated-dep.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/_expected/system/second-main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/dep.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/main1.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-existing/main2.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_config.js (94%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/amd/generated-build-starter.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/amd/generated-buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/amd/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/cjs/generated-build-starter.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/cjs/generated-buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/cjs/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/es/generated-build-starter.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/es/generated-buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/es/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/system/generated-build-starter.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/system/generated-buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/_expected/system/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/dep.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-facade/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_config.js (93%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/amd/generated-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/amd/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/cjs/generated-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/cjs/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/es/generated-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/es/generated-nested/my-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/es/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/system/generated-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/system/generated-nested/my-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/_expected/system/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/dep.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-named/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_config.js (98%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/amd/chunks/chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/amd/chunks/nested.js (69%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/amd/chunks/worker.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/amd/main.js (84%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/cjs/chunks/chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/cjs/chunks/nested.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/cjs/chunks/worker.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/cjs/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/es/chunks/chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/es/chunks/nested.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/es/chunks/worker-proxy.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/es/chunks/worker.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/es/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/system/chunks/chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/system/chunks/nested.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/system/chunks/worker-proxy.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/system/chunks/worker.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/_expected/system/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/index-amd.html (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/index-system.html (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/shared.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worker/worker.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_config.js (96%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/amd/chunks/chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/amd/chunks/worklet.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/amd/main.js (70%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/cjs/chunks/chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/cjs/chunks/worklet.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/cjs/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/es/chunks/chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/es/chunks/worklet.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/es/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/system/chunks/chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/system/chunks/worklet.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/_expected/system/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/index-es.html (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/shared.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk-worklet/worklet.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_config.js (93%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/amd/generated-buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/amd/generated-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/amd/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/cjs/generated-buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/cjs/generated-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/cjs/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/es/generated-buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/es/generated-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/es/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/system/generated-buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/system/generated-chunk.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/_expected/system/main.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/buildStart.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/dep.js (100%) rename test/chunking-form/samples/{ => deprecated}/emit-chunk/main.js (100%) create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_config.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-build-starter.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-build-starter.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/generated-build-starter.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/generated-buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-build-starter.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/dep.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-facade/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_config.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/dep.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-named/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_config.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/nested.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/nested.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/nested.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker-proxy.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/nested.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker-proxy.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/index-amd.html create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/index-system.html create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/shared.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worker/worker.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_config.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/index-es.html create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/shared.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-worklet/worklet.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_config.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/dep.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk/main.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_config.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/first-main.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/generated-dep.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/second-main.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/first-main.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/generated-dep.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/second-main.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/first-main.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/generated-dep.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/second-main.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/generated-dep.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/dep.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/main1.js create mode 100644 test/chunking-form/samples/emit-file/emits-existing-chunk/main2.js rename test/function/samples/{ => deprecated}/emit-chunk/chunk-filename-not-available/_config.js (94%) rename test/function/samples/{ => deprecated}/emit-chunk/chunk-filename-not-available/chunk.js (100%) rename test/function/samples/{ => deprecated}/emit-chunk/chunk-filename-not-available/main.js (100%) rename test/function/samples/{ => deprecated}/emit-chunk/chunk-not-found/_config.js (91%) rename test/function/samples/{ => deprecated}/emit-chunk/chunk-not-found/main.js (100%) rename test/function/samples/{ => deprecated}/emit-chunk/invalid-chunk-id/_config.js (63%) rename test/function/samples/{ => deprecated}/emit-chunk/invalid-chunk-id/main.js (100%) rename test/function/samples/{ => deprecated}/emit-chunk/modules-loaded/_config.js (78%) rename test/function/samples/{ => deprecated}/emit-chunk/modules-loaded/chunk.js (100%) rename test/function/samples/{ => deprecated}/emit-chunk/modules-loaded/main.js (100%) rename test/function/samples/{ => deprecated}/emit-chunk/no-input/_config.js (89%) rename test/function/samples/{ => deprecated}/emit-chunk/no-input/chunk.js (100%) create mode 100644 test/function/samples/deprecations/ROLLUP_CHUNK_URL/_config.js create mode 100644 test/function/samples/deprecations/ROLLUP_CHUNK_URL/main.js create mode 100644 test/function/samples/deprecations/this-emitChunk/_config.js create mode 100644 test/function/samples/deprecations/this-emitChunk/main.js create mode 100644 test/function/samples/deprecations/this-getChunkFileName/_config.js create mode 100644 test/function/samples/deprecations/this-getChunkFileName/chunk.js create mode 100644 test/function/samples/deprecations/this-getChunkFileName/main.js create mode 100644 test/function/samples/emit-file/chunk-filename-not-available/_config.js create mode 100644 test/function/samples/emit-file/chunk-filename-not-available/chunk.js create mode 100644 test/function/samples/emit-file/chunk-filename-not-available/main.js create mode 100644 test/function/samples/emit-file/chunk-not-found/_config.js create mode 100644 test/function/samples/emit-file/chunk-not-found/main.js rename test/function/samples/emit-file/{invalid-asset-id => invalid-file-id}/_config.js (54%) rename test/function/samples/emit-file/{invalid-asset-id => invalid-file-id}/main.js (100%) create mode 100644 test/function/samples/emit-file/modules-loaded/_config.js create mode 100644 test/function/samples/emit-file/modules-loaded/chunk.js create mode 100644 test/function/samples/emit-file/modules-loaded/main.js create mode 100644 test/function/samples/emit-file/no-input/_config.js create mode 100644 test/function/samples/emit-file/no-input/chunk.js diff --git a/src/Module.ts b/src/Module.ts index 24b6188a2e1..88cfe373a67 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -32,7 +32,6 @@ import ExternalModule from './ExternalModule'; import Graph from './Graph'; import { DecodedSourceMapOrMissing, - EmittedChunk, EmittedFile, ExistingDecodedSourceMap, ModuleJSON, @@ -92,7 +91,6 @@ export interface AstContext { deoptimizationTracker: EntityPathTracker; error: (props: RollupError, pos: number) => void; fileName: string; - getChunkFileName: (chunkReferenceId: string) => string; getExports: () => string[]; getFileName: (fileReferenceId: string) => string; getModuleExecIndex: () => number; @@ -207,7 +205,6 @@ export default class Module { scope!: ModuleScope; sourcemapChain!: DecodedSourceMapOrMissing[]; sources: string[] = []; - transformChunks?: EmittedChunk[]; transformFiles?: EmittedFile[]; usesTopLevelAwait = false; @@ -532,11 +529,9 @@ export default class Module { originalSourcemap, resolvedIds, sourcemapChain, - transformChunks, transformDependencies, transformFiles }: TransformModuleJSON & { - transformChunks?: EmittedChunk[] | undefined; transformFiles?: EmittedFile[] | undefined; }) { this.code = code; @@ -546,9 +541,6 @@ export default class Module { if (transformFiles) { this.transformFiles = transformFiles; } - if (transformChunks) { - this.transformChunks = transformChunks; - } this.transformDependencies = transformDependencies; this.customTransformCache = customTransformCache; if (typeof moduleSideEffects === 'boolean') { @@ -587,7 +579,6 @@ export default class Module { deoptimizationTracker: this.graph.deoptimizationTracker, error: this.error.bind(this), fileName, // Needed for warnings - getChunkFileName: this.graph.moduleLoader.getChunkFileName.bind(this.graph.moduleLoader), getExports: this.getExports.bind(this), getFileName: this.graph.pluginDriver.getFileName, getModuleExecIndex: () => this.execIndex, @@ -637,7 +628,6 @@ export default class Module { originalSourcemap: this.originalSourcemap, resolvedIds: this.resolvedIds, sourcemapChain: this.sourcemapChain, - transformChunks: this.transformChunks, transformDependencies: this.transformDependencies, transformFiles: this.transformFiles }; diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index f7694829828..324d2d7aefe 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -1,5 +1,4 @@ import * as ESTree from 'estree'; -import Chunk from './Chunk'; import ExternalModule from './ExternalModule'; import Graph from './Graph'; import Module from './Module'; @@ -17,8 +16,6 @@ import { import { errBadLoader, errCannotAssignModuleToChunk, - errChunkNotGeneratedForFileName, - errChunkReferenceIdNotFoundForFilename, errEntryCannotBeExternal, errInternalIdCannotBeExternal, errInvalidOption, @@ -30,7 +27,6 @@ import { } from './utils/error'; import { isRelative, resolve } from './utils/path'; import { PluginDriver } from './utils/pluginDriver'; -import { addWithNewReferenceId } from './utils/referenceIds'; import relativeId from './utils/relativeId'; import { timeEnd, timeStart } from './utils/timers'; import transform from './utils/transform'; @@ -97,10 +93,6 @@ function getHasModuleSideEffects( export class ModuleLoader { readonly isExternal: IsExternal; - private readonly entriesByReferenceId = new Map< - string, - { module: Module | null; name: string } - >(); private readonly entryModules: Module[] = []; private readonly getManualChunk: GetManualChunk; private readonly graph: Graph; @@ -131,27 +123,6 @@ export class ModuleLoader { this.getManualChunk = typeof getManualChunk === 'function' ? getManualChunk : () => null; } - addEntryModuleAndGetReferenceId(unresolvedEntryModule: UnresolvedModuleWithAlias): string { - const entryRecord: { module: Module | null; name: string } = { - module: null, - name: unresolvedEntryModule.unresolvedId - }; - const referenceId = addWithNewReferenceId( - entryRecord, - this.entriesByReferenceId, - unresolvedEntryModule.unresolvedId - ); - this.addEntryModules([unresolvedEntryModule], false) - .then(({ newEntryModules: [module] }) => { - entryRecord.module = module; - }) - .catch(() => { - // Avoid unhandled Promise rejection as the error will be thrown later - // once module loading has finished - }); - return referenceId; - } - addEntryModules( unresolvedEntryModules: UnresolvedModuleWithAlias[], isUserDefined: boolean @@ -205,18 +176,6 @@ export class ModuleLoader { return this.awaitLoadModulesPromise(loadNewManualChunkModulesPromise); } - getChunkFileName(referenceId: string): string { - const entryRecord = this.entriesByReferenceId.get(referenceId); - if (!entryRecord) return error(errChunkReferenceIdNotFoundForFilename(referenceId)); - const fileName = - entryRecord.module && - (entryRecord.module.facadeChunk - ? entryRecord.module.facadeChunk.id - : (entryRecord.module.chunk as Chunk).id); - if (!fileName) return error(errChunkNotGeneratedForFileName(entryRecord)); - return fileName; - } - async resolveId( source: string, importer: string, @@ -337,10 +296,6 @@ export class ModuleLoader { for (const emittedFile of cachedModule.transformFiles) this.pluginDriver.emitFile(emittedFile); } - if (cachedModule.transformChunks) { - for (const { id, options } of cachedModule.transformChunks) - this.pluginDriver.emitChunk(id, options); - } return cachedModule; } diff --git a/src/ast/nodes/MetaProperty.ts b/src/ast/nodes/MetaProperty.ts index c86a7122393..efdbbb182fd 100644 --- a/src/ast/nodes/MetaProperty.ts +++ b/src/ast/nodes/MetaProperty.ts @@ -76,15 +76,19 @@ export default class MetaProperty extends NodeBase { referenceId = metaProperty.substr(FILE_PREFIX.length); fileName = this.context.getFileName(referenceId); } else if (metaProperty.startsWith(ASSET_PREFIX)) { - assetReferenceId = metaProperty.substr(ASSET_PREFIX.length); - fileName = this.context.getFileName(assetReferenceId); this.context.warnDeprecation( `Using the "${ASSET_PREFIX}" prefix to reference files is deprecated. Use the "${FILE_PREFIX}" prefix instead.`, false ); + assetReferenceId = metaProperty.substr(ASSET_PREFIX.length); + fileName = this.context.getFileName(assetReferenceId); } else { + this.context.warnDeprecation( + `Using the "${CHUNK_PREFIX}" prefix to reference files is deprecated. Use the "${FILE_PREFIX}" prefix instead.`, + false + ); chunkReferenceId = metaProperty.substr(CHUNK_PREFIX.length); - fileName = this.context.getChunkFileName(chunkReferenceId); + fileName = this.context.getFileName(chunkReferenceId); } const relativePath = normalize(relative(dirname(chunkId), fileName)); let replacement; diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 7257224d165..8b2b0a7ba07 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -111,15 +111,9 @@ export interface TransformModuleJSON { export interface ModuleJSON extends TransformModuleJSON { dependencies: string[]; id: string; - transformChunks: EmittedChunk[] | undefined; transformFiles: EmittedFile[] | undefined; } -export interface EmittedChunk { - id: string; - options: { name?: string } | undefined; -} - export interface PluginCache { delete(id: string): boolean; get(id: string): T; @@ -131,29 +125,28 @@ export interface MinimalPluginContext { meta: PluginContextMeta; } -export type EmitAsset = (name: string, source?: string | Buffer) => string; -export type EmitChunk = (name: string, options?: { name?: string }) => string; - // TODO Lukas do not forget caching tests for files // TODO Lukas can there be interactions in names between multiple outputs? +// TODO Lukas can we make "name" optional to align the interfaces? export interface EmittedAsset { name: string; source?: string | Buffer; type: 'asset'; } -export type EmittedFile = - | EmittedAsset - | { - entryId: string; - name?: string; - type: 'chunk'; - } - | { - fileName: string; - source?: string | Buffer; - type: 'file'; - }; +// TODO Lukas is it possible to control the generated fileName directly? +export interface EmittedChunk { + id: string; + name?: string; + type: 'chunk'; +} + +export type EmittedFile = EmittedAsset | EmittedChunk; + +export type EmitAsset = (name: string, source?: string | Buffer) => string; + +export type EmitChunk = (id: string, options?: { name?: string }) => string; + export type EmitFile = (emittedFile: EmittedFile) => string; export interface PluginContext extends MinimalPluginContext { diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index 3431b8bbb36..0aa9c41ab80 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -1,12 +1,18 @@ import sha256 from 'hash.js/lib/hash/sha/256'; -import { EmittedAsset, EmittedFile, OutputBundle } from '../rollup/types'; +import Chunk from '../Chunk'; +import Graph from '../Graph'; +import Module from '../Module'; +import { EmittedAsset, EmittedChunk, EmittedFile, OutputBundle } from '../rollup/types'; +import { BuildPhase } from './buildPhase'; import { errAssetNotFinalisedForFileName, - errAssetReferenceIdNotFoundForFilename, errAssetReferenceIdNotFoundForSetSource, errAssetSourceAlreadySet, errAssetSourceMissingForSetSource, + errChunkNotGeneratedForFileName, + errFileReferenceIdNotFoundForFilename, errInvalidAssetName, + errInvalidRollupPhaseForChunkEmission, errNoAssetSourceSet, error } from './error'; @@ -65,26 +71,72 @@ function addAssetToBundle(asset: EmittedAssetWithSource, output: OutputSpecificF }; } +interface ConsumedChunk { + module: null | Module; + name: string; + type: 'chunk'; +} + +type ConsumedFile = ConsumedChunk | EmittedAsset; + // TODO Lukas general assumption: Having a source means having a reliable filename // TODO Lukas only access filename during generate? Or disallow setSource if there is a fileName? export class FileEmitter { - private filesByReferenceId: Map = new Map(); + private filesByReferenceId: Map = new Map(); // tslint:disable member-ordering private buildFilesByReferenceId = this.filesByReferenceId; + private graph: Graph; private output: OutputSpecificFileData | null = null; + constructor(graph: Graph) { + this.graph = graph; + } + public emitFile = (emittedFile: EmittedFile): string => { - if (emittedFile.type !== 'asset') { - throw new Error(`Unhandled file type ${emittedFile.type}`); + // TODO Lukas combine switch statements into object + switch (emittedFile.type) { + case 'asset': + return this.emitAsset(emittedFile); + case 'chunk': + return this.emitChunk(emittedFile); + // TODO Lukas make proper error and test + default: + throw new Error(`Unhandled file type ${(emittedFile as any).type}`); } - if (typeof emittedFile.name !== 'string' || !isPlainName(emittedFile.name)) { - return error(errInvalidAssetName(emittedFile.name)); + }; + + private emitAsset(asset: EmittedAsset): string { + // TODO Lukas this could become shared validation + if (typeof asset.name !== 'string' || !isPlainName(asset.name)) { + return error(errInvalidAssetName(asset.name)); } - if (this.output && emittedFile.source !== undefined) { - addAssetToBundle(emittedFile as EmittedAssetWithSource, this.output); + if (this.output && asset.source !== undefined) { + addAssetToBundle(asset as EmittedAssetWithSource, this.output); } - return addWithNewReferenceId(emittedFile, this.filesByReferenceId, emittedFile.name); - }; + return addWithNewReferenceId(asset, this.filesByReferenceId, asset.name); + } + + private emitChunk(chunk: EmittedChunk): string { + if (this.graph.phase > BuildPhase.LOAD_AND_PARSE) { + error(errInvalidRollupPhaseForChunkEmission()); + } + const consumedChunk: ConsumedChunk = { + module: null, + name: chunk.name || chunk.id, + type: 'chunk' + }; + this.graph.moduleLoader + .addEntryModules([{ alias: chunk.name || null, unresolvedId: chunk.id }], false) + .then(({ newEntryModules: [module] }) => { + consumedChunk.module = module; + }) + .catch(() => { + // Avoid unhandled Promise rejection as the error will be thrown later + // once module loading has finished + }); + + return addWithNewReferenceId(consumedChunk, this.filesByReferenceId, chunk.id); + } public finaliseAssets() { for (const emittedFile of this.filesByReferenceId.values()) { @@ -95,17 +147,30 @@ export class FileEmitter { public getFileName = (fileReferenceId: string) => { const emittedFile = this.filesByReferenceId.get(fileReferenceId); - if (!emittedFile) return error(errAssetReferenceIdNotFoundForFilename(fileReferenceId)); - // TODO Lukas and there is no pre-assigned name - if (!this.output) { - // TODO Lukas proper error - throw new Error('Cannot get file name during build phase'); - } - const fileName = this.output.assignedFileNames.get(emittedFile); - if (typeof fileName !== 'string') { - return error(errAssetNotFinalisedForFileName(emittedFile.name)); + if (!emittedFile) return error(errFileReferenceIdNotFoundForFilename(fileReferenceId)); + switch (emittedFile.type) { + case 'asset': { + // TODO Lukas and there is no pre-assigned name + if (!this.output) { + // TODO Lukas proper error + throw new Error('Cannot get file name during build phase'); + } + const fileName = this.output.assignedFileNames.get(emittedFile); + if (typeof fileName !== 'string') { + return error(errAssetNotFinalisedForFileName(emittedFile.name)); + } + return fileName; + } + case 'chunk': { + const fileName = + emittedFile.module && + (emittedFile.module.facadeChunk + ? emittedFile.module.facadeChunk.id + : (emittedFile.module.chunk as Chunk).id); + if (!fileName) return error(errChunkNotGeneratedForFileName(emittedFile.name)); + return fileName; + } } - return fileName; }; // TODO Lukas this should only be allowed @@ -114,6 +179,8 @@ export class FileEmitter { public setAssetSource = (fileReferenceId: string, source?: string | Buffer) => { const emittedFile = this.filesByReferenceId.get(fileReferenceId); if (!emittedFile) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); + // TODO Lukas refine error + if (emittedFile.type !== 'asset') throw new Error('cannot set source for chunk'); if (emittedFile.source !== undefined) return error(errAssetSourceAlreadySet(emittedFile.name)); // TODO Lukas check for string | Buffer instead? if (typeof source !== 'string' && !source) { @@ -138,7 +205,7 @@ export class FileEmitter { bundle: outputBundle }; for (const emittedFile of this.filesByReferenceId.values()) { - if (emittedFile.source !== undefined) { + if (emittedFile.type === 'asset' && emittedFile.source !== undefined) { addAssetToBundle(emittedFile as EmittedAssetWithSource, this.output); } } diff --git a/src/utils/defaultPlugin.ts b/src/utils/defaultPlugin.ts index 4b27c4c1546..7c93d36c9de 100644 --- a/src/utils/defaultPlugin.ts +++ b/src/utils/defaultPlugin.ts @@ -112,7 +112,10 @@ const getRelativeUrlFromDocument = (relativePath: string) => ); const relativeUrlMechanisms: Record string> = { - amd: relativePath => getResolveUrl(`require.toUrl('${relativePath}'), document.baseURI`), + amd: relativePath => { + if (relativePath[0] !== '.') relativePath = './' + relativePath; + return getResolveUrl(`require.toUrl('${relativePath}'), document.baseURI`); + }, cjs: relativePath => `(typeof document === 'undefined' ? ${getResolveUrl( `'file:' + __dirname + '/${relativePath}'`, diff --git a/src/utils/error.ts b/src/utils/error.ts index 7177425ec5b..71782d2da41 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -37,9 +37,9 @@ export enum Errors { ASSET_SOURCE_ALREADY_SET = 'ASSET_SOURCE_ALREADY_SET', ASSET_SOURCE_MISSING = 'ASSET_SOURCE_MISSING', BAD_LOADER = 'BAD_LOADER', - CHUNK_NOT_FOUND = 'CHUNK_NOT_FOUND', CHUNK_NOT_GENERATED = 'CHUNK_NOT_GENERATED', DEPRECATED_FEATURE = 'DEPRECATED_FEATURE', + FILE_NOT_FOUND = 'FILE_NOT_FOUND', INVALID_ASSET_NAME = 'INVALID_ASSET_NAME', INVALID_CHUNK = 'INVALID_CHUNK', INVALID_EXTERNAL_ID = 'INVALID_EXTERNAL_ID', @@ -58,17 +58,10 @@ export function errAssetNotFinalisedForFileName(name: string) { }; } -export function errChunkNotGeneratedForFileName(entry: { name: string }) { +export function errChunkNotGeneratedForFileName(name: string) { return { code: Errors.CHUNK_NOT_GENERATED, - message: `Plugin error - Unable to get file name for chunk "${entry.name}". Ensure that generate is called first.` - }; -} - -export function errAssetReferenceIdNotFoundForFilename(assetReferenceId: string) { - return { - code: Errors.ASSET_NOT_FOUND, - message: `Plugin error - Unable to get file name for unknown asset "${assetReferenceId}".` + message: `Plugin error - Unable to get file name for chunk "${name}". Ensure that generate is called first.` }; } @@ -109,17 +102,17 @@ export function errBadLoader(id: string) { }; } -export function errChunkReferenceIdNotFoundForFilename(chunkReferenceId: string) { +export function errDeprecation(deprecation: string | RollupWarning) { return { - code: Errors.CHUNK_NOT_FOUND, - message: `Plugin error - Unable to get file name for unknown chunk "${chunkReferenceId}".` + code: Errors.DEPRECATED_FEATURE, + ...(typeof deprecation === 'string' ? { message: deprecation } : deprecation) }; } -export function errDeprecation(deprecation: string | RollupWarning) { +export function errFileReferenceIdNotFoundForFilename(assetReferenceId: string) { return { - code: Errors.DEPRECATED_FEATURE, - ...(typeof deprecation === 'string' ? { message: deprecation } : deprecation) + code: Errors.FILE_NOT_FOUND, + message: `Plugin error - Unable to get file name for unknown file "${assetReferenceId}".` }; } @@ -166,10 +159,10 @@ export function errInvalidRollupPhaseForAddWatchFile() { }; } -export function errInvalidRollupPhaseForEmitChunk() { +export function errInvalidRollupPhaseForChunkEmission() { return { code: Errors.INVALID_ROLLUP_PHASE, - message: `Cannot call emitChunk after module loading has finished.` + message: `Cannot emit chunks after module loading has finished.` }; } diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index 98f90bbfc7f..5e1dbea3539 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -4,7 +4,6 @@ import ExternalModule from '../ExternalModule'; import Graph from '../Graph'; import Module from '../Module'; import { - EmitChunk, EmitFile, InputOptions, OutputBundle, @@ -18,18 +17,13 @@ import { } from '../rollup/types'; import { BuildPhase } from './buildPhase'; import { getRollupDefaultPlugin } from './defaultPlugin'; -import { - errInvalidRollupPhaseForAddWatchFile, - errInvalidRollupPhaseForEmitChunk, - error -} from './error'; +import { errInvalidRollupPhaseForAddWatchFile, error } from './error'; import { FileEmitter } from './FileEmitter'; type Args = T extends (...args: infer K) => any ? K : never; type EnsurePromise = Promise ? K : T>; export interface PluginDriver { - emitChunk: EmitChunk; emitFile: EmitFile; hasLoadersOrTransforms: boolean; finaliseAssets(): void; @@ -146,7 +140,7 @@ export function createPluginDriver( ...(options.plugins as Plugin[]), getRollupDefaultPlugin(options.preserveSymlinks as boolean) ]; - const fileEmitter = new FileEmitter(); + const fileEmitter = new FileEmitter(graph); const existingPluginKeys = new Set(); let hasLoadersOrTransforms = false; @@ -192,11 +186,14 @@ export function createPluginDriver( plugin.name, false ), - emitChunk(id, options) { - if (graph.phase > BuildPhase.LOAD_AND_PARSE) - this.error(errInvalidRollupPhaseForEmitChunk()); - return pluginDriver.emitChunk(id, options); - }, + emitChunk: getDeprecatedHookHandler( + (id: string, options?: { name?: string }) => + fileEmitter.emitFile({ type: 'chunk', id, name: options && options.name }), + 'emitChunk', + 'emitFile', + plugin.name, + false + ), emitFile: fileEmitter.emitFile, error(err): never { if (typeof err === 'string') err = { message: err }; @@ -212,9 +209,13 @@ export function createPluginDriver( plugin.name, false ), - getChunkFileName(chunkReferenceId) { - return graph.moduleLoader.getChunkFileName(chunkReferenceId); - }, + getChunkFileName: getDeprecatedHookHandler( + fileEmitter.getFileName, + 'getChunkFileName', + 'getFileName', + plugin.name, + false + ), getFileName: fileEmitter.getFileName, getModuleInfo(moduleId) { const foundModule = graph.moduleById.get(moduleId); @@ -382,12 +383,6 @@ export function createPluginDriver( const pluginDriver: PluginDriver = { emitFile: fileEmitter.emitFile, - emitChunk(id, options) { - return graph.moduleLoader.addEntryModuleAndGetReferenceId({ - alias: (options && options.name) || null, - unresolvedId: id - }); - }, finaliseAssets() { fileEmitter.finaliseAssets(); }, diff --git a/src/utils/transform.ts b/src/utils/transform.ts index 3f0f57e4554..2d8f7bf6794 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -3,7 +3,6 @@ import Graph from '../Graph'; import Module from '../Module'; import { DecodedSourceMapOrMissing, - EmittedChunk, EmittedFile, Plugin, PluginCache, @@ -32,7 +31,6 @@ export default function transform( const originalCode = source.code; let ast = source.ast; let transformDependencies: string[]; - const emittedChunks: EmittedChunk[] = []; const emittedFiles: EmittedFile[] = []; let customTransformCache = false; let moduleSideEffects: boolean | null = null; @@ -56,10 +54,8 @@ export default function transform( } } } else { - // assets/chunks emitted by a transform hook need to be emitted again if the hook is skipped + // files emitted by a transform hook need to be emitted again if the hook is skipped if (emittedFiles.length) module.transformFiles = emittedFiles; - if (emittedChunks.length) module.transformChunks = emittedChunks; - if (result && typeof result === 'object' && Array.isArray(result.dependencies)) { // not great, but a useful way to track this without assuming WeakMap if (!(curPlugin as any).warnedTransformDependencies) @@ -136,8 +132,9 @@ export default function transform( return graph.pluginDriver.emitFile(emittedFile); }, emitChunk(id, options) { - emittedChunks.push({ id, options }); - return graph.pluginDriver.emitChunk(id, options); + const emittedFile = { type: 'chunk' as 'chunk', id, name: options && options.name }; + emittedFiles.push({ ...emittedFile }); + return graph.pluginDriver.emitFile(emittedFile); }, emitFile(emittedFile: EmittedFile) { // TODO Lukas test that we are creating a copy or in the future, do not mutate emitted files diff --git a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js index 75b9c9cfe8e..44faf871ab5 100644 --- a/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/configure-asset-url/_expected/amd/main.js @@ -2,7 +2,7 @@ define(['require'], function (require) { 'use strict'; var asset2 = 'resolved'; - var asset3 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; + var asset3 = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; new Promise(function (resolve, reject) { require(['./nested/chunk'], resolve, reject) }).then(result => console.log(result, asset2, asset3)); diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js index 80859f986ad..81c4557c73b 100644 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js +++ b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_config.js @@ -14,7 +14,7 @@ module.exports = { }, load(id) { if (id.endsWith('solved')) { - const assetId = this.emitFile({type: 'asset', name: `asset-${id}.txt`, source: `Asset for: ${id}`}); + const assetId = this.emitAsset(`asset-${id}.txt`, `Asset for: ${id}`); const chunkId = this.emitChunk('chunk.js'); return ( `export const asset = import.meta.ROLLUP_ASSET_URL_${assetId};\n` + diff --git a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js index 65913f1755d..d5222443f37 100644 --- a/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/configure-file-url-for-assets-and-chunks/_expected/amd/main.js @@ -3,8 +3,8 @@ define(['require'], function (require) { 'use strict'; const asset = 'resolved'; const chunk = 'resolved'; - const asset$1 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; - const chunk$1 = new URL(require.toUrl('nested/chunk.js'), document.baseURI).href; + const asset$1 = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; + const chunk$1 = new URL(require.toUrl('./nested/chunk.js'), document.baseURI).href; new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }).then(result => console.log(result, chunk, chunk$1, asset, asset$1)); 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 1d8142bda6e..3debd768914 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,6 +1,6 @@ define(['require', './nested/chunk'], function (require, __chunk_1) { 'use strict'; - var logo = new URL(require.toUrl('assets/logo1-a5ec488b.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('./assets/logo1-a5ec488b.svg'), document.baseURI).href; __chunk_1.showImage(logo); new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }); diff --git a/test/chunking-form/samples/deprecated/emit-asset/index-amd.html b/test/chunking-form/samples/deprecated/emit-asset/index-amd.html index 476b9ce3df1..cd17b62967d 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/index-amd.html +++ b/test/chunking-form/samples/deprecated/emit-asset/index-amd.html @@ -5,6 +5,6 @@ AMD - + diff --git a/test/chunking-form/samples/deprecated/emit-asset/index-system.html b/test/chunking-form/samples/deprecated/emit-asset/index-system.html index 96c687c1eb7..d4b3890b337 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/index-system.html +++ b/test/chunking-form/samples/deprecated/emit-asset/index-system.html @@ -5,7 +5,7 @@ SystemJS - + diff --git a/test/chunking-form/samples/emit-chunk-existing/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_config.js similarity index 94% rename from test/chunking-form/samples/emit-chunk-existing/_config.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_config.js index 3f626f6076e..677af2b6b15 100644 --- a/test/chunking-form/samples/emit-chunk-existing/_config.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-existing/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'allows adding modules already in the graph as entry points', options: { + strictDeprecations: false, input: { 'first-main': 'main1', 'second-main': 'main2' diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/amd/first-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/first-main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/amd/first-main.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/first-main.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/amd/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/amd/generated-dep.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/amd/second-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/second-main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/amd/second-main.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/amd/second-main.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/cjs/first-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/first-main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/cjs/first-main.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/first-main.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/cjs/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/cjs/generated-dep.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/cjs/second-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/second-main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/cjs/second-main.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/cjs/second-main.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/es/first-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/first-main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/es/first-main.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/first-main.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/es/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/es/generated-dep.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/es/second-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/second-main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/es/second-main.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/es/second-main.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/system/first-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/system/first-main.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/first-main.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/system/generated-dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/system/generated-dep.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/emit-chunk-existing/_expected/system/second-main.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/_expected/system/second-main.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/_expected/system/second-main.js diff --git a/test/chunking-form/samples/emit-chunk-existing/dep.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/dep.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/dep.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/dep.js diff --git a/test/chunking-form/samples/emit-chunk-existing/main1.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/main1.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/main1.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/main1.js diff --git a/test/chunking-form/samples/emit-chunk-existing/main2.js b/test/chunking-form/samples/deprecated/emit-chunk-existing/main2.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-existing/main2.js rename to test/chunking-form/samples/deprecated/emit-chunk-existing/main2.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_config.js similarity index 94% rename from test/chunking-form/samples/emit-chunk-facade/_config.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_config.js index 4f15ed7ab82..a328ed9dd13 100644 --- a/test/chunking-form/samples/emit-chunk-facade/_config.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-facade/_config.js @@ -4,6 +4,7 @@ let referenceId; module.exports = { description: 'retrieves the correct name of an emitted chunk in case a facade is created', options: { + strictDeprecations: false, input: 'main', manualChunks: { 'build-starter': ['buildStart'] diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/amd/generated-build-starter.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-build-starter.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/amd/generated-build-starter.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-build-starter.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/amd/generated-buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/generated-buildStart.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/amd/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/amd/main.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/cjs/generated-build-starter.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-build-starter.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/cjs/generated-build-starter.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-build-starter.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/cjs/generated-buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/generated-buildStart.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/cjs/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/cjs/main.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-build-starter.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-build-starter.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-build-starter.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-build-starter.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/es/generated-buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/generated-buildStart.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/es/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/es/main.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-build-starter.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-build-starter.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-build-starter.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-build-starter.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/system/generated-buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/generated-buildStart.js diff --git a/test/chunking-form/samples/emit-chunk-facade/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/_expected/system/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/_expected/system/main.js diff --git a/test/chunking-form/samples/emit-chunk-facade/buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/buildStart.js diff --git a/test/chunking-form/samples/emit-chunk-facade/dep.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/dep.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/dep.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/dep.js diff --git a/test/chunking-form/samples/emit-chunk-facade/main.js b/test/chunking-form/samples/deprecated/emit-chunk-facade/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-facade/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-facade/main.js diff --git a/test/chunking-form/samples/emit-chunk-named/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_config.js similarity index 93% rename from test/chunking-form/samples/emit-chunk-named/_config.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_config.js index 8b171c6146e..2bd85d2be9a 100644 --- a/test/chunking-form/samples/emit-chunk-named/_config.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_config.js @@ -4,6 +4,7 @@ let referenceId; module.exports = { description: 'allows naming emitted chunks', options: { + strictDeprecations: false, input: 'main', plugins: { buildStart() { diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-chunk.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/amd/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-chunk.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/cjs/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-chunk.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/es/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/es/generated-nested/my-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/es/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-chunk.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/system/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/system/generated-nested/my-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js diff --git a/test/chunking-form/samples/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/_expected/system/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js diff --git a/test/chunking-form/samples/emit-chunk-named/buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk-named/buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/buildStart.js diff --git a/test/chunking-form/samples/emit-chunk-named/dep.js b/test/chunking-form/samples/deprecated/emit-chunk-named/dep.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/dep.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/dep.js diff --git a/test/chunking-form/samples/emit-chunk-named/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-named/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/main.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_config.js similarity index 98% rename from test/chunking-form/samples/emit-chunk-worker/_config.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_config.js index 168b5d3bb62..c77be10c7a7 100644 --- a/test/chunking-form/samples/emit-chunk-worker/_config.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_config.js @@ -6,6 +6,7 @@ let proxyId; module.exports = { description: 'allows adding additional chunks to be used in workers', options: { + strictDeprecations: false, input: 'main', output: { chunkFileNames: 'chunks/[name].js' diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/chunk.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/amd/chunks/nested.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/nested.js similarity index 69% rename from test/chunking-form/samples/emit-chunk-worker/_expected/amd/chunks/nested.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/nested.js index af95071095a..deefacd2395 100644 --- a/test/chunking-form/samples/emit-chunk-worker/_expected/amd/chunks/nested.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/nested.js @@ -1,7 +1,7 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker(new URL(require.toUrl('worker-proxy.js'), document.baseURI).href); + const worker = new Worker(new URL(require.toUrl('./worker-proxy.js'), document.baseURI).href); worker.onmessage = resolve; }); diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/amd/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/amd/chunks/worker.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js similarity index 84% rename from test/chunking-form/samples/emit-chunk-worker/_expected/amd/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js index f4916ec626e..e78af957548 100644 --- a/test/chunking-form/samples/emit-chunk-worker/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js @@ -1,7 +1,7 @@ define(['require', './chunks/chunk'], function (require, __chunk_1) { 'use strict'; const getWorkerMessage = () => new Promise(resolve => { - const worker = new Worker(new URL(require.toUrl('chunks/worker-proxy.js'), document.baseURI).href); + const worker = new Worker(new URL(require.toUrl('./chunks/worker-proxy.js'), document.baseURI).href); worker.onmessage = resolve; }); diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/chunk.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/cjs/chunks/nested.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/nested.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/cjs/chunks/nested.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/nested.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/cjs/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/cjs/chunks/worker.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/cjs/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/chunk.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/nested.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/nested.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/nested.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/nested.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/worker-proxy.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker-proxy.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/worker-proxy.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker-proxy.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/es/chunks/worker.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/es/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/chunk.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/nested.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/nested.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/nested.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/nested.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/worker-proxy.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker-proxy.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/worker-proxy.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker-proxy.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/system/chunks/worker.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js diff --git a/test/chunking-form/samples/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/_expected/system/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js diff --git a/test/chunking-form/samples/emit-chunk-worker/index-amd.html b/test/chunking-form/samples/deprecated/emit-chunk-worker/index-amd.html similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/index-amd.html rename to test/chunking-form/samples/deprecated/emit-chunk-worker/index-amd.html diff --git a/test/chunking-form/samples/emit-chunk-worker/index-system.html b/test/chunking-form/samples/deprecated/emit-chunk-worker/index-system.html similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/index-system.html rename to test/chunking-form/samples/deprecated/emit-chunk-worker/index-system.html diff --git a/test/chunking-form/samples/emit-chunk-worker/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/main.js diff --git a/test/chunking-form/samples/emit-chunk-worker/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/shared.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/shared.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/shared.js diff --git a/test/chunking-form/samples/emit-chunk-worker/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/worker.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worker/worker.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/worker.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_config.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_config.js similarity index 96% rename from test/chunking-form/samples/emit-chunk-worklet/_config.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_config.js index 0de5599741f..bb9d858bbed 100644 --- a/test/chunking-form/samples/emit-chunk-worklet/_config.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_config.js @@ -3,6 +3,7 @@ const REGISTER_WORKLET = 'register-paint-worklet:'; module.exports = { description: 'allows adding additional chunks to be used in worklets', options: { + strictDeprecations: false, input: 'main', output: { chunkFileNames: 'chunks/[name].js' diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/chunk.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/amd/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/amd/chunks/worklet.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js similarity index 70% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/amd/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js index c8445b3eae1..2c1a3f967e5 100644 --- a/test/chunking-form/samples/emit-chunk-worklet/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require', './chunks/chunk'], function (require, __chunk_1) { 'use strict'; - CSS.paintWorklet.addModule(new URL(require.toUrl('chunks/worklet.js'), document.baseURI).href); + CSS.paintWorklet.addModule(new URL(require.toUrl('./chunks/worklet.js'), document.baseURI).href); document.body.innerHTML += `

color: ${__chunk_1.color}, size: ${__chunk_1.size}

`; diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/chunk.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/cjs/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/cjs/chunks/worklet.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/cjs/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/chunk.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/es/chunks/worklet.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/es/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/chunk.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/system/chunks/worklet.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/_expected/system/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/index-es.html b/test/chunking-form/samples/deprecated/emit-chunk-worklet/index-es.html similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/index-es.html rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/index-es.html diff --git a/test/chunking-form/samples/emit-chunk-worklet/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/main.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/main.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/shared.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/shared.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/shared.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/shared.js diff --git a/test/chunking-form/samples/emit-chunk-worklet/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/worklet.js similarity index 100% rename from test/chunking-form/samples/emit-chunk-worklet/worklet.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/worklet.js diff --git a/test/chunking-form/samples/emit-chunk/_config.js b/test/chunking-form/samples/deprecated/emit-chunk/_config.js similarity index 93% rename from test/chunking-form/samples/emit-chunk/_config.js rename to test/chunking-form/samples/deprecated/emit-chunk/_config.js index 225c6722e8e..7652c7357cc 100644 --- a/test/chunking-form/samples/emit-chunk/_config.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_config.js @@ -4,6 +4,7 @@ let referenceId; module.exports = { description: 'allows adding additional chunks and retrieving their file name', options: { + strictDeprecations: false, input: 'main', plugins: { buildStart() { diff --git a/test/chunking-form/samples/emit-chunk/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/amd/generated-buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-chunk.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/amd/main.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/cjs/generated-buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-chunk.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/cjs/main.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/es/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/es/generated-buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/es/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-chunk.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/es/main.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/system/generated-buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/system/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-chunk.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-chunk.js diff --git a/test/chunking-form/samples/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/_expected/system/main.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js diff --git a/test/chunking-form/samples/emit-chunk/buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/buildStart.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/buildStart.js rename to test/chunking-form/samples/deprecated/emit-chunk/buildStart.js diff --git a/test/chunking-form/samples/emit-chunk/dep.js b/test/chunking-form/samples/deprecated/emit-chunk/dep.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/dep.js rename to test/chunking-form/samples/deprecated/emit-chunk/dep.js diff --git a/test/chunking-form/samples/emit-chunk/main.js b/test/chunking-form/samples/deprecated/emit-chunk/main.js similarity index 100% rename from test/chunking-form/samples/emit-chunk/main.js rename to test/chunking-form/samples/deprecated/emit-chunk/main.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_config.js new file mode 100644 index 00000000000..5434bb22502 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_config.js @@ -0,0 +1,20 @@ +const assert = require('assert'); +let referenceId; + +module.exports = { + description: 'retrieves the correct name of an emitted chunk in case a facade is created', + options: { + input: 'main', + manualChunks: { + 'build-starter': ['buildStart'] + }, + plugins: { + buildStart() { + referenceId = this.emitFile({ type: 'chunk', id: 'buildStart' }); + }, + renderChunk() { + assert.strictEqual(this.getFileName(referenceId), 'generated-buildStart.js'); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-build-starter.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-build-starter.js new file mode 100644 index 00000000000..4974a348248 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-build-starter.js @@ -0,0 +1,11 @@ +define(['exports'], function (exports) { 'use strict'; + + const value = 42; + const otherValue = 43; + + console.log('startBuild', value); + + exports.otherValue = otherValue; + exports.value = value; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js new file mode 100644 index 00000000000..06143748495 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/generated-buildStart.js @@ -0,0 +1,9 @@ +define(['exports', './generated-build-starter'], function (exports, buildStarter) { 'use strict'; + + + + exports.buildStartValue = buildStarter.value; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/main.js new file mode 100644 index 00000000000..f9191ee8ad4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(['./generated-build-starter'], function (buildStarter) { 'use strict'; + + console.log('main', buildStarter.value, buildStarter.otherValue); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-build-starter.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-build-starter.js new file mode 100644 index 00000000000..fecf7a3cd4c --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-build-starter.js @@ -0,0 +1,9 @@ +'use strict'; + +const value = 42; +const otherValue = 43; + +console.log('startBuild', value); + +exports.otherValue = otherValue; +exports.value = value; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js new file mode 100644 index 00000000000..66c05cca4ba --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/generated-buildStart.js @@ -0,0 +1,9 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var buildStarter = require('./generated-build-starter.js'); + + + +exports.buildStartValue = buildStarter.value; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/main.js new file mode 100644 index 00000000000..666c396846a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/cjs/main.js @@ -0,0 +1,5 @@ +'use strict'; + +var buildStarter = require('./generated-build-starter.js'); + +console.log('main', buildStarter.value, buildStarter.otherValue); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/generated-build-starter.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/generated-build-starter.js new file mode 100644 index 00000000000..43deafdd0be --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/generated-build-starter.js @@ -0,0 +1,6 @@ +const value = 42; +const otherValue = 43; + +console.log('startBuild', value); + +export { otherValue as o, value as v }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/generated-buildStart.js new file mode 100644 index 00000000000..ffb305eac54 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/generated-buildStart.js @@ -0,0 +1 @@ +export { v as buildStartValue } from './generated-build-starter.js'; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/main.js new file mode 100644 index 00000000000..28caef9429d --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/es/main.js @@ -0,0 +1,3 @@ +import { v as value, o as otherValue } from './generated-build-starter.js'; + +console.log('main', value, otherValue); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-build-starter.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-build-starter.js new file mode 100644 index 00000000000..75f69e53e87 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-build-starter.js @@ -0,0 +1,13 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + const value = exports('v', 42); + const otherValue = exports('o', 43); + + console.log('startBuild', value); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-buildStart.js new file mode 100644 index 00000000000..b82461c98ab --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/generated-buildStart.js @@ -0,0 +1,13 @@ +System.register(['./generated-build-starter.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('buildStartValue', module.v); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/main.js new file mode 100644 index 00000000000..4b52f565751 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/_expected/system/main.js @@ -0,0 +1,15 @@ +System.register(['./generated-build-starter.js'], function () { + 'use strict'; + var value, otherValue; + return { + setters: [function (module) { + value = module.v; + otherValue = module.o; + }], + execute: function () { + + console.log('main', value, otherValue); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/buildStart.js new file mode 100644 index 00000000000..49baee4964e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/buildStart.js @@ -0,0 +1,5 @@ +import {value} from './dep.js'; + +console.log('startBuild', value); + +export { value as buildStartValue }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/dep.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/dep.js new file mode 100644 index 00000000000..a2db6341120 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/dep.js @@ -0,0 +1,2 @@ +export const value = 42; +export const otherValue = 43; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-facade/main.js b/test/chunking-form/samples/emit-file/emit-chunk-facade/main.js new file mode 100644 index 00000000000..df41d56376c --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-facade/main.js @@ -0,0 +1,3 @@ +import { value, otherValue } from './dep'; + +console.log('main', value, otherValue); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_config.js new file mode 100644 index 00000000000..f0c2828ab2e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_config.js @@ -0,0 +1,17 @@ +const assert = require('assert'); +let referenceId; + +module.exports = { + description: 'allows naming emitted chunks', + options: { + input: 'main', + plugins: { + buildStart() { + referenceId = this.emitFile({ type: 'chunk', id: 'buildStart', name: 'nested/my-chunk' }); + }, + renderChunk() { + assert.strictEqual(this.getFileName(referenceId), 'generated-nested/my-chunk.js'); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..5e2f9f02968 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-chunk.js @@ -0,0 +1,7 @@ +define(['exports'], function (exports) { 'use strict'; + + var value = 42; + + exports.value = value; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js new file mode 100644 index 00000000000..9b82e0fcc17 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js @@ -0,0 +1,5 @@ +define(['../generated-chunk'], function (__chunk_1) { 'use strict'; + + console.log('startBuild', __chunk_1.value); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js new file mode 100644 index 00000000000..56bd65658a2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(['./generated-chunk'], function (__chunk_1) { 'use strict'; + + console.log('main', __chunk_1.value); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..6cec42c9a07 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-chunk.js @@ -0,0 +1,5 @@ +'use strict'; + +var value = 42; + +exports.value = value; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js new file mode 100644 index 00000000000..c193d450be5 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js @@ -0,0 +1,5 @@ +'use strict'; + +var __chunk_1 = require('../generated-chunk.js'); + +console.log('startBuild', __chunk_1.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js new file mode 100644 index 00000000000..04040e8d4f8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js @@ -0,0 +1,5 @@ +'use strict'; + +var __chunk_1 = require('./generated-chunk.js'); + +console.log('main', __chunk_1.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..b7cbe038a73 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-chunk.js @@ -0,0 +1,3 @@ +var value = 42; + +export { value as v }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js new file mode 100644 index 00000000000..015c2211ce2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js @@ -0,0 +1,3 @@ +import { v as value } from '../generated-chunk.js'; + +console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js new file mode 100644 index 00000000000..9ccd67b1a67 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js @@ -0,0 +1,3 @@ +import { v as value } from './generated-chunk.js'; + +console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..e69dcc529da --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var value = exports('v', 42); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js new file mode 100644 index 00000000000..f366fbd644f --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js @@ -0,0 +1,14 @@ +System.register(['../generated-chunk.js'], function () { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.v; + }], + execute: function () { + + console.log('startBuild', value); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js new file mode 100644 index 00000000000..8a46bd2bdb1 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js @@ -0,0 +1,14 @@ +System.register(['./generated-chunk.js'], function () { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.v; + }], + execute: function () { + + console.log('main', value); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk-named/buildStart.js new file mode 100644 index 00000000000..f9b1b414da5 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/buildStart.js @@ -0,0 +1,3 @@ +import value from './dep.js'; + +console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/dep.js b/test/chunking-form/samples/emit-file/emit-chunk-named/dep.js new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/dep.js @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/main.js new file mode 100644 index 00000000000..4a9b3a3f405 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/main.js @@ -0,0 +1,3 @@ +import value from './dep.js'; + +console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_config.js new file mode 100644 index 00000000000..1be938dec5b --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_config.js @@ -0,0 +1,54 @@ +const path = require('path'); + +let workerId; +let proxyId; + +module.exports = { + description: 'allows adding additional chunks to be used in workers', + options: { + input: 'main', + output: { + chunkFileNames: 'chunks/[name].js' + }, + plugins: { + load(id) { + if (id === 'merged' || id === 'nested') { + if (!workerId) { + workerId = this.emitFile({ type: 'chunk', id: 'worker' }); + proxyId = this.emitFile({ type: 'chunk', id: 'worker-proxy' }); + } + return ` +export const getWorkerMessage = () => new Promise(resolve => { + const worker = new Worker(import.meta.ROLLUP_FILE_URL_${proxyId}); + worker.onmessage = resolve; +});`; + } + if (id === 'worker-proxy') { + return `PLACEHOLDER(import.meta.ROLLUP_FILE_URL_${workerId})`; + } + }, + renderChunk(code, chunk, options) { + if (chunk.facadeModuleId === 'worker-proxy') { + const chunkFileName = `./${path.relative( + path.dirname(chunk.fileName), + this.getFileName(workerId) + )}`; + if (options.format === 'system') { + return `importScripts('../../../../../../../../node_modules/systemjs/dist/system.js'); +System.import('${chunkFileName}');`; + } + if (options.format === 'amd') { + return `importScripts('../../../../../../../../node_modules/requirejs/require.js'); +requirejs(['${chunkFileName}']);`; + } + } + }, + resolveId(id) { + if (id === 'merged' || id === 'nested' || id === 'worker-proxy') { + return id; + } + return null; + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/chunk.js new file mode 100644 index 00000000000..b188047d8e0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/chunk.js @@ -0,0 +1,7 @@ +define(['exports'], function (exports) { 'use strict'; + + const shared = 'shared'; + + exports.shared = shared; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/nested.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/nested.js new file mode 100644 index 00000000000..deefacd2395 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/nested.js @@ -0,0 +1,10 @@ +define(['require', 'exports'], function (require, exports) { 'use strict'; + + const getWorkerMessage = () => new Promise(resolve => { + const worker = new Worker(new URL(require.toUrl('./worker-proxy.js'), document.baseURI).href); + worker.onmessage = resolve; + }); + + exports.getWorkerMessage = getWorkerMessage; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js new file mode 100644 index 00000000000..4505f11437b --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker-proxy.js @@ -0,0 +1,2 @@ +importScripts('../../../../../../../../node_modules/requirejs/require.js'); +requirejs(['./worker.js']); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js new file mode 100644 index 00000000000..4cfe5e26c29 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js @@ -0,0 +1,5 @@ +define(['./chunk'], function (__chunk_1) { 'use strict'; + + postMessage(`from worker: ${__chunk_1.shared}`); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js new file mode 100644 index 00000000000..e78af957548 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js @@ -0,0 +1,15 @@ +define(['require', './chunks/chunk'], function (require, __chunk_1) { 'use strict'; + + const getWorkerMessage = () => new Promise(resolve => { + const worker = new Worker(new URL(require.toUrl('./chunks/worker-proxy.js'), document.baseURI).href); + worker.onmessage = resolve; + }); + + document.body.innerHTML += `

main: ${__chunk_1.shared}

`; + getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); + + new Promise(function (resolve, reject) { require(['./chunks/nested'], resolve, reject) }) + .then(result => result.getWorkerMessage()) + .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/chunk.js new file mode 100644 index 00000000000..e2dc6ecb8ef --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/chunk.js @@ -0,0 +1,5 @@ +'use strict'; + +const shared = 'shared'; + +exports.shared = shared; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/nested.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/nested.js new file mode 100644 index 00000000000..b1544deca5e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/nested.js @@ -0,0 +1,8 @@ +'use strict'; + +const getWorkerMessage = () => new Promise(resolve => { + const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/worker-proxy.js').href : new URL('worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); + worker.onmessage = resolve; +}); + +exports.getWorkerMessage = getWorkerMessage; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js new file mode 100644 index 00000000000..0171ef8895e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker-proxy.js @@ -0,0 +1,3 @@ +'use strict'; + +PLACEHOLDER((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/worker.js').href : new URL('worker.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js new file mode 100644 index 00000000000..3e14edd224a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js @@ -0,0 +1,5 @@ +'use strict'; + +var __chunk_1 = require('./chunk.js'); + +postMessage(`from worker: ${__chunk_1.shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js new file mode 100644 index 00000000000..e7c846b892f --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js @@ -0,0 +1,15 @@ +'use strict'; + +var __chunk_1 = require('./chunks/chunk.js'); + +const getWorkerMessage = () => new Promise(resolve => { + const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worker-proxy.js').href : new URL('chunks/worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); + worker.onmessage = resolve; +}); + +document.body.innerHTML += `

main: ${__chunk_1.shared}

`; +getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); + +new Promise(function (resolve) { resolve(require('./chunks/nested.js')); }) + .then(result => result.getWorkerMessage()) + .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/chunk.js new file mode 100644 index 00000000000..464379ccc95 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/chunk.js @@ -0,0 +1,3 @@ +const shared = 'shared'; + +export { shared as s }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/nested.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/nested.js new file mode 100644 index 00000000000..13c379e9742 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/nested.js @@ -0,0 +1,6 @@ +const getWorkerMessage = () => new Promise(resolve => { + const worker = new Worker(new URL('worker-proxy.js', import.meta.url).href); + worker.onmessage = resolve; +}); + +export { getWorkerMessage }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker-proxy.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker-proxy.js new file mode 100644 index 00000000000..88e9531a22e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker-proxy.js @@ -0,0 +1 @@ +PLACEHOLDER(new URL('worker.js', import.meta.url).href); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js new file mode 100644 index 00000000000..d4a13865f89 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js @@ -0,0 +1,3 @@ +import { s as shared } from './chunk.js'; + +postMessage(`from worker: ${shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js new file mode 100644 index 00000000000..542f42d06f6 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js @@ -0,0 +1,13 @@ +import { s as shared } from './chunks/chunk.js'; + +const getWorkerMessage = () => new Promise(resolve => { + const worker = new Worker(new URL('chunks/worker-proxy.js', import.meta.url).href); + worker.onmessage = resolve; +}); + +document.body.innerHTML += `

main: ${shared}

`; +getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); + +import('./chunks/nested.js') + .then(result => result.getWorkerMessage()) + .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/chunk.js new file mode 100644 index 00000000000..48be08070fc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + const shared = exports('s', 'shared'); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/nested.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/nested.js new file mode 100644 index 00000000000..1c41e726447 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/nested.js @@ -0,0 +1,13 @@ +System.register([], function (exports, module) { + 'use strict'; + return { + execute: function () { + + const getWorkerMessage = exports('getWorkerMessage', () => new Promise(resolve => { + const worker = new Worker(new URL('worker-proxy.js', module.meta.url).href); + worker.onmessage = resolve; + })); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker-proxy.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker-proxy.js new file mode 100644 index 00000000000..645282d199d --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker-proxy.js @@ -0,0 +1,2 @@ +importScripts('../../../../../../../../node_modules/systemjs/dist/system.js'); +System.import('./worker.js'); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js new file mode 100644 index 00000000000..b8ae183e3d0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js @@ -0,0 +1,14 @@ +System.register(['./chunk.js'], function () { + 'use strict'; + var shared; + return { + setters: [function (module) { + shared = module.s; + }], + execute: function () { + + postMessage(`from worker: ${shared}`); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js new file mode 100644 index 00000000000..c1b3d8a5a2f --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js @@ -0,0 +1,24 @@ +System.register(['./chunks/chunk.js'], function (exports, module) { + 'use strict'; + var shared; + return { + setters: [function (module) { + shared = module.s; + }], + execute: function () { + + const getWorkerMessage = () => new Promise(resolve => { + const worker = new Worker(new URL('chunks/worker-proxy.js', module.meta.url).href); + worker.onmessage = resolve; + }); + + document.body.innerHTML += `

main: ${shared}

`; + getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); + + module.import('./chunks/nested.js') + .then(result => result.getWorkerMessage()) + .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/index-amd.html b/test/chunking-form/samples/emit-file/emit-chunk-worker/index-amd.html new file mode 100644 index 00000000000..cd17b62967d --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/index-amd.html @@ -0,0 +1,10 @@ + + + + + AMD + + + + + diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/index-system.html b/test/chunking-form/samples/emit-file/emit-chunk-worker/index-system.html new file mode 100644 index 00000000000..d4b3890b337 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/index-system.html @@ -0,0 +1,11 @@ + + + + + SystemJS + + + + + + diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/main.js new file mode 100644 index 00000000000..4c03186f74e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/main.js @@ -0,0 +1,9 @@ +import { getWorkerMessage } from 'merged'; +import { shared } from './shared'; + +document.body.innerHTML += `

main: ${shared}

`; +getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); + +import('nested') + .then(result => result.getWorkerMessage()) + .then(message => (document.body.innerHTML += `

2: ${message.data}

`)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/shared.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/shared.js new file mode 100644 index 00000000000..cd35843de7a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/shared.js @@ -0,0 +1 @@ +export const shared = 'shared'; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/worker.js new file mode 100644 index 00000000000..824aa26d2e0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/worker.js @@ -0,0 +1,3 @@ +import {shared} from './shared'; + +postMessage(`from worker: ${shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_config.js new file mode 100644 index 00000000000..70bd5ddb829 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_config.js @@ -0,0 +1,29 @@ +const REGISTER_WORKLET = 'register-paint-worklet:'; + +module.exports = { + description: 'allows adding additional chunks to be used in worklets', + options: { + input: 'main', + output: { + chunkFileNames: 'chunks/[name].js' + }, + plugins: { + load(id) { + if (id.startsWith(REGISTER_WORKLET)) { + return `CSS.paintWorklet.addModule(import.meta.ROLLUP_FILE_URL_${this.emitFile({ + type: 'chunk', + id: id.slice(REGISTER_WORKLET.length) + })});`; + } + }, + resolveId(id, importee) { + if (id.startsWith(REGISTER_WORKLET)) { + return this.resolve(id.slice(REGISTER_WORKLET.length), importee).then( + resolvedId => REGISTER_WORKLET + resolvedId.id + ); + } + return null; + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/chunk.js new file mode 100644 index 00000000000..931cd5869bc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/chunk.js @@ -0,0 +1,9 @@ +define(['exports'], function (exports) { 'use strict'; + + const color = 'greenyellow'; + const size = 6; + + exports.color = color; + exports.size = size; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js new file mode 100644 index 00000000000..6b97d5f9e07 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js @@ -0,0 +1,17 @@ +define(['./chunk'], function (__chunk_1) { 'use strict'; + + registerPaint( + 'vertical-lines', + class { + paint(ctx, geom) { + for (let x = 0; x < geom.width / __chunk_1.size; x++) { + ctx.beginPath(); + ctx.fillStyle = __chunk_1.color; + ctx.rect(x * __chunk_1.size, 0, 2, geom.height); + ctx.fill(); + } + } + } + ); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js new file mode 100644 index 00000000000..2c1a3f967e5 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js @@ -0,0 +1,7 @@ +define(['require', './chunks/chunk'], function (require, __chunk_1) { 'use strict'; + + CSS.paintWorklet.addModule(new URL(require.toUrl('./chunks/worklet.js'), document.baseURI).href); + + document.body.innerHTML += `

color: ${__chunk_1.color}, size: ${__chunk_1.size}

`; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/chunk.js new file mode 100644 index 00000000000..baee02947f7 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/chunk.js @@ -0,0 +1,7 @@ +'use strict'; + +const color = 'greenyellow'; +const size = 6; + +exports.color = color; +exports.size = size; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js new file mode 100644 index 00000000000..b3eec36c862 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js @@ -0,0 +1,17 @@ +'use strict'; + +var __chunk_1 = require('./chunk.js'); + +registerPaint( + 'vertical-lines', + class { + paint(ctx, geom) { + for (let x = 0; x < geom.width / __chunk_1.size; x++) { + ctx.beginPath(); + ctx.fillStyle = __chunk_1.color; + ctx.rect(x * __chunk_1.size, 0, 2, geom.height); + ctx.fill(); + } + } + } +); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js new file mode 100644 index 00000000000..a5404718a54 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js @@ -0,0 +1,7 @@ +'use strict'; + +var __chunk_1 = require('./chunks/chunk.js'); + +CSS.paintWorklet.addModule((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worklet.js').href : new URL('chunks/worklet.js', document.currentScript && document.currentScript.src || document.baseURI).href)); + +document.body.innerHTML += `

color: ${__chunk_1.color}, size: ${__chunk_1.size}

`; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/chunk.js new file mode 100644 index 00000000000..cce16151201 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/chunk.js @@ -0,0 +1,4 @@ +const color = 'greenyellow'; +const size = 6; + +export { color as c, size as s }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js new file mode 100644 index 00000000000..43f54d48cc8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js @@ -0,0 +1,15 @@ +import { s as size, c as color } from './chunk.js'; + +registerPaint( + 'vertical-lines', + class { + paint(ctx, geom) { + for (let x = 0; x < geom.width / size; x++) { + ctx.beginPath(); + ctx.fillStyle = color; + ctx.rect(x * size, 0, 2, geom.height); + ctx.fill(); + } + } + } +); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js new file mode 100644 index 00000000000..cda6f00a5b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js @@ -0,0 +1,5 @@ +import { c as color, s as size } from './chunks/chunk.js'; + +CSS.paintWorklet.addModule(new URL('chunks/worklet.js', import.meta.url).href); + +document.body.innerHTML += `

color: ${color}, size: ${size}

`; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/chunk.js new file mode 100644 index 00000000000..f348ef3f487 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/chunk.js @@ -0,0 +1,11 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + const color = exports('c', 'greenyellow'); + const size = exports('s', 6); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js new file mode 100644 index 00000000000..95fe01bb0b4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js @@ -0,0 +1,27 @@ +System.register(['./chunk.js'], function () { + 'use strict'; + var size, color; + return { + setters: [function (module) { + size = module.s; + color = module.c; + }], + execute: function () { + + registerPaint( + 'vertical-lines', + class { + paint(ctx, geom) { + for (let x = 0; x < geom.width / size; x++) { + ctx.beginPath(); + ctx.fillStyle = color; + ctx.rect(x * size, 0, 2, geom.height); + ctx.fill(); + } + } + } + ); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js new file mode 100644 index 00000000000..b07122b3d50 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js @@ -0,0 +1,17 @@ +System.register(['./chunks/chunk.js'], function (exports, module) { + 'use strict'; + var color, size; + return { + setters: [function (module) { + color = module.c; + size = module.s; + }], + execute: function () { + + CSS.paintWorklet.addModule(new URL('chunks/worklet.js', module.meta.url).href); + + document.body.innerHTML += `

color: ${color}, size: ${size}

`; + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/index-es.html b/test/chunking-form/samples/emit-file/emit-chunk-worklet/index-es.html new file mode 100644 index 00000000000..af223f6c5c1 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/index-es.html @@ -0,0 +1,10 @@ + + + + + ESM + + + + + diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/main.js new file mode 100644 index 00000000000..60bad6751e8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/main.js @@ -0,0 +1,4 @@ +import 'register-paint-worklet:./worklet.js'; +import { color, size } from './shared'; + +document.body.innerHTML += `

color: ${color}, size: ${size}

`; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/shared.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/shared.js new file mode 100644 index 00000000000..5a94b80cdd8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/shared.js @@ -0,0 +1,2 @@ +export const color = 'greenyellow'; +export const size = 6; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/worklet.js new file mode 100644 index 00000000000..2274b010e02 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/worklet.js @@ -0,0 +1,15 @@ +import { color, size } from './shared'; + +registerPaint( + 'vertical-lines', + class { + paint(ctx, geom) { + for (let x = 0; x < geom.width / size; x++) { + ctx.beginPath(); + ctx.fillStyle = color; + ctx.rect(x * size, 0, 2, geom.height); + ctx.fill(); + } + } + } +); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_config.js b/test/chunking-form/samples/emit-file/emit-chunk/_config.js new file mode 100644 index 00000000000..2c6897b8235 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_config.js @@ -0,0 +1,17 @@ +const assert = require('assert'); +let referenceId; + +module.exports = { + description: 'allows adding additional chunks and retrieving their file name', + options: { + input: 'main', + plugins: { + buildStart() { + referenceId = this.emitFile({ type: 'chunk', id: 'buildStart' }); + }, + renderChunk() { + assert.strictEqual(this.getFileName(referenceId), 'generated-buildStart.js'); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js new file mode 100644 index 00000000000..e313dd4eb35 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js @@ -0,0 +1,5 @@ +define(['./generated-chunk'], function (__chunk_1) { 'use strict'; + + console.log('startBuild', __chunk_1.value); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..5e2f9f02968 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-chunk.js @@ -0,0 +1,7 @@ +define(['exports'], function (exports) { 'use strict'; + + var value = 42; + + exports.value = value; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js new file mode 100644 index 00000000000..56bd65658a2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(['./generated-chunk'], function (__chunk_1) { 'use strict'; + + console.log('main', __chunk_1.value); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js new file mode 100644 index 00000000000..806bebd797b --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js @@ -0,0 +1,5 @@ +'use strict'; + +var __chunk_1 = require('./generated-chunk.js'); + +console.log('startBuild', __chunk_1.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..6cec42c9a07 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-chunk.js @@ -0,0 +1,5 @@ +'use strict'; + +var value = 42; + +exports.value = value; diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js new file mode 100644 index 00000000000..04040e8d4f8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js @@ -0,0 +1,5 @@ +'use strict'; + +var __chunk_1 = require('./generated-chunk.js'); + +console.log('main', __chunk_1.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js new file mode 100644 index 00000000000..e243252b0c2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js @@ -0,0 +1,3 @@ +import { v as value } from './generated-chunk.js'; + +console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..b7cbe038a73 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-chunk.js @@ -0,0 +1,3 @@ +var value = 42; + +export { value as v }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js new file mode 100644 index 00000000000..9ccd67b1a67 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js @@ -0,0 +1,3 @@ +import { v as value } from './generated-chunk.js'; + +console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js new file mode 100644 index 00000000000..a19c2c2d671 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js @@ -0,0 +1,14 @@ +System.register(['./generated-chunk.js'], function () { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.v; + }], + execute: function () { + + console.log('startBuild', value); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..e69dcc529da --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var value = exports('v', 42); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js new file mode 100644 index 00000000000..8a46bd2bdb1 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js @@ -0,0 +1,14 @@ +System.register(['./generated-chunk.js'], function () { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.v; + }], + execute: function () { + + console.log('main', value); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/buildStart.js new file mode 100644 index 00000000000..f9b1b414da5 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/buildStart.js @@ -0,0 +1,3 @@ +import value from './dep.js'; + +console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/dep.js b/test/chunking-form/samples/emit-file/emit-chunk/dep.js new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/dep.js @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/emit-file/emit-chunk/main.js b/test/chunking-form/samples/emit-file/emit-chunk/main.js new file mode 100644 index 00000000000..4a9b3a3f405 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk/main.js @@ -0,0 +1,3 @@ +import value from './dep.js'; + +console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_config.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_config.js new file mode 100644 index 00000000000..404461da95e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'allows adding modules already in the graph as entry points', + options: { + input: { + 'first-main': 'main1', + 'second-main': 'main2' + }, + plugins: { + buildStart() { + // it should be possible to add existing entry points while not overriding their alias + this.emitFile({ type: 'chunk', id: 'main1' }); + + // if an existing dependency is added, all references should use the new name + this.emitFile({ type: 'chunk', id: 'dep.js' }); + this.emitFile({ type: 'chunk', id: 'dep' }); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/first-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/first-main.js new file mode 100644 index 00000000000..fd823ca54c7 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/first-main.js @@ -0,0 +1,5 @@ +define(['./generated-dep'], function (dep) { 'use strict'; + + console.log('main1', dep); + +}); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/generated-dep.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/generated-dep.js new file mode 100644 index 00000000000..e14fcf80133 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/generated-dep.js @@ -0,0 +1,7 @@ +define(function () { 'use strict'; + + var value = 42; + + return value; + +}); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/second-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/second-main.js new file mode 100644 index 00000000000..fd823ca54c7 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/amd/second-main.js @@ -0,0 +1,5 @@ +define(['./generated-dep'], function (dep) { 'use strict'; + + console.log('main1', dep); + +}); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/first-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/first-main.js new file mode 100644 index 00000000000..54bee5af979 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/first-main.js @@ -0,0 +1,5 @@ +'use strict'; + +var dep = require('./generated-dep.js'); + +console.log('main1', dep); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/generated-dep.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/generated-dep.js new file mode 100644 index 00000000000..07d7bfe2962 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/generated-dep.js @@ -0,0 +1,5 @@ +'use strict'; + +var value = 42; + +module.exports = value; diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/second-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/second-main.js new file mode 100644 index 00000000000..54bee5af979 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/cjs/second-main.js @@ -0,0 +1,5 @@ +'use strict'; + +var dep = require('./generated-dep.js'); + +console.log('main1', dep); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/first-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/first-main.js new file mode 100644 index 00000000000..d77500b5810 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/first-main.js @@ -0,0 +1,3 @@ +import value from './generated-dep.js'; + +console.log('main1', value); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/generated-dep.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/generated-dep.js new file mode 100644 index 00000000000..630536069ae --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/generated-dep.js @@ -0,0 +1,3 @@ +var value = 42; + +export default value; diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/second-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/second-main.js new file mode 100644 index 00000000000..d77500b5810 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/es/second-main.js @@ -0,0 +1,3 @@ +import value from './generated-dep.js'; + +console.log('main1', value); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js new file mode 100644 index 00000000000..80f3e6cfee2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/first-main.js @@ -0,0 +1,14 @@ +System.register(['./generated-dep.js'], function () { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.default; + }], + execute: function () { + + console.log('main1', value); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/generated-dep.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/generated-dep.js new file mode 100644 index 00000000000..9cb117a6246 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/generated-dep.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var value = exports('default', 42); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js new file mode 100644 index 00000000000..80f3e6cfee2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/_expected/system/second-main.js @@ -0,0 +1,14 @@ +System.register(['./generated-dep.js'], function () { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.default; + }], + execute: function () { + + console.log('main1', value); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/dep.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/dep.js new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/dep.js @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/main1.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/main1.js new file mode 100644 index 00000000000..e384824c6f2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/main1.js @@ -0,0 +1,3 @@ +import value from './dep.js'; + +console.log('main1', value); diff --git a/test/chunking-form/samples/emit-file/emits-existing-chunk/main2.js b/test/chunking-form/samples/emit-file/emits-existing-chunk/main2.js new file mode 100644 index 00000000000..e384824c6f2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-existing-chunk/main2.js @@ -0,0 +1,3 @@ +import value from './dep.js'; + +console.log('main1', value); 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 1d8142bda6e..3debd768914 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,6 +1,6 @@ define(['require', './nested/chunk'], function (require, __chunk_1) { 'use strict'; - var logo = new URL(require.toUrl('assets/logo1-a5ec488b.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('./assets/logo1-a5ec488b.svg'), document.baseURI).href; __chunk_1.showImage(logo); new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }); diff --git a/test/chunking-form/samples/emit-file/reference-files/index-amd.html b/test/chunking-form/samples/emit-file/reference-files/index-amd.html index 476b9ce3df1..cd17b62967d 100644 --- a/test/chunking-form/samples/emit-file/reference-files/index-amd.html +++ b/test/chunking-form/samples/emit-file/reference-files/index-amd.html @@ -5,6 +5,6 @@ AMD - + diff --git a/test/chunking-form/samples/emit-file/reference-files/index-system.html b/test/chunking-form/samples/emit-file/reference-files/index-system.html index 96c687c1eb7..d4b3890b337 100644 --- a/test/chunking-form/samples/emit-file/reference-files/index-system.html +++ b/test/chunking-form/samples/emit-file/reference-files/index-system.html @@ -5,7 +5,7 @@ SystemJS - + diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js index d14e3971593..db5e6d3dc96 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js @@ -1,10 +1,10 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; - const renderStart = new URL(require.toUrl('assets/renderStart-66600c78.txt'), document.baseURI).href; - const banner = new URL(require.toUrl('assets/banner-2b65cc0c.txt'), document.baseURI).href; - const footer = new URL(require.toUrl('assets/footer-e1d2fccb.txt'), document.baseURI).href; - const intro = new URL(require.toUrl('assets/intro-520a8116.txt'), document.baseURI).href; - const outro = new URL(require.toUrl('assets/outro-21f77720.txt'), document.baseURI).href; + const renderStart = new URL(require.toUrl('./assets/renderStart-66600c78.txt'), document.baseURI).href; + const banner = new URL(require.toUrl('./assets/banner-2b65cc0c.txt'), document.baseURI).href; + const footer = new URL(require.toUrl('./assets/footer-e1d2fccb.txt'), document.baseURI).href; + const intro = new URL(require.toUrl('./assets/intro-520a8116.txt'), document.baseURI).href; + const outro = new URL(require.toUrl('./assets/outro-21f77720.txt'), document.baseURI).href; exports.banner = banner; exports.footer = footer; diff --git a/test/chunking-form/samples/resolve-file-url/_config.js b/test/chunking-form/samples/resolve-file-url/_config.js index aad0d65e141..7116c2b042d 100644 --- a/test/chunking-form/samples/resolve-file-url/_config.js +++ b/test/chunking-form/samples/resolve-file-url/_config.js @@ -18,10 +18,10 @@ module.exports = { name: `asset-${id}.txt`, source: `Asset for: ${id}` }); - const chunkId = this.emitChunk('chunk.js'); + const chunkId = this.emitFile({ type: 'chunk', id: 'chunk.js' }); return ( `export const asset = import.meta.ROLLUP_FILE_URL_${assetId};\n` + - `export const chunk = import.meta.ROLLUP_CHUNK_URL_${chunkId};` + `export const chunk = import.meta.ROLLUP_FILE_URL_${chunkId};` ); } }, diff --git a/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js b/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js index 65913f1755d..d5222443f37 100644 --- a/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js +++ b/test/chunking-form/samples/resolve-file-url/_expected/amd/main.js @@ -3,8 +3,8 @@ define(['require'], function (require) { 'use strict'; const asset = 'resolved'; const chunk = 'resolved'; - const asset$1 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; - const chunk$1 = new URL(require.toUrl('nested/chunk.js'), document.baseURI).href; + const asset$1 = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; + const chunk$1 = new URL(require.toUrl('./nested/chunk.js'), document.baseURI).href; new Promise(function (resolve, reject) { require(['./nested/chunk2'], resolve, reject) }).then(result => console.log(result, chunk, chunk$1, asset, asset$1)); diff --git a/test/form/samples/configure-file-url/_expected/amd.js b/test/form/samples/configure-file-url/_expected/amd.js index 084e2ea462b..ecd6bd1ac2d 100644 --- a/test/form/samples/configure-file-url/_expected/amd.js +++ b/test/form/samples/configure-file-url/_expected/amd.js @@ -4,7 +4,7 @@ define(['require'], function (require) { 'use strict'; var asset2 = 'resolved'; - var asset3 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; + var asset3 = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/configure-asset-url/_expected/amd.js b/test/form/samples/deprecated/configure-asset-url/_expected/amd.js index 6ab335a4868..60d09eb0292 100644 --- a/test/form/samples/deprecated/configure-asset-url/_expected/amd.js +++ b/test/form/samples/deprecated/configure-asset-url/_expected/amd.js @@ -4,7 +4,7 @@ define(['require'], function (require) { 'use strict'; var asset2 = 'resolved'; - var asset3 = new URL(require.toUrl('assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; + var asset3 = new URL(require.toUrl('./assets/asset-unresolved-8dcd7fca.txt'), document.baseURI).href; console.log(asset1, asset2, asset3); diff --git a/test/form/samples/deprecated/emit-asset/_expected/amd.js b/test/form/samples/deprecated/emit-asset/_expected/amd.js index 43a19504229..36634121098 100644 --- a/test/form/samples/deprecated/emit-asset/_expected/amd.js +++ b/test/form/samples/deprecated/emit-asset/_expected/amd.js @@ -1,6 +1,6 @@ define(['require'], function (require) { 'use strict'; - var logo = new URL(require.toUrl('assets/logo-25585ac1.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('./assets/logo-25585ac1.svg'), document.baseURI).href; function showImage(url) { console.log(url); diff --git a/test/form/samples/deprecated/emit-asset/index-amd.html b/test/form/samples/deprecated/emit-asset/index-amd.html index e89cb396ea2..14c7c2fa4ac 100644 --- a/test/form/samples/deprecated/emit-asset/index-amd.html +++ b/test/form/samples/deprecated/emit-asset/index-amd.html @@ -5,6 +5,6 @@ AMD - + diff --git a/test/form/samples/deprecated/emit-asset/index-system.html b/test/form/samples/deprecated/emit-asset/index-system.html index bef9897957b..750eabdba25 100644 --- a/test/form/samples/deprecated/emit-asset/index-system.html +++ b/test/form/samples/deprecated/emit-asset/index-system.html @@ -5,7 +5,7 @@ SystemJS - + diff --git a/test/form/samples/deprecated/emit-asset/index-umd-amd.html b/test/form/samples/deprecated/emit-asset/index-umd-amd.html index e644ea36370..e7c9217ece0 100644 --- a/test/form/samples/deprecated/emit-asset/index-umd-amd.html +++ b/test/form/samples/deprecated/emit-asset/index-umd-amd.html @@ -5,6 +5,6 @@ UMD (AMD) - + diff --git a/test/form/samples/emit-asset-file/_expected/amd.js b/test/form/samples/emit-asset-file/_expected/amd.js index 43a19504229..36634121098 100644 --- a/test/form/samples/emit-asset-file/_expected/amd.js +++ b/test/form/samples/emit-asset-file/_expected/amd.js @@ -1,6 +1,6 @@ define(['require'], function (require) { 'use strict'; - var logo = new URL(require.toUrl('assets/logo-25585ac1.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('./assets/logo-25585ac1.svg'), document.baseURI).href; function showImage(url) { console.log(url); diff --git a/test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js b/test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js index 012eee6ddad..85f8e8fe64f 100644 --- a/test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js +++ b/test/function/samples/deprecated/emit-asset/invalid-asset-id/_config.js @@ -10,7 +10,7 @@ module.exports = { } }, generateError: { - code: 'ASSET_NOT_FOUND', - message: 'Plugin error - Unable to get file name for unknown asset "invalid".' + code: 'FILE_NOT_FOUND', + message: 'Plugin error - Unable to get file name for unknown file "invalid".' } }; diff --git a/test/function/samples/emit-chunk/chunk-filename-not-available/_config.js b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/_config.js similarity index 94% rename from test/function/samples/emit-chunk/chunk-filename-not-available/_config.js rename to test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/_config.js index eda4e487c82..52a5ee32ae1 100644 --- a/test/function/samples/emit-chunk/chunk-filename-not-available/_config.js +++ b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'Throws when accessing the filename before it has been generated', options: { + strictDeprecations: false, input: 'main.js', plugins: { name: 'test-plugin', diff --git a/test/function/samples/emit-chunk/chunk-filename-not-available/chunk.js b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/chunk.js similarity index 100% rename from test/function/samples/emit-chunk/chunk-filename-not-available/chunk.js rename to test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/chunk.js diff --git a/test/function/samples/emit-chunk/chunk-filename-not-available/main.js b/test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/main.js similarity index 100% rename from test/function/samples/emit-chunk/chunk-filename-not-available/main.js rename to test/function/samples/deprecated/emit-chunk/chunk-filename-not-available/main.js diff --git a/test/function/samples/emit-chunk/chunk-not-found/_config.js b/test/function/samples/deprecated/emit-chunk/chunk-not-found/_config.js similarity index 91% rename from test/function/samples/emit-chunk/chunk-not-found/_config.js rename to test/function/samples/deprecated/emit-chunk/chunk-not-found/_config.js index 0d85644457d..99a8b329017 100644 --- a/test/function/samples/emit-chunk/chunk-not-found/_config.js +++ b/test/function/samples/deprecated/emit-chunk/chunk-not-found/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'Throws if an emitted entry chunk cannot be resolved', options: { + strictDeprecations: false, input: 'main.js', plugins: { buildStart() { diff --git a/test/function/samples/emit-chunk/chunk-not-found/main.js b/test/function/samples/deprecated/emit-chunk/chunk-not-found/main.js similarity index 100% rename from test/function/samples/emit-chunk/chunk-not-found/main.js rename to test/function/samples/deprecated/emit-chunk/chunk-not-found/main.js diff --git a/test/function/samples/emit-chunk/invalid-chunk-id/_config.js b/test/function/samples/deprecated/emit-chunk/invalid-chunk-id/_config.js similarity index 63% rename from test/function/samples/emit-chunk/invalid-chunk-id/_config.js rename to test/function/samples/deprecated/emit-chunk/invalid-chunk-id/_config.js index 878e67a24ff..5f131d72bd5 100644 --- a/test/function/samples/emit-chunk/invalid-chunk-id/_config.js +++ b/test/function/samples/deprecated/emit-chunk/invalid-chunk-id/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'throws for invalid chunk ids', options: { + strictDeprecations: false, plugins: { name: 'test-plugin', load() { @@ -9,7 +10,7 @@ module.exports = { } }, generateError: { - code: 'CHUNK_NOT_FOUND', - message: 'Plugin error - Unable to get file name for unknown chunk "invalid".' + code: 'FILE_NOT_FOUND', + message: 'Plugin error - Unable to get file name for unknown file "invalid".' } }; diff --git a/test/function/samples/emit-chunk/invalid-chunk-id/main.js b/test/function/samples/deprecated/emit-chunk/invalid-chunk-id/main.js similarity index 100% rename from test/function/samples/emit-chunk/invalid-chunk-id/main.js rename to test/function/samples/deprecated/emit-chunk/invalid-chunk-id/main.js diff --git a/test/function/samples/emit-chunk/modules-loaded/_config.js b/test/function/samples/deprecated/emit-chunk/modules-loaded/_config.js similarity index 78% rename from test/function/samples/emit-chunk/modules-loaded/_config.js rename to test/function/samples/deprecated/emit-chunk/modules-loaded/_config.js index 1baeb21d1d2..da093620bc8 100644 --- a/test/function/samples/emit-chunk/modules-loaded/_config.js +++ b/test/function/samples/deprecated/emit-chunk/modules-loaded/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'Throws when adding a chunk after the modules have finished loading', options: { + strictDeprecations: false, input: 'main.js', plugins: { name: 'test-plugin', @@ -12,7 +13,7 @@ module.exports = { error: { code: 'PLUGIN_ERROR', hook: 'buildEnd', - message: 'Cannot call emitChunk after module loading has finished.', + message: 'Cannot emit chunks after module loading has finished.', plugin: 'test-plugin', pluginCode: 'INVALID_ROLLUP_PHASE' } diff --git a/test/function/samples/emit-chunk/modules-loaded/chunk.js b/test/function/samples/deprecated/emit-chunk/modules-loaded/chunk.js similarity index 100% rename from test/function/samples/emit-chunk/modules-loaded/chunk.js rename to test/function/samples/deprecated/emit-chunk/modules-loaded/chunk.js diff --git a/test/function/samples/emit-chunk/modules-loaded/main.js b/test/function/samples/deprecated/emit-chunk/modules-loaded/main.js similarity index 100% rename from test/function/samples/emit-chunk/modules-loaded/main.js rename to test/function/samples/deprecated/emit-chunk/modules-loaded/main.js diff --git a/test/function/samples/emit-chunk/no-input/_config.js b/test/function/samples/deprecated/emit-chunk/no-input/_config.js similarity index 89% rename from test/function/samples/emit-chunk/no-input/_config.js rename to test/function/samples/deprecated/emit-chunk/no-input/_config.js index ec7d2de6ece..6b66a172055 100644 --- a/test/function/samples/emit-chunk/no-input/_config.js +++ b/test/function/samples/deprecated/emit-chunk/no-input/_config.js @@ -1,6 +1,7 @@ module.exports = { description: 'It is not necessary to provide an input if a dynamic entry is emitted', options: { + strictDeprecations: false, input: undefined, plugins: { name: 'test-plugin', diff --git a/test/function/samples/emit-chunk/no-input/chunk.js b/test/function/samples/deprecated/emit-chunk/no-input/chunk.js similarity index 100% rename from test/function/samples/emit-chunk/no-input/chunk.js rename to test/function/samples/deprecated/emit-chunk/no-input/chunk.js diff --git a/test/function/samples/deprecations/ROLLUP_CHUNK_URL/_config.js b/test/function/samples/deprecations/ROLLUP_CHUNK_URL/_config.js new file mode 100644 index 00000000000..eac2bdb901b --- /dev/null +++ b/test/function/samples/deprecations/ROLLUP_CHUNK_URL/_config.js @@ -0,0 +1,26 @@ +module.exports = { + description: 'marks ROLLUP_CHUNK_URL as deprecated', + options: { + plugins: { + resolveId(id) { + if (id === 'chunk') { + return id; + } + }, + load(id) { + if (id === 'chunk') { + return "console.log('chunk')"; + } + return `export default import.meta.ROLLUP_CHUNK_URL_${this.emitFile({ + type: 'chunk', + id: 'chunk' + })};`; + } + } + }, + generateError: { + code: 'DEPRECATED_FEATURE', + message: + 'Using the "ROLLUP_CHUNK_URL_" prefix to reference files is deprecated. Use the "ROLLUP_FILE_URL_" prefix instead.' + } +}; diff --git a/test/function/samples/deprecations/ROLLUP_CHUNK_URL/main.js b/test/function/samples/deprecations/ROLLUP_CHUNK_URL/main.js new file mode 100644 index 00000000000..f8a2d88d245 --- /dev/null +++ b/test/function/samples/deprecations/ROLLUP_CHUNK_URL/main.js @@ -0,0 +1,11 @@ +const foo = {}; + +function doIt(x) { + if (foo[x]) { + return true; + } + foo[x] = true; +} + +doIt('x'); +assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/this-emitChunk/_config.js b/test/function/samples/deprecations/this-emitChunk/_config.js new file mode 100644 index 00000000000..207a79446f1 --- /dev/null +++ b/test/function/samples/deprecations/this-emitChunk/_config.js @@ -0,0 +1,17 @@ +module.exports = { + description: 'marks this.emitChunk as deprecated', + options: { + plugins: { + buildStart() { + this.emitChunk('chunk'); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: `The "this.emitChunk" plugin context function used by plugin at position 1 is deprecated. The "this.emitFile" plugin context function should be used instead.`, + plugin: 'at position 1', + pluginCode: 'DEPRECATED_FEATURE' + } +}; diff --git a/test/function/samples/deprecations/this-emitChunk/main.js b/test/function/samples/deprecations/this-emitChunk/main.js new file mode 100644 index 00000000000..f8a2d88d245 --- /dev/null +++ b/test/function/samples/deprecations/this-emitChunk/main.js @@ -0,0 +1,11 @@ +const foo = {}; + +function doIt(x) { + if (foo[x]) { + return true; + } + foo[x] = true; +} + +doIt('x'); +assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/deprecations/this-getAssetFileName/_config.js b/test/function/samples/deprecations/this-getAssetFileName/_config.js index 0be981440db..85f86ebcdd2 100644 --- a/test/function/samples/deprecations/this-getAssetFileName/_config.js +++ b/test/function/samples/deprecations/this-getAssetFileName/_config.js @@ -1,5 +1,5 @@ module.exports = { - description: 'marks this.emitAsset as deprecated', + description: 'marks this.getAssetFileName as deprecated', options: { plugins: { renderChunk() { diff --git a/test/function/samples/deprecations/this-getChunkFileName/_config.js b/test/function/samples/deprecations/this-getChunkFileName/_config.js new file mode 100644 index 00000000000..641cde735ea --- /dev/null +++ b/test/function/samples/deprecations/this-getChunkFileName/_config.js @@ -0,0 +1,23 @@ +let chunkReferenceId; + +module.exports = { + description: 'marks this.getChunkFileName as deprecated', + options: { + plugins: { + buildStart() { + chunkReferenceId = this.emitFile({ type: 'chunk', id: 'chunk' }); + }, + renderChunk() { + this.getChunkFileName(chunkReferenceId); + } + } + }, + generateError: { + code: 'PLUGIN_ERROR', + hook: 'renderChunk', + message: + 'The "this.getChunkFileName" plugin context function used by plugin at position 1 is deprecated. The "this.getFileName" plugin context function should be used instead.', + plugin: 'at position 1', + pluginCode: 'DEPRECATED_FEATURE' + } +}; diff --git a/test/function/samples/deprecations/this-getChunkFileName/chunk.js b/test/function/samples/deprecations/this-getChunkFileName/chunk.js new file mode 100644 index 00000000000..820c7c052bc --- /dev/null +++ b/test/function/samples/deprecations/this-getChunkFileName/chunk.js @@ -0,0 +1 @@ +assert.equal(1, 1); diff --git a/test/function/samples/deprecations/this-getChunkFileName/main.js b/test/function/samples/deprecations/this-getChunkFileName/main.js new file mode 100644 index 00000000000..f8a2d88d245 --- /dev/null +++ b/test/function/samples/deprecations/this-getChunkFileName/main.js @@ -0,0 +1,11 @@ +const foo = {}; + +function doIt(x) { + if (foo[x]) { + return true; + } + foo[x] = true; +} + +doIt('x'); +assert.ok(doIt('x'), 'foo was not reassigned'); diff --git a/test/function/samples/emit-file/chunk-filename-not-available/_config.js b/test/function/samples/emit-file/chunk-filename-not-available/_config.js new file mode 100644 index 00000000000..2575784f8d7 --- /dev/null +++ b/test/function/samples/emit-file/chunk-filename-not-available/_config.js @@ -0,0 +1,21 @@ +module.exports = { + description: 'Throws when accessing the filename before it has been generated', + options: { + input: 'main.js', + plugins: { + name: 'test-plugin', + buildStart() { + const chunkId = this.emitFile({ type: 'chunk', id: 'chunk.js' }); + this.getFileName(chunkId); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: + 'Plugin error - Unable to get file name for chunk "chunk.js". Ensure that generate is called first.', + plugin: 'test-plugin', + pluginCode: 'CHUNK_NOT_GENERATED' + } +}; diff --git a/test/function/samples/emit-file/chunk-filename-not-available/chunk.js b/test/function/samples/emit-file/chunk-filename-not-available/chunk.js new file mode 100644 index 00000000000..36b1d61dd25 --- /dev/null +++ b/test/function/samples/emit-file/chunk-filename-not-available/chunk.js @@ -0,0 +1 @@ +console.log('chunk'); diff --git a/test/function/samples/emit-file/chunk-filename-not-available/main.js b/test/function/samples/emit-file/chunk-filename-not-available/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/function/samples/emit-file/chunk-filename-not-available/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/function/samples/emit-file/chunk-not-found/_config.js b/test/function/samples/emit-file/chunk-not-found/_config.js new file mode 100644 index 00000000000..ef5735fe5a7 --- /dev/null +++ b/test/function/samples/emit-file/chunk-not-found/_config.js @@ -0,0 +1,15 @@ +module.exports = { + description: 'Throws if an emitted entry chunk cannot be resolved', + options: { + input: 'main.js', + plugins: { + buildStart() { + this.emitFile({ type: 'chunk', id: 'not-found.js' }); + } + } + }, + error: { + code: 'UNRESOLVED_ENTRY', + message: 'Could not resolve entry module (not-found.js).' + } +}; diff --git a/test/function/samples/emit-file/chunk-not-found/main.js b/test/function/samples/emit-file/chunk-not-found/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/function/samples/emit-file/chunk-not-found/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/function/samples/emit-file/invalid-asset-id/_config.js b/test/function/samples/emit-file/invalid-file-id/_config.js similarity index 54% rename from test/function/samples/emit-file/invalid-asset-id/_config.js rename to test/function/samples/emit-file/invalid-file-id/_config.js index 3ff40dfdcdb..7325c5713bc 100644 --- a/test/function/samples/emit-file/invalid-asset-id/_config.js +++ b/test/function/samples/emit-file/invalid-file-id/_config.js @@ -1,5 +1,5 @@ module.exports = { - description: 'throws for invalid asset ids', + description: 'throws for invalid file ids', options: { plugins: { name: 'test-plugin', @@ -9,7 +9,7 @@ module.exports = { } }, generateError: { - code: 'ASSET_NOT_FOUND', - message: 'Plugin error - Unable to get file name for unknown asset "invalid".' + code: 'FILE_NOT_FOUND', + message: 'Plugin error - Unable to get file name for unknown file "invalid".' } }; diff --git a/test/function/samples/emit-file/invalid-asset-id/main.js b/test/function/samples/emit-file/invalid-file-id/main.js similarity index 100% rename from test/function/samples/emit-file/invalid-asset-id/main.js rename to test/function/samples/emit-file/invalid-file-id/main.js diff --git a/test/function/samples/emit-file/modules-loaded/_config.js b/test/function/samples/emit-file/modules-loaded/_config.js new file mode 100644 index 00000000000..3cd01bfcd83 --- /dev/null +++ b/test/function/samples/emit-file/modules-loaded/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'Throws when adding a chunk after the modules have finished loading', + options: { + input: 'main.js', + plugins: { + name: 'test-plugin', + buildEnd() { + this.emitFile({ type: 'chunk', id: 'chunk.js' }); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildEnd', + message: 'Cannot emit chunks after module loading has finished.', + plugin: 'test-plugin', + pluginCode: 'INVALID_ROLLUP_PHASE' + } +}; diff --git a/test/function/samples/emit-file/modules-loaded/chunk.js b/test/function/samples/emit-file/modules-loaded/chunk.js new file mode 100644 index 00000000000..a9244a453fb --- /dev/null +++ b/test/function/samples/emit-file/modules-loaded/chunk.js @@ -0,0 +1 @@ +throw new Error('Not executed'); diff --git a/test/function/samples/emit-file/modules-loaded/main.js b/test/function/samples/emit-file/modules-loaded/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/function/samples/emit-file/modules-loaded/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/function/samples/emit-file/no-input/_config.js b/test/function/samples/emit-file/no-input/_config.js new file mode 100644 index 00000000000..c35eb800405 --- /dev/null +++ b/test/function/samples/emit-file/no-input/_config.js @@ -0,0 +1,12 @@ +module.exports = { + description: 'It is not necessary to provide an input if a dynamic entry is emitted', + options: { + input: undefined, + plugins: { + name: 'test-plugin', + buildStart() { + this.emitFile({ type: 'chunk', id: 'chunk.js' }); + } + } + } +}; diff --git a/test/function/samples/emit-file/no-input/chunk.js b/test/function/samples/emit-file/no-input/chunk.js new file mode 100644 index 00000000000..c40c320ba58 --- /dev/null +++ b/test/function/samples/emit-file/no-input/chunk.js @@ -0,0 +1 @@ +assert.equal(42, 42); From f5ad4b13f357001833eec7ab49e6f699210c0004 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sat, 13 Jul 2019 11:14:35 +0200 Subject: [PATCH 09/31] Allow emitting files with fixed names --- src/rollup/types.d.ts | 3 +- src/utils/FileEmitter.ts | 102 +++++++++++------- src/utils/error.ts | 1 + src/utils/relativeId.ts | 10 +- src/utils/renderNamePattern.ts | 6 +- .../emits-files-from-various-hooks/_config.js | 21 ++++ .../_expected/amd/custom/banner.txt | 1 + .../_expected/amd/custom/buildEnd.txt | 1 + .../_expected/amd/custom/buildStart.txt | 1 + .../_expected/amd/custom/footer.txt | 1 + .../_expected/amd/custom/generateBundle.txt | 1 + .../_expected/amd/custom/intro.txt | 1 + .../_expected/amd/custom/load.txt | 1 + .../_expected/amd/custom/outputOptions.txt | 1 + .../_expected/amd/custom/outro.txt | 1 + .../_expected/amd/custom/renderChunk.txt | 1 + .../_expected/amd/custom/renderStart.txt | 1 + .../_expected/amd/custom/resolveId.txt | 1 + .../_expected/amd/custom/transform.txt | 1 + .../_expected/cjs/custom/banner.txt | 1 + .../_expected/cjs/custom/buildEnd.txt | 1 + .../_expected/cjs/custom/buildStart.txt | 1 + .../_expected/cjs/custom/footer.txt | 1 + .../_expected/cjs/custom/generateBundle.txt | 1 + .../_expected/cjs/custom/intro.txt | 1 + .../_expected/cjs/custom/load.txt | 1 + .../_expected/cjs/custom/outputOptions.txt | 1 + .../_expected/cjs/custom/outro.txt | 1 + .../_expected/cjs/custom/renderChunk.txt | 1 + .../_expected/cjs/custom/renderStart.txt | 1 + .../_expected/cjs/custom/resolveId.txt | 1 + .../_expected/cjs/custom/transform.txt | 1 + .../_expected/es/custom/banner.txt | 1 + .../_expected/es/custom/buildEnd.txt | 1 + .../_expected/es/custom/buildStart.txt | 1 + .../_expected/es/custom/footer.txt | 1 + .../_expected/es/custom/generateBundle.txt | 1 + .../_expected/es/custom/intro.txt | 1 + .../_expected/es/custom/load.txt | 1 + .../_expected/es/custom/outputOptions.txt | 1 + .../_expected/es/custom/outro.txt | 1 + .../_expected/es/custom/renderChunk.txt | 1 + .../_expected/es/custom/renderStart.txt | 1 + .../_expected/es/custom/resolveId.txt | 1 + .../_expected/es/custom/transform.txt | 1 + .../_expected/system/custom/banner.txt | 1 + .../_expected/system/custom/buildEnd.txt | 1 + .../_expected/system/custom/buildStart.txt | 1 + .../_expected/system/custom/footer.txt | 1 + .../system/custom/generateBundle.txt | 1 + .../_expected/system/custom/intro.txt | 1 + .../_expected/system/custom/load.txt | 1 + .../_expected/system/custom/outputOptions.txt | 1 + .../_expected/system/custom/outro.txt | 1 + .../_expected/system/custom/renderChunk.txt | 1 + .../_expected/system/custom/renderStart.txt | 1 + .../_expected/system/custom/resolveId.txt | 1 + .../_expected/system/custom/transform.txt | 1 + 58 files changed, 150 insertions(+), 45 deletions(-) create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/banner.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildEnd.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildStart.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/footer.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/generateBundle.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/intro.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/load.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outputOptions.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outro.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderChunk.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderStart.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/resolveId.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/transform.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/banner.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildEnd.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildStart.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/footer.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/generateBundle.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/intro.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/load.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outputOptions.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outro.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderChunk.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderStart.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/resolveId.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/transform.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/banner.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildEnd.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildStart.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/footer.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/generateBundle.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/intro.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/load.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outputOptions.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outro.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderChunk.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderStart.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/resolveId.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/transform.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/banner.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildEnd.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildStart.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/footer.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/generateBundle.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/intro.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/load.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outputOptions.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outro.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderChunk.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderStart.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/resolveId.txt create mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/transform.txt diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 8b2b0a7ba07..abca3ddbd4d 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -129,7 +129,8 @@ export interface MinimalPluginContext { // TODO Lukas can there be interactions in names between multiple outputs? // TODO Lukas can we make "name" optional to align the interfaces? export interface EmittedAsset { - name: string; + fileName?: string; + name?: string; source?: string | Buffer; type: 'asset'; } diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index 0aa9c41ab80..b62e304e97d 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -18,16 +18,13 @@ import { } from './error'; import { extname } from './path'; import { addWithNewReferenceId } from './referenceIds'; -import { isPlainName } from './relativeId'; +import { isPlainPathFragment } from './relativeId'; import { makeUnique, renderNamePattern } from './renderNamePattern'; // TODO Lukas setAssetSource in transform needs to be repeated as well // TODO Lukas use EmittedFile and ConsumedEmittedFile types? interface OutputSpecificFileData { assetFileNames: string; - // TODO Lukas instead of this map and relying on references, how about replacing the emitted file in - // this.filesByReferenceId? - assignedFileNames: Map; bundle: OutputBundle; } @@ -59,13 +56,11 @@ function getAssetFileName( ); } -type EmittedAssetWithSource = EmittedAsset & { source: string | Buffer }; +type CompleteAsset = ConsumedAsset & { fileName: string; source: string | Buffer }; -function addAssetToBundle(asset: EmittedAssetWithSource, output: OutputSpecificFileData) { - const fileName = getAssetFileName(asset.name, asset.source, output); - output.assignedFileNames.set(asset, fileName); - output.bundle[fileName] = { - fileName, +function addAssetToBundle(asset: CompleteAsset, output: OutputSpecificFileData) { + output.bundle[asset.fileName] = { + fileName: asset.fileName, isAsset: true, source: asset.source }; @@ -77,12 +72,20 @@ interface ConsumedChunk { type: 'chunk'; } -type ConsumedFile = ConsumedChunk | EmittedAsset; +interface ConsumedAsset { + fileName: string | undefined; + name: string | undefined; + source: string | Buffer | undefined; + type: 'asset'; +} + +type ConsumedFile = ConsumedChunk | ConsumedAsset; // TODO Lukas general assumption: Having a source means having a reliable filename // TODO Lukas only access filename during generate? Or disallow setSource if there is a fileName? +// TODO Lukas convert all "throw" into proper errors export class FileEmitter { - private filesByReferenceId: Map = new Map(); + private filesByReferenceId = new Map(); // tslint:disable member-ordering private buildFilesByReferenceId = this.filesByReferenceId; private graph: Graph; @@ -99,7 +102,6 @@ export class FileEmitter { return this.emitAsset(emittedFile); case 'chunk': return this.emitChunk(emittedFile); - // TODO Lukas make proper error and test default: throw new Error(`Unhandled file type ${(emittedFile as any).type}`); } @@ -107,13 +109,40 @@ export class FileEmitter { private emitAsset(asset: EmittedAsset): string { // TODO Lukas this could become shared validation - if (typeof asset.name !== 'string' || !isPlainName(asset.name)) { - return error(errInvalidAssetName(asset.name)); + // TODO Lukas test validations + if ('fileName' in asset) { + if ('name' in asset) { + throw new Error('Cannot use both name and fileName'); + } + if (typeof asset.fileName !== 'string' || !isPlainPathFragment(asset.fileName)) { + throw new Error('Asset fileName must be non-relative, non-absolute path'); + } + } else if ('name' in asset) { + if (typeof asset.name !== 'string' || !isPlainPathFragment(asset.name)) { + return error(errInvalidAssetName(asset.name as string)); + } } + const consumedAsset: ConsumedAsset = { + fileName: asset.fileName, + name: asset.name, + source: asset.source, + type: 'asset' + }; if (this.output && asset.source !== undefined) { - addAssetToBundle(asset as EmittedAssetWithSource, this.output); + if (typeof consumedAsset.fileName !== 'string') { + consumedAsset.fileName = getAssetFileName( + consumedAsset.name || 'asset', + asset.source, + this.output + ); + } + addAssetToBundle(consumedAsset as CompleteAsset, this.output); } - return addWithNewReferenceId(asset, this.filesByReferenceId, asset.name); + return addWithNewReferenceId( + consumedAsset, + this.filesByReferenceId, + asset.fileName || asset.name || asset.type + ); } private emitChunk(chunk: EmittedChunk): string { @@ -139,9 +168,9 @@ export class FileEmitter { } public finaliseAssets() { - for (const emittedFile of this.filesByReferenceId.values()) { - if (emittedFile.type === 'asset' && emittedFile.source === undefined) - error(errNoAssetSourceSet(emittedFile.name)); + for (const [referenceId, emittedFile] of this.filesByReferenceId.entries()) { + if (emittedFile.type === 'asset' && typeof emittedFile.fileName !== 'string') + error(errNoAssetSourceSet(emittedFile.name || referenceId)); } } @@ -150,16 +179,10 @@ export class FileEmitter { if (!emittedFile) return error(errFileReferenceIdNotFoundForFilename(fileReferenceId)); switch (emittedFile.type) { case 'asset': { - // TODO Lukas and there is no pre-assigned name - if (!this.output) { - // TODO Lukas proper error - throw new Error('Cannot get file name during build phase'); - } - const fileName = this.output.assignedFileNames.get(emittedFile); - if (typeof fileName !== 'string') { - return error(errAssetNotFinalisedForFileName(emittedFile.name)); + if (typeof emittedFile.fileName !== 'string') { + return error(errAssetNotFinalisedForFileName(emittedFile.name || fileReferenceId)); } - return fileName; + return emittedFile.fileName; } case 'chunk': { const fileName = @@ -179,16 +202,18 @@ export class FileEmitter { public setAssetSource = (fileReferenceId: string, source?: string | Buffer) => { const emittedFile = this.filesByReferenceId.get(fileReferenceId); if (!emittedFile) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); - // TODO Lukas refine error if (emittedFile.type !== 'asset') throw new Error('cannot set source for chunk'); - if (emittedFile.source !== undefined) return error(errAssetSourceAlreadySet(emittedFile.name)); + if (emittedFile.source !== undefined) + return error(errAssetSourceAlreadySet(emittedFile.name || fileReferenceId)); // TODO Lukas check for string | Buffer instead? if (typeof source !== 'string' && !source) { - return error(errAssetSourceMissingForSetSource(emittedFile.name)); + return error(errAssetSourceMissingForSetSource(emittedFile.name || fileReferenceId)); } if (this.output) { + const fileName = + emittedFile.fileName || getAssetFileName(emittedFile.name || 'asset', source, this.output); // We must not modify the original assets to not interact with other outputs - const assetWithSource = { ...emittedFile, source }; + const assetWithSource = { ...emittedFile, fileName, source }; this.filesByReferenceId.set(fileReferenceId, assetWithSource); addAssetToBundle(assetWithSource, this.output); } else { @@ -201,12 +226,17 @@ export class FileEmitter { this.filesByReferenceId = new Map(this.buildFilesByReferenceId); this.output = { assetFileNames, - assignedFileNames: new Map(), bundle: outputBundle }; - for (const emittedFile of this.filesByReferenceId.values()) { + for (const [referenceId, emittedFile] of this.filesByReferenceId.entries()) { if (emittedFile.type === 'asset' && emittedFile.source !== undefined) { - addAssetToBundle(emittedFile as EmittedAssetWithSource, this.output); + const fileName = + emittedFile.fileName || + getAssetFileName(emittedFile.name || 'asset', emittedFile.source, this.output); + // We must not modify the original assets to not interact with other outputs + const assetWithFileName = { ...emittedFile, fileName }; + this.filesByReferenceId.set(referenceId, assetWithFileName); + addAssetToBundle(assetWithFileName as CompleteAsset, this.output); } } } diff --git a/src/utils/error.ts b/src/utils/error.ts index 71782d2da41..a4c0472a2df 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -4,6 +4,7 @@ import { RollupError, RollupWarning } from '../rollup/types'; import getCodeFrame from './getCodeFrame'; import relativeId from './relativeId'; +// TODO Lukas check for unused errors when done export function error(base: Error | RollupError, props?: RollupError): never { if (base instanceof Error === false) base = Object.assign(new Error(base.message), base); if (props) Object.assign(base, props); diff --git a/src/utils/relativeId.ts b/src/utils/relativeId.ts index 56c0160d860..ed04e10a5d9 100644 --- a/src/utils/relativeId.ts +++ b/src/utils/relativeId.ts @@ -10,10 +10,10 @@ export default function relativeId(id: string) { return relative(process.cwd(), id); } -export function isPlainName(name: string) { - // not starting with "./", "/". "../" - return !( - name[0] === '/' || - (name[1] === '.' && (name[2] === '/' || (name[2] === '.' && name[3] === '/'))) +export function isPlainPathFragment(name: string) { + // not starting with "/", "./", "../" + return ( + name[0] !== '/' && + !(name[0] === '.' && (name[1] === '/' || (name[1] === '.' && name[2] === '/'))) ); } diff --git a/src/utils/renderNamePattern.ts b/src/utils/renderNamePattern.ts index 12e14666b83..d4c35e0929b 100644 --- a/src/utils/renderNamePattern.ts +++ b/src/utils/renderNamePattern.ts @@ -1,13 +1,13 @@ import { error } from './error'; import { extname } from './path'; -import { isPlainName } from './relativeId'; +import { isPlainPathFragment } from './relativeId'; export function renderNamePattern( pattern: string, patternName: string, getReplacement: (name: string) => string ) { - if (!isPlainName(pattern)) + if (!isPlainPathFragment(pattern)) error({ code: 'INVALID_PATTERN', message: `Invalid output pattern "${pattern}" for ${patternName}, cannot be an absolute or relative URL or path.` @@ -19,7 +19,7 @@ export function renderNamePattern( code: 'INVALID_PATTERN_REPLACEMENT', message: `"${type}" is not a valid substitution name in output option ${patternName} pattern.` }); - if (!isPlainName(replacement)) + if (!isPlainPathFragment(replacement)) error({ code: 'INVALID_PATTERN_REPLACEMENT', message: `Invalid replacement "${replacement}" for "${type}" in ${patternName} pattern, must be a plain path name.` diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js index 79de2d6fa37..d97d5937918 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js @@ -5,42 +5,63 @@ module.exports = { plugins: { buildStart() { this.emitFile({ type: 'asset', name: 'buildStart.txt', source: 'buildStart' }); + this.emitFile({ type: 'asset', fileName: 'custom/buildStart.txt', source: 'buildStart' }); }, resolveId() { this.emitFile({ type: 'asset', name: 'resolveId.txt', source: 'resolveId' }); + this.emitFile({ type: 'asset', fileName: 'custom/resolveId.txt', source: 'resolveId' }); }, load() { this.emitFile({ type: 'asset', name: 'load.txt', source: 'load' }); + this.emitFile({ type: 'asset', fileName: 'custom/load.txt', source: 'load' }); }, transform() { this.emitFile({ type: 'asset', name: 'transform.txt', source: 'transform' }); + this.emitFile({ type: 'asset', fileName: 'custom/transform.txt', source: 'transform' }); }, buildEnd() { this.emitFile({ type: 'asset', name: 'buildEnd.txt', source: 'buildEnd' }); + this.emitFile({ type: 'asset', fileName: 'custom/buildEnd.txt', source: 'buildEnd' }); }, outputOptions() { this.emitFile({ type: 'asset', name: 'outputOptions.txt', source: 'outputOptions' }); + this.emitFile({ + type: 'asset', + fileName: 'custom/outputOptions.txt', + source: 'outputOptions' + }); }, renderStart() { this.emitFile({ type: 'asset', name: 'renderStart.txt', source: 'renderStart' }); + this.emitFile({ type: 'asset', fileName: 'custom/renderStart.txt', source: 'renderStart' }); }, banner() { this.emitFile({ type: 'asset', name: 'banner.txt', source: 'banner' }); + this.emitFile({ type: 'asset', fileName: 'custom/banner.txt', source: 'banner' }); }, footer() { this.emitFile({ type: 'asset', name: 'footer.txt', source: 'footer' }); + this.emitFile({ type: 'asset', fileName: 'custom/footer.txt', source: 'footer' }); }, intro() { this.emitFile({ type: 'asset', name: 'intro.txt', source: 'intro' }); + this.emitFile({ type: 'asset', fileName: 'custom/intro.txt', source: 'intro' }); }, outro() { this.emitFile({ type: 'asset', name: 'outro.txt', source: 'outro' }); + this.emitFile({ type: 'asset', fileName: 'custom/outro.txt', source: 'outro' }); }, renderChunk() { this.emitFile({ type: 'asset', name: 'renderChunk.txt', source: 'renderChunk' }); + this.emitFile({ type: 'asset', fileName: 'custom/renderChunk.txt', source: 'renderChunk' }); }, generateBundle() { this.emitFile({ type: 'asset', name: 'generateBundle.txt', source: 'generateBundle' }); + this.emitFile({ + type: 'asset', + fileName: 'custom/generateBundle.txt', + source: 'generateBundle' + }); } } } diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/banner.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/banner.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/banner.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildEnd.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildEnd.txt new file mode 100644 index 00000000000..bbb07acb9fc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildEnd.txt @@ -0,0 +1 @@ +buildEnd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildStart.txt new file mode 100644 index 00000000000..0cb77258e0a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/buildStart.txt @@ -0,0 +1 @@ +buildStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/footer.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/footer.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/footer.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/generateBundle.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/generateBundle.txt new file mode 100644 index 00000000000..de472563b28 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/generateBundle.txt @@ -0,0 +1 @@ +generateBundle \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/intro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/intro.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/intro.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/load.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/load.txt new file mode 100644 index 00000000000..024e67c1f24 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/load.txt @@ -0,0 +1 @@ +load \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outputOptions.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outputOptions.txt new file mode 100644 index 00000000000..46a687a3cb2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outputOptions.txt @@ -0,0 +1 @@ +outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outro.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outro.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderChunk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderChunk.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderChunk.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderStart.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/renderStart.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/resolveId.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/resolveId.txt new file mode 100644 index 00000000000..53029113abd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/resolveId.txt @@ -0,0 +1 @@ +resolveId \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/transform.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/transform.txt new file mode 100644 index 00000000000..3f001116657 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/transform.txt @@ -0,0 +1 @@ +transform \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/banner.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/banner.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/banner.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildEnd.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildEnd.txt new file mode 100644 index 00000000000..bbb07acb9fc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildEnd.txt @@ -0,0 +1 @@ +buildEnd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildStart.txt new file mode 100644 index 00000000000..0cb77258e0a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/buildStart.txt @@ -0,0 +1 @@ +buildStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/footer.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/footer.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/footer.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/generateBundle.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/generateBundle.txt new file mode 100644 index 00000000000..de472563b28 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/generateBundle.txt @@ -0,0 +1 @@ +generateBundle \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/intro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/intro.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/intro.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/load.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/load.txt new file mode 100644 index 00000000000..024e67c1f24 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/load.txt @@ -0,0 +1 @@ +load \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outputOptions.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outputOptions.txt new file mode 100644 index 00000000000..46a687a3cb2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outputOptions.txt @@ -0,0 +1 @@ +outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outro.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outro.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderChunk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderChunk.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderChunk.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderStart.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/renderStart.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/resolveId.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/resolveId.txt new file mode 100644 index 00000000000..53029113abd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/resolveId.txt @@ -0,0 +1 @@ +resolveId \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/transform.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/transform.txt new file mode 100644 index 00000000000..3f001116657 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/transform.txt @@ -0,0 +1 @@ +transform \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/banner.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/banner.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/banner.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildEnd.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildEnd.txt new file mode 100644 index 00000000000..bbb07acb9fc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildEnd.txt @@ -0,0 +1 @@ +buildEnd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildStart.txt new file mode 100644 index 00000000000..0cb77258e0a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/buildStart.txt @@ -0,0 +1 @@ +buildStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/footer.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/footer.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/footer.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/generateBundle.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/generateBundle.txt new file mode 100644 index 00000000000..de472563b28 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/generateBundle.txt @@ -0,0 +1 @@ +generateBundle \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/intro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/intro.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/intro.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/load.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/load.txt new file mode 100644 index 00000000000..024e67c1f24 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/load.txt @@ -0,0 +1 @@ +load \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outputOptions.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outputOptions.txt new file mode 100644 index 00000000000..46a687a3cb2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outputOptions.txt @@ -0,0 +1 @@ +outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outro.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outro.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderChunk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderChunk.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderChunk.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderStart.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/renderStart.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/resolveId.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/resolveId.txt new file mode 100644 index 00000000000..53029113abd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/resolveId.txt @@ -0,0 +1 @@ +resolveId \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/transform.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/transform.txt new file mode 100644 index 00000000000..3f001116657 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/transform.txt @@ -0,0 +1 @@ +transform \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/banner.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/banner.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/banner.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildEnd.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildEnd.txt new file mode 100644 index 00000000000..bbb07acb9fc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildEnd.txt @@ -0,0 +1 @@ +buildEnd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildStart.txt new file mode 100644 index 00000000000..0cb77258e0a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/buildStart.txt @@ -0,0 +1 @@ +buildStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/footer.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/footer.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/footer.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/generateBundle.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/generateBundle.txt new file mode 100644 index 00000000000..de472563b28 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/generateBundle.txt @@ -0,0 +1 @@ +generateBundle \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/intro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/intro.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/intro.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/load.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/load.txt new file mode 100644 index 00000000000..024e67c1f24 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/load.txt @@ -0,0 +1 @@ +load \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outputOptions.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outputOptions.txt new file mode 100644 index 00000000000..46a687a3cb2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outputOptions.txt @@ -0,0 +1 @@ +outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outro.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outro.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outro.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderChunk.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderChunk.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderChunk.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderStart.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderStart.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/renderStart.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/resolveId.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/resolveId.txt new file mode 100644 index 00000000000..53029113abd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/resolveId.txt @@ -0,0 +1 @@ +resolveId \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/transform.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/transform.txt new file mode 100644 index 00000000000..3f001116657 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/transform.txt @@ -0,0 +1 @@ +transform \ No newline at end of file From 1b2521680f70be84672876155f4723b360d98b23 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sat, 13 Jul 2019 11:33:21 +0200 Subject: [PATCH 10/31] Support unnamed assets --- src/rollup/types.d.ts | 1 - .../emit-file/emit-asset-without-name/_config.js | 11 +++++++++++ .../_expected/amd/assets/asset-417c0188 | 1 + .../emit-asset-without-name/_expected/amd/main.js | 5 +++++ .../_expected/cjs/assets/asset-417c0188 | 1 + .../emit-asset-without-name/_expected/cjs/main.js | 3 +++ .../_expected/es/assets/asset-417c0188 | 1 + .../emit-asset-without-name/_expected/es/main.js | 1 + .../_expected/system/assets/asset-417c0188 | 1 + .../emit-asset-without-name/_expected/system/main.js | 10 ++++++++++ .../samples/emit-file/emit-asset-without-name/main.js | 1 + 11 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/_config.js create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-417c0188 create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-417c0188 create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-417c0188 create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-417c0188 create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-asset-without-name/main.js diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index abca3ddbd4d..c3f558fd3f8 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -127,7 +127,6 @@ export interface MinimalPluginContext { // TODO Lukas do not forget caching tests for files // TODO Lukas can there be interactions in names between multiple outputs? -// TODO Lukas can we make "name" optional to align the interfaces? export interface EmittedAsset { fileName?: string; name?: string; diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_config.js b/test/chunking-form/samples/emit-file/emit-asset-without-name/_config.js new file mode 100644 index 00000000000..94cd5b89b47 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/_config.js @@ -0,0 +1,11 @@ +module.exports = { + description: 'supports emitting an asset without a name', + options: { + input: ['main.js'], + plugins: { + buildStart() { + this.emitFile({ type: 'asset', source: 'hello world' }); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-417c0188 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-417c0188 new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/assets/asset-417c0188 @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/main.js new file mode 100644 index 00000000000..126aa22ee83 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main'); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-417c0188 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-417c0188 new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/assets/asset-417c0188 @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/main.js new file mode 100644 index 00000000000..d0ed06d8c90 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/cjs/main.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-417c0188 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-417c0188 new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/assets/asset-417c0188 @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/es/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-417c0188 b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-417c0188 new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/assets/asset-417c0188 @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/main.js new file mode 100644 index 00000000000..c83499bc2d4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/_expected/system/main.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('main'); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-asset-without-name/main.js b/test/chunking-form/samples/emit-file/emit-asset-without-name/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-asset-without-name/main.js @@ -0,0 +1 @@ +console.log('main'); From e027bbd825b261e44634a8f17998e24d3f1d49ea Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 17 Jul 2019 08:41:01 +0200 Subject: [PATCH 11/31] Improve chunk name assignment --- src/ModuleLoader.ts | 44 +++++++------------ .../emit-chunk-name-conflict/_config.js | 31 +++++++++++++ .../_expected/amd/generated-name.js | 7 +++ .../_expected/amd/generated-name2.js | 7 +++ .../_expected/amd/generated-secondName.js | 7 +++ .../_expected/amd/other.js | 5 +++ .../_expected/cjs/generated-name.js | 5 +++ .../_expected/cjs/generated-name2.js | 5 +++ .../_expected/cjs/generated-secondName.js | 5 +++ .../_expected/cjs/other.js | 7 +++ .../_expected/es/generated-name.js | 3 ++ .../_expected/es/generated-name2.js | 3 ++ .../_expected/es/generated-secondName.js | 3 ++ .../_expected/es/other.js | 5 +++ .../_expected/system/generated-name.js | 10 +++++ .../_expected/system/generated-name2.js | 10 +++++ .../_expected/system/generated-secondName.js | 10 +++++ .../_expected/system/other.js | 16 +++++++ .../emit-chunk-name-conflict/dep1.js | 1 + .../emit-chunk-name-conflict/dep2.js | 1 + .../emit-chunk-name-conflict/dep3.js | 1 + .../emit-chunk-name-conflict/main.js | 5 +++ 22 files changed, 163 insertions(+), 28 deletions(-) create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_config.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name2.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-secondName.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/other.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name2.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-secondName.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/other.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-secondName.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/other.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name2.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-secondName.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep1.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep2.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep3.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/main.js diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index 324d2d7aefe..f079b06f52e 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -36,10 +36,6 @@ export interface UnresolvedModuleWithAlias { unresolvedId: string; } -interface UnresolvedEntryModuleWithAlias extends UnresolvedModuleWithAlias { - manualChunkAlias?: string; -} - function normalizeRelativeExternalId(importer: string, source: string) { return isRelative(source) ? resolve(importer, '..', source) : source; } @@ -132,8 +128,13 @@ export class ModuleLoader { newEntryModules: Module[]; }> { const loadNewEntryModulesPromise = Promise.all( - unresolvedEntryModules.map(unresolvedEntryModule => - this.loadEntryModule(unresolvedEntryModule, true) + unresolvedEntryModules.map(({ alias, unresolvedId }) => + this.loadEntryModule(unresolvedId, true).then(module => { + if (alias !== null && (module.chunkAlias === null || isUserDefined)) { + module.chunkAlias = alias; + } + return module; + }) ) ).then(entryModules => { for (const entryModule of entryModules) { @@ -153,21 +154,19 @@ export class ModuleLoader { } addManualChunks(manualChunks: Record): Promise { - const unresolvedManualChunks: UnresolvedEntryModuleWithAlias[] = []; + const unresolvedManualChunks: { manualChunkAlias: string; unresolvedId: string }[] = []; for (const alias of Object.keys(manualChunks)) { const manualChunkIds = manualChunks[alias]; for (const unresolvedId of manualChunkIds) { - unresolvedManualChunks.push({ alias: null, unresolvedId, manualChunkAlias: alias }); + unresolvedManualChunks.push({ unresolvedId, manualChunkAlias: alias }); } } const loadNewManualChunkModulesPromise = Promise.all( - unresolvedManualChunks.map(unresolvedManualChunk => - this.loadEntryModule(unresolvedManualChunk, false) - ) + unresolvedManualChunks.map(({ unresolvedId }) => this.loadEntryModule(unresolvedId, false)) ).then(manualChunkModules => { for (let index = 0; index < manualChunkModules.length; index++) { - this.addToManualChunk( - unresolvedManualChunks[index].manualChunkAlias as string, + this.addModuleToManualChunk( + unresolvedManualChunks[index].manualChunkAlias, manualChunkModules[index] ); } @@ -190,7 +189,7 @@ export class ModuleLoader { ); } - private addToManualChunk(alias: string, module: Module) { + private addModuleToManualChunk(alias: string, module: Module) { if (module.manualChunkAlias !== null && module.manualChunkAlias !== alias) { error(errCannotAssignModuleToChunk(module.id, alias, module.manualChunkAlias)); } @@ -266,7 +265,7 @@ export class ModuleLoader { this.modulesById.set(id, module); const manualChunkAlias = this.getManualChunk(id); if (typeof manualChunkAlias === 'string') { - this.addToManualChunk(manualChunkAlias, module); + this.addModuleToManualChunk(manualChunkAlias, module); } timeStart('load modules', 3); @@ -374,10 +373,7 @@ export class ModuleLoader { return resolvedId; } - private loadEntryModule = ( - { alias, unresolvedId }: UnresolvedModuleWithAlias, - isEntry: boolean - ): Promise => + private loadEntryModule = (unresolvedId: string, isEntry: boolean): Promise => this.pluginDriver.hookFirst('resolveId', [unresolvedId, undefined]).then(resolveIdResult => { if ( resolveIdResult === false || @@ -391,15 +387,7 @@ export class ModuleLoader { : resolveIdResult; if (typeof id === 'string') { - return this.fetchModule(id, undefined as any, true, isEntry).then(module => { - if (alias !== null) { - if (module.chunkAlias !== null && module.chunkAlias !== alias) { - return error(errCannotAssignModuleToChunk(module.id, alias, module.chunkAlias)); - } - module.chunkAlias = alias; - } - return module; - }); + return this.fetchModule(id, undefined as any, true, isEntry); } return error(errUnresolvedEntry(unresolvedId)); }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_config.js new file mode 100644 index 00000000000..3e7364fc039 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_config.js @@ -0,0 +1,31 @@ +module.exports = { + description: 'deduplicates named chunks emitted more than once', + options: { + // The last name is picked + input: { mainChunk: 'main', other: 'main' }, + plugins: { + buildStart() { + // The chunk is only emitted once + this.emitFile({ type: 'chunk', id: 'dep1', name: 'name' }); + this.emitFile({ type: 'chunk', id: 'dep1', name: 'name' }); + + // One of the suggested names is picked + this.emitFile({ type: 'chunk', id: 'dep2', name: 'firstName' }); + this.emitFile({ type: 'chunk', id: 'dep2', name: 'secondName' }); + + // Chunks with the same name are deduplicated + this.emitFile({ type: 'chunk', id: 'dep3', name: 'name' }); + + // Names for user defined chunks are not overridden + this.emitFile({ type: 'chunk', id: 'main', name: 'ignored' }); + }, + load(id) { + if (id.endsWith('main.js')) { + this.emitFile({ type: 'chunk', id: 'dep1', name: 'name' }); + this.emitFile({ type: 'chunk', id: 'dep2', name: 'thirdName' }); + this.emitFile({ type: 'chunk', id: 'main', name: 'ignored' }); + } + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name.js new file mode 100644 index 00000000000..eaec8503060 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name.js @@ -0,0 +1,7 @@ +define(function () { 'use strict'; + + var value1 = 42; + + return value1; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name2.js new file mode 100644 index 00000000000..ded9abf5ea1 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name2.js @@ -0,0 +1,7 @@ +define(function () { 'use strict'; + + var dep3 = 44; + + return dep3; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-secondName.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-secondName.js new file mode 100644 index 00000000000..e881e9cecbf --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-secondName.js @@ -0,0 +1,7 @@ +define(function () { 'use strict'; + + var value2 = 43; + + return value2; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/other.js new file mode 100644 index 00000000000..67a04c70451 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/other.js @@ -0,0 +1,5 @@ +define(['./generated-name', './generated-secondName', './generated-name2'], function (name, secondName, name$1) { 'use strict'; + + console.log('main', name, secondName, value3); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name.js new file mode 100644 index 00000000000..3ce0aaa325a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name.js @@ -0,0 +1,5 @@ +'use strict'; + +var value1 = 42; + +module.exports = value1; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name2.js new file mode 100644 index 00000000000..60d40fcff49 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name2.js @@ -0,0 +1,5 @@ +'use strict'; + +var dep3 = 44; + +module.exports = dep3; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-secondName.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-secondName.js new file mode 100644 index 00000000000..3cdfe4b5852 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-secondName.js @@ -0,0 +1,5 @@ +'use strict'; + +var value2 = 43; + +module.exports = value2; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/other.js new file mode 100644 index 00000000000..32f5b678894 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/other.js @@ -0,0 +1,7 @@ +'use strict'; + +var name = require('./generated-name.js'); +var secondName = require('./generated-secondName.js'); +require('./generated-name2.js'); + +console.log('main', name, secondName, value3); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name.js new file mode 100644 index 00000000000..6c5f12c4a68 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name.js @@ -0,0 +1,3 @@ +var value1 = 42; + +export default value1; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js new file mode 100644 index 00000000000..1c3876787dc --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js @@ -0,0 +1,3 @@ +var dep3 = 44; + +export default dep3; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-secondName.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-secondName.js new file mode 100644 index 00000000000..04479022dca --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-secondName.js @@ -0,0 +1,3 @@ +var value2 = 43; + +export default value2; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/other.js new file mode 100644 index 00000000000..5bd74327e11 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/other.js @@ -0,0 +1,5 @@ +import value1 from './generated-name.js'; +import value2 from './generated-secondName.js'; +import './generated-name2.js'; + +console.log('main', value1, value2, value3); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name.js new file mode 100644 index 00000000000..58e5c7ddbc3 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var value1 = exports('default', 42); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name2.js new file mode 100644 index 00000000000..957fb533335 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name2.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var dep3 = exports('default', 44); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-secondName.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-secondName.js new file mode 100644 index 00000000000..1dad12b0b48 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-secondName.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var value2 = exports('default', 43); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js new file mode 100644 index 00000000000..410be22f32b --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js @@ -0,0 +1,16 @@ +System.register(['./generated-name.js', './generated-secondName.js', './generated-name2.js'], function () { + 'use strict'; + var value1, value2; + return { + setters: [function (module) { + value1 = module.default; + }, function (module) { + value2 = module.default; + }, function () {}], + execute: function () { + + console.log('main', value1, value2, value3); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep1.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep1.js new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep1.js @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep2.js new file mode 100644 index 00000000000..8efc7299424 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep2.js @@ -0,0 +1 @@ +export default 43; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep3.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep3.js new file mode 100644 index 00000000000..8940fd86d41 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/dep3.js @@ -0,0 +1 @@ +export default 44; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/main.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/main.js new file mode 100644 index 00000000000..b56a46411e0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/main.js @@ -0,0 +1,5 @@ +import value1 from './dep1.js'; +import value2 from './dep2.js'; +import valu32 from './dep3.js'; + +console.log('main', value1, value2, value3); From 8216cfc19632a354cea53e0d3625fdd066ff39a9 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 19 Jul 2019 12:51:51 +0200 Subject: [PATCH 12/31] Initial support for chunk file names --- src/Chunk.ts | 48 ++++++++++++------- src/Graph.ts | 15 +++--- src/Module.ts | 3 +- src/ModuleLoader.ts | 38 ++++++++------- src/rollup/index.ts | 7 ++- src/rollup/types.d.ts | 1 + src/utils/FileEmitter.ts | 9 +++- src/utils/assignChunkIds.ts | 7 ++- .../emit-file/emit-named-chunk/_config.js | 21 ++++++++ .../_expected/amd/custom/build-start-chunk.js | 9 ++++ .../_expected/amd/generated-chunk.js | 7 +++ .../emit-named-chunk/_expected/amd/main.js | 5 ++ .../_expected/cjs/custom/build-start-chunk.js | 9 ++++ .../_expected/cjs/generated-chunk.js | 5 ++ .../emit-named-chunk/_expected/cjs/main.js | 6 +++ .../_expected/es/custom/build-start-chunk.js | 7 +++ .../_expected/es/generated-chunk.js | 3 ++ .../emit-named-chunk/_expected/es/main.js | 4 ++ .../system/custom/build-start-chunk.js | 16 +++++++ .../_expected/system/generated-chunk.js | 10 ++++ .../emit-named-chunk/_expected/system/main.js | 16 +++++++ .../emit-file/emit-named-chunk/buildStart.js | 5 ++ .../samples/emit-file/emit-named-chunk/dep.js | 1 + .../emit-file/emit-named-chunk/main.js | 4 ++ 24 files changed, 208 insertions(+), 48 deletions(-) create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_config.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/generated-chunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/dep.js create mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/main.js diff --git a/src/Chunk.ts b/src/Chunk.ts index f19fd9dd23e..9cebe1536a6 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -113,6 +113,7 @@ export default class Chunk { static generateFacade(graph: Graph, facadedModule: Module): Chunk { const chunk = new Chunk(graph, []); chunk.dependencies = [facadedModule.chunk as Chunk]; + // TODO Lukas also copy id if it exists? chunk.dynamicDependencies = []; chunk.facadeModule = facadedModule; facadedModule.facadeChunk = chunk; @@ -129,7 +130,7 @@ export default class Chunk { exportMode: 'none' | 'named' | 'default' = 'named'; facadeModule: Module | null = null; graph: Graph; - id: string = undefined as any; + id: string | null = null; indentString: string = undefined as any; isEmpty: boolean; manualChunkAlias: string | null = null; @@ -140,7 +141,7 @@ export default class Chunk { usedModules: Module[] = undefined as any; variableName: string; - private chunkName?: string; + private chunkName: string | null = null; private dependencies: (ExternalModule | Chunk)[] = undefined as any; private dynamicDependencies: (ExternalModule | Chunk)[] = undefined as any; private exportNames: { [name: string]: Variable } = Object.create(null); @@ -183,7 +184,10 @@ export default class Chunk { if (entryModule) { this.variableName = makeLegal( basename( - entryModule.chunkAlias || entryModule.manualChunkAlias || getAliasName(entryModule.id) + (entryModule.chunkFileName && getAliasName(entryModule.chunkFileName)) || + entryModule.chunkName || + entryModule.manualChunkAlias || + getAliasName(entryModule.id) ) ); } else { @@ -213,7 +217,7 @@ export default class Chunk { const exportNamesByVariable = module.getExportNamesByVariable(); if ( this.graph.preserveModules || - this.canModuleBeFacade(exportNamesByVariable, module.chunkAlias) + this.canModuleBeFacade(exportNamesByVariable, module.chunkName) ) { this.facadeModule = module; for (const [variable, exportNames] of exportNamesByVariable) { @@ -235,8 +239,8 @@ export default class Chunk { addons: Addons, options: OutputOptions, existingNames: Record - ) { - this.id = makeUnique( + ): string { + return makeUnique( renderNamePattern(pattern, patternName, type => { switch (type) { case 'format': @@ -255,9 +259,9 @@ export default class Chunk { generateIdPreserveModules( preserveModulesRelativeDir: string, existingNames: Record - ) { + ): string { const sanitizedId = sanitizeFileName(this.orderedModules[0].id); - this.id = makeUnique( + return makeUnique( normalize( isAbsolute(this.orderedModules[0].id) ? relative(preserveModulesRelativeDir, sanitizedId) @@ -304,11 +308,12 @@ export default class Chunk { } getChunkName(): string { + // TODO Lukas this.chunkName should be set to the id if a filename is provided, test return this.chunkName || (this.chunkName = this.computeChunkName()); } getDynamicImportIds(): string[] { - return this.dynamicDependencies.map(chunk => chunk.id).filter(Boolean); + return this.dynamicDependencies.map(chunk => chunk.id).filter(Boolean) as string[]; } getExportNames(): string[] { @@ -318,7 +323,7 @@ export default class Chunk { } getImportIds(): string[] { - return this.dependencies.map(chunk => chunk.id); + return this.dependencies.map(chunk => chunk.id).filter(Boolean) as string[]; } getRenderedHash(): string { @@ -617,7 +622,7 @@ export default class Chunk { const renderedDependency = this.renderedDeclarations.dependencies[i]; - const depId = dep instanceof ExternalModule ? renderedDependency.id : dep.id; + const depId = dep instanceof ExternalModule ? renderedDependency.id : (dep.id as string); let relPath = this.id ? normalize(relative(dirname(this.id), depId)) : depId; if (!relPath.startsWith('../')) relPath = './' + relPath; @@ -697,8 +702,8 @@ export default class Chunk { let file: string; if (options.file) file = resolve(options.sourcemapFile || options.file); - else if (options.dir) file = resolve(options.dir, this.id); - else file = resolve(this.id); + else if (options.dir) file = resolve(options.dir, this.id as string); + else file = resolve(this.id as string); if (this.graph.pluginDriver.hasLoadersOrTransforms) { const decodedMap = magicString.generateDecodedMap({}); @@ -783,14 +788,19 @@ export default class Chunk { } private computeChunkName(): string { + // TODO Lukas test interaction with manual chunks if (this.manualChunkAlias) { return sanitizeFileName(this.manualChunkAlias); } if (this.facadeModule !== null) { - return sanitizeFileName(this.facadeModule.chunkAlias || getAliasName(this.facadeModule.id)); + return sanitizeFileName( + (this.facadeModule.chunkFileName && getAliasName(this.facadeModule.chunkFileName)) || + this.facadeModule.chunkName || + getAliasName(this.facadeModule.id) + ); } for (const module of this.orderedModules) { - if (module.chunkAlias) return sanitizeFileName(module.chunkAlias); + if (module.chunkName) return sanitizeFileName(module.chunkName); } return 'chunk'; } @@ -817,14 +827,16 @@ export default class Chunk { if (resolution instanceof Module) { if (resolution.chunk !== this && isChunkRendered(resolution.chunk as Chunk)) { const resolutionChunk = resolution.facadeChunk || (resolution.chunk as Chunk); - let relPath = normalize(relative(dirname(this.id), resolutionChunk.id)); + let relPath = normalize( + relative(dirname(this.id as string), resolutionChunk.id as string) + ); if (!relPath.startsWith('../')) relPath = './' + relPath; node.renderFinalResolution(code, `'${relPath}'`, format); } } else if (resolution instanceof ExternalModule) { let resolutionId = resolution.id; if (resolution.renormalizeRenderPath) { - resolutionId = normalize(relative(dirname(this.id), resolution.renderPath)); + resolutionId = normalize(relative(dirname(this.id as string), resolution.renderPath)); if (!resolutionId.startsWith('../')) resolutionId = './' + resolutionId; } node.renderFinalResolution(code, `'${resolutionId}'`, format); @@ -838,7 +850,7 @@ export default class Chunk { private finaliseImportMetas(format: string): void { for (const [module, code] of this.renderedModuleSources) { for (const importMeta of module.importMetas) { - importMeta.renderFinalMechanism(code, this.id, format, this.graph.pluginDriver); + importMeta.renderFinalMechanism(code, this.id as string, format, this.graph.pluginDriver); } } } diff --git a/src/Graph.ts b/src/Graph.ts index 307d6dfc068..b563f25ac1d 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -8,7 +8,7 @@ import { EntityPathTracker } from './ast/utils/EntityPathTracker'; import Chunk, { isChunkRendered } from './Chunk'; import ExternalModule from './ExternalModule'; import Module, { defaultAcornOptions } from './Module'; -import { ModuleLoader, UnresolvedModuleWithAlias } from './ModuleLoader'; +import { ModuleLoader, UnresolvedModule } from './ModuleLoader'; import { ExternalOption, GetManualChunk, @@ -47,16 +47,17 @@ function makeOnwarn() { function normalizeEntryModules( entryModules: string | string[] | Record -): UnresolvedModuleWithAlias[] { +): UnresolvedModule[] { if (typeof entryModules === 'string') { - return [{ alias: null, unresolvedId: entryModules }]; + return [{ fileName: null, name: null, id: entryModules }]; } if (Array.isArray(entryModules)) { - return entryModules.map(unresolvedId => ({ alias: null, unresolvedId })); + return entryModules.map(id => ({ fileName: null, name: null, id })); } - return Object.keys(entryModules).map(alias => ({ - alias, - unresolvedId: entryModules[alias] + return Object.keys(entryModules).map(name => ({ + fileName: null, + id: entryModules[name], + name })); } diff --git a/src/Module.ts b/src/Module.ts index 88cfe373a67..4bae95651f2 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -169,7 +169,8 @@ const MISSING_EXPORT_SHIM_DESCRIPTION: ExportDescription = { export default class Module { chunk?: Chunk; - chunkAlias: string = null as any; + chunkFileName: string | null = null; + chunkName: string | null = null; code!: string; comments: CommentDescription[] = []; customTransformCache!: boolean; diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index f079b06f52e..9ffd56733f7 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -31,9 +31,10 @@ import relativeId from './utils/relativeId'; import { timeEnd, timeStart } from './utils/timers'; import transform from './utils/transform'; -export interface UnresolvedModuleWithAlias { - alias: string | null; - unresolvedId: string; +export interface UnresolvedModule { + fileName: string | null; + id: string; + name: string | null; } function normalizeRelativeExternalId(importer: string, source: string) { @@ -120,7 +121,7 @@ export class ModuleLoader { } addEntryModules( - unresolvedEntryModules: UnresolvedModuleWithAlias[], + unresolvedEntryModules: UnresolvedModule[], isUserDefined: boolean ): Promise<{ entryModules: Module[]; @@ -128,10 +129,18 @@ export class ModuleLoader { newEntryModules: Module[]; }> { const loadNewEntryModulesPromise = Promise.all( - unresolvedEntryModules.map(({ alias, unresolvedId }) => - this.loadEntryModule(unresolvedId, true).then(module => { - if (alias !== null && (module.chunkAlias === null || isUserDefined)) { - module.chunkAlias = alias; + unresolvedEntryModules.map(({ fileName, id, name }) => + this.loadEntryModule(id, true).then(module => { + if (fileName !== null) { + if (module.chunkFileName !== null) { + // TODO Lukas test or create facades and make chunkFileName a Set + throw new Error('Cannot reassign chunk filename'); + } + module.chunkFileName = fileName; + // TODO Lukas can we make sure a precise filename does not override a user-defined one? + // should we create facades if the user provides several names for a chunk? + } else if (name !== null && (module.chunkName === null || isUserDefined)) { + module.chunkName = name; } return module; }) @@ -154,21 +163,18 @@ export class ModuleLoader { } addManualChunks(manualChunks: Record): Promise { - const unresolvedManualChunks: { manualChunkAlias: string; unresolvedId: string }[] = []; + const unresolvedManualChunks: { alias: string; id: string }[] = []; for (const alias of Object.keys(manualChunks)) { const manualChunkIds = manualChunks[alias]; - for (const unresolvedId of manualChunkIds) { - unresolvedManualChunks.push({ unresolvedId, manualChunkAlias: alias }); + for (const id of manualChunkIds) { + unresolvedManualChunks.push({ id, alias }); } } const loadNewManualChunkModulesPromise = Promise.all( - unresolvedManualChunks.map(({ unresolvedId }) => this.loadEntryModule(unresolvedId, false)) + unresolvedManualChunks.map(({ id }) => this.loadEntryModule(id, false)) ).then(manualChunkModules => { for (let index = 0; index < manualChunkModules.length; index++) { - this.addModuleToManualChunk( - unresolvedManualChunks[index].manualChunkAlias, - manualChunkModules[index] - ); + this.addModuleToManualChunk(unresolvedManualChunks[index].alias, manualChunkModules[index]); } }); diff --git a/src/rollup/index.ts b/src/rollup/index.ts index f84aa95bae0..114840ae928 100644 --- a/src/rollup/index.ts +++ b/src/rollup/index.ts @@ -199,6 +199,7 @@ export default function rollup(rawInputOptions: GenericConfigObject): Promise { - const outputChunk = outputBundle[chunk.id] as OutputChunk; + const outputChunk = outputBundle[chunk.id as string] as OutputChunk; return chunk.render(outputOptions, addons, outputChunk).then(rendered => { outputChunk.code = rendered.code; outputChunk.map = rendered.map; diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index c3f558fd3f8..3e257fd9c7b 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -136,6 +136,7 @@ export interface EmittedAsset { // TODO Lukas is it possible to control the generated fileName directly? export interface EmittedChunk { + fileName?: string; id: string; name?: string; type: 'chunk'; diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index b62e304e97d..fdfd124cf32 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -129,6 +129,7 @@ export class FileEmitter { type: 'asset' }; if (this.output && asset.source !== undefined) { + // TODO Lukas throw an error when there is a conflict if (typeof consumedAsset.fileName !== 'string') { consumedAsset.fileName = getAssetFileName( consumedAsset.name || 'asset', @@ -151,11 +152,14 @@ export class FileEmitter { } const consumedChunk: ConsumedChunk = { module: null, - name: chunk.name || chunk.id, + name: chunk.fileName || chunk.name || chunk.id, type: 'chunk' }; this.graph.moduleLoader - .addEntryModules([{ alias: chunk.name || null, unresolvedId: chunk.id }], false) + .addEntryModules( + [{ fileName: chunk.fileName || null, name: chunk.name || null, id: chunk.id }], + false + ) .then(({ newEntryModules: [module] }) => { consumedChunk.module = module; }) @@ -210,6 +214,7 @@ export class FileEmitter { return error(errAssetSourceMissingForSetSource(emittedFile.name || fileReferenceId)); } if (this.output) { + // TODO Lukas throw an error when there is a conflict const fileName = emittedFile.fileName || getAssetFileName(emittedFile.name || 'asset', source, this.output); // We must not modify the original assets to not interact with other outputs diff --git a/src/utils/assignChunkIds.ts b/src/utils/assignChunkIds.ts index fab6fcea035..6675ed50897 100644 --- a/src/utils/assignChunkIds.ts +++ b/src/utils/assignChunkIds.ts @@ -30,7 +30,10 @@ export function assignChunkIds( if (outputOptions.file) { chunk.id = basename(outputOptions.file); } else if (inputOptions.preserveModules) { - chunk.generateIdPreserveModules(inputBase, usedIds); + // TODO Lukas how do we handle emitted chunks when preserving modules? + chunk.id = chunk.generateIdPreserveModules(inputBase, usedIds); + } else if (chunk.facadeModule && chunk.facadeModule.chunkFileName) { + chunk.id = chunk.facadeModule.chunkFileName; } else { let pattern, patternName; if (chunk.facadeModule && chunk.facadeModule.isUserDefinedEntryPoint) { @@ -40,7 +43,7 @@ export function assignChunkIds( pattern = outputOptions.chunkFileNames || '[name]-[hash].js'; patternName = 'output.chunkFileNames'; } - chunk.generateId(pattern, patternName, addons, outputOptions, usedIds); + chunk.id = chunk.generateId(pattern, patternName, addons, outputOptions, usedIds); } usedIds[chunk.id] = true; } diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_config.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_config.js new file mode 100644 index 00000000000..83a47e930ba --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_config.js @@ -0,0 +1,21 @@ +const assert = require('assert'); +let referenceId; + +module.exports = { + description: 'supports specifying a file name when emitting a chunk', + options: { + input: 'main', + plugins: { + buildStart() { + referenceId = this.emitFile({ + type: 'chunk', + id: 'buildStart', + fileName: 'custom/build-start-chunk.js' + }); + }, + renderChunk() { + assert.strictEqual(this.getFileName(referenceId), 'custom/build-start-chunk.js'); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js new file mode 100644 index 00000000000..7046d319d62 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js @@ -0,0 +1,9 @@ +define(['../generated-chunk'], function (__chunk_1) { 'use strict'; + + console.log('startBuild', __chunk_1.value); + + var value2 = 43; + + return value2; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..5e2f9f02968 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/generated-chunk.js @@ -0,0 +1,7 @@ +define(['exports'], function (exports) { 'use strict'; + + var value = 42; + + exports.value = value; + +}); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js new file mode 100644 index 00000000000..9267f864aea --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(['./generated-chunk', './custom/build-start-chunk'], function (__chunk_1, buildStartChunk) { 'use strict'; + + console.log('main', __chunk_1.value, buildStartChunk); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js new file mode 100644 index 00000000000..67f29129da7 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js @@ -0,0 +1,9 @@ +'use strict'; + +var __chunk_1 = require('../generated-chunk.js'); + +console.log('startBuild', __chunk_1.value); + +var value2 = 43; + +module.exports = value2; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..6cec42c9a07 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/generated-chunk.js @@ -0,0 +1,5 @@ +'use strict'; + +var value = 42; + +exports.value = value; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js new file mode 100644 index 00000000000..188ab1845cf --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js @@ -0,0 +1,6 @@ +'use strict'; + +var __chunk_1 = require('./generated-chunk.js'); +var buildStartChunk = require('./custom/build-start-chunk.js'); + +console.log('main', __chunk_1.value, buildStartChunk); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js new file mode 100644 index 00000000000..7ccc5162550 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js @@ -0,0 +1,7 @@ +import { v as value } from '../generated-chunk.js'; + +console.log('startBuild', value); + +var value2 = 43; + +export default value2; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..b7cbe038a73 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/generated-chunk.js @@ -0,0 +1,3 @@ +var value = 42; + +export { value as v }; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js new file mode 100644 index 00000000000..63e7099dc92 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js @@ -0,0 +1,4 @@ +import { v as value } from './generated-chunk.js'; +import value2 from './custom/build-start-chunk.js'; + +console.log('main', value, value2); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js new file mode 100644 index 00000000000..7b67e7190c9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js @@ -0,0 +1,16 @@ +System.register(['../generated-chunk.js'], function (exports) { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.v; + }], + execute: function () { + + console.log('startBuild', value); + + var value2 = exports('default', 43); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..e69dcc529da --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + var value = exports('v', 42); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js new file mode 100644 index 00000000000..91881e8db69 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js @@ -0,0 +1,16 @@ +System.register(['./generated-chunk.js', './custom/build-start-chunk.js'], function () { + 'use strict'; + var value, value2; + return { + setters: [function (module) { + value = module.v; + }, function (module) { + value2 = module.default; + }], + execute: function () { + + console.log('main', value, value2); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js b/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js new file mode 100644 index 00000000000..baa4c5f3ccd --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js @@ -0,0 +1,5 @@ +import value from './dep.js'; + +console.log('startBuild', value); + +export default 43; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/dep.js b/test/chunking-form/samples/emit-file/emit-named-chunk/dep.js new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/dep.js @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/main.js new file mode 100644 index 00000000000..500c5a469e4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/main.js @@ -0,0 +1,4 @@ +import value from './dep.js'; +import value2 from './buildStart.js'; + +console.log('main', value, value2); From 270eb5bcc6c3a6b958beb5a314716e50c1b0474e Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sat, 20 Jul 2019 08:26:17 +0200 Subject: [PATCH 13/31] Allow specifying explicit file names for emitted chunks --- src/Chunk.ts | 4 +- src/rollup/index.ts | 60 +++++++++++++------ src/rollup/types.d.ts | 4 ++ src/utils/FileEmitter.ts | 59 +++++++++++++----- src/utils/assignChunkIds.ts | 20 ++++--- src/utils/error.ts | 16 +++++ src/utils/pluginDriver.ts | 6 +- .../deconflict-against-named-files/_config.js | 38 ++++++++++++ .../_expected/amd/main.js | 5 ++ .../_expected/amd/myfile.js | 5 ++ .../_expected/amd/myfile2.js | 1 + .../_expected/amd/myfile3.js | 1 + .../_expected/amd/myfile4.js | 5 ++ .../_expected/amd/myfile5.js | 5 ++ .../_expected/cjs/main.js | 3 + .../_expected/cjs/myfile.js | 3 + .../_expected/cjs/myfile2.js | 1 + .../_expected/cjs/myfile3.js | 1 + .../_expected/cjs/myfile4.js | 3 + .../_expected/cjs/myfile5.js | 3 + .../_expected/es/main.js | 1 + .../_expected/es/myfile.js | 1 + .../_expected/es/myfile2.js | 1 + .../_expected/es/myfile3.js | 1 + .../_expected/es/myfile4.js | 1 + .../_expected/es/myfile5.js | 1 + .../_expected/system/main.js | 10 ++++ .../_expected/system/myfile.js | 10 ++++ .../_expected/system/myfile2.js | 1 + .../_expected/system/myfile3.js | 1 + .../_expected/system/myfile4.js | 10 ++++ .../_expected/system/myfile5.js | 10 ++++ .../emitted1.js | 1 + .../emitted2.js | 1 + .../emitted3.js | 1 + .../deconflict-against-named-files/main.js | 1 + .../_expected/amd/custom/build-start-chunk.js | 4 -- .../emit-named-chunk/_expected/amd/main.js | 4 +- .../_expected/cjs/custom/build-start-chunk.js | 4 -- .../emit-named-chunk/_expected/cjs/main.js | 3 +- .../_expected/es/custom/build-start-chunk.js | 4 -- .../emit-named-chunk/_expected/es/main.js | 3 +- .../system/custom/build-start-chunk.js | 4 +- .../emit-named-chunk/_expected/system/main.js | 8 +-- .../emit-file/emit-named-chunk/buildStart.js | 2 - .../emit-file/emit-named-chunk/main.js | 3 +- .../emits-files-from-various-hooks/_config.js | 8 --- .../amd/assets/outputOptions-d7fdb220.txt | 1 - .../_expected/amd/custom/outputOptions.txt | 1 - .../cjs/assets/outputOptions-d7fdb220.txt | 1 - .../_expected/cjs/custom/outputOptions.txt | 1 - .../es/assets/outputOptions-d7fdb220.txt | 1 - .../_expected/es/custom/outputOptions.txt | 1 - .../system/assets/outputOptions-d7fdb220.txt | 1 - .../_expected/system/custom/outputOptions.txt | 1 - .../emit-file/set-asset-source/_config.js | 36 ++++++++++- .../set-asset-source/_expected/amd/banner.txt | 1 + .../set-asset-source/_expected/amd/footer.txt | 1 + .../_expected/amd/generateBundle-format.txt | 1 + .../_expected/amd/generateBundle.txt | 1 + .../set-asset-source/_expected/amd/intro.txt | 1 + .../set-asset-source/_expected/amd/main.js | 10 ++++ .../set-asset-source/_expected/amd/outro.txt | 1 + .../_expected/amd/renderChunk.txt | 1 + .../_expected/amd/renderStart.txt | 1 + .../set-asset-source/_expected/cjs/banner.txt | 1 + .../set-asset-source/_expected/cjs/footer.txt | 1 + .../_expected/cjs/generateBundle-format.txt | 1 + .../_expected/cjs/generateBundle.txt | 1 + .../set-asset-source/_expected/cjs/intro.txt | 1 + .../set-asset-source/_expected/cjs/main.js | 10 ++++ .../set-asset-source/_expected/cjs/outro.txt | 1 + .../_expected/cjs/renderChunk.txt | 1 + .../_expected/cjs/renderStart.txt | 1 + .../set-asset-source/_expected/es/banner.txt | 1 + .../set-asset-source/_expected/es/footer.txt | 1 + .../_expected/es/generateBundle-format.txt | 1 + .../_expected/es/generateBundle.txt | 1 + .../set-asset-source/_expected/es/intro.txt | 1 + .../set-asset-source/_expected/es/main.js | 7 ++- .../set-asset-source/_expected/es/outro.txt | 1 + .../_expected/es/renderChunk.txt | 1 + .../_expected/es/renderStart.txt | 1 + .../_expected/system/banner.txt | 1 + .../_expected/system/footer.txt | 1 + .../system/generateBundle-format.txt | 1 + .../_expected/system/generateBundle.txt | 1 + .../_expected/system/intro.txt | 1 + .../set-asset-source/_expected/system/main.js | 5 ++ .../_expected/system/outro.txt | 1 + .../_expected/system/renderChunk.txt | 1 + .../_expected/system/renderStart.txt | 1 + test/function/index.js | 16 ++--- .../emit-from-output-options/_config.js | 21 +++++++ .../emit-from-output-options/buildStart1.js | 1 + .../emit-from-output-options/buildStart2.js | 1 + .../emit-from-output-options/main.js | 1 + .../_config.js | 31 ++++++++++ .../main.js | 1 + .../emit-named-chunk-conflict/_config.js | 25 ++++++++ .../emit-named-chunk-conflict/buildStart1.js | 1 + .../emit-named-chunk-conflict/buildStart2.js | 1 + .../emit-named-chunk-conflict/main.js | 1 + 103 files changed, 446 insertions(+), 104 deletions(-) create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_config.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile2.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile3.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile4.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile5.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile2.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile3.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile4.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile5.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile2.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile3.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile4.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile5.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile2.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile3.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile4.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile5.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted1.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted2.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted3.js create mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/main.js delete mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt delete mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outputOptions.txt delete mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt delete mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outputOptions.txt delete mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt delete mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outputOptions.txt delete mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt delete mode 100644 test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outputOptions.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/banner.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/footer.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle-format.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/intro.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/outro.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/renderChunk.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/renderStart.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/banner.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/footer.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle-format.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/intro.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/outro.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/renderChunk.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/renderStart.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/banner.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/footer.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle-format.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/intro.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/outro.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/renderChunk.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/es/renderStart.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/banner.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/footer.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle-format.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/intro.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/outro.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/renderChunk.txt create mode 100644 test/chunking-form/samples/emit-file/set-asset-source/_expected/system/renderStart.txt create mode 100644 test/function/samples/emit-file/emit-from-output-options/_config.js create mode 100644 test/function/samples/emit-file/emit-from-output-options/buildStart1.js create mode 100644 test/function/samples/emit-file/emit-from-output-options/buildStart2.js create mode 100644 test/function/samples/emit-file/emit-from-output-options/main.js create mode 100644 test/function/samples/emit-file/emit-named-asset-conflict-build-generate/_config.js create mode 100644 test/function/samples/emit-file/emit-named-asset-conflict-build-generate/main.js create mode 100644 test/function/samples/emit-file/emit-named-chunk-conflict/_config.js create mode 100644 test/function/samples/emit-file/emit-named-chunk-conflict/buildStart1.js create mode 100644 test/function/samples/emit-file/emit-named-chunk-conflict/buildStart2.js create mode 100644 test/function/samples/emit-file/emit-named-chunk-conflict/main.js diff --git a/src/Chunk.ts b/src/Chunk.ts index 9cebe1536a6..0562e225b0d 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -238,7 +238,7 @@ export default class Chunk { patternName: string, addons: Addons, options: OutputOptions, - existingNames: Record + existingNames: Record ): string { return makeUnique( renderNamePattern(pattern, patternName, type => { @@ -258,7 +258,7 @@ export default class Chunk { generateIdPreserveModules( preserveModulesRelativeDir: string, - existingNames: Record + existingNames: Record ): string { const sanitizedId = sanitizeFileName(this.orderedModules[0].id); return makeUnique( diff --git a/src/rollup/index.ts b/src/rollup/index.ts index 114840ae928..146ade6de53 100644 --- a/src/rollup/index.ts +++ b/src/rollup/index.ts @@ -5,7 +5,7 @@ import Graph from '../Graph'; import { createAddons } from '../utils/addons'; import { assignChunkIds } from '../utils/assignChunkIds'; import commondir from '../utils/commondir'; -import { errDeprecation, error } from '../utils/error'; +import { errCannotEmitFromOptionsHook, errDeprecation, error } from '../utils/error'; import { writeFile } from '../utils/fs'; import getExportMode from '../utils/getExportMode'; import mergeOptions, { GenericConfigObject } from '../utils/mergeOptions'; @@ -17,6 +17,7 @@ import { InputOptions, OutputAsset, OutputBundle, + OutputBundleWithPlaceholders, OutputChunk, OutputOptions, Plugin, @@ -80,6 +81,15 @@ function ensureArray(items: (T | null | undefined)[] | T | null | undefined): return []; } +function areNoPlaceholdersInBundle(bundle: OutputBundleWithPlaceholders): bundle is OutputBundle { + for (const fileName of Object.keys(bundle)) { + if (Object.keys(bundle[fileName]).length === 0) { + return false; + } + } + return true; +} + function getInputOptions(rawInputOptions: GenericConfigObject): InputOptions { if (!rawInputOptions) { throw new Error('You must supply an options object to rollup'); @@ -192,11 +202,11 @@ export default function rollup(rawInputOptions: GenericConfigObject): Promise { timeStart('GENERATE', 1); const assetFileNames = outputOptions.assetFileNames || 'assets/[name]-[hash][extname]'; - const outputBundle: OutputBundle = Object.create(null); + const outputBundle: OutputBundleWithPlaceholders = Object.create(null); const inputBase = commondir(getAbsoluteEntryModulePaths(chunks)); // TODO Lukas throw error when emitting assets or setting their source in outputOptions or make it work? // TODO Lukas this already adds assets to the bundle. This should probably already reserve slots for all chunks and assets with fixed names and throw errors in case of conflict @@ -225,7 +235,7 @@ export default function rollup(rawInputOptions: GenericConfigObject): Promise { - // run generateBundle hook + if (!areNoPlaceholdersInBundle(outputBundle)) { + throw new Error('Internal Error: Found remaining placeholder in bundle object.'); + } return graph.pluginDriver .hookSeq('generateBundle', [outputOptions, outputBundle, isWrite]) - .then(() => graph.pluginDriver.finaliseAssets()); - }) - .then(() => { - timeEnd('GENERATE', 1); - return outputBundle; + .then(() => graph.pluginDriver.finaliseAssets()) + .then(() => { + timeEnd('GENERATE', 1); + return outputBundle; + }); }); } @@ -363,16 +375,18 @@ function getSortingFileType(file: OutputAsset | OutputChunk): SortingFileType { return SortingFileType.SECONDARY_CHUNK; } -function createOutput(outputBundle: Record): RollupOutput { +function createOutput(outputBundle: Record): RollupOutput { return { - output: Object.keys(outputBundle) + output: (Object.keys(outputBundle) .map(fileName => outputBundle[fileName]) - .sort((outputFileA, outputFileB) => { - const fileTypeA = getSortingFileType(outputFileA); - const fileTypeB = getSortingFileType(outputFileB); - if (fileTypeA === fileTypeB) return 0; - return fileTypeA < fileTypeB ? -1 : 1; - }) as [OutputChunk, ...(OutputChunk | OutputAsset)[]] + .filter(outputFile => Object.keys(outputFile).length > 0) as ( + | OutputChunk + | OutputAsset)[]).sort((outputFileA, outputFileB) => { + const fileTypeA = getSortingFileType(outputFileA); + const fileTypeB = getSortingFileType(outputFileB); + if (fileTypeA === fileTypeB) return 0; + return fileTypeA < fileTypeB ? -1 : 1; + }) as [OutputChunk, ...(OutputChunk | OutputAsset)[]] }; } @@ -448,7 +462,15 @@ function normalizeOutputOptions( const outputOptions = pluginDriver.hookReduceArg0Sync( 'outputOptions', [mergedOutputOptions], - outputOptionsReducer + outputOptionsReducer, + pluginContext => { + return { + ...pluginContext, + emitFile() { + return pluginContext.error(errCannotEmitFromOptionsHook()); + } + }; + } ); checkOutputOptions(outputOptions); diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 3e257fd9c7b..0a89e0df9ed 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -317,6 +317,10 @@ export interface OutputBundle { [fileName: string]: OutputAsset | OutputChunk; } +export interface OutputBundleWithPlaceholders { + [fileName: string]: OutputAsset | OutputChunk | {}; +} + interface OnGenerateOptions extends OutputOptions { bundle: OutputChunk; } diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index fdfd124cf32..cc8f9ce1aac 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -2,7 +2,12 @@ import sha256 from 'hash.js/lib/hash/sha/256'; import Chunk from '../Chunk'; import Graph from '../Graph'; import Module from '../Module'; -import { EmittedAsset, EmittedChunk, EmittedFile, OutputBundle } from '../rollup/types'; +import { + EmittedAsset, + EmittedChunk, + EmittedFile, + OutputBundleWithPlaceholders +} from '../rollup/types'; import { BuildPhase } from './buildPhase'; import { errAssetNotFinalisedForFileName, @@ -10,6 +15,7 @@ import { errAssetSourceAlreadySet, errAssetSourceMissingForSetSource, errChunkNotGeneratedForFileName, + errFileNameConflict, errFileReferenceIdNotFoundForFilename, errInvalidAssetName, errInvalidRollupPhaseForChunkEmission, @@ -22,10 +28,9 @@ import { isPlainPathFragment } from './relativeId'; import { makeUnique, renderNamePattern } from './renderNamePattern'; // TODO Lukas setAssetSource in transform needs to be repeated as well -// TODO Lukas use EmittedFile and ConsumedEmittedFile types? interface OutputSpecificFileData { assetFileNames: string; - bundle: OutputBundle; + bundle: OutputBundleWithPlaceholders; } function getAssetFileName( @@ -66,7 +71,15 @@ function addAssetToBundle(asset: CompleteAsset, output: OutputSpecificFileData) }; } +function reserveFileNameInBundle(fileName: string, output: OutputSpecificFileData) { + if (fileName in output.bundle) { + return error(errFileNameConflict(fileName)); + } + output.bundle[fileName] = FILE_PLACEHOLDER; +} + interface ConsumedChunk { + fileName: string | undefined; module: null | Module; name: string; type: 'chunk'; @@ -81,6 +94,10 @@ interface ConsumedAsset { type ConsumedFile = ConsumedChunk | ConsumedAsset; +export const FILE_PLACEHOLDER = { + placeholder: true +}; + // TODO Lukas general assumption: Having a source means having a reliable filename // TODO Lukas only access filename during generate? Or disallow setSource if there is a fileName? // TODO Lukas convert all "throw" into proper errors @@ -128,16 +145,20 @@ export class FileEmitter { source: asset.source, type: 'asset' }; - if (this.output && asset.source !== undefined) { - // TODO Lukas throw an error when there is a conflict - if (typeof consumedAsset.fileName !== 'string') { - consumedAsset.fileName = getAssetFileName( - consumedAsset.name || 'asset', - asset.source, - this.output - ); + if (this.output) { + if (asset.fileName) { + reserveFileNameInBundle(asset.fileName, this.output); + } + if (asset.source !== undefined) { + if (typeof consumedAsset.fileName !== 'string') { + consumedAsset.fileName = getAssetFileName( + consumedAsset.name || 'asset', + asset.source, + this.output + ); + } + addAssetToBundle(consumedAsset as CompleteAsset, this.output); } - addAssetToBundle(consumedAsset as CompleteAsset, this.output); } return addWithNewReferenceId( consumedAsset, @@ -151,8 +172,9 @@ export class FileEmitter { error(errInvalidRollupPhaseForChunkEmission()); } const consumedChunk: ConsumedChunk = { + fileName: chunk.fileName, module: null, - name: chunk.fileName || chunk.name || chunk.id, + name: chunk.name || chunk.id, type: 'chunk' }; this.graph.moduleLoader @@ -194,7 +216,8 @@ export class FileEmitter { (emittedFile.module.facadeChunk ? emittedFile.module.facadeChunk.id : (emittedFile.module.chunk as Chunk).id); - if (!fileName) return error(errChunkNotGeneratedForFileName(emittedFile.name)); + if (!fileName) + return error(errChunkNotGeneratedForFileName(emittedFile.fileName || emittedFile.name)); return fileName; } } @@ -214,7 +237,6 @@ export class FileEmitter { return error(errAssetSourceMissingForSetSource(emittedFile.name || fileReferenceId)); } if (this.output) { - // TODO Lukas throw an error when there is a conflict const fileName = emittedFile.fileName || getAssetFileName(emittedFile.name || 'asset', source, this.output); // We must not modify the original assets to not interact with other outputs @@ -227,12 +249,17 @@ export class FileEmitter { }; // TODO Lukas how do we unfinalize assets for different outputs that have their source set during generate? Test! - public startOutput(outputBundle: OutputBundle, assetFileNames: string) { + public startOutput(outputBundle: OutputBundleWithPlaceholders, assetFileNames: string) { this.filesByReferenceId = new Map(this.buildFilesByReferenceId); this.output = { assetFileNames, bundle: outputBundle }; + for (const emittedFile of this.filesByReferenceId.values()) { + if (emittedFile.fileName) { + reserveFileNameInBundle(emittedFile.fileName, this.output); + } + } for (const [referenceId, emittedFile] of this.filesByReferenceId.entries()) { if (emittedFile.type === 'asset' && emittedFile.source !== undefined) { const fileName = diff --git a/src/utils/assignChunkIds.ts b/src/utils/assignChunkIds.ts index 6675ed50897..884cc77da38 100644 --- a/src/utils/assignChunkIds.ts +++ b/src/utils/assignChunkIds.ts @@ -1,6 +1,7 @@ import Chunk from '../Chunk'; -import { InputOptions, OutputOptions } from '../rollup/types'; +import { InputOptions, OutputBundleWithPlaceholders, OutputOptions } from '../rollup/types'; import { Addons } from './addons'; +import { FILE_PLACEHOLDER } from './FileEmitter'; import { basename } from './path'; export function assignChunkIds( @@ -8,9 +9,9 @@ export function assignChunkIds( inputOptions: InputOptions, outputOptions: OutputOptions, inputBase: string, - addons: Addons + addons: Addons, + bundle: OutputBundleWithPlaceholders ) { - const usedIds: Record = {}; const [entryChunks, otherChunks] = chunks.reduce<[Chunk[], Chunk[]]>( ([entryChunks, otherChunks], chunk) => { (chunk.facadeModule && chunk.facadeModule.isUserDefinedEntryPoint @@ -26,25 +27,26 @@ export function assignChunkIds( const chunksForNaming: Chunk[] = entryChunks.concat(otherChunks); for (let i = 0; i < chunksForNaming.length; i++) { const chunk = chunksForNaming[i]; + const facadeModule = chunk.facadeModule; if (outputOptions.file) { chunk.id = basename(outputOptions.file); } else if (inputOptions.preserveModules) { // TODO Lukas how do we handle emitted chunks when preserving modules? - chunk.id = chunk.generateIdPreserveModules(inputBase, usedIds); - } else if (chunk.facadeModule && chunk.facadeModule.chunkFileName) { - chunk.id = chunk.facadeModule.chunkFileName; + chunk.id = chunk.generateIdPreserveModules(inputBase, bundle); + } else if (facadeModule && facadeModule.chunkFileName) { + chunk.id = facadeModule.chunkFileName; } else { let pattern, patternName; - if (chunk.facadeModule && chunk.facadeModule.isUserDefinedEntryPoint) { + if (facadeModule && facadeModule.isUserDefinedEntryPoint) { pattern = outputOptions.entryFileNames || '[name].js'; patternName = 'output.entryFileNames'; } else { pattern = outputOptions.chunkFileNames || '[name]-[hash].js'; patternName = 'output.chunkFileNames'; } - chunk.id = chunk.generateId(pattern, patternName, addons, outputOptions, usedIds); + chunk.id = chunk.generateId(pattern, patternName, addons, outputOptions, bundle); } - usedIds[chunk.id] = true; + bundle[chunk.id] = FILE_PLACEHOLDER; } } diff --git a/src/utils/error.ts b/src/utils/error.ts index a4c0472a2df..58bc5f01a12 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -38,9 +38,11 @@ export enum Errors { ASSET_SOURCE_ALREADY_SET = 'ASSET_SOURCE_ALREADY_SET', ASSET_SOURCE_MISSING = 'ASSET_SOURCE_MISSING', BAD_LOADER = 'BAD_LOADER', + CANNOT_EMIT_FROM_OPTIONS_HOOK = 'CANNOT_EMIT_FROM_OPTIONS_HOOK', CHUNK_NOT_GENERATED = 'CHUNK_NOT_GENERATED', DEPRECATED_FEATURE = 'DEPRECATED_FEATURE', FILE_NOT_FOUND = 'FILE_NOT_FOUND', + FILE_NAME_CONFLICT = 'FILE_NAME_CONFLICT', INVALID_ASSET_NAME = 'INVALID_ASSET_NAME', INVALID_CHUNK = 'INVALID_CHUNK', INVALID_EXTERNAL_ID = 'INVALID_EXTERNAL_ID', @@ -59,6 +61,13 @@ export function errAssetNotFinalisedForFileName(name: string) { }; } +export function errCannotEmitFromOptionsHook() { + return { + code: Errors.CANNOT_EMIT_FROM_OPTIONS_HOOK, + message: `Cannot emit files from the "outputOptions" hook, use the "renderStart" hook instead.` + }; +} + export function errChunkNotGeneratedForFileName(name: string) { return { code: Errors.CHUNK_NOT_GENERATED, @@ -117,6 +126,13 @@ export function errFileReferenceIdNotFoundForFilename(assetReferenceId: string) }; } +export function errFileNameConflict(fileName: string) { + return { + code: Errors.FILE_NAME_CONFLICT, + message: `Could not emit file "${fileName}" as it conflicts with an already emitted file.` + }; +} + export function errInvalidAssetName(name: string) { return { code: Errors.INVALID_ASSET_NAME, diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index 5e1dbea3539..d63df0592df 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -6,7 +6,7 @@ import Module from '../Module'; import { EmitFile, InputOptions, - OutputBundle, + OutputBundleWithPlaceholders, Plugin, PluginCache, PluginContext, @@ -73,7 +73,7 @@ export interface PluginDriver { args: Args, context?: HookContext ): void; - startOutput(outputBundle: OutputBundle, assetFileNames: string): void; + startOutput(outputBundle: OutputBundleWithPlaceholders, assetFileNames: string): void; } export type Reduce = (reduction: T, result: R, plugin: Plugin) => T; @@ -475,7 +475,7 @@ export function createPluginDriver( return promise; }, - startOutput(outputBundle: OutputBundle, assetFileNames: string): void { + startOutput(outputBundle: OutputBundleWithPlaceholders, assetFileNames: string): void { fileEmitter.startOutput(outputBundle, assetFileNames); } }; diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_config.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_config.js new file mode 100644 index 00000000000..8368d64de60 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_config.js @@ -0,0 +1,38 @@ +module.exports = { + description: 'deconflicts files against named files', + options: { + input: 'main', + output: { assetFileNames: '[name].js', chunkFileNames: '[name].js' }, + plugins: { + buildStart() { + this.emitFile({ + type: 'chunk', + id: 'emitted1', + name: 'myfile' + }); + this.emitFile({ + type: 'chunk', + id: 'emitted2', + fileName: 'myfile.js' + }); + this.emitFile({ + type: 'chunk', + id: 'emitted3', + name: 'myfile' + }); + this.emitFile({ + type: 'asset', + name: 'myfile.js', + source: 'text1' + }); + }, + renderStart() { + this.emitFile({ + type: 'asset', + name: 'myfile.js', + source: 'text2' + }); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/main.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/main.js new file mode 100644 index 00000000000..126aa22ee83 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main'); + +}); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile.js new file mode 100644 index 00000000000..bbda32822fd --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('2'); + +}); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile2.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile2.js new file mode 100644 index 00000000000..156511ae0d8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile2.js @@ -0,0 +1 @@ +text1 \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile3.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile3.js new file mode 100644 index 00000000000..009b64bae3b --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile3.js @@ -0,0 +1 @@ +text2 \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile4.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile4.js new file mode 100644 index 00000000000..6ee85c0b62a --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile4.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('1'); + +}); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile5.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile5.js new file mode 100644 index 00000000000..2b6a8bff430 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile5.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('3'); + +}); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/main.js new file mode 100644 index 00000000000..d0ed06d8c90 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/main.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile.js new file mode 100644 index 00000000000..9278684d7b8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('2'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile2.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile2.js new file mode 100644 index 00000000000..156511ae0d8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile2.js @@ -0,0 +1 @@ +text1 \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile3.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile3.js new file mode 100644 index 00000000000..009b64bae3b --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile3.js @@ -0,0 +1 @@ +text2 \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile4.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile4.js new file mode 100644 index 00000000000..305b0baaa01 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile4.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('1'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile5.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile5.js new file mode 100644 index 00000000000..95c9caf4bc0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile5.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('3'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/main.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile.js new file mode 100644 index 00000000000..e74d4c9f8c0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile.js @@ -0,0 +1 @@ +console.log('2'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile2.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile2.js new file mode 100644 index 00000000000..156511ae0d8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile2.js @@ -0,0 +1 @@ +text1 \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile3.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile3.js new file mode 100644 index 00000000000..009b64bae3b --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile3.js @@ -0,0 +1 @@ +text2 \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile4.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile4.js new file mode 100644 index 00000000000..4748527e94f --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile4.js @@ -0,0 +1 @@ +console.log('1'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile5.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile5.js new file mode 100644 index 00000000000..511b99bba88 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile5.js @@ -0,0 +1 @@ +console.log('3'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/main.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/main.js new file mode 100644 index 00000000000..c83499bc2d4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/main.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('main'); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile.js new file mode 100644 index 00000000000..d379f11b78e --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('2'); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile2.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile2.js new file mode 100644 index 00000000000..156511ae0d8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile2.js @@ -0,0 +1 @@ +text1 \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile3.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile3.js new file mode 100644 index 00000000000..009b64bae3b --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile3.js @@ -0,0 +1 @@ +text2 \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile4.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile4.js new file mode 100644 index 00000000000..efdf4c46ee9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile4.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('1'); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile5.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile5.js new file mode 100644 index 00000000000..2624b4e70e1 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile5.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('3'); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted1.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted1.js new file mode 100644 index 00000000000..4748527e94f --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted1.js @@ -0,0 +1 @@ +console.log('1'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted2.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted2.js new file mode 100644 index 00000000000..e74d4c9f8c0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted2.js @@ -0,0 +1 @@ +console.log('2'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted3.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted3.js new file mode 100644 index 00000000000..511b99bba88 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted3.js @@ -0,0 +1 @@ +console.log('3'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/main.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js index 7046d319d62..9b82e0fcc17 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js @@ -2,8 +2,4 @@ define(['../generated-chunk'], function (__chunk_1) { 'use strict'; console.log('startBuild', __chunk_1.value); - var value2 = 43; - - return value2; - }); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js index 9267f864aea..56bd65658a2 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./generated-chunk', './custom/build-start-chunk'], function (__chunk_1, buildStartChunk) { 'use strict'; +define(['./generated-chunk'], function (__chunk_1) { 'use strict'; - console.log('main', __chunk_1.value, buildStartChunk); + console.log('main', __chunk_1.value); }); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js index 67f29129da7..c193d450be5 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js @@ -3,7 +3,3 @@ var __chunk_1 = require('../generated-chunk.js'); console.log('startBuild', __chunk_1.value); - -var value2 = 43; - -module.exports = value2; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js index 188ab1845cf..04040e8d4f8 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js @@ -1,6 +1,5 @@ 'use strict'; var __chunk_1 = require('./generated-chunk.js'); -var buildStartChunk = require('./custom/build-start-chunk.js'); -console.log('main', __chunk_1.value, buildStartChunk); +console.log('main', __chunk_1.value); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js index 7ccc5162550..015c2211ce2 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js @@ -1,7 +1,3 @@ import { v as value } from '../generated-chunk.js'; console.log('startBuild', value); - -var value2 = 43; - -export default value2; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js index 63e7099dc92..9ccd67b1a67 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/main.js @@ -1,4 +1,3 @@ import { v as value } from './generated-chunk.js'; -import value2 from './custom/build-start-chunk.js'; -console.log('main', value, value2); +console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js index 7b67e7190c9..f366fbd644f 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/custom/build-start-chunk.js @@ -1,4 +1,4 @@ -System.register(['../generated-chunk.js'], function (exports) { +System.register(['../generated-chunk.js'], function () { 'use strict'; var value; return { @@ -9,8 +9,6 @@ System.register(['../generated-chunk.js'], function (exports) { console.log('startBuild', value); - var value2 = exports('default', 43); - } }; }); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js index 91881e8db69..8a46bd2bdb1 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js @@ -1,15 +1,13 @@ -System.register(['./generated-chunk.js', './custom/build-start-chunk.js'], function () { +System.register(['./generated-chunk.js'], function () { 'use strict'; - var value, value2; + var value; return { setters: [function (module) { value = module.v; - }, function (module) { - value2 = module.default; }], execute: function () { - console.log('main', value, value2); + console.log('main', value); } }; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js b/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js index baa4c5f3ccd..f9b1b414da5 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js @@ -1,5 +1,3 @@ import value from './dep.js'; console.log('startBuild', value); - -export default 43; diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/main.js index 500c5a469e4..4a9b3a3f405 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/main.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/main.js @@ -1,4 +1,3 @@ import value from './dep.js'; -import value2 from './buildStart.js'; -console.log('main', value, value2); +console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js index d97d5937918..25e3d03dcaa 100644 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js +++ b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_config.js @@ -23,14 +23,6 @@ module.exports = { this.emitFile({ type: 'asset', name: 'buildEnd.txt', source: 'buildEnd' }); this.emitFile({ type: 'asset', fileName: 'custom/buildEnd.txt', source: 'buildEnd' }); }, - outputOptions() { - this.emitFile({ type: 'asset', name: 'outputOptions.txt', source: 'outputOptions' }); - this.emitFile({ - type: 'asset', - fileName: 'custom/outputOptions.txt', - source: 'outputOptions' - }); - }, renderStart() { this.emitFile({ type: 'asset', name: 'renderStart.txt', source: 'renderStart' }); this.emitFile({ type: 'asset', fileName: 'custom/renderStart.txt', source: 'renderStart' }); diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt deleted file mode 100644 index 46a687a3cb2..00000000000 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/assets/outputOptions-d7fdb220.txt +++ /dev/null @@ -1 +0,0 @@ -outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outputOptions.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outputOptions.txt deleted file mode 100644 index 46a687a3cb2..00000000000 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/amd/custom/outputOptions.txt +++ /dev/null @@ -1 +0,0 @@ -outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt deleted file mode 100644 index 46a687a3cb2..00000000000 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/assets/outputOptions-d7fdb220.txt +++ /dev/null @@ -1 +0,0 @@ -outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outputOptions.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outputOptions.txt deleted file mode 100644 index 46a687a3cb2..00000000000 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/cjs/custom/outputOptions.txt +++ /dev/null @@ -1 +0,0 @@ -outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt deleted file mode 100644 index 46a687a3cb2..00000000000 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/assets/outputOptions-d7fdb220.txt +++ /dev/null @@ -1 +0,0 @@ -outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outputOptions.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outputOptions.txt deleted file mode 100644 index 46a687a3cb2..00000000000 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/es/custom/outputOptions.txt +++ /dev/null @@ -1 +0,0 @@ -outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt deleted file mode 100644 index 46a687a3cb2..00000000000 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/assets/outputOptions-d7fdb220.txt +++ /dev/null @@ -1 +0,0 @@ -outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outputOptions.txt b/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outputOptions.txt deleted file mode 100644 index 46a687a3cb2..00000000000 --- a/test/chunking-form/samples/emit-file/emits-files-from-various-hooks/_expected/system/custom/outputOptions.txt +++ /dev/null @@ -1 +0,0 @@ -outputOptions \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_config.js b/test/chunking-form/samples/emit-file/set-asset-source/_config.js index 6b4f7a8689a..3e20c925b01 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_config.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_config.js @@ -1,10 +1,17 @@ let renderStart; +let renderStartNamed; let banner; +let bannerNamed; let footer; +let footerNamed; let intro; +let introNamed; let outro; +let outroNamed; let renderChunk; +let renderChunkNamed; let generateBundle; +let generateBundleNamed; module.exports = { description: 'supports setting the asset source during generate', @@ -13,45 +20,72 @@ module.exports = { plugins: { load() { renderStart = this.emitFile({ type: 'asset', name: 'renderStart.txt' }); + renderStartNamed = this.emitFile({ type: 'asset', fileName: 'renderStart.txt' }); banner = this.emitFile({ type: 'asset', name: 'banner.txt' }); + bannerNamed = this.emitFile({ type: 'asset', fileName: 'banner.txt' }); footer = this.emitFile({ type: 'asset', name: 'footer.txt' }); + footerNamed = this.emitFile({ type: 'asset', fileName: 'footer.txt' }); intro = this.emitFile({ type: 'asset', name: 'intro.txt' }); + introNamed = this.emitFile({ type: 'asset', fileName: 'intro.txt' }); outro = this.emitFile({ type: 'asset', name: 'outro.txt' }); + outroNamed = this.emitFile({ type: 'asset', fileName: 'outro.txt' }); renderChunk = this.emitFile({ type: 'asset', name: 'renderChunk.txt' }); + renderChunkNamed = this.emitFile({ type: 'asset', fileName: 'renderChunk.txt' }); generateBundle = this.emitFile({ type: 'asset', name: 'generateBundle.txt' }); + generateBundleNamed = this.emitFile({ type: 'asset', fileName: 'generateBundle.txt' }); return ( `export const renderStart = import.meta.ROLLUP_FILE_URL_${renderStart};\n` + + `export const renderStartNamed = import.meta.ROLLUP_FILE_URL_${renderStartNamed};\n` + `export const banner = import.meta.ROLLUP_FILE_URL_${banner};\n` + + `export const bannerNamed = import.meta.ROLLUP_FILE_URL_${bannerNamed};\n` + `export const footer = import.meta.ROLLUP_FILE_URL_${footer};\n` + + `export const footerNamed = import.meta.ROLLUP_FILE_URL_${footerNamed};\n` + `export const intro = import.meta.ROLLUP_FILE_URL_${intro};\n` + - `export const outro = import.meta.ROLLUP_FILE_URL_${outro};\n` + `export const introNamed = import.meta.ROLLUP_FILE_URL_${introNamed};\n` + + `export const outro = import.meta.ROLLUP_FILE_URL_${outro};\n` + + `export const outroNamed = import.meta.ROLLUP_FILE_URL_${outroNamed};\n` ); }, renderStart() { this.setAssetSource(renderStart, 'renderStart'); + this.setAssetSource(renderStartNamed, 'renderStart'); }, banner() { this.setAssetSource(banner, 'banner'); + this.setAssetSource(bannerNamed, 'banner'); }, footer() { this.setAssetSource(footer, 'footer'); + this.setAssetSource(footerNamed, 'footer'); }, intro() { this.setAssetSource(intro, 'intro'); + this.setAssetSource(introNamed, 'intro'); }, outro() { this.setAssetSource(outro, 'outro'); + this.setAssetSource(outroNamed, 'outro'); }, renderChunk() { this.setAssetSource(renderChunk, 'renderChunk'); + this.setAssetSource(renderChunkNamed, 'renderChunk'); }, generateBundle(options) { const localAsset = this.emitFile({ type: 'asset', name: 'generateBundle-format.txt' }); + const localAssetNamed = this.emitFile({ + type: 'asset', + fileName: 'generateBundle-format.txt' + }); this.setAssetSource(localAsset, options.format); + this.setAssetSource(localAssetNamed, options.format); this.setAssetSource( generateBundle, `generateBundle ${options.format} with ${this.getFileName(localAsset)}` ); + this.setAssetSource( + generateBundleNamed, + `generateBundle ${options.format} with ${this.getFileName(localAsset)}` + ); } } } diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/banner.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/banner.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/banner.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/footer.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/footer.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/footer.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle-format.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle-format.txt new file mode 100644 index 00000000000..1a4c4375014 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle-format.txt @@ -0,0 +1 @@ +amd \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt new file mode 100644 index 00000000000..a11bda7ebad --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/generateBundle.txt @@ -0,0 +1 @@ +generateBundle amd with assets/generateBundle-format-78d67aa8.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/intro.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/intro.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/intro.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js index db5e6d3dc96..36fada2557d 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js @@ -1,16 +1,26 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; const renderStart = new URL(require.toUrl('./assets/renderStart-66600c78.txt'), document.baseURI).href; + const renderStartNamed = new URL(require.toUrl('./renderStart.txt'), document.baseURI).href; const banner = new URL(require.toUrl('./assets/banner-2b65cc0c.txt'), document.baseURI).href; + const bannerNamed = new URL(require.toUrl('./banner.txt'), document.baseURI).href; const footer = new URL(require.toUrl('./assets/footer-e1d2fccb.txt'), document.baseURI).href; + const footerNamed = new URL(require.toUrl('./footer.txt'), document.baseURI).href; const intro = new URL(require.toUrl('./assets/intro-520a8116.txt'), document.baseURI).href; + const introNamed = new URL(require.toUrl('./intro.txt'), document.baseURI).href; const outro = new URL(require.toUrl('./assets/outro-21f77720.txt'), document.baseURI).href; + const outroNamed = new URL(require.toUrl('./outro.txt'), document.baseURI).href; exports.banner = banner; + exports.bannerNamed = bannerNamed; exports.footer = footer; + exports.footerNamed = footerNamed; exports.intro = intro; + exports.introNamed = introNamed; exports.outro = outro; + exports.outroNamed = outroNamed; exports.renderStart = renderStart; + exports.renderStartNamed = renderStartNamed; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/outro.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/outro.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/outro.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/renderChunk.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/renderChunk.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/renderChunk.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/renderStart.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/renderStart.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/renderStart.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/banner.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/banner.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/banner.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/footer.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/footer.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/footer.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle-format.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle-format.txt new file mode 100644 index 00000000000..8d0deb7e58a --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle-format.txt @@ -0,0 +1 @@ +cjs \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt new file mode 100644 index 00000000000..3f6be650ed5 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/generateBundle.txt @@ -0,0 +1 @@ +generateBundle cjs with assets/generateBundle-format-ef46b0c8.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/intro.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/intro.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/intro.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js index 0fbcb8b2da1..f04e852e328 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js @@ -3,13 +3,23 @@ Object.defineProperty(exports, '__esModule', { value: true }); const renderStart = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/renderStart-66600c78.txt').href : new URL('assets/renderStart-66600c78.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const renderStartNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/renderStart.txt').href : new URL('renderStart.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const banner = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/banner-2b65cc0c.txt').href : new URL('assets/banner-2b65cc0c.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const bannerNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/banner.txt').href : new URL('banner.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const footer = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/footer-e1d2fccb.txt').href : new URL('assets/footer-e1d2fccb.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const footerNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/footer.txt').href : new URL('footer.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const intro = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/intro-520a8116.txt').href : new URL('assets/intro-520a8116.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const introNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/intro.txt').href : new URL('intro.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const outro = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/outro-21f77720.txt').href : new URL('assets/outro-21f77720.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const outroNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/outro.txt').href : new URL('outro.txt', document.currentScript && document.currentScript.src || document.baseURI).href); exports.banner = banner; +exports.bannerNamed = bannerNamed; exports.footer = footer; +exports.footerNamed = footerNamed; exports.intro = intro; +exports.introNamed = introNamed; exports.outro = outro; +exports.outroNamed = outroNamed; exports.renderStart = renderStart; +exports.renderStartNamed = renderStartNamed; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/outro.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/outro.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/outro.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/renderChunk.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/renderChunk.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/renderChunk.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/renderStart.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/renderStart.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/renderStart.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/banner.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/banner.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/banner.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/footer.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/footer.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/footer.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle-format.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle-format.txt new file mode 100644 index 00000000000..6c4381495c2 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle-format.txt @@ -0,0 +1 @@ +es \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt new file mode 100644 index 00000000000..70119149dc7 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/generateBundle.txt @@ -0,0 +1 @@ +generateBundle es with assets/generateBundle-format-8b573c58.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/intro.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/intro.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/intro.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js index 111cbf4646e..80663455970 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js @@ -1,7 +1,12 @@ const renderStart = new URL('assets/renderStart-66600c78.txt', import.meta.url).href; +const renderStartNamed = new URL('renderStart.txt', import.meta.url).href; const banner = new URL('assets/banner-2b65cc0c.txt', import.meta.url).href; +const bannerNamed = new URL('banner.txt', import.meta.url).href; const footer = new URL('assets/footer-e1d2fccb.txt', import.meta.url).href; +const footerNamed = new URL('footer.txt', import.meta.url).href; const intro = new URL('assets/intro-520a8116.txt', import.meta.url).href; +const introNamed = new URL('intro.txt', import.meta.url).href; const outro = new URL('assets/outro-21f77720.txt', import.meta.url).href; +const outroNamed = new URL('outro.txt', import.meta.url).href; -export { banner, footer, intro, outro, renderStart }; +export { banner, bannerNamed, footer, footerNamed, intro, introNamed, outro, outroNamed, renderStart, renderStartNamed }; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/outro.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/outro.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/outro.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/renderChunk.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/renderChunk.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/renderChunk.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/renderStart.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/renderStart.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/renderStart.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/banner.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/banner.txt new file mode 100644 index 00000000000..12577274ecd --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/banner.txt @@ -0,0 +1 @@ +banner \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/footer.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/footer.txt new file mode 100644 index 00000000000..a56ca533272 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/footer.txt @@ -0,0 +1 @@ +footer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle-format.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle-format.txt new file mode 100644 index 00000000000..5b8201173c8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle-format.txt @@ -0,0 +1 @@ +system \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt new file mode 100644 index 00000000000..fdbb98a9d52 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/generateBundle.txt @@ -0,0 +1 @@ +generateBundle system with assets/generateBundle-format-7df86840.txt \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/intro.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/intro.txt new file mode 100644 index 00000000000..29fbe946bf9 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/intro.txt @@ -0,0 +1 @@ +intro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js index 0cbb0d54a65..3367de29bd4 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js @@ -4,10 +4,15 @@ System.register([], function (exports, module) { execute: function () { const renderStart = exports('renderStart', new URL('assets/renderStart-66600c78.txt', module.meta.url).href); + const renderStartNamed = exports('renderStartNamed', new URL('renderStart.txt', module.meta.url).href); const banner = exports('banner', new URL('assets/banner-2b65cc0c.txt', module.meta.url).href); + const bannerNamed = exports('bannerNamed', new URL('banner.txt', module.meta.url).href); const footer = exports('footer', new URL('assets/footer-e1d2fccb.txt', module.meta.url).href); + const footerNamed = exports('footerNamed', new URL('footer.txt', module.meta.url).href); const intro = exports('intro', new URL('assets/intro-520a8116.txt', module.meta.url).href); + const introNamed = exports('introNamed', new URL('intro.txt', module.meta.url).href); const outro = exports('outro', new URL('assets/outro-21f77720.txt', module.meta.url).href); + const outroNamed = exports('outroNamed', new URL('outro.txt', module.meta.url).href); } }; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/outro.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/outro.txt new file mode 100644 index 00000000000..31035209b9e --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/outro.txt @@ -0,0 +1 @@ +outro \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/renderChunk.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/renderChunk.txt new file mode 100644 index 00000000000..22f947650b0 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/renderChunk.txt @@ -0,0 +1 @@ +renderChunk \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/renderStart.txt b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/renderStart.txt new file mode 100644 index 00000000000..3cdc0005056 --- /dev/null +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/renderStart.txt @@ -0,0 +1 @@ +renderStart \ No newline at end of file diff --git a/test/function/index.js b/test/function/index.js index 637022ca81b..9e9222addae 100644 --- a/test/function/index.js +++ b/test/function/index.js @@ -76,13 +76,15 @@ runTestSuiteWithSamples('function', path.resolve(__dirname, 'samples'), (dir, co let result; - return bundle - .generate( - extend( - { - format: 'cjs' - }, - (config.options || {}).output || {} + return Promise.resolve() + .then(() => + bundle.generate( + extend( + { + format: 'cjs' + }, + (config.options || {}).output || {} + ) ) ) .then(({ output }) => { diff --git a/test/function/samples/emit-file/emit-from-output-options/_config.js b/test/function/samples/emit-file/emit-from-output-options/_config.js new file mode 100644 index 00000000000..4b0dc311e4c --- /dev/null +++ b/test/function/samples/emit-file/emit-from-output-options/_config.js @@ -0,0 +1,21 @@ +module.exports = { + description: 'throws when trying to emit files from the outputOptions hook', + options: { + input: 'main', + plugins: { + outputOptions() { + this.emitFile({ + type: 'asset', + source: 'asset' + }); + } + } + }, + generateError: { + code: 'PLUGIN_ERROR', + hook: 'outputOptions', + message: 'Cannot emit files from the "outputOptions" hook, use the "renderStart" hook instead.', + plugin: 'at position 1', + pluginCode: 'CANNOT_EMIT_FROM_OPTIONS_HOOK' + } +}; diff --git a/test/function/samples/emit-file/emit-from-output-options/buildStart1.js b/test/function/samples/emit-file/emit-from-output-options/buildStart1.js new file mode 100644 index 00000000000..4c326cae1bc --- /dev/null +++ b/test/function/samples/emit-file/emit-from-output-options/buildStart1.js @@ -0,0 +1 @@ +console.log('buildStart1'); diff --git a/test/function/samples/emit-file/emit-from-output-options/buildStart2.js b/test/function/samples/emit-file/emit-from-output-options/buildStart2.js new file mode 100644 index 00000000000..a74fcff5302 --- /dev/null +++ b/test/function/samples/emit-file/emit-from-output-options/buildStart2.js @@ -0,0 +1 @@ +console.log('buildStart2'); diff --git a/test/function/samples/emit-file/emit-from-output-options/main.js b/test/function/samples/emit-file/emit-from-output-options/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/function/samples/emit-file/emit-from-output-options/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/function/samples/emit-file/emit-named-asset-conflict-build-generate/_config.js b/test/function/samples/emit-file/emit-named-asset-conflict-build-generate/_config.js new file mode 100644 index 00000000000..c148dcc7912 --- /dev/null +++ b/test/function/samples/emit-file/emit-named-asset-conflict-build-generate/_config.js @@ -0,0 +1,31 @@ +module.exports = { + description: + 'throws when there is a conflict between two named assets emitted during different phases', + options: { + input: 'main', + plugins: { + buildStart() { + this.emitFile({ + type: 'asset', + fileName: 'custom/emitted.txt', + source: 'text' + }); + }, + renderStart() { + this.emitFile({ + type: 'asset', + fileName: 'custom/emitted.txt', + source: 'text' + }); + } + } + }, + generateError: { + code: 'PLUGIN_ERROR', + hook: 'renderStart', + message: + 'Could not emit file "custom/emitted.txt" as it conflicts with an already emitted file.', + plugin: 'at position 1', + pluginCode: 'FILE_NAME_CONFLICT' + } +}; diff --git a/test/function/samples/emit-file/emit-named-asset-conflict-build-generate/main.js b/test/function/samples/emit-file/emit-named-asset-conflict-build-generate/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/function/samples/emit-file/emit-named-asset-conflict-build-generate/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/function/samples/emit-file/emit-named-chunk-conflict/_config.js b/test/function/samples/emit-file/emit-named-chunk-conflict/_config.js new file mode 100644 index 00000000000..dfc45b3f266 --- /dev/null +++ b/test/function/samples/emit-file/emit-named-chunk-conflict/_config.js @@ -0,0 +1,25 @@ +module.exports = { + description: 'throws when there is a conflict between two emitted named chunks', + options: { + input: 'main', + plugins: { + buildStart() { + this.emitFile({ + type: 'chunk', + id: 'buildStart1', + fileName: 'custom/build-start-chunk.js' + }); + this.emitFile({ + type: 'chunk', + id: 'buildStart2', + fileName: 'custom/build-start-chunk.js' + }); + } + } + }, + generateError: { + code: 'FILE_NAME_CONFLICT', + message: + 'Could not emit file "custom/build-start-chunk.js" as it conflicts with an already emitted file.' + } +}; diff --git a/test/function/samples/emit-file/emit-named-chunk-conflict/buildStart1.js b/test/function/samples/emit-file/emit-named-chunk-conflict/buildStart1.js new file mode 100644 index 00000000000..4c326cae1bc --- /dev/null +++ b/test/function/samples/emit-file/emit-named-chunk-conflict/buildStart1.js @@ -0,0 +1 @@ +console.log('buildStart1'); diff --git a/test/function/samples/emit-file/emit-named-chunk-conflict/buildStart2.js b/test/function/samples/emit-file/emit-named-chunk-conflict/buildStart2.js new file mode 100644 index 00000000000..a74fcff5302 --- /dev/null +++ b/test/function/samples/emit-file/emit-named-chunk-conflict/buildStart2.js @@ -0,0 +1 @@ +console.log('buildStart2'); diff --git a/test/function/samples/emit-file/emit-named-chunk-conflict/main.js b/test/function/samples/emit-file/emit-named-chunk-conflict/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/function/samples/emit-file/emit-named-chunk-conflict/main.js @@ -0,0 +1 @@ +console.log('main'); From 5e85eeea0ee7bb51014572f1c696010026263b70 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sun, 21 Jul 2019 09:54:12 +0200 Subject: [PATCH 14/31] Fix some TODOs --- src/Chunk.ts | 1 - src/ast/nodes/MetaProperty.ts | 1 - src/ast/nodes/VariableDeclaration.ts | 1 - src/rollup/index.ts | 10 +-- src/rollup/types.d.ts | 3 - src/utils/FileEmitter.ts | 24 ++++-- src/utils/error.ts | 3 +- src/utils/referenceIds.ts | 17 ---- .../emit-file/emit-named-chunk/_config.js | 7 ++ .../emit-from-output-options/_config.js | 3 +- .../set-source-in-output-options/_config.js | 24 ++++++ .../buildStart1.js | 1 + .../buildStart2.js | 1 + .../set-source-in-output-options/main.js | 1 + test/hooks/index.js | 84 ++++++++++++++++++- 15 files changed, 139 insertions(+), 42 deletions(-) delete mode 100644 src/utils/referenceIds.ts create mode 100644 test/function/samples/emit-file/set-source-in-output-options/_config.js create mode 100644 test/function/samples/emit-file/set-source-in-output-options/buildStart1.js create mode 100644 test/function/samples/emit-file/set-source-in-output-options/buildStart2.js create mode 100644 test/function/samples/emit-file/set-source-in-output-options/main.js diff --git a/src/Chunk.ts b/src/Chunk.ts index 0562e225b0d..9dada196dd6 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -308,7 +308,6 @@ export default class Chunk { } getChunkName(): string { - // TODO Lukas this.chunkName should be set to the id if a filename is provided, test return this.chunkName || (this.chunkName = this.computeChunkName()); } diff --git a/src/ast/nodes/MetaProperty.ts b/src/ast/nodes/MetaProperty.ts index efdbbb182fd..4c466ea7ffa 100644 --- a/src/ast/nodes/MetaProperty.ts +++ b/src/ast/nodes/MetaProperty.ts @@ -61,7 +61,6 @@ export default class MetaProperty extends NodeBase { const parent = this.parent; const metaProperty = this.metaProperty as string | null; - // TODO Lukas deprecation warning if ( metaProperty && (metaProperty.startsWith(FILE_PREFIX) || diff --git a/src/ast/nodes/VariableDeclaration.ts b/src/ast/nodes/VariableDeclaration.ts index 6925f49f7a8..8a84f93ef93 100644 --- a/src/ast/nodes/VariableDeclaration.ts +++ b/src/ast/nodes/VariableDeclaration.ts @@ -131,7 +131,6 @@ export default class VariableDeclaration extends NodeBase { options: RenderOptions, { start = this.start, end = this.end, isNoStatement }: NodeRenderOptions ): void { - // TODO Lukas fix this const separatedNodes = getCommaSeparatedNodesWithBoundaries( this.declarations, code, diff --git a/src/rollup/index.ts b/src/rollup/index.ts index 146ade6de53..3c01365e88a 100644 --- a/src/rollup/index.ts +++ b/src/rollup/index.ts @@ -208,8 +208,6 @@ export default function rollup(rawInputOptions: GenericConfigObject): Promise { + const emitError = () => pluginContext.error(errCannotEmitFromOptionsHook()); return { ...pluginContext, - emitFile() { - return pluginContext.error(errCannotEmitFromOptionsHook()); - } + emitFile: emitError, + setAssetSource: emitError }; } ); diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts index 0a89e0df9ed..41d9b5c82bc 100644 --- a/src/rollup/types.d.ts +++ b/src/rollup/types.d.ts @@ -125,8 +125,6 @@ export interface MinimalPluginContext { meta: PluginContextMeta; } -// TODO Lukas do not forget caching tests for files -// TODO Lukas can there be interactions in names between multiple outputs? export interface EmittedAsset { fileName?: string; name?: string; @@ -134,7 +132,6 @@ export interface EmittedAsset { type: 'asset'; } -// TODO Lukas is it possible to control the generated fileName directly? export interface EmittedChunk { fileName?: string; id: string; diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index cc8f9ce1aac..c9c758822d6 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -23,7 +23,6 @@ import { error } from './error'; import { extname } from './path'; -import { addWithNewReferenceId } from './referenceIds'; import { isPlainPathFragment } from './relativeId'; import { makeUnique, renderNamePattern } from './renderNamePattern'; @@ -160,11 +159,7 @@ export class FileEmitter { addAssetToBundle(consumedAsset as CompleteAsset, this.output); } } - return addWithNewReferenceId( - consumedAsset, - this.filesByReferenceId, - asset.fileName || asset.name || asset.type - ); + return this.assignReferenceId(consumedAsset, asset.fileName || asset.name || asset.type); } private emitChunk(chunk: EmittedChunk): string { @@ -190,7 +185,22 @@ export class FileEmitter { // once module loading has finished }); - return addWithNewReferenceId(consumedChunk, this.filesByReferenceId, chunk.id); + return this.assignReferenceId(consumedChunk, chunk.id); + } + + private assignReferenceId(file: ConsumedFile, idBase: string): string { + let referenceId: string | undefined; + do { + const hash = sha256(); + if (referenceId) { + hash.update(referenceId); + } else { + hash.update(idBase); + } + referenceId = hash.digest('hex').substr(0, 8); + } while (this.filesByReferenceId.has(referenceId)); + this.filesByReferenceId.set(referenceId, file); + return referenceId; } public finaliseAssets() { diff --git a/src/utils/error.ts b/src/utils/error.ts index 58bc5f01a12..2ee1f5b82e0 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -4,7 +4,6 @@ import { RollupError, RollupWarning } from '../rollup/types'; import getCodeFrame from './getCodeFrame'; import relativeId from './relativeId'; -// TODO Lukas check for unused errors when done export function error(base: Error | RollupError, props?: RollupError): never { if (base instanceof Error === false) base = Object.assign(new Error(base.message), base); if (props) Object.assign(base, props); @@ -64,7 +63,7 @@ export function errAssetNotFinalisedForFileName(name: string) { export function errCannotEmitFromOptionsHook() { return { code: Errors.CANNOT_EMIT_FROM_OPTIONS_HOOK, - message: `Cannot emit files from the "outputOptions" hook, use the "renderStart" hook instead.` + message: `Cannot emit files or set asset sources in the "outputOptions" hook, use the "renderStart" hook instead.` }; } diff --git a/src/utils/referenceIds.ts b/src/utils/referenceIds.ts deleted file mode 100644 index 1df779c6452..00000000000 --- a/src/utils/referenceIds.ts +++ /dev/null @@ -1,17 +0,0 @@ -import sha256 from 'hash.js/lib/hash/sha/256'; - -// TODO Lukas inline into FileEmitter -export function addWithNewReferenceId(item: T, idMap: Map, hashBase: string): string { - let referenceId: string | undefined; - do { - const hash = sha256(); - if (referenceId) { - hash.update(referenceId); - } else { - hash.update(hashBase); - } - referenceId = hash.digest('hex').substr(0, 8); - } while (idMap.has(referenceId)); - idMap.set(referenceId, item); - return referenceId; -} diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_config.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_config.js index 83a47e930ba..4a511049e9a 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_config.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_config.js @@ -15,6 +15,13 @@ module.exports = { }, renderChunk() { 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', + 'chunk' + ]); } } } diff --git a/test/function/samples/emit-file/emit-from-output-options/_config.js b/test/function/samples/emit-file/emit-from-output-options/_config.js index 4b0dc311e4c..bf3ce6381d7 100644 --- a/test/function/samples/emit-file/emit-from-output-options/_config.js +++ b/test/function/samples/emit-file/emit-from-output-options/_config.js @@ -14,7 +14,8 @@ module.exports = { generateError: { code: 'PLUGIN_ERROR', hook: 'outputOptions', - message: 'Cannot emit files from the "outputOptions" hook, use the "renderStart" hook instead.', + message: + 'Cannot emit files or set asset sources in the "outputOptions" hook, use the "renderStart" hook instead.', plugin: 'at position 1', pluginCode: 'CANNOT_EMIT_FROM_OPTIONS_HOOK' } diff --git a/test/function/samples/emit-file/set-source-in-output-options/_config.js b/test/function/samples/emit-file/set-source-in-output-options/_config.js new file mode 100644 index 00000000000..6cba91aa9a2 --- /dev/null +++ b/test/function/samples/emit-file/set-source-in-output-options/_config.js @@ -0,0 +1,24 @@ +let referenceId; + +module.exports = { + description: 'throws when trying to set file sources in the outputOptions hook', + options: { + input: 'main', + plugins: { + buildStart() { + referenceId = this.emitFile({ type: 'asset' }); + }, + outputOptions() { + this.setAssetSource(referenceId, 'not allowed'); + } + } + }, + generateError: { + code: 'PLUGIN_ERROR', + hook: 'outputOptions', + message: + 'Cannot emit files or set asset sources in the "outputOptions" hook, use the "renderStart" hook instead.', + plugin: 'at position 1', + pluginCode: 'CANNOT_EMIT_FROM_OPTIONS_HOOK' + } +}; diff --git a/test/function/samples/emit-file/set-source-in-output-options/buildStart1.js b/test/function/samples/emit-file/set-source-in-output-options/buildStart1.js new file mode 100644 index 00000000000..4c326cae1bc --- /dev/null +++ b/test/function/samples/emit-file/set-source-in-output-options/buildStart1.js @@ -0,0 +1 @@ +console.log('buildStart1'); diff --git a/test/function/samples/emit-file/set-source-in-output-options/buildStart2.js b/test/function/samples/emit-file/set-source-in-output-options/buildStart2.js new file mode 100644 index 00000000000..a74fcff5302 --- /dev/null +++ b/test/function/samples/emit-file/set-source-in-output-options/buildStart2.js @@ -0,0 +1 @@ +console.log('buildStart2'); diff --git a/test/function/samples/emit-file/set-source-in-output-options/main.js b/test/function/samples/emit-file/set-source-in-output-options/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/function/samples/emit-file/set-source-in-output-options/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/hooks/index.js b/test/hooks/index.js index 2a6ba737319..1019b19bcc2 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -252,7 +252,10 @@ describe('hooks', () => { { transform(code, id) { if (id === 'input') { - return `export default import.meta.ROLLUP_CHUNK_URL_${this.emitChunk('chunk')};`; + return `export default import.meta.ROLLUP_FILE_URL_${this.emitFile({ + type: 'chunk', + id: 'chunk' + })};`; } } } @@ -319,7 +322,7 @@ describe('hooks', () => { }); }); - it('caches file emission in transform hook', () => { + it('caches asset emission in transform hook', () => { let cache; return rollup .rollup({ @@ -1110,6 +1113,83 @@ describe('hooks', () => { }) .then(bundle => bundle.generate({ format: 'es' }))); + it('caches chunk emission in transform hook', () => { + let cache; + return rollup + .rollup({ + input: 'input', + plugins: [ + loader({ input: '', chunk: "console.log('chunk');" }), + { + transform(code, id) { + if (id === 'input') { + return `export default import.meta.ROLLUP_CHUNK_URL_${this.emitChunk('chunk')};`; + } + } + } + ] + }) + .then(bundle => { + cache = bundle.cache; + return bundle.generate({ format: 'es' }); + }) + .then(({ output }) => { + assert.equal( + output[0].code, + `var input = new URL('chunk-01406d83.js', import.meta.url).href;\n\nexport default input;\n` + ); + assert.equal(output[1].fileName, 'chunk-01406d83.js'); + assert.equal(output[1].code, `console.log('chunk');\n`); + + return rollup.rollup({ + cache, + input: 'input', + plugins: [ + loader({ input: '', chunk: "console.log('chunk');" }), + { + transform() { + assert.fail('Should cache transform'); + } + } + ] + }); + }) + .then(bundle => { + cache = bundle.cache; + return bundle.generate({ format: 'es' }); + }) + .then(({ output }) => { + assert.equal( + output[0].code, + `var input = new URL('chunk-01406d83.js', import.meta.url).href;\n\nexport default input;\n` + ); + assert.equal(output[1].fileName, 'chunk-01406d83.js'); + assert.equal(output[1].code, `console.log('chunk');\n`); + + return rollup.rollup({ + cache, + input: 'input', + plugins: [ + loader({ input: '', chunk: "console.log('chunk');" }), + { + transform() { + assert.fail('Should cache transform'); + } + } + ] + }); + }) + .then(bundle => bundle.generate({ format: 'es' })) + .then(({ output }) => { + assert.equal( + output[0].code, + `var input = new URL('chunk-01406d83.js', import.meta.url).href;\n\nexport default input;\n` + ); + assert.equal(output[1].fileName, 'chunk-01406d83.js'); + assert.equal(output[1].code, `console.log('chunk');\n`); + }); + }); + it('caches asset emission in transform hook', () => { let cache; return rollup From c7bfaee61cfc58dab719332fc4850b7fb5157ae6 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Sun, 21 Jul 2019 11:43:29 +0200 Subject: [PATCH 15/31] Test ids remain stable when the transform hook is cached and make test more stable --- src/utils/transform.ts | 5 +- .../deconflict-against-named-files/_config.js | 69 ++++++++------- .../_expected/amd/myfile.js | 2 +- .../_expected/amd/myfile4.js | 2 +- .../_expected/amd/myfile5.js | 2 +- .../_expected/cjs/myfile.js | 2 +- .../_expected/cjs/myfile4.js | 2 +- .../_expected/cjs/myfile5.js | 2 +- .../_expected/es/myfile.js | 2 +- .../_expected/es/myfile4.js | 2 +- .../_expected/es/myfile5.js | 2 +- .../_expected/system/myfile.js | 2 +- .../_expected/system/myfile4.js | 2 +- .../_expected/system/myfile5.js | 2 +- .../emitted1.js | 1 - .../emitted2.js | 1 - .../emitted3.js | 1 - test/hooks/index.js | 88 +++++++++++++++++-- 18 files changed, 134 insertions(+), 55 deletions(-) delete mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted1.js delete mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted2.js delete mode 100644 test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted3.js diff --git a/src/utils/transform.ts b/src/utils/transform.ts index 2d8f7bf6794..6e714eacfb6 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -137,12 +137,9 @@ export default function transform( return graph.pluginDriver.emitFile(emittedFile); }, emitFile(emittedFile: EmittedFile) { - // TODO Lukas test that we are creating a copy or in the future, do not mutate emitted files - // or prevent setAssetSource during build? - emittedFiles.push({ ...emittedFile }); + emittedFiles.push(emittedFile); return graph.pluginDriver.emitFile(emittedFile); }, - // TODO Lukas this needs to be repeated as well addWatchFile(id: string) { if (!transformDependencies) transformDependencies = []; transformDependencies.push(id); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_config.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_config.js index 8368d64de60..a3622a8c983 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_config.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_config.js @@ -1,38 +1,47 @@ +const { loader } = require('../../../../utils.js'); + module.exports = { description: 'deconflicts files against named files', options: { input: 'main', output: { assetFileNames: '[name].js', chunkFileNames: '[name].js' }, - plugins: { - buildStart() { - this.emitFile({ - type: 'chunk', - id: 'emitted1', - name: 'myfile' - }); - this.emitFile({ - type: 'chunk', - id: 'emitted2', - fileName: 'myfile.js' - }); - this.emitFile({ - type: 'chunk', - id: 'emitted3', - name: 'myfile' - }); - this.emitFile({ - type: 'asset', - name: 'myfile.js', - source: 'text1' - }); - }, - renderStart() { - this.emitFile({ - type: 'asset', - name: 'myfile.js', - source: 'text2' - }); + plugins: [ + loader({ + emitted1: 'console.log(1);', + emitted2: 'console.log(2);', + emitted3: 'console.log(3);' + }), + { + buildStart() { + this.emitFile({ + type: 'chunk', + id: 'emitted1', + name: 'myfile' + }); + this.emitFile({ + type: 'chunk', + id: 'emitted2', + fileName: 'myfile.js' + }); + this.emitFile({ + type: 'chunk', + id: 'emitted3', + name: 'myfile' + }); + this.emitFile({ + type: 'asset', + name: 'myfile.js', + source: 'text1' + }); + }, + renderStart() { + this.emitFile({ + type: 'asset', + name: 'myfile.js', + source: 'text2' + }); + } } - } + ] } }; diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile.js index bbda32822fd..fe9bf59ea62 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile.js @@ -1,5 +1,5 @@ define(function () { 'use strict'; - console.log('2'); + console.log(2); }); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile4.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile4.js index 6ee85c0b62a..9ff7f9d4680 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile4.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile4.js @@ -1,5 +1,5 @@ define(function () { 'use strict'; - console.log('1'); + console.log(1); }); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile5.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile5.js index 2b6a8bff430..9c9de75f28f 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile5.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/amd/myfile5.js @@ -1,5 +1,5 @@ define(function () { 'use strict'; - console.log('3'); + console.log(3); }); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile.js index 9278684d7b8..8aed295d2f2 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile.js @@ -1,3 +1,3 @@ 'use strict'; -console.log('2'); +console.log(2); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile4.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile4.js index 305b0baaa01..638e130e3be 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile4.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile4.js @@ -1,3 +1,3 @@ 'use strict'; -console.log('1'); +console.log(1); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile5.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile5.js index 95c9caf4bc0..1ddbff7692c 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile5.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/cjs/myfile5.js @@ -1,3 +1,3 @@ 'use strict'; -console.log('3'); +console.log(3); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile.js index e74d4c9f8c0..e00b68aa31a 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile.js @@ -1 +1 @@ -console.log('2'); +console.log(2); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile4.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile4.js index 4748527e94f..296d5492b00 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile4.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile4.js @@ -1 +1 @@ -console.log('1'); +console.log(1); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile5.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile5.js index 511b99bba88..3bd241b50e7 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile5.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/es/myfile5.js @@ -1 +1 @@ -console.log('3'); +console.log(3); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile.js index d379f11b78e..51bbb7b8df1 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile.js @@ -3,7 +3,7 @@ System.register([], function () { return { execute: function () { - console.log('2'); + console.log(2); } }; diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile4.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile4.js index efdf4c46ee9..aa5f5177c77 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile4.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile4.js @@ -3,7 +3,7 @@ System.register([], function () { return { execute: function () { - console.log('1'); + console.log(1); } }; diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile5.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile5.js index 2624b4e70e1..71af751777f 100644 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile5.js +++ b/test/chunking-form/samples/emit-file/deconflict-against-named-files/_expected/system/myfile5.js @@ -3,7 +3,7 @@ System.register([], function () { return { execute: function () { - console.log('3'); + console.log(3); } }; diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted1.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted1.js deleted file mode 100644 index 4748527e94f..00000000000 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted1.js +++ /dev/null @@ -1 +0,0 @@ -console.log('1'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted2.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted2.js deleted file mode 100644 index e74d4c9f8c0..00000000000 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted2.js +++ /dev/null @@ -1 +0,0 @@ -console.log('2'); diff --git a/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted3.js b/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted3.js deleted file mode 100644 index 511b99bba88..00000000000 --- a/test/chunking-form/samples/emit-file/deconflict-against-named-files/emitted3.js +++ /dev/null @@ -1 +0,0 @@ -console.log('3'); diff --git a/test/hooks/index.js b/test/hooks/index.js index 1019b19bcc2..bad495a77c3 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -351,8 +351,6 @@ describe('hooks', () => { ); assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); - assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); - assert.equal(output[1].source, 'hello world'); return rollup.rollup({ cache, @@ -378,8 +376,6 @@ describe('hooks', () => { ); assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); - assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); - assert.equal(output[1].source, 'hello world'); return rollup.rollup({ cache, @@ -402,8 +398,88 @@ describe('hooks', () => { ); assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); assert.equal(output[1].source, 'hello world'); - assert.equal(output[1].fileName, 'assets/test-0a676135.ext'); - assert.equal(output[1].source, 'hello world'); + }); + }); + + it('keeps emitted ids stable between runs', () => { + let cache; + let emittedFile; + return rollup + .rollup({ + input: 'input', + plugins: [ + { + resolveId(id) { + return id; + }, + load(id) { + if (id === 'input') { + return ''; + } + this.setAssetSource(emittedFile, 'first run'); + return `console.log('imported')`; + }, + transform(code, id) { + if (id === 'input') { + emittedFile = this.emitFile({ + type: 'asset', + name: 'test.ext' + }); + return ( + `import 'imported';\n` + + `export default import.meta.ROLLUP_FILE_URL_${emittedFile};` + ); + } + } + } + ] + }) + .then(bundle => { + cache = bundle.cache; + return bundle.generate({ format: 'es' }); + }) + .then(({ output }) => { + assert.equal( + output[0].code, + `console.log('imported');\n\n` + + `var input = new URL('assets/test-09aeb845.ext', import.meta.url).href;\n\n` + + `export default input;\n` + ); + assert.equal(output[1].fileName, 'assets/test-09aeb845.ext'); + assert.equal(output[1].source, 'first run'); + + return rollup.rollup({ + cache, + input: 'input', + plugins: [ + { + resolveId(id) { + return id; + }, + load(id) { + if (id === 'input') { + return ''; + } + this.setAssetSource(emittedFile, 'second run'); + return `console.log('imported')`; + }, + transform() { + assert.fail('Should cache transform'); + } + } + ] + }); + }) + .then(bundle => bundle.generate({ format: 'es' })) + .then(({ output }) => { + assert.equal( + output[0].code, + `console.log('imported');\n\n` + + `var input = new URL('assets/test-ce5fc71b.ext', import.meta.url).href;\n\n` + + `export default input;\n` + ); + assert.equal(output[1].fileName, 'assets/test-ce5fc71b.ext'); + assert.equal(output[1].source, 'second run'); }); }); From c90026ae0b8e34d081c6919a1c573d537389559f Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Mon, 22 Jul 2019 17:23:22 +0200 Subject: [PATCH 16/31] Refine error handling --- src/utils/FileEmitter.ts | 167 ++++++++++++------ src/utils/error.ts | 27 ++- .../emit-file/asset-file-names/_config.js | 2 +- .../asset-source-missing-3/_config.js | 5 +- .../emit-asset/invalid-asset-name/_config.js | 4 +- .../asset-source-missing-3/_config.js | 5 +- .../emit-file/invalid-asset-name/_config.js | 4 +- 7 files changed, 134 insertions(+), 80 deletions(-) diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index c9c758822d6..2dacf2ffb16 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -2,22 +2,16 @@ import sha256 from 'hash.js/lib/hash/sha/256'; import Chunk from '../Chunk'; import Graph from '../Graph'; import Module from '../Module'; -import { - EmittedAsset, - EmittedChunk, - EmittedFile, - OutputBundleWithPlaceholders -} from '../rollup/types'; +import { OutputBundleWithPlaceholders } from '../rollup/types'; import { BuildPhase } from './buildPhase'; import { errAssetNotFinalisedForFileName, errAssetReferenceIdNotFoundForSetSource, errAssetSourceAlreadySet, - errAssetSourceMissingForSetSource, errChunkNotGeneratedForFileName, + errFailedValidation, errFileNameConflict, errFileReferenceIdNotFoundForFilename, - errInvalidAssetName, errInvalidRollupPhaseForChunkEmission, errNoAssetSourceSet, error @@ -26,7 +20,6 @@ import { extname } from './path'; import { isPlainPathFragment } from './relativeId'; import { makeUnique, renderNamePattern } from './renderNamePattern'; -// TODO Lukas setAssetSource in transform needs to be repeated as well interface OutputSpecificFileData { assetFileNames: string; bundle: OutputBundleWithPlaceholders; @@ -53,8 +46,7 @@ function getAssetFileName( case 'ext': return extname(name).substr(1); } - // TODO Lukas test - return placeholder; + return ''; }), output.bundle ); @@ -91,13 +83,57 @@ interface ConsumedAsset { type: 'asset'; } +interface EmittedFile { + fileName?: string; + name?: string; + type: 'chunk' | 'asset'; + [key: string]: unknown; +} + type ConsumedFile = ConsumedChunk | ConsumedAsset; export const FILE_PLACEHOLDER = { placeholder: true }; -// TODO Lukas general assumption: Having a source means having a reliable filename +function hasValidType( + emittedFile: unknown +): emittedFile is { type: 'asset' | 'chunk'; [key: string]: unknown } { + return ( + emittedFile && + ((emittedFile as { [key: string]: unknown }).type === 'asset' || + (emittedFile as { [key: string]: unknown }).type === 'chunk') + ); +} + +function hasValidName(emittedFile: { + type: 'asset' | 'chunk'; + [key: string]: unknown; +}): emittedFile is EmittedFile { + const validatedName = emittedFile.fileName || emittedFile.name; + return ( + !validatedName || (typeof validatedName === 'string' && isPlainPathFragment(validatedName)) + ); +} + +function getValidSource( + source: unknown, + emittedFile: { fileName?: string; name?: string }, + fileReferenceId: string | null +): string | Buffer { + if (typeof source !== 'string' && !Buffer.isBuffer(source)) { + const assetName = emittedFile.fileName || emittedFile.name || fileReferenceId; + const assetDescription = + typeof assetName === 'string' ? `asset "${assetName}"` : 'unnamed asset'; + return error( + errFailedValidation( + `Could not set source for ${assetDescription}, asset source needs to be a string of Buffer.` + ) + ); + } + return source; +} + // TODO Lukas only access filename during generate? Or disallow setSource if there is a fileName? // TODO Lukas convert all "throw" into proper errors export class FileEmitter { @@ -111,70 +147,89 @@ export class FileEmitter { this.graph = graph; } - public emitFile = (emittedFile: EmittedFile): string => { + public emitFile = (emittedFile: unknown): string => { // TODO Lukas combine switch statements into object - switch (emittedFile.type) { - case 'asset': - return this.emitAsset(emittedFile); - case 'chunk': - return this.emitChunk(emittedFile); - default: - throw new Error(`Unhandled file type ${(emittedFile as any).type}`); + if (!hasValidType(emittedFile)) { + return error( + errFailedValidation( + `Emitted files must be of type "asset" or "chunk", received "${emittedFile && + (emittedFile as any).type}".` + ) + ); + } + if (!hasValidName(emittedFile)) { + return error( + errFailedValidation( + `The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths, received "${emittedFile.fileName || + emittedFile.name}".` + ) + ); + } + if (emittedFile.type === 'chunk') { + return this.emitChunk(emittedFile); + } else { + return this.emitAsset(emittedFile); } }; - private emitAsset(asset: EmittedAsset): string { - // TODO Lukas this could become shared validation - // TODO Lukas test validations - if ('fileName' in asset) { - if ('name' in asset) { - throw new Error('Cannot use both name and fileName'); - } - if (typeof asset.fileName !== 'string' || !isPlainPathFragment(asset.fileName)) { - throw new Error('Asset fileName must be non-relative, non-absolute path'); - } - } else if ('name' in asset) { - if (typeof asset.name !== 'string' || !isPlainPathFragment(asset.name)) { - return error(errInvalidAssetName(asset.name as string)); - } - } + private emitAsset(emittedAsset: EmittedFile): string { + const source = + typeof emittedAsset.source !== 'undefined' + ? getValidSource(emittedAsset.source, emittedAsset, null) + : undefined; const consumedAsset: ConsumedAsset = { - fileName: asset.fileName, - name: asset.name, - source: asset.source, + fileName: emittedAsset.fileName, + name: emittedAsset.name, + source, type: 'asset' }; if (this.output) { - if (asset.fileName) { - reserveFileNameInBundle(asset.fileName, this.output); + if (emittedAsset.fileName) { + reserveFileNameInBundle(emittedAsset.fileName, this.output); } - if (asset.source !== undefined) { + if (source !== undefined) { if (typeof consumedAsset.fileName !== 'string') { consumedAsset.fileName = getAssetFileName( consumedAsset.name || 'asset', - asset.source, + source, this.output ); } addAssetToBundle(consumedAsset as CompleteAsset, this.output); } } - return this.assignReferenceId(consumedAsset, asset.fileName || asset.name || asset.type); + return this.assignReferenceId( + consumedAsset, + emittedAsset.fileName || emittedAsset.name || emittedAsset.type + ); } - private emitChunk(chunk: EmittedChunk): string { + private emitChunk(emittedChunk: EmittedFile): string { if (this.graph.phase > BuildPhase.LOAD_AND_PARSE) { error(errInvalidRollupPhaseForChunkEmission()); } + if (typeof emittedChunk.id !== 'string') { + return error( + errFailedValidation( + `Emitted chunks need to have a valid string id, received "${emittedChunk.id}"` + ) + ); + } const consumedChunk: ConsumedChunk = { - fileName: chunk.fileName, + fileName: emittedChunk.fileName, module: null, - name: chunk.name || chunk.id, + name: emittedChunk.name || emittedChunk.id, type: 'chunk' }; this.graph.moduleLoader .addEntryModules( - [{ fileName: chunk.fileName || null, name: chunk.name || null, id: chunk.id }], + [ + { + fileName: emittedChunk.fileName || null, + id: emittedChunk.id, + name: emittedChunk.name || null + } + ], false ) .then(({ newEntryModules: [module] }) => { @@ -185,7 +240,7 @@ export class FileEmitter { // once module loading has finished }); - return this.assignReferenceId(consumedChunk, chunk.id); + return this.assignReferenceId(consumedChunk, emittedChunk.id); } private assignReferenceId(file: ConsumedFile, idBase: string): string { @@ -236,16 +291,20 @@ export class FileEmitter { // TODO Lukas this should only be allowed // - unlimited times during build phase or // - at most once during generate phase if no source has been set yet - public setAssetSource = (fileReferenceId: string, source?: string | Buffer) => { + public setAssetSource = (fileReferenceId: string, requestedSource: unknown) => { const emittedFile = this.filesByReferenceId.get(fileReferenceId); if (!emittedFile) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); - if (emittedFile.type !== 'asset') throw new Error('cannot set source for chunk'); - if (emittedFile.source !== undefined) + if (emittedFile.type !== 'asset') { + return error( + errFailedValidation( + `Asset sources can only be set for emitted assets but "${fileReferenceId}" is an emitted chunk.` + ) + ); + } + if (emittedFile.source !== undefined) { return error(errAssetSourceAlreadySet(emittedFile.name || fileReferenceId)); - // TODO Lukas check for string | Buffer instead? - if (typeof source !== 'string' && !source) { - return error(errAssetSourceMissingForSetSource(emittedFile.name || fileReferenceId)); } + const source = getValidSource(requestedSource, emittedFile, fileReferenceId); if (this.output) { const fileName = emittedFile.fileName || getAssetFileName(emittedFile.name || 'asset', source, this.output); diff --git a/src/utils/error.ts b/src/utils/error.ts index 2ee1f5b82e0..4aa71f19406 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -5,7 +5,7 @@ import getCodeFrame from './getCodeFrame'; import relativeId from './relativeId'; export function error(base: Error | RollupError, props?: RollupError): never { - if (base instanceof Error === false) base = Object.assign(new Error(base.message), base); + if (!(base instanceof Error)) base = Object.assign(new Error(base.message), base); if (props) Object.assign(base, props); throw base; } @@ -42,7 +42,6 @@ export enum Errors { DEPRECATED_FEATURE = 'DEPRECATED_FEATURE', FILE_NOT_FOUND = 'FILE_NOT_FOUND', FILE_NAME_CONFLICT = 'FILE_NAME_CONFLICT', - INVALID_ASSET_NAME = 'INVALID_ASSET_NAME', INVALID_CHUNK = 'INVALID_CHUNK', INVALID_EXTERNAL_ID = 'INVALID_EXTERNAL_ID', INVALID_OPTION = 'INVALID_OPTION', @@ -50,7 +49,8 @@ export enum Errors { INVALID_ROLLUP_PHASE = 'INVALID_ROLLUP_PHASE', NAMESPACE_CONFLICT = 'NAMESPACE_CONFLICT', UNRESOLVED_ENTRY = 'UNRESOLVED_ENTRY', - UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT' + UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT', + VALIDATION_ERROR = 'VALIDATION_ERROR' } export function errAssetNotFinalisedForFileName(name: string) { @@ -88,13 +88,6 @@ export function errAssetSourceAlreadySet(name: string) { }; } -export function errAssetSourceMissingForSetSource(name: string) { - return { - code: Errors.ASSET_SOURCE_MISSING, - message: `Plugin error creating asset "${name}", setAssetSource call without a source.` - }; -} - export function errNoAssetSourceSet(assetName: string) { return { code: Errors.ASSET_SOURCE_MISSING, @@ -132,13 +125,6 @@ export function errFileNameConflict(fileName: string) { }; } -export function errInvalidAssetName(name: string) { - return { - code: Errors.INVALID_ASSET_NAME, - message: `Plugin error creating asset, name "${name}" is not a plain (non relative or absolute URL) string name.` - }; -} - export function errCannotAssignModuleToChunk( moduleId: string, assignToAlias: string, @@ -232,3 +218,10 @@ export function errUnresolvedImportTreatedAsExternal(source: string, importer: s url: 'https://rollupjs.org/guide/en/#warning-treating-module-as-external-dependency' }; } + +export function errFailedValidation(message: string) { + return { + code: Errors.VALIDATION_ERROR, + message + }; +} diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_config.js b/test/chunking-form/samples/emit-file/asset-file-names/_config.js index c1350154cbf..752a45ad3bd 100644 --- a/test/chunking-form/samples/emit-file/asset-file-names/_config.js +++ b/test/chunking-form/samples/emit-file/asset-file-names/_config.js @@ -9,7 +9,7 @@ module.exports = { } }, output: { - assetFileNames: '[ext]/[hash]-[name][extname]' + assetFileNames: '[ext][ignored]/[hash]-[name][extname]' } } }; diff --git a/test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js b/test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js index 6e1c9622897..feda0470a98 100644 --- a/test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js +++ b/test/function/samples/deprecated/emit-asset/asset-source-missing-3/_config.js @@ -13,8 +13,9 @@ module.exports = { error: { code: 'PLUGIN_ERROR', hook: 'buildStart', - message: 'Plugin error creating asset "test.ext", setAssetSource call without a source.', + message: + 'Could not set source for asset "test.ext", asset source needs to be a string of Buffer.', plugin: 'test-plugin', - pluginCode: 'ASSET_SOURCE_MISSING' + pluginCode: 'VALIDATION_ERROR' } }; diff --git a/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js b/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js index 33329f422ca..f807478d8f4 100644 --- a/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js +++ b/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js @@ -13,8 +13,8 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'Plugin error creating asset, name "/test.ext" is not a plain (non relative or absolute URL) string name.', + 'The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths, received "/test.ext".', plugin: 'test-plugin', - pluginCode: 'INVALID_ASSET_NAME' + pluginCode: 'VALIDATION_ERROR' } }; diff --git a/test/function/samples/emit-file/asset-source-missing-3/_config.js b/test/function/samples/emit-file/asset-source-missing-3/_config.js index bfc07ac697a..c91523c65dc 100644 --- a/test/function/samples/emit-file/asset-source-missing-3/_config.js +++ b/test/function/samples/emit-file/asset-source-missing-3/_config.js @@ -12,8 +12,9 @@ module.exports = { error: { code: 'PLUGIN_ERROR', hook: 'buildStart', - message: 'Plugin error creating asset "test.ext", setAssetSource call without a source.', + message: + 'Could not set source for asset "test.ext", asset source needs to be a string of Buffer.', plugin: 'test-plugin', - pluginCode: 'ASSET_SOURCE_MISSING' + pluginCode: 'VALIDATION_ERROR' } }; diff --git a/test/function/samples/emit-file/invalid-asset-name/_config.js b/test/function/samples/emit-file/invalid-asset-name/_config.js index b9fc62b43a4..1d58fe9c100 100644 --- a/test/function/samples/emit-file/invalid-asset-name/_config.js +++ b/test/function/samples/emit-file/invalid-asset-name/_config.js @@ -12,8 +12,8 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'Plugin error creating asset, name "/test.ext" is not a plain (non relative or absolute URL) string name.', + 'The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths, received "/test.ext".', plugin: 'test-plugin', - pluginCode: 'INVALID_ASSET_NAME' + pluginCode: 'VALIDATION_ERROR' } }; From 4087a2377d2ad152139f281a1f50c7a2a23f7092 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Mon, 22 Jul 2019 18:00:04 +0200 Subject: [PATCH 17/31] Test some more errors --- .../emit-file/invalid-chunk-id/_config.js | 18 ++++++++++++++++++ .../main.js | 0 .../emit-file/invalid-file-type/_config.js | 18 ++++++++++++++++++ .../emit-file/invalid-file-type/main.js | 1 + .../_config.js | 2 +- .../emit-file/invalid-reference-id/main.js | 1 + .../set-asset-source-chunk/_config.js | 19 +++++++++++++++++++ .../emit-file/set-asset-source-chunk/chunk.js | 1 + .../emit-file/set-asset-source-chunk/main.js | 1 + 9 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 test/function/samples/emit-file/invalid-chunk-id/_config.js rename test/function/samples/emit-file/{invalid-file-id => invalid-chunk-id}/main.js (100%) create mode 100644 test/function/samples/emit-file/invalid-file-type/_config.js create mode 100644 test/function/samples/emit-file/invalid-file-type/main.js rename test/function/samples/emit-file/{invalid-file-id => invalid-reference-id}/_config.js (85%) create mode 100644 test/function/samples/emit-file/invalid-reference-id/main.js create mode 100644 test/function/samples/emit-file/set-asset-source-chunk/_config.js create mode 100644 test/function/samples/emit-file/set-asset-source-chunk/chunk.js create mode 100644 test/function/samples/emit-file/set-asset-source-chunk/main.js diff --git a/test/function/samples/emit-file/invalid-chunk-id/_config.js b/test/function/samples/emit-file/invalid-chunk-id/_config.js new file mode 100644 index 00000000000..ed73d4d4776 --- /dev/null +++ b/test/function/samples/emit-file/invalid-chunk-id/_config.js @@ -0,0 +1,18 @@ +module.exports = { + description: 'throws for invalid chunk ids', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + this.emitFile({ type: 'chunk', id: null }); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: 'Emitted chunks need to have a valid string id, received "null"', + plugin: 'test-plugin', + pluginCode: 'VALIDATION_ERROR' + } +}; diff --git a/test/function/samples/emit-file/invalid-file-id/main.js b/test/function/samples/emit-file/invalid-chunk-id/main.js similarity index 100% rename from test/function/samples/emit-file/invalid-file-id/main.js rename to test/function/samples/emit-file/invalid-chunk-id/main.js diff --git a/test/function/samples/emit-file/invalid-file-type/_config.js b/test/function/samples/emit-file/invalid-file-type/_config.js new file mode 100644 index 00000000000..1c665fc2772 --- /dev/null +++ b/test/function/samples/emit-file/invalid-file-type/_config.js @@ -0,0 +1,18 @@ +module.exports = { + description: 'throws for invalid file types', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + this.emitFile({ type: 'unknown' }); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: 'Emitted files must be of type "asset" or "chunk", received "unknown".', + plugin: 'test-plugin', + pluginCode: 'VALIDATION_ERROR' + } +}; diff --git a/test/function/samples/emit-file/invalid-file-type/main.js b/test/function/samples/emit-file/invalid-file-type/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/invalid-file-type/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/invalid-file-id/_config.js b/test/function/samples/emit-file/invalid-reference-id/_config.js similarity index 85% rename from test/function/samples/emit-file/invalid-file-id/_config.js rename to test/function/samples/emit-file/invalid-reference-id/_config.js index 7325c5713bc..43e4e38420f 100644 --- a/test/function/samples/emit-file/invalid-file-id/_config.js +++ b/test/function/samples/emit-file/invalid-reference-id/_config.js @@ -1,5 +1,5 @@ module.exports = { - description: 'throws for invalid file ids', + description: 'throws for invalid reference ids', options: { plugins: { name: 'test-plugin', diff --git a/test/function/samples/emit-file/invalid-reference-id/main.js b/test/function/samples/emit-file/invalid-reference-id/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/invalid-reference-id/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/set-asset-source-chunk/_config.js b/test/function/samples/emit-file/set-asset-source-chunk/_config.js new file mode 100644 index 00000000000..27b97f89fb1 --- /dev/null +++ b/test/function/samples/emit-file/set-asset-source-chunk/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'throws when trying to set the asset source of a chunk', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + const referenceId = this.emitFile({ type: 'chunk', id: 'chunk' }); + this.setAssetSource(referenceId, 'hello world'); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: 'Asset sources can only be set for emitted assets but "6c87f683" is an emitted chunk.', + plugin: 'test-plugin', + pluginCode: 'VALIDATION_ERROR' + } +}; diff --git a/test/function/samples/emit-file/set-asset-source-chunk/chunk.js b/test/function/samples/emit-file/set-asset-source-chunk/chunk.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/set-asset-source-chunk/chunk.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/set-asset-source-chunk/main.js b/test/function/samples/emit-file/set-asset-source-chunk/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/set-asset-source-chunk/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); From 39fb3a4bf78180a3e0164ef4304d87fba9a2fead Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 23 Jul 2019 08:07:05 +0200 Subject: [PATCH 18/31] Refine file emission --- src/utils/FileEmitter.ts | 63 +++++++++---------- .../emit-file/set-asset-source/_config.js | 1 + .../set-asset-source/_expected/amd/main.js | 2 + .../set-asset-source/_expected/cjs/main.js | 2 + .../set-asset-source/_expected/es/main.js | 3 +- .../set-asset-source/_expected/system/main.js | 1 + .../asset-source-missing-4/_config.js | 20 ++++++ .../emit-file/asset-source-missing-4/main.js | 1 + 8 files changed, 58 insertions(+), 35 deletions(-) create mode 100644 test/function/samples/emit-file/asset-source-missing-4/_config.js create mode 100644 test/function/samples/emit-file/asset-source-missing-4/main.js diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index 2dacf2ffb16..f0407664be3 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -25,26 +25,27 @@ interface OutputSpecificFileData { bundle: OutputBundleWithPlaceholders; } -function getAssetFileName( - name: string, +function generateAssetFileName( + name: string | undefined, source: string | Buffer, output: OutputSpecificFileData ): string { + const emittedName = name || 'asset'; return makeUnique( renderNamePattern(output.assetFileNames, 'assetFileNames', placeholder => { switch (placeholder) { case 'hash': const hash = sha256(); - hash.update(name); + hash.update(emittedName); hash.update(':'); hash.update(source); return hash.digest('hex').substr(0, 8); case 'name': - return name.substr(0, name.length - extname(name).length); + return emittedName.substr(0, emittedName.length - extname(emittedName).length); case 'extname': - return extname(name); + return extname(emittedName); case 'ext': - return extname(name).substr(1); + return extname(emittedName).substr(1); } return ''; }), @@ -134,8 +135,21 @@ function getValidSource( return source; } -// TODO Lukas only access filename during generate? Or disallow setSource if there is a fileName? -// TODO Lukas convert all "throw" into proper errors +function getAssetFileName(file: ConsumedAsset, referenceId: string): string { + if (typeof file.fileName !== 'string') { + return error(errAssetNotFinalisedForFileName(file.name || referenceId)); + } + return file.fileName; +} + +function getChunkFileName(file: ConsumedChunk): string { + const fileName = + file.module && + (file.module.facadeChunk ? file.module.facadeChunk.id : (file.module.chunk as Chunk).id); + if (!fileName) return error(errChunkNotGeneratedForFileName(file.fileName || file.name)); + return fileName; +} + export class FileEmitter { private filesByReferenceId = new Map(); // tslint:disable member-ordering @@ -148,7 +162,6 @@ export class FileEmitter { } public emitFile = (emittedFile: unknown): string => { - // TODO Lukas combine switch statements into object if (!hasValidType(emittedFile)) { return error( errFailedValidation( @@ -189,11 +202,7 @@ export class FileEmitter { } if (source !== undefined) { if (typeof consumedAsset.fileName !== 'string') { - consumedAsset.fileName = getAssetFileName( - consumedAsset.name || 'asset', - source, - this.output - ); + consumedAsset.fileName = generateAssetFileName(consumedAsset.name, source, this.output); } addAssetToBundle(consumedAsset as CompleteAsset, this.output); } @@ -268,23 +277,10 @@ export class FileEmitter { public getFileName = (fileReferenceId: string) => { const emittedFile = this.filesByReferenceId.get(fileReferenceId); if (!emittedFile) return error(errFileReferenceIdNotFoundForFilename(fileReferenceId)); - switch (emittedFile.type) { - case 'asset': { - if (typeof emittedFile.fileName !== 'string') { - return error(errAssetNotFinalisedForFileName(emittedFile.name || fileReferenceId)); - } - return emittedFile.fileName; - } - case 'chunk': { - const fileName = - emittedFile.module && - (emittedFile.module.facadeChunk - ? emittedFile.module.facadeChunk.id - : (emittedFile.module.chunk as Chunk).id); - if (!fileName) - return error(errChunkNotGeneratedForFileName(emittedFile.fileName || emittedFile.name)); - return fileName; - } + if (emittedFile.type === 'chunk') { + return getChunkFileName(emittedFile); + } else { + return getAssetFileName(emittedFile, fileReferenceId); } }; @@ -307,7 +303,7 @@ export class FileEmitter { const source = getValidSource(requestedSource, emittedFile, fileReferenceId); if (this.output) { const fileName = - emittedFile.fileName || getAssetFileName(emittedFile.name || 'asset', source, this.output); + emittedFile.fileName || generateAssetFileName(emittedFile.name, source, this.output); // We must not modify the original assets to not interact with other outputs const assetWithSource = { ...emittedFile, fileName, source }; this.filesByReferenceId.set(fileReferenceId, assetWithSource); @@ -317,7 +313,6 @@ export class FileEmitter { } }; - // TODO Lukas how do we unfinalize assets for different outputs that have their source set during generate? Test! public startOutput(outputBundle: OutputBundleWithPlaceholders, assetFileNames: string) { this.filesByReferenceId = new Map(this.buildFilesByReferenceId); this.output = { @@ -333,7 +328,7 @@ export class FileEmitter { if (emittedFile.type === 'asset' && emittedFile.source !== undefined) { const fileName = emittedFile.fileName || - getAssetFileName(emittedFile.name || 'asset', emittedFile.source, this.output); + generateAssetFileName(emittedFile.name, emittedFile.source, this.output); // We must not modify the original assets to not interact with other outputs const assetWithFileName = { ...emittedFile, fileName }; this.filesByReferenceId.set(referenceId, assetWithFileName); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_config.js b/test/chunking-form/samples/emit-file/set-asset-source/_config.js index 3e20c925b01..c70db0ddc39 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_config.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_config.js @@ -36,6 +36,7 @@ module.exports = { return ( `export const renderStart = import.meta.ROLLUP_FILE_URL_${renderStart};\n` + `export const renderStartNamed = import.meta.ROLLUP_FILE_URL_${renderStartNamed};\n` + + `export const renderStartNamedImmediately = '${this.getFileName(renderStartNamed)}';\n` + `export const banner = import.meta.ROLLUP_FILE_URL_${banner};\n` + `export const bannerNamed = import.meta.ROLLUP_FILE_URL_${bannerNamed};\n` + `export const footer = import.meta.ROLLUP_FILE_URL_${footer};\n` + diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js index 36fada2557d..6dd36994c0f 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/amd/main.js @@ -2,6 +2,7 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; const renderStart = new URL(require.toUrl('./assets/renderStart-66600c78.txt'), document.baseURI).href; const renderStartNamed = new URL(require.toUrl('./renderStart.txt'), document.baseURI).href; + const renderStartNamedImmediately = 'renderStart.txt'; const banner = new URL(require.toUrl('./assets/banner-2b65cc0c.txt'), document.baseURI).href; const bannerNamed = new URL(require.toUrl('./banner.txt'), document.baseURI).href; const footer = new URL(require.toUrl('./assets/footer-e1d2fccb.txt'), document.baseURI).href; @@ -21,6 +22,7 @@ define(['require', 'exports'], function (require, exports) { 'use strict'; exports.outroNamed = outroNamed; exports.renderStart = renderStart; exports.renderStartNamed = renderStartNamed; + exports.renderStartNamedImmediately = renderStartNamedImmediately; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js index f04e852e328..51058623000 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/cjs/main.js @@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); const renderStart = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/renderStart-66600c78.txt').href : new URL('assets/renderStart-66600c78.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const renderStartNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/renderStart.txt').href : new URL('renderStart.txt', document.currentScript && document.currentScript.src || document.baseURI).href); +const renderStartNamedImmediately = 'renderStart.txt'; const banner = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/banner-2b65cc0c.txt').href : new URL('assets/banner-2b65cc0c.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const bannerNamed = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/banner.txt').href : new URL('banner.txt', document.currentScript && document.currentScript.src || document.baseURI).href); const footer = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/assets/footer-e1d2fccb.txt').href : new URL('assets/footer-e1d2fccb.txt', document.currentScript && document.currentScript.src || document.baseURI).href); @@ -23,3 +24,4 @@ exports.outro = outro; exports.outroNamed = outroNamed; exports.renderStart = renderStart; exports.renderStartNamed = renderStartNamed; +exports.renderStartNamedImmediately = renderStartNamedImmediately; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js index 80663455970..067f0c112fc 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/es/main.js @@ -1,5 +1,6 @@ const renderStart = new URL('assets/renderStart-66600c78.txt', import.meta.url).href; const renderStartNamed = new URL('renderStart.txt', import.meta.url).href; +const renderStartNamedImmediately = 'renderStart.txt'; const banner = new URL('assets/banner-2b65cc0c.txt', import.meta.url).href; const bannerNamed = new URL('banner.txt', import.meta.url).href; const footer = new URL('assets/footer-e1d2fccb.txt', import.meta.url).href; @@ -9,4 +10,4 @@ const introNamed = new URL('intro.txt', import.meta.url).href; const outro = new URL('assets/outro-21f77720.txt', import.meta.url).href; const outroNamed = new URL('outro.txt', import.meta.url).href; -export { banner, bannerNamed, footer, footerNamed, intro, introNamed, outro, outroNamed, renderStart, renderStartNamed }; +export { banner, bannerNamed, footer, footerNamed, intro, introNamed, outro, outroNamed, renderStart, renderStartNamed, renderStartNamedImmediately }; diff --git a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js index 3367de29bd4..5910199d4fd 100644 --- a/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/set-asset-source/_expected/system/main.js @@ -5,6 +5,7 @@ System.register([], function (exports, module) { const renderStart = exports('renderStart', new URL('assets/renderStart-66600c78.txt', module.meta.url).href); const renderStartNamed = exports('renderStartNamed', new URL('renderStart.txt', module.meta.url).href); + const renderStartNamedImmediately = exports('renderStartNamedImmediately', 'renderStart.txt'); const banner = exports('banner', new URL('assets/banner-2b65cc0c.txt', module.meta.url).href); const bannerNamed = exports('bannerNamed', new URL('banner.txt', module.meta.url).href); const footer = exports('footer', new URL('assets/footer-e1d2fccb.txt', module.meta.url).href); diff --git a/test/function/samples/emit-file/asset-source-missing-4/_config.js b/test/function/samples/emit-file/asset-source-missing-4/_config.js new file mode 100644 index 00000000000..85e314793fe --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing-4/_config.js @@ -0,0 +1,20 @@ +module.exports = { + description: 'throws when accessing the file name before the asset source is set', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + const assetId = this.emitFile({ type: 'asset', name: 'test.ext' }); + this.getFileName(assetId); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: + 'Plugin error - Unable to get file name for asset "test.ext". Ensure that the source is set and that generate is called first.', + plugin: 'test-plugin', + pluginCode: 'ASSET_NOT_FINALISED' + } +}; diff --git a/test/function/samples/emit-file/asset-source-missing-4/main.js b/test/function/samples/emit-file/asset-source-missing-4/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing-4/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); From d58306809ea6f32259e33f62f23fd47f4ad65d0e Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 24 Jul 2019 06:58:50 +0200 Subject: [PATCH 19/31] Refactor file emitter to have a single code path for asset finalization --- src/utils/FileEmitter.ts | 161 ++++++++++++++++++------------------ src/utils/assignChunkIds.ts | 1 - src/utils/pluginDriver.ts | 2 +- 3 files changed, 80 insertions(+), 84 deletions(-) diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index f0407664be3..82a048a608e 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -55,14 +55,6 @@ function generateAssetFileName( type CompleteAsset = ConsumedAsset & { fileName: string; source: string | Buffer }; -function addAssetToBundle(asset: CompleteAsset, output: OutputSpecificFileData) { - output.bundle[asset.fileName] = { - fileName: asset.fileName, - isAsset: true, - source: asset.source - }; -} - function reserveFileNameInBundle(fileName: string, output: OutputSpecificFileData) { if (fileName in output.bundle) { return error(errFileNameConflict(fileName)); @@ -185,6 +177,62 @@ export class FileEmitter { } }; + public getFileName = (fileReferenceId: string) => { + const emittedFile = this.filesByReferenceId.get(fileReferenceId); + if (!emittedFile) return error(errFileReferenceIdNotFoundForFilename(fileReferenceId)); + if (emittedFile.type === 'chunk') { + return getChunkFileName(emittedFile); + } else { + return getAssetFileName(emittedFile, fileReferenceId); + } + }; + + public setAssetSource = (referenceId: string, requestedSource: unknown) => { + const consumedFile = this.filesByReferenceId.get(referenceId); + if (!consumedFile) return error(errAssetReferenceIdNotFoundForSetSource(referenceId)); + if (consumedFile.type !== 'asset') { + return error( + errFailedValidation( + `Asset sources can only be set for emitted assets but "${referenceId}" is an emitted chunk.` + ) + ); + } + if (consumedFile.source !== undefined) { + return error(errAssetSourceAlreadySet(consumedFile.name || referenceId)); + } + const source = getValidSource(requestedSource, consumedFile, referenceId); + if (this.output) { + this.finalizeAsset(consumedFile, source, referenceId, this.output); + } else { + consumedFile.source = source; + } + }; + + public startOutput(outputBundle: OutputBundleWithPlaceholders, assetFileNames: string) { + this.filesByReferenceId = new Map(this.buildFilesByReferenceId); + this.output = { + assetFileNames, + bundle: outputBundle + }; + for (const emittedFile of this.filesByReferenceId.values()) { + if (emittedFile.fileName) { + reserveFileNameInBundle(emittedFile.fileName, this.output); + } + } + for (const [referenceId, consumedFile] of this.filesByReferenceId.entries()) { + if (consumedFile.type === 'asset' && consumedFile.source !== undefined) { + this.finalizeAsset(consumedFile, consumedFile.source, referenceId, this.output); + } + } + } + + public assertAssetsFinalized() { + for (const [referenceId, emittedFile] of this.filesByReferenceId.entries()) { + if (emittedFile.type === 'asset' && typeof emittedFile.fileName !== 'string') + error(errNoAssetSourceSet(emittedFile.name || referenceId)); + } + } + private emitAsset(emittedAsset: EmittedFile): string { const source = typeof emittedAsset.source !== 'undefined' @@ -196,21 +244,19 @@ export class FileEmitter { source, type: 'asset' }; + const referenceId = this.assignReferenceId( + consumedAsset, + emittedAsset.fileName || emittedAsset.name || emittedAsset.type + ); if (this.output) { if (emittedAsset.fileName) { reserveFileNameInBundle(emittedAsset.fileName, this.output); } if (source !== undefined) { - if (typeof consumedAsset.fileName !== 'string') { - consumedAsset.fileName = generateAssetFileName(consumedAsset.name, source, this.output); - } - addAssetToBundle(consumedAsset as CompleteAsset, this.output); + this.finalizeAsset(consumedAsset, source, referenceId, this.output); } } - return this.assignReferenceId( - consumedAsset, - emittedAsset.fileName || emittedAsset.name || emittedAsset.type - ); + return referenceId; } private emitChunk(emittedChunk: EmittedFile): string { @@ -267,73 +313,24 @@ export class FileEmitter { return referenceId; } - public finaliseAssets() { - for (const [referenceId, emittedFile] of this.filesByReferenceId.entries()) { - if (emittedFile.type === 'asset' && typeof emittedFile.fileName !== 'string') - error(errNoAssetSourceSet(emittedFile.name || referenceId)); - } - } - - public getFileName = (fileReferenceId: string) => { - const emittedFile = this.filesByReferenceId.get(fileReferenceId); - if (!emittedFile) return error(errFileReferenceIdNotFoundForFilename(fileReferenceId)); - if (emittedFile.type === 'chunk') { - return getChunkFileName(emittedFile); - } else { - return getAssetFileName(emittedFile, fileReferenceId); - } - }; - - // TODO Lukas this should only be allowed - // - unlimited times during build phase or - // - at most once during generate phase if no source has been set yet - public setAssetSource = (fileReferenceId: string, requestedSource: unknown) => { - const emittedFile = this.filesByReferenceId.get(fileReferenceId); - if (!emittedFile) return error(errAssetReferenceIdNotFoundForSetSource(fileReferenceId)); - if (emittedFile.type !== 'asset') { - return error( - errFailedValidation( - `Asset sources can only be set for emitted assets but "${fileReferenceId}" is an emitted chunk.` - ) - ); - } - if (emittedFile.source !== undefined) { - return error(errAssetSourceAlreadySet(emittedFile.name || fileReferenceId)); - } - const source = getValidSource(requestedSource, emittedFile, fileReferenceId); - if (this.output) { - const fileName = - emittedFile.fileName || generateAssetFileName(emittedFile.name, source, this.output); - // We must not modify the original assets to not interact with other outputs - const assetWithSource = { ...emittedFile, fileName, source }; - this.filesByReferenceId.set(fileReferenceId, assetWithSource); - addAssetToBundle(assetWithSource, this.output); - } else { - emittedFile.source = source; + // TODO deduplicate assets + private finalizeAsset( + consumedFile: ConsumedFile, + source: string | Buffer, + referenceId: string, + output: OutputSpecificFileData + ) { + const fileName = + consumedFile.fileName || generateAssetFileName(consumedFile.name, source, output); + // We must not modify the original assets to avoid interaction between outputs + const assetWithFileName = { ...consumedFile, source, fileName }; + if (referenceId) { + this.filesByReferenceId.set(referenceId, assetWithFileName); } - }; - - public startOutput(outputBundle: OutputBundleWithPlaceholders, assetFileNames: string) { - this.filesByReferenceId = new Map(this.buildFilesByReferenceId); - this.output = { - assetFileNames, - bundle: outputBundle + output.bundle[(assetWithFileName as CompleteAsset).fileName] = { + fileName: (assetWithFileName as CompleteAsset).fileName, + isAsset: true, + source: (assetWithFileName as CompleteAsset).source }; - for (const emittedFile of this.filesByReferenceId.values()) { - if (emittedFile.fileName) { - reserveFileNameInBundle(emittedFile.fileName, this.output); - } - } - for (const [referenceId, emittedFile] of this.filesByReferenceId.entries()) { - if (emittedFile.type === 'asset' && emittedFile.source !== undefined) { - const fileName = - emittedFile.fileName || - generateAssetFileName(emittedFile.name, emittedFile.source, this.output); - // We must not modify the original assets to not interact with other outputs - const assetWithFileName = { ...emittedFile, fileName }; - this.filesByReferenceId.set(referenceId, assetWithFileName); - addAssetToBundle(assetWithFileName as CompleteAsset, this.output); - } - } } } diff --git a/src/utils/assignChunkIds.ts b/src/utils/assignChunkIds.ts index 884cc77da38..53522d68788 100644 --- a/src/utils/assignChunkIds.ts +++ b/src/utils/assignChunkIds.ts @@ -32,7 +32,6 @@ export function assignChunkIds( if (outputOptions.file) { chunk.id = basename(outputOptions.file); } else if (inputOptions.preserveModules) { - // TODO Lukas how do we handle emitted chunks when preserving modules? chunk.id = chunk.generateIdPreserveModules(inputBase, bundle); } else if (facadeModule && facadeModule.chunkFileName) { chunk.id = facadeModule.chunkFileName; diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index d63df0592df..4c987276e3e 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -384,7 +384,7 @@ export function createPluginDriver( const pluginDriver: PluginDriver = { emitFile: fileEmitter.emitFile, finaliseAssets() { - fileEmitter.finaliseAssets(); + fileEmitter.assertAssetsFinalized(); }, getFileName: fileEmitter.getFileName, hasLoadersOrTransforms, From a2316a5c6458827fea3c2bcce2924e1cd3ac5c56 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 24 Jul 2019 07:58:31 +0200 Subject: [PATCH 20/31] Deduplicated emitted assets without a specific file name --- src/utils/FileEmitter.ts | 47 ++++++++++++------- ...{logo2-c943ca3c.svg => logo2-6d5979e4.svg} | 2 +- .../emit-asset/_expected/amd/nested/chunk2.js | 2 +- ...{logo2-c943ca3c.svg => logo2-6d5979e4.svg} | 2 +- .../emit-asset/_expected/cjs/nested/chunk2.js | 2 +- ...{logo2-c943ca3c.svg => logo2-6d5979e4.svg} | 2 +- .../emit-asset/_expected/es/nested/chunk2.js | 2 +- ...{logo2-c943ca3c.svg => logo2-6d5979e4.svg} | 2 +- .../_expected/system/nested/chunk2.js | 2 +- .../samples/deprecated/emit-asset/logo2.svg | 2 +- .../emit-file/deduplicate-assets/_config.js | 31 ++++++++++++ .../_expected/amd/assets/buffer-5a245d77.txt | 1 + .../_expected/amd/assets/string-be268e3d.txt | 1 + .../deduplicate-assets/_expected/amd/main.js | 5 ++ .../_expected/amd/named/buffer.txt | 1 + .../_expected/amd/named/string.txt | 1 + .../_expected/cjs/assets/buffer-5a245d77.txt | 1 + .../_expected/cjs/assets/string-be268e3d.txt | 1 + .../deduplicate-assets/_expected/cjs/main.js | 3 ++ .../_expected/cjs/named/buffer.txt | 1 + .../_expected/cjs/named/string.txt | 1 + .../_expected/es/assets/buffer-5a245d77.txt | 1 + .../_expected/es/assets/string-be268e3d.txt | 1 + .../deduplicate-assets/_expected/es/main.js | 1 + .../_expected/es/named/buffer.txt | 1 + .../_expected/es/named/string.txt | 1 + .../system/assets/buffer-5a245d77.txt | 1 + .../system/assets/string-be268e3d.txt | 1 + .../_expected/system/main.js | 10 ++++ .../_expected/system/named/buffer.txt | 1 + .../_expected/system/named/string.txt | 1 + .../emit-file/deduplicate-assets/main.js | 1 + .../_expected/amd/assets/logo2-6d5979e4.svg | 3 ++ .../_expected/amd/assets/logo2-c943ca3c.svg | 3 -- .../_expected/amd/nested/chunk2.js | 2 +- .../_expected/cjs/assets/logo2-6d5979e4.svg | 3 ++ .../_expected/cjs/assets/logo2-c943ca3c.svg | 3 -- .../_expected/cjs/nested/chunk2.js | 2 +- .../_expected/es/assets/logo2-6d5979e4.svg | 3 ++ .../_expected/es/assets/logo2-c943ca3c.svg | 3 -- .../_expected/es/nested/chunk2.js | 2 +- .../system/assets/logo2-6d5979e4.svg | 3 ++ .../system/assets/logo2-c943ca3c.svg | 3 -- .../_expected/system/nested/chunk2.js | 2 +- .../emit-file/reference-files/logo2.svg | 2 +- 45 files changed, 122 insertions(+), 44 deletions(-) rename test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/{logo2-c943ca3c.svg => logo2-6d5979e4.svg} (98%) rename test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/{logo2-c943ca3c.svg => logo2-6d5979e4.svg} (98%) rename test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/{logo2-c943ca3c.svg => logo2-6d5979e4.svg} (98%) rename test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/{logo2-c943ca3c.svg => logo2-6d5979e4.svg} (98%) create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_config.js create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-5a245d77.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-be268e3d.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/buffer.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/string.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-5a245d77.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-be268e3d.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/buffer.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/string.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-5a245d77.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-be268e3d.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/buffer.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/string.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-5a245d77.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-be268e3d.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/buffer.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/string.txt create mode 100644 test/chunking-form/samples/emit-file/deduplicate-assets/main.js create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-6d5979e4.svg delete mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-c943ca3c.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-6d5979e4.svg delete mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-c943ca3c.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-6d5979e4.svg delete mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-c943ca3c.svg create mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-6d5979e4.svg delete mode 100644 test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-c943ca3c.svg diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index 82a048a608e..a501d212e4c 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -2,7 +2,7 @@ import sha256 from 'hash.js/lib/hash/sha/256'; import Chunk from '../Chunk'; import Graph from '../Graph'; import Module from '../Module'; -import { OutputBundleWithPlaceholders } from '../rollup/types'; +import { OutputAsset, OutputBundleWithPlaceholders } from '../rollup/types'; import { BuildPhase } from './buildPhase'; import { errAssetNotFinalisedForFileName, @@ -53,13 +53,11 @@ function generateAssetFileName( ); } -type CompleteAsset = ConsumedAsset & { fileName: string; source: string | Buffer }; - -function reserveFileNameInBundle(fileName: string, output: OutputSpecificFileData) { - if (fileName in output.bundle) { +function reserveFileNameInBundle(fileName: string, bundle: OutputBundleWithPlaceholders) { + if (fileName in bundle) { return error(errFileNameConflict(fileName)); } - output.bundle[fileName] = FILE_PLACEHOLDER; + bundle[fileName] = FILE_PLACEHOLDER; } interface ConsumedChunk { @@ -86,7 +84,7 @@ interface EmittedFile { type ConsumedFile = ConsumedChunk | ConsumedAsset; export const FILE_PLACEHOLDER = { - placeholder: true + isPlaceholder: true }; function hasValidType( @@ -216,7 +214,7 @@ export class FileEmitter { }; for (const emittedFile of this.filesByReferenceId.values()) { if (emittedFile.fileName) { - reserveFileNameInBundle(emittedFile.fileName, this.output); + reserveFileNameInBundle(emittedFile.fileName, this.output.bundle); } } for (const [referenceId, consumedFile] of this.filesByReferenceId.entries()) { @@ -250,7 +248,7 @@ export class FileEmitter { ); if (this.output) { if (emittedAsset.fileName) { - reserveFileNameInBundle(emittedAsset.fileName, this.output); + reserveFileNameInBundle(emittedAsset.fileName, this.output.bundle); } if (source !== undefined) { this.finalizeAsset(consumedAsset, source, referenceId, this.output); @@ -313,7 +311,6 @@ export class FileEmitter { return referenceId; } - // TODO deduplicate assets private finalizeAsset( consumedFile: ConsumedFile, source: string | Buffer, @@ -321,16 +318,30 @@ export class FileEmitter { output: OutputSpecificFileData ) { const fileName = - consumedFile.fileName || generateAssetFileName(consumedFile.name, source, output); + consumedFile.fileName || + this.findExistingAssetFileNameWithSource(output.bundle, source) || + generateAssetFileName(consumedFile.name, source, output); + // We must not modify the original assets to avoid interaction between outputs const assetWithFileName = { ...consumedFile, source, fileName }; - if (referenceId) { - this.filesByReferenceId.set(referenceId, assetWithFileName); + this.filesByReferenceId.set(referenceId, assetWithFileName); + output.bundle[fileName] = { fileName, isAsset: true, source }; + } + + private findExistingAssetFileNameWithSource( + bundle: OutputBundleWithPlaceholders, + source: string | Buffer + ): string | null { + for (const fileName of Object.keys(bundle)) { + const outputFile = bundle[fileName] as OutputAsset; + if ( + outputFile.isAsset && + (Buffer.isBuffer(source) && Buffer.isBuffer(outputFile.source) + ? source.equals(outputFile.source) + : source === outputFile.source) + ) + return fileName; } - output.bundle[(assetWithFileName as CompleteAsset).fileName] = { - fileName: (assetWithFileName as CompleteAsset).fileName, - isAsset: true, - source: (assetWithFileName as CompleteAsset).source - }; + return null; } } diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-6d5979e4.svg similarity index 98% rename from test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-c943ca3c.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-6d5979e4.svg index cb7e52c5130..b446284a4cd 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-c943ca3c.svg +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/assets/logo2-6d5979e4.svg @@ -1,3 +1,3 @@ - + 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 ef79ac29c13..332eb53b021 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,6 +1,6 @@ define(['require', './chunk'], function (require, __chunk_1) { 'use strict'; - var logo = new URL(require.toUrl('../assets/logo2-c943ca3c.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('../assets/logo2-6d5979e4.svg'), document.baseURI).href; __chunk_1.showImage(logo); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-6d5979e4.svg similarity index 98% rename from test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-c943ca3c.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-6d5979e4.svg index cb7e52c5130..b446284a4cd 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-c943ca3c.svg +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/assets/logo2-6d5979e4.svg @@ -1,3 +1,3 @@ - + 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 360d0cbf6f9..d0cc5ad6ffa 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 @@ -2,6 +2,6 @@ var __chunk_1 = require('./chunk.js'); -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-c943ca3c.svg').href : new URL('../assets/logo2-c943ca3c.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +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); __chunk_1.showImage(logo); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-6d5979e4.svg similarity index 98% rename from test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-c943ca3c.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-6d5979e4.svg index cb7e52c5130..b446284a4cd 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-c943ca3c.svg +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/assets/logo2-6d5979e4.svg @@ -1,3 +1,3 @@ - + diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk2.js index f0caa2f9e11..509777851a0 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk2.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/es/nested/chunk2.js @@ -1,5 +1,5 @@ import { s as showImage } from './chunk.js'; -var logo = new URL('../assets/logo2-c943ca3c.svg', import.meta.url).href; +var logo = new URL('../assets/logo2-6d5979e4.svg', import.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-6d5979e4.svg similarity index 98% rename from test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-c943ca3c.svg rename to test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-6d5979e4.svg index cb7e52c5130..b446284a4cd 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-c943ca3c.svg +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/assets/logo2-6d5979e4.svg @@ -1,3 +1,3 @@ - + diff --git a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk2.js index aaeaa9950e6..6c53572799d 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk2.js +++ b/test/chunking-form/samples/deprecated/emit-asset/_expected/system/nested/chunk2.js @@ -7,7 +7,7 @@ System.register(['./chunk.js'], function (exports, module) { }], execute: function () { - var logo = new URL('../assets/logo2-c943ca3c.svg', module.meta.url).href; + var logo = new URL('../assets/logo2-6d5979e4.svg', module.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/deprecated/emit-asset/logo2.svg b/test/chunking-form/samples/deprecated/emit-asset/logo2.svg index cb7e52c5130..b446284a4cd 100644 --- a/test/chunking-form/samples/deprecated/emit-asset/logo2.svg +++ b/test/chunking-form/samples/deprecated/emit-asset/logo2.svg @@ -1,3 +1,3 @@ - + diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_config.js b/test/chunking-form/samples/emit-file/deduplicate-assets/_config.js new file mode 100644 index 00000000000..e9f0e506a81 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_config.js @@ -0,0 +1,31 @@ +module.exports = { + description: 'deduplicates asset that have the same source', + options: { + input: ['main.js'], + plugins: { + buildStart() { + this.emitFile({ type: 'asset', name: 'string.txt', source: 'hello world' }); + this.emitFile({ type: 'asset', name: 'otherString.txt', source: 'hello world' }); + this.emitFile({ + type: 'asset', + name: 'buffer.txt', + source: Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]) + }); + this.emitFile({ + type: 'asset', + name: 'otherBuffer.txt', + source: Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]) + }); + + // specific file names will not be deduplicated + this.emitFile({ type: 'asset', fileName: 'named/string.txt', source: 'hello world' }); + this.emitFile({ + type: 'asset', + fileName: 'named/buffer.txt', + source: Buffer.from([0x62, 0x75, 0x66, 0x66, 0x65, 0x72]) + }); + return null; + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-5a245d77.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-5a245d77.txt new file mode 100644 index 00000000000..ea75f1e9c19 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/buffer-5a245d77.txt @@ -0,0 +1 @@ +buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-be268e3d.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-be268e3d.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/assets/string-be268e3d.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/main.js b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/main.js new file mode 100644 index 00000000000..126aa22ee83 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/main.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('main'); + +}); diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/buffer.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/buffer.txt new file mode 100644 index 00000000000..ea75f1e9c19 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/buffer.txt @@ -0,0 +1 @@ +buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/string.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/string.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/amd/named/string.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-5a245d77.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-5a245d77.txt new file mode 100644 index 00000000000..ea75f1e9c19 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/buffer-5a245d77.txt @@ -0,0 +1 @@ +buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-be268e3d.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-be268e3d.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/assets/string-be268e3d.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/main.js new file mode 100644 index 00000000000..d0ed06d8c90 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/main.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/buffer.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/buffer.txt new file mode 100644 index 00000000000..ea75f1e9c19 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/buffer.txt @@ -0,0 +1 @@ +buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/string.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/string.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/cjs/named/string.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-5a245d77.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-5a245d77.txt new file mode 100644 index 00000000000..ea75f1e9c19 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/buffer-5a245d77.txt @@ -0,0 +1 @@ +buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-be268e3d.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-be268e3d.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/assets/string-be268e3d.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/main.js b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/buffer.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/buffer.txt new file mode 100644 index 00000000000..ea75f1e9c19 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/buffer.txt @@ -0,0 +1 @@ +buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/string.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/string.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/es/named/string.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-5a245d77.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-5a245d77.txt new file mode 100644 index 00000000000..ea75f1e9c19 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/buffer-5a245d77.txt @@ -0,0 +1 @@ +buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-be268e3d.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-be268e3d.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/assets/string-be268e3d.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/main.js b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/main.js new file mode 100644 index 00000000000..c83499bc2d4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/main.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('main'); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/buffer.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/buffer.txt new file mode 100644 index 00000000000..ea75f1e9c19 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/buffer.txt @@ -0,0 +1 @@ +buffer \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/string.txt b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/string.txt new file mode 100644 index 00000000000..95d09f2b101 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/_expected/system/named/string.txt @@ -0,0 +1 @@ +hello world \ No newline at end of file diff --git a/test/chunking-form/samples/emit-file/deduplicate-assets/main.js b/test/chunking-form/samples/emit-file/deduplicate-assets/main.js new file mode 100644 index 00000000000..c0b933d7b56 --- /dev/null +++ b/test/chunking-form/samples/emit-file/deduplicate-assets/main.js @@ -0,0 +1 @@ +console.log('main'); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-6d5979e4.svg new file mode 100644 index 00000000000..b446284a4cd --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-6d5979e4.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-c943ca3c.svg deleted file mode 100644 index cb7e52c5130..00000000000 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/amd/assets/logo2-c943ca3c.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - 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 ef79ac29c13..332eb53b021 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,6 +1,6 @@ define(['require', './chunk'], function (require, __chunk_1) { 'use strict'; - var logo = new URL(require.toUrl('../assets/logo2-c943ca3c.svg'), document.baseURI).href; + var logo = new URL(require.toUrl('../assets/logo2-6d5979e4.svg'), document.baseURI).href; __chunk_1.showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-6d5979e4.svg new file mode 100644 index 00000000000..b446284a4cd --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-6d5979e4.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-c943ca3c.svg deleted file mode 100644 index cb7e52c5130..00000000000 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/assets/logo2-c943ca3c.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - 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 360d0cbf6f9..d0cc5ad6ffa 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 @@ -2,6 +2,6 @@ var __chunk_1 = require('./chunk.js'); -var logo = (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/../assets/logo2-c943ca3c.svg').href : new URL('../assets/logo2-c943ca3c.svg', document.currentScript && document.currentScript.src || document.baseURI).href); +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); __chunk_1.showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-6d5979e4.svg new file mode 100644 index 00000000000..b446284a4cd --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-6d5979e4.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-c943ca3c.svg deleted file mode 100644 index cb7e52c5130..00000000000 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/es/assets/logo2-c943ca3c.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk2.js b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk2.js index f0caa2f9e11..509777851a0 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk2.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/es/nested/chunk2.js @@ -1,5 +1,5 @@ import { s as showImage } from './chunk.js'; -var logo = new URL('../assets/logo2-c943ca3c.svg', import.meta.url).href; +var logo = new URL('../assets/logo2-6d5979e4.svg', import.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-6d5979e4.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-6d5979e4.svg new file mode 100644 index 00000000000..b446284a4cd --- /dev/null +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-6d5979e4.svg @@ -0,0 +1,3 @@ + + + diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-c943ca3c.svg b/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-c943ca3c.svg deleted file mode 100644 index cb7e52c5130..00000000000 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/system/assets/logo2-c943ca3c.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk2.js b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk2.js index aaeaa9950e6..6c53572799d 100644 --- a/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk2.js +++ b/test/chunking-form/samples/emit-file/reference-files/_expected/system/nested/chunk2.js @@ -7,7 +7,7 @@ System.register(['./chunk.js'], function (exports, module) { }], execute: function () { - var logo = new URL('../assets/logo2-c943ca3c.svg', module.meta.url).href; + var logo = new URL('../assets/logo2-6d5979e4.svg', module.meta.url).href; showImage(logo); diff --git a/test/chunking-form/samples/emit-file/reference-files/logo2.svg b/test/chunking-form/samples/emit-file/reference-files/logo2.svg index cb7e52c5130..b446284a4cd 100644 --- a/test/chunking-form/samples/emit-file/reference-files/logo2.svg +++ b/test/chunking-form/samples/emit-file/reference-files/logo2.svg @@ -1,3 +1,3 @@ - + From 09725016f137e0f4e48f9a35255eff538907f810 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Tue, 30 Jul 2019 07:23:47 +0200 Subject: [PATCH 21/31] Only use the alias as name for a manual chunk if the chunk is not facade for an entry point --- src/Chunk.ts | 20 +++++-------------- .../_expected/amd/main1.js | 2 +- .../_expected/amd/{manual.js => main2.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/{manual.js => main2.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/{manual.js => main2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/{manual.js => main2.js} | 0 .../_config.js | 5 +++-- .../_expected/amd/generated-outer.js | 11 ---------- .../_expected/amd/main.js | 8 ++++++-- .../_expected/amd/main2.js | 5 +++++ .../_expected/cjs/generated-outer.js | 9 --------- .../_expected/cjs/main.js | 6 ++++-- .../_expected/cjs/main2.js | 4 ++++ .../_expected/es/generated-outer.js | 7 ------- .../_expected/es/main.js | 8 +++++++- .../_expected/es/main2.js | 1 + .../_expected/system/generated-outer.js | 14 ------------- .../_expected/system/main.js | 9 +++++---- .../_expected/system/main2.js | 11 ++++++++++ .../main2.js | 1 + .../manual-chunk-is-entry-conflict/_config.js | 5 +++-- .../_expected/amd/generated-other.js | 11 ---------- .../_expected/amd/main.js | 8 ++++++-- .../_expected/amd/main2.js | 5 +++++ .../_expected/cjs/generated-other.js | 9 --------- .../_expected/cjs/main.js | 6 ++++-- .../_expected/cjs/main2.js | 4 ++++ .../_expected/es/generated-other.js | 7 ------- .../_expected/es/main.js | 8 +++++++- .../_expected/es/main2.js | 1 + .../_expected/system/generated-other.js | 14 ------------- .../_expected/system/main.js | 9 +++++---- .../_expected/system/main2.js | 11 ++++++++++ .../manual-chunk-is-entry-conflict/main2.js | 1 + ...rated-dynamic.js => generated-dynamic1.js} | 0 .../_expected/amd/generated-dynamic2.js | 2 +- .../_expected/amd/generated-dynamic3.js | 2 +- .../_expected/amd/main.js | 4 ++-- ...rated-dynamic.js => generated-dynamic1.js} | 0 .../_expected/cjs/generated-dynamic2.js | 2 +- .../_expected/cjs/generated-dynamic3.js | 2 +- .../_expected/cjs/main.js | 4 ++-- ...rated-dynamic.js => generated-dynamic1.js} | 0 .../_expected/es/generated-dynamic2.js | 2 +- .../_expected/es/generated-dynamic3.js | 2 +- .../_expected/es/main.js | 4 ++-- ...rated-dynamic.js => generated-dynamic1.js} | 0 .../_expected/system/generated-dynamic2.js | 2 +- .../_expected/system/generated-dynamic3.js | 2 +- .../_expected/system/main.js | 4 ++-- .../_expected/amd/generated-dynamic1.js | 2 +- ...rated-dynamic.js => generated-dynamic2.js} | 0 .../_expected/amd/main.js | 2 +- .../_expected/cjs/generated-dynamic1.js | 2 +- ...rated-dynamic.js => generated-dynamic2.js} | 0 .../_expected/cjs/main.js | 2 +- .../_expected/es/generated-dynamic1.js | 2 +- ...rated-dynamic.js => generated-dynamic2.js} | 0 .../_expected/es/main.js | 2 +- .../_expected/system/generated-dynamic1.js | 2 +- ...rated-dynamic.js => generated-dynamic2.js} | 0 .../_expected/system/main.js | 2 +- .../_expected/amd/{chunk-a.js => main-a.js} | 0 .../_expected/cjs/{chunk-a.js => main-a.js} | 0 .../_expected/es/{chunk-a.js => main-a.js} | 0 .../system/{chunk-a.js => main-a.js} | 0 69 files changed, 127 insertions(+), 147 deletions(-) rename test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/{manual.js => main2.js} (100%) rename test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/{manual.js => main2.js} (100%) rename test/chunking-form/samples/manual-chunk-avoid-facade/_expected/es/{manual.js => main2.js} (100%) rename test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/{manual.js => main2.js} (100%) delete mode 100644 test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/generated-outer.js create mode 100644 test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main2.js delete mode 100644 test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/generated-outer.js create mode 100644 test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main2.js delete mode 100644 test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/generated-outer.js create mode 100644 test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main2.js delete mode 100644 test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/generated-outer.js create mode 100644 test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js create mode 100644 test/chunking-form/samples/manual-chunk-contains-entry-conflict/main2.js delete mode 100644 test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/generated-other.js create mode 100644 test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main2.js delete mode 100644 test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/generated-other.js create mode 100644 test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main2.js delete mode 100644 test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/generated-other.js create mode 100644 test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main2.js delete mode 100644 test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/generated-other.js create mode 100644 test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js create mode 100644 test/chunking-form/samples/manual-chunk-is-entry-conflict/main2.js rename test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/{generated-dynamic.js => generated-dynamic1.js} (100%) rename test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/{generated-dynamic.js => generated-dynamic1.js} (100%) rename test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/{generated-dynamic.js => generated-dynamic1.js} (100%) rename test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/{generated-dynamic.js => generated-dynamic1.js} (100%) rename test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/{generated-dynamic.js => generated-dynamic2.js} (100%) rename test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/{generated-dynamic.js => generated-dynamic2.js} (100%) rename test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/{generated-dynamic.js => generated-dynamic2.js} (100%) rename test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/{generated-dynamic.js => generated-dynamic2.js} (100%) rename test/chunking-form/samples/manual-chunks-function/_expected/amd/{chunk-a.js => main-a.js} (100%) rename test/chunking-form/samples/manual-chunks-function/_expected/cjs/{chunk-a.js => main-a.js} (100%) rename test/chunking-form/samples/manual-chunks-function/_expected/es/{chunk-a.js => main-a.js} (100%) rename test/chunking-form/samples/manual-chunks-function/_expected/system/{chunk-a.js => main-a.js} (100%) diff --git a/src/Chunk.ts b/src/Chunk.ts index 9dada196dd6..99761ed1e33 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -195,13 +195,7 @@ export default class Chunk { } } - canModuleBeFacade( - moduleExportNamesByVariable: Map, - moduleChunkAlias: string | null - ): boolean { - if (this.manualChunkAlias && moduleChunkAlias && this.manualChunkAlias !== moduleChunkAlias) { - return false; - } + canModuleBeFacade(moduleExportNamesByVariable: Map): boolean { for (const exposedVariable of this.exports) { if (!moduleExportNamesByVariable.has(exposedVariable)) { return false; @@ -215,10 +209,7 @@ export default class Chunk { for (const module of this.entryModules) { if (!this.facadeModule) { const exportNamesByVariable = module.getExportNamesByVariable(); - if ( - this.graph.preserveModules || - this.canModuleBeFacade(exportNamesByVariable, module.chunkName) - ) { + if (this.graph.preserveModules || this.canModuleBeFacade(exportNamesByVariable)) { this.facadeModule = module; for (const [variable, exportNames] of exportNamesByVariable) { for (const exportName of exportNames) { @@ -787,10 +778,6 @@ export default class Chunk { } private computeChunkName(): string { - // TODO Lukas test interaction with manual chunks - if (this.manualChunkAlias) { - return sanitizeFileName(this.manualChunkAlias); - } if (this.facadeModule !== null) { return sanitizeFileName( (this.facadeModule.chunkFileName && getAliasName(this.facadeModule.chunkFileName)) || @@ -798,6 +785,9 @@ export default class Chunk { getAliasName(this.facadeModule.id) ); } + if (this.manualChunkAlias) { + return sanitizeFileName(this.manualChunkAlias); + } for (const module of this.orderedModules) { if (module.chunkName) return sanitizeFileName(module.chunkName); } diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main1.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main1.js index 6b16473382c..a973f4d8de7 100644 --- a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main1.js +++ b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./manual'], function (manual) { 'use strict'; +define(['./main2'], function (manual) { 'use strict'; console.log('main', manual.reexported); diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/manual.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js similarity index 100% rename from test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/manual.js rename to test/chunking-form/samples/manual-chunk-avoid-facade/_expected/amd/main2.js diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main1.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main1.js index 05d27bd0aac..81de531a9bb 100644 --- a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main1.js +++ b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var manual = require('./manual.js'); +var manual = require('./main2.js'); console.log('main', manual.reexported); diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/manual.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js similarity index 100% rename from test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/manual.js rename to test/chunking-form/samples/manual-chunk-avoid-facade/_expected/cjs/main2.js diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/es/main1.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/es/main1.js index 4023c0017b1..6ba22536aa3 100644 --- a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/es/main1.js +++ b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { reexported as value } from './manual.js'; +import { reexported as value } from './main2.js'; console.log('main', value); diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/es/manual.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/es/main2.js similarity index 100% rename from test/chunking-form/samples/manual-chunk-avoid-facade/_expected/es/manual.js rename to test/chunking-form/samples/manual-chunk-avoid-facade/_expected/es/main2.js diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main1.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main1.js index 7118a7af492..36f1fb810be 100644 --- a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main1.js +++ b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./manual.js'], function () { +System.register(['./main2.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/manual.js b/test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main2.js similarity index 100% rename from test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/manual.js rename to test/chunking-form/samples/manual-chunk-avoid-facade/_expected/system/main2.js diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_config.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_config.js index e77c4240f0f..31b66fa814e 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_config.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_config.js @@ -1,8 +1,9 @@ module.exports = { - description: 'Creates proper facades if manual chunks contain entry chunks with different alias', + description: 'Uses entry alias if manual chunks contain entry chunks with different alias', options: { input: { - main: 'main.js' + main: 'main.js', + main2: 'main2.js' }, manualChunks: { outer: ['outer'] diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/generated-outer.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/generated-outer.js deleted file mode 100644 index 659be70e586..00000000000 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/generated-outer.js +++ /dev/null @@ -1,11 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - console.log('dep'); - - console.log('main'); - - const value = 42; - - exports.value = value; - -}); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js index bf9d53b546e..fc91f027a0e 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main.js @@ -1,8 +1,12 @@ -define(['exports', './generated-outer'], function (exports, main) { 'use strict'; +define(['exports'], function (exports) { 'use strict'; + console.log('dep'); + console.log('main'); - exports.value = main.value; + const value = 42; + + exports.value = value; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main2.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main2.js new file mode 100644 index 00000000000..0c144671364 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(['./main'], function (main) { 'use strict'; + + + +}); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/generated-outer.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/generated-outer.js deleted file mode 100644 index fe59aaab6b9..00000000000 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/generated-outer.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -console.log('dep'); - -console.log('main'); - -const value = 42; - -exports.value = value; diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js index d4b7fbb7259..5da9ebd5132 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main.js @@ -2,8 +2,10 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var main = require('./generated-outer.js'); +console.log('dep'); +console.log('main'); +const value = 42; -exports.value = main.value; +exports.value = value; diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main2.js new file mode 100644 index 00000000000..7ca8a520b06 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/cjs/main2.js @@ -0,0 +1,4 @@ +'use strict'; + +require('./main.js'); + diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/generated-outer.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/generated-outer.js deleted file mode 100644 index f3fca144ffd..00000000000 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/generated-outer.js +++ /dev/null @@ -1,7 +0,0 @@ -console.log('dep'); - -console.log('main'); - -const value = 42; - -export { value as v }; diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main.js index 8e1e1150271..132b27a8d7c 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main.js @@ -1 +1,7 @@ -export { v as value } from './generated-outer.js'; +console.log('dep'); + +console.log('main'); + +const value = 42; + +export { value }; diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main2.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main2.js new file mode 100644 index 00000000000..859ecc36bb9 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/es/main2.js @@ -0,0 +1 @@ +import './main.js'; diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/generated-outer.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/generated-outer.js deleted file mode 100644 index 64233ed6405..00000000000 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/generated-outer.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register([], function (exports) { - 'use strict'; - return { - execute: function () { - - console.log('dep'); - - console.log('main'); - - const value = exports('v', 42); - - } - }; -}); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main.js index e9a5e02cdd8..b92309e3bf3 100644 --- a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main.js @@ -1,12 +1,13 @@ -System.register(['./generated-outer.js'], function (exports) { +System.register([], function (exports) { 'use strict'; return { - setters: [function (module) { - exports('value', module.v); - }], execute: function () { + console.log('dep'); + console.log('main'); + + const value = exports('value', 42); } }; diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js new file mode 100644 index 00000000000..da731958b75 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/_expected/system/main2.js @@ -0,0 +1,11 @@ +System.register(['./main.js'], function () { + 'use strict'; + return { + setters: [function () {}], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/manual-chunk-contains-entry-conflict/main2.js b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/main2.js new file mode 100644 index 00000000000..d6cf3b02443 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-contains-entry-conflict/main2.js @@ -0,0 +1 @@ +import './dep.js'; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_config.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_config.js index d7c6eea6eba..3b18f870977 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_config.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_config.js @@ -1,8 +1,9 @@ module.exports = { - description: 'Creates proper facades if manual chunks are entry chunks with different alias', + description: 'Uses entry alias if manual chunks are entry chunks with different alias', options: { input: { - main: 'main.js' + main: 'main.js', + main2: 'main2.js' }, manualChunks: { other: ['main'] diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/generated-other.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/generated-other.js deleted file mode 100644 index 659be70e586..00000000000 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/generated-other.js +++ /dev/null @@ -1,11 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - console.log('dep'); - - console.log('main'); - - const value = 42; - - exports.value = value; - -}); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js index c5a19397b7d..fc91f027a0e 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main.js @@ -1,8 +1,12 @@ -define(['exports', './generated-other'], function (exports, main) { 'use strict'; +define(['exports'], function (exports) { 'use strict'; + console.log('dep'); + console.log('main'); - exports.value = main.value; + const value = 42; + + exports.value = value; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main2.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main2.js new file mode 100644 index 00000000000..0c144671364 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/amd/main2.js @@ -0,0 +1,5 @@ +define(['./main'], function (main) { 'use strict'; + + + +}); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/generated-other.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/generated-other.js deleted file mode 100644 index fe59aaab6b9..00000000000 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/generated-other.js +++ /dev/null @@ -1,9 +0,0 @@ -'use strict'; - -console.log('dep'); - -console.log('main'); - -const value = 42; - -exports.value = value; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js index 830a223da0b..5da9ebd5132 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main.js @@ -2,8 +2,10 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var main = require('./generated-other.js'); +console.log('dep'); +console.log('main'); +const value = 42; -exports.value = main.value; +exports.value = value; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main2.js new file mode 100644 index 00000000000..7ca8a520b06 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/cjs/main2.js @@ -0,0 +1,4 @@ +'use strict'; + +require('./main.js'); + diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/generated-other.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/generated-other.js deleted file mode 100644 index f3fca144ffd..00000000000 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/generated-other.js +++ /dev/null @@ -1,7 +0,0 @@ -console.log('dep'); - -console.log('main'); - -const value = 42; - -export { value as v }; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main.js index 3c5b3c20c93..132b27a8d7c 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main.js @@ -1 +1,7 @@ -export { v as value } from './generated-other.js'; +console.log('dep'); + +console.log('main'); + +const value = 42; + +export { value }; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main2.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main2.js new file mode 100644 index 00000000000..859ecc36bb9 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/es/main2.js @@ -0,0 +1 @@ +import './main.js'; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/generated-other.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/generated-other.js deleted file mode 100644 index 64233ed6405..00000000000 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/generated-other.js +++ /dev/null @@ -1,14 +0,0 @@ -System.register([], function (exports) { - 'use strict'; - return { - execute: function () { - - console.log('dep'); - - console.log('main'); - - const value = exports('v', 42); - - } - }; -}); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main.js index 7c35b746e8f..b92309e3bf3 100644 --- a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main.js @@ -1,12 +1,13 @@ -System.register(['./generated-other.js'], function (exports) { +System.register([], function (exports) { 'use strict'; return { - setters: [function (module) { - exports('value', module.v); - }], execute: function () { + console.log('dep'); + console.log('main'); + + const value = exports('value', 42); } }; diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js new file mode 100644 index 00000000000..da731958b75 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/_expected/system/main2.js @@ -0,0 +1,11 @@ +System.register(['./main.js'], function () { + 'use strict'; + return { + setters: [function () {}], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/manual-chunk-is-entry-conflict/main2.js b/test/chunking-form/samples/manual-chunk-is-entry-conflict/main2.js new file mode 100644 index 00000000000..d6cf3b02443 --- /dev/null +++ b/test/chunking-form/samples/manual-chunk-is-entry-conflict/main2.js @@ -0,0 +1 @@ +import './dep.js'; diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic1.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic.js rename to test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic1.js diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic2.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic2.js index 89b1bf75c5c..3efc4a24248 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic2.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic2.js @@ -1,4 +1,4 @@ -define(['exports', './generated-dynamic'], function (exports, dynamic) { 'use strict'; +define(['exports', './generated-dynamic1'], function (exports, dynamic) { 'use strict'; diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic3.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic3.js index 384c6292ada..b3ab5526279 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic3.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/generated-dynamic3.js @@ -1,4 +1,4 @@ -define(['exports', './generated-dynamic'], function (exports, dynamic) { 'use strict'; +define(['exports', './generated-dynamic1'], function (exports, dynamic) { 'use strict'; diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/main.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/main.js index 9558e0b7837..f727ac26ebc 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/amd/main.js @@ -1,6 +1,6 @@ -define(['require', './generated-dynamic'], function (require, dynamic) { 'use strict'; +define(['require', './generated-dynamic1'], function (require, dynamic) { 'use strict'; - Promise.all([new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }), new Promise(function (resolve, reject) { require(['./generated-dynamic2'], resolve, reject) }), new Promise(function (resolve, reject) { require(['./generated-dynamic3'], resolve, reject) })]).then( + Promise.all([new Promise(function (resolve, reject) { require(['./generated-dynamic1'], resolve, reject) }), new Promise(function (resolve, reject) { require(['./generated-dynamic2'], resolve, reject) }), new Promise(function (resolve, reject) { require(['./generated-dynamic3'], resolve, reject) })]).then( results => console.log(results, dynamic.DEP) ); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic1.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic.js rename to test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic1.js diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic2.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic2.js index cf43f7fbe57..53182ea2451 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic2.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic2.js @@ -1,6 +1,6 @@ 'use strict'; -var dynamic = require('./generated-dynamic.js'); +var dynamic = require('./generated-dynamic1.js'); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic3.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic3.js index 4ed30dd39c3..1c912459b86 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic3.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/generated-dynamic3.js @@ -1,6 +1,6 @@ 'use strict'; -var dynamic = require('./generated-dynamic.js'); +var dynamic = require('./generated-dynamic1.js'); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/main.js index 07eec1ca551..bf1cfffe0d9 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/cjs/main.js @@ -1,7 +1,7 @@ 'use strict'; -var dynamic = require('./generated-dynamic.js'); +var dynamic = require('./generated-dynamic1.js'); -Promise.all([new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }), new Promise(function (resolve) { resolve(require('./generated-dynamic2.js')); }), new Promise(function (resolve) { resolve(require('./generated-dynamic3.js')); })]).then( +Promise.all([new Promise(function (resolve) { resolve(require('./generated-dynamic1.js')); }), new Promise(function (resolve) { resolve(require('./generated-dynamic2.js')); }), new Promise(function (resolve) { resolve(require('./generated-dynamic3.js')); })]).then( results => console.log(results, dynamic.DEP) ); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic1.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic.js rename to test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic1.js diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic2.js index 73f483cb3eb..89ca034c123 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic2.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic2.js @@ -1 +1 @@ -export { DYNAMIC_2 } from './generated-dynamic.js'; +export { DYNAMIC_2 } from './generated-dynamic1.js'; diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic3.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic3.js index 44dcc838b09..9054e83572d 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic3.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/generated-dynamic3.js @@ -1 +1 @@ -export { DYNAMIC_3 } from './generated-dynamic.js'; +export { DYNAMIC_3 } from './generated-dynamic1.js'; diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/main.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/main.js index 4ed1bade3c1..3c4c2790945 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/es/main.js @@ -1,5 +1,5 @@ -import { DEP } from './generated-dynamic.js'; +import { DEP } from './generated-dynamic1.js'; -Promise.all([import('./generated-dynamic.js'), import('./generated-dynamic2.js'), import('./generated-dynamic3.js')]).then( +Promise.all([import('./generated-dynamic1.js'), import('./generated-dynamic2.js'), import('./generated-dynamic3.js')]).then( results => console.log(results, DEP) ); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic1.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic.js rename to test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic1.js diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic2.js index 06d1c404650..2be2040209b 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic2.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic2.js @@ -1,4 +1,4 @@ -System.register(['./generated-dynamic.js'], function (exports) { +System.register(['./generated-dynamic1.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic3.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic3.js index e1c23d0e130..9d5a4e5e400 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic3.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/generated-dynamic3.js @@ -1,4 +1,4 @@ -System.register(['./generated-dynamic.js'], function (exports) { +System.register(['./generated-dynamic1.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/main.js b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/main.js index 3b527719e90..e4c89cbec8e 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-facades/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-dynamic.js'], function (exports, module) { +System.register(['./generated-dynamic1.js'], function (exports, module) { 'use strict'; var DEP; return { @@ -7,7 +7,7 @@ System.register(['./generated-dynamic.js'], function (exports, module) { }], execute: function () { - Promise.all([module.import('./generated-dynamic.js'), module.import('./generated-dynamic2.js'), module.import('./generated-dynamic3.js')]).then( + Promise.all([module.import('./generated-dynamic1.js'), module.import('./generated-dynamic2.js'), module.import('./generated-dynamic3.js')]).then( results => console.log(results, DEP) ); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic1.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic1.js index b0ba64ff7d0..7099829631e 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic1.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic1.js @@ -1,4 +1,4 @@ -define(['exports', './generated-dynamic'], function (exports, dynamic) { 'use strict'; +define(['exports', './generated-dynamic2'], function (exports, dynamic) { 'use strict'; diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic2.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic.js rename to test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/generated-dynamic2.js diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/main.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/main.js index ca2fb108442..f4b35d93856 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/amd/main.js @@ -1,6 +1,6 @@ define(['require'], function (require) { 'use strict'; new Promise(function (resolve, reject) { require(['./generated-dynamic1'], resolve, reject) }).then(result => console.log(result)); - new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }).then(result => console.log(result)); + new Promise(function (resolve, reject) { require(['./generated-dynamic2'], resolve, reject) }).then(result => console.log(result)); }); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic1.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic1.js index 836352671d2..8c02507c538 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic1.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic1.js @@ -1,6 +1,6 @@ 'use strict'; -var dynamic = require('./generated-dynamic.js'); +var dynamic = require('./generated-dynamic2.js'); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic2.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic.js rename to test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/generated-dynamic2.js diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/main.js index 5f2da3636d4..53a6187adfd 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/cjs/main.js @@ -1,4 +1,4 @@ 'use strict'; new Promise(function (resolve) { resolve(require('./generated-dynamic1.js')); }).then(result => console.log(result)); -new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }).then(result => console.log(result)); +new Promise(function (resolve) { resolve(require('./generated-dynamic2.js')); }).then(result => console.log(result)); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic1.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic1.js index c1ec5610d56..9fd55a3cb1e 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic1.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic1.js @@ -1 +1 @@ -export { DYNAMIC_B as DYNAMIC_A, DYNAMIC_A as DYNAMIC_B } from './generated-dynamic.js'; +export { DYNAMIC_B as DYNAMIC_A, DYNAMIC_A as DYNAMIC_B } from './generated-dynamic2.js'; diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic2.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic.js rename to test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/generated-dynamic2.js diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/main.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/main.js index 56b8f8a4d28..14c93b850c3 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/main.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/es/main.js @@ -1,2 +1,2 @@ import('./generated-dynamic1.js').then(result => console.log(result)); -import('./generated-dynamic.js').then(result => console.log(result)); +import('./generated-dynamic2.js').then(result => console.log(result)); diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic1.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic1.js index bd46b39dd45..5e4764f520e 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic1.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic1.js @@ -1,4 +1,4 @@ -System.register(['./generated-dynamic.js'], function (exports) { +System.register(['./generated-dynamic2.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic2.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic.js rename to test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/generated-dynamic2.js diff --git a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/main.js b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/main.js index f2c39c717c5..bb4718f9bde 100644 --- a/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/main.js +++ b/test/chunking-form/samples/manual-chunks-dynamic-name-conflict/_expected/system/main.js @@ -4,7 +4,7 @@ System.register([], function (exports, module) { execute: function () { module.import('./generated-dynamic1.js').then(result => console.log(result)); - module.import('./generated-dynamic.js').then(result => console.log(result)); + module.import('./generated-dynamic2.js').then(result => console.log(result)); } }; diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/amd/chunk-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-function/_expected/amd/chunk-a.js rename to test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/cjs/chunk-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/cjs/main-a.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-function/_expected/cjs/chunk-a.js rename to test/chunking-form/samples/manual-chunks-function/_expected/cjs/main-a.js diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/es/chunk-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/es/main-a.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-function/_expected/es/chunk-a.js rename to test/chunking-form/samples/manual-chunks-function/_expected/es/main-a.js diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/system/chunk-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js similarity index 100% rename from test/chunking-form/samples/manual-chunks-function/_expected/system/chunk-a.js rename to test/chunking-form/samples/manual-chunks-function/_expected/system/main-a.js From 5078443e3ddcaf085f082733c62cceb2bb6f3c51 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Wed, 31 Jul 2019 07:53:37 +0200 Subject: [PATCH 22/31] Generate separate facades for duplicate named user-defined entry points --- src/Chunk.ts | 36 ++++++++++++++++--- src/Module.ts | 2 ++ src/ModuleLoader.ts | 9 +++-- src/utils/FileEmitter.ts | 6 ++-- .../emit-chunk-name-conflict/_config.js | 2 +- .../_expected/amd/generated-name2.js | 4 +-- .../_expected/amd/mainChunk.js | 5 +++ .../_expected/amd/other.js | 4 +-- .../_expected/cjs/generated-name2.js | 4 +-- .../_expected/cjs/mainChunk.js | 7 ++++ .../_expected/cjs/other.js | 6 ++-- .../_expected/es/generated-name2.js | 4 +-- .../_expected/es/mainChunk.js | 5 +++ .../_expected/es/other.js | 7 ++-- .../_expected/system/generated-name2.js | 2 +- .../_expected/system/mainChunk.js | 18 ++++++++++ .../_expected/system/other.js | 11 ++---- .../emit-chunk-name-conflict/main.js | 2 +- .../emit-file/named-user-chunks/_config.js | 18 ++++++++++ .../_expected/amd/mainChunk.js | 9 +++++ .../_expected/amd/mainChunkFacade.js | 9 +++++ .../_expected/cjs/mainChunk.js | 7 ++++ .../_expected/cjs/mainChunkFacade.js | 9 +++++ .../_expected/es/mainChunk.js | 3 ++ .../_expected/es/mainChunkFacade.js | 1 + .../_expected/system/mainChunk.js | 10 ++++++ .../_expected/system/mainChunkFacade.js | 13 +++++++ .../emit-file/named-user-chunks/main.js | 1 + 28 files changed, 179 insertions(+), 35 deletions(-) create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/mainChunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/mainChunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/mainChunk.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_config.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/mainChunk.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/mainChunkFacade.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunk.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunkFacade.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/main.js diff --git a/src/Chunk.ts b/src/Chunk.ts index 99761ed1e33..29343f1f0af 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -77,6 +77,11 @@ export interface ImportSpecifier { local: string; } +interface FacadeName { + fileName?: string; + name?: string; +} + function getGlobalName( module: ExternalModule, globals: GlobalsOption, @@ -110,13 +115,17 @@ export function isChunkRendered(chunk: Chunk): boolean { } export default class Chunk { - static generateFacade(graph: Graph, facadedModule: Module): Chunk { + static generateFacade(graph: Graph, facadedModule: Module, { name }: FacadeName): Chunk { const chunk = new Chunk(graph, []); chunk.dependencies = [facadedModule.chunk as Chunk]; - // TODO Lukas also copy id if it exists? + if (name) { + chunk.chunkName = name; + } chunk.dynamicDependencies = []; chunk.facadeModule = facadedModule; - facadedModule.facadeChunk = chunk; + if (!facadedModule.facadeChunk) { + facadedModule.facadeChunk = chunk; + } for (const exportName of facadedModule.getAllExportNames()) { const tracedVariable = facadedModule.getVariableForExportName(exportName); chunk.exports.add(tracedVariable); @@ -191,6 +200,7 @@ export default class Chunk { ) ); } else { + // TODO Lukas this could be derived from the last module this.variableName = '__chunk_' + ++graph.curChunkIndex; } } @@ -207,19 +217,35 @@ export default class Chunk { generateFacades(): Chunk[] { const facades: Chunk[] = []; for (const module of this.entryModules) { + const requiredFacades: FacadeName[] = Array.from(module.userChunkNames).map(name => ({ + name + })); + if (requiredFacades.length === 0) { + requiredFacades.push({}); + } if (!this.facadeModule) { const exportNamesByVariable = module.getExportNamesByVariable(); if (this.graph.preserveModules || this.canModuleBeFacade(exportNamesByVariable)) { this.facadeModule = module; + module.facadeChunk = this; for (const [variable, exportNames] of exportNamesByVariable) { for (const exportName of exportNames) { this.exportNames[exportName] = variable; } } - continue; + const facadeName = requiredFacades.shift() as { name?: string }; + // TODO Lukas completely handle the case of a facade module here + if (facadeName.name) { + this.chunkName = facadeName.name; + } else if (module.chunkName) { + this.chunkName = module.chunkName; + } } } - facades.push(Chunk.generateFacade(this.graph, module)); + + for (const facadeName of requiredFacades) { + facades.push(Chunk.generateFacade(this.graph, module, facadeName)); + } } return facades; } diff --git a/src/Module.ts b/src/Module.ts index 4bae95651f2..21cb570cd11 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -196,6 +196,7 @@ export default class Module { imports = new Set(); isEntryPoint: boolean; isExecuted = false; + // TODO Lukas may no longer be necessary isUserDefinedEntryPoint = false; manualChunkAlias: string = null as any; moduleSideEffects: boolean; @@ -207,6 +208,7 @@ export default class Module { sourcemapChain!: DecodedSourceMapOrMissing[]; sources: string[] = []; transformFiles?: EmittedFile[]; + userChunkNames = new Set(); usesTopLevelAwait = false; private allExportNames?: Set; diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index 9ffd56733f7..e95de18144e 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -139,8 +139,13 @@ export class ModuleLoader { module.chunkFileName = fileName; // TODO Lukas can we make sure a precise filename does not override a user-defined one? // should we create facades if the user provides several names for a chunk? - } else if (name !== null && (module.chunkName === null || isUserDefined)) { - module.chunkName = name; + } else if (name !== null) { + if (module.chunkName === null) { + module.chunkName = name; + } + if (isUserDefined) { + module.userChunkNames.add(name); + } } return module; }) diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index a501d212e4c..31a4cc6fbac 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -134,8 +134,10 @@ function getAssetFileName(file: ConsumedAsset, referenceId: string): string { function getChunkFileName(file: ConsumedChunk): string { const fileName = - file.module && - (file.module.facadeChunk ? file.module.facadeChunk.id : (file.module.chunk as Chunk).id); + // TODO Lukas test first case + file.fileName || + (file.module && + (file.module.facadeChunk ? file.module.facadeChunk.id : (file.module.chunk as Chunk).id)); if (!fileName) return error(errChunkNotGeneratedForFileName(file.fileName || file.name)); return fileName; } diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_config.js index 3e7364fc039..ce14a9334cf 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_config.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_config.js @@ -1,7 +1,7 @@ module.exports = { description: 'deduplicates named chunks emitted more than once', options: { - // The last name is picked + // For the second entry, a facade is created input: { mainChunk: 'main', other: 'main' }, plugins: { buildStart() { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name2.js index ded9abf5ea1..465cffcb633 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/generated-name2.js @@ -1,7 +1,7 @@ define(function () { 'use strict'; - var dep3 = 44; + var value3 = 44; - return dep3; + return value3; }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/mainChunk.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/mainChunk.js new file mode 100644 index 00000000000..399be2c932a --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/mainChunk.js @@ -0,0 +1,5 @@ +define(['./generated-name', './generated-secondName', './generated-name2'], function (name, secondName, name$1) { 'use strict'; + + console.log('main', name, secondName, name$1); + +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/other.js index 67a04c70451..9aa3629e5d4 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/other.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/amd/other.js @@ -1,5 +1,5 @@ -define(['./generated-name', './generated-secondName', './generated-name2'], function (name, secondName, name$1) { 'use strict'; +define(['./generated-name', './generated-secondName', './generated-name2', './mainChunk'], function (name, secondName, name$1, mainChunk) { 'use strict'; + - console.log('main', name, secondName, value3); }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name2.js index 60d40fcff49..ad1465f0155 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/generated-name2.js @@ -1,5 +1,5 @@ 'use strict'; -var dep3 = 44; +var value3 = 44; -module.exports = dep3; +module.exports = value3; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/mainChunk.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/mainChunk.js new file mode 100644 index 00000000000..5f0a2cff6ec --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/mainChunk.js @@ -0,0 +1,7 @@ +'use strict'; + +var name = require('./generated-name.js'); +var secondName = require('./generated-secondName.js'); +var name$1 = require('./generated-name2.js'); + +console.log('main', name, secondName, name$1); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/other.js index 32f5b678894..5f69e2c8c3a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/other.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/cjs/other.js @@ -1,7 +1,7 @@ 'use strict'; -var name = require('./generated-name.js'); -var secondName = require('./generated-secondName.js'); +require('./generated-name.js'); +require('./generated-secondName.js'); require('./generated-name2.js'); +require('./mainChunk.js'); -console.log('main', name, secondName, value3); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js index 1c3876787dc..6409a036d0c 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/generated-name2.js @@ -1,3 +1,3 @@ -var dep3 = 44; +var value3 = 44; -export default dep3; +export default value3; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/mainChunk.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/mainChunk.js new file mode 100644 index 00000000000..bae9f17e008 --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/mainChunk.js @@ -0,0 +1,5 @@ +import value1 from './generated-name.js'; +import value2 from './generated-secondName.js'; +import value3 from './generated-name2.js'; + +console.log('main', value1, value2, value3); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/other.js index 5bd74327e11..c236d86e897 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/other.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/es/other.js @@ -1,5 +1,4 @@ -import value1 from './generated-name.js'; -import value2 from './generated-secondName.js'; +import './generated-name.js'; +import './generated-secondName.js'; import './generated-name2.js'; - -console.log('main', value1, value2, value3); +import './mainChunk.js'; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name2.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name2.js index 957fb533335..9996739ec74 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name2.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/generated-name2.js @@ -3,7 +3,7 @@ System.register([], function (exports) { return { execute: function () { - var dep3 = exports('default', 44); + var value3 = exports('default', 44); } }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js new file mode 100644 index 00000000000..1d933eddaef --- /dev/null +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/mainChunk.js @@ -0,0 +1,18 @@ +System.register(['./generated-name.js', './generated-secondName.js', './generated-name2.js'], function () { + 'use strict'; + var value1, value2, value3; + return { + setters: [function (module) { + value1 = module.default; + }, function (module) { + value2 = module.default; + }, function (module) { + value3 = module.default; + }], + execute: function () { + + console.log('main', value1, value2, value3); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js index 410be22f32b..b207a067d3a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/_expected/system/other.js @@ -1,15 +1,10 @@ -System.register(['./generated-name.js', './generated-secondName.js', './generated-name2.js'], function () { +System.register(['./generated-name.js', './generated-secondName.js', './generated-name2.js', './mainChunk.js'], function () { 'use strict'; - var value1, value2; return { - setters: [function (module) { - value1 = module.default; - }, function (module) { - value2 = module.default; - }, function () {}], + setters: [function () {}, function () {}, function () {}, function () {}], execute: function () { - console.log('main', value1, value2, value3); + } }; diff --git a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/main.js b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/main.js index b56a46411e0..f2ffe9afdc1 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-name-conflict/main.js @@ -1,5 +1,5 @@ import value1 from './dep1.js'; import value2 from './dep2.js'; -import valu32 from './dep3.js'; +import value3 from './dep3.js'; console.log('main', value1, value2, value3); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_config.js b/test/chunking-form/samples/emit-file/named-user-chunks/_config.js new file mode 100644 index 00000000000..62c4c65818d --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_config.js @@ -0,0 +1,18 @@ +const assert = require('assert'); + +let referenceId; + +module.exports = { + description: 'deduplicates with named chunks defined by the user', + options: { + input: { mainChunk: 'main', mainChunkFacade: 'main' }, + plugins: { + buildStart() { + referenceId = this.emitFile({ type: 'chunk', id: 'main', name: 'ignored' }); + }, + generateBundle() { + assert.strictEqual(this.getFileName(referenceId), 'mainChunk.js'); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js new file mode 100644 index 00000000000..876aec76659 --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunk.js @@ -0,0 +1,9 @@ +define(['exports'], function (exports) { 'use strict'; + + const value = 42; + + exports.value = value; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js new file mode 100644 index 00000000000..993c75f358b --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/mainChunkFacade.js @@ -0,0 +1,9 @@ +define(['exports', './mainChunk'], function (exports, mainChunk) { 'use strict'; + + + + exports.value = mainChunk.value; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js new file mode 100644 index 00000000000..181fa0fd711 --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunk.js @@ -0,0 +1,7 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +const value = 42; + +exports.value = value; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js new file mode 100644 index 00000000000..4353ca57beb --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/mainChunkFacade.js @@ -0,0 +1,9 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var mainChunk = require('./mainChunk.js'); + + + +exports.value = mainChunk.value; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/mainChunk.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/mainChunk.js new file mode 100644 index 00000000000..d897952f7d1 --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/mainChunk.js @@ -0,0 +1,3 @@ +const value = 42; + +export { value }; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/mainChunkFacade.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/mainChunkFacade.js new file mode 100644 index 00000000000..5ef699520e8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/mainChunkFacade.js @@ -0,0 +1 @@ +export { value } from './mainChunk.js'; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunk.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunk.js new file mode 100644 index 00000000000..437f1af456e --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + const value = exports('value', 42); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunkFacade.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunkFacade.js new file mode 100644 index 00000000000..cb058047eca --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/mainChunkFacade.js @@ -0,0 +1,13 @@ +System.register(['./mainChunk.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('value', module.value); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/main.js b/test/chunking-form/samples/emit-file/named-user-chunks/main.js new file mode 100644 index 00000000000..46d3ca8c61f --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/main.js @@ -0,0 +1 @@ +export const value = 42; From 689ba18711a8dc7b7212fcf66a4b5b171b07e287 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Thu, 1 Aug 2019 13:03:39 +0200 Subject: [PATCH 23/31] Always create facades for explicit file names --- src/Chunk.ts | 73 +++++++++++-------- src/Graph.ts | 1 + src/Module.ts | 2 +- src/ModuleLoader.ts | 8 +- src/utils/assignChunkIds.ts | 26 +++---- .../emit-file/named-user-chunks/_config.js | 20 ++++- .../_expected/amd/explicit-name1.js | 9 +++ .../_expected/amd/explicit-name2.js | 9 +++ .../_expected/cjs/explicit-name1.js | 9 +++ .../_expected/cjs/explicit-name2.js | 9 +++ .../_expected/es/explicit-name1.js | 1 + .../_expected/es/explicit-name2.js | 1 + .../_expected/system/explicit-name1.js | 13 ++++ .../_expected/system/explicit-name2.js | 13 ++++ 14 files changed, 136 insertions(+), 58 deletions(-) create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/explicit-name1.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/explicit-name2.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name1.js create mode 100644 test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name2.js diff --git a/src/Chunk.ts b/src/Chunk.ts index 29343f1f0af..b2dcc83cf75 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -115,17 +115,19 @@ export function isChunkRendered(chunk: Chunk): boolean { } export default class Chunk { - static generateFacade(graph: Graph, facadedModule: Module, { name }: FacadeName): Chunk { + private static generateFacade( + graph: Graph, + facadedModule: Module, + facadeName: FacadeName + ): Chunk { const chunk = new Chunk(graph, []); - chunk.dependencies = [facadedModule.chunk as Chunk]; - if (name) { - chunk.chunkName = name; - } - chunk.dynamicDependencies = []; - chunk.facadeModule = facadedModule; + chunk.assignFacadeName(facadeName, facadedModule); if (!facadedModule.facadeChunk) { facadedModule.facadeChunk = chunk; } + chunk.dependencies = [facadedModule.chunk as Chunk]; + chunk.dynamicDependencies = []; + chunk.facadeModule = facadedModule; for (const exportName of facadedModule.getAllExportNames()) { const tracedVariable = facadedModule.getVariableForExportName(exportName); chunk.exports.add(tracedVariable); @@ -150,6 +152,8 @@ export default class Chunk { usedModules: Module[] = undefined as any; variableName: string; + // TODO Lukas remove chunk + private chunkFileName: string | null = null; private chunkName: string | null = null; private dependencies: (ExternalModule | Chunk)[] = undefined as any; private dynamicDependencies: (ExternalModule | Chunk)[] = undefined as any; @@ -193,10 +197,7 @@ export default class Chunk { if (entryModule) { this.variableName = makeLegal( basename( - (entryModule.chunkFileName && getAliasName(entryModule.chunkFileName)) || - entryModule.chunkName || - entryModule.manualChunkAlias || - getAliasName(entryModule.id) + entryModule.chunkName || entryModule.manualChunkAlias || getAliasName(entryModule.id) ) ); } else { @@ -220,6 +221,10 @@ export default class Chunk { const requiredFacades: FacadeName[] = Array.from(module.userChunkNames).map(name => ({ name })); + if (requiredFacades.length === 0 && module.isUserDefinedEntryPoint) { + requiredFacades.push({}); + } + requiredFacades.push(...Array.from(module.chunkFileNames).map(fileName => ({ fileName }))); if (requiredFacades.length === 0) { requiredFacades.push({}); } @@ -233,13 +238,7 @@ export default class Chunk { this.exportNames[exportName] = variable; } } - const facadeName = requiredFacades.shift() as { name?: string }; - // TODO Lukas completely handle the case of a facade module here - if (facadeName.name) { - this.chunkName = facadeName.name; - } else if (module.chunkName) { - this.chunkName = module.chunkName; - } + this.assignFacadeName(requiredFacades.shift() as FacadeName, module); } } @@ -257,6 +256,9 @@ export default class Chunk { options: OutputOptions, existingNames: Record ): string { + if (this.chunkFileName !== null) { + return this.chunkFileName; + } return makeUnique( renderNamePattern(pattern, patternName, type => { switch (type) { @@ -325,7 +327,7 @@ export default class Chunk { } getChunkName(): string { - return this.chunkName || (this.chunkName = this.computeChunkName()); + return this.chunkName || (this.chunkName = sanitizeFileName(this.getFallbackChunkName())); } getDynamicImportIds(): string[] { @@ -803,21 +805,15 @@ export default class Chunk { } } - private computeChunkName(): string { - if (this.facadeModule !== null) { - return sanitizeFileName( - (this.facadeModule.chunkFileName && getAliasName(this.facadeModule.chunkFileName)) || - this.facadeModule.chunkName || - getAliasName(this.facadeModule.id) + private assignFacadeName({ fileName, name }: FacadeName, facadedModule: Module) { + if (fileName) { + // TODO Lukas all assignments to chunkFileName should be sanitized + this.chunkFileName = fileName; + } else { + this.chunkName = sanitizeFileName( + name || facadedModule.chunkName || getAliasName(facadedModule.id) ); } - if (this.manualChunkAlias) { - return sanitizeFileName(this.manualChunkAlias); - } - for (const module of this.orderedModules) { - if (module.chunkName) return sanitizeFileName(module.chunkName); - } - return 'chunk'; } private computeContentHashWithDependencies(addons: Addons, options: OutputOptions): string { @@ -1010,6 +1006,19 @@ export default class Chunk { return exports; } + private getFallbackChunkName(): string { + if (this.manualChunkAlias) { + return this.manualChunkAlias; + } + if (this.chunkFileName) { + return getAliasName(this.chunkFileName); + } + for (const module of this.orderedModules) { + if (module.chunkName) return module.chunkName; + } + return 'chunk'; + } + private inlineChunkDependencies(chunk: Chunk, deep: boolean) { for (const dep of chunk.dependencies) { if (dep instanceof ExternalModule) { diff --git a/src/Graph.ts b/src/Graph.ts index b563f25ac1d..5cd5e561d69 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -313,6 +313,7 @@ export default class Graph { const facades: Chunk[] = []; for (const chunk of chunks) { for (const facade of chunk.generateFacades()) { + // TODO Lukas use spread operator facades.push(facade); } } diff --git a/src/Module.ts b/src/Module.ts index 21cb570cd11..e323ee85999 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -169,7 +169,7 @@ const MISSING_EXPORT_SHIM_DESCRIPTION: ExportDescription = { export default class Module { chunk?: Chunk; - chunkFileName: string | null = null; + chunkFileNames = new Set(); chunkName: string | null = null; code!: string; comments: CommentDescription[] = []; diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts index e95de18144e..9290a509035 100644 --- a/src/ModuleLoader.ts +++ b/src/ModuleLoader.ts @@ -132,13 +132,7 @@ export class ModuleLoader { unresolvedEntryModules.map(({ fileName, id, name }) => this.loadEntryModule(id, true).then(module => { if (fileName !== null) { - if (module.chunkFileName !== null) { - // TODO Lukas test or create facades and make chunkFileName a Set - throw new Error('Cannot reassign chunk filename'); - } - module.chunkFileName = fileName; - // TODO Lukas can we make sure a precise filename does not override a user-defined one? - // should we create facades if the user provides several names for a chunk? + module.chunkFileNames.add(fileName); } else if (name !== null) { if (module.chunkName === null) { module.chunkName = name; diff --git a/src/utils/assignChunkIds.ts b/src/utils/assignChunkIds.ts index 53522d68788..84fa53aec33 100644 --- a/src/utils/assignChunkIds.ts +++ b/src/utils/assignChunkIds.ts @@ -12,29 +12,25 @@ export function assignChunkIds( addons: Addons, bundle: OutputBundleWithPlaceholders ) { - const [entryChunks, otherChunks] = chunks.reduce<[Chunk[], Chunk[]]>( - ([entryChunks, otherChunks], chunk) => { - (chunk.facadeModule && chunk.facadeModule.isUserDefinedEntryPoint - ? entryChunks - : otherChunks - ).push(chunk); - return [entryChunks, otherChunks]; - }, - [[], []] - ); + // TODO Lukas test conflict between prenamed chunk and entry chunk + // TODO Lukas do not filter out prenamed chunks but use new property + const entryChunks: Chunk[] = []; + const otherChunks: Chunk[] = []; + for (const chunk of chunks) { + (chunk.facadeModule && chunk.facadeModule.isUserDefinedEntryPoint + ? entryChunks + : otherChunks + ).push(chunk); + } // make sure entry chunk names take precedence with regard to deconflicting const chunksForNaming: Chunk[] = entryChunks.concat(otherChunks); - for (let i = 0; i < chunksForNaming.length; i++) { - const chunk = chunksForNaming[i]; + for (const chunk of chunksForNaming) { const facadeModule = chunk.facadeModule; - if (outputOptions.file) { chunk.id = basename(outputOptions.file); } else if (inputOptions.preserveModules) { chunk.id = chunk.generateIdPreserveModules(inputBase, bundle); - } else if (facadeModule && facadeModule.chunkFileName) { - chunk.id = facadeModule.chunkFileName; } else { let pattern, patternName; if (facadeModule && facadeModule.isUserDefinedEntryPoint) { diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_config.js b/test/chunking-form/samples/emit-file/named-user-chunks/_config.js index 62c4c65818d..6807aad6a57 100644 --- a/test/chunking-form/samples/emit-file/named-user-chunks/_config.js +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_config.js @@ -1,6 +1,8 @@ const assert = require('assert'); -let referenceId; +let referenceIdName; +let referenceIdFileName1; +let referenceIdFileName2; module.exports = { description: 'deduplicates with named chunks defined by the user', @@ -8,10 +10,22 @@ module.exports = { input: { mainChunk: 'main', mainChunkFacade: 'main' }, plugins: { buildStart() { - referenceId = this.emitFile({ type: 'chunk', id: 'main', name: 'ignored' }); + referenceIdName = this.emitFile({ type: 'chunk', id: 'main', name: 'ignored' }); + referenceIdFileName1 = this.emitFile({ + type: 'chunk', + id: 'main', + fileName: 'explicit-name1.js' + }); + referenceIdFileName2 = this.emitFile({ + type: 'chunk', + id: 'main', + fileName: 'explicit-name2.js' + }); }, generateBundle() { - assert.strictEqual(this.getFileName(referenceId), 'mainChunk.js'); + assert.strictEqual(this.getFileName(referenceIdName), 'mainChunk.js'); + assert.strictEqual(this.getFileName(referenceIdFileName1), 'explicit-name1.js'); + assert.strictEqual(this.getFileName(referenceIdFileName2), 'explicit-name2.js'); } } } diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js new file mode 100644 index 00000000000..993c75f358b --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name1.js @@ -0,0 +1,9 @@ +define(['exports', './mainChunk'], function (exports, mainChunk) { 'use strict'; + + + + exports.value = mainChunk.value; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js new file mode 100644 index 00000000000..993c75f358b --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/amd/explicit-name2.js @@ -0,0 +1,9 @@ +define(['exports', './mainChunk'], function (exports, mainChunk) { 'use strict'; + + + + exports.value = mainChunk.value; + + Object.defineProperty(exports, '__esModule', { value: true }); + +}); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js new file mode 100644 index 00000000000..4353ca57beb --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name1.js @@ -0,0 +1,9 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var mainChunk = require('./mainChunk.js'); + + + +exports.value = mainChunk.value; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js new file mode 100644 index 00000000000..4353ca57beb --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/cjs/explicit-name2.js @@ -0,0 +1,9 @@ +'use strict'; + +Object.defineProperty(exports, '__esModule', { value: true }); + +var mainChunk = require('./mainChunk.js'); + + + +exports.value = mainChunk.value; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/explicit-name1.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/explicit-name1.js new file mode 100644 index 00000000000..5ef699520e8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/explicit-name1.js @@ -0,0 +1 @@ +export { value } from './mainChunk.js'; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/explicit-name2.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/explicit-name2.js new file mode 100644 index 00000000000..5ef699520e8 --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/es/explicit-name2.js @@ -0,0 +1 @@ +export { value } from './mainChunk.js'; diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name1.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name1.js new file mode 100644 index 00000000000..cb058047eca --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name1.js @@ -0,0 +1,13 @@ +System.register(['./mainChunk.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('value', module.value); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name2.js b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name2.js new file mode 100644 index 00000000000..cb058047eca --- /dev/null +++ b/test/chunking-form/samples/emit-file/named-user-chunks/_expected/system/explicit-name2.js @@ -0,0 +1,13 @@ +System.register(['./mainChunk.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('value', module.value); + }], + execute: function () { + + + + } + }; +}); From 0bf918a3ec1c0ee61333310665c3c6bdd15aa5e5 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Thu, 1 Aug 2019 18:43:30 +0200 Subject: [PATCH 24/31] Test edge cases --- src/Chunk.ts | 57 +- src/utils/FileEmitter.ts | 8 +- src/utils/pluginDriver.ts | 9 - .../basic-chunking/_expected/amd/main1.js | 4 +- .../basic-chunking/_expected/amd/main2.js | 4 +- .../basic-chunking/_expected/cjs/main1.js | 4 +- .../basic-chunking/_expected/cjs/main2.js | 4 +- .../_expected/amd/generated-chunk2.js | 6 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../_expected/amd/main4.js | 2 +- .../_expected/cjs/generated-chunk2.js | 8 +- .../_expected/cjs/main1.js | 4 +- .../_expected/amd/generated-chunk3.js | 2 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../_expected/amd/main4.js | 2 +- .../_expected/cjs/main1.js | 4 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 2 +- .../_expected/cjs/main1.js | 4 +- .../_expected/amd/main1.js | 6 +- .../_expected/amd/main2.js | 6 +- .../_expected/cjs/main1.js | 6 +- .../_expected/cjs/main2.js | 6 +- .../_expected/amd/main1.js | 8 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 8 +- .../_expected/cjs/main2.js | 4 +- .../_expected/amd/custom/entryC.js | 4 +- .../chunk-naming/_expected/amd/entryA.js | 4 +- .../chunk-naming/_expected/amd/entryB.js | 4 +- .../_expected/cjs/custom/entryC.js | 6 +- .../chunk-naming/_expected/cjs/entryA.js | 6 +- .../chunk-naming/_expected/cjs/entryB.js | 6 +- .../chunking-compact/_expected/amd/main1.js | 4 +- .../chunking-compact/_expected/amd/main2.js | 4 +- .../chunking-compact/_expected/cjs/main1.js | 4 +- .../chunking-compact/_expected/cjs/main2.js | 4 +- .../chunking-externals/_expected/amd/main1.js | 4 +- .../chunking-externals/_expected/amd/main2.js | 4 +- .../chunking-externals/_expected/cjs/main1.js | 4 +- .../chunking-externals/_expected/cjs/main2.js | 4 +- .../chunking-reexport/_expected/amd/main1.js | 2 +- .../chunking-reexport/_expected/amd/main2.js | 2 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main1.js.map | 2 +- .../_expected/amd/main2.js | 4 +- .../_expected/amd/main2.js.map | 2 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main1.js.map | 2 +- .../_expected/cjs/main2.js | 4 +- .../_expected/cjs/main2.js.map | 2 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../deconflict-globals/_expected/amd/main1.js | 4 +- .../deconflict-globals/_expected/amd/main2.js | 4 +- .../deconflict-globals/_expected/cjs/main1.js | 4 +- .../deconflict-globals/_expected/cjs/main2.js | 4 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../emit-asset/_expected/amd/main.js | 4 +- .../emit-asset/_expected/amd/nested/chunk2.js | 4 +- .../emit-asset/_expected/cjs/main.js | 4 +- .../emit-asset/_expected/cjs/nested/chunk2.js | 4 +- .../amd/generated-nested/my-chunk.js | 4 +- .../emit-chunk-named/_expected/amd/main.js | 4 +- .../cjs/generated-nested/my-chunk.js | 4 +- .../emit-chunk-named/_expected/cjs/main.js | 4 +- .../_expected/amd/chunks/worker.js | 4 +- .../emit-chunk-worker/_expected/amd/main.js | 4 +- .../_expected/cjs/chunks/worker.js | 4 +- .../emit-chunk-worker/_expected/cjs/main.js | 4 +- .../_expected/amd/chunks/worklet.js | 8 +- .../emit-chunk-worklet/_expected/amd/main.js | 4 +- .../_expected/cjs/chunks/worklet.js | 8 +- .../emit-chunk-worklet/_expected/cjs/main.js | 4 +- .../_expected/amd/generated-buildStart.js | 4 +- .../emit-chunk/_expected/amd/main.js | 4 +- .../_expected/cjs/generated-buildStart.js | 4 +- .../emit-chunk/_expected/cjs/main.js | 4 +- .../_expected/amd/generated-dep2.js | 4 +- .../_expected/amd/main.js | 4 +- .../_expected/cjs/generated-dep2.js | 4 +- .../_expected/cjs/main.js | 4 +- .../_expected/amd/main.js | 4 +- .../_expected/cjs/main.js | 4 +- .../_expected/amd/chunks/other.js | 4 +- .../dynamic-import/_expected/amd/main.js | 4 +- .../_expected/cjs/chunks/other.js | 4 +- .../dynamic-import/_expected/cjs/main.js | 4 +- .../amd/generated-nested/my-chunk.js | 4 +- .../emit-chunk-named/_expected/amd/main.js | 4 +- .../cjs/generated-nested/my-chunk.js | 4 +- .../emit-chunk-named/_expected/cjs/main.js | 4 +- .../_expected/amd/chunks/worker.js | 4 +- .../emit-chunk-worker/_expected/amd/main.js | 4 +- .../_expected/cjs/chunks/worker.js | 4 +- .../emit-chunk-worker/_expected/cjs/main.js | 4 +- .../_expected/amd/chunks/worklet.js | 8 +- .../emit-chunk-worklet/_expected/amd/main.js | 4 +- .../_expected/cjs/chunks/worklet.js | 8 +- .../emit-chunk-worklet/_expected/cjs/main.js | 4 +- .../_expected/amd/generated-buildStart.js | 4 +- .../emit-chunk/_expected/amd/main.js | 4 +- .../_expected/cjs/generated-buildStart.js | 4 +- .../emit-chunk/_expected/cjs/main.js | 4 +- .../_expected/amd/custom/build-start-chunk.js | 4 +- .../emit-named-chunk/_expected/amd/main.js | 4 +- .../_expected/cjs/custom/build-start-chunk.js | 4 +- .../emit-named-chunk/_expected/cjs/main.js | 4 +- .../reference-files/_expected/amd/main.js | 4 +- .../_expected/amd/nested/chunk2.js | 4 +- .../reference-files/_expected/cjs/main.js | 4 +- .../_expected/cjs/nested/chunk2.js | 4 +- .../emit-file/sanitize-file-name/_config.js | 21 + .../_expected/amd/generated-_virtual.js | 5 + .../sanitize-file-name/_expected/amd/main.js | 7 + .../_expected/cjs/generated-_virtual.js | 3 + .../sanitize-file-name/_expected/cjs/main.js | 5 + .../_expected/es/generated-_virtual.js | 1 + .../sanitize-file-name/_expected/es/main.js | 3 + .../_expected/system/generated-_virtual.js | 10 + .../_expected/system/main.js | 12 + .../sanitize-file-name/buildStart.js | 3 + .../emit-file/sanitize-file-name/dep.js | 1 + .../emit-file/sanitize-file-name/main.js | 3 + .../grouping-multiple/_expected/amd/main1.js | 4 +- .../grouping-multiple/_expected/amd/main2.js | 4 +- .../grouping-multiple/_expected/amd/main3.js | 4 +- .../grouping-multiple/_expected/cjs/main1.js | 4 +- .../grouping-multiple/_expected/cjs/main2.js | 4 +- .../grouping-multiple/_expected/cjs/main3.js | 4 +- .../grouping-size/_expected/amd/main1.js | 4 +- .../grouping-size/_expected/amd/main2.js | 4 +- .../grouping-size/_expected/amd/main3.js | 4 +- .../grouping-size/_expected/cjs/main1.js | 6 +- .../grouping-size/_expected/cjs/main2.js | 6 +- .../grouping-size/_expected/cjs/main3.js | 4 +- .../import-meta-url/_expected/amd/main.js | 4 +- .../_expected/amd/nested/chunk2.js | 4 +- .../import-meta-url/_expected/cjs/main.js | 4 +- .../_expected/cjs/nested/chunk2.js | 4 +- .../_expected/amd/generated-manual-middle.js | 2 +- .../_expected/amd/generated-manual-outer.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/amd/generated-chunk-c.js | 2 +- .../_expected/amd/main-a.js | 2 +- .../_expected/amd/main.js | 2 +- .../_expected/amd/generated-deps2and3.js | 4 +- .../manual-chunks/_expected/amd/main.js | 6 +- .../_expected/cjs/generated-deps2and3.js | 4 +- .../manual-chunks/_expected/cjs/main.js | 6 +- .../_expected/amd/main.js | 4 +- .../_expected/cjs/main.js | 6 +- .../multi-chunking/_expected/amd/main1.js | 4 +- .../multi-chunking/_expected/amd/main2.js | 4 +- .../multi-chunking/_expected/amd/main3.js | 4 +- .../multi-chunking/_expected/cjs/main1.js | 6 +- .../multi-chunking/_expected/cjs/main2.js | 6 +- .../multi-chunking/_expected/cjs/main3.js | 6 +- .../_expected/amd/main.js | 4 +- .../_expected/amd/other.js | 4 +- .../_expected/cjs/main.js | 4 +- .../_expected/cjs/other.js | 4 +- .../_expected/amd/generated-chunk2.js | 4 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 4 +- .../_expected/amd/main3.js | 2 +- .../_expected/cjs/generated-chunk2.js | 4 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../_expected/amd/main-a.js | 6 +- .../_expected/amd/main-b.js | 4 +- .../_expected/cjs/main-a.js | 6 +- .../_expected/cjs/main-b.js | 4 +- .../_expected/amd/generated-chunk2.js | 2 +- .../_expected/amd/generated-chunk3.js | 2 +- .../namespace-tracing/_expected/amd/main-a.js | 6 +- .../namespace-tracing/_expected/amd/main-b.js | 10 +- .../namespace-tracing/_expected/amd/main-c.js | 6 +- .../namespace-tracing/_expected/cjs/main-a.js | 8 +- .../namespace-tracing/_expected/cjs/main-b.js | 14 +- .../namespace-tracing/_expected/cjs/main-c.js | 8 +- .../amd/_virtual/other.js_commonjs-proxy | 4 +- .../_expected/amd/commonjs.js | 6 +- .../_expected/amd/main.js | 4 +- .../cjs/_virtual/other.js_commonjs-proxy | 4 +- .../_expected/cjs/commonjs.js | 8 +- .../_expected/cjs/main.js | 4 +- .../_expected/amd/m1.js | 6 +- .../_expected/amd/main.js | 4 +- .../_expected/cjs/m1.js | 8 +- .../_expected/cjs/main.js | 4 +- .../_expected/amd/main.js | 4 +- .../_expected/cjs/main.js | 4 +- .../_expected/amd/main1.js | 6 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 6 +- .../_expected/cjs/main2.js | 4 +- .../_expected/amd/main.js | 4 +- .../_expected/cjs/main.js | 4 +- .../_expected/amd/main.js | 4 +- .../_expected/cjs/main.js | 4 +- .../_expected/amd/lib/main.js | 4 +- .../_expected/cjs/lib/main.js | 4 +- .../_expected/amd/main.js | 4 +- .../_expected/cjs/main.js | 4 +- .../_expected/amd/deps/dep2.js | 4 +- .../_expected/amd/deps/dep3.js | 4 +- .../preserve-modules/_expected/amd/main1.js | 6 +- .../preserve-modules/_expected/amd/main2.js | 6 +- .../_expected/cjs/deps/dep2.js | 4 +- .../_expected/cjs/deps/dep3.js | 4 +- .../preserve-modules/_expected/cjs/main1.js | 8 +- .../preserve-modules/_expected/cjs/main2.js | 8 +- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../_expected/cjs/main1.js | 4 +- .../render-chunk/_expected/amd/main1.js | 4 +- .../render-chunk/_expected/amd/main2.js | 4 +- .../render-chunk/_expected/cjs/main1.js | 4 +- .../render-chunk/_expected/cjs/main2.js | 4 +- .../_expected/amd/generated-lazy.js | 4 +- .../_expected/amd/main.js | 546 +++++++++--------- .../_expected/cjs/generated-lazy.js | 4 +- .../_expected/cjs/main.js | 546 +++++++++--------- .../_expected/amd/main1.js | 4 +- .../_expected/amd/main2.js | 4 +- .../_expected/cjs/main1.js | 4 +- .../_expected/cjs/main2.js | 4 +- .../emit-asset/invalid-asset-name/_config.js | 2 +- .../emit-file/invalid-asset-name/_config.js | 2 +- .../emit-file/invalid-asset-name2/_config.js | 19 + .../emit-file/invalid-asset-name2/main.js | 1 + 262 files changed, 1192 insertions(+), 1106 deletions(-) create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/_config.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/_expected/amd/generated-_virtual.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/_expected/cjs/generated-_virtual.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/_expected/cjs/main.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/_expected/es/generated-_virtual.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/_expected/es/main.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/_expected/system/generated-_virtual.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/buildStart.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/dep.js create mode 100644 test/chunking-form/samples/emit-file/sanitize-file-name/main.js create mode 100644 test/function/samples/emit-file/invalid-asset-name2/_config.js create mode 100644 test/function/samples/emit-file/invalid-asset-name2/main.js diff --git a/src/Chunk.ts b/src/Chunk.ts index b2dcc83cf75..3c6b5954a13 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -152,14 +152,13 @@ export default class Chunk { usedModules: Module[] = undefined as any; variableName: string; - // TODO Lukas remove chunk - private chunkFileName: string | null = null; - private chunkName: string | null = null; private dependencies: (ExternalModule | Chunk)[] = undefined as any; private dynamicDependencies: (ExternalModule | Chunk)[] = undefined as any; private exportNames: { [name: string]: Variable } = Object.create(null); private exports = new Set(); + private fileName: string | null = null; private imports = new Set(); + private name: string | null = null; private needsExportsShim = false; private renderedDeclarations: { dependencies: ChunkDependencies; @@ -193,15 +192,17 @@ export default class Chunk { } } - const entryModule = this.entryModules[0]; - if (entryModule) { + const moduleForNaming = + this.entryModules[0] || this.orderedModules[this.orderedModules.length - 1]; + if (moduleForNaming) { this.variableName = makeLegal( basename( - entryModule.chunkName || entryModule.manualChunkAlias || getAliasName(entryModule.id) + moduleForNaming.chunkName || + moduleForNaming.manualChunkAlias || + getAliasName(moduleForNaming.id) ) ); } else { - // TODO Lukas this could be derived from the last module this.variableName = '__chunk_' + ++graph.curChunkIndex; } } @@ -256,8 +257,8 @@ export default class Chunk { options: OutputOptions, existingNames: Record ): string { - if (this.chunkFileName !== null) { - return this.chunkFileName; + if (this.fileName !== null) { + return this.fileName; } return makeUnique( renderNamePattern(pattern, patternName, type => { @@ -327,7 +328,7 @@ export default class Chunk { } getChunkName(): string { - return this.chunkName || (this.chunkName = sanitizeFileName(this.getFallbackChunkName())); + return this.name || (this.name = sanitizeFileName(this.getFallbackChunkName())); } getDynamicImportIds(): string[] { @@ -641,7 +642,7 @@ export default class Chunk { const renderedDependency = this.renderedDeclarations.dependencies[i]; const depId = dep instanceof ExternalModule ? renderedDependency.id : (dep.id as string); - let relPath = this.id ? normalize(relative(dirname(this.id), depId)) : depId; + let relPath = normalize(relative(dirname(this.id as string), depId)); if (!relPath.startsWith('../')) relPath = './' + relPath; if (dep instanceof Chunk) renderedDependency.namedExportsMode = dep.exportMode !== 'default'; @@ -723,20 +724,15 @@ export default class Chunk { else if (options.dir) file = resolve(options.dir, this.id as string); else file = resolve(this.id as string); - if (this.graph.pluginDriver.hasLoadersOrTransforms) { - const decodedMap = magicString.generateDecodedMap({}); - map = collapseSourcemaps( - this, - file, - decodedMap, - this.usedModules, - chunkSourcemapChain, - options.sourcemapExcludeSources as boolean - ); - } else { - map = magicString.generateMap({ file, includeContent: !options.sourcemapExcludeSources }); - } - + const decodedMap = magicString.generateDecodedMap({}); + map = collapseSourcemaps( + this, + file, + decodedMap, + this.usedModules, + chunkSourcemapChain, + options.sourcemapExcludeSources as boolean + ); map.sources = map.sources.map(sourcePath => normalize( options.sourcemapPathTransform ? options.sourcemapPathTransform(sourcePath) : sourcePath @@ -807,10 +803,9 @@ export default class Chunk { private assignFacadeName({ fileName, name }: FacadeName, facadedModule: Module) { if (fileName) { - // TODO Lukas all assignments to chunkFileName should be sanitized - this.chunkFileName = fileName; + this.fileName = fileName; } else { - this.chunkName = sanitizeFileName( + this.name = sanitizeFileName( name || facadedModule.chunkName || getAliasName(facadedModule.id) ); } @@ -841,6 +836,7 @@ export default class Chunk { let relPath = normalize( relative(dirname(this.id as string), resolutionChunk.id as string) ); + // TODO Lukas test where relpath starts with '../' if (!relPath.startsWith('../')) relPath = './' + relPath; node.renderFinalResolution(code, `'${relPath}'`, format); } @@ -848,6 +844,7 @@ export default class Chunk { let resolutionId = resolution.id; if (resolution.renormalizeRenderPath) { resolutionId = normalize(relative(dirname(this.id as string), resolution.renderPath)); + // TODO Lukas test where resolutionId starts with '../' if (!resolutionId.startsWith('../')) resolutionId = './' + resolutionId; } node.renderFinalResolution(code, `'${resolutionId}'`, format); @@ -1010,8 +1007,8 @@ export default class Chunk { if (this.manualChunkAlias) { return this.manualChunkAlias; } - if (this.chunkFileName) { - return getAliasName(this.chunkFileName); + if (this.fileName) { + return getAliasName(this.fileName); } for (const module of this.orderedModules) { if (module.chunkName) return module.chunkName; diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index 31a4cc6fbac..b4544ad6c58 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -19,6 +19,7 @@ import { import { extname } from './path'; import { isPlainPathFragment } from './relativeId'; import { makeUnique, renderNamePattern } from './renderNamePattern'; +import { sanitizeFileName } from './sanitizeFileName'; interface OutputSpecificFileData { assetFileNames: string; @@ -103,7 +104,10 @@ function hasValidName(emittedFile: { }): emittedFile is EmittedFile { const validatedName = emittedFile.fileName || emittedFile.name; return ( - !validatedName || (typeof validatedName === 'string' && isPlainPathFragment(validatedName)) + !validatedName || + (typeof validatedName === 'string' && + isPlainPathFragment(validatedName) && + sanitizeFileName(validatedName) === validatedName) ); } @@ -165,7 +169,7 @@ export class FileEmitter { if (!hasValidName(emittedFile)) { return error( errFailedValidation( - `The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths, received "${emittedFile.fileName || + `The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths and do not contain invalid characters, received "${emittedFile.fileName || emittedFile.name}".` ) ); diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index 4c987276e3e..7f7de0302b8 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -25,7 +25,6 @@ type EnsurePromise = Promise ? K : T>; export interface PluginDriver { emitFile: EmitFile; - hasLoadersOrTransforms: boolean; finaliseAssets(): void; getFileName(assetReferenceId: string): string; hookFirst>( @@ -142,7 +141,6 @@ export function createPluginDriver( ]; const fileEmitter = new FileEmitter(graph); const existingPluginKeys = new Set(); - let hasLoadersOrTransforms = false; const pluginContexts: PluginContext[] = plugins.map((plugin, pidx) => { let cacheable = true; @@ -154,12 +152,6 @@ export function createPluginDriver( } } - if ( - !hasLoadersOrTransforms && - (plugin.load || plugin.transform || plugin.transformBundle || plugin.transformChunk) - ) - hasLoadersOrTransforms = true; - let cacheInstance: PluginCache; if (!pluginCache) { cacheInstance = noCache; @@ -387,7 +379,6 @@ export function createPluginDriver( fileEmitter.assertAssetsFinalized(); }, getFileName: fileEmitter.getFileName, - hasLoadersOrTransforms, // chains, ignores returns hookSeq(name, args, hookContext) { diff --git a/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js b/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js index ac14c9b6c66..108e509e2f3 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep2) { 'use strict'; function fn () { console.log('dep1 fn'); @@ -7,7 +7,7 @@ define(['./generated-chunk'], function (__chunk_1) { 'use strict'; class Main1 { constructor () { fn(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js b/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js index 111b5a4ace0..362f7851a1c 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep2) { 'use strict'; function fn () { console.log('lib1 fn'); @@ -12,7 +12,7 @@ define(['./generated-chunk'], function (__chunk_1) { 'use strict'; class Main2 { constructor () { fn$1(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js b/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js index 3f1d6358cca..d5090945ce7 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk.js'); function fn () { console.log('dep1 fn'); @@ -9,7 +9,7 @@ function fn () { class Main1 { constructor () { fn(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js b/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js index ca04f12a578..360eacc9f9b 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk.js'); function fn () { console.log('lib1 fn'); @@ -14,7 +14,7 @@ function fn$1 () { class Main2 { constructor () { fn$1(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js index 81990cfcc0b..ee7aed4131e 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js @@ -1,8 +1,8 @@ -define(['exports', './generated-chunk', './generated-chunk3'], function (exports, __chunk_1, __chunk_3) { 'use strict'; +define(['exports', './generated-chunk', './generated-chunk3'], function (exports, dep1, dep2) { 'use strict'; - var x = __chunk_1.x + 1; + var x = dep1.x + 1; - var y = __chunk_3.x + 1; + var y = dep2.x + 1; exports.x = x; exports.y = y; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js index ebe790c766a..0e65131f4fd 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js @@ -1,5 +1,5 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (__chunk_1, __chunk_2, __chunk_3) { 'use strict'; +define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep1, shared2, dep2) { 'use strict'; - console.log(__chunk_2.x + __chunk_2.y); + console.log(shared2.x + shared2.y); }); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js index 6924458be25..4a881f3542f 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (__chunk_1, __chunk_2, __chunk_3) { 'use strict'; +define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep1, shared2, dep2) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js index 80869868e48..bd74061e2d8 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep1) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js index 57661f926d5..1fc33edde0c 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js @@ -1,4 +1,4 @@ -define(['./generated-chunk3'], function (__chunk_3) { 'use strict'; +define(['./generated-chunk3'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js index bfffacb8799..1869f3a0186 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js @@ -1,11 +1,11 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); -var __chunk_3 = require('./generated-chunk3.js'); +var dep1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk3.js'); -var x = __chunk_1.x + 1; +var x = dep1.x + 1; -var y = __chunk_3.x + 1; +var y = dep2.x + 1; exports.x = x; exports.y = y; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js index 814ecdd4098..395b4cbab96 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; require('./generated-chunk.js'); -var __chunk_2 = require('./generated-chunk2.js'); +var shared2 = require('./generated-chunk2.js'); require('./generated-chunk3.js'); -console.log(__chunk_2.x + __chunk_2.y); +console.log(shared2.x + shared2.y); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js index 63b1b2fef74..872a82acb49 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2'], function (__chunk_1, __chunk_2) { 'use strict'; +define(['./generated-chunk', './generated-chunk2'], function (dep111, dep112) { 'use strict'; console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js index 84e0fbc0088..6748631337f 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js @@ -1,7 +1,7 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (__chunk_1, __chunk_2, __chunk_3) { 'use strict'; +define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep111, dep112, dep11) { 'use strict'; console.log('1'); - console.log(__chunk_2.x); + console.log(dep112.x); }); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js index 6924458be25..b8d58e21dee 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (__chunk_1, __chunk_2, __chunk_3) { 'use strict'; +define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep111, dep112, dep11) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js index 80869868e48..f4841ed82fe 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep111) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js index 01a1c62db72..bc6715800f4 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js @@ -1,4 +1,4 @@ -define(['./generated-chunk2'], function (__chunk_2) { 'use strict'; +define(['./generated-chunk2'], function (dep112) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js index 2c7c4ca8683..b2a67e5bc37 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js @@ -1,9 +1,9 @@ 'use strict'; require('./generated-chunk.js'); -var __chunk_2 = require('./generated-chunk2.js'); +var dep112 = require('./generated-chunk2.js'); require('./generated-chunk3.js'); console.log('1'); -console.log(__chunk_2.x); +console.log(dep112.x); diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js index 166cf5b87f0..fff81b46661 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js @@ -1,8 +1,8 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep1) { 'use strict'; class Main1 { constructor () { - __chunk_1.fn(); + dep1.fn(); } } diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js index 2755a1f1093..7665de6f99c 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js @@ -1,8 +1,8 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep1) { 'use strict'; class Main2 { constructor () { - __chunk_1.fn$1(); + dep1.fn$1(); } } diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js index db58d12e0f5..57540c44ee0 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js @@ -1,10 +1,10 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep1 = require('./generated-chunk.js'); class Main1 { constructor () { - __chunk_1.fn(); + dep1.fn(); } } diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js index 1e03271063e..f03cd93dc87 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js @@ -1,10 +1,10 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep1 = require('./generated-chunk.js'); class Main2 { constructor () { - __chunk_1.fn$1(); + dep1.fn$1(); } } diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js index b2e05fcc77c..4bc5739ac53 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js @@ -1,8 +1,8 @@ -define(['exports', './generated-chunk'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './generated-chunk'], function (exports, one) { 'use strict'; - exports.ItemOne = __chunk_1.One; + exports.ItemOne = one.One; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js index 5817de20203..28aa6948e70 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js @@ -1,8 +1,8 @@ -define(['exports', './generated-chunk'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './generated-chunk'], function (exports, one) { 'use strict'; class Two { test() { - return __chunk_1.ONE_CONSTANT; + return one.ONE_CONSTANT; } } diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js index 6d99df53376..6a6c1b487cc 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js @@ -2,8 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var __chunk_1 = require('./generated-chunk.js'); +var one = require('./generated-chunk.js'); -exports.ItemOne = __chunk_1.One; +exports.ItemOne = one.One; diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js index 5af2561690a..e0adf1b39da 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js @@ -2,11 +2,11 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var __chunk_1 = require('./generated-chunk.js'); +var one = require('./generated-chunk.js'); class Two { test() { - return __chunk_1.ONE_CONSTANT; + return one.ONE_CONSTANT; } } diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js index aa788e1c4dc..fcc3e22f67b 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js @@ -1,7 +1,7 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (lib) { 'use strict'; function fn () { - var emptyFunction = __chunk_1.emptyFunction; + var emptyFunction = lib.emptyFunction; console.log(emptyFunction); } diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js index 80869868e48..09d13545f2a 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (lib) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js index e30ecabb6d1..245b14fc81c 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js @@ -1,9 +1,9 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var lib = require('./generated-chunk.js'); function fn () { - var emptyFunction = __chunk_1.emptyFunction; + var emptyFunction = lib.emptyFunction; console.log(emptyFunction); } diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js index d618cb1c2d6..9de2c058385 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js @@ -1,9 +1,9 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep1) { 'use strict'; class Main1 { constructor () { - __chunk_1.fn(); - console.log(__chunk_1.text); + dep1.fn(); + console.log(dep1.text); } } diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js index c49699c2b2c..cd376312505 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js @@ -1,9 +1,9 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep1) { 'use strict'; class Main2 { constructor () { - __chunk_1.fn$1(); - console.log(__chunk_1.text$1); + dep1.fn$1(); + console.log(dep1.text$1); } } diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js index 316cd5a722a..60027ffe8ee 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js @@ -1,11 +1,11 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep1 = require('./generated-chunk.js'); class Main1 { constructor () { - __chunk_1.fn(); - console.log(__chunk_1.text); + dep1.fn(); + console.log(dep1.text); } } diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js index d6a9f21b5e8..d3a7b6358b0 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js @@ -1,11 +1,11 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep1 = require('./generated-chunk.js'); class Main2 { constructor () { - __chunk_1.fn$1(); - console.log(__chunk_1.text$1); + dep1.fn$1(); + console.log(dep1.text$1); } } diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js index 2167f01dcf8..91c28dd2e42 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js @@ -1,9 +1,9 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (shared) { 'use strict'; - __chunk_1.commonjsGlobal.fn = d => d + 1; - var cjs = __chunk_1.commonjsGlobal.fn; + shared.commonjsGlobal.fn = d => d + 1; + var cjs = shared.commonjsGlobal.fn; - var main1 = __chunk_1.d.map(cjs); + var main1 = shared.d.map(cjs); return main1; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js index aaabc773106..b80ae0d3892 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js @@ -1,6 +1,6 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (shared) { 'use strict'; - var main2 = __chunk_1.d.map(d => d + 2); + var main2 = shared.d.map(d => d + 2); return main2; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js index 180e8c27663..b75d97e0ced 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js @@ -1,10 +1,10 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var shared = require('./generated-chunk.js'); -__chunk_1.commonjsGlobal.fn = d => d + 1; -var cjs = __chunk_1.commonjsGlobal.fn; +shared.commonjsGlobal.fn = d => d + 1; +var cjs = shared.commonjsGlobal.fn; -var main1 = __chunk_1.d.map(cjs); +var main1 = shared.d.map(cjs); module.exports = main1; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js index 65c7edb2329..ce051f9dca8 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var shared = require('./generated-chunk.js'); -var main2 = __chunk_1.d.map(d => d + 2); +var main2 = shared.d.map(d => d + 2); module.exports = main2; diff --git a/test/chunking-form/samples/chunk-naming/_expected/amd/custom/entryC.js b/test/chunking-form/samples/chunk-naming/_expected/amd/custom/entryC.js index 0996f9cb03b..dc61fbfae26 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/amd/custom/entryC.js +++ b/test/chunking-form/samples/chunk-naming/_expected/amd/custom/entryC.js @@ -1,5 +1,5 @@ -define(['../chunks/chunk', '../chunks/chunk3'], function (__chunk_1, __chunk_3) { 'use strict'; +define(['../chunks/chunk', '../chunks/chunk3'], function (dep1, dep3) { 'use strict'; - console.log(__chunk_1.num + __chunk_3.num); + console.log(dep1.num + dep3.num); }); diff --git a/test/chunking-form/samples/chunk-naming/_expected/amd/entryA.js b/test/chunking-form/samples/chunk-naming/_expected/amd/entryA.js index 587db5114ca..263d4b3c0ed 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/amd/entryA.js +++ b/test/chunking-form/samples/chunk-naming/_expected/amd/entryA.js @@ -1,5 +1,5 @@ -define(['./chunks/chunk', './chunks/chunk2'], function (__chunk_1, __chunk_2) { 'use strict'; +define(['./chunks/chunk', './chunks/chunk2'], function (dep1, dep2) { 'use strict'; - console.log(__chunk_1.num + __chunk_2.num); + console.log(dep1.num + dep2.num); }); diff --git a/test/chunking-form/samples/chunk-naming/_expected/amd/entryB.js b/test/chunking-form/samples/chunk-naming/_expected/amd/entryB.js index 66a2dc57923..2b47f5f6800 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/amd/entryB.js +++ b/test/chunking-form/samples/chunk-naming/_expected/amd/entryB.js @@ -1,5 +1,5 @@ -define(['./chunks/chunk2', './chunks/chunk3'], function (__chunk_2, __chunk_3) { 'use strict'; +define(['./chunks/chunk2', './chunks/chunk3'], function (dep2, dep3) { 'use strict'; - console.log(__chunk_2.num + __chunk_3.num); + console.log(dep2.num + dep3.num); }); diff --git a/test/chunking-form/samples/chunk-naming/_expected/cjs/custom/entryC.js b/test/chunking-form/samples/chunk-naming/_expected/cjs/custom/entryC.js index 369303485d2..ef92b645475 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/cjs/custom/entryC.js +++ b/test/chunking-form/samples/chunk-naming/_expected/cjs/custom/entryC.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('../chunks/chunk.js'); -var __chunk_3 = require('../chunks/chunk3.js'); +var dep1 = require('../chunks/chunk.js'); +var dep3 = require('../chunks/chunk3.js'); -console.log(__chunk_1.num + __chunk_3.num); +console.log(dep1.num + dep3.num); diff --git a/test/chunking-form/samples/chunk-naming/_expected/cjs/entryA.js b/test/chunking-form/samples/chunk-naming/_expected/cjs/entryA.js index 2c43ef416cc..0cf31f7652b 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/cjs/entryA.js +++ b/test/chunking-form/samples/chunk-naming/_expected/cjs/entryA.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./chunks/chunk.js'); -var __chunk_2 = require('./chunks/chunk2.js'); +var dep1 = require('./chunks/chunk.js'); +var dep2 = require('./chunks/chunk2.js'); -console.log(__chunk_1.num + __chunk_2.num); +console.log(dep1.num + dep2.num); diff --git a/test/chunking-form/samples/chunk-naming/_expected/cjs/entryB.js b/test/chunking-form/samples/chunk-naming/_expected/cjs/entryB.js index 3e63d354d8a..f8f15a60782 100644 --- a/test/chunking-form/samples/chunk-naming/_expected/cjs/entryB.js +++ b/test/chunking-form/samples/chunk-naming/_expected/cjs/entryB.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_2 = require('./chunks/chunk2.js'); -var __chunk_3 = require('./chunks/chunk3.js'); +var dep2 = require('./chunks/chunk2.js'); +var dep3 = require('./chunks/chunk3.js'); -console.log(__chunk_2.num + __chunk_3.num); +console.log(dep2.num + dep3.num); diff --git a/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js b/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js index 12d3a520ed4..1d2a2737c70 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js @@ -1,8 +1,8 @@ -define(['./generated-chunk'],function(__chunk_1){'use strict';function fn () { +define(['./generated-chunk'],function(dep2){'use strict';function fn () { console.log('dep1 fn'); }class Main1 { constructor () { fn(); - __chunk_1.f(); + dep2.f(); } }return Main1;}); \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js b/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js index fa6b2a09851..85ff93f21c8 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk','external'],function(__chunk_1,external){'use strict';function fn () { +define(['./generated-chunk','external'],function(dep2,external){'use strict';function fn () { console.log('lib1 fn'); external.fn(); }function fn$1 () { @@ -7,6 +7,6 @@ define(['./generated-chunk','external'],function(__chunk_1,external){'use strict }class Main2 { constructor () { fn$1(); - __chunk_1.f(); + dep2.f(); } }return Main2;}); \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js index 631d097e6f6..6dc9d76ea1f 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js @@ -1,8 +1,8 @@ -'use strict';var __chunk_1=require('./generated-chunk.js');function fn () { +'use strict';var dep2=require('./generated-chunk.js');function fn () { console.log('dep1 fn'); }class Main1 { constructor () { fn(); - __chunk_1.f(); + dep2.f(); } }module.exports=Main1; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js index 916428d57a9..854dd48c92e 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js @@ -1,4 +1,4 @@ -'use strict';var __chunk_1=require('./generated-chunk.js'),external=require('external');function fn () { +'use strict';var dep2=require('./generated-chunk.js'),external=require('external');function fn () { console.log('lib1 fn'); external.fn(); }function fn$1 () { @@ -7,6 +7,6 @@ }class Main2 { constructor () { fn$1(); - __chunk_1.f(); + dep2.f(); } }module.exports=Main2; \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js b/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js index ac14c9b6c66..108e509e2f3 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep2) { 'use strict'; function fn () { console.log('dep1 fn'); @@ -7,7 +7,7 @@ define(['./generated-chunk'], function (__chunk_1) { 'use strict'; class Main1 { constructor () { fn(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js b/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js index c6f58144aa8..7cfbb3515ea 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', 'external'], function (__chunk_1, external) { 'use strict'; +define(['./generated-chunk', 'external'], function (dep2, external) { 'use strict'; function fn () { console.log('lib1 fn'); @@ -13,7 +13,7 @@ define(['./generated-chunk', 'external'], function (__chunk_1, external) { 'use class Main2 { constructor () { fn$1(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js index 3f1d6358cca..d5090945ce7 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk.js'); function fn () { console.log('dep1 fn'); @@ -9,7 +9,7 @@ function fn () { class Main1 { constructor () { fn(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js index 20c359298e1..357ed56270f 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk.js'); var external = require('external'); function fn () { @@ -16,7 +16,7 @@ function fn$1 () { class Main2 { constructor () { fn$1(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js index 46adba2f54f..08b071d4e0a 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', 'external', './generated-chunk'], function (exports, external, __chunk_1) { 'use strict'; +define(['exports', 'external', './generated-chunk'], function (exports, external, dep) { 'use strict'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js index 46adba2f54f..08b071d4e0a 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', 'external', './generated-chunk'], function (exports, external, __chunk_1) { 'use strict'; +define(['exports', 'external', './generated-chunk'], function (exports, external, dep) { 'use strict'; diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js index e69175e6288..0afd0b1be07 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep2) { 'use strict'; function fn () { console.log('dep1 fn'); @@ -7,7 +7,7 @@ define(['./generated-chunk'], function (__chunk_1) { 'use strict'; class Main1 { constructor () { fn(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js.map index bb897b029b1..325a06a233e 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js.map +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js.map @@ -1 +1 @@ -{"version":3,"file":"main1.js","sources":["../../dep1.js","../../main1.js"],"sourcesContent":["export function fn () {\n console.log('dep1 fn');\n}","import { fn } from './dep1.js';\nimport { fn as fn2 } from './dep2.js';\n\nexport default class Main1 {\n constructor () {\n fn();\n fn2();\n }\n}"],"names":["fn2"],"mappings":";;EAAO,SAAS,EAAE,IAAI;EACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;GAAC,DCCc,MAAM,KAAK,CAAC;EAC3B,EAAE,WAAW,CAAC,GAAG;EACjB,IAAI,EAAE,EAAE,CAAC;EACT,IAAIA,YAAG,EAAE,CAAC;EACV,GAAG;EACH;;;;;;;;"} \ No newline at end of file +{"version":3,"file":"main1.js","sources":["../../dep1.js","../../main1.js"],"sourcesContent":["export function fn () {\n console.log('dep1 fn');\n}","import { fn } from './dep1.js';\nimport { fn as fn2 } from './dep2.js';\n\nexport default class Main1 {\n constructor () {\n fn();\n fn2();\n }\n}"],"names":["fn2"],"mappings":";;EAAO,SAAS,EAAE,IAAI;EACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;GAAC,DCCc,MAAM,KAAK,CAAC;EAC3B,EAAE,WAAW,CAAC,GAAG;EACjB,IAAI,EAAE,EAAE,CAAC;EACT,IAAIA,OAAG,EAAE,CAAC;EACV,GAAG;EACH;;;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js index 2a762c5f878..ede2faa9fa4 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep2) { 'use strict'; function fn () { console.log('lib1 fn'); @@ -12,7 +12,7 @@ define(['./generated-chunk'], function (__chunk_1) { 'use strict'; class Main2 { constructor () { fn$1(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js.map index 607acbbeec9..ae9ec33bbb1 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js.map +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js.map @@ -1 +1 @@ -{"version":3,"file":"main2.js","sources":["../../lib1.js","../../dep3.js","../../main2.js"],"sourcesContent":["export function fn () {\n console.log('lib1 fn');\n}\n\nexport function treeshaked () {\n console.log('this is tree shaken!');\n}","import { fn as libfn, treeshaked } from './lib1.js';\n\nexport function fn () {\n libfn();\n console.log('dep3 fn');\n}\n\nexport default treeshaked;","import { fn } from './dep2.js';\nimport { fn as fn2, default as treeshaked } from './dep3.js';\n\nif (false) {\n treeshaked();\n}\n\nexport default class Main2 {\n constructor () {\n fn2();\n fn();\n }\n}"],"names":["fn","libfn","fn2"],"mappings":";;EAAO,SAAS,EAAE,IAAI;EACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB,CAAC;;ECAM,SAASA,IAAE,IAAI;EACtB,EAAEC,EAAK,EAAE,CAAC;EACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB,CAAC;;ECEc,MAAM,KAAK,CAAC;EAC3B,EAAE,WAAW,CAAC,GAAG;EACjB,IAAIC,IAAG,EAAE,CAAC;EACV,IAAIF,YAAE,EAAE,CAAC;EACT,GAAG;EACH;;;;;;;;"} \ No newline at end of file +{"version":3,"file":"main2.js","sources":["../../lib1.js","../../dep3.js","../../main2.js"],"sourcesContent":["export function fn () {\n console.log('lib1 fn');\n}\n\nexport function treeshaked () {\n console.log('this is tree shaken!');\n}","import { fn as libfn, treeshaked } from './lib1.js';\n\nexport function fn () {\n libfn();\n console.log('dep3 fn');\n}\n\nexport default treeshaked;","import { fn } from './dep2.js';\nimport { fn as fn2, default as treeshaked } from './dep3.js';\n\nif (false) {\n treeshaked();\n}\n\nexport default class Main2 {\n constructor () {\n fn2();\n fn();\n }\n}"],"names":["fn","libfn","fn2"],"mappings":";;EAAO,SAAS,EAAE,IAAI;EACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB,CAAC;;ECAM,SAASA,IAAE,IAAI;EACtB,EAAEC,EAAK,EAAE,CAAC;EACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB,CAAC;;ECEc,MAAM,KAAK,CAAC;EAC3B,EAAE,WAAW,CAAC,GAAG;EACjB,IAAIC,IAAG,EAAE,CAAC;EACV,IAAIF,OAAE,EAAE,CAAC;EACT,GAAG;EACH;;;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js index b75b412a5b6..4f1ae2dd061 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk.js'); function fn () { console.log('dep1 fn'); @@ -9,7 +9,7 @@ function fn () { class Main1 { constructor () { fn(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js.map index 47f38d8ff91..146662c5a98 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js.map +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js.map @@ -1 +1 @@ -{"version":3,"file":"main1.js","sources":["../../dep1.js","../../main1.js"],"sourcesContent":["export function fn () {\n console.log('dep1 fn');\n}","import { fn } from './dep1.js';\nimport { fn as fn2 } from './dep2.js';\n\nexport default class Main1 {\n constructor () {\n fn();\n fn2();\n }\n}"],"names":["fn2"],"mappings":";;;;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCCc,MAAM,KAAK,CAAC;EACzB,WAAW,CAAC,GAAG;IACb,EAAE,EAAE,CAAC;IACLA,YAAG,EAAE,CAAC;GACP;;;;;"} \ No newline at end of file +{"version":3,"file":"main1.js","sources":["../../dep1.js","../../main1.js"],"sourcesContent":["export function fn () {\n console.log('dep1 fn');\n}","import { fn } from './dep1.js';\nimport { fn as fn2 } from './dep2.js';\n\nexport default class Main1 {\n constructor () {\n fn();\n fn2();\n }\n}"],"names":["fn2"],"mappings":";;;;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCCc,MAAM,KAAK,CAAC;EACzB,WAAW,CAAC,GAAG;IACb,EAAE,EAAE,CAAC;IACLA,OAAG,EAAE,CAAC;GACP;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js index b91e05aabc3..575b4056b99 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk.js'); function fn () { console.log('lib1 fn'); @@ -14,7 +14,7 @@ function fn$1 () { class Main2 { constructor () { fn$1(); - __chunk_1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js.map index e79021e3cd7..1709cfe53aa 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js.map +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js.map @@ -1 +1 @@ -{"version":3,"file":"main2.js","sources":["../../lib1.js","../../dep3.js","../../main2.js"],"sourcesContent":["export function fn () {\n console.log('lib1 fn');\n}\n\nexport function treeshaked () {\n console.log('this is tree shaken!');\n}","import { fn as libfn, treeshaked } from './lib1.js';\n\nexport function fn () {\n libfn();\n console.log('dep3 fn');\n}\n\nexport default treeshaked;","import { fn } from './dep2.js';\nimport { fn as fn2, default as treeshaked } from './dep3.js';\n\nif (false) {\n treeshaked();\n}\n\nexport default class Main2 {\n constructor () {\n fn2();\n fn();\n }\n}"],"names":["fn","libfn","fn2"],"mappings":";;;;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;CACxB;;ACAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;CACxB;;ACEc,MAAM,KAAK,CAAC;EACzB,WAAW,CAAC,GAAG;IACbC,IAAG,EAAE,CAAC;IACNF,YAAE,EAAE,CAAC;GACN;;;;;"} \ No newline at end of file +{"version":3,"file":"main2.js","sources":["../../lib1.js","../../dep3.js","../../main2.js"],"sourcesContent":["export function fn () {\n console.log('lib1 fn');\n}\n\nexport function treeshaked () {\n console.log('this is tree shaken!');\n}","import { fn as libfn, treeshaked } from './lib1.js';\n\nexport function fn () {\n libfn();\n console.log('dep3 fn');\n}\n\nexport default treeshaked;","import { fn } from './dep2.js';\nimport { fn as fn2, default as treeshaked } from './dep3.js';\n\nif (false) {\n treeshaked();\n}\n\nexport default class Main2 {\n constructor () {\n fn2();\n fn();\n }\n}"],"names":["fn","libfn","fn2"],"mappings":";;;;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;CACxB;;ACAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;CACxB;;ACEc,MAAM,KAAK,CAAC;EACzB,WAAW,CAAC,GAAG;IACbC,IAAG,EAAE,CAAC;IACNF,OAAE,EAAE,CAAC;GACN;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js index af1d847e2f9..18a8affa0de 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', 'starexternal1', 'external1', 'starexternal2', 'external2', './generated-chunk'], function (exports, starexternal1, external1, starexternal2, external2, __chunk_1) { 'use strict'; +define(['exports', 'starexternal1', 'external1', 'starexternal2', 'external2', './generated-chunk'], function (exports, starexternal1, external1, starexternal2, external2, dep) { 'use strict'; var main = '1'; @@ -16,7 +16,7 @@ define(['exports', 'starexternal1', 'external1', 'starexternal2', 'external2', ' return external1.e; } }); - exports.dep = __chunk_1.dep; + exports.dep = dep.dep; exports.main = main; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js index 680171b02dc..3f3fc18f276 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', 'starexternal2', 'external2', './generated-chunk'], function (exports, starexternal2, external2, __chunk_1) { 'use strict'; +define(['exports', 'starexternal2', 'external2', './generated-chunk'], function (exports, starexternal2, external2, dep) { 'use strict'; var main = '2'; @@ -16,7 +16,7 @@ define(['exports', 'starexternal2', 'external2', './generated-chunk'], function return external2.e; } }); - exports.dep = __chunk_1.dep; + exports.dep = dep.dep; exports.main = main; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js index 7082c9aa626..c4e5c7b17c1 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js @@ -6,7 +6,7 @@ var starexternal1 = require('starexternal1'); var external1 = require('external1'); require('starexternal2'); require('external2'); -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); var main = '1'; @@ -24,5 +24,5 @@ Object.defineProperty(exports, 'e', { return external1.e; } }); -exports.dep = __chunk_1.dep; +exports.dep = dep.dep; exports.main = main; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js index 51eaa277781..4f085285c75 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var starexternal2 = require('starexternal2'); var external2 = require('external2'); -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); var main = '2'; @@ -22,5 +22,5 @@ Object.defineProperty(exports, 'e', { return external2.e; } }); -exports.dep = __chunk_1.dep; +exports.dep = dep.dep; exports.main = main; diff --git a/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js index 875ce56c7de..edaa6114189 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log(__chunk_1.x); + console.log(dep.x); }); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js index 5d18b330e59..37f699e7206 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log(x, __chunk_1.x); + console.log(x, dep.x); }); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js index ec89a94037f..537c99d18e8 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log(__chunk_1.x); +console.log(dep.x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js index 3fac3def85e..5da40c6f426 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log(x, __chunk_1.x); +console.log(x, dep.x); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js index 4116f89dc57..feee89f7078 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (proxy2) { 'use strict'; - console.log(__chunk_1.bar, __chunk_1.bar); + console.log(proxy2.bar, proxy2.bar); }); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js index 4116f89dc57..feee89f7078 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (proxy2) { 'use strict'; - console.log(__chunk_1.bar, __chunk_1.bar); + console.log(proxy2.bar, proxy2.bar); }); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js index b3cc08fc4d9..7b26323fcee 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var proxy2 = require('./generated-chunk.js'); -console.log(__chunk_1.bar, __chunk_1.bar); +console.log(proxy2.bar, proxy2.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js index b3cc08fc4d9..7b26323fcee 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var proxy2 = require('./generated-chunk.js'); -console.log(__chunk_1.bar, __chunk_1.bar); +console.log(proxy2.bar, proxy2.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js index 4116f89dc57..2d85f4f5f0d 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (proxy) { 'use strict'; - console.log(__chunk_1.bar, __chunk_1.bar); + console.log(proxy.bar, proxy.bar); }); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js index 4116f89dc57..2d85f4f5f0d 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (proxy) { 'use strict'; - console.log(__chunk_1.bar, __chunk_1.bar); + console.log(proxy.bar, proxy.bar); }); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js index b3cc08fc4d9..55c9b13cb7e 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var proxy = require('./generated-chunk.js'); -console.log(__chunk_1.bar, __chunk_1.bar); +console.log(proxy.bar, proxy.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js index b3cc08fc4d9..55c9b13cb7e 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var proxy = require('./generated-chunk.js'); -console.log(__chunk_1.bar, __chunk_1.bar); +console.log(proxy.bar, proxy.bar); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js index 0ed08f8c0a5..be83c4e0d05 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (module3) { 'use strict'; - console.log(__chunk_1.b, __chunk_1.b); + console.log(module3.b, module3.b); }); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js index 0ed08f8c0a5..be83c4e0d05 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (module3) { 'use strict'; - console.log(__chunk_1.b, __chunk_1.b); + console.log(module3.b, module3.b); }); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js index 52ebedf3a5d..4bead314162 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var module3 = require('./generated-chunk.js'); -console.log(__chunk_1.b, __chunk_1.b); +console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js index 52ebedf3a5d..4bead314162 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var module3 = require('./generated-chunk.js'); -console.log(__chunk_1.b, __chunk_1.b); +console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js index d67cb599463..9fe0088b29a 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js @@ -1,6 +1,6 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (shared) { 'use strict'; - var main1 = __chunk_1.d.map(d => d + 1); + var main1 = shared.d.map(d => d + 1); return main1; diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js index aaabc773106..b80ae0d3892 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js @@ -1,6 +1,6 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (shared) { 'use strict'; - var main2 = __chunk_1.d.map(d => d + 2); + var main2 = shared.d.map(d => d + 2); return main2; diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js index 1bf78d9019b..36e411ab23e 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var shared = require('./generated-chunk.js'); -var main1 = __chunk_1.d.map(d => d + 1); +var main1 = shared.d.map(d => d + 1); module.exports = main1; diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js index 65c7edb2329..ce051f9dca8 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var shared = require('./generated-chunk.js'); -var main2 = __chunk_1.d.map(d => d + 2); +var main2 = shared.d.map(d => d + 2); module.exports = main2; 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 3debd768914..337791a6921 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,8 @@ -define(['require', './nested/chunk'], function (require, __chunk_1) { 'use strict'; +define(['require', './nested/chunk'], function (require, showImage) { 'use strict'; var logo = new URL(require.toUrl('./assets/logo1-a5ec488b.svg'), document.baseURI).href; - __chunk_1.showImage(logo); + 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/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/amd/nested/chunk2.js index 332eb53b021..92ac9ba4db0 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, __chunk_1) { 'use strict'; +define(['require', './chunk'], function (require, showImage) { 'use strict'; var logo = new URL(require.toUrl('../assets/logo2-6d5979e4.svg'), document.baseURI).href; - __chunk_1.showImage(logo); + showImage.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 2c01c808c16..5078a894cce 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,8 @@ 'use strict'; -var __chunk_1 = require('./nested/chunk.js'); +var showImage = 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); -__chunk_1.showImage(logo); +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/chunk2.js b/test/chunking-form/samples/deprecated/emit-asset/_expected/cjs/nested/chunk2.js index d0cc5ad6ffa..510d2678d19 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 __chunk_1 = require('./chunk.js'); +var showImage = 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); -__chunk_1.showImage(logo); +showImage.showImage(logo); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js index 9b82e0fcc17..eb910f88982 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js @@ -1,5 +1,5 @@ -define(['../generated-chunk'], function (__chunk_1) { 'use strict'; +define(['../generated-chunk'], function (dep) { 'use strict'; - console.log('startBuild', __chunk_1.value); + console.log('startBuild', dep.value); }); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js index 56bd65658a2..2fe39264b7d 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log('main', __chunk_1.value); + console.log('main', dep.value); }); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js index c193d450be5..95376156df4 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('../generated-chunk.js'); +var dep = require('../generated-chunk.js'); -console.log('startBuild', __chunk_1.value); +console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js index 04040e8d4f8..c199d16a106 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log('main', __chunk_1.value); +console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js index 4cfe5e26c29..9ec11065a3b 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js @@ -1,5 +1,5 @@ -define(['./chunk'], function (__chunk_1) { 'use strict'; +define(['./chunk'], function (shared) { 'use strict'; - postMessage(`from worker: ${__chunk_1.shared}`); + postMessage(`from worker: ${shared.shared}`); }); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js index e78af957548..faaeaec8554 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js @@ -1,11 +1,11 @@ -define(['require', './chunks/chunk'], function (require, __chunk_1) { 'use strict'; +define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker(new URL(require.toUrl('./chunks/worker-proxy.js'), document.baseURI).href); worker.onmessage = resolve; }); - document.body.innerHTML += `

main: ${__chunk_1.shared}

`; + document.body.innerHTML += `

main: ${shared.shared}

`; getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); new Promise(function (resolve, reject) { require(['./chunks/nested'], resolve, reject) }) diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js index 3e14edd224a..4b96dadad63 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./chunk.js'); +var shared = require('./chunk.js'); -postMessage(`from worker: ${__chunk_1.shared}`); +postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js index e7c846b892f..5da3cf5ccfe 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js @@ -1,13 +1,13 @@ 'use strict'; -var __chunk_1 = require('./chunks/chunk.js'); +var shared = require('./chunks/chunk.js'); const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worker-proxy.js').href : new URL('chunks/worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); worker.onmessage = resolve; }); -document.body.innerHTML += `

main: ${__chunk_1.shared}

`; +document.body.innerHTML += `

main: ${shared.shared}

`; getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); new Promise(function (resolve) { resolve(require('./chunks/nested.js')); }) diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js index 6b97d5f9e07..9ce3b8ea497 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js @@ -1,13 +1,13 @@ -define(['./chunk'], function (__chunk_1) { 'use strict'; +define(['./chunk'], function (shared) { 'use strict'; registerPaint( 'vertical-lines', class { paint(ctx, geom) { - for (let x = 0; x < geom.width / __chunk_1.size; x++) { + for (let x = 0; x < geom.width / shared.size; x++) { ctx.beginPath(); - ctx.fillStyle = __chunk_1.color; - ctx.rect(x * __chunk_1.size, 0, 2, geom.height); + ctx.fillStyle = shared.color; + ctx.rect(x * shared.size, 0, 2, geom.height); ctx.fill(); } } diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js index 2c1a3f967e5..4f1f66e5fe0 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js @@ -1,7 +1,7 @@ -define(['require', './chunks/chunk'], function (require, __chunk_1) { 'use strict'; +define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; CSS.paintWorklet.addModule(new URL(require.toUrl('./chunks/worklet.js'), document.baseURI).href); - document.body.innerHTML += `

color: ${__chunk_1.color}, size: ${__chunk_1.size}

`; + document.body.innerHTML += `

color: ${shared.color}, size: ${shared.size}

`; }); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js index b3eec36c862..c825979c594 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js @@ -1,15 +1,15 @@ 'use strict'; -var __chunk_1 = require('./chunk.js'); +var shared = require('./chunk.js'); registerPaint( 'vertical-lines', class { paint(ctx, geom) { - for (let x = 0; x < geom.width / __chunk_1.size; x++) { + for (let x = 0; x < geom.width / shared.size; x++) { ctx.beginPath(); - ctx.fillStyle = __chunk_1.color; - ctx.rect(x * __chunk_1.size, 0, 2, geom.height); + ctx.fillStyle = shared.color; + ctx.rect(x * shared.size, 0, 2, geom.height); ctx.fill(); } } diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js index a5404718a54..112043ba7d4 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./chunks/chunk.js'); +var shared = require('./chunks/chunk.js'); CSS.paintWorklet.addModule((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worklet.js').href : new URL('chunks/worklet.js', document.currentScript && document.currentScript.src || document.baseURI).href)); -document.body.innerHTML += `

color: ${__chunk_1.color}, size: ${__chunk_1.size}

`; +document.body.innerHTML += `

color: ${shared.color}, size: ${shared.size}

`; diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js index e313dd4eb35..e71ca60c322 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log('startBuild', __chunk_1.value); + console.log('startBuild', dep.value); }); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js index 56bd65658a2..2fe39264b7d 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log('main', __chunk_1.value); + console.log('main', dep.value); }); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js index 806bebd797b..01502f79482 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log('startBuild', __chunk_1.value); +console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js index 04040e8d4f8..c199d16a106 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log('main', __chunk_1.value); +console.log('main', dep.value); 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 d6192e01c21..0ff0154a980 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-chunk'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './generated-chunk'], function (exports, dep4) { 'use strict'; function mult (num) { - return num + __chunk_1.multiplier; + return num + dep4.multiplier; } exports.mult = mult; 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 ef675ab6761..f5e55c8be42 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,7 +1,7 @@ -define(['require', './generated-chunk'], function (require, __chunk_1) { 'use strict'; +define(['require', './generated-chunk'], function (require, dep4) { 'use strict'; function calc (num) { - return num * __chunk_1.multiplier; + return num * dep4.multiplier; } function fn (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 64e18d76138..9ffd19ad726 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 __chunk_1 = require('./generated-chunk.js'); +var dep4 = require('./generated-chunk.js'); function mult (num) { - return num + __chunk_1.multiplier; + return num + dep4.multiplier; } exports.mult = mult; 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 c4cb8c2855e..a1ce7cc13ec 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,9 +1,9 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep4 = require('./generated-chunk.js'); function calc (num) { - return num * __chunk_1.multiplier; + return num * dep4.multiplier; } function fn (num) { 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 b9e9c31e762..5f16b4ed626 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,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep1) { 'use strict'; - console.log(__chunk_1.foo(), __chunk_1.bar()); + console.log(dep1.foo(), dep1.bar()); }); 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 8f2c58c6eae..12c7a0a7c3b 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep1 = require('./generated-chunk.js'); -console.log(__chunk_1.foo(), __chunk_1.bar()); +console.log(dep1.foo(), dep1.bar()); 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 3aab0b0cf74..ac567d0a690 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', './chunk'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './chunk'], function (exports, shared) { 'use strict'; - exports.value = __chunk_1.sharedValue; + exports.value = shared.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 205e4fcd0fc..3578eb39061 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js @@ -1,6 +1,6 @@ -define(['require', 'exports', './chunks/chunk'], function (require, exports, __chunk_1) { 'use strict'; +define(['require', 'exports', './chunks/chunk'], function (require, exports, shared) { 'use strict'; - assert.equal(__chunk_1.sharedValue, 'shared'); + assert.equal(shared.sharedValue, 'shared'); const promise = new Promise(function (resolve, reject) { require(['./chunks/other'], resolve, reject) }).then(result => assert.deepEqual(result, { value: 'shared' }) diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js index 04b27928561..84df05fe8fd 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 __chunk_1 = require('./chunk.js'); +var shared = require('./chunk.js'); -exports.value = __chunk_1.sharedValue; +exports.value = shared.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 047a282dd81..64eec88f4c8 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js @@ -2,9 +2,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var __chunk_1 = require('./chunks/chunk.js'); +var shared = require('./chunks/chunk.js'); -assert.equal(__chunk_1.sharedValue, 'shared'); +assert.equal(shared.sharedValue, 'shared'); const promise = new Promise(function (resolve) { resolve(require('./chunks/other.js')); }).then(result => assert.deepEqual(result, { value: 'shared' }) diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js index 9b82e0fcc17..eb910f88982 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js @@ -1,5 +1,5 @@ -define(['../generated-chunk'], function (__chunk_1) { 'use strict'; +define(['../generated-chunk'], function (dep) { 'use strict'; - console.log('startBuild', __chunk_1.value); + console.log('startBuild', dep.value); }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js index 56bd65658a2..2fe39264b7d 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log('main', __chunk_1.value); + console.log('main', dep.value); }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js index c193d450be5..95376156df4 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('../generated-chunk.js'); +var dep = require('../generated-chunk.js'); -console.log('startBuild', __chunk_1.value); +console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js index 04040e8d4f8..c199d16a106 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log('main', __chunk_1.value); +console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js index 4cfe5e26c29..9ec11065a3b 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js @@ -1,5 +1,5 @@ -define(['./chunk'], function (__chunk_1) { 'use strict'; +define(['./chunk'], function (shared) { 'use strict'; - postMessage(`from worker: ${__chunk_1.shared}`); + postMessage(`from worker: ${shared.shared}`); }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js index e78af957548..faaeaec8554 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js @@ -1,11 +1,11 @@ -define(['require', './chunks/chunk'], function (require, __chunk_1) { 'use strict'; +define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker(new URL(require.toUrl('./chunks/worker-proxy.js'), document.baseURI).href); worker.onmessage = resolve; }); - document.body.innerHTML += `

main: ${__chunk_1.shared}

`; + document.body.innerHTML += `

main: ${shared.shared}

`; getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); new Promise(function (resolve, reject) { require(['./chunks/nested'], resolve, reject) }) diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js index 3e14edd224a..4b96dadad63 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./chunk.js'); +var shared = require('./chunk.js'); -postMessage(`from worker: ${__chunk_1.shared}`); +postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js index e7c846b892f..5da3cf5ccfe 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js @@ -1,13 +1,13 @@ 'use strict'; -var __chunk_1 = require('./chunks/chunk.js'); +var shared = require('./chunks/chunk.js'); const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worker-proxy.js').href : new URL('chunks/worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); worker.onmessage = resolve; }); -document.body.innerHTML += `

main: ${__chunk_1.shared}

`; +document.body.innerHTML += `

main: ${shared.shared}

`; getWorkerMessage().then(message => (document.body.innerHTML += `

1: ${message.data}

`)); new Promise(function (resolve) { resolve(require('./chunks/nested.js')); }) diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js index 6b97d5f9e07..9ce3b8ea497 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js @@ -1,13 +1,13 @@ -define(['./chunk'], function (__chunk_1) { 'use strict'; +define(['./chunk'], function (shared) { 'use strict'; registerPaint( 'vertical-lines', class { paint(ctx, geom) { - for (let x = 0; x < geom.width / __chunk_1.size; x++) { + for (let x = 0; x < geom.width / shared.size; x++) { ctx.beginPath(); - ctx.fillStyle = __chunk_1.color; - ctx.rect(x * __chunk_1.size, 0, 2, geom.height); + ctx.fillStyle = shared.color; + ctx.rect(x * shared.size, 0, 2, geom.height); ctx.fill(); } } diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js index 2c1a3f967e5..4f1f66e5fe0 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js @@ -1,7 +1,7 @@ -define(['require', './chunks/chunk'], function (require, __chunk_1) { 'use strict'; +define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; CSS.paintWorklet.addModule(new URL(require.toUrl('./chunks/worklet.js'), document.baseURI).href); - document.body.innerHTML += `

color: ${__chunk_1.color}, size: ${__chunk_1.size}

`; + document.body.innerHTML += `

color: ${shared.color}, size: ${shared.size}

`; }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js index b3eec36c862..c825979c594 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js @@ -1,15 +1,15 @@ 'use strict'; -var __chunk_1 = require('./chunk.js'); +var shared = require('./chunk.js'); registerPaint( 'vertical-lines', class { paint(ctx, geom) { - for (let x = 0; x < geom.width / __chunk_1.size; x++) { + for (let x = 0; x < geom.width / shared.size; x++) { ctx.beginPath(); - ctx.fillStyle = __chunk_1.color; - ctx.rect(x * __chunk_1.size, 0, 2, geom.height); + ctx.fillStyle = shared.color; + ctx.rect(x * shared.size, 0, 2, geom.height); ctx.fill(); } } diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js index a5404718a54..112043ba7d4 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./chunks/chunk.js'); +var shared = require('./chunks/chunk.js'); CSS.paintWorklet.addModule((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worklet.js').href : new URL('chunks/worklet.js', document.currentScript && document.currentScript.src || document.baseURI).href)); -document.body.innerHTML += `

color: ${__chunk_1.color}, size: ${__chunk_1.size}

`; +document.body.innerHTML += `

color: ${shared.color}, size: ${shared.size}

`; diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js index e313dd4eb35..e71ca60c322 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log('startBuild', __chunk_1.value); + console.log('startBuild', dep.value); }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js index 56bd65658a2..2fe39264b7d 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log('main', __chunk_1.value); + console.log('main', dep.value); }); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js index 806bebd797b..01502f79482 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log('startBuild', __chunk_1.value); +console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js index 04040e8d4f8..c199d16a106 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log('main', __chunk_1.value); +console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js index 9b82e0fcc17..eb910f88982 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js @@ -1,5 +1,5 @@ -define(['../generated-chunk'], function (__chunk_1) { 'use strict'; +define(['../generated-chunk'], function (dep) { 'use strict'; - console.log('startBuild', __chunk_1.value); + console.log('startBuild', dep.value); }); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js index 56bd65658a2..2fe39264b7d 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log('main', __chunk_1.value); + console.log('main', dep.value); }); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js index c193d450be5..95376156df4 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('../generated-chunk.js'); +var dep = require('../generated-chunk.js'); -console.log('startBuild', __chunk_1.value); +console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js index 04040e8d4f8..c199d16a106 100644 --- a/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log('main', __chunk_1.value); +console.log('main', dep.value); 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 3debd768914..337791a6921 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,8 @@ -define(['require', './nested/chunk'], function (require, __chunk_1) { 'use strict'; +define(['require', './nested/chunk'], function (require, showImage) { 'use strict'; var logo = new URL(require.toUrl('./assets/logo1-a5ec488b.svg'), document.baseURI).href; - __chunk_1.showImage(logo); + 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/chunk2.js b/test/chunking-form/samples/emit-file/reference-files/_expected/amd/nested/chunk2.js index 332eb53b021..92ac9ba4db0 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, __chunk_1) { 'use strict'; +define(['require', './chunk'], function (require, showImage) { 'use strict'; var logo = new URL(require.toUrl('../assets/logo2-6d5979e4.svg'), document.baseURI).href; - __chunk_1.showImage(logo); + showImage.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 2c01c808c16..5078a894cce 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,8 @@ 'use strict'; -var __chunk_1 = require('./nested/chunk.js'); +var showImage = 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); -__chunk_1.showImage(logo); +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/chunk2.js b/test/chunking-form/samples/emit-file/reference-files/_expected/cjs/nested/chunk2.js index d0cc5ad6ffa..510d2678d19 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 __chunk_1 = require('./chunk.js'); +var showImage = 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); -__chunk_1.showImage(logo); +showImage.showImage(logo); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/_config.js b/test/chunking-form/samples/emit-file/sanitize-file-name/_config.js new file mode 100644 index 00000000000..39a76de71d6 --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/_config.js @@ -0,0 +1,21 @@ +module.exports = { + description: 'allows adding additional chunks and retrieving their file name', + options: { + input: 'main', + plugins: { + resolveId(id) { + if (id === '\0virtual') { + return id; + } + }, + load(id) { + if (id === '\0virtual') { + return `console.log('virtual');`; + } + }, + buildStart() { + this.emitFile({ type: 'chunk', id: '\0virtual' }); + } + } + } +}; diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/amd/generated-_virtual.js b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/amd/generated-_virtual.js new file mode 100644 index 00000000000..32246cb68ba --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/amd/generated-_virtual.js @@ -0,0 +1,5 @@ +define(function () { 'use strict'; + + console.log('virtual'); + +}); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/amd/main.js b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/amd/main.js new file mode 100644 index 00000000000..dcbf09f0392 --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/amd/main.js @@ -0,0 +1,7 @@ +define(function () { 'use strict'; + + var value = 42; + + console.log('main', value); + +}); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/cjs/generated-_virtual.js b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/cjs/generated-_virtual.js new file mode 100644 index 00000000000..1764c6a085b --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/cjs/generated-_virtual.js @@ -0,0 +1,3 @@ +'use strict'; + +console.log('virtual'); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/cjs/main.js new file mode 100644 index 00000000000..26bd2f14193 --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/cjs/main.js @@ -0,0 +1,5 @@ +'use strict'; + +var value = 42; + +console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/es/generated-_virtual.js b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/es/generated-_virtual.js new file mode 100644 index 00000000000..a3bc2d5daf3 --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/es/generated-_virtual.js @@ -0,0 +1 @@ +console.log('virtual'); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/es/main.js b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/es/main.js new file mode 100644 index 00000000000..a3207fe8c14 --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/es/main.js @@ -0,0 +1,3 @@ +var value = 42; + +console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/system/generated-_virtual.js b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/system/generated-_virtual.js new file mode 100644 index 00000000000..e8682500989 --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/system/generated-_virtual.js @@ -0,0 +1,10 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + console.log('virtual'); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/system/main.js b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/system/main.js new file mode 100644 index 00000000000..a824ae3115d --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/_expected/system/main.js @@ -0,0 +1,12 @@ +System.register([], function () { + 'use strict'; + return { + execute: function () { + + var value = 42; + + console.log('main', value); + + } + }; +}); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/buildStart.js b/test/chunking-form/samples/emit-file/sanitize-file-name/buildStart.js new file mode 100644 index 00000000000..f9b1b414da5 --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/buildStart.js @@ -0,0 +1,3 @@ +import value from './dep.js'; + +console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/dep.js b/test/chunking-form/samples/emit-file/sanitize-file-name/dep.js new file mode 100644 index 00000000000..7a4e8a723a4 --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/dep.js @@ -0,0 +1 @@ +export default 42; diff --git a/test/chunking-form/samples/emit-file/sanitize-file-name/main.js b/test/chunking-form/samples/emit-file/sanitize-file-name/main.js new file mode 100644 index 00000000000..4a9b3a3f405 --- /dev/null +++ b/test/chunking-form/samples/emit-file/sanitize-file-name/main.js @@ -0,0 +1,3 @@ +import value from './dep.js'; + +console.log('main', value); diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js index 70d5738bbcb..7a8cf74c70d 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js @@ -1,6 +1,6 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep1) { 'use strict'; - var main1 = __chunk_1.x + __chunk_1.y; + var main1 = dep1.x + dep1.y; return main1; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js index 4aef9d410a7..ef71c5734fc 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js @@ -1,6 +1,6 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep1) { 'use strict'; - var main2 = __chunk_1.x + __chunk_1.z; + var main2 = dep1.x + dep1.z; return main2; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js index b42651359db..b0e9a23338c 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js @@ -1,6 +1,6 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep1) { 'use strict'; - var main3 = __chunk_1.y + __chunk_1.z; + var main3 = dep1.y + dep1.z; return main3; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js index ecc16472e0f..980f499b8ae 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep1 = require('./generated-chunk.js'); -var main1 = __chunk_1.x + __chunk_1.y; +var main1 = dep1.x + dep1.y; module.exports = main1; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js index cb9dcfd1880..f006c706a6a 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep1 = require('./generated-chunk.js'); -var main2 = __chunk_1.x + __chunk_1.z; +var main2 = dep1.x + dep1.z; module.exports = main2; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js index dd73699a09f..63736fc903f 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep1 = require('./generated-chunk.js'); -var main3 = __chunk_1.y + __chunk_1.z; +var main3 = dep1.y + dep1.z; module.exports = main3; diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/main1.js b/test/chunking-form/samples/grouping-size/_expected/amd/main1.js index c21d934d51e..bc68133afaf 100644 --- a/test/chunking-form/samples/grouping-size/_expected/amd/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/amd/main1.js @@ -1,6 +1,6 @@ -define(['./generated-chunk', './generated-chunk2'], function (__chunk_1, __chunk_2) { 'use strict'; +define(['./generated-chunk', './generated-chunk2'], function (dep1, dep2) { 'use strict'; - var main1 = __chunk_1.x + __chunk_2.y; + var main1 = dep1.x + dep2.y; return main1; diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/main2.js b/test/chunking-form/samples/grouping-size/_expected/amd/main2.js index 0eb3cf0c0aa..2ce5dd206fd 100644 --- a/test/chunking-form/samples/grouping-size/_expected/amd/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/amd/main2.js @@ -1,6 +1,6 @@ -define(['./generated-chunk', './generated-chunk2'], function (__chunk_1, __chunk_2) { 'use strict'; +define(['./generated-chunk', './generated-chunk2'], function (dep1, dep2) { 'use strict'; - var main2 = __chunk_1.x + __chunk_2.z; + var main2 = dep1.x + dep2.z; return main2; diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/main3.js b/test/chunking-form/samples/grouping-size/_expected/amd/main3.js index 7d4ddbd4550..fdbaf782254 100644 --- a/test/chunking-form/samples/grouping-size/_expected/amd/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/amd/main3.js @@ -1,6 +1,6 @@ -define(['./generated-chunk2'], function (__chunk_2) { 'use strict'; +define(['./generated-chunk2'], function (dep2) { 'use strict'; - var main3 = __chunk_2.y + __chunk_2.z; + var main3 = dep2.y + dep2.z; return main3; diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js b/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js index 403d57593cc..6859a03fbff 100644 --- a/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js @@ -1,8 +1,8 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); -var __chunk_2 = require('./generated-chunk2.js'); +var dep1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk2.js'); -var main1 = __chunk_1.x + __chunk_2.y; +var main1 = dep1.x + dep2.y; module.exports = main1; diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js b/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js index 5bc3542e0e1..d64360e5a40 100644 --- a/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js @@ -1,8 +1,8 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); -var __chunk_2 = require('./generated-chunk2.js'); +var dep1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk2.js'); -var main2 = __chunk_1.x + __chunk_2.z; +var main2 = dep1.x + dep2.z; module.exports = main2; diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js b/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js index 45e0a8946fb..8295c0efa78 100644 --- a/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_2 = require('./generated-chunk2.js'); +var dep2 = require('./generated-chunk2.js'); -var main3 = __chunk_2.y + __chunk_2.z; +var main3 = dep2.y + dep2.z; module.exports = main3; 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 97f96ccbbaf..b7f5a800c4a 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,6 @@ -define(['module', 'require', './nested/chunk'], function (module, require, __chunk_1) { 'use strict'; +define(['module', 'require', './nested/chunk'], function (module, require, log) { 'use strict'; - __chunk_1.log('main: ' + new URL(module.uri, document.baseURI).href); + 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/chunk2.js b/test/chunking-form/samples/import-meta-url/_expected/amd/nested/chunk2.js index e63722d0646..468fd8cd396 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, __chunk_1) { 'use strict'; +define(['module', './chunk'], function (module, log) { 'use strict'; - __chunk_1.log('nested: ' + new URL(module.uri, document.baseURI).href); + log.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 b68f315c4d5..bb1f021a939 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,6 @@ 'use strict'; -var __chunk_1 = require('./nested/chunk.js'); +var log = require('./nested/chunk.js'); -__chunk_1.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))); +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/chunk2.js b/test/chunking-form/samples/import-meta-url/_expected/cjs/nested/chunk2.js index ad2c0bb4da0..a674059fbab 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 __chunk_1 = require('./chunk.js'); +var log = require('./chunk.js'); -__chunk_1.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))); +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))); diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/generated-manual-middle.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/generated-manual-middle.js index d685b7251a8..a12cddc2c4f 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/generated-manual-middle.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/generated-manual-middle.js @@ -1,4 +1,4 @@ -define(['./generated-manual-inner'], function (__chunk_1) { 'use strict'; +define(['./generated-manual-inner'], function (manualInner) { 'use strict'; console.log('middle'); diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/generated-manual-outer.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/generated-manual-outer.js index 13ebf2a438d..19b33370089 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/generated-manual-outer.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/generated-manual-outer.js @@ -1,4 +1,4 @@ -define(['./generated-manual-middle'], function (__chunk_2) { 'use strict'; +define(['./generated-manual-middle'], function (manualMiddle) { 'use strict'; console.log('outer'); diff --git a/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/main.js b/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/main.js index 6bc9ac6c053..5ec5a9952d4 100644 --- a/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunks-different-nested/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-manual-inner', './generated-manual-middle', './generated-manual-outer'], function (__chunk_1, __chunk_2, __chunk_3) { 'use strict'; +define(['./generated-manual-inner', './generated-manual-middle', './generated-manual-outer'], function (manualInner, manualMiddle, manualOuter) { 'use strict'; console.log('main'); diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/amd/generated-chunk-c.js b/test/chunking-form/samples/manual-chunks-function/_expected/amd/generated-chunk-c.js index ac30fde69d7..d62075790ea 100644 --- a/test/chunking-form/samples/manual-chunks-function/_expected/amd/generated-chunk-c.js +++ b/test/chunking-form/samples/manual-chunks-function/_expected/amd/generated-chunk-c.js @@ -1,4 +1,4 @@ -define(['./generated-chunk-b'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk-b'], function (chunkB) { 'use strict'; console.log('dep-c'); diff --git a/test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js b/test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js index 6f202bfb172..939b5e414df 100644 --- a/test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js +++ b/test/chunking-form/samples/manual-chunks-function/_expected/amd/main-a.js @@ -1,4 +1,4 @@ -define(['./generated-chunk-b', './generated-chunk-c'], function (__chunk_1, __chunk_2) { 'use strict'; +define(['./generated-chunk-b', './generated-chunk-c'], function (chunkB, chunkC) { 'use strict'; console.log('dep1'); diff --git a/test/chunking-form/samples/manual-chunks-nested/_expected/amd/main.js b/test/chunking-form/samples/manual-chunks-nested/_expected/amd/main.js index 4cfe600e533..c9a0d54be11 100644 --- a/test/chunking-form/samples/manual-chunks-nested/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunks-nested/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-manual'], function (__chunk_1) { 'use strict'; +define(['./generated-manual'], function (manual) { 'use strict'; console.log('main'); diff --git a/test/chunking-form/samples/manual-chunks/_expected/amd/generated-deps2and3.js b/test/chunking-form/samples/manual-chunks/_expected/amd/generated-deps2and3.js index 165b82f137a..ddd28d1a05e 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/amd/generated-deps2and3.js +++ b/test/chunking-form/samples/manual-chunks/_expected/amd/generated-deps2and3.js @@ -1,4 +1,4 @@ -define(['exports', './generated-lib1'], function (exports, __chunk_2) { 'use strict'; +define(['exports', './generated-lib1'], function (exports, lib1) { 'use strict'; function fn () { console.log('lib2 fn'); @@ -10,7 +10,7 @@ define(['exports', './generated-lib1'], function (exports, __chunk_2) { 'use str } function fn$2 () { - __chunk_2.fn(); + lib1.fn(); console.log('dep3 fn'); } diff --git a/test/chunking-form/samples/manual-chunks/_expected/amd/main.js b/test/chunking-form/samples/manual-chunks/_expected/amd/main.js index beeca173eae..e636d3d3dd1 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/amd/main.js +++ b/test/chunking-form/samples/manual-chunks/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-deps2and3', './generated-lib1'], function (__chunk_1, __chunk_2) { 'use strict'; +define(['./generated-deps2and3', './generated-lib1'], function (deps2and3, lib1) { 'use strict'; function fn () { console.log('dep1 fn'); @@ -7,8 +7,8 @@ define(['./generated-deps2and3', './generated-lib1'], function (__chunk_1, __chu class Main { constructor () { fn(); - __chunk_1.fn(); - __chunk_1.fn$1(); + deps2and3.fn(); + deps2and3.fn$1(); } } diff --git a/test/chunking-form/samples/manual-chunks/_expected/cjs/generated-deps2and3.js b/test/chunking-form/samples/manual-chunks/_expected/cjs/generated-deps2and3.js index 64e6eb793d9..2b98a12f897 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/cjs/generated-deps2and3.js +++ b/test/chunking-form/samples/manual-chunks/_expected/cjs/generated-deps2and3.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_2 = require('./generated-lib1.js'); +var lib1 = require('./generated-lib1.js'); function fn () { console.log('lib2 fn'); @@ -12,7 +12,7 @@ function fn$1 () { } function fn$2 () { - __chunk_2.fn(); + lib1.fn(); console.log('dep3 fn'); } diff --git a/test/chunking-form/samples/manual-chunks/_expected/cjs/main.js b/test/chunking-form/samples/manual-chunks/_expected/cjs/main.js index 9b98d406a1a..2a68746bab6 100644 --- a/test/chunking-form/samples/manual-chunks/_expected/cjs/main.js +++ b/test/chunking-form/samples/manual-chunks/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-deps2and3.js'); +var deps2and3 = require('./generated-deps2and3.js'); require('./generated-lib1.js'); function fn () { @@ -10,8 +10,8 @@ function fn () { class Main { constructor () { fn(); - __chunk_1.fn(); - __chunk_1.fn$1(); + deps2and3.fn(); + deps2and3.fn$1(); } } diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/main.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/main.js index 8fd12daee88..ec4beefe55b 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/main.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./dep1', './dep2'], function (__chunk_1, __chunk_2) { 'use strict'; +define(['./dep1', './dep2'], function (dep1, dep2) { 'use strict'; - console.log(__chunk_1.missing1, __chunk_2.missing2, __chunk_2.previousShimmedExport); + console.log(dep1.missing1, dep2.missing2, dep2.previousShimmedExport); }); diff --git a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/main.js b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/main.js index cd5ca909182..0a8ed0c591c 100644 --- a/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/main.js +++ b/test/chunking-form/samples/missing-export-reused-deconflicting/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./dep1.js'); -var __chunk_2 = require('./dep2.js'); +var dep1 = require('./dep1.js'); +var dep2 = require('./dep2.js'); -console.log(__chunk_1.missing1, __chunk_2.missing2, __chunk_2.previousShimmedExport); +console.log(dep1.missing1, dep2.missing2, dep2.previousShimmedExport); diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js b/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js index 41ad8f756f1..241f3b4decf 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js @@ -1,5 +1,5 @@ -define(['./generated-chunk', './generated-chunk2'], function (__chunk_1, __chunk_2) { 'use strict'; +define(['./generated-chunk', './generated-chunk2'], function (dep1, dep2) { 'use strict'; - console.log(__chunk_1.num + __chunk_2.num); + console.log(dep1.num + dep2.num); }); diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js b/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js index fb0872ff799..be42a710778 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js @@ -1,5 +1,5 @@ -define(['./generated-chunk2', './generated-chunk3'], function (__chunk_2, __chunk_3) { 'use strict'; +define(['./generated-chunk2', './generated-chunk3'], function (dep2, dep3) { 'use strict'; - console.log(__chunk_2.num + __chunk_3.num); + console.log(dep2.num + dep3.num); }); diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js b/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js index 3317ef0bd37..7ac5d88e84b 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js @@ -1,5 +1,5 @@ -define(['./generated-chunk', './generated-chunk3'], function (__chunk_1, __chunk_3) { 'use strict'; +define(['./generated-chunk', './generated-chunk3'], function (dep1, dep3) { 'use strict'; - console.log(__chunk_1.num + __chunk_3.num); + console.log(dep1.num + dep3.num); }); diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js index baa7be60bf3..97a9e5c06ee 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); -var __chunk_2 = require('./generated-chunk2.js'); +var dep1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk2.js'); -console.log(__chunk_1.num + __chunk_2.num); +console.log(dep1.num + dep2.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js index 275f62b386c..aa5a8a1765e 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_2 = require('./generated-chunk2.js'); -var __chunk_3 = require('./generated-chunk3.js'); +var dep2 = require('./generated-chunk2.js'); +var dep3 = require('./generated-chunk3.js'); -console.log(__chunk_2.num + __chunk_3.num); +console.log(dep2.num + dep3.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js index 87cd8aaa33b..825f821e4ee 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); -var __chunk_3 = require('./generated-chunk3.js'); +var dep1 = require('./generated-chunk.js'); +var dep3 = require('./generated-chunk3.js'); -console.log(__chunk_1.num + __chunk_3.num); +console.log(dep1.num + dep3.num); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js index e8d75a79e14..3a71fb0a580 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./chunks/chunk'], function (__chunk_1) { 'use strict'; +define(['./chunks/chunk'], function (shared) { 'use strict'; - assert.equal(__chunk_1.sharedValue, 'shared'); + assert.equal(shared.sharedValue, 'shared'); }); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js index 1c4346af7f8..f956e7d89dd 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js @@ -1,8 +1,8 @@ -define(['exports', './chunks/chunk'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './chunks/chunk'], function (exports, shared) { 'use strict'; - exports.sharedValue = __chunk_1.sharedValue; + exports.sharedValue = shared.sharedValue; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js index 276798be0e4..21f7a767310 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./chunks/chunk.js'); +var shared = require('./chunks/chunk.js'); -assert.equal(__chunk_1.sharedValue, 'shared'); +assert.equal(shared.sharedValue, 'shared'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js index bdb6a8f4c55..dd37c515620 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js @@ -2,8 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var __chunk_1 = require('./chunks/chunk.js'); +var shared = require('./chunks/chunk.js'); -exports.sharedValue = __chunk_1.sharedValue; +exports.sharedValue = shared.sharedValue; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js index 2d9441cbf54..42413614a36 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js @@ -1,9 +1,9 @@ -define(['exports', './generated-chunk', 'external'], function (exports, __chunk_1, external) { 'use strict'; +define(['exports', './generated-chunk', 'external'], function (exports, dep, external) { 'use strict'; console.log(external.reexported); var lib = /*#__PURE__*/Object.freeze({ - reexported: __chunk_1.reexported + reexported: dep.reexported }); exports.lib = lib; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js index 51772b15d56..27080798f40 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js @@ -1,5 +1,5 @@ -define(['./generated-chunk', 'external', './generated-chunk2'], function (__chunk_1, external, __chunk_2) { 'use strict'; +define(['./generated-chunk', 'external', './generated-chunk2'], function (dep, external, index) { 'use strict'; - console.log(__chunk_2.lib); + console.log(index.lib); }); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js index cf6f7207880..e054ba744c3 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js @@ -1,5 +1,5 @@ -define(['./generated-chunk', 'external', './generated-chunk2'], function (__chunk_1, external, __chunk_2) { 'use strict'; +define(['./generated-chunk', 'external', './generated-chunk2'], function (dep, external, index) { 'use strict'; - console.log(__chunk_1.reexported); + console.log(dep.reexported); }); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js index 80869868e48..60c4edba0a2 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js index efde5396823..52d701a5760 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js @@ -1,12 +1,12 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); var external = require('external'); console.log(external.reexported); var lib = /*#__PURE__*/Object.freeze({ - reexported: __chunk_1.reexported + reexported: dep.reexported }); exports.lib = lib; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js index bcb57971dfe..a39cf01b525 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js @@ -2,6 +2,6 @@ require('./generated-chunk.js'); require('external'); -var __chunk_2 = require('./generated-chunk2.js'); +var index = require('./generated-chunk2.js'); -console.log(__chunk_2.lib); +console.log(index.lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js index 0c13973bdd8..4c77f2beb0f 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); require('external'); require('./generated-chunk2.js'); -console.log(__chunk_1.reexported); +console.log(dep.reexported); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js index b5a0e083248..716dfb53d76 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js @@ -1,6 +1,6 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (other) { 'use strict'; - __chunk_1.Other.doSomething(); - __chunk_1.Broken.doSomething(); + other.Other.doSomething(); + other.Broken.doSomething(); }); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js index e2d4985dc13..e1dd9238e1c 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (other) { 'use strict'; - __chunk_1.Other.doSomething(); + other.Other.doSomething(); }); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js index 1b39a06671d..a7b7bb36ca6 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js @@ -1,6 +1,6 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var other = require('./generated-chunk.js'); -__chunk_1.Other.doSomething(); -__chunk_1.Broken.doSomething(); +other.Other.doSomething(); +other.Broken.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js index 5ed989f9b07..2434778310d 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var other = require('./generated-chunk.js'); -__chunk_1.Other.doSomething(); +other.Other.doSomething(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js index 0a3e8b14711..9c8503e7aee 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './generated-chunk'], function (exports, broken) { 'use strict'; function foo() { console.log('foo'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js index 6d8f8bf796c..ef36cc32878 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './generated-chunk'], function (exports, broken) { 'use strict'; function bar() { console.log('bar'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js index 116300fc7e0..3913f749429 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js @@ -1,6 +1,6 @@ -define(['./generated-chunk', './generated-chunk2'], function (__chunk_1, __chunk_2) { 'use strict'; +define(['./generated-chunk', './generated-chunk2'], function (broken, foo) { 'use strict'; - __chunk_2.foo(); - __chunk_1.broken(); + foo.foo(); + broken.broken(); }); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js index 0f2eec7ca6d..fdce3215734 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js @@ -1,8 +1,8 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (__chunk_1, __chunk_2, __chunk_3) { 'use strict'; +define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (broken, foo, bar) { 'use strict'; - __chunk_2.foo(); - __chunk_1.broken(); - __chunk_3.bar(); - __chunk_1.broken(); + foo.foo(); + broken.broken(); + bar.bar(); + broken.broken(); }); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js index 28477f9fa63..2d8063dc6b7 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js @@ -1,6 +1,6 @@ -define(['./generated-chunk', './generated-chunk3'], function (__chunk_1, __chunk_3) { 'use strict'; +define(['./generated-chunk', './generated-chunk3'], function (broken, bar) { 'use strict'; - __chunk_3.bar(); - __chunk_1.broken(); + bar.bar(); + broken.broken(); }); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js index 9f7dc53de52..d62d63dc1a3 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); -var __chunk_2 = require('./generated-chunk2.js'); +var broken = require('./generated-chunk.js'); +var foo = require('./generated-chunk2.js'); -__chunk_2.foo(); -__chunk_1.broken(); +foo.foo(); +broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js index a49ddae4ed4..4d042398ce2 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js @@ -1,10 +1,10 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); -var __chunk_2 = require('./generated-chunk2.js'); -var __chunk_3 = require('./generated-chunk3.js'); +var broken = require('./generated-chunk.js'); +var foo = require('./generated-chunk2.js'); +var bar = require('./generated-chunk3.js'); -__chunk_2.foo(); -__chunk_1.broken(); -__chunk_3.bar(); -__chunk_1.broken(); +foo.foo(); +broken.broken(); +bar.bar(); +broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js index 7aca1fba638..fbe86e301ea 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); -var __chunk_3 = require('./generated-chunk3.js'); +var broken = require('./generated-chunk.js'); +var bar = require('./generated-chunk3.js'); -__chunk_3.bar(); -__chunk_1.broken(); +bar.bar(); +broken.broken(); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-proxy b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-proxy index 598a5312942..077f7c6892d 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-proxy +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/_virtual/other.js_commonjs-proxy @@ -1,7 +1,7 @@ -define(['exports', '../other'], function (exports, __chunk_1) { 'use strict'; +define(['exports', '../other'], function (exports, other) { 'use strict'; - exports.default = __chunk_1.__moduleExports; + exports.default = other.__moduleExports; }); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js index 5702aa06452..f9724402a16 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/commonjs.js @@ -1,10 +1,10 @@ -define(['exports', 'external', './other', './_virtual/_external_commonjs-external', './_virtual/other.js_commonjs-proxy'], function (exports, external, __chunk_1, __chunk_2, __chunk_3) { 'use strict'; +define(['exports', 'external', './other', './_virtual/_external_commonjs-external', './_virtual/other.js_commonjs-proxy'], function (exports, external, other, _external_commonjsExternal, other$1) { 'use strict'; external = external && external.hasOwnProperty('default') ? external['default'] : external; - const { value } = __chunk_3.default; + const { value } = other$1.default; - console.log(__chunk_2.default, value); + console.log(_external_commonjsExternal.default, value); var commonjs = 42; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js index d266f1602d4..5e740cc642c 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/amd/main.js @@ -1,7 +1,7 @@ -define(['external', './commonjs'], function (external, __chunk_4) { 'use strict'; +define(['external', './commonjs'], function (external, commonjs) { 'use strict'; external = external && external.hasOwnProperty('default') ? external['default'] : external; - console.log(__chunk_4.default, external); + console.log(commonjs.default, external); }); diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-proxy b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-proxy index fbf759c7e91..38113e1c00d 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-proxy +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/_virtual/other.js_commonjs-proxy @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('../other.js'); +var other = require('../other.js'); -exports.default = __chunk_1.__moduleExports; +exports.default = other.__moduleExports; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js index d9d398e8f71..fee76c2bbd4 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/commonjs.js @@ -2,12 +2,12 @@ require('external'); require('./other.js'); -var __chunk_2 = require('./_virtual/_external_commonjs-external'); -var __chunk_3 = require('./_virtual/other.js_commonjs-proxy'); +var _external_commonjsExternal = require('./_virtual/_external_commonjs-external'); +var other$1 = require('./_virtual/other.js_commonjs-proxy'); -const { value } = __chunk_3.default; +const { value } = other$1.default; -console.log(__chunk_2.default, value); +console.log(_external_commonjsExternal.default, value); var commonjs = 42; diff --git a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js index 52510c0ebe7..3566b7d3ca4 100644 --- a/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-commonjs/_expected/cjs/main.js @@ -3,6 +3,6 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; } var external = _interopDefault(require('external')); -var __chunk_4 = require('./commonjs.js'); +var commonjs = require('./commonjs.js'); -console.log(__chunk_4.default, external); +console.log(commonjs.default, external); diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js index c298602724e..1994dfa24ea 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/m1.js @@ -1,8 +1,8 @@ -define(['exports', './m2', './m3'], function (exports, __chunk_1, __chunk_2) { 'use strict'; +define(['exports', './m2', './m3'], function (exports, m2, m3) { 'use strict'; - exports.m2 = __chunk_1.default; - exports.m3 = __chunk_2.default; + exports.m2 = m2.default; + exports.m3 = m3.default; }); diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/main.js index 72e7481571d..b73da45ad1d 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./m1'], function (__chunk_3) { 'use strict'; +define(['./m1'], function (m1) { 'use strict'; - console.log(__chunk_3); + console.log(m1); }); diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js index 2d344aba613..9cd978cdba0 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/m1.js @@ -1,9 +1,9 @@ 'use strict'; -var __chunk_1 = require('./m2.js'); -var __chunk_2 = require('./m3.js'); +var m2 = require('./m2.js'); +var m3 = require('./m3.js'); -exports.m2 = __chunk_1.default; -exports.m3 = __chunk_2.default; +exports.m2 = m2.default; +exports.m3 = m3.default; diff --git a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/main.js index 9cfd124aa66..79afdf39744 100644 --- a/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-dynamic-namespace/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_3 = require('./m1.js'); +var m1 = require('./m1.js'); -console.log(__chunk_3); +console.log(m1); diff --git a/test/chunking-form/samples/preserve-modules-empty/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-empty/_expected/amd/main.js index 1ed84f69b0f..d1a402c3323 100644 --- a/test/chunking-form/samples/preserve-modules-empty/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-empty/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./two'], function (__chunk_1) { 'use strict'; +define(['./two'], function (two) { 'use strict'; - window.APP = { a: __chunk_1.default }; + window.APP = { a: two.default }; }); diff --git a/test/chunking-form/samples/preserve-modules-empty/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-empty/_expected/cjs/main.js index 2e2d4bc2bfa..9c99002c078 100644 --- a/test/chunking-form/samples/preserve-modules-empty/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-empty/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./two.js'); +var two = require('./two.js'); -window.APP = { a: __chunk_1.default }; +window.APP = { a: two.default }; diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js index eca24c0e300..4c30c2b8f1e 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main1.js @@ -1,9 +1,9 @@ -define(['exports', './dep'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './dep'], function (exports, dep) { 'use strict'; - exports.bar = __chunk_1.foo; - exports.foo = __chunk_1.foo; + exports.bar = dep.foo; + exports.foo = dep.foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js index ce0c6142f0d..0d4dfce05b3 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/amd/main2.js @@ -1,8 +1,8 @@ -define(['exports', './dep'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './dep'], function (exports, dep) { 'use strict'; - exports.bar = __chunk_1.foo; + exports.bar = dep.foo; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js index f0bc32c0694..801c4e75c53 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main1.js @@ -2,9 +2,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var __chunk_1 = require('./dep.js'); +var dep = require('./dep.js'); -exports.bar = __chunk_1.foo; -exports.foo = __chunk_1.foo; +exports.bar = dep.foo; +exports.foo = dep.foo; diff --git a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js index e775bbbe223..1c1f62cd337 100644 --- a/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js +++ b/test/chunking-form/samples/preserve-modules-export-alias/_expected/cjs/main2.js @@ -2,8 +2,8 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var __chunk_1 = require('./dep.js'); +var dep = require('./dep.js'); -exports.bar = __chunk_1.foo; +exports.bar = dep.foo; diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js index ada967244e0..c89b17c4c11 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/amd/main.js @@ -1,8 +1,8 @@ -define(['exports', './inner/more_inner/something', './inner/some_effect'], function (exports, __chunk_1, __chunk_3) { 'use strict'; +define(['exports', './inner/more_inner/something', './inner/some_effect'], function (exports, something, some_effect) { 'use strict'; - exports.Something = __chunk_1.Something; + exports.Something = something.Something; Object.defineProperty(exports, '__esModule', { value: true }); diff --git a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js index 35c480bcd14..ffa1d0bc5bb 100644 --- a/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-nested-export/_expected/cjs/main.js @@ -2,9 +2,9 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var __chunk_1 = require('./inner/more_inner/something.js'); +var something = require('./inner/more_inner/something.js'); require('./inner/some_effect.js'); -exports.Something = __chunk_1.Something; +exports.Something = something.Something; diff --git a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/amd/main.js index 35ea0e4c3f7..c07b67c3402 100644 --- a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/amd/main.js @@ -1,7 +1,7 @@ -define(['./dep2'], function (__chunk_1) { 'use strict'; +define(['./dep2'], function (dep2) { 'use strict'; - return __chunk_1.default; + return dep2.default; }); diff --git a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/cjs/main.js index 265941ad491..0dc5aea529f 100644 --- a/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-non-entry-imports/_expected/cjs/main.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./dep2.js'); +var dep2 = require('./dep2.js'); -module.exports = __chunk_1.default; +module.exports = dep2.default; diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/lib/main.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/lib/main.js index 0562844ec4c..ff8eacced99 100644 --- a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/lib/main.js +++ b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/amd/lib/main.js @@ -1,8 +1,8 @@ -define(['../dep'], function (__chunk_1) { 'use strict'; +define(['../dep'], function (dep) { 'use strict'; class Main { constructor () { - __chunk_1.fn(); + dep.fn(); } } diff --git a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/lib/main.js b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/lib/main.js index e3035db7e95..fb6e31f3abc 100644 --- a/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/lib/main.js +++ b/test/chunking-form/samples/preserve-modules-reaching-outside/_expected/cjs/lib/main.js @@ -1,10 +1,10 @@ 'use strict'; -var __chunk_1 = require('../dep.js'); +var dep = require('../dep.js'); class Main { constructor () { - __chunk_1.fn(); + dep.fn(); } } diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/main.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/main.js index 505a608b3e3..452f5c4b435 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/main.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/amd/main.js @@ -1,5 +1,5 @@ -define(['./_virtual/_virtualModule'], function (__chunk_1) { 'use strict'; +define(['./_virtual/_virtualModule'], function (_virtualModule) { 'use strict'; - assert.equal(__chunk_1.virtual, 'Virtual!'); + assert.equal(_virtualModule.virtual, 'Virtual!'); }); diff --git a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/main.js b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/main.js index f80a159eff0..c32672f1b85 100644 --- a/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/main.js +++ b/test/chunking-form/samples/preserve-modules-virtual-modules/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./_virtual/_virtualModule'); +var _virtualModule = require('./_virtual/_virtualModule'); -assert.equal(__chunk_1.virtual, 'Virtual!'); +assert.equal(_virtualModule.virtual, 'Virtual!'); diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js index babc3674287..ad678831a6e 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep2.js @@ -1,7 +1,7 @@ -define(['exports', '../lib/lib2'], function (exports, __chunk_2) { 'use strict'; +define(['exports', '../lib/lib2'], function (exports, lib2) { 'use strict'; function fn () { - __chunk_2.fn(); + lib2.fn(); console.log('dep2 fn'); } diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js index b3a7e253194..48bf30466aa 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/deps/dep3.js @@ -1,7 +1,7 @@ -define(['exports', '../lib/lib1'], function (exports, __chunk_4) { 'use strict'; +define(['exports', '../lib/lib1'], function (exports, lib1) { 'use strict'; function fn () { - __chunk_4.fn(); + lib1.fn(); console.log('dep3 fn'); } diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/main1.js b/test/chunking-form/samples/preserve-modules/_expected/amd/main1.js index 59c09092c0b..70e5862bab7 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/main1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/main1.js @@ -1,9 +1,9 @@ -define(['./deps/dep1', './deps/dep2'], function (__chunk_1, __chunk_3) { 'use strict'; +define(['./deps/dep1', './deps/dep2'], function (dep1, dep2) { 'use strict'; class Main1 { constructor () { - __chunk_1.fn(); - __chunk_3.fn(); + dep1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/preserve-modules/_expected/amd/main2.js b/test/chunking-form/samples/preserve-modules/_expected/amd/main2.js index 4c0aa3659bf..b9dd02ca10c 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/amd/main2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/amd/main2.js @@ -1,9 +1,9 @@ -define(['./deps/dep2', './deps/dep3'], function (__chunk_3, __chunk_5) { 'use strict'; +define(['./deps/dep2', './deps/dep3'], function (dep2, dep3) { 'use strict'; class Main2 { constructor () { - __chunk_5.fn(); - __chunk_3.fn(); + dep3.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js index b0eba9e1a68..1c35a7c280c 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep2.js @@ -1,9 +1,9 @@ 'use strict'; -var __chunk_2 = require('../lib/lib2.js'); +var lib2 = require('../lib/lib2.js'); function fn () { - __chunk_2.fn(); + lib2.fn(); console.log('dep2 fn'); } diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js index e429ec92785..9459cf55dea 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/deps/dep3.js @@ -1,9 +1,9 @@ 'use strict'; -var __chunk_4 = require('../lib/lib1.js'); +var lib1 = require('../lib/lib1.js'); function fn () { - __chunk_4.fn(); + lib1.fn(); console.log('dep3 fn'); } diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/main1.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/main1.js index 70488dc698a..0181b38e214 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/main1.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/main1.js @@ -1,12 +1,12 @@ 'use strict'; -var __chunk_1 = require('./deps/dep1.js'); -var __chunk_3 = require('./deps/dep2.js'); +var dep1 = require('./deps/dep1.js'); +var dep2 = require('./deps/dep2.js'); class Main1 { constructor () { - __chunk_1.fn(); - __chunk_3.fn(); + dep1.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/preserve-modules/_expected/cjs/main2.js b/test/chunking-form/samples/preserve-modules/_expected/cjs/main2.js index ca7e906776a..5078fc7854f 100644 --- a/test/chunking-form/samples/preserve-modules/_expected/cjs/main2.js +++ b/test/chunking-form/samples/preserve-modules/_expected/cjs/main2.js @@ -1,12 +1,12 @@ 'use strict'; -var __chunk_3 = require('./deps/dep2.js'); -var __chunk_5 = require('./deps/dep3.js'); +var dep2 = require('./deps/dep2.js'); +var dep3 = require('./deps/dep3.js'); class Main2 { constructor () { - __chunk_5.fn(); - __chunk_3.fn(); + dep3.fn(); + dep2.fn(); } } diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js index f1a34bad61f..01aa9f8c94c 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js @@ -1,7 +1,7 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep2) { 'use strict'; - return __chunk_1.foo; + return dep2.foo; }); diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js index 80869868e48..d41d6fbb8d7 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js index 80869868e48..d41d6fbb8d7 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js index 58199158186..15404e8950b 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep2 = require('./generated-chunk.js'); -module.exports = __chunk_1.foo; +module.exports = dep2.foo; diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main1.js b/test/chunking-form/samples/render-chunk/_expected/amd/main1.js index afaf8762c8b..0de55adbbf9 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/main1.js @@ -1,8 +1,8 @@ -define(['./chunk-chunk'], function (__chunk_1) { 'use strict'; +define(['./chunk-chunk'], function (dep2) { 'use strict'; var num = 1; - console.log(num + __chunk_1.num); + console.log(num + dep2.num); }); console.log('fileName', 'main1.js'); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main2.js b/test/chunking-form/samples/render-chunk/_expected/amd/main2.js index d83bca88519..07f680de4a4 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/main2.js @@ -1,8 +1,8 @@ -define(['./chunk-chunk'], function (__chunk_1) { 'use strict'; +define(['./chunk-chunk'], function (dep2) { 'use strict'; var num = 3; - console.log(__chunk_1.num + num); + console.log(dep2.num + num); }); console.log('fileName', 'main2.js'); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js index 89a507a1f86..bdde6363441 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js @@ -1,10 +1,10 @@ 'use strict'; -var __chunk_1 = require('./chunk-chunk.js'); +var dep2 = require('./chunk-chunk.js'); var num = 1; -console.log(num + __chunk_1.num); +console.log(num + dep2.num); console.log('fileName', 'main1.js'); console.log('imports', 'chunk-chunk.js'); console.log('isEntry', true); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js index 1f7969b15d1..74049b711a3 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js @@ -1,10 +1,10 @@ 'use strict'; -var __chunk_1 = require('./chunk-chunk.js'); +var dep2 = require('./chunk-chunk.js'); var num = 3; -console.log(__chunk_1.num + num); +console.log(dep2.num + num); console.log('fileName', 'main2.js'); console.log('imports', 'chunk-chunk.js'); console.log('isEntry', true); 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 e42b35f00ff..3d7f4c33046 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-chunk'], function (exports, __chunk_1) { 'use strict'; +define(['exports', './generated-chunk'], function (exports, constants) { 'use strict'; - var lazy = () => __chunk_1.v1; + var lazy = () => constants.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 a5b743a2ca4..779c4810f2d 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,279 +1,279 @@ -define(['require', 'exports', './generated-chunk'], function (require, exports, __chunk_1) { 'use strict'; +define(['require', 'exports', './generated-chunk'], function (require, exports, constants) { 'use strict'; const lazy = new Promise(function (resolve, reject) { require(['./generated-lazy'], resolve, reject) }); - exports.v1 = __chunk_1.v1; - exports.v10 = __chunk_1.v10; - exports.v100 = __chunk_1.v100; - exports.v101 = __chunk_1.v101; - exports.v102 = __chunk_1.v102; - exports.v103 = __chunk_1.v103; - exports.v104 = __chunk_1.v104; - exports.v105 = __chunk_1.v105; - exports.v106 = __chunk_1.v106; - exports.v107 = __chunk_1.v107; - exports.v108 = __chunk_1.v108; - exports.v109 = __chunk_1.v109; - exports.v11 = __chunk_1.v11; - exports.v110 = __chunk_1.v110; - exports.v111 = __chunk_1.v111; - exports.v112 = __chunk_1.v112; - exports.v113 = __chunk_1.v113; - exports.v114 = __chunk_1.v114; - exports.v115 = __chunk_1.v115; - exports.v116 = __chunk_1.v116; - exports.v117 = __chunk_1.v117; - exports.v118 = __chunk_1.v118; - exports.v119 = __chunk_1.v119; - exports.v12 = __chunk_1.v12; - exports.v120 = __chunk_1.v120; - exports.v121 = __chunk_1.v121; - exports.v122 = __chunk_1.v122; - exports.v123 = __chunk_1.v123; - exports.v124 = __chunk_1.v124; - exports.v125 = __chunk_1.v125; - exports.v126 = __chunk_1.v126; - exports.v127 = __chunk_1.v127; - exports.v128 = __chunk_1.v128; - exports.v129 = __chunk_1.v129; - exports.v13 = __chunk_1.v13; - exports.v130 = __chunk_1.v130; - exports.v131 = __chunk_1.v131; - exports.v132 = __chunk_1.v132; - exports.v133 = __chunk_1.v133; - exports.v134 = __chunk_1.v134; - exports.v135 = __chunk_1.v135; - exports.v136 = __chunk_1.v136; - exports.v137 = __chunk_1.v137; - exports.v138 = __chunk_1.v138; - exports.v139 = __chunk_1.v139; - exports.v14 = __chunk_1.v14; - exports.v140 = __chunk_1.v140; - exports.v141 = __chunk_1.v141; - exports.v142 = __chunk_1.v142; - exports.v143 = __chunk_1.v143; - exports.v144 = __chunk_1.v144; - exports.v145 = __chunk_1.v145; - exports.v146 = __chunk_1.v146; - exports.v147 = __chunk_1.v147; - exports.v148 = __chunk_1.v148; - exports.v149 = __chunk_1.v149; - exports.v15 = __chunk_1.v15; - exports.v150 = __chunk_1.v150; - exports.v151 = __chunk_1.v151; - exports.v152 = __chunk_1.v152; - exports.v153 = __chunk_1.v153; - exports.v154 = __chunk_1.v154; - exports.v155 = __chunk_1.v155; - exports.v156 = __chunk_1.v156; - exports.v157 = __chunk_1.v157; - exports.v158 = __chunk_1.v158; - exports.v159 = __chunk_1.v159; - exports.v16 = __chunk_1.v16; - exports.v160 = __chunk_1.v160; - exports.v161 = __chunk_1.v161; - exports.v162 = __chunk_1.v162; - exports.v163 = __chunk_1.v163; - exports.v164 = __chunk_1.v164; - exports.v165 = __chunk_1.v165; - exports.v166 = __chunk_1.v166; - exports.v167 = __chunk_1.v167; - exports.v168 = __chunk_1.v168; - exports.v169 = __chunk_1.v169; - exports.v17 = __chunk_1.v17; - exports.v170 = __chunk_1.v170; - exports.v171 = __chunk_1.v171; - exports.v172 = __chunk_1.v172; - exports.v173 = __chunk_1.v173; - exports.v174 = __chunk_1.v174; - exports.v175 = __chunk_1.v175; - exports.v176 = __chunk_1.v176; - exports.v177 = __chunk_1.v177; - exports.v178 = __chunk_1.v178; - exports.v179 = __chunk_1.v179; - exports.v18 = __chunk_1.v18; - exports.v180 = __chunk_1.v180; - exports.v181 = __chunk_1.v181; - exports.v182 = __chunk_1.v182; - exports.v183 = __chunk_1.v183; - exports.v184 = __chunk_1.v184; - exports.v185 = __chunk_1.v185; - exports.v186 = __chunk_1.v186; - exports.v187 = __chunk_1.v187; - exports.v188 = __chunk_1.v188; - exports.v189 = __chunk_1.v189; - exports.v19 = __chunk_1.v19; - exports.v190 = __chunk_1.v190; - exports.v191 = __chunk_1.v191; - exports.v192 = __chunk_1.v192; - exports.v193 = __chunk_1.v193; - exports.v194 = __chunk_1.v194; - exports.v195 = __chunk_1.v195; - exports.v196 = __chunk_1.v196; - exports.v197 = __chunk_1.v197; - exports.v198 = __chunk_1.v198; - exports.v199 = __chunk_1.v199; - exports.v2 = __chunk_1.v2; - exports.v20 = __chunk_1.v20; - exports.v200 = __chunk_1.v200; - exports.v201 = __chunk_1.v201; - exports.v202 = __chunk_1.v202; - exports.v203 = __chunk_1.v203; - exports.v204 = __chunk_1.v204; - exports.v205 = __chunk_1.v205; - exports.v206 = __chunk_1.v206; - exports.v207 = __chunk_1.v207; - exports.v208 = __chunk_1.v208; - exports.v209 = __chunk_1.v209; - exports.v21 = __chunk_1.v21; - exports.v210 = __chunk_1.v210; - exports.v211 = __chunk_1.v211; - exports.v212 = __chunk_1.v212; - exports.v213 = __chunk_1.v213; - exports.v214 = __chunk_1.v214; - exports.v215 = __chunk_1.v215; - exports.v216 = __chunk_1.v216; - exports.v217 = __chunk_1.v217; - exports.v218 = __chunk_1.v218; - exports.v219 = __chunk_1.v219; - exports.v22 = __chunk_1.v22; - exports.v220 = __chunk_1.v220; - exports.v221 = __chunk_1.v221; - exports.v222 = __chunk_1.v222; - exports.v223 = __chunk_1.v223; - exports.v224 = __chunk_1.v224; - exports.v225 = __chunk_1.v225; - exports.v226 = __chunk_1.v226; - exports.v227 = __chunk_1.v227; - exports.v228 = __chunk_1.v228; - exports.v229 = __chunk_1.v229; - exports.v23 = __chunk_1.v23; - exports.v230 = __chunk_1.v230; - exports.v231 = __chunk_1.v231; - exports.v232 = __chunk_1.v232; - exports.v233 = __chunk_1.v233; - exports.v234 = __chunk_1.v234; - exports.v235 = __chunk_1.v235; - exports.v236 = __chunk_1.v236; - exports.v237 = __chunk_1.v237; - exports.v238 = __chunk_1.v238; - exports.v239 = __chunk_1.v239; - exports.v24 = __chunk_1.v24; - exports.v240 = __chunk_1.v240; - exports.v241 = __chunk_1.v241; - exports.v242 = __chunk_1.v242; - exports.v243 = __chunk_1.v243; - exports.v244 = __chunk_1.v244; - exports.v245 = __chunk_1.v245; - exports.v246 = __chunk_1.v246; - exports.v247 = __chunk_1.v247; - exports.v248 = __chunk_1.v248; - exports.v249 = __chunk_1.v249; - exports.v25 = __chunk_1.v25; - exports.v250 = __chunk_1.v250; - exports.v251 = __chunk_1.v251; - exports.v252 = __chunk_1.v252; - exports.v253 = __chunk_1.v253; - exports.v254 = __chunk_1.v254; - exports.v255 = __chunk_1.v255; - exports.v256 = __chunk_1.v256; - exports.v257 = __chunk_1.v257; - exports.v258 = __chunk_1.v258; - exports.v259 = __chunk_1.v259; - exports.v26 = __chunk_1.v26; - exports.v260 = __chunk_1.v260; - exports.v261 = __chunk_1.v261; - exports.v262 = __chunk_1.v262; - exports.v263 = __chunk_1.v263; - exports.v264 = __chunk_1.v264; - exports.v265 = __chunk_1.v265; - exports.v266 = __chunk_1.v266; - exports.v267 = __chunk_1.v267; - exports.v268 = __chunk_1.v268; - exports.v269 = __chunk_1.v269; - exports.v27 = __chunk_1.v27; - exports.v270 = __chunk_1.v270; - exports.v271 = __chunk_1.v271; - exports.v272 = __chunk_1.v272; - exports.v28 = __chunk_1.v28; - exports.v29 = __chunk_1.v29; - exports.v3 = __chunk_1.v3; - exports.v30 = __chunk_1.v30; - exports.v31 = __chunk_1.v31; - exports.v32 = __chunk_1.v32; - exports.v33 = __chunk_1.v33; - exports.v34 = __chunk_1.v34; - exports.v35 = __chunk_1.v35; - exports.v36 = __chunk_1.v36; - exports.v37 = __chunk_1.v37; - exports.v38 = __chunk_1.v38; - exports.v39 = __chunk_1.v39; - exports.v4 = __chunk_1.v4; - exports.v40 = __chunk_1.v40; - exports.v41 = __chunk_1.v41; - exports.v42 = __chunk_1.v42; - exports.v43 = __chunk_1.v43; - exports.v44 = __chunk_1.v44; - exports.v45 = __chunk_1.v45; - exports.v46 = __chunk_1.v46; - exports.v47 = __chunk_1.v47; - exports.v48 = __chunk_1.v48; - exports.v49 = __chunk_1.v49; - exports.v5 = __chunk_1.v5; - exports.v50 = __chunk_1.v50; - exports.v51 = __chunk_1.v51; - exports.v52 = __chunk_1.v52; - exports.v53 = __chunk_1.v53; - exports.v54 = __chunk_1.v54; - exports.v55 = __chunk_1.v55; - exports.v56 = __chunk_1.v56; - exports.v57 = __chunk_1.v57; - exports.v58 = __chunk_1.v58; - exports.v59 = __chunk_1.v59; - exports.v6 = __chunk_1.v6; - exports.v60 = __chunk_1.v60; - exports.v61 = __chunk_1.v61; - exports.v62 = __chunk_1.v62; - exports.v63 = __chunk_1.v63; - exports.v64 = __chunk_1.v64; - exports.v65 = __chunk_1.v65; - exports.v66 = __chunk_1.v66; - exports.v67 = __chunk_1.v67; - exports.v68 = __chunk_1.v68; - exports.v69 = __chunk_1.v69; - exports.v7 = __chunk_1.v7; - exports.v70 = __chunk_1.v70; - exports.v71 = __chunk_1.v71; - exports.v72 = __chunk_1.v72; - exports.v73 = __chunk_1.v73; - exports.v74 = __chunk_1.v74; - exports.v75 = __chunk_1.v75; - exports.v76 = __chunk_1.v76; - exports.v77 = __chunk_1.v77; - exports.v78 = __chunk_1.v78; - exports.v79 = __chunk_1.v79; - exports.v8 = __chunk_1.v8; - exports.v80 = __chunk_1.v80; - exports.v81 = __chunk_1.v81; - exports.v82 = __chunk_1.v82; - exports.v83 = __chunk_1.v83; - exports.v84 = __chunk_1.v84; - exports.v85 = __chunk_1.v85; - exports.v86 = __chunk_1.v86; - exports.v87 = __chunk_1.v87; - exports.v88 = __chunk_1.v88; - exports.v89 = __chunk_1.v89; - exports.v9 = __chunk_1.v9; - exports.v90 = __chunk_1.v90; - exports.v91 = __chunk_1.v91; - exports.v92 = __chunk_1.v92; - exports.v93 = __chunk_1.v93; - exports.v94 = __chunk_1.v94; - exports.v95 = __chunk_1.v95; - exports.v96 = __chunk_1.v96; - exports.v97 = __chunk_1.v97; - exports.v98 = __chunk_1.v98; - exports.v99 = __chunk_1.v99; + 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; Object.defineProperty(exports, '__esModule', { value: true }); 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 4ea4eee74c3..c8f3fa4490e 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 __chunk_1 = require('./generated-chunk.js'); +var constants = require('./generated-chunk.js'); -var lazy = () => __chunk_1.v1; +var lazy = () => constants.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 6ac4cd24d43..13c0d7a30f6 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,280 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var __chunk_1 = require('./generated-chunk.js'); +var constants = require('./generated-chunk.js'); const lazy = new Promise(function (resolve) { resolve(require('./generated-lazy.js')); }); -exports.v1 = __chunk_1.v1; -exports.v10 = __chunk_1.v10; -exports.v100 = __chunk_1.v100; -exports.v101 = __chunk_1.v101; -exports.v102 = __chunk_1.v102; -exports.v103 = __chunk_1.v103; -exports.v104 = __chunk_1.v104; -exports.v105 = __chunk_1.v105; -exports.v106 = __chunk_1.v106; -exports.v107 = __chunk_1.v107; -exports.v108 = __chunk_1.v108; -exports.v109 = __chunk_1.v109; -exports.v11 = __chunk_1.v11; -exports.v110 = __chunk_1.v110; -exports.v111 = __chunk_1.v111; -exports.v112 = __chunk_1.v112; -exports.v113 = __chunk_1.v113; -exports.v114 = __chunk_1.v114; -exports.v115 = __chunk_1.v115; -exports.v116 = __chunk_1.v116; -exports.v117 = __chunk_1.v117; -exports.v118 = __chunk_1.v118; -exports.v119 = __chunk_1.v119; -exports.v12 = __chunk_1.v12; -exports.v120 = __chunk_1.v120; -exports.v121 = __chunk_1.v121; -exports.v122 = __chunk_1.v122; -exports.v123 = __chunk_1.v123; -exports.v124 = __chunk_1.v124; -exports.v125 = __chunk_1.v125; -exports.v126 = __chunk_1.v126; -exports.v127 = __chunk_1.v127; -exports.v128 = __chunk_1.v128; -exports.v129 = __chunk_1.v129; -exports.v13 = __chunk_1.v13; -exports.v130 = __chunk_1.v130; -exports.v131 = __chunk_1.v131; -exports.v132 = __chunk_1.v132; -exports.v133 = __chunk_1.v133; -exports.v134 = __chunk_1.v134; -exports.v135 = __chunk_1.v135; -exports.v136 = __chunk_1.v136; -exports.v137 = __chunk_1.v137; -exports.v138 = __chunk_1.v138; -exports.v139 = __chunk_1.v139; -exports.v14 = __chunk_1.v14; -exports.v140 = __chunk_1.v140; -exports.v141 = __chunk_1.v141; -exports.v142 = __chunk_1.v142; -exports.v143 = __chunk_1.v143; -exports.v144 = __chunk_1.v144; -exports.v145 = __chunk_1.v145; -exports.v146 = __chunk_1.v146; -exports.v147 = __chunk_1.v147; -exports.v148 = __chunk_1.v148; -exports.v149 = __chunk_1.v149; -exports.v15 = __chunk_1.v15; -exports.v150 = __chunk_1.v150; -exports.v151 = __chunk_1.v151; -exports.v152 = __chunk_1.v152; -exports.v153 = __chunk_1.v153; -exports.v154 = __chunk_1.v154; -exports.v155 = __chunk_1.v155; -exports.v156 = __chunk_1.v156; -exports.v157 = __chunk_1.v157; -exports.v158 = __chunk_1.v158; -exports.v159 = __chunk_1.v159; -exports.v16 = __chunk_1.v16; -exports.v160 = __chunk_1.v160; -exports.v161 = __chunk_1.v161; -exports.v162 = __chunk_1.v162; -exports.v163 = __chunk_1.v163; -exports.v164 = __chunk_1.v164; -exports.v165 = __chunk_1.v165; -exports.v166 = __chunk_1.v166; -exports.v167 = __chunk_1.v167; -exports.v168 = __chunk_1.v168; -exports.v169 = __chunk_1.v169; -exports.v17 = __chunk_1.v17; -exports.v170 = __chunk_1.v170; -exports.v171 = __chunk_1.v171; -exports.v172 = __chunk_1.v172; -exports.v173 = __chunk_1.v173; -exports.v174 = __chunk_1.v174; -exports.v175 = __chunk_1.v175; -exports.v176 = __chunk_1.v176; -exports.v177 = __chunk_1.v177; -exports.v178 = __chunk_1.v178; -exports.v179 = __chunk_1.v179; -exports.v18 = __chunk_1.v18; -exports.v180 = __chunk_1.v180; -exports.v181 = __chunk_1.v181; -exports.v182 = __chunk_1.v182; -exports.v183 = __chunk_1.v183; -exports.v184 = __chunk_1.v184; -exports.v185 = __chunk_1.v185; -exports.v186 = __chunk_1.v186; -exports.v187 = __chunk_1.v187; -exports.v188 = __chunk_1.v188; -exports.v189 = __chunk_1.v189; -exports.v19 = __chunk_1.v19; -exports.v190 = __chunk_1.v190; -exports.v191 = __chunk_1.v191; -exports.v192 = __chunk_1.v192; -exports.v193 = __chunk_1.v193; -exports.v194 = __chunk_1.v194; -exports.v195 = __chunk_1.v195; -exports.v196 = __chunk_1.v196; -exports.v197 = __chunk_1.v197; -exports.v198 = __chunk_1.v198; -exports.v199 = __chunk_1.v199; -exports.v2 = __chunk_1.v2; -exports.v20 = __chunk_1.v20; -exports.v200 = __chunk_1.v200; -exports.v201 = __chunk_1.v201; -exports.v202 = __chunk_1.v202; -exports.v203 = __chunk_1.v203; -exports.v204 = __chunk_1.v204; -exports.v205 = __chunk_1.v205; -exports.v206 = __chunk_1.v206; -exports.v207 = __chunk_1.v207; -exports.v208 = __chunk_1.v208; -exports.v209 = __chunk_1.v209; -exports.v21 = __chunk_1.v21; -exports.v210 = __chunk_1.v210; -exports.v211 = __chunk_1.v211; -exports.v212 = __chunk_1.v212; -exports.v213 = __chunk_1.v213; -exports.v214 = __chunk_1.v214; -exports.v215 = __chunk_1.v215; -exports.v216 = __chunk_1.v216; -exports.v217 = __chunk_1.v217; -exports.v218 = __chunk_1.v218; -exports.v219 = __chunk_1.v219; -exports.v22 = __chunk_1.v22; -exports.v220 = __chunk_1.v220; -exports.v221 = __chunk_1.v221; -exports.v222 = __chunk_1.v222; -exports.v223 = __chunk_1.v223; -exports.v224 = __chunk_1.v224; -exports.v225 = __chunk_1.v225; -exports.v226 = __chunk_1.v226; -exports.v227 = __chunk_1.v227; -exports.v228 = __chunk_1.v228; -exports.v229 = __chunk_1.v229; -exports.v23 = __chunk_1.v23; -exports.v230 = __chunk_1.v230; -exports.v231 = __chunk_1.v231; -exports.v232 = __chunk_1.v232; -exports.v233 = __chunk_1.v233; -exports.v234 = __chunk_1.v234; -exports.v235 = __chunk_1.v235; -exports.v236 = __chunk_1.v236; -exports.v237 = __chunk_1.v237; -exports.v238 = __chunk_1.v238; -exports.v239 = __chunk_1.v239; -exports.v24 = __chunk_1.v24; -exports.v240 = __chunk_1.v240; -exports.v241 = __chunk_1.v241; -exports.v242 = __chunk_1.v242; -exports.v243 = __chunk_1.v243; -exports.v244 = __chunk_1.v244; -exports.v245 = __chunk_1.v245; -exports.v246 = __chunk_1.v246; -exports.v247 = __chunk_1.v247; -exports.v248 = __chunk_1.v248; -exports.v249 = __chunk_1.v249; -exports.v25 = __chunk_1.v25; -exports.v250 = __chunk_1.v250; -exports.v251 = __chunk_1.v251; -exports.v252 = __chunk_1.v252; -exports.v253 = __chunk_1.v253; -exports.v254 = __chunk_1.v254; -exports.v255 = __chunk_1.v255; -exports.v256 = __chunk_1.v256; -exports.v257 = __chunk_1.v257; -exports.v258 = __chunk_1.v258; -exports.v259 = __chunk_1.v259; -exports.v26 = __chunk_1.v26; -exports.v260 = __chunk_1.v260; -exports.v261 = __chunk_1.v261; -exports.v262 = __chunk_1.v262; -exports.v263 = __chunk_1.v263; -exports.v264 = __chunk_1.v264; -exports.v265 = __chunk_1.v265; -exports.v266 = __chunk_1.v266; -exports.v267 = __chunk_1.v267; -exports.v268 = __chunk_1.v268; -exports.v269 = __chunk_1.v269; -exports.v27 = __chunk_1.v27; -exports.v270 = __chunk_1.v270; -exports.v271 = __chunk_1.v271; -exports.v272 = __chunk_1.v272; -exports.v28 = __chunk_1.v28; -exports.v29 = __chunk_1.v29; -exports.v3 = __chunk_1.v3; -exports.v30 = __chunk_1.v30; -exports.v31 = __chunk_1.v31; -exports.v32 = __chunk_1.v32; -exports.v33 = __chunk_1.v33; -exports.v34 = __chunk_1.v34; -exports.v35 = __chunk_1.v35; -exports.v36 = __chunk_1.v36; -exports.v37 = __chunk_1.v37; -exports.v38 = __chunk_1.v38; -exports.v39 = __chunk_1.v39; -exports.v4 = __chunk_1.v4; -exports.v40 = __chunk_1.v40; -exports.v41 = __chunk_1.v41; -exports.v42 = __chunk_1.v42; -exports.v43 = __chunk_1.v43; -exports.v44 = __chunk_1.v44; -exports.v45 = __chunk_1.v45; -exports.v46 = __chunk_1.v46; -exports.v47 = __chunk_1.v47; -exports.v48 = __chunk_1.v48; -exports.v49 = __chunk_1.v49; -exports.v5 = __chunk_1.v5; -exports.v50 = __chunk_1.v50; -exports.v51 = __chunk_1.v51; -exports.v52 = __chunk_1.v52; -exports.v53 = __chunk_1.v53; -exports.v54 = __chunk_1.v54; -exports.v55 = __chunk_1.v55; -exports.v56 = __chunk_1.v56; -exports.v57 = __chunk_1.v57; -exports.v58 = __chunk_1.v58; -exports.v59 = __chunk_1.v59; -exports.v6 = __chunk_1.v6; -exports.v60 = __chunk_1.v60; -exports.v61 = __chunk_1.v61; -exports.v62 = __chunk_1.v62; -exports.v63 = __chunk_1.v63; -exports.v64 = __chunk_1.v64; -exports.v65 = __chunk_1.v65; -exports.v66 = __chunk_1.v66; -exports.v67 = __chunk_1.v67; -exports.v68 = __chunk_1.v68; -exports.v69 = __chunk_1.v69; -exports.v7 = __chunk_1.v7; -exports.v70 = __chunk_1.v70; -exports.v71 = __chunk_1.v71; -exports.v72 = __chunk_1.v72; -exports.v73 = __chunk_1.v73; -exports.v74 = __chunk_1.v74; -exports.v75 = __chunk_1.v75; -exports.v76 = __chunk_1.v76; -exports.v77 = __chunk_1.v77; -exports.v78 = __chunk_1.v78; -exports.v79 = __chunk_1.v79; -exports.v8 = __chunk_1.v8; -exports.v80 = __chunk_1.v80; -exports.v81 = __chunk_1.v81; -exports.v82 = __chunk_1.v82; -exports.v83 = __chunk_1.v83; -exports.v84 = __chunk_1.v84; -exports.v85 = __chunk_1.v85; -exports.v86 = __chunk_1.v86; -exports.v87 = __chunk_1.v87; -exports.v88 = __chunk_1.v88; -exports.v89 = __chunk_1.v89; -exports.v9 = __chunk_1.v9; -exports.v90 = __chunk_1.v90; -exports.v91 = __chunk_1.v91; -exports.v92 = __chunk_1.v92; -exports.v93 = __chunk_1.v93; -exports.v94 = __chunk_1.v94; -exports.v95 = __chunk_1.v95; -exports.v96 = __chunk_1.v96; -exports.v97 = __chunk_1.v97; -exports.v98 = __chunk_1.v98; -exports.v99 = __chunk_1.v99; +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; diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js index 4d9e69640e1..b31a9f2a0c9 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log('1', __chunk_1.dep); + console.log('1', dep.dep); }); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js index b493172d6f7..802b4783d5b 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js @@ -1,5 +1,5 @@ -define(['./generated-chunk'], function (__chunk_1) { 'use strict'; +define(['./generated-chunk'], function (dep) { 'use strict'; - console.log('2', __chunk_1.dep); + console.log('2', dep.dep); }); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js index 1ac4d8f3fdf..b90e46d1ef6 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log('1', __chunk_1.dep); +console.log('1', dep.dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js index 5891a1080e9..f1bf31c4b92 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var __chunk_1 = require('./generated-chunk.js'); +var dep = require('./generated-chunk.js'); -console.log('2', __chunk_1.dep); +console.log('2', dep.dep); diff --git a/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js b/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js index f807478d8f4..8add304a305 100644 --- a/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js +++ b/test/function/samples/deprecated/emit-asset/invalid-asset-name/_config.js @@ -13,7 +13,7 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths, received "/test.ext".', + 'The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths and do not contain invalid characters, received "/test.ext".', plugin: 'test-plugin', pluginCode: 'VALIDATION_ERROR' } diff --git a/test/function/samples/emit-file/invalid-asset-name/_config.js b/test/function/samples/emit-file/invalid-asset-name/_config.js index 1d58fe9c100..58ff955cc15 100644 --- a/test/function/samples/emit-file/invalid-asset-name/_config.js +++ b/test/function/samples/emit-file/invalid-asset-name/_config.js @@ -12,7 +12,7 @@ module.exports = { code: 'PLUGIN_ERROR', hook: 'buildStart', message: - 'The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths, received "/test.ext".', + 'The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths and do not contain invalid characters, received "/test.ext".', plugin: 'test-plugin', pluginCode: 'VALIDATION_ERROR' } diff --git a/test/function/samples/emit-file/invalid-asset-name2/_config.js b/test/function/samples/emit-file/invalid-asset-name2/_config.js new file mode 100644 index 00000000000..c0ff923d737 --- /dev/null +++ b/test/function/samples/emit-file/invalid-asset-name2/_config.js @@ -0,0 +1,19 @@ +module.exports = { + description: 'throws for invalid asset names with special characters', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + this.emitFile({ type: 'asset', name: '\0test.ext', source: 'content' }); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: + 'The "fileName" or "name" properties of emitted files must be strings that are neither absolute nor relative paths and do not contain invalid characters, received "\u0000test.ext".', + plugin: 'test-plugin', + pluginCode: 'VALIDATION_ERROR' + } +}; diff --git a/test/function/samples/emit-file/invalid-asset-name2/main.js b/test/function/samples/emit-file/invalid-asset-name2/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/invalid-asset-name2/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); From fedee4d061c4adc836d490abb33e6bd77dc8ed13 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 2 Aug 2019 07:00:19 +0200 Subject: [PATCH 25/31] Test and refactor handling of dynamic relative imports --- src/Chunk.ts | 40 ++++++++++--------- .../samples/nested-chunks/_config.js | 7 ++++ .../_expected/amd/generated-chunk.js | 7 ++++ .../_expected/amd/generated-dynamic.js | 7 ++++ .../nested-chunks/_expected/amd/main1.js | 27 +++++++++++++ .../_expected/amd/nested/main2.js | 27 +++++++++++++ .../_expected/cjs/generated-chunk.js | 5 +++ .../_expected/cjs/generated-dynamic.js | 5 +++ .../nested-chunks/_expected/cjs/main1.js | 27 +++++++++++++ .../_expected/cjs/nested/main2.js | 27 +++++++++++++ .../_expected/es/generated-chunk.js | 3 ++ .../_expected/es/generated-dynamic.js | 3 ++ .../nested-chunks/_expected/es/main1.js | 6 +++ .../_expected/es/nested/main2.js | 6 +++ .../_expected/system/generated-chunk.js | 10 +++++ .../_expected/system/generated-dynamic.js | 10 +++++ .../nested-chunks/_expected/system/main1.js | 17 ++++++++ .../_expected/system/nested/main2.js | 17 ++++++++ .../samples/nested-chunks/dep.js | 1 + .../samples/nested-chunks/dynamic.js | 1 + .../samples/nested-chunks/main1.js | 6 +++ .../samples/nested-chunks/main2.js | 6 +++ 22 files changed, 246 insertions(+), 19 deletions(-) create mode 100644 test/chunking-form/samples/nested-chunks/_config.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/amd/generated-chunk.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/amd/generated-dynamic.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/amd/main1.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/cjs/generated-chunk.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/cjs/generated-dynamic.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/es/generated-chunk.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/es/generated-dynamic.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/es/main1.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/system/generated-chunk.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/system/generated-dynamic.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/system/main1.js create mode 100644 test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js create mode 100644 test/chunking-form/samples/nested-chunks/dep.js create mode 100644 test/chunking-form/samples/nested-chunks/dynamic.js create mode 100644 test/chunking-form/samples/nested-chunks/main1.js create mode 100644 test/chunking-form/samples/nested-chunks/main2.js diff --git a/src/Chunk.ts b/src/Chunk.ts index 3c6b5954a13..81c027cb010 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -640,13 +640,9 @@ export default class Chunk { if (dep instanceof ExternalModule && !dep.renormalizeRenderPath) continue; const renderedDependency = this.renderedDeclarations.dependencies[i]; - const depId = dep instanceof ExternalModule ? renderedDependency.id : (dep.id as string); - let relPath = normalize(relative(dirname(this.id as string), depId)); - if (!relPath.startsWith('../')) relPath = './' + relPath; - if (dep instanceof Chunk) renderedDependency.namedExportsMode = dep.exportMode !== 'default'; - renderedDependency.id = relPath; + renderedDependency.id = this.getRelativePath(depId); } this.finaliseDynamicImports(format); @@ -833,23 +829,24 @@ export default class Chunk { if (resolution instanceof Module) { if (resolution.chunk !== this && isChunkRendered(resolution.chunk as Chunk)) { const resolutionChunk = resolution.facadeChunk || (resolution.chunk as Chunk); - let relPath = normalize( - relative(dirname(this.id as string), resolutionChunk.id as string) + node.renderFinalResolution( + code, + `'${this.getRelativePath(resolutionChunk.id as string)}'`, + format ); - // TODO Lukas test where relpath starts with '../' - if (!relPath.startsWith('../')) relPath = './' + relPath; - node.renderFinalResolution(code, `'${relPath}'`, format); - } - } else if (resolution instanceof ExternalModule) { - let resolutionId = resolution.id; - if (resolution.renormalizeRenderPath) { - resolutionId = normalize(relative(dirname(this.id as string), resolution.renderPath)); - // TODO Lukas test where resolutionId starts with '../' - if (!resolutionId.startsWith('../')) resolutionId = './' + resolutionId; } - node.renderFinalResolution(code, `'${resolutionId}'`, format); } else { - node.renderFinalResolution(code, resolution, format); + node.renderFinalResolution( + code, + resolution instanceof ExternalModule + ? `'${ + resolution.renormalizeRenderPath + ? this.getRelativePath(resolution.renderPath) + : resolution.id + }'` + : resolution, + format + ); } } } @@ -1016,6 +1013,11 @@ export default class Chunk { return 'chunk'; } + private getRelativePath(targetPath: string): string { + const relativePath = normalize(relative(dirname(this.id as string), targetPath)); + return relativePath.startsWith('../') ? relativePath : './' + relativePath; + } + private inlineChunkDependencies(chunk: Chunk, deep: boolean) { for (const dep of chunk.dependencies) { if (dep instanceof ExternalModule) { diff --git a/test/chunking-form/samples/nested-chunks/_config.js b/test/chunking-form/samples/nested-chunks/_config.js new file mode 100644 index 00000000000..c9c0bdd593b --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_config.js @@ -0,0 +1,7 @@ +module.exports = { + description: 'nested chunks', + options: { + input: { main1: 'main1', 'nested/main2': 'main2' }, + external: './external.js' + } +}; diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/amd/generated-chunk.js new file mode 100644 index 00000000000..bf7989e606f --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/generated-chunk.js @@ -0,0 +1,7 @@ +define(['exports'], function (exports) { 'use strict'; + + const value = 42; + + exports.value = value; + +}); diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/nested-chunks/_expected/amd/generated-dynamic.js new file mode 100644 index 00000000000..74e365684fd --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/generated-dynamic.js @@ -0,0 +1,7 @@ +define(['exports'], function (exports) { 'use strict'; + + const value = 43; + + exports.value = value; + +}); diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js new file mode 100644 index 00000000000..e844cf32aa9 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js @@ -0,0 +1,27 @@ +define(['require', './generated-chunk'], function (require, dep) { 'use strict'; + + function _interopNamespace(e) { + if (e && e.__esModule) { return e; } else { + var n = {}; + if (e) { + Object.keys(e).forEach(function (k) { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { + return e[k]; + } + }); + }); + } + n['default'] = e; + return n; + } + } + + console.log('main1', dep.value); + + new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }).then(result => console.log(result)); + new Promise(function (resolve, reject) { require(['./external'], function (m) { resolve(_interopNamespace(m)); }, reject) }).then(result => console.log(result)); + +}); diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js new file mode 100644 index 00000000000..9dd19fb5de2 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js @@ -0,0 +1,27 @@ +define(['require', '../generated-chunk'], function (require, dep) { 'use strict'; + + function _interopNamespace(e) { + if (e && e.__esModule) { return e; } else { + var n = {}; + if (e) { + Object.keys(e).forEach(function (k) { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { + return e[k]; + } + }); + }); + } + n['default'] = e; + return n; + } + } + + console.log('main2', dep.value); + + new Promise(function (resolve, reject) { require(['../generated-dynamic'], resolve, reject) }).then(result => console.log(result)); + new Promise(function (resolve, reject) { require(['../external'], function (m) { resolve(_interopNamespace(m)); }, reject) }).then(result => console.log(result)); + +}); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-chunk.js new file mode 100644 index 00000000000..9549eb32880 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-chunk.js @@ -0,0 +1,5 @@ +'use strict'; + +const value = 42; + +exports.value = value; diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-dynamic.js new file mode 100644 index 00000000000..7fc20dc4309 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-dynamic.js @@ -0,0 +1,5 @@ +'use strict'; + +const value = 43; + +exports.value = value; diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js new file mode 100644 index 00000000000..bbaad8b217c --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js @@ -0,0 +1,27 @@ +'use strict'; + +function _interopNamespace(e) { + if (e && e.__esModule) { return e; } else { + var n = {}; + if (e) { + Object.keys(e).forEach(function (k) { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { + return e[k]; + } + }); + }); + } + n['default'] = e; + return n; + } +} + +var dep = require('./generated-chunk.js'); + +console.log('main1', dep.value); + +new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }).then(result => console.log(result)); +new Promise(function (resolve) { resolve(_interopNamespace(require('./external.js'))); }).then(result => console.log(result)); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js new file mode 100644 index 00000000000..d32364b2355 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js @@ -0,0 +1,27 @@ +'use strict'; + +function _interopNamespace(e) { + if (e && e.__esModule) { return e; } else { + var n = {}; + if (e) { + Object.keys(e).forEach(function (k) { + var d = Object.getOwnPropertyDescriptor(e, k); + Object.defineProperty(n, k, d.get ? d : { + enumerable: true, + get: function () { + return e[k]; + } + }); + }); + } + n['default'] = e; + return n; + } +} + +var dep = require('../generated-chunk.js'); + +console.log('main2', dep.value); + +new Promise(function (resolve) { resolve(require('../generated-dynamic.js')); }).then(result => console.log(result)); +new Promise(function (resolve) { resolve(_interopNamespace(require('../external.js'))); }).then(result => console.log(result)); diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/es/generated-chunk.js new file mode 100644 index 00000000000..eede3bf82d2 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/es/generated-chunk.js @@ -0,0 +1,3 @@ +const value = 42; + +export { value as v }; diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/generated-dynamic.js b/test/chunking-form/samples/nested-chunks/_expected/es/generated-dynamic.js new file mode 100644 index 00000000000..8df94b1d35d --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/es/generated-dynamic.js @@ -0,0 +1,3 @@ +const value = 43; + +export { value }; diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/main1.js b/test/chunking-form/samples/nested-chunks/_expected/es/main1.js new file mode 100644 index 00000000000..4151def9fa9 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/es/main1.js @@ -0,0 +1,6 @@ +import { v as value } from './generated-chunk.js'; + +console.log('main1', value); + +import('./generated-dynamic.js').then(result => console.log(result)); +import('./external.js').then(result => console.log(result)); diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js new file mode 100644 index 00000000000..c6e95061a3d --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js @@ -0,0 +1,6 @@ +import { v as value } from '../generated-chunk.js'; + +console.log('main2', value); + +import('../generated-dynamic.js').then(result => console.log(result)); +import('../external.js').then(result => console.log(result)); diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/system/generated-chunk.js new file mode 100644 index 00000000000..1fc955eb247 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/system/generated-chunk.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + const value = exports('v', 42); + + } + }; +}); diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/generated-dynamic.js b/test/chunking-form/samples/nested-chunks/_expected/system/generated-dynamic.js new file mode 100644 index 00000000000..8f4da831c09 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/system/generated-dynamic.js @@ -0,0 +1,10 @@ +System.register([], function (exports) { + 'use strict'; + return { + execute: function () { + + const value = exports('value', 43); + + } + }; +}); diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/main1.js b/test/chunking-form/samples/nested-chunks/_expected/system/main1.js new file mode 100644 index 00000000000..ed575d5ed4f --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/system/main1.js @@ -0,0 +1,17 @@ +System.register(['./generated-chunk.js'], function (exports, module) { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.v; + }], + execute: function () { + + console.log('main1', value); + + module.import('./generated-dynamic.js').then(result => console.log(result)); + module.import('./external.js').then(result => console.log(result)); + + } + }; +}); diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js new file mode 100644 index 00000000000..18862f8a50e --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js @@ -0,0 +1,17 @@ +System.register(['../generated-chunk.js'], function (exports, module) { + 'use strict'; + var value; + return { + setters: [function (module) { + value = module.v; + }], + execute: function () { + + console.log('main2', value); + + module.import('../generated-dynamic.js').then(result => console.log(result)); + module.import('../external.js').then(result => console.log(result)); + + } + }; +}); diff --git a/test/chunking-form/samples/nested-chunks/dep.js b/test/chunking-form/samples/nested-chunks/dep.js new file mode 100644 index 00000000000..46d3ca8c61f --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/dep.js @@ -0,0 +1 @@ +export const value = 42; diff --git a/test/chunking-form/samples/nested-chunks/dynamic.js b/test/chunking-form/samples/nested-chunks/dynamic.js new file mode 100644 index 00000000000..0ec6a796109 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/dynamic.js @@ -0,0 +1 @@ +export const value = 43; diff --git a/test/chunking-form/samples/nested-chunks/main1.js b/test/chunking-form/samples/nested-chunks/main1.js new file mode 100644 index 00000000000..442d5542d65 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/main1.js @@ -0,0 +1,6 @@ +import { value } from './dep.js'; + +console.log('main1', value); + +import('./dynamic.js').then(result => console.log(result)); +import('./external.js').then(result => console.log(result)); diff --git a/test/chunking-form/samples/nested-chunks/main2.js b/test/chunking-form/samples/nested-chunks/main2.js new file mode 100644 index 00000000000..17a36ab5743 --- /dev/null +++ b/test/chunking-form/samples/nested-chunks/main2.js @@ -0,0 +1,6 @@ +import { value } from './dep.js'; + +console.log('main2', value); + +import('./dynamic.js').then(result => console.log(result)); +import('./external.js').then(result => console.log(result)); From b3cd734003ab6e7d40b059c470517bc434d2f01a Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 2 Aug 2019 07:51:35 +0200 Subject: [PATCH 26/31] Use async-await in generate function, remove error condition --- src/Graph.ts | 5 +- src/Module.ts | 1 - src/rollup/index.ts | 183 ++++++++++++++++++------------------ src/utils/assignChunkIds.ts | 2 - 4 files changed, 92 insertions(+), 99 deletions(-) diff --git a/src/Graph.ts b/src/Graph.ts index 5cd5e561d69..ecb9141e0d7 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -312,10 +312,7 @@ export default class Graph { chunks = chunks.filter(isChunkRendered); const facades: Chunk[] = []; for (const chunk of chunks) { - for (const facade of chunk.generateFacades()) { - // TODO Lukas use spread operator - facades.push(facade); - } + facades.push(...chunk.generateFacades()); } timeEnd('generate chunks', 2); diff --git a/src/Module.ts b/src/Module.ts index e323ee85999..11bc333cf39 100644 --- a/src/Module.ts +++ b/src/Module.ts @@ -196,7 +196,6 @@ export default class Module { imports = new Set(); isEntryPoint: boolean; isExecuted = false; - // TODO Lukas may no longer be necessary isUserDefinedEntryPoint = false; manualChunkAlias: string = null as any; moduleSideEffects: boolean; diff --git a/src/rollup/index.ts b/src/rollup/index.ts index 3c01365e88a..bc11bab656b 100644 --- a/src/rollup/index.ts +++ b/src/rollup/index.ts @@ -81,15 +81,6 @@ function ensureArray(items: (T | null | undefined)[] | T | null | undefined): return []; } -function areNoPlaceholdersInBundle(bundle: OutputBundleWithPlaceholders): bundle is OutputBundle { - for (const fileName of Object.keys(bundle)) { - if (Object.keys(bundle[fileName]).length === 0) { - return false; - } - } - return true; -} - function getInputOptions(rawInputOptions: GenericConfigObject): InputOptions { if (!rawInputOptions) { throw new Error('You must supply an options object to rollup'); @@ -156,6 +147,33 @@ export function setWatcher(watcher: RollupWatcher) { curWatcher = watcher; } +function assignChunksToBundle( + chunks: Chunk[], + outputBundle: OutputBundleWithPlaceholders +): OutputBundle { + for (let i = 0; i < chunks.length; i++) { + const chunk = chunks[i]; + const facadeModule = chunk.facadeModule; + + outputBundle[chunk.id as string] = { + code: undefined as any, + dynamicImports: chunk.getDynamicImportIds(), + exports: chunk.getExportNames(), + facadeModuleId: facadeModule && facadeModule.id, + fileName: chunk.id, + imports: chunk.getImportIds(), + isDynamicEntry: facadeModule !== null && facadeModule.dynamicallyImportedBy.length > 0, + isEntry: facadeModule !== null && facadeModule.isEntryPoint, + map: undefined, + modules: chunk.renderedModules, + get name() { + return chunk.getChunkName(); + } + } as OutputChunk; + } + return outputBundle as OutputBundle; +} + export default function rollup(rawInputOptions: GenericConfigObject): Promise { try { const inputOptions = getInputOptions(rawInputOptions); @@ -202,94 +220,75 @@ export default function rollup(rawInputOptions: GenericConfigObject): Promise { + async function generate( + outputOptions: OutputOptions, + isWrite: boolean + ): Promise { timeStart('GENERATE', 1); const assetFileNames = outputOptions.assetFileNames || 'assets/[name]-[hash][extname]'; - const outputBundle: OutputBundleWithPlaceholders = Object.create(null); + const outputBundleWithPlaceholders: OutputBundleWithPlaceholders = Object.create(null); + let outputBundle; const inputBase = commondir(getAbsoluteEntryModulePaths(chunks)); - graph.pluginDriver.startOutput(outputBundle, assetFileNames); - - return graph.pluginDriver - .hookParallel('renderStart', []) - .then(() => createAddons(graph, outputOptions)) - .then(addons => { - // pre-render all chunks - for (const chunk of chunks) { - if (!inputOptions.preserveModules) chunk.generateInternalExports(outputOptions); - if (chunk.facadeModule && chunk.facadeModule.isEntryPoint) - chunk.exportMode = getExportMode(chunk, outputOptions); - } - for (const chunk of chunks) { - chunk.preRender(outputOptions, inputBase); - } - if (!optimized && inputOptions.experimentalOptimizeChunks) { - optimizeChunks( - chunks, - outputOptions, - inputOptions.chunkGroupingSize as number, - inputBase - ); - optimized = true; - } - - assignChunkIds(chunks, inputOptions, outputOptions, inputBase, addons, outputBundle); - - // assign to outputBundle - for (let i = 0; i < chunks.length; i++) { - const chunk = chunks[i]; - const facadeModule = chunk.facadeModule; - - outputBundle[chunk.id as string] = { - code: undefined as any, - dynamicImports: chunk.getDynamicImportIds(), - exports: chunk.getExportNames(), - facadeModuleId: facadeModule && facadeModule.id, - fileName: chunk.id, - imports: chunk.getImportIds(), - isDynamicEntry: - facadeModule !== null && facadeModule.dynamicallyImportedBy.length > 0, - isEntry: facadeModule !== null && facadeModule.isEntryPoint, - map: undefined, - modules: chunk.renderedModules, - get name() { - return chunk.getChunkName(); - } - } as OutputChunk; - } - - return Promise.all( - chunks.map(chunk => { - const outputChunk = outputBundle[chunk.id as string] as OutputChunk; - return chunk.render(outputOptions, addons, outputChunk).then(rendered => { - outputChunk.code = rendered.code; - outputChunk.map = rendered.map; - - return graph.pluginDriver.hookParallel('ongenerate', [ - { bundle: outputChunk, ...outputOptions }, - outputChunk - ]); - }); - }) - ).then(() => {}); - }) - .catch(error => - graph.pluginDriver.hookParallel('renderError', [error]).then(() => { - throw error; - }) - ) - .then(() => { - if (!areNoPlaceholdersInBundle(outputBundle)) { - throw new Error('Internal Error: Found remaining placeholder in bundle object.'); - } - return graph.pluginDriver - .hookSeq('generateBundle', [outputOptions, outputBundle, isWrite]) - .then(() => graph.pluginDriver.finaliseAssets()) - .then(() => { - timeEnd('GENERATE', 1); - return outputBundle; + graph.pluginDriver.startOutput(outputBundleWithPlaceholders, assetFileNames); + + try { + await graph.pluginDriver.hookParallel('renderStart', []); + const addons = await createAddons(graph, outputOptions); + for (const chunk of chunks) { + if (!inputOptions.preserveModules) chunk.generateInternalExports(outputOptions); + if (chunk.facadeModule && chunk.facadeModule.isEntryPoint) + chunk.exportMode = getExportMode(chunk, outputOptions); + } + for (const chunk of chunks) { + chunk.preRender(outputOptions, inputBase); + } + if (!optimized && inputOptions.experimentalOptimizeChunks) { + optimizeChunks( + chunks, + outputOptions, + inputOptions.chunkGroupingSize as number, + inputBase + ); + optimized = true; + } + assignChunkIds( + chunks, + inputOptions, + outputOptions, + inputBase, + addons, + outputBundleWithPlaceholders + ); + outputBundle = assignChunksToBundle(chunks, outputBundleWithPlaceholders); + + await Promise.all( + chunks.map(chunk => { + const outputChunk = outputBundleWithPlaceholders[chunk.id as string] as OutputChunk; + return chunk.render(outputOptions, addons, outputChunk).then(rendered => { + outputChunk.code = rendered.code; + outputChunk.map = rendered.map; + + return graph.pluginDriver.hookParallel('ongenerate', [ + { bundle: outputChunk, ...outputOptions }, + outputChunk + ]); }); - }); + }) + ); + } catch (error) { + await graph.pluginDriver.hookParallel('renderError', [error]); + throw error; + } + await graph.pluginDriver.hookSeq('generateBundle', [ + outputOptions, + outputBundle, + isWrite + ]); + graph.pluginDriver.finaliseAssets(); + + timeEnd('GENERATE', 1); + return outputBundle; } const cache = useCache ? graph.getCache() : undefined; diff --git a/src/utils/assignChunkIds.ts b/src/utils/assignChunkIds.ts index 84fa53aec33..452de880205 100644 --- a/src/utils/assignChunkIds.ts +++ b/src/utils/assignChunkIds.ts @@ -12,8 +12,6 @@ export function assignChunkIds( addons: Addons, bundle: OutputBundleWithPlaceholders ) { - // TODO Lukas test conflict between prenamed chunk and entry chunk - // TODO Lukas do not filter out prenamed chunks but use new property const entryChunks: Chunk[] = []; const otherChunks: Chunk[] = []; for (const chunk of chunks) { From 56b0a062f227082d904c69017843bae1d964b884 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 2 Aug 2019 10:12:50 +0200 Subject: [PATCH 27/31] Improve and test pattern validation --- src/Chunk.ts | 14 +++----- src/utils/FileEmitter.ts | 33 +++++++----------- src/utils/relativeId.ts | 4 ++- src/utils/renderNamePattern.ts | 34 ++++++++++--------- .../emit-file/asset-file-names/_config.js | 2 +- .../samples/input-name-validation/_config.js | 11 ++++++ .../samples/input-name-validation/main.js | 1 + .../samples/input-name-validation2/_config.js | 11 ++++++ .../samples/input-name-validation2/main.js | 1 + .../samples/input-name-validation3/_config.js | 11 ++++++ .../samples/input-name-validation3/main.js | 1 + .../invalid-pattern-replacement/_config.js | 10 ++++++ .../invalid-pattern-replacement/main.js | 1 + .../samples/invalid-pattern/_config.js | 11 ++++++ test/function/samples/invalid-pattern/main.js | 1 + 15 files changed, 97 insertions(+), 49 deletions(-) create mode 100644 test/function/samples/input-name-validation/_config.js create mode 100644 test/function/samples/input-name-validation/main.js create mode 100644 test/function/samples/input-name-validation2/_config.js create mode 100644 test/function/samples/input-name-validation2/main.js create mode 100644 test/function/samples/input-name-validation3/_config.js create mode 100644 test/function/samples/input-name-validation3/main.js create mode 100644 test/function/samples/invalid-pattern-replacement/_config.js create mode 100644 test/function/samples/invalid-pattern-replacement/main.js create mode 100644 test/function/samples/invalid-pattern/_config.js create mode 100644 test/function/samples/invalid-pattern/main.js diff --git a/src/Chunk.ts b/src/Chunk.ts index 81c027cb010..3eed0478a7d 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -261,16 +261,10 @@ export default class Chunk { return this.fileName; } return makeUnique( - renderNamePattern(pattern, patternName, type => { - switch (type) { - case 'format': - return options.format === 'es' ? 'esm' : options.format; - case 'hash': - return this.computeContentHashWithDependencies(addons, options); - case 'name': - return this.getChunkName(); - } - return undefined as any; + renderNamePattern(pattern, patternName, { + format: () => (options.format === 'es' ? 'esm' : (options.format as string)), + hash: () => this.computeContentHashWithDependencies(addons, options), + name: () => this.getChunkName() }), existingNames ); diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index b4544ad6c58..51d210ad01c 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -19,7 +19,6 @@ import { import { extname } from './path'; import { isPlainPathFragment } from './relativeId'; import { makeUnique, renderNamePattern } from './renderNamePattern'; -import { sanitizeFileName } from './sanitizeFileName'; interface OutputSpecificFileData { assetFileNames: string; @@ -33,22 +32,17 @@ function generateAssetFileName( ): string { const emittedName = name || 'asset'; return makeUnique( - renderNamePattern(output.assetFileNames, 'assetFileNames', placeholder => { - switch (placeholder) { - case 'hash': - const hash = sha256(); - hash.update(emittedName); - hash.update(':'); - hash.update(source); - return hash.digest('hex').substr(0, 8); - case 'name': - return emittedName.substr(0, emittedName.length - extname(emittedName).length); - case 'extname': - return extname(emittedName); - case 'ext': - return extname(emittedName).substr(1); - } - return ''; + renderNamePattern(output.assetFileNames, 'output.assetFileNames', { + hash() { + const hash = sha256(); + hash.update(emittedName); + hash.update(':'); + hash.update(source); + return hash.digest('hex').substr(0, 8); + }, + ext: () => extname(emittedName).substr(1), + extname: () => extname(emittedName), + name: () => emittedName.substr(0, emittedName.length - extname(emittedName).length) }), output.bundle ); @@ -104,10 +98,7 @@ function hasValidName(emittedFile: { }): emittedFile is EmittedFile { const validatedName = emittedFile.fileName || emittedFile.name; return ( - !validatedName || - (typeof validatedName === 'string' && - isPlainPathFragment(validatedName) && - sanitizeFileName(validatedName) === validatedName) + !validatedName || (typeof validatedName === 'string' && isPlainPathFragment(validatedName)) ); } diff --git a/src/utils/relativeId.ts b/src/utils/relativeId.ts index ed04e10a5d9..d21dd62bbd3 100644 --- a/src/utils/relativeId.ts +++ b/src/utils/relativeId.ts @@ -1,4 +1,5 @@ import { basename, extname, isAbsolute, relative } from './path'; +import { sanitizeFileName } from './sanitizeFileName'; export function getAliasName(id: string) { const base = basename(id); @@ -14,6 +15,7 @@ export function isPlainPathFragment(name: string) { // not starting with "/", "./", "../" return ( name[0] !== '/' && - !(name[0] === '.' && (name[1] === '/' || (name[1] === '.' && name[2] === '/'))) + !(name[0] === '.' && (name[1] === '/' || name[1] === '.')) && + sanitizeFileName(name) === name ); } diff --git a/src/utils/renderNamePattern.ts b/src/utils/renderNamePattern.ts index d4c35e0929b..6734f202fc8 100644 --- a/src/utils/renderNamePattern.ts +++ b/src/utils/renderNamePattern.ts @@ -1,29 +1,31 @@ -import { error } from './error'; +import { errFailedValidation, error } from './error'; import { extname } from './path'; import { isPlainPathFragment } from './relativeId'; export function renderNamePattern( pattern: string, patternName: string, - getReplacement: (name: string) => string + replacements: { [name: string]: () => string } ) { if (!isPlainPathFragment(pattern)) - error({ - code: 'INVALID_PATTERN', - message: `Invalid output pattern "${pattern}" for ${patternName}, cannot be an absolute or relative URL or path.` - }); + return error( + errFailedValidation( + `Invalid pattern "${pattern}" for "${patternName}", patterns can be neither absolute nor relative paths and must not contain invalid characters.` + ) + ); return pattern.replace(/\[(\w+)\]/g, (_match, type) => { - const replacement = getReplacement(type); - if (replacement === undefined) - error({ - code: 'INVALID_PATTERN_REPLACEMENT', - message: `"${type}" is not a valid substitution name in output option ${patternName} pattern.` - }); + if (!replacements.hasOwnProperty(type)) { + return error( + errFailedValidation(`"[${type}]" is not a valid placeholder in "${patternName}" pattern.`) + ); + } + const replacement = replacements[type](); if (!isPlainPathFragment(replacement)) - error({ - code: 'INVALID_PATTERN_REPLACEMENT', - message: `Invalid replacement "${replacement}" for "${type}" in ${patternName} pattern, must be a plain path name.` - }); + return error( + errFailedValidation( + `Invalid substitution "${replacement}" for placeholder "[${type}]" in "${patternName}" pattern, can be neither absolute nor relative path.` + ) + ); return replacement; }); } diff --git a/test/chunking-form/samples/emit-file/asset-file-names/_config.js b/test/chunking-form/samples/emit-file/asset-file-names/_config.js index 752a45ad3bd..c1350154cbf 100644 --- a/test/chunking-form/samples/emit-file/asset-file-names/_config.js +++ b/test/chunking-form/samples/emit-file/asset-file-names/_config.js @@ -9,7 +9,7 @@ module.exports = { } }, output: { - assetFileNames: '[ext][ignored]/[hash]-[name][extname]' + assetFileNames: '[ext]/[hash]-[name][extname]' } } }; diff --git a/test/function/samples/input-name-validation/_config.js b/test/function/samples/input-name-validation/_config.js new file mode 100644 index 00000000000..e080d4098c9 --- /dev/null +++ b/test/function/samples/input-name-validation/_config.js @@ -0,0 +1,11 @@ +module.exports = { + description: 'throws for absolute paths as input names', + options: { + input: { '/test': 'main.js' } + }, + generateError: { + code: 'VALIDATION_ERROR', + message: + 'Invalid substitution "/test" for placeholder "[name]" in "output.entryFileNames" pattern, can be neither absolute nor relative path.' + } +}; diff --git a/test/function/samples/input-name-validation/main.js b/test/function/samples/input-name-validation/main.js new file mode 100644 index 00000000000..a9244a453fb --- /dev/null +++ b/test/function/samples/input-name-validation/main.js @@ -0,0 +1 @@ +throw new Error('Not executed'); diff --git a/test/function/samples/input-name-validation2/_config.js b/test/function/samples/input-name-validation2/_config.js new file mode 100644 index 00000000000..66b864ccf6c --- /dev/null +++ b/test/function/samples/input-name-validation2/_config.js @@ -0,0 +1,11 @@ +module.exports = { + description: 'throws for relative paths as input names', + options: { + input: { './test': 'main.js' } + }, + generateError: { + code: 'VALIDATION_ERROR', + message: + 'Invalid substitution "./test" for placeholder "[name]" in "output.entryFileNames" pattern, can be neither absolute nor relative path.' + } +}; diff --git a/test/function/samples/input-name-validation2/main.js b/test/function/samples/input-name-validation2/main.js new file mode 100644 index 00000000000..a9244a453fb --- /dev/null +++ b/test/function/samples/input-name-validation2/main.js @@ -0,0 +1 @@ +throw new Error('Not executed'); diff --git a/test/function/samples/input-name-validation3/_config.js b/test/function/samples/input-name-validation3/_config.js new file mode 100644 index 00000000000..5c40d5fb728 --- /dev/null +++ b/test/function/samples/input-name-validation3/_config.js @@ -0,0 +1,11 @@ +module.exports = { + description: 'throws for relative paths as input names', + options: { + input: { '../test': 'main.js' } + }, + generateError: { + code: 'VALIDATION_ERROR', + message: + 'Invalid substitution "../test" for placeholder "[name]" in "output.entryFileNames" pattern, can be neither absolute nor relative path.' + } +}; diff --git a/test/function/samples/input-name-validation3/main.js b/test/function/samples/input-name-validation3/main.js new file mode 100644 index 00000000000..a9244a453fb --- /dev/null +++ b/test/function/samples/input-name-validation3/main.js @@ -0,0 +1 @@ +throw new Error('Not executed'); diff --git a/test/function/samples/invalid-pattern-replacement/_config.js b/test/function/samples/invalid-pattern-replacement/_config.js new file mode 100644 index 00000000000..e02a3b56d35 --- /dev/null +++ b/test/function/samples/invalid-pattern-replacement/_config.js @@ -0,0 +1,10 @@ +module.exports = { + description: 'throws for invalid placeholders in patterns', + options: { + output: { entryFileNames: '[invalid].js' } + }, + generateError: { + code: 'VALIDATION_ERROR', + message: '"[invalid]" is not a valid placeholder in "output.entryFileNames" pattern.' + } +}; diff --git a/test/function/samples/invalid-pattern-replacement/main.js b/test/function/samples/invalid-pattern-replacement/main.js new file mode 100644 index 00000000000..a9244a453fb --- /dev/null +++ b/test/function/samples/invalid-pattern-replacement/main.js @@ -0,0 +1 @@ +throw new Error('Not executed'); diff --git a/test/function/samples/invalid-pattern/_config.js b/test/function/samples/invalid-pattern/_config.js new file mode 100644 index 00000000000..6275e9e38ac --- /dev/null +++ b/test/function/samples/invalid-pattern/_config.js @@ -0,0 +1,11 @@ +module.exports = { + description: 'throws for invalid patterns', + options: { + output: { entryFileNames: '\0main.js' } + }, + generateError: { + code: 'VALIDATION_ERROR', + message: + 'Invalid pattern "\0main.js" for "output.entryFileNames", patterns can be neither absolute nor relative paths and must not contain invalid characters.' + } +}; diff --git a/test/function/samples/invalid-pattern/main.js b/test/function/samples/invalid-pattern/main.js new file mode 100644 index 00000000000..a9244a453fb --- /dev/null +++ b/test/function/samples/invalid-pattern/main.js @@ -0,0 +1 @@ +throw new Error('Not executed'); From 35ecf88aebd2f551767101b51333f64d7709f68e Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 2 Aug 2019 11:05:14 +0200 Subject: [PATCH 28/31] Test file emitter edge cases --- src/utils/FileEmitter.ts | 12 ++++------- src/utils/error.ts | 2 +- src/utils/transform.ts | 4 +--- .../set-asset-source-twice/_config.js | 2 +- .../_config.js | 0 .../main.js | 0 .../asset-source-invalid2/_config.js | 20 +++++++++++++++++++ .../main.js | 0 .../asset-source-invalid3/_config.js | 20 +++++++++++++++++++ .../main.js | 0 .../asset-source-invalid4/_config.js | 18 +++++++++++++++++ .../emit-file/asset-source-invalid4/main.js | 1 + .../asset-source-missing2/_config.js | 15 ++++++++++++++ .../emit-file/asset-source-missing2/main.js | 1 + .../_config.js | 0 .../emit-file/asset-source-missing3/main.js | 1 + .../asset-source-missing4/_config.js | 20 +++++++++++++++++++ .../emit-file/asset-source-missing4/main.js | 1 + .../_config.js | 0 .../emit-file/asset-source-missing5/main.js | 1 + .../set-asset-source-twice/_config.js | 2 +- .../set-asset-source-twice2/_config.js | 20 +++++++++++++++++++ .../emit-file/set-asset-source-twice2/main.js | 1 + 23 files changed, 127 insertions(+), 14 deletions(-) rename test/function/samples/emit-file/{asset-source-missing-3 => asset-source-invalid}/_config.js (100%) rename test/function/samples/emit-file/{asset-source-missing-2 => asset-source-invalid}/main.js (100%) create mode 100644 test/function/samples/emit-file/asset-source-invalid2/_config.js rename test/function/samples/emit-file/{asset-source-missing-3 => asset-source-invalid2}/main.js (100%) create mode 100644 test/function/samples/emit-file/asset-source-invalid3/_config.js rename test/function/samples/emit-file/{asset-source-missing-4 => asset-source-invalid3}/main.js (100%) create mode 100644 test/function/samples/emit-file/asset-source-invalid4/_config.js create mode 100644 test/function/samples/emit-file/asset-source-invalid4/main.js create mode 100644 test/function/samples/emit-file/asset-source-missing2/_config.js create mode 100644 test/function/samples/emit-file/asset-source-missing2/main.js rename test/function/samples/emit-file/{asset-source-missing-4 => asset-source-missing3}/_config.js (100%) create mode 100644 test/function/samples/emit-file/asset-source-missing3/main.js create mode 100644 test/function/samples/emit-file/asset-source-missing4/_config.js create mode 100644 test/function/samples/emit-file/asset-source-missing4/main.js rename test/function/samples/emit-file/{asset-source-missing-2 => asset-source-missing5}/_config.js (100%) create mode 100644 test/function/samples/emit-file/asset-source-missing5/main.js create mode 100644 test/function/samples/emit-file/set-asset-source-twice2/_config.js create mode 100644 test/function/samples/emit-file/set-asset-source-twice2/main.js diff --git a/src/utils/FileEmitter.ts b/src/utils/FileEmitter.ts index 51d210ad01c..edd72dda3ba 100644 --- a/src/utils/FileEmitter.ts +++ b/src/utils/FileEmitter.ts @@ -109,11 +109,11 @@ function getValidSource( ): string | Buffer { if (typeof source !== 'string' && !Buffer.isBuffer(source)) { const assetName = emittedFile.fileName || emittedFile.name || fileReferenceId; - const assetDescription = - typeof assetName === 'string' ? `asset "${assetName}"` : 'unnamed asset'; return error( errFailedValidation( - `Could not set source for ${assetDescription}, asset source needs to be a string of Buffer.` + `Could not set source for ${ + typeof assetName === 'string' ? `asset "${assetName}"` : 'unnamed asset' + }, asset source needs to be a string of Buffer.` ) ); } @@ -128,11 +128,7 @@ function getAssetFileName(file: ConsumedAsset, referenceId: string): string { } function getChunkFileName(file: ConsumedChunk): string { - const fileName = - // TODO Lukas test first case - file.fileName || - (file.module && - (file.module.facadeChunk ? file.module.facadeChunk.id : (file.module.chunk as Chunk).id)); + const fileName = file.fileName || (file.module && (file.module.facadeChunk as Chunk).id); if (!fileName) return error(errChunkNotGeneratedForFileName(file.fileName || file.name)); return fileName; } diff --git a/src/utils/error.ts b/src/utils/error.ts index 4aa71f19406..ca4d67afcd5 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -84,7 +84,7 @@ export function errAssetReferenceIdNotFoundForSetSource(assetReferenceId: string export function errAssetSourceAlreadySet(name: string) { return { code: Errors.ASSET_SOURCE_ALREADY_SET, - message: `Plugin error - Unable to set the source for asset "${name}", source already set.` + message: `Unable to set the source for asset "${name}", source already set.` }; } diff --git a/src/utils/transform.ts b/src/utils/transform.ts index 6e714eacfb6..ac04c23c08e 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -30,7 +30,7 @@ export default function transform( let originalSourcemap = source.map === null ? null : decodedSourcemap(source.map); const originalCode = source.code; let ast = source.ast; - let transformDependencies: string[]; + const transformDependencies: string[] = []; const emittedFiles: EmittedFile[] = []; let customTransformCache = false; let moduleSideEffects: boolean | null = null; @@ -64,7 +64,6 @@ export default function transform( true ); (curPlugin as any).warnedTransformDependencies = true; - if (!transformDependencies) transformDependencies = []; for (const dep of result.dependencies) transformDependencies.push(resolve(dirname(id), dep)); } @@ -141,7 +140,6 @@ export default function transform( return graph.pluginDriver.emitFile(emittedFile); }, addWatchFile(id: string) { - if (!transformDependencies) transformDependencies = []; transformDependencies.push(id); pluginContext.addWatchFile(id); }, diff --git a/test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js b/test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js index ad08fb433fc..1f6d657d302 100644 --- a/test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js +++ b/test/function/samples/deprecated/emit-asset/set-asset-source-twice/_config.js @@ -14,7 +14,7 @@ module.exports = { error: { code: 'PLUGIN_ERROR', hook: 'buildEnd', - message: 'Plugin error - Unable to set the source for asset "test.ext", source already set.', + message: 'Unable to set the source for asset "test.ext", source already set.', plugin: 'test-plugin', pluginCode: 'ASSET_SOURCE_ALREADY_SET' } diff --git a/test/function/samples/emit-file/asset-source-missing-3/_config.js b/test/function/samples/emit-file/asset-source-invalid/_config.js similarity index 100% rename from test/function/samples/emit-file/asset-source-missing-3/_config.js rename to test/function/samples/emit-file/asset-source-invalid/_config.js diff --git a/test/function/samples/emit-file/asset-source-missing-2/main.js b/test/function/samples/emit-file/asset-source-invalid/main.js similarity index 100% rename from test/function/samples/emit-file/asset-source-missing-2/main.js rename to test/function/samples/emit-file/asset-source-invalid/main.js diff --git a/test/function/samples/emit-file/asset-source-invalid2/_config.js b/test/function/samples/emit-file/asset-source-invalid2/_config.js new file mode 100644 index 00000000000..e05d1b9893b --- /dev/null +++ b/test/function/samples/emit-file/asset-source-invalid2/_config.js @@ -0,0 +1,20 @@ +module.exports = { + description: 'throws when setting an empty asset source', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + const assetId = this.emitFile({ type: 'asset', fileName: 'test.ext' }); + this.setAssetSource(assetId, null); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: + 'Could not set source for asset "test.ext", asset source needs to be a string of Buffer.', + plugin: 'test-plugin', + pluginCode: 'VALIDATION_ERROR' + } +}; diff --git a/test/function/samples/emit-file/asset-source-missing-3/main.js b/test/function/samples/emit-file/asset-source-invalid2/main.js similarity index 100% rename from test/function/samples/emit-file/asset-source-missing-3/main.js rename to test/function/samples/emit-file/asset-source-invalid2/main.js diff --git a/test/function/samples/emit-file/asset-source-invalid3/_config.js b/test/function/samples/emit-file/asset-source-invalid3/_config.js new file mode 100644 index 00000000000..a28eecabffc --- /dev/null +++ b/test/function/samples/emit-file/asset-source-invalid3/_config.js @@ -0,0 +1,20 @@ +module.exports = { + description: 'throws when setting an empty asset source', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + const assetId = this.emitFile({ type: 'asset' }); + this.setAssetSource(assetId, null); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: + 'Could not set source for asset "d59386e0", asset source needs to be a string of Buffer.', + plugin: 'test-plugin', + pluginCode: 'VALIDATION_ERROR' + } +}; diff --git a/test/function/samples/emit-file/asset-source-missing-4/main.js b/test/function/samples/emit-file/asset-source-invalid3/main.js similarity index 100% rename from test/function/samples/emit-file/asset-source-missing-4/main.js rename to test/function/samples/emit-file/asset-source-invalid3/main.js diff --git a/test/function/samples/emit-file/asset-source-invalid4/_config.js b/test/function/samples/emit-file/asset-source-invalid4/_config.js new file mode 100644 index 00000000000..102bdfc3e57 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-invalid4/_config.js @@ -0,0 +1,18 @@ +module.exports = { + description: 'throws when setting an empty asset source', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + this.emitFile({ type: 'asset', source: null }); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: 'Could not set source for unnamed asset, asset source needs to be a string of Buffer.', + plugin: 'test-plugin', + pluginCode: 'VALIDATION_ERROR' + } +}; diff --git a/test/function/samples/emit-file/asset-source-invalid4/main.js b/test/function/samples/emit-file/asset-source-invalid4/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-invalid4/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/asset-source-missing2/_config.js b/test/function/samples/emit-file/asset-source-missing2/_config.js new file mode 100644 index 00000000000..fad75fd1542 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing2/_config.js @@ -0,0 +1,15 @@ +module.exports = { + description: 'throws when not setting the asset source', + options: { + plugins: { + name: 'test-plugin', + load() { + this.emitFile({ type: 'asset' }); + } + } + }, + generateError: { + code: 'ASSET_SOURCE_MISSING', + message: 'Plugin error creating asset "d59386e0" - no asset source set.' + } +}; diff --git a/test/function/samples/emit-file/asset-source-missing2/main.js b/test/function/samples/emit-file/asset-source-missing2/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing2/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/asset-source-missing-4/_config.js b/test/function/samples/emit-file/asset-source-missing3/_config.js similarity index 100% rename from test/function/samples/emit-file/asset-source-missing-4/_config.js rename to test/function/samples/emit-file/asset-source-missing3/_config.js diff --git a/test/function/samples/emit-file/asset-source-missing3/main.js b/test/function/samples/emit-file/asset-source-missing3/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing3/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/asset-source-missing4/_config.js b/test/function/samples/emit-file/asset-source-missing4/_config.js new file mode 100644 index 00000000000..a61bd81012d --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing4/_config.js @@ -0,0 +1,20 @@ +module.exports = { + description: 'throws when accessing the file name before the asset source is set', + options: { + plugins: { + name: 'test-plugin', + buildStart() { + const assetId = this.emitFile({ type: 'asset' }); + this.getFileName(assetId); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildStart', + message: + 'Plugin error - Unable to get file name for asset "d59386e0". Ensure that the source is set and that generate is called first.', + plugin: 'test-plugin', + pluginCode: 'ASSET_NOT_FINALISED' + } +}; diff --git a/test/function/samples/emit-file/asset-source-missing4/main.js b/test/function/samples/emit-file/asset-source-missing4/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing4/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/asset-source-missing-2/_config.js b/test/function/samples/emit-file/asset-source-missing5/_config.js similarity index 100% rename from test/function/samples/emit-file/asset-source-missing-2/_config.js rename to test/function/samples/emit-file/asset-source-missing5/_config.js diff --git a/test/function/samples/emit-file/asset-source-missing5/main.js b/test/function/samples/emit-file/asset-source-missing5/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/asset-source-missing5/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); diff --git a/test/function/samples/emit-file/set-asset-source-twice/_config.js b/test/function/samples/emit-file/set-asset-source-twice/_config.js index 6405dbed625..52e798fec21 100644 --- a/test/function/samples/emit-file/set-asset-source-twice/_config.js +++ b/test/function/samples/emit-file/set-asset-source-twice/_config.js @@ -13,7 +13,7 @@ module.exports = { error: { code: 'PLUGIN_ERROR', hook: 'buildEnd', - message: 'Plugin error - Unable to set the source for asset "test.ext", source already set.', + message: 'Unable to set the source for asset "test.ext", source already set.', plugin: 'test-plugin', pluginCode: 'ASSET_SOURCE_ALREADY_SET' } diff --git a/test/function/samples/emit-file/set-asset-source-twice2/_config.js b/test/function/samples/emit-file/set-asset-source-twice2/_config.js new file mode 100644 index 00000000000..b02d47bfa18 --- /dev/null +++ b/test/function/samples/emit-file/set-asset-source-twice2/_config.js @@ -0,0 +1,20 @@ +module.exports = { + description: 'throws when setting the asset source twice', + options: { + plugins: { + name: 'test-plugin', + buildEnd() { + const assetId = this.emitFile({ type: 'asset' }); + this.setAssetSource(assetId, 'hello world'); + this.setAssetSource(assetId, 'another'); + } + } + }, + error: { + code: 'PLUGIN_ERROR', + hook: 'buildEnd', + message: 'Unable to set the source for asset "d59386e0", source already set.', + plugin: 'test-plugin', + pluginCode: 'ASSET_SOURCE_ALREADY_SET' + } +}; diff --git a/test/function/samples/emit-file/set-asset-source-twice2/main.js b/test/function/samples/emit-file/set-asset-source-twice2/main.js new file mode 100644 index 00000000000..c4b940fc952 --- /dev/null +++ b/test/function/samples/emit-file/set-asset-source-twice2/main.js @@ -0,0 +1 @@ +throw new Error('should not build'); From 6d4199e740f4b22da343a55a83e3d3fd11e5d4f4 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 2 Aug 2019 11:57:01 +0200 Subject: [PATCH 29/31] Improve plugin error handling --- src/Chunk.ts | 4 +- src/Graph.ts | 2 - src/utils/error.ts | 1 + src/utils/pluginDriver.ts | 52 +++++++++---------- src/utils/transform.ts | 19 ++----- .../transform-dependencies/_config.js | 2 + 6 files changed, 35 insertions(+), 45 deletions(-) diff --git a/src/Chunk.ts b/src/Chunk.ts index 3eed0478a7d..738e6ebf45c 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -150,8 +150,8 @@ export default class Chunk { [moduleId: string]: RenderedModule; }; usedModules: Module[] = undefined as any; + variableName = 'chunk'; - variableName: string; private dependencies: (ExternalModule | Chunk)[] = undefined as any; private dynamicDependencies: (ExternalModule | Chunk)[] = undefined as any; private exportNames: { [name: string]: Variable } = Object.create(null); @@ -202,8 +202,6 @@ export default class Chunk { getAliasName(moduleForNaming.id) ) ); - } else { - this.variableName = '__chunk_' + ++graph.curChunkIndex; } } diff --git a/src/Graph.ts b/src/Graph.ts index ecb9141e0d7..871994d972c 100644 --- a/src/Graph.ts +++ b/src/Graph.ts @@ -66,7 +66,6 @@ export default class Graph { acornParser: typeof acorn.Parser; cachedModules: Map; contextParse: (code: string, acornOptions?: acorn.Options) => ESTree.Program; - curChunkIndex = 0; deoptimizationTracker: EntityPathTracker; getModuleContext: (id: string) => string; moduleById = new Map(); @@ -90,7 +89,6 @@ export default class Graph { constructor(options: InputOptions, watcher?: RollupWatcher) { this.onwarn = (options.onwarn as WarningHandler) || makeOnwarn(); - this.curChunkIndex = 0; this.deoptimizationTracker = new EntityPathTracker(); this.cachedModules = new Map(); if (options.cache) { diff --git a/src/utils/error.ts b/src/utils/error.ts index ca4d67afcd5..7010eb883c2 100644 --- a/src/utils/error.ts +++ b/src/utils/error.ts @@ -48,6 +48,7 @@ export enum Errors { INVALID_PLUGIN_HOOK = 'INVALID_PLUGIN_HOOK', INVALID_ROLLUP_PHASE = 'INVALID_ROLLUP_PHASE', NAMESPACE_CONFLICT = 'NAMESPACE_CONFLICT', + PLUGIN_ERROR = 'PLUGIN_ERROR', UNRESOLVED_ENTRY = 'UNRESOLVED_ENTRY', UNRESOLVED_IMPORT = 'UNRESOLVED_IMPORT', VALIDATION_ERROR = 'VALIDATION_ERROR' diff --git a/src/utils/pluginDriver.ts b/src/utils/pluginDriver.ts index 7f7de0302b8..cf6411c53cc 100644 --- a/src/utils/pluginDriver.ts +++ b/src/utils/pluginDriver.ts @@ -11,13 +11,14 @@ import { PluginCache, PluginContext, PluginHooks, + RollupError, RollupWarning, RollupWatcher, SerializablePluginCache } from '../rollup/types'; import { BuildPhase } from './buildPhase'; import { getRollupDefaultPlugin } from './defaultPlugin'; -import { errInvalidRollupPhaseForAddWatchFile, error } from './error'; +import { errInvalidRollupPhaseForAddWatchFile, error, Errors } from './error'; import { FileEmitter } from './FileEmitter'; type Args = T extends (...args: infer K) => any ? K : never; @@ -76,7 +77,7 @@ export interface PluginDriver { } export type Reduce = (reduction: T, result: R, plugin: Plugin) => T; -export type HookContext = (context: PluginContext, plugin?: Plugin) => PluginContext; +export type HookContext = (context: PluginContext, plugin: Plugin) => PluginContext; export const ANONYMOUS_PLUGIN_PREFIX = 'at position '; @@ -104,6 +105,26 @@ function warnDeprecatedHooks(plugins: Plugin[], graph: Graph) { } } +export function throwPluginError( + err: string | RollupError, + plugin: string, + { hook, id }: { hook?: string; id?: string } = {} +): never { + if (typeof err === 'string') err = { message: err }; + if (err.code && err.code !== Errors.PLUGIN_ERROR) { + err.pluginCode = err.code; + } + err.code = Errors.PLUGIN_ERROR; + err.plugin = plugin; + if (hook) { + err.hook = hook; + } + if (id) { + err.id = id; + } + return error(err); +} + export function createPluginDriver( graph: Graph, options: InputOptions, @@ -188,11 +209,7 @@ export function createPluginDriver( ), emitFile: fileEmitter.emitFile, error(err): never { - if (typeof err === 'string') err = { message: err }; - if (err.code) err.pluginCode = err.code; - err.code = 'PLUGIN_ERROR'; - err.plugin = plugin.name; - return error(err); + return throwPluginError(err, plugin.name); }, getAssetFileName: getDeprecatedHookHandler( fileEmitter.getFileName, @@ -320,16 +337,8 @@ export function createPluginDriver( } return hook.apply(context, args); } catch (err) { - if (typeof err === 'string') err = { message: err }; - if (err.code !== 'PLUGIN_ERROR') { - if (err.code) err.pluginCode = err.code; - err.code = 'PLUGIN_ERROR'; - } - err.plugin = plugin.name; - err.hook = hookName; - error(err); + return throwPluginError(err, plugin.name, { hook: hookName }); } - return undefined as any; } function runHook( @@ -361,16 +370,7 @@ export function createPluginDriver( } return hook.apply(context, args); }) - .catch(err => { - if (typeof err === 'string') err = { message: err }; - if (err.code !== 'PLUGIN_ERROR') { - if (err.code) err.pluginCode = err.code; - err.code = 'PLUGIN_ERROR'; - } - err.plugin = plugin.name; - err.hook = hookName; - error(err); - }); + .catch(err => throwPluginError(err, plugin.name, { hook: hookName })); } const pluginDriver: PluginDriver = { diff --git a/src/utils/transform.ts b/src/utils/transform.ts index ac04c23c08e..2e6d6f382bb 100644 --- a/src/utils/transform.ts +++ b/src/utils/transform.ts @@ -15,9 +15,9 @@ import { } from '../rollup/types'; import { collapseSourcemap } from './collapseSourcemaps'; import { decodedSourcemap } from './decodedSourcemap'; -import { augmentCodeLocation, error } from './error'; +import { augmentCodeLocation } from './error'; import { dirname, resolve } from './path'; -import { trackPluginCache } from './pluginDriver'; +import { throwPluginError, trackPluginCache } from './pluginDriver'; export default function transform( graph: Graph, @@ -49,8 +49,7 @@ export default function transform( if (customTransformCache) { if (result && typeof result === 'object' && Array.isArray(result.dependencies)) { for (const dep of result.dependencies) { - const depId = resolve(dirname(id), dep); - if (!graph.watchFiles[depId]) graph.watchFiles[depId] = true; + graph.watchFiles[resolve(dirname(id), dep)] = true; } } } else { @@ -105,7 +104,7 @@ export default function transform( [curSource, id], transformReducer, (pluginContext, plugin) => { - curPlugin = plugin as Plugin; + curPlugin = plugin; if (curPlugin.cacheKey) customTransformCache = true; else trackedPluginCache = trackPluginCache(pluginContext.cache); return { @@ -181,15 +180,7 @@ export default function transform( }; } ) - .catch(err => { - if (typeof err === 'string') err = { message: err }; - if (err.code !== 'PLUGIN_ERROR') { - if (err.code) err.pluginCode = err.code; - err.code = 'PLUGIN_ERROR'; - } - err.id = id; - error(err); - }) + .catch(err => throwPluginError(err, curPlugin.name, { hook: 'transform', id })) .then(code => { if (!customTransformCache && setAssetSourceErr) throw setAssetSourceErr; diff --git a/test/function/samples/deprecations/transform-dependencies/_config.js b/test/function/samples/deprecations/transform-dependencies/_config.js index 84f836df2fc..00ca6697bac 100644 --- a/test/function/samples/deprecations/transform-dependencies/_config.js +++ b/test/function/samples/deprecations/transform-dependencies/_config.js @@ -11,9 +11,11 @@ module.exports = { }, error: { code: 'PLUGIN_ERROR', + hook: 'transform', id: path.resolve(__dirname, 'main.js'), message: 'Returning "dependencies" from the "transform" hook as done by plugin at position 1 is deprecated. The "this.addWatchFile" plugin context function should be used instead.', + plugin: 'at position 1', pluginCode: 'DEPRECATED_FEATURE' } }; From e4f44c0bc355e7f8874c2e58d4854e4267105dc0 Mon Sep 17 00:00:00 2001 From: Lukas Taegert-Atkinson Date: Fri, 2 Aug 2019 14:42:43 +0200 Subject: [PATCH 30/31] Add documentation --- docs/05-plugin-development.md | 131 +++++++++++------- .../_config.js | 0 .../_expected/amd/custom/build-start-chunk.js | 10 ++ .../_expected/amd/generated-chunk.js | 0 .../emit-chunk-filename/_expected/amd/main.js | 7 + .../_expected/cjs/custom/build-start-chunk.js | 10 ++ .../_expected/cjs/generated-chunk.js | 0 .../_expected/cjs/main.js | 3 + .../_expected/es/custom/build-start-chunk.js | 6 + .../_expected/es/generated-chunk.js | 0 .../_expected/es/main.js | 3 + .../system/custom/build-start-chunk.js | 5 +- .../_expected/system/generated-chunk.js | 0 .../_expected/system/main.js | 18 +++ .../emit-chunk-filename/buildStart.js | 3 + .../dep.js | 0 .../emit-file/emit-chunk-filename/dep2.js | 3 + .../main.js | 2 +- .../_expected/amd/custom/build-start-chunk.js | 5 - .../emit-named-chunk/_expected/amd/main.js | 5 - .../_expected/cjs/custom/build-start-chunk.js | 5 - .../_expected/es/custom/build-start-chunk.js | 3 - .../emit-named-chunk/_expected/system/main.js | 14 -- .../emit-file/emit-named-chunk/buildStart.js | 3 - 24 files changed, 148 insertions(+), 88 deletions(-) rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/_config.js (100%) create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/_expected/amd/generated-chunk.js (100%) create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/_expected/cjs/generated-chunk.js (100%) rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/_expected/cjs/main.js (50%) create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/_expected/es/generated-chunk.js (100%) rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/_expected/es/main.js (53%) rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/_expected/system/custom/build-start-chunk.js (50%) rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/_expected/system/generated-chunk.js (100%) create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-filename/buildStart.js rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/dep.js (100%) create mode 100644 test/chunking-form/samples/emit-file/emit-chunk-filename/dep2.js rename test/chunking-form/samples/emit-file/{emit-named-chunk => emit-chunk-filename}/main.js (74%) delete mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/custom/build-start-chunk.js delete mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/amd/main.js delete mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/cjs/custom/build-start-chunk.js delete mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/es/custom/build-start-chunk.js delete mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/_expected/system/main.js delete mode 100644 test/chunking-form/samples/emit-file/emit-named-chunk/buildStart.js diff --git a/docs/05-plugin-development.md b/docs/05-plugin-development.md index 0abc711e461..c5ba87e775e 100644 --- a/docs/05-plugin-development.md +++ b/docs/05-plugin-development.md @@ -201,7 +201,7 @@ In case a dynamic import is not passed a string as argument, this hook gets acce Note that the return value of this hook will not be passed to `resolveId` afterwards; if you need access to the static resolution algorithm, you can use [`this.resolve(source, importer)`](guide/en/#thisresolvesource-string-importer-string-options-skipself-boolean--promiseid-string-external-boolean--null) on the plugin context. #### `resolveFileUrl` -Type: `({assetReferenceId: string | null, chunkId: string, chunkReferenceId: string | null, fileName: string, format: string, moduleId: string, relativePath: string}) => string | null`
+Type: `({chunkId: string, fileName: string, format: string, moduleId: string, referenceId: string, relativePath: string}) => string | null`
Kind: `sync, first` Allows to customize how Rollup resolves URLs of files that were emitted by plugins via `this.emitAsset` or `this.emitChunk`. By default, Rollup will generate code for `import.meta.ROLLUP_ASSET_URL_assetReferenceId` and `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId` that should correctly generate absolute URLs of emitted files independent of the output format and the host system where the code is deployed. @@ -327,38 +327,50 @@ Adds additional files to be monitored in watch mode so that changes to these fil In general, it is recommended to use `this.addWatchfile` from within the hook that depends on the watched file. -#### `this.emitAsset(assetName: string, source: string) => string` +#### `this.emitFile(emittedFile: EmittedChunk | EmittedAsset) => string` -Emits a custom file that is included in the build output, returning an `assetReferenceId` that can be used to reference the emitted file. You can defer setting the source if you provide it later via [`this.setAssetSource(assetReferenceId, source)`](guide/en/#thissetassetsourceassetreferenceid-string-source-string--buffer--void). A string or Buffer source must be set for each asset through either method or an error will be thrown on generate completion. +Emits a new file that is included in the build output and returns a `referenceId` that can be used in various places to reference the emitted file. `emittedFile` can have one of two forms: -Emitted assets will follow the [`output.assetFileNames`](guide/en/#outputassetfilenames) naming scheme. You can reference the URL of the file in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_ASSET_URL_assetReferenceId`. See [Asset URLs](guide/en/#asset-urls) for more details and an example. - -The generated code that replaces `import.meta.ROLLUP_ASSET_URL_assetReferenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the asset has been finalized during `generate`, you can also use [`this.getAssetFileName(assetReferenceId)`](guide/en/#thisgetassetfilenameassetreferenceid-string--string) to determine the file name. +``` +// EmittedChunk +{ + type: 'chunk', + id: string, + name?: string, + fileName?: string +} -#### `this.emitChunk(moduleId: string, options?: {name?: string}) => string` +// EmittedAsset +{ + type: 'asset', + source?: string | Buffer, + name?: string, + fileName?: string +} +``` -Emits a new chunk with the given module as entry point. This will not result in duplicate modules in the graph, instead if necessary, existing chunks will be split. It returns a `chunkReferenceId` that can be used to later access the generated file name of the chunk. +In both cases, either a `name` or a `fileName` can be supplied. If a `fileName` is provided, it will be used unmodified as the name of the generated file, throwing an error if this causes a conflict. Otherwise if a `name` is supplied, this will be used as substitution for `[name]` in the corresponding [`output.chunkFileNames`](guide/en/#outputchunkfilenames) or [`output.assetFileNames`](guide/en/#outputassetfilenames) pattern, possibly adding a unique number to the end of the file name to avoid conflicts. If neither a `name` nor `fileName` is supplied, a default name will be used. + +You can reference the URL of an emitted file in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_FILE_URL_referenceId`. See [File URLs](guide/en/#file-urls) for more details and an example. + +The generated code that replaces `import.meta.ROLLUP_FILE_URL_referenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. You can also use [`this.getFileName(referenceId)`](guide/en/#thisgetfilenamereferenceid-string--string) to determine the file name as soon as it is available -Emitted chunks will follow the [`output.chunkFileNames`](guide/en/#outputchunkfilenames), [`output.entryFileNames`](guide/en/#outputentryfilenames) naming scheme. If a `name` is provided, this will be used for the `[name]` file name placeholder, otherwise the name will be derived from the file name. If a `name` is provided, this name must not conflict with any other entry point names unless the entry points reference the same entry module. You can reference the URL of the emitted chunk in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId`. +If the `type` is *`chunk`*, then this emits a new chunk with the given module id as entry point. This will not result in duplicate modules in the graph, instead if necessary, existing chunks will be split or a facade chunk with reexports will be created. Chunks with a specified `fileName` will always generate separate chunks while other emitted chunks may be deduplicated with existing chunks even if the `name` does not match. If such a chunk is not deduplicated, the [`output.chunkFileNames`](guide/en/#outputchunkfilenames) name pattern will be used. -The generated code that replaces `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the chunk has been rendered during `generate`, you can also use [`this.getChunkFileName(chunkReferenceId)`](guide/en/#thisgetchunkfilenamechunkreferenceid-string--string) to determine the file name. +If the `type` is *`asset`*, then this emits an arbitrary new file with the given `source` as content. It is possible to defer setting the `source` via [`this.setAssetSource(assetReferenceId, source)`](guide/en/#thissetassetsourceassetreferenceid-string-source-string--buffer--void) to a later time to be able to reference a file during the build phase while setting the source separately for each output during the generate phase. Assets with a specified `fileName` will always generate separate files while other emitted assets may be deduplicated with existing assets if they have the same source even if the `name` does not match. If such an asset is not deduplicated, the [`output.assetFileNames`](guide/en/#outputassetfilenames) name pattern will be used. #### `this.error(error: string | Error, position?: number | { column: number; line: number }) => never` Structurally equivalent to `this.warn`, except that it will also abort the bundling process. -#### `this.getAssetFileName(assetReferenceId: string) => string` - -Get the file name of an asset, according to the `assetFileNames` output option pattern. The file name will be relative to `outputOptions.dir`. - -#### `this.getChunkFileName(chunkReferenceId: string) => string` - -Get the file name of an emitted chunk. The file name will be relative to `outputOptions.dir`. - #### `this.getCombinedSourcemap() => SourceMap` Get the combined source maps of all previous plugins. This context function can only be used in [`transform`](guide/en/#transform) plugin hook. +#### `this.getFileName(referenceId: string) => string` + +Get the file name of a chunk or asset that has been emitted via [`this.emitFile`](guide/en/#thisemitfileemittedfile-emittedchunk--emittedasset--string) . The file name will be relative to `outputOptions.dir`. + #### `this.getModuleInfo(moduleId: string) => ModuleInfo` Returns additional information about the module in question in the form @@ -422,13 +434,29 @@ The `position` argument is a character index where the warning was raised. If pr ☢️ These context utility functions have been deprecated and may be removed in a future Rollup version. -- `this.isExternal(id: string, importer: string, isResolved: boolean): boolean` - _**Use [`this.resolve`](guide/en/#thisresolvesource-string-importer-string-options-skipself-boolean--promiseid-string-external-boolean--null)**_ - Determine if a given module ID is external when imported by `importer`. When `isResolved` is false, Rollup will try to resolve the id before testing if it is external. +- `this.emitAsset(assetName: string, source: string) => string` - _**Use [`this.emitFile`](guide/en/#thisemitfileemittedfile-emittedchunk--emittedasset--string)**_ - Emits a custom file that is included in the build output, returning an `assetReferenceId` that can be used to reference the emitted file. You can defer setting the source if you provide it later via [`this.setAssetSource(assetReferenceId, source)`](guide/en/#thissetassetsourceassetreferenceid-string-source-string--buffer--void). A string or Buffer source must be set for each asset through either method or an error will be thrown on generate completion. + + Emitted assets will follow the [`output.assetFileNames`](guide/en/#outputassetfilenames) naming scheme. You can reference the URL of the file in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_ASSET_URL_assetReferenceId`. + + The generated code that replaces `import.meta.ROLLUP_ASSET_URL_assetReferenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the asset has been finalized during `generate`, you can also use [`this.getFileName(assetReferenceId)`](guide/en/#thisgetfilenamereferenceid-string--string) to determine the file name. + +- `this.emitChunk(moduleId: string, options?: {name?: string}) => string` - _**Use [`this.emitFile`](guide/en/#thisemitfileemittedfile-emittedchunk--emittedasset--string)**_ - Emits a new chunk with the given module as entry point. This will not result in duplicate modules in the graph, instead if necessary, existing chunks will be split. It returns a `chunkReferenceId` that can be used to later access the generated file name of the chunk. + + Emitted chunks will follow the [`output.chunkFileNames`](guide/en/#outputchunkfilenames), [`output.entryFileNames`](guide/en/#outputentryfilenames) naming scheme. If a `name` is provided, this will be used for the `[name]` file name placeholder, otherwise the name will be derived from the file name. If a `name` is provided, this name must not conflict with any other entry point names unless the entry points reference the same entry module. You can reference the URL of the emitted chunk in any code returned by a [`load`](guide/en/#load) or [`transform`](guide/en/#transform) plugin hook via `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId`. + + The generated code that replaces `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId` can be customized via the [`resolveFileUrl`](guide/en/#resolvefileurl) plugin hook. Once the chunk has been rendered during `generate`, you can also use [`this.getFileName(chunkReferenceId)`](guide/en/#thisgetfilenamereferenceid-string--string) to determine the file name. + +- `this.getAssetFileName(assetReferenceId: string) => string` - _**Use [`this.getFileName`](guide/en/#thisgetfilenamereferenceid-string--string)**_ - Get the file name of an asset, according to the `assetFileNames` output option pattern. The file name will be relative to `outputOptions.dir`. + +- `this.getChunkFileName(chunkReferenceId: string) => string` - _**Use [`this.getFileName`](guide/en/#thisgetfilenamereferenceid-string--string)**_ - Get the file name of an emitted chunk. The file name will be relative to `outputOptions.dir`. + +- `this.isExternal(id: string, importer: string, isResolved: boolean) => boolean` - _**Use [`this.resolve`](guide/en/#thisresolvesource-string-importer-string-options-skipself-boolean--promiseid-string-external-boolean--null)**_ - Determine if a given module ID is external when imported by `importer`. When `isResolved` is false, Rollup will try to resolve the id before testing if it is external. - `this.resolveId(source: string, importer: string) => Promise` - _**Use [`this.resolve`](guide/en/#thisresolvesource-string-importer-string-options-skipself-boolean--promiseid-string-external-boolean--null)**_ - Resolve imports to module ids (i.e. file names) using the same plugins that Rollup uses. Returns `null` if an id cannot be resolved. -### Asset URLs +### File URLs -To reference an asset URL reference from within JS code, use the `import.meta.ROLLUP_ASSET_URL_assetReferenceId` replacement. This will generate code that depends on the output format and generates a URL that points to the emitted file in the target environment. Note that all formats except CommonJS and UMD assume that they run in a browser environment where `URL` and `document` are available. +To reference a file URL reference from within JS code, use the `import.meta.ROLLUP_FILE_URL_referenceId` replacement. This will generate code that depends on the output format and generates a URL that points to the emitted file in the target environment. Note that all formats except CommonJS and UMD assume that they run in a browser environment where `URL` and `document` are available. The following example will detect imports of `.svg` files, emit the imported files as assets, and return their URLs to be used e.g. as the `src` attribute of an `img` tag: @@ -443,26 +471,28 @@ export default function svgResolverPlugin () { }, load(id) { if (id.endsWith('.svg')) { - const assetReferenceId = this.emitAsset( - path.basename(id), - fs.readFileSync(id) - ); - return `export default import.meta.ROLLUP_ASSET_URL_${assetReferenceId};`; + const referenceId = this.emitFile({ + type: 'asset', + name: path.basename(id), + source: fs.readFileSync(id) + }); + return `export default import.meta.ROLLUP_FILE_URL_${referenceId};`; } } }); } +``` + +Usage: -// usage +```js import logo from '../images/logo.svg'; const image = document.createElement('img'); image.src = logo; document.body.appendChild(image); ``` -### Chunk URLs - -Similar to assets, emitted chunks can be referenced from within JS code via the `import.meta.ROLLUP_CHUNK_URL_chunkReferenceId` replacement. +Similar to assets, emitted chunks can be referenced from within JS code via `import.meta.ROLLUP_FILE_URL_referenceId` as well. The following example will detect imports prefixed with `register-paint-worklet:` and generate the necessary code and separate chunk to generate a CSS paint worklet. Note that this will only work in modern browsers and will only work if the output format is set to `esm`. @@ -473,20 +503,21 @@ export default function paintWorkletPlugin () { return ({ load(id) { if (id.startsWith(REGISTER_WORKLET)) { - return `CSS.paintWorklet.addModule(import.meta.ROLLUP_CHUNK_URL_${this.emitChunk( - id.slice(REGISTER_WORKLET.length) - )});`; + return `CSS.paintWorklet.addModule(import.meta.ROLLUP_FILE_URL_${this.emitFile({ + type: 'chunk', + id: id.slice(REGISTER_WORKLET.length) + })});`; } }, resolveId(source, importer) { // We remove the prefix, resolve everything to absolute ids and add the prefix again // This makes sure that you can use relative imports to define worklets - if (source.startsWith(REGISTER_WORKLET)) { - return this.resolveId(source.slice(REGISTER_WORKLET.length), importer).then( - id => REGISTER_WORKLET + id - ); - } - return null; + if (source.startsWith(REGISTER_WORKLET)) { + return this.resolve(source.slice(REGISTER_WORKLET.length), importer).then( + resolvedId => REGISTER_WORKLET + resolvedId.id + ); + } + return null; } }); } @@ -503,17 +534,17 @@ document.body.innerHTML += `

Date: Sat, 3 Aug 2019 14:54:26 +0200 Subject: [PATCH 31/31] Use id of last module in chunk as name base for auto-generated chunks --- src/Chunk.ts | 5 +--- .../{generated-chunk.js => generated-dep2.js} | 0 .../basic-chunking/_expected/amd/main1.js | 2 +- .../basic-chunking/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../basic-chunking/_expected/cjs/main1.js | 2 +- .../basic-chunking/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../basic-chunking/_expected/es/main1.js | 2 +- .../basic-chunking/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../basic-chunking/_expected/system/main1.js | 2 +- .../basic-chunking/_expected/system/main2.js | 2 +- .../_expected/amd/generated-chunk2.js | 10 ------- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk3.js => generated-dep2.js} | 0 .../_expected/amd/generated-shared2.js | 10 +++++++ .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../_expected/amd/main4.js | 2 +- .../_expected/cjs/generated-chunk2.js | 11 -------- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk3.js => generated-dep2.js} | 0 .../_expected/cjs/generated-shared2.js | 11 ++++++++ .../_expected/cjs/main1.js | 6 ++--- .../_expected/cjs/main2.js | 6 ++--- .../_expected/cjs/main3.js | 2 +- .../_expected/cjs/main4.js | 2 +- .../_expected/es/generated-chunk2.js | 8 ------ .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk3.js => generated-dep2.js} | 0 .../_expected/es/generated-shared2.js | 8 ++++++ .../_expected/es/main1.js | 6 ++--- .../_expected/es/main2.js | 6 ++--- .../_expected/es/main3.js | 2 +- .../_expected/es/main4.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk3.js => generated-dep2.js} | 0 ...nerated-chunk2.js => generated-shared2.js} | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../_expected/system/main4.js | 2 +- .../_expected/amd/generated-chunk3.js | 5 ---- .../_expected/amd/generated-dep11.js | 5 ++++ ...generated-chunk.js => generated-dep111.js} | 0 ...enerated-chunk2.js => generated-dep112.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../_expected/amd/main4.js | 2 +- .../_expected/cjs/generated-chunk3.js | 6 ----- .../_expected/cjs/generated-dep11.js | 6 +++++ ...generated-chunk.js => generated-dep111.js} | 0 ...enerated-chunk2.js => generated-dep112.js} | 0 .../_expected/cjs/main1.js | 6 ++--- .../_expected/cjs/main2.js | 6 ++--- .../_expected/cjs/main3.js | 2 +- .../_expected/cjs/main4.js | 2 +- .../_expected/es/generated-chunk3.js | 4 --- .../_expected/es/generated-dep11.js | 4 +++ ...generated-chunk.js => generated-dep111.js} | 0 ...enerated-chunk2.js => generated-dep112.js} | 0 .../_expected/es/main1.js | 6 ++--- .../_expected/es/main2.js | 6 ++--- .../_expected/es/main3.js | 2 +- .../_expected/es/main4.js | 2 +- ...generated-chunk3.js => generated-dep11.js} | 2 +- ...generated-chunk.js => generated-dep111.js} | 0 ...enerated-chunk2.js => generated-dep112.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../_expected/system/main4.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-one.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-one.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-one.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-one.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-lib.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-lib.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-lib.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-lib.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../chunk-live-bindings/_expected/es/main1.js | 2 +- .../chunk-live-bindings/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-compact/_expected/amd/main1.js | 2 +- .../chunking-compact/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-compact/_expected/cjs/main1.js | 2 +- .../chunking-compact/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-compact/_expected/es/main1.js | 2 +- .../chunking-compact/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-externals/_expected/amd/main1.js | 2 +- .../chunking-externals/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-externals/_expected/cjs/main1.js | 2 +- .../chunking-externals/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../chunking-externals/_expected/es/main1.js | 2 +- .../chunking-externals/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../chunking-reexport/_expected/amd/main1.js | 2 +- .../chunking-reexport/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../chunking-reexport/_expected/cjs/main1.js | 2 +- .../chunking-reexport/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../chunking-reexport/_expected/es/main1.js | 2 +- .../chunking-reexport/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/amd/generated-chunk.js.map | 1 - .../{generated-chunk.js => generated-dep2.js} | 2 +- .../_expected/amd/generated-dep2.js.map | 1 + .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/cjs/generated-chunk.js.map | 1 - .../{generated-chunk.js => generated-dep2.js} | 2 +- .../_expected/cjs/generated-dep2.js.map | 1 + .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../_expected/es/generated-chunk.js.map | 1 - .../{generated-chunk.js => generated-dep2.js} | 2 +- .../_expected/es/generated-dep2.js.map | 1 + .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js.map | 1 - .../{generated-chunk.js => generated-dep2.js} | 2 +- .../_expected/system/generated-dep2.js.map | 1 + .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../deconflict-globals/_expected/amd/main1.js | 2 +- .../deconflict-globals/_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../deconflict-globals/_expected/cjs/main1.js | 2 +- .../deconflict-globals/_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../deconflict-globals/_expected/es/main1.js | 2 +- .../deconflict-globals/_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...generated-chunk.js => generated-proxy2.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...generated-chunk.js => generated-proxy2.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...generated-chunk.js => generated-proxy2.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...generated-chunk.js => generated-proxy2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...{generated-chunk.js => generated-proxy.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...{generated-chunk.js => generated-proxy.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...{generated-chunk.js => generated-proxy.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...{generated-chunk.js => generated-proxy.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...enerated-chunk.js => generated-module3.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...enerated-chunk.js => generated-module3.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...enerated-chunk.js => generated-module3.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...enerated-chunk.js => generated-module3.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...generated-chunk.js => generated-shared.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../amd/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/amd/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../cjs/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/cjs/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/es/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/es/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../system/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/system/main.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/amd/main.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/cjs/main.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/es/main.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/chunks/worker.js | 2 +- .../_expected/system/main.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/amd/main.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/cjs/main.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/es/main.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/chunks/worklet.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/amd/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/amd/main.js | 2 +- .../_expected/cjs/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/cjs/main.js | 2 +- .../_expected/es/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/es/main.js | 2 +- .../_expected/system/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/system/main.js | 2 +- .../_expected/amd/generated-dep2.js | 2 +- .../{generated-chunk.js => generated-dep4.js} | 0 .../_expected/amd/main.js | 2 +- .../_expected/cjs/generated-dep2.js | 2 +- .../{generated-chunk.js => generated-dep4.js} | 0 .../_expected/cjs/main.js | 2 +- .../_expected/es/generated-dep2.js | 2 +- .../{generated-chunk.js => generated-dep4.js} | 0 .../_expected/es/main.js | 2 +- .../_expected/system/generated-dep2.js | 2 +- .../{generated-chunk.js => generated-dep4.js} | 0 .../_expected/system/main.js | 2 +- .../_expected/amd/generated-chunk.js | 13 --------- .../_expected/amd/generated-dynamic.js | 10 +++++-- .../_expected/amd/generated-dynamic2.js | 7 +++++ .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/cjs/generated-chunk.js | 11 -------- .../_expected/cjs/generated-dynamic.js | 8 ++++-- .../_expected/cjs/generated-dynamic2.js | 7 +++++ .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../_expected/es/generated-chunk.js | 8 ------ .../_expected/es/generated-dynamic.js | 9 ++++++- .../_expected/es/generated-dynamic2.js | 1 + .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-chunk.js | 15 ----------- .../_expected/system/generated-dynamic.js | 10 ++++--- .../_expected/system/generated-dynamic2.js | 13 +++++++++ .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/amd/generated-dep1.js | 17 ++++++++++-- .../_expected/amd/generated-dep12.js | 7 +++++ .../_expected/amd/main.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/cjs/generated-dep1.js | 15 +++++++++-- .../_expected/cjs/generated-dep12.js | 7 +++++ .../_expected/cjs/main.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../_expected/es/generated-dep1.js | 16 ++++++++++- .../_expected/es/generated-dep12.js | 1 + .../_expected/es/main.js | 2 +- .../_expected/es/main2.js | 2 +- .../_expected/system/generated-dep1.js | 22 ++++++++++++--- .../_expected/system/generated-dep12.js | 13 +++++++++ .../_expected/system/main.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/amd/generated-chunk.js | 20 -------------- .../_expected/amd/generated-dep1.js} | 0 .../_expected/amd/main.js | 2 +- .../_expected/cjs/generated-chunk.js | 18 ------------- .../_expected/cjs/generated-dep1.js} | 0 .../_expected/cjs/main.js | 2 +- .../_expected/es/generated-chunk.js | 15 ----------- .../_expected/es/generated-dep1.js} | 0 .../_expected/es/main.js | 2 +- .../_expected/system/generated-chunk.js | 27 ------------------- .../_expected/system/generated-dep1.js} | 0 .../_expected/system/main.js | 2 +- .../_expected/amd/chunks/other.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../dynamic-import/_expected/amd/main.js | 2 +- .../_expected/cjs/chunks/other.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../dynamic-import/_expected/cjs/main.js | 2 +- .../_expected/es/chunks/other.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../dynamic-import/_expected/es/main.js | 2 +- .../_expected/system/chunks/other.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../dynamic-import/_expected/system/main.js | 2 +- .../emit-file/emit-chunk-filename/_config.js | 2 +- .../_expected/amd/custom/build-start-chunk.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk-filename/_expected/amd/main.js | 2 +- .../_expected/cjs/custom/build-start-chunk.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk-filename/_expected/cjs/main.js | 2 +- .../_expected/es/custom/build-start-chunk.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk-filename/_expected/es/main.js | 2 +- .../system/custom/build-start-chunk.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../amd/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/amd/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../cjs/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/cjs/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/es/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/es/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../system/generated-nested/my-chunk.js | 2 +- .../emit-chunk-named/_expected/system/main.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/amd/main.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/cjs/main.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/chunks/worker.js | 2 +- .../emit-chunk-worker/_expected/es/main.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/chunks/worker.js | 2 +- .../_expected/system/main.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/amd/main.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/cjs/main.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/chunks/worklet.js | 2 +- .../emit-chunk-worklet/_expected/es/main.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/chunks/worklet.js | 2 +- .../_expected/system/main.js | 2 +- .../_expected/amd/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/amd/main.js | 2 +- .../_expected/cjs/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/cjs/main.js | 2 +- .../_expected/es/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-file/emit-chunk/_expected/es/main.js | 2 +- .../_expected/system/generated-buildStart.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../emit-chunk/_expected/system/main.js | 2 +- .../{generated-chunk.js => generated-m1.js} | 0 .../_expected/amd/m1.js | 2 +- .../_expected/amd/main.js | 2 +- .../{generated-chunk.js => generated-m1.js} | 0 .../_expected/cjs/m1.js | 2 +- .../_expected/cjs/main.js | 2 +- .../{generated-chunk.js => generated-m1.js} | 0 .../_expected/es/m1.js | 2 +- .../_expected/es/main.js | 2 +- .../{generated-chunk.js => generated-m1.js} | 0 .../_expected/system/m1.js | 2 +- .../_expected/system/main.js | 2 +- ...rated-main2alias.js => generated-main2.js} | 0 .../_expected/amd/main1alias.js | 2 +- .../_expected/amd/main2alias.js | 2 +- ...rated-main2alias.js => generated-main2.js} | 0 .../_expected/cjs/main1alias.js | 2 +- .../_expected/cjs/main2alias.js | 2 +- ...rated-main2alias.js => generated-main2.js} | 0 .../_expected/es/main1alias.js | 2 +- .../_expected/es/main2alias.js | 2 +- ...rated-main2alias.js => generated-main2.js} | 0 .../_expected/system/main1alias.js | 2 +- .../_expected/system/main2alias.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../entrypoint-facade/_expected/amd/main1.js | 2 +- .../entrypoint-facade/_expected/amd/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../entrypoint-facade/_expected/cjs/main1.js | 2 +- .../entrypoint-facade/_expected/cjs/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../entrypoint-facade/_expected/es/main1.js | 2 +- .../entrypoint-facade/_expected/es/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- ...c19-amd.js => chunk-main2-6bb39c19-amd.js} | 0 .../_expected/amd/entry-main1-e7c7d1b5-amd.js | 2 +- .../_expected/amd/entry-main2-f9a2200a-amd.js | 2 +- ...40d-cjs.js => chunk-main2-33c8b40d-cjs.js} | 0 .../_expected/cjs/entry-main1-639831da-cjs.js | 2 +- .../_expected/cjs/entry-main2-4508233a-cjs.js | 2 +- ...346-esm.js => chunk-main2-cc2b1346-esm.js} | 0 .../_expected/es/entry-main1-2901d8b1-esm.js | 2 +- .../_expected/es/entry-main2-62d27906-esm.js | 2 +- ...stem.js => chunk-main2-63744fb4-system.js} | 0 .../system/entry-main1-379caf56-system.js | 2 +- .../system/entry-main2-9e49ba04-system.js | 2 +- .../{generated-chunk.js => generated-dep3.js} | 0 .../grouping-multiple/_expected/amd/main1.js | 2 +- .../grouping-multiple/_expected/amd/main2.js | 2 +- .../grouping-multiple/_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep3.js} | 0 .../grouping-multiple/_expected/cjs/main1.js | 2 +- .../grouping-multiple/_expected/cjs/main2.js | 2 +- .../grouping-multiple/_expected/cjs/main3.js | 2 +- .../{generated-chunk.js => generated-dep3.js} | 0 .../grouping-multiple/_expected/es/main1.js | 2 +- .../grouping-multiple/_expected/es/main2.js | 2 +- .../grouping-multiple/_expected/es/main3.js | 2 +- .../{generated-chunk.js => generated-dep3.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep3.js} | 0 .../grouping-size/_expected/amd/main1.js | 2 +- .../grouping-size/_expected/amd/main2.js | 2 +- .../grouping-size/_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep3.js} | 0 .../grouping-size/_expected/cjs/main1.js | 4 +-- .../grouping-size/_expected/cjs/main2.js | 4 +-- .../grouping-size/_expected/cjs/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep3.js} | 0 .../grouping-size/_expected/es/main1.js | 4 +-- .../grouping-size/_expected/es/main2.js | 4 +-- .../grouping-size/_expected/es/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep3.js} | 0 .../grouping-size/_expected/system/main1.js | 2 +- .../grouping-size/_expected/system/main2.js | 2 +- .../grouping-size/_expected/system/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep2.js} | 0 ...{generated-chunk3.js => generated-dep3.js} | 0 .../multi-chunking/_expected/amd/main1.js | 2 +- .../multi-chunking/_expected/amd/main2.js | 2 +- .../multi-chunking/_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep2.js} | 0 ...{generated-chunk3.js => generated-dep3.js} | 0 .../multi-chunking/_expected/cjs/main1.js | 4 +-- .../multi-chunking/_expected/cjs/main2.js | 4 +-- .../multi-chunking/_expected/cjs/main3.js | 4 +-- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep2.js} | 0 ...{generated-chunk3.js => generated-dep3.js} | 0 .../multi-chunking/_expected/es/main1.js | 4 +-- .../multi-chunking/_expected/es/main2.js | 4 +-- .../multi-chunking/_expected/es/main3.js | 4 +-- .../{generated-chunk.js => generated-dep1.js} | 0 ...{generated-chunk2.js => generated-dep2.js} | 0 ...{generated-chunk3.js => generated-dep3.js} | 0 .../multi-chunking/_expected/system/main1.js | 2 +- .../multi-chunking/_expected/system/main2.js | 2 +- .../multi-chunking/_expected/system/main3.js | 2 +- .../amd/chunks/{chunk.js => shared.js} | 0 .../_expected/amd/main.js | 2 +- .../_expected/amd/other.js | 2 +- .../cjs/chunks/{chunk.js => shared.js} | 0 .../_expected/cjs/main.js | 2 +- .../_expected/cjs/other.js | 2 +- .../es/chunks/{chunk.js => shared.js} | 0 .../_expected/es/main.js | 2 +- .../_expected/es/other.js | 2 +- .../system/chunks/{chunk.js => shared.js} | 0 .../_expected/system/main.js | 2 +- .../_expected/system/other.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- ...{generated-chunk.js => generated-main2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 ...generated-chunk2.js => generated-index.js} | 2 +- .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 ...generated-chunk2.js => generated-index.js} | 2 +- .../_expected/cjs/main1.js | 4 +-- .../_expected/cjs/main2.js | 4 +-- .../_expected/cjs/main3.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 ...generated-chunk2.js => generated-index.js} | 2 +- .../_expected/es/main1.js | 4 +-- .../_expected/es/main2.js | 4 +-- .../_expected/es/main3.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 ...generated-chunk2.js => generated-index.js} | 2 +- .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- ...{generated-chunk.js => generated-index.js} | 0 .../_expected/amd/index.js | 2 +- .../namespace-reexports/_expected/amd/main.js | 2 +- ...{generated-chunk.js => generated-index.js} | 0 .../_expected/cjs/index.js | 2 +- .../namespace-reexports/_expected/cjs/main.js | 2 +- ...{generated-chunk.js => generated-index.js} | 0 .../namespace-reexports/_expected/es/index.js | 2 +- .../namespace-reexports/_expected/es/main.js | 2 +- ...{generated-chunk.js => generated-index.js} | 0 .../_expected/system/index.js | 2 +- .../_expected/system/main.js | 2 +- ...{generated-chunk.js => generated-other.js} | 0 .../_expected/amd/main-a.js | 2 +- .../_expected/amd/main-b.js | 2 +- ...{generated-chunk.js => generated-other.js} | 0 .../_expected/cjs/main-a.js | 2 +- .../_expected/cjs/main-b.js | 2 +- ...{generated-chunk.js => generated-other.js} | 0 .../_expected/es/main-a.js | 2 +- .../_expected/es/main-b.js | 2 +- ...{generated-chunk.js => generated-other.js} | 0 .../_expected/system/main-a.js | 2 +- .../_expected/system/main-b.js | 2 +- .../_expected/amd/generated-bar.js | 9 +++++++ ...generated-chunk.js => generated-broken.js} | 0 .../_expected/amd/generated-chunk2.js | 9 ------- .../_expected/amd/generated-chunk3.js | 9 ------- .../_expected/amd/generated-foo.js | 9 +++++++ .../namespace-tracing/_expected/amd/main-a.js | 2 +- .../namespace-tracing/_expected/amd/main-b.js | 2 +- .../namespace-tracing/_expected/amd/main-c.js | 2 +- .../{generated-chunk3.js => generated-bar.js} | 2 +- ...generated-chunk.js => generated-broken.js} | 0 .../{generated-chunk2.js => generated-foo.js} | 2 +- .../namespace-tracing/_expected/cjs/main-a.js | 4 +-- .../namespace-tracing/_expected/cjs/main-b.js | 6 ++--- .../namespace-tracing/_expected/cjs/main-c.js | 4 +-- .../{generated-chunk3.js => generated-bar.js} | 2 +- ...generated-chunk.js => generated-broken.js} | 0 .../{generated-chunk2.js => generated-foo.js} | 2 +- .../namespace-tracing/_expected/es/main-a.js | 4 +-- .../namespace-tracing/_expected/es/main-b.js | 6 ++--- .../namespace-tracing/_expected/es/main-c.js | 4 +-- .../{generated-chunk3.js => generated-bar.js} | 2 +- ...generated-chunk.js => generated-broken.js} | 0 .../{generated-chunk2.js => generated-foo.js} | 2 +- .../_expected/system/main-a.js | 2 +- .../_expected/system/main-b.js | 2 +- .../_expected/system/main-c.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../nested-chunks/_expected/amd/main1.js | 2 +- .../_expected/amd/nested/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../nested-chunks/_expected/cjs/main1.js | 2 +- .../_expected/cjs/nested/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../nested-chunks/_expected/es/main1.js | 2 +- .../_expected/es/nested/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../nested-chunks/_expected/system/main1.js | 2 +- .../_expected/system/nested/main2.js | 2 +- ...rated-chunk.js => generated-otherEntry.js} | 0 .../reexport-from-entry/_expected/amd/main.js | 2 +- .../_expected/amd/otherEntry.js | 2 +- ...rated-chunk.js => generated-otherEntry.js} | 0 .../reexport-from-entry/_expected/cjs/main.js | 2 +- .../_expected/cjs/otherEntry.js | 2 +- ...rated-chunk.js => generated-otherEntry.js} | 0 .../reexport-from-entry/_expected/es/main.js | 2 +- .../_expected/es/otherEntry.js | 2 +- ...rated-chunk.js => generated-otherEntry.js} | 0 .../_expected/system/main.js | 2 +- .../_expected/system/otherEntry.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../_expected/amd/main3.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../_expected/cjs/main3.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../reexport-shortpaths/_expected/es/main1.js | 2 +- .../reexport-shortpaths/_expected/es/main2.js | 2 +- .../reexport-shortpaths/_expected/es/main3.js | 2 +- .../{generated-chunk.js => generated-dep2.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- .../_expected/system/main3.js | 2 +- .../amd/{chunk-chunk.js => chunk-dep2.js} | 4 +-- .../render-chunk/_expected/amd/main1.js | 4 +-- .../render-chunk/_expected/amd/main2.js | 4 +-- .../cjs/{chunk-chunk.js => chunk-dep2.js} | 4 +-- .../render-chunk/_expected/cjs/main1.js | 4 +-- .../render-chunk/_expected/cjs/main2.js | 4 +-- .../es/{chunk-chunk.js => chunk-dep2.js} | 4 +-- .../render-chunk/_expected/es/main1.js | 4 +-- .../render-chunk/_expected/es/main2.js | 4 +-- .../system/{chunk-chunk.js => chunk-dep2.js} | 4 +-- .../render-chunk/_expected/system/main1.js | 4 +-- .../render-chunk/_expected/system/main2.js | 4 +-- ...erated-chunk.js => generated-constants.js} | 0 .../_expected/amd/generated-lazy.js | 2 +- .../_expected/amd/main.js | 2 +- ...erated-chunk.js => generated-constants.js} | 0 .../_expected/cjs/generated-lazy.js | 2 +- .../_expected/cjs/main.js | 2 +- ...erated-chunk.js => generated-constants.js} | 0 .../_expected/es/generated-lazy.js | 2 +- .../_expected/es/main.js | 2 +- ...erated-chunk.js => generated-constants.js} | 0 .../_expected/system/generated-lazy.js | 2 +- .../_expected/system/main.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/amd/main1.js | 2 +- .../_expected/amd/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/cjs/main1.js | 2 +- .../_expected/cjs/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/es/main1.js | 2 +- .../_expected/es/main2.js | 2 +- .../{generated-chunk.js => generated-dep.js} | 0 .../_expected/system/main1.js | 2 +- .../_expected/system/main2.js | 2 +- test/hooks/index.js | 6 ++--- test/misc/bundle-information.js | 18 ++++++------- test/misc/misc.js | 2 +- 725 files changed, 740 insertions(+), 743 deletions(-) rename test/chunking-form/samples/basic-chunking/_expected/amd/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/basic-chunking/_expected/cjs/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/basic-chunking/_expected/es/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/basic-chunking/_expected/system/{generated-chunk.js => generated-dep2.js} (100%) delete mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/{generated-chunk3.js => generated-dep2.js} (100%) create mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-shared2.js delete mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/{generated-chunk3.js => generated-dep2.js} (100%) create mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-shared2.js delete mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/{generated-chunk3.js => generated-dep2.js} (100%) create mode 100644 test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-shared2.js rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/{generated-chunk3.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/{generated-chunk2.js => generated-shared2.js} (73%) delete mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js create mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep11.js rename test/chunking-form/samples/chunk-execution-order/_expected/amd/{generated-chunk.js => generated-dep111.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/amd/{generated-chunk2.js => generated-dep112.js} (100%) delete mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk3.js create mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep11.js rename test/chunking-form/samples/chunk-execution-order/_expected/cjs/{generated-chunk.js => generated-dep111.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/cjs/{generated-chunk2.js => generated-dep112.js} (100%) delete mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk3.js create mode 100644 test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep11.js rename test/chunking-form/samples/chunk-execution-order/_expected/es/{generated-chunk.js => generated-dep111.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/es/{generated-chunk2.js => generated-dep112.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/system/{generated-chunk3.js => generated-dep11.js} (61%) rename test/chunking-form/samples/chunk-execution-order/_expected/system/{generated-chunk.js => generated-dep111.js} (100%) rename test/chunking-form/samples/chunk-execution-order/_expected/system/{generated-chunk2.js => generated-dep112.js} (100%) rename test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-export-deshadowing/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-export-deshadowing/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-export-renaming/_expected/amd/{generated-chunk.js => generated-one.js} (100%) rename test/chunking-form/samples/chunk-export-renaming/_expected/cjs/{generated-chunk.js => generated-one.js} (100%) rename test/chunking-form/samples/chunk-export-renaming/_expected/es/{generated-chunk.js => generated-one.js} (100%) rename test/chunking-form/samples/chunk-export-renaming/_expected/system/{generated-chunk.js => generated-one.js} (100%) rename test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/{generated-chunk.js => generated-lib.js} (100%) rename test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/{generated-chunk.js => generated-lib.js} (100%) rename test/chunking-form/samples/chunk-import-deshadowing/_expected/es/{generated-chunk.js => generated-lib.js} (100%) rename test/chunking-form/samples/chunk-import-deshadowing/_expected/system/{generated-chunk.js => generated-lib.js} (100%) rename test/chunking-form/samples/chunk-live-bindings/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-live-bindings/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-live-bindings/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-live-bindings/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/chunk-namespace-boundary/_expected/es/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/chunk-namespace-boundary/_expected/system/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/chunking-compact/_expected/amd/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-compact/_expected/cjs/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-compact/_expected/es/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-compact/_expected/system/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-externals/_expected/amd/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-externals/_expected/cjs/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-externals/_expected/es/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-externals/_expected/system/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/chunking-reexport/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-reexport/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-reexport/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-reexport/_expected/system/{generated-chunk.js => generated-dep.js} (100%) delete mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js.map rename test/chunking-form/samples/chunking-source-maps/_expected/amd/{generated-chunk.js => generated-dep2.js} (81%) create mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js.map delete mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js.map rename test/chunking-form/samples/chunking-source-maps/_expected/cjs/{generated-chunk.js => generated-dep2.js} (75%) create mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js.map delete mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js.map rename test/chunking-form/samples/chunking-source-maps/_expected/es/{generated-chunk.js => generated-dep2.js} (73%) create mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js.map delete mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js.map rename test/chunking-form/samples/chunking-source-maps/_expected/system/{generated-chunk.js => generated-dep2.js} (86%) create mode 100644 test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js.map rename test/chunking-form/samples/chunking-star-external/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-star-external/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-star-external/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/chunking-star-external/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deconflict-globals/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deconflict-globals/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deconflict-globals/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deconflict-globals/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/{generated-chunk.js => generated-proxy2.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/{generated-chunk.js => generated-proxy2.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/{generated-chunk.js => generated-proxy2.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/{generated-chunk.js => generated-proxy2.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/{generated-chunk.js => generated-proxy.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/{generated-chunk.js => generated-proxy.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/{generated-chunk.js => generated-proxy.js} (100%) rename test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/{generated-chunk.js => generated-proxy.js} (100%) rename test/chunking-form/samples/default-export-name-conflict/_expected/amd/{generated-chunk.js => generated-module3.js} (100%) rename test/chunking-form/samples/default-export-name-conflict/_expected/cjs/{generated-chunk.js => generated-module3.js} (100%) rename test/chunking-form/samples/default-export-name-conflict/_expected/es/{generated-chunk.js => generated-module3.js} (100%) rename test/chunking-form/samples/default-export-name-conflict/_expected/system/{generated-chunk.js => generated-module3.js} (100%) rename test/chunking-form/samples/default-identifier-renaming/_expected/amd/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/default-identifier-renaming/_expected/cjs/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/default-identifier-renaming/_expected/es/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/default-identifier-renaming/_expected/system/{generated-chunk.js => generated-shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/deprecated/emit-chunk/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/dynamic-import-chunking/_expected/amd/{generated-chunk.js => generated-dep4.js} (100%) rename test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/{generated-chunk.js => generated-dep4.js} (100%) rename test/chunking-form/samples/dynamic-import-chunking/_expected/es/{generated-chunk.js => generated-dep4.js} (100%) rename test/chunking-form/samples/dynamic-import-chunking/_expected/system/{generated-chunk.js => generated-dep4.js} (100%) delete mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-chunk.js create mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic2.js delete mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-chunk.js create mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic2.js delete mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js create mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic2.js delete mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js create mode 100644 test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic2.js create mode 100644 test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep12.js create mode 100644 test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep12.js create mode 100644 test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep12.js create mode 100644 test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep12.js delete mode 100644 test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-chunk.js rename test/chunking-form/samples/{dynamic-import-statically-imported-2/_expected/amd/generated-chunk.js => dynamic-import-statically-imported/_expected/amd/generated-dep1.js} (100%) delete mode 100644 test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-chunk.js rename test/chunking-form/samples/{dynamic-import-statically-imported-2/_expected/cjs/generated-chunk.js => dynamic-import-statically-imported/_expected/cjs/generated-dep1.js} (100%) delete mode 100644 test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js rename test/chunking-form/samples/{dynamic-import-statically-imported-2/_expected/es/generated-chunk.js => dynamic-import-statically-imported/_expected/es/generated-dep1.js} (100%) delete mode 100644 test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js rename test/chunking-form/samples/{dynamic-import-statically-imported-2/_expected/system/generated-chunk.js => dynamic-import-statically-imported/_expected/system/generated-dep1.js} (100%) rename test/chunking-form/samples/dynamic-import/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/dynamic-import/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/dynamic-import/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/emit-file/emit-chunk/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/entry-point-without-own-code/_expected/amd/{generated-chunk.js => generated-m1.js} (100%) rename test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/{generated-chunk.js => generated-m1.js} (100%) rename test/chunking-form/samples/entry-point-without-own-code/_expected/es/{generated-chunk.js => generated-m1.js} (100%) rename test/chunking-form/samples/entry-point-without-own-code/_expected/system/{generated-chunk.js => generated-m1.js} (100%) rename test/chunking-form/samples/entrypoint-aliasing/_expected/amd/{generated-main2alias.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/{generated-main2alias.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-aliasing/_expected/es/{generated-main2alias.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-aliasing/_expected/system/{generated-main2alias.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-facade/_expected/amd/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-facade/_expected/cjs/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-facade/_expected/es/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/entrypoint-facade/_expected/system/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/amd/{chunk-chunk-6bb39c19-amd.js => chunk-main2-6bb39c19-amd.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/cjs/{chunk-chunk-33c8b40d-cjs.js => chunk-main2-33c8b40d-cjs.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/es/{chunk-chunk-cc2b1346-esm.js => chunk-main2-cc2b1346-esm.js} (100%) rename test/chunking-form/samples/filenames-patterns/_expected/system/{chunk-chunk-63744fb4-system.js => chunk-main2-63744fb4-system.js} (100%) rename test/chunking-form/samples/grouping-multiple/_expected/amd/{generated-chunk.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-multiple/_expected/cjs/{generated-chunk.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-multiple/_expected/es/{generated-chunk.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-multiple/_expected/system/{generated-chunk.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/amd/{generated-chunk2.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/cjs/{generated-chunk2.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/es/{generated-chunk2.js => generated-dep3.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/grouping-size/_expected/system/{generated-chunk2.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/amd/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/amd/{generated-chunk2.js => generated-dep2.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/amd/{generated-chunk3.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/cjs/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/cjs/{generated-chunk2.js => generated-dep2.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/cjs/{generated-chunk3.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/es/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/es/{generated-chunk2.js => generated-dep2.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/es/{generated-chunk3.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/system/{generated-chunk.js => generated-dep1.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/system/{generated-chunk2.js => generated-dep2.js} (100%) rename test/chunking-form/samples/multi-chunking/_expected/system/{generated-chunk3.js => generated-dep3.js} (100%) rename test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/{chunk.js => shared.js} (100%) rename test/chunking-form/samples/namespace-object-import/_expected/amd/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/namespace-object-import/_expected/cjs/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/namespace-object-import/_expected/es/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/namespace-object-import/_expected/system/{generated-chunk.js => generated-main2.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/{generated-chunk2.js => generated-index.js} (57%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/{generated-chunk2.js => generated-index.js} (80%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/{generated-chunk2.js => generated-index.js} (73%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/{generated-chunk2.js => generated-index.js} (82%) rename test/chunking-form/samples/namespace-reexports/_expected/amd/{generated-chunk.js => generated-index.js} (100%) rename test/chunking-form/samples/namespace-reexports/_expected/cjs/{generated-chunk.js => generated-index.js} (100%) rename test/chunking-form/samples/namespace-reexports/_expected/es/{generated-chunk.js => generated-index.js} (100%) rename test/chunking-form/samples/namespace-reexports/_expected/system/{generated-chunk.js => generated-index.js} (100%) rename test/chunking-form/samples/namespace-retracing/_expected/amd/{generated-chunk.js => generated-other.js} (100%) rename test/chunking-form/samples/namespace-retracing/_expected/cjs/{generated-chunk.js => generated-other.js} (100%) rename test/chunking-form/samples/namespace-retracing/_expected/es/{generated-chunk.js => generated-other.js} (100%) rename test/chunking-form/samples/namespace-retracing/_expected/system/{generated-chunk.js => generated-other.js} (100%) create mode 100644 test/chunking-form/samples/namespace-tracing/_expected/amd/generated-bar.js rename test/chunking-form/samples/namespace-tracing/_expected/amd/{generated-chunk.js => generated-broken.js} (100%) delete mode 100644 test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js delete mode 100644 test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js create mode 100644 test/chunking-form/samples/namespace-tracing/_expected/amd/generated-foo.js rename test/chunking-form/samples/namespace-tracing/_expected/cjs/{generated-chunk3.js => generated-bar.js} (69%) rename test/chunking-form/samples/namespace-tracing/_expected/cjs/{generated-chunk.js => generated-broken.js} (100%) rename test/chunking-form/samples/namespace-tracing/_expected/cjs/{generated-chunk2.js => generated-foo.js} (69%) rename test/chunking-form/samples/namespace-tracing/_expected/es/{generated-chunk3.js => generated-bar.js} (66%) rename test/chunking-form/samples/namespace-tracing/_expected/es/{generated-chunk.js => generated-broken.js} (100%) rename test/chunking-form/samples/namespace-tracing/_expected/es/{generated-chunk2.js => generated-foo.js} (66%) rename test/chunking-form/samples/namespace-tracing/_expected/system/{generated-chunk3.js => generated-bar.js} (74%) rename test/chunking-form/samples/namespace-tracing/_expected/system/{generated-chunk.js => generated-broken.js} (100%) rename test/chunking-form/samples/namespace-tracing/_expected/system/{generated-chunk2.js => generated-foo.js} (74%) rename test/chunking-form/samples/nested-chunks/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/nested-chunks/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/nested-chunks/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/nested-chunks/_expected/system/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/reexport-from-entry/_expected/amd/{generated-chunk.js => generated-otherEntry.js} (100%) rename test/chunking-form/samples/reexport-from-entry/_expected/cjs/{generated-chunk.js => generated-otherEntry.js} (100%) rename test/chunking-form/samples/reexport-from-entry/_expected/es/{generated-chunk.js => generated-otherEntry.js} (100%) rename test/chunking-form/samples/reexport-from-entry/_expected/system/{generated-chunk.js => generated-otherEntry.js} (100%) rename test/chunking-form/samples/reexport-shortpaths/_expected/amd/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/reexport-shortpaths/_expected/cjs/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/reexport-shortpaths/_expected/es/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/reexport-shortpaths/_expected/system/{generated-chunk.js => generated-dep2.js} (100%) rename test/chunking-form/samples/render-chunk/_expected/amd/{chunk-chunk.js => chunk-dep2.js} (72%) rename test/chunking-form/samples/render-chunk/_expected/cjs/{chunk-chunk.js => chunk-dep2.js} (65%) rename test/chunking-form/samples/render-chunk/_expected/es/{chunk-chunk.js => chunk-dep2.js} (63%) rename test/chunking-form/samples/render-chunk/_expected/system/{chunk-chunk.js => chunk-dep2.js} (75%) rename test/chunking-form/samples/sanitize-internal-exports/_expected/amd/{generated-chunk.js => generated-constants.js} (100%) rename test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/{generated-chunk.js => generated-constants.js} (100%) rename test/chunking-form/samples/sanitize-internal-exports/_expected/es/{generated-chunk.js => generated-constants.js} (100%) rename test/chunking-form/samples/sanitize-internal-exports/_expected/system/{generated-chunk.js => generated-constants.js} (100%) rename test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/{generated-chunk.js => generated-dep.js} (100%) rename test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/{generated-chunk.js => generated-dep.js} (100%) diff --git a/src/Chunk.ts b/src/Chunk.ts index 738e6ebf45c..c751139466b 100644 --- a/src/Chunk.ts +++ b/src/Chunk.ts @@ -999,10 +999,7 @@ export default class Chunk { if (this.fileName) { return getAliasName(this.fileName); } - for (const module of this.orderedModules) { - if (module.chunkName) return module.chunkName; - } - return 'chunk'; + return getAliasName(this.orderedModules[this.orderedModules.length - 1].id); } private getRelativePath(targetPath: string): string { diff --git a/test/chunking-form/samples/basic-chunking/_expected/amd/generated-chunk.js b/test/chunking-form/samples/basic-chunking/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/basic-chunking/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/basic-chunking/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js b/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js index 108e509e2f3..ab0a692d55b 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js b/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js index 362f7851a1c..af93aebe675 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/basic-chunking/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/basic-chunking/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/basic-chunking/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js b/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js index d5090945ce7..66d8235034e 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js b/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js index 360eacc9f9b..35fc9355a24 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/generated-chunk.js b/test/chunking-form/samples/basic-chunking/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/basic-chunking/_expected/es/generated-chunk.js rename to test/chunking-form/samples/basic-chunking/_expected/es/generated-dep2.js diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/main1.js b/test/chunking-form/samples/basic-chunking/_expected/es/main1.js index ca00ac41196..f2e4ef52928 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/es/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { f as fn$1 } from './generated-chunk.js'; +import { f as fn$1 } from './generated-dep2.js'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/es/main2.js b/test/chunking-form/samples/basic-chunking/_expected/es/main2.js index 71b0c9a1bd5..ac12b7f136e 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/es/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { f as fn$2 } from './generated-chunk.js'; +import { f as fn$2 } from './generated-dep2.js'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/generated-chunk.js b/test/chunking-form/samples/basic-chunking/_expected/system/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/basic-chunking/_expected/system/generated-chunk.js rename to test/chunking-form/samples/basic-chunking/_expected/system/generated-dep2.js diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js index 6d693637dce..287fda7c0e7 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/system/main1.js +++ b/test/chunking-form/samples/basic-chunking/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$1; return { diff --git a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js index f89c1969cba..2ca1781350a 100644 --- a/test/chunking-form/samples/basic-chunking/_expected/system/main2.js +++ b/test/chunking-form/samples/basic-chunking/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$2; return { diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js deleted file mode 100644 index ee7aed4131e..00000000000 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk2.js +++ /dev/null @@ -1,10 +0,0 @@ -define(['exports', './generated-chunk', './generated-chunk3'], function (exports, dep1, dep2) { 'use strict'; - - var x = dep1.x + 1; - - var y = dep2.x + 1; - - exports.x = x; - exports.y = y; - -}); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-chunk3.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-shared2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-shared2.js new file mode 100644 index 00000000000..04c631986fa --- /dev/null +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/generated-shared2.js @@ -0,0 +1,10 @@ +define(['exports', './generated-dep1', './generated-dep2'], function (exports, dep1, dep2) { 'use strict'; + + var x = dep1.x + 1; + + var y = dep2.x + 1; + + exports.x = x; + exports.y = y; + +}); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js index 0e65131f4fd..6db24f20d99 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep1, shared2, dep2) { 'use strict'; +define(['./generated-dep1', './generated-shared2', './generated-dep2'], function (dep1, shared2, dep2) { 'use strict'; console.log(shared2.x + shared2.y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js index 4a881f3542f..2d15ef40f6e 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep1, shared2, dep2) { 'use strict'; +define(['./generated-dep1', './generated-shared2', './generated-dep2'], function (dep1, shared2, dep2) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js index bd74061e2d8..02a46daf2cd 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js index 1fc33edde0c..8806f30b198 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/amd/main4.js @@ -1,4 +1,4 @@ -define(['./generated-chunk3'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js deleted file mode 100644 index 1869f3a0186..00000000000 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk2.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -var dep1 = require('./generated-chunk.js'); -var dep2 = require('./generated-chunk3.js'); - -var x = dep1.x + 1; - -var y = dep2.x + 1; - -exports.x = x; -exports.y = y; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-chunk3.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-shared2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-shared2.js new file mode 100644 index 00000000000..5482042bab1 --- /dev/null +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/generated-shared2.js @@ -0,0 +1,11 @@ +'use strict'; + +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep2.js'); + +var x = dep1.x + 1; + +var y = dep2.x + 1; + +exports.x = x; +exports.y = y; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js index 395b4cbab96..e1b073c3c46 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -require('./generated-chunk.js'); -var shared2 = require('./generated-chunk2.js'); -require('./generated-chunk3.js'); +require('./generated-dep1.js'); +var shared2 = require('./generated-shared2.js'); +require('./generated-dep2.js'); console.log(shared2.x + shared2.y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js index 486e3d559d5..291f1954f45 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-chunk.js'); -require('./generated-chunk2.js'); -require('./generated-chunk3.js'); +require('./generated-dep1.js'); +require('./generated-shared2.js'); +require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main3.js index cd3e1d69188..ccb8d98ce68 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main3.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep1.js'); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main4.js index afdcfc1fbb8..8bcaed1c530 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/cjs/main4.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk3.js'); +require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js deleted file mode 100644 index ae1f188f66e..00000000000 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk2.js +++ /dev/null @@ -1,8 +0,0 @@ -import { x as x$1 } from './generated-chunk.js'; -import { x as x$2 } from './generated-chunk3.js'; - -var x = x$1 + 1; - -var y = x$2 + 1; - -export { x, y }; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-chunk3.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-dep2.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-shared2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-shared2.js new file mode 100644 index 00000000000..15af511db49 --- /dev/null +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/generated-shared2.js @@ -0,0 +1,8 @@ +import { x as x$1 } from './generated-dep1.js'; +import { x as x$2 } from './generated-dep2.js'; + +var x = x$1 + 1; + +var y = x$2 + 1; + +export { x, y }; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main1.js index dedab6da860..df90cab25c7 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main1.js @@ -1,5 +1,5 @@ -import './generated-chunk.js'; -import { x, y } from './generated-chunk2.js'; -import './generated-chunk3.js'; +import './generated-dep1.js'; +import { x, y } from './generated-shared2.js'; +import './generated-dep2.js'; console.log(x + y); diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js index 4a3b3c2f889..09d60765311 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main2.js @@ -1,3 +1,3 @@ -import './generated-chunk.js'; -import './generated-chunk2.js'; -import './generated-chunk3.js'; +import './generated-dep1.js'; +import './generated-shared2.js'; +import './generated-dep2.js'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main3.js index 5d03e846db5..934a68ee7f1 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main3.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep1.js'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main4.js index f3cda5f3b3f..e38989d38f2 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/es/main4.js @@ -1 +1 @@ -import './generated-chunk3.js'; +import './generated-dep2.js'; diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk3.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-dep2.js diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-shared2.js similarity index 73% rename from test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-shared2.js index 51118121202..a72e59cac53 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/generated-shared2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk3.js'], function (exports) { +System.register(['./generated-dep1.js', './generated-dep2.js'], function (exports) { 'use strict'; var x$1, x$2; return { diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js index 32946cf076f..e1227b6045a 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep1.js', './generated-shared2.js', './generated-dep2.js'], function () { 'use strict'; var x, y; return { diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js index b03ec442333..4b34c33770f 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep1.js', './generated-shared2.js', './generated-dep2.js'], function () { 'use strict'; return { setters: [function () {}, function () {}, function () {}], diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js index 0546a48da7c..5668bec5d4f 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep1.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js index 1445de70bec..73473efce7c 100644 --- a/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js +++ b/test/chunking-form/samples/chunk-deshadowing-reassignment/_expected/system/main4.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk3.js'], function () { +System.register(['./generated-dep2.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js deleted file mode 100644 index 872a82acb49..00000000000 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk3.js +++ /dev/null @@ -1,5 +0,0 @@ -define(['./generated-chunk', './generated-chunk2'], function (dep111, dep112) { 'use strict'; - - console.log('11'); - -}); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep11.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep11.js new file mode 100644 index 00000000000..8a7b5d70482 --- /dev/null +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep11.js @@ -0,0 +1,5 @@ +define(['./generated-dep111', './generated-dep112'], function (dep111, dep112) { 'use strict'; + + console.log('11'); + +}); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep111.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep111.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep112.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-chunk2.js rename to test/chunking-form/samples/chunk-execution-order/_expected/amd/generated-dep112.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js index 6748631337f..111e385a36a 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep111, dep112, dep11) { 'use strict'; +define(['./generated-dep111', './generated-dep112', './generated-dep11'], function (dep111, dep112, dep11) { 'use strict'; console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js index b8d58e21dee..b4448a037ae 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (dep111, dep112, dep11) { 'use strict'; +define(['./generated-dep111', './generated-dep112', './generated-dep11'], function (dep111, dep112, dep11) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js index f4841ed82fe..6b57c04c178 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep111) { 'use strict'; +define(['./generated-dep111'], function (dep111) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js index bc6715800f4..bcc4d6bb6d1 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/amd/main4.js @@ -1,4 +1,4 @@ -define(['./generated-chunk2'], function (dep112) { 'use strict'; +define(['./generated-dep112'], function (dep112) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk3.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk3.js deleted file mode 100644 index e0237f0a354..00000000000 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk3.js +++ /dev/null @@ -1,6 +0,0 @@ -'use strict'; - -require('./generated-chunk.js'); -require('./generated-chunk2.js'); - -console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep11.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep11.js new file mode 100644 index 00000000000..d53656de00a --- /dev/null +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep11.js @@ -0,0 +1,6 @@ +'use strict'; + +require('./generated-dep111.js'); +require('./generated-dep112.js'); + +console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep111.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep111.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep112.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/chunk-execution-order/_expected/cjs/generated-dep112.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js index b2a67e5bc37..5cb69cbe4bf 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main1.js @@ -1,8 +1,8 @@ 'use strict'; -require('./generated-chunk.js'); -var dep112 = require('./generated-chunk2.js'); -require('./generated-chunk3.js'); +require('./generated-dep111.js'); +var dep112 = require('./generated-dep112.js'); +require('./generated-dep11.js'); console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js index 486e3d559d5..d68bb5324b6 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-chunk.js'); -require('./generated-chunk2.js'); -require('./generated-chunk3.js'); +require('./generated-dep111.js'); +require('./generated-dep112.js'); +require('./generated-dep11.js'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main3.js index cd3e1d69188..03f5bcb4802 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main3.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep111.js'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main4.js index 6830e0e1cfa..9efc879ddeb 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/cjs/main4.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk2.js'); +require('./generated-dep112.js'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk3.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk3.js deleted file mode 100644 index e837e788147..00000000000 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk3.js +++ /dev/null @@ -1,4 +0,0 @@ -import './generated-chunk.js'; -import './generated-chunk2.js'; - -console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep11.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep11.js new file mode 100644 index 00000000000..113045c45f4 --- /dev/null +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep11.js @@ -0,0 +1,4 @@ +import './generated-dep111.js'; +import './generated-dep112.js'; + +console.log('11'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep111.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep111.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk2.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep112.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/chunk-execution-order/_expected/es/generated-dep112.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js index 251b780143e..fec6c00831b 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main1.js @@ -1,6 +1,6 @@ -import './generated-chunk.js'; -import { x } from './generated-chunk2.js'; -import './generated-chunk3.js'; +import './generated-dep111.js'; +import { x } from './generated-dep112.js'; +import './generated-dep11.js'; console.log('1'); diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js index 4a3b3c2f889..f7b18be422f 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main2.js @@ -1,3 +1,3 @@ -import './generated-chunk.js'; -import './generated-chunk2.js'; -import './generated-chunk3.js'; +import './generated-dep111.js'; +import './generated-dep112.js'; +import './generated-dep11.js'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main3.js index 5d03e846db5..7fab442816a 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main3.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep111.js'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/es/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/es/main4.js index da772d22419..7d06babc396 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/es/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/es/main4.js @@ -1 +1 @@ -import './generated-chunk2.js'; +import './generated-dep112.js'; diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk3.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js similarity index 61% rename from test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk3.js rename to test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js index 2325334df60..639ef3bdbab 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep11.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function () { +System.register(['./generated-dep111.js', './generated-dep112.js'], function () { 'use strict'; return { setters: [function () {}, function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep111.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep111.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk2.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep112.js similarity index 100% rename from test/chunking-form/samples/chunk-execution-order/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/chunk-execution-order/_expected/system/generated-dep112.js diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js index d3eed3ab319..8987e5bcdb7 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep111.js', './generated-dep112.js', './generated-dep11.js'], function () { 'use strict'; var x; return { diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js index b03ec442333..58cd5cb31fd 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep111.js', './generated-dep112.js', './generated-dep11.js'], function () { 'use strict'; return { setters: [function () {}, function () {}, function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js index 0546a48da7c..84a63039a8d 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep111.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js b/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js index 32b933bbc4f..2ce7e7a8ab3 100644 --- a/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js +++ b/test/chunking-form/samples/chunk-execution-order/_expected/system/main4.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk2.js'], function () { +System.register(['./generated-dep112.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js index fff81b46661..76c150bb232 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js index 7665de6f99c..483ff435cb6 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js index 57540c44ee0..835f075e3b6 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js index f03cd93dc87..71e1239cab9 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-export-deshadowing/_expected/es/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js index b945e58a593..d08c5b42593 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { f as fn } from './generated-chunk.js'; +import { f as fn } from './generated-dep1.js'; class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js index 49d0df6cb5a..dc15f820234 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as fn } from './generated-chunk.js'; +import { a as fn } from './generated-dep1.js'; class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-export-deshadowing/_expected/system/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js index 0c039cedaa5..21a22fa46ea 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep1.js'], function (exports) { 'use strict'; var fn; return { diff --git a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js index feb990ed1a8..a105cc04181 100644 --- a/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-export-deshadowing/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep1.js'], function (exports) { 'use strict'; var fn; return { diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/generated-one.js similarity index 100% rename from test/chunking-form/samples/chunk-export-renaming/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-export-renaming/_expected/amd/generated-one.js diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js index 4bc5739ac53..18a0182c07a 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, one) { 'use strict'; +define(['exports', './generated-one'], function (exports, one) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js index 28aa6948e70..781a4cbc0bb 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, one) { 'use strict'; +define(['exports', './generated-one'], function (exports, one) { 'use strict'; class Two { test() { diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/generated-one.js similarity index 100% rename from test/chunking-form/samples/chunk-export-renaming/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-export-renaming/_expected/cjs/generated-one.js diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js index 6a6c1b487cc..357f059b4fd 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main1.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var one = require('./generated-chunk.js'); +var one = require('./generated-one.js'); diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js index e0adf1b39da..d990bcc5d17 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/cjs/main2.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var one = require('./generated-chunk.js'); +var one = require('./generated-one.js'); class Two { test() { diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-one.js similarity index 100% rename from test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-export-renaming/_expected/es/generated-one.js diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/es/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/es/main1.js index f2c11dd4a4b..fe75206da7e 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/es/main1.js @@ -1 +1 @@ -export { O as ItemOne } from './generated-chunk.js'; +export { O as ItemOne } from './generated-one.js'; diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/es/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/es/main2.js index 9e807f7f881..fccdd26cf28 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as ONE_CONSTANT } from './generated-chunk.js'; +import { a as ONE_CONSTANT } from './generated-one.js'; class Two { test() { diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-one.js similarity index 100% rename from test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-export-renaming/_expected/system/generated-one.js diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js index d76ff21e960..4ef53c4cb8c 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-one.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js index 26ccfa8c843..98c75710b26 100644 --- a/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-export-renaming/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-one.js'], function (exports) { 'use strict'; var ONE_CONSTANT; return { diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/generated-lib.js similarity index 100% rename from test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/generated-lib.js diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js index fcc3e22f67b..b0baf5a2dbf 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (lib) { 'use strict'; +define(['./generated-lib'], function (lib) { 'use strict'; function fn () { var emptyFunction = lib.emptyFunction; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js index 09d13545f2a..8eaddd1b192 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (lib) { 'use strict'; +define(['./generated-lib'], function (lib) { 'use strict'; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/generated-lib.js similarity index 100% rename from test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/generated-lib.js diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js index 245b14fc81c..7018f1f5678 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var lib = require('./generated-chunk.js'); +var lib = require('./generated-lib.js'); function fn () { var emptyFunction = lib.emptyFunction; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main2.js index cd3e1d69188..a4c4529c43f 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/cjs/main2.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-lib.js'); diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-lib.js similarity index 100% rename from test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-import-deshadowing/_expected/es/generated-lib.js diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main1.js index 7ae1592867a..8d4d0f8f6d5 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { e as emptyFunction } from './generated-chunk.js'; +import { e as emptyFunction } from './generated-lib.js'; function fn () { var emptyFunction$1 = emptyFunction; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main2.js index 5d03e846db5..1de20fb6656 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/es/main2.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-lib.js'; diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-lib.js similarity index 100% rename from test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-import-deshadowing/_expected/system/generated-lib.js diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js index 4b216f95f3c..8029d14b1ee 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-lib.js'], function () { 'use strict'; var emptyFunction; return { diff --git a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js index f26bc7ab25f..eb8c6d4539e 100644 --- a/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-import-deshadowing/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-lib.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-live-bindings/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-live-bindings/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js index 9de2c058385..7f1158b9f9b 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js index cd376312505..82f94dbe2f0 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-live-bindings/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-live-bindings/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js index 60027ffe8ee..27d86d3824c 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js index d3a7b6358b0..e0cfed4d826 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-live-bindings/_expected/es/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js index d347e5e679b..4ab6a281f36 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { f as fn, t as text } from './generated-chunk.js'; +import { f as fn, t as text } from './generated-dep1.js'; class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js index 015cf2d2589..07b5d8e9ba6 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { a as fn, b as text } from './generated-chunk.js'; +import { a as fn, b as text } from './generated-dep1.js'; class Main2 { constructor () { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-live-bindings/_expected/system/generated-dep1.js diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js index abfa0773b80..4082f2bc13a 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep1.js'], function (exports) { 'use strict'; var fn, text; return { diff --git a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js index fad90019042..d7c6ceee584 100644 --- a/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-live-bindings/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep1.js'], function (exports) { 'use strict'; var fn, text; return { diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/generated-shared.js similarity index 100% rename from test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/generated-shared.js diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js index 91c28dd2e42..edf92beb77d 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (shared) { 'use strict'; +define(['./generated-shared'], function (shared) { 'use strict'; shared.commonjsGlobal.fn = d => d + 1; var cjs = shared.commonjsGlobal.fn; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js index b80ae0d3892..9f1de21690f 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (shared) { 'use strict'; +define(['./generated-shared'], function (shared) { 'use strict'; var main2 = shared.d.map(d => d + 2); diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/generated-shared.js similarity index 100% rename from test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/generated-shared.js diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js index b75d97e0ced..3fff58119e2 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./generated-chunk.js'); +var shared = require('./generated-shared.js'); shared.commonjsGlobal.fn = d => d + 1; var cjs = shared.commonjsGlobal.fn; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js index ce051f9dca8..d4cd65916b3 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./generated-chunk.js'); +var shared = require('./generated-shared.js'); var main2 = shared.d.map(d => d + 2); diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-shared.js similarity index 100% rename from test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunk-namespace-boundary/_expected/es/generated-shared.js diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js index f2f0d4cd0ea..2aefb855ca2 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { c as commonjsGlobal, d } from './generated-chunk.js'; +import { c as commonjsGlobal, d } from './generated-shared.js'; commonjsGlobal.fn = d => d + 1; var cjs = commonjsGlobal.fn; diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js index 1029203efe8..45d7c4f0e3f 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { d } from './generated-chunk.js'; +import { d } from './generated-shared.js'; var main2 = d.map(d => d + 2); diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-shared.js similarity index 100% rename from test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunk-namespace-boundary/_expected/system/generated-shared.js diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js index f3b25331f17..36acb82d941 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-shared.js'], function (exports) { 'use strict'; var commonjsGlobal, d; return { diff --git a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js index 15f9ff21e60..b872e5d5df4 100644 --- a/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js +++ b/test/chunking-form/samples/chunk-namespace-boundary/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-shared.js'], function (exports) { 'use strict'; var d; return { diff --git a/test/chunking-form/samples/chunking-compact/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-compact/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-compact/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js b/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js index 1d2a2737c70..56ee749a02b 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'],function(dep2){'use strict';function fn () { +define(['./generated-dep2'],function(dep2){'use strict';function fn () { console.log('dep1 fn'); }class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js b/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js index 85ff93f21c8..309081d4e2e 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk','external'],function(dep2,external){'use strict';function fn () { +define(['./generated-dep2','external'],function(dep2,external){'use strict';function fn () { console.log('lib1 fn'); external.fn(); }function fn$1 () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-compact/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-compact/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js index 6dc9d76ea1f..e5002543a29 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/cjs/main1.js @@ -1,4 +1,4 @@ -'use strict';var dep2=require('./generated-chunk.js');function fn () { +'use strict';var dep2=require('./generated-dep2.js');function fn () { console.log('dep1 fn'); }class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js index 854dd48c92e..bc53429ccde 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/cjs/main2.js @@ -1,4 +1,4 @@ -'use strict';var dep2=require('./generated-chunk.js'),external=require('external');function fn () { +'use strict';var dep2=require('./generated-dep2.js'),external=require('external');function fn () { console.log('lib1 fn'); external.fn(); }function fn$1 () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-compact/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-compact/_expected/es/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/main1.js b/test/chunking-form/samples/chunking-compact/_expected/es/main1.js index 3f3bf5f95c7..b761b539ad2 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/es/main1.js @@ -1,4 +1,4 @@ -import {f as fn$1}from'./generated-chunk.js';function fn () { +import {f as fn$1}from'./generated-dep2.js';function fn () { console.log('dep1 fn'); }class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/es/main2.js b/test/chunking-form/samples/chunking-compact/_expected/es/main2.js index d211a97fe64..05a22e7cfa8 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/es/main2.js @@ -1,4 +1,4 @@ -import {f as fn$3}from'./generated-chunk.js';import {fn as fn$2}from'external';function fn () { +import {f as fn$3}from'./generated-dep2.js';import {fn as fn$2}from'external';function fn () { console.log('lib1 fn'); fn$2(); }function fn$1 () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-compact/_expected/system/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-compact/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-compact/_expected/system/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/main1.js b/test/chunking-form/samples/chunking-compact/_expected/system/main1.js index f8b5e0df27e..cc51b4e2739 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-compact/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'],function(exports){'use strict';var fn$1;return{setters:[function(module){fn$1=module.f;}],execute:function(){function fn () { +System.register(['./generated-dep2.js'],function(exports){'use strict';var fn$1;return{setters:[function(module){fn$1=module.f;}],execute:function(){function fn () { console.log('dep1 fn'); }class Main1 { constructor () { diff --git a/test/chunking-form/samples/chunking-compact/_expected/system/main2.js b/test/chunking-form/samples/chunking-compact/_expected/system/main2.js index 17ddf05a6a4..7e360eb7cd5 100644 --- a/test/chunking-form/samples/chunking-compact/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-compact/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js','external'],function(exports){'use strict';var fn$3,fn$2;return{setters:[function(module){fn$3=module.f;},function(module){fn$2=module.fn;}],execute:function(){function fn () { +System.register(['./generated-dep2.js','external'],function(exports){'use strict';var fn$3,fn$2;return{setters:[function(module){fn$3=module.f;},function(module){fn$2=module.fn;}],execute:function(){function fn () { console.log('lib1 fn'); fn$2(); }function fn$1 () { diff --git a/test/chunking-form/samples/chunking-externals/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-externals/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-externals/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-externals/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js b/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js index 108e509e2f3..ab0a692d55b 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js b/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js index 7cfbb3515ea..355062b5084 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', 'external'], function (dep2, external) { 'use strict'; +define(['./generated-dep2', 'external'], function (dep2, external) { 'use strict'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/chunking-externals/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-externals/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-externals/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-externals/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js index d5090945ce7..66d8235034e 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js index 357ed56270f..c34f2f4cd35 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); var external = require('external'); function fn () { diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-externals/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-externals/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-externals/_expected/es/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/main1.js b/test/chunking-form/samples/chunking-externals/_expected/es/main1.js index ca00ac41196..f2e4ef52928 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { f as fn$1 } from './generated-chunk.js'; +import { f as fn$1 } from './generated-dep2.js'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-externals/_expected/es/main2.js b/test/chunking-form/samples/chunking-externals/_expected/es/main2.js index f742263cbbe..abd4c70ed24 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { f as fn$3 } from './generated-chunk.js'; +import { f as fn$3 } from './generated-dep2.js'; import { fn as fn$2 } from 'external'; function fn () { diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-externals/_expected/system/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/chunking-externals/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-externals/_expected/system/generated-dep2.js diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/main1.js b/test/chunking-form/samples/chunking-externals/_expected/system/main1.js index 6d693637dce..287fda7c0e7 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-externals/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$1; return { diff --git a/test/chunking-form/samples/chunking-externals/_expected/system/main2.js b/test/chunking-form/samples/chunking-externals/_expected/system/main2.js index c29d8e1b2ca..dc5df3486a5 100644 --- a/test/chunking-form/samples/chunking-externals/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-externals/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', 'external'], function (exports) { +System.register(['./generated-dep2.js', 'external'], function (exports) { 'use strict'; var fn$3, fn$2; return { diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-reexport/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-reexport/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js index 08b071d4e0a..b6fd812827f 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', 'external', './generated-chunk'], function (exports, external, dep) { 'use strict'; +define(['exports', 'external', './generated-dep'], function (exports, external, dep) { 'use strict'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js index 08b071d4e0a..b6fd812827f 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', 'external', './generated-chunk'], function (exports, external, dep) { 'use strict'; +define(['exports', 'external', './generated-dep'], function (exports, external, dep) { 'use strict'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-reexport/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-reexport/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js index 870bcdb1f33..62208a32170 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main1.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -require('./generated-chunk.js'); +require('./generated-dep.js'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js index 870bcdb1f33..62208a32170 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/cjs/main2.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var external = require('external'); -require('./generated-chunk.js'); +require('./generated-dep.js'); diff --git a/test/chunking-form/samples/chunking-reexport/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-reexport/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-reexport/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-reexport/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js index 0cbd4e3b197..1fed25e3162 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/es/main1.js @@ -1,2 +1,2 @@ export { asdf as dep } from 'external'; -import './generated-chunk.js'; +import './generated-dep.js'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js index 0cbd4e3b197..1fed25e3162 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/es/main2.js @@ -1,2 +1,2 @@ export { asdf as dep } from 'external'; -import './generated-chunk.js'; +import './generated-dep.js'; diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-reexport/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-reexport/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js index faadde80394..06b06689d51 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['external', './generated-chunk.js'], function (exports) { +System.register(['external', './generated-dep.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js index faadde80394..06b06689d51 100644 --- a/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-reexport/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['external', './generated-chunk.js'], function (exports) { +System.register(['external', './generated-dep.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js.map deleted file mode 100644 index 889b063cea7..00000000000 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"generated-chunk.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;EAAO,SAAS,EAAE,IAAI;EACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;GAAC,DCAM,SAASA,IAAE,IAAI;EACtB,EAAEC,EAAK,EAAE,CAAC;EACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js similarity index 81% rename from test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js index e40b3592122..a425552f5bd 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-chunk.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js @@ -12,4 +12,4 @@ define(['exports'], function (exports) { 'use strict'; exports.fn = fn$1; }); -//# sourceMappingURL=generated-chunk.js.map +//# sourceMappingURL=generated-dep2.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js.map new file mode 100644 index 00000000000..59ecdb33e93 --- /dev/null +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/generated-dep2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"generated-dep2.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;EAAO,SAAS,EAAE,IAAI;EACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;GAAC,DCAM,SAASA,IAAE,IAAI;EACtB,EAAEC,EAAK,EAAE,CAAC;EACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;EACzB;;;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js index 0afd0b1be07..81c55bbb6dd 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js index ede2faa9fa4..15ec43aa23f 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js.map deleted file mode 100644 index d3b0b7b652f..00000000000 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"generated-chunk.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js similarity index 75% rename from test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js index 7f8cbaf709e..92b096d5d75 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-chunk.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js @@ -10,4 +10,4 @@ function fn$1 () { } exports.fn = fn$1; -//# sourceMappingURL=generated-chunk.js.map +//# sourceMappingURL=generated-dep2.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js.map new file mode 100644 index 00000000000..2c922a47bea --- /dev/null +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/generated-dep2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"generated-dep2.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js index 4f1ae2dd061..ddd5bdb5938 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js index 575b4056b99..c0adb3595f3 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js.map deleted file mode 100644 index 774134b72a1..00000000000 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"generated-chunk.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":"AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js similarity index 73% rename from test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js index c25a283ed38..4eb77fee44a 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-chunk.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js @@ -8,4 +8,4 @@ function fn$1 () { } export { fn$1 as f }; -//# sourceMappingURL=generated-chunk.js.map +//# sourceMappingURL=generated-dep2.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js.map new file mode 100644 index 00000000000..11f05890cad --- /dev/null +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/generated-dep2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"generated-dep2.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":"AAAO,SAAS,EAAE,IAAI;EACpB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;CACxB,DCAM,SAASA,IAAE,IAAI;EACpBC,EAAK,EAAE,CAAC;EACR,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js index 8a8989c6776..4075e0cecd4 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { f as fn$1 } from './generated-chunk.js'; +import { f as fn$1 } from './generated-dep2.js'; function fn () { console.log('dep1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js index cc4066eb98f..6f468343738 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { f as fn$2 } from './generated-chunk.js'; +import { f as fn$2 } from './generated-dep2.js'; function fn () { console.log('lib1 fn'); diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js.map deleted file mode 100644 index c111870654d..00000000000 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"generated-chunk.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;;;;;;MAAO,SAAS,EAAE,IAAI;MACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;OAAC,DCAM,SAASA,IAAE,IAAI;MACtB,EAAEC,EAAK,EAAE,CAAC;MACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js similarity index 86% rename from test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js index e9142c04be5..a0e17d1c7b9 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-chunk.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js @@ -17,4 +17,4 @@ System.register([], function (exports) { } }; }); -//# sourceMappingURL=generated-chunk.js.map +//# sourceMappingURL=generated-dep2.js.map diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js.map b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js.map new file mode 100644 index 00000000000..272d56b572b --- /dev/null +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/generated-dep2.js.map @@ -0,0 +1 @@ +{"version":3,"file":"generated-dep2.js","sources":["../../lib2.js","../../dep2.js"],"sourcesContent":["export function fn () {\n console.log('lib2 fn');\n}","import { fn as libfn } from './lib2.js';\n\nexport function fn () {\n libfn();\n console.log('dep2 fn');\n}"],"names":["fn","libfn"],"mappings":";;;;;;;MAAO,SAAS,EAAE,IAAI;MACtB,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;OAAC,DCAM,SAASA,IAAE,IAAI;MACtB,EAAEC,EAAK,EAAE,CAAC;MACV,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;MACzB;;;;;;"} \ No newline at end of file diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js index 93359f8e776..2ac9cf86864 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$1; return { diff --git a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js index 841980499c9..3ebabf501c0 100644 --- a/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-source-maps/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var fn$2; return { diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/generated-chunk.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-star-external/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/chunking-star-external/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js index 18a8affa0de..1422f08ba64 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['exports', 'starexternal1', 'external1', 'starexternal2', 'external2', './generated-chunk'], function (exports, starexternal1, external1, starexternal2, external2, dep) { 'use strict'; +define(['exports', 'starexternal1', 'external1', 'starexternal2', 'external2', './generated-dep'], function (exports, starexternal1, external1, starexternal2, external2, dep) { 'use strict'; var main = '1'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js index 3f3fc18f276..acee5c2945f 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', 'starexternal2', 'external2', './generated-chunk'], function (exports, starexternal2, external2, dep) { 'use strict'; +define(['exports', 'starexternal2', 'external2', './generated-dep'], function (exports, starexternal2, external2, dep) { 'use strict'; var main = '2'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-star-external/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/chunking-star-external/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js index c4e5c7b17c1..762a44d3e1b 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main1.js @@ -6,7 +6,7 @@ var starexternal1 = require('starexternal1'); var external1 = require('external1'); require('starexternal2'); require('external2'); -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); var main = '1'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js index 4f085285c75..d3309a99969 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/cjs/main2.js @@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var starexternal2 = require('starexternal2'); var external2 = require('external2'); -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); var main = '2'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/es/generated-chunk.js b/test/chunking-form/samples/chunking-star-external/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-star-external/_expected/es/generated-chunk.js rename to test/chunking-form/samples/chunking-star-external/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/chunking-star-external/_expected/es/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/es/main1.js index 711370b13d9..9f996c19901 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/es/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/es/main1.js @@ -2,7 +2,7 @@ export * from 'starexternal1'; export { e } from 'external1'; import 'starexternal2'; import 'external2'; -export { d as dep } from './generated-chunk.js'; +export { d as dep } from './generated-dep.js'; var main = '1'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js index 4abdf641215..20781a113c7 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/es/main2.js @@ -1,6 +1,6 @@ export * from 'starexternal2'; export { e } from 'external2'; -export { d as dep } from './generated-chunk.js'; +export { d as dep } from './generated-dep.js'; var main = '2'; diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/generated-chunk.js b/test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/chunking-star-external/_expected/system/generated-chunk.js rename to test/chunking-form/samples/chunking-star-external/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js index db0f67ab147..ae0521bfa48 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['starexternal1', 'external1', 'starexternal2', 'external2', './generated-chunk.js'], function (exports) { +System.register(['starexternal1', 'external1', 'starexternal2', 'external2', './generated-dep.js'], function (exports) { 'use strict'; var _starExcludes = { main: 1, default: 1, e: 1, dep: 1 }; return { diff --git a/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js b/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js index 6e8f2c8a535..b98ca0ce76e 100644 --- a/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js +++ b/test/chunking-form/samples/chunking-star-external/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['starexternal2', 'external2', './generated-chunk.js'], function (exports) { +System.register(['starexternal2', 'external2', './generated-dep.js'], function (exports) { 'use strict'; var _starExcludes = { main: 1, default: 1, e: 1, dep: 1 }; return { diff --git a/test/chunking-form/samples/deconflict-globals/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deconflict-globals/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deconflict-globals/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deconflict-globals/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js index edaa6114189..ac552c3f721 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log(dep.x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js index 37f699e7206..d7edef3bc09 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log(x, dep.x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deconflict-globals/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deconflict-globals/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deconflict-globals/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js index 537c99d18e8..0c77a6eb075 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log(dep.x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js index 5da40c6f426..5e3d1c896ad 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log(x, dep.x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/es/generated-chunk.js b/test/chunking-form/samples/deconflict-globals/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deconflict-globals/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deconflict-globals/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/deconflict-globals/_expected/es/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/es/main1.js index 4436c56e0e7..720f2805c01 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/es/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { x } from './generated-chunk.js'; +import { x } from './generated-dep.js'; console.log(x); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/es/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/es/main2.js index fb76b1827a3..a6a74bf24d0 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/es/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { x as x$1 } from './generated-chunk.js'; +import { x as x$1 } from './generated-dep.js'; console.log(x, x$1); diff --git a/test/chunking-form/samples/deconflict-globals/_expected/system/generated-chunk.js b/test/chunking-form/samples/deconflict-globals/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deconflict-globals/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deconflict-globals/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js b/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js index 15286672325..d1b8162d68e 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var x; return { diff --git a/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js b/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js index 1c6ae62b1de..66912a652cf 100644 --- a/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js +++ b/test/chunking-form/samples/deconflict-globals/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var x$1; return { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/generated-proxy2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/generated-proxy2.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js index feee89f7078..852bac0cf6c 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (proxy2) { 'use strict'; +define(['./generated-proxy2'], function (proxy2) { 'use strict'; console.log(proxy2.bar, proxy2.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js index feee89f7078..852bac0cf6c 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (proxy2) { 'use strict'; +define(['./generated-proxy2'], function (proxy2) { 'use strict'; console.log(proxy2.bar, proxy2.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/generated-proxy2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/generated-proxy2.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js index 7b26323fcee..6383790cc0b 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var proxy2 = require('./generated-chunk.js'); +var proxy2 = require('./generated-proxy2.js'); console.log(proxy2.bar, proxy2.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js index 7b26323fcee..6383790cc0b 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var proxy2 = require('./generated-chunk.js'); +var proxy2 = require('./generated-proxy2.js'); console.log(proxy2.bar, proxy2.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-proxy2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/generated-proxy2.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main1.js index ae77e303194..b71bc0a690d 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { f as bar } from './generated-chunk.js'; +import { f as bar } from './generated-proxy2.js'; console.log(bar, bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main2.js index ae77e303194..b71bc0a690d 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { f as bar } from './generated-chunk.js'; +import { f as bar } from './generated-proxy2.js'; console.log(bar, bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-proxy2.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/generated-proxy2.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js index 95ef8b50f7f..b3f6f3d4d4c 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-proxy2.js'], function () { 'use strict'; var bar; return { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js index 95ef8b50f7f..b3f6f3d4d4c 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals-2/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-proxy2.js'], function () { 'use strict'; var bar; return { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/generated-proxy.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/generated-proxy.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js index 2d85f4f5f0d..1980708e4d1 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (proxy) { 'use strict'; +define(['./generated-proxy'], function (proxy) { 'use strict'; console.log(proxy.bar, proxy.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js index 2d85f4f5f0d..1980708e4d1 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (proxy) { 'use strict'; +define(['./generated-proxy'], function (proxy) { 'use strict'; console.log(proxy.bar, proxy.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/generated-proxy.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/generated-proxy.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js index 55c9b13cb7e..9c53aa9f1d2 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var proxy = require('./generated-chunk.js'); +var proxy = require('./generated-proxy.js'); console.log(proxy.bar, proxy.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js index 55c9b13cb7e..9c53aa9f1d2 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var proxy = require('./generated-chunk.js'); +var proxy = require('./generated-proxy.js'); console.log(proxy.bar, proxy.bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-proxy.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/generated-proxy.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main1.js index ae77e303194..c3422bfdcdf 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { f as bar } from './generated-chunk.js'; +import { f as bar } from './generated-proxy.js'; console.log(bar, bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main2.js index ae77e303194..c3422bfdcdf 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { f as bar } from './generated-chunk.js'; +import { f as bar } from './generated-proxy.js'; console.log(bar, bar); diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-chunk.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-proxy.js similarity index 100% rename from test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/generated-proxy.js diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js index 95ef8b50f7f..ce5d2ec5a67 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-proxy.js'], function () { 'use strict'; var bar; return { diff --git a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js index 95ef8b50f7f..ce5d2ec5a67 100644 --- a/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js +++ b/test/chunking-form/samples/deduplicate-imports-referencing-originals/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-proxy.js'], function () { 'use strict'; var bar; return { diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/generated-chunk.js b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/generated-module3.js similarity index 100% rename from test/chunking-form/samples/default-export-name-conflict/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/default-export-name-conflict/_expected/amd/generated-module3.js diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js index be83c4e0d05..ebd2ea34dc8 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (module3) { 'use strict'; +define(['./generated-module3'], function (module3) { 'use strict'; console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js index be83c4e0d05..ebd2ea34dc8 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (module3) { 'use strict'; +define(['./generated-module3'], function (module3) { 'use strict'; console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/generated-module3.js similarity index 100% rename from test/chunking-form/samples/default-export-name-conflict/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/default-export-name-conflict/_expected/cjs/generated-module3.js diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js index 4bead314162..d6c9a2821fe 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var module3 = require('./generated-chunk.js'); +var module3 = require('./generated-module3.js'); console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js index 4bead314162..d6c9a2821fe 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var module3 = require('./generated-chunk.js'); +var module3 = require('./generated-module3.js'); console.log(module3.b, module3.b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/es/generated-chunk.js b/test/chunking-form/samples/default-export-name-conflict/_expected/es/generated-module3.js similarity index 100% rename from test/chunking-form/samples/default-export-name-conflict/_expected/es/generated-chunk.js rename to test/chunking-form/samples/default-export-name-conflict/_expected/es/generated-module3.js diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/es/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/es/main1.js index 2e9179b6dc9..9fd5cf8f8e8 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/es/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { a as b } from './generated-chunk.js'; +import { a as b } from './generated-module3.js'; console.log(b, b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/es/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/es/main2.js index 2e9179b6dc9..9fd5cf8f8e8 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/es/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { a as b } from './generated-chunk.js'; +import { a as b } from './generated-module3.js'; console.log(b, b); diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/system/generated-chunk.js b/test/chunking-form/samples/default-export-name-conflict/_expected/system/generated-module3.js similarity index 100% rename from test/chunking-form/samples/default-export-name-conflict/_expected/system/generated-chunk.js rename to test/chunking-form/samples/default-export-name-conflict/_expected/system/generated-module3.js diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js index 123cb9a65df..eb97faed58a 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-module3.js'], function () { 'use strict'; var b; return { diff --git a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js index 123cb9a65df..eb97faed58a 100644 --- a/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/default-export-name-conflict/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-module3.js'], function () { 'use strict'; var b; return { diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/generated-chunk.js b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/generated-shared.js similarity index 100% rename from test/chunking-form/samples/default-identifier-renaming/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/default-identifier-renaming/_expected/amd/generated-shared.js diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js index 9fe0088b29a..250e2287d45 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (shared) { 'use strict'; +define(['./generated-shared'], function (shared) { 'use strict'; var main1 = shared.d.map(d => d + 1); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js index b80ae0d3892..9f1de21690f 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (shared) { 'use strict'; +define(['./generated-shared'], function (shared) { 'use strict'; var main2 = shared.d.map(d => d + 2); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/generated-shared.js similarity index 100% rename from test/chunking-form/samples/default-identifier-renaming/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/default-identifier-renaming/_expected/cjs/generated-shared.js diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js index 36e411ab23e..d31052f2951 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./generated-chunk.js'); +var shared = require('./generated-shared.js'); var main1 = shared.d.map(d => d + 1); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js index ce051f9dca8..d4cd65916b3 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./generated-chunk.js'); +var shared = require('./generated-shared.js'); var main2 = shared.d.map(d => d + 2); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-chunk.js b/test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-shared.js similarity index 100% rename from test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-chunk.js rename to test/chunking-form/samples/default-identifier-renaming/_expected/es/generated-shared.js diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js index 7751da1485f..0147e14293c 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { d } from './generated-chunk.js'; +import { d } from './generated-shared.js'; var main1 = d.map(d => d + 1); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js index 1029203efe8..45d7c4f0e3f 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { d } from './generated-chunk.js'; +import { d } from './generated-shared.js'; var main2 = d.map(d => d + 2); diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-chunk.js b/test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-shared.js similarity index 100% rename from test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-chunk.js rename to test/chunking-form/samples/default-identifier-renaming/_expected/system/generated-shared.js diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js index 4b7d94d9d89..227a431f5a9 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-shared.js'], function (exports) { 'use strict'; var d; return { diff --git a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js index 15f9ff21e60..b872e5d5df4 100644 --- a/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js +++ b/test/chunking-form/samples/default-identifier-renaming/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-shared.js'], function (exports) { 'use strict'; var d; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js index eb910f88982..5b7a3c5e857 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js @@ -1,4 +1,4 @@ -define(['../generated-chunk'], function (dep) { 'use strict'; +define(['../generated-dep'], function (dep) { 'use strict'; console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js index 2fe39264b7d..764805deda3 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js index 95376156df4..b69626e539a 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('../generated-chunk.js'); +var dep = require('../generated-dep.js'); console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js index c199d16a106..4c79b32a701 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js index 015c2211ce2..cceb51002be 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/generated-nested/my-chunk.js @@ -1,3 +1,3 @@ -import { v as value } from '../generated-chunk.js'; +import { v as value } from '../generated-dep.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js index 9ccd67b1a67..da4e855f39a 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/es/main.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js index f366fbd644f..2655f9f646f 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/generated-nested/my-chunk.js @@ -1,4 +1,4 @@ -System.register(['../generated-chunk.js'], function () { +System.register(['../generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js index 8a46bd2bdb1..13eec5478ac 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-named/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js index 9ec11065a3b..de59be73c36 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/chunks/worker.js @@ -1,4 +1,4 @@ -define(['./chunk'], function (shared) { 'use strict'; +define(['./shared'], function (shared) { 'use strict'; postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js index faaeaec8554..cc2e4dd2ca3 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; +define(['require', './chunks/shared'], function (require, shared) { 'use strict'; const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker(new URL(require.toUrl('./chunks/worker-proxy.js'), document.baseURI).href); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js index 4b96dadad63..c12a25e95f5 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/chunks/worker.js @@ -1,5 +1,5 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js index 5da3cf5ccfe..f8fd02b76dc 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worker-proxy.js').href : new URL('chunks/worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js index d4a13865f89..376c9cd1a99 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/chunks/worker.js @@ -1,3 +1,3 @@ -import { s as shared } from './chunk.js'; +import { s as shared } from './shared.js'; postMessage(`from worker: ${shared}`); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js index 542f42d06f6..19521653160 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/es/main.js @@ -1,4 +1,4 @@ -import { s as shared } from './chunks/chunk.js'; +import { s as shared } from './chunks/shared.js'; const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker(new URL('chunks/worker-proxy.js', import.meta.url).href); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js index b8ae183e3d0..1013f55b394 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/chunks/worker.js @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function () { +System.register(['./shared.js'], function () { 'use strict'; var shared; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js index c1b3d8a5a2f..4ee1bb4ab60 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worker/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var shared; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js index 9ce3b8ea497..f96f283ad52 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/chunks/worklet.js @@ -1,4 +1,4 @@ -define(['./chunk'], function (shared) { 'use strict'; +define(['./shared'], function (shared) { 'use strict'; registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js index 4f1f66e5fe0..bf73a6f1543 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; +define(['require', './chunks/shared'], function (require, shared) { 'use strict'; CSS.paintWorklet.addModule(new URL(require.toUrl('./chunks/worklet.js'), document.baseURI).href); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js index c825979c594..55c46f65372 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/chunks/worklet.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js index 112043ba7d4..6ba79bfb0e6 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); CSS.paintWorklet.addModule((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worklet.js').href : new URL('chunks/worklet.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js index 43f54d48cc8..7ae737842e0 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/chunks/worklet.js @@ -1,4 +1,4 @@ -import { s as size, c as color } from './chunk.js'; +import { s as size, c as color } from './shared.js'; registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js index cda6f00a5b0..fc0e00f5183 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/es/main.js @@ -1,4 +1,4 @@ -import { c as color, s as size } from './chunks/chunk.js'; +import { c as color, s as size } from './chunks/shared.js'; CSS.paintWorklet.addModule(new URL('chunks/worklet.js', import.meta.url).href); diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/chunk.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js index 95fe01bb0b4..9cb6055973e 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/chunks/worklet.js @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function () { +System.register(['./shared.js'], function () { 'use strict'; var size, color; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js index b07122b3d50..3165374294e 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk-worklet/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var color, size; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js index e71ca60c322..05dda0e01f3 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-buildStart.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js index 2fe39264b7d..764805deda3 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js index 01502f79482..cfa8c788f1d 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-buildStart.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js index c199d16a106..4c79b32a701 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main', dep.value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js index e243252b0c2..fbe237d2ce7 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-buildStart.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js index 9ccd67b1a67..da4e855f39a 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/es/main.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main', value); diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js index a19c2c2d671..08465151e63 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-buildStart.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-chunk.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-chunk.js rename to test/chunking-form/samples/deprecated/emit-chunk/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js index 8a46bd2bdb1..13eec5478ac 100644 --- a/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js +++ b/test/chunking-form/samples/deprecated/emit-chunk/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep2.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep2.js index 0ff0154a980..d2c7c803984 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep2.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep2.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, dep4) { 'use strict'; +define(['exports', './generated-dep4'], function (exports, dep4) { 'use strict'; function mult (num) { return num + dep4.multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-chunk.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep4.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-chunking/_expected/amd/generated-dep4.js diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/main.js index f5e55c8be42..5c0dffc9c3c 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './generated-chunk'], function (require, dep4) { 'use strict'; +define(['require', './generated-dep4'], function (require, dep4) { 'use strict'; function calc (num) { return num * dep4.multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep2.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep2.js index 9ffd19ad726..b163fd7ef4b 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep2.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep4 = require('./generated-chunk.js'); +var dep4 = require('./generated-dep4.js'); function mult (num) { return num + dep4.multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep4.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/generated-dep4.js diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/main.js index a1ce7cc13ec..7cb456918e0 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var dep4 = require('./generated-chunk.js'); +var dep4 = require('./generated-dep4.js'); function calc (num) { return num * dep4.multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep2.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep2.js index 8655410d7af..fa5260712e6 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep2.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep2.js @@ -1,4 +1,4 @@ -import { m as multiplier } from './generated-chunk.js'; +import { m as multiplier } from './generated-dep4.js'; function mult (num) { return num + multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-chunk.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep4.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-chunking/_expected/es/generated-dep4.js diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/main.js index 5595d47dfdb..8b874a64bb6 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/es/main.js @@ -1,4 +1,4 @@ -import { m as multiplier } from './generated-chunk.js'; +import { m as multiplier } from './generated-dep4.js'; function calc (num) { return num * multiplier; diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js index e732ae148d1..d7b8dfdb5f6 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep4.js'], function (exports) { 'use strict'; var multiplier; return { diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-chunk.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep4.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-chunking/_expected/system/generated-dep4.js diff --git a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js index 5acaa3bb59c..72783a72455 100644 --- a/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import-chunking/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports, module) { +System.register(['./generated-dep4.js'], function (exports, module) { 'use strict'; var multiplier; return { diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-chunk.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-chunk.js deleted file mode 100644 index 7c2370c19a3..00000000000 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-chunk.js +++ /dev/null @@ -1,13 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - console.log('dep'); - - const dep = 'dep'; - - console.log('dynamic', dep); - const dynamic = 'dynamic'; - - exports.dep = dep; - exports.dynamic = dynamic; - -}); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic.js index f5831da416e..7c2370c19a3 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic.js @@ -1,7 +1,13 @@ -define(['exports', './generated-chunk'], function (exports, dynamic) { 'use strict'; +define(['exports'], function (exports) { 'use strict'; + console.log('dep'); + const dep = 'dep'; - exports.dynamic = dynamic.dynamic; + console.log('dynamic', dep); + const dynamic = 'dynamic'; + + exports.dep = dep; + exports.dynamic = dynamic; }); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic2.js new file mode 100644 index 00000000000..549cac73f1e --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/generated-dynamic2.js @@ -0,0 +1,7 @@ +define(['exports', './generated-dynamic'], function (exports, dynamic) { 'use strict'; + + + + exports.dynamic = dynamic.dynamic; + +}); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main1.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main1.js index 4dc4a80e97f..0f84ec99a44 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main1.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main1.js @@ -1,5 +1,5 @@ define(['require'], function (require) { 'use strict'; - new Promise(function (resolve, reject) { require(['./generated-dynamic'], resolve, reject) }).then(({dynamic}) => console.log('main1', dynamic)); + new Promise(function (resolve, reject) { require(['./generated-dynamic2'], resolve, reject) }).then(({dynamic}) => console.log('main1', dynamic)); }); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main2.js index 0efdba2aa84..1974c7d9afd 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main2.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dynamic) { 'use strict'; +define(['./generated-dynamic'], function (dynamic) { 'use strict'; console.log('main2', dynamic.dynamic, dynamic.dep); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-chunk.js deleted file mode 100644 index 210a1e1c5bc..00000000000 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-chunk.js +++ /dev/null @@ -1,11 +0,0 @@ -'use strict'; - -console.log('dep'); - -const dep = 'dep'; - -console.log('dynamic', dep); -const dynamic = 'dynamic'; - -exports.dep = dep; -exports.dynamic = dynamic; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic.js index 9ce0252a483..210a1e1c5bc 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic.js @@ -1,7 +1,11 @@ 'use strict'; -var dynamic = require('./generated-chunk.js'); +console.log('dep'); +const dep = 'dep'; +console.log('dynamic', dep); +const dynamic = 'dynamic'; -exports.dynamic = dynamic.dynamic; +exports.dep = dep; +exports.dynamic = dynamic; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic2.js new file mode 100644 index 00000000000..db9f8d3d094 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/generated-dynamic2.js @@ -0,0 +1,7 @@ +'use strict'; + +var dynamic = require('./generated-dynamic.js'); + + + +exports.dynamic = dynamic.dynamic; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main1.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main1.js index 94c55f49481..0a1d6b0432e 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main1.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main1.js @@ -1,3 +1,3 @@ 'use strict'; -new Promise(function (resolve) { resolve(require('./generated-dynamic.js')); }).then(({dynamic}) => console.log('main1', dynamic)); +new Promise(function (resolve) { resolve(require('./generated-dynamic2.js')); }).then(({dynamic}) => console.log('main1', dynamic)); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main2.js index 924410b061d..3276a034886 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main2.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var dynamic = require('./generated-chunk.js'); +var dynamic = require('./generated-dynamic.js'); console.log('main2', dynamic.dynamic, dynamic.dep); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js deleted file mode 100644 index a0ce15fe84a..00000000000 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-chunk.js +++ /dev/null @@ -1,8 +0,0 @@ -console.log('dep'); - -const dep = 'dep'; - -console.log('dynamic', dep); -const dynamic = 'dynamic'; - -export { dep as a, dynamic as d }; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic.js index 44d1ba0252e..a0ce15fe84a 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic.js @@ -1 +1,8 @@ -export { d as dynamic } from './generated-chunk.js'; +console.log('dep'); + +const dep = 'dep'; + +console.log('dynamic', dep); +const dynamic = 'dynamic'; + +export { dep as a, dynamic as d }; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic2.js new file mode 100644 index 00000000000..ebf2d6f8467 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/es/generated-dynamic2.js @@ -0,0 +1 @@ +export { d as dynamic } from './generated-dynamic.js'; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/main1.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/main1.js index 2fbb59a4af9..cf5d3a31f7e 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/es/main1.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/es/main1.js @@ -1 +1 @@ -import('./generated-dynamic.js').then(({dynamic}) => console.log('main1', dynamic)); +import('./generated-dynamic2.js').then(({dynamic}) => console.log('main1', dynamic)); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/es/main2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/es/main2.js index 7ede9cb8d15..90795a3d8bd 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/es/main2.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { d as dynamic, a as dep } from './generated-chunk.js'; +import { d as dynamic, a as dep } from './generated-dynamic.js'; console.log('main2', dynamic, dep); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js deleted file mode 100644 index 0605f07ef7e..00000000000 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-chunk.js +++ /dev/null @@ -1,15 +0,0 @@ -System.register([], function (exports) { - 'use strict'; - return { - execute: function () { - - console.log('dep'); - - const dep = exports('a', 'dep'); - - console.log('dynamic', dep); - const dynamic = exports('d', 'dynamic'); - - } - }; -}); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic.js index 1ed42711b01..0605f07ef7e 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic.js @@ -1,12 +1,14 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register([], function (exports) { 'use strict'; return { - setters: [function (module) { - exports('dynamic', module.d); - }], execute: function () { + console.log('dep'); + const dep = exports('a', 'dep'); + + console.log('dynamic', dep); + const dynamic = exports('d', 'dynamic'); } }; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic2.js new file mode 100644 index 00000000000..4d3438486d2 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/generated-dynamic2.js @@ -0,0 +1,13 @@ +System.register(['./generated-dynamic.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('dynamic', module.d); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main1.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main1.js index c49f55149f2..2cb9535c9b4 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main1.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main1.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - module.import('./generated-dynamic.js').then(({dynamic}) => console.log('main1', dynamic)); + module.import('./generated-dynamic2.js').then(({dynamic}) => console.log('main1', dynamic)); } }; diff --git a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js index 5801a3edbbe..48bd74f53c6 100644 --- a/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js +++ b/test/chunking-form/samples/dynamic-import-facade/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dynamic.js'], function () { 'use strict'; var dynamic, dep; return { diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep1.js index 4c6c80f1699..2ec5ef78f0c 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep1.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep1.js @@ -1,7 +1,20 @@ -define(['exports', './generated-chunk'], function (exports, dep1) { 'use strict'; +define(['exports'], function (exports) { 'use strict'; + function foo() { + return 'dep2'; + } + Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - exports.bar = dep1.bar; + function bar() { + return foo(); + } + + var dep1 = /*#__PURE__*/Object.freeze({ + bar: bar + }); + + exports.bar = bar; + exports.foo = foo; }); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep12.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep12.js new file mode 100644 index 00000000000..4bd11b297c4 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-dep12.js @@ -0,0 +1,7 @@ +define(['exports', './generated-dep1'], function (exports, dep1) { 'use strict'; + + + + exports.bar = dep1.bar; + +}); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main.js index 5f16b4ed626..cac66392a39 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; console.log(dep1.foo(), dep1.bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main2.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main2.js index 86ec013aaab..4fd363667ff 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main2.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/main2.js @@ -1,5 +1,5 @@ define(['require'], function (require) { 'use strict'; - new Promise(function (resolve, reject) { require(['./generated-dep1'], resolve, reject) }).then(({ bar }) => console.log(bar())); + new Promise(function (resolve, reject) { require(['./generated-dep12'], resolve, reject) }).then(({ bar }) => console.log(bar())); }); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep1.js index cf4187f08c2..957dd6916a7 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep1.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep1.js @@ -1,7 +1,18 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +function foo() { + return 'dep2'; +} +Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); +function bar() { + return foo(); +} -exports.bar = dep1.bar; +var dep1 = /*#__PURE__*/Object.freeze({ + bar: bar +}); + +exports.bar = bar; +exports.foo = foo; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep12.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep12.js new file mode 100644 index 00000000000..cd30893ebe8 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-dep12.js @@ -0,0 +1,7 @@ +'use strict'; + +var dep1 = require('./generated-dep1.js'); + + + +exports.bar = dep1.bar; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main.js index 12c7a0a7c3b..d054aa0a11c 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); console.log(dep1.foo(), dep1.bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main2.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main2.js index b910e11fb85..d87b8141b66 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main2.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/main2.js @@ -1,3 +1,3 @@ 'use strict'; -new Promise(function (resolve) { resolve(require('./generated-dep1.js')); }).then(({ bar }) => console.log(bar())); +new Promise(function (resolve) { resolve(require('./generated-dep12.js')); }).then(({ bar }) => console.log(bar())); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep1.js index 2fb7ac4adeb..867796fbd1d 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep1.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep1.js @@ -1 +1,15 @@ -export { b as bar } from './generated-chunk.js'; +function foo() { + return 'dep2'; +} + +Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); + +function bar() { + return foo(); +} + +var dep1 = /*#__PURE__*/Object.freeze({ + bar: bar +}); + +export { bar as b, foo as f }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep12.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep12.js new file mode 100644 index 00000000000..d22ddbff25b --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-dep12.js @@ -0,0 +1 @@ +export { b as bar } from './generated-dep1.js'; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main.js index 7b5156785f9..793f396d0ba 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main.js @@ -1,3 +1,3 @@ -import { f as foo, b as bar } from './generated-chunk.js'; +import { f as foo, b as bar } from './generated-dep1.js'; console.log(foo(), bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main2.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main2.js index 00aba354edb..970b0eb472e 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main2.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/main2.js @@ -1 +1 @@ -import('./generated-dep1.js').then(({ bar }) => console.log(bar())); +import('./generated-dep12.js').then(({ bar }) => console.log(bar())); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep1.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep1.js index dfd0e6bfdcf..7c01c4d8b46 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep1.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep1.js @@ -1,12 +1,26 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register([], function (exports) { 'use strict'; return { - setters: [function (module) { - exports('bar', module.b); - }], execute: function () { + exports({ + b: bar, + f: foo + }); + function foo() { + return 'dep2'; + } + + Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); + + function bar() { + return foo(); + } + + var dep1 = /*#__PURE__*/Object.freeze({ + bar: bar + }); } }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep12.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep12.js new file mode 100644 index 00000000000..b9da72c55c7 --- /dev/null +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-dep12.js @@ -0,0 +1,13 @@ +System.register(['./generated-dep1.js'], function (exports) { + 'use strict'; + return { + setters: [function (module) { + exports('bar', module.b); + }], + execute: function () { + + + + } + }; +}); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js index c6ba95561cb..1f0c72ea5a1 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep1.js'], function () { 'use strict'; var foo, bar; return { diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main2.js b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main2.js index 2f2c41db6e5..32925b05438 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main2.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/main2.js @@ -3,7 +3,7 @@ System.register([], function (exports, module) { return { execute: function () { - module.import('./generated-dep1.js').then(({ bar }) => console.log(bar())); + module.import('./generated-dep12.js').then(({ bar }) => console.log(bar())); } }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-chunk.js deleted file mode 100644 index 2ec5ef78f0c..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-chunk.js +++ /dev/null @@ -1,20 +0,0 @@ -define(['exports'], function (exports) { 'use strict'; - - function foo() { - return 'dep2'; - } - - Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - - function bar() { - return foo(); - } - - var dep1 = /*#__PURE__*/Object.freeze({ - bar: bar - }); - - exports.bar = bar; - exports.foo = foo; - -}); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/main.js index 5f16b4ed626..cac66392a39 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep1'], function (dep1) { 'use strict'; console.log(dep1.foo(), dep1.bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-chunk.js deleted file mode 100644 index 957dd6916a7..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-chunk.js +++ /dev/null @@ -1,18 +0,0 @@ -'use strict'; - -function foo() { - return 'dep2'; -} - -Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - -function bar() { - return foo(); -} - -var dep1 = /*#__PURE__*/Object.freeze({ - bar: bar -}); - -exports.bar = bar; -exports.foo = foo; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js index 12c7a0a7c3b..d054aa0a11c 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep1.js'); console.log(dep1.foo(), dep1.bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js deleted file mode 100644 index 867796fbd1d..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-chunk.js +++ /dev/null @@ -1,15 +0,0 @@ -function foo() { - return 'dep2'; -} - -Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - -function bar() { - return foo(); -} - -var dep1 = /*#__PURE__*/Object.freeze({ - bar: bar -}); - -export { bar as b, foo as f }; diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/es/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/generated-dep1.js diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js index 7b5156785f9..793f396d0ba 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/es/main.js @@ -1,3 +1,3 @@ -import { f as foo, b as bar } from './generated-chunk.js'; +import { f as foo, b as bar } from './generated-dep1.js'; console.log(foo(), bar()); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js deleted file mode 100644 index 7c01c4d8b46..00000000000 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-chunk.js +++ /dev/null @@ -1,27 +0,0 @@ -System.register([], function (exports) { - 'use strict'; - return { - execute: function () { - - exports({ - b: bar, - f: foo - }); - - function foo() { - return 'dep2'; - } - - Promise.resolve().then(function () { return dep1; }).then(({ bar }) => console.log(bar())); - - function bar() { - return foo(); - } - - var dep1 = /*#__PURE__*/Object.freeze({ - bar: bar - }); - - } - }; -}); diff --git a/test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-chunk.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/dynamic-import-statically-imported-2/_expected/system/generated-chunk.js rename to test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/generated-dep1.js diff --git a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/main.js b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/main.js index c6ba95561cb..1f0c72ea5a1 100644 --- a/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import-statically-imported/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep1.js'], function () { 'use strict'; var foo, bar; return { diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/other.js index ac567d0a690..9015a82be2e 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/other.js +++ b/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/other.js @@ -1,4 +1,4 @@ -define(['exports', './chunk'], function (exports, shared) { 'use strict'; +define(['exports', './shared'], function (exports, shared) { 'use strict'; diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/dynamic-import/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/dynamic-import/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js index 3578eb39061..c6b551a83c2 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/amd/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', 'exports', './chunks/chunk'], function (require, exports, shared) { 'use strict'; +define(['require', 'exports', './chunks/shared'], function (require, exports, shared) { 'use strict'; assert.equal(shared.sharedValue, 'shared'); diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js index 84df05fe8fd..90d22b547c6 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js +++ b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/other.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/dynamic-import/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js index 64eec88f4c8..d3c2764b413 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/cjs/main.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); assert.equal(shared.sharedValue, 'shared'); diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js index f77a7605c9b..ff838bd038b 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js +++ b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/other.js @@ -1 +1 @@ -export { s as value } from './chunk.js'; +export { s as value } from './shared.js'; diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/dynamic-import/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/dynamic-import/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/dynamic-import/_expected/es/main.js b/test/chunking-form/samples/dynamic-import/_expected/es/main.js index 45fed222df0..4c4ca183a1e 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/es/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/es/main.js @@ -1,4 +1,4 @@ -import { s as sharedValue } from './chunks/chunk.js'; +import { s as sharedValue } from './chunks/shared.js'; assert.equal(sharedValue, 'shared'); diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js index 49bbf27adb6..201777a5cbe 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js +++ b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/other.js @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function (exports) { +System.register(['./shared.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/chunks/chunk.js b/test/chunking-form/samples/dynamic-import/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/dynamic-import/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/dynamic-import/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/dynamic-import/_expected/system/main.js b/test/chunking-form/samples/dynamic-import/_expected/system/main.js index ab84a618663..a8d72ea45f1 100644 --- a/test/chunking-form/samples/dynamic-import/_expected/system/main.js +++ b/test/chunking-form/samples/dynamic-import/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var sharedValue; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js index 4a511049e9a..abad92080cc 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_config.js @@ -20,7 +20,7 @@ module.exports = { assert.deepStrictEqual(Object.keys(bundle).map(key => bundle[key].name), [ 'build-start-chunk', 'main', - 'chunk' + 'dep' ]); } } diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js index c7f12af1025..bc0871d46b1 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/custom/build-start-chunk.js @@ -1,4 +1,4 @@ -define(['exports', '../generated-chunk'], function (exports, dep) { 'use strict'; +define(['exports', '../generated-dep'], function (exports, dep) { 'use strict'; const id = 'startBuild'; console.log(id, dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js index 5ab113347f0..1ee89bd0e67 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './custom/build-start-chunk'], function (dep, buildStart) { 'use strict'; +define(['./generated-dep', './custom/build-start-chunk'], function (dep, buildStart) { 'use strict'; console.log(buildStart.id); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js index c619394654a..54e70b3a4af 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/custom/build-start-chunk.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var dep = require('../generated-chunk.js'); +var dep = require('../generated-dep.js'); const id = 'startBuild'; console.log(id, dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js index 33c4c2c445e..036ef6a6055 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); var buildStart = require('./custom/build-start-chunk.js'); console.log(buildStart.id); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js index 8125f265dc7..c9077d82bfd 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/custom/build-start-chunk.js @@ -1,4 +1,4 @@ -import { v as value } from '../generated-chunk.js'; +import { v as value } from '../generated-dep.js'; const id = 'startBuild'; console.log(id, value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js index c07ac33243f..b291dee7947 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/es/main.js @@ -1,4 +1,4 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; import { id } from './custom/build-start-chunk.js'; console.log(id); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js index e740725842c..e830592fd37 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/custom/build-start-chunk.js @@ -1,4 +1,4 @@ -System.register(['../generated-chunk.js'], function (exports) { +System.register(['../generated-dep.js'], function (exports) { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js index d95239821e0..cc7bf937631 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-filename/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './custom/build-start-chunk.js'], function () { +System.register(['./generated-dep.js', './custom/build-start-chunk.js'], function () { 'use strict'; var value, id; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js index eb910f88982..5b7a3c5e857 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/generated-nested/my-chunk.js @@ -1,4 +1,4 @@ -define(['../generated-chunk'], function (dep) { 'use strict'; +define(['../generated-dep'], function (dep) { 'use strict'; console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js index 2fe39264b7d..764805deda3 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js index 95376156df4..b69626e539a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/generated-nested/my-chunk.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('../generated-chunk.js'); +var dep = require('../generated-dep.js'); console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js index c199d16a106..4c79b32a701 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js index 015c2211ce2..cceb51002be 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/generated-nested/my-chunk.js @@ -1,3 +1,3 @@ -import { v as value } from '../generated-chunk.js'; +import { v as value } from '../generated-dep.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js index 9ccd67b1a67..da4e855f39a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/es/main.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js index f366fbd644f..2655f9f646f 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/generated-nested/my-chunk.js @@ -1,4 +1,4 @@ -System.register(['../generated-chunk.js'], function () { +System.register(['../generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js index 8a46bd2bdb1..13eec5478ac 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-named/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js index 9ec11065a3b..de59be73c36 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/chunks/worker.js @@ -1,4 +1,4 @@ -define(['./chunk'], function (shared) { 'use strict'; +define(['./shared'], function (shared) { 'use strict'; postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js index faaeaec8554..cc2e4dd2ca3 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; +define(['require', './chunks/shared'], function (require, shared) { 'use strict'; const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker(new URL(require.toUrl('./chunks/worker-proxy.js'), document.baseURI).href); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js index 4b96dadad63..c12a25e95f5 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/chunks/worker.js @@ -1,5 +1,5 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); postMessage(`from worker: ${shared.shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js index 5da3cf5ccfe..f8fd02b76dc 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worker-proxy.js').href : new URL('chunks/worker-proxy.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js index d4a13865f89..376c9cd1a99 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/chunks/worker.js @@ -1,3 +1,3 @@ -import { s as shared } from './chunk.js'; +import { s as shared } from './shared.js'; postMessage(`from worker: ${shared}`); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js index 542f42d06f6..19521653160 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/es/main.js @@ -1,4 +1,4 @@ -import { s as shared } from './chunks/chunk.js'; +import { s as shared } from './chunks/shared.js'; const getWorkerMessage = () => new Promise(resolve => { const worker = new Worker(new URL('chunks/worker-proxy.js', import.meta.url).href); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js index b8ae183e3d0..1013f55b394 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/chunks/worker.js @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function () { +System.register(['./shared.js'], function () { 'use strict'; var shared; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js index c1b3d8a5a2f..4ee1bb4ab60 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worker/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var shared; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js index 9ce3b8ea497..f96f283ad52 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/chunks/worklet.js @@ -1,4 +1,4 @@ -define(['./chunk'], function (shared) { 'use strict'; +define(['./shared'], function (shared) { 'use strict'; registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js index 4f1f66e5fe0..bf73a6f1543 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', './chunks/chunk'], function (require, shared) { 'use strict'; +define(['require', './chunks/shared'], function (require, shared) { 'use strict'; CSS.paintWorklet.addModule(new URL(require.toUrl('./chunks/worklet.js'), document.baseURI).href); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js index c825979c594..55c46f65372 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/chunks/worklet.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunk.js'); +var shared = require('./shared.js'); registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js index 112043ba7d4..6ba79bfb0e6 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); CSS.paintWorklet.addModule((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __dirname + '/chunks/worklet.js').href : new URL('chunks/worklet.js', document.currentScript && document.currentScript.src || document.baseURI).href)); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js index 43f54d48cc8..7ae737842e0 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/chunks/worklet.js @@ -1,4 +1,4 @@ -import { s as size, c as color } from './chunk.js'; +import { s as size, c as color } from './shared.js'; registerPaint( 'vertical-lines', diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js index cda6f00a5b0..fc0e00f5183 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/es/main.js @@ -1,4 +1,4 @@ -import { c as color, s as size } from './chunks/chunk.js'; +import { c as color, s as size } from './chunks/shared.js'; CSS.paintWorklet.addModule(new URL('chunks/worklet.js', import.meta.url).href); diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/chunk.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js index 95fe01bb0b4..9cb6055973e 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/chunks/worklet.js @@ -1,4 +1,4 @@ -System.register(['./chunk.js'], function () { +System.register(['./shared.js'], function () { 'use strict'; var size, color; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js index b07122b3d50..3165374294e 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk-worklet/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports, module) { +System.register(['./chunks/shared.js'], function (exports, module) { 'use strict'; var color, size; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js index e71ca60c322..05dda0e01f3 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-buildStart.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js index 2fe39264b7d..764805deda3 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js index 01502f79482..cfa8c788f1d 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-buildStart.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('startBuild', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js index c199d16a106..4c79b32a701 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main', dep.value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js index e243252b0c2..fbe237d2ce7 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-buildStart.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('startBuild', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js index 9ccd67b1a67..da4e855f39a 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/es/main.js @@ -1,3 +1,3 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main', value); diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js index a19c2c2d671..08465151e63 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-buildStart.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-chunk.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-chunk.js rename to test/chunking-form/samples/emit-file/emit-chunk/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js index 8a46bd2bdb1..13eec5478ac 100644 --- a/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js +++ b/test/chunking-form/samples/emit-file/emit-chunk/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/generated-chunk.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/generated-m1.js similarity index 100% rename from test/chunking-form/samples/entry-point-without-own-code/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/entry-point-without-own-code/_expected/amd/generated-m1.js diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js index 2e73f2c4072..b95c6ca797c 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/m1.js @@ -1,4 +1,4 @@ -define(['exports', './m2', './generated-chunk'], function (exports, m2, m1) { 'use strict'; +define(['exports', './m2', './generated-m1'], function (exports, m2, m1) { 'use strict'; diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js index c56ed5a438c..fd4897a745b 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./m2', './generated-chunk'], function (m2, m1) { 'use strict'; +define(['./m2', './generated-m1'], function (m2, m1) { 'use strict'; console.log(m1.ms); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/generated-m1.js similarity index 100% rename from test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/generated-m1.js diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js index 69e845c1c87..9b97781f444 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/m1.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var m2 = require('./m2.js'); -require('./generated-chunk.js'); +require('./generated-m1.js'); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js index cab9d88907e..a7ba4a72c65 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/cjs/main.js @@ -1,6 +1,6 @@ 'use strict'; require('./m2.js'); -var m1 = require('./generated-chunk.js'); +var m1 = require('./generated-m1.js'); console.log(m1.ms); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-chunk.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-m1.js similarity index 100% rename from test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-chunk.js rename to test/chunking-form/samples/entry-point-without-own-code/_expected/es/generated-m1.js diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m1.js index 60888641454..a0461824120 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/m1.js @@ -1,2 +1,2 @@ export { default as m2 } from './m2.js'; -import './generated-chunk.js'; +import './generated-m1.js'; diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js index b68936e6d94..107671de693 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/es/main.js @@ -1,4 +1,4 @@ import './m2.js'; -import { a as ms } from './generated-chunk.js'; +import { a as ms } from './generated-m1.js'; console.log(ms); diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-chunk.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js similarity index 100% rename from test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-chunk.js rename to test/chunking-form/samples/entry-point-without-own-code/_expected/system/generated-m1.js diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js index 4474abd1206..5f74314c76e 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/m1.js @@ -1,4 +1,4 @@ -System.register(['./m2.js', './generated-chunk.js'], function (exports) { +System.register(['./m2.js', './generated-m1.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js index 6f7bc939a64..6c433a4d441 100644 --- a/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js +++ b/test/chunking-form/samples/entry-point-without-own-code/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./m2.js', './generated-chunk.js'], function () { +System.register(['./m2.js', './generated-m1.js'], function () { 'use strict'; var ms; return { diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/generated-main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-aliasing/_expected/amd/generated-main2alias.js rename to test/chunking-form/samples/entrypoint-aliasing/_expected/amd/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main1alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main1alias.js index bac6f259fff..c58fe8910da 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main1alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main1alias.js @@ -1,4 +1,4 @@ -define(['./generated-main2alias'], function (main2alias) { 'use strict'; +define(['./generated-main2'], function (main2alias) { 'use strict'; main2alias.log(main2alias.dep); diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main2alias.js index 2747e887cd9..61ab8e7d7a6 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/amd/main2alias.js @@ -1,4 +1,4 @@ -define(['./generated-main2alias'], function (main2alias) { 'use strict'; +define(['./generated-main2'], function (main2alias) { 'use strict'; diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/generated-main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/generated-main2alias.js rename to test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main1alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main1alias.js index 9f4d3bf034c..528760feda2 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main1alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main1alias.js @@ -1,5 +1,5 @@ 'use strict'; -var main2alias = require('./generated-main2alias.js'); +var main2alias = require('./generated-main2.js'); main2alias.log(main2alias.dep); diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main2alias.js index 449c18d87bb..69b1826b762 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/cjs/main2alias.js @@ -1,6 +1,6 @@ 'use strict'; -var main2alias = require('./generated-main2alias.js'); +var main2alias = require('./generated-main2.js'); diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2alias.js rename to test/chunking-form/samples/entrypoint-aliasing/_expected/es/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main1alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main1alias.js index 5053a9cfe5a..7ad3b06e91d 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main1alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main1alias.js @@ -1,3 +1,3 @@ -import { l as log, d as dep } from './generated-main2alias.js'; +import { l as log, d as dep } from './generated-main2.js'; log(dep); diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main2alias.js index 3b08b759c45..d74b87aba77 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/es/main2alias.js @@ -1 +1 @@ -export { l as default } from './generated-main2alias.js'; +export { l as default } from './generated-main2.js'; diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2alias.js rename to test/chunking-form/samples/entrypoint-aliasing/_expected/system/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js index 97c73a3bfa6..8eddd1df106 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main1alias.js @@ -1,4 +1,4 @@ -System.register(['./generated-main2alias.js'], function () { +System.register(['./generated-main2.js'], function () { 'use strict'; var log, dep; return { diff --git a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js index c5d63486e0e..94afaca11b1 100644 --- a/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js +++ b/test/chunking-form/samples/entrypoint-aliasing/_expected/system/main2alias.js @@ -1,4 +1,4 @@ -System.register(['./generated-main2alias.js'], function (exports) { +System.register(['./generated-main2.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/amd/generated-chunk.js b/test/chunking-form/samples/entrypoint-facade/_expected/amd/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-facade/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/entrypoint-facade/_expected/amd/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/amd/main1.js b/test/chunking-form/samples/entrypoint-facade/_expected/amd/main1.js index 4b813479b19..b319e7ebff9 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/amd/main1.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (main2) { 'use strict'; +define(['./generated-main2'], function (main2) { 'use strict'; main2.log(main2.dep); diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/amd/main2.js b/test/chunking-form/samples/entrypoint-facade/_expected/amd/main2.js index dca57e6bdbb..e4a115ee883 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/amd/main2.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (main2) { 'use strict'; +define(['./generated-main2'], function (main2) { 'use strict'; diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-facade/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/entrypoint-facade/_expected/cjs/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main1.js b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main1.js index 0f9129ef76b..6c0864d0770 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main1.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var main2 = require('./generated-chunk.js'); +var main2 = require('./generated-main2.js'); main2.log(main2.dep); diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main2.js b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main2.js index 30320fc1844..1cca608acf8 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main2.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var main2 = require('./generated-chunk.js'); +var main2 = require('./generated-main2.js'); diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/es/generated-chunk.js b/test/chunking-form/samples/entrypoint-facade/_expected/es/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-facade/_expected/es/generated-chunk.js rename to test/chunking-form/samples/entrypoint-facade/_expected/es/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/es/main1.js b/test/chunking-form/samples/entrypoint-facade/_expected/es/main1.js index 9e409ed6e90..7ad3b06e91d 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/es/main1.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { l as log, d as dep } from './generated-chunk.js'; +import { l as log, d as dep } from './generated-main2.js'; log(dep); diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/es/main2.js b/test/chunking-form/samples/entrypoint-facade/_expected/es/main2.js index 022c729be82..d74b87aba77 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/es/main2.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/es/main2.js @@ -1 +1 @@ -export { l as default } from './generated-chunk.js'; +export { l as default } from './generated-main2.js'; diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/system/generated-chunk.js b/test/chunking-form/samples/entrypoint-facade/_expected/system/generated-main2.js similarity index 100% rename from test/chunking-form/samples/entrypoint-facade/_expected/system/generated-chunk.js rename to test/chunking-form/samples/entrypoint-facade/_expected/system/generated-main2.js diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js b/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js index e42bfafc58b..8eddd1df106 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-main2.js'], function () { 'use strict'; var log, dep; return { diff --git a/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js b/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js index 8f75a67173f..94afaca11b1 100644 --- a/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js +++ b/test/chunking-form/samples/entrypoint-facade/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-main2.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-chunk-6bb39c19-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-6bb39c19-amd.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-chunk-6bb39c19-amd.js rename to test/chunking-form/samples/filenames-patterns/_expected/amd/chunk-main2-6bb39c19-amd.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-e7c7d1b5-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-e7c7d1b5-amd.js index 16b886110fd..791e2547a0f 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-e7c7d1b5-amd.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main1-e7c7d1b5-amd.js @@ -1,4 +1,4 @@ -define(['./chunk-chunk-6bb39c19-amd'], function (main2) { 'use strict'; +define(['./chunk-main2-6bb39c19-amd'], function (main2) { 'use strict'; main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-f9a2200a-amd.js b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-f9a2200a-amd.js index eb0faba5282..0e357dbc084 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-f9a2200a-amd.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/amd/entry-main2-f9a2200a-amd.js @@ -1,4 +1,4 @@ -define(['./chunk-chunk-6bb39c19-amd'], function (main2) { 'use strict'; +define(['./chunk-main2-6bb39c19-amd'], function (main2) { 'use strict'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-chunk-33c8b40d-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-33c8b40d-cjs.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-chunk-33c8b40d-cjs.js rename to test/chunking-form/samples/filenames-patterns/_expected/cjs/chunk-main2-33c8b40d-cjs.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-639831da-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-639831da-cjs.js index c6c3e337b7a..df68f3f3591 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-639831da-cjs.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main1-639831da-cjs.js @@ -1,5 +1,5 @@ 'use strict'; -var main2 = require('./chunk-chunk-33c8b40d-cjs.js'); +var main2 = require('./chunk-main2-33c8b40d-cjs.js'); main2.log(main2.dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-4508233a-cjs.js b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-4508233a-cjs.js index b4586862b9a..60dc76f979f 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-4508233a-cjs.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/cjs/entry-main2-4508233a-cjs.js @@ -1,6 +1,6 @@ 'use strict'; -var main2 = require('./chunk-chunk-33c8b40d-cjs.js'); +var main2 = require('./chunk-main2-33c8b40d-cjs.js'); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-cc2b1346-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-cc2b1346-esm.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/es/chunk-chunk-cc2b1346-esm.js rename to test/chunking-form/samples/filenames-patterns/_expected/es/chunk-main2-cc2b1346-esm.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-2901d8b1-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-2901d8b1-esm.js index de7ec87b1cc..d269251063e 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-2901d8b1-esm.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main1-2901d8b1-esm.js @@ -1,3 +1,3 @@ -import { l as log, d as dep } from './chunk-chunk-cc2b1346-esm.js'; +import { l as log, d as dep } from './chunk-main2-cc2b1346-esm.js'; log(dep); diff --git a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-62d27906-esm.js b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-62d27906-esm.js index 1b5ae3247da..780b6aba3d3 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-62d27906-esm.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/es/entry-main2-62d27906-esm.js @@ -1 +1 @@ -export { l as default } from './chunk-chunk-cc2b1346-esm.js'; +export { l as default } from './chunk-main2-cc2b1346-esm.js'; diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-63744fb4-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-63744fb4-system.js similarity index 100% rename from test/chunking-form/samples/filenames-patterns/_expected/system/chunk-chunk-63744fb4-system.js rename to test/chunking-form/samples/filenames-patterns/_expected/system/chunk-main2-63744fb4-system.js diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js index f39349ff449..56fe0f70e2c 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main1-379caf56-system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-chunk-63744fb4-system.js'], function () { +System.register(['./chunk-main2-63744fb4-system.js'], function () { 'use strict'; var log, dep; return { diff --git a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js index d17fe961092..74ee594635c 100644 --- a/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js +++ b/test/chunking-form/samples/filenames-patterns/_expected/system/entry-main2-9e49ba04-system.js @@ -1,4 +1,4 @@ -System.register(['./chunk-chunk-63744fb4-system.js'], function (exports) { +System.register(['./chunk-main2-63744fb4-system.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/generated-chunk.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-multiple/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/grouping-multiple/_expected/amd/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js index 7a8cf74c70d..f72ae9595ae 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep3'], function (dep1) { 'use strict'; var main1 = dep1.x + dep1.y; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js index ef71c5734fc..cd2e2da56fa 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep3'], function (dep1) { 'use strict'; var main2 = dep1.x + dep1.z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js index b0e9a23338c..d350c7f13da 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep1) { 'use strict'; +define(['./generated-dep3'], function (dep1) { 'use strict'; var main3 = dep1.y + dep1.z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-multiple/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/grouping-multiple/_expected/cjs/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js index 980f499b8ae..74fc4840ff8 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep3.js'); var main1 = dep1.x + dep1.y; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js index f006c706a6a..a27a78410d3 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep3.js'); var main2 = dep1.x + dep1.z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js index 63736fc903f..4cde9988a58 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/cjs/main3.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); +var dep1 = require('./generated-dep3.js'); var main3 = dep1.y + dep1.z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/es/generated-chunk.js b/test/chunking-form/samples/grouping-multiple/_expected/es/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-multiple/_expected/es/generated-chunk.js rename to test/chunking-form/samples/grouping-multiple/_expected/es/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-multiple/_expected/es/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/es/main1.js index 57030d5cb31..171ce283868 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/es/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { x, y } from './generated-chunk.js'; +import { x, y } from './generated-dep3.js'; var main1 = x + y; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/es/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/es/main2.js index 78ebdd3affe..eafaf36a946 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/es/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { x, z } from './generated-chunk.js'; +import { x, z } from './generated-dep3.js'; var main2 = x + z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/es/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/es/main3.js index 81053c79836..27a13fc9109 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/es/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/es/main3.js @@ -1,4 +1,4 @@ -import { y, z } from './generated-chunk.js'; +import { y, z } from './generated-dep3.js'; var main3 = y + z; diff --git a/test/chunking-form/samples/grouping-multiple/_expected/system/generated-chunk.js b/test/chunking-form/samples/grouping-multiple/_expected/system/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-multiple/_expected/system/generated-chunk.js rename to test/chunking-form/samples/grouping-multiple/_expected/system/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js b/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js index 8cd2edf972f..297ef97c4cb 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep3.js'], function (exports) { 'use strict'; var x, y; return { diff --git a/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js b/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js index 5dd376c685b..c79b02efd87 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep3.js'], function (exports) { 'use strict'; var x, z; return { diff --git a/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js b/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js index 511c66a1978..b691d6096e2 100644 --- a/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js +++ b/test/chunking-form/samples/grouping-multiple/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep3.js'], function (exports) { 'use strict'; var y, z; return { diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/generated-chunk.js b/test/chunking-form/samples/grouping-size/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/grouping-size/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/amd/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/amd/generated-chunk2.js rename to test/chunking-form/samples/grouping-size/_expected/amd/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/main1.js b/test/chunking-form/samples/grouping-size/_expected/amd/main1.js index bc68133afaf..4f472918845 100644 --- a/test/chunking-form/samples/grouping-size/_expected/amd/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2'], function (dep1, dep2) { 'use strict'; +define(['./generated-dep1', './generated-dep3'], function (dep1, dep2) { 'use strict'; var main1 = dep1.x + dep2.y; diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/main2.js b/test/chunking-form/samples/grouping-size/_expected/amd/main2.js index 2ce5dd206fd..14edb878030 100644 --- a/test/chunking-form/samples/grouping-size/_expected/amd/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2'], function (dep1, dep2) { 'use strict'; +define(['./generated-dep1', './generated-dep3'], function (dep1, dep2) { 'use strict'; var main2 = dep1.x + dep2.z; diff --git a/test/chunking-form/samples/grouping-size/_expected/amd/main3.js b/test/chunking-form/samples/grouping-size/_expected/amd/main3.js index fdbaf782254..9250229bf8d 100644 --- a/test/chunking-form/samples/grouping-size/_expected/amd/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk2'], function (dep2) { 'use strict'; +define(['./generated-dep3'], function (dep2) { 'use strict'; var main3 = dep2.y + dep2.z; diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/grouping-size/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/grouping-size/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/cjs/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/grouping-size/_expected/cjs/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js b/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js index 6859a03fbff..1e013c8c562 100644 --- a/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); -var dep2 = require('./generated-chunk2.js'); +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep3.js'); var main1 = dep1.x + dep2.y; diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js b/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js index d64360e5a40..2aba4b69579 100644 --- a/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/cjs/main2.js @@ -1,7 +1,7 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); -var dep2 = require('./generated-chunk2.js'); +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep3.js'); var main2 = dep1.x + dep2.z; diff --git a/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js b/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js index 8295c0efa78..71eb5e920f7 100644 --- a/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/cjs/main3.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk2.js'); +var dep2 = require('./generated-dep3.js'); var main3 = dep2.y + dep2.z; diff --git a/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk.js b/test/chunking-form/samples/grouping-size/_expected/es/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/es/generated-chunk.js rename to test/chunking-form/samples/grouping-size/_expected/es/generated-dep1.js diff --git a/test/chunking-form/samples/grouping-size/_expected/es/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/es/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/grouping-size/_expected/es/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-size/_expected/es/main1.js b/test/chunking-form/samples/grouping-size/_expected/es/main1.js index 97c077c14bb..a5da120e3f0 100644 --- a/test/chunking-form/samples/grouping-size/_expected/es/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/es/main1.js @@ -1,5 +1,5 @@ -import { x } from './generated-chunk.js'; -import { y } from './generated-chunk2.js'; +import { x } from './generated-dep1.js'; +import { y } from './generated-dep3.js'; var main1 = x + y; diff --git a/test/chunking-form/samples/grouping-size/_expected/es/main2.js b/test/chunking-form/samples/grouping-size/_expected/es/main2.js index 1ef06784c22..dc474b4b2fc 100644 --- a/test/chunking-form/samples/grouping-size/_expected/es/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/es/main2.js @@ -1,5 +1,5 @@ -import { x } from './generated-chunk.js'; -import { z } from './generated-chunk2.js'; +import { x } from './generated-dep1.js'; +import { z } from './generated-dep3.js'; var main2 = x + z; diff --git a/test/chunking-form/samples/grouping-size/_expected/es/main3.js b/test/chunking-form/samples/grouping-size/_expected/es/main3.js index 0e6aa638c19..27a13fc9109 100644 --- a/test/chunking-form/samples/grouping-size/_expected/es/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/es/main3.js @@ -1,4 +1,4 @@ -import { y, z } from './generated-chunk2.js'; +import { y, z } from './generated-dep3.js'; var main3 = y + z; diff --git a/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk.js b/test/chunking-form/samples/grouping-size/_expected/system/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/system/generated-chunk.js rename to test/chunking-form/samples/grouping-size/_expected/system/generated-dep1.js diff --git a/test/chunking-form/samples/grouping-size/_expected/system/generated-chunk2.js b/test/chunking-form/samples/grouping-size/_expected/system/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/grouping-size/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/grouping-size/_expected/system/generated-dep3.js diff --git a/test/chunking-form/samples/grouping-size/_expected/system/main1.js b/test/chunking-form/samples/grouping-size/_expected/system/main1.js index 2178827b1bd..27aca0a7647 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/main1.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function (exports) { +System.register(['./generated-dep1.js', './generated-dep3.js'], function (exports) { 'use strict'; var x, y; return { diff --git a/test/chunking-form/samples/grouping-size/_expected/system/main2.js b/test/chunking-form/samples/grouping-size/_expected/system/main2.js index 3c03de1b558..9b1886c4026 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/main2.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function (exports) { +System.register(['./generated-dep1.js', './generated-dep3.js'], function (exports) { 'use strict'; var x, z; return { diff --git a/test/chunking-form/samples/grouping-size/_expected/system/main3.js b/test/chunking-form/samples/grouping-size/_expected/system/main3.js index 48858805f74..b691d6096e2 100644 --- a/test/chunking-form/samples/grouping-size/_expected/system/main3.js +++ b/test/chunking-form/samples/grouping-size/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk2.js'], function (exports) { +System.register(['./generated-dep3.js'], function (exports) { 'use strict'; var y, z; return { diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk.js b/test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep1.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk2.js rename to test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/amd/generated-chunk3.js rename to test/chunking-form/samples/multi-chunking/_expected/amd/generated-dep3.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js b/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js index 241f3b4decf..d80fcec60b9 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2'], function (dep1, dep2) { 'use strict'; +define(['./generated-dep1', './generated-dep2'], function (dep1, dep2) { 'use strict'; console.log(dep1.num + dep2.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js b/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js index be42a710778..a1004c1c5e5 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk2', './generated-chunk3'], function (dep2, dep3) { 'use strict'; +define(['./generated-dep2', './generated-dep3'], function (dep2, dep3) { 'use strict'; console.log(dep2.num + dep3.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js b/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js index 7ac5d88e84b..d7f5a6375ad 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk3'], function (dep1, dep3) { 'use strict'; +define(['./generated-dep1', './generated-dep3'], function (dep1, dep3) { 'use strict'; console.log(dep1.num + dep3.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep1.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/cjs/generated-chunk3.js rename to test/chunking-form/samples/multi-chunking/_expected/cjs/generated-dep3.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js index 97a9e5c06ee..8b5a4997485 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); -var dep2 = require('./generated-chunk2.js'); +var dep1 = require('./generated-dep1.js'); +var dep2 = require('./generated-dep2.js'); console.log(dep1.num + dep2.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js index aa5a8a1765e..d94a40ca098 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/cjs/main2.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk2.js'); -var dep3 = require('./generated-chunk3.js'); +var dep2 = require('./generated-dep2.js'); +var dep3 = require('./generated-dep3.js'); console.log(dep2.num + dep3.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js b/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js index 825f821e4ee..3ec0b7eeba4 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/cjs/main3.js @@ -1,6 +1,6 @@ 'use strict'; -var dep1 = require('./generated-chunk.js'); -var dep3 = require('./generated-chunk3.js'); +var dep1 = require('./generated-dep1.js'); +var dep3 = require('./generated-dep3.js'); console.log(dep1.num + dep3.num); diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk.js b/test/chunking-form/samples/multi-chunking/_expected/es/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk.js rename to test/chunking-form/samples/multi-chunking/_expected/es/generated-dep1.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/multi-chunking/_expected/es/generated-dep2.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/es/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/es/generated-chunk3.js rename to test/chunking-form/samples/multi-chunking/_expected/es/generated-dep3.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/main1.js b/test/chunking-form/samples/multi-chunking/_expected/es/main1.js index 283b9dd7f7b..bdc757ad123 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/es/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { n as num } from './generated-chunk.js'; -import { n as num$1 } from './generated-chunk2.js'; +import { n as num } from './generated-dep1.js'; +import { n as num$1 } from './generated-dep2.js'; console.log(num + num$1); diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/main2.js b/test/chunking-form/samples/multi-chunking/_expected/es/main2.js index f6ea4b201e1..910ca24c1bf 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/es/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/es/main2.js @@ -1,4 +1,4 @@ -import { n as num } from './generated-chunk2.js'; -import { n as num$1 } from './generated-chunk3.js'; +import { n as num } from './generated-dep2.js'; +import { n as num$1 } from './generated-dep3.js'; console.log(num + num$1); diff --git a/test/chunking-form/samples/multi-chunking/_expected/es/main3.js b/test/chunking-form/samples/multi-chunking/_expected/es/main3.js index 9b2232a482a..dd0e733e824 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/es/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/es/main3.js @@ -1,4 +1,4 @@ -import { n as num } from './generated-chunk.js'; -import { n as num$1 } from './generated-chunk3.js'; +import { n as num } from './generated-dep1.js'; +import { n as num$1 } from './generated-dep3.js'; console.log(num + num$1); diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk.js b/test/chunking-form/samples/multi-chunking/_expected/system/generated-dep1.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk.js rename to test/chunking-form/samples/multi-chunking/_expected/system/generated-dep1.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk2.js b/test/chunking-form/samples/multi-chunking/_expected/system/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/multi-chunking/_expected/system/generated-dep2.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk3.js b/test/chunking-form/samples/multi-chunking/_expected/system/generated-dep3.js similarity index 100% rename from test/chunking-form/samples/multi-chunking/_expected/system/generated-chunk3.js rename to test/chunking-form/samples/multi-chunking/_expected/system/generated-dep3.js diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/main1.js b/test/chunking-form/samples/multi-chunking/_expected/system/main1.js index da512ecf173..3225e3904ba 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/main1.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function () { +System.register(['./generated-dep1.js', './generated-dep2.js'], function () { 'use strict'; var num, num$1; return { diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/main2.js b/test/chunking-form/samples/multi-chunking/_expected/system/main2.js index 38a4353f3f4..36473866c15 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/main2.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep2.js', './generated-dep3.js'], function () { 'use strict'; var num, num$1; return { diff --git a/test/chunking-form/samples/multi-chunking/_expected/system/main3.js b/test/chunking-form/samples/multi-chunking/_expected/system/main3.js index 08c6b10c8df..969f68fdd31 100644 --- a/test/chunking-form/samples/multi-chunking/_expected/system/main3.js +++ b/test/chunking-form/samples/multi-chunking/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk3.js'], function () { +System.register(['./generated-dep1.js', './generated-dep3.js'], function () { 'use strict'; var num, num$1; return { diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/chunk.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/chunk.js rename to test/chunking-form/samples/multiple-entry-points/_expected/amd/chunks/shared.js diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js index 3a71fb0a580..d9da2d72b7c 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['./chunks/chunk'], function (shared) { 'use strict'; +define(['./chunks/shared'], function (shared) { 'use strict'; assert.equal(shared.sharedValue, 'shared'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js index f956e7d89dd..dbb13d1f811 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/amd/other.js @@ -1,4 +1,4 @@ -define(['exports', './chunks/chunk'], function (exports, shared) { 'use strict'; +define(['exports', './chunks/shared'], function (exports, shared) { 'use strict'; diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/chunk.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/chunk.js rename to test/chunking-form/samples/multiple-entry-points/_expected/cjs/chunks/shared.js diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js index 21f7a767310..713701b7e81 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/main.js @@ -1,5 +1,5 @@ 'use strict'; -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); assert.equal(shared.sharedValue, 'shared'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js index dd37c515620..40cf77c3578 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/cjs/other.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var shared = require('./chunks/chunk.js'); +var shared = require('./chunks/shared.js'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/chunk.js b/test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/chunk.js rename to test/chunking-form/samples/multiple-entry-points/_expected/es/chunks/shared.js diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/es/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/es/main.js index 4f329e1fd8f..9af3da63084 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/es/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/es/main.js @@ -1,3 +1,3 @@ -import { s as sharedValue } from './chunks/chunk.js'; +import { s as sharedValue } from './chunks/shared.js'; assert.equal(sharedValue, 'shared'); diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/es/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/es/other.js index c31fc8ebe03..7500959c939 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/es/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/es/other.js @@ -1 +1 @@ -export { s as sharedValue } from './chunks/chunk.js'; +export { s as sharedValue } from './chunks/shared.js'; diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/chunk.js b/test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/shared.js similarity index 100% rename from test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/chunk.js rename to test/chunking-form/samples/multiple-entry-points/_expected/system/chunks/shared.js diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js b/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js index 8c2f77a463e..e1235fab616 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function () { +System.register(['./chunks/shared.js'], function () { 'use strict'; var sharedValue; return { diff --git a/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js b/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js index 4a10ce2e599..3dac21b55e7 100644 --- a/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js +++ b/test/chunking-form/samples/multiple-entry-points/_expected/system/other.js @@ -1,4 +1,4 @@ -System.register(['./chunks/chunk.js'], function (exports) { +System.register(['./chunks/shared.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/namespace-object-import/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-object-import/_expected/amd/generated-main2.js similarity index 100% rename from test/chunking-form/samples/namespace-object-import/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-object-import/_expected/amd/generated-main2.js diff --git a/test/chunking-form/samples/namespace-object-import/_expected/amd/main1.js b/test/chunking-form/samples/namespace-object-import/_expected/amd/main1.js index 585aa959563..78484e848f0 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/amd/main1.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (main2) { 'use strict'; +define(['./generated-main2'], function (main2) { 'use strict'; console.log(main2.a); diff --git a/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js index ab807b27492..58cbd115137 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, main2) { 'use strict'; +define(['exports', './generated-main2'], function (exports, main2) { 'use strict'; diff --git a/test/chunking-form/samples/namespace-object-import/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-object-import/_expected/cjs/generated-main2.js similarity index 100% rename from test/chunking-form/samples/namespace-object-import/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-object-import/_expected/cjs/generated-main2.js diff --git a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main1.js b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main1.js index 09ee475014d..76c02e55904 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main1.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var main2 = require('./generated-chunk.js'); +var main2 = require('./generated-main2.js'); console.log(main2.a); diff --git a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js index ad7ea0780cc..688bfd2c811 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/cjs/main2.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var main2 = require('./generated-chunk.js'); +var main2 = require('./generated-main2.js'); diff --git a/test/chunking-form/samples/namespace-object-import/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-object-import/_expected/es/generated-main2.js similarity index 100% rename from test/chunking-form/samples/namespace-object-import/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-object-import/_expected/es/generated-main2.js diff --git a/test/chunking-form/samples/namespace-object-import/_expected/es/main1.js b/test/chunking-form/samples/namespace-object-import/_expected/es/main1.js index 312052b1e75..be5e5bf30b0 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/es/main1.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { a, m as main2 } from './generated-chunk.js'; +import { a, m as main2 } from './generated-main2.js'; console.log(a); diff --git a/test/chunking-form/samples/namespace-object-import/_expected/es/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/es/main2.js index 794f1dbe5a9..221b2d2b14c 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/es/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/es/main2.js @@ -1 +1 @@ -export { a, b } from './generated-chunk.js'; +export { a, b } from './generated-main2.js'; diff --git a/test/chunking-form/samples/namespace-object-import/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-object-import/_expected/system/generated-main2.js similarity index 100% rename from test/chunking-form/samples/namespace-object-import/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-object-import/_expected/system/generated-main2.js diff --git a/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js b/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js index d2b38ecf6aa..7e0b6ecc415 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-main2.js'], function () { 'use strict'; var a, main2; return { diff --git a/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js b/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js index 5e3927b3b23..b72cf2e0366 100644 --- a/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js +++ b/test/chunking-form/samples/namespace-object-import/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-main2.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-index.js similarity index 57% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-index.js index 42413614a36..8609967a094 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/generated-index.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk', 'external'], function (exports, dep, external) { 'use strict'; +define(['exports', './generated-dep', 'external'], function (exports, dep, external) { 'use strict'; console.log(external.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js index 27080798f40..e27605e3143 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', 'external', './generated-chunk2'], function (dep, external, index) { 'use strict'; +define(['./generated-dep', 'external', './generated-index'], function (dep, external, index) { 'use strict'; console.log(index.lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js index e054ba744c3..2187075bd38 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', 'external', './generated-chunk2'], function (dep, external, index) { 'use strict'; +define(['./generated-dep', 'external', './generated-index'], function (dep, external, index) { 'use strict'; console.log(dep.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js index 60c4edba0a2..6401b09a1e2 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-index.js similarity index 80% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-index.js index 52d701a5760..2615d5c1483 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/generated-index.js @@ -1,6 +1,6 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); var external = require('external'); console.log(external.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js index a39cf01b525..76ea0a89824 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main1.js @@ -1,7 +1,7 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep.js'); require('external'); -var index = require('./generated-chunk2.js'); +var index = require('./generated-index.js'); console.log(index.lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js index 4c77f2beb0f..a97a14db2d7 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main2.js @@ -1,7 +1,7 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); require('external'); -require('./generated-chunk2.js'); +require('./generated-index.js'); console.log(dep.reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main3.js index cd3e1d69188..9fcaf192db3 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main3.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/cjs/main3.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep.js'); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-index.js similarity index 73% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-index.js index 9abe01c7f87..78e52033db5 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/generated-index.js @@ -1,4 +1,4 @@ -import { r as reexported$1 } from './generated-chunk.js'; +import { r as reexported$1 } from './generated-dep.js'; import { reexported } from 'external'; console.log(reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js index 62f034ff6a1..2de2224803a 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main1.js @@ -1,5 +1,5 @@ -import './generated-chunk.js'; +import './generated-dep.js'; import 'external'; -import { l as lib } from './generated-chunk2.js'; +import { l as lib } from './generated-index.js'; console.log(lib); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js index 5007839a655..0ad3b767a61 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main2.js @@ -1,5 +1,5 @@ -import { r as reexported } from './generated-chunk.js'; +import { r as reexported } from './generated-dep.js'; import 'external'; -import './generated-chunk2.js'; +import './generated-index.js'; console.log(reexported); diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main3.js index 5d03e846db5..81875f89bf4 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main3.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/es/main3.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep.js'; diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-index.js similarity index 82% rename from test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-index.js index 3fe5c861605..5acfbcac078 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/generated-index.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', 'external'], function (exports) { +System.register(['./generated-dep.js', 'external'], function (exports) { 'use strict'; var reexported$1, reexported; return { diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js index f3ba426750f..aa87cd2e3bb 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', 'external', './generated-chunk2.js'], function () { +System.register(['./generated-dep.js', 'external', './generated-index.js'], function () { 'use strict'; var lib; return { diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js index a2deeafcd55..776944744d8 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', 'external', './generated-chunk2.js'], function () { +System.register(['./generated-dep.js', 'external', './generated-index.js'], function () { 'use strict'; var reexported; return { diff --git a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js index 0546a48da7c..0b6277f0f56 100644 --- a/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js +++ b/test/chunking-form/samples/namespace-reexport-name-conflict/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js similarity index 100% rename from test/chunking-form/samples/namespace-reexports/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-reexports/_expected/amd/generated-index.js diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js index 403b5f70f60..1c0eff2a0ca 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/index.js @@ -1,4 +1,4 @@ -define(['exports', './hsl2hsv', './generated-chunk'], function (exports, hsl2hsv$1, index) { 'use strict'; +define(['exports', './hsl2hsv', './generated-index'], function (exports, hsl2hsv$1, index) { 'use strict'; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js index 95dbd44f35d..ab833f3837e 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['exports', './hsl2hsv', './generated-chunk'], function (exports, hsl2hsv$1, index) { 'use strict'; +define(['exports', './hsl2hsv', './generated-index'], function (exports, hsl2hsv$1, index) { 'use strict'; console.log(hsl2hsv$1.p); var main = new Map(Object.entries(index.lib)); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js similarity index 100% rename from test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-reexports/_expected/cjs/generated-index.js diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js index dc695449285..cd95edf7d26 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/index.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var hsl2hsv$1 = require('./hsl2hsv.js'); -require('./generated-chunk.js'); +require('./generated-index.js'); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js index 19c3b6a8ff6..f56ee42c2ad 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/cjs/main.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); var hsl2hsv$1 = require('./hsl2hsv.js'); -var index = require('./generated-chunk.js'); +var index = require('./generated-index.js'); console.log(hsl2hsv$1.p); var main = new Map(Object.entries(index.lib)); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-reexports/_expected/es/generated-index.js similarity index 100% rename from test/chunking-form/samples/namespace-reexports/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-reexports/_expected/es/generated-index.js diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/index.js b/test/chunking-form/samples/namespace-reexports/_expected/es/index.js index bd43de91785..18fe44189f4 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/es/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/es/index.js @@ -1,2 +1,2 @@ export { default as hsl2hsv } from './hsl2hsv.js'; -import './generated-chunk.js'; +import './generated-index.js'; diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/main.js b/test/chunking-form/samples/namespace-reexports/_expected/es/main.js index 4ebbb5a0a1d..3b20f239985 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/es/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/es/main.js @@ -1,5 +1,5 @@ import { p } from './hsl2hsv.js'; -import { l as lib } from './generated-chunk.js'; +import { l as lib } from './generated-index.js'; console.log(p); var main = new Map(Object.entries(lib)); diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js similarity index 100% rename from test/chunking-form/samples/namespace-reexports/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-reexports/_expected/system/generated-index.js diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js index e5b95ce7584..3df535ca051 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/index.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/index.js @@ -1,4 +1,4 @@ -System.register(['./hsl2hsv.js', './generated-chunk.js'], function (exports) { +System.register(['./hsl2hsv.js', './generated-index.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/main.js b/test/chunking-form/samples/namespace-reexports/_expected/system/main.js index 59f90f5cdd4..bcb4935821d 100644 --- a/test/chunking-form/samples/namespace-reexports/_expected/system/main.js +++ b/test/chunking-form/samples/namespace-reexports/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./hsl2hsv.js', './generated-chunk.js'], function (exports) { +System.register(['./hsl2hsv.js', './generated-index.js'], function (exports) { 'use strict'; var p, lib; return { diff --git a/test/chunking-form/samples/namespace-retracing/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-retracing/_expected/amd/generated-other.js similarity index 100% rename from test/chunking-form/samples/namespace-retracing/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-retracing/_expected/amd/generated-other.js diff --git a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js index 716dfb53d76..8dae1d07429 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-a.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (other) { 'use strict'; +define(['./generated-other'], function (other) { 'use strict'; other.Other.doSomething(); other.Broken.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js index e1dd9238e1c..0466893c505 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/amd/main-b.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (other) { 'use strict'; +define(['./generated-other'], function (other) { 'use strict'; other.Other.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-retracing/_expected/cjs/generated-other.js similarity index 100% rename from test/chunking-form/samples/namespace-retracing/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-retracing/_expected/cjs/generated-other.js diff --git a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js index a7b7bb36ca6..2cdbc64098d 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-a.js @@ -1,6 +1,6 @@ 'use strict'; -var other = require('./generated-chunk.js'); +var other = require('./generated-other.js'); other.Other.doSomething(); other.Broken.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js index 2434778310d..0d2c9c16c86 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/cjs/main-b.js @@ -1,5 +1,5 @@ 'use strict'; -var other = require('./generated-chunk.js'); +var other = require('./generated-other.js'); other.Other.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-retracing/_expected/es/generated-other.js similarity index 100% rename from test/chunking-form/samples/namespace-retracing/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-retracing/_expected/es/generated-other.js diff --git a/test/chunking-form/samples/namespace-retracing/_expected/es/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/es/main-a.js index 15c86ffaca0..a6d3bd5379d 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/es/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/es/main-a.js @@ -1,4 +1,4 @@ -import { O as Other, B as Broken } from './generated-chunk.js'; +import { O as Other, B as Broken } from './generated-other.js'; Other.doSomething(); Broken.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/es/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/es/main-b.js index 2d07b85a658..affda9718cc 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/es/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/es/main-b.js @@ -1,3 +1,3 @@ -import { O as Other } from './generated-chunk.js'; +import { O as Other } from './generated-other.js'; Other.doSomething(); diff --git a/test/chunking-form/samples/namespace-retracing/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-retracing/_expected/system/generated-other.js similarity index 100% rename from test/chunking-form/samples/namespace-retracing/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-retracing/_expected/system/generated-other.js diff --git a/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js b/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js index 94cfa6183b7..8e17f8f314a 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/system/main-a.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-other.js'], function () { 'use strict'; var Other, Broken; return { diff --git a/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js b/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js index 0d1c1119146..8d057522e89 100644 --- a/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js +++ b/test/chunking-form/samples/namespace-retracing/_expected/system/main-b.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-other.js'], function () { 'use strict'; var Other; return { diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-bar.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-bar.js new file mode 100644 index 00000000000..43cc41e1615 --- /dev/null +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-bar.js @@ -0,0 +1,9 @@ +define(['exports', './generated-broken'], function (exports, broken) { 'use strict'; + + function bar() { + console.log('bar'); + } + + exports.bar = bar; + +}); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-broken.js similarity index 100% rename from test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/namespace-tracing/_expected/amd/generated-broken.js diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js deleted file mode 100644 index 9c8503e7aee..00000000000 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk2.js +++ /dev/null @@ -1,9 +0,0 @@ -define(['exports', './generated-chunk'], function (exports, broken) { 'use strict'; - - function foo() { - console.log('foo'); - } - - exports.foo = foo; - -}); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js deleted file mode 100644 index ef36cc32878..00000000000 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-chunk3.js +++ /dev/null @@ -1,9 +0,0 @@ -define(['exports', './generated-chunk'], function (exports, broken) { 'use strict'; - - function bar() { - console.log('bar'); - } - - exports.bar = bar; - -}); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-foo.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-foo.js new file mode 100644 index 00000000000..d08ae86cc78 --- /dev/null +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/generated-foo.js @@ -0,0 +1,9 @@ +define(['exports', './generated-broken'], function (exports, broken) { 'use strict'; + + function foo() { + console.log('foo'); + } + + exports.foo = foo; + +}); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js index 3913f749429..57ff8799c78 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-a.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2'], function (broken, foo) { 'use strict'; +define(['./generated-broken', './generated-foo'], function (broken, foo) { 'use strict'; foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js index fdce3215734..a765544075c 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-b.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk2', './generated-chunk3'], function (broken, foo, bar) { 'use strict'; +define(['./generated-broken', './generated-foo', './generated-bar'], function (broken, foo, bar) { 'use strict'; foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js index 2d8063dc6b7..3294fe2a7fc 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/amd/main-c.js @@ -1,4 +1,4 @@ -define(['./generated-chunk', './generated-chunk3'], function (broken, bar) { 'use strict'; +define(['./generated-broken', './generated-bar'], function (broken, bar) { 'use strict'; bar.bar(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-bar.js similarity index 69% rename from test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk3.js rename to test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-bar.js index 7dcb4144d19..c1ada01763e 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk3.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-bar.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-broken.js'); function bar() { console.log('bar'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-broken.js similarity index 100% rename from test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-broken.js diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-foo.js similarity index 69% rename from test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk2.js rename to test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-foo.js index c84a8c1f21a..cf2842741a0 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/generated-foo.js @@ -1,6 +1,6 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-broken.js'); function foo() { console.log('foo'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js index d62d63dc1a3..dc1c5e9f6f3 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-a.js @@ -1,7 +1,7 @@ 'use strict'; -var broken = require('./generated-chunk.js'); -var foo = require('./generated-chunk2.js'); +var broken = require('./generated-broken.js'); +var foo = require('./generated-foo.js'); foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js index 4d042398ce2..6ee2b541f99 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-b.js @@ -1,8 +1,8 @@ 'use strict'; -var broken = require('./generated-chunk.js'); -var foo = require('./generated-chunk2.js'); -var bar = require('./generated-chunk3.js'); +var broken = require('./generated-broken.js'); +var foo = require('./generated-foo.js'); +var bar = require('./generated-bar.js'); foo.foo(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js index fbe86e301ea..54cdd8631bb 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/cjs/main-c.js @@ -1,7 +1,7 @@ 'use strict'; -var broken = require('./generated-chunk.js'); -var bar = require('./generated-chunk3.js'); +var broken = require('./generated-broken.js'); +var bar = require('./generated-bar.js'); bar.bar(); broken.broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-bar.js similarity index 66% rename from test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js rename to test/chunking-form/samples/namespace-tracing/_expected/es/generated-bar.js index ccc1008b239..f6d2390fb6c 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk3.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-bar.js @@ -1,4 +1,4 @@ -import './generated-chunk.js'; +import './generated-broken.js'; function bar() { console.log('bar'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-broken.js similarity index 100% rename from test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk.js rename to test/chunking-form/samples/namespace-tracing/_expected/es/generated-broken.js diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-foo.js similarity index 66% rename from test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js rename to test/chunking-form/samples/namespace-tracing/_expected/es/generated-foo.js index 2d374209102..9792caf6b29 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/generated-foo.js @@ -1,4 +1,4 @@ -import './generated-chunk.js'; +import './generated-broken.js'; function foo() { console.log('foo'); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js index 6e2804603b4..36c262d3265 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/main-a.js @@ -1,5 +1,5 @@ -import { b as broken } from './generated-chunk.js'; -import { f as foo } from './generated-chunk2.js'; +import { b as broken } from './generated-broken.js'; +import { f as foo } from './generated-foo.js'; foo(); broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js index 2680a53a1cb..6da3133e340 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/main-b.js @@ -1,6 +1,6 @@ -import { b as broken } from './generated-chunk.js'; -import { f as foo } from './generated-chunk2.js'; -import { b as bar } from './generated-chunk3.js'; +import { b as broken } from './generated-broken.js'; +import { f as foo } from './generated-foo.js'; +import { b as bar } from './generated-bar.js'; foo(); broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js index 444fdcd8d0d..ba24b661e25 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/es/main-c.js @@ -1,5 +1,5 @@ -import { b as broken } from './generated-chunk.js'; -import { b as bar } from './generated-chunk3.js'; +import { b as broken } from './generated-broken.js'; +import { b as bar } from './generated-bar.js'; bar(); broken(); diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-bar.js similarity index 74% rename from test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js rename to test/chunking-form/samples/namespace-tracing/_expected/system/generated-bar.js index f0764f0e98c..ffd4c4e677a 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk3.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-bar.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-broken.js'], function (exports) { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk.js b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-broken.js similarity index 100% rename from test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk.js rename to test/chunking-form/samples/namespace-tracing/_expected/system/generated-broken.js diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-foo.js similarity index 74% rename from test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js rename to test/chunking-form/samples/namespace-tracing/_expected/system/generated-foo.js index d354d7ad489..4a975af238b 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/generated-chunk2.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/generated-foo.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-broken.js'], function (exports) { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js b/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js index 8707b6feebd..a6734308369 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-a.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js'], function () { +System.register(['./generated-broken.js', './generated-foo.js'], function () { 'use strict'; var broken, foo; return { diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js b/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js index 2115d848c3e..720016f85f6 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-b.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk2.js', './generated-chunk3.js'], function () { +System.register(['./generated-broken.js', './generated-foo.js', './generated-bar.js'], function () { 'use strict'; var broken, foo, bar; return { diff --git a/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js b/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js index cafc635a882..7a4c645212e 100644 --- a/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js +++ b/test/chunking-form/samples/namespace-tracing/_expected/system/main-c.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js', './generated-chunk3.js'], function () { +System.register(['./generated-broken.js', './generated-bar.js'], function () { 'use strict'; var broken, bar; return { diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/nested-chunks/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/nested-chunks/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js index e844cf32aa9..3321e9b5522 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['require', './generated-chunk'], function (require, dep) { 'use strict'; +define(['require', './generated-dep'], function (require, dep) { 'use strict'; function _interopNamespace(e) { if (e && e.__esModule) { return e; } else { diff --git a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js index 9dd19fb5de2..4cc20c12c2d 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/amd/nested/main2.js @@ -1,4 +1,4 @@ -define(['require', '../generated-chunk'], function (require, dep) { 'use strict'; +define(['require', '../generated-dep'], function (require, dep) { 'use strict'; function _interopNamespace(e) { if (e && e.__esModule) { return e; } else { diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/nested-chunks/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/nested-chunks/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js index bbaad8b217c..52074306591 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/main1.js @@ -19,7 +19,7 @@ function _interopNamespace(e) { } } -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('main1', dep.value); diff --git a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js index d32364b2355..3566c8527df 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/cjs/nested/main2.js @@ -19,7 +19,7 @@ function _interopNamespace(e) { } } -var dep = require('../generated-chunk.js'); +var dep = require('../generated-dep.js'); console.log('main2', dep.value); diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/nested-chunks/_expected/es/generated-chunk.js rename to test/chunking-form/samples/nested-chunks/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/main1.js b/test/chunking-form/samples/nested-chunks/_expected/es/main1.js index 4151def9fa9..3f3e65f4aa6 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/es/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { v as value } from './generated-chunk.js'; +import { v as value } from './generated-dep.js'; console.log('main1', value); diff --git a/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js index c6e95061a3d..85a5ad91b96 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/es/nested/main2.js @@ -1,4 +1,4 @@ -import { v as value } from '../generated-chunk.js'; +import { v as value } from '../generated-dep.js'; console.log('main2', value); diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/generated-chunk.js b/test/chunking-form/samples/nested-chunks/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/nested-chunks/_expected/system/generated-chunk.js rename to test/chunking-form/samples/nested-chunks/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/main1.js b/test/chunking-form/samples/nested-chunks/_expected/system/main1.js index ed575d5ed4f..079ee4a97fb 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/system/main1.js +++ b/test/chunking-form/samples/nested-chunks/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports, module) { +System.register(['./generated-dep.js'], function (exports, module) { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js b/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js index 18862f8a50e..9b7473ec5cf 100644 --- a/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js +++ b/test/chunking-form/samples/nested-chunks/_expected/system/nested/main2.js @@ -1,4 +1,4 @@ -System.register(['../generated-chunk.js'], function (exports, module) { +System.register(['../generated-dep.js'], function (exports, module) { 'use strict'; var value; return { diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-chunk.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-otherEntry.js similarity index 100% rename from test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/reexport-from-entry/_expected/amd/generated-otherEntry.js diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js index 08797ca7d91..a917dd64a09 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, otherEntry) { 'use strict'; +define(['exports', './generated-otherEntry'], function (exports, otherEntry) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js index 1165026a188..67cdcc8d4ad 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/amd/otherEntry.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, otherEntry) { 'use strict'; +define(['exports', './generated-otherEntry'], function (exports, otherEntry) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-otherEntry.js similarity index 100% rename from test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/reexport-from-entry/_expected/cjs/generated-otherEntry.js diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js index 0c5f311b215..f20f54e462f 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/main.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var otherEntry = require('./generated-chunk.js'); +var otherEntry = require('./generated-otherEntry.js'); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js index 43ada6a8da1..683a67be054 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/cjs/otherEntry.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var otherEntry = require('./generated-chunk.js'); +var otherEntry = require('./generated-otherEntry.js'); diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/es/generated-chunk.js b/test/chunking-form/samples/reexport-from-entry/_expected/es/generated-otherEntry.js similarity index 100% rename from test/chunking-form/samples/reexport-from-entry/_expected/es/generated-chunk.js rename to test/chunking-form/samples/reexport-from-entry/_expected/es/generated-otherEntry.js diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/es/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/es/main.js index e4102b9ca06..f3332346bba 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/es/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/es/main.js @@ -1 +1 @@ -export { a, c } from './generated-chunk.js'; +export { a, c } from './generated-otherEntry.js'; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js index fe77963101f..55b811935d3 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/es/otherEntry.js @@ -1 +1 @@ -export { b, c } from './generated-chunk.js'; +export { b, c } from './generated-otherEntry.js'; diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/system/generated-chunk.js b/test/chunking-form/samples/reexport-from-entry/_expected/system/generated-otherEntry.js similarity index 100% rename from test/chunking-form/samples/reexport-from-entry/_expected/system/generated-chunk.js rename to test/chunking-form/samples/reexport-from-entry/_expected/system/generated-otherEntry.js diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js b/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js index e606d15fab6..ed7997ea08b 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-otherEntry.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js b/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js index f2975a5a236..54a7527b442 100644 --- a/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js +++ b/test/chunking-form/samples/reexport-from-entry/_expected/system/otherEntry.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-otherEntry.js'], function (exports) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/generated-chunk.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/reexport-shortpaths/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/reexport-shortpaths/_expected/amd/generated-dep2.js diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js index 01aa9f8c94c..c20bbae9105 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js index d41d6fbb8d7..8806f30b198 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js index d41d6fbb8d7..8806f30b198 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/amd/main3.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep2) { 'use strict'; +define(['./generated-dep2'], function (dep2) { 'use strict'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/reexport-shortpaths/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/reexport-shortpaths/_expected/cjs/generated-dep2.js diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js index 15404e8950b..660ed01c2f9 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main1.js @@ -1,6 +1,6 @@ 'use strict'; -var dep2 = require('./generated-chunk.js'); +var dep2 = require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main2.js index cd3e1d69188..8bcaed1c530 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main2.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main3.js index cd3e1d69188..8bcaed1c530 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/cjs/main3.js @@ -1,4 +1,4 @@ 'use strict'; -require('./generated-chunk.js'); +require('./generated-dep2.js'); diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-chunk.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-chunk.js rename to test/chunking-form/samples/reexport-shortpaths/_expected/es/generated-dep2.js diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js index 927e1ccf171..fb0148dad4a 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main1.js @@ -1,4 +1,4 @@ -import { f as foo } from './generated-chunk.js'; +import { f as foo } from './generated-dep2.js'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main2.js index 5d03e846db5..e38989d38f2 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main2.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep2.js'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main3.js index 5d03e846db5..e38989d38f2 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/es/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/es/main3.js @@ -1 +1 @@ -import './generated-chunk.js'; +import './generated-dep2.js'; diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-chunk.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-dep2.js similarity index 100% rename from test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-chunk.js rename to test/chunking-form/samples/reexport-shortpaths/_expected/system/generated-dep2.js diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js index 0197c25f351..3de029c4f12 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-dep2.js'], function (exports) { 'use strict'; var foo; return { diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js index 0546a48da7c..73473efce7c 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep2.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js index 0546a48da7c..73473efce7c 100644 --- a/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js +++ b/test/chunking-form/samples/reexport-shortpaths/_expected/system/main3.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep2.js'], function () { 'use strict'; return { setters: [function () {}], diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js similarity index 72% rename from test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js rename to test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js index a106c2a7287..ab30e5c7536 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/chunk-chunk.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/chunk-dep2.js @@ -5,8 +5,8 @@ define(['exports'], function (exports) { 'use strict'; exports.num = num; }); -console.log('fileName', 'chunk-chunk.js'); +console.log('fileName', 'chunk-dep2.js'); console.log('imports', ''); console.log('isEntry', false); -console.log('name', 'chunk'); +console.log('name', 'dep2'); console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main1.js b/test/chunking-form/samples/render-chunk/_expected/amd/main1.js index 0de55adbbf9..ea52a11c0f9 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./chunk-chunk'], function (dep2) { 'use strict'; +define(['./chunk-dep2'], function (dep2) { 'use strict'; var num = 1; @@ -6,7 +6,7 @@ define(['./chunk-chunk'], function (dep2) { 'use strict'; }); console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main1'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/amd/main2.js b/test/chunking-form/samples/render-chunk/_expected/amd/main2.js index 07f680de4a4..9dee74671ae 100644 --- a/test/chunking-form/samples/render-chunk/_expected/amd/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./chunk-chunk'], function (dep2) { 'use strict'; +define(['./chunk-dep2'], function (dep2) { 'use strict'; var num = 3; @@ -6,7 +6,7 @@ define(['./chunk-chunk'], function (dep2) { 'use strict'; }); console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main2'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js similarity index 65% rename from test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js rename to test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js index 2e50e4012ed..ad01f5c7b03 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-chunk.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/chunk-dep2.js @@ -3,8 +3,8 @@ var num = 2; exports.num = num; -console.log('fileName', 'chunk-chunk.js'); +console.log('fileName', 'chunk-dep2.js'); console.log('imports', ''); console.log('isEntry', false); -console.log('name', 'chunk'); +console.log('name', 'dep2'); console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js index bdde6363441..86d308be0b0 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/main1.js @@ -1,12 +1,12 @@ 'use strict'; -var dep2 = require('./chunk-chunk.js'); +var dep2 = require('./chunk-dep2.js'); var num = 1; console.log(num + dep2.num); console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main1'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js b/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js index 74049b711a3..f142d493e16 100644 --- a/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/cjs/main2.js @@ -1,12 +1,12 @@ 'use strict'; -var dep2 = require('./chunk-chunk.js'); +var dep2 = require('./chunk-dep2.js'); var num = 3; console.log(dep2.num + num); console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main2'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js similarity index 63% rename from test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js rename to test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js index 872040311d2..20ae277758e 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/chunk-chunk.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/chunk-dep2.js @@ -1,8 +1,8 @@ var num = 2; export { num as n }; -console.log('fileName', 'chunk-chunk.js'); +console.log('fileName', 'chunk-dep2.js'); console.log('imports', ''); console.log('isEntry', false); -console.log('name', 'chunk'); +console.log('name', 'dep2'); console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/main1.js b/test/chunking-form/samples/render-chunk/_expected/es/main1.js index 0f011a9040f..c4b243a3998 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/main1.js @@ -1,10 +1,10 @@ -import { n as num$1 } from './chunk-chunk.js'; +import { n as num$1 } from './chunk-dep2.js'; var num = 1; console.log(num + num$1); console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main1'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/es/main2.js b/test/chunking-form/samples/render-chunk/_expected/es/main2.js index f015e249192..2666225853f 100644 --- a/test/chunking-form/samples/render-chunk/_expected/es/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/es/main2.js @@ -1,10 +1,10 @@ -import { n as num$1 } from './chunk-chunk.js'; +import { n as num$1 } from './chunk-dep2.js'; var num = 3; console.log(num$1 + num); console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main2'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js similarity index 75% rename from test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js rename to test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js index b84f63c3869..e408a3daf21 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/chunk-chunk.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/chunk-dep2.js @@ -8,8 +8,8 @@ System.register([], function (exports) { } }; }); -console.log('fileName', 'chunk-chunk.js'); +console.log('fileName', 'chunk-dep2.js'); console.log('imports', ''); console.log('isEntry', false); -console.log('name', 'chunk'); +console.log('name', 'dep2'); console.log('modules.length', 1); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main1.js b/test/chunking-form/samples/render-chunk/_expected/system/main1.js index 3988f51e28e..4120600f1c7 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/main1.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./chunk-chunk.js'], function () { +System.register(['./chunk-dep2.js'], function () { 'use strict'; var num$1; return { @@ -15,7 +15,7 @@ System.register(['./chunk-chunk.js'], function () { }; }); console.log('fileName', 'main1.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main1'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/render-chunk/_expected/system/main2.js b/test/chunking-form/samples/render-chunk/_expected/system/main2.js index 5f06d114583..952563b2e78 100644 --- a/test/chunking-form/samples/render-chunk/_expected/system/main2.js +++ b/test/chunking-form/samples/render-chunk/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./chunk-chunk.js'], function () { +System.register(['./chunk-dep2.js'], function () { 'use strict'; var num$1; return { @@ -15,7 +15,7 @@ System.register(['./chunk-chunk.js'], function () { }; }); console.log('fileName', 'main2.js'); -console.log('imports', 'chunk-chunk.js'); +console.log('imports', 'chunk-dep2.js'); console.log('isEntry', true); console.log('name', 'main2'); console.log('modules.length', 2); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-chunk.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-constants.js similarity index 100% rename from test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-constants.js diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js index 3d7f4c33046..0f399e25ebf 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/generated-lazy.js @@ -1,4 +1,4 @@ -define(['exports', './generated-chunk'], function (exports, constants) { 'use strict'; +define(['exports', './generated-constants'], function (exports, constants) { 'use strict'; var lazy = () => constants.v1; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js index 779c4810f2d..b301e43cc8a 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/amd/main.js @@ -1,4 +1,4 @@ -define(['require', 'exports', './generated-chunk'], function (require, exports, constants) { 'use strict'; +define(['require', 'exports', './generated-constants'], function (require, exports, constants) { 'use strict'; const lazy = new Promise(function (resolve, reject) { require(['./generated-lazy'], resolve, reject) }); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-constants.js similarity index 100% rename from test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-constants.js diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js index c8f3fa4490e..39df6fd6001 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/generated-lazy.js @@ -1,6 +1,6 @@ 'use strict'; -var constants = require('./generated-chunk.js'); +var constants = require('./generated-constants.js'); var lazy = () => constants.v1; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js index 13c0d7a30f6..45d50ce8b88 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/cjs/main.js @@ -2,7 +2,7 @@ Object.defineProperty(exports, '__esModule', { value: true }); -var constants = require('./generated-chunk.js'); +var constants = require('./generated-constants.js'); const lazy = new Promise(function (resolve) { resolve(require('./generated-lazy.js')); }); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-chunk.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-constants.js similarity index 100% rename from test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-chunk.js rename to test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-constants.js diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js index cab35d6029a..0ed413ad194 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/generated-lazy.js @@ -1,4 +1,4 @@ -import { v as v1 } from './generated-chunk.js'; +import { v as v1 } from './generated-constants.js'; var lazy = () => v1; diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/main.js index b706e857187..9f6233b1f85 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/es/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/es/main.js @@ -1,4 +1,4 @@ -export { v as v1, i as v10, aJ as v100, aK as v101, aL as v102, aM as v103, aN as v104, aO as v105, aP as v106, aQ as v107, aR as v108, aS as v109, j as v11, aT as v110, aU as v111, aV as v112, aW as v113, aX as v114, aY as v115, aZ as v116, a_ as v117, a$ as v118, b0 as v119, k as v12, b1 as v120, b2 as v121, b3 as v122, b4 as v123, b5 as v124, b6 as v125, b7 as v126, b8 as v127, b9 as v128, ba as v129, l as v13, bb as v130, bc as v131, bd as v132, be as v133, bf as v134, bg as v135, bh as v136, bi as v137, bj as v138, bk as v139, m as v14, bl as v140, bm as v141, bn as v142, bo as v143, bp as v144, bq as v145, br as v146, bs as v147, bt as v148, bu as v149, n as v15, bv as v150, bw as v151, bx as v152, by as v153, bz as v154, bA as v155, bB as v156, bC as v157, bD as v158, bE as v159, o as v16, bF as v160, bG as v161, bH as v162, bI as v163, bJ as v164, bK as v165, bL as v166, bM as v167, bN as v168, bO as v169, p as v17, bP as v170, bQ as v171, bR as v172, bS as v173, bT as v174, bU as v175, bV as v176, bW as v177, bX as v178, bY as v179, q as v18, bZ as v180, b_ as v181, b$ as v182, c0 as v183, c1 as v184, c2 as v185, c3 as v186, c4 as v187, c5 as v188, c6 as v189, r as v19, c7 as v190, c8 as v191, c9 as v192, ca as v193, cb as v194, cc as v195, cd as v196, ce as v197, cf as v198, cg as v199, a as v2, s as v20, ch as v200, ci as v201, cj as v202, ck as v203, cl as v204, cm as v205, cn as v206, co as v207, cp as v208, cq as v209, t as v21, cr as v210, cs as v211, ct as v212, cu as v213, cv as v214, cw as v215, cx as v216, cy as v217, cz as v218, cA as v219, u as v22, cB as v220, cC as v221, cD as v222, cE as v223, cF as v224, cG as v225, cH as v226, cI as v227, cJ as v228, cK as v229, w as v23, cL as v230, cM as v231, cN as v232, cO as v233, cP as v234, cQ as v235, cR as v236, cS as v237, cT as v238, cU as v239, x as v24, cV as v240, cW as v241, cX as v242, cY as v243, cZ as v244, c_ as v245, c$ as v246, d0 as v247, d1 as v248, d2 as v249, y as v25, d3 as v250, d4 as v251, d5 as v252, d6 as v253, d7 as v254, d8 as v255, d9 as v256, da as v257, db as v258, dc as v259, z as v26, dd as v260, de as v261, df as v262, dg as v263, dh as v264, di as v265, dj as v266, dk as v267, dl as v268, dm as v269, A as v27, dn as v270, dp as v271, dq as v272, B as v28, C as v29, b as v3, D as v30, E as v31, F as v32, G as v33, H as v34, I as v35, J as v36, K as v37, L as v38, M as v39, c as v4, N as v40, O as v41, P as v42, Q as v43, R as v44, S as v45, T as v46, U as v47, V as v48, W as v49, d as v5, X as v50, Y as v51, Z as v52, _ as v53, $ as v54, a0 as v55, a1 as v56, a2 as v57, a3 as v58, a4 as v59, e as v6, a5 as v60, a6 as v61, a7 as v62, a8 as v63, a9 as v64, aa as v65, ab as v66, ac as v67, ad as v68, ae as v69, f as v7, af as v70, ag as v71, ah as v72, ai as v73, aj as v74, ak as v75, al as v76, am as v77, an as v78, ao as v79, g as v8, ap as v80, aq as v81, ar as v82, as as v83, at as v84, au as v85, av as v86, aw as v87, ax as v88, ay as v89, h as v9, az as v90, aA as v91, aB as v92, aC as v93, aD as v94, aE as v95, aF as v96, aG as v97, aH as v98, aI as v99 } from './generated-chunk.js'; +export { v as v1, i as v10, aJ as v100, aK as v101, aL as v102, aM as v103, aN as v104, aO as v105, aP as v106, aQ as v107, aR as v108, aS as v109, j as v11, aT as v110, aU as v111, aV as v112, aW as v113, aX as v114, aY as v115, aZ as v116, a_ as v117, a$ as v118, b0 as v119, k as v12, b1 as v120, b2 as v121, b3 as v122, b4 as v123, b5 as v124, b6 as v125, b7 as v126, b8 as v127, b9 as v128, ba as v129, l as v13, bb as v130, bc as v131, bd as v132, be as v133, bf as v134, bg as v135, bh as v136, bi as v137, bj as v138, bk as v139, m as v14, bl as v140, bm as v141, bn as v142, bo as v143, bp as v144, bq as v145, br as v146, bs as v147, bt as v148, bu as v149, n as v15, bv as v150, bw as v151, bx as v152, by as v153, bz as v154, bA as v155, bB as v156, bC as v157, bD as v158, bE as v159, o as v16, bF as v160, bG as v161, bH as v162, bI as v163, bJ as v164, bK as v165, bL as v166, bM as v167, bN as v168, bO as v169, p as v17, bP as v170, bQ as v171, bR as v172, bS as v173, bT as v174, bU as v175, bV as v176, bW as v177, bX as v178, bY as v179, q as v18, bZ as v180, b_ as v181, b$ as v182, c0 as v183, c1 as v184, c2 as v185, c3 as v186, c4 as v187, c5 as v188, c6 as v189, r as v19, c7 as v190, c8 as v191, c9 as v192, ca as v193, cb as v194, cc as v195, cd as v196, ce as v197, cf as v198, cg as v199, a as v2, s as v20, ch as v200, ci as v201, cj as v202, ck as v203, cl as v204, cm as v205, cn as v206, co as v207, cp as v208, cq as v209, t as v21, cr as v210, cs as v211, ct as v212, cu as v213, cv as v214, cw as v215, cx as v216, cy as v217, cz as v218, cA as v219, u as v22, cB as v220, cC as v221, cD as v222, cE as v223, cF as v224, cG as v225, cH as v226, cI as v227, cJ as v228, cK as v229, w as v23, cL as v230, cM as v231, cN as v232, cO as v233, cP as v234, cQ as v235, cR as v236, cS as v237, cT as v238, cU as v239, x as v24, cV as v240, cW as v241, cX as v242, cY as v243, cZ as v244, c_ as v245, c$ as v246, d0 as v247, d1 as v248, d2 as v249, y as v25, d3 as v250, d4 as v251, d5 as v252, d6 as v253, d7 as v254, d8 as v255, d9 as v256, da as v257, db as v258, dc as v259, z as v26, dd as v260, de as v261, df as v262, dg as v263, dh as v264, di as v265, dj as v266, dk as v267, dl as v268, dm as v269, A as v27, dn as v270, dp as v271, dq as v272, B as v28, C as v29, b as v3, D as v30, E as v31, F as v32, G as v33, H as v34, I as v35, J as v36, K as v37, L as v38, M as v39, c as v4, N as v40, O as v41, P as v42, Q as v43, R as v44, S as v45, T as v46, U as v47, V as v48, W as v49, d as v5, X as v50, Y as v51, Z as v52, _ as v53, $ as v54, a0 as v55, a1 as v56, a2 as v57, a3 as v58, a4 as v59, e as v6, a5 as v60, a6 as v61, a7 as v62, a8 as v63, a9 as v64, aa as v65, ab as v66, ac as v67, ad as v68, ae as v69, f as v7, af as v70, ag as v71, ah as v72, ai as v73, aj as v74, ak as v75, al as v76, am as v77, an as v78, ao as v79, g as v8, ap as v80, aq as v81, ar as v82, as as v83, at as v84, au as v85, av as v86, aw as v87, ax as v88, ay as v89, h as v9, az as v90, aA as v91, aB as v92, aC as v93, aD as v94, aE as v95, aF as v96, aG as v97, aH as v98, aI as v99 } from './generated-constants.js'; const lazy = import('./generated-lazy.js'); diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-chunk.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-constants.js similarity index 100% rename from test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-chunk.js rename to test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-constants.js diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js index ef89b9a8ad8..c3492d0d8b7 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/generated-lazy.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports) { +System.register(['./generated-constants.js'], function (exports) { 'use strict'; var v1; return { diff --git a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js index aa67b797808..2a78e71a87d 100644 --- a/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js +++ b/test/chunking-form/samples/sanitize-internal-exports/_expected/system/main.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function (exports, module) { +System.register(['./generated-constants.js'], function (exports, module) { 'use strict'; return { setters: [function (module) { diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/generated-chunk.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/generated-dep.js similarity index 100% rename from test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/generated-chunk.js rename to test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/generated-dep.js diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js index b31a9f2a0c9..70e8b91dfca 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main1.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('1', dep.dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js index 802b4783d5b..16bc0f7b408 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/amd/main2.js @@ -1,4 +1,4 @@ -define(['./generated-chunk'], function (dep) { 'use strict'; +define(['./generated-dep'], function (dep) { 'use strict'; console.log('2', dep.dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/generated-chunk.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/generated-dep.js similarity index 100% rename from test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/generated-chunk.js rename to test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/generated-dep.js diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js index b90e46d1ef6..a553cd08cb3 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main1.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('1', dep.dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js index f1bf31c4b92..bb5673f82f5 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/cjs/main2.js @@ -1,5 +1,5 @@ 'use strict'; -var dep = require('./generated-chunk.js'); +var dep = require('./generated-dep.js'); console.log('2', dep.dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-chunk.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-dep.js similarity index 100% rename from test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-chunk.js rename to test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/generated-dep.js diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main1.js index a4c64ad8e0f..f30deaee122 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main1.js @@ -1,3 +1,3 @@ -import { d as dep } from './generated-chunk.js'; +import { d as dep } from './generated-dep.js'; console.log('1', dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main2.js index ad86f9a5010..831adcfdfad 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/es/main2.js @@ -1,3 +1,3 @@ -import { d as dep } from './generated-chunk.js'; +import { d as dep } from './generated-dep.js'; console.log('2', dep); diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-chunk.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-dep.js similarity index 100% rename from test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-chunk.js rename to test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/generated-dep.js diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js index 1bb19ac8f71..8daf064dae0 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main1.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var dep; return { diff --git a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js index 47e6f097d27..23664a93e78 100644 --- a/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js +++ b/test/chunking-form/samples/system-exports-wrap-pure-annotation/_expected/system/main2.js @@ -1,4 +1,4 @@ -System.register(['./generated-chunk.js'], function () { +System.register(['./generated-dep.js'], function () { 'use strict'; var dep; return { diff --git a/test/hooks/index.js b/test/hooks/index.js index bad495a77c3..658b7ce8280 100644 --- a/test/hooks/index.js +++ b/test/hooks/index.js @@ -997,17 +997,17 @@ describe('hooks', () => { }, { fileName: 'generated-a.js', - imports: ['generated-chunk.js'], + imports: ['generated-c.js'], modules: ['d', 'a'] }, { - fileName: 'generated-chunk.js', + fileName: 'generated-c.js', imports: [], modules: ['c'] }, { fileName: 'generated-b.js', - imports: ['generated-chunk.js'], + imports: ['generated-c.js'], modules: ['b'] } ]); diff --git a/test/misc/bundle-information.js b/test/misc/bundle-information.js index 734cb3423f3..cc0e6aa8bde 100644 --- a/test/misc/bundle-information.js +++ b/test/misc/bundle-information.js @@ -26,21 +26,21 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1-91cf8b5e.js', 'input2-28e1210a.js', 'generated-chunk-e9283962.js'], + ['input1-91cf8b5e.js', 'input2-28e1210a.js', 'generated-shared-e9283962.js'], 'fileName' ); assert.deepEqual( output.map(chunk => chunk.code), [ - `import './generated-chunk-e9283962.js';\n\nconsole.log("input1");const out = true;\n\nexport { out };\n`, - `import './generated-chunk-e9283962.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport default input2;\n`, + `import './generated-shared-e9283962.js';\n\nconsole.log("input1");const out = true;\n\nexport { out };\n`, + `import './generated-shared-e9283962.js';\n\nconsole.log("input2");var input2 = 42;\n\nexport default input2;\n`, 'console.log("shared");\n' ], 'code' ); assert.deepEqual(output.map(chunk => chunk.map), [null, null, null], 'map'); assert.deepEqual(output.map(chunk => chunk.isEntry), [true, true, false], 'isEntry'); - assert.deepEqual(output.map(chunk => chunk.name), ['input1', 'input2', 'chunk'], 'name'); + assert.deepEqual(output.map(chunk => chunk.name), ['input1', 'input2', 'shared'], 'name'); assert.deepEqual( output.map(chunk => chunk.facadeModuleId), ['input1', 'input2', null], @@ -48,7 +48,7 @@ describe('The bundle object', () => { ); assert.deepEqual( output.map(chunk => chunk.imports), - [['generated-chunk-e9283962.js'], ['generated-chunk-e9283962.js'], []], + [['generated-shared-e9283962.js'], ['generated-shared-e9283962.js'], []], 'imports' ); assert.deepEqual(output.map(chunk => chunk.dynamicImports), [[], [], []], 'dynamicImports'); @@ -109,7 +109,7 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1.js', 'input2.js', 'generated-chunk.js'], + ['input1.js', 'input2.js', 'generated-input2.js'], 'fileName' ); assert.deepEqual( @@ -150,7 +150,7 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1.js', 'input2.js', 'chunk.js'], + ['input1.js', 'input2.js', 'input22.js'], 'fileName' ); assert.deepEqual( @@ -239,7 +239,7 @@ describe('The bundle object', () => { .then(({ output }) => { assert.deepEqual( output.map(chunk => chunk.fileName), - ['input1.js', 'input2.js', 'generated-chunk.js', 'generated-dynamic.js'], + ['input1.js', 'input2.js', 'generated-dynamic.js', 'generated-dynamic2.js'], 'fileName' ); assert.deepEqual( @@ -259,7 +259,7 @@ describe('The bundle object', () => { ); assert.deepEqual( output.map(chunk => chunk.dynamicImports), - [['generated-chunk.js'], [], [], []], + [['generated-dynamic.js'], [], [], []], 'dynamicImports' ); }); diff --git a/test/misc/misc.js b/test/misc/misc.js index 1a59e2a0fd5..4640a9fcbd7 100644 --- a/test/misc/misc.js +++ b/test/misc/misc.js @@ -91,7 +91,7 @@ describe('misc', () => { assert.deepEqual(output.map(({ fileName }) => fileName), [ 'main1.js', 'main2.js', - 'chunk-9d1272f4.js', + 'dep-9d1272f4.js', 'dyndep-80285050.js' ]); });