webpack 4.38.0 → 4.39.3

package/README.md

@@ -14,6 +14,7 @@
 [![builds2][builds2]][builds2-url]
 [![coverage][cover]][cover-url]
 [![licenses][licenses]][licenses-url]
+[![PR's welcome][prs]][prs-url]
 
   <br>
   <a href="https://dependabot.com/compatibility-score.html?dependency-name=webpack&package-manager=npm_and_yarn&new-version=latest">
@@ -346,7 +347,7 @@ If you create a loader or plugin, we would <3 for you to open source it, and put
 
 <h2 align="center">Support</h2>
 
-We consider webpack to be a low-level tool used not only individually but also layered beneath other awesome tools. Because of its flexibility, webpack isn't always the _easiest_ entry-level solution, however we do believe it is the most powerful. That said, we're always looking for ways improve and simplify the tool without compromising functionality. If you have any ideas on ways to accomplish this, we're all ears!
+We consider webpack to be a low-level tool used not only individually but also layered beneath other awesome tools. Because of its flexibility, webpack isn't always the _easiest_ entry-level solution, however we do believe it is the most powerful. That said, we're always looking for ways to improve and simplify the tool without compromising functionality. If you have any ideas on ways to accomplish this, we're all ears!
 
 If you're just getting started, take a look at [our new docs and concepts page](https://webpack.js.org/concepts/). This has a high level overview that is great for beginners!!
 
@@ -767,6 +768,9 @@ src="https://static.monei.net/monei-logo.svg" height="30" alt="MONEI"></a>
 [tests]: https://img.shields.io/travis/webpack/webpack/master.svg
 [tests-url]: https://travis-ci.org/webpack/webpack
 
+[prs]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg
+[prs-url]: https://webpack.js.org/contribute/
+
 [builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/master
 [builds]: https://ci.appveyor.com/api/projects/status/github/webpack/webpack?svg=true
 

package/lib/BannerPlugin.js

@@ -81,7 +81,6 @@ class BannerPlugin {
 							continue;
 						}
 
-						let basename;
 						let query = "";
 						let filename = file;
 						const hash = compilation.hash;
@@ -94,11 +93,10 @@ class BannerPlugin {
 
 						const lastSlashIndex = filename.lastIndexOf("/");
 
-						if (lastSlashIndex === -1) {
-							basename = filename;
-						} else {
-							basename = filename.substr(lastSlashIndex + 1);
-						}
+						const basename =
+							lastSlashIndex === -1
+								? filename
+								: filename.substr(lastSlashIndex + 1);
 
 						const data = {
 							hash,

package/lib/CachePlugin.js

@@ -24,21 +24,19 @@ class CachePlugin {
 					compilation.hooks.childCompiler.tap(
 						"CachePlugin",
 						(childCompiler, compilerName, compilerIndex) => {
-							if (cache) {
-								let childCache;
-								if (!cache.children) {
-									cache.children = {};
-								}
-								if (!cache.children[compilerName]) {
-									cache.children[compilerName] = [];
-								}
-								if (cache.children[compilerName][compilerIndex]) {
-									childCache = cache.children[compilerName][compilerIndex];
-								} else {
-									cache.children[compilerName].push((childCache = {}));
-								}
-								registerCacheToCompiler(childCompiler, childCache);
+							let childCache;
+							if (!cache.children) {
+								cache.children = {};
 							}
+							if (!cache.children[compilerName]) {
+								cache.children[compilerName] = [];
+							}
+							if (cache.children[compilerName][compilerIndex]) {
+								childCache = cache.children[compilerName][compilerIndex];
+							} else {
+								cache.children[compilerName].push((childCache = {}));
+							}
+							registerCacheToCompiler(childCompiler, childCache);
 						}
 					);
 				});

package/lib/ChunkGroup.js

@@ -70,12 +70,12 @@ class ChunkGroup {
 		this.chunks = [];
 		/** @type {OriginRecord[]} */
 		this.origins = [];
-		/** Indicies in top-down order */
+		/** Indices in top-down order */
 		/** @private @type {Map<Module, number>} */
-		this._moduleIndicies = new Map();
-		/** Indicies in bottom-up order */
+		this._moduleIndices = new Map();
+		/** Indices in bottom-up order */
 		/** @private @type {Map<Module, number>} */
-		this._moduleIndicies2 = new Map();
+		this._moduleIndices2 = new Map();
 	}
 
 	/**
@@ -174,7 +174,7 @@ class ChunkGroup {
 	/**
 	 * add a chunk into ChunkGroup. Is pushed on or prepended
 	 * @param {Chunk} chunk chunk being pushed into ChunkGroupS
-	 * @returns {boolean} returns true if chunk addition was ssuccesful.
+	 * @returns {boolean} returns true if chunk addition was successful.
 	 */
 	pushChunk(chunk) {
 		const oldIdx = this.chunks.indexOf(chunk);
@@ -187,8 +187,8 @@ class ChunkGroup {
 
 	/**
 	 * @param {Chunk} oldChunk chunk to be replaced
-	 * @param {Chunk} newChunk New chunkt that will be replaced
-	 * @returns {boolean} rerturns true for
+	 * @param {Chunk} newChunk New chunk that will be replaced with
+	 * @returns {boolean} returns true if the replacement was successful
 	 */
 	replaceChunk(oldChunk, newChunk) {
 		const oldIdx = this.chunks.indexOf(oldChunk);
@@ -369,7 +369,7 @@ class ChunkGroup {
 
 		/**
 		 * we need to iterate again over the children
-		 * to remove this from the childs parents.
+		 * to remove this from the child's parents.
 		 * This can not be done in the above loop
 		 * as it is not guaranteed that `this._parents` contains anything.
 		 */
@@ -460,7 +460,7 @@ class ChunkGroup {
 	 * @returns {void}
 	 */
 	setModuleIndex(module, index) {
-		this._moduleIndicies.set(module, index);
+		this._moduleIndices.set(module, index);
 	}
 
 	/**
@@ -469,7 +469,7 @@ class ChunkGroup {
 	 * @returns {number} index
 	 */
 	getModuleIndex(module) {
-		return this._moduleIndicies.get(module);
+		return this._moduleIndices.get(module);
 	}
 
 	/**
@@ -479,7 +479,7 @@ class ChunkGroup {
 	 * @returns {void}
 	 */
 	setModuleIndex2(module, index) {
-		this._moduleIndicies2.set(module, index);
+		this._moduleIndices2.set(module, index);
 	}
 
 	/**
@@ -488,7 +488,7 @@ class ChunkGroup {
 	 * @returns {number} index
 	 */
 	getModuleIndex2(module) {
-		return this._moduleIndicies2.get(module);
+		return this._moduleIndices2.get(module);
 	}
 
 	checkConstraints() {

package/lib/Compilation.js

@@ -913,11 +913,6 @@ class Compilation extends Tapable {
 							iterationDependencies(dependencies);
 
 							const afterBuild = () => {
-								if (currentProfile) {
-									const afterBuilding = Date.now();
-									currentProfile.building = afterBuilding - afterFactory;
-								}
-
 								if (recursive && addModuleResult.dependencies) {
 									this.processModuleDependencies(dependentModule, callback);
 								} else {
@@ -1059,11 +1054,6 @@ class Compilation extends Tapable {
 					module.addReason(null, dependency);
 
 					const afterBuild = () => {
-						if (currentProfile) {
-							const afterBuilding = Date.now();
-							currentProfile.building = afterBuilding - afterFactory;
-						}
-
 						if (addModuleResult.dependencies) {
 							this.processModuleDependencies(module, err => {
 								if (err) return callback(err);

package/lib/Compiler.js

@@ -55,6 +55,8 @@ class Compiler extends Tapable {
 			run: new AsyncSeriesHook(["compiler"]),
 			/** @type {AsyncSeriesHook<Compilation>} */
 			emit: new AsyncSeriesHook(["compilation"]),
+			/** @type {AsyncSeriesHook<string, Buffer>} */
+			assetEmitted: new AsyncSeriesHook(["file", "content"]),
 			/** @type {AsyncSeriesHook<Compilation>} */
 			afterEmit: new AsyncSeriesHook(["compilation"]),
 
@@ -86,7 +88,7 @@ class Compiler extends Tapable {
 			watchClose: new SyncHook([]),
 
 			/** @type {SyncBailHook<string, string, any[]>} */
-			infrastructurelog: new SyncBailHook(["origin", "type", "args"]),
+			infrastructureLog: new SyncBailHook(["origin", "type", "args"]),
 
 			// TODO the following hooks are weirdly located here
 			// TODO move them for webpack 5
@@ -101,6 +103,8 @@ class Compiler extends Tapable {
 			/** @type {SyncBailHook<string, Entry>} */
 			entryOption: new SyncBailHook(["context", "entry"])
 		};
+		// TODO webpack 5 remove this
+		this.hooks.infrastructurelog = this.hooks.infrastructureLog;
 
 		this._pluginCompat.tap("Compiler", options => {
 			switch (options.name) {
@@ -221,7 +225,7 @@ class Compiler extends Tapable {
 					);
 				}
 			}
-			if (this.hooks.infrastructurelog.call(name, type, args) === undefined) {
+			if (this.hooks.infrastructureLog.call(name, type, args) === undefined) {
 				if (this.infrastructureLogger !== undefined) {
 					this.infrastructureLogger(name, type, args);
 				}
@@ -430,7 +434,7 @@ class Compiler extends Tapable {
 										: targetFileGeneration + 1;
 								cacheEntry.writtenTo.set(targetPath, newGeneration);
 								this._assetEmittingWrittenFiles.set(targetPath, newGeneration);
-								callback();
+								this.hooks.assetEmitted.callAsync(file, content, callback);
 							});
 						} else {
 							if (source.existsAt === targetPath) {
@@ -445,7 +449,10 @@ class Compiler extends Tapable {
 
 							source.existsAt = targetPath;
 							source.emitted = true;
-							this.outputFileSystem.writeFile(targetPath, content, callback);
+							this.outputFileSystem.writeFile(targetPath, content, err => {
+								if (err) return callback(err);
+								this.hooks.assetEmitted.callAsync(file, content, callback);
+							});
 						}
 					};
 

package/lib/Entrypoint.js

@@ -52,8 +52,8 @@ class Entrypoint extends ChunkGroup {
 
 	/**
 	 * @param {Chunk} oldChunk chunk to be replaced
-	 * @param {Chunk} newChunk New chunkt that will be replaced
-	 * @returns {boolean} rerturns true for
+	 * @param {Chunk} newChunk New chunk that will be replaced with
+	 * @returns {boolean} returns true if the replacement was successful
 	 */
 	replaceChunk(oldChunk, newChunk) {
 		if (this.runtimeChunk === oldChunk) this.runtimeChunk = newChunk;

package/lib/MultiCompiler.js

@@ -18,7 +18,10 @@ module.exports = class MultiCompiler extends Tapable {
 			invalid: new MultiHook(compilers.map(c => c.hooks.invalid)),
 			run: new MultiHook(compilers.map(c => c.hooks.run)),
 			watchClose: new SyncHook([]),
-			watchRun: new MultiHook(compilers.map(c => c.hooks.watchRun))
+			watchRun: new MultiHook(compilers.map(c => c.hooks.watchRun)),
+			infrastructureLog: new MultiHook(
+				compilers.map(c => c.hooks.infrastructureLog)
+			)
 		};
 		if (!Array.isArray(compilers)) {
 			compilers = Object.keys(compilers).map(name => {
@@ -90,6 +93,10 @@ module.exports = class MultiCompiler extends Tapable {
 		}
 	}
 
+	getInfrastructureLogger(name) {
+		return this.compilers[0].getInfrastructureLogger(name);
+	}
+
 	validateDependencies(callback) {
 		const edges = new Set();
 		const missing = [];

package/lib/ProgressPlugin.js

@@ -10,50 +10,14 @@ const schema = require("../schemas/plugins/ProgressPlugin.json");
 /** @typedef {import("../declarations/plugins/ProgressPlugin").ProgressPluginArgument} ProgressPluginArgument */
 /** @typedef {import("../declarations/plugins/ProgressPlugin").ProgressPluginOptions} ProgressPluginOptions */
 
-const createDefaultHandler = profile => {
-	let lineCaretPosition = 0;
-	let lastMessage = "";
+const createDefaultHandler = (profile, logger) => {
 	let lastState;
 	let lastStateTime;
 
 	const defaultHandler = (percentage, msg, ...args) => {
-		let state = msg;
-		const details = args.filter(v => v.length);
-		const maxLineLength = process.stderr.columns || Infinity;
-		if (percentage < 1) {
-			percentage = Math.floor(percentage * 100);
-			msg = `${percentage}% ${msg}`;
-			if (percentage < 100) {
-				msg = ` ${msg}`;
-			}
-			if (percentage < 10) {
-				msg = ` ${msg}`;
-			}
-
-			if (details.length) {
-				const maxTotalDetailsLength = maxLineLength - msg.length;
-				const totalDetailsLength = details.reduce(
-					(a, b) => a + b.length,
-					details.length // account for added space before each detail text
-				);
-				const maxDetailLength =
-					totalDetailsLength < maxTotalDetailsLength
-						? Infinity
-						: Math.floor(maxTotalDetailsLength / details.length);
-
-				for (let detail of details) {
-					if (!detail) continue;
-					if (detail.length + 1 > maxDetailLength) {
-						const truncatePrefix = "...";
-						detail = `${truncatePrefix}${detail.substr(
-							-(maxDetailLength - truncatePrefix.length - 1)
-						)}`;
-					}
-					msg += ` ${detail}`;
-				}
-			}
-		}
+		logger.status(`${Math.floor(percentage * 100)}%`, msg, ...args);
 		if (profile) {
+			let state = msg;
 			state = state.replace(/^\d+\/\d+\s+/, "");
 			if (percentage === 0) {
 				lastState = null;
@@ -61,33 +25,23 @@ const createDefaultHandler = profile => {
 			} else if (state !== lastState || percentage === 1) {
 				const now = Date.now();
 				if (lastState) {
-					const stateMsg = `${now - lastStateTime}ms ${lastState}`;
-					goToLineStart(stateMsg);
-					process.stderr.write(stateMsg + "\n");
-					lineCaretPosition = 0;
+					const diff = now - lastStateTime;
+					const stateMsg = `${diff}ms ${lastState}`;
+					if (diff > 1000) {
+						logger.warn(stateMsg);
+					} else if (diff > 10) {
+						logger.info(stateMsg);
+					} else if (diff > 0) {
+						logger.log(stateMsg);
+					} else {
+						logger.debug(stateMsg);
+					}
 				}
 				lastState = state;
 				lastStateTime = now;
 			}
 		}
-		if (lastMessage !== msg) {
-			goToLineStart(msg);
-			msg = msg.substring(0, maxLineLength);
-			process.stderr.write(msg);
-			lastMessage = msg;
-		}
-	};
-
-	const goToLineStart = nextMessage => {
-		let str = "";
-		for (; lineCaretPosition > nextMessage.length; lineCaretPosition--) {
-			str += "\b \b";
-		}
-		for (var i = 0; i < lineCaretPosition; i++) {
-			str += "\b";
-		}
-		lineCaretPosition = nextMessage.length;
-		if (str) process.stderr.write(str);
+		if (percentage === 1) logger.status();
 	};
 
 	return defaultHandler;
@@ -118,7 +72,12 @@ class ProgressPlugin {
 
 	apply(compiler) {
 		const { modulesCount } = this;
-		const handler = this.handler || createDefaultHandler(this.profile);
+		const handler =
+			this.handler ||
+			createDefaultHandler(
+				this.profile,
+				compiler.getInfrastructureLogger("webpack.Progress")
+			);
 		const showEntries = this.showEntries;
 		const showModules = this.showModules;
 		const showActiveModules = this.showActiveModules;

package/lib/Stats.js

@@ -755,6 +755,7 @@ class Stats {
 						LogType.profile,
 						LogType.profileEnd,
 						LogType.time,
+						LogType.status,
 						LogType.clear
 					]);
 					collapsedGroups = true;
@@ -1442,7 +1443,7 @@ class Stats {
 					let indent = "";
 					for (const entry of logData.entries) {
 						let color = colors.normal;
-						let prefix = "";
+						let prefix = "    ";
 						switch (entry.type) {
 							case LogType.clear:
 								colors.normal(`${indent}-------`);
@@ -1467,6 +1468,10 @@ class Stats {
 							case LogType.debug:
 								color = colors.normal;
 								break;
+							case LogType.status:
+								color = colors.magenta;
+								prefix = "<s> ";
+								break;
 							case LogType.profile:
 								color = colors.magenta;
 								prefix = "<p> ";
@@ -1481,13 +1486,14 @@ class Stats {
 								break;
 							case LogType.group:
 								color = colors.cyan;
+								prefix = "<-> ";
 								break;
 							case LogType.groupCollapsed:
 								color = colors.cyan;
 								prefix = "<+> ";
 								break;
 							case LogType.groupEnd:
-								if (indent.length > 2)
+								if (indent.length >= 2)
 									indent = indent.slice(0, indent.length - 2);
 								continue;
 						}

package/lib/SystemMainTemplatePlugin.js

@@ -34,7 +34,11 @@ class SystemMainTemplatePlugin {
 			const externals = chunk.getModules().filter(m => m.external);
 
 			// The name this bundle should be registered as with System
-			const name = this.name ? `${JSON.stringify(this.name)}, ` : "";
+			const name = this.name
+				? `${JSON.stringify(
+						mainTemplate.getAssetPath(this.name, { hash, chunk })
+				  )}, `
+				: "";
 
 			// The array of dependencies that are external to webpack and will be provided by System
 			const systemDependencies = JSON.stringify(

package/lib/TemplatedPathPlugin.js

@@ -47,12 +47,18 @@ const getReplacer = (value, allowEmpty) => {
 			}
 			return "";
 		} else {
-			return `${value}`;
+			return `${escapePathVariables(value)}`;
 		}
 	};
 	return fn;
 };
 
+const escapePathVariables = value => {
+	return typeof value === "string"
+		? value.replace(/\[(\\*[\w:]+\\*)\]/gi, "[\\$1\\]")
+		: value;
+};
+
 const replacePathVariables = (path, data) => {
 	const chunk = data.chunk;
 	const chunkId = chunk && chunk.id;
@@ -114,6 +120,7 @@ const replacePathVariables = (path, data) => {
 			.replace(REGEXP_QUERY, getReplacer(data.query, true))
 			// only available in sourceMappingURLComment
 			.replace(REGEXP_URL, getReplacer(data.url))
+			.replace(/\[\\(\\*[\w:]+\\*)\\\]/gi, "[$1]")
 	);
 };
 

package/lib/buildChunkGraph.js

@@ -28,11 +28,13 @@ const GraphHelpers = require("./GraphHelpers");
 
 /**
  * @typedef {Object} ChunkGroupInfo
+ * @property {ChunkGroup} chunkGroup the chunk group
  * @property {Set<Module>} minAvailableModules current minimal set of modules available at this point
  * @property {boolean} minAvailableModulesOwned true, if minAvailableModules is owned and can be modified
  * @property {Set<Module>[]} availableModulesToBeMerged enqueued updates to the minimal set of available modules
  * @property {QueueItem[]} skippedItems queue items that were skipped because module is already available in parent chunks (need to reconsider when minAvailableModules is shrinking)
  * @property {Set<Module>} resultingAvailableModules set of modules available including modules from this chunk group
+ * @property {Set<ChunkGroup>} children set of children chunk groups, that will be revisited when availableModules shrink
  */
 
 /**
@@ -196,11 +198,13 @@ const visitModules = (
 			});
 		}
 		chunkGroupInfoMap.set(chunkGroup, {
+			chunkGroup,
 			minAvailableModules: new Set(),
 			minAvailableModulesOwned: true,
 			availableModulesToBeMerged: [],
 			skippedItems: [],
-			resultingAvailableModules: undefined
+			resultingAvailableModules: undefined,
+			children: undefined
 		});
 		return queue;
 	};
@@ -418,7 +422,7 @@ const visitModules = (
 		}
 		logger.timeEnd("visiting");
 
-		if (queueConnect.size > 0) {
+		while (queueConnect.size > 0) {
 			logger.time("calculating available modules");
 
 			// Figure out new parents for chunk groups
@@ -435,17 +439,26 @@ const visitModules = (
 					}
 				}
 				info.resultingAvailableModules = resultingAvailableModules;
+				if (info.children === undefined) {
+					info.children = targets;
+				} else {
+					for (const target of targets) {
+						info.children.add(target);
+					}
+				}
 
 				// 2. Update chunk group info
 				for (const target of targets) {
 					let chunkGroupInfo = chunkGroupInfoMap.get(target);
 					if (chunkGroupInfo === undefined) {
 						chunkGroupInfo = {
+							chunkGroup: target,
 							minAvailableModules: undefined,
 							minAvailableModulesOwned: undefined,
 							availableModulesToBeMerged: [],
 							skippedItems: [],
-							resultingAvailableModules: undefined
+							resultingAvailableModules: undefined,
+							children: undefined
 						};
 						chunkGroupInfoMap.set(target, chunkGroupInfo);
 					}
@@ -463,7 +476,7 @@ const visitModules = (
 				// Execute the merge
 				for (const info of outdatedChunkGroupInfo) {
 					const availableModulesToBeMerged = info.availableModulesToBeMerged;
-					let minAvailableModules = info.minAvailableModules;
+					let cachedMinAvailableModules = info.minAvailableModules;
 
 					// 1. Get minimal available modules
 					// It doesn't make sense to traverse a chunk again with more available modules.
@@ -474,29 +487,31 @@ const visitModules = (
 					}
 					let changed = false;
 					for (const availableModules of availableModulesToBeMerged) {
-						if (minAvailableModules === undefined) {
-							minAvailableModules = availableModules;
-							info.minAvailableModules = minAvailableModules;
+						if (cachedMinAvailableModules === undefined) {
+							cachedMinAvailableModules = availableModules;
+							info.minAvailableModules = cachedMinAvailableModules;
 							info.minAvailableModulesOwned = false;
 							changed = true;
 						} else {
 							if (info.minAvailableModulesOwned) {
 								// We own it and can modify it
-								for (const m of minAvailableModules) {
+								for (const m of cachedMinAvailableModules) {
 									if (!availableModules.has(m)) {
-										minAvailableModules.delete(m);
+										cachedMinAvailableModules.delete(m);
 										changed = true;
 									}
 								}
 							} else {
-								for (const m of minAvailableModules) {
+								for (const m of cachedMinAvailableModules) {
 									if (!availableModules.has(m)) {
-										// minAvailableModules need to be modified
+										// cachedMinAvailableModules need to be modified
 										// but we don't own it
-										// construct a new Set as intersection of minAvailableModules and availableModules
+										// construct a new Set as intersection of cachedMinAvailableModules and availableModules
 										/** @type {Set<Module>} */
 										const newSet = new Set();
-										const iterator = minAvailableModules[Symbol.iterator]();
+										const iterator = cachedMinAvailableModules[
+											Symbol.iterator
+										]();
 										/** @type {IteratorResult<Module>} */
 										let it;
 										while (!(it = iterator.next()).done) {
@@ -510,9 +525,16 @@ const visitModules = (
 												newSet.add(module);
 											}
 										}
-										minAvailableModules = newSet;
+										cachedMinAvailableModules = newSet;
 										info.minAvailableModulesOwned = true;
 										info.minAvailableModules = newSet;
+
+										// Update the cache from the first queue
+										// if the chunkGroup is currently cached
+										if (chunkGroup === info.chunkGroup) {
+											minAvailableModules = cachedMinAvailableModules;
+										}
+
 										changed = true;
 										break;
 									}
@@ -528,6 +550,19 @@ const visitModules = (
 						queue.push(queueItem);
 					}
 					info.skippedItems.length = 0;
+
+					// 3. Reconsider children chunk groups
+					if (info.children !== undefined) {
+						const chunkGroup = info.chunkGroup;
+						for (const c of info.children) {
+							let connectList = queueConnect.get(chunkGroup);
+							if (connectList === undefined) {
+								connectList = new Set();
+								queueConnect.set(chunkGroup, connectList);
+							}
+							connectList.add(c);
+						}
+					}
 				}
 				outdatedChunkGroupInfo.clear();
 				logger.timeEnd("merging available modules");

package/lib/debug/ProfilingPlugin.js

@@ -391,8 +391,8 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 					id,
 					cat: defaultCategory
 				});
+				const callback = args.pop();
 				fn(...args, (...r) => {
-					const callback = args.pop();
 					tracer.trace.end({
 						name,
 						id,

package/lib/logging/Logger.js

@@ -26,7 +26,8 @@ const LogType = Object.freeze({
 
 	time: "time", // name, time as [seconds, nanoseconds]
 
-	clear: "clear" // no arguments
+	clear: "clear", // no arguments
+	status: "status" // message, arguments
 });
 
 exports.LogType = LogType;
@@ -78,6 +79,10 @@ class WebpackLogger {
 		this[LOG_SYMBOL](LogType.clear);
 	}
 
+	status(...args) {
+		this[LOG_SYMBOL](LogType.status, args);
+	}
+
 	group(...args) {
 		this[LOG_SYMBOL](LogType.group, args);
 	}

package/lib/logging/createConsoleLogger.js

@@ -15,8 +15,9 @@ const { LogType } = require("./Logger");
 
 /**
  * @typedef {Object} LoggerOptions
- * @property {false|true|"none"|"error"|"warn"|"info"|"log"|"verbose"} options.level loglevel
- * @property {FilterTypes|boolean} options.debug filter for debug logging
+ * @property {false|true|"none"|"error"|"warn"|"info"|"log"|"verbose"} level loglevel
+ * @property {FilterTypes|boolean} debug filter for debug logging
+ * @property {Console & { status?: Function, logTime?: Function }} console the console to log to
  */
 
 /**
@@ -62,7 +63,7 @@ const LogLevel = {
  * @param {LoggerOptions} options options object
  * @returns {function(string, LogTypeEnum, any[]): void} logging function
  */
-module.exports = ({ level = "info", debug = false }) => {
+module.exports = ({ level = "info", debug = false, console }) => {
 	const debugFilters =
 		typeof debug === "boolean"
 			? [() => debug]
@@ -79,12 +80,12 @@ module.exports = ({ level = "info", debug = false }) => {
 	 * @returns {void}
 	 */
 	const logger = (name, type, args) => {
-		const labeledArgs = (prefix = "") => {
+		const labeledArgs = () => {
 			if (Array.isArray(args)) {
 				if (args.length > 0 && typeof args[0] === "string") {
-					return [`${prefix}[${name}] ${args[0]}`, ...args.slice(1)];
+					return [`[${name}] ${args[0]}`, ...args.slice(1)];
 				} else {
-					return [`${prefix}[${name}]`, ...args];
+					return [`[${name}]`, ...args];
 				}
 			} else {
 				return [];
@@ -108,20 +109,33 @@ module.exports = ({ level = "info", debug = false }) => {
 				break;
 			case LogType.info:
 				if (!debug && loglevel > LogLevel.info) return;
-				console.info(...labeledArgs("<i> "));
+				console.info(...labeledArgs());
 				break;
 			case LogType.warn:
 				if (!debug && loglevel > LogLevel.warn) return;
-				console.warn(...labeledArgs("<w> "));
+				console.warn(...labeledArgs());
 				break;
 			case LogType.error:
 				if (!debug && loglevel > LogLevel.error) return;
-				console.error(...labeledArgs("<e> "));
+				console.error(...labeledArgs());
 				break;
 			case LogType.trace:
 				if (!debug) return;
 				console.trace();
 				break;
+			case LogType.groupCollapsed:
+				if (!debug && loglevel > LogLevel.log) return;
+				if (!debug && loglevel > LogLevel.verbose) {
+					// eslint-disable-next-line node/no-unsupported-features/node-builtins
+					if (typeof console.groupCollapsed === "function") {
+						// eslint-disable-next-line node/no-unsupported-features/node-builtins
+						console.groupCollapsed(...labeledArgs());
+					} else {
+						console.log(...labeledArgs());
+					}
+					break;
+				}
+			// falls through
 			case LogType.group:
 				if (!debug && loglevel > LogLevel.log) return;
 				// eslint-disable-next-line node/no-unsupported-features/node-builtins
@@ -132,32 +146,25 @@ module.exports = ({ level = "info", debug = false }) => {
 					console.log(...labeledArgs());
 				}
 				break;
-			case LogType.groupCollapsed:
-				if (!debug && loglevel > LogLevel.log) return;
-				// eslint-disable-next-line node/no-unsupported-features/node-builtins
-				if (typeof console.groupCollapsed === "function") {
-					// eslint-disable-next-line node/no-unsupported-features/node-builtins
-					console.groupCollapsed(...labeledArgs());
-				} else {
-					console.log(...labeledArgs("<g> "));
-				}
-				break;
 			case LogType.groupEnd:
 				if (!debug && loglevel > LogLevel.log) return;
 				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.groupEnd === "function") {
 					// eslint-disable-next-line node/no-unsupported-features/node-builtins
 					console.groupEnd();
-				} else {
-					console.log(...labeledArgs("</g> "));
 				}
 				break;
-			case LogType.time:
+			case LogType.time: {
 				if (!debug && loglevel > LogLevel.log) return;
-				console.log(
-					`[${name}] ${args[0]}: ${args[1] * 1000 + args[2] / 1000000}ms`
-				);
+				const ms = args[1] * 1000 + args[2] / 1000000;
+				const msg = `[${name}] ${args[0]}: ${ms}ms`;
+				if (typeof console.logTime === "function") {
+					console.logTime(msg);
+				} else {
+					console.log(msg);
+				}
 				break;
+			}
 			case LogType.profile:
 				// eslint-disable-next-line node/no-unsupported-features/node-builtins
 				if (typeof console.profile === "function") {
@@ -180,6 +187,20 @@ module.exports = ({ level = "info", debug = false }) => {
 					console.clear();
 				}
 				break;
+			case LogType.status:
+				if (!debug && loglevel > LogLevel.info) return;
+				if (typeof console.status === "function") {
+					if (args.length === 0) {
+						console.status();
+					} else {
+						console.status(...labeledArgs());
+					}
+				} else {
+					if (args.length !== 0) {
+						console.info(...labeledArgs());
+					}
+				}
+				break;
 			default:
 				throw new Error(`Unexpected LogType ${type}`);
 		}

package/lib/logging/runtime.js

@@ -5,7 +5,8 @@ const createConsoleLogger = require("./createConsoleLogger");
 /** @type {createConsoleLogger.LoggerOptions} */
 let currentDefaultLoggerOptions = {
 	level: "info",
-	debug: false
+	debug: false,
+	console
 };
 let currentDefaultLogger = createConsoleLogger(currentDefaultLoggerOptions);
 

package/lib/logging/truncateArgs.js

@@ -0,0 +1,76 @@
+/*
+ MIT License http://www.opensource.org/licenses/mit-license.php
+ Author Tobias Koppers @sokra
+ */
+
+"use strict";
+
+/**
+ * @param {any[]} args items to be truncated
+ * @param {number} maxLength maximum length of args including spaces between
+ * @returns {string[]} truncated args
+ */
+const truncateArgs = (args, maxLength) => {
+	const lengths = args.map(a => `${a}`.length);
+	const availableLength = maxLength - lengths.length + 1;
+
+	if (availableLength > 0 && args.length === 1) {
+		if (availableLength >= args[0].length) {
+			return args;
+		} else if (availableLength > 3) {
+			return ["..." + args[0].slice(-availableLength + 3)];
+		} else {
+			return [args[0].slice(-availableLength)];
+		}
+	}
+
+	// Check if there is space for at least 4 chars per arg
+	if (availableLength < lengths.reduce((s, i) => s + Math.min(i, 6), 0)) {
+		// remove args
+		if (args.length > 1)
+			return truncateArgs(args.slice(0, args.length - 1), maxLength);
+		return [];
+	}
+
+	let currentLength = lengths.reduce((a, b) => a + b, 0);
+
+	// Check if all fits into maxLength
+	if (currentLength <= availableLength) return args;
+
+	// Try to remove chars from the longest items until it fits
+	while (currentLength > availableLength) {
+		const maxLength = Math.max(...lengths);
+		const shorterItems = lengths.filter(l => l !== maxLength);
+		const nextToMaxLength =
+			shorterItems.length > 0 ? Math.max(...shorterItems) : 0;
+		const maxReduce = maxLength - nextToMaxLength;
+		let maxItems = lengths.length - shorterItems.length;
+		let overrun = currentLength - availableLength;
+		for (let i = 0; i < lengths.length; i++) {
+			if (lengths[i] === maxLength) {
+				const reduce = Math.min(Math.floor(overrun / maxItems), maxReduce);
+				lengths[i] -= reduce;
+				currentLength -= reduce;
+				overrun -= reduce;
+				maxItems--;
+			}
+		}
+	}
+
+	// Return args reduced to length in lengths
+	return args.map((a, i) => {
+		const str = `${a}`;
+		const length = lengths[i];
+		if (str.length === length) {
+			return str;
+		} else if (length > 5) {
+			return "..." + str.slice(-length + 3);
+		} else if (length > 0) {
+			return str.slice(-length);
+		} else {
+			return "";
+		}
+	});
+};
+
+module.exports = truncateArgs;

package/lib/node/NodeEnvironmentPlugin.js

@@ -9,6 +9,7 @@ const NodeOutputFileSystem = require("./NodeOutputFileSystem");
 const NodeJsInputFileSystem = require("enhanced-resolve/lib/NodeJsInputFileSystem");
 const CachedInputFileSystem = require("enhanced-resolve/lib/CachedInputFileSystem");
 const createConsoleLogger = require("../logging/createConsoleLogger");
+const nodeConsole = require("./nodeConsole");
 
 class NodeEnvironmentPlugin {
 	constructor(options) {
@@ -20,7 +21,8 @@ class NodeEnvironmentPlugin {
 			Object.assign(
 				{
 					level: "info",
-					debug: false
+					debug: false,
+					console: nodeConsole
 				},
 				this.options.infrastructureLogging
 			)

package/lib/node/nodeConsole.js

@@ -0,0 +1,135 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const truncateArgs = require("../logging/truncateArgs");
+const util = require("util");
+
+const tty = process.stderr.isTTY && process.env.TERM !== "dumb";
+
+let currentStatusMessage = undefined;
+let hasStatusMessage = false;
+let currentIndent = "";
+let currentCollapsed = 0;
+
+const indent = (str, prefix, colorPrefix, colorSuffix) => {
+	if (str === "") return str;
+	prefix = currentIndent + prefix;
+	if (tty) {
+		return (
+			prefix +
+			colorPrefix +
+			str.replace(/\n/g, colorSuffix + "\n" + prefix + colorPrefix) +
+			colorSuffix
+		);
+	} else {
+		return prefix + str.replace(/\n/g, "\n" + prefix);
+	}
+};
+
+const clearStatusMessage = () => {
+	if (hasStatusMessage) {
+		process.stderr.write("\x1b[2K\r");
+		hasStatusMessage = false;
+	}
+};
+
+const writeStatusMessage = () => {
+	if (!currentStatusMessage) return;
+	const l = process.stderr.columns;
+	const args = l
+		? truncateArgs(currentStatusMessage, l - 1)
+		: currentStatusMessage;
+	const str = args.join(" ");
+	const coloredStr = `\u001b[1m${str}\u001b[39m\u001b[22m`;
+	process.stderr.write(`\x1b[2K\r${coloredStr}`);
+	hasStatusMessage = true;
+};
+
+const writeColored = (prefix, colorPrefix, colorSuffix) => {
+	return (...args) => {
+		if (currentCollapsed > 0) return;
+		clearStatusMessage();
+		// @ts-ignore
+		const str = indent(util.format(...args), prefix, colorPrefix, colorSuffix);
+		process.stderr.write(str + "\n");
+		writeStatusMessage();
+	};
+};
+
+const writeGroupMessage = writeColored(
+	"<-> ",
+	"\u001b[1m\u001b[36m",
+	"\u001b[39m\u001b[22m"
+);
+
+const writeGroupCollapsedMessage = writeColored(
+	"<+> ",
+	"\u001b[1m\u001b[36m",
+	"\u001b[39m\u001b[22m"
+);
+
+module.exports = {
+	log: writeColored("    ", "\u001b[1m", "\u001b[22m"),
+	debug: writeColored("    ", "", ""),
+	trace: writeColored("    ", "", ""),
+	info: writeColored("<i> ", "\u001b[1m\u001b[32m", "\u001b[39m\u001b[22m"),
+	warn: writeColored("<w> ", "\u001b[1m\u001b[33m", "\u001b[39m\u001b[22m"),
+	error: writeColored("<e> ", "\u001b[1m\u001b[31m", "\u001b[39m\u001b[22m"),
+	logTime: writeColored("<t> ", "\u001b[1m\u001b[35m", "\u001b[39m\u001b[22m"),
+	group: (...args) => {
+		writeGroupMessage(...args);
+		if (currentCollapsed > 0) {
+			currentCollapsed++;
+		} else {
+			currentIndent += "  ";
+		}
+	},
+	groupCollapsed: (...args) => {
+		writeGroupCollapsedMessage(...args);
+		currentCollapsed++;
+	},
+	groupEnd: () => {
+		if (currentCollapsed > 0) currentCollapsed--;
+		else if (currentIndent.length >= 2)
+			currentIndent = currentIndent.slice(0, currentIndent.length - 2);
+	},
+	// eslint-disable-next-line node/no-unsupported-features/node-builtins
+	profile: console.profile && (name => console.profile(name)),
+	// eslint-disable-next-line node/no-unsupported-features/node-builtins
+	profileEnd: console.profileEnd && (name => console.profileEnd(name)),
+	clear:
+		tty &&
+		// eslint-disable-next-line node/no-unsupported-features/node-builtins
+		console.clear &&
+		(() => {
+			clearStatusMessage();
+			// eslint-disable-next-line node/no-unsupported-features/node-builtins
+			console.clear();
+			writeStatusMessage();
+		}),
+	status: tty
+		? (name, ...args) => {
+				args = args.filter(Boolean);
+				if (name === undefined && args.length === 0) {
+					clearStatusMessage();
+					currentStatusMessage = undefined;
+				} else if (
+					typeof name === "string" &&
+					name.startsWith("[webpack.Progress] ")
+				) {
+					currentStatusMessage = [name.slice(19), ...args];
+					writeStatusMessage();
+				} else if (name === "[webpack.Progress]") {
+					currentStatusMessage = [...args];
+					writeStatusMessage();
+				} else {
+					currentStatusMessage = [name, ...args];
+					writeStatusMessage();
+				}
+		  }
+		: writeColored("<s> ", "", "")
+};

package/lib/wasm/WebAssemblyGenerator.js

@@ -70,7 +70,7 @@ const getImportedGlobals = ast => {
 
 	t.traverse(ast, {
 		ModuleImport({ node }) {
-			if (t.isGlobalType(node.descr) === true) {
+			if (t.isGlobalType(node.descr)) {
 				importedGlobals.push(node);
 			}
 		}
@@ -79,12 +79,18 @@ const getImportedGlobals = ast => {
 	return importedGlobals;
 };
 
+/**
+ * Get the count for imported func
+ *
+ * @param {Object} ast Module's AST
+ * @returns {Number} - count
+ */
 const getCountImportedFunc = ast => {
 	let count = 0;
 
 	t.traverse(ast, {
 		ModuleImport({ node }) {
-			if (t.isFuncImportDescr(node.descr) === true) {
+			if (t.isFuncImportDescr(node.descr)) {
 				count++;
 			}
 		}
@@ -133,7 +139,7 @@ const getNextFuncIndex = (ast, countImportedFunc) => {
 };
 
 /**
- * Create a init instruction for a global
+ * Creates an init instruction for a global type
  * @param {t.GlobalType} globalType the global type
  * @returns {t.Instruction} init expression
  */
@@ -156,7 +162,7 @@ const createDefaultInitForGlobal = globalType => {
 /**
  * Rewrite the import globals:
  * - removes the ModuleImport instruction
- * - injects at the same offset a mutable global of the same time
+ * - injects at the same offset a mutable global of the same type
  *
  * Since the imported globals are before the other global declarations, our
  * indices will be preserved.
@@ -172,7 +178,7 @@ const rewriteImportedGlobals = state => bin => {
 
 	bin = editWithAST(state.ast, bin, {
 		ModuleImport(path) {
-			if (t.isGlobalType(path.node.descr) === true) {
+			if (t.isGlobalType(path.node.descr)) {
 				const globalType = path.node.descr;
 
 				globalType.mutability = "var";
@@ -206,8 +212,8 @@ const rewriteImportedGlobals = state => bin => {
 
 				additionalInitCode.push(
 					/**
-					 * get_global in global initilizer only work for imported globals.
-					 * They have the same indices than the init params, so use the
+					 * get_global in global initializer only works for imported globals.
+					 * They have the same indices as the init params, so use the
 					 * same index.
 					 */
 					t.instruction("get_local", [initialGlobalidx]),

package/lib/web/JsonpMainTemplatePlugin.js

@@ -367,7 +367,7 @@ class JsonpMainTemplatePlugin {
 							"for(;i < chunkIds.length; i++) {",
 							Template.indent([
 								"chunkId = chunkIds[i];",
-								"if(installedChunks[chunkId]) {",
+								"if(Object.prototype.hasOwnProperty.call(installedChunks, chunkId) && installedChunks[chunkId]) {",
 								Template.indent("resolves.push(installedChunks[chunkId][0]);"),
 								"}",
 								"installedChunks[chunkId] = 0;"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "4.38.0",
+  "version": "4.39.3",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",
@@ -9,25 +9,25 @@
     "@webassemblyjs/helper-module-context": "1.8.5",
     "@webassemblyjs/wasm-edit": "1.8.5",
     "@webassemblyjs/wasm-parser": "1.8.5",
-    "acorn": "^6.2.0",
-    "ajv": "^6.1.0",
-    "ajv-keywords": "^3.1.0",
-    "chrome-trace-event": "^1.0.0",
+    "acorn": "^6.2.1",
+    "ajv": "^6.10.2",
+    "ajv-keywords": "^3.4.1",
+    "chrome-trace-event": "^1.0.2",
     "enhanced-resolve": "^4.1.0",
-    "eslint-scope": "^4.0.0",
+    "eslint-scope": "^4.0.3",
     "json-parse-better-errors": "^1.0.2",
-    "loader-runner": "^2.3.0",
-    "loader-utils": "^1.1.0",
-    "memory-fs": "~0.4.1",
-    "micromatch": "^3.1.8",
-    "mkdirp": "~0.5.0",
-    "neo-async": "^2.5.0",
-    "node-libs-browser": "^2.0.0",
+    "loader-runner": "^2.4.0",
+    "loader-utils": "^1.2.3",
+    "memory-fs": "^0.4.1",
+    "micromatch": "^3.1.10",
+    "mkdirp": "^0.5.1",
+    "neo-async": "^2.6.1",
+    "node-libs-browser": "^2.2.1",
     "schema-utils": "^1.0.0",
-    "tapable": "^1.1.0",
-    "terser-webpack-plugin": "^1.1.0",
-    "watchpack": "^1.5.0",
-    "webpack-sources": "^1.3.0"
+    "tapable": "^1.1.3",
+    "terser-webpack-plugin": "^1.4.1",
+    "watchpack": "^1.6.0",
+    "webpack-sources": "^1.4.1"
   },
   "devDependencies": {
     "@types/node": "^10.12.21",
@@ -53,8 +53,6 @@
     "husky": "^1.1.3",
     "i18n-webpack-plugin": "^1.0.0",
     "istanbul": "^0.4.5",
-    "jade": "^1.11.0",
-    "jade-loader": "~0.8.0",
     "jest": "24.1.0",
     "jest-junit": "^6.2.1",
     "json-loader": "^0.5.7",
@@ -64,7 +62,7 @@
     "lint-staged": "^8.0.4",
     "lodash": "^4.17.4",
     "prettier": "^1.14.3",
-    "pug": "^2.0.3",
+    "pug": "^2.0.4",
     "pug-loader": "^2.4.0",
     "raw-loader": "^1.0.0",
     "react": "^16.8.0",
@@ -122,12 +120,12 @@
     "pretest": "yarn lint",
     "prelint": "yarn setup",
     "lint": "yarn code-lint && yarn jest-lint && yarn type-lint && yarn special-lint",
-    "code-lint": "eslint --cache \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.js\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "code-lint": "eslint . --ext '.js' --cache",
     "type-lint": "tsc --pretty",
     "special-lint": "node tooling/inherit-types && node tooling/format-schemas && node tooling/compile-to-definitions",
     "special-lint-fix": "node tooling/inherit-types --write --override && node tooling/format-schemas --write && node tooling/compile-to-definitions --write",
     "fix": "yarn code-lint --fix && yarn special-lint-fix",
-    "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
+    "pretty": "prettier --loglevel warn --write \"*.{ts,js,json,yml,yaml}\" \"{setup,lib,bin,hot,buildin,benchmark,tooling,schemas}/**/*.{js,json}\" \"test/*.js\" \"test/helpers/*.js\" \"test/{configCases,watchCases,statsCases,hotCases}/**/webpack.config.js\" \"examples/**/webpack.config.js\"",
     "jest-lint": "node --max-old-space-size=4096 node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.lint.js\" --no-verbose",
     "benchmark": "node --max-old-space-size=4096 --trace-deprecation node_modules/jest-cli/bin/jest --testMatch \"<rootDir>/test/*.benchmark.js\" --runInBand",
     "cover": "yarn cover:all && yarn cover:report",