webpack 1.12.13 → 1.13.1

package/lib/EvalSourceMapDevToolModuleTemplatePlugin.js

@@ -7,7 +7,7 @@ var ModuleFilenameHelpers = require("./ModuleFilenameHelpers");
 
 function EvalSourceMapDevToolModuleTemplatePlugin(compilation, options, sourceMapComment, moduleFilenameTemplate) {
 	this.compilation = compilation;
-	this.sourceMapComment = sourceMapComment || "//@ sourceMappingURL=[url]";
+	this.sourceMapComment = sourceMapComment || "//# sourceMappingURL=[url]";
 	this.moduleFilenameTemplate = moduleFilenameTemplate || "webpack:///[resource-path]?[hash]";
 	this.options = options;
 }
@@ -57,7 +57,7 @@ EvalSourceMapDevToolModuleTemplatePlugin.prototype.apply = function(moduleTempla
 		}
 		sourceMap.sourceRoot = "";
 		sourceMap.file = module.id + ".js";
-		var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));
+		var footer = self.sourceMapComment.replace(/\[url\]/g, "data:application/json;charset=utf-8;base64," + new Buffer(JSON.stringify(sourceMap)).toString("base64"));
 		source.__EvalSourceMapDevToolData = new RawSource("eval(" + JSON.stringify(content + footer) + ");");
 		return source.__EvalSourceMapDevToolData;
 	});

package/lib/HotModuleReplacement.runtime.js

@@ -5,6 +5,17 @@
 /*global $hash$ installedModules $require$ hotDownloadManifest hotDownloadUpdateChunk modules */
 module.exports = function() {
 
+	// Copied from https://github.com/facebook/react/blob/bef45b0/src/shared/utils/canDefineProperty.js
+	var canDefineProperty = false;
+	try {
+		Object.defineProperty({}, "x", {
+			get: function() {}
+		});
+		canDefineProperty = true;
+	} catch(x) {
+		// IE will fail on defineProperty
+	}
+
 	var hotApplyOnUpdate = true;
 	var hotCurrentHash = $hash$; // eslint-disable-line no-unused-vars
 	var hotCurrentModuleData = {};
@@ -29,47 +40,57 @@ module.exports = function() {
 		};
 		for(var name in $require$) {
 			if(Object.prototype.hasOwnProperty.call($require$, name)) {
-				Object.defineProperty(fn, name, (function(name) {
-					return {
-						configurable: true,
-						enumerable: true,
-						get: function() {
-							return $require$[name];
-						},
-						set: function(value) {
-							$require$[name] = value;
-						}
-					};
-				}(name)));
+				if(canDefineProperty) {
+					Object.defineProperty(fn, name, (function(name) {
+						return {
+							configurable: true,
+							enumerable: true,
+							get: function() {
+								return $require$[name];
+							},
+							set: function(value) {
+								$require$[name] = value;
+							}
+						};
+					}(name)));
+				} else {
+					fn[name] = $require$[name];
+				}
 			}
 		}
-		Object.defineProperty(fn, "e", {
-			enumerable: true,
-			value: function(chunkId, callback) {
-				if(hotStatus === "ready")
-					hotSetStatus("prepare");
-				hotChunksLoading++;
-				$require$.e(chunkId, function() {
-					try {
-						callback.call(null, fn);
-					} finally {
-						finishChunkLoading();
-					}
 
-					function finishChunkLoading() {
-						hotChunksLoading--;
-						if(hotStatus === "prepare") {
-							if(!hotWaitingFilesMap[chunkId]) {
-								hotEnsureUpdateChunk(chunkId);
-							}
-							if(hotChunksLoading === 0 && hotWaitingFiles === 0) {
-								hotUpdateDownloaded();
-							}
+		function ensure(chunkId, callback) {
+			if(hotStatus === "ready")
+				hotSetStatus("prepare");
+			hotChunksLoading++;
+			$require$.e(chunkId, function() {
+				try {
+					callback.call(null, fn);
+				} finally {
+					finishChunkLoading();
+				}
+
+				function finishChunkLoading() {
+					hotChunksLoading--;
+					if(hotStatus === "prepare") {
+						if(!hotWaitingFilesMap[chunkId]) {
+							hotEnsureUpdateChunk(chunkId);
+						}
+						if(hotChunksLoading === 0 && hotWaitingFiles === 0) {
+							hotUpdateDownloaded();
 						}
 					}
-				});
-			}
-		});
+				}
+			});
+		}
+		if(canDefineProperty) {
+			Object.defineProperty(fn, "e", {
+				enumerable: true,
+				value: ensure
+			});
+		} else {
+			fn.e = ensure;
+		}
 		return fn;
 	}
 

package/lib/LibManifestPlugin.js

@@ -12,8 +12,10 @@ module.exports = LibManifestPlugin;
 LibManifestPlugin.prototype.apply = function(compiler) {
 	compiler.plugin("emit", function(compilation, callback) {
 		async.forEach(compilation.chunks, function(chunk, callback) {
-			if(!chunk.initial)
+			if(!chunk.initial) {
+				callback();
 				return;
+			}
 			var targetPath = compilation.getPath(this.options.path, {
 				hash: compilation.hash,
 				chunk: chunk

package/lib/Parser.js

@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var esprima = require("esprima");
+var acorn = require("acorn");
 var Tapable = require("tapable");
 var BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
 
@@ -39,28 +39,34 @@ Parser.prototype.initializeEvaluating = function() {
 			return new BasicEvaluatedExpression().setRegExp(expr.value).setRange(expr.range);
 	});
 	this.plugin("evaluate LogicalExpression", function(expr) {
+		var left;
+		var leftAsBool;
+		var right;
 		if(expr.operator === "&&") {
-			var left = this.evaluateExpression(expr.left);
-			var leftAsBool = left && left.asBool();
+			left = this.evaluateExpression(expr.left);
+			leftAsBool = left && left.asBool();
 			if(leftAsBool === false) return left.setRange(expr.range);
 			if(leftAsBool !== true) return;
-			var right = this.evaluateExpression(expr.right);
+			right = this.evaluateExpression(expr.right);
 			return right.setRange(expr.range);
 		} else if(expr.operator === "||") {
-			var left = this.evaluateExpression(expr.left);
-			var leftAsBool = left && left.asBool();
+			left = this.evaluateExpression(expr.left);
+			leftAsBool = left && left.asBool();
 			if(leftAsBool === true) return left.setRange(expr.range);
 			if(leftAsBool !== false) return;
-			var right = this.evaluateExpression(expr.right);
+			right = this.evaluateExpression(expr.right);
 			return right.setRange(expr.range);
 		}
 	});
 	this.plugin("evaluate BinaryExpression", function(expr) {
+		var left;
+		var right;
+		var res;
 		if(expr.operator === "+") {
-			var left = this.evaluateExpression(expr.left);
-			var right = this.evaluateExpression(expr.right);
+			left = this.evaluateExpression(expr.left);
+			right = this.evaluateExpression(expr.right);
 			if(!left || !right) return;
-			var res = new BasicEvaluatedExpression();
+			res = new BasicEvaluatedExpression();
 			if(left.isString()) {
 				if(right.isString()) {
 					res.setString(left.string + right.string);
@@ -112,37 +118,37 @@ Parser.prototype.initializeEvaluating = function() {
 			res.setRange(expr.range);
 			return res;
 		} else if(expr.operator === "-") {
-			var left = this.evaluateExpression(expr.left);
-			var right = this.evaluateExpression(expr.right);
+			left = this.evaluateExpression(expr.left);
+			right = this.evaluateExpression(expr.right);
 			if(!left || !right) return;
 			if(!left.isNumber() || !right.isNumber()) return;
-			var res = new BasicEvaluatedExpression();
+			res = new BasicEvaluatedExpression();
 			res.setNumber(left.number - right.number);
 			res.setRange(expr.range);
 			return res;
 		} else if(expr.operator === "*") {
-			var left = this.evaluateExpression(expr.left);
-			var right = this.evaluateExpression(expr.right);
+			left = this.evaluateExpression(expr.left);
+			right = this.evaluateExpression(expr.right);
 			if(!left || !right) return;
 			if(!left.isNumber() || !right.isNumber()) return;
-			var res = new BasicEvaluatedExpression();
+			res = new BasicEvaluatedExpression();
 			res.setNumber(left.number * right.number);
 			res.setRange(expr.range);
 			return res;
 		} else if(expr.operator === "/") {
-			var left = this.evaluateExpression(expr.left);
-			var right = this.evaluateExpression(expr.right);
+			left = this.evaluateExpression(expr.left);
+			right = this.evaluateExpression(expr.right);
 			if(!left || !right) return;
 			if(!left.isNumber() || !right.isNumber()) return;
-			var res = new BasicEvaluatedExpression();
+			res = new BasicEvaluatedExpression();
 			res.setNumber(left.number / right.number);
 			res.setRange(expr.range);
 			return res;
 		} else if(expr.operator === "==" || expr.operator === "===") {
-			var left = this.evaluateExpression(expr.left);
-			var right = this.evaluateExpression(expr.right);
+			left = this.evaluateExpression(expr.left);
+			right = this.evaluateExpression(expr.right);
 			if(!left || !right) return;
-			var res = new BasicEvaluatedExpression();
+			res = new BasicEvaluatedExpression();
 			res.setRange(expr.range);
 			if(left.isString() && right.isString()) {
 				return res.setBoolean(left.string === right.string);
@@ -152,10 +158,10 @@ Parser.prototype.initializeEvaluating = function() {
 				return res.setBoolean(left.bool === right.bool);
 			}
 		} else if(expr.operator === "!=" || expr.operator === "!==") {
-			var left = this.evaluateExpression(expr.left);
-			var right = this.evaluateExpression(expr.right);
+			left = this.evaluateExpression(expr.left);
+			right = this.evaluateExpression(expr.right);
 			if(!left || !right) return;
-			var res = new BasicEvaluatedExpression();
+			res = new BasicEvaluatedExpression();
 			res.setRange(expr.range);
 			if(left.isString() && right.isString()) {
 				return res.setBoolean(left.string !== right.string);
@@ -168,10 +174,11 @@ Parser.prototype.initializeEvaluating = function() {
 	});
 	this.plugin("evaluate UnaryExpression", function(expr) {
 		if(expr.operator === "typeof") {
+			var res;
 			if(expr.argument.type === "Identifier") {
 				var name = this.scope.renames["$" + expr.argument.name] || expr.argument.name;
 				if(this.scope.definitions.indexOf(name) === -1) {
-					var res = this.applyPluginsBailResult("evaluate typeof " + name, expr);
+					res = this.applyPluginsBailResult("evaluate typeof " + name, expr);
 					if(res !== undefined) return res;
 				}
 			}
@@ -186,7 +193,7 @@ Parser.prototype.initializeEvaluating = function() {
 					exprName.unshift(this.scope.renames["$" + expression.name] || expression.name);
 					if(this.scope.definitions.indexOf(name) === -1) {
 						exprName = exprName.join(".");
-						var res = this.applyPluginsBailResult("evaluate typeof " + exprName, expr);
+						res = this.applyPluginsBailResult("evaluate typeof " + exprName, expr);
 						if(res !== undefined) return res;
 					}
 				}
@@ -267,15 +274,16 @@ Parser.prototype.initializeEvaluating = function() {
 	["substr", "substring"].forEach(function(fn) {
 		this.plugin("evaluate CallExpression ." + fn, function(expr, param) {
 			if(!param.isString()) return;
+			var arg1;
 			var result, str = param.string;
 			switch(expr.arguments.length) {
 				case 1:
-					var arg1 = this.evaluateExpression(expr.arguments[0]);
+					arg1 = this.evaluateExpression(expr.arguments[0]);
 					if(!arg1.isNumber()) return;
 					result = str[fn](arg1.number);
 					break;
 				case 2:
-					var arg1 = this.evaluateExpression(expr.arguments[0]);
+					arg1 = this.evaluateExpression(expr.arguments[0]);
 					var arg2 = this.evaluateExpression(expr.arguments[1]);
 					if(!arg1.isNumber()) return;
 					if(!arg2.isNumber()) return;
@@ -302,11 +310,12 @@ Parser.prototype.initializeEvaluating = function() {
 	this.plugin("evaluate ConditionalExpression", function(expr) {
 		var condition = this.evaluateExpression(expr.test);
 		var conditionValue = condition.asBool();
+		var res;
 		if(conditionValue === undefined) {
 			var consequent = this.evaluateExpression(expr.consequent);
 			var alternate = this.evaluateExpression(expr.alternate);
 			if(!consequent || !alternate) return;
-			var res = new BasicEvaluatedExpression();
+			res = new BasicEvaluatedExpression();
 			if(consequent.isConditional())
 				res.setOptions(consequent.options);
 			else
@@ -316,7 +325,7 @@ Parser.prototype.initializeEvaluating = function() {
 			else
 				res.addOptions([alternate]);
 		} else {
-			var res = this.evaluateExpression(conditionValue ? expr.consequent : expr.alternate);
+			res = this.evaluateExpression(conditionValue ? expr.consequent : expr.alternate);
 		}
 		res.setRange(expr.range);
 		return res;
@@ -339,6 +348,24 @@ Parser.prototype.getRenameIdentifier = function getRenameIdentifier(expr) {
 	return;
 };
 
+Parser.prototype.walkClass = function walkClass(classy) {
+	if(classy.superClass)
+		this.walkExpression(classy.superClass);
+	if(classy.body && classy.body.type === "ClassBody") {
+		classy.body.body.forEach(function(methodDefinition) {
+			if(methodDefinition.type === "MethodDefinition")
+				this.walkMethodDefinition(methodDefinition);
+		}, this);
+	}
+};
+
+Parser.prototype.walkMethodDefinition = function walkMethodDefinition(methodDefinition) {
+	if(methodDefinition.computed && methodDefinition.key)
+		this.walkExpression(methodDefinition.key);
+	if(methodDefinition.value)
+		this.walkExpression(methodDefinition.value);
+};
+
 Parser.prototype.walkStatements = function walkStatements(statements) {
 	statements.forEach(function(statement) {
 		this.walkStatement(statement);
@@ -405,7 +432,8 @@ Parser.prototype.walkTryStatement = function walkTryStatement(statement) {
 		this.walkStatement(statement.block);
 		this.scope.inTry = false;
 	}
-	this.walkCatchClauses(statement.handlers);
+	if(statement.handler)
+		this.walkCatchClause(statement.handler);
 	if(statement.finalizer)
 		this.walkStatement(statement.finalizer);
 };
@@ -439,6 +467,15 @@ Parser.prototype.walkForInStatement = function walkForInStatement(statement) {
 	this.walkStatement(statement.body);
 };
 
+Parser.prototype.walkForOfStatement = function walkForOfStatement(statement) {
+	if(statement.left.type === "VariableDeclaration")
+		this.walkStatement(statement.left);
+	else
+		this.walkExpression(statement.left);
+	this.walkExpression(statement.right);
+	this.walkStatement(statement.body);
+};
+
 // Declarations
 Parser.prototype.walkFunctionDeclaration = function walkFunctionDeclaration(statement) {
 	this.scope.renames["$" + statement.id.name] = undefined;
@@ -456,6 +493,10 @@ Parser.prototype.walkVariableDeclaration = function walkVariableDeclaration(stat
 		this.walkVariableDeclarators(statement.declarations);
 };
 
+Parser.prototype.walkClassDeclaration = function walkClassDeclaration(statement) {
+	this.walkClass(statement);
+};
+
 Parser.prototype.walkSwitchCases = function walkSwitchCases(switchCases) {
 	switchCases.forEach(function(switchCase) {
 		if(switchCase.test)
@@ -464,14 +505,12 @@ Parser.prototype.walkSwitchCases = function walkSwitchCases(switchCases) {
 	}, this);
 };
 
-Parser.prototype.walkCatchClauses = function walkCatchClauses(catchClauses) {
-	catchClauses.forEach(function(catchClause) {
-		if(catchClause.guard)
-			this.walkExpression(catchClause.guard);
-		this.inScope([catchClause.param], function() {
-			this.walkStatement(catchClause.body);
-		}.bind(this));
-	}, this);
+Parser.prototype.walkCatchClause = function walkCatchClause(catchClause) {
+	if(catchClause.guard)
+		this.walkExpression(catchClause.guard);
+	this.inScope([catchClause.param], function() {
+		this.walkStatement(catchClause.body);
+	}.bind(this));
 };
 
 Parser.prototype.walkVariableDeclarators = function walkVariableDeclarators(declarators) {
@@ -518,8 +557,15 @@ Parser.prototype.walkArrayExpression = function walkArrayExpression(expression)
 		this.walkExpressions(expression.elements);
 };
 
+Parser.prototype.walkSpreadElement = function walkSpreadElement(expression) {
+	if(expression.argument)
+		this.walkExpression(expression.argument);
+};
+
 Parser.prototype.walkObjectExpression = function walkObjectExpression(expression) {
 	expression.properties.forEach(function(prop) {
+		if(prop.computed)
+			this.walkExpression(prop.key)
 		this.walkExpression(prop.value);
 	}, this);
 };
@@ -533,6 +579,15 @@ Parser.prototype.walkFunctionExpression = function walkFunctionExpression(expres
 	}.bind(this));
 };
 
+Parser.prototype.walkArrowFunctionExpression = function walkArrowFunctionExpression(expression) {
+	this.inScope(expression.params, function() {
+		if(expression.body.type === "BlockStatement")
+			this.walkStatement(expression.body);
+		else
+			this.walkExpression(expression.body);
+	}.bind(this));
+};
+
 Parser.prototype.walkSequenceExpression = function walkSequenceExpression(expression) {
 	if(expression.expressions)
 		this.walkExpressions(expression.expressions);
@@ -612,6 +667,27 @@ Parser.prototype.walkNewExpression = function walkNewExpression(expression) {
 		this.walkExpressions(expression.arguments);
 };
 
+Parser.prototype.walkYieldExpression = function walkYieldExpression(expression) {
+	if(expression.argument)
+		this.walkExpression(expression.argument);
+};
+
+Parser.prototype.walkTemplateLiteral = function walkTemplateLiteral(expression) {
+	if(expression.expressions)
+		this.walkExpressions(expression.expressions);
+};
+
+Parser.prototype.walkTaggedTemplateExpression = function walkTaggedTemplateExpression(expression) {
+	if(expression.tag)
+		this.walkExpression(expression.tag);
+	if(expression.quasi && expression.quasi.expressions)
+		this.walkExpressions(expression.quasi.expressions);
+};
+
+Parser.prototype.walkClassExpression = function walkClassExpression(expression) {
+	this.walkClass(expression);
+};
+
 Parser.prototype.walkCallExpression = function walkCallExpression(expression) {
 	function walkIIFE(functionExpression, args) {
 		var params = functionExpression.params;
@@ -798,12 +874,38 @@ Parser.prototype.parseCalculatedString = function parseCalculatedString(expressi
 	};
 });
 
+var POSSIBLE_AST_OPTIONS = [{
+	ranges: true,
+	locations: true,
+	ecmaVersion: 6,
+	sourceType: "module"
+}, {
+	ranges: true,
+	locations: true,
+	ecmaVersion: 6,
+	sourceType: "script"
+}]
+
 Parser.prototype.parse = function parse(source, initialState) {
-	var ast = esprima.parse(source, {
-		range: true,
-		loc: true,
-		raw: true
-	});
+	var ast;
+	for(var i = 0; i < POSSIBLE_AST_OPTIONS.length; i++) {
+		if(!ast) {
+			try {
+				ast = acorn.parse(source, POSSIBLE_AST_OPTIONS[i]);
+			} catch(e) {
+				// ignore the error
+			}
+		}
+	}
+	if(!ast) {
+		// for the error
+		ast = acorn.parse(source, {
+			ranges: true,
+			locations: true,
+			ecmaVersion: 6,
+			sourceType: "module"
+		});
+	}
 	if(!ast || typeof ast !== "object")
 		throw new Error("Source couldn't be parsed");
 	var oldScope = this.scope;
@@ -822,10 +924,11 @@ Parser.prototype.parse = function parse(source, initialState) {
 };
 
 Parser.prototype.evaluate = function evaluate(source) {
-	var ast = esprima.parse("(" + source + ")", {
-		range: true,
-		loc: true,
-		raw: true
+	var ast = acorn.parse("(" + source + ")", {
+		ranges: true,
+		locations: true,
+		ecmaVersion: 6,
+		sourceType: "module"
 	});
 	if(!ast || typeof ast !== "object" || ast.type !== "Program")
 		throw new Error("evaluate: Source couldn't be parsed");

package/lib/SourceMapDevToolPlugin.js

@@ -112,7 +112,7 @@ SourceMapDevToolPlugin.prototype.apply = function(compiler) {
 				var moduleFilenames = task.moduleFilenames;
 				var modules = task.modules;
 				sourceMap.sources = moduleFilenames;
-				if(sourceMap.sourcesContent) {
+				if(sourceMap.sourcesContent && !options.noSources) {
 					sourceMap.sourcesContent = sourceMap.sourcesContent.map(function(content, i) {
 						return content + "\n\n\n" + ModuleFilenameHelpers.createFooter(modules[i], requestShortener);
 					});
@@ -152,7 +152,7 @@ SourceMapDevToolPlugin.prototype.apply = function(compiler) {
 							return JSON.stringify(sourceMap);
 						})
 						.replace(/\[url\]/g, function() {
-							return "data:application/json;base64," +
+							return "data:application/json;charset=utf-8;base64," +
 								new Buffer(JSON.stringify(sourceMap)).toString("base64");
 						})
 					);

package/lib/WebpackOptionsApply.js

@@ -112,6 +112,7 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 				break;
 			case "atom":
 			case "electron":
+			case "electron-main":
 				var NodeTemplatePlugin = require("./node/NodeTemplatePlugin");
 				var NodeTargetPlugin = require("./node/NodeTargetPlugin");
 				var ExternalsPlugin = require("./ExternalsPlugin");
@@ -128,18 +129,44 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 						"electron",
 						"global-shortcut",
 						"ipc",
+						"ipc-main",
 						"menu",
 						"menu-item",
 						"power-monitor",
+						"power-save-blocker",
 						"protocol",
+						"session",
+						"web-contents",
 						"tray",
+						"clipboard",
+						"crash-reporter",
+						"native-image",
+						"screen",
+						"shell"
+					]),
+					new LoaderTargetPlugin(options.target)
+				);
+				break;
+			case "electron-renderer":
+				var JsonpTemplatePlugin = require("./JsonpTemplatePlugin");
+				var NodeTargetPlugin = require("./node/NodeTargetPlugin");
+				var ExternalsPlugin = require("./ExternalsPlugin");
+				compiler.apply(
+					new JsonpTemplatePlugin(options.output),
+					new FunctionModulePlugin(options.output),
+					new NodeTargetPlugin(),
+					new ExternalsPlugin("commonjs", [
+						"desktop-capturer",
+						"electron",
+						"ipc",
+						"ipc-renderer",
 						"remote",
-						"web-view",
+						"web-frame",
 						"clipboard",
 						"crash-reporter",
+						"native-image",
 						"screen",
-						"shell",
-						"native-image"
+						"shell"
 					]),
 					new LoaderTargetPlugin(options.target)
 				);
@@ -173,6 +200,7 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 		var evalWrapped = options.devtool.indexOf("eval") >= 0;
 		var cheap = options.devtool.indexOf("cheap") >= 0;
 		var moduleMaps = options.devtool.indexOf("module") >= 0;
+		var noSources = options.devtool.indexOf("nosources") >= 0;
 		var legacy = options.devtool.indexOf("@") >= 0;
 		var modern = options.devtool.indexOf("#") >= 0;
 		var comment = legacy && modern ? "\n/*\n//@ sourceMappingURL=[url]\n//# sourceMappingURL=[url]\n*/" :
@@ -187,7 +215,8 @@ WebpackOptionsApply.prototype.process = function(options, compiler) {
 			append: hidden ? false : comment,
 			module: moduleMaps ? true : cheap ? false : true,
 			columns: cheap ? false : true,
-			lineToLine: options.output.devtoolLineToLine
+			lineToLine: options.output.devtoolLineToLine,
+			noSources: noSources,
 		}));
 	} else if(options.devtool && options.devtool.indexOf("eval") >= 0) {
 		var legacy = options.devtool.indexOf("@") >= 0;

package/lib/dependencies/AMDDefineDependency.js

@@ -17,7 +17,7 @@ AMDDefineDependency.prototype = Object.create(NullDependency.prototype);
 AMDDefineDependency.prototype.constructor = AMDDefineDependency;
 AMDDefineDependency.prototype.type = "amd define";
 
-AMDDefineDependency.Template = function AMDRequireDependencyTemplate() {};
+AMDDefineDependency.Template = function AMDDefineDependencyTemplate() {};
 
 AMDDefineDependency.Template.prototype.apply = function(dep, source) {
 	var localModuleVar = dep.localModule && dep.localModule.used && dep.localModule.variableName();

package/lib/dependencies/AMDRequireDependenciesBlock.js

@@ -11,6 +11,7 @@ function AMDRequireDependenciesBlock(expr, arrayRange, functionRange, module, lo
 	this.outerRange = expr.range;
 	this.arrayRange = arrayRange;
 	this.functionRange = functionRange;
+	this.bindThis = true;
 	this.range = arrayRange && functionRange ? [arrayRange[0], functionRange[1]] :
 		arrayRange ? arrayRange :
 		functionRange ? functionRange :

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -10,6 +10,7 @@ var LocalModuleDependency = require("./LocalModuleDependency");
 var ContextDependencyHelpers = require("./ContextDependencyHelpers");
 var LocalModulesHelpers = require("./LocalModulesHelpers");
 var ConstDependency = require("./ConstDependency");
+var getFunctionExpression = require("./getFunctionExpression");
 
 function AMDRequireDependenciesBlockParserPlugin(options) {
 	this.options = options;
@@ -46,15 +47,23 @@ AMDRequireDependenciesBlockParserPlugin.prototype.apply = function(parser) {
 						result = this.applyPluginsBailResult("call require:amd:array", expr, param);
 					}.bind(this));
 					if(!result) return;
-					if(expr.arguments[1].type === "FunctionExpression") {
-						this.inScope(expr.arguments[1].params.filter(function(i) {
+					var fnData = getFunctionExpression(expr.arguments[1]);
+					if(fnData) {
+						this.inScope(fnData.fn.params.filter(function(i) {
 							return ["require", "module", "exports"].indexOf(i.name) < 0;
 						}), function() {
-							if(expr.arguments[1].body.type === "BlockStatement")
-								this.walkStatement(expr.arguments[1].body);
+							if(fnData.fn.body.type === "BlockStatement")
+								this.walkStatement(fnData.fn.body);
 							else
-								this.walkExpression(expr.arguments[1].body);
+								this.walkExpression(fnData.fn.body);
 						}.bind(this));
+						this.walkExpressions(fnData.expressions);
+						if(fnData.needThis === false) {
+							// smaller bundles for simple function expression
+							dep.bindThis = false;
+						}
+					} else {
+						this.walkExpression(expr.arguments[1]);
 					}
 				} finally {
 					this.state.current = old;

package/lib/dependencies/AMDRequireDependency.js

@@ -46,14 +46,14 @@ AMDRequireDependency.Template.prototype.apply = function(dep, source, outputOpti
 			source.insert(depBlock.arrayRange[0] + 0.9, "var __WEBPACK_AMD_REQUIRE_ARRAY__ = ");
 			source.replace(depBlock.arrayRange[1], depBlock.functionRange[0] - 1, "; (");
 			source.insert(depBlock.functionRange[1], ".apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));");
-			source.replace(depBlock.functionRange[1], depBlock.outerRange[1] - 1, "}" + wrapper[1]);
+			source.replace(depBlock.functionRange[1], depBlock.outerRange[1] - 1, "}" + (depBlock.bindThis ? ".bind(this)" : "") + wrapper[1]);
 		} else {
 			source.replace(depBlock.outerRange[0], depBlock.arrayRange[0] - 1,
 				"!/* require */(" + asComment(depBlock.chunkReason) + "function() { ");
 			source.insert(depBlock.arrayRange[0] + 0.9, "var __WEBPACK_AMD_REQUIRE_ARRAY__ = ");
 			source.replace(depBlock.arrayRange[1], depBlock.functionRange[0] - 1, "; (");
 			source.insert(depBlock.functionRange[1], ".apply(null, __WEBPACK_AMD_REQUIRE_ARRAY__));");
-			source.replace(depBlock.functionRange[1], depBlock.outerRange[1] - 1, "}())");
+			source.replace(depBlock.functionRange[1], depBlock.outerRange[1] - 1, "}" + (depBlock.bindThis ? ".call(this)" : "()") + ")");
 		}
 	}
 };

package/lib/dependencies/LoaderPlugin.js

@@ -23,9 +23,8 @@ LoaderPlugin.prototype.apply = function(compiler) {
 				], true, "lm", false, function(err) {
 					if(err) return callback(err);
 
-					module = dep.module;
-					if(!module) return callback(new Error("Cannot load the module"));
-					if(module.building) module.building.push(next);
+					if(!dep.module) return callback(new Error("Cannot load the module"));
+					if(dep.module.building) dep.module.building.push(next);
 					else next();
 
 					function next(err) {

package/lib/dependencies/getFunctionExpression.js

@@ -7,7 +7,8 @@ module.exports = function(expr) {
 	if(expr.type === "FunctionExpression") {
 		return {
 			fn: expr,
-			expressions: []
+			expressions: [],
+			needThis: false
 		};
 	}
 	// <FunctionExpression>.bind(<Expression>)
@@ -35,7 +36,8 @@ module.exports = function(expr) {
 		expr.callee.body.body[0].argument.type === "FunctionExpression") {
 		return {
 			fn: expr.callee.body.body[0].argument,
-			expressions: []
+			expressions: [],
+			needThis: true
 		};
 	}
 };

package/lib/optimize/UglifyJsPlugin.js

@@ -91,6 +91,9 @@ UglifyJsPlugin.prototype.apply = function(compiler) {
 						ast.figure_out_scope();
 						ast.compute_char_frequency(options.mangle || {});
 						ast.mangle_names(options.mangle || {});
+						if(options.mangle && options.mangle.props) {
+							uglify.mangle_properties(ast, options.mangle.props);
+						}
 					}
 					var output = {};
 					output.comments = Object.prototype.hasOwnProperty.call(options, "comments") ? options.comments : /^\**!|@preserve|@license/;

package/lib/webpack.js

@@ -28,7 +28,10 @@ function webpack(options, callback) {
 	}
 	if(callback) {
 		if(typeof callback !== "function") throw new Error("Invalid argument: callback");
-		if(options.watch === true) {
+		if(options.watch === true || (Array.isArray(options) &&
+				options.some(function(o) {
+					return o.watch;
+				}))) {
 			var watchOptions = (!Array.isArray(options) ? options : options[0]).watchOptions || {};
 			// TODO remove this in next major version
 			var watchDelay = (!Array.isArray(options) ? options : options[0]).watchDelay;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "webpack",
-  "version": "1.12.13",
+  "version": "1.13.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, jade, coffee, css, less, ... and your custom stuff.",
   "dependencies": {
     "async": "^1.3.0",
     "clone": "^1.0.2",
     "enhanced-resolve": "~0.9.0",
-    "esprima": "^2.5.0",
+    "acorn": "^3.0.0",
     "interpret": "^0.6.4",
     "loader-utils": "^0.2.11",
     "memory-fs": "~0.3.0",