webpack 5.111.1 → 5.112.1

package/lib/errors/SystemImportDeprecationWarning.js

@@ -0,0 +1,43 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+
+"use strict";
+
+const makeSerializable = require("../util/makeSerializable");
+const WebpackError = require("./WebpackError");
+
+/** @import { DependencyLocation } from "../graph/Dependency" */
+
+class SystemImportDeprecationWarning extends WebpackError {
+	/**
+	 * Creates an instance of SystemImportDeprecationWarning.
+	 * @param {DependencyLocation} loc location
+	 */
+	constructor(loc) {
+		super(
+			"System.import() is deprecated and will be removed soon. Use import() instead.\n" +
+				"For more info visit https://webpack.js.org/guides/code-splitting/"
+		);
+
+		/** @type {string} */
+		this.name = "SystemImportDeprecationWarning";
+
+		/** @type {DependencyLocation} */
+		this.loc = loc;
+	}
+}
+
+makeSerializable(
+	SystemImportDeprecationWarning,
+	[
+		"webpack/lib/errors/SystemImportDeprecationWarning",
+		// TODO in the next major release: remove, they restore pre-move cache packs
+		"webpack/lib/dependencies/system/SystemPlugin",
+		"webpack/lib/dependencies/SystemPlugin"
+	],
+	"SystemImportDeprecationWarning"
+);
+
+module.exports = SystemImportDeprecationWarning;

package/lib/errors/UnmergeableEntryExportsError.js

@@ -0,0 +1,34 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+/** @import Chunk from "../graph/Chunk" */
+
+/**
+ * Error raised when an entry asks for `entryExports: "all"` but webpack cannot build
+ * the merged exports object from its modules.
+ */
+class UnmergeableEntryExportsError extends WebpackError {
+	/**
+	 * Captures the chunk carrying the entry and why its exports cannot be merged.
+	 * @param {Chunk} chunk the chunk carrying the entry
+	 * @param {string} reason what stands in the way, as a sentence fragment
+	 */
+	constructor(chunk, reason) {
+		super(
+			`Entry "${chunk.name || chunk.id}" can't merge the exports of its modules because ${reason}. Set 'library.entryExports' back to 'last', or re-export the modules from a single entry module instead.`
+		);
+
+		/** @type {string} */
+		this.name = "UnmergeableEntryExportsError";
+		/** @type {Chunk} */
+		this.chunk = chunk;
+	}
+}
+
+module.exports = UnmergeableEntryExportsError;

package/lib/errors/UnsupportedFeatureWarning.js

@@ -8,7 +8,7 @@
 const makeSerializable = require("../util/makeSerializable");
 const WebpackError = require("./WebpackError");
 
-/** @import { DependencyLocation } from "../Dependency" */
+/** @import { DependencyLocation } from "../graph/Dependency" */
 
 class UnsupportedFeatureWarning extends WebpackError {
 	/**

package/lib/{wasm-sync → errors}/UnsupportedWebAssemblyFeatureError.js

@@ -4,7 +4,7 @@
 
 "use strict";
 
-const WebpackError = require("../errors/WebpackError");
+const WebpackError = require("./WebpackError");
 
 class UnsupportedWebAssemblyFeatureError extends WebpackError {
 	/**

package/lib/{wasm-sync → errors}/WebAssemblyInInitialChunkError.js

@@ -4,12 +4,14 @@
 
 "use strict";
 
-const WebpackError = require("../errors/WebpackError");
+// TODO in the next major release: remove together with `lib/wasm-sync/`,
+// whose `WebAssemblyModulesPlugin` is the only thing that raises this
+const WebpackError = require("./WebpackError");
 
-/** @import ChunkGraph from "../ChunkGraph" */
-/** @import Module from "../Module" */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import RequestShortener from "../RequestShortener" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
+/** @import Module from "../module/Module" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import RequestShortener from "../util/RequestShortener" */
 
 /**
  * Gets initial module chains.

package/lib/errors/WebpackError.js

@@ -8,9 +8,9 @@
 const inspect = require("util").inspect.custom;
 const makeSerializable = require("../util/makeSerializable");
 
-/** @import Chunk from "../Chunk" */
-/** @import { DependencyLocation } from "../Dependency" */
-/** @import Module from "../Module" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import { DependencyLocation } from "../graph/Dependency" */
+/** @import Module from "../module/Module" */
 /**
  * @import {
  * 	ObjectDeserializerContext,
@@ -41,6 +41,16 @@ class WebpackError extends Error {
 		this.file = undefined;
 	}
 
+	/**
+	 * Whether an error is a webpack error rather than any other thrown value.
+	 * @template T
+	 * @param {T} value an error
+	 * @returns {value is T & WebpackError} true when the value is a webpack error
+	 */
+	static isWebpackError(value) {
+		return value instanceof WebpackError;
+	}
+
 	/**
 	 * Returns inspect message.
 	 * @returns {string} inspect message

package/lib/esm/ExportWebpackRequireRuntimeModule.js

@@ -4,8 +4,8 @@
 
 "use strict";
 
-const RuntimeGlobals = require("../RuntimeGlobals");
-const RuntimeModule = require("../RuntimeModule");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const RuntimeModule = require("../runtime/RuntimeModule");
 
 class ExportWebpackRequireRuntimeModule extends RuntimeModule {
 	constructor() {

package/lib/esm/ModuleChunkFormatPlugin.js

@@ -6,13 +6,11 @@
 "use strict";
 
 const { ConcatSource } = require("webpack-sources");
-const { HotUpdateChunk, RuntimeGlobals } = require("..");
-const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
-const Template = require("../Template");
+const { RuntimeGlobals } = require("..");
 const {
 	createChunkHashHandler,
 	getChunkInfo
-} = require("../javascript/ChunkFormatHelpers");
+} = require("../javascript/ChunkHelpers");
 const { getAllChunks } = require("../javascript/ChunkHelpers");
 const {
 	chunkHasJs,
@@ -23,14 +21,16 @@ const {
 	entryModuleIdExpression,
 	renderAwaitedEntries
 } = require("../javascript/StartupHelpers");
+const { JAVASCRIPT_TYPE } = require("../module/ModuleSourceTypeConstants");
+const Template = require("../template/Template");
 const { getUndoPath } = require("../util/identifier");
 
 /** @import { Source } from "webpack-sources" */
-/** @import Chunk from "../Chunk" */
-/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
 /** @import Compiler from "../Compiler" */
-/** @import Entrypoint from "../Entrypoint" */
+/** @import Entrypoint from "../graph/Entrypoint" */
 /**
  * @import {
  * 	ChunkRenderContext
@@ -103,6 +103,33 @@ function getChunkNamedImport(index) {
 	return `__webpack_chunk_${index}__`;
 }
 
+/**
+ * Returns the chunks, other than the runtime chunk, whose files the startup of an entry chunk imports.
+ * @param {Chunk} chunk the chunk
+ * @param {ChunkGraph} chunkGraph the chunk graph
+ * @returns {Iterable<Chunk>} the imported chunks
+ */
+function getImportedChunks(chunk, chunkGraph) {
+	if (chunk.hasRuntime()) {
+		return chunkGraph.getNumberOfEntryModules(chunk) > 0
+			? chunkGraph.getChunkEntryDependentChunksIterable(chunk)
+			: [];
+	}
+	const { entries, runtimeChunk } = getChunkInfo(chunk, chunkGraph);
+	/** @type {Set<Chunk>} */
+	const chunks = new Set();
+	for (const [, entrypoint] of entries) {
+		for (const c of getAllChunks(
+			/** @type {Entrypoint} */ (entrypoint),
+			chunk,
+			runtimeChunk
+		)) {
+			chunks.add(c);
+		}
+	}
+	return chunks;
+}
+
 const PLUGIN_NAME = "ModuleChunkFormatPlugin";
 
 class ModuleChunkFormatPlugin {
@@ -191,7 +218,7 @@ class ModuleChunkFormatPlugin {
 			hooks.renderChunk.tap(PLUGIN_NAME, (modules, renderContext) => {
 				const { chunk, chunkGraph, moduleGraph, runtimeTemplate } =
 					renderContext;
-				const hotUpdateChunk = chunk instanceof HotUpdateChunk ? chunk : null;
+				const hotUpdateChunk = chunk.isHotUpdate() ? chunk : null;
 				const source = new ConcatSource();
 				const cst = runtimeTemplate.renderConst();
 				source.add(
@@ -243,15 +270,7 @@ class ModuleChunkFormatPlugin {
 						);
 					}
 
-					const entryOptions = chunk.getEntryOptions();
-					const library =
-						entryOptions && entryOptions.library !== undefined
-							? entryOptions.library
-							: runtimeTemplate.outputOptions.library;
-					// A module library awaits the entry itself, in `ModuleLibraryPlugin`.
-					const canAwaitEntry =
-						runtimeTemplate.supportsTopLevelAwait() &&
-						!(library !== undefined && library.type === "module");
+					const canAwaitEntry = runtimeTemplate.supportsTopLevelAwait();
 					/** @type {string[]} */
 					const awaitedEntries = [];
 					/** @type {Set<Chunk>} */
@@ -267,7 +286,7 @@ class ModuleChunkFormatPlugin {
 						const chunks = getAllChunks(
 							/** @type {Entrypoint} */ (entrypoint),
 							chunk,
-							/** @type {Chunk} */ (runtimeChunk)
+							runtimeChunk
 						);
 						/** @type {Set<Chunk>} */
 						const processChunks = new Set();
@@ -328,14 +347,22 @@ class ModuleChunkFormatPlugin {
 					for (const line of renderAwaitedEntries(awaitedEntries)) {
 						startupSource.add(`${line}\n`);
 					}
+					const exportsAwaited = awaitedEntries.includes(
+						RuntimeGlobals.exports
+					);
 
 					entrySource.add(
 						hooks.renderStartup.call(
 							startupSource,
 							entries[entries.length - 1][0],
 							inlinedEntryModule
-								? { ...renderContext, inlined: true, inlinedInIIFE: false }
-								: renderContext
+								? {
+										...renderContext,
+										inlined: true,
+										inlinedInIIFE: false,
+										exportsAwaited
+									}
+								: { ...renderContext, exportsAwaited }
 						)
 					);
 					return entrySource;
@@ -343,6 +370,14 @@ class ModuleChunkFormatPlugin {
 				return source;
 			});
 			hooks.chunkHash.tap(PLUGIN_NAME, createChunkHashHandler(PLUGIN_NAME));
+			hooks.chunkHash.tap(PLUGIN_NAME, (chunk, hash, { chunkGraph }) => {
+				// WHY: the startup imports these chunks by their hashed filenames, so a
+				// cached render keyed by this hash must not outlive one of them;
+				// `Compilation#createHash` hashes them before this chunk.
+				for (const c of getImportedChunks(chunk, chunkGraph)) {
+					if (chunkHasJs(c, chunkGraph)) hash.update(`${c.hash}`);
+				}
+			});
 		});
 	}
 }

package/lib/esm/ModuleChunkLoadingPlugin.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 these
 const getExportWebpackRequireRuntimeModule = lazyModule(() =>

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -6,25 +6,25 @@
 
 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");
 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");
 const { RESOLVABLE_SPECIFIER_REGEXP } = require("../util/identifier");
 const memoize = require("../util/memoize");
 
-const getAPIPlugin = memoize(() => require("../APIPlugin"));
+const getAPIPlugin = memoize(() => require("../javascript/APIPlugin"));
 
-/** @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" */
 
 const createCompilationHooks = () => ({
 	/**
@@ -568,7 +568,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 							}()).then(${runtimeTemplate.basicFunction("obj", [
 								"return obj.default;"
 							])}, ${runtimeTemplate.basicFunction("error", [
-								"if(['MODULE_NOT_FOUND', 'ENOENT'].includes(error.code)) return;",
+								"if(['MODULE_NOT_FOUND', 'ERR_MODULE_NOT_FOUND', 'ENOENT'].includes(error.code)) return;",
 								"throw error;"
 							])});`
 						])};`

package/lib/{ExternalModule.js → externals/ExternalModule.js}

@@ -7,36 +7,38 @@
 
 const { SyncBailHook } = require("tapable");
 const { OriginalSource, RawSource } = require("webpack-sources");
-const ConcatenationScope = require("./ConcatenationScope");
-const { UsageState } = require("./ExportsInfo");
-const InitFragment = require("./InitFragment");
-const Module = require("./Module");
+const WebpackError = require("../WebpackError");
+const { DEFAULTS } = require("../config/defaults");
+const { ImportPhaseUtils } = require("../dependencies/core/ImportPhase");
+const StaticExportsDependency = require("../dependencies/core/StaticExportsDependency");
+const { UsageState } = require("../graph/ExportsInfo");
+const Module = require("../module/Module");
 const {
 	ASSET_URL_TYPE,
 	ASSET_URL_TYPES,
 	CSS_IMPORT_TYPES,
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES
-} = require("./ModuleSourceTypeConstants");
-const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
-const RuntimeGlobals = require("./RuntimeGlobals");
-const Template = require("./Template");
-const WebpackError = require("./WebpackError");
-const { DEFAULTS } = require("./config/defaults");
-const { ImportPhaseUtils } = require("./dependencies/ImportPhase");
-const StaticExportsDependency = require("./dependencies/StaticExportsDependency");
-const { coreModules } = require("./node/nodeBuiltins");
-const createHash = require("./util/createHash");
-const createHooksRegistry = require("./util/createHooksRegistry");
-const extractUrlAndGlobal = require("./util/extractUrlAndGlobal");
-const { toJsStringLiteral } = require("./util/identifier");
-const makeSerializable = require("./util/makeSerializable");
-const memoize = require("./util/memoize");
-const { propertyAccess } = require("./util/property");
-const { register } = require("./util/serialization");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../module/ModuleTypeConstants");
+const { coreModules } = require("../node/nodeBuiltins");
+const ConcatenationScope = require("../optimize/ConcatenationScope");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const InitFragment = require("../template/InitFragment");
+const Template = require("../template/Template");
+const createHash = require("../util/createHash");
+const createHooksRegistry = require("../util/createHooksRegistry");
+const { toJsStringLiteral } = require("../util/identifier");
+const makeSerializable = require("../util/makeSerializable");
+const memoize = require("../util/memoize");
+const { propertyAccess } = require("../util/property");
+const { register, registerLegacyRequest } = require("../util/serialization");
+const extractUrlAndGlobal = require("./extractUrlAndGlobal");
 
 const getEnvironmentNotSupportAsyncWarning = memoize(() =>
-	require("./errors/EnvironmentNotSupportAsyncWarning")
+	require("../errors/EnvironmentNotSupportAsyncWarning")
 );
 
 /** @import { Source } from "webpack-sources" */
@@ -45,19 +47,18 @@ const getEnvironmentNotSupportAsyncWarning = memoize(() =>
  * 	ExternalsType,
  * 	HashFunction,
  * 	ExternalItemInterop as ExternalInterop
- * } from "../declarations/WebpackOptions"
+ * } from "../../declarations/WebpackOptions"
  */
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
- * } from "./config/defaults"
+ * } from "../config/defaults"
  */
-/** @import Chunk from "./Chunk" */
-/** @import ChunkGraph, { ModuleId } from "./ChunkGraph" */
-/** @import Compilation, { UnsafeCacheData } from "./Compilation" */
-/** @import { UpdateHashContext } from "./Dependency" */
-/** @import ExportsInfo from "./ExportsInfo" */
-/** @import { GenerateContext } from "./Generator" */
+/** @import Chunk from "../graph/Chunk" */
+/** @import ChunkGraph, { ModuleId } from "../graph/ChunkGraph" */
+/** @import Compilation, { UnsafeCacheData } from "../Compilation" */
+/** @import { UpdateHashContext } from "../graph/Dependency" */
+/** @import ExportsInfo from "../graph/ExportsInfo" */
 /**
  * @import {
  * 	BuildMeta,
@@ -74,27 +75,29 @@ const getEnvironmentNotSupportAsyncWarning = memoize(() =>
  * 	RuntimeRequirements,
  * 	ReadOnlyRuntimeRequirements,
  * 	Sources,
- * 	SourceTypes
- * } from "./Module"
+ * 	SourceTypes,
+ * 	ModuleKinds
+ * } from "../module/Module"
  */
-/** @import ModuleGraph from "./ModuleGraph" */
-/** @import { ConnectionState } from "./ModuleGraphConnection" */
-/** @import NormalModuleFactory from "./NormalModuleFactory" */
-/** @import RequestShortener from "./RequestShortener" */
-/** @import { ResolverWithOptions } from "./ResolverFactory" */
-/** @import RuntimeTemplate from "./RuntimeTemplate" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import { ConnectionState } from "../graph/ModuleGraphConnection" */
+/** @import NormalModuleFactory from "../module/NormalModuleFactory" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
 /**
  * @import {
- * 	ChunkRenderContext
- * } from "./javascript/JavascriptModulesPlugin"
+ * 	ChunkRenderContext,
+ * 	ChunkRenderContext as GenerateContext
+ * } from "../javascript/JavascriptModulesPlugin"
  */
-/** @import { ImportAttributes } from "./javascript/JavascriptParser" */
-/** @import { ImportPhaseType } from "./dependencies/ImportPhase" */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext<[ExternalModuleRequest, ExternalsType, string, DependencyMeta | undefined, ExternalInterop | undefined, boolean | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext<[ExternalModuleRequest, ExternalsType, string, DependencyMeta | undefined, ExternalInterop | undefined, boolean | undefined]>} ObjectSerializerContext */
-/** @import Hash from "./util/Hash" */
-/** @import { InputFileSystem } from "./util/fs" */
-/** @import { RuntimeSpec } from "./util/runtime" */
+/** @import { ImportAttributes } from "../javascript/JavascriptParser" */
+/** @import { ImportPhaseType } from "../dependencies/core/ImportPhase" */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ExternalModuleRequest, ExternalsType, string, DependencyMeta | undefined, ExternalInterop | undefined, boolean | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ExternalModuleRequest, ExternalsType, string, DependencyMeta | undefined, ExternalInterop | undefined, boolean | undefined]>} ObjectSerializerContext */
+/** @import Hash from "../util/Hash" */
+/** @import { InputFileSystem } from "../fs/fs" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 /** @typedef {{ attributes?: ImportAttributes, phase?: ImportPhaseType, externalType: "import" | "module" | undefined }} ImportDependencyMeta */
 /** @typedef {{ layer?: string, supports?: string, media?: string }} CssImportDependencyMeta */
@@ -247,7 +250,7 @@ const getExternalModuleNodeCommonjsInitFragment = (
 	if (!universal) {
 		return new InitFragment(
 			`import { createRequire as __WEBPACK_EXTERNAL_createRequire } from ${moduleId};\n${runtimeTemplate.renderConst()} __WEBPACK_EXTERNAL_createRequire_require = __WEBPACK_EXTERNAL_createRequire(${importMetaName}.url);\n`,
-			InitFragment.STAGE_HARMONY_IMPORTS,
+			InitFragment.STAGE_ESM_IMPORTS,
 			0,
 			"external module node-commonjs"
 		);
@@ -261,7 +264,7 @@ const getExternalModuleNodeCommonjsInitFragment = (
 
 	return new InitFragment(
 		content,
-		InitFragment.STAGE_HARMONY_IMPORTS,
+		InitFragment.STAGE_ESM_IMPORTS,
 		0,
 		"external module node-commonjs universal"
 	);
@@ -470,7 +473,7 @@ class ModuleExternalInitFragment extends InitFragment {
 
 		super(
 			"",
-			InitFragment.STAGE_HARMONY_IMPORTS,
+			InitFragment.STAGE_ESM_IMPORTS,
 			0,
 			`external module import ${ident} ${
 				imported === true ? imported : imported.join(" ")
@@ -589,7 +592,7 @@ class ModuleExternalInitFragment extends InitFragment {
 
 register(
 	ModuleExternalInitFragment,
-	"webpack/lib/ExternalModule",
+	"webpack/lib/externals/ExternalModule",
 	"ModuleExternalInitFragment",
 	{
 		serialize(obj, { write }) {
@@ -763,9 +766,7 @@ const getSourceForModuleExternal = (
 		runtimeRequirements: moduleRemapping
 			? RUNTIME_REQUIREMENTS_FOR_MODULE
 			: undefined,
-		chunkInitFragments: [
-			/** @type {InitFragment<EXPECTED_ANY>} */ (initFragment)
-		]
+		chunkInitFragments: [initFragment]
 	};
 };
 
@@ -980,7 +981,7 @@ class ExternalModule extends Module {
 		// resolved, so a type rendering no javascript is never reported as a
 		// javascript module — that would emit a dead `false` factory in the chunk
 		const type = this._resolveExternalType(this.externalType);
-		// TODO webpack 6 drop "css-url" once the alias is removed
+		// TODO in the next major release: drop "css-url" once the alias is removed
 		if (type === ASSET_URL_TYPE || type === "css-url") {
 			return ASSET_URL_TYPES;
 		}
@@ -1236,6 +1237,8 @@ class ExternalModule extends Module {
 	}
 
 	/**
+	 * Whether a concatenation may defer this module behind its lazy CommonJS
+	 * accessor. A generator ignoring `ConcatenationScope#isWrapped` answers false.
 	 * @returns {boolean} true, when it may be wrapped
 	 */
 	canBeWrappedInConcatenation() {
@@ -1291,7 +1294,7 @@ class ExternalModule extends Module {
 			}
 			return "module";
 		} else if (
-			// TODO webpack 6 drop "css-url" once the alias is removed
+			// TODO in the next major release: drop "css-url" once the alias is removed
 			externalType === "asset" ||
 			externalType === ASSET_URL_TYPE ||
 			externalType === "css-url"
@@ -1359,7 +1362,8 @@ class ExternalModule extends Module {
 				const { node } = runtimeTemplate.compilation.options.externalsPresets;
 				// ESM has no `require`; load via `createRequire` when the target is node
 				const createRequireInModule =
-					/** @type {BuildInfo} */ (this.buildInfo).javascriptModule &&
+					/** @type {ExternalModuleBuildInfo} */ (this.buildInfo)
+						.javascriptModule &&
 					(externalType === "node-commonjs" || Boolean(node));
 				if (!createRequireInModule) {
 					return getSourceForCommonJsExternal(request);
@@ -1396,7 +1400,12 @@ class ExternalModule extends Module {
 			case "script":
 				return getSourceForScriptExternal(request, runtimeTemplate);
 			case "module": {
-				if (!(/** @type {BuildInfo} */ (this.buildInfo).javascriptModule)) {
+				if (
+					!(
+						/** @type {ExternalModuleBuildInfo} */ (this.buildInfo)
+							.javascriptModule
+					)
+				) {
 					if (!runtimeTemplate.supportsDynamicImport()) {
 						throw new Error(
 							`The target environment doesn't support dynamic import() syntax so it's not possible to use external type 'module' within a script${
@@ -1464,7 +1473,7 @@ class ExternalModule extends Module {
 				data.set("url", { javascript: /** @type {string} */ (request) });
 				return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS, data };
 			}
-			// TODO webpack 6 remove "css-url" alias
+			// TODO in the next major release: remove "css-url" alias
 			case "css-url":
 			case "asset-url": {
 				/** @type {Sources} */
@@ -1506,8 +1515,7 @@ class ExternalModule extends Module {
 				// renders the plain `module.exports =` form: its exports are read
 				// through the wrapper accessor, not through a shared-scope binding.
 				const wrapped = Boolean(
-					concatenationScope &&
-					/** @type {ConcatenationScope} */ (concatenationScope).isWrapped()
+					concatenationScope && concatenationScope.isWrapped()
 				);
 				const sourceData = this._getSourceData(
 					request,
@@ -1573,7 +1581,7 @@ class ExternalModule extends Module {
 				}
 
 				let runtimeRequirements = sourceData.runtimeRequirements;
-				if (!concatenationScope) {
+				if (!concatenationScope || wrapped) {
 					if (!runtimeRequirements) {
 						runtimeRequirements = RUNTIME_REQUIREMENTS;
 					} else {
@@ -1674,10 +1682,29 @@ ExternalModule.getCompilationHooks = createHooksRegistry(
 	createCompilationHooks
 );
 
-makeSerializable(ExternalModule, "webpack/lib/ExternalModule");
+makeSerializable(ExternalModule, [
+	"webpack/lib/externals/ExternalModule",
+	// TODO in the next major release: remove, it restores caches written
+	// before this moved into lib/externals/
+	"webpack/lib/ExternalModule"
+]);
+
+// WHY: `ModuleExternalInitFragment` is registered with `register` and a
+// serializer of its own, not `makeSerializable`, so the request it moved from
+// cannot ride along in the array above.
+// TODO in the next major release: remove, it restores caches written
+// before this moved into lib/externals/
+registerLegacyRequest(
+	ModuleExternalInitFragment,
+	"webpack/lib/ExternalModule",
+	"ModuleExternalInitFragment"
+);
 
 ExternalModule.ModuleExternalInitFragment = ModuleExternalInitFragment;
 ExternalModule.getExternalModuleNodeCommonjsInitFragment =
 	getExternalModuleNodeCommonjsInitFragment;
 
+/** @type {Set<keyof ModuleKinds>} */
+ExternalModule.KINDS = new Set([...Module.KINDS, "external"]);
+
 module.exports = ExternalModule;