webpack 5.111.1 → 5.112.1

package/lib/container/ContainerEntryModule.js

@@ -6,16 +6,18 @@
 "use strict";
 
 const { OriginalSource, RawSource } = require("webpack-sources");
-const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
-const Module = require("../Module");
+const StaticExportsDependency = require("../dependencies/core/StaticExportsDependency");
+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");
-const StaticExportsDependency = require("../dependencies/StaticExportsDependency");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
 const makeSerializable = require("../util/makeSerializable");
 const ContainerExposedDependency = require("./ContainerExposedDependency");
 
@@ -36,13 +38,13 @@ const ContainerExposedDependency = require("./ContainerExposedDependency");
  * 	NeedBuildContext,
  * 	Sources,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import RequestShortener from "../RequestShortener" */
-/** @import { ResolverWithOptions } from "../ResolverFactory" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ExposesList, string]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ExposesList, string]>} ObjectSerializerContext */
-/** @import { InputFileSystem } from "../util/fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 
 /**
  * Defines the expose options type used by this module.

package/lib/container/ContainerEntryModuleFactory.js

@@ -5,14 +5,14 @@
 
 "use strict";
 
-const ModuleFactory = require("../ModuleFactory");
+const ModuleFactory = require("../module/ModuleFactory");
 const ContainerEntryModule = require("./ContainerEntryModule");
 
 /**
  * @import {
  * 	ModuleFactoryCallback,
  * 	ModuleFactoryCreateData
- * } from "../ModuleFactory"
+ * } from "../module/ModuleFactory"
  */
 /** @import ContainerEntryDependency from "./ContainerEntryDependency" */
 

package/lib/container/ContainerExposedDependency.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const ModuleDependency = require("../dependencies/ModuleDependency");
+const ModuleDependency = require("../dependencies/core/ModuleDependency");
 const makeSerializable = require("../util/makeSerializable");
 
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string]>} ObjectDeserializerContext */

package/lib/container/ContainerPlugin.js

@@ -11,14 +11,187 @@ const ContainerExposedDependency = require("./ContainerExposedDependency");
 const getModuleFederationCompilationHooks = require("./moduleFederationHooks");
 const { parseOptions } = require("./options");
 
-/**
- * @import {
- * 	ContainerPluginOptions
- * } from "../../declarations/plugins/container/ContainerPlugin"
- */
 /** @import Compiler from "../Compiler" */
 /** @import { ExposesList } from "./ContainerEntryModule" */
 
+/**
+ * @inline
+ * @minLength 1
+ * @pattern ^[A-Za-z_$][A-Za-z0-9_$]*(\.[A-Za-z_$][A-Za-z0-9_$]*)*$
+ * @typedef {string} DottedIdentifier
+ */
+
+/**
+ * @inline
+ * @minLength 1
+ * @absolutePath false
+ * @typedef {string} NonEmptyRelativePath
+ */
+
+/**
+ * @inline
+ * @minLength 1
+ * @typedef {string} NonEmptyString
+ */
+
+/**
+ * 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
+ */
+
+/**
+ * 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
+ */
+
+/**
+ * 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
+ */
+
+/**
+ * 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
+ */
+
+/**
+ * @required name, exposes
+ * @schema plugins/container/ContainerPlugin
+ * @typedef {object} ContainerPluginOptions
+ * @property {Exposes} exposes
+ * @property {NonEmptyRelativePath=} filename The filename for this container relative path inside the `output.path` directory.
+ * @property {LibraryOptions=} library
+ * @property {NonEmptyString} name The name for this container.
+ * @property {EntryRuntime=} runtime
+ * @property {NonEmptyString=} shareScope The name of the share scope which is shared with the host (defaults to 'default').
+ */
+
 const PLUGIN_NAME = "ContainerPlugin";
 
 class ContainerPlugin {

package/lib/container/ContainerReferencePlugin.js

@@ -5,9 +5,9 @@
 
 "use strict";
 
-const ExternalModule = require("../ExternalModule");
-const ExternalsPlugin = require("../ExternalsPlugin");
-const RuntimeGlobals = require("../RuntimeGlobals");
+const ExternalModule = require("../externals/ExternalModule");
+const ExternalsPlugin = require("../externals/ExternalsPlugin");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const FallbackDependency = require("./FallbackDependency");
 const FallbackItemDependency = require("./FallbackItemDependency");
 const FallbackModuleFactory = require("./FallbackModuleFactory");
@@ -17,12 +17,65 @@ const RemoteToExternalDependency = require("./RemoteToExternalDependency");
 const { addDeclaredRemotes } = require("./declaredRemotes");
 const { parseOptions } = require("./options");
 
+/** @import Compiler from "../Compiler" */
+
 /**
- * @import {
- * 	ContainerReferencePluginOptions
- * } from "../../declarations/plugins/container/ContainerReferencePlugin"
+ * @inline
+ * @minLength 1
+ * @typedef {string} NonEmptyString
+ */
+
+/**
+ * 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
+ */
+
+/**
+ * Specifies the default type of externals ('amd*', 'umd*', 'system' and 'jsonp' depend on output.libraryTarget set to the same value).
+ * @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
+ */
+
+/**
+ * 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
+ */
+
+/**
+ * @schema plugins/container/ContainerReferencePlugin
+ * @typedef {object} ContainerReferencePluginOptions
+ * @property {ExternalsType} remoteType The external type of the remote containers.
+ * @property {Remotes} remotes
+ * @property {NonEmptyString=} shareScope The name of the share scope shared with all remotes (defaults to 'default').
  */
-/** @import Compiler from "../Compiler" */
 
 const slashCode = "/".charCodeAt(0);
 const PLUGIN_NAME = "ContainerReferencePlugin";
@@ -120,15 +173,23 @@ class ContainerReferencePlugin {
 								(data.request.length === key.length ||
 									data.request.charCodeAt(key.length) === slashCode)
 							) {
+								// Mirror the registration loop above: the fallback index only
+								// counts non-internal externals, so `internal ` entries must
+								// not advance it or the names drift out of remoteExternals.
+								let i = 0;
+								const externalRequests = config.external.map((external) => {
+									if (external.startsWith("internal ")) {
+										return external.slice(9);
+									}
+									const request = `webpack/container/reference/${key}${
+										i ? `/fallback-${i}` : ""
+									}`;
+									i++;
+									return request;
+								});
 								return new RemoteModule(
 									data.request,
-									config.external.map((external, i) =>
-										external.startsWith("internal ")
-											? external.slice(9)
-											: `webpack/container/reference/${key}${
-													i ? `/fallback-${i}` : ""
-												}`
-									),
+									externalRequests,
 									`.${data.request.slice(key.length)}`,
 									config.shareScope
 								);

package/lib/container/FallbackDependency.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const Dependency = require("../Dependency");
+const Dependency = require("../graph/Dependency");
 const makeSerializable = require("../util/makeSerializable");
 
 /** @import { ExternalRequests } from "./RemoteModule" */

package/lib/container/FallbackItemDependency.js

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

package/lib/container/FallbackModule.js

@@ -6,14 +6,16 @@
 "use strict";
 
 const { RawSource } = require("webpack-sources");
-const Module = require("../Module");
+const Module = require("../module/Module");
 const {
 	JAVASCRIPT_TYPE,
 	JAVASCRIPT_TYPES
-} = require("../ModuleSourceTypeConstants");
-const { WEBPACK_MODULE_TYPE_FALLBACK } = require("../ModuleTypeConstants");
-const RuntimeGlobals = require("../RuntimeGlobals");
-const Template = require("../Template");
+} = require("../module/ModuleSourceTypeConstants");
+const {
+	WEBPACK_MODULE_TYPE_FALLBACK
+} = require("../module/ModuleTypeConstants");
+const RuntimeGlobals = require("../runtime/RuntimeGlobals");
+const Template = require("../template/Template");
 const makeSerializable = require("../util/makeSerializable");
 const FallbackItemDependency = require("./FallbackItemDependency");
 
@@ -22,7 +24,7 @@ const FallbackItemDependency = require("./FallbackItemDependency");
  * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
  * } from "../config/defaults"
  */
-/** @import Chunk from "../Chunk" */
+/** @import Chunk from "../graph/Chunk" */
 /** @import Compilation from "../Compilation" */
 /**
  * @import {
@@ -35,13 +37,13 @@ const FallbackItemDependency = require("./FallbackItemDependency");
  * 	NeedBuildContext,
  * 	Sources,
  * 	SourceTypes
- * } from "../Module"
+ * } from "../module/Module"
  */
-/** @import RequestShortener from "../RequestShortener" */
-/** @import { ResolverWithOptions } from "../ResolverFactory" */
+/** @import RequestShortener from "../util/RequestShortener" */
+/** @import { ResolverWithOptions } from "../resolve/ResolverFactory" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[ExternalRequests]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[ExternalRequests]>} ObjectSerializerContext */
-/** @import { InputFileSystem } from "../util/fs" */
+/** @import { InputFileSystem } from "../fs/fs" */
 /** @import { ExternalRequests } from "./RemoteModule" */
 
 const RUNTIME_REQUIREMENTS = new Set([RuntimeGlobals.module]);

package/lib/container/FallbackModuleFactory.js

@@ -5,14 +5,14 @@
 
 "use strict";
 
-const ModuleFactory = require("../ModuleFactory");
+const ModuleFactory = require("../module/ModuleFactory");
 const FallbackModule = require("./FallbackModule");
 
 /**
  * @import {
  * 	ModuleFactoryCallback,
  * 	ModuleFactoryCreateData
- * } from "../ModuleFactory"
+ * } from "../module/ModuleFactory"
  */
 /** @import FallbackDependency from "./FallbackDependency" */
 

package/lib/container/HoistContainerReferencesPlugin.js

@@ -5,23 +5,22 @@
 
 "use strict";
 
-const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
-const ExternalModule = require("../ExternalModule");
-const { STAGE_ADVANCED } = require("../OptimizationStages");
+const isDependencyKind = require("../graph/isDependencyKind");
+const { STAGE_ADVANCED } = require("../optimize/OptimizationStages");
 const { forEachRuntime } = require("../util/runtime");
 const getModuleFederationCompilationHooks = require("./moduleFederationHooks");
 
 /** @import Compilation from "../Compilation" */
 /** @import Compiler from "../Compiler" */
-/** @import Dependency from "../Dependency" */
-/** @import Module from "../Module" */
+/** @import Dependency from "../graph/Dependency" */
+/** @import Module from "../module/Module" */
 
-const PLUGIN_NAME = "HoistContainerReferences";
+const PLUGIN_NAME = "HoistContainerReferencesPlugin";
 
 /**
  * This class is used to hoist container references in the code.
  */
-class HoistContainerReferences {
+class HoistContainerReferencesPlugin {
 	/**
 	 * Apply the plugin to the compiler.
 	 * @param {Compiler} compiler The webpack compiler instance.
@@ -42,7 +41,7 @@ class HoistContainerReferences {
 			hooks.addFederationRuntimeDependency.tap(PLUGIN_NAME, traceDep);
 
 			compilation.hooks.addEntry.tap(PLUGIN_NAME, (entryDep) => {
-				if (entryDep.type === "entry") {
+				if (isDependencyKind(entryDep, "entry")) {
 					entryExternalsToHoist.add(entryDep);
 				}
 			});
@@ -215,14 +214,14 @@ function getAllReferencedModules(compilation, module, type, includeInitial) {
 						/** @type {Dependency} */
 						(connection.dependency)
 					);
-					if (parentBlock instanceof AsyncDependenciesBlock) {
+					if (parentBlock !== undefined && parentBlock.isAsyncBlock()) {
 						continue;
 					}
 				}
 
 				// Handle 'external' type (collecting only external modules)
 				if (type === "external") {
-					if (connection.module instanceof ExternalModule) {
+					if (connection.module.is("external")) {
 						collectedModules.add(connectedModule);
 					}
 				} else {
@@ -240,4 +239,4 @@ function getAllReferencedModules(compilation, module, type, includeInitial) {
 	return collectedModules;
 }
 
-module.exports = HoistContainerReferences;
+module.exports = HoistContainerReferencesPlugin;