webpack 5.97.1 → 5.104.1

package/lib/optimize/ModuleConcatenationPlugin.js

@@ -8,15 +8,16 @@
 const asyncLib = require("neo-async");
 const ChunkGraph = require("../ChunkGraph");
 const ModuleGraph = require("../ModuleGraph");
+const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
 const { STAGE_DEFAULT } = require("../OptimizationStages");
 const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const {
+	filterRuntime,
 	intersectRuntime,
+	mergeRuntime,
 	mergeRuntimeOwned,
-	filterRuntime,
-	runtimeToString,
-	mergeRuntime
+	runtimeToString
 } = require("../util/runtime");
 const ConcatenatedModule = require("./ConcatenatedModule");
 
@@ -45,7 +46,9 @@ const ConcatenatedModule = require("./ConcatenatedModule");
  * @param {string} msg message
  * @returns {string} formatted message
  */
-const formatBailoutReason = msg => `ModuleConcatenation bailout: ${msg}`;
+const formatBailoutReason = (msg) => `ModuleConcatenation bailout: ${msg}`;
+
+const PLUGIN_NAME = "ModuleConcatenationPlugin";
 
 class ModuleConcatenationPlugin {
 	/**
@@ -55,7 +58,7 @@ class ModuleConcatenationPlugin {
 	 */
 	apply(compiler) {
 		const { _backCompat: backCompat } = compiler;
-		compiler.hooks.compilation.tap("ModuleConcatenationPlugin", compilation => {
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
 			if (compilation.moduleMemCaches) {
 				throw new Error(
 					"optimization.concatenateModules can't be used with cacheUnaffected as module concatenation is a global effect"
@@ -75,7 +78,7 @@ class ModuleConcatenationPlugin {
 					.getOptimizationBailout(module)
 					.push(
 						typeof reason === "function"
-							? rs => formatBailoutReason(reason(rs))
+							? (rs) => formatBailoutReason(reason(rs))
 							: formatBailoutReason(reason)
 					);
 			};
@@ -101,10 +104,10 @@ class ModuleConcatenationPlugin {
 
 			/**
 			 * @param {Module} module the module
-			 * @param {Module | function(RequestShortener): string} problem the problem
+			 * @param {Module | ((requestShortener: RequestShortener) => string)} problem the problem
 			 * @returns {(requestShortener: RequestShortener) => string} the reason
 			 */
-			const formatBailoutWarning = (module, problem) => requestShortener => {
+			const formatBailoutWarning = (module, problem) => (requestShortener) => {
 				if (typeof problem === "function") {
 					return formatBailoutReason(
 						`Cannot concat with ${module.readableIdentifier(
@@ -132,7 +135,7 @@ class ModuleConcatenationPlugin {
 
 			compilation.hooks.optimizeChunkModules.tapAsync(
 				{
-					name: "ModuleConcatenationPlugin",
+					name: PLUGIN_NAME,
 					stage: STAGE_DEFAULT
 				},
 				(allChunks, modules, callback) => {
@@ -146,6 +149,7 @@ class ModuleConcatenationPlugin {
 						chunkGraph,
 						moduleGraph
 					};
+					const deferEnabled = compilation.options.experiments.deferImport;
 					logger.time("select relevant modules");
 					for (const module of modules) {
 						let canBeRoot = true;
@@ -179,7 +183,7 @@ class ModuleConcatenationPlugin {
 						const exportsInfo = moduleGraph.getExportsInfo(module);
 						const relevantExports = exportsInfo.getRelevantExports(undefined);
 						const unknownReexports = relevantExports.filter(
-							exportInfo =>
+							(exportInfo) =>
 								exportInfo.isReexport() && !exportInfo.getTarget(moduleGraph)
 						);
 						if (unknownReexports.length > 0) {
@@ -187,7 +191,7 @@ class ModuleConcatenationPlugin {
 								module,
 								`Reexports in this module do not have a static target (${Array.from(
 									unknownReexports,
-									exportInfo =>
+									(exportInfo) =>
 										`${
 											exportInfo.name || "other exports"
 										}: ${exportInfo.getUsedInfo()}`
@@ -198,14 +202,14 @@ class ModuleConcatenationPlugin {
 
 						// Root modules must have a static list of exports
 						const unknownProvidedExports = relevantExports.filter(
-							exportInfo => exportInfo.provided !== true
+							(exportInfo) => exportInfo.provided !== true
 						);
 						if (unknownProvidedExports.length > 0) {
 							setBailoutReason(
 								module,
 								`List of module exports is dynamic (${Array.from(
 									unknownProvidedExports,
-									exportInfo =>
+									(exportInfo) =>
 										`${
 											exportInfo.name || "other exports"
 										}: ${exportInfo.getProvidedInfo()} and ${exportInfo.getUsedInfo()}`
@@ -220,6 +224,11 @@ class ModuleConcatenationPlugin {
 							canBeInner = false;
 						}
 
+						if (deferEnabled && moduleGraph.isDeferred(module)) {
+							setInnerBailoutReason(module, "Module is deferred");
+							canBeInner = false;
+						}
+
 						if (canBeRoot) relevantModules.push(module);
 						if (canBeInner) possibleInners.add(module);
 					}
@@ -269,7 +278,7 @@ class ModuleConcatenationPlugin {
 							chunkRuntime = mergeRuntimeOwned(chunkRuntime, r);
 						}
 						const exportsInfo = moduleGraph.getExportsInfo(currentRoot);
-						const filteredRuntime = filterRuntime(chunkRuntime, r =>
+						const filteredRuntime = filterRuntime(chunkRuntime, (r) =>
 							exportsInfo.isModuleUsed(r)
 						);
 						const activeRuntime =
@@ -381,7 +390,6 @@ class ModuleConcatenationPlugin {
 							}
 
 							// Create a new ConcatenatedModule
-							ConcatenatedModule.getCompilationHooks(compilation);
 							const newModule = ConcatenatedModule.create(
 								rootModule,
 								modules,
@@ -393,13 +401,13 @@ class ModuleConcatenationPlugin {
 
 							const build = () => {
 								newModule.build(
-									compiler.options,
+									compilation.options,
 									compilation,
-									/** @type {TODO} */
+									/** @type {EXPECTED_ANY} */
 									(null),
-									/** @type {TODO} */
+									/** @type {EXPECTED_ANY} */
 									(null),
-									err => {
+									(err) => {
 										if (err) {
 											if (!err.module) {
 												err.module = newModule;
@@ -433,7 +441,7 @@ class ModuleConcatenationPlugin {
 										moduleGraph.copyOutgoingModuleConnections(
 											m,
 											newModule,
-											c =>
+											(c) =>
 												c.originModule === m &&
 												!(
 													c.dependency instanceof HarmonyImportDependency &&
@@ -452,7 +460,7 @@ class ModuleConcatenationPlugin {
 												chunkGraph.disconnectChunkAndModule(chunk, m);
 											} else {
 												const newSourceTypes = new Set(sourceTypes);
-												newSourceTypes.delete("javascript");
+												newSourceTypes.delete(JAVASCRIPT_TYPE);
 												chunkGraph.setChunkModuleSourceTypes(
 													chunk,
 													m,
@@ -469,14 +477,18 @@ class ModuleConcatenationPlugin {
 								// remove module from chunk
 								chunkGraph.replaceModule(rootModule, newModule);
 								// replace module references with the concatenated module
-								moduleGraph.moveModuleConnections(rootModule, newModule, c => {
-									const otherModule =
-										c.module === rootModule ? c.originModule : c.module;
-									const innerConnection =
-										c.dependency instanceof HarmonyImportDependency &&
-										modules.has(/** @type {Module} */ (otherModule));
-									return !innerConnection;
-								});
+								moduleGraph.moveModuleConnections(
+									rootModule,
+									newModule,
+									(c) => {
+										const otherModule =
+											c.module === rootModule ? c.originModule : c.module;
+										const innerConnection =
+											c.dependency instanceof HarmonyImportDependency &&
+											modules.has(/** @type {Module} */ (otherModule));
+										return !innerConnection;
+									}
+								);
 								// add concatenated module to the compilation
 								compilation.modules.add(newModule);
 
@@ -485,7 +497,7 @@ class ModuleConcatenationPlugin {
 
 							build();
 						},
-						err => {
+						(err) => {
 							logger.timeEnd("create concatenated modules");
 							process.nextTick(callback.bind(null, err));
 						}
@@ -524,7 +536,7 @@ class ModuleConcatenationPlugin {
 			);
 
 			if (
-				importedNames.every(i =>
+				importedNames.every((i) =>
 					Array.isArray(i) ? i.length > 0 : i.name.length > 0
 				) ||
 				Array.isArray(moduleGraph.getProvidedExports(module))
@@ -543,11 +555,11 @@ class ModuleConcatenationPlugin {
 	 * @param {RuntimeSpec} activeRuntime the runtime scope of the root module
 	 * @param {Set<Module>} possibleModules modules that are candidates
 	 * @param {Set<Module>} candidates list of potential candidates (will be added to)
-	 * @param {Map<Module, Module | function(RequestShortener): string>} failureCache cache for problematic modules to be more performant
+	 * @param {Map<Module, Module | ((requestShortener: RequestShortener) => string)>} failureCache cache for problematic modules to be more performant
 	 * @param {ChunkGraph} chunkGraph the chunk graph
 	 * @param {boolean} avoidMutateOnFailure avoid mutating the config when adding fails
 	 * @param {Statistics} statistics gathering metrics
-	 * @returns {null | Module | function(RequestShortener): string} the problematic module
+	 * @returns {null | Module | ((requestShortener: RequestShortener) => string)} the problematic module
 	 */
 	_tryToAdd(
 		compilation,
@@ -582,25 +594,27 @@ class ModuleConcatenationPlugin {
 		}
 
 		// Module must be in the correct chunks
-		const missingChunks = Array.from(
-			chunkGraph.getModuleChunksIterable(config.rootModule)
-		).filter(chunk => !chunkGraph.isModuleInChunk(module, chunk));
+		const missingChunks = [
+			...chunkGraph.getModuleChunksIterable(config.rootModule)
+		].filter((chunk) => !chunkGraph.isModuleInChunk(module, chunk));
 		if (missingChunks.length > 0) {
 			/**
 			 * @param {RequestShortener} requestShortener request shortener
 			 * @returns {string} problem description
 			 */
-			const problem = requestShortener => {
-				const missingChunksList = Array.from(
-					new Set(missingChunks.map(chunk => chunk.name || "unnamed chunk(s)"))
-				).sort();
-				const chunks = Array.from(
-					new Set(
-						Array.from(chunkGraph.getModuleChunksIterable(module)).map(
-							chunk => chunk.name || "unnamed chunk(s)"
+			const problem = (requestShortener) => {
+				const missingChunksList = [
+					...new Set(
+						missingChunks.map((chunk) => chunk.name || "unnamed chunk(s)")
+					)
+				].sort();
+				const chunks = [
+					...new Set(
+						[...chunkGraph.getModuleChunksIterable(module)].map(
+							(chunk) => chunk.name || "unnamed chunk(s)"
 						)
 					)
-				).sort();
+				].sort();
 				return `Module ${module.readableIdentifier(
 					requestShortener
 				)} is not in the same chunk(s) (expected in chunk(s) ${missingChunksList.join(
@@ -621,7 +635,7 @@ class ModuleConcatenationPlugin {
 			incomingConnections.get(null) || incomingConnections.get(undefined);
 		if (incomingConnectionsFromNonModules) {
 			const activeNonModulesConnections =
-				incomingConnectionsFromNonModules.filter(connection =>
+				incomingConnectionsFromNonModules.filter((connection) =>
 					// We are not interested in inactive connections
 					// or connections without dependency
 					connection.isActive(runtime)
@@ -631,11 +645,13 @@ class ModuleConcatenationPlugin {
 				 * @param {RequestShortener} requestShortener request shortener
 				 * @returns {string} problem description
 				 */
-				const problem = requestShortener => {
+				const problem = (requestShortener) => {
 					const importingExplanations = new Set(
-						activeNonModulesConnections.map(c => c.explanation).filter(Boolean)
+						activeNonModulesConnections
+							.map((c) => c.explanation)
+							.filter(Boolean)
 					);
-					const explanations = Array.from(importingExplanations).sort();
+					const explanations = [...importingExplanations].sort();
 					return `Module ${module.readableIdentifier(
 						requestShortener
 					)} is referenced ${
@@ -650,7 +666,7 @@ class ModuleConcatenationPlugin {
 			}
 		}
 
-		/** @type {Map<Module, readonly ModuleGraph.ModuleGraphConnection[]>} */
+		/** @type {Map<Module, ReadonlyArray<ModuleGraph.ModuleGraphConnection>>} */
 		const incomingConnectionsFromModules = new Map();
 		for (const [originModule, connections] of incomingConnections) {
 			if (originModule) {
@@ -666,18 +682,19 @@ class ModuleConcatenationPlugin {
 				if (!intersectRuntime(runtime, originRuntime)) continue;
 
 				// We are not interested in inactive connections
-				const activeConnections = connections.filter(connection =>
+				const activeConnections = connections.filter((connection) =>
 					connection.isActive(runtime)
 				);
-				if (activeConnections.length > 0)
+				if (activeConnections.length > 0) {
 					incomingConnectionsFromModules.set(originModule, activeConnections);
+				}
 			}
 		}
 
-		const incomingModules = Array.from(incomingConnectionsFromModules.keys());
+		const incomingModules = [...incomingConnectionsFromModules.keys()];
 
 		// Module must be in the same chunks like the referencing module
-		const otherChunkModules = incomingModules.filter(originModule => {
+		const otherChunkModules = incomingModules.filter((originModule) => {
 			for (const chunk of chunkGraph.getModuleChunksIterable(
 				config.rootModule
 			)) {
@@ -692,9 +709,9 @@ class ModuleConcatenationPlugin {
 			 * @param {RequestShortener} requestShortener request shortener
 			 * @returns {string} problem description
 			 */
-			const problem = requestShortener => {
+			const problem = (requestShortener) => {
 				const names = otherChunkModules
-					.map(m => m.readableIdentifier(requestShortener))
+					.map((m) => m.readableIdentifier(requestShortener))
 					.sort();
 				return `Module ${module.readableIdentifier(
 					requestShortener
@@ -707,35 +724,36 @@ class ModuleConcatenationPlugin {
 			return problem;
 		}
 
-		/** @type {Map<Module, readonly ModuleGraph.ModuleGraphConnection[]>} */
+		/** @type {Map<Module, ReadonlyArray<ModuleGraph.ModuleGraphConnection>>} */
 		const nonHarmonyConnections = new Map();
 		for (const [originModule, connections] of incomingConnectionsFromModules) {
 			const selected = connections.filter(
-				connection =>
+				(connection) =>
 					!connection.dependency ||
 					!(connection.dependency instanceof HarmonyImportDependency)
 			);
-			if (selected.length > 0)
+			if (selected.length > 0) {
 				nonHarmonyConnections.set(originModule, connections);
+			}
 		}
 		if (nonHarmonyConnections.size > 0) {
 			/**
 			 * @param {RequestShortener} requestShortener request shortener
 			 * @returns {string} problem description
 			 */
-			const problem = requestShortener => {
-				const names = Array.from(nonHarmonyConnections)
+			const problem = (requestShortener) => {
+				const names = [...nonHarmonyConnections]
 					.map(
 						([originModule, connections]) =>
 							`${originModule.readableIdentifier(
 								requestShortener
-							)} (referenced with ${Array.from(
-								new Set(
+							)} (referenced with ${[
+								...new Set(
 									connections
-										.map(c => c.dependency && c.dependency.type)
+										.map((c) => c.dependency && c.dependency.type)
 										.filter(Boolean)
 								)
-							)
+							]
 								.sort()
 								.join(", ")})`
 					)
@@ -762,7 +780,7 @@ class ModuleConcatenationPlugin {
 				/** @type {false | RuntimeSpec} */
 				let currentRuntimeCondition = false;
 				for (const connection of connections) {
-					const runtimeCondition = filterRuntime(runtime, runtime =>
+					const runtimeCondition = filterRuntime(runtime, (runtime) =>
 						connection.isTargetActive(runtime)
 					);
 					if (runtimeCondition === false) continue;
@@ -784,7 +802,7 @@ class ModuleConcatenationPlugin {
 				 * @param {RequestShortener} requestShortener request shortener
 				 * @returns {string} problem description
 				 */
-				const problem = requestShortener =>
+				const problem = (requestShortener) =>
 					`Module ${module.readableIdentifier(
 						requestShortener
 					)} is runtime-dependent referenced by these modules: ${Array.from(
@@ -846,6 +864,9 @@ class ModuleConcatenationPlugin {
 	}
 }
 
+/** @typedef {Module | ((requestShortener: RequestShortener) => string)} Problem */
+/** @typedef {Map<Module, Problem>} Warnings */
+
 class ConcatConfiguration {
 	/**
 	 * @param {Module} rootModule the root module
@@ -857,7 +878,7 @@ class ConcatConfiguration {
 		/** @type {Set<Module>} */
 		this.modules = new Set();
 		this.modules.add(rootModule);
-		/** @type {Map<Module, Module | function(RequestShortener): string>} */
+		/** @type {Warnings} */
 		this.warnings = new Map();
 	}
 
@@ -882,18 +903,18 @@ class ConcatConfiguration {
 
 	/**
 	 * @param {Module} module the module
-	 * @param {Module | function(RequestShortener): string} problem the problem
+	 * @param {Problem} problem the problem
 	 */
 	addWarning(module, problem) {
 		this.warnings.set(module, problem);
 	}
 
 	/**
-	 * @returns {Map<Module, Module | function(RequestShortener): string>} warnings
+	 * @returns {Warnings} warnings
 	 */
 	getWarningsSorted() {
 		return new Map(
-			Array.from(this.warnings).sort((a, b) => {
+			[...this.warnings].sort((a, b) => {
 				const ai = a[0].identifier();
 				const bi = b[0].identifier();
 				if (ai < bi) return -1;