webpack 5.111.0 → 5.112.0

package/lib/wasm-sync/WasmChunkLoadingRuntimeModule.js

@@ -4,22 +4,22 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const RuntimeModule = require("../runtime/RuntimeModule");
+const Template = require("../template/Template");
 const { compareModulesByIdentifier } = require("../util/comparators");
 const { fullHashPathData } = require("../wasm/wasmModuleFilename");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
 /** @import { Signature } from "@webassemblyjs/ast" */
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph, { ModuleId } from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph, { ModuleId } from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
-/** @import Module, { ReadOnlyRuntimeRequirements } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import Module, { ReadOnlyRuntimeRequirements } from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 
-// TODO webpack 6 remove the whole folder
+// TODO in the next major release: remove the whole folder
 
 // Get all wasm modules
 /**
@@ -339,10 +339,9 @@ class WasmChunkLoadingRuntimeModule extends RuntimeModule {
 				stateExpression ? runtimeTemplate.assignOr(stateExpression, "{}") : "{}"
 			};`,
 			"",
-			// This function is used to delay reading the installed wasm module promises
-			// by a microtask. Sorting them doesn't help because there are edge cases where
-			// sorting is not possible (modules splitted into different chunks).
-			// So we not even trying and solve this by a microtask delay.
+			// Delays reading the installed wasm module promises by a microtask.
+			// Sorting them instead is not always possible — modules split across
+			// chunks have no order — so the delay is what is relied on.
 			"function promiseResolve() { return Promise.resolve(); }",
 			"",
 			Template.asString(declarations),

package/lib/wasm-sync/WasmFinalizeExportsPlugin.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
+const UnsupportedWebAssemblyFeatureError = require("../errors/UnsupportedWebAssemblyFeatureError");
 const formatLocation = require("../util/formatLocation");
-const UnsupportedWebAssemblyFeatureError = require("./UnsupportedWebAssemblyFeatureError");
 
 /** @import Compiler from "../Compiler" */
-/** @import Dependency from "../Dependency" */
-/** @import Module from "../Module" */
+/** @import Dependency from "../graph/Dependency" */
+/** @import Module from "../module/Module" */
 /** @import { SyncWasmModuleBuildMeta } from "./SyncWasmModule" */
 
 const PLUGIN_NAME = "WasmFinalizeExportsPlugin";

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -10,16 +10,17 @@ const { moduleContextFromModuleAST } = require("@webassemblyjs/ast");
 const { addWithAST, editWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const { RawSource } = require("webpack-sources");
-const Generator = require("../Generator");
-const { WEBASSEMBLY_TYPES } = require("../ModuleSourceTypeConstants");
-const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Generator = require("../module/Generator");
+const { WEBASSEMBLY_TYPES } = require("../module/ModuleSourceTypeConstants");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
+/** @import WebAssemblyExportImportedDependency from "../dependencies/wasm/WebAssemblyExportImportedDependency" */
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext, UpdateHashContext } from "../Generator" */
-/** @import Module, { SourceType, SourceTypes } from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import NormalModule from "../NormalModule" */
+/** @import { GenerateContext, UpdateHashContext } from "../module/Generator" */
+/** @import Module, { SourceType, SourceTypes } from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import NormalModule from "../module/NormalModule" */
 /** @import Hash from "../util/Hash" */
 /** @import { RuntimeSpec } from "../util/runtime" */
 /** @import { UsedWasmDependency } from "./WebAssemblyUtils" */
@@ -489,7 +490,7 @@ class WebAssemblyGenerator extends Generator {
 		);
 		const externalExports = new Set(
 			module.dependencies
-				.filter((d) => d instanceof WebAssemblyExportImportedDependency)
+				.filter((d) => isDependencyKind(d, "webassembly-export-imported"))
 				.map((d) => {
 					const wasmDep = /** @type {WebAssemblyExportImportedDependency} */ (
 						d
@@ -544,7 +545,12 @@ class WebAssemblyGenerator extends Generator {
 	 * @returns {Source | null} generated code
 	 */
 	generateError(error, module, generateContext) {
-		return new RawSource(error.message);
+		return new RawSource(
+			Generator.buildErrorMessage(
+				error,
+				generateContext.runtimeTemplate.requestShortener
+			)
+		);
 	}
 
 	/**

package/lib/wasm-sync/WebAssemblyJavascriptGenerator.js

@@ -6,20 +6,19 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const { UsageState } = require("../ExportsInfo");
-const Generator = require("../Generator");
-const InitFragment = require("../InitFragment");
-const { WEBASSEMBLY_TYPES } = require("../ModuleSourceTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
-const ModuleDependency = require("../dependencies/ModuleDependency");
-const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const { UsageState } = require("../graph/ExportsInfo");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Generator = require("../module/Generator");
+const { WEBASSEMBLY_TYPES } = require("../module/ModuleSourceTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const InitFragment = require("../template/InitFragment");
+const Template = require("../template/Template");
 
 /** @import { Source } from "webpack-sources" */
-/** @import { GenerateContext } from "../Generator" */
-/** @import Module, { SourceType, SourceTypes } from "../Module" */
-/** @import NormalModule from "../NormalModule" */
+/** @import { GenerateContext } from "../module/Generator" */
+/** @import ModuleDependency from "../dependencies/core/ModuleDependency" */
+/** @import Module, { SourceType, SourceTypes } from "../module/Module" */
+/** @import NormalModule from "../module/NormalModule" */
 
 class WebAssemblyJavascriptGenerator extends Generator {
 	/**
@@ -69,7 +68,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 		let index = 0;
 		for (const dep of module.dependencies) {
 			const moduleDep =
-				dep && dep instanceof ModuleDependency ? dep : undefined;
+				dep && isDependencyKind(dep, "module-dependency") ? dep : undefined;
 			const mod = moduleGraph.getModule(dep);
 			if (mod) {
 				let importData = importedModules.get(mod);
@@ -87,7 +86,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 					);
 					index++;
 				}
-				if (dep instanceof WebAssemblyImportDependency) {
+				if (isDependencyKind(dep, "webassembly-import")) {
 					importData.names.add(dep.name);
 					if (dep.description.type === "GlobalType") {
 						const exportName = dep.name;
@@ -121,7 +120,7 @@ class WebAssemblyJavascriptGenerator extends Generator {
 						}
 					}
 				}
-				if (dep instanceof WebAssemblyExportImportedDependency) {
+				if (isDependencyKind(dep, "webassembly-export-imported")) {
 					importData.names.add(dep.name);
 					const usedName = moduleGraph
 						.getExportsInfo(module)
@@ -232,7 +231,11 @@ class WebAssemblyJavascriptGenerator extends Generator {
 	 */
 	generateError(error, module, generateContext) {
 		return new RawSource(
-			Generator.throwBuildErrorCode(error, "WebAssembly.CompileError")
+			Generator.throwBuildErrorCode(
+				error,
+				"WebAssembly.CompileError",
+				generateContext.runtimeTemplate.requestShortener
+			)
 		);
 	}
 }

package/lib/wasm-sync/WebAssemblyModulesPlugin.js

@@ -5,21 +5,23 @@
 
 "use strict";
 
-const Generator = require("../Generator");
+const WebAssemblyExportImportedDependency = require("../dependencies/wasm/WebAssemblyExportImportedDependency");
+const WebAssemblyImportDependency = require("../dependencies/wasm/WebAssemblyImportDependency");
+const WebAssemblyInInitialChunkError = require("../errors/WebAssemblyInInitialChunkError");
+const Generator = require("../module/Generator");
 const {
 	JAVASCRIPT_TYPE,
 	WEBASSEMBLY_TYPE
-} = require("../ModuleSourceTypeConstants");
-const { WEBASSEMBLY_MODULE_TYPE_SYNC } = require("../ModuleTypeConstants");
-const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	WEBASSEMBLY_MODULE_TYPE_SYNC
+} = require("../module/ModuleTypeConstants");
 const { compareModulesByFullName } = require("../util/comparators");
 const lazyModule = require("../util/lazyModule");
 const preloadModuleType = require("../util/preloadModuleType");
-const WebAssemblyInInitialChunkError = require("./WebAssemblyInInitialChunkError");
 
 /** @import Compiler from "../Compiler" */
-/** @import Module from "../Module" */
+/** @import Module from "../module/Module" */
 
 const getWebAssemblyGenerator = lazyModule(() =>
 	require("./WebAssemblyGenerator")

package/lib/wasm-sync/WebAssemblyParser.js

@@ -8,15 +8,15 @@
 const t = require("@webassemblyjs/ast");
 const { moduleContextFromModuleAST } = require("@webassemblyjs/ast");
 const { decode } = require("@webassemblyjs/wasm-parser");
-const Parser = require("../Parser");
-const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
-const WebAssemblyExportImportedDependency = require("../dependencies/WebAssemblyExportImportedDependency");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const StaticExportsDependency = require("../dependencies/core/StaticExportsDependency");
+const WebAssemblyExportImportedDependency = require("../dependencies/wasm/WebAssemblyExportImportedDependency");
+const WebAssemblyImportDependency = require("../dependencies/wasm/WebAssemblyImportDependency");
+const Parser = require("../module/Parser");
 
 /** @import { ModuleImport } from "@webassemblyjs/ast" */
-/** @import { BuildInfo, BuildMeta } from "../Module" */
+/** @import { BuildInfo, BuildMeta } from "../module/Module" */
 /** @import { SyncWasmModuleBuildMeta } from "./SyncWasmModule" */
-/** @import { ParserState, PreparsedAst } from "../Parser" */
+/** @import { ParserState, PreparsedAst } from "../module/Parser" */
 
 const JS_COMPAT_TYPES = new Set(["i32", "i64", "f32", "f64", "externref"]);
 

package/lib/wasm-sync/WebAssemblyUtils.js

@@ -5,11 +5,12 @@
 
 "use strict";
 
-const Template = require("../Template");
-const WebAssemblyImportDependency = require("../dependencies/WebAssemblyImportDependency");
+const isDependencyKind = require("../graph/isDependencyKind");
+const Template = require("../template/Template");
 
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
+/** @import WebAssemblyImportDependency from "../dependencies/wasm/WebAssemblyImportDependency" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
 
 /**
  * Defines the used wasm dependency type used by this module.
@@ -33,7 +34,7 @@ const getUsedDependencies = (moduleGraph, module, mangle) => {
 	const array = [];
 	let importIndex = 0;
 	for (const dep of module.dependencies) {
-		if (dep instanceof WebAssemblyImportDependency) {
+		if (isDependencyKind(dep, "webassembly-import")) {
 			if (
 				dep.description.type === "GlobalType" ||
 				moduleGraph.getModule(dep) === null
@@ -42,10 +43,8 @@ const getUsedDependencies = (moduleGraph, module, mangle) => {
 			}
 
 			const exportName = dep.name;
-			// TODO add the following 3 lines when removing of ModuleExport is possible
-			// const importedModule = moduleGraph.getModule(dep);
-			// const usedName = importedModule && moduleGraph.getExportsInfo(importedModule).getUsedName(exportName, runtime);
-			// if (usedName !== false) {
+			// TODO once ModuleExport can be removed, skip a dependency whose
+			// imported module reports `getUsedName(exportName, runtime) === false`.
 			if (mangle) {
 				array.push({
 					dependency: dep,

package/lib/{MultiWatching.js → watch/MultiWatching.js}

@@ -5,11 +5,11 @@
 
 "use strict";
 
-const asyncLib = require("./util/async");
+const asyncLib = require("../util/async");
 
-/** @import MultiCompiler from "./MultiCompiler" */
+/** @import MultiCompiler from "../MultiCompiler" */
 /** @import Watching from "./Watching" */
-/** @import { ErrorCallback } from "./webpack" */
+/** @import { ErrorCallback } from "../webpack" */
 
 class MultiWatching {
 	/**

package/lib/{WatchIgnorePlugin.js → watch/WatchIgnorePlugin.js}

@@ -5,16 +5,49 @@
 
 "use strict";
 
-const { groupBy } = require("./util/ArrayHelpers");
+const { groupBy } = require("../util/ArrayHelpers");
+const memoize = require("../util/memoize");
+
+const getGlobUtils = memoize(() => require("../util/globUtils"));
 
 /** @import { TimeInfoEntries } from "watchpack" */
+/** @import Compiler from "../Compiler" */
+/** @import { WatchFileSystem, WatchMethod, Watcher } from "../fs/fs" */
+
+/**
+ * An absolute path to a directory or file that should be ignored.
+ * @inline
+ * @absolutePath true
+ * @typedef {string} WatchIgnoreAbsolutePath
+ */
+
+/**
+ * A glob matching, at any depth, the directories or files that should be ignored.
+ * @since 5.112.0
+ * @inline
+ * @minLength 1
+ * @absolutePath false
+ * @typedef {string} WatchIgnoreGlob
+ */
+
+/**
+ * RegExp, absolute path or glob to directories or files that should be ignored.
+ * @inline
+ * @typedef {RegExp | WatchIgnoreAbsolutePath | WatchIgnoreGlob} WatchIgnoreEntry
+ */
+
+/**
+ * A list of RegExps, absolute paths or globs to directories or files that should be ignored.
+ * @minItems 1
+ * @inline
+ * @typedef {WatchIgnoreEntry[]} WatchIgnorePaths
+ */
+
 /**
- * @import {
- * 	WatchIgnorePluginOptions
- * } from "../declarations/plugins/WatchIgnorePlugin"
+ * @schema plugins/WatchIgnorePlugin
+ * @typedef {object} WatchIgnorePluginOptions
+ * @property {WatchIgnorePaths} paths
  */
-/** @import Compiler from "./Compiler" */
-/** @import { WatchFileSystem, WatchMethod, Watcher } from "./util/fs" */
 
 const IGNORE_TIME_ENTRY = "ignore";
 
@@ -27,7 +60,8 @@ class IgnoringWatchFileSystem {
 	constructor(wfs, paths) {
 		/** @type {WatchFileSystem} */
 		this.wfs = wfs;
-		this.paths = paths;
+		const { compileRelativeGlobPaths, createPathGlobRegExp } = getGlobUtils();
+		this.paths = compileRelativeGlobPaths(paths, createPathGlobRegExp);
 	}
 
 	/** @type {WatchMethod} */
@@ -140,14 +174,14 @@ class WatchIgnorePlugin {
 	apply(compiler) {
 		compiler.hooks.validate.tap(PLUGIN_NAME, () => {
 			compiler.validate(
-				() => require("../schemas/plugins/WatchIgnorePlugin.json"),
+				() => require("../../schemas/plugins/WatchIgnorePlugin.json"),
 				this.options,
 				{
 					name: "Watch Ignore Plugin",
 					baseDataPath: "options"
 				},
 				(options) =>
-					require("../schemas/plugins/WatchIgnorePlugin.check")(options)
+					require("../../schemas/plugins/WatchIgnorePlugin.check")(options)
 			);
 		});
 		compiler.hooks.afterEnvironment.tap(PLUGIN_NAME, () => {

package/lib/{Watching.js → watch/Watching.js}

@@ -5,20 +5,20 @@
 
 "use strict";
 
-const Stats = require("./Stats");
+const Stats = require("../stats/Stats");
 
-/** @import { WatchOptions } from "../declarations/WebpackOptions" */
-/** @import Compilation from "./Compilation" */
-/** @import Compiler from "./Compiler" */
-/** @import { Logger } from "./logging/Logger" */
-/** @import { TimeInfoEntries, WatchFileSystem, Watcher } from "./util/fs" */
-/** @import { ErrorCallback } from "./webpack" */
+/** @import { WatchOptions } from "../../declarations/WebpackOptions" */
+/** @import Compilation from "../Compilation" */
+/** @import Compiler from "../Compiler" */
+/** @import { Logger } from "../logging/Logger" */
+/** @import { TimeInfoEntries, WatchFileSystem, Watcher } from "../fs/fs" */
+/** @import { ErrorCallback } from "../webpack" */
 
 /**
  * Defines the callback type used by this module.
  * @template T
  * @template [R=void]
- * @typedef {import("./webpack").Callback<T, R>} Callback
+ * @typedef {import("../webpack").Callback<T, R>} Callback
  */
 
 /** @typedef {Set<string>} CollectedFiles */

package/lib/web/FetchCompileAsyncWasmPlugin.js

@@ -5,14 +5,16 @@
 
 "use strict";
 
-const { WEBASSEMBLY_MODULE_TYPE_ASYNC } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const { usesFullHashDigest } = require("../TemplatedPathPlugin");
+const {
+	WEBASSEMBLY_MODULE_TYPE_ASYNC
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const { usesFullHashDigest } = require("../template/TemplatedPathPlugin");
+const AsyncWasmCompileRuntimeModule = require("../wasm/AsyncWasmCompileRuntimeModule");
+const AsyncWasmLoadingRuntimeModule = require("../wasm/AsyncWasmLoadingRuntimeModule");
 const { needsRuntimeFullHash } = require("../wasm/wasmModuleFilename");
-const AsyncWasmCompileRuntimeModule = require("../wasm-async/AsyncWasmCompileRuntimeModule");
-const AsyncWasmLoadingRuntimeModule = require("../wasm-async/AsyncWasmLoadingRuntimeModule");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "FetchCompileAsyncWasmPlugin";

package/lib/web/FetchCompileWasmPlugin.js

@@ -5,13 +5,15 @@
 
 "use strict";
 
-const { WEBASSEMBLY_MODULE_TYPE_SYNC } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const { usesFullHashDigest } = require("../TemplatedPathPlugin");
+const {
+	WEBASSEMBLY_MODULE_TYPE_SYNC
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const { usesFullHashDigest } = require("../template/TemplatedPathPlugin");
 const { needsRuntimeFullHash } = require("../wasm/wasmModuleFilename");
 const WasmChunkLoadingRuntimeModule = require("../wasm-sync/WasmChunkLoadingRuntimeModule");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
 
 /**

package/lib/web/JsonpChunkLoadingPlugin.js

@@ -5,12 +5,12 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const lazyModule = require("../util/lazyModule");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
-/** @import { RuntimeRequirements } from "../Module" */
+/** @import { RuntimeRequirements } from "../module/Module" */
 
 // only a chunk that loads other chunks at runtime emits this
 const getJsonpChunkLoadingRuntimeModule = lazyModule(() =>

package/lib/web/JsonpChunkLoadingRuntimeModule.js

@@ -6,21 +6,21 @@
 
 const { SyncWaterfallHook } = require("tapable");
 /** @import Compilation from "../Compilation" */
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
-const Template = require("../Template");
 const {
 	generateJavascriptHMR
 } = require("../hmr/JavascriptHotModuleReplacementHelper");
 const chunkHasJs = require("../javascript/JavascriptModulesPlugin").chunkHasJs;
 const { getInitialChunkIds } = require("../javascript/StartupHelpers");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const RuntimeModule = require("../runtime/RuntimeModule");
 const { renderBaseUri } = require("../runtime/baseUri");
+const Template = require("../template/Template");
 const compileBooleanMatcher = require("../util/compileBooleanMatcher");
 const createHooksRegistry = require("../util/createHooksRegistry");
 
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
-/** @import { ReadOnlyRuntimeRequirements } from "../Module" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
+/** @import { ReadOnlyRuntimeRequirements } from "../module/Module" */
 
 /**
  * @typedef {object} JsonpCompilationPluginHooks

package/lib/web/JsonpTemplatePlugin.js

@@ -12,7 +12,7 @@ const JsonpChunkLoadingRuntimeModule = require("./JsonpChunkLoadingRuntimeModule
 /** @import Compilation from "../Compilation" */
 /** @import Compiler from "../Compiler" */
 
-// TODO webpack 6 remove this class
+// TODO in the next major release: remove this class
 class JsonpTemplatePlugin {
 	/**
 	 * Returns hooks.

package/lib/webpack.js

@@ -7,11 +7,8 @@
 
 const util = require("util");
 const webpackOptionsSchemaCheck = require("../schemas/WebpackOptions.check");
-const webpackOptionsSchema =
-	/** @type {EXPECTED_ANY} */
-	(require("../schemas/WebpackOptions.json"));
 const Compiler = require("./Compiler");
-const WebpackOptionsApply = require("./WebpackOptionsApply");
+const WebpackOptionsApply = require("./config/WebpackOptionsApply");
 const {
 	applyWebpackOptionsBaseDefaults,
 	applyWebpackOptionsDefaults
@@ -23,9 +20,16 @@ const {
 const NodeEnvironmentPlugin = require("./node/NodeEnvironmentPlugin");
 const memoize = require("./util/memoize");
 
-const getValidateSchema = memoize(() => require("./validateSchema"));
+const getValidateSchema = memoize(() => require("./config/validateSchema"));
+// Read only to explain a failure the precompiled check already found, so a
+// valid configuration never parses the schema — 498 KB of objects.
+const getWebpackOptionsSchema = memoize(
+	() =>
+		/** @type {Parameters<typeof import("./config/validateSchema")>[0]} */
+		(require("../schemas/WebpackOptions.json"))
+);
 const getMultiCompiler = memoize(() => require("./MultiCompiler"));
-const getProgressPlugin = memoize(() => require("./ProgressPlugin"));
+const getProgressPlugin = memoize(() => require("./logging/ProgressPlugin"));
 
 /**
  * @import {
@@ -41,8 +45,8 @@ const getProgressPlugin = memoize(() => require("./ProgressPlugin"));
  * 	MultiWebpackOptions
  * } from "./MultiCompiler"
  */
-/** @import MultiStats from "./MultiStats" */
-/** @import Stats from "./Stats" */
+/** @import MultiStats from "./stats/MultiStats" */
+/** @import Stats from "./stats/Stats" */
 
 /** @typedef {(this: Compiler, compiler: Compiler) => void} WebpackPluginFunction */
 /** @typedef {(compiler: Compiler) => void} WebpackPluginInstanceApplyFunction */
@@ -63,7 +67,9 @@ const isDefaultProgressEnabled = (options) => {
 	if (!progress) return false;
 	if (
 		infrastructureLogging.level === "none" ||
-		/** @type {EXPECTED_ANY} */ (infrastructureLogging.level) === false
+		/** @type {typeof infrastructureLogging.level | false} */ (
+			infrastructureLogging.level
+		) === false
 	) {
 		return false;
 	}
@@ -71,7 +77,7 @@ const isDefaultProgressEnabled = (options) => {
 };
 
 /**
- * @param {WebpackOptionsNormalizedWithDefaults} options resolved options
+ * @param {WebpackOptionsNormalizedWithDefaults | MultiCompilerOptions} options resolved or multi compiler options
  * @returns {boolean} true when the user already added a ProgressPlugin
  */
 const hasUserProgressPlugin = (options) =>
@@ -129,12 +135,16 @@ const createMultiCompiler = (childOptions, options) => {
 		compilers.length > 0 &&
 		/** @type {WebpackOptionsNormalizedWithDefaults} */ (compilers[0].options);
 	if (firstOptions) {
-		applyDefaultProgressPlugin(compiler, firstOptions, () =>
-			compilers.some((c) =>
-				hasUserProgressPlugin(
-					/** @type {WebpackOptionsNormalizedWithDefaults} */ (c.options)
+		applyDefaultProgressPlugin(
+			compiler,
+			firstOptions,
+			() =>
+				hasUserProgressPlugin(options) ||
+				compilers.some((c) =>
+					hasUserProgressPlugin(
+						/** @type {WebpackOptionsNormalizedWithDefaults} */ (c.options)
+					)
 				)
-			)
 		);
 	}
 	return compiler;
@@ -271,10 +281,10 @@ const webpack = (options, callback) => {
 			)
 		) {
 			getValidateSchema()(
-				webpackOptionsSchema,
+				getWebpackOptionsSchema(),
 				isMultiCompiler
 					? options.map((options) => (needValidate(options) ? options : {}))
-					: needValidate(options)
+					: needValidate(/** @type {WebpackOptions} */ (options))
 						? options
 						: {}
 			);

package/lib/webworker/ImportScriptsChunkLoadingPlugin.js

@@ -5,13 +5,13 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const StartupChunkDependenciesPlugin = require("../runtime/StartupChunkDependenciesPlugin");
 const lazyModule = require("../util/lazyModule");
 
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
-/** @import { RuntimeRequirements } from "../Module" */
+/** @import { RuntimeRequirements } from "../module/Module" */
 
 // only a chunk that loads other chunks at runtime emits this
 const getImportScriptsChunkLoadingRuntimeModule = lazyModule(() =>