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

package/lib/asset/AssetModulesPlugin.js

@@ -7,6 +7,10 @@
 
 const { RawSource } = require("webpack-sources");
 const HotUpdateChunk = require("../HotUpdateChunk");
+const {
+	ASSET_URL_TYPE,
+	JAVASCRIPT_TYPE
+} = require("../ModuleSourceTypeConstants");
 const {
 	ASSET_MODULE_TYPE,
 	ASSET_MODULE_TYPE_BYTES,
@@ -18,20 +22,31 @@ const {
 const { compareModulesByFullName } = require("../util/comparators");
 const createHash = require("../util/createHash");
 const { getUndoPath } = require("../util/identifier");
-const memoize = require("../util/memoize");
+const lazyModule = require("../util/lazyModule");
+const preloadModuleType = require("../util/preloadModuleType");
 const { PUBLIC_PATH_AUTO } = require("../util/publicPathPlaceholder");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("schema-utils").Schema} Schema */
-/** @typedef {import("../../declarations/WebpackOptions").AssetGeneratorDataUrl} AssetGeneratorDataUrl */
-/** @typedef {import("../../declarations/WebpackOptions").AssetModuleOutputPath} AssetModuleOutputPath */
-/** @typedef {import("../../declarations/WebpackOptions").RawPublicPath} RawPublicPath */
-/** @typedef {import("../../declarations/WebpackOptions").AssetModuleFilename} AssetModuleFilename */
-/** @typedef {import("../Compilation").AssetInfo} AssetInfo */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("./AssetModule").AssetModuleBuildInfo} AssetModuleBuildInfo */
-/** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
-/** @typedef {import("../NormalModule")} NormalModule */
+/** @import { Source } from "webpack-sources" */
+/** @import { Schema } from "schema-utils" */
+/**
+ * @import {
+ * 	AssetGeneratorDataUrl,
+ * 	AssetModuleOutputPath,
+ * 	RawPublicPath,
+ * 	AssetModuleFilename
+ * } from "../../declarations/WebpackOptions"
+ */
+/**
+ * @import {
+ * 	AssetInfo,
+ * 	ExecuteModuleObject,
+ * 	WebpackRequire
+ * } from "../Compilation"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import { AssetModuleBuildInfo } from "./AssetModule" */
+/** @import { CodeGenerationResult } from "../Module" */
+/** @import NormalModule from "../NormalModule" */
 
 /**
  * Returns definition.
@@ -54,17 +69,19 @@ const generatorValidationOptions = {
 	baseDataPath: "generator"
 };
 
-const getAssetGenerator = memoize(() => require("./AssetGenerator"));
-const getAssetParser = memoize(() => require("./AssetParser"));
-const getAssetSourceParser = memoize(() => require("./AssetSourceParser"));
-const getAssetBytesParser = memoize(() => require("./AssetBytesParser"));
-const getAssetSourceGenerator = memoize(() =>
+const getAssetGenerator = lazyModule(() => require("./AssetGenerator"));
+const getAssetParser = lazyModule(() => require("./AssetParser"));
+const getAssetSourceParser = lazyModule(() => require("./AssetSourceParser"));
+const getAssetBytesParser = lazyModule(() => require("./AssetBytesParser"));
+const getAssetSourceGenerator = lazyModule(() =>
 	require("./AssetSourceGenerator")
 );
-const getAssetBytesGenerator = memoize(() => require("./AssetBytesGenerator"));
-const getAssetModule = memoize(() => require("./AssetModule"));
-const getWebManifestParser = memoize(() => require("./WebManifestParser"));
-const getWebManifestGenerator = memoize(() =>
+const getAssetBytesGenerator = lazyModule(() =>
+	require("./AssetBytesGenerator")
+);
+const getAssetModule = lazyModule(() => require("./AssetModule"));
+const getWebManifestParser = lazyModule(() => require("./WebManifestParser"));
+const getWebManifestGenerator = lazyModule(() =>
 	require("./WebManifestGenerator")
 );
 
@@ -98,7 +115,33 @@ class AssetModulesPlugin {
 		compiler.hooks.compilation.tap(
 			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
-				const AssetModule = getAssetModule();
+				preloadModuleType(normalModuleFactory, PLUGIN_NAME, [
+					[
+						ASSET_MODULE_TYPE,
+						[getAssetModule, getAssetParser, getAssetGenerator]
+					],
+					[
+						ASSET_MODULE_TYPE_INLINE,
+						[getAssetModule, getAssetParser, getAssetGenerator]
+					],
+					[
+						ASSET_MODULE_TYPE_RESOURCE,
+						[getAssetModule, getAssetParser, getAssetGenerator]
+					],
+					[
+						ASSET_MODULE_TYPE_SOURCE,
+						[getAssetModule, getAssetSourceParser, getAssetSourceGenerator]
+					],
+					[
+						ASSET_MODULE_TYPE_BYTES,
+						[getAssetModule, getAssetBytesParser, getAssetBytesGenerator]
+					],
+					[
+						ASSET_MODULE_TYPE_WEBMANIFEST,
+						[getWebManifestParser, getWebManifestGenerator]
+					]
+				]);
+
 				for (const type of [
 					ASSET_MODULE_TYPE,
 					ASSET_MODULE_TYPE_BYTES,
@@ -108,11 +151,11 @@ class AssetModulesPlugin {
 				]) {
 					normalModuleFactory.hooks.createModuleClass
 						.for(type)
-						.tap(
-							PLUGIN_NAME,
-							(createData, _resolveData) =>
-								new AssetModule(createData, this.options.sideEffectFree)
-						);
+						.tap(PLUGIN_NAME, (createData, _resolveData) => {
+							const AssetModule = getAssetModule.loaded();
+
+							return new AssetModule(createData, this.options.sideEffectFree);
+						});
 				}
 
 				normalModuleFactory.hooks.createParser
@@ -139,35 +182,35 @@ class AssetModulesPlugin {
 							};
 						}
 
-						const AssetParser = getAssetParser();
+						const AssetParser = getAssetParser.loaded();
 
 						return new AssetParser(dataUrlCondition);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_INLINE)
 					.tap(PLUGIN_NAME, (_parserOptions) => {
-						const AssetParser = getAssetParser();
+						const AssetParser = getAssetParser.loaded();
 
 						return new AssetParser(true);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_RESOURCE)
 					.tap(PLUGIN_NAME, (_parserOptions) => {
-						const AssetParser = getAssetParser();
+						const AssetParser = getAssetParser.loaded();
 
 						return new AssetParser(false);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_SOURCE)
 					.tap(PLUGIN_NAME, (_parserOptions) => {
-						const AssetSourceParser = getAssetSourceParser();
+						const AssetSourceParser = getAssetSourceParser.loaded();
 
 						return new AssetSourceParser();
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_BYTES)
 					.tap(PLUGIN_NAME, (_parserOptions) => {
-						const AssetBytesParser = getAssetBytesParser();
+						const AssetBytesParser = getAssetBytesParser.loaded();
 
 						return new AssetBytesParser();
 					});
@@ -244,7 +287,7 @@ class AssetModulesPlugin {
 								outputPath = generatorOptions.outputPath;
 							}
 
-							const AssetGenerator = getAssetGenerator();
+							const AssetGenerator = getAssetGenerator.loaded();
 
 							return new AssetGenerator(
 								compilation.moduleGraph,
@@ -260,7 +303,7 @@ class AssetModulesPlugin {
 				normalModuleFactory.hooks.createGenerator
 					.for(ASSET_MODULE_TYPE_SOURCE)
 					.tap(PLUGIN_NAME, () => {
-						const AssetSourceGenerator = getAssetSourceGenerator();
+						const AssetSourceGenerator = getAssetSourceGenerator.loaded();
 
 						return new AssetSourceGenerator(compilation.moduleGraph);
 					});
@@ -268,7 +311,7 @@ class AssetModulesPlugin {
 				normalModuleFactory.hooks.createGenerator
 					.for(ASSET_MODULE_TYPE_BYTES)
 					.tap(PLUGIN_NAME, () => {
-						const AssetBytesGenerator = getAssetBytesGenerator();
+						const AssetBytesGenerator = getAssetBytesGenerator.loaded();
 
 						return new AssetBytesGenerator(compilation.moduleGraph);
 					});
@@ -306,7 +349,7 @@ class AssetModulesPlugin {
 
 								if (errored) {
 									const erroredModule = /** @type {NormalModule} */ (module);
-									const AssetGenerator = getAssetGenerator();
+									const AssetGenerator = getAssetGenerator.loaded();
 									const [fullContentHash, contentHash] =
 										AssetGenerator.getFullContentHash(
 											erroredModule,
@@ -373,14 +416,14 @@ class AssetModulesPlugin {
 					normalModuleFactory.hooks.createParser
 						.for(ASSET_MODULE_TYPE_WEBMANIFEST)
 						.tap(PLUGIN_NAME, () => {
-							const WebManifestParser = getWebManifestParser();
+							const WebManifestParser = getWebManifestParser.loaded();
 
 							return new WebManifestParser();
 						});
 					normalModuleFactory.hooks.createGenerator
 						.for(ASSET_MODULE_TYPE_WEBMANIFEST)
 						.tap(PLUGIN_NAME, () => {
-							const WebManifestGenerator = getWebManifestGenerator();
+							const WebManifestGenerator = getWebManifestGenerator.loaded();
 
 							return new WebManifestGenerator(compilation.moduleGraph);
 						});
@@ -462,6 +505,35 @@ class AssetModulesPlugin {
 						);
 					}
 				);
+
+				compilation.hooks.executeModule.tap(PLUGIN_NAME, (options, context) => {
+					const { codeGenerationResult } = options;
+					// A wrapper-less asset (`asset-url` only) would yield `{}` when
+					// required at build time — emulate the wrapper's exports instead.
+					if (!options.module.type.startsWith(ASSET_MODULE_TYPE)) return;
+					if (codeGenerationResult.sources.has(JAVASCRIPT_TYPE)) return;
+					const data = codeGenerationResult.data;
+					if (!data) return;
+					const moduleObject =
+						/** @type {ExecuteModuleObject} */
+						(options.moduleObject);
+					// `__webpack_require__.p` honors the `importModule` publicPath
+					// override (`URLDependency` requests it for wrapper-less assets).
+					const publicPath =
+						/** @type {WebpackRequire} */
+						(context.__webpack_require__).p;
+					const filename = data.get("filename");
+					if (typeof filename === "string" && typeof publicPath === "string") {
+						moduleObject.exports = publicPath + filename;
+						return;
+					}
+					// data: uris (and assets without a runtime publicPath) resolve
+					// chunk-independently — use the baked `asset-url`.
+					const url = data.get("url");
+					if (url && typeof url[ASSET_URL_TYPE] === "string") {
+						moduleObject.exports = url[ASSET_URL_TYPE];
+					}
+				});
 			}
 		);
 	}

package/lib/asset/AssetParser.js

@@ -7,13 +7,15 @@
 
 const Parser = require("../Parser");
 
-/** @typedef {import("../../declarations/WebpackOptions").AssetParserDataUrlOptions} AssetParserDataUrlOptions */
-/** @typedef {import("../../declarations/WebpackOptions").AssetParserOptions} AssetParserOptions */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("./AssetModule").AssetModuleBuildInfo} AssetModuleBuildInfo */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../Parser").ParserState} ParserState */
-/** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
+/**
+ * @import {
+ * 	AssetParserDataUrlOptions,
+ * 	AssetParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Module, { BuildMeta } from "../Module" */
+/** @import { AssetModuleBuildInfo } from "./AssetModule" */
+/** @import { ParserState, PreparsedAst } from "../Parser" */
 
 /** @typedef {((source: string | Buffer, context: { filename: string, module: Module }) => boolean)} AssetParserDataUrlFunction */
 

package/lib/asset/AssetSourceGenerator.js

@@ -19,14 +19,20 @@ const {
 	NO_TYPES
 } = require("../ModuleSourceTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
-
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../Generator").GenerateContext} GenerateContext */
-/** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
-/** @typedef {import("../Module").SourceType} SourceType */
-/** @typedef {import("../Module").SourceTypes} SourceTypes */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../NormalModule")} NormalModule */
+const { languageOfFilename } = require("../util/dataURL");
+
+/** @import { Source } from "webpack-sources" */
+/** @import { GenerateContext, UpdateHashContext } from "../Generator" */
+/** @import Hash from "../util/Hash" */
+/**
+ * @import {
+ * 	ConcatenationBailoutReasonContext,
+ * 	SourceType,
+ * 	SourceTypes
+ * } from "../Module"
+ */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import NormalModule from "../NormalModule" */
 
 class AssetSourceGenerator extends Generator {
 	/**
@@ -60,8 +66,11 @@ class AssetSourceGenerator extends Generator {
 				}
 
 				const content = originalSource.source();
-				const encodedSource =
-					typeof content === "string" ? content : content.toString("utf8");
+				const encodedSource = AssetSourceGenerator._renderEmbedded(
+					module,
+					typeof content === "string" ? content : content.toString("utf8"),
+					runtimeTemplate
+				);
 
 				/** @type {string} */
 				let sourceContent;
@@ -99,6 +108,46 @@ class AssetSourceGenerator extends Generator {
 		}
 	}
 
+	/**
+	 * Offer the file's text to `renderEmbeddedSource` before it is embedded in
+	 * JavaScript. Declines a file whose name names no language webpack knows.
+	 * @param {NormalModule} module the module holding the text
+	 * @param {string} text the file's text
+	 * @param {GenerateContext["runtimeTemplate"]} runtimeTemplate runtime template
+	 * @returns {string} the rendered text, or `text` when nothing rendered it
+	 */
+	static _renderEmbedded(module, text, runtimeTemplate) {
+		if (!runtimeTemplate) return text;
+		// Untapped, nothing can change: no mime lookup and no source to wrap.
+		const { compilation } = runtimeTemplate;
+		if (compilation.hooks.renderEmbeddedSource.taps.length === 0) return text;
+		const type = languageOfFilename(module.nameForCondition());
+		if (type === undefined) return text;
+		const rendered = compilation._resolveEmbeddedSource(new RawSource(text), {
+			type,
+			hostType: JAVASCRIPT_TYPE,
+			module
+		});
+		return /** @type {string} */ (rendered.source());
+	}
+
+	/**
+	 * Updates the hash with the data contributed by this instance.
+	 * @param {Hash} hash hash that will be modified
+	 * @param {UpdateHashContext} updateHashContext context for updating hash
+	 */
+	updateHash(hash, updateHashContext) {
+		const { module, runtimeTemplate } = updateHashContext;
+		// What a tap varies on has to reach the key, or a changed option replays.
+		if (
+			runtimeTemplate &&
+			runtimeTemplate.compilation.hooks.renderEmbeddedSource.taps.length > 0 &&
+			languageOfFilename(module.nameForCondition())
+		) {
+			runtimeTemplate.compilation.hooks.embeddedSourceHash.call(module, hash);
+		}
+	}
+
 	/**
 	 * Generates fallback output for the provided error condition.
 	 * @param {Error} error the error
@@ -109,9 +158,7 @@ class AssetSourceGenerator extends Generator {
 	generateError(error, module, generateContext) {
 		switch (generateContext.type) {
 			case JAVASCRIPT_TYPE: {
-				return new RawSource(
-					`throw new Error(${JSON.stringify(error.message)});`
-				);
+				return new RawSource(Generator.throwBuildErrorCode(error));
 			}
 			default:
 				return null;

package/lib/asset/AssetSourceParser.js

@@ -7,10 +7,8 @@
 
 const Parser = require("../Parser");
 
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../Parser").ParserState} ParserState */
-/** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
+/** @import { BuildInfo, BuildMeta } from "../Module" */
+/** @import { ParserState, PreparsedAst } from "../Parser" */
 
 class AssetSourceParser extends Parser {
 	/**

package/lib/asset/RawDataUrlModule.js

@@ -15,24 +15,32 @@ const { ASSET_MODULE_TYPE_RAW_DATA_URL } = require("../ModuleTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("../config/defaults").WebpackOptionsNormalizedWithDefaults} WebpackOptions */
-/** @typedef {import("../Compilation")} Compilation */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../Module").BuildCallback} BuildCallback */
-/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
-/** @typedef {import("../Module").CodeGenerationContext} CodeGenerationContext */
-/** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
-/** @typedef {import("../Module").CodeGenerationResultData} CodeGenerationResultData */
-/** @typedef {import("../Module").NeedBuildCallback} NeedBuildCallback */
-/** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
-/** @typedef {import("../Module").Sources} Sources */
-/** @typedef {import("../Module").SourceTypes} SourceTypes */
-/** @typedef {import("../RequestShortener")} RequestShortener */
-/** @typedef {import("../ResolverFactory").ResolverWithOptions} ResolverWithOptions */
+/**
+ * @import {
+ * 	WebpackOptionsNormalizedWithDefaults as WebpackOptions
+ * } from "../config/defaults"
+ */
+/** @import Compilation from "../Compilation" */
+/** @import { UpdateHashContext } from "../Dependency" */
+/**
+ * @import {
+ * 	BuildCallback,
+ * 	RuntimeRequirements,
+ * 	CodeGenerationContext,
+ * 	CodeGenerationResult,
+ * 	CodeGenerationResultData,
+ * 	NeedBuildCallback,
+ * 	NeedBuildContext,
+ * 	Sources,
+ * 	SourceTypes
+ * } from "../Module"
+ */
+/** @import RequestShortener from "../RequestShortener" */
+/** @import { ResolverWithOptions } from "../ResolverFactory" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Buffer | undefined, string, string]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Buffer | undefined, string, string]>} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/fs").InputFileSystem} InputFileSystem */
+/** @import Hash from "../util/Hash" */
+/** @import { InputFileSystem } from "../util/fs" */
 
 class RawDataUrlModule extends Module {
 	/**

package/lib/asset/WebManifestGenerator.js

@@ -12,16 +12,14 @@ const nonNumericOnlyHash = require("../util/nonNumericOnlyHash");
 const { PUBLIC_PATH_AUTO } = require("../util/publicPathPlaceholder");
 const AssetGenerator = require("./AssetGenerator");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
-/** @typedef {import("../Compilation").DependencyConstructor} DependencyConstructor */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Generator").GenerateContext} GenerateContext */
-/** @typedef {import("../Module").SourceType} SourceType */
-/** @typedef {import("../Module").SourceTypes} SourceTypes */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../NormalModule")} NormalModule */
+/** @import { Source } from "webpack-sources" */
+/** @import CodeGenerationResults from "../CodeGenerationResults" */
+/** @import { DependencyConstructor } from "../Compilation" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { GenerateContext } from "../Generator" */
+/** @import { SourceType, SourceTypes } from "../Module" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import NormalModule from "../NormalModule" */
 
 const WEBMANIFEST_TYPE = "webmanifest";
 const WEBMANIFEST_TYPES = new Set([WEBMANIFEST_TYPE]);

package/lib/asset/WebManifestParser.js

@@ -9,13 +9,9 @@ const { parse } = require("acorn");
 const Parser = require("../Parser");
 const HtmlSourceDependency = require("../dependencies/HtmlSourceDependency");
 
-/** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("estree").ObjectExpression} ObjectExpression */
-/** @typedef {import("estree").Program} Program */
-/** @typedef {import("estree").Property} Property */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
-/** @typedef {import("../Parser").ParserState} ParserState */
-/** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
+/** @import { Expression, ObjectExpression, Program, Property } from "estree" */
+/** @import { BuildInfo } from "../Module" */
+/** @import { ParserState, PreparsedAst } from "../Parser" */
 
 // acorn decorates every node with numeric source offsets (absent from the estree types).
 /** @typedef {{ start: number, end: number }} Positioned */
@@ -26,6 +22,7 @@ const ABSOLUTE_URL_SCHEME_REGEXP = /^[a-zA-Z][a-zA-Z\d+\-.]*:/;
 // Manifest members whose array items carry an asset `src` (`icons[].src`,
 // `screenshots[].src`, and `shortcuts[].icons[].src` — the last nests under `icons`).
 const ICON_CONTAINER_KEYS = new Set(["icons", "screenshots"]);
+const BOM_BYTE_LENGTH = 3;
 
 /**
  * Parses a Web App Manifest (`.webmanifest`) so its icon/screenshot `src`
@@ -41,14 +38,28 @@ class WebManifestParser extends Parser {
 	 * @returns {ParserState} the parser state
 	 */
 	parse(source, state) {
-		if (Buffer.isBuffer(source)) {
-			source = source.toString("utf8");
+		// The generator replaces over the raw buffer, so the emitted ranges are
+		// byte offsets rather than the UTF-16 ones acorn reports.
+		const binary = Buffer.isBuffer(source);
+		if (binary) {
+			source = /** @type {Buffer} */ (source).toString("utf8");
 		} else if (typeof source === "object") {
 			throw new Error("webpackAst is unexpected for the WebManifestParser");
 		}
+		let leadingBytes = 0;
 		if (source[0] === "") {
 			source = source.slice(1);
+			leadingBytes = binary ? BOM_BYTE_LENGTH : 1;
 		}
+		const text = /** @type {string} */ (source);
+		const asciiOnly = !binary || Buffer.byteLength(text) === text.length;
+		/**
+		 * @param {number} offset offset in UTF-16 code units into `text`
+		 * @returns {number} matching offset into the module source
+		 */
+		const toSourceOffset = (offset) =>
+			(asciiOnly ? offset : Buffer.byteLength(text.slice(0, offset))) +
+			leadingBytes;
 
 		const module = state.module;
 		// Without `buildHttp` there is no handler to fetch remote icons, so an
@@ -111,7 +122,10 @@ class WebManifestParser extends Parser {
 						const { start, end } = /** @type {Positioned} */ (
 							/** @type {unknown} */ (value)
 						);
-						const dep = new HtmlSourceDependency(url, [start, end - 2]);
+						const dep = new HtmlSourceDependency(url, [
+							toSourceOffset(start),
+							toSourceOffset(end - 2)
+						]);
 						module.addDependency(dep);
 						module.addCodeGenerationDependency(dep);
 					}

package/lib/async-modules/AsyncModuleHelpers.js

@@ -7,8 +7,8 @@
 
 const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
 
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../Module")} Module */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import Module from "../Module" */
 
 /** @typedef {Set<Module>} Modules */
 
@@ -32,16 +32,22 @@ const getOutgoingAsyncModules = (moduleGraph, module) => {
 			const outgoingConnectionMap =
 				moduleGraph.getOutgoingConnectionsByModule(module);
 			if (outgoingConnectionMap) {
-				for (const [module, connections] of outgoingConnectionMap) {
+				// Walk the imports in source order: the spec gathers these from
+				// `[[RequestedModules]]`, and their evaluation order is observable.
+				for (const dependency of module.dependencies) {
+					if (!(dependency instanceof HarmonyImportDependency)) continue;
+					const referenced = moduleGraph.getModule(dependency);
+					if (!referenced || seen.has(referenced)) continue;
+					const connections = outgoingConnectionMap.get(referenced);
 					if (
+						connections &&
 						connections.some(
 							(c) =>
 								c.dependency instanceof HarmonyImportDependency &&
 								c.isTargetActive(undefined)
-						) &&
-						module
+						)
 					) {
-						g(module);
+						g(referenced);
 					}
 				}
 			}

package/lib/async-modules/AwaitDependenciesInitFragment.js

@@ -9,8 +9,8 @@ const InitFragment = require("../InitFragment");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../Generator").GenerateContext} GenerateContext */
+/** @import { Source } from "webpack-sources" */
+/** @import { GenerateContext } from "../Generator" */
 
 /** @typedef {Map<string, string>} Dependencies */
 

package/lib/async-modules/InferAsyncModulesPlugin.js

@@ -7,8 +7,8 @@
 
 const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../Module" */
 
 const PLUGIN_NAME = "InferAsyncModulesPlugin";
 

package/lib/async-modules/isGeneratorLowered.js

@@ -4,14 +4,14 @@
 
 "use strict";
 
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @import Module from "../Module" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import RuntimeTemplate from "../RuntimeTemplate" */
 
 /**
  * Whether an async module is lowered to a generator: the target has no
  * `async`/`await` but supports generators, and the module contains no
- * top-level `for await…of` (which generators can't express).
+ * top-level `for await…of` or `await using` (which generators can't express).
  * @param {Module} module module
  * @param {ModuleGraph} moduleGraph module graph
  * @param {RuntimeTemplate} runtimeTemplate runtime template