use correct (relative) url to source map

sokra · sokra · commit 572ebfcd51d6 · 2014-07-16T20:57:10.000+02:00
diff --git a/lib/SourceMapDevToolPlugin.js b/lib/SourceMapDevToolPlugin.js
@@ -2,6 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
+var path = require("path");
 var RequestShortener = require("./RequestShortener");
 var Template = require("./Template");
 var ConcatSource = require("webpack-core/lib/ConcatSource");
@@ -64,7 +65,8 @@ SourceMapDevToolPlugin.prototype.apply = function(compiler) {
 								.replace(Template.REGEXP_FILEBASE, basename(filename))
 								.replace(Template.REGEXP_HASH, this.hash)
 								.replace(Template.REGEXP_ID, chunk.id);
-							asset.__SourceMapDevTool_Data[file] = this.assets[file] = new ConcatSource(asset, sourceMappingURLComment.replace(/\[url\]/g, sourceMapFile));
+							var sourceMapUrl = path.relative(path.dirname(file), sourceMapFile).replace(/\\/g, "/");
+							asset.__SourceMapDevTool_Data[file] = this.assets[file] = new ConcatSource(asset, sourceMappingURLComment.replace(/\[url\]/g, sourceMapUrl));
 							asset.__SourceMapDevTool_Data[sourceMapFile] = this.assets[sourceMapFile] = new RawSource(JSON.stringify(sourceMap));
 							chunk.files.push(sourceMapFile);
 						} else {
@@ -81,3 +83,4 @@ function basename(name) {
 	if(name.indexOf("/") < 0) return name;
 	return name.substr(name.lastIndexOf("/")+1);
 }
+
diff --git a/lib/node/NodeMainTemplatePlugin.js b/lib/node/NodeMainTemplatePlugin.js
@@ -51,7 +51,8 @@ NodeMainTemplatePlugin.prototype.apply = function(mainTemplate) {
 					this.indent([
 						"if(err) { if(" + this.requireFn + ".onError) return " + this.requireFn + ".onError(err); else throw err; }",
 						"var chunk = {};",
-						"require('vm').runInThisContext('(function(exports) {' + content + '\\n})', filename)(chunk);",
+						"require('vm').runInThisContext('(function(exports, require, __dirname, __filename) {' + content + '\\n})', filename)" +
+						"(chunk, require, require('path').dirname(filename), filename);",
 					].concat(insertMoreModules).concat([
 						"var callbacks = [];",
 						"for(var i = 0; i < chunkIds.length; i++) {",
diff --git a/test/ConfigTestCases.test.js b/test/ConfigTestCases.test.js
@@ -52,9 +52,9 @@ describe("ConfigTestCases", function() {
 						function _require(module) {
 							if(module.substr(0, 2) === "./") {
 								var p = path.join(outputDirectory, module);
-								var fn = vm.runInThisContext("(function(require, module, exports, __dirname, it) {" + fs.readFileSync(p, "utf-8") + "\n})", p);
+								var fn = vm.runInThisContext("(function(require, module, exports, __dirname, __filename, it) {" + fs.readFileSync(p, "utf-8") + "\n})", p);
 								var module = { exports: {} };
-								fn.call(module.exports, _require, module, module.exports, outputDirectory, _it);
+								fn.call(module.exports, _require, module, module.exports, outputDirectory, p, _it);
 								return module.exports;
 							} else return require(module);
 						}
diff --git a/test/configCases/source-map/relative-source-map-path/index.js b/test/configCases/source-map/relative-source-map-path/index.js
@@ -0,0 +1,13 @@
+it("should have a relative url to the source-map", function() {
+	var fs = require("fs");
+	var source = fs.readFileSync(__filename, "utf-8");
+	var match = /sourceMappingURL\s*=\s*(.*)/.exec(source);
+	match[1].should.be.eql("bundle0.js.map");
+});
+
+it("should have a relative url to the source-map with prefix", function(done) {
+	require.ensure([], function(require) {
+		require("./test.js");
+		done();
+	});
+});
diff --git a/test/configCases/source-map/relative-source-map-path/test.js b/test/configCases/source-map/relative-source-map-path/test.js
@@ -0,0 +1,4 @@
+var fs = require("fs");
+var source = fs.readFileSync(__filename, "utf-8");
+var match = /sourceMappingURL\s*=\s*(.*)/.exec(source);
+match[1].should.be.eql("c.js.map");
diff --git a/test/configCases/source-map/relative-source-map-path/webpack.config.js b/test/configCases/source-map/relative-source-map-path/webpack.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+	output: {
+		chunkFilename: "js/chunks/c.js"
+	},
+	node: {
+		__dirname: false,
+		__filename: false
+	},
+	devtool: "source-map"
+};
