Merge branch 'master' into webpack-2

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("|");
 }
 

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
 					});

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"
   },

test/configCases/records/issue-295/file.js

@@ -0,0 +1 @@
+// just a file

test/configCases/records/issue-295/loader.js

@@ -0,0 +1,3 @@
+module.exports = function(source) {
+	return source;
+};

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/);
+});

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
+	}
+};