webpack 5.101.3 → 5.102.0

package/lib/ModuleGraph.js

@@ -17,6 +17,7 @@ const { sortWithSourceOrder } = require("./util/comparators");
 /** @typedef {import("./DependenciesBlock")} DependenciesBlock */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./ExportsInfo").ExportInfo} ExportInfo */
+/** @typedef {import("./ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./ModuleProfile")} ModuleProfile */
 /** @typedef {import("./RequestShortener")} RequestShortener */
@@ -37,7 +38,7 @@ const EMPTY_SET = new Set();
  * @template {Module | null | undefined} T
  * @param {SortableSet<ModuleGraphConnection>} set input
  * @param {(connection: ModuleGraphConnection) => T} getKey function to extract key from connection
- * @returns {readonly Map<T, readonly ModuleGraphConnection[]>} mapped by key
+ * @returns {ReadonlyMap<T, ReadonlyArray<ModuleGraphConnection>>} mapped by key
  */
 const getConnectionsByKey = (set, getKey) => {
 	const map = new Map();
@@ -68,20 +69,22 @@ const getConnectionsByKey = (set, getKey) => {
 
 /**
  * @param {SortableSet<ModuleGraphConnection>} set input
- * @returns {readonly Map<Module | undefined | null, readonly ModuleGraphConnection[]>} mapped by origin module
+ * @returns {ReadonlyMap<Module | undefined | null, ReadonlyArray<ModuleGraphConnection>>} mapped by origin module
  */
 const getConnectionsByOriginModule = (set) =>
 	getConnectionsByKey(set, (connection) => connection.originModule);
 
 /**
  * @param {SortableSet<ModuleGraphConnection>} set input
- * @returns {readonly Map<Module | undefined, readonly ModuleGraphConnection[]>} mapped by module
+ * @returns {ReadonlyMap<Module | undefined, ReadonlyArray<ModuleGraphConnection>>} mapped by module
  */
 const getConnectionsByModule = (set) =>
 	getConnectionsByKey(set, (connection) => connection.module);
 
 /** @typedef {SortableSet<ModuleGraphConnection>} IncomingConnections */
 /** @typedef {SortableSet<ModuleGraphConnection>} OutgoingConnections */
+/** @typedef {Module | null | undefined} Issuer */
+/** @typedef {(string | OptimizationBailoutFunction)[]} OptimizationBailouts */
 
 class ModuleGraphModule {
 	constructor() {
@@ -89,9 +92,9 @@ class ModuleGraphModule {
 		this.incomingConnections = new SortableSet();
 		/** @type {OutgoingConnections | undefined} */
 		this.outgoingConnections = undefined;
-		/** @type {Module | null | undefined} */
+		/** @type {Issuer} */
 		this.issuer = undefined;
-		/** @type {(string | OptimizationBailoutFunction)[]} */
+		/** @type {OptimizationBailouts} */
 		this.optimizationBailout = [];
 		/** @type {ExportsInfo} */
 		this.exports = new ExportsInfo();
@@ -113,7 +116,18 @@ class ModuleGraphModule {
 /** @typedef {(moduleGraphConnection: ModuleGraphConnection) => boolean} FilterConnection */
 
 /** @typedef {EXPECTED_OBJECT} MetaKey */
-/** @typedef {TODO} Meta */
+
+/** @typedef {import("./dependencies/CommonJsExportRequireDependency").idsSymbol} CommonJsExportRequireDependencyIDsSymbol */
+/** @typedef {import("./dependencies/HarmonyImportSpecifierDependency").idsSymbol} HarmonyImportSpecifierDependencyIDsSymbol */
+/** @typedef {import("./dependencies/HarmonyExportImportedSpecifierDependency").idsSymbol} HarmonyExportImportedSpecifierDependencyIDsSymbol */
+
+/**
+ * @typedef {object} KnownMeta
+ * @property {Map<Module, string>=} importVarMap
+ * @property {Map<Module, string>=} deferredImportVarMap
+ */
+
+/** @typedef {KnownMeta & Record<CommonJsExportRequireDependencyIDsSymbol | HarmonyImportSpecifierDependencyIDsSymbol | HarmonyExportImportedSpecifierDependencyIDsSymbol, string[]> & Record<string, EXPECTED_ANY>} Meta */
 
 class ModuleGraph {
 	constructor() {
@@ -567,7 +581,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {readonly Map<Module | undefined | null, readonly ModuleGraphConnection[]>} reasons why a module is included, in a map by source module
+	 * @returns {ReadonlyMap<Module | undefined | null, ReadonlyArray<ModuleGraphConnection>>} reasons why a module is included, in a map by source module
 	 */
 	getIncomingConnectionsByOriginModule(module) {
 		const connections = this._getModuleGraphModule(module).incomingConnections;
@@ -576,7 +590,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {readonly Map<Module | undefined, readonly ModuleGraphConnection[]> | undefined} connections to modules, in a map by module
+	 * @returns {ReadonlyMap<Module | undefined, ReadonlyArray<ModuleGraphConnection>> | undefined} connections to modules, in a map by module
 	 */
 	getOutgoingConnectionsByModule(module) {
 		const connections = this._getModuleGraphModule(module).outgoingConnections;
@@ -606,7 +620,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {Module | null | undefined} the issuer module
+	 * @returns {Issuer} the issuer module
 	 */
 	getIssuer(module) {
 		const mgm = this._getModuleGraphModule(module);
@@ -635,7 +649,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {(string | OptimizationBailoutFunction)[]} optimization bailouts
+	 * @returns {OptimizationBailouts} optimization bailouts
 	 */
 	getOptimizationBailout(module) {
 		const mgm = this._getModuleGraphModule(module);
@@ -644,7 +658,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @returns {true | string[] | null} the provided exports
+	 * @returns {null | true | ExportInfoName[]} the provided exports
 	 */
 	getProvidedExports(module) {
 		const mgm = this._getModuleGraphModule(module);
@@ -653,7 +667,7 @@ class ModuleGraph {
 
 	/**
 	 * @param {Module} module the module
-	 * @param {string | string[]} exportName a name of an export
+	 * @param {ExportInfoName | ExportInfoName[]} exportName a name of an export
 	 * @returns {boolean | null} true, if the export is provided by the module.
 	 * null, if it's unknown.
 	 * false, if it's not provided.
@@ -851,7 +865,7 @@ class ModuleGraph {
 	getMeta(thing) {
 		let meta = this._metaMap.get(thing);
 		if (meta === undefined) {
-			meta = Object.create(null);
+			meta = /** @type {Meta} */ (Object.create(null));
 			this._metaMap.set(thing, meta);
 		}
 		return meta;
@@ -879,10 +893,10 @@ class ModuleGraph {
 	}
 
 	/**
-	 * @template T
+	 * @template {EXPECTED_ANY[]} T
 	 * @template R
-	 * @param {(moduleGraph: ModuleGraph, ...args: T[]) => R} fn computer
-	 * @param {...T} args arguments
+	 * @param {(moduleGraph: ModuleGraph, ...args: T) => R} fn computer
+	 * @param {T} args arguments
 	 * @returns {R} computed value or cached
 	 */
 	cached(fn, ...args) {

package/lib/ModuleInfoHeaderPlugin.js

@@ -18,7 +18,6 @@ const JavascriptModulesPlugin = require("./javascript/JavascriptModulesPlugin");
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./Module").BuildMeta} BuildMeta */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
-/** @typedef {import("./ModuleTemplate")} ModuleTemplate */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 
 /**

package/lib/ModuleTemplate.js

@@ -11,11 +11,9 @@ const memoize = require("./util/memoize");
 /** @typedef {import("tapable").Tap} Tap */
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("./Chunk")} Chunk */
-/** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Module")} Module */
-/** @typedef {import("./ModuleGraph")} ModuleGraph */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("./javascript/JavascriptModulesPlugin").ChunkRenderContext} ChunkRenderContext */
 /** @typedef {import("./javascript/JavascriptModulesPlugin").ModuleRenderContext}  ModuleRenderContext */

package/lib/ModuleTypeConstants.js

@@ -89,6 +89,12 @@ const ASSET_MODULE_TYPE_RESOURCE = "asset/resource";
  */
 const ASSET_MODULE_TYPE_SOURCE = "asset/source";
 
+/**
+ * @type {Readonly<"asset/bytes">}
+ * This is the module type used for assets that are imported as Uint8Array.
+ */
+const ASSET_MODULE_TYPE_BYTES = "asset/bytes";
+
 /**
  * @type {Readonly<"asset/raw-data-url">}
  * TODO: Document what this asset type is for. See css-loader tests for its usage.
@@ -137,17 +143,19 @@ const WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY = "lazy-compilation-proxy";
 /** @typedef {"javascript/auto" | "javascript/dynamic" | "javascript/esm"} JavaScriptModuleTypes */
 /** @typedef {"json"} JSONModuleType */
 /** @typedef {"webassembly/async" | "webassembly/sync"} WebAssemblyModuleTypes */
-/** @typedef {"css" | "css/global" | "css/module"} CSSModuleTypes */
+/** @typedef {"css" | "css/global" | "css/module" | "css/auto"} CSSModuleTypes */
 /** @typedef {"asset" | "asset/inline" | "asset/resource" | "asset/source" | "asset/raw-data-url"} AssetModuleTypes */
 /** @typedef {"runtime" | "fallback-module" | "remote-module" | "provide-module" | "consume-shared-module" | "lazy-compilation-proxy"} WebpackModuleTypes */
 /** @typedef {string} UnknownModuleTypes */
 /** @typedef {JavaScriptModuleTypes | JSONModuleType | WebAssemblyModuleTypes | CSSModuleTypes | AssetModuleTypes | WebpackModuleTypes | UnknownModuleTypes} ModuleTypes */
 
 module.exports.ASSET_MODULE_TYPE = ASSET_MODULE_TYPE;
+module.exports.ASSET_MODULE_TYPE_BYTES = ASSET_MODULE_TYPE_BYTES;
 module.exports.ASSET_MODULE_TYPE_INLINE = ASSET_MODULE_TYPE_INLINE;
 module.exports.ASSET_MODULE_TYPE_RAW_DATA_URL = ASSET_MODULE_TYPE_RAW_DATA_URL;
 module.exports.ASSET_MODULE_TYPE_RESOURCE = ASSET_MODULE_TYPE_RESOURCE;
 module.exports.ASSET_MODULE_TYPE_SOURCE = ASSET_MODULE_TYPE_SOURCE;
+/** @type {CSSModuleTypes[]} */
 module.exports.CSS_MODULES = [
 	CSS_MODULE_TYPE,
 	CSS_MODULE_TYPE_GLOBAL,
@@ -158,6 +166,7 @@ module.exports.CSS_MODULE_TYPE = CSS_MODULE_TYPE;
 module.exports.CSS_MODULE_TYPE_AUTO = CSS_MODULE_TYPE_AUTO;
 module.exports.CSS_MODULE_TYPE_GLOBAL = CSS_MODULE_TYPE_GLOBAL;
 module.exports.CSS_MODULE_TYPE_MODULE = CSS_MODULE_TYPE_MODULE;
+/** @type {JavaScriptModuleTypes[]} */
 module.exports.JAVASCRIPT_MODULES = [
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
@@ -167,6 +176,7 @@ module.exports.JAVASCRIPT_MODULE_TYPE_AUTO = JAVASCRIPT_MODULE_TYPE_AUTO;
 module.exports.JAVASCRIPT_MODULE_TYPE_DYNAMIC = JAVASCRIPT_MODULE_TYPE_DYNAMIC;
 module.exports.JAVASCRIPT_MODULE_TYPE_ESM = JAVASCRIPT_MODULE_TYPE_ESM;
 module.exports.JSON_MODULE_TYPE = JSON_MODULE_TYPE;
+/** @type {WebAssemblyModuleTypes[]} */
 module.exports.WEBASSEMBLY_MODULES = [
 	WEBASSEMBLY_MODULE_TYPE_SYNC,
 	WEBASSEMBLY_MODULE_TYPE_SYNC

package/lib/MultiCompiler.js

@@ -14,30 +14,36 @@ const MultiWatching = require("./MultiWatching");
 const WebpackError = require("./WebpackError");
 const ArrayQueue = require("./util/ArrayQueue");
 
-/** @template T @typedef {import("tapable").AsyncSeriesHook<T>} AsyncSeriesHook<T> */
-/** @template T @template R @typedef {import("tapable").SyncBailHook<T, R>} SyncBailHook<T, R> */
-/** @typedef {import("../declarations/WebpackOptions").WebpackOptions} WebpackOptions */
+/**
+ * @template T
+ * @typedef {import("tapable").AsyncSeriesHook<T>} AsyncSeriesHook<T>
+ */
+/**
+ * @template T
+ * @template R
+ * @typedef {import("tapable").SyncBailHook<T, R>} SyncBailHook<T, R>
+ */
+/** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("./Compiler")} Compiler */
+/**
+ * @template T
+ * @template [R=void]
+ * @typedef {import("./webpack").Callback<T, R>} Callback
+ */
+/** @typedef {import("./webpack").ErrorCallback} ErrorCallback */
 /** @typedef {import("./Stats")} Stats */
-/** @typedef {import("./Watching")} Watching */
 /** @typedef {import("./logging/Logger").Logger} Logger */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 /** @typedef {import("./util/fs").IntermediateFileSystem} IntermediateFileSystem */
 /** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
 /** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
 
-/**
- * @template T
- * @callback Callback
- * @param {Error | null} err
- * @param {T=} result
- */
-
 /**
  * @callback RunWithDependenciesHandler
  * @param {Compiler} compiler
  * @param {Callback<MultiStats>} callback
+ * @returns {void}
  */
 
 /**
@@ -581,11 +587,12 @@ module.exports = class MultiCompiler {
 	/**
 	 * @param {WatchOptions | WatchOptions[]} watchOptions the watcher's options
 	 * @param {Callback<MultiStats>} handler signals when the call finishes
-	 * @returns {MultiWatching} a compiler watcher
+	 * @returns {MultiWatching | undefined} a compiler watcher
 	 */
 	watch(watchOptions, handler) {
 		if (this.running) {
-			return handler(new ConcurrentCompilationError());
+			handler(new ConcurrentCompilationError());
+			return;
 		}
 		this.running = true;
 
@@ -621,7 +628,8 @@ module.exports = class MultiCompiler {
 	 */
 	run(callback) {
 		if (this.running) {
-			return callback(new ConcurrentCompilationError());
+			callback(new ConcurrentCompilationError());
+			return;
 		}
 		this.running = true;
 
@@ -649,7 +657,7 @@ module.exports = class MultiCompiler {
 	}
 
 	/**
-	 * @param {Callback<void>} callback signals when the compiler closes
+	 * @param {ErrorCallback} callback signals when the compiler closes
 	 * @returns {void}
 	 */
 	close(callback) {

package/lib/MultiWatching.js

@@ -9,13 +9,7 @@ const asyncLib = require("neo-async");
 
 /** @typedef {import("./MultiCompiler")} MultiCompiler */
 /** @typedef {import("./Watching")} Watching */
-
-/**
- * @template T
- * @callback Callback
- * @param {(Error | null)=} err
- * @param {T=} result
- */
+/** @typedef {import("./webpack").ErrorCallback} ErrorCallback */
 
 class MultiWatching {
 	/**
@@ -28,7 +22,7 @@ class MultiWatching {
 	}
 
 	/**
-	 * @param {Callback<void>=} callback signals when the build has completed again
+	 * @param {ErrorCallback=} callback signals when the build has completed again
 	 * @returns {void}
 	 */
 	invalidate(callback) {
@@ -36,7 +30,9 @@ class MultiWatching {
 			asyncLib.each(
 				this.watchings,
 				(watching, callback) => watching.invalidate(callback),
-				callback
+				(err) => {
+					callback(err);
+				}
 			);
 		} else {
 			for (const watching of this.watchings) {
@@ -58,7 +54,7 @@ class MultiWatching {
 	}
 
 	/**
-	 * @param {Callback<void>} callback signals when the watcher is closed
+	 * @param {ErrorCallback} callback signals when the watcher is closed
 	 * @returns {void}
 	 */
 	close(callback) {

package/lib/NodeStuffPlugin.js

@@ -21,15 +21,11 @@ const {
 const { relative } = require("./util/fs");
 const { parseResource } = require("./util/identifier");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../declarations/WebpackOptions").NodeOptions} NodeOptions */
 /** @typedef {import("./Compiler")} Compiler */
-/** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./NormalModule")} NormalModule */
-/** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("./javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("./javascript/JavascriptParser").Range} Range */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
@@ -188,9 +184,7 @@ class NodeStuffPlugin {
 								);
 								break;
 							case "node-module": {
-								const importMetaName =
-									/** @type {string} */
-									(compilation.outputOptions.importMetaName);
+								const importMetaName = compilation.outputOptions.importMetaName;
 
 								setUrlModuleConstant(
 									"__filename",
@@ -230,9 +224,7 @@ class NodeStuffPlugin {
 								);
 								break;
 							case "node-module": {
-								const importMetaName =
-									/** @type {string} */
-									(compilation.outputOptions.importMetaName);
+								const importMetaName = compilation.outputOptions.importMetaName;
 
 								setUrlModuleConstant(
 									"__dirname",