webpack 5.109.0 → 5.109.1

package/lib/ids/IdHelpers.js

@@ -18,6 +18,17 @@ const numberHash = require("../util/numberHash");
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../css/CssModule").CssModuleBuildMeta} CssModuleBuildMeta */
 
+// Numbers longer than this are written in exponential form ("...e+xx"), so a
+// longer string can't be a plain integer id.
+const MAX_NUMERIC_STRING_LENGTH = 21;
+// Char codes bounding the "looks like a plain number" fast check in `avoidNumber`.
+const CC_HYPHEN_MINUS = 45;
+const CC_DIGIT_ONE = 49;
+const CC_DIGIT_NINE = 57;
+// Long ids are truncated to this length and disambiguated with a short hash.
+const MAX_SHORTENED_STRING_LENGTH = 100;
+const SHORTENED_STRING_HASH_LENGTH = 6;
+
 /**
  * Returns hash.
  * @param {string} str string to hash
@@ -38,14 +49,12 @@ const getHash = (str, len, hashFunction) => {
  * @returns {string} string prefixed by an underscore if it is a number
  */
 const avoidNumber = (str) => {
-	// max length of a number is 21 chars, bigger numbers a written as "...e+xx"
-	if (str.length > 21) return str;
+	if (str.length > MAX_NUMERIC_STRING_LENGTH) return str;
 	const firstChar = str.charCodeAt(0);
-	// skip everything that doesn't look like a number
-	// charCodes: "-": 45, "1": 49, "9": 57
-	if (firstChar < 49) {
-		if (firstChar !== 45) return str;
-	} else if (firstChar > 57) {
+	// Skip everything that doesn't start like a number ("-" or a digit).
+	if (firstChar < CC_DIGIT_ONE) {
+		if (firstChar !== CC_HYPHEN_MINUS) return str;
+	} else if (firstChar > CC_DIGIT_NINE) {
 		return str;
 	}
 	if (str === String(Number(str))) {
@@ -70,11 +79,16 @@ const requestToId = (request) =>
  * @returns {string} string with limited max length to 100 chars
  */
 const shortenLongString = (string, delimiter, hashFunction) => {
-	if (string.length < 100) return string;
+	if (string.length < MAX_SHORTENED_STRING_LENGTH) return string;
 	return (
-		string.slice(0, 100 - 6 - delimiter.length) +
+		string.slice(
+			0,
+			MAX_SHORTENED_STRING_LENGTH -
+				SHORTENED_STRING_HASH_LENGTH -
+				delimiter.length
+		) +
 		delimiter +
-		getHash(string, 6, hashFunction)
+		getHash(string, SHORTENED_STRING_HASH_LENGTH, hashFunction)
 	);
 };
 

package/lib/javascript/JavascriptParser.js

@@ -5625,8 +5625,10 @@ class JavascriptParser extends Parser {
 	}
 
 	/**
-	 * First significant char code at or after `pos`, skipping whitespace and
-	 * comments, or -1 at end of source.
+	 * First significant char code at or after `pos`, skipping whitespace,
+	 * comments and grouping `)` (a parenthesized node's range excludes its
+	 * wrapping parens, so a `,`/`;` separator can sit behind them), or -1 at
+	 * end of source.
 	 * @param {string} source source text
 	 * @param {number} pos start offset
 	 * @returns {number} char code of the next token, or -1
@@ -5643,6 +5645,7 @@ class JavascriptParser extends Parser {
 				c === 13 ||
 				c === 11 ||
 				c === 12 ||
+				c === 41 /* ) */ ||
 				c === 0xa0 ||
 				c === 0xfeff ||
 				c === 0x2028 ||