webpack 1.13.0 → 1.14.0

package/lib/EvalSourceMapDevToolModuleTemplatePlugin.js

@@ -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/ModuleFilenameHelpers.js

@@ -96,20 +96,18 @@ ModuleFilenameHelpers.createFooter = function createFooter(module, requestShorte
 	if(!module) module = "";
 	if(typeof module === "string") {
 		return [
-			"/** WEBPACK FOOTER **",
-			" ** " + requestShortener.shorten(module),
-			" **/"
+			"// WEBPACK FOOTER //",
+			"// " + requestShortener.shorten(module)
 		].join("\n");
 	} else {
 		return [
-			"/*****************",
-			" ** WEBPACK FOOTER",
-			" ** " + module.readableIdentifier(requestShortener),
-			" ** module id = " + module.id,
-			" ** module chunks = " + module.chunks.map(function(c) {
+			"//////////////////",
+			"// WEBPACK FOOTER",
+			"// " + module.readableIdentifier(requestShortener),
+			"// module id = " + module.id,
+			"// module chunks = " + module.chunks.map(function(c) {
 				return c.id;
-			}).join(" "),
-			" **/"
+			}).join(" ")
 		].join("\n");
 	}
 };

package/lib/SourceMapDevToolPlugin.js

@@ -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/dependencies/DepBlockHelpers.js

@@ -25,11 +25,11 @@ DepBlockHelpers.getLoadDepBlockWrapper = function(depBlock, outputOptions, reque
 				"if(--__WEBPACK_REMAINING_CHUNKS__ < 1) (",
 
 				"(__webpack_require__));" +
-				"};" +
+				"}.bind(this);" +
 				chunks.map(function(chunk) {
 					return "__webpack_require__.e(" + chunk.id + ", __WEBPACK_CALLBACK__);";
 				}).join("") +
-				"}())"
+				"}).call(this)"
 			];
 		}
 	}

package/lib/node/NodeSourcePlugin.js

@@ -5,12 +5,31 @@
 var ModuleAliasPlugin = require("enhanced-resolve/lib/ModuleAliasPlugin");
 var ModuleParserHelpers = require("../ModuleParserHelpers");
 var nodeLibsBrowser = require("node-libs-browser");
+var path = require("path");
 
 function NodeSourcePlugin(options) {
 	this.options = options;
 }
 module.exports = NodeSourcePlugin;
 NodeSourcePlugin.prototype.apply = function(compiler) {
+	var parser = compiler.parser;
+
+	function buildExpression(context, pathToModule) {
+		var moduleJsPath = path.relative(context, pathToModule);
+		if(!/^[A-Z]:/i.test(moduleJsPath)) {
+			moduleJsPath = "./" + moduleJsPath.replace(/\\/g, "/");
+		}
+		return "require(" + JSON.stringify(moduleJsPath) + ")";
+	}
+
+	function addExpression(parser, name, module, type, suffix) {
+		suffix = suffix || "";
+		parser.plugin("expression " + name, function() {
+			if(this.state.module && this.state.module.resource === getPathToModule(module, type)) return;
+			return ModuleParserHelpers.addParsedVariable(this, name, buildExpression(this.state.module.context, getPathToModule(module, type)) + suffix);
+		});
+	}
+
 	function getPathToModule(module, type) {
 		if(type === true || (type === undefined && nodeLibsBrowser[module])) {
 			if(!nodeLibsBrowser[module]) throw new Error("No browser version for node.js core module '" + module + "' available");
@@ -21,23 +40,20 @@ NodeSourcePlugin.prototype.apply = function(compiler) {
 			return require.resolve("node-libs-browser/mock/empty");
 		} else return module;
 	}
-	if(this.options.process) {
-		var processType = this.options.process;
-		compiler.parser.plugin("expression process", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "process", "require(" + JSON.stringify(getPathToModule("process", processType)) + ")");
-		});
-	}
+
 	if(this.options.global) {
 		compiler.parser.plugin("expression global", function() {
 			this.state.module.addVariable("global", "(function() { return this; }())");
 			return true;
 		});
 	}
+	if(this.options.process) {
+		var processType = this.options.process;
+		addExpression(parser, "process", "process", processType);
+	}
 	if(this.options.console) {
 		var consoleType = this.options.console;
-		compiler.parser.plugin("expression console", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "console", "require(" + JSON.stringify(getPathToModule("console", consoleType)) + ")");
-		});
+		addExpression(parser, "console", "console", consoleType);
 	}
 	var bufferType = this.options.Buffer;
 	if(typeof bufferType === "undefined") {
@@ -46,18 +62,12 @@ NodeSourcePlugin.prototype.apply = function(compiler) {
 			bufferType = true;
 	}
 	if(bufferType) {
-		compiler.parser.plugin("expression Buffer", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "Buffer", "require(" + JSON.stringify(getPathToModule("buffer", bufferType)) + ").Buffer");
-		});
+		addExpression(parser, "Buffer", "buffer", bufferType, ".Buffer");
 	}
 	if(this.options.setImmediate) {
 		var setImmediateType = this.options.setImmediate;
-		compiler.parser.plugin("expression setImmediate", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "setImmediate", "require(" + JSON.stringify(getPathToModule("timers", setImmediateType)) + ").setImmediate");
-		});
-		compiler.parser.plugin("expression clearImmediate", function() {
-			return ModuleParserHelpers.addParsedVariable(this, "clearImmediate", "require(" + JSON.stringify(getPathToModule("timers", setImmediateType)) + ").clearImmediate");
-		});
+		addExpression(parser, "setImmediate", "timers", setImmediateType, ".setImmediate");
+		addExpression(parser, "clearImmediate", "timers", setImmediateType, ".clearImmediate");
 	}
 	var options = this.options;
 	compiler.plugin("after-resolvers", function(compiler) {

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,24 +1,24 @@
 {
   "name": "webpack",
-  "version": "1.13.0",
+  "version": "1.14.0",
   "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": {
+    "acorn": "^3.0.0",
     "async": "^1.3.0",
     "clone": "^1.0.2",
     "enhanced-resolve": "~0.9.0",
-    "acorn": "^3.0.0",
     "interpret": "^0.6.4",
     "loader-utils": "^0.2.11",
     "memory-fs": "~0.3.0",
     "mkdirp": "~0.5.0",
-    "node-libs-browser": ">= 0.4.0 <=0.6.0",
+    "node-libs-browser": "^0.7.0",
     "optimist": "~0.6.0",
     "supports-color": "^3.1.0",
     "tapable": "~0.1.8",
-    "uglify-js": "~2.6.0",
+    "uglify-js": "~2.7.3",
     "watchpack": "^0.2.1",
-    "webpack-core": "~0.6.0"
+    "webpack-core": "~0.6.9"
   },
   "license": "MIT",
   "devDependencies": {
@@ -83,7 +83,7 @@
     "beautify-lint": "node ./scripts/beautify-check",
     "beautify": "node ./scripts/beautify-rewrite",
     "precover": "npm run lint && npm run beautify-lint",
-    "cover": "istanbul cover -x *.runtime.js node_modules/mocha/bin/_mocha",
+    "cover": "istanbul cover -x **/*.runtime.js node_modules/mocha/bin/_mocha",
     "publish-patch": "npm run lint && npm run beautify-lint && mocha && npm version patch && git push && git push --tags && npm publish"
   }
 }