webpack 5.101.2 → 5.102.0

package/lib/ContextReplacementPlugin.js

@@ -10,6 +10,8 @@ const { join } = require("./util/fs");
 
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./ContextModule").ContextModuleOptions} ContextModuleOptions */
+/** @typedef {import("./ContextModuleFactory").BeforeContextResolveData} BeforeContextResolveData */
+/** @typedef {import("./ContextModuleFactory").AfterContextResolveData} AfterContextResolveData */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
 /** @typedef {Record<string, string>} NewContentCreateContextMap */
@@ -19,7 +21,7 @@ const PLUGIN_NAME = "ContextReplacementPlugin";
 class ContextReplacementPlugin {
 	/**
 	 * @param {RegExp} resourceRegExp A regular expression that determines which files will be selected
-	 * @param {(string | ((context: TODO) => void) | RegExp | boolean)=} newContentResource A new resource to replace the match
+	 * @param {(string | ((context: BeforeContextResolveData | AfterContextResolveData) => void) | RegExp | boolean)=} newContentResource A new resource to replace the match
 	 * @param {(boolean | NewContentCreateContextMap | RegExp)=} newContentRecursive If true, all subdirectories are searched for matches
 	 * @param {RegExp=} newContentRegExp A regular expression that determines which files will be selected
 	 */
@@ -122,7 +124,14 @@ class ContextReplacementPlugin {
 			});
 			cmf.hooks.afterResolve.tap(PLUGIN_NAME, (result) => {
 				if (!result) return;
-				if (resourceRegExp.test(result.resource)) {
+				const isMatchResourceRegExp = () => {
+					if (Array.isArray(result.resource)) {
+						return result.resource.some((item) => resourceRegExp.test(item));
+					}
+
+					return resourceRegExp.test(result.resource);
+				};
+				if (isMatchResourceRegExp()) {
 					if (newContentResource !== undefined) {
 						if (
 							newContentResource.startsWith("/") ||
@@ -130,10 +139,15 @@ class ContextReplacementPlugin {
 						) {
 							result.resource = newContentResource;
 						} else {
+							const rootPath =
+								typeof result.resource === "string"
+									? result.resource
+									: /** @type {string} */
+										(result.resource.find((item) => resourceRegExp.test(item)));
 							result.resource = join(
 								/** @type {InputFileSystem} */
 								(compiler.inputFileSystem),
-								result.resource,
+								rootPath,
 								newContentResource
 							);
 						}
@@ -153,18 +167,27 @@ class ContextReplacementPlugin {
 					if (typeof newContentCallback === "function") {
 						const origResource = result.resource;
 						newContentCallback(result);
-						if (
-							result.resource !== origResource &&
-							!result.resource.startsWith("/") &&
-							(result.resource.length <= 1 || result.resource[1] !== ":")
-						) {
-							// When the function changed it to an relative path
-							result.resource = join(
-								/** @type {InputFileSystem} */
-								(compiler.inputFileSystem),
-								origResource,
-								result.resource
-							);
+						if (result.resource !== origResource) {
+							const newResource = Array.isArray(result.resource)
+								? result.resource
+								: [result.resource];
+
+							for (let i = 0; i < newResource.length; i++) {
+								if (
+									!newResource[i].startsWith("/") &&
+									(newResource[i].length <= 1 || newResource[i][1] !== ":")
+								) {
+									// When the function changed it to an relative path
+									newResource[i] = join(
+										/** @type {InputFileSystem} */
+										(compiler.inputFileSystem),
+										origResource[i],
+										newResource[i]
+									);
+								}
+							}
+
+							result.resource = newResource;
 						}
 					} else {
 						for (const d of result.dependencies) {

package/lib/DefinePlugin.js

@@ -22,14 +22,14 @@ const {
 const createHash = require("./util/createHash");
 
 /** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("../declarations/WebpackOptions").HashFunction} HashFunction */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
+/** @typedef {import("./Module").ValueCacheVersion} ValueCacheVersion */
 /** @typedef {import("./Module").ValueCacheVersions} ValueCacheVersions */
 /** @typedef {import("./NormalModule")} NormalModule */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("./javascript/JavascriptParser").DestructuringAssignmentProperty} DestructuringAssignmentProperty */
+/** @typedef {import("./javascript/JavascriptParser").DestructuringAssignmentProperties} DestructuringAssignmentProperties */
 /** @typedef {import("./javascript/JavascriptParser").Range} Range */
 /** @typedef {import("./logging/Logger").Logger} Logger */
 
@@ -45,7 +45,6 @@ const createHash = require("./util/createHash");
  * @property {string| (() => string)=} version
  */
 
-/** @typedef {string | Set<string>} ValueCacheVersion */
 /** @typedef {(value: { module: NormalModule, key: string, readonly version: ValueCacheVersion }) => CodeValuePrimitive} GeneratorFn */
 
 class RuntimeValue {
@@ -125,7 +124,7 @@ class RuntimeValue {
 }
 
 /**
- * @param {Set<DestructuringAssignmentProperty> | undefined} properties properties
+ * @param {DestructuringAssignmentProperties | undefined} properties properties
  * @returns {Set<string> | undefined} used keys
  */
 function getObjKeys(properties) {
@@ -376,10 +375,7 @@ class DefinePlugin {
 				);
 				const { runtimeTemplate } = compilation;
 
-				const mainHash = createHash(
-					/** @type {HashFunction} */
-					(compilation.outputOptions.hashFunction)
-				);
+				const mainHash = createHash(compilation.outputOptions.hashFunction);
 				mainHash.update(
 					/** @type {string} */
 					(compilation.valueCacheVersions.get(VALUE_DEP_MAIN)) || ""
@@ -489,6 +485,13 @@ class DefinePlugin {
 								if (nested && !hooked.has(nested)) {
 									// only detect the same nested key once
 									hooked.add(nested);
+									parser.hooks.collectDestructuringAssignmentProperties.tap(
+										PLUGIN_NAME,
+										(expr) => {
+											const nameInfo = parser.getNameForExpression(expr);
+											if (nameInfo && nameInfo.name === nested) return true;
+										}
+									);
 									parser.hooks.expression.for(nested).tap(
 										{
 											name: PLUGIN_NAME,
@@ -687,6 +690,13 @@ class DefinePlugin {
 								PLUGIN_NAME,
 								withValueDependency(key, evaluateToString("object"))
 							);
+						parser.hooks.collectDestructuringAssignmentProperties.tap(
+							PLUGIN_NAME,
+							(expr) => {
+								const nameInfo = parser.getNameForExpression(expr);
+								if (nameInfo && nameInfo.name === key) return true;
+							}
+						);
 						parser.hooks.expression.for(key).tap(PLUGIN_NAME, (expr) => {
 							addValueDependency(key);
 							let strCode = stringifyObj(

package/lib/DelegatedModule.js

@@ -14,30 +14,26 @@ const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDepende
 const StaticExportsDependency = require("./dependencies/StaticExportsDependency");
 const makeSerializable = require("./util/makeSerializable");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptions} DllReferencePluginOptions */
-/** @typedef {import("./ChunkGraph")} ChunkGraph */
+/** @typedef {import("./config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Generator").SourceTypes} SourceTypes */
 /** @typedef {import("./LibManifestPlugin").ManifestModuleData} ManifestModuleData */
+/** @typedef {import("./Module").ModuleId} ModuleId */
 /** @typedef {import("./Module").BuildCallback} BuildCallback */
 /** @typedef {import("./Module").BuildMeta} BuildMeta */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Module").LibIdentOptions} LibIdentOptions */
+/** @typedef {import("./Module").LibIdent} LibIdent */
 /** @typedef {import("./Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
-/** @typedef {import("./Module").SourceContext} SourceContext */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("./WebpackError")} WebpackError */
-/** @typedef {import("./dependencies/ModuleDependency")} ModuleDependency */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @typedef {import("./dependencies/StaticExportsDependency").Exports} Exports */
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
@@ -48,8 +44,8 @@ const makeSerializable = require("./util/makeSerializable");
 /**
  * @typedef {object} DelegatedModuleData
  * @property {BuildMeta=} buildMeta build meta
- * @property {true | string[]=} exports exports
- * @property {number | string} id module id
+ * @property {Exports=} exports exports
+ * @property {ModuleId} id module id
  */
 
 const RUNTIME_REQUIREMENTS = new Set([
@@ -89,7 +85,7 @@ class DelegatedModule extends Module {
 
 	/**
 	 * @param {LibIdentOptions} options options
-	 * @returns {string | null} an identifier for library inclusion
+	 * @returns {LibIdent | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
 		return typeof this.originalRequest === "string"

package/lib/DependenciesBlock.js

@@ -8,8 +8,6 @@
 const makeSerializable = require("./util/makeSerializable");
 
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
-/** @typedef {import("./ChunkGraph")} ChunkGraph */
-/** @typedef {import("./ChunkGroup")} ChunkGroup */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */

package/lib/Dependency.js

@@ -7,10 +7,8 @@
 
 const memoize = require("./util/memoize");
 
-/** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
-/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
 /** @typedef {import("./ModuleGraphConnection")} ModuleGraphConnection */
@@ -62,10 +60,12 @@ const memoize = require("./util/memoize");
  * @property {boolean=} hidden export is not visible, because another export blends over it
  */
 
+/** @typedef {Set<string>} ExportsSpecExcludeExports */
+
 /**
  * @typedef {object} ExportsSpec
  * @property {(string | ExportSpec)[] | true | null} exports exported names, true for unknown exports or null for no exports
- * @property {Set<string>=} excludeExports when exports = true, list of unaffected exports
+ * @property {ExportsSpecExcludeExports=} excludeExports when exports = true, list of unaffected exports
  * @property {(Set<string> | null)=} hideExports list of maybe prior exposed, but now hidden exports
  * @property {ModuleGraphConnection=} from when reexported: from which module
  * @property {number=} priority when reexported: with which priority
@@ -80,6 +80,9 @@ const memoize = require("./util/memoize");
  * @property {boolean=} canMangle when false, referenced export can not be mangled, defaults to true
  */
 
+/** @typedef {string[][]} RawReferencedExports */
+/** @typedef {(string[] | ReferencedExport)[]} ReferencedExports */
+
 /** @typedef {(moduleGraphConnection: ModuleGraphConnection, runtime: RuntimeSpec) => ConnectionState} GetConditionFn */
 
 const TRANSITIVE = Symbol("transitive");
@@ -105,9 +108,6 @@ class Dependency {
 		this.weak = false;
 		// TODO check if this can be moved into ModuleDependency
 		/** @type {boolean | undefined} */
-		this.defer = false;
-		// TODO check if this can be moved into ModuleDependency
-		/** @type {boolean | undefined} */
 		this.optional = false;
 		this._locSL = 0;
 		this._locSC = 0;
@@ -230,7 +230,7 @@ class Dependency {
 	 * Returns list of exports referenced by this dependency
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {RuntimeSpec} runtime the runtime for which the module is analysed
-	 * @returns {(string[] | ReferencedExport)[]} referenced exports
+	 * @returns {ReferencedExports} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		return Dependency.EXPORTS_OBJECT_REFERENCED;
@@ -315,7 +315,6 @@ class Dependency {
 		write(this._locEC);
 		write(this._locI);
 		write(this._locN);
-		write(this.defer);
 	}
 
 	/**
@@ -330,13 +329,12 @@ class Dependency {
 		this._locEC = read();
 		this._locI = read();
 		this._locN = read();
-		this.defer = read();
 	}
 }
 
-/** @type {string[][]} */
+/** @type {RawReferencedExports} */
 Dependency.NO_EXPORTS_REFERENCED = [];
-/** @type {string[][]} */
+/** @type {RawReferencedExports} */
 Dependency.EXPORTS_OBJECT_REFERENCED = [[]];
 
 // TODO remove in webpack 6

package/lib/DependencyTemplates.js

@@ -8,12 +8,10 @@
 const { DEFAULTS } = require("./config/defaults");
 const createHash = require("./util/createHash");
 
-/** @typedef {import("./Dependency")} Dependency */
+/** @typedef {import("./Compilation").DependencyConstructor} DependencyConstructor */
 /** @typedef {import("./DependencyTemplate")} DependencyTemplate */
 /** @typedef {typeof import("./util/Hash")} Hash */
 
-/** @typedef {new (...args: EXPECTED_ANY[]) => Dependency} DependencyConstructor */
-
 class DependencyTemplates {
 	/**
 	 * @param {string | Hash} hashFunction the hash function to use

package/lib/DllModule.js

@@ -12,24 +12,18 @@ const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const makeSerializable = require("./util/makeSerializable");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
-/** @typedef {import("./ChunkGraph")} ChunkGraph */
+/** @typedef {import("./config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Generator").SourceTypes} SourceTypes */
 /** @typedef {import("./Module").BuildCallback} BuildCallback */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
-/** @typedef {import("./Module").SourceContext} SourceContext */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
-/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("./WebpackError")} WebpackError */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./util/Hash")} Hash */

package/lib/DllReferencePlugin.js

@@ -84,7 +84,7 @@ class DllReferencePlugin {
 							// Store the error in the params so that it can
 							// be added as a compilation error later on.
 							const manifestPath = makePathsRelative(
-								/** @type {string} */ (compiler.options.context),
+								compiler.context,
 								manifest,
 								compiler.root
 							);
@@ -142,9 +142,7 @@ class DllReferencePlugin {
 				source,
 				type: this.options.type,
 				scope: this.options.scope,
-				context:
-					/** @type {string} */
-					(this.options.context || compiler.options.context),
+				context: this.options.context || compiler.context,
 				content:
 					/** @type {DllReferencePluginOptionsContent} */
 					(resolvedContent),

package/lib/DynamicEntryPlugin.js

@@ -11,8 +11,6 @@ const EntryDependency = require("./dependencies/EntryDependency");
 
 /** @typedef {import("../declarations/WebpackOptions").EntryDescriptionNormalized} EntryDescriptionNormalized */
 /** @typedef {import("../declarations/WebpackOptions").EntryDynamicNormalized} EntryDynamic */
-/** @typedef {import("../declarations/WebpackOptions").EntryItem} EntryItem */
-/** @typedef {import("../declarations/WebpackOptions").EntryStaticNormalized} EntryStatic */
 /** @typedef {import("./Compiler")} Compiler */
 
 const PLUGIN_NAME = "DynamicEntryPlugin";

package/lib/EntryOptionPlugin.js

@@ -76,11 +76,6 @@ class EntryOptionPlugin {
 			wasmLoading: desc.wasmLoading,
 			library: desc.library
 		};
-		if (desc.layer !== undefined && !compiler.options.experiments.layers) {
-			throw new Error(
-				"'entryOptions.layer' is only allowed when 'experiments.layers' is enabled"
-			);
-		}
 		if (desc.chunkLoading) {
 			const EnableChunkLoadingPlugin = require("./javascript/EnableChunkLoadingPlugin");
 

package/lib/EnvironmentNotSupportAsyncWarning.js

@@ -9,10 +9,7 @@ const WebpackError = require("./WebpackError");
 const makeSerializable = require("./util/makeSerializable");
 
 /** @typedef {import("./Module")} Module */
-/** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {"asyncWebAssembly" | "topLevelAwait" | "external promise" | "external script" | "external import" | "external module"} Feature */
 
 class EnvironmentNotSupportAsyncWarning extends WebpackError {

package/lib/EvalDevToolModulePlugin.js

@@ -12,7 +12,8 @@ const RuntimeGlobals = require("./RuntimeGlobals");
 const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").OutputNormalized} OutputOptions */
+/** @typedef {import("../declarations/WebpackOptions").DevtoolNamespace} DevtoolNamespace */
+/** @typedef {import("../declarations/WebpackOptions").DevtoolModuleFilenameTemplate} DevtoolModuleFilenameTemplate */
 /** @typedef {import("./Compiler")} Compiler */
 
 /** @type {WeakMap<Source, Source>} */
@@ -30,9 +31,9 @@ const devtoolWarning = new RawSource(`/*
 
 /**
  * @typedef {object} EvalDevToolModulePluginOptions
- * @property {OutputOptions["devtoolNamespace"]=} namespace namespace
+ * @property {DevtoolNamespace=} namespace namespace
  * @property {string=} sourceUrlComment source url comment
- * @property {OutputOptions["devtoolModuleFilenameTemplate"]=} moduleFilenameTemplate module filename template
+ * @property {DevtoolModuleFilenameTemplate=} moduleFilenameTemplate module filename template
  */
 
 const PLUGIN_NAME = "EvalDevToolModulePlugin";

package/lib/EvalSourceMapDevToolPlugin.js

@@ -17,7 +17,6 @@ const { makePathsAbsolute } = require("./util/identifier");
 
 /** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
 /** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../declarations/WebpackOptions").DevTool} DevToolOptions */
 /** @typedef {import("../declarations/plugins/SourceMapDevToolPlugin").SourceMapDevToolPluginOptions} SourceMapDevToolPluginOptions */
 /** @typedef {import("./ChunkGraph").ModuleId} ModuleId */
 /** @typedef {import("./Compiler")} Compiler */
@@ -39,9 +38,9 @@ const PLUGIN_NAME = "EvalSourceMapDevToolPlugin";
 
 class EvalSourceMapDevToolPlugin {
 	/**
-	 * @param {SourceMapDevToolPluginOptions | string} inputOptions Options object
+	 * @param {SourceMapDevToolPluginOptions | string=} inputOptions Options object
 	 */
-	constructor(inputOptions) {
+	constructor(inputOptions = {}) {
 		/** @type {SourceMapDevToolPluginOptions} */
 		let options;
 		if (typeof inputOptions === "string") {
@@ -134,7 +133,7 @@ class EvalSourceMapDevToolPlugin {
 
 					// Clone (flat) the sourcemap to ensure that the mutations below do not persist.
 					sourceMap = { ...sourceMap };
-					const context = /** @type {string} */ (compiler.options.context);
+					const context = compiler.context;
 					const root = compiler.root;
 					const modules = sourceMap.sources.map((source) => {
 						if (!source.startsWith("webpack://")) return source;