webpack 5.57.0 → 5.58.2

package/lib/FileSystemInfo.js

@@ -206,17 +206,17 @@ class Snapshot {
 		this._flags = 0;
 		/** @type {number | undefined} */
 		this.startTime = undefined;
-		/** @type {Map<string, FileSystemInfoEntry> | undefined} */
+		/** @type {Map<string, FileSystemInfoEntry | null> | undefined} */
 		this.fileTimestamps = undefined;
-		/** @type {Map<string, string> | undefined} */
+		/** @type {Map<string, string | null> | undefined} */
 		this.fileHashes = undefined;
-		/** @type {Map<string, TimestampAndHash | string> | undefined} */
+		/** @type {Map<string, TimestampAndHash | string | null> | undefined} */
 		this.fileTshs = undefined;
-		/** @type {Map<string, ResolvedContextFileSystemInfoEntry> | undefined} */
+		/** @type {Map<string, ResolvedContextFileSystemInfoEntry | null> | undefined} */
 		this.contextTimestamps = undefined;
-		/** @type {Map<string, string> | undefined} */
+		/** @type {Map<string, string | null> | undefined} */
 		this.contextHashes = undefined;
-		/** @type {Map<string, ResolvedContextTimestampAndHash> | undefined} */
+		/** @type {Map<string, ResolvedContextTimestampAndHash | null> | undefined} */
 		this.contextTshs = undefined;
 		/** @type {Map<string, boolean> | undefined} */
 		this.missingExistence = undefined;
@@ -823,11 +823,10 @@ const getManagedItem = (managedPath, path) => {
 
 /**
  * @template {ContextFileSystemInfoEntry | ContextTimestampAndHash} T
- * @param {T | "ignore"} entry entry
+ * @param {T} entry entry
  * @returns {T["resolved"] | undefined} the resolved entry
  */
 const getResolvedTimestamp = entry => {
-	if (entry === "ignore") return undefined;
 	if (entry === null) return null;
 	if (entry.resolved !== undefined) return entry.resolved;
 	return entry.symlinks === undefined ? entry : undefined;
@@ -1191,6 +1190,7 @@ class FileSystemInfo {
 	getContextTimestamp(path, callback) {
 		const cache = this._contextTimestamps.get(path);
 		if (cache !== undefined) {
+			if (cache === "ignore") return callback(null, "ignore");
 			const resolved = getResolvedTimestamp(cache);
 			if (resolved !== undefined) return callback(null, resolved);
 			return this._resolveContextTimestamp(cache, callback);
@@ -1876,17 +1876,17 @@ class FileSystemInfo {
 	 * @returns {void}
 	 */
 	createSnapshot(startTime, files, directories, missing, options, callback) {
-		/** @type {Map<string, FileSystemInfoEntry>} */
+		/** @type {Map<string, FileSystemInfoEntry | null>} */
 		const fileTimestamps = new Map();
-		/** @type {Map<string, string>} */
+		/** @type {Map<string, string | null>} */
 		const fileHashes = new Map();
-		/** @type {Map<string, TimestampAndHash | string>} */
+		/** @type {Map<string, TimestampAndHash | string | null>} */
 		const fileTshs = new Map();
-		/** @type {Map<string, FileSystemInfoEntry>} */
+		/** @type {Map<string, FileSystemInfoEntry | null>} */
 		const contextTimestamps = new Map();
-		/** @type {Map<string, string>} */
+		/** @type {Map<string, string | null>} */
 		const contextHashes = new Map();
-		/** @type {Map<string, TimestampAndHash | string>} */
+		/** @type {Map<string, ResolvedContextTimestampAndHash | null>} */
 		const contextTshs = new Map();
 		/** @type {Map<string, boolean>} */
 		const missingExistence = new Map();
@@ -2080,6 +2080,7 @@ class FileSystemInfo {
 					this._contextTshsOptimization.optimize(snapshot, capturedDirectories);
 					for (const path of capturedDirectories) {
 						const cache = this._contextTshs.get(path);
+						/** @type {ResolvedContextTimestampAndHash} */
 						let resolved;
 						if (
 							cache !== undefined &&
@@ -2088,6 +2089,11 @@ class FileSystemInfo {
 							contextTshs.set(path, resolved);
 						} else {
 							jobs++;
+							/**
+							 * @param {Error=} err error
+							 * @param {ResolvedContextTimestampAndHash=} entry entry
+							 * @returns {void}
+							 */
 							const callback = (err, entry) => {
 								if (err) {
 									if (this.logger) {
@@ -2152,14 +2158,20 @@ class FileSystemInfo {
 					);
 					for (const path of capturedDirectories) {
 						const cache = this._contextTimestamps.get(path);
+						if (cache === "ignore") continue;
 						let resolved;
 						if (
 							cache !== undefined &&
 							(resolved = getResolvedTimestamp(cache)) !== undefined
 						) {
 							contextTimestamps.set(path, resolved);
-						} else if (cache !== "ignore") {
+						} else {
 							jobs++;
+							/**
+							 * @param {Error=} err error
+							 * @param {ResolvedContextFileSystemInfoEntry=} entry entry
+							 * @returns {void}
+							 */
 							const callback = (err, entry) => {
 								if (err) {
 									if (this.logger) {
@@ -2572,14 +2584,14 @@ class FileSystemInfo {
 					const cache = this._fileTimestamps.get(path);
 					if (cache !== undefined) {
 						if (cache === "ignore" || !checkFile(path, cache, tsh, false)) {
-							processFileHashSnapshot(path, tsh.hash);
+							processFileHashSnapshot(path, tsh && tsh.hash);
 						}
 					} else {
 						jobs++;
 						this.fileTimestampQueue.add(path, (err, entry) => {
 							if (err) return invalidWithError(path, err);
 							if (!checkFile(path, entry, tsh, false)) {
-								processFileHashSnapshot(path, tsh.hash);
+								processFileHashSnapshot(path, tsh && tsh.hash);
 							}
 							jobDone();
 						});
@@ -2592,6 +2604,7 @@ class FileSystemInfo {
 			this._statTestedEntries += contextTimestamps.size;
 			for (const [path, ts] of contextTimestamps) {
 				const cache = this._contextTimestamps.get(path);
+				if (cache === "ignore") continue;
 				let resolved;
 				if (
 					cache !== undefined &&
@@ -2601,8 +2614,13 @@ class FileSystemInfo {
 						invalid();
 						return;
 					}
-				} else if (cache !== "ignore") {
+				} else {
 					jobs++;
+					/**
+					 * @param {Error=} err error
+					 * @param {ResolvedContextFileSystemInfoEntry=} entry entry
+					 * @returns {void}
+					 */
 					const callback = (err, entry) => {
 						if (err) return invalidWithError(path, err);
 						if (!checkContext(path, entry, ts)) {
@@ -2662,27 +2680,33 @@ class FileSystemInfo {
 					processContextHashSnapshot(path, tsh);
 				} else {
 					const cache = this._contextTimestamps.get(path);
+					if (cache === "ignore") continue;
 					let resolved;
 					if (
 						cache !== undefined &&
 						(resolved = getResolvedTimestamp(cache)) !== undefined
 					) {
 						if (!checkContext(path, resolved, tsh, false)) {
-							processContextHashSnapshot(path, tsh.hash);
+							processContextHashSnapshot(path, tsh && tsh.hash);
 						}
-					} else if (cache !== "ignore") {
+					} else {
 						jobs++;
+						/**
+						 * @param {Error=} err error
+						 * @param {ResolvedContextFileSystemInfoEntry=} entry entry
+						 * @returns {void}
+						 */
 						const callback = (err, entry) => {
 							if (err) return invalidWithError(path, err);
 							if (!checkContext(path, entry, tsh, false)) {
-								processContextHashSnapshot(path, tsh.hash);
+								processContextHashSnapshot(path, tsh && tsh.hash);
 							}
 							jobDone();
 						};
 						if (cache !== undefined) {
-							this._resolveContextTsh(cache, callback);
+							this._resolveContextTimestamp(cache, callback);
 						} else {
-							this.getContextTsh(path, callback);
+							this.getContextTimestamp(path, callback);
 						}
 					}
 				}
@@ -3032,6 +3056,11 @@ class FileSystemInfo {
 		);
 	}
 
+	/**
+	 * @param {ContextFileSystemInfoEntry} entry entry
+	 * @param {function(Error=, ResolvedContextFileSystemInfoEntry=): void} callback callback
+	 * @returns {void}
+	 */
 	_resolveContextTimestamp(entry, callback) {
 		const hashes = [];
 		let safeTime = 0;
@@ -3135,6 +3164,11 @@ class FileSystemInfo {
 		);
 	}
 
+	/**
+	 * @param {ContextHash} entry context hash
+	 * @param {function(Error=, string=): void} callback callback
+	 * @returns {void}
+	 */
 	_resolveContextHash(entry, callback) {
 		const hashes = [];
 		processAsyncTree(
@@ -3286,6 +3320,11 @@ class FileSystemInfo {
 		}
 	}
 
+	/**
+	 * @param {ContextTimestampAndHash} entry entry
+	 * @param {function(Error=, ResolvedContextTimestampAndHash=): void} callback callback
+	 * @returns {void}
+	 */
 	_resolveContextTsh(entry, callback) {
 		const hashes = [];
 		const tsHashes = [];

package/lib/Module.js

@@ -885,6 +885,10 @@ class Module extends DependenciesBlock {
 		return true;
 	}
 
+	hasChunkCondition() {
+		return this.chunkCondition !== Module.prototype.chunkCondition;
+	}
+
 	/**
 	 * Assuming this module is in the cache. Update the (cached) module with
 	 * the fresh module from the factory. Usually updates internal references

package/lib/ModuleGraph.js

@@ -123,14 +123,6 @@ class ModuleGraph {
 		/** @type {WeakMap<any, Object>} */
 		this._metaMap = new WeakMap();
 
-		// Caching
-		this._cacheModuleGraphModuleKey1 = undefined;
-		this._cacheModuleGraphModuleValue1 = undefined;
-		this._cacheModuleGraphModuleKey2 = undefined;
-		this._cacheModuleGraphModuleValue2 = undefined;
-		this._cacheModuleGraphDependencyKey = undefined;
-		this._cacheModuleGraphDependencyValue = undefined;
-
 		/** @type {WeakTupleMap<any[], any>} */
 		this._cache = undefined;
 
@@ -143,19 +135,11 @@ class ModuleGraph {
 	 * @returns {ModuleGraphModule} the internal module
 	 */
 	_getModuleGraphModule(module) {
-		if (this._cacheModuleGraphModuleKey1 === module)
-			return this._cacheModuleGraphModuleValue1;
-		if (this._cacheModuleGraphModuleKey2 === module)
-			return this._cacheModuleGraphModuleValue2;
 		let mgm = this._moduleMap.get(module);
 		if (mgm === undefined) {
 			mgm = new ModuleGraphModule();
 			this._moduleMap.set(module, mgm);
 		}
-		this._cacheModuleGraphModuleKey2 = this._cacheModuleGraphModuleKey1;
-		this._cacheModuleGraphModuleValue2 = this._cacheModuleGraphModuleValue1;
-		this._cacheModuleGraphModuleKey1 = module;
-		this._cacheModuleGraphModuleValue1 = mgm;
 		return mgm;
 	}
 
@@ -163,9 +147,11 @@ class ModuleGraph {
 	 * @param {Dependency} dependency the dependency
 	 * @param {DependenciesBlock} block parent block
 	 * @param {Module} module parent module
+	 * @param {number=} indexInBlock position in block
 	 * @returns {void}
 	 */
-	setParents(dependency, block, module) {
+	setParents(dependency, block, module, indexInBlock = -1) {
+		dependency._parentDependenciesBlockIndex = indexInBlock;
 		dependency._parentDependenciesBlock = block;
 		dependency._parentModule = module;
 	}
@@ -186,6 +172,14 @@ class ModuleGraph {
 		return dependency._parentDependenciesBlock;
 	}
 
+	/**
+	 * @param {Dependency} dependency the dependency
+	 * @returns {number} index
+	 */
+	getParentBlockIndex(dependency) {
+		return dependency._parentDependenciesBlockIndex;
+	}
+
 	/**
 	 * @param {Module} originModule the referencing module
 	 * @param {Dependency} dependency the referencing dependency

package/lib/NormalModule.js

@@ -37,6 +37,7 @@ const {
 	keepOriginalOrder
 } = require("./util/comparators");
 const createHash = require("./util/createHash");
+const { createFakeHook } = require("./util/deprecation");
 const { join } = require("./util/fs");
 const {
 	contextify,
@@ -187,6 +188,7 @@ makeSerializable(
  * @property {SyncHook<[object, NormalModule]>} loader
  * @property {SyncHook<[LoaderItem[], NormalModule, object]>} beforeLoaders
  * @property {HookMap<AsyncSeriesBailHook<[string, NormalModule], string | Buffer>>} readResourceForScheme
+ * @property {HookMap<AsyncSeriesBailHook<[object], string | Buffer>>} readResource
  * @property {AsyncSeriesBailHook<[NormalModule, NeedBuildContext], boolean>} needBuild
  */
 
@@ -209,8 +211,28 @@ class NormalModule extends Module {
 			hooks = {
 				loader: new SyncHook(["loaderContext", "module"]),
 				beforeLoaders: new SyncHook(["loaders", "module", "loaderContext"]),
-				readResourceForScheme: new HookMap(
-					() => new AsyncSeriesBailHook(["resource", "module"])
+				// TODO webpack 6 deprecate
+				readResourceForScheme: new HookMap(scheme => {
+					const hook = hooks.readResource.for(scheme);
+					return createFakeHook(
+						/** @type {AsyncSeriesBailHook<[string, NormalModule], string | Buffer>} */ ({
+							tap: (options, fn) =>
+								hook.tap(options, loaderContext =>
+									fn(loaderContext.resource, loaderContext._module)
+								),
+							tapAsync: (options, fn) =>
+								hook.tapAsync(options, (loaderContext, callback) =>
+									fn(loaderContext.resource, loaderContext._module, callback)
+								),
+							tapPromise: (options, fn) =>
+								hook.tapPromise(options, loaderContext =>
+									fn(loaderContext.resource, loaderContext._module)
+								)
+						})
+					);
+				}),
+				readResource: new HookMap(
+					() => new AsyncSeriesBailHook(["loaderContext"])
 				),
 				needBuild: new AsyncSeriesBailHook(["module", "context"])
 			};
@@ -786,20 +808,15 @@ class NormalModule extends Module {
 				processResource: (loaderContext, resourcePath, callback) => {
 					const resource = loaderContext.resource;
 					const scheme = getScheme(resource);
-					if (scheme) {
-						hooks.readResourceForScheme
-							.for(scheme)
-							.callAsync(resource, this, (err, result) => {
-								if (err) return callback(err);
-								if (typeof result !== "string" && !result) {
-									return callback(new UnhandledSchemeError(scheme, resource));
-								}
-								return callback(null, result);
-							});
-					} else {
-						loaderContext.addDependency(resourcePath);
-						fs.readFile(resourcePath, callback);
-					}
+					hooks.readResource
+						.for(scheme)
+						.callAsync(loaderContext, (err, result) => {
+							if (err) return callback(err);
+							if (typeof result !== "string" && !result) {
+								return callback(new UnhandledSchemeError(scheme, resource));
+							}
+							return callback(null, result);
+						});
 				}
 			},
 			(err, result) => {

package/lib/NormalModuleFactory.js

@@ -466,49 +466,68 @@ class NormalModuleFactory extends ModuleFactory {
 							: "") +
 						stringifyLoadersAndResource(loaders, resourceData.resource);
 
-					const resourceDataForRules = matchResourceData || resourceData;
-					const result = this.ruleSet.exec({
-						resource: resourceDataForRules.path,
-						realResource: resourceData.path,
-						resourceQuery: resourceDataForRules.query,
-						resourceFragment: resourceDataForRules.fragment,
-						scheme,
-						assertions,
-						mimetype: matchResourceData ? "" : resourceData.data.mimetype || "",
-						dependency: dependencyType,
-						descriptionData: matchResourceData
-							? undefined
-							: resourceData.data.descriptionFileData,
-						issuer: contextInfo.issuer,
-						compiler: contextInfo.compiler,
-						issuerLayer: contextInfo.issuerLayer || ""
-					});
 					const settings = {};
 					const useLoadersPost = [];
 					const useLoaders = [];
 					const useLoadersPre = [];
-					for (const r of result) {
-						if (r.type === "use") {
-							if (!noAutoLoaders && !noPrePostAutoLoaders) {
-								useLoaders.push(r.value);
-							}
-						} else if (r.type === "use-post") {
-							if (!noPrePostAutoLoaders) {
-								useLoadersPost.push(r.value);
-							}
-						} else if (r.type === "use-pre") {
-							if (!noPreAutoLoaders && !noPrePostAutoLoaders) {
-								useLoadersPre.push(r.value);
+
+					// handle .webpack[] suffix
+					let resource;
+					let match;
+					if (
+						matchResourceData &&
+						typeof (resource = matchResourceData.resource) === "string" &&
+						(match = /\.webpack\[([^\]]+)\]$/.exec(resource))
+					) {
+						settings.type = match[1];
+						matchResourceData.resource = matchResourceData.resource.slice(
+							0,
+							-settings.type.length - 10
+						);
+					} else {
+						settings.type = "javascript/auto";
+						const resourceDataForRules = matchResourceData || resourceData;
+						const result = this.ruleSet.exec({
+							resource: resourceDataForRules.path,
+							realResource: resourceData.path,
+							resourceQuery: resourceDataForRules.query,
+							resourceFragment: resourceDataForRules.fragment,
+							scheme,
+							assertions,
+							mimetype: matchResourceData
+								? ""
+								: resourceData.data.mimetype || "",
+							dependency: dependencyType,
+							descriptionData: matchResourceData
+								? undefined
+								: resourceData.data.descriptionFileData,
+							issuer: contextInfo.issuer,
+							compiler: contextInfo.compiler,
+							issuerLayer: contextInfo.issuerLayer || ""
+						});
+						for (const r of result) {
+							if (r.type === "use") {
+								if (!noAutoLoaders && !noPrePostAutoLoaders) {
+									useLoaders.push(r.value);
+								}
+							} else if (r.type === "use-post") {
+								if (!noPrePostAutoLoaders) {
+									useLoadersPost.push(r.value);
+								}
+							} else if (r.type === "use-pre") {
+								if (!noPreAutoLoaders && !noPrePostAutoLoaders) {
+									useLoadersPre.push(r.value);
+								}
+							} else if (
+								typeof r.value === "object" &&
+								r.value !== null &&
+								typeof settings[r.type] === "object" &&
+								settings[r.type] !== null
+							) {
+								settings[r.type] = cachedCleverMerge(settings[r.type], r.value);
+							} else {
+								settings[r.type] = r.value;
 							}
-						} else if (
-							typeof r.value === "object" &&
-							r.value !== null &&
-							typeof settings[r.type] === "object" &&
-							settings[r.type] !== null
-						) {
-							settings[r.type] = cachedCleverMerge(settings[r.type], r.value);
-						} else {
-							settings[r.type] = r.value;
 						}
 					}
 
@@ -528,23 +547,6 @@ class NormalModuleFactory extends ModuleFactory {
 						}
 						for (const loader of preLoaders) allLoaders.push(loader);
 						let type = settings.type;
-						if (!type) {
-							let resource;
-							let match;
-							if (
-								matchResourceData &&
-								typeof (resource = matchResourceData.resource) === "string" &&
-								(match = /\.webpack\[([^\]]+)\]$/.exec(resource))
-							) {
-								type = match[1];
-								matchResourceData.resource = matchResourceData.resource.slice(
-									0,
-									-type.length - 10
-								);
-							} else {
-								type = "javascript/auto";
-							}
-						}
 						const resolveOptions = settings.resolve;
 						const layer = settings.layer;
 						if (layer !== undefined && !layers) {