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

package/lib/dependencies/HtmlEntryDependency.js

@@ -9,19 +9,22 @@ const {
 	CSS_TYPE,
 	JAVASCRIPT_TYPE
 } = require("../ModuleSourceTypeConstants");
-const HtmlGenerator = require("../html/HtmlGenerator");
 const ResourceHintPlugin = require("../prefetch/ResourceHintPlugin");
 const ResourceHintRuntimeModule = require("../prefetch/ResourceHintRuntimeModule");
 const makeSerializable = require("../util/makeSerializable");
+const memoize = require("../util/memoize");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Entrypoint")} Entrypoint */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+// only the template needs it, and that runs only for a real html module
+const getHtmlGenerator = memoize(() => require("../html/HtmlGenerator"));
+
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Chunk from "../Chunk" */
+/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Entrypoint from "../Entrypoint" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {"script" | "script-module" | "modulepreload" | "stylesheet" | "html" | "preload" | "prefetch"} HtmlEntryElementKind */
 
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string, HtmlEntryElementKind, number, number, boolean, string, number, boolean, number, (Range | null), (Range | null), boolean, number, number]>} ObjectDeserializerContext */
@@ -638,7 +641,7 @@ const resolveResourceHint = (desc, ctx) => {
 		if (!has) continue;
 		tags.push(
 			buildLinkTag(rel, {
-				href: HtmlGenerator.makeChunkUrlSentinel(chunk, kind),
+				href: getHtmlGenerator().makeChunkUrlSentinel(chunk, kind),
 				as,
 				type: desc.type,
 				crossorigin,
@@ -649,7 +652,7 @@ const resolveResourceHint = (desc, ctx) => {
 					(rel === "preload" || rel === "modulepreload") &&
 					desc.integrity !== false &&
 					ctx.integrityOn
-						? ` integrity="${HtmlGenerator.makeChunkIntegritySentinel(chunk, kind)}"`
+						? ` integrity="${getHtmlGenerator().makeChunkIntegritySentinel(chunk, kind)}"`
 						: undefined,
 				media: desc.media,
 				fetchpriority: desc.fetchPriority
@@ -682,7 +685,7 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			source.replace(
 				dep.range[0],
 				dep.range[1] - 1,
-				HtmlGenerator.makeHtmlPageUrlSentinel(dep.entryName)
+				getHtmlGenerator().makeHtmlPageUrlSentinel(dep.entryName)
 			);
 			return;
 		}
@@ -712,15 +715,12 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 				: "";
 
 		// Per-chunk SRI: emit an `integrity` sentinel resolved late (after the
-		// chunks' final bytes exist) by `resolveChunkIntegritySentinels`. On when
-		// `output.html.integrity` is `true`, a non-empty array, or a function.
+		// chunks' final bytes exist) by `resolveChunkIntegritySentinels`. Tags are
+		// generated per HTML module, but one module can back pages with different
+		// `integrity` options, so sentinels are emitted whenever any page wants SRI
+		// and each page then resolves or strips them on emit.
 		const htmlOption = compilation.outputOptions.html;
-		const integrity =
-			typeof htmlOption === "object" ? htmlOption.integrity : undefined;
-		const integrityOn =
-			integrity === true ||
-			typeof integrity === "function" ||
-			(Array.isArray(integrity) && integrity.length > 0);
+		const integrityOn = getHtmlGenerator().hasIntegritySentinels(compilation);
 		const inject =
 			typeof htmlOption === "object" ? htmlOption.inject : undefined;
 
@@ -746,7 +746,7 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 				}
 				source.insert(
 					dep.tagNameEnd,
-					` integrity="${HtmlGenerator.makeChunkIntegritySentinel(
+					` integrity="${getHtmlGenerator().makeChunkIntegritySentinel(
 						chunk,
 						contentHashType
 					)}"`
@@ -763,7 +763,7 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			source.replace(
 				dep.range[0],
 				dep.range[1] - 1,
-				HtmlGenerator.makeChunkUrlSentinel(entryChunk, contentHashType)
+				getHtmlGenerator().makeChunkUrlSentinel(entryChunk, contentHashType)
 			);
 			// `preload` is integrity-eligible per the SRI spec, so mirror
 			// `crossorigin`/`integrity` onto it (SRI requires CORS). `prefetch` is a
@@ -822,7 +822,7 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			isChunkInlined(entryChunk, entryContentHashType);
 
 		if (entryInlined) {
-			const inlineSentinel = HtmlGenerator.makeChunkInlineSentinel(
+			const inlineSentinel = getHtmlGenerator().makeChunkInlineSentinel(
 				entryChunk,
 				entryContentHashType
 			);
@@ -843,7 +843,10 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			source.replace(
 				dep.range[0],
 				dep.range[1] - 1,
-				HtmlGenerator.makeChunkUrlSentinel(entryChunk, entryContentHashType)
+				getHtmlGenerator().makeChunkUrlSentinel(
+					entryChunk,
+					entryContentHashType
+				)
 			);
 		}
 
@@ -872,14 +875,17 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			 */
 			const buildSibling = (chunk, kind) => {
 				if (isChunkInlined(chunk, kind)) {
-					const sentinel = HtmlGenerator.makeChunkInlineSentinel(chunk, kind);
+					const sentinel = getHtmlGenerator().makeChunkInlineSentinel(
+						chunk,
+						kind
+					);
 					return kind === "css"
 						? `<style>${sentinel}</style>`
 						: `<script${scriptTypeAttr}>${sentinel}</script>`;
 				}
-				const url = HtmlGenerator.makeChunkUrlSentinel(chunk, kind);
+				const url = getHtmlGenerator().makeChunkUrlSentinel(chunk, kind);
 				const integrityAttr = integrityOn
-					? ` integrity="${HtmlGenerator.makeChunkIntegritySentinel(chunk, kind)}"`
+					? ` integrity="${getHtmlGenerator().makeChunkIntegritySentinel(chunk, kind)}"`
 					: "";
 				if (kind === "css") {
 					// A CSS chunk is always loaded via `<link rel="stylesheet">`.
@@ -1118,13 +1124,13 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 						) {
 							continue;
 						}
-						const href = HtmlGenerator.makeChunkUrlSentinel(
+						const href = getHtmlGenerator().makeChunkUrlSentinel(
 							chunk,
 							"javascript"
 						);
 						const integrityAttr =
 							integrityOn && !prefetchMode
-								? ` integrity="${HtmlGenerator.makeChunkIntegritySentinel(
+								? ` integrity="${getHtmlGenerator().makeChunkIntegritySentinel(
 										chunk,
 										"javascript"
 									)}"`
@@ -1233,7 +1239,9 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 				const typeAttr = md.typeAttribute;
 				const mediaAttr = md.mediaAttribute;
 				const fetchPriority = md.fetchPriority;
-				const href = HtmlGenerator.makeAssetUrlSentinel(module.identifier());
+				const href = getHtmlGenerator().makeAssetUrlSentinel(
+					module.identifier()
+				);
 				const attrs =
 					`${asAttr ? ` as="${escapeAttr(asAttr)}"` : ""}` +
 					`${typeAttr ? ` type="${escapeAttr(typeAttr)}"` : ""}` +

package/lib/dependencies/HtmlInlineHtmlDependency.js

@@ -8,14 +8,13 @@ const { HTML_TYPE } = require("../ModuleSourceTypeConstants");
 const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../util/Hash")} Hash */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import CodeGenerationResults from "../CodeGenerationResults" */
+/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Module from "../Module" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import Hash from "../util/Hash" */
 
 // One pass over the source: each char is replaced once and replacements aren't
 // re-scanned, so this matches the `&`-first sequential escape chain exactly.

package/lib/dependencies/HtmlInlineScriptDependency.js

@@ -4,16 +4,19 @@
 
 "use strict";
 
-const HtmlGenerator = require("../html/HtmlGenerator");
 const makeSerializable = require("../util/makeSerializable");
+const memoize = require("../util/memoize");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Entrypoint")} Entrypoint */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+// only the template needs it, and that runs only for a real html module
+const getHtmlGenerator = memoize(() => require("../html/HtmlGenerator"));
+
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Chunk from "../Chunk" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Entrypoint from "../Entrypoint" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[number, Range, string, string]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[number, Range, string, string]>} ObjectSerializerContext */
 
@@ -106,7 +109,7 @@ HtmlInlineScriptDependency.Template = class HtmlInlineScriptDependencyTemplate e
 		if (entrypoint) {
 			const chunk = /** @type {Chunk} */ (entrypoint.getEntrypointChunk());
 			// Defer chunk-URL substitution to renderManifest — chunk hashes aren't ready yet.
-			url = HtmlGenerator.makeChunkUrlSentinel(chunk, "javascript");
+			url = getHtmlGenerator().makeChunkUrlSentinel(chunk, "javascript");
 		}
 
 		// Insert ` src="…"` right after `<script` so the inline body is

package/lib/dependencies/HtmlInlineStyleDependency.js

@@ -8,18 +8,15 @@ const { CSS_TEXT_TYPE } = require("../ModuleSourceTypeConstants");
 const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import CodeGenerationResults from "../CodeGenerationResults" */
+/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Module from "../Module" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<boolean[]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<boolean[]>} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import Hash from "../util/Hash" */
 
 const TRAILING_WHITESPACE_REGEXP = /\s+$/;
 // One pass over the source: each char is replaced once and replacements aren't

package/lib/dependencies/HtmlSourceDependency.js

@@ -11,20 +11,24 @@ const makeSerializable = require("../util/makeSerializable");
 const memoize = require("../util/memoize");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").CssDependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
-/** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
-/** @typedef {import("../Module").CodeGenerationResultData} CodeGenerationResultData */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import CodeGenerationResults from "../CodeGenerationResults" */
+/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/**
+ * @import {
+ * 	CssDependencyTemplateContext as DependencyTemplateContext
+ * } from "../DependencyTemplate"
+ */
+/** @import Module, { BuildInfo } from "../Module" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "../serialization/ObjectMiddleware"
+ */
+/** @import Hash from "../util/Hash" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 const getIgnoredRawDataUrlModule = memoize(
 	() => new RawDataUrlModule("data:,", "ignored-asset", "(ignored asset)")
@@ -61,6 +65,10 @@ class HtmlSourceDependency extends ModuleDependency {
 		return "url";
 	}
 
+	get referencedSourceType() {
+		return ASSET_URL_TYPE;
+	}
+
 	/**
 	 * Creates an ignored module.
 	 * @param {string} context context directory

package/lib/dependencies/ImportContextDependency.js

@@ -9,10 +9,10 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
 
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
-/** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
+/** @import { ContextDependencyOptions } from "./ContextDependency" */
 
 class ImportContextDependency extends ContextDependency {
 	/**

package/lib/dependencies/ImportDependency.js

@@ -8,28 +8,32 @@
 const Dependency = require("../Dependency");
 const Template = require("../Template");
 const makeSerializable = require("../util/makeSerializable");
-const memoize = require("../util/memoize");
+const HarmonyImportGuard = require("./HarmonyImportGuard");
 const { ImportPhaseUtils } = require("./ImportPhase");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../AsyncDependenciesBlock")} AsyncDependenciesBlock */
-/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
-/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("./HarmonyImportGuard").DependencyGuard} DependencyGuard */
-/** @typedef {import("./ImportPhase").ImportPhaseType} ImportPhaseType */
-
-const getHarmonyImportGuard = memoize(() => require("./HarmonyImportGuard"));
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import AsyncDependenciesBlock from "../AsyncDependenciesBlock" */
+/**
+ * @import {
+ * 	GetConditionFn,
+ * 	RawReferencedExports,
+ * 	ReferencedExports
+ * } from "../Dependency"
+ */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Module, { BuildMeta } from "../Module" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { ImportAttributes, Range } from "../javascript/JavascriptParser" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "../serialization/ObjectMiddleware"
+ */
+/** @import { RuntimeSpec } from "../util/runtime" */
+/** @import { DependencyGuard } from "./HarmonyImportGuard" */
+/** @import { ImportPhaseType } from "./ImportPhase" */
 
 class ImportDependency extends ModuleDependency {
 	/**
@@ -75,7 +79,7 @@ class ImportDependency extends ModuleDependency {
 		const guards = this.branchGuards;
 		if (guards === undefined) return null;
 		return (connection, runtime) =>
-			!getHarmonyImportGuard().isDeadByGuards(guards, moduleGraph, runtime);
+			!HarmonyImportGuard.isDeadByGuards(guards, moduleGraph, runtime);
 	}
 
 	/**

package/lib/dependencies/ImportEagerDependency.js

@@ -8,15 +8,12 @@
 const makeSerializable = require("../util/makeSerializable");
 const ImportDependency = require("./ImportDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {ImportDependency.RawReferencedExports} RawReferencedExports */
-/** @typedef {import("./ImportPhase").ImportPhaseType} ImportPhaseType */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency, { RawReferencedExports } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Module, { BuildMeta } from "../Module" */
+/** @import { ImportAttributes, Range } from "../javascript/JavascriptParser" */
+/** @import { ImportPhaseType } from "./ImportPhase" */
 
 class ImportEagerDependency extends ImportDependency {
 	/**

package/lib/dependencies/ImportMetaContextDependency.js

@@ -9,8 +9,8 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
 
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { ContextDependencyOptions } from "./ContextDependency" */
 
 class ImportMetaContextDependency extends ContextDependency {
 	/**

package/lib/dependencies/ImportMetaContextDependencyParserPlugin.js

@@ -11,19 +11,20 @@ const {
 } = require("../javascript/JavascriptParserHelpers");
 const ImportMetaContextDependency = require("./ImportMetaContextDependency");
 
-/** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("estree").ObjectExpression} ObjectExpression */
-/** @typedef {import("estree").Property} Property */
-/** @typedef {import("estree").Identifier} Identifier */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../ContextModule").ContextModuleOptions} ContextModuleOptions */
-/** @typedef {import("../ContextModule").ContextMode} ContextMode */
-/** @typedef {import("../Chunk").ChunkName} ChunkName */
-/** @typedef {import("../ChunkGroup").RawChunkGroupOptions} RawChunkGroupOptions */
-/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
+/**
+ * @import {
+ * 	Expression,
+ * 	ObjectExpression,
+ * 	Property,
+ * 	Identifier
+ * } from "estree"
+ */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import { ContextModuleOptions, ContextMode } from "../ContextModule" */
+/** @import { ChunkName } from "../Chunk" */
+/** @import { RawChunkGroupOptions } from "../ChunkGroup" */
+/** @import { RawReferencedExports, DependencyLocation } from "../Dependency" */
+/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
 
 /** @typedef {Pick<ContextModuleOptions, "mode" | "recursive" | "regExp" | "include" | "exclude" | "chunkName"> & { groupOptions: RawChunkGroupOptions, exports?: RawReferencedExports }} ImportMetaContextOptions */
 

package/lib/dependencies/ImportMetaContextPlugin.js

@@ -16,9 +16,13 @@ const ImportMetaGlobDependency = require("./ImportMetaGlobDependency");
 const ImportMetaGlobDependencyParserPlugin = require("./ImportMetaGlobDependencyParserPlugin");
 const { isImportMetaFieldEnabled } = require("./ImportMetaPlugin");
 
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../javascript/JavascriptParser")} Parser */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import Parser from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "ImportMetaContextPlugin";
 

package/lib/dependencies/ImportMetaGlobDependency.js

@@ -9,8 +9,8 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
 
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { ContextDependencyOptions } from "./ContextDependency" */
 
 /**
  * @typedef {ContextDependencyOptions & {

package/lib/dependencies/ImportMetaGlobDependencyParserPlugin.js

@@ -11,9 +11,8 @@ const {
 const ImportMetaGlobDependency = require("./ImportMetaGlobDependency");
 const { parseImportMetaGlobCall } = require("./ImportMetaGlobHelpers");
 
-/** @typedef {import("estree").CallExpression} CallExpression */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+/** @import { CallExpression } from "estree" */
+/** @import JavascriptParser from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "ImportMetaGlobDependencyParserPlugin";
 

package/lib/dependencies/ImportMetaGlobHelpers.js

@@ -5,8 +5,10 @@
 
 "use strict";
 
+/** @import UnsupportedFeatureWarning from "../errors/UnsupportedFeatureWarning" */
+
 const path = require("path");
-const UnsupportedFeatureWarning = require("../errors/UnsupportedFeatureWarning");
+
 const WebpackError = require("../errors/WebpackError");
 const {
 	commonGlobBaseDir,
@@ -18,29 +20,24 @@ const {
 	normalizePathSeparatorsForPath,
 	resolveContextModuleGlobPattern
 } = require("../util/globUtils");
+const { relativePathToRequest } = require("../util/identifier");
+const memoize = require("../util/memoize");
+
+const getUnsupportedFeatureWarning = memoize(() =>
+	require("../errors/UnsupportedFeatureWarning")
+);
 
+/** @import { ContextModuleOptions } from "../ContextModule" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import { RawReferencedExports, DependencyLocation } from "../Dependency" */
 /**
- * @param {string} relativePath relative path
- * @returns {string} request
+ * @import {
+ * 	CallExpression,
+ * 	Expression,
+ * 	ObjectExpression,
+ * 	Property
+ * } from "estree"
  */
-const relativePathToRequest = (relativePath) => {
-	if (relativePath === "") return "./.";
-	if (relativePath === "..") return "../.";
-	if (relativePath.startsWith("../")) return relativePath;
-	return `./${relativePath}`;
-};
-
-/** @typedef {import("../ContextModule").ContextModuleOptions} ContextModuleOptions */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("estree").CallExpression} CallExpression */
-/** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("estree").ObjectExpression} ObjectExpression */
-/** @typedef {import("estree").Property} Property */
-/** @typedef {import("./ImportMetaGlobDependency").ImportMetaGlobDependencyOptions} ImportMetaGlobDependencyOptions */
-
 /**
  * @typedef {object} ParsedImportMetaGlobOptions
  * @property {string[]} patterns patterns
@@ -77,7 +74,7 @@ const createImportMetaGlobError = (msg, loc) => {
  * @returns {UnsupportedFeatureWarning} warning
  */
 const createImportMetaGlobWarning = (msg, loc) =>
-	new UnsupportedFeatureWarning(msg, loc);
+	new (getUnsupportedFeatureWarning())(msg, loc);
 
 /**
  * @param {Expression} expr expression

package/lib/dependencies/ImportMetaHotAcceptDependency.js

@@ -9,7 +9,7 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
 
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { Range } from "../javascript/JavascriptParser" */
 
 class ImportMetaHotAcceptDependency extends ModuleDependency {
 	/**

package/lib/dependencies/ImportMetaHotDeclineDependency.js

@@ -9,7 +9,7 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
 
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { Range } from "../javascript/JavascriptParser" */
 
 class ImportMetaHotDeclineDependency extends ModuleDependency {
 	/**