webpack 5.58.0 → 5.59.1

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;
@@ -854,8 +853,8 @@ class FileSystemInfo {
 	/**
 	 * @param {InputFileSystem} fs file system
 	 * @param {Object} options options
-	 * @param {Iterable<string>=} options.managedPaths paths that are only managed by a package manager
-	 * @param {Iterable<string>=} options.immutablePaths paths that are immutable
+	 * @param {Iterable<string | RegExp>=} options.managedPaths paths that are only managed by a package manager
+	 * @param {Iterable<string | RegExp>=} options.immutablePaths paths that are immutable
 	 * @param {Logger=} options.logger logger used to log invalid snapshots
 	 * @param {string | Hash=} options.hashFunction the hash function to use
 	 */
@@ -997,12 +996,19 @@ class FileSystemInfo {
 			processor: this._getManagedItemDirectoryInfo.bind(this)
 		});
 		this.managedPaths = Array.from(managedPaths);
-		this.managedPathsWithSlash = this.managedPaths.map(p =>
-			join(fs, p, "_").slice(0, -1)
+		this.managedPathsWithSlash = /** @type {string[]} */ (
+			this.managedPaths.filter(p => typeof p === "string")
+		).map(p => join(fs, p, "_").slice(0, -1));
+
+		this.managedPathsRegExps = /** @type {RegExp[]} */ (
+			this.managedPaths.filter(p => typeof p !== "string")
 		);
 		this.immutablePaths = Array.from(immutablePaths);
-		this.immutablePathsWithSlash = this.immutablePaths.map(p =>
-			join(fs, p, "_").slice(0, -1)
+		this.immutablePathsWithSlash = /** @type {string[]} */ (
+			this.immutablePaths.filter(p => typeof p === "string")
+		).map(p => join(fs, p, "_").slice(0, -1));
+		this.immutablePathsRegExps = /** @type {RegExp[]} */ (
+			this.immutablePaths.filter(p => typeof p !== "string")
 		);
 
 		this._cachedDeprecatedFileTimestamps = undefined;
@@ -1191,6 +1197,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 +1883,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();
@@ -1966,12 +1973,29 @@ class FileSystemInfo {
 			}
 		};
 		const checkManaged = (path, managedSet) => {
+			for (const immutablePath of this.immutablePathsRegExps) {
+				if (immutablePath.test(path)) {
+					managedSet.add(path);
+					return true;
+				}
+			}
 			for (const immutablePath of this.immutablePathsWithSlash) {
 				if (path.startsWith(immutablePath)) {
 					managedSet.add(path);
 					return true;
 				}
 			}
+			for (const managedPath of this.managedPathsRegExps) {
+				const match = managedPath.exec(path);
+				if (match) {
+					const managedItem = getManagedItem(match[1], path);
+					if (managedItem) {
+						managedItems.add(managedItem);
+						managedSet.add(path);
+						return true;
+					}
+				}
+			}
 			for (const managedPath of this.managedPathsWithSlash) {
 				if (path.startsWith(managedPath)) {
 					const managedItem = getManagedItem(managedPath, path);
@@ -2080,6 +2104,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 +2113,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 +2182,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 +2608,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 +2628,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 +2638,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 +2704,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);
 						}
 					}
 				}
@@ -2899,10 +2947,29 @@ class FileSystemInfo {
 				files,
 				(file, callback) => {
 					const child = join(this.fs, path, file);
+					for (const immutablePath of this.immutablePathsRegExps) {
+						if (immutablePath.test(path)) {
+							// ignore any immutable path for timestamping
+							return callback(null, fromImmutablePath(path));
+						}
+					}
 					for (const immutablePath of this.immutablePathsWithSlash) {
 						if (path.startsWith(immutablePath)) {
 							// ignore any immutable path for timestamping
-							return callback(null, fromImmutablePath(immutablePath));
+							return callback(null, fromImmutablePath(path));
+						}
+					}
+					for (const managedPath of this.managedPathsRegExps) {
+						const match = managedPath.exec(path);
+						if (match) {
+							const managedItem = getManagedItem(match[1], path);
+							if (managedItem) {
+								// construct timestampHash from managed info
+								return this.managedItemQueue.add(managedItem, (err, info) => {
+									if (err) return callback(err);
+									return callback(null, fromManagedItem(info));
+								});
+							}
 						}
 					}
 					for (const managedPath of this.managedPathsWithSlash) {
@@ -3032,6 +3099,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 +3207,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 +3363,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/NormalModule.js

@@ -187,6 +187,8 @@ makeSerializable(
  * @typedef {Object} NormalModuleCompilationHooks
  * @property {SyncHook<[object, NormalModule]>} loader
  * @property {SyncHook<[LoaderItem[], NormalModule, object]>} beforeLoaders
+ * @property {SyncHook<[NormalModule]>} beforeParse
+ * @property {SyncHook<[NormalModule]>} beforeSnapshot
  * @property {HookMap<AsyncSeriesBailHook<[string, NormalModule], string | Buffer>>} readResourceForScheme
  * @property {HookMap<AsyncSeriesBailHook<[object], string | Buffer>>} readResource
  * @property {AsyncSeriesBailHook<[NormalModule, NeedBuildContext], boolean>} needBuild
@@ -211,6 +213,8 @@ class NormalModule extends Module {
 			hooks = {
 				loader: new SyncHook(["loaderContext", "module"]),
 				beforeLoaders: new SyncHook(["loaders", "module", "loaderContext"]),
+				beforeParse: new SyncHook(["module"]),
+				beforeSnapshot: new SyncHook(["module"]),
 				// TODO webpack 6 deprecate
 				readResourceForScheme: new HookMap(scheme => {
 					const hook = hooks.readResource.for(scheme);
@@ -387,6 +391,7 @@ class NormalModule extends Module {
 		this.generator = m.generator;
 		this.generatorOptions = m.generatorOptions;
 		this.resource = m.resource;
+		this.resourceResolveData = m.resourceResolveData;
 		this.context = m.context;
 		this.matchResource = m.matchResource;
 		this.loaders = m.loaders;
@@ -488,9 +493,10 @@ class NormalModule extends Module {
 	 * @param {WebpackOptions} options webpack options
 	 * @param {Compilation} compilation the compilation
 	 * @param {InputFileSystem} fs file system from reading
+	 * @param {NormalModuleCompilationHooks} hooks the hooks
 	 * @returns {NormalModuleLoaderContext} loader context
 	 */
-	createLoaderContext(resolver, options, compilation, fs) {
+	_createLoaderContext(resolver, options, compilation, fs, hooks) {
 		const { requestShortener } = compilation.runtimeTemplate;
 		const getCurrentLoaderName = () => {
 			const currentLoader = this.getCurrentLoader(loaderContext);
@@ -659,10 +665,7 @@ class NormalModule extends Module {
 
 		Object.assign(loaderContext, options.loader);
 
-		NormalModule.getCompilationHooks(compilation).loader.call(
-			loaderContext,
-			this
-		);
+		hooks.loader.call(loaderContext, this);
 
 		return loaderContext;
 	}
@@ -723,15 +726,17 @@ class NormalModule extends Module {
 	 * @param {Compilation} compilation the compilation
 	 * @param {ResolverWithOptions} resolver the resolver
 	 * @param {InputFileSystem} fs the file system
+	 * @param {NormalModuleCompilationHooks} hooks the hooks
 	 * @param {function(WebpackError=): void} callback callback function
 	 * @returns {void}
 	 */
-	doBuild(options, compilation, resolver, fs, callback) {
-		const loaderContext = this.createLoaderContext(
+	_doBuild(options, compilation, resolver, fs, hooks, callback) {
+		const loaderContext = this._createLoaderContext(
 			resolver,
 			options,
 			compilation,
-			fs
+			fs,
+			hooks
 		);
 
 		const processResult = (err, result) => {
@@ -785,8 +790,6 @@ class NormalModule extends Module {
 			return callback();
 		};
 
-		const hooks = NormalModule.getCompilationHooks(compilation);
-
 		this.buildInfo.fileDependencies = new LazySet();
 		this.buildInfo.contextDependencies = new LazySet();
 		this.buildInfo.missingDependencies = new LazySet();
@@ -942,7 +945,9 @@ class NormalModule extends Module {
 
 		const startTime = compilation.compiler.fsStartTime || Date.now();
 
-		return this.doBuild(options, compilation, resolver, fs, err => {
+		const hooks = NormalModule.getCompilationHooks(compilation);
+
+		return this._doBuild(options, compilation, resolver, fs, hooks, err => {
 			// if we have an error mark module as failed and exit
 			if (err) {
 				this.markModuleAsErrored(err);
@@ -974,6 +979,13 @@ class NormalModule extends Module {
 			};
 
 			const handleBuildDone = () => {
+				try {
+					hooks.beforeSnapshot.call(this);
+				} catch (err) {
+					this.markModuleAsErrored(err);
+					return callback();
+				}
+
 				const snapshotOptions = compilation.options.snapshot.module;
 				if (!this.buildInfo.cacheable || !snapshotOptions) {
 					return callback();
@@ -1038,6 +1050,14 @@ class NormalModule extends Module {
 				);
 			};
 
+			try {
+				hooks.beforeParse.call(this);
+			} catch (err) {
+				this.markModuleAsErrored(err);
+				this._initBuildHash(compilation);
+				return callback();
+			}
+
 			// check if this module should !not! be parsed.
 			// if so, exit here;
 			const noParseRule = options.module && options.module.noParse;

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) {

package/lib/RuntimeTemplate.js

@@ -807,7 +807,7 @@ class RuntimeTemplate {
 					? `(0,${access})`
 					: asiSafe === false
 					? `;(0,${access})`
-					: `Object(${access})`;
+					: `/*#__PURE__*/Object(${access})`;
 			}
 			return access;
 		} else {

package/lib/WebpackOptionsApply.js

@@ -279,8 +279,6 @@ class WebpackOptionsApply extends OptionsApply {
 		if (options.experiments.buildHttp) {
 			const HttpUriPlugin = require("./schemes/HttpUriPlugin");
 			const httpOptions = options.experiments.buildHttp;
-			if (httpOptions === true)
-				throw new Error("Unexpected due to normalization");
 			new HttpUriPlugin(httpOptions).apply(compiler);
 		}
 

package/lib/cache/AddManagedPathsPlugin.js

@@ -9,8 +9,8 @@
 
 class AddManagedPathsPlugin {
 	/**
-	 * @param {Iterable<string>} managedPaths list of managed paths
-	 * @param {Iterable<string>} immutablePaths list of immutable paths
+	 * @param {Iterable<string | RegExp>} managedPaths list of managed paths
+	 * @param {Iterable<string | RegExp>} immutablePaths list of immutable paths
 	 */
 	constructor(managedPaths, immutablePaths) {
 		this.managedPaths = new Set(managedPaths);

package/lib/cache/PackFileCacheStrategy.js

@@ -370,8 +370,8 @@ class Pack {
 			for (const identifier of content.items) {
 				mergedItems.add(identifier);
 			}
-			for (const identifer of content.used) {
-				mergedUsedItems.add(identifer);
+			for (const identifier of content.used) {
+				mergedUsedItems.add(identifier);
 			}
 			addToMergedMap.push(async map => {
 				// unpack existing content