webpack 5.76.1 → 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/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.1",
+  "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;