Merge branch 'master' into improve-id-resolution

# Conflicts: # docs/05-plugins.md # src/Chunk.ts # src/ModuleLoader.ts # src/rollup/types.d.ts # src/utils/assetHooks.ts # src/utils/defaultPlugin.ts # src/utils/error.ts # src/utils/pluginDriver.ts # test/function/samples/emit-chunk/chunk-not-found/_config.js
rollup · May 3, 2019 · 131ed0f · 131ed0f
2 parents 4ea1620 + 18829da
commit 131ed0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ### Pull Requests
 * [#2821](https://github.com/rollup/rollup/pull/2821): Fix syntax error in documentation (@FFxSquall)
+* [#2832](https://github.com/rollup/rollup/pull/2821): Improve `generateBundle` documentation (@lukastaegert)
 
 ## 1.10.1
 *2019-04-19*

diff --git a/docs/05-plugins.md b/docs/05-plugins.md
@@ -112,13 +112,15 @@ Called at the end of `bundle.generate()` or immediately before the files are wri
 
 // ChunkInfo
 {
+  code: string,
   dynamicImports: string[],
   exports: string[],
   facadeModuleId: string | null,
   fileName: string,
   imports: string[],
   isDynamicEntry: boolean,
   isEntry: boolean,
+  map: SourceMap | null,
   modules: {
     [id: string]: {
       renderedExports: string[],

diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -195,6 +195,7 @@ export type RenderChunkHook = (
 	| string
 	| null;
 
+// TODO this should probably return ResolveIdResult
 export type ResolveDynamicImportHook = (
 	this: PluginContext,
 	specifier: string | ESTree.Node,