@depup/webpack 5.109.0-depup.0 → 5.109.2-depup.0

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/JavascriptModulesPlugin.js

@@ -330,23 +330,89 @@ const printGeneratedCodeForStack = (module, code) => {
  * @property {boolean=} renderInObject render module in object container
  */
 
+const createCompilationHooks = () => ({
+	/**
+	 * @type {SyncWaterfallHook<[Source, Module, ModuleRenderContext]>}
+	 */
+	renderModuleContent: new SyncWaterfallHook([
+		"source",
+		"module",
+		"moduleRenderContext"
+	]),
+	/**
+	 * @type {SyncWaterfallHook<[Source, Module, ModuleRenderContext]>}
+	 */
+	renderModuleContainer: new SyncWaterfallHook([
+		"source",
+		"module",
+		"moduleRenderContext"
+	]),
+	/**
+	 * @type {SyncWaterfallHook<[Source, Module, ModuleRenderContext]>}
+	 */
+	renderModulePackage: new SyncWaterfallHook([
+		"source",
+		"module",
+		"moduleRenderContext"
+	]),
+	/**
+	 * @type {SyncWaterfallHook<[Source, RenderContext]>}
+	 */
+	render: new SyncWaterfallHook(["source", "renderContext"]),
+	/**
+	 * @type {SyncWaterfallHook<[Source, RenderContext]>}
+	 * @since 5.41.0
+	 */
+	renderContent: new SyncWaterfallHook(["source", "renderContext"]),
+	/**
+	 * @type {SyncWaterfallHook<[Source, Module, StartupRenderContext]>}
+	 * @since 5.22.0
+	 */
+	renderStartup: new SyncWaterfallHook([
+		"source",
+		"module",
+		"startupRenderContext"
+	]),
+	/**
+	 * @type {SyncWaterfallHook<[Source, RenderContext]>}
+	 */
+	renderChunk: new SyncWaterfallHook(["source", "renderContext"]),
+	/**
+	 * @type {SyncWaterfallHook<[Source, RenderContext]>}
+	 */
+	renderMain: new SyncWaterfallHook(["source", "renderContext"]),
+	/**
+	 * @type {SyncWaterfallHook<[string, RenderBootstrapContext]>}
+	 */
+	renderRequire: new SyncWaterfallHook(["code", "renderContext"]),
+	/**
+	 * @type {SyncBailHook<[Module, Partial<RenderBootstrapContext>], string | void>}
+	 * @since 5.22.0
+	 */
+	inlineInRuntimeBailout: new SyncBailHook(["module", "renderContext"]),
+	/**
+	 * @type {SyncBailHook<[Module, RenderContext], string | void>}
+	 * @since 5.22.0
+	 */
+	embedInRuntimeBailout: new SyncBailHook(["module", "renderContext"]),
+	/**
+	 * @type {SyncBailHook<[RenderContext], string | void>}
+	 * @since 5.26.1
+	 */
+	strictRuntimeBailout: new SyncBailHook(["renderContext"]),
+	/**
+	 * @type {SyncHook<[Chunk, Hash, ChunkHashContext]>}
+	 */
+	chunkHash: new SyncHook(["chunk", "hash", "context"]),
+	/**
+	 * @type {SyncBailHook<[Chunk, RenderContext], boolean | void>}
+	 * @since 5.2.1
+	 */
+	useSourceMap: new SyncBailHook(["chunk", "renderContext"])
+});
+
 /**
- * Defines the compilation hooks type used by this module.
- * @typedef {object} CompilationHooks
- * @property {SyncWaterfallHook<[Source, Module, ModuleRenderContext]>} renderModuleContent
- * @property {SyncWaterfallHook<[Source, Module, ModuleRenderContext]>} renderModuleContainer
- * @property {SyncWaterfallHook<[Source, Module, ModuleRenderContext]>} renderModulePackage
- * @property {SyncWaterfallHook<[Source, RenderContext]>} renderChunk
- * @property {SyncWaterfallHook<[Source, RenderContext]>} renderMain
- * @property {SyncWaterfallHook<[Source, RenderContext]>} renderContent
- * @property {SyncWaterfallHook<[Source, RenderContext]>} render
- * @property {SyncWaterfallHook<[Source, Module, StartupRenderContext]>} renderStartup
- * @property {SyncWaterfallHook<[string, RenderBootstrapContext]>} renderRequire
- * @property {SyncBailHook<[Module, Partial<RenderBootstrapContext>], string | void>} inlineInRuntimeBailout
- * @property {SyncBailHook<[Module, RenderContext], string | void>} embedInRuntimeBailout
- * @property {SyncBailHook<[RenderContext], string | void>} strictRuntimeBailout
- * @property {SyncHook<[Chunk, Hash, ChunkHashContext]>} chunkHash
- * @property {SyncBailHook<[Chunk, RenderContext], boolean | void>} useSourceMap
+ * @typedef {ReturnType<typeof createCompilationHooks>} CompilationHooks
  */
 
 /**
@@ -2288,39 +2354,7 @@ class JavascriptModulesPlugin {
 }
 
 JavascriptModulesPlugin.getCompilationHooks = createHooksRegistry(
-	() =>
-		/** @type {CompilationHooks} */ ({
-			renderModuleContent: new SyncWaterfallHook([
-				"source",
-				"module",
-				"moduleRenderContext"
-			]),
-			renderModuleContainer: new SyncWaterfallHook([
-				"source",
-				"module",
-				"moduleRenderContext"
-			]),
-			renderModulePackage: new SyncWaterfallHook([
-				"source",
-				"module",
-				"moduleRenderContext"
-			]),
-			render: new SyncWaterfallHook(["source", "renderContext"]),
-			renderContent: new SyncWaterfallHook(["source", "renderContext"]),
-			renderStartup: new SyncWaterfallHook([
-				"source",
-				"module",
-				"startupRenderContext"
-			]),
-			renderChunk: new SyncWaterfallHook(["source", "renderContext"]),
-			renderMain: new SyncWaterfallHook(["source", "renderContext"]),
-			renderRequire: new SyncWaterfallHook(["code", "renderContext"]),
-			inlineInRuntimeBailout: new SyncBailHook(["module", "renderContext"]),
-			embedInRuntimeBailout: new SyncBailHook(["module", "renderContext"]),
-			strictRuntimeBailout: new SyncBailHook(["renderContext"]),
-			chunkHash: new SyncHook(["chunk", "hash", "context"]),
-			useSourceMap: new SyncBailHook(["chunk", "renderContext"])
-		})
+	createCompilationHooks
 );
 
 module.exports = JavascriptModulesPlugin;

package/lib/javascript/JavascriptParser.js

@@ -514,11 +514,17 @@ class JavascriptParser extends Parser {
 			evaluateDefinedIdentifier: new HookMap(
 				() => new SyncBailHook(["expression"])
 			),
-			/** @type {HookMap<SyncBailHook<[NewExpression], BasicEvaluatedExpression | null | undefined>>} */
+			/**
+			 * @type {HookMap<SyncBailHook<[NewExpression], BasicEvaluatedExpression | null | undefined>>}
+			 * @since 5.73.0
+			 */
 			evaluateNewExpression: new HookMap(
 				() => new SyncBailHook(["expression"])
 			),
-			/** @type {HookMap<SyncBailHook<[CallExpression], BasicEvaluatedExpression | null | undefined>>} */
+			/**
+			 * @type {HookMap<SyncBailHook<[CallExpression], BasicEvaluatedExpression | null | undefined>>}
+			 * @since 5.73.0
+			 */
 			evaluateCallExpression: new HookMap(
 				() => new SyncBailHook(["expression"])
 			),
@@ -532,12 +538,18 @@ class JavascriptParser extends Parser {
 			),
 			/** @type {SyncBailHook<[Statement | ModuleDeclaration | MaybeNamedClassDeclaration | MaybeNamedFunctionDeclaration], boolean | void>} */
 			preStatement: new SyncBailHook(["statement"]),
-			/** @type {HookMap<SyncBailHook<[Statement | ModuleDeclaration | MaybeNamedClassDeclaration | MaybeNamedFunctionDeclaration], boolean | void>>} */
+			/**
+			 * @type {HookMap<SyncBailHook<[Statement | ModuleDeclaration | MaybeNamedClassDeclaration | MaybeNamedFunctionDeclaration], boolean | void>>}
+			 * @since 5.109.0
+			 */
 			preStatementByType: new HookMap(() => new SyncBailHook(["statement"])),
 
 			/** @type {SyncBailHook<[Statement | ModuleDeclaration | MaybeNamedClassDeclaration | MaybeNamedFunctionDeclaration], boolean | void>} */
 			blockPreStatement: new SyncBailHook(["declaration"]),
-			/** @type {HookMap<SyncBailHook<[Statement | ModuleDeclaration | MaybeNamedClassDeclaration | MaybeNamedFunctionDeclaration], boolean | void>>} */
+			/**
+			 * @type {HookMap<SyncBailHook<[Statement | ModuleDeclaration | MaybeNamedClassDeclaration | MaybeNamedFunctionDeclaration], boolean | void>>}
+			 * @since 5.109.0
+			 */
 			blockPreStatementByType: new HookMap(
 				() => new SyncBailHook(["declaration"])
 			),
@@ -545,7 +557,10 @@ class JavascriptParser extends Parser {
 			statement: new SyncBailHook(["statement"]),
 			/** @type {SyncBailHook<[IfStatement], boolean | void>} */
 			statementIf: new SyncBailHook(["statement"]),
-			/** @type {SyncBailHook<[Expression], GuardCollection | void>} */
+			/**
+			 * @type {SyncBailHook<[Expression], GuardCollection | void>}
+			 * @since 5.105.0
+			 */
 			collectGuards: new SyncBailHook(["expression"]),
 			/** @type {SyncBailHook<[Expression, ClassExpression | ClassDeclaration | MaybeNamedClassDeclaration], boolean | void>} */
 			classExtendsExpression: new SyncBailHook([
@@ -554,7 +569,10 @@ class JavascriptParser extends Parser {
 			]),
 			/** @type {SyncBailHook<[MethodDefinition | PropertyDefinition | StaticBlock, ClassExpression | ClassDeclaration | MaybeNamedClassDeclaration], boolean | void>} */
 			classBodyElement: new SyncBailHook(["element", "classDefinition"]),
-			/** @type {SyncBailHook<[Expression, MethodDefinition | PropertyDefinition, ClassExpression | ClassDeclaration | MaybeNamedClassDeclaration], boolean | void>} */
+			/**
+			 * @type {SyncBailHook<[Expression, MethodDefinition | PropertyDefinition, ClassExpression | ClassDeclaration | MaybeNamedClassDeclaration], boolean | void>}
+			 * @since 5.36.0
+			 */
 			classBodyValue: new SyncBailHook([
 				"expression",
 				"element",
@@ -604,13 +622,19 @@ class JavascriptParser extends Parser {
 			varDeclarationLet: new HookMap(() => new SyncBailHook(["declaration"])),
 			/** @type {HookMap<SyncBailHook<[Identifier], boolean | void>>} */
 			varDeclarationConst: new HookMap(() => new SyncBailHook(["declaration"])),
-			/** @type {HookMap<SyncBailHook<[Identifier], boolean | void>>} */
+			/**
+			 * @type {HookMap<SyncBailHook<[Identifier], boolean | void>>}
+			 * @since 5.100.0
+			 */
 			varDeclarationUsing: new HookMap(() => new SyncBailHook(["declaration"])),
 			/** @type {HookMap<SyncBailHook<[Identifier], boolean | void>>} */
 			varDeclarationVar: new HookMap(() => new SyncBailHook(["declaration"])),
 			/** @type {HookMap<SyncBailHook<[Identifier], boolean | void>>} */
 			pattern: new HookMap(() => new SyncBailHook(["pattern"])),
-			/** @type {SyncBailHook<[Expression], boolean | void>} */
+			/**
+			 * @type {SyncBailHook<[Expression], boolean | void>}
+			 * @since 5.101.3
+			 */
 			collectDestructuringAssignmentProperties: new SyncBailHook([
 				"expression"
 			]),
@@ -671,7 +695,10 @@ class JavascriptParser extends Parser {
 			optionalChaining: new SyncBailHook(["optionalChaining"]),
 			/** @type {HookMap<SyncBailHook<[NewExpression], boolean | void>>} */
 			new: new HookMap(() => new SyncBailHook(["expression"])),
-			/** @type {SyncBailHook<[BinaryExpression], boolean | void>} */
+			/**
+			 * @type {SyncBailHook<[BinaryExpression], boolean | void>}
+			 * @since 5.71.0
+			 */
 			binaryExpression: new SyncBailHook(["binaryExpression"]),
 			/** @type {HookMap<SyncBailHook<[Expression], boolean | void>>} */
 			expression: new HookMap(() => new SyncBailHook(["expression"])),
@@ -695,11 +722,17 @@ class JavascriptParser extends Parser {
 			expressionLogicalOperator: new SyncBailHook(["expression"]),
 			/** @type {SyncBailHook<[Program, Comment[]], boolean | void>} */
 			program: new SyncBailHook(["ast", "comments"]),
-			/** @type {SyncBailHook<[ThrowStatement | ReturnStatement], boolean | void>} */
+			/**
+			 * @type {SyncBailHook<[ThrowStatement | ReturnStatement], boolean | void>}
+			 * @since 5.99.0
+			 */
 			terminate: new SyncBailHook(["statement"]),
 			/** @type {SyncBailHook<[Program, Comment[]], boolean | void>} */
 			finish: new SyncBailHook(["ast", "comments"]),
-			/** @type {SyncBailHook<[Statement], boolean | void>} */
+			/**
+			 * @type {SyncBailHook<[Statement], boolean | void>}
+			 * @since 5.99.9
+			 */
 			unusedStatement: new SyncBailHook(["statement"])
 		});
 		this.sourceType = sourceType;
@@ -5625,8 +5658,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 +5678,7 @@ class JavascriptParser extends Parser {
 				c === 13 ||
 				c === 11 ||
 				c === 12 ||
+				c === 41 /* ) */ ||
 				c === 0xa0 ||
 				c === 0xfeff ||
 				c === 0x2028 ||