webpack 5.94.0 → 5.96.0

package/lib/ConcatenationScope.js

@@ -5,31 +5,18 @@
 
 "use strict";
 
+const {
+	DEFAULT_EXPORT,
+	NAMESPACE_OBJECT_EXPORT
+} = require("./util/concatenate");
+
 /** @typedef {import("./Module")} Module */
+/** @typedef {import("./optimize/ConcatenatedModule").ConcatenatedModuleInfo} ConcatenatedModuleInfo */
+/** @typedef {import("./optimize/ConcatenatedModule").ModuleInfo} ModuleInfo */
 
 const MODULE_REFERENCE_REGEXP =
 	/^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?(_directImport)?(?:_asiSafe(\d))?__$/;
 
-const DEFAULT_EXPORT = "__WEBPACK_DEFAULT_EXPORT__";
-const NAMESPACE_OBJECT_EXPORT = "__WEBPACK_NAMESPACE_OBJECT__";
-
-/**
- * @typedef {object} ExternalModuleInfo
- * @property {number} index
- * @property {Module} module
- */
-
-/**
- * @typedef {object} ConcatenatedModuleInfo
- * @property {number} index
- * @property {Module} module
- * @property {Map<string, string>} exportMap mapping from export name to symbol
- * @property {Map<string, string>} rawExportMap mapping from export name to symbol
- * @property {string=} namespaceExportSymbol
- */
-
-/** @typedef {ConcatenatedModuleInfo | ExternalModuleInfo} ModuleInfo */
-
 /**
  * @typedef {object} ModuleReferenceOptions
  * @property {string[]} ids the properties/exports of the module

package/lib/ContextModule.js

@@ -9,6 +9,7 @@ const { OriginalSource, RawSource } = require("webpack-sources");
 const AsyncDependenciesBlock = require("./AsyncDependenciesBlock");
 const { makeWebpackError } = require("./HookWebpackError");
 const Module = require("./Module");
+const { JS_TYPES } = require("./ModuleSourceTypesConstants");
 const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const Template = require("./Template");
@@ -37,13 +38,13 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
+/** @typedef {import("./Generator").SourceTypes} SourceTypes */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
 /** @typedef {import("./Module").BuildMeta} BuildMeta */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
-/** @typedef {import("./Module").SourceTypes} SourceTypes */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
@@ -62,11 +63,11 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {ContextMode} mode
  * @property {boolean} recursive
  * @property {RegExp} regExp
- * @property {"strict"|boolean=} namespaceObject
+ * @property {("strict" | boolean)=} namespaceObject
  * @property {string=} addon
- * @property {string=} chunkName
- * @property {RegExp=} include
- * @property {RegExp=} exclude
+ * @property {(string | null)=} chunkName
+ * @property {(RegExp | null)=} include
+ * @property {(RegExp | null)=} exclude
  * @property {RawChunkGroupOptions=} groupOptions
  * @property {string=} typePrefix
  * @property {string=} category
@@ -104,8 +105,6 @@ const makeSerializable = require("./util/makeSerializable");
 
 const SNAPSHOT_OPTIONS = { timestamp: true };
 
-const TYPES = new Set(["javascript"]);
-
 class ContextModule extends Module {
 	/**
 	 * @param {ResolveDependencies} resolveDependencies function to get dependencies in this context
@@ -160,7 +159,7 @@ class ContextModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return TYPES;
+		return JS_TYPES;
 	}
 
 	/**

package/lib/CssModule.js

@@ -1,6 +1,6 @@
 /*
 	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Alexander Krasnoyarov @alexander-akait
+	Author Alexander Akait @alexander-akait
 */
 
 "use strict";
@@ -14,13 +14,13 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
-/** @typedef {string|undefined} CssLayer */
-/** @typedef {string|undefined} Supports */
-/** @typedef {string|undefined} Media */
-/** @typedef {[CssLayer?, Supports?, Media?]} InheritanceItem */
+/** @typedef {string | undefined} CssLayer */
+/** @typedef {string | undefined} Supports */
+/** @typedef {string | undefined} Media */
+/** @typedef {[CssLayer, Supports, Media]} InheritanceItem */
 /** @typedef {Array<InheritanceItem>} Inheritance */
 
-/** @typedef {NormalModuleCreateData & { cssLayer: CssLayer|null, supports: Supports|null, media: Media|null, inheritance: Inheritance|null }} CSSModuleCreateData */
+/** @typedef {NormalModuleCreateData & { cssLayer: CssLayer, supports: Supports, media: Media, inheritance: Inheritance }} CSSModuleCreateData */
 
 class CssModule extends NormalModule {
 	/**
@@ -127,30 +127,34 @@ class CssModule extends NormalModule {
 	static deserialize(context) {
 		const obj = new CssModule({
 			// will be deserialized by Module
-			layer: null,
+			layer: /** @type {EXPECTED_ANY} */ (null),
 			type: "",
 			// will be filled by updateCacheModule
 			resource: "",
 			context: "",
-			request: null,
-			userRequest: null,
-			rawRequest: null,
-			loaders: null,
-			matchResource: null,
-			parser: null,
-			parserOptions: null,
-			generator: null,
-			generatorOptions: null,
-			resolveOptions: null,
-			cssLayer: null,
-			supports: null,
-			media: null,
-			inheritance: null
+			request: /** @type {EXPECTED_ANY} */ (null),
+			userRequest: /** @type {EXPECTED_ANY} */ (null),
+			rawRequest: /** @type {EXPECTED_ANY} */ (null),
+			loaders: /** @type {EXPECTED_ANY} */ (null),
+			matchResource: /** @type {EXPECTED_ANY} */ (null),
+			parser: /** @type {EXPECTED_ANY} */ (null),
+			parserOptions: /** @type {EXPECTED_ANY} */ (null),
+			generator: /** @type {EXPECTED_ANY} */ (null),
+			generatorOptions: /** @type {EXPECTED_ANY} */ (null),
+			resolveOptions: /** @type {EXPECTED_ANY} */ (null),
+			cssLayer: /** @type {EXPECTED_ANY} */ (null),
+			supports: /** @type {EXPECTED_ANY} */ (null),
+			media: /** @type {EXPECTED_ANY} */ (null),
+			inheritance: /** @type {EXPECTED_ANY} */ (null)
 		});
 		obj.deserialize(context);
 		return obj;
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 * @returns {TODO} Module
+	 */
 	deserialize(context) {
 		const { read } = context;
 		this.cssLayer = read();

package/lib/DefinePlugin.js

@@ -22,9 +22,9 @@ const {
 const createHash = require("./util/createHash");
 
 /** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("./Compilation").ValueCacheVersion} ValueCacheVersion */
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
+/** @typedef {import("./Module").ValueCacheVersions} ValueCacheVersions */
 /** @typedef {import("./NormalModule")} NormalModule */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
@@ -45,6 +45,7 @@ const createHash = require("./util/createHash");
  * @property {string|function(): string=} version
  */
 
+/** @typedef {string | Set<string>} ValueCacheVersion */
 /** @typedef {function({ module: NormalModule, key: string, readonly version: ValueCacheVersion }): CodeValuePrimitive} GeneratorFn */
 
 class RuntimeValue {
@@ -68,7 +69,7 @@ class RuntimeValue {
 
 	/**
 	 * @param {JavascriptParser} parser the parser
-	 * @param {Map<string, ValueCacheVersion>} valueCacheVersions valueCacheVersions
+	 * @param {ValueCacheVersions} valueCacheVersions valueCacheVersions
 	 * @param {string} key the defined key
 	 * @returns {CodeValuePrimitive} code
 	 */
@@ -107,7 +108,9 @@ class RuntimeValue {
 			module: parser.state.module,
 			key,
 			get version() {
-				return valueCacheVersions.get(VALUE_DEP_PREFIX + key);
+				return /** @type {ValueCacheVersion} */ (
+					valueCacheVersions.get(VALUE_DEP_PREFIX + key)
+				);
 			}
 		});
 	}
@@ -136,7 +139,7 @@ function getObjKeys(properties) {
 /**
  * @param {any[]|{[k: string]: any}} obj obj
  * @param {JavascriptParser} parser Parser
- * @param {Map<string, ValueCacheVersion>} valueCacheVersions valueCacheVersions
+ * @param {ValueCacheVersions} valueCacheVersions valueCacheVersions
  * @param {string} key the defined key
  * @param {RuntimeTemplate} runtimeTemplate the runtime template
  * @param {Logger} logger the logger object
@@ -209,7 +212,7 @@ const stringifyObj = (
  * Convert code to a string that evaluates
  * @param {CodeValue} code Code to evaluate
  * @param {JavascriptParser} parser Parser
- * @param {Map<string, ValueCacheVersion>} valueCacheVersions valueCacheVersions
+ * @param {ValueCacheVersions} valueCacheVersions valueCacheVersions
  * @param {string} key the defined key
  * @param {RuntimeTemplate} runtimeTemplate the runtime template
  * @param {Logger} logger the logger object
@@ -377,7 +380,9 @@ class DefinePlugin {
 				 * @returns {void}
 				 */
 				const handler = parser => {
-					const mainValue = compilation.valueCacheVersions.get(VALUE_DEP_MAIN);
+					const mainValue =
+						/** @type {ValueCacheVersion} */
+						(compilation.valueCacheVersions.get(VALUE_DEP_MAIN));
 					parser.hooks.program.tap(PLUGIN_NAME, () => {
 						const buildInfo = /** @type {BuildInfo} */ (
 							parser.state.module.buildInfo
@@ -397,7 +402,8 @@ class DefinePlugin {
 						/** @type {NonNullable<BuildInfo["valueDependencies"]>} */
 						(buildInfo.valueDependencies).set(
 							VALUE_DEP_PREFIX + key,
-							compilation.valueCacheVersions.get(VALUE_DEP_PREFIX + key)
+							/** @type {ValueCacheVersion} */
+							(compilation.valueCacheVersions.get(VALUE_DEP_PREFIX + key))
 						);
 					};
 
@@ -666,7 +672,7 @@ class DefinePlugin {
 				const walkDefinitionsForValues = (definitions, prefix) => {
 					for (const key of Object.keys(definitions)) {
 						const code = definitions[key];
-						const version = toCacheVersion(code);
+						const version = /** @type {string} */ (toCacheVersion(code));
 						const name = VALUE_DEP_PREFIX + prefix + key;
 						mainHash.update(`|${prefix}${key}`);
 						const oldVersion = compilation.valueCacheVersions.get(name);

package/lib/DelegatedModule.js

@@ -7,6 +7,7 @@
 
 const { OriginalSource, RawSource } = require("webpack-sources");
 const Module = require("./Module");
+const { JS_TYPES } = require("./ModuleSourceTypesConstants");
 const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const DelegatedSourceDependency = require("./dependencies/DelegatedSourceDependency");
@@ -19,13 +20,13 @@ const makeSerializable = require("./util/makeSerializable");
 /** @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").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
 /** @typedef {import("./Module").SourceContext} SourceContext */
-/** @typedef {import("./Module").SourceTypes} SourceTypes */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
@@ -40,7 +41,6 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {"require" | "object"} Type */
 /** @typedef {TODO} Data */
 
-const TYPES = new Set(["javascript"]);
 const RUNTIME_REQUIREMENTS = new Set([
 	RuntimeGlobals.module,
 	RuntimeGlobals.require
@@ -74,7 +74,7 @@ class DelegatedModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return TYPES;
+		return JS_TYPES;
 	}
 
 	/**

package/lib/DllModule.js

@@ -7,6 +7,7 @@
 
 const { RawSource } = require("webpack-sources");
 const Module = require("./Module");
+const { JS_TYPES } = require("./ModuleSourceTypesConstants");
 const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const makeSerializable = require("./util/makeSerializable");
@@ -18,11 +19,11 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
+/** @typedef {import("./Generator").SourceTypes} SourceTypes */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
 /** @typedef {import("./Module").SourceContext} SourceContext */
-/** @typedef {import("./Module").SourceTypes} SourceTypes */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
@@ -32,7 +33,6 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
-const TYPES = new Set(["javascript"]);
 const RUNTIME_REQUIREMENTS = new Set([
 	RuntimeGlobals.require,
 	RuntimeGlobals.module
@@ -57,7 +57,7 @@ class DllModule extends Module {
 	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return TYPES;
+		return JS_TYPES;
 	}
 
 	/**
@@ -165,7 +165,7 @@ class DllModule extends Module {
 	 */
 	cleanupForCache() {
 		super.cleanupForCache();
-		this.dependencies = undefined;
+		this.dependencies = /** @type {EXPECTED_ANY} */ (undefined);
 	}
 }
 

package/lib/DynamicEntryPlugin.js

@@ -9,6 +9,7 @@ const EntryOptionPlugin = require("./EntryOptionPlugin");
 const EntryPlugin = require("./EntryPlugin");
 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 */
@@ -40,22 +41,27 @@ class DynamicEntryPlugin {
 			}
 		);
 
-		compiler.hooks.make.tapPromise(
-			"DynamicEntryPlugin",
-			(compilation, callback) =>
-				Promise.resolve(this.entry())
-					.then(entry => {
-						const promises = [];
-						for (const name of Object.keys(entry)) {
-							const desc = entry[name];
-							const options = EntryOptionPlugin.entryDescriptionToOptions(
-								compiler,
-								name,
-								desc
-							);
-							for (const entry of desc.import) {
-								promises.push(
-									new Promise((resolve, reject) => {
+		compiler.hooks.make.tapPromise("DynamicEntryPlugin", compilation =>
+			Promise.resolve(this.entry())
+				.then(entry => {
+					const promises = [];
+					for (const name of Object.keys(entry)) {
+						const desc = entry[name];
+						const options = EntryOptionPlugin.entryDescriptionToOptions(
+							compiler,
+							name,
+							desc
+						);
+						for (const entry of /** @type {NonNullable<EntryDescriptionNormalized["import"]>} */ (
+							desc.import
+						)) {
+							promises.push(
+								new Promise(
+									/**
+									 * @param {(value?: any) => void} resolve resolve
+									 * @param {(reason?: Error) => void} reject reject
+									 */
+									(resolve, reject) => {
 										compilation.addEntry(
 											this.context,
 											EntryPlugin.createDependency(entry, options),
@@ -65,13 +71,14 @@ class DynamicEntryPlugin {
 												resolve();
 											}
 										);
-									})
-								);
-							}
+									}
+								)
+							);
 						}
-						return Promise.all(promises);
-					})
-					.then(x => {})
+					}
+					return Promise.all(promises);
+				})
+				.then(x => {})
 		);
 	}
 }

package/lib/EnvironmentPlugin.js

@@ -13,15 +13,16 @@ const WebpackError = require("./WebpackError");
 
 class EnvironmentPlugin {
 	/**
-	 * @param {(string | string[] | Record<string, string>)[]} keys keys
+	 * @param {(string | string[] | Record<string, any>)[]} keys keys
 	 */
 	constructor(...keys) {
 		if (keys.length === 1 && Array.isArray(keys[0])) {
+			/** @type {string[]} */
 			this.keys = keys[0];
 			this.defaultValues = {};
 		} else if (keys.length === 1 && keys[0] && typeof keys[0] === "object") {
 			this.keys = Object.keys(keys[0]);
-			this.defaultValues = /** @type {Record<string, string>} */ (keys[0]);
+			this.defaultValues = /** @type {Record<string, any>} */ (keys[0]);
 		} else {
 			this.keys = /** @type {string[]} */ (keys);
 			this.defaultValues = {};

package/lib/EvalDevToolModulePlugin.js

@@ -57,7 +57,7 @@ class EvalDevToolModulePlugin {
 			const hooks = JavascriptModulesPlugin.getCompilationHooks(compilation);
 			hooks.renderModuleContent.tap(
 				"EvalDevToolModulePlugin",
-				(source, module, { runtimeTemplate, chunkGraph }) => {
+				(source, module, { chunk, runtimeTemplate, chunkGraph }) => {
 					const cacheEntry = cache.get(source);
 					if (cacheEntry !== undefined) return cacheEntry;
 					if (module instanceof ExternalModule) {
@@ -65,11 +65,14 @@ class EvalDevToolModulePlugin {
 						return source;
 					}
 					const content = source.source();
+					const namespace = compilation.getPath(this.namespace, {
+						chunk
+					});
 					const str = ModuleFilenameHelpers.createFilename(
 						module,
 						{
 							moduleFilenameTemplate: this.moduleFilenameTemplate,
-							namespace: this.namespace
+							namespace
 						},
 						{
 							requestShortener: runtimeTemplate.requestShortener,

package/lib/EvalSourceMapDevToolPlugin.js

@@ -77,7 +77,7 @@ class EvalSourceMapDevToolPlugin {
 				);
 				hooks.renderModuleContent.tap(
 					"EvalSourceMapDevToolPlugin",
-					(source, m, { runtimeTemplate, chunkGraph }) => {
+					(source, m, { chunk, runtimeTemplate, chunkGraph }) => {
 						const cachedSource = cache.get(source);
 						if (cachedSource !== undefined) {
 							return cachedSource;
@@ -113,6 +113,9 @@ class EvalSourceMapDevToolPlugin {
 							return result(source);
 						}
 
+						const namespace = compilation.getPath(this.namespace, {
+							chunk
+						});
 						/** @type {SourceMap} */
 						let sourceMap;
 						let content;
@@ -143,7 +146,7 @@ class EvalSourceMapDevToolPlugin {
 								module,
 								{
 									moduleFilenameTemplate: this.moduleFilenameTemplate,
-									namespace: this.namespace
+									namespace
 								},
 								{
 									requestShortener: runtimeTemplate.requestShortener,