webpack 5.97.1 → 5.104.1

package/lib/node/ReadFileChunkLoadingRuntimeModule.js

@@ -7,6 +7,9 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
+const {
+	generateJavascriptHMR
+} = require("../hmr/JavascriptHotModuleReplacementHelper");
 const {
 	chunkHasJs,
 	getChunkFilenameTemplate
@@ -18,6 +21,7 @@ const { getUndoPath } = require("../util/identifier");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 
 class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
@@ -33,15 +37,16 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 	 * @private
 	 * @param {Chunk} chunk chunk
 	 * @param {string} rootOutputDir root output directory
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
 	 * @returns {string} generated code
 	 */
-	_generateBaseUri(chunk, rootOutputDir) {
+	_generateBaseUri(chunk, rootOutputDir, runtimeTemplate) {
 		const options = chunk.getEntryOptions();
 		if (options && options.baseUri) {
 			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
 		}
 
-		return `${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
+		return `${RuntimeGlobals.baseURI} = require(${runtimeTemplate.renderNodePrefixForCoreModule("url")}).pathToFileURL(${
 			rootOutputDir
 				? `__dirname + ${JSON.stringify(`/${rootOutputDir}`)}`
 				: "__filename"
@@ -86,7 +91,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			/** @type {string} */ (compilation.outputOptions.path),
+			compilation.outputOptions.path,
 			false
 		);
 
@@ -96,7 +101,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return Template.asString([
 			withBaseURI
-				? this._generateBaseUri(chunk, rootOutputDir)
+				? this._generateBaseUri(chunk, rootOutputDir, runtimeTemplate)
 				: "// no baseURI",
 			"",
 			"// object to store loaded chunks",
@@ -105,7 +110,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
 			}{`,
 			Template.indent(
-				Array.from(initialChunkIds, id => `${JSON.stringify(id)}: 0`).join(
+				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 0`).join(
 					",\n"
 				)
 			),
@@ -168,17 +173,17 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 												"var promise = new Promise(function(resolve, reject) {",
 												Template.indent([
 													"installedChunkData = installedChunks[chunkId] = [resolve, reject];",
-													`var filename = require('path').join(__dirname, ${JSON.stringify(
+													`var filename = require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).join(__dirname, ${JSON.stringify(
 														rootOutputDir
 													)} + ${
 														RuntimeGlobals.getChunkScriptFilename
 													}(chunkId));`,
-													"require('fs').readFile(filename, 'utf-8', function(err, content) {",
+													`require(${runtimeTemplate.renderNodePrefixForCoreModule("fs")}).readFile(filename, 'utf-8', function(err, content) {`,
 													Template.indent([
 														"if(err) return reject(err);",
 														"var chunk = {};",
-														"require('vm').runInThisContext('(function(exports, require, __dirname, __filename) {' + content + '\\n})', filename)" +
-															"(chunk, require, require('path').dirname(filename), filename);",
+														`require(${runtimeTemplate.renderNodePrefixForCoreModule("vm")}).runInThisContext('(function(exports, require, __dirname, __filename) {' + content + '\\n})', filename)` +
+															`(chunk, require, require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).dirname(filename), filename);`,
 														"installChunk(chunk);"
 													]),
 													"});"
@@ -212,15 +217,15 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 						Template.indent([
 							"return new Promise(function(resolve, reject) {",
 							Template.indent([
-								`var filename = require('path').join(__dirname, ${JSON.stringify(
+								`var filename = require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).join(__dirname, ${JSON.stringify(
 									rootOutputDir
 								)} + ${RuntimeGlobals.getChunkUpdateScriptFilename}(chunkId));`,
-								"require('fs').readFile(filename, 'utf-8', function(err, content) {",
+								`require(${runtimeTemplate.renderNodePrefixForCoreModule("fs")}).readFile(filename, 'utf-8', function(err, content) {`,
 								Template.indent([
 									"if(err) return reject(err);",
 									"var update = {};",
-									"require('vm').runInThisContext('(function(exports, require, __dirname, __filename) {' + content + '\\n})', filename)" +
-										"(update, require, require('path').dirname(filename), filename);",
+									`require(${runtimeTemplate.renderNodePrefixForCoreModule("vm")}).runInThisContext('(function(exports, require, __dirname, __filename) {' + content + '\\n})', filename)` +
+										`(update, require, require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).dirname(filename), filename);`,
 									"var updatedModules = update.modules;",
 									"var runtime = update.runtime;",
 									"for(var moduleId in updatedModules) {",
@@ -242,28 +247,7 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						"",
-						Template.getFunctionContent(
-							require("../hmr/JavascriptHotModuleReplacement.runtime.js")
-						)
-							.replace(/\$key\$/g, "readFileVm")
-							.replace(/\$installedChunks\$/g, "installedChunks")
-							.replace(/\$loadUpdateChunk\$/g, "loadUpdateChunk")
-							.replace(/\$moduleCache\$/g, RuntimeGlobals.moduleCache)
-							.replace(/\$moduleFactories\$/g, RuntimeGlobals.moduleFactories)
-							.replace(
-								/\$ensureChunkHandlers\$/g,
-								RuntimeGlobals.ensureChunkHandlers
-							)
-							.replace(/\$hasOwnProperty\$/g, RuntimeGlobals.hasOwnProperty)
-							.replace(/\$hmrModuleData\$/g, RuntimeGlobals.hmrModuleData)
-							.replace(
-								/\$hmrDownloadUpdateHandlers\$/g,
-								RuntimeGlobals.hmrDownloadUpdateHandlers
-							)
-							.replace(
-								/\$hmrInvalidateModuleHandlers\$/g,
-								RuntimeGlobals.hmrInvalidateModuleHandlers
-							)
+						generateJavascriptHMR("readFileVm")
 					])
 				: "// no HMR",
 			"",
@@ -273,14 +257,14 @@ class ReadFileChunkLoadingRuntimeModule extends RuntimeModule {
 						Template.indent([
 							"return new Promise(function(resolve, reject) {",
 							Template.indent([
-								`var filename = require('path').join(__dirname, ${JSON.stringify(
+								`var filename = require(${runtimeTemplate.renderNodePrefixForCoreModule("path")}).join(__dirname, ${JSON.stringify(
 									rootOutputDir
 								)} + ${RuntimeGlobals.getUpdateManifestFilename}());`,
-								"require('fs').readFile(filename, 'utf-8', function(err, content) {",
+								`require(${runtimeTemplate.renderNodePrefixForCoreModule("fs")}).readFile(filename, 'utf-8', function(err, content) {`,
 								Template.indent([
 									"if(err) {",
 									Template.indent([
-										'if(err.code === "ENOENT") return resolve();',
+										'if(["MODULE_NOT_FOUND", "ENOENT"].includes(err.code)) return resolve();',
 										"return reject(err);"
 									]),
 									"}",

package/lib/node/ReadFileCompileAsyncWasmPlugin.js

@@ -15,14 +15,14 @@ const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRun
 
 /**
  * @typedef {object} ReadFileCompileAsyncWasmPluginOptions
- * @property {boolean} [import] use import?
+ * @property {boolean=} import use import?
  */
 
 const PLUGIN_NAME = "ReadFileCompileAsyncWasmPlugin";
 
 class ReadFileCompileAsyncWasmPlugin {
 	/**
-	 * @param {ReadFileCompileAsyncWasmPluginOptions} [options] options object
+	 * @param {ReadFileCompileAsyncWasmPluginOptions=} options options object
 	 */
 	constructor({ import: useImport = false } = {}) {
 		this._import = useImport;
@@ -34,13 +34,13 @@ class ReadFileCompileAsyncWasmPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			const globalWasmLoading = compilation.outputOptions.wasmLoading;
 			/**
 			 * @param {Chunk} chunk chunk
 			 * @returns {boolean} true, if wasm loading is enabled for the chunk
 			 */
-			const isEnabledForChunk = chunk => {
+			const isEnabledForChunk = (chunk) => {
 				const options = chunk.getEntryOptions();
 				const wasmLoading =
 					options && options.wasmLoading !== undefined
@@ -50,11 +50,10 @@ class ReadFileCompileAsyncWasmPlugin {
 			};
 
 			/**
-			 * @param {string} path path to wasm file
-			 * @returns {string} generated code to load the wasm file
+			 * @type {(path: string) => string} callback to generate code to load the wasm file
 			 */
 			const generateLoadBinaryCode = this._import
-				? path =>
+				? (path) =>
 						Template.asString([
 							"Promise.all([import('fs'), import('url')]).then(([{ readFile }, { URL }]) => new Promise((resolve, reject) => {",
 							Template.indent([
@@ -71,14 +70,14 @@ class ReadFileCompileAsyncWasmPlugin {
 							]),
 							"}))"
 						])
-				: path =>
+				: (path) =>
 						Template.asString([
 							"new Promise(function (resolve, reject) {",
 							Template.indent([
 								"try {",
 								Template.indent([
-									"var { readFile } = require('fs');",
-									"var { join } = require('path');",
+									`var { readFile } = require(${compilation.runtimeTemplate.renderNodePrefixForCoreModule("fs")});`,
+									`var { join } = require(${compilation.runtimeTemplate.renderNodePrefixForCoreModule("path")});`,
 									"",
 									`readFile(join(__dirname, ${path}), function(err, buffer){`,
 									Template.indent([
@@ -103,7 +102,7 @@ class ReadFileCompileAsyncWasmPlugin {
 					if (
 						!chunkGraph.hasModuleInGraph(
 							chunk,
-							m => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
+							(m) => m.type === WEBASSEMBLY_MODULE_TYPE_ASYNC
 						)
 					) {
 						return;

package/lib/node/ReadFileCompileWasmPlugin.js

@@ -15,17 +15,15 @@ const WasmChunkLoadingRuntimeModule = require("../wasm-sync/WasmChunkLoadingRunt
 
 /**
  * @typedef {object} ReadFileCompileWasmPluginOptions
- * @property {boolean} [mangleImports] mangle imports
- * @property {boolean} [import] use import?
+ * @property {boolean=} mangleImports mangle imports
+ * @property {boolean=} import use import?
  */
 
-// TODO webpack 6 remove
-
 const PLUGIN_NAME = "ReadFileCompileWasmPlugin";
 
 class ReadFileCompileWasmPlugin {
 	/**
-	 * @param {ReadFileCompileWasmPluginOptions} [options] options object
+	 * @param {ReadFileCompileWasmPluginOptions=} options options object
 	 */
 	constructor(options = {}) {
 		this.options = options;
@@ -37,13 +35,13 @@ class ReadFileCompileWasmPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
 			const globalWasmLoading = compilation.outputOptions.wasmLoading;
 			/**
 			 * @param {Chunk} chunk chunk
 			 * @returns {boolean} true, when wasm loading is enabled for the chunk
 			 */
-			const isEnabledForChunk = chunk => {
+			const isEnabledForChunk = (chunk) => {
 				const options = chunk.getEntryOptions();
 				const wasmLoading =
 					options && options.wasmLoading !== undefined
@@ -53,11 +51,10 @@ class ReadFileCompileWasmPlugin {
 			};
 
 			/**
-			 * @param {string} path path to wasm file
-			 * @returns {string} generated code to load the wasm file
+			 * @type {(path: string) => string} callback to generate code to load the wasm file
 			 */
 			const generateLoadBinaryCode = this.options.import
-				? path =>
+				? (path) =>
 						Template.asString([
 							"Promise.all([import('fs'), import('url')]).then(([{ readFile }, { URL }]) => new Promise((resolve, reject) => {",
 							Template.indent([
@@ -74,12 +71,12 @@ class ReadFileCompileWasmPlugin {
 							]),
 							"}))"
 						])
-				: path =>
+				: (path) =>
 						Template.asString([
 							"new Promise(function (resolve, reject) {",
 							Template.indent([
-								"var { readFile } = require('fs');",
-								"var { join } = require('path');",
+								`var { readFile } = require(${compilation.runtimeTemplate.renderNodePrefixForCoreModule("fs")});`,
+								`var { join } = require(${compilation.runtimeTemplate.renderNodePrefixForCoreModule("path")});`,
 								"",
 								"try {",
 								Template.indent([
@@ -106,7 +103,7 @@ class ReadFileCompileWasmPlugin {
 					if (
 						!chunkGraph.hasModuleInGraph(
 							chunk,
-							m => m.type === WEBASSEMBLY_MODULE_TYPE_SYNC
+							(m) => m.type === WEBASSEMBLY_MODULE_TYPE_SYNC
 						)
 					) {
 						return;

package/lib/node/RequireChunkLoadingRuntimeModule.js

@@ -7,6 +7,9 @@
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
+const {
+	generateJavascriptHMR
+} = require("../hmr/JavascriptHotModuleReplacementHelper");
 const {
 	chunkHasJs,
 	getChunkFilenameTemplate
@@ -18,6 +21,7 @@ const { getUndoPath } = require("../util/identifier");
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Compilation")} Compilation */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 
 class RequireChunkLoadingRuntimeModule extends RuntimeModule {
@@ -33,15 +37,16 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 	 * @private
 	 * @param {Chunk} chunk chunk
 	 * @param {string} rootOutputDir root output directory
+	 * @param {RuntimeTemplate} runtimeTemplate the runtime template
 	 * @returns {string} generated code
 	 */
-	_generateBaseUri(chunk, rootOutputDir) {
+	_generateBaseUri(chunk, rootOutputDir, runtimeTemplate) {
 		const options = chunk.getEntryOptions();
 		if (options && options.baseUri) {
 			return `${RuntimeGlobals.baseURI} = ${JSON.stringify(options.baseUri)};`;
 		}
 
-		return `${RuntimeGlobals.baseURI} = require("url").pathToFileURL(${
+		return `${RuntimeGlobals.baseURI} = require(${runtimeTemplate.renderNodePrefixForCoreModule("url")}).pathToFileURL(${
 			rootOutputDir !== "./"
 				? `__dirname + ${JSON.stringify(`/${rootOutputDir}`)}`
 				: "__filename"
@@ -86,7 +91,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 		);
 		const rootOutputDir = getUndoPath(
 			outputName,
-			/** @type {string} */ (compilation.outputOptions.path),
+			compilation.outputOptions.path,
 			true
 		);
 
@@ -96,7 +101,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 
 		return Template.asString([
 			withBaseURI
-				? this._generateBaseUri(chunk, rootOutputDir)
+				? this._generateBaseUri(chunk, rootOutputDir, runtimeTemplate)
 				: "// no baseURI",
 			"",
 			"// object to store loaded chunks",
@@ -105,7 +110,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 				stateExpression ? `${stateExpression} = ${stateExpression} || ` : ""
 			}{`,
 			Template.indent(
-				Array.from(initialChunkIds, id => `${JSON.stringify(id)}: 1`).join(
+				Array.from(initialChunkIds, (id) => `${JSON.stringify(id)}: 1`).join(
 					",\n"
 				)
 			),
@@ -153,11 +158,16 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 												? "if(true) { // all chunks have JS"
 												: `if(${hasJsMatcher("chunkId")}) {`,
 											Template.indent([
-												`installChunk(require(${JSON.stringify(
+												// The require function loads and runs a chunk. When the chunk is being run,
+												// it can call __webpack_require__.C to directly complete installed.
+												`var installedChunk = require(${JSON.stringify(
 													rootOutputDir
 												)} + ${
 													RuntimeGlobals.getChunkScriptFilename
-												}(chunkId)));`
+												}(chunkId));`,
+												"if (!installedChunks[chunkId]) {",
+												Template.indent(["installChunk(installedChunk);"]),
+												"}"
 											]),
 											"} else installedChunks[chunkId] = 1;",
 											""
@@ -199,28 +209,7 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 						]),
 						"}",
 						"",
-						Template.getFunctionContent(
-							require("../hmr/JavascriptHotModuleReplacement.runtime.js")
-						)
-							.replace(/\$key\$/g, "require")
-							.replace(/\$installedChunks\$/g, "installedChunks")
-							.replace(/\$loadUpdateChunk\$/g, "loadUpdateChunk")
-							.replace(/\$moduleCache\$/g, RuntimeGlobals.moduleCache)
-							.replace(/\$moduleFactories\$/g, RuntimeGlobals.moduleFactories)
-							.replace(
-								/\$ensureChunkHandlers\$/g,
-								RuntimeGlobals.ensureChunkHandlers
-							)
-							.replace(/\$hasOwnProperty\$/g, RuntimeGlobals.hasOwnProperty)
-							.replace(/\$hmrModuleData\$/g, RuntimeGlobals.hmrModuleData)
-							.replace(
-								/\$hmrDownloadUpdateHandlers\$/g,
-								RuntimeGlobals.hmrDownloadUpdateHandlers
-							)
-							.replace(
-								/\$hmrInvalidateModuleHandlers\$/g,
-								RuntimeGlobals.hmrInvalidateModuleHandlers
-							)
+						generateJavascriptHMR("require")
 					])
 				: "// no HMR",
 			"",
@@ -234,7 +223,10 @@ class RequireChunkLoadingRuntimeModule extends RuntimeModule {
 									RuntimeGlobals.getUpdateManifestFilename
 								}());`
 							]),
-							"})['catch'](function(err) { if(err.code !== 'MODULE_NOT_FOUND') throw err; });"
+							`}).catch(${runtimeTemplate.basicFunction("err", [
+								"if(['MODULE_NOT_FOUND', 'ENOENT'].includes(err.code)) return;",
+								"throw err;"
+							])});`
 						]),
 						"}"
 					])

package/lib/node/nodeConsole.js

@@ -8,13 +8,16 @@
 const util = require("util");
 const truncateArgs = require("../logging/truncateArgs");
 
+/** @typedef {import("../config/defaults").InfrastructureLoggingNormalizedWithDefaults} InfrastructureLoggingNormalizedWithDefaults */
 /** @typedef {import("../logging/createConsoleLogger").LoggerConsole} LoggerConsole */
 
+/* eslint-disable no-console */
+
 /**
  * @param {object} options options
  * @param {boolean=} options.colors colors
  * @param {boolean=} options.appendOnly append only
- * @param {NodeJS.WritableStream} options.stream stream
+ * @param {InfrastructureLoggingNormalizedWithDefaults["stream"]} options.stream stream
  * @returns {LoggerConsole} logger function
  */
 module.exports = ({ colors, appendOnly, stream }) => {
@@ -55,7 +58,7 @@ module.exports = ({ colors, appendOnly, stream }) => {
 
 	const writeStatusMessage = () => {
 		if (!currentStatusMessage) return;
-		const l = /** @type {TODO} */ (stream).columns || 40;
+		const l = stream.columns || 40;
 		const args = truncateArgs(currentStatusMessage, l - 1);
 		const str = args.join(" ");
 		const coloredStr = `\u001B[1m${str}\u001B[39m\u001B[22m`;
@@ -67,7 +70,7 @@ module.exports = ({ colors, appendOnly, stream }) => {
 	 * @param {string} prefix prefix
 	 * @param {string} colorPrefix color prefix
 	 * @param {string} colorSuffix color suffix
-	 * @returns {(function(...EXPECTED_ANY[]): void)} function to write with colors
+	 * @returns {(...args: EXPECTED_ANY[]) => void} function to write with colors
 	 */
 	const writeColored =
 		(prefix, colorPrefix, colorSuffix) =>
@@ -121,12 +124,14 @@ module.exports = ({ colors, appendOnly, stream }) => {
 			currentCollapsed++;
 		},
 		groupEnd: () => {
-			if (currentCollapsed > 0) currentCollapsed--;
-			else if (currentIndent.length >= 2)
+			if (currentCollapsed > 0) {
+				currentCollapsed--;
+			} else if (currentIndent.length >= 2) {
 				currentIndent = currentIndent.slice(0, -2);
+			}
 		},
-		profile: console.profile && (name => console.profile(name)),
-		profileEnd: console.profileEnd && (name => console.profileEnd(name)),
+		profile: console.profile && ((name) => console.profile(name)),
+		profileEnd: console.profileEnd && ((name) => console.profileEnd(name)),
 		clear:
 			/** @type {() => void} */
 			(

package/lib/optimize/AggressiveMergingPlugin.js

@@ -15,9 +15,11 @@ 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
+	 * @param {AggressiveMergingPluginOptions=} options options object
 	 */
 	constructor(options) {
 		if (
@@ -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;
+				}
+			);
+		});
 	}
 }