webpack 2.2.0-rc.6 → 2.2.1

package/lib/Template.js

@@ -2,159 +2,160 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var Tapable = require("tapable");
-var ConcatSource = require("webpack-sources").ConcatSource;
+"use strict";
 
-function Template(outputOptions) {
-	Tapable.call(this);
-	this.outputOptions = outputOptions || {};
-}
-module.exports = Template;
+const Tapable = require("tapable");
+const ConcatSource = require("webpack-sources").ConcatSource;
 
-Template.getFunctionContent = function(fn) {
-	return fn.toString().replace(/^function\s?\(\)\s?\{\n?|\n?\}$/g, "").replace(/^\t/mg, "");
-};
+const START_LOWERCASE_ALPHABET_CODE = "a".charCodeAt(0);
+const START_UPPERCASE_ALPHABET_CODE = "A".charCodeAt(0);
+const DELTA_A_TO_Z = "z".charCodeAt(0) - START_LOWERCASE_ALPHABET_CODE + 1;
 
-Template.toIdentifier = function(str) {
-	if(typeof str !== "string") return "";
-	return str.replace(/^[^a-zA-Z$_]/, "_").replace(/[^a-zA-Z0-9$_]/g, "_");
-};
+module.exports = class Template extends Tapable {
+	constructor(outputOptions) {
+		super();
+		this.outputOptions = outputOptions || {};
+	}
 
-var START_LOWERCASE_ALPHABET_CODE = "a".charCodeAt(0);
-var START_UPPERCASE_ALPHABET_CODE = "A".charCodeAt(0);
-var DELTA_A_TO_Z = "z".charCodeAt(0) - START_LOWERCASE_ALPHABET_CODE + 1;
-// map number to a single character a-z, A-Z or <_ + number> if number is too big
-Template.numberToIdentifer = function numberToIdentifer(n) {
-	// lower case
-	if(n < DELTA_A_TO_Z) return String.fromCharCode(START_LOWERCASE_ALPHABET_CODE + n);
+	static getFunctionContent(fn) {
+		return fn.toString().replace(/^function\s?\(\)\s?\{\n?|\n?\}$/g, "").replace(/^\t/mg, "");
+	}
 
-	// upper case
-	n -= DELTA_A_TO_Z;
-	if(n < DELTA_A_TO_Z) return String.fromCharCode(START_UPPERCASE_ALPHABET_CODE + n);
+	static toIdentifier(str) {
+		if(typeof str !== "string") return "";
+		return str.replace(/^[^a-zA-Z$_]/, "_").replace(/[^a-zA-Z0-9$_]/g, "_");
+	}
 
-	// fall back to _ + number
-	n -= DELTA_A_TO_Z;
-	return "_" + n;
-};
+	// map number to a single character a-z, A-Z or <_ + number> if number is too big
+	static numberToIdentifer(n) {
+		// lower case
+		if(n < DELTA_A_TO_Z) return String.fromCharCode(START_LOWERCASE_ALPHABET_CODE + n);
 
-Template.prototype = Object.create(Tapable.prototype);
-Template.prototype.constructor = Template;
+		// upper case
+		n -= DELTA_A_TO_Z;
+		if(n < DELTA_A_TO_Z) return String.fromCharCode(START_UPPERCASE_ALPHABET_CODE + n);
 
-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");
+		// fall back to _ + number
+		n -= DELTA_A_TO_Z;
+		return "_" + n;
 	}
-};
 
-Template.prototype.prefix = function(str, prefix) {
-	if(Array.isArray(str)) {
-		str = str.join("\n");
+	indent(str) {
+		if(Array.isArray(str)) {
+			return str.map(this.indent.bind(this)).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");
+		}
 	}
-	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");
+	prefix(str, prefix) {
+		if(Array.isArray(str)) {
+			str = str.join("\n");
+		}
+		str = str.trim();
+		if(!str) return "";
+		let ind = (str[0] === "\n" ? "" : prefix);
+		return ind + str.replace(/\n([^\n])/g, "\n" + prefix + "$1");
 	}
-	return str;
-};
 
-function moduleIdIsNumber(module) {
-	return typeof module.id === "number";
-}
-
-Template.prototype.getModulesArrayBounds = function(modules) {
-	if(!modules.every(moduleIdIsNumber))
-		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;
+	asString(str) {
+		if(Array.isArray(str)) {
+			return str.join("\n");
+		}
+		return str;
 	}
-	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 removedModules = chunk.removedModules;
-	var allModules = chunk.modules.map(function(module) {
-		return {
-			id: module.id,
-			source: moduleTemplate.render(module, dependencyTemplates, chunk)
-		};
-	});
-	if(removedModules && removedModules.length > 0) {
-		removedModules.forEach(function(id) {
-			allModules.push({
-				id: id,
-				source: "false"
-			});
+	getModulesArrayBounds(modules) {
+		if(!modules.every(moduleIdIsNumber))
+			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;
 	}
-	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 = {};
-		allModules.forEach(function(module) {
-			modules[module.id] = module;
+	renderChunkModules(chunk, moduleTemplate, dependencyTemplates, prefix) {
+		if(!prefix) prefix = "";
+		var source = new ConcatSource();
+		if(chunk.modules.length === 0) {
+			source.add("[]");
+			return source;
+		}
+		var removedModules = chunk.removedModules;
+		var allModules = chunk.modules.map(function(module) {
+			return {
+				id: module.id,
+				source: moduleTemplate.render(module, dependencyTemplates, chunk)
+			};
 		});
-		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(module.source);
+		if(removedModules && removedModules.length > 0) {
+			removedModules.forEach(function(id) {
+				allModules.push({
+					id: id,
+					source: "false"
+				});
+			});
+		}
+		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 = {};
+			allModules.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(module.source);
+				}
 			}
+			source.add("\n" + prefix + "]");
+			if(minId !== 0) source.add(")");
+		} else {
+			// Render an object
+			source.add("{\n");
+			allModules.sort(function(a, b) {
+				var aId = a.id + "";
+				var bId = b.id + "";
+				if(aId < bId) return -1;
+				if(aId > bId) return 1;
+				return 0;
+			}).forEach(function(module, idx) {
+				if(idx !== 0) source.add(",\n");
+				source.add("\n/***/ " + JSON.stringify(module.id) + ":\n");
+				source.add(module.source);
+			});
+			source.add("\n\n" + prefix + "}");
 		}
-		source.add("\n" + prefix + "]");
-		if(minId !== 0) source.add(")");
-	} else {
-		// Render an object
-		source.add("{\n");
-		allModules.sort(function(a, b) {
-			var aId = a.id + "";
-			var bId = b.id + "";
-			if(aId < bId) return -1;
-			if(aId > bId) return 1;
-			return 0;
-		}).forEach(function(module, idx) {
-			if(idx !== 0) source.add(",\n");
-			source.add("\n/***/ " + JSON.stringify(module.id) + ":\n");
-			source.add(module.source);
-		});
-		source.add("\n\n" + prefix + "}");
+		return source;
 	}
-	return source;
 };
+
+function moduleIdIsNumber(module) {
+	return typeof module.id === "number";
+}

package/lib/compareLocations.js

@@ -2,6 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
+"use strict";
 module.exports = function compareLocations(a, b) {
 	if(typeof a === "string") {
 		if(typeof b === "string") {
@@ -17,14 +18,14 @@ module.exports = function compareLocations(a, b) {
 		if(typeof b === "string") {
 			return -1;
 		} else if(typeof b === "object") {
-			var aa = a.start ? a.start : a;
-			var bb = b.start ? b.start : b;
-			if(aa.line < bb.line) return -1;
-			if(aa.line > bb.line) return 1;
-			if(aa.column < bb.column) return -1;
-			if(aa.column > bb.column) return 1;
-			if(aa.index < bb.index) return -1;
-			if(aa.index > bb.index) return 1;
+			if(a.start && b.start) {
+				const ap = a.start;
+				const bp = b.start;
+				if(ap.line < bp.line) return -1;
+				if(ap.line > bp.line) return 1;
+				if(ap.column < bp.column) return -1;
+				if(ap.column > bp.column) return 1;
+			}
 			if(a.index < b.index) return -1;
 			if(a.index > b.index) return 1;
 			return 0;

package/lib/dependencies/AMDPlugin.js

@@ -2,122 +2,118 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var path = require("path");
-var AMDRequireDependency = require("./AMDRequireDependency");
-var AMDRequireItemDependency = require("./AMDRequireItemDependency");
-var AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
-var AMDRequireContextDependency = require("./AMDRequireContextDependency");
-var AMDDefineDependency = require("./AMDDefineDependency");
-var UnsupportedDependency = require("./UnsupportedDependency");
-var LocalModuleDependency = require("./LocalModuleDependency");
-
-var NullFactory = require("../NullFactory");
-
-var AMDRequireDependenciesBlockParserPlugin = require("./AMDRequireDependenciesBlockParserPlugin");
-var AMDDefineDependencyParserPlugin = require("./AMDDefineDependencyParserPlugin");
-
-var AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
-
-var BasicEvaluatedExpression = require("../BasicEvaluatedExpression");
-var ParserHelpers = require("../ParserHelpers");
-
-function AMDPlugin(options, amdOptions) {
-	this.amdOptions = amdOptions;
-	this.options = options;
-}
-module.exports = AMDPlugin;
-
-AMDPlugin.prototype.apply = function(compiler) {
-	var options = this.options;
-	var amdOptions = this.amdOptions;
-	compiler.plugin("compilation", function(compilation, params) {
-		var normalModuleFactory = params.normalModuleFactory;
-		var contextModuleFactory = params.contextModuleFactory;
-
-		compilation.dependencyFactories.set(AMDRequireDependency, new NullFactory());
-		compilation.dependencyTemplates.set(AMDRequireDependency, new AMDRequireDependency.Template());
-
-		compilation.dependencyFactories.set(AMDRequireItemDependency, normalModuleFactory);
-		compilation.dependencyTemplates.set(AMDRequireItemDependency, new AMDRequireItemDependency.Template());
-
-		compilation.dependencyFactories.set(AMDRequireArrayDependency, new NullFactory());
-		compilation.dependencyTemplates.set(AMDRequireArrayDependency, new AMDRequireArrayDependency.Template());
-
-		compilation.dependencyFactories.set(AMDRequireContextDependency, contextModuleFactory);
-		compilation.dependencyTemplates.set(AMDRequireContextDependency, new AMDRequireContextDependency.Template());
-
-		compilation.dependencyFactories.set(AMDDefineDependency, new NullFactory());
-		compilation.dependencyTemplates.set(AMDDefineDependency, new AMDDefineDependency.Template());
-
-		compilation.dependencyFactories.set(UnsupportedDependency, new NullFactory());
-		compilation.dependencyTemplates.set(UnsupportedDependency, new UnsupportedDependency.Template());
-
-		compilation.dependencyFactories.set(LocalModuleDependency, new NullFactory());
-		compilation.dependencyTemplates.set(LocalModuleDependency, new LocalModuleDependency.Template());
-
-		params.normalModuleFactory.plugin("parser", function(parser, parserOptions) {
-
-			if(typeof parserOptions.amd !== "undefined" && !parserOptions.amd)
-				return;
-
-			function setExpressionToModule(expr, module) {
-				parser.plugin("expression " + expr, function(expr) {
-					var dep = new AMDRequireItemDependency(module, expr.range);
-					dep.userRequest = expr;
+"use strict";
+
+const path = require("path");
+const AMDRequireDependency = require("./AMDRequireDependency");
+const AMDRequireItemDependency = require("./AMDRequireItemDependency");
+const AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
+const AMDRequireContextDependency = require("./AMDRequireContextDependency");
+const AMDDefineDependency = require("./AMDDefineDependency");
+const UnsupportedDependency = require("./UnsupportedDependency");
+const LocalModuleDependency = require("./LocalModuleDependency");
+
+const NullFactory = require("../NullFactory");
+
+const AMDRequireDependenciesBlockParserPlugin = require("./AMDRequireDependenciesBlockParserPlugin");
+const AMDDefineDependencyParserPlugin = require("./AMDDefineDependencyParserPlugin");
+
+const AliasPlugin = require("enhanced-resolve/lib/AliasPlugin");
+
+const ParserHelpers = require("../ParserHelpers");
+
+class AMDPlugin {
+	constructor(options, amdOptions) {
+		this.amdOptions = amdOptions;
+		this.options = options;
+	}
+
+	apply(compiler) {
+		const options = this.options;
+		const amdOptions = this.amdOptions;
+		compiler.plugin("compilation", (compilation, params) => {
+			const normalModuleFactory = params.normalModuleFactory;
+			const contextModuleFactory = params.contextModuleFactory;
+
+			compilation.dependencyFactories.set(AMDRequireDependency, new NullFactory());
+			compilation.dependencyTemplates.set(AMDRequireDependency, new AMDRequireDependency.Template());
+
+			compilation.dependencyFactories.set(AMDRequireItemDependency, normalModuleFactory);
+			compilation.dependencyTemplates.set(AMDRequireItemDependency, new AMDRequireItemDependency.Template());
+
+			compilation.dependencyFactories.set(AMDRequireArrayDependency, new NullFactory());
+			compilation.dependencyTemplates.set(AMDRequireArrayDependency, new AMDRequireArrayDependency.Template());
+
+			compilation.dependencyFactories.set(AMDRequireContextDependency, contextModuleFactory);
+			compilation.dependencyTemplates.set(AMDRequireContextDependency, new AMDRequireContextDependency.Template());
+
+			compilation.dependencyFactories.set(AMDDefineDependency, new NullFactory());
+			compilation.dependencyTemplates.set(AMDDefineDependency, new AMDDefineDependency.Template());
+
+			compilation.dependencyFactories.set(UnsupportedDependency, new NullFactory());
+			compilation.dependencyTemplates.set(UnsupportedDependency, new UnsupportedDependency.Template());
+
+			compilation.dependencyFactories.set(LocalModuleDependency, new NullFactory());
+			compilation.dependencyTemplates.set(LocalModuleDependency, new LocalModuleDependency.Template());
+
+			params.normalModuleFactory.plugin("parser", (parser, parserOptions) => {
+
+				if(typeof parserOptions.amd !== "undefined" && !parserOptions.amd)
+					return;
+
+				function setExpressionToModule(expr, module) {
+					parser.plugin("expression " + expr, (expr) => {
+						const dep = new AMDRequireItemDependency(module, expr.range);
+						dep.userRequest = expr;
+						dep.loc = expr.loc;
+						parser.state.current.addDependency(dep);
+						return true;
+					});
+				}
+
+				parser.apply(
+					new AMDRequireDependenciesBlockParserPlugin(options),
+					new AMDDefineDependencyParserPlugin(options)
+				);
+				setExpressionToModule("require.amd", "!!webpack amd options");
+				setExpressionToModule("define.amd", "!!webpack amd options");
+				setExpressionToModule("define", "!!webpack amd define");
+				parser.plugin("expression __webpack_amd_options__", () =>
+					parser.state.current.addVariable("__webpack_amd_options__", JSON.stringify(amdOptions)));
+				parser.plugin("evaluate typeof define.amd", ParserHelpers.evaluateToString(typeof amdOptions));
+				parser.plugin("evaluate typeof require.amd", ParserHelpers.evaluateToString(typeof amdOptions));
+				parser.plugin("evaluate Identifier define.amd", ParserHelpers.evaluateToBoolean(true));
+				parser.plugin("evaluate Identifier require.amd", ParserHelpers.evaluateToBoolean(true));
+				parser.plugin("typeof define", ParserHelpers.toConstantDependency(JSON.stringify("function")));
+				parser.plugin("evaluate typeof define", ParserHelpers.evaluateToString("function"));
+				parser.plugin("can-rename define", ParserHelpers.approve);
+				parser.plugin("rename define", (expr) => {
+					const dep = new AMDRequireItemDependency("!!webpack amd define", expr.range);
+					dep.userRequest = "define";
 					dep.loc = expr.loc;
-					this.state.current.addDependency(dep);
-					return true;
+					parser.state.current.addDependency(dep);
+					return false;
 				});
-			}
-
-			parser.apply(
-				new AMDRequireDependenciesBlockParserPlugin(options),
-				new AMDDefineDependencyParserPlugin(options)
-			);
-			setExpressionToModule("require.amd", "!!webpack amd options");
-			setExpressionToModule("define.amd", "!!webpack amd options");
-			setExpressionToModule("define", "!!webpack amd define");
-			parser.plugin("expression __webpack_amd_options__", function() {
-				return this.state.current.addVariable("__webpack_amd_options__", JSON.stringify(amdOptions));
-			});
-			parser.plugin("evaluate typeof define.amd", ParserHelpers.evaluateToString(typeof amdOptions));
-			parser.plugin("evaluate typeof require.amd", ParserHelpers.evaluateToString(typeof amdOptions));
-			parser.plugin("evaluate Identifier define.amd", function(expr) {
-				return new BasicEvaluatedExpression().setBoolean(true).setRange(expr.range);
+				parser.plugin("typeof require", ParserHelpers.toConstantDependency(JSON.stringify("function")));
+				parser.plugin("evaluate typeof require", ParserHelpers.evaluateToString("function"));
 			});
-			parser.plugin("evaluate Identifier require.amd", function(expr) {
-				return new BasicEvaluatedExpression().setBoolean(true).setRange(expr.range);
-			});
-			parser.plugin("typeof define", ParserHelpers.toConstantDependency("function"));
-			parser.plugin("evaluate typeof define", ParserHelpers.evaluateToString("function"));
-			parser.plugin("can-rename define", function() {
-				return true;
-			});
-			parser.plugin("rename define", function(expr) {
-				var dep = new AMDRequireItemDependency("!!webpack amd define", expr.range);
-				dep.userRequest = "define";
-				dep.loc = expr.loc;
-				this.state.current.addDependency(dep);
-				return false;
-			});
-			parser.plugin("typeof require", ParserHelpers.toConstantDependency("function"));
-			parser.plugin("evaluate typeof require", ParserHelpers.evaluateToString("function"));
 		});
-	});
-	compiler.plugin("after-resolvers", function() {
-		compiler.resolvers.normal.apply(
-			new AliasPlugin("described-resolve", {
-				name: "amdefine",
-				alias: path.join(__dirname, "..", "..", "buildin", "amd-define.js")
-			}, "resolve"),
-			new AliasPlugin("described-resolve", {
-				name: "webpack amd options",
-				alias: path.join(__dirname, "..", "..", "buildin", "amd-options.js")
-			}, "resolve"),
-			new AliasPlugin("described-resolve", {
-				name: "webpack amd define",
-				alias: path.join(__dirname, "..", "..", "buildin", "amd-define.js")
-			}, "resolve")
-		);
-	});
-};
+		compiler.plugin("after-resolvers", () => {
+			compiler.resolvers.normal.apply(
+				new AliasPlugin("described-resolve", {
+					name: "amdefine",
+					alias: path.join(__dirname, "..", "..", "buildin", "amd-define.js")
+				}, "resolve"),
+				new AliasPlugin("described-resolve", {
+					name: "webpack amd options",
+					alias: path.join(__dirname, "..", "..", "buildin", "amd-options.js")
+				}, "resolve"),
+				new AliasPlugin("described-resolve", {
+					name: "webpack amd define",
+					alias: path.join(__dirname, "..", "..", "buildin", "amd-define.js")
+				}, "resolve")
+			);
+		});
+	}
+}
+module.exports = AMDPlugin;