Merge pull request webpack#5896 from daft300punk/master

sokra · web-flow · commit 9ee553221b90 · 2017-11-10T08:00:10.000+01:00
Source maps: webpack serves null content from sourcesContent webpack#5542
diff --git a/lib/EvalSourceMapDevToolModuleTemplatePlugin.js b/lib/EvalSourceMapDevToolModuleTemplatePlugin.js
@@ -55,7 +55,7 @@ class EvalSourceMapDevToolModuleTemplatePlugin {
 			sourceMap.sources = moduleFilenames;
 			if(sourceMap.sourcesContent) {
 				sourceMap.sourcesContent = sourceMap.sourcesContent.map(function(content, i) {
-					return `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], this.requestShortener)}`;
+					return typeof content === "string" ? `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], this.requestShortener)}` : null;
 				}, this);
 			}
 			sourceMap.sourceRoot = options.sourceRoot || "";
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -158,7 +158,7 @@ class SourceMapDevToolPlugin {
 					const moduleFilenames = modules.map(m => moduleToSourceNameMapping.get(m));
 					sourceMap.sources = moduleFilenames;
 					if(sourceMap.sourcesContent && !options.noSources) {
-						sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}`);
+						sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => typeof content === "string" ? `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}` : null);
 					} else {
 						sourceMap.sourcesContent = undefined;
 					}

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ class EvalSourceMapDevToolModuleTemplatePlugin {`
`55`	`55`	`sourceMap.sources = moduleFilenames;`
`56`	`56`	`if(sourceMap.sourcesContent) {`
`57`	`57`	`sourceMap.sourcesContent = sourceMap.sourcesContent.map(function(content, i) {`
`58`		- return `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], this.requestShortener)}`;
	`58`	+ return typeof content === "string" ? `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], this.requestShortener)}` : null;
`59`	`59`	`}, this);`
`60`	`60`	`}`
`61`	`61`	`sourceMap.sourceRoot = options.sourceRoot \|\| "";`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ class SourceMapDevToolPlugin {`
`158`	`158`	`const moduleFilenames = modules.map(m => moduleToSourceNameMapping.get(m));`
`159`	`159`	`sourceMap.sources = moduleFilenames;`
`160`	`160`	`if(sourceMap.sourcesContent && !options.noSources) {`
`161`		- sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}`);
	`161`	+ sourceMap.sourcesContent = sourceMap.sourcesContent.map((content, i) => typeof content === "string" ? `${content}\n\n\n${ModuleFilenameHelpers.createFooter(modules[i], requestShortener)}` : null);
`162`	`162`	`} else {`
`163`	`163`	`sourceMap.sourcesContent = undefined;`
`164`	`164`	`}`