Fix repeated re-emission of files emitted from a transform hook (#2936)

rollup · Jun 13, 2019 · 9d19a18 · 9d19a18
1 parent c3247e6
commit 9d19a18
Show file tree

Hide file tree

Showing 4 changed files with 176 additions and 149 deletions.
diff --git a/src/Module.ts b/src/Module.ts
@@ -217,7 +217,7 @@ export default class Module {
 	private graph: Graph;
 	private magicString!: MagicString;
 	private namespaceVariable: NamespaceVariable = undefined as any;
-	private transformDependencies!: string[];
+	private transformDependencies: string[] | null = null;
 	private transitiveReexports?: string[];
 
 	constructor(graph: Graph, id: string, moduleSideEffects: boolean, isEntry: boolean) {
@@ -526,13 +526,24 @@ export default class Module {
 		originalSourcemap,
 		resolvedIds,
 		sourcemapChain,
+		transformAssets,
+		transformChunks,
 		transformDependencies
-	}: TransformModuleJSON) {
+	}: TransformModuleJSON & {
+		transformAssets?: Asset[] | undefined;
+		transformChunks?: EmittedChunk[] | undefined;
+	}) {
 		this.code = code;
 		this.originalCode = originalCode;
 		this.originalSourcemap = originalSourcemap;
 		this.sourcemapChain = sourcemapChain as RawSourceMap[];
-		this.transformDependencies = transformDependencies as string[];
+		if (transformAssets) {
+			this.transformAssets = transformAssets;
+		}
+		if (transformChunks) {
+			this.transformChunks = transformChunks;
+		}
+		this.transformDependencies = transformDependencies;
 		this.customTransformCache = customTransformCache;
 		if (typeof moduleSideEffects === 'boolean') {
 			this.moduleSideEffects = moduleSideEffects;

diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts
@@ -7,6 +7,7 @@ import {
 	ExternalOption,
 	GetManualChunk,
 	IsExternal,
+	ModuleJSON,
 	ModuleSideEffectsOption,
 	PureModulesOption,
 	ResolvedId,
@@ -348,7 +349,7 @@ export class ModuleLoader {
 				}
 				return transform(this.graph, sourceDescription, module);
 			})
-			.then((source: TransformModuleJSON) => {
+			.then((source: TransformModuleJSON | ModuleJSON) => {
 				module.setSource(source);
 				this.modulesById.set(id, module);
 

diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -88,8 +88,8 @@ export interface TransformModuleJSON {
 export interface ModuleJSON extends TransformModuleJSON {
 	dependencies: string[];
 	id: string;
-	transformAssets: Asset[] | void;
-	transformChunks: EmittedChunk[] | void;
+	transformAssets: Asset[] | undefined;
+	transformChunks: EmittedChunk[] | undefined;
 }
 
 export interface EmittedChunk {