webpack 5.99.9 → 5.100.1

package/lib/ModuleGraph.js

@@ -441,8 +441,9 @@ class ModuleGraph {
 							/** @type {Dependency} */ (connection.dependency),
 							connection
 						);
-						if (connection.dependency === dependency)
+						if (connection.dependency === dependency) {
 							foundConnection = connection;
+						}
 					}
 					mgm._unassignedConnections.length = 0;
 					if (foundConnection !== undefined) {
@@ -752,6 +753,26 @@ class ModuleGraph {
 		return mgm.async;
 	}
 
+	/**
+	 * @param {Module} module the module
+	 * @returns {boolean} true, if the module is used as a deferred module at least once
+	 */
+	isDeferred(module) {
+		if (this.isAsync(module)) return false;
+		const connections = this.getIncomingConnections(module);
+		for (const connection of connections) {
+			if (
+				!connection.dependency ||
+				connection.dependency instanceof
+					require("./dependencies/CommonJsSelfReferenceDependency")
+			) {
+				continue;
+			}
+			if (connection.dependency.defer) return true;
+		}
+		return false;
+	}
+
 	/**
 	 * @param {Module} module the module
 	 * @returns {void}
@@ -860,12 +881,13 @@ class ModuleGraph {
 			 */
 			module => {
 				const moduleGraph = moduleGraphForModuleMap.get(module);
-				if (!moduleGraph)
+				if (!moduleGraph) {
 					throw new Error(
 						`${
 							deprecateMessage
 						}There was no ModuleGraph assigned to the Module for backward-compat (Use the new API)`
 					);
+				}
 				return moduleGraph;
 			},
 			`${deprecateMessage}: Use new ModuleGraph API`,

package/lib/ModuleGraphConnection.js

@@ -132,7 +132,7 @@ class ModuleGraphConnection {
 
 	get explanation() {
 		if (this.explanations === undefined) return "";
-		return Array.from(this.explanations).join(" ");
+		return [...this.explanations].join(" ");
 	}
 
 	/**
@@ -190,10 +190,10 @@ class ModuleGraphConnection {
 /** @typedef {typeof CIRCULAR_CONNECTION} CIRCULAR_CONNECTION */
 
 module.exports = ModuleGraphConnection;
-module.exports.addConnectionStates = addConnectionStates;
-module.exports.TRANSITIVE_ONLY = /** @type {typeof TRANSITIVE_ONLY} */ (
-	TRANSITIVE_ONLY
-);
 module.exports.CIRCULAR_CONNECTION = /** @type {typeof CIRCULAR_CONNECTION} */ (
 	CIRCULAR_CONNECTION
 );
+module.exports.TRANSITIVE_ONLY = /** @type {typeof TRANSITIVE_ONLY} */ (
+	TRANSITIVE_ONLY
+);
+module.exports.addConnectionStates = addConnectionStates;

package/lib/ModuleInfoHeaderPlugin.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const { ConcatSource, RawSource, CachedSource } = require("webpack-sources");
+const { CachedSource, ConcatSource, RawSource } = require("webpack-sources");
 const { UsageState } = require("./ExportsInfo");
 const Template = require("./Template");
 const CssModulesPlugin = require("./css/CssModulesPlugin");
@@ -310,4 +310,5 @@ class ModuleInfoHeaderPlugin {
 		return new RawSource(headerStr);
 	}
 }
+
 module.exports = ModuleInfoHeaderPlugin;

package/lib/ModuleParseError.js

@@ -62,6 +62,7 @@ class ModuleParseError extends WebpackError {
 
 			if (
 				Buffer.isBuffer(source) ||
+				// eslint-disable-next-line no-control-regex
 				/[\0\u0001\u0002\u0003\u0004\u0005\u0006\u0007]/.test(source)
 			) {
 				// binary file

package/lib/ModuleSourceTypesConstants.js

@@ -102,22 +102,22 @@ const CONSUME_SHARED_TYPES = new Set(["consume-shared"]);
  */
 const SHARED_INIT_TYPES = new Set(["share-init"]);
 
-module.exports.NO_TYPES = NO_TYPES;
-module.exports.JS_TYPE = JS_TYPE;
-module.exports.JS_TYPES = JS_TYPES;
-module.exports.JS_AND_CSS_TYPES = JS_AND_CSS_TYPES;
-module.exports.JS_AND_CSS_URL_TYPES = JS_AND_CSS_URL_TYPES;
-module.exports.JS_AND_CSS_EXPORT_TYPES = JS_AND_CSS_EXPORT_TYPES;
-module.exports.ASSET_TYPES = ASSET_TYPES;
-module.exports.ASSET_AND_JS_TYPES = ASSET_AND_JS_TYPES;
 module.exports.ASSET_AND_CSS_URL_TYPES = ASSET_AND_CSS_URL_TYPES;
 module.exports.ASSET_AND_JS_AND_CSS_URL_TYPES = ASSET_AND_JS_AND_CSS_URL_TYPES;
+module.exports.ASSET_AND_JS_TYPES = ASSET_AND_JS_TYPES;
+module.exports.ASSET_TYPES = ASSET_TYPES;
+module.exports.CONSUME_SHARED_TYPES = CONSUME_SHARED_TYPES;
+module.exports.CSS_IMPORT_TYPES = CSS_IMPORT_TYPES;
 module.exports.CSS_TYPE = CSS_TYPE;
 module.exports.CSS_TYPES = CSS_TYPES;
 module.exports.CSS_URL_TYPES = CSS_URL_TYPES;
-module.exports.CSS_IMPORT_TYPES = CSS_IMPORT_TYPES;
-module.exports.WEBASSEMBLY_TYPES = WEBASSEMBLY_TYPES;
-module.exports.RUNTIME_TYPES = RUNTIME_TYPES;
+module.exports.JS_AND_CSS_EXPORT_TYPES = JS_AND_CSS_EXPORT_TYPES;
+module.exports.JS_AND_CSS_TYPES = JS_AND_CSS_TYPES;
+module.exports.JS_AND_CSS_URL_TYPES = JS_AND_CSS_URL_TYPES;
+module.exports.JS_TYPE = JS_TYPE;
+module.exports.JS_TYPES = JS_TYPES;
+module.exports.NO_TYPES = NO_TYPES;
 module.exports.REMOTE_AND_SHARE_INIT_TYPES = REMOTE_AND_SHARE_INIT_TYPES;
-module.exports.CONSUME_SHARED_TYPES = CONSUME_SHARED_TYPES;
+module.exports.RUNTIME_TYPES = RUNTIME_TYPES;
 module.exports.SHARED_INIT_TYPES = SHARED_INIT_TYPES;
+module.exports.WEBASSEMBLY_TYPES = WEBASSEMBLY_TYPES;

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,7 +80,7 @@ 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 */
@@ -115,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")
 );
@@ -159,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
@@ -195,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;
 };
@@ -206,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;
 };
@@ -229,7 +221,7 @@ makeSerializable(
 	"NonErrorEmittedError"
 );
 
-/** @typedef {[string | Buffer, string | SourceMapSource, PreparsedAst]}  Result */
+/** @typedef {[string | Buffer, string | RawSourceMap | undefined, PreparsedAst | undefined]}  Result */
 
 /**
  * @typedef {object} NormalModuleCompilationHooks
@@ -246,7 +238,7 @@ 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
@@ -265,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
@@ -407,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();
 	}
 
@@ -543,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
 	 */
@@ -571,7 +561,8 @@ class NormalModule extends Module {
 					name,
 					contextifySourceMap(
 						context,
-						/** @type {SourceMap} */ (sourceMap),
+						/** @type {RawSourceMap} */
+						(sourceMap),
 						associatedObjectForCache
 					)
 				);
@@ -865,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
 	 */
@@ -886,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)
 			);
 		}
 
@@ -924,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);
@@ -943,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];
@@ -1263,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 {
@@ -1389,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;
@@ -1463,9 +1453,6 @@ class NormalModule extends Module {
 			runtimeRequirements.add(RuntimeGlobals.thisAsExports);
 		}
 
-		/**
-		 * @type {() => CodeGeneratorData}
-		 */
 		const getData = () => this._codeGeneratorData;
 
 		const sources = new Map();

package/lib/NormalModuleFactory.js

@@ -9,10 +9,10 @@ const { getContext } = require("loader-runner");
 const asyncLib = require("neo-async");
 const {
 	AsyncSeriesBailHook,
-	SyncWaterfallHook,
+	HookMap,
 	SyncBailHook,
 	SyncHook,
-	HookMap
+	SyncWaterfallHook
 } = require("tapable");
 const ChunkGraph = require("./ChunkGraph");
 const Module = require("./Module");
@@ -304,7 +304,7 @@ class NormalModuleFactory extends ModuleFactory {
 			generator: new HookMap(
 				() => new SyncHook(["generator", "generatorOptions"])
 			),
-			/** @type {HookMap<SyncBailHook<[TODO, ResolveData], Module | void>>} */
+			/** @type {HookMap<SyncBailHook<[CreateData, ResolveData], Module | void>>} */
 			createModuleClass: new HookMap(
 				() => new SyncBailHook(["createData", "resolveData"])
 			)
@@ -352,24 +352,26 @@ class NormalModuleFactory extends ModuleFactory {
 					// direct module
 					if (result instanceof Module) return callback(null, result);
 
-					if (typeof result === "object")
+					if (typeof result === "object") {
 						throw new Error(
 							`${deprecationChangedHookMessage(
 								"resolve",
 								this.hooks.resolve
 							)} Returning a Module object will result in this module used as result.`
 						);
+					}
 
 					this.hooks.afterResolve.callAsync(resolveData, (err, result) => {
 						if (err) return callback(err);
 
-						if (typeof result === "object")
+						if (typeof result === "object") {
 							throw new Error(
 								deprecationChangedHookMessage(
 									"afterResolve",
 									this.hooks.afterResolve
 								)
 							);
+						}
 
 						// Ignored
 						if (result === false) return callback();
@@ -570,8 +572,11 @@ class NormalModuleFactory extends ModuleFactory {
 
 					/** @type {ModuleSettings} */
 					const settings = {};
+					/** @type {LoaderItem[]} */
 					const useLoadersPost = [];
+					/** @type {LoaderItem[]} */
 					const useLoaders = [];
+					/** @type {LoaderItem[]} */
 					const useLoadersPre = [];
 
 					// handle .webpack[] suffix
@@ -630,17 +635,16 @@ class NormalModuleFactory extends ModuleFactory {
 								typeof r.value === "object" &&
 								r.value !== null &&
 								typeof settings[
-									/** @type {keyof ModuleSettings} */ (r.type)
+									/** @type {keyof ModuleSettings} */
+									(r.type)
 								] === "object" &&
 								settings[/** @type {keyof ModuleSettings} */ (r.type)] !== null
 							) {
 								const type = /** @type {keyof ModuleSettings} */ (r.type);
-								/** @type {TODO} */
-								(settings)[type] = cachedCleverMerge(settings[type], r.value);
+								settings[type] = cachedCleverMerge(settings[type], r.value);
 							} else {
 								const type = /** @type {keyof ModuleSettings} */ (r.type);
-								/** @type {TODO} */
-								(settings)[type] = r.value;
+								settings[type] = r.value;
 							}
 						}
 					}
@@ -658,18 +662,27 @@ class NormalModuleFactory extends ModuleFactory {
 						}
 						const allLoaders = /** @type {LoaderItem[]} */ (postLoaders);
 						if (matchResourceData === undefined) {
-							for (const loader of /** @type {LoaderItem[]} */ (loaders))
+							for (const loader of /** @type {LoaderItem[]} */ (loaders)) {
 								allLoaders.push(loader);
-							for (const loader of /** @type {LoaderItem[]} */ (normalLoaders))
+							}
+							for (const loader of /** @type {LoaderItem[]} */ (
+								normalLoaders
+							)) {
 								allLoaders.push(loader);
+							}
 						} else {
-							for (const loader of /** @type {LoaderItem[]} */ (normalLoaders))
+							for (const loader of /** @type {LoaderItem[]} */ (
+								normalLoaders
+							)) {
 								allLoaders.push(loader);
-							for (const loader of /** @type {LoaderItem[]} */ (loaders))
+							}
+							for (const loader of /** @type {LoaderItem[]} */ (loaders)) {
 								allLoaders.push(loader);
+							}
 						}
-						for (const loader of /** @type {LoaderItem[]} */ (preLoaders))
+						for (const loader of /** @type {LoaderItem[]} */ (preLoaders)) {
 							allLoaders.push(loader);
+						}
 						const type = /** @type {string} */ (settings.type);
 						const resolveOptions = settings.resolve;
 						const layer = settings.layer;
@@ -848,7 +861,9 @@ class NormalModuleFactory extends ModuleFactory {
 				}
 
 				// resource without scheme and without path
-				else defaultResolve(context);
+				else {
+					defaultResolve(context);
+				}
 			}
 		);
 	}
@@ -920,13 +935,14 @@ class NormalModuleFactory extends ModuleFactory {
 				return callback(null, factoryResult);
 			}
 
-			if (typeof result === "object")
+			if (typeof result === "object") {
 				throw new Error(
 					deprecationChangedHookMessage(
 						"beforeResolve",
 						this.hooks.beforeResolve
 					)
 				);
+			}
 
 			this.hooks.factorize.callAsync(resolveData, (err, module) => {
 				if (err) {
@@ -999,9 +1015,7 @@ ${hints.join("\n\n")}`;
 
 							// Check if the extension is missing a leading dot (e.g. "js" instead of ".js")
 							let appendResolveExtensionsHint = false;
-							const specifiedExtensions = Array.from(
-								resolver.options.extensions
-							);
+							const specifiedExtensions = [...resolver.options.extensions];
 							const expectedExtensions = specifiedExtensions.map(extension => {
 								if (LEADING_DOT_EXTENSION_REGEX.test(extension)) {
 									appendResolveExtensionsHint = true;

package/lib/NormalModuleReplacementPlugin.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const { join, dirname } = require("./util/fs");
+const { dirname, join } = require("./util/fs");
 
 /** @typedef {import("./Compiler")} Compiler */
 /** @typedef {import("./NormalModuleFactory").ResolveData} ResolveData */

package/lib/NullFactory.js

@@ -20,4 +20,5 @@ class NullFactory extends ModuleFactory {
 		return callback();
 	}
 }
+
 module.exports = NullFactory;