webpack 5.99.8 → 5.100.0

package/lib/optimize/AggressiveMergingPlugin.js

@@ -15,6 +15,8 @@ const { STAGE_ADVANCED } = require("../OptimizationStages");
  * @property {number=} minSizeReduce minimal size reduction to trigger merging
  */
 
+const PLUGIN_NAME = "AggressiveMergingPlugin";
+
 class AggressiveMergingPlugin {
 	/**
 	 * @param {AggressiveMergingPluginOptions=} options options object
@@ -40,58 +42,55 @@ class AggressiveMergingPlugin {
 		const options = this.options;
 		const minSizeReduce = options.minSizeReduce || 1.5;
 
-		compiler.hooks.thisCompilation.tap(
-			"AggressiveMergingPlugin",
-			compilation => {
-				compilation.hooks.optimizeChunks.tap(
-					{
-						name: "AggressiveMergingPlugin",
-						stage: STAGE_ADVANCED
-					},
-					chunks => {
-						const chunkGraph = compilation.chunkGraph;
-						/** @type {{a: Chunk, b: Chunk, improvement: number}[]} */
-						const combinations = [];
-						for (const a of chunks) {
-							if (a.canBeInitial()) continue;
-							for (const b of chunks) {
-								if (b.canBeInitial()) continue;
-								if (b === a) break;
-								if (!chunkGraph.canChunksBeIntegrated(a, b)) {
-									continue;
-								}
-								const aSize = chunkGraph.getChunkSize(b, {
-									chunkOverhead: 0
-								});
-								const bSize = chunkGraph.getChunkSize(a, {
-									chunkOverhead: 0
-								});
-								const abSize = chunkGraph.getIntegratedChunksSize(b, a, {
-									chunkOverhead: 0
-								});
-								const improvement = (aSize + bSize) / abSize;
-								combinations.push({
-									a,
-									b,
-									improvement
-								});
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+			compilation.hooks.optimizeChunks.tap(
+				{
+					name: PLUGIN_NAME,
+					stage: STAGE_ADVANCED
+				},
+				chunks => {
+					const chunkGraph = compilation.chunkGraph;
+					/** @type {{a: Chunk, b: Chunk, improvement: number}[]} */
+					const combinations = [];
+					for (const a of chunks) {
+						if (a.canBeInitial()) continue;
+						for (const b of chunks) {
+							if (b.canBeInitial()) continue;
+							if (b === a) break;
+							if (!chunkGraph.canChunksBeIntegrated(a, b)) {
+								continue;
 							}
+							const aSize = chunkGraph.getChunkSize(b, {
+								chunkOverhead: 0
+							});
+							const bSize = chunkGraph.getChunkSize(a, {
+								chunkOverhead: 0
+							});
+							const abSize = chunkGraph.getIntegratedChunksSize(b, a, {
+								chunkOverhead: 0
+							});
+							const improvement = (aSize + bSize) / abSize;
+							combinations.push({
+								a,
+								b,
+								improvement
+							});
 						}
+					}
 
-						combinations.sort((a, b) => b.improvement - a.improvement);
+					combinations.sort((a, b) => b.improvement - a.improvement);
 
-						const pair = combinations[0];
+					const pair = combinations[0];
 
-						if (!pair) return;
-						if (pair.improvement < minSizeReduce) return;
+					if (!pair) return;
+					if (pair.improvement < minSizeReduce) return;
 
-						chunkGraph.integrateChunks(pair.b, pair.a);
-						compilation.chunks.delete(pair.a);
-						return true;
-					}
-				);
-			}
-		);
+					chunkGraph.integrateChunks(pair.b, pair.a);
+					compilation.chunks.delete(pair.a);
+					return true;
+				}
+			);
+		});
 	}
 }
 

package/lib/optimize/AggressiveSplittingPlugin.js

@@ -8,8 +8,8 @@
 const { STAGE_ADVANCED } = require("../OptimizationStages");
 const { intersect } = require("../util/SetHelpers");
 const {
-	compareModulesByIdentifier,
-	compareChunks
+	compareChunks,
+	compareModulesByIdentifier
 } = require("../util/comparators");
 const createSchemaValidation = require("../util/create-schema-validation");
 const identifierUtils = require("../util/identifier");
@@ -21,7 +21,7 @@ const identifierUtils = require("../util/identifier");
 /** @typedef {import("../Module")} Module */
 
 const validate = createSchemaValidation(
-	require("../../schemas/plugins/optimize/AggressiveSplittingPlugin.check.js"),
+	require("../../schemas/plugins/optimize/AggressiveSplittingPlugin.check"),
 	() =>
 		require("../../schemas/plugins/optimize/AggressiveSplittingPlugin.json"),
 	{
@@ -49,6 +49,8 @@ const moveModuleBetween = (chunkGraph, oldChunk, newChunk) => module => {
 const isNotAEntryModule = (chunkGraph, chunk) => module =>
 	!chunkGraph.isEntryModuleInChunk(module, chunk);
 
+/** @typedef {{ id?: NonNullable<Chunk["id"]>, hash?: NonNullable<Chunk["hash"]>, modules: Module[], size: number }} SplitData */
+
 /** @type {WeakSet<Chunk>} */
 const recordedChunks = new WeakSet();
 
@@ -92,7 +94,6 @@ class AggressiveSplittingPlugin {
 	apply(compiler) {
 		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
 			let needAdditionalSeal = false;
-			/** @typedef {{ id?: NonNullable<Chunk["id"]>, hash?: NonNullable<Chunk["hash"]>, modules: Module[], size: number }} SplitData */
 			/** @type {SplitData[]} */
 			let newSplits;
 			/** @type {Set<Chunk>} */
@@ -134,7 +135,7 @@ class AggressiveSplittingPlugin {
 					const recordedSplits =
 						(compilation.records && compilation.records.aggressiveSplits) || [];
 					const usedSplits = newSplits
-						? recordedSplits.concat(newSplits)
+						? [...recordedSplits, ...newSplits]
 						: recordedSplits;
 
 					const minSize = /** @type {number} */ (this.options.minSize);
@@ -176,11 +177,10 @@ class AggressiveSplittingPlugin {
 						// The found chunk is already the split or similar
 						if (
 							selectedChunks.size === 1 &&
-							chunkGraph.getNumberOfChunkModules(
-								Array.from(selectedChunks)[0]
-							) === selectedModules.length
+							chunkGraph.getNumberOfChunkModules([...selectedChunks][0]) ===
+								selectedModules.length
 						) {
-							const chunk = Array.from(selectedChunks)[0];
+							const chunk = [...selectedChunks][0];
 							if (fromAggressiveSplittingSet.has(chunk)) return false;
 							fromAggressiveSplittingSet.add(chunk);
 							chunkSplitDataMap.set(chunk, splitData);
@@ -217,7 +217,7 @@ class AggressiveSplittingPlugin {
 					// for any chunk which isn't splitted yet, split it and create a new entry
 					// start with the biggest chunk
 					const cmpFn = compareChunks(chunkGraph);
-					const sortedChunks = Array.from(chunks).sort((a, b) => {
+					const sortedChunks = [...chunks].sort((a, b) => {
 						const diff1 =
 							chunkGraph.getChunkModulesSize(b) -
 							chunkGraph.getChunkModulesSize(a);
@@ -259,7 +259,7 @@ class AggressiveSplittingPlugin {
 							};
 
 							if (applySplit(splitData)) {
-								newSplits = (newSplits || []).concat(splitData);
+								newSplits = [...(newSplits || []), splitData];
 								changed = true;
 							}
 						}
@@ -323,7 +323,7 @@ class AggressiveSplittingPlugin {
 					}
 
 					// record all splits
-					records.aggressiveSplits = Array.from(allSplits);
+					records.aggressiveSplits = [...allSplits];
 
 					needAdditionalSeal = false;
 				}
@@ -337,4 +337,5 @@ class AggressiveSplittingPlugin {
 		});
 	}
 }
+
 module.exports = AggressiveSplittingPlugin;