webpack 2.3.1 → 2.4.1

package/lib/LibManifestPlugin.js

@@ -2,52 +2,57 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var path = require("path");
-var async = require("async");
+"use strict";
 
-function LibManifestPlugin(options) {
-	this.options = options;
+const path = require("path");
+const asyncLib = require("async");
+
+class LibManifestPlugin {
+	constructor(options) {
+		this.options = options;
+	}
+
+	apply(compiler) {
+		compiler.plugin("emit", (compilation, callback) => {
+			asyncLib.forEach(compilation.chunks, (chunk, callback) => {
+				if(!chunk.isInitial()) {
+					callback();
+					return;
+				}
+				const targetPath = compilation.getPath(this.options.path, {
+					hash: compilation.hash,
+					chunk
+				});
+				const name = this.options.name && compilation.getPath(this.options.name, {
+					hash: compilation.hash,
+					chunk
+				});
+				const manifest = {
+					name,
+					type: this.options.type,
+					content: chunk.modules.reduce((obj, module) => {
+						if(module.libIdent) {
+							const ident = module.libIdent({
+								context: this.options.context || compiler.options.context
+							});
+							if(ident) {
+								obj[ident] = {
+									id: module.id,
+									meta: module.meta,
+									exports: Array.isArray(module.providedExports) ? module.providedExports : undefined
+								};
+							}
+						}
+						return obj;
+					}, {})
+				};
+				const content = new Buffer(JSON.stringify(manifest, null, 2), "utf8"); //eslint-disable-line
+				compiler.outputFileSystem.mkdirp(path.dirname(targetPath), err => {
+					if(err) return callback(err);
+					compiler.outputFileSystem.writeFile(targetPath, content, callback);
+				});
+			}, callback);
+		});
+	}
 }
 module.exports = LibManifestPlugin;
-LibManifestPlugin.prototype.apply = function(compiler) {
-	compiler.plugin("emit", function(compilation, callback) {
-		async.forEach(compilation.chunks, function(chunk, callback) {
-			if(!chunk.isInitial()) {
-				callback();
-				return;
-			}
-			var targetPath = compilation.getPath(this.options.path, {
-				hash: compilation.hash,
-				chunk: chunk
-			});
-			var name = this.options.name && compilation.getPath(this.options.name, {
-				hash: compilation.hash,
-				chunk: chunk
-			});
-			var manifest = {
-				name: name,
-				type: this.options.type,
-				content: chunk.modules.reduce(function(obj, module) {
-					if(module.libIdent) {
-						var ident = module.libIdent({
-							context: this.options.context || compiler.options.context
-						});
-						if(ident) {
-							obj[ident] = {
-								id: module.id,
-								meta: module.meta,
-								exports: Array.isArray(module.providedExports) ? module.providedExports : undefined
-							};
-						}
-					}
-					return obj;
-				}.bind(this), {})
-			};
-			var content = new Buffer(JSON.stringify(manifest, null, 2), "utf8"); //eslint-disable-line
-			compiler.outputFileSystem.mkdirp(path.dirname(targetPath), function(err) {
-				if(err) return callback(err);
-				compiler.outputFileSystem.writeFile(targetPath, content, callback);
-			});
-		}.bind(this), callback);
-	}.bind(this));
-};

package/lib/MainTemplate.js

@@ -30,8 +30,7 @@ module.exports = class MainTemplate extends Template {
 			const buf = [];
 			if(chunk.entryModule) {
 				buf.push("// Load entry module and return exports");
-				buf.push("return " + this.renderRequireFunctionForModule(hash, chunk, JSON.stringify(chunk.entryModule.id)) +
-					"(" + this.requireFn + ".s = " + JSON.stringify(chunk.entryModule.id) + ");");
+				buf.push(`return ${this.renderRequireFunctionForModule(hash, chunk, JSON.stringify(chunk.entryModule.id))}(${this.requireFn}.s = ${JSON.stringify(chunk.entryModule.id)});`);
 			}
 			return this.asString(buf);
 		});
@@ -58,9 +57,9 @@ module.exports = class MainTemplate extends Template {
 			return this.asString([
 				source,
 				"// Check if module is in cache",
-				"if(installedModules[moduleId])",
+				"if(installedModules[moduleId]) {",
 				this.indent("return installedModules[moduleId].exports;"),
-				"",
+				"}",
 				"// Create a new module (and put it into the cache)",
 				"var module = installedModules[moduleId] = {",
 				this.indent(this.applyPluginsWaterfall("module-obj", "", chunk, hash, "moduleId")),
@@ -71,7 +70,7 @@ module.exports = class MainTemplate extends Template {
 					"var threw = true;",
 					"try {",
 					this.indent([
-						"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
+						`modules[moduleId].call(module.exports, module, module.exports, ${this.renderRequireFunctionForModule(hash, chunk, "moduleId")});`,
 						"threw = false;"
 					]),
 					"} finally {",
@@ -81,7 +80,7 @@ module.exports = class MainTemplate extends Template {
 					"}"
 				] : [
 					"// Execute the module function",
-					"modules[moduleId].call(module.exports, module, module.exports, " + this.renderRequireFunctionForModule(hash, chunk, "moduleId") + ");",
+					`modules[moduleId].call(module.exports, module, module.exports, ${this.renderRequireFunctionForModule(hash, chunk, "moduleId")});`,
 				]),
 				"",
 				"// Flag the module as loaded",
@@ -103,27 +102,27 @@ module.exports = class MainTemplate extends Template {
 			if(chunk.chunks.length > 0) {
 				buf.push("// This file contains only the entry chunk.");
 				buf.push("// The chunk loading function for additional chunks");
-				buf.push(this.requireFn + ".e = function requireEnsure(chunkId) {");
+				buf.push(`${this.requireFn}.e = function requireEnsure(chunkId) {`);
 				buf.push(this.indent(this.applyPluginsWaterfall("require-ensure", "throw new Error('Not chunk loading available');", chunk, hash, "chunkId")));
 				buf.push("};");
 			}
 			buf.push("");
 			buf.push("// expose the modules object (__webpack_modules__)");
-			buf.push(this.requireFn + ".m = modules;");
+			buf.push(`${this.requireFn}.m = modules;`);
 
 			buf.push("");
 			buf.push("// expose the module cache");
-			buf.push(this.requireFn + ".c = installedModules;");
+			buf.push(`${this.requireFn}.c = installedModules;`);
 
 			buf.push("");
 			buf.push("// identity function for calling harmony imports with the correct context");
-			buf.push(this.requireFn + ".i = function(value) { return value; };");
+			buf.push(`${this.requireFn}.i = function(value) { return value; };`);
 
 			buf.push("");
 			buf.push("// define getter function for harmony exports");
-			buf.push(this.requireFn + ".d = function(exports, name, getter) {");
+			buf.push(`${this.requireFn}.d = function(exports, name, getter) {`);
 			buf.push(this.indent([
-				"if(!" + this.requireFn + ".o(exports, name)) {",
+				`if(!${this.requireFn}.o(exports, name)) {`,
 				this.indent([
 					"Object.defineProperty(exports, name, {",
 					this.indent([
@@ -146,21 +145,21 @@ module.exports = class MainTemplate extends Template {
 					"function getDefault() { return module['default']; } :",
 					"function getModuleExports() { return module; };"
 				]),
-				this.requireFn + ".d(getter, 'a', getter);",
+				`${this.requireFn}.d(getter, 'a', getter);`,
 				"return getter;"
 			]));
 			buf.push("};");
 
 			buf.push("");
 			buf.push("// Object.prototype.hasOwnProperty.call");
-			buf.push(this.requireFn + ".o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };");
+			buf.push(`${this.requireFn}.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };`);
 
 			const publicPath = this.getPublicPath({
 				hash: hash
 			});
 			buf.push("");
 			buf.push("// __webpack_public_path__");
-			buf.push(this.requireFn + ".p = " + JSON.stringify(publicPath) + ";");
+			buf.push(`${this.requireFn}.p = ${JSON.stringify(publicPath)};`);
 			return this.asString(buf);
 		});
 
@@ -173,14 +172,14 @@ module.exports = class MainTemplate extends Template {
 		buf.push(this.applyPluginsWaterfall("local-vars", "", chunk, hash));
 		buf.push("");
 		buf.push("// The require function");
-		buf.push("function " + this.requireFn + "(moduleId) {");
+		buf.push(`function ${this.requireFn}(moduleId) {`);
 		buf.push(this.indent(this.applyPluginsWaterfall("require", "", chunk, hash)));
 		buf.push("}");
 		buf.push("");
 		buf.push(this.asString(this.applyPluginsWaterfall("require-extensions", "", chunk, hash)));
 		buf.push("");
 		buf.push(this.asString(this.applyPluginsWaterfall("startup", "", chunk, hash)));
-		let source = this.applyPluginsWaterfall("render", new OriginalSource(this.prefix(buf, " \t") + "\n", "webpack/bootstrap " + hash), chunk, hash, moduleTemplate, dependencyTemplates);
+		let source = this.applyPluginsWaterfall("render", new OriginalSource(this.prefix(buf, " \t") + "\n", `webpack/bootstrap ${hash}`), chunk, hash, moduleTemplate, dependencyTemplates);
 		if(chunk.hasEntryModule()) {
 			source = this.applyPluginsWaterfall("render-with-entry", source, chunk, hash);
 		}
@@ -194,7 +193,7 @@ module.exports = class MainTemplate extends Template {
 	}
 
 	renderAddModule(hash, chunk, varModuleId, varModule) {
-		return this.applyPluginsWaterfall("add-module", "modules[" + varModuleId + "] = " + varModule + ";", chunk, hash, varModuleId, varModule);
+		return this.applyPluginsWaterfall("add-module", `modules[${varModuleId}] = ${varModule};`, chunk, hash, varModuleId, varModule);
 	}
 
 	renderCurrentHashCode(hash, length) {

package/lib/Module.js

@@ -2,189 +2,187 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var DependenciesBlock = require("./DependenciesBlock");
-var ModuleReason = require("./ModuleReason");
-var Template = require("./Template");
-
-var debugId = 1000;
-
-function Module() {
-	DependenciesBlock.call(this);
-	this.context = null;
-	this.reasons = [];
-	this.debugId = debugId++;
-	this.lastId = -1;
-	this.id = null;
-	this.portableId = null;
-	this.index = null;
-	this.index2 = null;
-	this.depth = null;
-	this.used = null;
-	this.usedExports = null;
-	this.providedExports = null;
-	this.chunks = [];
-	this.warnings = [];
-	this.dependenciesWarnings = [];
-	this.errors = [];
-	this.dependenciesErrors = [];
-	this.strict = false;
-	this.meta = {};
+"use strict";
+
+const DependenciesBlock = require("./DependenciesBlock");
+const ModuleReason = require("./ModuleReason");
+const Template = require("./Template");
+
+function addToSet(set, items) {
+	for(let item of items) {
+		if(set.indexOf(item) < 0)
+			set.push(item);
+	}
 }
-module.exports = Module;
 
-Module.prototype = Object.create(DependenciesBlock.prototype);
-Module.prototype.constructor = Module;
+function byId(a, b) {
+	return a.id - b.id;
+}
 
-Object.defineProperty(Module.prototype, "entry", {
-	configurable: false,
-	get: function() {
-		throw new Error("Module.entry was removed. Use Chunk.entryModule");
-	},
-	set: function() {
-		throw new Error("Module.entry was removed. Use Chunk.entryModule");
+let debugId = 1000;
+
+class Module extends DependenciesBlock {
+	constructor() {
+		super();
+		this.context = null;
+		this.reasons = [];
+		this.debugId = debugId++;
+		this.lastId = -1;
+		this.id = null;
+		this.portableId = null;
+		this.index = null;
+		this.index2 = null;
+		this.depth = null;
+		this.used = null;
+		this.usedExports = null;
+		this.providedExports = null;
+		this.chunks = [];
+		this.warnings = [];
+		this.dependenciesWarnings = [];
+		this.errors = [];
+		this.dependenciesErrors = [];
+		this.strict = false;
+		this.meta = {};
 	}
-});
 
-Module.prototype.disconnect = function() {
-	this.reasons.length = 0;
-	this.lastId = this.id;
-	this.id = null;
-	this.index = null;
-	this.index2 = null;
-	this.depth = null;
-	this.used = null;
-	this.usedExports = null;
-	this.providedExports = null;
-	this.chunks.length = 0;
-	DependenciesBlock.prototype.disconnect.call(this);
-};
-
-Module.prototype.unseal = function() {
-	this.lastId = this.id;
-	this.id = null;
-	this.index = null;
-	this.index2 = null;
-	this.depth = null;
-	this.chunks.length = 0;
-	DependenciesBlock.prototype.unseal.call(this);
-};
-
-Module.prototype.addChunk = function(chunk) {
-	var idx = this.chunks.indexOf(chunk);
-	if(idx < 0)
-		this.chunks.push(chunk);
-};
-
-Module.prototype.removeChunk = function(chunk) {
-	var idx = this.chunks.indexOf(chunk);
-	if(idx >= 0) {
-		this.chunks.splice(idx, 1);
-		chunk.removeModule(this);
-		return true;
+	disconnect() {
+		this.reasons.length = 0;
+		this.lastId = this.id;
+		this.id = null;
+		this.index = null;
+		this.index2 = null;
+		this.depth = null;
+		this.used = null;
+		this.usedExports = null;
+		this.providedExports = null;
+		this.chunks.length = 0;
+		super.disconnect();
 	}
-	return false;
-};
 
-Module.prototype.addReason = function(module, dependency) {
-	this.reasons.push(new ModuleReason(module, dependency));
-};
+	unseal() {
+		this.lastId = this.id;
+		this.id = null;
+		this.index = null;
+		this.index2 = null;
+		this.depth = null;
+		this.chunks.length = 0;
+		super.unseal();
+	}
 
-Module.prototype.removeReason = function(module, dependency) {
-	for(var i = 0; i < this.reasons.length; i++) {
-		var r = this.reasons[i];
-		if(r.module === module && r.dependency === dependency) {
-			this.reasons.splice(i, 1);
+	addChunk(chunk) {
+		let idx = this.chunks.indexOf(chunk);
+		if(idx < 0)
+			this.chunks.push(chunk);
+	}
+
+	removeChunk(chunk) {
+		let idx = this.chunks.indexOf(chunk);
+		if(idx >= 0) {
+			this.chunks.splice(idx, 1);
+			chunk.removeModule(this);
 			return true;
 		}
+		return false;
 	}
-	return false;
-};
 
-Module.prototype.hasReasonForChunk = function(chunk) {
-	for(var i = 0; i < this.reasons.length; i++) {
-		var r = this.reasons[i];
-		if(r.chunks) {
-			if(r.chunks.indexOf(chunk) >= 0)
-				return true;
-		} else if(r.module.chunks.indexOf(chunk) >= 0)
-			return true;
+	addReason(module, dependency) {
+		this.reasons.push(new ModuleReason(module, dependency));
 	}
-	return false;
-};
 
-function addToSet(set, items) {
-	items.forEach(function(item) {
-		if(set.indexOf(item) < 0)
-			set.push(item);
-	});
-}
+	removeReason(module, dependency) {
+		for(let i = 0; i < this.reasons.length; i++) {
+			let r = this.reasons[i];
+			if(r.module === module && r.dependency === dependency) {
+				this.reasons.splice(i, 1);
+				return true;
+			}
+		}
+		return false;
+	}
 
-Module.prototype.rewriteChunkInReasons = function(oldChunk, newChunks) {
-	this.reasons.forEach(function(r) {
-		if(!r.chunks) {
-			if(r.module.chunks.indexOf(oldChunk) < 0)
-				return;
-			r.chunks = r.module.chunks;
+	hasReasonForChunk(chunk) {
+		for(let r of this.reasons) {
+			if(r.chunks) {
+				if(r.chunks.indexOf(chunk) >= 0)
+					return true;
+			} else if(r.module.chunks.indexOf(chunk) >= 0)
+				return true;
 		}
-		r.chunks = r.chunks.reduce(function(arr, c) {
-			addToSet(arr, c !== oldChunk ? [c] : newChunks);
-			return arr;
-		}, []);
-	});
-};
-
-Module.prototype.isUsed = function(exportName) {
-	if(this.used === null) return exportName;
-	if(!exportName) return this.used ? true : false;
-	if(!this.used) return false;
-	if(!this.usedExports) return false;
-	if(this.usedExports === true) return exportName;
-	var idx = this.usedExports.indexOf(exportName);
-	if(idx < 0) return false;
-	if(this.isProvided(exportName))
-		return Template.numberToIdentifer(idx);
-	return exportName;
-};
-
-Module.prototype.isProvided = function(exportName) {
-	if(!Array.isArray(this.providedExports))
-		return null;
-	return this.providedExports.indexOf(exportName) >= 0;
-};
-
-Module.prototype.toString = function() {
-	return "Module[" + (this.id || this.debugId) + "]";
-};
-
-Module.prototype.needRebuild = function(fileTimestamps, contextTimestamps) {
-	return true;
-};
-
-Module.prototype.updateHash = function(hash) {
-	hash.update(this.id + "" + this.used);
-	hash.update(JSON.stringify(this.usedExports));
-	DependenciesBlock.prototype.updateHash.call(this, hash);
-};
+		return false;
+	}
 
-function byId(a, b) {
-	return a.id - b.id;
-}
+	rewriteChunkInReasons(oldChunk, newChunks) {
+		this.reasons.forEach(r => {
+			if(!r.chunks) {
+				if(r.module.chunks.indexOf(oldChunk) < 0)
+					return;
+				r.chunks = r.module.chunks;
+			}
+			r.chunks = r.chunks.reduce((arr, c) => {
+				addToSet(arr, c !== oldChunk ? [c] : newChunks);
+				return arr;
+			}, []);
+		});
+	}
 
-Module.prototype.sortItems = function() {
-	DependenciesBlock.prototype.sortItems.call(this);
-	this.chunks.sort(byId);
-	this.reasons.sort(function(a, b) {
-		return byId(a.module, b.module);
-	});
-};
+	isUsed(exportName) {
+		if(this.used === null) return exportName;
+		if(!exportName) return !!this.used;
+		if(!this.used) return false;
+		if(!this.usedExports) return false;
+		if(this.usedExports === true) return exportName;
+		let idx = this.usedExports.indexOf(exportName);
+		if(idx < 0) return false;
+		if(this.isProvided(exportName))
+			return Template.numberToIdentifer(idx);
+		return exportName;
+	}
 
-Module.prototype.unbuild = function() {
-	this.disconnect();
-};
+	isProvided(exportName) {
+		if(!Array.isArray(this.providedExports))
+			return null;
+		return this.providedExports.indexOf(exportName) >= 0;
+	}
+
+	toString() {
+		return `Module[${this.id || this.debugId}]`;
+	}
+
+	needRebuild(fileTimestamps, contextTimestamps) {
+		return true;
+	}
+
+	updateHash(hash) {
+		hash.update(this.id + "" + this.used);
+		hash.update(JSON.stringify(this.usedExports));
+		super.updateHash(hash);
+	}
 
+	sortItems() {
+		super.sortItems();
+		this.chunks.sort(byId);
+		this.reasons.sort((a, b) => byId(a.module, b.module));
+	}
+
+	unbuild() {
+		this.disconnect();
+	}
+}
+
+Object.defineProperty(Module.prototype, "entry", {
+	configurable: false,
+	get() {
+		throw new Error("Module.entry was removed. Use Chunk.entryModule");
+	},
+	set() {
+		throw new Error("Module.entry was removed. Use Chunk.entryModule");
+	}
+});
 Module.prototype.identifier = null;
 Module.prototype.readableIdentifier = null;
 Module.prototype.build = null;
 Module.prototype.source = null;
 Module.prototype.size = null;
 Module.prototype.nameForCondition = null;
+
+module.exports = Module;

package/lib/ModuleBuildError.js

@@ -4,12 +4,13 @@
 */
 "use strict";
 
+const WebpackError = require("./WebpackError");
 const cutOffLoaderExecution = require("./ErrorHelpers").cutOffLoaderExecution;
 
-class ModuleBuildError extends Error {
-
+class ModuleBuildError extends WebpackError {
 	constructor(module, err) {
 		super();
+
 		this.name = "ModuleBuildError";
 		this.message = "Module build failed: ";
 		if(err !== null && typeof err === "object") {
@@ -33,6 +34,7 @@ class ModuleBuildError extends Error {
 		}
 		this.module = module;
 		this.error = err;
+
 		Error.captureStackTrace(this, this.constructor);
 	}
 }

package/lib/ModuleDependencyError.js

@@ -4,9 +4,10 @@
 */
 "use strict";
 
+const WebpackError = require("./WebpackError");
 const formatLocation = require("./formatLocation");
 
-module.exports = class ModuleDependencyError extends Error {
+module.exports = class ModuleDependencyError extends WebpackError {
 	constructor(module, err, loc) {
 		super();
 

package/lib/ModuleDependencyWarning.js

@@ -4,9 +4,10 @@
 */
 "use strict";
 
+const WebpackError = require("./WebpackError");
 const formatLocation = require("./formatLocation");
 
-module.exports = class ModuleDependencyWarning extends Error {
+module.exports = class ModuleDependencyWarning extends WebpackError {
 	constructor(module, err, loc) {
 		super();
 

package/lib/ModuleError.js

@@ -4,10 +4,10 @@
 */
 "use strict";
 
+const WebpackError = require("./WebpackError");
 const cleanUp = require("./ErrorHelpers").cleanUp;
 
-class ModuleError extends Error {
-
+class ModuleError extends WebpackError {
 	constructor(module, err) {
 		super();