webpack 1.13.3 → 1.14.0

package/lib/Template.js

@@ -1,119 +1,119 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var Tapable = require("tapable");
-var ConcatSource = require("webpack-core/lib/ConcatSource");
-
-function Template(outputOptions) {
-	Tapable.call(this);
-	this.outputOptions = outputOptions || {};
-}
-module.exports = Template;
-
-Template.getFunctionContent = function(fn) {
-	return fn.toString().replace(/^function\s?\(\)\s?\{\n?|\n?\}$/g, "").replace(/^\t/mg, "");
-};
-
-Template.toIdentifier = function(str) {
-	if(typeof str !== "string") return "";
-	return str.replace(/^[^a-zA-Z$_]/, "_").replace(/[^a-zA-Z0-9$_]/g, "_");
-};
-
-Template.prototype = Object.create(Tapable.prototype);
-Template.prototype.constructor = Template;
-
-Template.prototype.indent = function indent(str) {
-	if(Array.isArray(str)) {
-		return str.map(indent).join("\n");
-	} else {
-		str = str.trimRight();
-		if(!str) return "";
-		var ind = (str[0] === "\n" ? "" : "\t");
-		return ind + str.replace(/\n([^\n])/g, "\n\t$1");
-	}
-};
-
-Template.prototype.prefix = function(str, prefix) {
-	if(Array.isArray(str)) {
-		str = str.join("\n");
-	}
-	str = str.trim();
-	if(!str) return "";
-	var ind = (str[0] === "\n" ? "" : prefix);
-	return ind + str.replace(/\n([^\n])/g, "\n" + prefix + "$1");
-};
-
-Template.prototype.asString = function(str) {
-	if(Array.isArray(str)) {
-		return str.join("\n");
-	}
-	return str;
-};
-
-Template.prototype.getModulesArrayBounds = function(modules) {
-	if(modules.some(function(module) {
-			return typeof module.id !== "number";
-		}))
-		return false;
-	var maxId = -Infinity;
-	var minId = Infinity;
-	modules.forEach(function(module) {
-		if(maxId < module.id) maxId = module.id;
-		if(minId > module.id) minId = module.id;
-	});
-	if(minId < 16 + ("" + minId).length) {
-		// add minId x ',' instead of 'Array(minId).concat(...)'
-		minId = 0;
-	}
-	var objectOverhead = modules.map(function(module) {
-		var idLength = (module.id + "").length;
-		return idLength + 2;
-	}).reduce(function(a, b) {
-		return a + b;
-	}, -1);
-	var arrayOverhead = minId === 0 ? maxId : 16 + ("" + minId).length + maxId;
-	return arrayOverhead < objectOverhead ? [minId, maxId] : false;
-};
-
-Template.prototype.renderChunkModules = function(chunk, moduleTemplate, dependencyTemplates, prefix) {
-	if(!prefix) prefix = "";
-	var source = new ConcatSource();
-	if(chunk.modules.length === 0) {
-		source.add("[]");
-		return source;
-	}
-	var bounds = this.getModulesArrayBounds(chunk.modules);
-	if(bounds) {
-		// Render a spare array
-		var minId = bounds[0];
-		var maxId = bounds[1];
-		if(minId !== 0) source.add("Array(" + minId + ").concat(");
-		source.add("[\n");
-		var modules = {};
-		chunk.modules.forEach(function(module) {
-			modules[module.id] = module;
-		});
-		for(var idx = minId; idx <= maxId; idx++) {
-			var module = modules[idx];
-			if(idx !== minId) source.add(",\n");
-			source.add("/* " + idx + " */");
-			if(module) {
-				source.add("\n");
-				source.add(moduleTemplate.render(module, dependencyTemplates, chunk));
-			}
-		}
-		source.add("\n" + prefix + "]");
-		if(minId !== 0) source.add(")");
-	} else {
-		// Render an object
-		source.add("{\n");
-		chunk.modules.forEach(function(module, idx) {
-			if(idx !== 0) source.add(",\n");
-			source.add("\n/***/ " + JSON.stringify(module.id) + ":\n");
-			source.add(moduleTemplate.render(module, dependencyTemplates, chunk));
-		});
-		source.add("\n\n" + prefix + "}");
-	}
-	return source;
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+var Tapable = require("tapable");
+var ConcatSource = require("webpack-core/lib/ConcatSource");
+
+function Template(outputOptions) {
+	Tapable.call(this);
+	this.outputOptions = outputOptions || {};
+}
+module.exports = Template;
+
+Template.getFunctionContent = function(fn) {
+	return fn.toString().replace(/^function\s?\(\)\s?\{\n?|\n?\}$/g, "").replace(/^\t/mg, "");
+};
+
+Template.toIdentifier = function(str) {
+	if(typeof str !== "string") return "";
+	return str.replace(/^[^a-zA-Z$_]/, "_").replace(/[^a-zA-Z0-9$_]/g, "_");
+};
+
+Template.prototype = Object.create(Tapable.prototype);
+Template.prototype.constructor = Template;
+
+Template.prototype.indent = function indent(str) {
+	if(Array.isArray(str)) {
+		return str.map(indent).join("\n");
+	} else {
+		str = str.trimRight();
+		if(!str) return "";
+		var ind = (str[0] === "\n" ? "" : "\t");
+		return ind + str.replace(/\n([^\n])/g, "\n\t$1");
+	}
+};
+
+Template.prototype.prefix = function(str, prefix) {
+	if(Array.isArray(str)) {
+		str = str.join("\n");
+	}
+	str = str.trim();
+	if(!str) return "";
+	var ind = (str[0] === "\n" ? "" : prefix);
+	return ind + str.replace(/\n([^\n])/g, "\n" + prefix + "$1");
+};
+
+Template.prototype.asString = function(str) {
+	if(Array.isArray(str)) {
+		return str.join("\n");
+	}
+	return str;
+};
+
+Template.prototype.getModulesArrayBounds = function(modules) {
+	if(modules.some(function(module) {
+			return typeof module.id !== "number";
+		}))
+		return false;
+	var maxId = -Infinity;
+	var minId = Infinity;
+	modules.forEach(function(module) {
+		if(maxId < module.id) maxId = module.id;
+		if(minId > module.id) minId = module.id;
+	});
+	if(minId < 16 + ("" + minId).length) {
+		// add minId x ',' instead of 'Array(minId).concat(...)'
+		minId = 0;
+	}
+	var objectOverhead = modules.map(function(module) {
+		var idLength = (module.id + "").length;
+		return idLength + 2;
+	}).reduce(function(a, b) {
+		return a + b;
+	}, -1);
+	var arrayOverhead = minId === 0 ? maxId : 16 + ("" + minId).length + maxId;
+	return arrayOverhead < objectOverhead ? [minId, maxId] : false;
+};
+
+Template.prototype.renderChunkModules = function(chunk, moduleTemplate, dependencyTemplates, prefix) {
+	if(!prefix) prefix = "";
+	var source = new ConcatSource();
+	if(chunk.modules.length === 0) {
+		source.add("[]");
+		return source;
+	}
+	var bounds = this.getModulesArrayBounds(chunk.modules);
+	if(bounds) {
+		// Render a spare array
+		var minId = bounds[0];
+		var maxId = bounds[1];
+		if(minId !== 0) source.add("Array(" + minId + ").concat(");
+		source.add("[\n");
+		var modules = {};
+		chunk.modules.forEach(function(module) {
+			modules[module.id] = module;
+		});
+		for(var idx = minId; idx <= maxId; idx++) {
+			var module = modules[idx];
+			if(idx !== minId) source.add(",\n");
+			source.add("/* " + idx + " */");
+			if(module) {
+				source.add("\n");
+				source.add(moduleTemplate.render(module, dependencyTemplates, chunk));
+			}
+		}
+		source.add("\n" + prefix + "]");
+		if(minId !== 0) source.add(")");
+	} else {
+		// Render an object
+		source.add("{\n");
+		chunk.modules.forEach(function(module, idx) {
+			if(idx !== 0) source.add(",\n");
+			source.add("\n/***/ " + JSON.stringify(module.id) + ":\n");
+			source.add(moduleTemplate.render(module, dependencyTemplates, chunk));
+		});
+		source.add("\n\n" + prefix + "}");
+	}
+	return source;
+};

package/lib/TemplatedPathPlugin.js

@@ -1,111 +1,111 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Jason Anderson @diurnalist
-*/
-
-var REGEXP_HASH = /\[hash(?::(\d+))?\]/gi,
-	REGEXP_CHUNKHASH = /\[chunkhash(?::(\d+))?\]/gi,
-	REGEXP_NAME = /\[name\]/gi,
-	REGEXP_ID = /\[id\]/gi,
-	REGEXP_FILE = /\[file\]/gi,
-	REGEXP_QUERY = /\[query\]/gi,
-	REGEXP_FILEBASE = /\[filebase\]/gi;
-
-// Using global RegExp for .test is dangerous
-// We use a normal RegExp instead of .test
-var REGEXP_HASH_FOR_TEST = new RegExp(REGEXP_HASH.source, "i"),
-	REGEXP_CHUNKHASH_FOR_TEST = new RegExp(REGEXP_CHUNKHASH.source, "i"),
-	REGEXP_NAME_FOR_TEST = new RegExp(REGEXP_NAME.source, "i");
-
-// Backwards compatibility; expose regexes on Template object
-var Template = require("./Template");
-Template.REGEXP_HASH = REGEXP_HASH;
-Template.REGEXP_CHUNKHASH = REGEXP_CHUNKHASH;
-Template.REGEXP_NAME = REGEXP_NAME;
-Template.REGEXP_ID = REGEXP_ID;
-Template.REGEXP_FILE = REGEXP_FILE;
-Template.REGEXP_QUERY = REGEXP_QUERY;
-Template.REGEXP_FILEBASE = REGEXP_FILEBASE;
-
-function TemplatedPathPlugin() {}
-
-module.exports = TemplatedPathPlugin;
-
-function withHashLength(replacer, handlerFn) {
-	return function(_, hashLength) {
-		var length = hashLength && parseInt(hashLength, 10);
-		if(length && handlerFn) {
-			return handlerFn(length);
-		}
-		var hash = replacer.apply(this, arguments);
-		return length ? hash.slice(0, length) : hash;
-	};
-}
-
-function getReplacer(value, allowEmpty) {
-	return function(match) {
-		// last argument in replacer is the entire input string
-		var input = arguments[arguments.length - 1];
-		if(value == null) {
-			if(!allowEmpty) throw new Error("Path variable " + match + " not implemented in this context: " + input);
-			return "";
-		} else {
-			return "" + value;
-		}
-	};
-}
-
-function replacePathVariables(path, data) {
-	var chunk = data.chunk;
-	var chunkId = chunk && chunk.id;
-	var chunkName = chunk && (chunk.name || chunk.id);
-	var chunkHash = chunk && (chunk.renderedHash || chunk.hash);
-	var chunkHashWithLength = chunk && chunk.hashWithLength;
-
-	if(data.noChunkHash && REGEXP_CHUNKHASH_FOR_TEST.test(path)) {
-		throw new Error("Cannot use [chunkhash] for chunk in '" + path + "' (use [hash] instead)");
-	}
-
-	return path
-		.replace(REGEXP_HASH, withHashLength(getReplacer(data.hash), data.hashWithLength))
-		.replace(REGEXP_CHUNKHASH, withHashLength(getReplacer(chunkHash), chunkHashWithLength))
-		.replace(REGEXP_ID, getReplacer(chunkId))
-		.replace(REGEXP_NAME, getReplacer(chunkName))
-		.replace(REGEXP_FILE, getReplacer(data.filename))
-		.replace(REGEXP_FILEBASE, getReplacer(data.basename))
-		// query is optional, it's OK if it's in a path but there's nothing to replace it with
-		.replace(REGEXP_QUERY, getReplacer(data.query, true));
-}
-
-TemplatedPathPlugin.prototype.constructor = TemplatedPathPlugin;
-TemplatedPathPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("compilation", function(compilation) {
-		var mainTemplate = compilation.mainTemplate;
-
-		mainTemplate.plugin("asset-path", replacePathVariables);
-
-		mainTemplate.plugin("global-hash", function(chunk, paths) {
-			var outputOptions = this.outputOptions;
-			var publicPath = outputOptions.publicPath || "";
-			var filename = outputOptions.filename || "";
-			var chunkFilename = outputOptions.chunkFilename || outputOptions.filename;
-			if(REGEXP_HASH_FOR_TEST.test(publicPath) || REGEXP_CHUNKHASH_FOR_TEST.test(publicPath) || REGEXP_NAME_FOR_TEST.test(publicPath))
-				return true;
-			if(REGEXP_HASH_FOR_TEST.test(filename))
-				return true;
-			if(REGEXP_HASH_FOR_TEST.test(chunkFilename))
-				return true;
-			if(REGEXP_HASH_FOR_TEST.test(paths.join("|")))
-				return true;
-		});
-
-		mainTemplate.plugin("hash-for-chunk", function(hash, chunk) {
-			var outputOptions = this.outputOptions;
-			var chunkFilename = outputOptions.chunkFilename || outputOptions.filename;
-			if(REGEXP_CHUNKHASH_FOR_TEST.test(chunkFilename))
-				hash.update(JSON.stringify(chunk.getChunkMaps(true, true).hash));
-			if(REGEXP_NAME_FOR_TEST.test(chunkFilename))
-				hash.update(JSON.stringify(chunk.getChunkMaps(true, true).name));
-		});
-	});
-};
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Jason Anderson @diurnalist
+*/
+
+var REGEXP_HASH = /\[hash(?::(\d+))?\]/gi,
+	REGEXP_CHUNKHASH = /\[chunkhash(?::(\d+))?\]/gi,
+	REGEXP_NAME = /\[name\]/gi,
+	REGEXP_ID = /\[id\]/gi,
+	REGEXP_FILE = /\[file\]/gi,
+	REGEXP_QUERY = /\[query\]/gi,
+	REGEXP_FILEBASE = /\[filebase\]/gi;
+
+// Using global RegExp for .test is dangerous
+// We use a normal RegExp instead of .test
+var REGEXP_HASH_FOR_TEST = new RegExp(REGEXP_HASH.source, "i"),
+	REGEXP_CHUNKHASH_FOR_TEST = new RegExp(REGEXP_CHUNKHASH.source, "i"),
+	REGEXP_NAME_FOR_TEST = new RegExp(REGEXP_NAME.source, "i");
+
+// Backwards compatibility; expose regexes on Template object
+var Template = require("./Template");
+Template.REGEXP_HASH = REGEXP_HASH;
+Template.REGEXP_CHUNKHASH = REGEXP_CHUNKHASH;
+Template.REGEXP_NAME = REGEXP_NAME;
+Template.REGEXP_ID = REGEXP_ID;
+Template.REGEXP_FILE = REGEXP_FILE;
+Template.REGEXP_QUERY = REGEXP_QUERY;
+Template.REGEXP_FILEBASE = REGEXP_FILEBASE;
+
+function TemplatedPathPlugin() {}
+
+module.exports = TemplatedPathPlugin;
+
+function withHashLength(replacer, handlerFn) {
+	return function(_, hashLength) {
+		var length = hashLength && parseInt(hashLength, 10);
+		if(length && handlerFn) {
+			return handlerFn(length);
+		}
+		var hash = replacer.apply(this, arguments);
+		return length ? hash.slice(0, length) : hash;
+	};
+}
+
+function getReplacer(value, allowEmpty) {
+	return function(match) {
+		// last argument in replacer is the entire input string
+		var input = arguments[arguments.length - 1];
+		if(value == null) {
+			if(!allowEmpty) throw new Error("Path variable " + match + " not implemented in this context: " + input);
+			return "";
+		} else {
+			return "" + value;
+		}
+	};
+}
+
+function replacePathVariables(path, data) {
+	var chunk = data.chunk;
+	var chunkId = chunk && chunk.id;
+	var chunkName = chunk && (chunk.name || chunk.id);
+	var chunkHash = chunk && (chunk.renderedHash || chunk.hash);
+	var chunkHashWithLength = chunk && chunk.hashWithLength;
+
+	if(data.noChunkHash && REGEXP_CHUNKHASH_FOR_TEST.test(path)) {
+		throw new Error("Cannot use [chunkhash] for chunk in '" + path + "' (use [hash] instead)");
+	}
+
+	return path
+		.replace(REGEXP_HASH, withHashLength(getReplacer(data.hash), data.hashWithLength))
+		.replace(REGEXP_CHUNKHASH, withHashLength(getReplacer(chunkHash), chunkHashWithLength))
+		.replace(REGEXP_ID, getReplacer(chunkId))
+		.replace(REGEXP_NAME, getReplacer(chunkName))
+		.replace(REGEXP_FILE, getReplacer(data.filename))
+		.replace(REGEXP_FILEBASE, getReplacer(data.basename))
+		// query is optional, it's OK if it's in a path but there's nothing to replace it with
+		.replace(REGEXP_QUERY, getReplacer(data.query, true));
+}
+
+TemplatedPathPlugin.prototype.constructor = TemplatedPathPlugin;
+TemplatedPathPlugin.prototype.apply = function(compiler) {
+	compiler.plugin("compilation", function(compilation) {
+		var mainTemplate = compilation.mainTemplate;
+
+		mainTemplate.plugin("asset-path", replacePathVariables);
+
+		mainTemplate.plugin("global-hash", function(chunk, paths) {
+			var outputOptions = this.outputOptions;
+			var publicPath = outputOptions.publicPath || "";
+			var filename = outputOptions.filename || "";
+			var chunkFilename = outputOptions.chunkFilename || outputOptions.filename;
+			if(REGEXP_HASH_FOR_TEST.test(publicPath) || REGEXP_CHUNKHASH_FOR_TEST.test(publicPath) || REGEXP_NAME_FOR_TEST.test(publicPath))
+				return true;
+			if(REGEXP_HASH_FOR_TEST.test(filename))
+				return true;
+			if(REGEXP_HASH_FOR_TEST.test(chunkFilename))
+				return true;
+			if(REGEXP_HASH_FOR_TEST.test(paths.join("|")))
+				return true;
+		});
+
+		mainTemplate.plugin("hash-for-chunk", function(hash, chunk) {
+			var outputOptions = this.outputOptions;
+			var chunkFilename = outputOptions.chunkFilename || outputOptions.filename;
+			if(REGEXP_CHUNKHASH_FOR_TEST.test(chunkFilename))
+				hash.update(JSON.stringify(chunk.getChunkMaps(true, true).hash));
+			if(REGEXP_NAME_FOR_TEST.test(chunkFilename))
+				hash.update(JSON.stringify(chunk.getChunkMaps(true, true).name));
+		});
+	});
+};