SourceMapDevToolPlugin: add fileContext and publicPath options. Add a configCase test

EugeneHlushko · EugeneHlushko · commit 840b43f16aed · 2017-11-25T16:38:30.000+02:00
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -181,14 +181,17 @@ class SourceMapDevToolPlugin {
 						}
 						let sourceMapFile = compilation.getPath(sourceMapFilename, {
 							chunk,
-							filename,
+							filename: options.fileContext ? path.relative(options.fileContext, filename) : filename,
 							query,
 							basename: basename(filename)
 						});
 						if(sourceMapFile.indexOf("[contenthash]") !== -1) {
 							sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, crypto.createHash("md5").update(sourceMapString).digest("hex"));
 						}
-						const sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
+						let sourceMapUrl = (options.fileContext ? sourceMapFile : path.relative(path.dirname(file), sourceMapFile)).replace(/\\/g, "/");
+						if(options.publicPath) {
+							sourceMapUrl = options.publicPath + sourceMapUrl;
+						}
 						if(currentSourceMappingURLComment !== false) {
 							asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));
 						}
diff --git a/test/configCases/plugins/source-map-dev-tool-plugin/index.js b/test/configCases/plugins/source-map-dev-tool-plugin/index.js
@@ -0,0 +1,6 @@
+it("should contain publicPath prefix in [url] and resolve relatively to fileContext", function() {
+	var fs = require("fs"),
+			path = require("path");
+	var source = fs.readFileSync(path.join(__dirname, "dist/public/test.js"), "utf-8");
+	source.should.containEql("//# sourceMappingURL=https://10.10.10.10/project/sourcemaps/test.js.map");
+});
diff --git a/test/configCases/plugins/source-map-dev-tool-plugin/test.js b/test/configCases/plugins/source-map-dev-tool-plugin/test.js
@@ -0,0 +1,5 @@
+var testObject = {
+	a: 1
+};
+
+module.exports = testObject;
diff --git a/test/configCases/plugins/source-map-dev-tool-plugin/webpack.config.js b/test/configCases/plugins/source-map-dev-tool-plugin/webpack.config.js
@@ -0,0 +1,21 @@
+var webpack = require("../../../../");
+module.exports = {
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	entry: {
+		"bundle0": ["./index.js"],
+		"dist/public/test": ["./test.js"],
+	},
+	output: {
+		filename: "[name].js"
+	},
+	plugins: [
+		new webpack.SourceMapDevToolPlugin({
+			filename: "sourcemaps/[file].map",
+			publicPath: "https://10.10.10.10/project/",
+			fileContext: "dist/public"
+		})
+	]
+};

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +var testObject = {
 +	a: 1
 +};
++
 +module.exports = testObject;