Fix crash when returning undefined sourcemaps from renderChunk hook (#…

…2558)
rollup · Nov 17, 2018 · dbd2e47 · dbd2e47
1 parent 3c521ca
commit dbd2e47
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 22 deletions.
diff --git a/src/utils/collapseSourcemaps.ts b/src/utils/collapseSourcemaps.ts
@@ -143,6 +143,26 @@ export default function collapseSourcemaps(
 	bundleSourcemapChain: RawSourceMap[],
 	excludeContent: boolean
 ) {
+	function linkMap(source: Source, map: any) {
+		if (map.missing) {
+			bundle.graph.warn({
+				code: 'SOURCEMAP_BROKEN',
+				plugin: map.plugin,
+				message: `Sourcemap is likely to be incorrect: a plugin${
+					map.plugin ? ` ('${map.plugin}')` : ``
+				} was used to transform files, but didn't generate a sourcemap for the transformation. Consult the plugin documentation for help`,
+				url: `https://rollupjs.org/guide/en#warning-sourcemap-is-likely-to-be-incorrect`
+			});
+
+			map = {
+				names: [],
+				mappings: ''
+			};
+		}
+
+		return <any>new Link(map, [source]);
+	}
+
 	const moduleSources = modules.filter(module => !module.excludeFromSourcemap).map(module => {
 		let sourcemapChain = module.sourcemapChain;
 
@@ -170,34 +190,14 @@ export default function collapseSourcemaps(
 			}
 		}
 
-		sourcemapChain.forEach((map: any) => {
-			if (map.missing) {
-				bundle.graph.warn({
-					code: 'SOURCEMAP_BROKEN',
-					plugin: map.plugin,
-					message: `Sourcemap is likely to be incorrect: a plugin${
-						map.plugin ? ` ('${map.plugin}')` : ``
-					} was used to transform files, but didn't generate a sourcemap for the transformation. Consult the plugin documentation for help`,
-					url: `https://rollupjs.org/guide/en#warning-sourcemap-is-likely-to-be-incorrect`
-				});
-
-				map = {
-					names: [],
-					mappings: ''
-				};
-			}
-
-			source = <any>new Link(map, [source]);
-		});
+		source = sourcemapChain.reduce(linkMap, source);
 
 		return source;
 	});
 
 	let source = new Link(<any>map, moduleSources);
 
-	bundleSourcemapChain.forEach(map => {
-		source = new Link(<any>map, [<any>source]);
-	});
+	source = bundleSourcemapChain.reduce(linkMap, source);
 
 	let { sources, sourcesContent, names, mappings } = source.traceMappings();
 

diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_config.js b/test/form/samples/render-chunk-plugin-sourcemaps/_config.js
@@ -0,0 +1,21 @@
+module.exports = {
+	description:
+		'supports returning undefined source maps from render chunk hooks, when source maps are enabled',
+	options: {
+		output: {
+			sourcemap: true
+		},
+		plugins: [
+			{
+				renderChunk(code) {
+					return '/* first plugin */';
+				}
+			},
+			{
+				renderChunk(code) {
+					return code + '\n/* second plugin */';
+				}
+			}
+		]
+	}
+};
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/amd.js b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/amd.js
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/amd.js.map b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/amd.js.map
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/cjs.js b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/cjs.js
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/cjs.js.map b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/cjs.js.map
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/es.js b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/es.js
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/es.js.map b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/es.js.map
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/iife.js b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/iife.js
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/iife.js.map b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/iife.js.map
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/system.js b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/system.js
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/system.js.map b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/system.js.map
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/umd.js b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/umd.js
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/_expected/umd.js.map b/test/form/samples/render-chunk-plugin-sourcemaps/_expected/umd.js.map
diff --git a/test/form/samples/render-chunk-plugin-sourcemaps/main.js b/test/form/samples/render-chunk-plugin-sourcemaps/main.js
@@ -0,0 +1 @@
+console.log( 1 + 1 );