webpack 2.3.3 → 2.5.1

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();
 

package/lib/ModuleFilenameHelpers.js

@@ -2,7 +2,9 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var ModuleFilenameHelpers = exports;
+"use strict";
+
+const ModuleFilenameHelpers = exports;
 
 ModuleFilenameHelpers.ALL_LOADERS_RESOURCE = "[all-loaders][resource]";
 ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE = /\[all-?loaders\]\[resource\]/gi;
@@ -26,17 +28,17 @@ ModuleFilenameHelpers.HASH = "[hash]";
 ModuleFilenameHelpers.REGEXP_HASH = /\[hash\]/gi;
 
 function getAfter(str, token) {
-	var idx = str.indexOf(token);
+	const idx = str.indexOf(token);
 	return idx < 0 ? "" : str.substr(idx);
 }
 
 function getBefore(str, token) {
-	var idx = str.lastIndexOf(token);
+	const idx = str.lastIndexOf(token);
 	return idx < 0 ? "" : str.substr(0, idx);
 }
 
 function getHash(str) {
-	var hash = require("crypto").createHash("md5");
+	const hash = require("crypto").createHash("md5");
 	hash.update(str);
 	return hash.digest("hex").substr(0, 4);
 }
@@ -47,12 +49,12 @@ function asRegExp(test) {
 }
 
 ModuleFilenameHelpers.createFilename = function createFilename(module, moduleFilenameTemplate, requestShortener) {
-	var absoluteResourcePath;
-	var hash;
-	var identifier;
-	var moduleId;
-	var shortIdentifier;
-	if(!module) module = "";
+	let absoluteResourcePath;
+	let hash;
+	let identifier;
+	let moduleId;
+	let shortIdentifier;
+	if(module === undefined) module = "";
 	if(typeof module === "string") {
 		shortIdentifier = requestShortener.shorten(module);
 		identifier = shortIdentifier;
@@ -63,14 +65,14 @@ ModuleFilenameHelpers.createFilename = function createFilename(module, moduleFil
 		shortIdentifier = module.readableIdentifier(requestShortener);
 		identifier = requestShortener.shorten(module.identifier());
 		moduleId = module.id;
-		absoluteResourcePath = module.resourcePath || module.identifier().split("!").pop();
+		absoluteResourcePath = module.identifier().split("!").pop();
 		hash = getHash(identifier);
 	}
-	var resource = shortIdentifier.split("!").pop();
-	var loaders = getBefore(shortIdentifier, "!");
-	var allLoaders = getBefore(identifier, "!");
-	var query = getAfter(resource, "?");
-	var resourcePath = resource.substr(0, resource.length - query.length);
+	const resource = shortIdentifier.split("!").pop();
+	const loaders = getBefore(shortIdentifier, "!");
+	const allLoaders = getBefore(identifier, "!");
+	const query = getAfter(resource, "?");
+	const resourcePath = resource.substr(0, resource.length - query.length);
 	if(typeof moduleFilenameTemplate === "function") {
 		return moduleFilenameTemplate({
 			identifier: identifier,
@@ -102,35 +104,33 @@ ModuleFilenameHelpers.createFooter = function createFooter(module, requestShorte
 	if(typeof module === "string") {
 		return [
 			"// WEBPACK FOOTER //",
-			"// " + requestShortener.shorten(module)
+			`// ${requestShortener.shorten(module)}`
 		].join("\n");
 	} else {
 		return [
 			"//////////////////",
 			"// WEBPACK FOOTER",
-			"// " + module.readableIdentifier(requestShortener),
-			"// module id = " + module.id,
-			"// module chunks = " + module.chunks.map(function(c) {
-				return c.id;
-			}).join(" ")
+			`// ${module.readableIdentifier(requestShortener)}`,
+			`// module id = ${module.id}`,
+			`// module chunks = ${module.chunks.map(c => c.id).join(" ")}`
 		].join("\n");
 	}
 };
 
 ModuleFilenameHelpers.replaceDuplicates = function replaceDuplicates(array, fn, comparator) {
-	var countMap = {};
-	var posMap = {};
-	array.forEach(function(item, idx) {
+	const countMap = Object.create(null);
+	const posMap = Object.create(null);
+	array.forEach((item, idx) => {
 		countMap[item] = (countMap[item] || []);
 		countMap[item].push(idx);
 		posMap[item] = 0;
 	});
 	if(comparator) {
-		Object.keys(countMap).forEach(function(item) {
+		Object.keys(countMap).forEach(item => {
 			countMap[item].sort(comparator);
 		});
 	}
-	return array.map(function(item, i) {
+	return array.map((item, i) => {
 		if(countMap[item].length > 1) {
 			if(comparator && countMap[item][0] === i)
 				return item;

package/lib/ModuleNotFoundError.js

@@ -4,7 +4,9 @@
 */
 "use strict";
 
-class ModuleNotFoundError extends Error {
+const WebpackError = require("./WebpackError");
+
+class ModuleNotFoundError extends WebpackError {
 	constructor(module, err, dependencies) {
 		super();
 

package/lib/ModuleParseError.js

@@ -4,9 +4,12 @@
 */
 "use strict";
 
-class ModuleParseError extends Error {
+const WebpackError = require("./WebpackError");
+
+class ModuleParseError extends WebpackError {
 	constructor(module, source, err) {
 		super();
+
 		this.name = "ModuleParseError";
 		this.message = "Module parse failed: " + module.request + " " + err.message;
 		this.message += "\nYou may need an appropriate loader to handle this file type.";
@@ -23,9 +26,8 @@ class ModuleParseError extends Error {
 		}
 		this.module = module;
 		this.error = err;
-		if(Error.hasOwnProperty("captureStackTrace")) {
-			Error.captureStackTrace(this, this.constructor);
-		}
+
+		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/ModuleWarning.js

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

package/lib/MultiCompiler.js

@@ -3,7 +3,7 @@
 	Author Tobias Koppers @sokra
 */
 var Tapable = require("tapable");
-var async = require("async");
+var asyncLib = require("async");
 var MultiWatching = require("./MultiWatching");
 var MultiStats = require("./MultiStats");
 
@@ -100,7 +100,7 @@ function runWithDependencies(compilers, fn, callback) {
 
 	function runCompilers(callback) {
 		if(remainingCompilers.length === 0) return callback();
-		async.map(getReadyCompilers(), function(compiler, callback) {
+		asyncLib.map(getReadyCompilers(), function(compiler, callback) {
 			fn(compiler, function(err) {
 				if(err) return callback(err);
 				fulfilledNames[compiler.name] = true;
@@ -119,11 +119,10 @@ MultiCompiler.prototype.watch = function(watchOptions, handler) {
 	var compilerStatus = this.compilers.map(function() {
 		return false;
 	});
-
 	runWithDependencies(this.compilers, function(compiler, callback) {
 		var compilerIdx = this.compilers.indexOf(compiler);
 		var firstRun = true;
-		var watching = compiler.watch(watchOptions, function(err, stats) {
+		var watching = compiler.watch(Array.isArray(watchOptions) ? watchOptions[compilerIdx] : watchOptions, function(err, stats) {
 			if(err)
 				handler(err);
 			if(stats) {

package/lib/MultiStats.js

@@ -11,7 +11,7 @@ const optionOrFallback = (optionValue, fallbackValue) => optionValue !== undefin
 class MultiStats {
 	constructor(stats) {
 		this.stats = stats;
-		this.hash = stats.map((stat) => stat.hash).join("");
+		this.hash = stats.map(stat => stat.hash).join("");
 	}
 
 	hasErrors() {
@@ -42,12 +42,12 @@ class MultiStats {
 		});
 		const obj = {
 			errors: jsons.reduce((arr, j) => {
-				return arr.concat(j.errors.map((msg) => {
+				return arr.concat(j.errors.map(msg => {
 					return `(${j.name}) ${msg}`;
 				}));
 			}, []),
 			warnings: jsons.reduce((arr, j) => {
-				return arr.concat(j.warnings.map((msg) => {
+				return arr.concat(j.warnings.map(msg => {
 					return `(${j.name}) ${msg}`;
 				}));
 			}, [])

package/lib/MultiWatching.js

@@ -4,7 +4,7 @@
 */
 "use strict";
 
-const async = require("async");
+const asyncLib = require("async");
 
 class MultiWatching {
 	constructor(watchings, compiler) {
@@ -19,7 +19,7 @@ class MultiWatching {
 	close(callback) {
 		if(callback === undefined) callback = () => { /*do nothing*/ };
 
-		async.forEach(this.watchings, (watching, finishedCallback) => {
+		asyncLib.forEach(this.watchings, (watching, finishedCallback) => {
 			watching.close(finishedCallback);
 		}, err => {
 			this.compiler.applyPlugins("watch-close");

package/lib/NamedChunksPlugin.js

@@ -0,0 +1,30 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+class NamedChunksPlugin {
+
+	static defaultNameResolver(chunk) {
+		return chunk.name || null;
+	}
+
+	constructor(nameResolver) {
+		this.nameResolver = nameResolver || NamedChunksPlugin.defaultNameResolver;
+	}
+
+	apply(compiler) {
+		compiler.plugin("compilation", (compilation) => {
+			compilation.plugin("before-chunk-ids", (chunks) => {
+				chunks.forEach((chunk) => {
+					if(chunk.id === null) {
+						chunk.id = this.nameResolver(chunk);
+					}
+				});
+			});
+		});
+	}
+}
+
+module.exports = NamedChunksPlugin;