webpack 1.13.3 → 1.14.0

package/lib/ConcatSource.js

@@ -1,5 +1,5 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-module.exports = require("webpack-core/lib/ConcatSource");
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+module.exports = require("webpack-core/lib/ConcatSource");

package/lib/ConstPlugin.js

@@ -1,54 +1,54 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var ConstDependency = require("./dependencies/ConstDependency");
-var BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
-
-var NullFactory = require("./NullFactory");
-
-function ConstPlugin() {}
-module.exports = ConstPlugin;
-
-ConstPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("compilation", function(compilation) {
-		compilation.dependencyFactories.set(ConstDependency, new NullFactory());
-		compilation.dependencyTemplates.set(ConstDependency, new ConstDependency.Template());
-	});
-	compiler.parser.plugin("statement if", function(statement) {
-		var param = this.evaluateExpression(statement.test);
-		var bool = param.asBool();
-		if(typeof bool === "boolean") {
-			if(statement.test.type !== "Literal") {
-				var dep = new ConstDependency(bool + "", param.range);
-				dep.loc = statement.loc;
-				this.state.current.addDependency(dep);
-			}
-			return bool;
-		}
-	});
-	compiler.parser.plugin("expression ?:", function(expression) {
-		var param = this.evaluateExpression(expression.test);
-		var bool = param.asBool();
-		if(typeof bool === "boolean") {
-			if(expression.test.type !== "Literal") {
-				var dep = new ConstDependency(" " + bool + "", param.range);
-				dep.loc = expression.loc;
-				this.state.current.addDependency(dep);
-			}
-			return bool;
-		}
-	});
-	compiler.parser.plugin("evaluate Identifier __resourceQuery", function(expr) {
-		if(!this.state.module) return;
-		var res = new BasicEvaluatedExpression();
-		res.setString(this.state.module.splitQuery(this.state.module.resource)[1]);
-		res.setRange(expr.range);
-		return res;
-	});
-	compiler.parser.plugin("expression __resourceQuery", function() {
-		if(!this.state.module) return;
-		this.state.current.addVariable("__resourceQuery", JSON.stringify(this.state.module.splitQuery(this.state.module.resource)[1]));
-		return true;
-	});
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var ConstDependency = require("./dependencies/ConstDependency");
+var BasicEvaluatedExpression = require("./BasicEvaluatedExpression");
+
+var NullFactory = require("./NullFactory");
+
+function ConstPlugin() {}
+module.exports = ConstPlugin;
+
+ConstPlugin.prototype.apply = function(compiler) {
+	compiler.plugin("compilation", function(compilation) {
+		compilation.dependencyFactories.set(ConstDependency, new NullFactory());
+		compilation.dependencyTemplates.set(ConstDependency, new ConstDependency.Template());
+	});
+	compiler.parser.plugin("statement if", function(statement) {
+		var param = this.evaluateExpression(statement.test);
+		var bool = param.asBool();
+		if(typeof bool === "boolean") {
+			if(statement.test.type !== "Literal") {
+				var dep = new ConstDependency(bool + "", param.range);
+				dep.loc = statement.loc;
+				this.state.current.addDependency(dep);
+			}
+			return bool;
+		}
+	});
+	compiler.parser.plugin("expression ?:", function(expression) {
+		var param = this.evaluateExpression(expression.test);
+		var bool = param.asBool();
+		if(typeof bool === "boolean") {
+			if(expression.test.type !== "Literal") {
+				var dep = new ConstDependency(" " + bool + "", param.range);
+				dep.loc = expression.loc;
+				this.state.current.addDependency(dep);
+			}
+			return bool;
+		}
+	});
+	compiler.parser.plugin("evaluate Identifier __resourceQuery", function(expr) {
+		if(!this.state.module) return;
+		var res = new BasicEvaluatedExpression();
+		res.setString(this.state.module.splitQuery(this.state.module.resource)[1]);
+		res.setRange(expr.range);
+		return res;
+	});
+	compiler.parser.plugin("expression __resourceQuery", function() {
+		if(!this.state.module) return;
+		this.state.current.addVariable("__resourceQuery", JSON.stringify(this.state.module.splitQuery(this.state.module.resource)[1]));
+		return true;
+	});
+};

package/lib/ContextModule.js

@@ -1,130 +1,130 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var Module = require("./Module");
-var OriginalSource = require("webpack-core/lib/OriginalSource");
-var RawSource = require("webpack-core/lib/RawSource");
-
-function ContextModule(resolveDependencies, context, recursive, regExp, addon) {
-	Module.call(this);
-	this.resolveDependencies = resolveDependencies;
-	this.context = context;
-	this.recursive = recursive;
-	this.regExp = regExp;
-	this.addon = addon;
-	this.cacheable = true;
-	this.contextDependencies = [context];
-	this.built = false;
-}
-module.exports = ContextModule;
-
-ContextModule.prototype = Object.create(Module.prototype);
-
-ContextModule.prototype.identifier = function() {
-	var identifier = "";
-	identifier += this.context + " ";
-	if(!this.recursive)
-		identifier += "nonrecursive ";
-	if(this.addon)
-		identifier += this.addon;
-	if(this.regExp)
-		identifier += this.regExp;
-	return identifier.replace(/ $/, "");
-};
-
-function prettyRegExp(str) {
-	return str.substring(1, str.length - 1);
-}
-
-ContextModule.prototype.readableIdentifier = function(requestShortener) {
-	var identifier = "";
-	identifier += requestShortener.shorten(this.context) + " ";
-	if(!this.recursive)
-		identifier += "nonrecursive ";
-	if(this.addon)
-		identifier += requestShortener.shorten(this.addon);
-	if(this.regExp)
-		identifier += prettyRegExp(this.regExp + "");
-	return identifier.replace(/ $/, "");
-};
-
-ContextModule.prototype.needRebuild = function(fileTimestamps, contextTimestamps) {
-	var ts = contextTimestamps[this.context];
-	if(!ts) return true;
-	return ts >= this.builtTime;
-};
-
-ContextModule.prototype.disconnect = function disconnect() {
-	this.built = false;
-	Module.prototype.disconnect.call(this);
-};
-
-ContextModule.prototype.build = function(options, compilation, resolver, fs, callback) {
-	this.built = true;
-	this.builtTime = new Date().getTime();
-	var addon = this.addon;
-	this.resolveDependencies(fs, this.context, this.recursive, this.regExp, function(err, dependencies) {
-		if(err) return callback(err);
-		if(dependencies) {
-			dependencies.forEach(function(dep) {
-				dep.loc = dep.userRequest;
-				dep.request = addon + dep.request;
-			});
-		}
-		this.dependencies = dependencies;
-		callback();
-	}.bind(this));
-};
-
-ContextModule.prototype.source = function() {
-	var str;
-	if(this.dependencies && this.dependencies.length > 0) {
-		var map = {};
-		this.dependencies.slice().sort(function(a, b) {
-			if(a.userRequest === b.userRequest) return 0;
-			return a.userRequest < b.userRequest ? -1 : 1;
-		}).forEach(function(dep) {
-			if(dep.module)
-				map[dep.userRequest] = dep.module.id;
-		});
-		str = [
-			"var map = ", JSON.stringify(map, null, "\t"), ";\n",
-			"function webpackContext(req) {\n",
-			"\treturn __webpack_require__(webpackContextResolve(req));\n",
-			"};\n",
-			"function webpackContextResolve(req) {\n",
-			"\treturn map[req] || (function() { throw new Error(\"Cannot find module '\" + req + \"'.\") }());\n",
-			"};\n",
-			"webpackContext.keys = function webpackContextKeys() {\n",
-			"\treturn Object.keys(map);\n",
-			"};\n",
-			"webpackContext.resolve = webpackContextResolve;\n",
-			"module.exports = webpackContext;\n",
-			"webpackContext.id = " + this.id + ";\n"
-		];
-	} else {
-		str = [
-			"function webpackContext(req) {\n",
-			"\tthrow new Error(\"Cannot find module '\" + req + \"'.\");\n",
-			"}\n",
-			"webpackContext.keys = function() { return []; };\n",
-			"webpackContext.resolve = webpackContext;\n",
-			"module.exports = webpackContext;\n",
-			"webpackContext.id = " + this.id + ";\n"
-		];
-	}
-	if(this.useSourceMap) {
-		return new OriginalSource(str.join(""), this.identifier());
-	} else {
-		return new RawSource(str.join(""));
-	}
-};
-
-ContextModule.prototype.size = function() {
-	return this.dependencies.map(function(dep) {
-		return dep.userRequest.length + 5;
-	}).reduce(function(a, b) {
-		return a + b;
-	}, 160);
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var Module = require("./Module");
+var OriginalSource = require("webpack-core/lib/OriginalSource");
+var RawSource = require("webpack-core/lib/RawSource");
+
+function ContextModule(resolveDependencies, context, recursive, regExp, addon) {
+	Module.call(this);
+	this.resolveDependencies = resolveDependencies;
+	this.context = context;
+	this.recursive = recursive;
+	this.regExp = regExp;
+	this.addon = addon;
+	this.cacheable = true;
+	this.contextDependencies = [context];
+	this.built = false;
+}
+module.exports = ContextModule;
+
+ContextModule.prototype = Object.create(Module.prototype);
+
+ContextModule.prototype.identifier = function() {
+	var identifier = "";
+	identifier += this.context + " ";
+	if(!this.recursive)
+		identifier += "nonrecursive ";
+	if(this.addon)
+		identifier += this.addon;
+	if(this.regExp)
+		identifier += this.regExp;
+	return identifier.replace(/ $/, "");
+};
+
+function prettyRegExp(str) {
+	return str.substring(1, str.length - 1);
+}
+
+ContextModule.prototype.readableIdentifier = function(requestShortener) {
+	var identifier = "";
+	identifier += requestShortener.shorten(this.context) + " ";
+	if(!this.recursive)
+		identifier += "nonrecursive ";
+	if(this.addon)
+		identifier += requestShortener.shorten(this.addon);
+	if(this.regExp)
+		identifier += prettyRegExp(this.regExp + "");
+	return identifier.replace(/ $/, "");
+};
+
+ContextModule.prototype.needRebuild = function(fileTimestamps, contextTimestamps) {
+	var ts = contextTimestamps[this.context];
+	if(!ts) return true;
+	return ts >= this.builtTime;
+};
+
+ContextModule.prototype.disconnect = function disconnect() {
+	this.built = false;
+	Module.prototype.disconnect.call(this);
+};
+
+ContextModule.prototype.build = function(options, compilation, resolver, fs, callback) {
+	this.built = true;
+	this.builtTime = new Date().getTime();
+	var addon = this.addon;
+	this.resolveDependencies(fs, this.context, this.recursive, this.regExp, function(err, dependencies) {
+		if(err) return callback(err);
+		if(dependencies) {
+			dependencies.forEach(function(dep) {
+				dep.loc = dep.userRequest;
+				dep.request = addon + dep.request;
+			});
+		}
+		this.dependencies = dependencies;
+		callback();
+	}.bind(this));
+};
+
+ContextModule.prototype.source = function() {
+	var str;
+	if(this.dependencies && this.dependencies.length > 0) {
+		var map = {};
+		this.dependencies.slice().sort(function(a, b) {
+			if(a.userRequest === b.userRequest) return 0;
+			return a.userRequest < b.userRequest ? -1 : 1;
+		}).forEach(function(dep) {
+			if(dep.module)
+				map[dep.userRequest] = dep.module.id;
+		});
+		str = [
+			"var map = ", JSON.stringify(map, null, "\t"), ";\n",
+			"function webpackContext(req) {\n",
+			"\treturn __webpack_require__(webpackContextResolve(req));\n",
+			"};\n",
+			"function webpackContextResolve(req) {\n",
+			"\treturn map[req] || (function() { throw new Error(\"Cannot find module '\" + req + \"'.\") }());\n",
+			"};\n",
+			"webpackContext.keys = function webpackContextKeys() {\n",
+			"\treturn Object.keys(map);\n",
+			"};\n",
+			"webpackContext.resolve = webpackContextResolve;\n",
+			"module.exports = webpackContext;\n",
+			"webpackContext.id = " + this.id + ";\n"
+		];
+	} else {
+		str = [
+			"function webpackContext(req) {\n",
+			"\tthrow new Error(\"Cannot find module '\" + req + \"'.\");\n",
+			"}\n",
+			"webpackContext.keys = function() { return []; };\n",
+			"webpackContext.resolve = webpackContext;\n",
+			"module.exports = webpackContext;\n",
+			"webpackContext.id = " + this.id + ";\n"
+		];
+	}
+	if(this.useSourceMap) {
+		return new OriginalSource(str.join(""), this.identifier());
+	} else {
+		return new RawSource(str.join(""));
+	}
+};
+
+ContextModule.prototype.size = function() {
+	return this.dependencies.map(function(dep) {
+		return dep.userRequest.length + 5;
+	}).reduce(function(a, b) {
+		return a + b;
+	}, 160);
+};

package/lib/ContextModuleFactory.js

@@ -1,132 +1,132 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var async = require("async");
-var path = require("path");
-
-var Tapable = require("tapable");
-var ContextModule = require("./ContextModule");
-var ContextElementDependency = require("./dependencies/ContextElementDependency");
-
-function ContextModuleFactory(resolvers) {
-	Tapable.call(this);
-	this.resolvers = resolvers;
-}
-module.exports = ContextModuleFactory;
-
-ContextModuleFactory.prototype = Object.create(Tapable.prototype);
-ContextModuleFactory.prototype.constructor = ContextModuleFactory;
-
-ContextModuleFactory.prototype.create = function(context, dependency, callback) {
-	this.applyPluginsAsyncWaterfall("before-resolve", {
-		context: context,
-		request: dependency.request,
-		recursive: dependency.recursive,
-		regExp: dependency.regExp
-	}, function(err, result) {
-		if(err) return callback(err);
-
-		// Ignored
-		if(!result) return callback();
-
-		var context = result.context;
-		var request = result.request;
-		var recursive = result.recursive;
-		var regExp = result.regExp;
-
-		var loaders, resource, loadersPrefix = "";
-		var idx = request.lastIndexOf("!");
-		if(idx >= 0) {
-			loaders = request.substr(0, idx + 1);
-			for(var i = 0; i < loaders.length && loaders[i] === "!"; i++) {
-				loadersPrefix += "!";
-			}
-			loaders = loaders.substr(i).replace(/!+$/, "").replace(/!!+/g, "!");
-			if(loaders === "") loaders = [];
-			else loaders = loaders.split("!");
-			resource = request.substr(idx + 1);
-		} else {
-			loaders = [];
-			resource = request;
-		}
-
-		async.parallel([
-			this.resolvers.context.resolve.bind(this.resolvers.context, context, resource),
-			async.map.bind(async, loaders, this.resolvers.loader.resolve.bind(this.resolvers.loader, context))
-		], function(err, result) {
-			if(err) return callback(err);
-
-			this.applyPluginsAsyncWaterfall("after-resolve", {
-				loaders: loadersPrefix + result[1].join("!") + (result[1].length > 0 ? "!" : ""),
-				resource: result[0],
-				recursive: recursive,
-				regExp: regExp,
-				resolveDependencies: this.resolveDependencies.bind(this)
-			}, function(err, result) {
-				if(err) return callback(err);
-
-				// Ignored
-				if(!result) return callback();
-
-				return callback(null, new ContextModule(result.resolveDependencies, result.resource, result.recursive, result.regExp, result.loaders));
-			});
-		}.bind(this));
-	}.bind(this));
-};
-
-ContextModuleFactory.prototype.resolveDependencies = function resolveDependencies(fs, resource, recursive, regExp, callback) {
-	(function addDirectory(directory, callback) {
-		fs.readdir(directory, function(err, files) {
-			if(err) return callback(err);
-			if(!files || files.length === 0) return callback(null, []);
-			async.map(files.filter(function(p) {
-				return p.indexOf(".") !== 0;
-			}), function(seqment, callback) {
-
-				var subResource = path.join(directory, seqment);
-
-				fs.stat(subResource, function(err, stat) {
-					if(err) return callback(err);
-
-					if(stat.isDirectory()) {
-
-						if(!recursive) return callback();
-						addDirectory.call(this, subResource, callback);
-
-					} else if(stat.isFile()) {
-
-						var obj = {
-							context: resource,
-							request: "." + subResource.substr(resource.length).replace(/\\/g, "/")
-						};
-						this.applyPluginsAsyncWaterfall("alternatives", [obj], function(err, alternatives) {
-							if(err) return callback(err);
-							alternatives = alternatives.filter(function(obj) {
-								return regExp.test(obj.request);
-							}).map(function(obj) {
-								var dep = new ContextElementDependency(obj.request);
-								dep.optional = true;
-								return dep;
-							});
-							callback(null, alternatives);
-						});
-
-					} else callback();
-
-				}.bind(this));
-
-			}.bind(this), function(err, result) {
-				if(err) return callback(err);
-
-				if(!result) return callback(null, []);
-
-				callback(null, result.filter(function(i) {
-					return !!i;
-				}).reduce(function(a, i) {
-					return a.concat(i);
-				}, []));
-			});
-		}.bind(this));
-	}.call(this, resource, callback));
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var async = require("async");
+var path = require("path");
+
+var Tapable = require("tapable");
+var ContextModule = require("./ContextModule");
+var ContextElementDependency = require("./dependencies/ContextElementDependency");
+
+function ContextModuleFactory(resolvers) {
+	Tapable.call(this);
+	this.resolvers = resolvers;
+}
+module.exports = ContextModuleFactory;
+
+ContextModuleFactory.prototype = Object.create(Tapable.prototype);
+ContextModuleFactory.prototype.constructor = ContextModuleFactory;
+
+ContextModuleFactory.prototype.create = function(context, dependency, callback) {
+	this.applyPluginsAsyncWaterfall("before-resolve", {
+		context: context,
+		request: dependency.request,
+		recursive: dependency.recursive,
+		regExp: dependency.regExp
+	}, function(err, result) {
+		if(err) return callback(err);
+
+		// Ignored
+		if(!result) return callback();
+
+		var context = result.context;
+		var request = result.request;
+		var recursive = result.recursive;
+		var regExp = result.regExp;
+
+		var loaders, resource, loadersPrefix = "";
+		var idx = request.lastIndexOf("!");
+		if(idx >= 0) {
+			loaders = request.substr(0, idx + 1);
+			for(var i = 0; i < loaders.length && loaders[i] === "!"; i++) {
+				loadersPrefix += "!";
+			}
+			loaders = loaders.substr(i).replace(/!+$/, "").replace(/!!+/g, "!");
+			if(loaders === "") loaders = [];
+			else loaders = loaders.split("!");
+			resource = request.substr(idx + 1);
+		} else {
+			loaders = [];
+			resource = request;
+		}
+
+		async.parallel([
+			this.resolvers.context.resolve.bind(this.resolvers.context, context, resource),
+			async.map.bind(async, loaders, this.resolvers.loader.resolve.bind(this.resolvers.loader, context))
+		], function(err, result) {
+			if(err) return callback(err);
+
+			this.applyPluginsAsyncWaterfall("after-resolve", {
+				loaders: loadersPrefix + result[1].join("!") + (result[1].length > 0 ? "!" : ""),
+				resource: result[0],
+				recursive: recursive,
+				regExp: regExp,
+				resolveDependencies: this.resolveDependencies.bind(this)
+			}, function(err, result) {
+				if(err) return callback(err);
+
+				// Ignored
+				if(!result) return callback();
+
+				return callback(null, new ContextModule(result.resolveDependencies, result.resource, result.recursive, result.regExp, result.loaders));
+			});
+		}.bind(this));
+	}.bind(this));
+};
+
+ContextModuleFactory.prototype.resolveDependencies = function resolveDependencies(fs, resource, recursive, regExp, callback) {
+	(function addDirectory(directory, callback) {
+		fs.readdir(directory, function(err, files) {
+			if(err) return callback(err);
+			if(!files || files.length === 0) return callback(null, []);
+			async.map(files.filter(function(p) {
+				return p.indexOf(".") !== 0;
+			}), function(seqment, callback) {
+
+				var subResource = path.join(directory, seqment);
+
+				fs.stat(subResource, function(err, stat) {
+					if(err) return callback(err);
+
+					if(stat.isDirectory()) {
+
+						if(!recursive) return callback();
+						addDirectory.call(this, subResource, callback);
+
+					} else if(stat.isFile()) {
+
+						var obj = {
+							context: resource,
+							request: "." + subResource.substr(resource.length).replace(/\\/g, "/")
+						};
+						this.applyPluginsAsyncWaterfall("alternatives", [obj], function(err, alternatives) {
+							if(err) return callback(err);
+							alternatives = alternatives.filter(function(obj) {
+								return regExp.test(obj.request);
+							}).map(function(obj) {
+								var dep = new ContextElementDependency(obj.request);
+								dep.optional = true;
+								return dep;
+							});
+							callback(null, alternatives);
+						});
+
+					} else callback();
+
+				}.bind(this));
+
+			}.bind(this), function(err, result) {
+				if(err) return callback(err);
+
+				if(!result) return callback(null, []);
+
+				callback(null, result.filter(function(i) {
+					return !!i;
+				}).reduce(function(a, i) {
+					return a.concat(i);
+				}, []));
+			});
+		}.bind(this));
+	}.call(this, resource, callback));
+};