Merge branch 'master' into next

sokra · sokra · commit bfa4b49858c7 · 2017-12-04T14:36:07.000+01:00
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -188,14 +188,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, 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/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "3.8.1",
+  "version": "3.9.1",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "dependencies": {
diff --git a/schemas/WebpackOptions.json b/schemas/WebpackOptions.json
@@ -1634,6 +1634,13 @@
           "description": "Delay the rebuilt after the first change. Value is a time in ms.",
           "type": "number"
         },
+        "ignored": {
+          "description": "Ignore some files from watching"
+        },
+        "stdin": {
+          "description": "Stop watching when stdin stream has ended",
+          "type": "boolean"
+        },
         "poll": {
           "description": "Enable polling mode for watching",
           "anyOf": [
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
`@@ -188,14 +188,14 @@ class SourceMapDevToolPlugin {`
`188`	`188`	`}`
`189`	`189`	`let sourceMapFile = compilation.getPath(sourceMapFilename, {`
`190`	`190`	`chunk,`
`191`		`- filename,`
	`191`	`+ filename: options.fileContext ? path.relative(options.fileContext, filename) : filename,`
`192`	`192`	`query,`
`193`	`193`	`basename: basename(filename)`
`194`	`194`	`});`
`195`	`195`	`if(sourceMapFile.indexOf("[contenthash]") !== -1) {`
`196`	`196`	`sourceMapFile = sourceMapFile.replace(/\[contenthash\]/g, createHash("md5").update(sourceMapString).digest("hex"));`
`197`	`197`	`}`
`198`		`- const sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");`
	`198`	`+ const sourceMapUrl = options.publicPath ? options.publicPath + sourceMapFile.replace(/\\/g, "/") : path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");`
`199`	`199`	`if(currentSourceMappingURLComment !== false) {`
`200`	`200`	`asset.__SourceMapDevToolData[file] = compilation.assets[file] = new ConcatSource(new RawSource(source), currentSourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "webpack",`
`3`		`- "version": "3.8.1",`
	`3`	`+ "version": "3.9.1",`
`4`	`4`	`"author": "Tobias Koppers @sokra",`
`5`	`5`	`"description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",`
`6`	`6`	`"dependencies": {`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +var testObject = {
 +	a: 1
 +};
++
 +module.exports = testObject;