Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add test for #3467 * Extract multi-chunk option validation from output option parsing * Reorder rollup entry by usage * Get rid of chunk generation parameters * Introduce Bundle class * Make generate a little nicer * Split option parsing * Split merging from parsing * Start implementing normalized input options * Normalize treeshaking options and warnings * Normalize input, manualChunks, signatures and inline validation * Normalize remaining options * Fix CLI object option handling * Start normalizing output options * Normalize file name options * Normalize addons * Normalize flags * Normalize dynamicImportFunction and exports * Normalize globals, name and paths * Make options private in Graph * Refactor option usage * Fix types * Remove unrelated TODOs * Update docs * Improve coverage * Fix url in builtin warning
- Loading branch information
1 parent
00e197f
commit 9bff788
Showing
109 changed files
with
2,112 additions
and
1,594 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| import Chunk from './Chunk'; | ||
| import { | ||
| NormalizedInputOptions, | ||
| NormalizedOutputOptions, | ||
| OutputBundle, | ||
| OutputBundleWithPlaceholders, | ||
| OutputChunk | ||
| } from './rollup/types'; | ||
| import { Addons, createAddons } from './utils/addons'; | ||
| import commondir from './utils/commondir'; | ||
| import { error, warnDeprecation } from './utils/error'; | ||
| import { FILE_PLACEHOLDER } from './utils/FileEmitter'; | ||
| import { basename, isAbsolute } from './utils/path'; | ||
| import { PluginDriver } from './utils/PluginDriver'; | ||
| import { timeEnd, timeStart } from './utils/timers'; | ||
|
|
||
| export default class Bundle { | ||
| constructor( | ||
| private readonly outputOptions: NormalizedOutputOptions, | ||
| private readonly unsetOptions: Set<string>, | ||
| private readonly inputOptions: NormalizedInputOptions, | ||
| private readonly pluginDriver: PluginDriver, | ||
| private readonly chunks: Chunk[] | ||
| ) {} | ||
|
|
||
| async generate(isWrite: boolean): Promise<OutputBundle> { | ||
| timeStart('GENERATE', 1); | ||
| const inputBase = commondir(getAbsoluteEntryModulePaths(this.chunks)); | ||
| const outputBundle: OutputBundleWithPlaceholders = Object.create(null); | ||
| this.pluginDriver.setOutputBundle(outputBundle, this.outputOptions.assetFileNames); | ||
| try { | ||
| await this.pluginDriver.hookParallel('renderStart', [this.outputOptions, this.inputOptions]); | ||
| if (this.chunks.length > 1) { | ||
| validateOptionsForMultiChunkOutput(this.outputOptions); | ||
| } | ||
|
|
||
| const addons = await createAddons(this.outputOptions, this.pluginDriver); | ||
| for (const chunk of this.chunks) { | ||
| chunk.generateExports(this.outputOptions); | ||
| } | ||
| for (const chunk of this.chunks) { | ||
| chunk.preRender(this.outputOptions, inputBase, this.pluginDriver); | ||
| } | ||
| this.assignChunkIds(inputBase, addons, outputBundle); | ||
| assignChunksToBundle(this.chunks, outputBundle); | ||
|
|
||
| await Promise.all( | ||
| this.chunks.map(chunk => { | ||
| const outputChunk = outputBundle[chunk.id!] as OutputChunk; | ||
| return chunk | ||
| .render(this.outputOptions, addons, outputChunk, this.pluginDriver) | ||
| .then(rendered => { | ||
| outputChunk.code = rendered.code; | ||
| outputChunk.map = rendered.map; | ||
| }); | ||
| }) | ||
| ); | ||
| } catch (error) { | ||
| await this.pluginDriver.hookParallel('renderError', [error]); | ||
| throw error; | ||
| } | ||
| await this.pluginDriver.hookSeq('generateBundle', [ | ||
| this.outputOptions, | ||
| outputBundle as OutputBundle, | ||
| isWrite | ||
| ]); | ||
| for (const key of Object.keys(outputBundle)) { | ||
| const file = outputBundle[key] as any; | ||
| if (!file.type) { | ||
| warnDeprecation( | ||
| 'A plugin is directly adding properties to the bundle object in the "generateBundle" hook. This is deprecated and will be removed in a future Rollup version, please use "this.emitFile" instead.', | ||
| true, | ||
| this.inputOptions | ||
| ); | ||
| file.type = 'asset'; | ||
| } | ||
| } | ||
| this.pluginDriver.finaliseAssets(); | ||
|
|
||
| timeEnd('GENERATE', 1); | ||
| return outputBundle as OutputBundle; | ||
| } | ||
|
|
||
| private assignChunkIds(inputBase: string, addons: Addons, bundle: OutputBundleWithPlaceholders) { | ||
| const entryChunks: Chunk[] = []; | ||
| const otherChunks: Chunk[] = []; | ||
| for (const chunk of this.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 (const chunk of chunksForNaming) { | ||
| if (this.outputOptions.file) { | ||
| chunk.id = basename(this.outputOptions.file); | ||
| } else if (this.inputOptions.preserveModules) { | ||
| chunk.id = chunk.generateIdPreserveModules( | ||
| inputBase, | ||
| this.outputOptions, | ||
| bundle, | ||
| this.unsetOptions | ||
| ); | ||
| } else { | ||
| chunk.id = chunk.generateId(addons, this.outputOptions, bundle, true, this.pluginDriver); | ||
| } | ||
| bundle[chunk.id] = FILE_PLACEHOLDER; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function getAbsoluteEntryModulePaths(chunks: Chunk[]): string[] { | ||
| const absoluteEntryModulePaths: string[] = []; | ||
| for (const chunk of chunks) { | ||
| for (const entryModule of chunk.entryModules) { | ||
| if (isAbsolute(entryModule.id)) { | ||
| absoluteEntryModulePaths.push(entryModule.id); | ||
| } | ||
| } | ||
| } | ||
| return absoluteEntryModulePaths; | ||
| } | ||
|
|
||
| function validateOptionsForMultiChunkOutput(outputOptions: NormalizedOutputOptions) { | ||
| if (outputOptions.format === 'umd' || outputOptions.format === 'iife') | ||
| return error({ | ||
| code: 'INVALID_OPTION', | ||
| message: 'UMD and IIFE output formats are not supported for code-splitting builds.' | ||
| }); | ||
| if (typeof outputOptions.file === 'string') | ||
| return error({ | ||
| code: 'INVALID_OPTION', | ||
| message: | ||
| 'When building multiple chunks, the "output.dir" option must be used, not "output.file". ' + | ||
| 'To inline dynamic imports, set the "inlineDynamicImports" option.' | ||
| }); | ||
| if (outputOptions.sourcemapFile) | ||
| return error({ | ||
| code: 'INVALID_OPTION', | ||
| message: '"output.sourcemapFile" is only supported for single-file builds.' | ||
| }); | ||
| } | ||
|
|
||
| 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!] = { | ||
| code: undefined as any, | ||
| dynamicImports: chunk.getDynamicImportIds(), | ||
| exports: chunk.getExportNames(), | ||
| facadeModuleId: facadeModule && facadeModule.id, | ||
| fileName: chunk.id, | ||
| imports: chunk.getImportIds(), | ||
| isDynamicEntry: chunk.isDynamicEntry, | ||
| isEntry: facadeModule !== null && facadeModule.isEntryPoint, | ||
| map: undefined, | ||
| modules: chunk.renderedModules, | ||
| get name() { | ||
| return chunk.getChunkName(); | ||
| }, | ||
| type: 'chunk' | ||
| } as OutputChunk; | ||
| } | ||
| return outputBundle as OutputBundle; | ||
| } |
Oops, something went wrong.