webpack 5.59.0 → 5.76.0

package/lib/ExternalModuleFactoryPlugin.js

@@ -89,8 +89,8 @@ class ExternalModuleFactoryPlugin {
 							UNSPECIFIED_EXTERNAL_TYPE_REGEXP.test(externalConfig)
 						) {
 							const idx = externalConfig.indexOf(" ");
-							type = externalConfig.substr(0, idx);
-							externalConfig = externalConfig.substr(idx + 1);
+							type = externalConfig.slice(0, idx);
+							externalConfig = externalConfig.slice(idx + 1);
 						} else if (
 							Array.isArray(externalConfig) &&
 							externalConfig.length > 0 &&
@@ -98,9 +98,9 @@ class ExternalModuleFactoryPlugin {
 						) {
 							const firstItem = externalConfig[0];
 							const idx = firstItem.indexOf(" ");
-							type = firstItem.substr(0, idx);
+							type = firstItem.slice(0, idx);
 							externalConfig = [
-								firstItem.substr(idx + 1),
+								firstItem.slice(idx + 1),
 								...externalConfig.slice(1)
 							];
 						}
@@ -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

@@ -6,7 +6,9 @@
 "use strict";
 
 const { create: createResolver } = require("enhanced-resolve");
+const nodeModule = require("module");
 const asyncLib = require("neo-async");
+const { isAbsolute } = require("path");
 const AsyncQueue = require("./util/AsyncQueue");
 const StackedCacheMap = require("./util/StackedCacheMap");
 const createHash = require("./util/createHash");
@@ -22,6 +24,8 @@ const processAsyncTree = require("./util/processAsyncTree");
 
 const supportsEsm = +process.versions.modules >= 83;
 
+const builtinModules = new Set(nodeModule.builtinModules);
+
 let FS_ACCURACY = 2000;
 
 const EMPTY_SET = new Set();
@@ -204,6 +208,12 @@ class SnapshotIterable {
 class Snapshot {
 	constructor() {
 		this._flags = 0;
+		/** @type {Iterable<string> | undefined} */
+		this._cachedFileIterable = undefined;
+		/** @type {Iterable<string> | undefined} */
+		this._cachedContextIterable = undefined;
+		/** @type {Iterable<string> | undefined} */
+		this._cachedMissingIterable = undefined;
 		/** @type {number | undefined} */
 		this.startTime = undefined;
 		/** @type {Map<string, FileSystemInfoEntry | null> | undefined} */
@@ -414,31 +424,43 @@ class Snapshot {
 	 * @returns {Iterable<string>} iterable
 	 */
 	getFileIterable() {
-		return this._createIterable(s => [
-			s.fileTimestamps,
-			s.fileHashes,
-			s.fileTshs,
-			s.managedFiles
-		]);
+		if (this._cachedFileIterable === undefined) {
+			this._cachedFileIterable = this._createIterable(s => [
+				s.fileTimestamps,
+				s.fileHashes,
+				s.fileTshs,
+				s.managedFiles
+			]);
+		}
+		return this._cachedFileIterable;
 	}
 
 	/**
 	 * @returns {Iterable<string>} iterable
 	 */
 	getContextIterable() {
-		return this._createIterable(s => [
-			s.contextTimestamps,
-			s.contextHashes,
-			s.contextTshs,
-			s.managedContexts
-		]);
+		if (this._cachedContextIterable === undefined) {
+			this._cachedContextIterable = this._createIterable(s => [
+				s.contextTimestamps,
+				s.contextHashes,
+				s.contextTshs,
+				s.managedContexts
+			]);
+		}
+		return this._cachedContextIterable;
 	}
 
 	/**
 	 * @returns {Iterable<string>} iterable
 	 */
 	getMissingIterable() {
-		return this._createIterable(s => [s.missingExistence, s.managedMissing]);
+		if (this._cachedMissingIterable === undefined) {
+			this._cachedMissingIterable = this._createIterable(s => [
+				s.missingExistence,
+				s.managedMissing
+			]);
+		}
+		return this._cachedMissingIterable;
 	}
 }
 
@@ -692,6 +714,11 @@ class SnapshotOptimization {
 	}
 }
 
+const parseString = str => {
+	if (str[0] === "'") str = `"${str.slice(1, -1).replace(/"/g, '\\"')}"`;
+	return JSON.parse(str);
+};
+
 /* istanbul ignore next */
 /**
  * @param {number} mtime mtime
@@ -1180,7 +1207,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) {
@@ -1191,7 +1218,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) {
@@ -1212,7 +1239,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) {
@@ -1223,7 +1250,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) {
@@ -1234,7 +1261,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) {
@@ -1254,7 +1281,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) {
@@ -1265,7 +1292,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) {
@@ -1285,7 +1312,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) {
@@ -1325,7 +1352,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) {
@@ -1625,7 +1652,9 @@ class FileSystemInfo {
 									let request = relative(this.fs, context, childPath);
 									if (request.endsWith(".js")) request = request.slice(0, -3);
 									request = request.replace(/\\/g, "/");
-									if (!request.startsWith("../")) request = `./${request}`;
+									if (!request.startsWith("../") && !isAbsolute(request)) {
+										request = `./${request}`;
+									}
 									push({
 										type: RBDT_RESOLVE_CJS_FILE,
 										context,
@@ -1657,21 +1686,22 @@ class FileSystemInfo {
 												let dependency;
 												if (imp.d === -1) {
 													// import ... from "..."
-													dependency = JSON.parse(
+													dependency = parseString(
 														source.substring(imp.s - 1, imp.e + 1)
 													);
 												} else if (imp.d > -1) {
 													// import()
 													let expr = source.substring(imp.s, imp.e).trim();
-													if (expr[0] === "'")
-														expr = `"${expr
-															.slice(1, -1)
-															.replace(/"/g, '\\"')}"`;
-													dependency = JSON.parse(expr);
+													dependency = parseString(expr);
 												} else {
 													// e.g. import.meta
 													continue;
 												}
+
+												// we should not track Node.js build dependencies
+												if (dependency.startsWith("node:")) continue;
+												if (builtinModules.has(dependency)) continue;
+
 												push({
 													type: RBDT_RESOLVE_ESM_FILE,
 													context,
@@ -1797,7 +1827,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) {
@@ -1879,7 +1909,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) {
@@ -1988,7 +2018,7 @@ class FileSystemInfo {
 			for (const managedPath of this.managedPathsRegExps) {
 				const match = managedPath.exec(path);
 				if (match) {
-					const managedItem = getManagedItem(managedPath[1], path);
+					const managedItem = getManagedItem(match[1], path);
 					if (managedItem) {
 						managedItems.add(managedItem);
 						managedSet.add(path);
@@ -2015,8 +2045,7 @@ class FileSystemInfo {
 			}
 			return capturedItems;
 		};
-		if (files) {
-			const capturedFiles = captureNonManaged(files, managedFiles);
+		const processCapturedFiles = capturedFiles => {
 			switch (mode) {
 				case 3:
 					this._fileTshsOptimization.optimize(snapshot, capturedFiles);
@@ -2093,12 +2122,11 @@ class FileSystemInfo {
 					}
 					break;
 			}
+		};
+		if (files) {
+			processCapturedFiles(captureNonManaged(files, managedFiles));
 		}
-		if (directories) {
-			const capturedDirectories = captureNonManaged(
-				directories,
-				managedContexts
-			);
+		const processCapturedDirectories = capturedDirectories => {
 			switch (mode) {
 				case 3:
 					this._contextTshsOptimization.optimize(snapshot, capturedDirectories);
@@ -2218,9 +2246,13 @@ class FileSystemInfo {
 					}
 					break;
 			}
+		};
+		if (directories) {
+			processCapturedDirectories(
+				captureNonManaged(directories, managedContexts)
+			);
 		}
-		if (missing) {
-			const capturedMissing = captureNonManaged(missing, managedMissing);
+		const processCapturedMissing = capturedMissing => {
 			this._missingExistenceOptimization.optimize(snapshot, capturedMissing);
 			for (const path of capturedMissing) {
 				const cache = this._fileTimestamps.get(path);
@@ -2245,11 +2277,19 @@ class FileSystemInfo {
 					});
 				}
 			}
+		};
+		if (missing) {
+			processCapturedMissing(captureNonManaged(missing, managedMissing));
 		}
 		this._managedItemInfoOptimization.optimize(snapshot, managedItems);
 		for (const path of managedItems) {
 			const cache = this._managedItems.get(path);
 			if (cache !== undefined) {
+				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 {
 				jobs++;
@@ -2261,9 +2301,28 @@ class FileSystemInfo {
 							);
 						}
 						jobError();
-					} else {
+					} else if (entry) {
+						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();
+					} else {
+						// Fallback to normal snapshotting
+						const process = (set, fn) => {
+							if (set.size === 0) return;
+							const captured = new Set();
+							for (const file of set) {
+								if (file.startsWith(path)) captured.add(file);
+							}
+							if (captured.size > 0) fn(captured);
+						};
+						process(managedFiles, processCapturedFiles);
+						process(managedContexts, processCapturedDirectories);
+						process(managedMissing, processCapturedMissing);
+						jobDone();
 					}
 				});
 			}
@@ -2349,7 +2408,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) {
@@ -2369,7 +2428,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) {
@@ -2918,7 +2977,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(
 		{
@@ -2962,7 +3021,7 @@ class FileSystemInfo {
 					for (const managedPath of this.managedPathsRegExps) {
 						const match = managedPath.exec(path);
 						if (match) {
-							const managedItem = getManagedItem(managedPath[1], path);
+							const managedItem = getManagedItem(match[1], path);
 							if (managedItem) {
 								// construct timestampHash from managed info
 								return this.managedItemQueue.add(managedItem, (err, info) => {
@@ -3101,7 +3160,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) {
@@ -3209,7 +3268,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) {
@@ -3365,7 +3424,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) {
@@ -3445,8 +3504,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
@@ -3455,8 +3514,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
@@ -3473,12 +3532,13 @@ 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");
 							}
-							const problem = `Managed item ${path} isn't a directory or doesn't contain a package.json`;
-							this.logger.warn(problem);
-							return callback(new Error(problem));
+							this.logger.warn(
+								`Managed item ${path} isn't a directory or doesn't contain a package.json (see snapshot.managedPaths option)`
+							);
+							return callback();
 						});
 						return;
 					}
@@ -3490,6 +3550,12 @@ class FileSystemInfo {
 				} catch (e) {
 					return callback(e);
 				}
+				if (!data.name) {
+					this.logger.warn(
+						`${packageJsonPath} doesn't contain a "name" property (see snapshot.managedPaths option)`
+					);
+					return callback();
+				}
 				const info = `${data.name || ""}@${data.version || ""}`;
 				this._managedItems.set(path, info);
 				callback(null, info);

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
  */
@@ -36,6 +38,7 @@
  * @property {NormalModule} module the module
  * @property {ChunkGraph} chunkGraph
  * @property {RuntimeSpec} runtime
+ * @property {RuntimeTemplate=} runtimeTemplate
  */
 
 /**

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/HotModuleReplacementPlugin.js

@@ -83,6 +83,7 @@ class HotModuleReplacementPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
+		const { _backCompat: backCompat } = compiler;
 		if (compiler.options.output.strictModuleErrorHandling === undefined)
 			compiler.options.output.strictModuleErrorHandling = true;
 		const runtimeRequirements = [RuntimeGlobals.module];
@@ -597,7 +598,8 @@ class HotModuleReplacementPlugin {
 								(newRuntimeModules && newRuntimeModules.length > 0)
 							) {
 								const hotUpdateChunk = new HotUpdateChunk();
-								ChunkGraph.setChunkGraphForChunk(hotUpdateChunk, chunkGraph);
+								if (backCompat)
+									ChunkGraph.setChunkGraphForChunk(hotUpdateChunk, chunkGraph);
 								hotUpdateChunk.id = chunkId;
 								hotUpdateChunk.runtime = newRuntime;
 								if (currentChunk) {

package/lib/LoaderOptionsPlugin.js

@@ -52,7 +52,7 @@ class LoaderOptionsPlugin {
 					if (
 						ModuleFilenameHelpers.matchObject(
 							options,
-							i < 0 ? resource : resource.substr(0, i)
+							i < 0 ? resource : resource.slice(0, i)
 						)
 					) {
 						for (const key of Object.keys(options)) {

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 */
@@ -48,6 +49,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {string=} type the type of source that should be generated
  */
 
+// TODO webpack 6: compilation will be required in CodeGenerationContext
 /**
  * @typedef {Object} CodeGenerationContext
  * @property {DependencyTemplates} dependencyTemplates the dependency templates
@@ -56,6 +58,9 @@ 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)
+ * @property {Compilation=} compilation the compilation
+ * @property {ReadonlySet<string>=} sourceTypes source types
  */
 
 /**
@@ -165,6 +170,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 +403,6 @@ class Module extends DependenciesBlock {
 	// BACKWARD-COMPAT END
 
 	/**
-	 * @deprecated moved to .buildInfo.exportsArgument
 	 * @returns {string} name of the exports argument
 	 */
 	get exportsArgument() {
@@ -404,7 +410,6 @@ class Module extends DependenciesBlock {
 	}
 
 	/**
-	 * @deprecated moved to .buildInfo.moduleArgument
 	 * @returns {string} name of the module argument
 	 */
 	get moduleArgument() {
@@ -493,6 +498,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 +519,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 +692,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 +820,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 +998,7 @@ class Module extends DependenciesBlock {
 		write(this.buildMeta);
 		write(this.buildInfo);
 		write(this.presentationalDependencies);
+		write(this.codeGenerationDependencies);
 		super.serialize(context);
 	}
 
@@ -993,6 +1016,7 @@ class Module extends DependenciesBlock {
 		this.buildMeta = read();
 		this.buildInfo = read();
 		this.presentationalDependencies = read();
+		this.codeGenerationDependencies = read();
 		super.deserialize(context);
 	}
 }