Merge pull request #16345 from ahabhgk/fix-eval-nosources

sokra · web-flow · commit 2403a3632624 · 2022-11-09T12:38:21.000+01:00
fix: `devtool: 'eval-nosources-*'` still contains sourcesContent
diff --git a/lib/EvalSourceMapDevToolPlugin.js b/lib/EvalSourceMapDevToolPlugin.js
@@ -153,6 +153,9 @@ class EvalSourceMapDevToolPlugin {
 							}
 						);
 						sourceMap.sources = moduleFilenames;
+						if (options.noSources) {
+							sourceMap.sourcesContent = undefined;
+						}
 						sourceMap.sourceRoot = options.sourceRoot || "";
 						const moduleId = chunkGraph.getModuleId(m);
 						sourceMap.file = `${moduleId}.js`;
diff --git a/test/configCases/devtools/eval-nosources-source-map/index.js b/test/configCases/devtools/eval-nosources-source-map/index.js
@@ -0,0 +1,10 @@
+it("should not include sourcesContent if noSources option is used", function() {
+	var fs = require("fs");
+	var source = fs.readFileSync(__filename, "utf-8");
+  var match = /\/\/# sourceMappingURL\s*=\s*data:application\/json;charset=utf-8;base64,(.*)\\n\/\/#/.exec(source);
+  var mapString = Buffer.from(match[1], 'base64').toString('utf-8');
+	var map = JSON.parse(mapString);
+	expect(map).not.toHaveProperty("sourcesContent");
+});
+
+if (Math.random() < 0) require("./test.js");
diff --git a/test/configCases/devtools/eval-nosources-source-map/test.js b/test/configCases/devtools/eval-nosources-source-map/test.js
@@ -0,0 +1,3 @@
+var foo = {};
+
+module.exports = foo;
diff --git a/test/configCases/devtools/eval-nosources-source-map/webpack.config.js b/test/configCases/devtools/eval-nosources-source-map/webpack.config.js
@@ -0,0 +1,4 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	devtool: "eval-nosources-source-map"
+};

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+var foo = {};`
	`2`	`+`
	`3`	`+module.exports = foo;`