@depup/webpack 5.109.2-depup.0 → 5.110.3-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 */
@@ -191,7 +194,12 @@ const getEntrypointChunksInLoadOrder = (entrypoint) => {
 	const chunksLoadedByAncestorTags = new Set();
 	/** @type {Set<import("../ChunkGroup")>} */
 	const visitedGroups = new Set();
-	const walk = (/** @type {import("../ChunkGroup")} */ group) => {
+	/**
+	 * Collects the chunks an ancestor entry's own tags already load.
+	 * @param {import("../ChunkGroup")} group chunk group to walk up from
+	 * @returns {void}
+	 */
+	const walk = (group) => {
 		if (visitedGroups.has(group)) return;
 		visitedGroups.add(group);
 		for (const parent of group.parentsIterable) {
@@ -217,7 +225,12 @@ const getEntrypointChunksInLoadOrder = (entrypoint) => {
 	const ordered = [];
 	/** @type {Set<Chunk>} */
 	const seen = new Set();
-	const push = (/** @type {Chunk | null | undefined} */ chunk) => {
+	/**
+	 * Appends a chunk once, skipping the ones an ancestor entry already loads.
+	 * @param {Chunk | null | undefined} chunk chunk to append
+	 * @returns {void}
+	 */
+	const push = (chunk) => {
 		if (!chunk || seen.has(chunk) || chunk === entryChunk) return;
 		if (chunksLoadedByAncestorTags.has(chunk)) return;
 		seen.add(chunk);
@@ -638,7 +651,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 +662,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 +695,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 +725,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 +756,7 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 				}
 				source.insert(
 					dep.tagNameEnd,
-					` integrity="${HtmlGenerator.makeChunkIntegritySentinel(
+					` integrity="${getHtmlGenerator().makeChunkIntegritySentinel(
 						chunk,
 						contentHashType
 					)}"`
@@ -763,7 +773,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 +832,7 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			isChunkInlined(entryChunk, entryContentHashType);
 
 		if (entryInlined) {
-			const inlineSentinel = HtmlGenerator.makeChunkInlineSentinel(
+			const inlineSentinel = getHtmlGenerator().makeChunkInlineSentinel(
 				entryChunk,
 				entryContentHashType
 			);
@@ -843,7 +853,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 +885,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 +1134,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 +1249,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

@@ -8,11 +8,13 @@
 const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
+const importOptionsCheck = require("./importOptionsCheck");
 
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
-/** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { ObjectDeserializerContext, ObjectSerializerContext } from "../serialization/ObjectMiddleware" */
+/** @import { ContextDependencyOptions } from "./ContextDependency" */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
 
 class ImportContextDependency extends ContextDependency {
 	/**
@@ -26,6 +28,8 @@ class ImportContextDependency extends ContextDependency {
 
 		this.range = range;
 		this.valueRange = valueRange;
+		/** @type {Range | undefined} */
+		this.optionsRange = undefined;
 	}
 
 	get type() {
@@ -56,6 +60,7 @@ class ImportContextDependency extends ContextDependency {
 	 */
 	serialize(context) {
 		context.write(this.valueRange);
+		context.write(this.optionsRange);
 
 		super.serialize(context);
 	}
@@ -66,6 +71,7 @@ class ImportContextDependency extends ContextDependency {
 	 */
 	deserialize(context) {
 		this.valueRange = context.read();
+		this.optionsRange = context.read();
 
 		super.deserialize(context.rest);
 	}
@@ -76,6 +82,40 @@ makeSerializable(
 	"webpack/lib/dependencies/ImportContextDependency"
 );
 
-ImportContextDependency.Template = ContextDependencyTemplateAsRequireCall;
+ImportContextDependency.Template = class ImportContextDependencyTemplate extends (
+	ContextDependencyTemplateAsRequireCall
+) {
+	/**
+	 * Rewrites the call around its request, dropping anything the original one
+	 * carried after it. Overridden where a later argument must be kept.
+	 * @param {ContextDependency} dep the dependency
+	 * @param {ReplaceSource} source the current replace source which can be modified
+	 * @param {string} moduleExports the expression the request is passed to
+	 * @param {DependencyTemplateContext} templateContext the context object
+	 * @returns {void}
+	 */
+	replaceCall(dep, source, moduleExports, templateContext) {
+		const optionsRange = /** @type {ImportContextDependency} */ (dep)
+			.optionsRange;
+		if (optionsRange === undefined) {
+			super.replaceCall(dep, source, moduleExports, templateContext);
+			return;
+		}
+		// Request then options, in that order; their own source is kept so
+		// nested dependencies in them still get their replacements.
+		const range = /** @type {Range} */ (dep.range);
+		const valueRange = /** @type {Range} */ (dep.valueRange);
+		const check = importOptionsCheck(
+			templateContext.runtimeTemplate,
+			["r", "o"],
+			`${moduleExports}(r)`
+		);
+		source.replace(range[0], valueRange[0] - 1, `(${check})(`);
+		// The options range excludes any parentheses the source had, so a comma
+		// expression would otherwise split into arguments of its own.
+		source.replace(valueRange[1], optionsRange[0] - 1, ", (");
+		source.replace(optionsRange[1], range[1] - 1, "))");
+	}
+};
 
 module.exports = ImportContextDependency;

package/lib/dependencies/ImportDependency.js

@@ -6,30 +6,34 @@
 "use strict";
 
 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"));
+const importOptionsCheck = require("./importOptionsCheck");
+
+/** @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);
 	}
 
 	/**
@@ -222,35 +226,14 @@ ImportDependency.Template = class ImportDependencyTemplate extends (
 		}
 
 		// A non-static second argument must still be evaluated (for its side
-		// effects and evaluation order) and validated per spec. Keep it in place
-		// and wrap it in an inline validator that mirrors the runtime checks of
-		// the spec's `import(specifier, options)` evaluation.
+		// effects and evaluation order) and checked per spec, so keep it in place
+		// and wrap it.
 		if (dep.optionsRange) {
-			const validator = runtimeTemplate.basicFunction("o", [
-				"try {",
-				Template.indent([
-					"if (o !== undefined) {",
-					Template.indent([
-						'if ((typeof o !== "object" && typeof o !== "function") || o === null) throw new TypeError("The second argument to import() must be an object");',
-						'var a = o["with"];',
-						"if (a !== undefined) {",
-						Template.indent([
-							'if ((typeof a !== "object" && typeof a !== "function") || a === null) throw new TypeError("The \'with\' option must be an object");',
-							"for (var k = Object.keys(a), i = 0; i < k.length; i++) {",
-							Template.indent([
-								'if (typeof a[k[i]] !== "string") throw new TypeError("Import attribute values must be strings");'
-							]),
-							"}"
-						]),
-						"}"
-					]),
-					"}"
-				]),
-				"} catch (e) { return Promise.reject(e); }",
-				`return ${content};`
-			]);
-			source.replace(dep.range[0], dep.optionsRange[0] - 1, `(${validator})(`);
-			source.replace(dep.optionsRange[1], dep.range[1] - 1, ")");
+			const check = importOptionsCheck(runtimeTemplate, ["o"], content);
+			// The options range excludes any parentheses the source had, so a
+			// comma expression would otherwise split into arguments of its own.
+			source.replace(dep.range[0], dep.optionsRange[0] - 1, `(${check})((`);
+			source.replace(dep.optionsRange[1], dep.range[1] - 1, "))");
 			return;
 		}
 

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 & {