Merge pull request webpack#5986 from EugeneHlushko/feature-sourcemap-use-filename-in-url

sokra · web-flow · commit 905a8f163c9c · 2017-12-04T12:27:27.000+01:00
SourceMapDevToolPlugin: Enable path stripping from source map filenam…
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -181,14 +181,14 @@ 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, "/");
+						const sourceMapUrl = options.publicPath ? options.publicPath + sourceMapFile.replace(/\\/g, "/") : path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
 						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,12 @@
+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, "public/test.js"), "utf-8");
+	source.should.containEql("//# sourceMappingURL=https://10.10.10.10/project/sourcemaps/test.js.map");
+});
+
+it("should write sourcemap file relative fo fileContext", function() {
+	var fs = require("fs"),
+			path = require("path");
+	fs.existsSync(path.join(__dirname, "sourcemaps/test.js.map")).should.be.true();
+});
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"],
+		"public/test": ["./test.js"],
+	},
+	output: {
+		filename: "[name].js"
+	},
+	plugins: [
+		new webpack.SourceMapDevToolPlugin({
+			filename: "sourcemaps/[file].map",
+			publicPath: "https://10.10.10.10/project/",
+			fileContext: "public"
+		})
+	]
+};

Original file line number	Diff line number	Diff line change
`@@ -181,14 +181,14 @@ class SourceMapDevToolPlugin {`
`181`	`181`	`}`
`182`	`182`	`let sourceMapFile = compilation.getPath(sourceMapFilename, {`
`183`	`183`	`chunk,`
`184`		`- filename,`
	`184`	`+ filename: options.fileContext ? path.relative(options.fileContext, filename) : filename,`
`185`	`185`	`query,`
`186`	`186`	`basename: basename(filename)`
`187`	`187`	`});`
`188`	`188`	`if(sourceMapFile.indexOf("[contenthash]") !== -1) {`
`189`	`189`	`sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, crypto.createHash("md5").update(sourceMapString).digest("hex"));`
`190`	`190`	`}`
`191`		`- const sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");`
	`191`	`+ const sourceMapUrl = options.publicPath ? options.publicPath + sourceMapFile.replace(/\\/g, "/") : path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");`
`192`	`192`	`if(currentSourceMappingURLComment !== false) {`
`193`	`193`	`asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));`
`194`	`194`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +var testObject = {
 +	a: 1
 +};
++
 +module.exports = testObject;