webpack 5.76.0 → 5.76.2

package/lib/ModuleGraph.js

@@ -128,6 +128,9 @@ class ModuleGraph {
 
 		/** @type {Map<Module, WeakTupleMap<any, any>>} */
 		this._moduleMemCaches = undefined;
+
+		/** @type {string} */
+		this._cacheStage = undefined;
 	}
 
 	/**

package/lib/SourceMapDevToolPlugin.js

@@ -47,13 +47,32 @@ const validate = createSchemaValidation(
  * @property {ItemCacheFacade} cacheItem cache item
  */
 
+const METACHARACTERS_REGEXP = /[-[\]\\/{}()*+?.^$|]/g;
+const CONTENT_HASH_DETECT_REGEXP = /\[contenthash(:\w+)?\]/;
+const CSS_AND_JS_MODULE_EXTENSIONS_REGEXP = /\.((c|m)?js|css)($|\?)/i;
+const CSS_EXTENSION_DETECT_REGEXP = /\.css($|\?)/i;
+const MAP_URL_COMMENT_REGEXP = /\[map\]/g;
+const URL_COMMENT_REGEXP = /\[url\]/g;
+const URL_FORMATTING_REGEXP = /^\n\/\/(.*)$/;
+
+/**
+ * Reset's .lastIndex of stateful Regular Expressions
+ * For when `test` or `exec` is called on them
+ * @param {RegExp} regexp Stateful Regular Expression to be reset
+ * @returns {void}
+ *
+ */
+const resetRegexpState = regexp => {
+	regexp.lastIndex = -1;
+};
+
 /**
  * Escapes regular expression metacharacters
  * @param {string} str String to quote
  * @returns {string} Escaped string
  */
 const quoteMeta = str => {
-	return str.replace(/[-[\]\\/{}()*+?.^$|]/g, "\\$&");
+	return str.replace(METACHARACTERS_REGEXP, "\\$&");
 };
 
 /**
@@ -152,7 +171,7 @@ class SourceMapDevToolPlugin {
 		const fallbackModuleFilenameTemplate = this.fallbackModuleFilenameTemplate;
 		const requestShortener = compiler.requestShortener;
 		const options = this.options;
-		options.test = options.test || /\.((c|m)?js|css)($|\?)/i;
+		options.test = options.test || CSS_AND_JS_MODULE_EXTENSIONS_REGEXP;
 
 		const matchObject = ModuleFilenameHelpers.matchObject.bind(
 			undefined,
@@ -409,7 +428,9 @@ class SourceMapDevToolPlugin {
 									sourceMap.file = file;
 									const usesContentHash =
 										sourceMapFilename &&
-										/\[contenthash(:\w+)?\]/.test(sourceMapFilename);
+										CONTENT_HASH_DETECT_REGEXP.test(sourceMapFilename);
+
+									resetRegexpState(CONTENT_HASH_DETECT_REGEXP);
 
 									// If SourceMap and asset uses contenthash, avoid a circular dependency by hiding hash in `file`
 									if (usesContentHash && task.assetInfo.contenthash) {
@@ -428,13 +449,16 @@ class SourceMapDevToolPlugin {
 
 									/** @type {string | false} */
 									let currentSourceMappingURLComment = sourceMappingURLComment;
+									let cssExtensionDetected =
+										CSS_EXTENSION_DETECT_REGEXP.test(file);
+									resetRegexpState(CSS_EXTENSION_DETECT_REGEXP);
 									if (
 										currentSourceMappingURLComment !== false &&
-										/\.css($|\?)/i.test(file)
+										cssExtensionDetected
 									) {
 										currentSourceMappingURLComment =
 											currentSourceMappingURLComment.replace(
-												/^\n\/\/(.*)$/,
+												URL_FORMATTING_REGEXP,
 												"\n/*$1*/"
 											);
 									}
@@ -516,9 +540,9 @@ class SourceMapDevToolPlugin {
 										const asset = new ConcatSource(
 											new RawSource(source),
 											currentSourceMappingURLComment
-												.replace(/\[map\]/g, () => sourceMapString)
+												.replace(MAP_URL_COMMENT_REGEXP, () => sourceMapString)
 												.replace(
-													/\[url\]/g,
+													URL_COMMENT_REGEXP,
 													() =>
 														`data:application/json;charset=utf-8;base64,${Buffer.from(
 															sourceMapString,

package/lib/node/NodeTargetPlugin.js

@@ -11,6 +11,7 @@ const ExternalsPlugin = require("../ExternalsPlugin");
 
 const builtins = [
 	"assert",
+	"assert/strict",
 	"async_hooks",
 	"buffer",
 	"child_process",

package/lib/optimize/RealContentHashPlugin.js

@@ -178,43 +178,10 @@ class RealContentHashPlugin {
 						}
 					}
 					if (hashToAssets.size === 0) return;
-					const hashRegExps = Array.from(hashToAssets.keys(), quoteMeta).map(
-						hash => new RegExp(hash, "g")
+					const hashRegExp = new RegExp(
+						Array.from(hashToAssets.keys(), quoteMeta).join("|"),
+						"g"
 					);
-
-					/**
-					 * @param {string} str string to be matched against all hashRegExps
-					 * @returns {string[] | null} matches found
-					 */
-					const hashMatch = str => {
-						/** @type {string[]} */
-						const results = [];
-						for (const hashRegExp of hashRegExps) {
-							const matches = str.match(hashRegExp);
-							if (matches) {
-								matches.forEach(match => results.push(match));
-							}
-						}
-						if (results.length) {
-							return results;
-						} else {
-							return null;
-						}
-					};
-
-					/**
-					 * @param {string} str string to be replaced with all hashRegExps
-					 * @param {function(string): string} fn replacement function to use when a hash is found
-					 * @returns {string} replaced content
-					 */
-					const hashReplace = (str, fn) => {
-						let result = str;
-						for (const hashRegExp of hashRegExps) {
-							result = result.replace(hashRegExp, fn);
-						}
-						return result;
-					};
-
 					await Promise.all(
 						assetsWithInfo.map(async asset => {
 							const { name, source, content, hashes } = asset;
@@ -231,7 +198,7 @@ class RealContentHashPlugin {
 								await cacheAnalyse.providePromise(name, etag, () => {
 									const referencedHashes = new Set();
 									let ownHashes = new Set();
-									const inContent = hashMatch(content);
+									const inContent = content.match(hashRegExp);
 									if (inContent) {
 										for (const hash of inContent) {
 											if (hashes.has(hash)) {
@@ -331,7 +298,7 @@ ${referencingAssets
 									identifier,
 									etag,
 									() => {
-										const newContent = hashReplace(asset.content, hash =>
+										const newContent = asset.content.replace(hashRegExp, hash =>
 											hashToNewHash.get(hash)
 										);
 										return new RawSource(newContent);
@@ -356,12 +323,15 @@ ${referencingAssets
 									identifier,
 									etag,
 									() => {
-										const newContent = hashReplace(asset.content, hash => {
-											if (asset.ownHashes.has(hash)) {
-												return "";
+										const newContent = asset.content.replace(
+											hashRegExp,
+											hash => {
+												if (asset.ownHashes.has(hash)) {
+													return "";
+												}
+												return hashToNewHash.get(hash);
 											}
-											return hashToNewHash.get(hash);
-										});
+										);
 										return new RawSource(newContent);
 									}
 								);
@@ -393,6 +363,9 @@ ${referencingAssets
 						let newHash = hooks.updateHash.call(assetsContent, oldHash);
 						if (!newHash) {
 							const hash = createHash(this._hashFunction);
+							if (compilation.outputOptions.hashSalt) {
+								hash.update(compilation.outputOptions.hashSalt);
+							}
 							for (const content of assetsContent) {
 								hash.update(content);
 							}
@@ -404,7 +377,7 @@ ${referencingAssets
 					await Promise.all(
 						assetsWithInfo.map(async asset => {
 							await computeNewContent(asset);
-							const newName = hashReplace(asset.name, hash =>
+							const newName = asset.name.replace(hashRegExp, hash =>
 								hashToNewHash.get(hash)
 							);
 

package/lib/runtime/AutoPublicPathRuntimeModule.js

@@ -43,7 +43,7 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
 						"if (!scriptUrl && document) {",
 						Template.indent([
 							`if (document.currentScript)`,
-							Template.indent(`scriptUrl = document.currentScript.src`),
+							Template.indent(`scriptUrl = document.currentScript.src;`),
 							"if (!scriptUrl) {",
 							Template.indent([
 								'var scripts = document.getElementsByTagName("script");',

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -146,8 +146,7 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 							)});`,
 							"if(prev) return prev(event);"
 						])
-					) +
-					";",
+					),
 				`var timeout = setTimeout(onScriptComplete.bind(null, undefined, { type: 'timeout', target: script }), ${loadTimeout});`,
 				"script.onerror = onScriptComplete.bind(null, script.onerror);",
 				"script.onload = onScriptComplete.bind(null, script.onload);",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.76.0",
+  "version": "5.76.2",
   "author": "Tobias Koppers @sokra",
   "description": "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "license": "MIT",

package/types.d.ts

@@ -9358,6 +9358,15 @@ declare class RawSource extends Source {
 	constructor(source: string | Buffer, convertToString?: boolean);
 	isBuffer(): boolean;
 }
+declare interface RawSourceMap {
+	version: number;
+	sources: string[];
+	names: string[];
+	sourceRoot?: string;
+	sourcesContent?: string[];
+	mappings: string;
+	file: string;
+}
 declare class ReadFileCompileWasmPlugin {
 	constructor(options?: any);
 	options: any;
@@ -11104,7 +11113,7 @@ declare abstract class SortableSet<T> extends Set<T> {
 declare class Source {
 	constructor();
 	size(): number;
-	map(options?: MapOptions): Object;
+	map(options?: MapOptions): null | RawSourceMap;
 	sourceAndMap(options?: MapOptions): { source: string | Buffer; map: Object };
 	updateHash(hash: Hash): void;
 	source(): string | Buffer;