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

package/lib/dependencies/HtmlEntryDependency.js

@@ -7,6 +7,7 @@
 const {
 	CSS_IMPORT_TYPE,
 	CSS_TYPE,
+	HTML_TYPE,
 	JAVASCRIPT_TYPE
 } = require("../ModuleSourceTypeConstants");
 const ResourceHintPlugin = require("../prefetch/ResourceHintPlugin");
@@ -194,7 +195,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) {
@@ -220,7 +226,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);
@@ -487,11 +498,12 @@ const cloneTagWithUrl = (
 	return isLink ? body : `${body}</script>`;
 };
 
-// ES5 `<link rel="modulepreload">` polyfill (Safari <17, Firefox <115, …):
-// on browsers without native support, fetch each modulepreload target with the
-// tag's own credentials/integrity so the pending module import reuses it. The
-// `.ep` guard makes it idempotent, and the observer catches any later-inserted
-// links. Emitted only when the target environment lacks native support.
+// WHY: an ES5 `<link rel="modulepreload">` polyfill (Safari <17, Firefox <115,
+// …). On a browser without native support, each modulepreload target is fetched
+// with the tag's own credentials and integrity, so the pending module import
+// reuses it. The `.ep` guard makes that idempotent and the observer catches any
+// later-inserted link. Emitted only where the target environment lacks native
+// support.
 const MODULEPRELOAD_POLYFILL = [
 	"(function(){",
 	'var s=document.createElement("link").relList;',
@@ -577,6 +589,47 @@ const buildLinkTag = (rel, attrs) =>
 			: ""
 	}>`;
 
+/**
+ * The chunks a hint means when it names a page: a page loads no JavaScript of
+ * its own, so the hint follows the entries the parser extracted from it.
+ * @param {import("../Compilation")} compilation compilation
+ * @param {Chunk} chunk chunk a hint resolved to
+ * @returns {Chunk[]} the chunks to hint at
+ */
+const resolvePageChunk = (compilation, chunk) => {
+	const { chunkGraph } = compilation;
+	const modules = chunkGraph.getChunkModulesIterableBySourceType(
+		chunk,
+		HTML_TYPE
+	);
+	// A page with a JavaScript side of its own (an `output.library` entry) is
+	// hinted too — `chunkHasJs` can't say so, it holds for any runtime chunk.
+	const javascript = chunkGraph.getChunkModulesIterableBySourceType(
+		chunk,
+		JAVASCRIPT_TYPE
+	);
+	/** @type {Chunk[]} */
+	const chunks = javascript === undefined ? [] : [chunk];
+	// A chunk carrying no page stands for itself; a page stands for the entries
+	// extracted from it, so one that extracted nothing hints nothing.
+	if (modules === undefined) return chunks.length === 0 ? [chunk] : chunks;
+	for (const module of modules) {
+		const { htmlEntries } =
+			/** @type {import("../html/HtmlModule").HtmlModuleBuildInfo} */ (
+				module.buildInfo
+			) || {};
+		if (!htmlEntries) continue;
+		for (const group of Object.values(htmlEntries)) {
+			for (const { entryName } of group) {
+				const entrypoint = compilation.entrypoints.get(entryName);
+				const entryChunk = entrypoint && entrypoint.getEntrypointChunk();
+				if (entryChunk) chunks.push(entryChunk);
+			}
+		}
+	}
+	return chunks;
+};
+
 /**
  * Resolve one `output.html.resourceHints` descriptor to zero or more `<link>`
  * tags. A `chunk`/`entry` reference becomes the emitted chunk URL (a sentinel
@@ -623,6 +676,14 @@ const resolveResourceHint = (desc, ctx) => {
 	} else {
 		return [];
 	}
+	/** @type {Chunk[]} */
+	const hinted = [];
+	for (const chunk of chunks) {
+		for (const resolved of resolvePageChunk(ctx.compilation, chunk)) {
+			hinted.push(resolved);
+		}
+	}
+	chunks = hinted;
 	const kind = desc.as === "style" ? "css" : "javascript";
 	const as = desc.as || (rel === "modulepreload" ? undefined : "script");
 	// A hint targeting another chunk must match how that chunk is fetched, so
@@ -677,10 +738,9 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 		const dep = /** @type {HtmlEntryDependency} */ (dependency);
 		const compilation = runtimeTemplate.compilation;
 
-		// A `type: "html"` link points at another emitted page, not a JS/CSS
-		// chunk: rewrite the attribute to that page's filename (resolved by
-		// HtmlModulesPlugin once it's built) and emit no sibling tags — a page
-		// link loads only itself.
+		// A `type: "html"` link points at another emitted page rather than a chunk,
+		// so rewrite the attribute to that page's filename and emit no siblings:
+		// a page link loads only itself.
 		if (dep.elementKind === "html") {
 			source.replace(
 				dep.range[0],
@@ -704,21 +764,17 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 		const orderedChunks = getEntrypointChunksInLoadOrder(entrypoint);
 		const entryChunk = orderedChunks[orderedChunks.length - 1];
 
-		// `crossorigin` mirrors `output.crossOriginLoading` onto every injected
-		// tag. Empty when the option is off or the originating tag already set
-		// `crossorigin` (author value wins, flagged at parse time). Mirrors
-		// webpack's runtime, which sets `crossOrigin` on chunk-loading scripts,
-		// and matches Vite, which emits it on every injected script/stylesheet.
+		// Mirrors `output.crossOriginLoading` onto every injected tag, as webpack's
+		// runtime does for chunk-loading scripts. Empty when the option is off or
+		// the originating tag set `crossorigin` itself, since the author wins.
 		const crossOrigin =
 			crossOriginLoading && !dep.hasOwnCrossOrigin
 				? ` crossorigin="${crossOriginLoading}"`
 				: "";
 
-		// Per-chunk SRI: emit an `integrity` sentinel resolved late (after the
-		// 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.
+		// Per-chunk SRI emits an `integrity` sentinel resolved once the chunks'
+		// final bytes exist. One module can back pages with different `integrity`
+		// options, so every page emits them and strips its own on emit.
 		const htmlOption = compilation.outputOptions.html;
 		const integrityOn = getHtmlGenerator().hasIntegritySentinels(compilation);
 		const inject =
@@ -888,11 +944,9 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 					? ` integrity="${getHtmlGenerator().makeChunkIntegritySentinel(chunk, kind)}"`
 					: "";
 				if (kind === "css") {
-					// A CSS chunk is always loaded via `<link rel="stylesheet">`.
-					// Clone only when the entry tag is itself a native `<link
-					// rel="stylesheet">` (so attributes like `media` carry over);
-					// a `<script>` entry that imported CSS, or a custom element,
-					// gets a freshly synthesized `<link>`.
+					// A CSS chunk always loads through `<link rel="stylesheet">`. Clone
+					// only when the entry tag is itself one, so `media` carries over;
+					// anything else gets a freshly synthesized `<link>`.
 					if (isStylesheet && tagIsNative) {
 						return cloneTagWithUrl(
 							originalTag,
@@ -944,10 +998,9 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			// Parser-derived anchor (a source text scan would match `</head>` inside
 			// comments or raw text).
 			const headClose = inject === "head" ? dep.headAnchor : -1;
-			// When the entry tag is already inside <head> (tagStart < headClose),
-			// inserting siblings at headClose would place them after the entry,
-			// reversing runtime-before-entry execution order for deferred scripts.
-			// Insert before the entry tag instead so the load order is preserved.
+			// With the entry tag already inside `<head>`, inserting at `headClose`
+			// would place siblings after it and reverse runtime-before-entry order
+			// for deferred scripts. Insert before the entry tag instead.
 			const headAt =
 				headClose < 0
 					? -1
@@ -958,29 +1011,24 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			let cssHtml = "";
 			let cssAt = -1;
 			if (isStylesheet) {
-				// `<link rel="stylesheet">` entries are CSS, but a shared/runtime
-				// JS-only chunk (e.g. `optimization.runtimeChunk`) can still sit in
-				// the entrypoint — only clone the `<link>` for siblings that actually
-				// produce a `.css` asset (mirrors the JS branch below), otherwise the
-				// link points at a non-existent `.css` file (a 404, or an empty
-				// `<style>` when inlined). Attributes like `media` still carry over.
+				// WHY: a `<link rel="stylesheet">` entry is CSS, but a shared or runtime
+				// JS-only chunk — `optimization.runtimeChunk`, say — can still sit in the
+				// entrypoint, so the `<link>` is cloned only for siblings that actually
+				// produce a `.css` asset, mirroring the JS branch below. Otherwise it
+				// points at a `.css` file that does not exist: a 404, or an empty
+				// `<style>` when inlined. Attributes such as `media` still carry over.
 				for (let i = 0; i < orderedChunks.length - 1; i++) {
 					if (chunkHasCss(orderedChunks[i], chunkGraph)) {
 						siblings.push(buildSibling(orderedChunks[i], "css"));
 					}
 				}
 			} else {
-				// CSS chunks are emitted before JS chunks so the cascade is set
-				// up before any script runs. Within CSS the order needs to match
-				// the source's import order — `entrypoint.chunks` alone doesn't
-				// give us that for arbitrary splitChunks layouts (splitChunks
-				// inserts each new chunk before the entry chunk via
-				// `insertChunk(_, before)`, so split CSS siblings end up in
-				// *reverse* of the order they were processed — exactly the
-				// html-webpack-plugin#1838 / mini-css-extract#959 symptom). We
-				// re-derive the order from the entrypoint's module post-order
-				// index, which mirrors the dependency walk and so reflects the
-				// import order.
+				// WHY: splitChunks inserts each new chunk before the entry chunk, so
+				// `entrypoint.chunks` hands back split CSS siblings in reverse of the
+				// order they were processed — the html-webpack-plugin#1838 and
+				// mini-css-extract#959 symptom. The order is re-derived from the
+				// entrypoint's module post-order index, which follows the dependency
+				// walk and so the source's import order.
 				/** @type {{ chunk: Chunk, index: number, key: string }[]} */
 				const cssChunkOrder = [];
 				/** @type {Chunk[]} */
@@ -1000,18 +1048,14 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 							key: cssChunkSortKey(chunk)
 						});
 					}
-					// Anything that isn't CSS-only stays on the JS lane, in the
-					// `orderedChunks` order — that preserves the runtime-first /
-					// vendor-before-entry invariant of `getEntrypointChunksInLoadOrder`.
-					// Chunks that produce no `.js` and no `.css` (e.g. wasm-only
-					// or asset-only) still get a `<script>` clone here so we
-					// keep prior behavior for users who relied on it.
+					// Anything not CSS-only stays on the JS lane in `orderedChunks` order,
+					// preserving the runtime-first invariant. A chunk emitting neither
+					// `.js` nor `.css` still gets a clone, as it always has.
 					if (hasJs || !hasCss) jsChunks.push(chunk);
 				}
-				// If the entry chunk itself contains CSS (entry JS imports CSS
-				// without splitChunks separating it), fold it into the same CSS
-				// ordering so the entry-chunk `<link>` lands in the correct
-				// cascade position relative to sibling CSS chunks.
+				// When the entry chunk carries CSS itself, fold it into the same
+				// ordering so its `<link>` lands in the right cascade position
+				// relative to the sibling CSS chunks.
 				if (chunkHasCss(entryChunk, chunkGraph)) {
 					cssChunkOrder.push({
 						chunk: entryChunk,
@@ -1024,13 +1068,9 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 					});
 				}
 				cssChunkOrder.sort(compareCssChunkOrder);
-				// Stylesheets always land in <head> when the page has one. A
-				// classic blocking script pins them ahead of itself (`cssAnchor`)
-				// so its execution never awaits later CSS; when every script is
-				// `defer`/module they go to the *end* of head, after the script
-				// tags — Vite's and html-webpack-plugin's order: the scripts
-				// start fetching earlier yet still execute after parsing and
-				// after pending stylesheets.
+				// Stylesheets land in `<head>`. A classic blocking script pins them
+				// ahead of itself, so it never awaits later CSS; with only `defer` and
+				// module scripts they go last, which starts the script fetches earlier.
 				cssAt =
 					dep.headAnchor >= 0
 						? dep.cssAnchor >= 0 && dep.cssAnchor < dep.headAnchor
@@ -1056,15 +1096,15 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			if (cssHtml !== "" && dep.cssAnchor < 0) source.insert(cssAt, cssHtml);
 		}
 
-		// Resource hints are opt-in — webpack already loads the initial chunks
-		// via parallel `<script>` tags, so there is no waterfall to prevent by
-		// default. `output.resourceHints` requests them: `true` preloads the
-		// entry's initial dependency chunks (runtime, vendor, split); an array
-		// or function adds custom hints (a function may spread the auto
-		// `defaultHints`). Only for extracted pages — a JS-string HTML export
-		// would embed the sentinels in the JS chunk. URL-referenced assets
-		// (fonts, images) carrying `webpackPrefetch` / `webpackPreload`
-		// (magic-comment or `parser.<type>.urlHints` rule) also emit here.
+		// WHY: resource hints are opt-in, the initial chunks already loading
+		// through parallel `<script>` tags, so there is no default waterfall to
+		// prevent. `output.resourceHints` requests them: `true` preloads the entry's
+		// initial dependency chunks (runtime, vendor, split), while an array or a
+		// function adds custom ones and a function may spread the auto
+		// `defaultHints`. Extracted pages only — a JS-string HTML export would embed
+		// the sentinels in the JS chunk. A URL-referenced asset carrying
+		// `webpackPrefetch` / `webpackPreload`, by magic comment or a
+		// `parser.<type>.urlHints` rule, emits here too.
 		const resourceHintResolver =
 			ResourceHintPlugin.getCompilationResolver(compilation);
 		const resourceHints = resourceHintResolver.hints;
@@ -1092,15 +1132,16 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 
 			// === chunks channel — the entry's own initial dependency graph ===
 			if (resourceHints !== undefined && resourceHints !== false) {
-				// The auto initial-graph preload as descriptors carrying their exact
-				// tag, built only when needed (`true`/`"prefetch"` emits them, a
-				// function may spread them). The entry chunk is skipped — it's
-				// already the `<script src>`. ESM uses `modulepreload` (fetch +
-				// parse), classic output `preload as="script"`, and `"prefetch"`
-				// opts into `<link rel="prefetch">` (idle-time fetch, no `as` / no
-				// `integrity` — the spec doesn't list them). Async `import()` chunks
-				// aren't covered here; use `module.parser.javascript.dynamicImport*`
-				// which routes through webpack's on-demand chunk-load runtime.
+				// WHY: descriptors for the auto initial-graph preload, carrying their
+				// exact tag and built only when needed — `true` or `"prefetch"` emits
+				// them, and a function may spread them. The entry chunk is skipped, being
+				// the `<script src>` already. ESM uses `modulepreload`, which fetches and
+				// parses; classic output `preload as="script"`; and `"prefetch"` opts into
+				// `<link rel="prefetch">`, an idle-time fetch with no `as` and no
+				// `integrity`, which the spec does not list. An async `import()` chunk is
+				// not covered here: that is
+				// `module.parser.javascript.dynamicImport*`, which routes through
+				// webpack's on-demand chunk-load runtime.
 				const prefetchMode = resourceHints === "prefetch";
 				const preloadMode = resourceHints === true;
 				/** @type {"modulepreload" | "preload" | "prefetch"} */
@@ -1135,10 +1176,9 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 										"javascript"
 									)}"`
 								: "";
-						// Mirror the entry tag's `nonce`/`crossorigin`/`referrerpolicy`
-						// (and `output.crossOriginLoading`) so the request matches the
-						// sibling `<script>`'s and the browser reuses it instead of
-						// fetching twice.
+						// Mirror the entry tag's `nonce`, `crossorigin` and `referrerpolicy`,
+						// so the request matches the sibling `<script>`'s and the browser
+						// reuses it rather than fetching twice.
 						const attrs = `${dep.copyableAttrsText}${crossOrigin}${integrityAttr}`;
 						const tag = prefetchMode
 							? `<link rel="prefetch" href="${href}"${attrs}>`
@@ -1216,14 +1256,10 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 			}
 
 			// === assets channel — URL-referenced assets carrying `prefetch`/`preload` ===
-			// The plugin has already scanned the entrypoint's chunks × modules
-			// once and cached the URL/CSS/HTML asset deps for this entry name;
-			// consume that list here so this template doesn't repeat the walk.
-			// Each unique asset emits one `<link rel="prefetch|preload">` into
-			// the HTML `<head>`; the JS chunk-startup runtime skips it (no
-			// double `<link>` in DOM). URLs are sentinels resolved from asset
-			// codegen data during `HtmlModulesPlugin` render — the asset
-			// module might not have been codegen'd yet at this point.
+
+			// The plugin already walked the entrypoint once and cached this entry's
+			// asset deps, so consume that list rather than repeat it. URLs stay
+			// sentinels here: the asset module may not be codegen'd yet.
 			const outputCrossOriginAttr = crossOriginLoading
 				? ` crossorigin="${crossOriginLoading}"`
 				: "";
@@ -1264,12 +1300,9 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 						finalHints.push(h);
 					}
 				}
-				// When the target environment lacks native `modulepreload` (an
-				// `output.environment` capability, like the JS-feature checks), append
-				// a tiny polyfill once per page so the hints still warm the cache there.
-				// `resourceHints.modulePreloadPolyfill` defaults from the target's
-				// modulepreload support (`output.environment.modulePreload`); `false`
-				// opts out (strict CSP).
+				// Without native `modulepreload` the hints warm no cache, so append the
+				// polyfill once per page. It defaults from the target's support, and
+				// `false` opts out, which a strict CSP needs.
 				if (
 					rhOptions &&
 					rhOptions.modulePreloadPolyfill &&
@@ -1279,10 +1312,9 @@ HtmlEntryDependency.Template = class HtmlEntryDependencyTemplate extends (
 					polyfilledSources.add(source);
 					finalHints.push(`<script>${MODULEPRELOAD_POLYFILL}</script>`);
 				}
-				// Insert right after the `<head>` open tag (parser-derived) so the
-				// hints are the document's first fetches; fall back to the first
-				// blocking script (else the entry tag) when the page has no
-				// written `<head>` (e.g. an HTML fragment).
+				// Insert just after the `<head>` open tag, so the hints are the first
+				// fetches. A page with no written `<head>` falls back to the first
+				// blocking script, else the entry tag.
 				const hintAt =
 					dep.headOpenEnd >= 0
 						? dep.headOpenEnd

package/lib/dependencies/HtmlInlineScriptDependency.js

@@ -112,10 +112,9 @@ HtmlInlineScriptDependency.Template = class HtmlInlineScriptDependencyTemplate e
 			url = getHtmlGenerator().makeChunkUrlSentinel(chunk, "javascript");
 		}
 
-		// Insert ` src="…"` right after `<script` so the inline body is
-		// served from the emitted chunk instead. The browser ignores the
-		// remaining inline body once `src` is present, but we still clear
-		// it below so the unprocessed JS doesn't ride along.
+		// Insert ` src="…"` just after `<script`, serving the body from the emitted
+		// chunk. The browser ignores an inline body beside `src`, but it is cleared
+		// below so the unprocessed JS does not ride along.
 		source.insert(dep.insertPos, ` src="${url}"`);
 		source.replace(dep.contentRange[0], dep.contentRange[1] - 1, "");
 	}

package/lib/dependencies/HtmlInlineStyleDependency.js

@@ -127,10 +127,9 @@ HtmlInlineStyleDependency.Template = class HtmlInlineStyleDependencyTemplate ext
 			}
 		}
 
-		// An attribute value was entity-decoded before parsing, so re-escape
-		// the processed CSS to keep the surrounding markup valid in any
-		// quoting context, and drop the trailing newline the CSS generator
-		// appends so the rewritten attribute stays on one line.
+		// An attribute value was entity-decoded before parsing, so the processed CSS
+		// is re-escaped to keep the markup valid in any quoting context, and the
+		// generator's trailing newline dropped to keep it on one line.
 		if (dep.inAttribute) {
 			cssText = cssText
 				.replace(TRAILING_WHITESPACE_REGEXP, "")

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");
 
 /** @import { Range } from "../javascript/JavascriptParser" */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
+/** @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,11 +6,11 @@
 "use strict";
 
 const Dependency = require("../Dependency");
-const Template = require("../Template");
 const makeSerializable = require("../util/makeSerializable");
 const HarmonyImportGuard = require("./HarmonyImportGuard");
 const { ImportPhaseUtils } = require("./ImportPhase");
 const ModuleDependency = require("./ModuleDependency");
+const importOptionsCheck = require("./importOptionsCheck");
 
 /** @import { ReplaceSource } from "webpack-sources" */
 /** @import AsyncDependenciesBlock from "../AsyncDependenciesBlock" */
@@ -226,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/ImportMetaContextDependencyParserPlugin.js

@@ -20,7 +20,7 @@ const ImportMetaContextDependency = require("./ImportMetaContextDependency");
  * } from "estree"
  */
 /** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
-/** @import { ContextModuleOptions, ContextMode } from "../ContextModule" */
+/** @import { ContextModuleOptions, ContextMode } from "../context/ContextModule" */
 /** @import { ChunkName } from "../Chunk" */
 /** @import { RawChunkGroupOptions } from "../ChunkGroup" */
 /** @import { RawReferencedExports, DependencyLocation } from "../Dependency" */

package/lib/dependencies/ImportMetaGlobHelpers.js

@@ -27,7 +27,7 @@ const getUnsupportedFeatureWarning = memoize(() =>
 	require("../errors/UnsupportedFeatureWarning")
 );
 
-/** @import { ContextModuleOptions } from "../ContextModule" */
+/** @import { ContextModuleOptions } from "../context/ContextModule" */
 /** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 /** @import { RawReferencedExports, DependencyLocation } from "../Dependency" */
 /**