webpack 4.37.0 → 4.39.2

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;
@@ -263,7 +222,6 @@ class ProgressPlugin {
 					recordModules: "record modules",
 					recordChunks: "record chunks",
 					beforeHash: "hashing",
-					contentHash: "content hashing",
 					afterHash: "after hashing",
 					recordHash: "record hash",
 					beforeModuleAssets: "module assets processing",

package/lib/SourceMapDevToolPlugin.js

@@ -49,27 +49,13 @@ const assetsCache = new WeakMap();
 /**
  * Creating {@link SourceMapTask} for given file
  * @param {string} file current compiled file
+ * @param {Source} asset the asset
  * @param {Chunk} chunk related chunk
  * @param {SourceMapDevToolPluginOptions} options source map options
  * @param {Compilation} compilation compilation instance
  * @returns {SourceMapTask | undefined} created task instance or `undefined`
  */
-const getTaskForFile = (file, chunk, options, compilation) => {
-	const asset = compilation.assets[file];
-	const cache = assetsCache.get(asset);
-	/**
-	 * If presented in cache, reassigns assets. Cache assets already have source maps.
-	 */
-	if (cache && cache.file === file) {
-		for (const cachedFile in cache.assets) {
-			compilation.assets[cachedFile] = cache.assets[cachedFile];
-			/**
-			 * Add file to chunk, if not presented there
-			 */
-			if (cachedFile !== file) chunk.files.push(cachedFile);
-		}
-		return;
-	}
+const getTaskForFile = (file, asset, chunk, options, compilation) => {
 	let source, sourceMap;
 	/**
 	 * Check if asset can build source map
@@ -189,13 +175,35 @@ class SourceMapDevToolPlugin {
 					reportProgress(0.0);
 					const tasks = [];
 					files.forEach(({ file, chunk }, idx) => {
+						const asset = compilation.assets[file];
+						const cache = assetsCache.get(asset);
+						/**
+						 * If presented in cache, reassigns assets. Cache assets already have source maps.
+						 */
+						if (cache && cache.file === file) {
+							for (const cachedFile in cache.assets) {
+								compilation.assets[cachedFile] = cache.assets[cachedFile];
+								/**
+								 * Add file to chunk, if not presented there
+								 */
+								if (cachedFile !== file) chunk.files.push(cachedFile);
+							}
+							return;
+						}
+
 						reportProgress(
 							(0.5 * idx) / files.length,
 							file,
 							"generate SourceMap"
 						);
 						/** @type {SourceMapTask | undefined} */
-						const task = getTaskForFile(file, chunk, options, compilation);
+						const task = getTaskForFile(
+							file,
+							asset,
+							chunk,
+							options,
+							compilation
+						);
 
 						if (task) {
 							const modules = task.sourceMap.sources.map(source => {

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/WebpackOptionsDefaulter.js

@@ -196,7 +196,12 @@ class WebpackOptionsDefaulter extends OptionsDefaulter {
 		);
 
 		this.set("optimization", "call", value => Object.assign({}, value));
-		this.set("optimization.removeAvailableModules", true);
+		// TODO webpack 5: Disable by default in a modes
+		this.set(
+			"optimization.removeAvailableModules",
+			"make",
+			options => options.mode !== "development"
+		);
 		this.set("optimization.removeEmptyChunks", true);
 		this.set("optimization.mergeDuplicateChunks", true);
 		this.set("optimization.flagIncludedChunks", "make", options =>