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

package/lib/ids/ChunkModuleIdRangePlugin.js

@@ -11,9 +11,9 @@ const {
 	compareModulesByPreOrderIndexOrIdentifier
 } = require("../util/comparators");
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../ChunkGraph").ModuleComparator} ModuleComparator */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../Module" */
+/** @import { ModuleComparator } from "../ChunkGraph" */
 
 /**
  * Defines the chunk module id range plugin options type used by this module.

package/lib/ids/DeterministicChunkIdsPlugin.js

@@ -12,7 +12,7 @@ const {
 	getUsedChunkIds
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Compiler from "../Compiler" */
 
 /**
  * Defines the deterministic chunk ids plugin options type used by this module.

package/lib/ids/DeterministicModuleIdsPlugin.js

@@ -14,8 +14,8 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../Module" */
 
 /**
  * Defines the deterministic module ids plugin options type used by this module.

package/lib/ids/HashedModuleIdsPlugin.js

@@ -15,8 +15,12 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../../declarations/plugins/ids/HashedModuleIdsPlugin").HashedModuleIdsPluginOptions} HashedModuleIdsPluginOptions */
-/** @typedef {import("../Compiler")} Compiler */
+/**
+ * @import {
+ * 	HashedModuleIdsPluginOptions
+ * } from "../../declarations/plugins/ids/HashedModuleIdsPlugin"
+ */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "HashedModuleIdsPlugin";
 

package/lib/ids/IdHelpers.js

@@ -9,14 +9,24 @@ const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
 const numberHash = require("../util/numberHash");
 
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Compilation")} Compilation */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../util/Hash").HashFunction} HashFunction */
-/** @typedef {import("../util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../css/CssModule").CssModuleBuildMeta} CssModuleBuildMeta */
+/** @import Chunk from "../Chunk" */
+/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Compilation from "../Compilation" */
+/** @import Module from "../Module" */
+/** @import { HashFunction } from "../util/Hash" */
+/** @import { AssociatedObjectForCache } from "../util/identifier" */
+/** @import { CssModuleBuildMeta } from "../css/CssModule" */
+
+// 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.
@@ -38,14 +48,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 +78,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/ids/NamedChunkIdsPlugin.js

@@ -14,7 +14,7 @@ const {
 	getUsedChunkIds
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Compiler from "../Compiler" */
 
 /**
  * Defines the named chunk ids plugin options type used by this module.

package/lib/ids/NamedModuleIdsPlugin.js

@@ -14,7 +14,7 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Compiler from "../Compiler" */
 
 /**
  * Defines the named module ids plugin options type used by this module.

package/lib/ids/NaturalChunkIdsPlugin.js

@@ -8,8 +8,8 @@
 const { compareChunksNatural } = require("../util/comparators");
 const { assignAscendingChunkIds } = require("./IdHelpers");
 
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Chunk from "../Chunk" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "NaturalChunkIdsPlugin";
 

package/lib/ids/NaturalModuleIdsPlugin.js

@@ -13,7 +13,7 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "NaturalModuleIdsPlugin";
 

package/lib/ids/OccurrenceChunkIdsPlugin.js

@@ -8,9 +8,13 @@
 const { compareChunksNatural } = require("../util/comparators");
 const { assignAscendingChunkIds } = require("./IdHelpers");
 
-/** @typedef {import("../../declarations/plugins/ids/OccurrenceChunkIdsPlugin").OccurrenceChunkIdsPluginOptions} OccurrenceChunkIdsPluginOptions */
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Compiler")} Compiler */
+/**
+ * @import {
+ * 	OccurrenceChunkIdsPluginOptions
+ * } from "../../declarations/plugins/ids/OccurrenceChunkIdsPlugin"
+ */
+/** @import Chunk from "../Chunk" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "OccurrenceChunkIdsPlugin";
 

package/lib/ids/OccurrenceModuleIdsPlugin.js

@@ -13,9 +13,13 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../../declarations/plugins/ids/OccurrenceModuleIdsPlugin").OccurrenceModuleIdsPluginOptions} OccurrenceModuleIdsPluginOptions */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
+/**
+ * @import {
+ * 	OccurrenceModuleIdsPluginOptions
+ * } from "../../declarations/plugins/ids/OccurrenceModuleIdsPlugin"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../Module" */
 
 const PLUGIN_NAME = "OccurrenceModuleIdsPlugin";
 

package/lib/ids/SyncModuleIdsPlugin.js

@@ -8,10 +8,10 @@
 const { WebpackError } = require("..");
 const { getUsedModuleIdsAndModules } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").ModuleId} ModuleId */
-/** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
+/** @import { ModuleId } from "../ChunkGraph" */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../Module" */
+/** @import { IntermediateFileSystem } from "../util/fs" */
 
 /** @typedef {{ [key: string]: ModuleId }} JSONContent */
 

package/lib/index.js

@@ -603,12 +603,22 @@ module.exports = mergeExports(fn, {
 	css: {
 		get CssModulesPlugin() {
 			return require("./css/CssModulesPlugin");
+		},
+		// Experimental native CSS parser + safe minifying serializer (its
+		// `SourceProcessor` / `printer` exports carry the `@experimental` tag).
+		get syntax() {
+			return require("./css/syntax");
 		}
 	},
 
 	html: {
 		get HtmlModulesPlugin() {
 			return require("./html/HtmlModulesPlugin");
+		},
+		// Experimental native HTML parser + safe minifying serializer (its
+		// `SourceProcessor` / `printer` exports carry the `@experimental` tag).
+		get syntax() {
+			return require("./html/syntax");
 		}
 	},
 

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -15,9 +15,9 @@ const {
 	updateHashForEntryStartup
 } = require("./StartupHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../ChunkGraph").EntryModuleWithChunkGroup} EntryModuleWithChunkGroup */
-/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
+/** @import Compiler from "../Compiler" */
+/** @import { EntryModuleWithChunkGroup } from "../ChunkGraph" */
+/** @import CodeGenerationResults from "../CodeGenerationResults" */
 
 const PLUGIN_NAME = "ArrayPushCallbackChunkFormatPlugin";
 

package/lib/javascript/BasicEvaluatedExpression.js

@@ -5,12 +5,16 @@
 
 "use strict";
 
-/** @typedef {import("estree").Node} Node */
-/** @typedef {import("./JavascriptParser").Range} Range */
-/** @typedef {import("./JavascriptParser").VariableInfo} VariableInfo */
-/** @typedef {import("./JavascriptParser").Members} Members */
-/** @typedef {import("./JavascriptParser").MembersOptionals} MembersOptionals */
-/** @typedef {import("./JavascriptParser").MemberRanges} MemberRanges */
+/** @import { Node } from "estree" */
+/**
+ * @import {
+ * 	Range,
+ * 	VariableInfo,
+ * 	Members,
+ * 	MembersOptionals,
+ * 	MemberRanges
+ * } from "./JavascriptParser"
+ */
 
 const TypeUnknown = 0;
 const TypeUndefined = 1;
@@ -302,32 +306,32 @@ class BasicEvaluatedExpression {
 	}
 
 	/**
-	 * @returns {string | VariableInfo | undefined} identifier
+	 * @returns {string | InstanceType<VariableInfo> | undefined} identifier
 	 */
 	get identifier() {
 		return this.type === TypeIdentifier
-			? /** @type {string | VariableInfo} */ (this._v1)
+			? /** @type {string | InstanceType<VariableInfo>} */ (this._v1)
 			: undefined;
 	}
 
 	/**
-	 * @param {string | VariableInfo | undefined} value identifier
+	 * @param {string | InstanceType<VariableInfo> | undefined} value identifier
 	 */
 	set identifier(value) {
 		this._v1 = value;
 	}
 
 	/**
-	 * @returns {string | VariableInfo | undefined} root info
+	 * @returns {string | InstanceType<VariableInfo> | undefined} root info
 	 */
 	get rootInfo() {
 		return this.type === TypeIdentifier
-			? /** @type {string | VariableInfo} */ (this._v2)
+			? /** @type {string | InstanceType<VariableInfo>} */ (this._v2)
 			: undefined;
 	}
 
 	/**
-	 * @param {string | VariableInfo | undefined} value root info
+	 * @param {string | InstanceType<VariableInfo> | undefined} value root info
 	 */
 	set rootInfo(value) {
 		this._v2 = value;
@@ -692,8 +696,8 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Set's the value of this expression to a particular identifier and its members.
-	 * @param {string | VariableInfo} identifier identifier to set
-	 * @param {string | VariableInfo} rootInfo root info
+	 * @param {string | InstanceType<VariableInfo>} identifier identifier to set
+	 * @param {string | InstanceType<VariableInfo>} rootInfo root info
 	 * @param {GetMembers} getMembers members
 	 * @param {GetMembersOptionals=} getMembersOptionals optional members
 	 * @param {GetMemberRanges=} getMemberRanges ranges of progressively increasing sub-expressions

package/lib/javascript/ChunkFormatHelpers.js

@@ -7,12 +7,12 @@
 
 const { updateHashForEntryStartup } = require("./StartupHelpers");
 
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Entrypoint")} Entrypoint */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
+/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Module from "../Module" */
+/** @import Chunk from "../Chunk" */
+/** @import Entrypoint from "../Entrypoint" */
+/** @import Hash from "../util/Hash" */
+/** @import { ChunkHashContext } from "../Compilation" */
 
 /**
  * Returns } Object containing chunk entries and runtime chunk.

package/lib/javascript/ChunkHelpers.js

@@ -7,7 +7,7 @@
 
 const Entrypoint = require("../Entrypoint");
 
-/** @typedef {import("../Chunk")} Chunk */
+/** @import Chunk from "../Chunk" */
 
 /**
  * Returns chunks.

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -17,10 +17,13 @@ const {
 	getChunkFilenameTemplate,
 	getCompilationHooks
 } = require("./JavascriptModulesPlugin");
-const { generateEntryStartup } = require("./StartupHelpers");
+const {
+	entryStartupAwaitsChunks,
+	generateEntryStartup
+} = require("./StartupHelpers");
 
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Chunk from "../Chunk" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "CommonJsChunkFormatPlugin";
 
@@ -38,7 +41,11 @@ class CommonJsChunkFormatPlugin {
 					if (chunk.hasRuntime()) return;
 					if (chunkGraph.getNumberOfEntryModules(chunk) > 0) {
 						set.add(RuntimeGlobals.require);
-						set.add(RuntimeGlobals.startupEntrypoint);
+						// An entry with nothing to wait for is called straight, so the
+						// helper that waits would have no call site.
+						if (entryStartupAwaitsChunks(chunkGraph, chunk)) {
+							set.add(RuntimeGlobals.startupEntrypoint);
+						}
 						set.add(RuntimeGlobals.externalInstallChunk);
 					}
 				}
@@ -47,7 +54,6 @@ class CommonJsChunkFormatPlugin {
 			hooks.renderChunk.tap(PLUGIN_NAME, (modules, renderContext) => {
 				const { chunk, chunkGraph, runtimeTemplate } = renderContext;
 				const source = new ConcatSource();
-				source.add(`exports.id = ${JSON.stringify(chunk.id)};\n`);
 				source.add(`exports.ids = ${JSON.stringify(chunk.ids)};\n`);
 				source.add("exports.modules = ");
 				source.add(modules);

package/lib/javascript/EnableChunkLoadingPlugin.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-/** @typedef {import("../../declarations/WebpackOptions").ChunkLoadingType} ChunkLoadingType */
-/** @typedef {import("../Compiler")} Compiler */
+/** @import { ChunkLoadingType } from "../../declarations/WebpackOptions" */
+/** @import Compiler from "../Compiler" */
 
 /** @typedef {Set<ChunkLoadingType>} ChunkLoadingTypes */