webpack 5.99.8 → 5.100.0

package/lib/ModuleTemplate.js

@@ -163,7 +163,7 @@ Object.defineProperty(ModuleTemplate.prototype, "runtimeTemplate", {
 		 * @this {ModuleTemplate}
 		 * @returns {RuntimeTemplate} output options
 		 */
-		function () {
+		function runtimeTemplate() {
 			return this._runtimeTemplate;
 		},
 		"ModuleTemplate.runtimeTemplate is deprecated (use Compilation.runtimeTemplate instead)",

package/lib/ModuleTypeConstants.js

@@ -144,40 +144,40 @@ const WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY = "lazy-compilation-proxy";
 /** @typedef {JavaScriptModuleTypes | JSONModuleType | WebAssemblyModuleTypes | CSSModuleTypes | AssetModuleTypes | WebpackModuleTypes | UnknownModuleTypes} ModuleTypes */
 
 module.exports.ASSET_MODULE_TYPE = ASSET_MODULE_TYPE;
+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_SOURCE = ASSET_MODULE_TYPE_SOURCE;
 module.exports.ASSET_MODULE_TYPE_RESOURCE = ASSET_MODULE_TYPE_RESOURCE;
-module.exports.ASSET_MODULE_TYPE_INLINE = ASSET_MODULE_TYPE_INLINE;
-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.ASSET_MODULE_TYPE_SOURCE = ASSET_MODULE_TYPE_SOURCE;
+module.exports.CSS_MODULES = [
+	CSS_MODULE_TYPE,
+	CSS_MODULE_TYPE_GLOBAL,
+	CSS_MODULE_TYPE_MODULE,
+	CSS_MODULE_TYPE_AUTO
+];
+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;
 module.exports.JAVASCRIPT_MODULES = [
 	JAVASCRIPT_MODULE_TYPE_AUTO,
 	JAVASCRIPT_MODULE_TYPE_DYNAMIC,
 	JAVASCRIPT_MODULE_TYPE_ESM
 ];
+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;
-module.exports.WEBASSEMBLY_MODULE_TYPE_ASYNC = WEBASSEMBLY_MODULE_TYPE_ASYNC;
-module.exports.WEBASSEMBLY_MODULE_TYPE_SYNC = WEBASSEMBLY_MODULE_TYPE_SYNC;
 module.exports.WEBASSEMBLY_MODULES = [
 	WEBASSEMBLY_MODULE_TYPE_SYNC,
 	WEBASSEMBLY_MODULE_TYPE_SYNC
 ];
-module.exports.CSS_MODULE_TYPE = CSS_MODULE_TYPE;
-module.exports.CSS_MODULE_TYPE_GLOBAL = CSS_MODULE_TYPE_GLOBAL;
-module.exports.CSS_MODULE_TYPE_MODULE = CSS_MODULE_TYPE_MODULE;
-module.exports.CSS_MODULE_TYPE_AUTO = CSS_MODULE_TYPE_AUTO;
-module.exports.CSS_MODULES = [
-	CSS_MODULE_TYPE,
-	CSS_MODULE_TYPE_GLOBAL,
-	CSS_MODULE_TYPE_MODULE,
-	CSS_MODULE_TYPE_AUTO
-];
-module.exports.WEBPACK_MODULE_TYPE_RUNTIME = WEBPACK_MODULE_TYPE_RUNTIME;
-module.exports.WEBPACK_MODULE_TYPE_FALLBACK = WEBPACK_MODULE_TYPE_FALLBACK;
-module.exports.WEBPACK_MODULE_TYPE_REMOTE = WEBPACK_MODULE_TYPE_REMOTE;
-module.exports.WEBPACK_MODULE_TYPE_PROVIDE = WEBPACK_MODULE_TYPE_PROVIDE;
+module.exports.WEBASSEMBLY_MODULE_TYPE_ASYNC = WEBASSEMBLY_MODULE_TYPE_ASYNC;
+module.exports.WEBASSEMBLY_MODULE_TYPE_SYNC = WEBASSEMBLY_MODULE_TYPE_SYNC;
 module.exports.WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE =
 	WEBPACK_MODULE_TYPE_CONSUME_SHARED_MODULE;
+module.exports.WEBPACK_MODULE_TYPE_FALLBACK = WEBPACK_MODULE_TYPE_FALLBACK;
 module.exports.WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY =
 	WEBPACK_MODULE_TYPE_LAZY_COMPILATION_PROXY;
+module.exports.WEBPACK_MODULE_TYPE_PROVIDE = WEBPACK_MODULE_TYPE_PROVIDE;
+module.exports.WEBPACK_MODULE_TYPE_REMOTE = WEBPACK_MODULE_TYPE_REMOTE;
+module.exports.WEBPACK_MODULE_TYPE_RUNTIME = WEBPACK_MODULE_TYPE_RUNTIME;

package/lib/MultiCompiler.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const asyncLib = require("neo-async");
-const { SyncHook, MultiHook } = require("tapable");
+const { MultiHook, SyncHook } = require("tapable");
 
 const ConcurrentCompilationError = require("./ConcurrentCompilationError");
 const MultiStats = require("./MultiStats");
@@ -305,7 +305,7 @@ module.exports = class MultiCompiler {
 		}
 		if (edges.size > 0) {
 			/** @type {string[]} */
-			const lines = Array.from(edges)
+			const lines = [...edges]
 				.sort(sortEdges)
 				.map(edge => `${edge.source.name} -> ${edge.target.name}`);
 			lines.unshift("Circular dependency found in compiler dependencies.");
@@ -324,7 +324,7 @@ module.exports = class MultiCompiler {
 	 * @deprecated This method should have been private
 	 * @param {Compiler[]} compilers the child compilers
 	 * @param {RunWithDependenciesHandler} fn a handler to run for each compiler
-	 * @param {Callback<MultiStats>} callback the compiler's handler
+	 * @param {Callback<Stats[]>} callback the compiler's handler
 	 * @returns {void}
 	 */
 	runWithDependencies(compilers, fn, callback) {
@@ -355,7 +355,7 @@ module.exports = class MultiCompiler {
 			return readyCompilers;
 		};
 		/**
-		 * @param {Callback<MultiStats>} callback callback
+		 * @param {Callback<Stats[]>} callback callback
 		 * @returns {void}
 		 */
 		const runCompilers = callback => {
@@ -370,7 +370,7 @@ module.exports = class MultiCompiler {
 					});
 				},
 				(err, results) => {
-					callback(err, /** @type {TODO} */ (results));
+					callback(err, results);
 				}
 			);
 		};
@@ -598,7 +598,7 @@ module.exports = class MultiCompiler {
 					}
 					return watching;
 				},
-				(compiler, watching, callback) => {
+				(compiler, watching, _callback) => {
 					if (compiler.watching !== watching) return;
 					if (!watching.running) watching.invalidate();
 				},

package/lib/NormalModule.js

@@ -5,14 +5,14 @@
 
 "use strict";
 
+const querystring = require("querystring");
 const parseJson = require("json-parse-even-better-errors");
 const { getContext, runLoaders } = require("loader-runner");
-const querystring = require("querystring");
 const {
+	AsyncSeriesBailHook,
 	HookMap,
 	SyncHook,
-	SyncWaterfallHook,
-	AsyncSeriesBailHook
+	SyncWaterfallHook
 } = require("tapable");
 const {
 	CachedSource,
@@ -38,22 +38,23 @@ const { isSubset } = require("./util/SetHelpers");
 const { getScheme } = require("./util/URLAbsoluteSpecifier");
 const {
 	compareLocations,
-	concatComparators,
 	compareSelect,
+	concatComparators,
 	keepOriginalOrder
 } = require("./util/comparators");
 const createHash = require("./util/createHash");
 const { createFakeHook } = require("./util/deprecation");
 const { join } = require("./util/fs");
 const {
-	contextify,
 	absolutify,
+	contextify,
 	makePathsRelative
 } = require("./util/identifier");
 const makeSerializable = require("./util/makeSerializable");
 const memoize = require("./util/memoize");
 
 /** @typedef {import("webpack-sources").Source} Source */
+/** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
 /** @typedef {import("../declarations/WebpackOptions").Mode} Mode */
 /** @typedef {import("../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
@@ -64,6 +65,7 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("./Generator")} Generator */
 /** @typedef {import("./Generator").GenerateErrorFn} GenerateErrorFn */
+/** @typedef {import("./Generator").GenerateContextData} GenerateContextData */
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
 /** @typedef {import("./Module").BuildMeta} BuildMeta */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
@@ -78,14 +80,16 @@ const memoize = require("./util/memoize");
 /** @typedef {import("./Module").UnsafeCacheData} UnsafeCacheData */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
 /** @typedef {import("./ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("./ModuleTypeConstants").JavaScriptModuleTypes} JavaScriptModuleTypes */
+/** @typedef {import("./ModuleTypeConstants").ModuleTypes} ModuleTypes */
 /** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
 /** @typedef {import("./NormalModuleFactory").ResourceDataWithData} ResourceDataWithData */
+/** @typedef {import("./NormalModuleFactory").ResourceSchemeData} ResourceSchemeData */
 /** @typedef {import("./Parser")} Parser */
 /** @typedef {import("./Parser").PreparsedAst} PreparsedAst */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolveContext} ResolveContext */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
+/** @typedef {import("./ResolverFactory").ResolveRequest} ResolveRequest */
 /** @typedef {import("./RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("./logging/Logger").Logger} WebpackLogger */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -113,18 +117,6 @@ const memoize = require("./util/memoize");
  * @typedef {import("../declarations/LoaderContext").NormalModuleLoaderContext<T>} NormalModuleLoaderContext
  */
 
-/**
- * @typedef {object} SourceMap
- * @property {number} version
- * @property {string[]} sources
- * @property {string} mappings
- * @property {string=} file
- * @property {string=} sourceRoot
- * @property {string[]=} sourcesContent
- * @property {string[]=} names
- * @property {string=} debugId
- */
-
 const getInvalidDependenciesModuleWarning = memoize(() =>
 	require("./InvalidDependenciesModuleWarning")
 );
@@ -157,12 +149,14 @@ const contextifySourceUrl = (context, source, associatedObjectForCache) => {
 
 /**
  * @param {string} context absolute context path
- * @param {SourceMap} sourceMap a source map
+ * @param {string | RawSourceMap} sourceMap a source map
  * @param {AssociatedObjectForCache=} associatedObjectForCache an object to which the cache will be attached
- * @returns {SourceMap} new source map
+ * @returns {string | RawSourceMap} new source map
  */
 const contextifySourceMap = (context, sourceMap, associatedObjectForCache) => {
-	if (!Array.isArray(sourceMap.sources)) return sourceMap;
+	if (typeof sourceMap === "string" || !Array.isArray(sourceMap.sources)) {
+		return sourceMap;
+	}
 	const { sourceRoot } = sourceMap;
 	/** @type {(source: string) => string} */
 	const mapper = !sourceRoot
@@ -193,7 +187,7 @@ const contextifySourceMap = (context, sourceMap, associatedObjectForCache) => {
  */
 const asString = input => {
 	if (Buffer.isBuffer(input)) {
-		return input.toString("utf-8");
+		return input.toString("utf8");
 	}
 	return input;
 };
@@ -204,7 +198,7 @@ const asString = input => {
  */
 const asBuffer = input => {
 	if (!Buffer.isBuffer(input)) {
-		return Buffer.from(input, "utf-8");
+		return Buffer.from(input, "utf8");
 	}
 	return input;
 };
@@ -227,7 +221,7 @@ makeSerializable(
 	"NonErrorEmittedError"
 );
 
-/** @typedef {[string | Buffer, string | SourceMapSource, PreparsedAst]}  Result */
+/** @typedef {[string | Buffer, string | RawSourceMap | undefined, PreparsedAst | undefined]}  Result */
 
 /**
  * @typedef {object} NormalModuleCompilationHooks
@@ -244,13 +238,13 @@ makeSerializable(
 /**
  * @typedef {object} NormalModuleCreateData
  * @property {string=} layer an optional layer in which the module is
- * @property {JavaScriptModuleTypes | ""} type module type. When deserializing, this is set to an empty string "".
+ * @property {ModuleTypes | ""} type module type. When deserializing, this is set to an empty string "".
  * @property {string} request request string
  * @property {string} userRequest request intended by user (without loaders from config)
  * @property {string} rawRequest request without resolving
  * @property {LoaderItem[]} loaders list of loaders
  * @property {string} resource path + query of the real resource
- * @property {TODO=} resourceResolveData resource resolve data
+ * @property {(ResourceSchemeData & Partial<ResolveRequest>)=} resourceResolveData resource resolve data
  * @property {string} context context directory for resolving
  * @property {string=} matchResource path + query of the matched resource (virtual)
  * @property {Parser} parser the parser used
@@ -263,8 +257,6 @@ makeSerializable(
 /** @type {WeakMap<Compilation, NormalModuleCompilationHooks>} */
 const compilationHooksMap = new WeakMap();
 
-/** @typedef {Map<string, EXPECTED_ANY>} CodeGeneratorData */
-
 class NormalModule extends Module {
 	/**
 	 * @param {Compilation} compilation the compilation
@@ -405,7 +397,7 @@ class NormalModule extends Module {
 		this._isEvaluatingSideEffects = false;
 		/** @type {WeakSet<ModuleGraph> | undefined} */
 		this._addedSideEffectsBailout = undefined;
-		/** @type {CodeGeneratorData} */
+		/** @type {GenerateContextData} */
 		this._codeGeneratorData = new Map();
 	}
 
@@ -541,7 +533,7 @@ class NormalModule extends Module {
 	 * @param {string} context the compilation context
 	 * @param {string} name the asset name
 	 * @param {string | Buffer} content the content
-	 * @param {(string | SourceMap)=} sourceMap an optional source map
+	 * @param {(string | RawSourceMap)=} sourceMap an optional source map
 	 * @param {AssociatedObjectForCache=} associatedObjectForCache object for caching
 	 * @returns {Source} the created source
 	 */
@@ -569,7 +561,8 @@ class NormalModule extends Module {
 					name,
 					contextifySourceMap(
 						context,
-						/** @type {SourceMap} */ (sourceMap),
+						/** @type {RawSourceMap} */
+						(sourceMap),
 						associatedObjectForCache
 					)
 				);
@@ -587,12 +580,14 @@ class NormalModule extends Module {
 	 * @param {Compilation} compilation the compilation
 	 * @param {InputFileSystem} fs file system from reading
 	 * @param {NormalModuleCompilationHooks} hooks the hooks
-	 * @returns {import("../declarations/LoaderContext").NormalModuleLoaderContext<T>} loader context
+	 * @returns {import("../declarations/LoaderContext").LoaderContext<T>} loader context
 	 */
 	_createLoaderContext(resolver, options, compilation, fs, hooks) {
 		const { requestShortener } = compilation.runtimeTemplate;
 		const getCurrentLoaderName = () => {
-			const currentLoader = this.getCurrentLoader(loaderContext);
+			const currentLoader = this.getCurrentLoader(
+				/** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext)
+			);
 			if (!currentLoader) return "(not in loader scope)";
 			return requestShortener.shorten(currentLoader.loader);
 		};
@@ -601,13 +596,22 @@ class NormalModule extends Module {
 		 */
 		const getResolveContext = () => ({
 			fileDependencies: {
-				add: d => /** @type {TODO} */ (loaderContext).addDependency(d)
+				add: d =>
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (
+						loaderContext
+					).addDependency(d)
 			},
 			contextDependencies: {
-				add: d => /** @type {TODO} */ (loaderContext).addContextDependency(d)
+				add: d =>
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (
+						loaderContext
+					).addContextDependency(d)
 			},
 			missingDependencies: {
-				add: d => /** @type {TODO} */ (loaderContext).addMissingDependency(d)
+				add: d =>
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (
+						loaderContext
+					).addMissingDependency(d)
 			}
 		});
 		const getAbsolutify = memoize(() =>
@@ -668,7 +672,9 @@ class NormalModule extends Module {
 			 * @returns {T} options
 			 */
 			getOptions: schema => {
-				const loader = this.getCurrentLoader(loaderContext);
+				const loader = this.getCurrentLoader(
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext)
+				);
 
 				let { options } = /** @type {LoaderItem} */ (loader);
 
@@ -728,7 +734,9 @@ class NormalModule extends Module {
 				);
 			},
 			getLogger: name => {
-				const currentLoader = this.getCurrentLoader(loaderContext);
+				const currentLoader = this.getCurrentLoader(
+					/** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext)
+				);
 				return compilation.getLogger(() =>
 					[currentLoader && currentLoader.loader, name, this.identifier()]
 						.filter(Boolean)
@@ -816,18 +824,19 @@ class NormalModule extends Module {
 
 		Object.assign(loaderContext, options.loader);
 
+		// After `hooks.loader.call` is called, the loaderContext is typed as LoaderContext<EXPECTED_ANY>
 		hooks.loader.call(
 			/** @type {LoaderContext<EXPECTED_ANY>} */
 			(loaderContext),
 			this
 		);
 
-		return loaderContext;
+		return /** @type {LoaderContext<EXPECTED_ANY>} */ (loaderContext);
 	}
 
 	// TODO remove `loaderContext` in webpack@6
 	/**
-	 * @param {TODO} loaderContext loader context
+	 * @param {LoaderContext<EXPECTED_ANY>} loaderContext loader context
 	 * @param {number} index index
 	 * @returns {LoaderItem | null} loader
 	 */
@@ -847,7 +856,7 @@ class NormalModule extends Module {
 	/**
 	 * @param {string} context the compilation context
 	 * @param {string | Buffer} content the content
-	 * @param {(string | SourceMapSource | null)=} sourceMap an optional source map
+	 * @param {(string | RawSourceMap | null)=} sourceMap an optional source map
 	 * @param {AssociatedObjectForCache=} associatedObjectForCache object for caching
 	 * @returns {Source} the created source
 	 */
@@ -868,11 +877,7 @@ class NormalModule extends Module {
 			return new SourceMapSource(
 				content,
 				contextifySourceUrl(context, identifier, associatedObjectForCache),
-				contextifySourceMap(
-					context,
-					/** @type {TODO} */ (sourceMap),
-					associatedObjectForCache
-				)
+				contextifySourceMap(context, sourceMap, associatedObjectForCache)
 			);
 		}
 
@@ -906,10 +911,10 @@ class NormalModule extends Module {
 
 		/**
 		 * @param {Error | null} err err
-		 * @param {(Result | null)=} _result result
+		 * @param {(Result | null)=} result_ result
 		 * @returns {void}
 		 */
-		const processResult = (err, _result) => {
+		const processResult = (err, result_) => {
 			if (err) {
 				if (!(err instanceof Error)) {
 					err = new NonErrorEmittedError(err);
@@ -925,7 +930,8 @@ class NormalModule extends Module {
 				return callback(error);
 			}
 			const result = hooks.processResult.call(
-				/** @type {Result} */ (_result),
+				/** @type {Result} */
+				(result_),
 				this
 			);
 			const source = result[0];
@@ -998,7 +1004,7 @@ class NormalModule extends Module {
 				loaders: this.loaders,
 				context: loaderContext,
 				/**
-				 * @param {LoaderContext<TODO>} loaderContext the loader context
+				 * @param {LoaderContext<EXPECTED_ANY>} loaderContext the loader context
 				 * @param {string} resourcePath the resource Path
 				 * @param {(err: Error | null, result?: string | Buffer) => void} callback callback
 				 */
@@ -1245,8 +1251,9 @@ class NormalModule extends Module {
 				const checkDependencies = deps => {
 					for (const dep of deps) {
 						if (!ABSOLUTE_PATH_REGEX.test(dep)) {
-							if (nonAbsoluteDependencies === undefined)
+							if (nonAbsoluteDependencies === undefined) {
 								nonAbsoluteDependencies = new Set();
+							}
 							nonAbsoluteDependencies.add(dep);
 							deps.delete(dep);
 							try {
@@ -1371,8 +1378,9 @@ class NormalModule extends Module {
 			if (this.factoryMeta.sideEffectFree === false) return true;
 		}
 		if (this.buildMeta !== undefined && this.buildMeta.sideEffectFree) {
-			if (this._isEvaluatingSideEffects)
+			if (this._isEvaluatingSideEffects) {
 				return ModuleGraphConnection.CIRCULAR_CONNECTION;
+			}
 			this._isEvaluatingSideEffects = true;
 			/** @type {ConnectionState} */
 			let current = false;
@@ -1445,9 +1453,6 @@ class NormalModule extends Module {
 			runtimeRequirements.add(RuntimeGlobals.thisAsExports);
 		}
 
-		/**
-		 * @type {() => CodeGeneratorData}
-		 */
 		const getData = () => this._codeGeneratorData;
 
 		const sources = new Map();
@@ -1662,7 +1667,7 @@ class NormalModule extends Module {
 
 	/**
 	 * @param {ObjectDeserializerContext} context context
-	 * @returns {TODO} Module
+	 * @returns {NormalModule} module
 	 */
 	static deserialize(context) {
 		const obj = new NormalModule({