webpack 5.100.2 → 5.101.1

package/lib/hmr/HotModuleReplacement.runtime.js

@@ -354,38 +354,50 @@ module.exports = function () {
 		};
 
 		var outdatedModules = [];
-		results.forEach(function (result) {
-			if (result.apply) {
-				var modules = result.apply(reportError);
-				if (modules) {
-					for (var i = 0; i < modules.length; i++) {
-						outdatedModules.push(modules[i]);
-					}
-				}
-			}
-		});
 
-		return Promise.all([disposePromise, applyPromise]).then(function () {
-			// handle errors in accept handlers and self accepted module load
-			if (error) {
-				return setStatus("fail").then(function () {
-					throw error;
-				});
-			}
+		var onAccepted = function () {
+			return Promise.all([disposePromise, applyPromise]).then(function () {
+				// handle errors in accept handlers and self accepted module load
+				if (error) {
+					return setStatus("fail").then(function () {
+						throw error;
+					});
+				}
 
-			if (queuedInvalidatedModules) {
-				return internalApply(options).then(function (list) {
-					outdatedModules.forEach(function (moduleId) {
-						if (list.indexOf(moduleId) < 0) list.push(moduleId);
+				if (queuedInvalidatedModules) {
+					return internalApply(options).then(function (list) {
+						outdatedModules.forEach(function (moduleId) {
+							if (list.indexOf(moduleId) < 0) list.push(moduleId);
+						});
+						return list;
 					});
-					return list;
-				});
-			}
+				}
 
-			return setStatus("idle").then(function () {
-				return outdatedModules;
+				return setStatus("idle").then(function () {
+					return outdatedModules;
+				});
 			});
-		});
+		};
+
+		return Promise.all(
+			results
+				.filter(function (result) {
+					return result.apply;
+				})
+				.map(function (result) {
+					return result.apply(reportError);
+				})
+		)
+			.then(function (applyResults) {
+				applyResults.forEach(function (modules) {
+					if (modules) {
+						for (var i = 0; i < modules.length; i++) {
+							outdatedModules.push(modules[i]);
+						}
+					}
+				});
+			})
+			.then(onAccepted);
 	}
 
 	function applyInvalidatedModules() {

package/lib/hmr/JavascriptHotModuleReplacement.runtime.js

@@ -281,6 +281,7 @@ module.exports = function () {
 				}
 			},
 			apply: function (reportError) {
+				var acceptPromises = [];
 				// insert new code
 				for (var updateModuleId in appliedUpdate) {
 					if ($hasOwnProperty$(appliedUpdate, updateModuleId)) {
@@ -317,8 +318,9 @@ module.exports = function () {
 								}
 							}
 							for (var k = 0; k < callbacks.length; k++) {
+								var result;
 								try {
-									callbacks[k].call(null, moduleOutdatedDependencies);
+									result = callbacks[k].call(null, moduleOutdatedDependencies);
 								} catch (err) {
 									if (typeof errorHandlers[k] === "function") {
 										try {
@@ -355,54 +357,63 @@ module.exports = function () {
 										}
 									}
 								}
+								if (result && typeof result.then === "function") {
+									acceptPromises.push(result);
+								}
 							}
 						}
 					}
 				}
 
-				// Load self accepted modules
-				for (var o = 0; o < outdatedSelfAcceptedModules.length; o++) {
-					var item = outdatedSelfAcceptedModules[o];
-					var moduleId = item.module;
-					try {
-						item.require(moduleId);
-					} catch (err) {
-						if (typeof item.errorHandler === "function") {
-							try {
-								item.errorHandler(err, {
-									moduleId: moduleId,
-									module: $moduleCache$[moduleId]
-								});
-							} catch (err1) {
+				var onAccepted = function () {
+					// Load self accepted modules
+					for (var o = 0; o < outdatedSelfAcceptedModules.length; o++) {
+						var item = outdatedSelfAcceptedModules[o];
+						var moduleId = item.module;
+						try {
+							item.require(moduleId);
+						} catch (err) {
+							if (typeof item.errorHandler === "function") {
+								try {
+									item.errorHandler(err, {
+										moduleId: moduleId,
+										module: $moduleCache$[moduleId]
+									});
+								} catch (err1) {
+									if (options.onErrored) {
+										options.onErrored({
+											type: "self-accept-error-handler-errored",
+											moduleId: moduleId,
+											error: err1,
+											originalError: err
+										});
+									}
+									if (!options.ignoreErrored) {
+										reportError(err1);
+										reportError(err);
+									}
+								}
+							} else {
 								if (options.onErrored) {
 									options.onErrored({
-										type: "self-accept-error-handler-errored",
+										type: "self-accept-errored",
 										moduleId: moduleId,
-										error: err1,
-										originalError: err
+										error: err
 									});
 								}
 								if (!options.ignoreErrored) {
-									reportError(err1);
 									reportError(err);
 								}
 							}
-						} else {
-							if (options.onErrored) {
-								options.onErrored({
-									type: "self-accept-errored",
-									moduleId: moduleId,
-									error: err
-								});
-							}
-							if (!options.ignoreErrored) {
-								reportError(err);
-							}
 						}
 					}
-				}
+				};
 
-				return outdatedModules;
+				return Promise.all(acceptPromises)
+					.then(onAccepted)
+					.then(function () {
+						return outdatedModules;
+					});
 			}
 		};
 	}

package/lib/hmr/JavascriptHotModuleReplacementHelper.js

@@ -13,7 +13,7 @@ const Template = require("../Template");
  * @param {string} type unique identifier used for HMR runtime properties
  * @returns {string} HMR runtime code
  */
-const generateJavascriptHMR = type =>
+const generateJavascriptHMR = (type) =>
 	Template.getFunctionContent(
 		require("../hmr/JavascriptHotModuleReplacement.runtime")
 	)

package/lib/hmr/LazyCompilationPlugin.js

@@ -382,7 +382,7 @@ class LazyCompilationPlugin {
 				callback();
 			});
 			if (promise && promise.then) {
-				promise.then(b => {
+				promise.then((b) => {
 					backend = b;
 					callback();
 				}, callback);
@@ -395,7 +395,7 @@ class LazyCompilationPlugin {
 					PLUGIN_NAME,
 					(module, createData, resolveData) => {
 						if (
-							resolveData.dependencies.every(dep =>
+							resolveData.dependencies.every((dep) =>
 								HMR_DEPENDENCY_TYPES.has(dep.type)
 							)
 						) {
@@ -406,9 +406,9 @@ class LazyCompilationPlugin {
 								/** @type {Module} */
 								(compilation.moduleGraph.getParentModule(hmrDep));
 							const isReferringToDynamicImport = originModule.blocks.some(
-								block =>
+								(block) =>
 									block.dependencies.some(
-										dep =>
+										(dep) =>
 											dep.type === "import()" &&
 											/** @type {HarmonyImportDependency} */ (dep).request ===
 												hmrDep.request
@@ -417,7 +417,7 @@ class LazyCompilationPlugin {
 							if (!isReferringToDynamicImport) return module;
 						} else if (
 							!resolveData.dependencies.every(
-								dep =>
+								(dep) =>
 									HMR_DEPENDENCY_TYPES.has(dep.type) ||
 									(this.imports &&
 										(dep.type === "import()" ||
@@ -455,7 +455,7 @@ class LazyCompilationPlugin {
 				);
 			}
 		);
-		compiler.hooks.shutdown.tapAsync(PLUGIN_NAME, callback => {
+		compiler.hooks.shutdown.tapAsync(PLUGIN_NAME, (callback) => {
 			backend.dispose(callback);
 		});
 	}

package/lib/hmr/lazyCompilationBackend.js

@@ -22,7 +22,7 @@
  * @param {Omit<LazyCompilationDefaultBackendOptions, "client"> & { client: NonNullable<LazyCompilationDefaultBackendOptions["client"]>}} options additional options for the backend
  * @returns {BackendHandler} backend
  */
-module.exports = options => (compiler, callback) => {
+module.exports = (options) => (compiler, callback) => {
 	const logger = compiler.getInfrastructureLogger("LazyCompilationBackend");
 	const activeModules = new Map();
 	const prefix = "/lazy-compilation-using-";
@@ -47,7 +47,7 @@ module.exports = options => (compiler, callback) => {
 	const listen =
 		typeof options.listen === "function"
 			? options.listen
-			: server => {
+			: (server) => {
 					let listen = options.listen;
 					if (typeof listen === "object" && !("port" in listen)) {
 						listen = { ...listen, port: undefined };
@@ -100,14 +100,14 @@ module.exports = options => (compiler, callback) => {
 	let isClosing = false;
 	/** @type {Set<import("net").Socket>} */
 	const sockets = new Set();
-	server.on("connection", socket => {
+	server.on("connection", (socket) => {
 		sockets.add(socket);
 		socket.on("close", () => {
 			sockets.delete(socket);
 		});
 		if (isClosing) socket.destroy();
 	});
-	server.on("clientError", e => {
+	server.on("clientError", (e) => {
 		if (e.message !== "Server is disposing") logger.warn(e);
 	});
 
@@ -117,7 +117,7 @@ module.exports = options => (compiler, callback) => {
 		 * @param {Error} err error
 		 * @returns {void}
 		 */
-		err => {
+		(err) => {
 			if (err) return callback(err);
 			const _addr = server.address();
 			if (typeof _addr === "string") {
@@ -138,7 +138,7 @@ module.exports = options => (compiler, callback) => {
 					isClosing = true;
 					// Removing the listener is a workaround for a memory leak in node.js
 					server.off("request", requestListener);
-					server.close(err => {
+					server.close((err) => {
 						callback(err);
 					});
 					for (const socket of sockets) {

package/lib/ids/ChunkModuleIdRangePlugin.js

@@ -39,13 +39,13 @@ class ChunkModuleIdRangePlugin {
 	 */
 	apply(compiler) {
 		const options = this.options;
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			const moduleGraph = compilation.moduleGraph;
-			compilation.hooks.moduleIds.tap(PLUGIN_NAME, modules => {
+			compilation.hooks.moduleIds.tap(PLUGIN_NAME, (modules) => {
 				const chunkGraph = compilation.chunkGraph;
 				const chunk = find(
 					compilation.chunks,
-					chunk => chunk.name === options.name
+					(chunk) => chunk.name === options.name
 				);
 				if (!chunk) {
 					throw new Error(
@@ -72,7 +72,7 @@ class ChunkModuleIdRangePlugin {
 					chunkModules = chunkGraph.getOrderedChunkModules(chunk, cmpFn);
 				} else {
 					chunkModules = [...modules]
-						.filter(m => chunkGraph.isModuleInChunk(m, chunk))
+						.filter((m) => chunkGraph.isModuleInChunk(m, chunk))
 						.sort(compareModulesByPreOrderIndexOrIdentifier(moduleGraph));
 				}
 

package/lib/ids/DeterministicChunkIdsPlugin.js

@@ -37,8 +37,8 @@ class DeterministicChunkIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
-			compilation.hooks.chunkIds.tap(PLUGIN_NAME, chunks => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.chunkIds.tap(PLUGIN_NAME, (chunks) => {
 				const chunkGraph = compilation.chunkGraph;
 				const context = this.options.context
 					? this.options.context
@@ -49,8 +49,9 @@ class DeterministicChunkIdsPlugin {
 
 				const usedIds = getUsedChunkIds(compilation);
 				assignDeterministicIds(
-					[...chunks].filter(chunk => chunk.id === null),
-					chunk => getFullChunkName(chunk, chunkGraph, context, compiler.root),
+					[...chunks].filter((chunk) => chunk.id === null),
+					(chunk) =>
+						getFullChunkName(chunk, chunkGraph, context, compiler.root),
 					compareNatural,
 					(chunk, id) => {
 						const size = usedIds.size;

package/lib/ids/DeterministicModuleIdsPlugin.js

@@ -43,7 +43,7 @@ class DeterministicModuleIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
 				const chunkGraph = compilation.chunkGraph;
 				const context = this.options.context
@@ -61,7 +61,7 @@ class DeterministicModuleIdsPlugin {
 				);
 				assignDeterministicIds(
 					modules,
-					module => getFullModuleName(module, context, compiler.root),
+					(module) => getFullModuleName(module, context, compiler.root),
 					failOnConflict
 						? () => 0
 						: compareModulesByPreOrderIndexOrIdentifier(

package/lib/ids/HashedModuleIdsPlugin.js

@@ -54,7 +54,7 @@ class HashedModuleIdsPlugin {
 	 */
 	apply(compiler) {
 		const options = this.options;
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
 				const chunkGraph = compilation.chunkGraph;
 				const context = this.options.context

package/lib/ids/IdHelpers.js

@@ -33,7 +33,7 @@ const getHash = (str, len, hashFunction) => {
  * @param {string} str the string
  * @returns {string} string prefixed by an underscore if it is a number
  */
-const avoidNumber = str => {
+const avoidNumber = (str) => {
 	// max length of a number is 21 chars, bigger numbers a written as "...e+xx"
 	if (str.length > 21) return str;
 	const firstChar = str.charCodeAt(0);
@@ -54,7 +54,7 @@ const avoidNumber = str => {
  * @param {string} request the request
  * @returns {string} id representation
  */
-const requestToId = request =>
+const requestToId = (request) =>
 	request.replace(/^(\.\.?\/)+/, "").replace(/(^[.-]|[^a-zA-Z0-9_-])+/g, "_");
 
 /**
@@ -136,7 +136,7 @@ const getShortChunkName = (
 	associatedObjectForCache
 ) => {
 	const modules = chunkGraph.getChunkRootModules(chunk);
-	const shortModuleNames = modules.map(m =>
+	const shortModuleNames = modules.map((m) =>
 		requestToId(getShortModuleName(m, context, associatedObjectForCache))
 	);
 	chunk.idNameHints.sort();
@@ -164,10 +164,10 @@ const getLongChunkName = (
 	associatedObjectForCache
 ) => {
 	const modules = chunkGraph.getChunkRootModules(chunk);
-	const shortModuleNames = modules.map(m =>
+	const shortModuleNames = modules.map((m) =>
 		requestToId(getShortModuleName(m, context, associatedObjectForCache))
 	);
-	const longModuleNames = modules.map(m =>
+	const longModuleNames = modules.map((m) =>
 		requestToId(
 			getLongModuleName("", m, context, hashFunction, associatedObjectForCache)
 		)
@@ -198,7 +198,7 @@ const getFullChunkName = (
 ) => {
 	if (chunk.name) return chunk.name;
 	const modules = chunkGraph.getChunkRootModules(chunk);
-	const fullModuleNames = modules.map(m =>
+	const fullModuleNames = modules.map((m) =>
 		makePathsRelative(context, m.identifier(), associatedObjectForCache)
 	);
 	return fullModuleNames.join();
@@ -259,7 +259,7 @@ const getUsedModuleIdsAndModules = (compilation, filter) => {
  * @param {Compilation} compilation the compilation
  * @returns {Set<string>} used chunk ids as strings
  */
-const getUsedChunkIds = compilation => {
+const getUsedChunkIds = (compilation) => {
 	/** @type {Set<string>} */
 	const usedIds = new Set();
 	if (compilation.usedChunkIds) {
@@ -413,7 +413,7 @@ const assignAscendingModuleIds = (usedIds, modules, compilation) => {
 		/**
 		 * @param {Module} module the module
 		 */
-		assignId = module => {
+		assignId = (module) => {
 			if (chunkGraph.getModuleId(module) === null) {
 				while (usedIds.has(String(nextId))) nextId++;
 				chunkGraph.setModuleId(module, nextId++);
@@ -423,7 +423,7 @@ const assignAscendingModuleIds = (usedIds, modules, compilation) => {
 		/**
 		 * @param {Module} module the module
 		 */
-		assignId = module => {
+		assignId = (module) => {
 			if (chunkGraph.getModuleId(module) === null) {
 				chunkGraph.setModuleId(module, nextId++);
 			}

package/lib/ids/NamedChunkIdsPlugin.js

@@ -42,24 +42,24 @@ class NamedChunkIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			const hashFunction =
 				/** @type {NonNullable<Output["hashFunction"]>} */
 				(compilation.outputOptions.hashFunction);
-			compilation.hooks.chunkIds.tap(PLUGIN_NAME, chunks => {
+			compilation.hooks.chunkIds.tap(PLUGIN_NAME, (chunks) => {
 				const chunkGraph = compilation.chunkGraph;
 				const context = this.context ? this.context : compiler.context;
 				const delimiter = this.delimiter;
 
 				const unnamedChunks = assignNames(
-					[...chunks].filter(chunk => {
+					[...chunks].filter((chunk) => {
 						if (chunk.name) {
 							chunk.id = chunk.name;
 							chunk.ids = [chunk.name];
 						}
 						return chunk.id === null;
 					}),
-					chunk =>
+					(chunk) =>
 						getShortChunkName(
 							chunk,
 							chunkGraph,
@@ -68,7 +68,7 @@ class NamedChunkIdsPlugin {
 							hashFunction,
 							compiler.root
 						),
-					chunk =>
+					(chunk) =>
 						getLongChunkName(
 							chunk,
 							chunkGraph,

package/lib/ids/NamedModuleIdsPlugin.js

@@ -40,7 +40,7 @@ class NamedModuleIdsPlugin {
 	 */
 	apply(compiler) {
 		const { root } = compiler;
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			const hashFunction =
 				/** @type {NonNullable<Output["hashFunction"]>} */
 				(compilation.outputOptions.hashFunction);
@@ -53,7 +53,7 @@ class NamedModuleIdsPlugin {
 				const [usedIds, modules] = getUsedModuleIdsAndModules(compilation);
 				const unnamedModules = assignNames(
 					modules,
-					m => getShortModuleName(m, context, root),
+					(m) => getShortModuleName(m, context, root),
 					(m, shortName) =>
 						getLongModuleName(shortName, m, context, hashFunction, root),
 					compareModulesByIdentifier,

package/lib/ids/NaturalChunkIdsPlugin.js

@@ -21,8 +21,8 @@ class NaturalChunkIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
-			compilation.hooks.chunkIds.tap(PLUGIN_NAME, chunks => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.chunkIds.tap(PLUGIN_NAME, (chunks) => {
 				const chunkGraph = compilation.chunkGraph;
 				const compareNatural = compareChunksNatural(chunkGraph);
 				/** @type {Chunk[]} */

package/lib/ids/NaturalModuleIdsPlugin.js

@@ -25,7 +25,7 @@ class NaturalModuleIdsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
 				const [usedIds, modulesInNaturalOrder] =
 					getUsedModuleIdsAndModules(compilation);

package/lib/ids/OccurrenceChunkIdsPlugin.js

@@ -41,8 +41,8 @@ class OccurrenceChunkIdsPlugin {
 	 */
 	apply(compiler) {
 		const prioritiseInitial = this.options.prioritiseInitial;
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
-			compilation.hooks.chunkIds.tap(PLUGIN_NAME, chunks => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.chunkIds.tap(PLUGIN_NAME, (chunks) => {
 				const chunkGraph = compilation.chunkGraph;
 
 				/** @type {Map<Chunk, number>} */

package/lib/ids/OccurrenceModuleIdsPlugin.js

@@ -46,7 +46,7 @@ class OccurrenceModuleIdsPlugin {
 	 */
 	apply(compiler) {
 		const prioritiseInitial = this.options.prioritiseInitial;
-		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			const moduleGraph = compilation.moduleGraph;
 
 			compilation.hooks.moduleIds.tap(PLUGIN_NAME, () => {
@@ -75,14 +75,14 @@ class OccurrenceModuleIdsPlugin {
 				 * @param {Module} module module
 				 * @returns {number} count of occurs
 				 */
-				const countOccursInEntry = module => {
+				const countOccursInEntry = (module) => {
 					let sum = 0;
 					for (const [
 						originModule,
 						connections
 					] of moduleGraph.getIncomingConnectionsByOriginModule(module)) {
 						if (!originModule) continue;
-						if (!connections.some(c => c.isTargetActive(undefined))) continue;
+						if (!connections.some((c) => c.isTargetActive(undefined))) continue;
 						sum += initialChunkChunkMap.get(originModule) || 0;
 					}
 					return sum;
@@ -92,7 +92,7 @@ class OccurrenceModuleIdsPlugin {
 				 * @param {Module} module module
 				 * @returns {number} count of occurs
 				 */
-				const countOccurs = module => {
+				const countOccurs = (module) => {
 					let sum = 0;
 					for (const [
 						originModule,

package/lib/ids/SyncModuleIdsPlugin.js

@@ -46,7 +46,7 @@ class SyncModuleIdsPlugin {
 		let data;
 		let dataChanged = false;
 		if (this._read) {
-			compiler.hooks.readRecords.tapAsync(plugin, callback => {
+			compiler.hooks.readRecords.tapAsync(plugin, (callback) => {
 				const fs =
 					/** @type {IntermediateFileSystem} */
 					(compiler.intermediateFileSystem);
@@ -68,7 +68,7 @@ class SyncModuleIdsPlugin {
 			});
 		}
 		if (this._write) {
-			compiler.hooks.emitRecords.tapAsync(plugin, callback => {
+			compiler.hooks.emitRecords.tapAsync(plugin, (callback) => {
 				if (!data || !dataChanged) return callback();
 				/** @type {{[key: string]: string | number}} */
 				const json = {};
@@ -82,7 +82,7 @@ class SyncModuleIdsPlugin {
 				fs.writeFile(this._path, JSON.stringify(json), callback);
 			});
 		}
-		compiler.hooks.thisCompilation.tap(plugin, compilation => {
+		compiler.hooks.thisCompilation.tap(plugin, (compilation) => {
 			const associatedObjectForCache = compiler.root;
 			const context = this._context || compiler.context;
 			if (this._read) {
@@ -114,7 +114,7 @@ class SyncModuleIdsPlugin {
 				});
 			}
 			if (this._write) {
-				compilation.hooks.recordModules.tap(plugin, modules => {
+				compilation.hooks.recordModules.tap(plugin, (modules) => {
 					const { chunkGraph } = compilation;
 					let oldData = data;
 					if (!oldData) {