make url only relative when no publicPath has been provided

sokra · web-flow · commit 471e1a28f49d · 2017-11-27T07:53:38.000+01:00
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -188,10 +188,7 @@ class SourceMapDevToolPlugin {
 						if(sourceMapFile.indexOf("[contenthash]") !== -1) {
 							sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, crypto.createHash("md5").update(sourceMapString).digest("hex"));
 						}
-						let sourceMapUrl = (options.fileContext ? sourceMapFile : path.relative(path.dirname(file), sourceMapFile)).replace(/\\/g, "/");
-						if(options.publicPath) {
-							sourceMapUrl = options.publicPath + sourceMapUrl;
-						}
+						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));
 						}

Original file line number	Diff line number	Diff line change
`@@ -188,10 +188,7 @@ class SourceMapDevToolPlugin {`
`188`	`188`	`if(sourceMapFile.indexOf("[contenthash]") !== -1) {`
`189`	`189`	`sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, crypto.createHash("md5").update(sourceMapString).digest("hex"));`
`190`	`190`	`}`
`191`		`- let sourceMapUrl = (options.fileContext ? sourceMapFile : path.relative(path.dirname(file), sourceMapFile)).replace(/\\/g, "/");`
`192`		`- if(options.publicPath) {`
`193`		`- sourceMapUrl = options.publicPath + sourceMapUrl;`
`194`		`- }`
	`191`	`+ const sourceMapUrl = options.publicPath ? options.publicPath + sourceMapFile.replace(/\\/g, "/") : path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");`
`195`	`192`	`if(currentSourceMappingURLComment !== false) {`
`196`	`193`	`asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));`
`197`	`194`	`}`