webpack 5.97.1 → 5.104.1

package/lib/optimize/EnsureChunkConditionsPlugin.js

@@ -11,6 +11,8 @@ const { STAGE_BASIC } = require("../OptimizationStages");
 /** @typedef {import("../ChunkGroup")} ChunkGroup */
 /** @typedef {import("../Compiler")} Compiler */
 
+const PLUGIN_NAME = "EnsureChunkConditionsPlugin";
+
 class EnsureChunkConditionsPlugin {
 	/**
 	 * Apply the plugin
@@ -18,71 +20,69 @@ class EnsureChunkConditionsPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"EnsureChunkConditionsPlugin",
-			compilation => {
-				/**
-				 * @param {Iterable<Chunk>} chunks the chunks
-				 */
-				const handler = chunks => {
-					const chunkGraph = compilation.chunkGraph;
-					// These sets are hoisted here to save memory
-					// They are cleared at the end of every loop
-					/** @type {Set<Chunk>} */
-					const sourceChunks = new Set();
-					/** @type {Set<ChunkGroup>} */
-					const chunkGroups = new Set();
-					for (const module of compilation.modules) {
-						if (!module.hasChunkCondition()) continue;
-						for (const chunk of chunkGraph.getModuleChunksIterable(module)) {
-							if (!module.chunkCondition(chunk, compilation)) {
-								sourceChunks.add(chunk);
-								for (const group of chunk.groupsIterable) {
-									chunkGroups.add(group);
-								}
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			/**
+			 * @param {Iterable<Chunk>} chunks the chunks
+			 */
+			const handler = (chunks) => {
+				const chunkGraph = compilation.chunkGraph;
+				// These sets are hoisted here to save memory
+				// They are cleared at the end of every loop
+				/** @type {Set<Chunk>} */
+				const sourceChunks = new Set();
+				/** @type {Set<ChunkGroup>} */
+				const chunkGroups = new Set();
+				for (const module of compilation.modules) {
+					if (!module.hasChunkCondition()) continue;
+					for (const chunk of chunkGraph.getModuleChunksIterable(module)) {
+						if (!module.chunkCondition(chunk, compilation)) {
+							sourceChunks.add(chunk);
+							for (const group of chunk.groupsIterable) {
+								chunkGroups.add(group);
 							}
 						}
-						if (sourceChunks.size === 0) continue;
-						/** @type {Set<Chunk>} */
-						const targetChunks = new Set();
-						chunkGroupLoop: for (const chunkGroup of chunkGroups) {
-							// Can module be placed in a chunk of this group?
-							for (const chunk of chunkGroup.chunks) {
-								if (module.chunkCondition(chunk, compilation)) {
-									targetChunks.add(chunk);
-									continue chunkGroupLoop;
-								}
-							}
-							// We reached the entrypoint: fail
-							if (chunkGroup.isInitial()) {
-								throw new Error(
-									`Cannot fulfil chunk condition of ${module.identifier()}`
-								);
-							}
-							// Try placing in all parents
-							for (const group of chunkGroup.parentsIterable) {
-								chunkGroups.add(group);
+					}
+					if (sourceChunks.size === 0) continue;
+					/** @type {Set<Chunk>} */
+					const targetChunks = new Set();
+					chunkGroupLoop: for (const chunkGroup of chunkGroups) {
+						// Can module be placed in a chunk of this group?
+						for (const chunk of chunkGroup.chunks) {
+							if (module.chunkCondition(chunk, compilation)) {
+								targetChunks.add(chunk);
+								continue chunkGroupLoop;
 							}
 						}
-						for (const sourceChunk of sourceChunks) {
-							chunkGraph.disconnectChunkAndModule(sourceChunk, module);
+						// We reached the entrypoint: fail
+						if (chunkGroup.isInitial()) {
+							throw new Error(
+								`Cannot fulfil chunk condition of ${module.identifier()}`
+							);
 						}
-						for (const targetChunk of targetChunks) {
-							chunkGraph.connectChunkAndModule(targetChunk, module);
+						// Try placing in all parents
+						for (const group of chunkGroup.parentsIterable) {
+							chunkGroups.add(group);
 						}
-						sourceChunks.clear();
-						chunkGroups.clear();
 					}
-				};
-				compilation.hooks.optimizeChunks.tap(
-					{
-						name: "EnsureChunkConditionsPlugin",
-						stage: STAGE_BASIC
-					},
-					handler
-				);
-			}
-		);
+					for (const sourceChunk of sourceChunks) {
+						chunkGraph.disconnectChunkAndModule(sourceChunk, module);
+					}
+					for (const targetChunk of targetChunks) {
+						chunkGraph.connectChunkAndModule(targetChunk, module);
+					}
+					sourceChunks.clear();
+					chunkGroups.clear();
+				}
+			};
+			compilation.hooks.optimizeChunks.tap(
+				{
+					name: PLUGIN_NAME,
+					stage: STAGE_BASIC
+				},
+				handler
+			);
+		});
 	}
 }
+
 module.exports = EnsureChunkConditionsPlugin;

package/lib/optimize/FlagIncludedChunksPlugin.js

@@ -12,6 +12,8 @@ const { compareIds } = require("../util/comparators");
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
 
+const PLUGIN_NAME = "FlagIncludedChunksPlugin";
+
 class FlagIncludedChunksPlugin {
 	/**
 	 * Apply the plugin
@@ -19,112 +21,107 @@ class FlagIncludedChunksPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap("FlagIncludedChunksPlugin", compilation => {
-			compilation.hooks.optimizeChunkIds.tap(
-				"FlagIncludedChunksPlugin",
-				chunks => {
-					const chunkGraph = compilation.chunkGraph;
-
-					// prepare two bit integers for each module
-					// 2^31 is the max number represented as SMI in v8
-					// we want the bits distributed this way:
-					// the bit 2^31 is pretty rar and only one module should get it
-					// so it has a probability of 1 / modulesCount
-					// the first bit (2^0) is the easiest and every module could get it
-					// if it doesn't get a better bit
-					// from bit 2^n to 2^(n+1) there is a probability of p
-					// so 1 / modulesCount == p^31
-					// <=> p = sqrt31(1 / modulesCount)
-					// so we use a modulo of 1 / sqrt31(1 / modulesCount)
-					/** @type {WeakMap<Module, number>} */
-					const moduleBits = new WeakMap();
-					const modulesCount = compilation.modules.size;
-
-					// precalculate the modulo values for each bit
-					const modulo = 1 / (1 / modulesCount) ** (1 / 31);
-					const modulos = Array.from(
-						{ length: 31 },
-						(x, i) => (modulo ** i) | 0
-					);
-
-					// iterate all modules to generate bit values
-					let i = 0;
-					for (const module of compilation.modules) {
-						let bit = 30;
-						while (i % modulos[bit] !== 0) {
-							bit--;
-						}
-						moduleBits.set(module, 1 << bit);
-						i++;
+		compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.optimizeChunkIds.tap(PLUGIN_NAME, (chunks) => {
+				const chunkGraph = compilation.chunkGraph;
+
+				// prepare two bit integers for each module
+				// 2^31 is the max number represented as SMI in v8
+				// we want the bits distributed this way:
+				// the bit 2^31 is pretty rar and only one module should get it
+				// so it has a probability of 1 / modulesCount
+				// the first bit (2^0) is the easiest and every module could get it
+				// if it doesn't get a better bit
+				// from bit 2^n to 2^(n+1) there is a probability of p
+				// so 1 / modulesCount == p^31
+				// <=> p = sqrt31(1 / modulesCount)
+				// so we use a modulo of 1 / sqrt31(1 / modulesCount)
+				/** @type {WeakMap<Module, number>} */
+				const moduleBits = new WeakMap();
+				const modulesCount = compilation.modules.size;
+
+				// precalculate the modulo values for each bit
+				const modulo = 1 / (1 / modulesCount) ** (1 / 31);
+				const modulos = Array.from({ length: 31 }, (x, i) => (modulo ** i) | 0);
+
+				// iterate all modules to generate bit values
+				let i = 0;
+				for (const module of compilation.modules) {
+					let bit = 30;
+					while (i % modulos[bit] !== 0) {
+						bit--;
 					}
+					moduleBits.set(module, 1 << bit);
+					i++;
+				}
 
-					// iterate all chunks to generate bitmaps
-					/** @type {WeakMap<Chunk, number>} */
-					const chunkModulesHash = new WeakMap();
-					for (const chunk of chunks) {
-						let hash = 0;
-						for (const module of chunkGraph.getChunkModulesIterable(chunk)) {
-							hash |= /** @type {number} */ (moduleBits.get(module));
+				// iterate all chunks to generate bitmaps
+				/** @type {WeakMap<Chunk, number>} */
+				const chunkModulesHash = new WeakMap();
+				for (const chunk of chunks) {
+					let hash = 0;
+					for (const module of chunkGraph.getChunkModulesIterable(chunk)) {
+						hash |= /** @type {number} */ (moduleBits.get(module));
+					}
+					chunkModulesHash.set(chunk, hash);
+				}
+
+				for (const chunkA of chunks) {
+					const chunkAHash =
+						/** @type {number} */
+						(chunkModulesHash.get(chunkA));
+					const chunkAModulesCount = chunkGraph.getNumberOfChunkModules(chunkA);
+					if (chunkAModulesCount === 0) continue;
+					let bestModule;
+					for (const module of chunkGraph.getChunkModulesIterable(chunkA)) {
+						if (
+							bestModule === undefined ||
+							chunkGraph.getNumberOfModuleChunks(bestModule) >
+								chunkGraph.getNumberOfModuleChunks(module)
+						) {
+							bestModule = module;
 						}
-						chunkModulesHash.set(chunk, hash);
 					}
+					loopB: for (const chunkB of chunkGraph.getModuleChunksIterable(
+						/** @type {Module} */ (bestModule)
+					)) {
+						// as we iterate the same iterables twice
+						// skip if we find ourselves
+						if (chunkA === chunkB) continue;
+
+						const chunkBModulesCount =
+							chunkGraph.getNumberOfChunkModules(chunkB);
 
-					for (const chunkA of chunks) {
-						const chunkAHash =
+						// ids for empty chunks are not included
+						if (chunkBModulesCount === 0) continue;
+
+						// instead of swapping A and B just bail
+						// as we loop twice the current A will be B and B then A
+						if (chunkAModulesCount > chunkBModulesCount) continue;
+
+						// is chunkA in chunkB?
+
+						// we do a cheap check for the hash value
+						const chunkBHash =
 							/** @type {number} */
-							(chunkModulesHash.get(chunkA));
-						const chunkAModulesCount =
-							chunkGraph.getNumberOfChunkModules(chunkA);
-						if (chunkAModulesCount === 0) continue;
-						let bestModule;
-						for (const module of chunkGraph.getChunkModulesIterable(chunkA)) {
-							if (
-								bestModule === undefined ||
-								chunkGraph.getNumberOfModuleChunks(bestModule) >
-									chunkGraph.getNumberOfModuleChunks(module)
-							)
-								bestModule = module;
-						}
-						loopB: for (const chunkB of chunkGraph.getModuleChunksIterable(
-							/** @type {Module} */ (bestModule)
-						)) {
-							// as we iterate the same iterables twice
-							// skip if we find ourselves
-							if (chunkA === chunkB) continue;
-
-							const chunkBModulesCount =
-								chunkGraph.getNumberOfChunkModules(chunkB);
-
-							// ids for empty chunks are not included
-							if (chunkBModulesCount === 0) continue;
-
-							// instead of swapping A and B just bail
-							// as we loop twice the current A will be B and B then A
-							if (chunkAModulesCount > chunkBModulesCount) continue;
-
-							// is chunkA in chunkB?
-
-							// we do a cheap check for the hash value
-							const chunkBHash =
-								/** @type {number} */
-								(chunkModulesHash.get(chunkB));
-							if ((chunkBHash & chunkAHash) !== chunkAHash) continue;
-
-							// compare all modules
-							for (const m of chunkGraph.getChunkModulesIterable(chunkA)) {
-								if (!chunkGraph.isModuleInChunk(m, chunkB)) continue loopB;
-							}
-
-							/** @type {ChunkId[]} */
-							(chunkB.ids).push(/** @type {ChunkId} */ (chunkA.id));
-							// https://github.com/webpack/webpack/issues/18837
-							/** @type {ChunkId[]} */
-							(chunkB.ids).sort(compareIds);
+							(chunkModulesHash.get(chunkB));
+						if ((chunkBHash & chunkAHash) !== chunkAHash) continue;
+
+						// compare all modules
+						for (const m of chunkGraph.getChunkModulesIterable(chunkA)) {
+							if (!chunkGraph.isModuleInChunk(m, chunkB)) continue loopB;
 						}
+
+						/** @type {ChunkId[]} */
+						(chunkB.ids).push(/** @type {ChunkId} */ (chunkA.id));
+						// https://github.com/webpack/webpack/issues/18837
+						/** @type {ChunkId[]} */
+						(chunkB.ids).sort(compareIds);
 					}
 				}
-			);
+			});
 		});
 	}
 }
+
 module.exports = FlagIncludedChunksPlugin;