webpack 2.3.3 → 2.5.1

package/lib/ChunkRenderError.js

@@ -4,10 +4,12 @@
 */
 "use strict";
 
-class ChunkRenderError extends Error {
+const WebpackError = require("./WebpackError");
 
+class ChunkRenderError extends WebpackError {
 	constructor(chunk, file, error) {
 		super();
+
 		this.name = "ChunkRenderError";
 		this.error = error;
 		this.message = error.message;

package/lib/ChunkTemplate.js

@@ -13,8 +13,8 @@ module.exports = class ChunkTemplate extends Template {
 	}
 
 	render(chunk, moduleTemplate, dependencyTemplates) {
-		const modules = this.renderChunkModules(chunk, moduleTemplate, dependencyTemplates);
-		const core = this.applyPluginsWaterfall("modules", modules, chunk, moduleTemplate, dependencyTemplates);
+		const moduleSources = this.renderChunkModules(chunk, moduleTemplate, dependencyTemplates);
+		const core = this.applyPluginsWaterfall("modules", moduleSources, chunk, moduleTemplate, dependencyTemplates);
 		let source = this.applyPluginsWaterfall("render", core, chunk, moduleTemplate, dependencyTemplates);
 		if(chunk.hasEntryModule()) {
 			source = this.applyPluginsWaterfall("render-with-entry", source, chunk);

package/lib/Compilation.js

@@ -4,7 +4,7 @@
 	*/
 "use strict";
 
-const async = require("async");
+const asyncLib = require("async");
 const crypto = require("crypto");
 const Tapable = require("tapable");
 const EntryModuleNotFoundError = require("./EntryModuleNotFoundError");
@@ -14,7 +14,6 @@ const ModuleDependencyError = require("./ModuleDependencyError");
 const Module = require("./Module");
 const Chunk = require("./Chunk");
 const Entrypoint = require("./Entrypoint");
-const Stats = require("./Stats");
 const MainTemplate = require("./MainTemplate");
 const ChunkTemplate = require("./ChunkTemplate");
 const HotUpdateChunkTemplate = require("./HotUpdateChunkTemplate");
@@ -22,6 +21,7 @@ const ModuleTemplate = require("./ModuleTemplate");
 const Dependency = require("./Dependency");
 const ChunkRenderError = require("./ChunkRenderError");
 const CachedSource = require("webpack-sources").CachedSource;
+const Stats = require("./Stats");
 
 function byId(a, b) {
 	if(a.id < b.id) return -1;
@@ -82,6 +82,10 @@ class Compilation extends Tapable {
 		this.dependencyTemplates = new Map();
 	}
 
+	getStats() {
+		return new Stats(this);
+	}
+
 	templatesPlugin(name, fn) {
 		this.mainTemplate.plugin(name, fn);
 		this.chunkTemplate.plugin(name, fn);
@@ -197,7 +201,7 @@ class Compilation extends Tapable {
 
 	addModuleDependencies(module, dependencies, bail, cacheGroup, recursive, callback) {
 		let _this = this;
-		const start = _this.profile && +new Date();
+		const start = _this.profile && Date.now();
 
 		const factories = [];
 		for(let i = 0; i < dependencies.length; i++) {
@@ -207,7 +211,7 @@ class Compilation extends Tapable {
 			}
 			factories[i] = [factory, dependencies[i]];
 		}
-		async.forEach(factories, function iteratorFactory(item, callback) {
+		asyncLib.forEach(factories, function iteratorFactory(item, callback) {
 			const dependencies = item[1];
 
 			const errorAndCallback = function errorAndCallback(err) {
@@ -266,7 +270,7 @@ class Compilation extends Tapable {
 					if(!dependentModule.profile) {
 						dependentModule.profile = {};
 					}
-					afterFactory = +new Date();
+					afterFactory = Date.now();
 					dependentModule.profile.factory = afterFactory - start;
 				}
 
@@ -286,7 +290,7 @@ class Compilation extends Tapable {
 						if(!module.profile) {
 							module.profile = {};
 						}
-						const time = +new Date() - start;
+						const time = Date.now() - start;
 						if(!module.profile.dependencies || time > module.profile.dependencies) {
 							module.profile.dependencies = time;
 						}
@@ -307,7 +311,7 @@ class Compilation extends Tapable {
 					iterationDependencies(dependencies);
 
 					if(_this.profile) {
-						const afterBuilding = +new Date();
+						const afterBuilding = Date.now();
 						module.profile.building = afterBuilding - afterFactory;
 					}
 
@@ -328,7 +332,7 @@ class Compilation extends Tapable {
 					}
 
 					if(_this.profile) {
-						const afterBuilding = +new Date();
+						const afterBuilding = Date.now();
 						dependentModule.profile.building = afterBuilding - afterFactory;
 					}
 
@@ -356,7 +360,7 @@ class Compilation extends Tapable {
 	}
 
 	_addModuleChain(context, dependency, onModule, callback) {
-		const start = this.profile && +new Date();
+		const start = this.profile && Date.now();
 
 		const errorAndCallback = this.bail ? function errorAndCallback(err) {
 			callback(err);
@@ -393,7 +397,7 @@ class Compilation extends Tapable {
 				if(!module.profile) {
 					module.profile = {};
 				}
-				afterFactory = +new Date();
+				afterFactory = Date.now();
 				module.profile.factory = afterFactory - start;
 			}
 
@@ -404,7 +408,7 @@ class Compilation extends Tapable {
 				onModule(module);
 
 				if(this.profile) {
-					const afterBuilding = +new Date();
+					const afterBuilding = Date.now();
 					module.profile.building = afterBuilding - afterFactory;
 				}
 
@@ -432,7 +436,7 @@ class Compilation extends Tapable {
 				}
 
 				if(this.profile) {
-					const afterBuilding = +new Date();
+					const afterBuilding = Date.now();
 					module.profile.building = afterBuilding - afterFactory;
 				}
 
@@ -474,7 +478,7 @@ class Compilation extends Tapable {
 				const idx = this.preparedChunks.indexOf(slot);
 				this.preparedChunks.splice(idx, 1);
 			}
-			return callback();
+			return callback(null, module);
 		});
 	}
 
@@ -1214,10 +1218,6 @@ class Compilation extends Tapable {
 		return this.mainTemplate.applyPluginsWaterfall("asset-path", filename, data);
 	}
 
-	getStats() {
-		return new Stats(this);
-	}
-
 	createChildCompiler(name, outputOptions) {
 		return this.compiler.createChildCompiler(this, name, outputOptions);
 	}

package/lib/Compiler.js

@@ -6,15 +6,13 @@ var path = require("path");
 var Tapable = require("tapable");
 
 var Compilation = require("./Compilation");
-
+var Stats = require("./Stats");
 var NormalModuleFactory = require("./NormalModuleFactory");
 var ContextModuleFactory = require("./ContextModuleFactory");
 
 function Watching(compiler, watchOptions, handler) {
 	this.startTime = null;
 	this.invalid = false;
-	this.error = null;
-	this.stats = null;
 	this.handler = handler;
 	this.closed = false;
 	if(typeof watchOptions === "number") {
@@ -38,7 +36,7 @@ function Watching(compiler, watchOptions, handler) {
 
 Watching.prototype._go = function() {
 	var self = this;
-	self.startTime = new Date().getTime();
+	self.startTime = Date.now();
 	self.running = true;
 	self.invalid = false;
 	self.compiler.applyPluginsAsync("watch-run", self, function(err) {
@@ -61,9 +59,9 @@ Watching.prototype._go = function() {
 					if(compilation.applyPluginsBailResult("need-additional-pass")) {
 						compilation.needAdditionalPass = true;
 
-						var stats = compilation.getStats();
+						var stats = new Stats(compilation);
 						stats.startTime = self.startTime;
-						stats.endTime = new Date().getTime();
+						stats.endTime = Date.now();
 						self.compiler.applyPlugins("done", stats);
 
 						self.compiler.applyPluginsAsync("additional-pass", function(err) {
@@ -79,22 +77,29 @@ Watching.prototype._go = function() {
 	});
 };
 
+Watching.prototype._getStats = function(compilation) {
+	var stats = new Stats(compilation);
+	stats.startTime = this.startTime;
+	stats.endTime = Date.now();
+	return stats;
+};
+
 Watching.prototype._done = function(err, compilation) {
 	this.running = false;
 	if(this.invalid) return this._go();
-	this.error = err || null;
-	this.stats = compilation ? compilation.getStats() : null;
-	if(this.stats) {
-		this.stats.startTime = this.startTime;
-		this.stats.endTime = new Date().getTime();
+
+	var stats = compilation ? this._getStats(compilation) : null;
+	if(err) {
+		this.compiler.applyPlugins("failed", err);
+		this.handler(err, stats);
+		return;
 	}
-	if(this.stats)
-		this.compiler.applyPlugins("done", this.stats);
-	else
-		this.compiler.applyPlugins("failed", this.error);
-	this.handler(this.error, this.stats);
-	if(!this.error && !this.closed)
+
+	this.compiler.applyPlugins("done", stats);
+	this.handler(null, stats);
+	if(!this.closed) {
 		this.watch(compilation.fileDependencies, compilation.contextDependencies, compilation.missingDependencies);
+	}
 };
 
 Watching.prototype.watch = function(files, dirs, missing) {
@@ -217,7 +222,7 @@ Compiler.prototype.watch = function(watchOptions, handler) {
 
 Compiler.prototype.run = function(callback) {
 	var self = this;
-	var startTime = new Date().getTime();
+	var startTime = Date.now();
 
 	self.applyPluginsAsync("before-run", self, function(err) {
 		if(err) return callback(err);
@@ -232,9 +237,9 @@ Compiler.prototype.run = function(callback) {
 					if(err) return callback(err);
 
 					if(self.applyPluginsBailResult("should-emit", compilation) === false) {
-						var stats = compilation.getStats();
+						var stats = new Stats(compilation);
 						stats.startTime = startTime;
-						stats.endTime = new Date().getTime();
+						stats.endTime = Date.now();
 						self.applyPlugins("done", stats);
 						return callback(null, stats);
 					}
@@ -245,9 +250,9 @@ Compiler.prototype.run = function(callback) {
 						if(compilation.applyPluginsBailResult("need-additional-pass")) {
 							compilation.needAdditionalPass = true;
 
-							var stats = compilation.getStats();
+							var stats = new Stats(compilation);
 							stats.startTime = startTime;
-							stats.endTime = new Date().getTime();
+							stats.endTime = Date.now();
 							self.applyPlugins("done", stats);
 
 							self.applyPluginsAsync("additional-pass", function(err) {
@@ -260,9 +265,9 @@ Compiler.prototype.run = function(callback) {
 						self.emitRecords(function(err) {
 							if(err) return callback(err);
 
-							var stats = compilation.getStats();
+							var stats = new Stats(compilation);
 							stats.startTime = startTime;
-							stats.endTime = new Date().getTime();
+							stats.endTime = Date.now();
 							self.applyPlugins("done", stats);
 							return callback(null, stats);
 						});
@@ -391,7 +396,7 @@ Compiler.prototype.readRecords = function readRecords(callback) {
 			if(err) return callback(err);
 
 			try {
-				self.records = JSON.parse(content);
+				self.records = JSON.parse(content.toString("utf-8"));
 			} catch(e) {
 				e.message = "Cannot parse records: " + e.message;
 				return callback(e);

package/lib/ContextModule.js

@@ -10,7 +10,7 @@ const RawSource = require("webpack-sources").RawSource;
 const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
 
 class ContextModule extends Module {
-	constructor(resolveDependencies, context, recursive, regExp, addon, isAsync) {
+	constructor(resolveDependencies, context, recursive, regExp, addon, isAsync, chunkName) {
 		super();
 		this.resolveDependencies = resolveDependencies;
 		this.context = context;
@@ -21,6 +21,7 @@ class ContextModule extends Module {
 		this.cacheable = true;
 		this.contextDependencies = [context];
 		this.built = false;
+		this.chunkName = chunkName;
 	}
 
 	prettyRegExp(regexString) {
@@ -98,7 +99,7 @@ class ContextModule extends Module {
 
 	build(options, compilation, resolver, fs, callback) {
 		this.built = true;
-		this.builtTime = new Date().getTime();
+		this.builtTime = Date.now();
 		this.resolveDependencies(fs, this.context, this.recursive, this.regExp, (err, dependencies) => {
 			if(err) return callback(err);
 
@@ -125,7 +126,7 @@ class ContextModule extends Module {
 			// if we are async however create a new async dependency block
 			// and add that block to this context
 			dependencies.forEach(dep => {
-				const block = new AsyncDependenciesBlock(null, dep.module, dep.loc);
+				const block = new AsyncDependenciesBlock(this.chunkName, dep.module, dep.loc);
 				block.addDependency(dep);
 				this.addBlock(block);
 			});

package/lib/ContextModuleFactory.js

@@ -2,7 +2,7 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var async = require("async");
+var asyncLib = require("async");
 var path = require("path");
 
 var Tapable = require("tapable");
@@ -61,7 +61,7 @@ ContextModuleFactory.prototype.create = function(data, callback) {
 
 		var resolvers = module.resolvers;
 
-		async.parallel([
+		asyncLib.parallel([
 			function(callback) {
 				resolvers.context.resolve({}, context, resource, function(err, result) {
 					if(err) return callback(err);
@@ -69,7 +69,7 @@ ContextModuleFactory.prototype.create = function(data, callback) {
 				});
 			},
 			function(callback) {
-				async.map(loaders, function(loader, callback) {
+				asyncLib.map(loaders, function(loader, callback) {
 					resolvers.loader.resolve({}, context, loader, function(err, result) {
 						if(err) return callback(err);
 						callback(null, result);
@@ -93,7 +93,7 @@ ContextModuleFactory.prototype.create = function(data, callback) {
 				// Ignored
 				if(!result) return callback();
 
-				return callback(null, new ContextModule(result.resolveDependencies, result.resource, result.recursive, result.regExp, result.loaders, result.async));
+				return callback(null, new ContextModule(result.resolveDependencies, result.resource, result.recursive, result.regExp, result.loaders, result.async, dependency.chunkName));
 			});
 		});
 	});
@@ -106,7 +106,7 @@ ContextModuleFactory.prototype.resolveDependencies = function resolveDependencie
 		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) {
+			asyncLib.map(files.filter(function(p) {
 				return p.indexOf(".") !== 0;
 			}), function(seqment, callback) {
 

package/lib/DelegatedModule.js

@@ -2,79 +2,85 @@
 	MIT License http://www.opensource.org/licenses/mit-license.php
 	Author Tobias Koppers @sokra
 */
-var Module = require("./Module");
-var OriginalSource = require("webpack-sources").OriginalSource;
-var RawSource = require("webpack-sources").RawSource;
-var WebpackMissingModule = require("./dependencies/WebpackMissingModule");
-var DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
+"use strict";
 
-function DelegatedModule(sourceRequest, data, type, userRequest) {
-	Module.call(this);
-	this.sourceRequest = sourceRequest;
-	this.request = data.id;
-	this.meta = data.meta;
-	this.type = type;
-	this.userRequest = userRequest;
-	this.built = false;
-	this.delegateData = data;
-}
-module.exports = DelegatedModule;
+const Module = require("./Module");
+const OriginalSource = require("webpack-sources").OriginalSource;
+const RawSource = require("webpack-sources").RawSource;
+const WebpackMissingModule = require("./dependencies/WebpackMissingModule");
+const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
 
-DelegatedModule.prototype = Object.create(Module.prototype);
-DelegatedModule.prototype.constructor = DelegatedModule;
+class DelegatedModule extends Module {
+	constructor(sourceRequest, data, type, userRequest) {
+		super();
+		this.sourceRequest = sourceRequest;
+		this.request = data.id;
+		this.meta = data.meta;
+		this.type = type;
+		this.userRequest = userRequest;
+		this.built = false;
+		this.delegated = true;
+		this.delegateData = data;
+	}
 
-DelegatedModule.prototype.delegated = true;
+	identifier() {
+		return `delegated ${JSON.stringify(this.request)} from ${this.sourceRequest}`;
+	}
 
-DelegatedModule.prototype.identifier = function() {
-	return "delegated " + JSON.stringify(this.request) + " from " + this.sourceRequest;
-};
+	readableIdentifier() {
+		return `delegated ${this.userRequest} from ${this.sourceRequest}`;
+	}
 
-DelegatedModule.prototype.readableIdentifier = function() {
-	return "delegated " + this.userRequest + " from " + this.sourceRequest;
-};
+	needRebuild() {
+		return false;
+	}
 
-DelegatedModule.prototype.needRebuild = function() {
-	return false;
-};
+	build(options, compilation, resolver, fs, callback) {
+		this.built = true;
+		this.builtTime = Date.now();
+		this.usedExports = true;
+		this.providedExports = this.delegateData.exports || true;
+		this.dependencies.length = 0;
+		this.addDependency(new DelegatedSourceDependency(this.sourceRequest));
+		callback();
+	}
 
-DelegatedModule.prototype.build = function(options, compilation, resolver, fs, callback) {
-	this.built = true;
-	this.builtTime = new Date().getTime();
-	this.usedExports = true;
-	this.providedExports = this.delegateData.exports || true;
-	this.dependencies.length = 0;
-	this.addDependency(new DelegatedSourceDependency(this.sourceRequest));
-	callback();
-};
+	unbuild() {
+		this.built = false;
+		super.unbuild();
+	}
 
-DelegatedModule.prototype.unbuild = function() {
-	this.built = false;
-	Module.prototype.unbuild.call(this);
-};
+	source() {
+		const sourceModule = this.dependencies[0].module;
+		let str;
 
-DelegatedModule.prototype.source = function() {
-	var sourceModule = this.dependencies[0].module;
-	var str;
-	if(!sourceModule) {
-		str = WebpackMissingModule.moduleCode(this.sourceRequest);
-	} else {
-		str = "module.exports = (__webpack_require__(" + sourceModule.id + "))";
-		switch(this.type) {
-			case "require":
-				str += "(" + JSON.stringify(this.request) + ");";
-				break;
-			case "object":
-				str += "[" + JSON.stringify(this.request) + "];";
-				break;
+		if(!sourceModule) {
+			str = WebpackMissingModule.moduleCode(this.sourceRequest);
+		} else {
+			str = `module.exports = (__webpack_require__(${sourceModule.id}))`;
+
+			switch(this.type) {
+				case "require":
+					str += `(${JSON.stringify(this.request)})`;
+					break;
+				case "object":
+					str += `[${JSON.stringify(this.request)}]`;
+					break;
+			}
+
+			str += ";";
+		}
+
+		if(this.useSourceMap) {
+			return new OriginalSource(str, this.identifier());
+		} else {
+			return new RawSource(str);
 		}
 	}
-	if(this.useSourceMap) {
-		return new OriginalSource(str, this.identifier());
-	} else {
-		return new RawSource(str);
+
+	size() {
+		return 42;
 	}
-};
+}
 
-DelegatedModule.prototype.size = function() {
-	return 42;
-};
+module.exports = DelegatedModule;

package/lib/DependenciesBlock.js

@@ -1,75 +1,81 @@
 /*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-var DependenciesBlockVariable = require("./DependenciesBlockVariable");
+ MIT License http://www.opensource.org/licenses/mit-license.php
+ Author Tobias Koppers @sokra
+ */
+"use strict";
 
-function DependenciesBlock() {
-	this.dependencies = [];
-	this.blocks = [];
-	this.variables = [];
+const DependenciesBlockVariable = require("./DependenciesBlockVariable");
+
+function disconnect(i) {
+	i.disconnect();
 }
-module.exports = DependenciesBlock;
 
-DependenciesBlock.prototype.addBlock = function(block) {
-	this.blocks.push(block);
-	block.parent = this;
-};
+function unseal(i) {
+	i.unseal();
+}
+
+class DependenciesBlock {
+	constructor() {
+		this.dependencies = [];
+		this.blocks = [];
+		this.variables = [];
+	}
+
+	addBlock(block) {
+		this.blocks.push(block);
+		block.parent = this;
+	}
+
+	addVariable(name, expression, dependencies) {
+		for(let v of this.variables) {
+			if(v.name === name && v.expression === expression) {
+				return;
+			}
+		}
+		this.variables.push(new DependenciesBlockVariable(name, expression, dependencies));
+	}
 
-DependenciesBlock.prototype.addVariable = function(name, expression, dependencies) {
-	for(var i = 0; i < this.variables.length; i++) {
-		var v = this.variables[i];
-		if(v.name === name && v.expression === expression) return;
+	addDependency(dependency) {
+		this.dependencies.push(dependency);
 	}
-	this.variables.push(new DependenciesBlockVariable(name, expression, dependencies));
-};
 
-DependenciesBlock.prototype.addDependency = function(dependency) {
-	this.dependencies.push(dependency);
-};
+	updateHash(hash) {
+		function updateHash(i) {
+			i.updateHash(hash);
+		}
 
-DependenciesBlock.prototype.updateHash = function(hash) {
-	this.dependencies.forEach(function(d) {
-		d.updateHash(hash);
-	});
-	this.blocks.forEach(function(b) {
-		b.updateHash(hash);
-	});
-	this.variables.forEach(function(v) {
-		v.updateHash(hash);
-	});
-};
+		this.dependencies.forEach(updateHash);
+		this.blocks.forEach(updateHash);
+		this.variables.forEach(updateHash);
+	}
 
-DependenciesBlock.prototype.disconnect = function() {
-	function disconnect(i) {
-		i.disconnect();
+	disconnect() {
+		this.dependencies.forEach(disconnect);
+		this.blocks.forEach(disconnect);
+		this.variables.forEach(disconnect);
 	}
-	this.dependencies.forEach(disconnect);
-	this.blocks.forEach(disconnect);
-	this.variables.forEach(disconnect);
-};
 
-DependenciesBlock.prototype.unseal = function() {
-	function unseal(i) {
-		i.unseal();
+	unseal() {
+		this.blocks.forEach(unseal);
 	}
-	this.blocks.forEach(unseal);
-};
 
-DependenciesBlock.prototype.hasDependencies = function(filter) {
-	if(filter) {
-		if(this.dependencies.some(filter)) return true;
-	} else {
-		if(this.dependencies.length > 0) return true;
+	hasDependencies(filter) {
+		if(filter) {
+			if(this.dependencies.some(filter)) {
+				return true;
+			}
+		} else {
+			if(this.dependencies.length > 0) {
+				return true;
+			}
+		}
+
+		return this.blocks.concat(this.variables).some(item => item.hasDependencies(filter));
 	}
 
-	return this.blocks.concat(this.variables).some(function(item) {
-		return item.hasDependencies(filter);
-	});
-};
+	sortItems() {
+		this.blocks.forEach(block => block.sortItems());
+	}
+}
 
-DependenciesBlock.prototype.sortItems = function() {
-	this.blocks.forEach(function(block) {
-		block.sortItems();
-	});
-};
+module.exports = DependenciesBlock;

package/lib/Dependency.js

@@ -44,6 +44,7 @@ class Dependency {
 		this.module = null;
 	}
 
+	// TODO: remove in webpack 3
 	compare(a, b) {
 		return compareLocations(a.loc, b.loc);
 	}