webpack 5.99.8 → 5.100.0

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -16,6 +16,9 @@ const {
 } = require("./StartupHelpers");
 
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../ChunkGraph").EntryModuleWithChunkGroup} EntryModuleWithChunkGroup */
+
+const PLUGIN_NAME = "ArrayPushCallbackChunkFormatPlugin";
 
 class ArrayPushCallbackChunkFormatPlugin {
 	/**
@@ -24,132 +27,123 @@ class ArrayPushCallbackChunkFormatPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(
-			"ArrayPushCallbackChunkFormatPlugin",
-			compilation => {
-				compilation.hooks.additionalChunkRuntimeRequirements.tap(
-					"ArrayPushCallbackChunkFormatPlugin",
-					(chunk, set, { chunkGraph }) => {
-						if (chunk.hasRuntime()) return;
-						if (chunkGraph.getNumberOfEntryModules(chunk) > 0) {
-							set.add(RuntimeGlobals.onChunksLoaded);
-							set.add(RuntimeGlobals.exports);
-							set.add(RuntimeGlobals.require);
-						}
-						set.add(RuntimeGlobals.chunkCallback);
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+			compilation.hooks.additionalChunkRuntimeRequirements.tap(
+				PLUGIN_NAME,
+				(chunk, set, { chunkGraph }) => {
+					if (chunk.hasRuntime()) return;
+					if (chunkGraph.getNumberOfEntryModules(chunk) > 0) {
+						set.add(RuntimeGlobals.onChunksLoaded);
+						set.add(RuntimeGlobals.exports);
+						set.add(RuntimeGlobals.require);
 					}
-				);
-				const hooks = getCompilationHooks(compilation);
-				hooks.renderChunk.tap(
-					"ArrayPushCallbackChunkFormatPlugin",
-					(modules, renderContext) => {
-						const { chunk, chunkGraph, runtimeTemplate } = renderContext;
-						const hotUpdateChunk =
-							chunk instanceof HotUpdateChunk ? chunk : null;
-						const globalObject = runtimeTemplate.globalObject;
-						const source = new ConcatSource();
-						const runtimeModules =
-							chunkGraph.getChunkRuntimeModulesInOrder(chunk);
-						if (hotUpdateChunk) {
-							const hotUpdateGlobal =
-								runtimeTemplate.outputOptions.hotUpdateGlobal;
-							source.add(
-								`${globalObject}[${JSON.stringify(hotUpdateGlobal)}](`
-							);
-							source.add(`${JSON.stringify(chunk.id)},`);
-							source.add(modules);
-							if (runtimeModules.length > 0) {
-								source.add(",\n");
-								const runtimePart = Template.renderChunkRuntimeModules(
-									runtimeModules,
-									renderContext
-								);
-								source.add(runtimePart);
-							}
-							source.add(")");
-						} else {
-							const chunkLoadingGlobal =
-								runtimeTemplate.outputOptions.chunkLoadingGlobal;
-							source.add(
-								`(${globalObject}[${JSON.stringify(
-									chunkLoadingGlobal
-								)}] = ${globalObject}[${JSON.stringify(
-									chunkLoadingGlobal
-								)}] || []).push([`
+					set.add(RuntimeGlobals.chunkCallback);
+				}
+			);
+			const hooks = getCompilationHooks(compilation);
+			hooks.renderChunk.tap(PLUGIN_NAME, (modules, renderContext) => {
+				const { chunk, chunkGraph, runtimeTemplate } = renderContext;
+				const hotUpdateChunk = chunk instanceof HotUpdateChunk ? chunk : null;
+				const globalObject = runtimeTemplate.globalObject;
+				const source = new ConcatSource();
+				const runtimeModules = chunkGraph.getChunkRuntimeModulesInOrder(chunk);
+				if (hotUpdateChunk) {
+					const hotUpdateGlobal = runtimeTemplate.outputOptions.hotUpdateGlobal;
+					source.add(`${globalObject}[${JSON.stringify(hotUpdateGlobal)}](`);
+					source.add(`${JSON.stringify(chunk.id)},`);
+					source.add(modules);
+					if (runtimeModules.length > 0) {
+						source.add(",\n");
+						const runtimePart = Template.renderChunkRuntimeModules(
+							runtimeModules,
+							renderContext
+						);
+						source.add(runtimePart);
+					}
+					source.add(")");
+				} else {
+					const chunkLoadingGlobal =
+						runtimeTemplate.outputOptions.chunkLoadingGlobal;
+					source.add(
+						`(${globalObject}[${JSON.stringify(
+							chunkLoadingGlobal
+						)}] = ${globalObject}[${JSON.stringify(
+							chunkLoadingGlobal
+						)}] || []).push([`
+					);
+					source.add(`${JSON.stringify(chunk.ids)},`);
+					source.add(modules);
+					/** @type {EntryModuleWithChunkGroup[]} */
+					const entries = [
+						...chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
+					];
+					if (runtimeModules.length > 0 || entries.length > 0) {
+						const runtime = new ConcatSource(
+							`${
+								runtimeTemplate.supportsArrowFunction()
+									? `${RuntimeGlobals.require} =>`
+									: `function(${RuntimeGlobals.require})`
+							} { // webpackRuntimeModules\n`
+						);
+						if (runtimeModules.length > 0) {
+							runtime.add(
+								Template.renderRuntimeModules(runtimeModules, {
+									...renderContext,
+									codeGenerationResults: compilation.codeGenerationResults
+								})
 							);
-							source.add(`${JSON.stringify(chunk.ids)},`);
-							source.add(modules);
-							const entries = Array.from(
-								chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
+						}
+						if (entries.length > 0) {
+							const startupSource = new RawSource(
+								generateEntryStartup(
+									chunkGraph,
+									runtimeTemplate,
+									entries,
+									chunk,
+									true
+								)
 							);
-							if (runtimeModules.length > 0 || entries.length > 0) {
-								const runtime = new ConcatSource(
-									`${
-										runtimeTemplate.supportsArrowFunction()
-											? `${RuntimeGlobals.require} =>`
-											: `function(${RuntimeGlobals.require})`
-									} { // webpackRuntimeModules\n`
-								);
-								if (runtimeModules.length > 0) {
-									runtime.add(
-										Template.renderRuntimeModules(runtimeModules, {
-											...renderContext,
-											codeGenerationResults: compilation.codeGenerationResults
-										})
-									);
-								}
-								if (entries.length > 0) {
-									const startupSource = new RawSource(
-										generateEntryStartup(
-											chunkGraph,
-											runtimeTemplate,
-											entries,
-											chunk,
-											true
-										)
-									);
-									runtime.add(
-										hooks.renderStartup.call(
-											startupSource,
-											entries[entries.length - 1][0],
-											{
-												...renderContext,
-												inlined: false
-											}
-										)
-									);
-									if (
-										chunkGraph
-											.getChunkRuntimeRequirements(chunk)
-											.has(RuntimeGlobals.returnExportsFromRuntime)
-									) {
-										runtime.add(`return ${RuntimeGlobals.exports};\n`);
+							runtime.add(
+								hooks.renderStartup.call(
+									startupSource,
+									entries[entries.length - 1][0],
+									{
+										...renderContext,
+										inlined: false
 									}
-								}
-								runtime.add("}\n");
-								source.add(",\n");
-								source.add(new PrefixSource("/******/ ", runtime));
+								)
+							);
+							if (
+								chunkGraph
+									.getChunkRuntimeRequirements(chunk)
+									.has(RuntimeGlobals.returnExportsFromRuntime)
+							) {
+								runtime.add(`return ${RuntimeGlobals.exports};\n`);
 							}
-							source.add("])");
 						}
-						return source;
-					}
-				);
-				hooks.chunkHash.tap(
-					"ArrayPushCallbackChunkFormatPlugin",
-					(chunk, hash, { chunkGraph, runtimeTemplate }) => {
-						if (chunk.hasRuntime()) return;
-						hash.update(
-							`ArrayPushCallbackChunkFormatPlugin1${runtimeTemplate.outputOptions.chunkLoadingGlobal}${runtimeTemplate.outputOptions.hotUpdateGlobal}${runtimeTemplate.globalObject}`
-						);
-						const entries = Array.from(
-							chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
-						);
-						updateHashForEntryStartup(hash, chunkGraph, entries, chunk);
+						runtime.add("}\n");
+						source.add(",\n");
+						source.add(new PrefixSource("/******/ ", runtime));
 					}
-				);
-			}
-		);
+					source.add("])");
+				}
+				return source;
+			});
+			hooks.chunkHash.tap(
+				PLUGIN_NAME,
+				(chunk, hash, { chunkGraph, runtimeTemplate }) => {
+					if (chunk.hasRuntime()) return;
+					hash.update(
+						`${PLUGIN_NAME}1${runtimeTemplate.outputOptions.chunkLoadingGlobal}${runtimeTemplate.outputOptions.hotUpdateGlobal}${runtimeTemplate.globalObject}`
+					);
+					/** @type {EntryModuleWithChunkGroup[]} */
+					const entries = [
+						...chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
+					];
+					updateHashForEntryStartup(hash, chunkGraph, entries, chunk);
+				}
+			);
+		});
 	}
 }
 

package/lib/javascript/BasicEvaluatedExpression.js

@@ -566,7 +566,7 @@ BasicEvaluatedExpression.isValidRegExpFlags = flags => {
 	// cspell:word gimy
 	let remaining = 0b0000; // bit per RegExp flag: gimy
 
-	for (let i = 0; i < len; i++)
+	for (let i = 0; i < len; i++) {
 		switch (flags.charCodeAt(i)) {
 			case 103 /* g */:
 				if (remaining & 0b1000) return false;
@@ -587,6 +587,7 @@ BasicEvaluatedExpression.isValidRegExpFlags = flags => {
 			default:
 				return false;
 		}
+	}
 
 	return true;
 };

package/lib/javascript/ChunkHelpers.js

@@ -30,4 +30,5 @@ const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {
 	}
 	return chunks;
 };
+
 module.exports.getAllChunks = getAllChunks;

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -22,6 +22,8 @@ const {
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Entrypoint")} Entrypoint */
 
+const PLUGIN_NAME = "CommonJsChunkFormatPlugin";
+
 class CommonJsChunkFormatPlugin {
 	/**
 	 * Apply the plugin
@@ -29,146 +31,129 @@ class CommonJsChunkFormatPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(
-			"CommonJsChunkFormatPlugin",
-			compilation => {
-				compilation.hooks.additionalChunkRuntimeRequirements.tap(
-					"CommonJsChunkFormatPlugin",
-					(chunk, set, { chunkGraph }) => {
-						if (chunk.hasRuntime()) return;
-						if (chunkGraph.getNumberOfEntryModules(chunk) > 0) {
-							set.add(RuntimeGlobals.require);
-							set.add(RuntimeGlobals.startupEntrypoint);
-							set.add(RuntimeGlobals.externalInstallChunk);
-						}
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+			compilation.hooks.additionalChunkRuntimeRequirements.tap(
+				PLUGIN_NAME,
+				(chunk, set, { chunkGraph }) => {
+					if (chunk.hasRuntime()) return;
+					if (chunkGraph.getNumberOfEntryModules(chunk) > 0) {
+						set.add(RuntimeGlobals.require);
+						set.add(RuntimeGlobals.startupEntrypoint);
+						set.add(RuntimeGlobals.externalInstallChunk);
 					}
-				);
-				const hooks = getCompilationHooks(compilation);
-				hooks.renderChunk.tap(
-					"CommonJsChunkFormatPlugin",
-					(modules, renderContext) => {
-						const { chunk, chunkGraph, runtimeTemplate } = renderContext;
-						const source = new ConcatSource();
-						source.add(`exports.id = ${JSON.stringify(chunk.id)};\n`);
-						source.add(`exports.ids = ${JSON.stringify(chunk.ids)};\n`);
-						source.add("exports.modules = ");
-						source.add(modules);
-						source.add(";\n");
-						const runtimeModules =
-							chunkGraph.getChunkRuntimeModulesInOrder(chunk);
-						if (runtimeModules.length > 0) {
-							source.add("exports.runtime =\n");
-							source.add(
-								Template.renderChunkRuntimeModules(
-									runtimeModules,
-									renderContext
-								)
-							);
-						}
-						const entries = Array.from(
-							chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
-						);
-						if (entries.length > 0) {
-							const runtimeChunk =
-								/** @type {Entrypoint} */
-								(entries[0][1]).getRuntimeChunk();
-							const currentOutputName = compilation
-								.getPath(
-									getChunkFilenameTemplate(chunk, compilation.outputOptions),
-									{
-										chunk,
-										contentHashType: "javascript"
-									}
-								)
-								.replace(/^\/+/g, "")
-								.split("/");
-							const runtimeOutputName = compilation
-								.getPath(
-									getChunkFilenameTemplate(
-										/** @type {Chunk} */
-										(runtimeChunk),
-										compilation.outputOptions
-									),
-									{
-										chunk: /** @type {Chunk} */ (runtimeChunk),
-										contentHashType: "javascript"
-									}
-								)
-								.replace(/^\/+/g, "")
-								.split("/");
-
-							// remove common parts
-							while (
-								currentOutputName.length > 1 &&
-								runtimeOutputName.length > 1 &&
-								currentOutputName[0] === runtimeOutputName[0]
-							) {
-								currentOutputName.shift();
-								runtimeOutputName.shift();
+				}
+			);
+			const hooks = getCompilationHooks(compilation);
+			hooks.renderChunk.tap(PLUGIN_NAME, (modules, renderContext) => {
+				const { chunk, chunkGraph, runtimeTemplate } = renderContext;
+				const source = new ConcatSource();
+				source.add(`exports.id = ${JSON.stringify(chunk.id)};\n`);
+				source.add(`exports.ids = ${JSON.stringify(chunk.ids)};\n`);
+				source.add("exports.modules = ");
+				source.add(modules);
+				source.add(";\n");
+				const runtimeModules = chunkGraph.getChunkRuntimeModulesInOrder(chunk);
+				if (runtimeModules.length > 0) {
+					source.add("exports.runtime =\n");
+					source.add(
+						Template.renderChunkRuntimeModules(runtimeModules, renderContext)
+					);
+				}
+				const entries = [
+					...chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
+				];
+				if (entries.length > 0) {
+					const runtimeChunk =
+						/** @type {Entrypoint} */
+						(entries[0][1]).getRuntimeChunk();
+					const currentOutputName = compilation
+						.getPath(
+							getChunkFilenameTemplate(chunk, compilation.outputOptions),
+							{
+								chunk,
+								contentHashType: "javascript"
+							}
+						)
+						.replace(/^\/+/g, "")
+						.split("/");
+					const runtimeOutputName = compilation
+						.getPath(
+							getChunkFilenameTemplate(
+								/** @type {Chunk} */
+								(runtimeChunk),
+								compilation.outputOptions
+							),
+							{
+								chunk: /** @type {Chunk} */ (runtimeChunk),
+								contentHashType: "javascript"
 							}
-							const last = runtimeOutputName.join("/");
-							// create final path
-							const runtimePath =
-								getUndoPath(currentOutputName.join("/"), last, true) + last;
+						)
+						.replace(/^\/+/g, "")
+						.split("/");
 
-							const entrySource = new ConcatSource();
-							entrySource.add(
-								`(${
-									runtimeTemplate.supportsArrowFunction()
-										? "() => "
-										: "function() "
-								}{\n`
-							);
-							entrySource.add("var exports = {};\n");
-							entrySource.add(source);
-							entrySource.add(";\n\n// load runtime\n");
-							entrySource.add(
-								`var ${RuntimeGlobals.require} = require(${JSON.stringify(
-									runtimePath
-								)});\n`
-							);
-							entrySource.add(
-								`${RuntimeGlobals.externalInstallChunk}(exports);\n`
-							);
-							const startupSource = new RawSource(
-								generateEntryStartup(
-									chunkGraph,
-									runtimeTemplate,
-									entries,
-									chunk,
-									false
-								)
-							);
-							entrySource.add(
-								hooks.renderStartup.call(
-									startupSource,
-									entries[entries.length - 1][0],
-									{
-										...renderContext,
-										inlined: false
-									}
-								)
-							);
-							entrySource.add("\n})()");
-							return entrySource;
-						}
-						return source;
+					// remove common parts
+					while (
+						currentOutputName.length > 1 &&
+						runtimeOutputName.length > 1 &&
+						currentOutputName[0] === runtimeOutputName[0]
+					) {
+						currentOutputName.shift();
+						runtimeOutputName.shift();
 					}
-				);
-				hooks.chunkHash.tap(
-					"CommonJsChunkFormatPlugin",
-					(chunk, hash, { chunkGraph }) => {
-						if (chunk.hasRuntime()) return;
-						hash.update("CommonJsChunkFormatPlugin");
-						hash.update("1");
-						const entries = Array.from(
-							chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
-						);
-						updateHashForEntryStartup(hash, chunkGraph, entries, chunk);
-					}
-				);
-			}
-		);
+					const last = runtimeOutputName.join("/");
+					// create final path
+					const runtimePath =
+						getUndoPath(currentOutputName.join("/"), last, true) + last;
+
+					const entrySource = new ConcatSource();
+					entrySource.add(
+						`(${
+							runtimeTemplate.supportsArrowFunction() ? "() => " : "function() "
+						}{\n`
+					);
+					entrySource.add("var exports = {};\n");
+					entrySource.add(source);
+					entrySource.add(";\n\n// load runtime\n");
+					entrySource.add(
+						`var ${RuntimeGlobals.require} = require(${JSON.stringify(
+							runtimePath
+						)});\n`
+					);
+					entrySource.add(`${RuntimeGlobals.externalInstallChunk}(exports);\n`);
+					const startupSource = new RawSource(
+						generateEntryStartup(
+							chunkGraph,
+							runtimeTemplate,
+							entries,
+							chunk,
+							false
+						)
+					);
+					entrySource.add(
+						hooks.renderStartup.call(
+							startupSource,
+							entries[entries.length - 1][0],
+							{
+								...renderContext,
+								inlined: false
+							}
+						)
+					);
+					entrySource.add("\n})()");
+					return entrySource;
+				}
+				return source;
+			});
+			hooks.chunkHash.tap(PLUGIN_NAME, (chunk, hash, { chunkGraph }) => {
+				if (chunk.hasRuntime()) return;
+				hash.update(PLUGIN_NAME);
+				hash.update("1");
+				const entries = [
+					...chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
+				];
+				updateHashForEntryStartup(hash, chunkGraph, entries, chunk);
+			});
+		});
 	}
 }
 

package/lib/javascript/EnableChunkLoadingPlugin.js

@@ -53,9 +53,7 @@ class EnableChunkLoadingPlugin {
 					"EnableChunkLoadingPlugin need to be used to enable this type of chunk loading. " +
 					'This usually happens through the "output.enabledChunkLoadingTypes" option. ' +
 					'If you are using a function as entry which sets "chunkLoading", you need to add all potential chunk loading types to "output.enabledChunkLoadingTypes". ' +
-					`These types are enabled: ${Array.from(
-						getEnabledTypes(compiler)
-					).join(", ")}`
+					`These types are enabled: ${[...getEnabledTypes(compiler)].join(", ")}`
 			);
 		}
 	}
@@ -77,17 +75,20 @@ class EnableChunkLoadingPlugin {
 			switch (type) {
 				case "jsonp": {
 					const JsonpChunkLoadingPlugin = require("../web/JsonpChunkLoadingPlugin");
+
 					new JsonpChunkLoadingPlugin().apply(compiler);
 					break;
 				}
 				case "import-scripts": {
 					const ImportScriptsChunkLoadingPlugin = require("../webworker/ImportScriptsChunkLoadingPlugin");
+
 					new ImportScriptsChunkLoadingPlugin().apply(compiler);
 					break;
 				}
 				case "require": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const CommonJsChunkLoadingPlugin = require("../node/CommonJsChunkLoadingPlugin");
+
 					new CommonJsChunkLoadingPlugin({
 						asyncChunkLoading: false
 					}).apply(compiler);
@@ -96,6 +97,7 @@ class EnableChunkLoadingPlugin {
 				case "async-node": {
 					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const CommonJsChunkLoadingPlugin = require("../node/CommonJsChunkLoadingPlugin");
+
 					new CommonJsChunkLoadingPlugin({
 						asyncChunkLoading: true
 					}).apply(compiler);
@@ -104,6 +106,7 @@ class EnableChunkLoadingPlugin {
 				case "import":
 				case "universal": {
 					const ModuleChunkLoadingPlugin = require("../esm/ModuleChunkLoadingPlugin");
+
 					new ModuleChunkLoadingPlugin().apply(compiler);
 					break;
 				}

package/lib/javascript/JavascriptGenerator.js

@@ -25,6 +25,18 @@ const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibi
 /** @typedef {import("../NormalModule")} NormalModule */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 
+const DEFAULT_SOURCE = {
+	source() {
+		return new RawSource("throw new Error('No source available');");
+	},
+	/**
+	 * @returns {number} size of the DEFAULT_SOURCE.source()
+	 */
+	size() {
+		return 39;
+	}
+};
+
 // TODO: clean up this file
 // replace with newer constructs
 
@@ -59,7 +71,7 @@ class JavascriptGenerator extends Generator {
 	getSize(module, type) {
 		const originalSource = module.originalSource();
 		if (!originalSource) {
-			return 39;
+			return DEFAULT_SOURCE.size();
 		}
 		return originalSource.size();
 	}
@@ -98,7 +110,7 @@ class JavascriptGenerator extends Generator {
 	generate(module, generateContext) {
 		const originalSource = module.originalSource();
 		if (!originalSource) {
-			return new RawSource("throw new Error('No source available');");
+			return DEFAULT_SOURCE.source();
 		}
 
 		const source = new ReplaceSource(originalSource);