webpack 5.65.0 → 5.69.0

package/lib/ExternalModule.js

@@ -53,6 +53,7 @@ const { register } = require("./util/serialization");
  */
 
 const TYPES = new Set(["javascript"]);
+const CSS_TYPES = new Set(["css-import"]);
 const RUNTIME_REQUIREMENTS = new Set([RuntimeGlobals.module]);
 const RUNTIME_REQUIREMENTS_FOR_SCRIPT = new Set([RuntimeGlobals.loadScript]);
 const RUNTIME_REQUIREMENTS_FOR_MODULE = new Set([
@@ -392,7 +393,7 @@ class ExternalModule extends Module {
 	 * @returns {Set<string>} types available (do not mutate)
 	 */
 	getSourceTypes() {
-		return TYPES;
+		return this.externalType === "css-import" ? CSS_TYPES : TYPES;
 	}
 
 	/**
@@ -409,7 +410,9 @@ class ExternalModule extends Module {
 	 * @returns {boolean} true, if the chunk is ok for the module
 	 */
 	chunkCondition(chunk, { chunkGraph }) {
-		return chunkGraph.getNumberOfEntryModules(chunk) > 0;
+		return this.externalType === "css-import"
+			? true
+			: chunkGraph.getNumberOfEntryModules(chunk) > 0;
 	}
 
 	/**
@@ -429,7 +432,7 @@ class ExternalModule extends Module {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {
@@ -526,8 +529,14 @@ class ExternalModule extends Module {
 		return { request, externalType };
 	}
 
-	_getSourceData(runtimeTemplate, moduleGraph, chunkGraph, runtime) {
-		const { request, externalType } = this._getRequestAndExternalType();
+	_getSourceData(
+		request,
+		externalType,
+		runtimeTemplate,
+		moduleGraph,
+		chunkGraph,
+		runtime
+	) {
 		switch (externalType) {
 			case "this":
 			case "window":
@@ -541,6 +550,7 @@ class ExternalModule extends Module {
 			case "commonjs":
 			case "commonjs2":
 			case "commonjs-module":
+			case "commonjs-static":
 				return getSourceForCommonJsExternal(request);
 			case "node-commonjs":
 				return this.buildInfo.module
@@ -613,60 +623,90 @@ class ExternalModule extends Module {
 		runtime,
 		concatenationScope
 	}) {
-		const sourceData = this._getSourceData(
-			runtimeTemplate,
-			moduleGraph,
-			chunkGraph,
-			runtime
-		);
+		const { request, externalType } = this._getRequestAndExternalType();
+		switch (externalType) {
+			case "asset": {
+				const sources = new Map();
+				sources.set(
+					"javascript",
+					new RawSource(`module.exports = ${JSON.stringify(request)};`)
+				);
+				const data = new Map();
+				data.set("url", request);
+				return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS, data };
+			}
+			case "css-import": {
+				const sources = new Map();
+				sources.set(
+					"css-import",
+					new RawSource(`@import url(${JSON.stringify(request)});`)
+				);
+				return {
+					sources,
+					runtimeRequirements: EMPTY_RUNTIME_REQUIREMENTS
+				};
+			}
+			default: {
+				const sourceData = this._getSourceData(
+					request,
+					externalType,
+					runtimeTemplate,
+					moduleGraph,
+					chunkGraph,
+					runtime
+				);
 
-		let sourceString = sourceData.expression;
-		if (sourceData.iife)
-			sourceString = `(function() { return ${sourceString}; }())`;
-		if (concatenationScope) {
-			sourceString = `${runtimeTemplate.supportsConst() ? "const" : "var"} ${
-				ConcatenationScope.NAMESPACE_OBJECT_EXPORT
-			} = ${sourceString};`;
-			concatenationScope.registerNamespaceExport(
-				ConcatenationScope.NAMESPACE_OBJECT_EXPORT
-			);
-		} else {
-			sourceString = `module.exports = ${sourceString};`;
-		}
-		if (sourceData.init) sourceString = `${sourceData.init}\n${sourceString}`;
+				let sourceString = sourceData.expression;
+				if (sourceData.iife)
+					sourceString = `(function() { return ${sourceString}; }())`;
+				if (concatenationScope) {
+					sourceString = `${
+						runtimeTemplate.supportsConst() ? "const" : "var"
+					} ${ConcatenationScope.NAMESPACE_OBJECT_EXPORT} = ${sourceString};`;
+					concatenationScope.registerNamespaceExport(
+						ConcatenationScope.NAMESPACE_OBJECT_EXPORT
+					);
+				} else {
+					sourceString = `module.exports = ${sourceString};`;
+				}
+				if (sourceData.init)
+					sourceString = `${sourceData.init}\n${sourceString}`;
 
-		let data = undefined;
-		if (sourceData.chunkInitFragments) {
-			data = new Map();
-			data.set("chunkInitFragments", sourceData.chunkInitFragments);
-		}
+				let data = undefined;
+				if (sourceData.chunkInitFragments) {
+					data = new Map();
+					data.set("chunkInitFragments", sourceData.chunkInitFragments);
+				}
 
-		const sources = new Map();
-		if (this.useSourceMap || this.useSimpleSourceMap) {
-			sources.set(
-				"javascript",
-				new OriginalSource(sourceString, this.identifier())
-			);
-		} else {
-			sources.set("javascript", new RawSource(sourceString));
-		}
+				const sources = new Map();
+				if (this.useSourceMap || this.useSimpleSourceMap) {
+					sources.set(
+						"javascript",
+						new OriginalSource(sourceString, this.identifier())
+					);
+				} else {
+					sources.set("javascript", new RawSource(sourceString));
+				}
+
+				let runtimeRequirements = sourceData.runtimeRequirements;
+				if (!concatenationScope) {
+					if (!runtimeRequirements) {
+						runtimeRequirements = RUNTIME_REQUIREMENTS;
+					} else {
+						const set = new Set(runtimeRequirements);
+						set.add(RuntimeGlobals.module);
+						runtimeRequirements = set;
+					}
+				}
 
-		let runtimeRequirements = sourceData.runtimeRequirements;
-		if (!concatenationScope) {
-			if (!runtimeRequirements) {
-				runtimeRequirements = RUNTIME_REQUIREMENTS;
-			} else {
-				const set = new Set(runtimeRequirements);
-				set.add(RuntimeGlobals.module);
-				runtimeRequirements = set;
+				return {
+					sources,
+					runtimeRequirements:
+						runtimeRequirements || EMPTY_RUNTIME_REQUIREMENTS,
+					data
+				};
 			}
 		}
-
-		return {
-			sources,
-			runtimeRequirements: runtimeRequirements || EMPTY_RUNTIME_REQUIREMENTS,
-			data
-		};
 	}
 
 	/**

package/lib/ExternalModuleFactoryPlugin.js

@@ -117,7 +117,7 @@ class ExternalModuleFactoryPlugin {
 
 				/**
 				 * @param {Externals} externals externals config
-				 * @param {function(Error=, ExternalModule=): void} callback callback
+				 * @param {function((Error | null)=, ExternalModule=): void} callback callback
 				 * @returns {void}
 				 */
 				const handleExternals = (externals, callback) => {

package/lib/FileSystemInfo.js

@@ -1185,7 +1185,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {string} path file path
-	 * @param {function(WebpackError=, (FileSystemInfoEntry | "ignore" | null)=): void} callback callback function
+	 * @param {function((WebpackError | null)=, (FileSystemInfoEntry | "ignore" | null)=): void} callback callback function
 	 * @returns {void}
 	 */
 	getFileTimestamp(path, callback) {
@@ -1196,7 +1196,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {string} path context path
-	 * @param {function(WebpackError=, (ResolvedContextFileSystemInfoEntry | "ignore" | null)=): void} callback callback function
+	 * @param {function((WebpackError | null)=, (ResolvedContextFileSystemInfoEntry | "ignore" | null)=): void} callback callback function
 	 * @returns {void}
 	 */
 	getContextTimestamp(path, callback) {
@@ -1217,7 +1217,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {string} path context path
-	 * @param {function(WebpackError=, (ContextFileSystemInfoEntry | "ignore" | null)=): void} callback callback function
+	 * @param {function((WebpackError | null)=, (ContextFileSystemInfoEntry | "ignore" | null)=): void} callback callback function
 	 * @returns {void}
 	 */
 	_getUnresolvedContextTimestamp(path, callback) {
@@ -1228,7 +1228,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {string} path file path
-	 * @param {function(WebpackError=, string=): void} callback callback function
+	 * @param {function((WebpackError | null)=, string=): void} callback callback function
 	 * @returns {void}
 	 */
 	getFileHash(path, callback) {
@@ -1239,7 +1239,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {string} path context path
-	 * @param {function(WebpackError=, string=): void} callback callback function
+	 * @param {function((WebpackError | null)=, string=): void} callback callback function
 	 * @returns {void}
 	 */
 	getContextHash(path, callback) {
@@ -1259,7 +1259,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {string} path context path
-	 * @param {function(WebpackError=, ContextHash=): void} callback callback function
+	 * @param {function((WebpackError | null)=, ContextHash=): void} callback callback function
 	 * @returns {void}
 	 */
 	_getUnresolvedContextHash(path, callback) {
@@ -1270,7 +1270,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {string} path context path
-	 * @param {function(WebpackError=, ResolvedContextTimestampAndHash=): void} callback callback function
+	 * @param {function((WebpackError | null)=, ResolvedContextTimestampAndHash=): void} callback callback function
 	 * @returns {void}
 	 */
 	getContextTsh(path, callback) {
@@ -1290,7 +1290,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {string} path context path
-	 * @param {function(WebpackError=, ContextTimestampAndHash=): void} callback callback function
+	 * @param {function((WebpackError | null)=, ContextTimestampAndHash=): void} callback callback function
 	 * @returns {void}
 	 */
 	_getUnresolvedContextTsh(path, callback) {
@@ -1330,7 +1330,7 @@ class FileSystemInfo {
 	/**
 	 * @param {string} context context directory
 	 * @param {Iterable<string>} deps dependencies
-	 * @param {function(Error=, ResolveBuildDependenciesResult=): void} callback callback function
+	 * @param {function((Error | null)=, ResolveBuildDependenciesResult=): void} callback callback function
 	 * @returns {void}
 	 */
 	resolveBuildDependencies(context, deps, callback) {
@@ -1798,7 +1798,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {Map<string, string | false>} resolveResults results from resolving
-	 * @param {function(Error=, boolean=): void} callback callback with true when resolveResults resolve the same way
+	 * @param {function((Error | null)=, boolean=): void} callback callback with true when resolveResults resolve the same way
 	 * @returns {void}
 	 */
 	checkResolveResultsValid(resolveResults, callback) {
@@ -1880,7 +1880,7 @@ class FileSystemInfo {
 	 * @param {Object} options options object (for future extensions)
 	 * @param {boolean=} options.hash should use hash to snapshot
 	 * @param {boolean=} options.timestamp should use timestamp to snapshot
-	 * @param {function(WebpackError=, Snapshot=): void} callback callback function
+	 * @param {function((WebpackError | null)=, (Snapshot | null)=): void} callback callback function
 	 * @returns {void}
 	 */
 	createSnapshot(startTime, files, directories, missing, options, callback) {
@@ -2256,8 +2256,10 @@ class FileSystemInfo {
 		for (const path of managedItems) {
 			const cache = this._managedItems.get(path);
 			if (cache !== undefined) {
-				if (cache !== "missing") {
+				if (!cache.startsWith("*")) {
 					managedFiles.add(join(this.fs, path, "package.json"));
+				} else if (cache === "*nested") {
+					managedMissing.add(join(this.fs, path, "package.json"));
 				}
 				managedItemInfo.set(path, cache);
 			} else {
@@ -2271,8 +2273,10 @@ class FileSystemInfo {
 						}
 						jobError();
 					} else if (entry) {
-						if (entry !== "missing") {
+						if (!entry.startsWith("*")) {
 							managedFiles.add(join(this.fs, path, "package.json"));
+						} else if (cache === "*nested") {
+							managedMissing.add(join(this.fs, path, "package.json"));
 						}
 						managedItemInfo.set(path, entry);
 						jobDone();
@@ -2375,7 +2379,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {Snapshot} snapshot the snapshot made
-	 * @param {function(WebpackError=, boolean=): void} callback callback function
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function
 	 * @returns {void}
 	 */
 	checkSnapshotValid(snapshot, callback) {
@@ -2395,7 +2399,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {Snapshot} snapshot the snapshot made
-	 * @param {function(WebpackError=, boolean=): void} callback callback function
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function
 	 * @returns {void}
 	 */
 	_checkSnapshotValidNoCache(snapshot, callback) {
@@ -2944,7 +2948,7 @@ class FileSystemInfo {
 	 * @param {function(string, IStats, function(Error=, ItemType=): void): void} options.fromFile called when context item is a file
 	 * @param {function(string, IStats, function(Error=, ItemType=): void): void} options.fromDirectory called when context item is a directory
 	 * @param {function(string[], ItemType[]): T} options.reduce called from all context items
-	 * @param {function(Error=, (T)=): void} callback callback
+	 * @param {function((Error | null)=, (T)=): void} callback callback
 	 */
 	_readContext(
 		{
@@ -3127,7 +3131,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {ContextFileSystemInfoEntry} entry entry
-	 * @param {function(Error=, ResolvedContextFileSystemInfoEntry=): void} callback callback
+	 * @param {function((Error | null)=, ResolvedContextFileSystemInfoEntry=): void} callback callback
 	 * @returns {void}
 	 */
 	_resolveContextTimestamp(entry, callback) {
@@ -3235,7 +3239,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {ContextHash} entry context hash
-	 * @param {function(Error=, string=): void} callback callback
+	 * @param {function((Error | null)=, string=): void} callback callback
 	 * @returns {void}
 	 */
 	_resolveContextHash(entry, callback) {
@@ -3391,7 +3395,7 @@ class FileSystemInfo {
 
 	/**
 	 * @param {ContextTimestampAndHash} entry entry
-	 * @param {function(Error=, ResolvedContextTimestampAndHash=): void} callback callback
+	 * @param {function((Error | null)=, ResolvedContextTimestampAndHash=): void} callback callback
 	 * @returns {void}
 	 */
 	_resolveContextTsh(entry, callback) {
@@ -3471,8 +3475,8 @@ class FileSystemInfo {
 			}
 			if (!elements.has(path)) {
 				// file or directory doesn't exist
-				this._managedItems.set(path, "missing");
-				return callback(null, "missing");
+				this._managedItems.set(path, "*missing");
+				return callback(null, "*missing");
 			}
 			// something exists
 			// it may be a file or directory
@@ -3481,8 +3485,8 @@ class FileSystemInfo {
 				(path.endsWith("/node_modules") || path.endsWith("\\node_modules"))
 			) {
 				// we are only interested in existence of this special directory
-				this._managedItems.set(path, "exists");
-				return callback(null, "exists");
+				this._managedItems.set(path, "*node_modules");
+				return callback(null, "*node_modules");
 			}
 
 			// we assume it's a directory, as files shouldn't occur in managed paths
@@ -3499,8 +3503,8 @@ class FileSystemInfo {
 							) {
 								// This is only a grouping folder e. g. used by yarn
 								// we are only interested in existence of this special directory
-								this._managedItems.set(path, "nested");
-								return callback(null, "nested");
+								this._managedItems.set(path, "*nested");
+								return callback(null, "*nested");
 							}
 							this.logger.warn(
 								`Managed item ${path} isn't a directory or doesn't contain a package.json (see snapshot.managedPaths option)`

package/lib/Generator.js

@@ -7,6 +7,7 @@
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
+/** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./ConcatenationScope")} ConcatenationScope */
 /** @typedef {import("./DependencyTemplate")} DependencyTemplate */
@@ -27,6 +28,7 @@
  * @property {Set<string>} runtimeRequirements the requirements for runtime
  * @property {RuntimeSpec} runtime the runtime
  * @property {ConcatenationScope=} concatenationScope when in concatenated module, information about other concatenated modules
+ * @property {CodeGenerationResults=} codeGenerationResults code generation results of other modules (need to have a codeGenerationDependency to use that)
  * @property {string} type which kind of code should be generated
  * @property {function(): Map<string, any>=} getData get access to the code generation data
  */

package/lib/HookWebpackError.js

@@ -51,7 +51,7 @@ module.exports.makeWebpackError = makeWebpackError;
 
 /**
  * @template T
- * @param {function(WebpackError=, T=): void} callback webpack error callback
+ * @param {function((WebpackError | null)=, T=): void} callback webpack error callback
  * @param {string} hook name of hook
  * @returns {Callback<T>} generic callback
  */

package/lib/Module.js

@@ -19,6 +19,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("../declarations/WebpackOptions").WebpackOptionsNormalized} WebpackOptions */
 /** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGroup")} ChunkGroup */
+/** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./ConcatenationScope")} ConcatenationScope */
 /** @typedef {import("./Dependency")} Dependency */
@@ -56,6 +57,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {ChunkGraph} chunkGraph the chunk graph
  * @property {RuntimeSpec} runtime the runtimes code should be generated for
  * @property {ConcatenationScope=} concatenationScope when in concatenated module, information about other concatenated modules
+ * @property {CodeGenerationResults} codeGenerationResults code generation results of other modules (need to have a codeGenerationDependency to use that)
  */
 
 /**
@@ -165,6 +167,8 @@ class Module extends DependenciesBlock {
 		this.buildInfo = undefined;
 		/** @type {Dependency[] | undefined} */
 		this.presentationalDependencies = undefined;
+		/** @type {Dependency[] | undefined} */
+		this.codeGenerationDependencies = undefined;
 	}
 
 	// TODO remove in webpack 6
@@ -396,7 +400,6 @@ class Module extends DependenciesBlock {
 	// BACKWARD-COMPAT END
 
 	/**
-	 * @deprecated moved to .buildInfo.exportsArgument
 	 * @returns {string} name of the exports argument
 	 */
 	get exportsArgument() {
@@ -404,7 +407,6 @@ class Module extends DependenciesBlock {
 	}
 
 	/**
-	 * @deprecated moved to .buildInfo.moduleArgument
 	 * @returns {string} name of the module argument
 	 */
 	get moduleArgument() {
@@ -493,6 +495,19 @@ class Module extends DependenciesBlock {
 		this.presentationalDependencies.push(presentationalDependency);
 	}
 
+	/**
+	 * @param {Dependency} codeGenerationDependency dependency being tied to module.
+	 * This is a Dependency where the code generation result of the referenced module is needed during code generation.
+	 * The Dependency should also be added to normal dependencies via addDependency.
+	 * @returns {void}
+	 */
+	addCodeGenerationDependency(codeGenerationDependency) {
+		if (this.codeGenerationDependencies === undefined) {
+			this.codeGenerationDependencies = [];
+		}
+		this.codeGenerationDependencies.push(codeGenerationDependency);
+	}
+
 	/**
 	 * Removes all dependencies and blocks
 	 * @returns {void}
@@ -501,6 +516,9 @@ class Module extends DependenciesBlock {
 		if (this.presentationalDependencies !== undefined) {
 			this.presentationalDependencies.length = 0;
 		}
+		if (this.codeGenerationDependencies !== undefined) {
+			this.codeGenerationDependencies.length = 0;
+		}
 		super.clearDependenciesAndBlocks();
 	}
 
@@ -671,7 +689,7 @@ class Module extends DependenciesBlock {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {
@@ -799,7 +817,8 @@ class Module extends DependenciesBlock {
 			runtimeTemplate,
 			moduleGraph: chunkGraph.moduleGraph,
 			chunkGraph,
-			runtime: undefined
+			runtime: undefined,
+			codeGenerationResults: undefined
 		};
 		const sources = this.codeGeneration(codeGenContext).sources;
 		return type ? sources.get(type) : sources.get(first(this.getSourceTypes()));
@@ -976,6 +995,7 @@ class Module extends DependenciesBlock {
 		write(this.buildMeta);
 		write(this.buildInfo);
 		write(this.presentationalDependencies);
+		write(this.codeGenerationDependencies);
 		super.serialize(context);
 	}
 
@@ -993,6 +1013,7 @@ class Module extends DependenciesBlock {
 		this.buildMeta = read();
 		this.buildInfo = read();
 		this.presentationalDependencies = read();
+		this.codeGenerationDependencies = read();
 		super.deserialize(context);
 	}
 }

package/lib/ModuleFilenameHelpers.js

@@ -5,6 +5,7 @@
 
 "use strict";
 
+const NormalModule = require("./NormalModule");
 const createHash = require("./util/createHash");
 const memoize = require("./util/memoize");
 
@@ -138,7 +139,10 @@ ModuleFilenameHelpers.createFilename = (
 		);
 		identifier = memoize(() => requestShortener.shorten(module.identifier()));
 		moduleId = () => chunkGraph.getModuleId(module);
-		absoluteResourcePath = () => module.identifier().split("!").pop();
+		absoluteResourcePath = () =>
+			module instanceof NormalModule
+				? module.resource
+				: module.identifier().split("!").pop();
 		hash = getHash(identifier, hashFunction);
 	}
 	const resource = memoize(() => shortIdentifier().split("!").pop());

package/lib/MultiCompiler.js

@@ -27,7 +27,7 @@ const ArrayQueue = require("./util/ArrayQueue");
 /**
  * @template T
  * @callback Callback
- * @param {Error=} err
+ * @param {(Error | null)=} err
  * @param {T=} result
  */
 

package/lib/MultiWatching.js

@@ -13,7 +13,7 @@ const asyncLib = require("neo-async");
 /**
  * @template T
  * @callback Callback
- * @param {Error=} err
+ * @param {(Error | null)=} err
  * @param {T=} result
  */
 

package/lib/NormalModule.js

@@ -310,7 +310,7 @@ class NormalModule extends Module {
 		}
 
 		// Info from Build
-		/** @type {WebpackError=} */
+		/** @type {(WebpackError | null)=} */
 		this.error = null;
 		/** @private @type {Source=} */
 		this._source = null;
@@ -355,11 +355,13 @@ class NormalModule extends Module {
 	 * @returns {string | null} an identifier for library inclusion
 	 */
 	libIdent(options) {
-		return contextify(
+		let ident = contextify(
 			options.context,
 			this.userRequest,
 			options.associatedObjectForCache
 		);
+		if (this.layer) ident = `(${this.layer})/${ident}`;
+		return ident;
 	}
 
 	/**
@@ -730,7 +732,7 @@ class NormalModule extends Module {
 	 * @param {ResolverWithOptions} resolver the resolver
 	 * @param {InputFileSystem} fs the file system
 	 * @param {NormalModuleCompilationHooks} hooks the hooks
-	 * @param {function(WebpackError=): void} callback callback function
+	 * @param {function((WebpackError | null)=): void} callback callback function
 	 * @returns {void}
 	 */
 	_doBuild(options, compilation, resolver, fs, hooks, callback) {
@@ -1168,7 +1170,8 @@ class NormalModule extends Module {
 		moduleGraph,
 		chunkGraph,
 		runtime,
-		concatenationScope
+		concatenationScope,
+		codeGenerationResults
 	}) {
 		/** @type {Set<string>} */
 		const runtimeRequirements = new Set();
@@ -1200,6 +1203,7 @@ class NormalModule extends Module {
 						runtimeRequirements,
 						runtime,
 						concatenationScope,
+						codeGenerationResults,
 						getData,
 						type
 				  });
@@ -1234,7 +1238,7 @@ class NormalModule extends Module {
 
 	/**
 	 * @param {NeedBuildContext} context context info
-	 * @param {function(WebpackError=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
+	 * @param {function((WebpackError | null)=, boolean=): void} callback callback function, returns true, if the module needs a rebuild
 	 * @returns {void}
 	 */
 	needBuild(context, callback) {