webpack 5.112.1 → 5.112.2

package/lib/optimize/ConcatenatedModule.js

@@ -1471,8 +1471,6 @@ class ConcatenatedModule extends Module {
 				if (runtimeCondition === false) continue;
 				const nonDeferAccess = !defer;
 				const module = connection.module;
-				if (targets === undefined) targets = [module];
-				else if (!targets.includes(module)) targets.push(module);
 				const dependency = connection.dependency;
 				if (
 					dependency !== null &&
@@ -1483,6 +1481,8 @@ class ConcatenatedModule extends Module {
 				}
 				const entry = referencesMap.get(module);
 				if (entry === undefined) {
+					if (targets === undefined) targets = [module];
+					else targets.push(module);
 					referencesMap.set(module, {
 						connection,
 						runtimeCondition,

package/lib/util/SourceProcessor.js

@@ -335,7 +335,7 @@ const FLATTEN_BLOCK = 64 * 1024;
 
 // Most prints do not ask for a source map. Sharing their permanently empty
 // mapping column avoids allocating an array for every inline CSS/HTML body.
-/** @type {[number, number, number, number][]} */
+/** @type {number[]} */
 const EMPTY_MAPPINGS = [];
 
 // Base64 VLQ, the source-map `mappings` encoding. Hand-rolled so producing a map
@@ -347,6 +347,28 @@ const _B64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
  * @returns {string} its Base64 VLQ encoding
  */
 const _vlq = (n) => {
+	// Most deltas are small, and each is spelled the same every time.
+	if (n > -_VLQ_CACHED && n < _VLQ_CACHED) {
+		if (_vlqCache === null) _vlqCache = Array.from({ length: _VLQ_CACHED * 2 });
+		const cached = _vlqCache[n + _VLQ_CACHED];
+		if (cached !== undefined) return cached;
+		return (_vlqCache[n + _VLQ_CACHED] = _encodeVlq(n));
+	}
+	return _encodeVlq(n);
+};
+
+// `_vlq` of every delta within this of zero, filled in as they are written,
+// and made only once a map is.
+const _VLQ_CACHED = 1024;
+/** @type {(string | undefined)[] | null} */
+let _vlqCache = null;
+
+/**
+ * One value as a Base64 VLQ, spelled out.
+ * @param {number} n the value
+ * @returns {string} its VLQ
+ */
+const _encodeVlq = (n) => {
 	let v = n < 0 ? (-n << 1) | 1 : n << 1;
 	let out = "";
 	do {
@@ -436,9 +458,11 @@ class PrintContext {
 		/** @type {boolean} whether {@link sourceMap} can still be asked for one */
 		this.mapWanted =
 			/** @type {{ source?: string }} */ (options).source !== undefined;
-		/** @type {[number, number, number, number][]} `[chunkIndex, offsetInChunk, srcLine, srcCol]`, output-ordered; a `srcLine` of -1 is one {@link retract} took back with its piece */
+		// Flat rather than one array per mapping: a stylesheet anchors every rule,
+		// and those arrays live as long as the print does.
+		/** @type {number[]} `chunkIndex, offsetInChunk, srcLine, srcCol` per mapping, output-ordered; a `srcLine` of -1 is one {@link retract} took back with its piece */
 		this._mappings = this.mapWanted ? [] : EMPTY_MAPPINGS;
-		/** @type {number[] | null} by retractable piece index, the mapping anchored to it, so taking the piece back takes its mapping too */
+		/** @type {number[] | null} by retractable piece index, the index in `_mappings` of the mapping anchored to it, so taking the piece back takes its mapping too */
 		this._retractableMappings = null;
 		/** @type {[number, string][]} source-anchored literals to keep (comments), source-ordered */
 		this._inserts = [];
@@ -651,9 +675,14 @@ class PrintContext {
 			remove -= chunks[i].length - kept;
 			chunks[i] = chunks[i].slice(0, kept);
 			// A mapping into what went would point past its piece.
-			this._mappings = this._mappings.filter(
-				([chunk, offset]) => chunk !== i || offset <= kept
-			);
+			const mappings = this._mappings;
+			let to = 0;
+			for (let at = 0; at < mappings.length; at += 4) {
+				if (mappings[at] === i && mappings[at + 1] > kept) continue;
+				for (let k = 0; k < 4; k++) mappings[to + k] = mappings[at + k];
+				to += 4;
+			}
+			mappings.length = to;
 		}
 		this._emit(text);
 		return true;
@@ -788,7 +817,7 @@ class PrintContext {
 		this._chunks[index] = "";
 		if (this._retractableMappings === null) return;
 		const mapping = this._retractableMappings[index];
-		if (mapping !== undefined) this._mappings[mapping][2] = -1;
+		if (mapping !== undefined) this._mappings[mapping + 2] = -1;
 	}
 
 	/**
@@ -923,12 +952,12 @@ class PrintContext {
 		if (srcLine !== undefined && this.mapWanted) {
 			// `_chunks.length` is where the tail will land once it is cut off, so
 			// this stays right whether or not a piece is cut after it.
-			this._mappings.push([
+			this._mappings.push(
 				this._chunks.length,
 				this._tailLength,
 				srcLine,
 				/** @type {number} */ (srcCol)
-			]);
+			);
 		}
 	}
 
@@ -1039,7 +1068,12 @@ class PrintContext {
 		// Offset of the next newline at or after the cursor, `-1` for none left.
 		// Carried rather than searched for per mapping: `indexOf` has no end bound.
 		let nextNewline = text.indexOf("\n");
-		for (const [chunkIndex, chunkOffset, sl, sc] of this._mappings) {
+		const mappings = this._mappings;
+		for (let at = 0; at < mappings.length; at += 4) {
+			const chunkIndex = mappings[at];
+			const chunkOffset = mappings[at + 1];
+			const sl = mappings[at + 2];
+			const sc = mappings[at + 3];
 			// Its piece was taken back, so there is no output left to anchor.
 			if (sl === -1) continue;
 			// A piece's length is stored, so summing them costs nothing per byte.
@@ -1100,7 +1134,7 @@ class PrintContext {
 		let at = 0;
 		for (let i = 0; i <= chunks.length; i++) {
 			const text = i === chunks.length ? this._tail : chunks[i];
-			while (at < mappings.length && mappings[at][0] < i) at++;
+			while (at < mappings.length && mappings[at] < i) at += 4;
 			let start = text.indexOf(DEFERRED_MARKER);
 			if (start === -1) continue;
 			let out = "";
@@ -1139,9 +1173,9 @@ class PrintContext {
 				chunks[i] = out;
 			}
 			let s = 0;
-			for (let k = at; k < mappings.length && mappings[k][0] === i; k++) {
-				while (s < shifts.length && shifts[s][0] <= mappings[k][1]) s++;
-				if (s !== 0) mappings[k][1] += shifts[s - 1][1];
+			for (let k = at; k < mappings.length && mappings[k] === i; k += 4) {
+				while (s < shifts.length && shifts[s][0] <= mappings[k + 1]) s++;
+				if (s !== 0) mappings[k + 1] += shifts[s - 1][1];
 			}
 		}
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.112.1",
+  "version": "5.112.2",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "homepage": "https://github.com/webpack/webpack",
   "bugs": "https://github.com/webpack/webpack/issues",
@@ -121,7 +121,8 @@
     "cover:minify": "yarn cover:base --testMatch \"<rootDir>/test/specCases/minify-corpora.spectest.js\" --coverage",
     "cover:minify-fuzz": "yarn cover:base --testMatch \"<rootDir>/test/specCases/js-fuzz.spectest.js\" --coverage",
     "cover:test262-parser": "yarn cover:base --testMatch \"<rootDir>/test/specCases/test262-parser.spectest.js\" --coverage",
-    "cover:xmlconf": "yarn cover:base --testMatch \"<rootDir>/test/specCases/xmlconf.spectest.js\" --coverage"
+    "cover:xmlconf": "yarn cover:base --testMatch \"<rootDir>/test/specCases/xmlconf.spectest.js\" --coverage",
+    "cover:spec-css-html-xml": "yarn cover:base --testMatch \"<rootDir>/test/specCases/cssParsing-webpack.spectest.js\" \"<rootDir>/test/specCases/html5lib.spectest.js\" \"<rootDir>/test/specCases/xmlconf.spectest.js\" --coverage"
   },
   "lint-staged": {
     "*.{js,cjs,mjs}": [