webpack 5.111.0 → 5.112.0

package/lib/container/ModuleFederationPlugin.js

@@ -9,16 +9,315 @@ const isValidExternalsType = require("../../schemas/plugins/container/ExternalsT
 const SharePlugin = require("../sharing/SharePlugin");
 const ContainerPlugin = require("./ContainerPlugin");
 const ContainerReferencePlugin = require("./ContainerReferencePlugin");
-const HoistContainerReferences = require("./HoistContainerReferencesPlugin");
+const HoistContainerReferencesPlugin = require("./HoistContainerReferencesPlugin");
 const getCompilationHooks = require("./moduleFederationHooks");
 
+/** @import Compiler from "../Compiler" */
+
 /**
- * @import {
- * 	ExternalsType,
- * 	ModuleFederationPluginOptions
- * } from "../../declarations/plugins/container/ModuleFederationPlugin"
+ * @inline
+ * @minLength 1
+ * @pattern ^[A-Za-z_$][A-Za-z0-9_$]*(\.[A-Za-z_$][A-Za-z0-9_$]*)*$
+ * @typedef {string} DottedIdentifier
+ */
+
+/**
+ * @inline
+ * @minLength 1
+ * @typedef {string} NonEmptyString
+ */
+
+/**
+ * @inline
+ * @absolutePath false
+ * @typedef {string} RelativePath
+ */
+
+/**
+ * Append the same comment above each import style.
+ * @inline
+ * @typedef {string} AuxiliaryCommentBranch1
+ */
+
+/**
+ * Modules that should be exposed by this container.
+ * @inline
+ * @typedef {ExposesItem | ExposesObject} ExposesBranch1Item
+ */
+
+/**
+ * Modules that should be exposed by this container.
+ * @inline
+ * @typedef {ExposesConfig | ExposesItem | ExposesItems} ExposesObjectValue
+ */
+
+/**
+ * Part of the name of the property exposed globally by a UMD library.
+ * @inline
+ * @typedef {NonEmptyString} LibraryCustomUmdObjectRootBranch1Item
+ */
+
+/**
+ * Part of the export that should be exposed as library.
+ * @inline
+ * @typedef {NonEmptyString} LibraryExportBranch1Item
+ */
+
+/**
+ * A part of the library name.
+ * @inline
+ * @typedef {NonEmptyString} LibraryNameBranch1Item
+ */
+
+/**
+ * @minItems 1
+ * @inline
+ * @typedef {LibraryNameBranch1Item[]} LibraryNameBranch1
+ */
+
+/**
+ * Container locations and request scopes from which modules should be resolved and loaded at runtime.
+ * @inline
+ * @typedef {RemotesItem | RemotesObject} RemotesBranch1Item
+ */
+
+/**
+ * Container locations from which modules should be resolved and loaded at runtime.
+ * @inline
+ * @typedef {RemotesConfig | RemotesItem | RemotesItems} RemotesObjectValue
+ */
+
+/**
+ * Modules that should be shared in the share scope.
+ * @inline
+ * @typedef {SharedItem | SharedObject} SharedBranch1Item
+ */
+
+/**
+ * No provided or fallback module.
+ * @inline
+ * @typedef {false} SharedConfigImportBranch1
+ */
+
+/**
+ * No version requirement check.
+ * @inline
+ * @typedef {false} SharedConfigRequiredVersionBranch1
+ */
+
+/**
+ * Version as string. Can be prefixed with '^' or '~' for minimum matches. Each part of the version should be separated by a dot '.'.
+ * @inline
+ * @typedef {string} SharedConfigRequiredVersionBranch2
+ */
+
+/**
+ * Don't provide a version.
+ * @inline
+ * @typedef {false} SharedConfigVersionBranch1
+ */
+
+/**
+ * Version as string. Each part of the version should be separated by a dot '.'.
+ * @inline
+ * @typedef {string} SharedConfigVersionBranch2
+ */
+
+/**
+ * Modules that should be shared in the share scope.
+ * @inline
+ * @typedef {SharedConfig | SharedItem} SharedObjectValue
+ */
+
+/**
+ * Add a container for define/require functions in the AMD module.
+ * @typedef {NonEmptyString} AmdContainer
+ */
+
+/**
+ * Add a comment in the UMD wrapper.
+ * @typedef {AuxiliaryCommentBranch1 | LibraryCustomUmdCommentObject} AuxiliaryComment
+ */
+
+/**
+ * The name of the runtime chunk. If set a runtime chunk with this name is created or an existing entrypoint is used as runtime.
+ * @typedef {false | NonEmptyString} EntryRuntime
+ */
+
+/**
+ * Modules that should be exposed by this container. When provided, property name is used as public name, otherwise public name is automatically inferred from request.
+ * @typedef {ExposesBranch1Item[] | ExposesObject} Exposes
+ */
+
+/**
+ * Advanced configuration for modules that should be exposed by this container.
+ * @typedef {object} ExposesConfig
+ * @property {ExposesItem | ExposesItems} import Request to a module that should be exposed by this container.
+ * @property {string=} name Custom chunk name for the exposed module.
+ */
+
+/**
+ * Module that should be exposed by this container.
+ * @typedef {NonEmptyString} ExposesItem
+ */
+
+/**
+ * Modules that should be exposed by this container.
+ * @typedef {ExposesItem[]} ExposesItems
+ */
+
+/**
+ * Modules that should be exposed by this container. Property names are used as public paths.
+ * @typedef {{ [key: string]: ExposesObjectValue }} ExposesObject
+ */
+
+/**
+ * Specifies the default type of externals ('amd*', 'umd*', 'system' and 'jsonp' depend on output.libraryTarget set to the same value).
+ * @publishes plugins/container/ExternalsType
+ * @typedef {"var" | "module" | "assign" | "this" | "window" | "self" | "global" | "commonjs" | "commonjs2" | "commonjs-module" | "commonjs-static" | "amd" | "amd-require" | "amd-async" | "umd" | "umd2" | "jsonp" | "system" | "promise" | "import" | "module-import" | "script" | "node-commonjs" | "asset" | "asset-url" | "css-import" | "css-url"} ExternalsType
+ */
+
+/**
+ * Set explicit comments for `commonjs`, `commonjs2`, `amd`, and `root`.
+ * @typedef {object} LibraryCustomUmdCommentObject
+ * @property {string=} amd Set comment for `amd` section in UMD.
+ * @property {string=} commonjs Set comment for `commonjs` (exports) section in UMD.
+ * @property {string=} commonjs2 Set comment for `commonjs2` (module.exports) section in UMD.
+ * @property {string=} root Set comment for `root` (global variable) section in UMD.
+ */
+
+/**
+ * Description object for all UMD variants of the library name.
+ * @typedef {object} LibraryCustomUmdObject
+ * @property {NonEmptyString=} amd Name of the exposed AMD library in the UMD.
+ * @property {NonEmptyString=} commonjs Name of the exposed commonjs export in the UMD.
+ * @property {LibraryCustomUmdObjectRootBranch1Item[] | NonEmptyString=} root Name of the property exposed globally by a UMD library.
+ */
+
+/**
+ * Which modules of an entry the library exposes the exports of: only the last one, or all of them, where a name more than one module binds differently is left out, as 'export *' does.
+ * @since 5.112.0
+ * @typedef {"last" | "all"} LibraryEntryExports
+ */
+
+/**
+ * Specify which export should be exposed as library.
+ * @typedef {LibraryExportBranch1Item[] | NonEmptyString} LibraryExport
+ */
+
+/**
+ * The name of the library (some types allow unnamed libraries too).
+ * @typedef {LibraryNameBranch1 | NonEmptyString | LibraryCustomUmdObject} LibraryName
+ */
+
+/**
+ * Options for library.
+ * @typedef {object} LibraryOptions
+ * @property {AmdContainer=} amdContainer
+ * @property {AuxiliaryComment=} auxiliaryComment
+ * @property {LibraryEntryExports=} entryExports
+ * @property {LibraryExport=} export
+ * @property {LibraryName=} name
+ * @property {LibraryType} type
+ * @property {UmdAmdContainer=} umdAmdContainer
+ * @property {UmdNamedDefine=} umdNamedDefine
+ */
+
+/**
+ * Type of library (types included by default are 'var', 'module', 'assign', 'assign-properties', 'this', 'window', 'self', 'global', 'commonjs', 'commonjs2', 'commonjs-module', 'commonjs-static', 'amd', 'amd-require', 'umd', 'umd2', 'jsonp', 'system', but others might be added by plugins).
+ * @typedef {("var" | "module" | "assign" | "assign-properties" | "this" | "window" | "self" | "global" | "commonjs" | "commonjs2" | "commonjs-module" | "commonjs-static" | "amd" | "amd-require" | "umd" | "umd2" | "jsonp" | "system") | string} LibraryType
+ */
+
+/**
+ * Container locations and request scopes from which modules should be resolved and loaded at runtime. When provided, property name is used as request scope, otherwise request scope is automatically inferred from container location.
+ * @typedef {RemotesBranch1Item[] | RemotesObject} Remotes
+ */
+
+/**
+ * Advanced configuration for container locations from which modules should be resolved and loaded at runtime.
+ * @typedef {object} RemotesConfig
+ * @property {RemotesItem | RemotesItems} external Container locations from which modules should be resolved and loaded at runtime.
+ * @property {NonEmptyString=} shareScope The name of the share scope shared with this remote.
+ */
+
+/**
+ * Container location from which modules should be resolved and loaded at runtime.
+ * @typedef {NonEmptyString} RemotesItem
+ */
+
+/**
+ * Container locations from which modules should be resolved and loaded at runtime.
+ * @typedef {RemotesItem[]} RemotesItems
+ */
+
+/**
+ * Container locations from which modules should be resolved and loaded at runtime. Property names are used as request scopes.
+ * @typedef {{ [key: string]: RemotesObjectValue }} RemotesObject
+ */
+
+/**
+ * Modules that should be shared in the share scope. When provided, property names are used to match requested modules in this compilation.
+ * @typedef {SharedBranch1Item[] | SharedObject} Shared
+ */
+
+/**
+ * Advanced configuration for modules that should be shared in the share scope.
+ * @typedef {object} SharedConfig
+ * @property {boolean=} eager Include the provided and fallback module directly instead behind an async request. This allows to use this shared module in initial load too. All possible shared modules need to be eager too.
+ * @property {SharedModuleFilter=} exclude
+ * @property {SharedConfigImportBranch1 | SharedItem=} import Provided module that should be provided to share scope. Also acts as fallback module if no shared module is found in share scope or version isn't valid. Defaults to the property name.
+ * @property {SharedModuleFilter=} include
+ * @property {NonEmptyString=} packageName Package name to determine required version from description file. This is only needed when package name can't be automatically determined from request.
+ * @property {SharedConfigRequiredVersionBranch1 | SharedConfigRequiredVersionBranch2=} requiredVersion Version requirement from module in share scope.
+ * @property {NonEmptyString=} shareKey Module is looked up under this key from the share scope.
+ * @property {NonEmptyString=} shareScope Share scope name.
+ * @property {boolean=} singleton Allow only a single version of the shared module in share scope (disabled by default).
+ * @property {boolean=} strictVersion Do not accept shared module if version is not valid (defaults to yes, if local fallback module is available and shared module is not a singleton, otherwise no, has no effect if there is no required version specified).
+ * @property {SharedConfigVersionBranch1 | SharedConfigVersionBranch2=} version Version of the provided module. Will replace lower matching versions, but not higher.
+ */
+
+/**
+ * A module that should be shared in the share scope.
+ * @typedef {NonEmptyString} SharedItem
+ */
+
+/**
+ * Filters shared modules by version or request: with 'include' only matching modules are shared, with 'exclude' matching ones are not. A filtered-out module is resolved and bundled as if it wasn't shared.
+ * @since 5.112.0
+ * @typedef {object} SharedModuleFilter
+ * @property {RegExp | NonEmptyString=} request Request remainder after a key ending in a slash (e.g. 'get' for 'lodash/get' under 'lodash/'). Has no effect on other keys.
+ * @property {NonEmptyString=} version Version range the module's version (from its description file or the 'version' option) is tested against. A consumed module is tested through its fallback module, so this has no effect on consumes without one.
+ */
+
+/**
+ * Modules that should be shared in the share scope. Property names are used to match requested modules in this compilation. Relative requests are resolved, module requests are matched unresolved, absolute paths will match resolved requests. A trailing slash will match all requests with this prefix. In this case shareKey must also have a trailing slash.
+ * @typedef {{ [key: string]: SharedObjectValue }} SharedObject
+ */
+
+/**
+ * Add a branch to the UMD wrapper for an AMD-style loader exposing `define` on a container object, given as a dot-separated path, after the `define.amd` branch.
+ * @since 5.110.0
+ * @typedef {DottedIdentifier} UmdAmdContainer
+ */
+
+/**
+ * If `output.libraryTarget` is set to umd and `output.library` is set, setting this to true will name the AMD module.
+ * @typedef {boolean} UmdNamedDefine
+ */
+
+/**
+ * @schema plugins/container/ModuleFederationPlugin
+ * @typedef {object} ModuleFederationPluginOptions
+ * @property {Exposes=} exposes
+ * @property {RelativePath=} filename The filename of the container as relative path inside the `output.path` directory.
+ * @property {LibraryOptions=} library
+ * @property {string=} name The name of the container.
+ * @property {ExternalsType=} remoteType The external type of the remote containers.
+ * @property {Remotes=} remotes
+ * @property {EntryRuntime=} runtime
+ * @property {NonEmptyString=} shareScope Share scope name used for all shared modules (defaults to 'default').
+ * @property {Shared=} shared
  */
-/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "ModuleFederationPlugin";
 
@@ -100,7 +399,7 @@ class ModuleFederationPlugin {
 					shareScope: options.shareScope
 				}).apply(compiler);
 			}
-			new HoistContainerReferences().apply(compiler);
+			new HoistContainerReferencesPlugin().apply(compiler);
 		});
 	}
 }

package/lib/container/RemoteModule.js

@@ -6,13 +6,13 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const Module = require("../Module");
+const Module = require("../module/Module");
 const {
 	JAVASCRIPT_TYPES,
 	REMOTE_AND_SHARE_INIT_TYPES
-} = require("../ModuleSourceTypeConstants");
-const { WEBPACK_MODULE_TYPE_REMOTE } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
+} = require("../module/ModuleSourceTypeConstants");
+const { WEBPACK_MODULE_TYPE_REMOTE } = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 const FallbackDependency = require("./FallbackDependency");
 const RemoteToExternalDependency = require("./RemoteToExternalDependency");
@@ -37,15 +37,16 @@ const RemoteToExternalDependency = require("./RemoteToExternalDependency");
  * 	Sources,
  * 	SourceTypes,
  * 	ExportsType,
- * 	BasicSourceTypes
- * } from "../Module"
+ * 	BasicSourceTypes,
+ * 	ModuleKinds
+ * } from "../module/Module"
  */
-/** @import ModuleGraph from "../ModuleGraph" */
-/** @import RequestShortener from "../RequestShortener" */
-/** @import { ResolverWithOptions } from "../ResolverFactory" */
+/** @import ModuleGraph from "../graph/ModuleGraph" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ExternalRequests, string, string]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ExternalRequests, string, string]>} ObjectSerializerContext */
-/** @import { InputFileSystem } from "../util/fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 const RUNTIME_REQUIREMENTS = new Set([RuntimeGlobals.module]);
 
@@ -253,4 +254,7 @@ class RemoteModule extends Module {
 
 makeSerializable(RemoteModule, "webpack/lib/container/RemoteModule");
 
+/** @type {Set<keyof ModuleKinds>} */
+RemoteModule.KINDS = new Set([...Module.KINDS, "remote"]);
+
 module.exports = RemoteModule;

package/lib/container/RemoteRuntimeModule.js

@@ -5,13 +5,13 @@
 
 "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");
 
-/** @import Chunk, { ChunkId } from "../Chunk" */
-/** @import ChunkGraph, { ModuleId } from "../ChunkGraph" */
+/** @import Chunk, { ChunkId } from "../graph/Chunk" */
+/** @import ChunkGraph, { ModuleId } from "../graph/ChunkGraph" */
 /** @import Compilation from "../Compilation" */
 /** @import RemoteModule from "./RemoteModule" */
 

package/lib/container/RemoteToExternalDependency.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const ModuleDependency = require("../dependencies/ModuleDependency");
+const ModuleDependency = require("../dependencies/core/ModuleDependency");
 const makeSerializable = require("../util/makeSerializable");
 
 class RemoteToExternalDependency extends ModuleDependency {

package/lib/container/moduleFederationHooks.js

@@ -8,7 +8,7 @@
 const { SyncHook } = require("tapable");
 const createHooksRegistry = require("../util/createHooksRegistry");
 
-/** @import Dependency from "../Dependency" */
+/** @import Dependency from "../graph/Dependency" */
 
 const createCompilationHooks = () => ({
 	/**

package/lib/{ContextExclusionPlugin.js → context/ContextExclusionPlugin.js}

@@ -4,7 +4,7 @@
 
 "use strict";
 
-/** @import Compiler from "./Compiler" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "ContextExclusionPlugin";
 

package/lib/{ContextModule.js → context/ContextModule.js}

@@ -6,49 +6,54 @@
 "use strict";
 
 const { OriginalSource, RawSource } = require("webpack-sources");
-const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
-const Module = require("./Module");
+const {
+	getOutgoingAsyncModules
+} = require("../async-modules/AsyncModuleHelpers");
+const {
+	ImportPhase,
+	ImportPhaseUtils
+} = require("../dependencies/core/ImportPhase");
+const { makeWebpackError } = require("../errors/HookWebpackError");
+const WebpackError = require("../errors/WebpackError");
+const AsyncDependenciesBlock = require("../graph/AsyncDependenciesBlock");
+const Module = require("../module/Module");
 const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES
-} = require("./ModuleSourceTypeConstants");
-const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
-const RuntimeGlobals = require("./RuntimeGlobals");
-const Template = require("./Template");
+} = require("../module/ModuleSourceTypeConstants");
 const {
-	getOutgoingAsyncModules
-} = require("./async-modules/AsyncModuleHelpers");
-const { ImportPhase, ImportPhaseUtils } = require("./dependencies/ImportPhase");
-const { makeWebpackError } = require("./errors/HookWebpackError");
-const WebpackError = require("./errors/WebpackError");
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
 const {
 	compareLocations,
 	compareModulesById,
 	compareSelect,
 	concatComparators,
 	keepOriginalOrder
-} = require("./util/comparators");
+} = require("../util/comparators");
 const {
 	contextify,
 	makePathsRelative,
 	parseResource
-} = require("./util/identifier");
-const makeSerializable = require("./util/makeSerializable");
-const { propertyAccess } = require("./util/property");
+} = require("../util/identifier");
+const makeSerializable = require("../util/makeSerializable");
+const { propertyAccess } = require("../util/property");
 
 /** @import { Source } from "webpack-sources" */
-/** @import { ResolveOptions } from "../declarations/WebpackOptions" */
+/** @import { ResolveOptions } from "../../declarations/WebpackOptions" */
 /**
  * @import {
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
- * } from "./config/defaults"
+ * } from "../config/defaults"
  */
-/** @import Chunk, { ChunkId, ChunkName } from "./Chunk" */
-/** @import ChunkGraph, { ModuleId } from "./ChunkGraph" */
-/** @import { RawChunkGroupOptions } from "./ChunkGroup" */
-/** @import Compilation, { FileSystemDependencies } from "./Compilation" */
-/** @import Dependency, { RawReferencedExports } from "./Dependency" */
-/** @import { Snapshot } from "./FileSystemInfo" */
+/** @import Chunk, { ChunkId, ChunkName } from "../graph/Chunk" */
+/** @import ChunkGraph, { ModuleId } from "../graph/ChunkGraph" */
+/** @import { RawChunkGroupOptions } from "../graph/ChunkGroup" */
+/** @import Compilation, { FileSystemDependencies } from "../Compilation" */
+/** @import Dependency, { RawReferencedExports } from "../graph/Dependency" */
+/** @import { Snapshot } from "../fs/FileSystemInfo" */
 /**
  * @import {
  * 	BuildCallback,
@@ -62,18 +67,19 @@ const { propertyAccess } = require("./util/property");
  * 	NeedBuildContext,
  * 	RuntimeRequirements,
  * 	Sources,
- * 	SourceTypes
- * } from "./Module"
+ * 	SourceTypes,
+ * 	ModuleKinds
+ * } from "../module/Module"
  */
-/** @import RequestShortener from "./RequestShortener" */
-/** @import { ResolverWithOptions } from "./ResolverFactory" */
-/** @import RuntimeTemplate from "./RuntimeTemplate" */
-/** @import ContextElementDependency from "./dependencies/ContextElementDependency" */
-/** @import { ImportAttributes } from "./javascript/JavascriptParser" */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext<[string, boolean]>} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext<[string, boolean]>} ObjectSerializerContext */
-/** @import { InputFileSystem } from "./util/fs" */
-/** @import { ImportPhaseType } from "./dependencies/ImportPhase" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
+/** @import RuntimeTemplate from "../template/RuntimeTemplate" */
+/** @import ContextElementDependency from "../dependencies/context/ContextElementDependency" */
+/** @import { ImportAttributes } from "../javascript/JavascriptParser" */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, boolean]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, boolean]>} ObjectSerializerContext */
+/** @import { InputFileSystem } from "../fs/fs" */
+/** @import { ImportPhaseType } from "../dependencies/core/ImportPhase" */
 
 /** @typedef {"sync" | "eager" | "weak" | "async-weak" | "lazy" | "lazy-once"} ContextMode Context mode */
 
@@ -1473,7 +1479,7 @@ module.exports = webpackEmptyAsyncContext;`;
 		const returnModuleObject = this.getReturnModuleObjectSource(fakeMap);
 		const globImportAccess = this.getImportPropertyAccess();
 		const sortedDependencies =
-			/** @type {import("./dependencies/ContextElementDependency")[]} */
+			/** @type {import("../dependencies/context/ContextElementDependency")[]} */
 			(dependencies).sort((a, b) =>
 				a.userRequest < b.userRequest
 					? -1
@@ -1724,6 +1730,14 @@ module.exports = webpackEmptyAsyncContext;`;
 	}
 }
 
-makeSerializable(ContextModule, "webpack/lib/ContextModule");
+makeSerializable(ContextModule, [
+	"webpack/lib/context/ContextModule",
+	// TODO in the next major release: remove, it restores caches written
+	// before this moved into lib/context/
+	"webpack/lib/ContextModule"
+]);
+
+/** @type {Set<keyof ModuleKinds>} */
+ContextModule.KINDS = new Set([...Module.KINDS, "context"]);
 
 module.exports = ContextModule;

package/lib/{ContextModuleFactory.js → context/ContextModuleFactory.js}

@@ -6,25 +6,25 @@
 "use strict";
 
 const { AsyncSeriesWaterfallHook, SyncWaterfallHook } = require("tapable");
-const ContextModule = require("./ContextModule");
-const ModuleFactory = require("./ModuleFactory");
-const ContextElementDependency = require("./dependencies/ContextElementDependency");
-const LazySet = require("./util/LazySet");
-const asyncLib = require("./util/async");
-const { cachedSetProperty } = require("./util/cleverMerge");
-const { createFakeHook } = require("./util/deprecation");
-const { join } = require("./util/fs");
+const ContextElementDependency = require("../dependencies/context/ContextElementDependency");
+const { join } = require("../fs/fs");
+const ModuleFactory = require("../module/ModuleFactory");
+const LazySet = require("../util/LazySet");
+const asyncLib = require("../util/async");
+const { cachedSetProperty } = require("../util/cleverMerge");
+const { createFakeHook } = require("../util/deprecation");
 const {
 	globPatternBaseReachesDir,
 	globUserRequest,
 	isNonExhaustiveImportMetaGlobSkippedDir,
 	resolveContextModuleGlobPattern
-} = require("./util/globUtils");
+} = require("../util/globUtils");
+const ContextModule = require("./ContextModule");
 
-/** @import { ResolvedContextModuleGlobPattern } from "./util/globUtils" */
+/** @import { ResolvedContextModuleGlobPattern } from "../util/globUtils" */
 /** @typedef {(context: string, subResource: string, callback: () => void, resolvedGlobPatterns?: ResolvedContextModuleGlobPattern[]) => void} AddSubDirectoryFn */
 /** @import { ResolveRequest } from "enhanced-resolve" */
-/** @import { FileSystemDependencies } from "./Compilation" */
+/** @import { FileSystemDependencies } from "../Compilation" */
 /**
  * @import {
  * 	ContextModuleOptions,
@@ -36,17 +36,17 @@ const {
  * @import {
  * 	ModuleFactoryCreateData,
  * 	ModuleFactoryCallback
- * } from "./ModuleFactory"
+ * } from "../module/ModuleFactory"
  */
-/** @import ResolverFactory from "./ResolverFactory" */
-/** @import ContextDependency from "./dependencies/ContextDependency" */
+/** @import ResolverFactory from "../resolve/ResolverFactory" */
+/** @import ContextDependency from "../dependencies/context/ContextDependency" */
 
 /**
  * Defines the shared type used by this module.
  * @template T
- * @typedef {import("./util/deprecation").FakeHook<T>} FakeHook<T>
+ * @typedef {import("../util/deprecation").FakeHook<T>} FakeHook<T>
  */
-/** @import { IStats, InputFileSystem } from "./util/fs" */
+/** @import { IStats, InputFileSystem } from "../fs/fs" */
 /** @typedef {{ context: string, request: string }} ContextAlternativeRequest */
 
 /**
@@ -363,7 +363,8 @@ class ContextModuleFactory extends ModuleFactory {
 			referencedExports,
 			category,
 			typePrefix,
-			attributes
+			attributes,
+			phase
 		} = options;
 		const isImportMetaGlob = Boolean(patterns && requestContext);
 		if ((!regExp && !isImportMetaGlob) || !resource) return callback(null, []);
@@ -524,18 +525,17 @@ class ContextModuleFactory extends ModuleFactory {
 												referencedExports,
 												ctx,
 												attributes,
-												contextRequest
+												contextRequest,
+												phase
 											);
 											dep.optional = true;
 											globDeps.push(dep);
 										}
 										return callback();
 									}
-									// Collect for a single batched alternativeRequests call
-									// per directory below. Calling the hook once per file
-									// would pay per-call overhead (closure, resolverFactory
-									// lookup, array allocations) for every file in the
-									// context — which is the bulk of work on rebuilds.
+									// Collected for one batched `alternativeRequests` call per
+									// directory: calling the hook per file would pay its overhead
+									// across the whole context, the bulk of a rebuild.
 									fileObjs.push({
 										context: ctx,
 										request: `.${subResource.slice(ctx.length).replace(/\\/g, "/")}`
@@ -601,7 +601,8 @@ class ContextModuleFactory extends ModuleFactory {
 										referencedExports,
 										alt.context,
 										attributes,
-										contextRequest
+										contextRequest,
+										phase
 									);
 									dep.optional = true;
 									flattenedResult.push(dep);