Merge branch 'master' into webpack-2

sokra · sokra · commit 9dffb44c9354 · 2015-10-28T22:33:11.000+01:00
diff --git a/lib/RecordIdsPlugin.js b/lib/RecordIdsPlugin.js
@@ -10,7 +10,9 @@ module.exports = RecordIdsPlugin;
 function makeRelative(compiler, identifier) {
 	var context = compiler.context;
 	return identifier.split("|").map(function(str) {
-		return path.relative(context, str);
+		return identifier.split("!").map(function(str) {
+			return path.relative(context, str);
+		}).join("!");
 	}).join("|");
 }
 
diff --git a/lib/optimize/UglifyJsPlugin.js b/lib/optimize/UglifyJsPlugin.js
@@ -78,6 +78,7 @@ UglifyJsPlugin.prototype.apply = function(compiler) {
 							warnings.push(warning);
 						};
 					}
+					uglify.base54.reset();
 					var ast = uglify.parse(input, {
 						filename: file
 					});
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "optimist": "~0.6.0",
     "supports-color": "^3.1.0",
     "tapable": "~0.1.8",
-    "uglify-js": "~2.4.24",
+    "uglify-js": "~2.5.0",
     "watchpack": "^0.2.1",
     "webpack-core": "~0.6.0"
   },
diff --git a/test/configCases/records/issue-295/file.js b/test/configCases/records/issue-295/file.js
@@ -0,0 +1 @@
+// just a file
diff --git a/test/configCases/records/issue-295/loader.js b/test/configCases/records/issue-295/loader.js
@@ -0,0 +1,3 @@
+module.exports = function(source) {
+	return source;
+};
diff --git a/test/configCases/records/issue-295/test.js b/test/configCases/records/issue-295/test.js
@@ -0,0 +1,9 @@
+require("./loader!./file");
+require("./loader?2!./file");
+
+it("should write relative paths to records", function() {
+	var fs = require("fs");
+	var path = require("path");
+	var content = fs.readFileSync(path.join(__dirname, "records.json"), "utf-8");
+	content.should.not.match(/webpack|issue/);
+});
diff --git a/test/configCases/records/issue-295/webpack.config.js b/test/configCases/records/issue-295/webpack.config.js
@@ -0,0 +1,10 @@
+var path = require("path");
+var webpack = require("../../../../");
+module.exports = {
+	entry: "./test",
+	recordsPath: path.resolve(__dirname, "../../../js/config/records/issue-295/records.json"),
+	target: "node",
+	node: {
+		__dirname: false
+	}
+};

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,7 @@ UglifyJsPlugin.prototype.apply = function(compiler) {`
`78`	`78`	`warnings.push(warning);`
`79`	`79`	`};`
`80`	`80`	`}`
	`81`	`+ uglify.base54.reset();`
`81`	`82`	`var ast = uglify.parse(input, {`
`82`	`83`	`filename: file`
`83`	`84`	`});`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = function(source) {`
	`2`	`+ return source;`
	`3`	`+};`