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

package/lib/dependencies/ImportParserPlugin.js

@@ -6,8 +6,7 @@
 "use strict";
 
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
-const CommentCompilationWarning = require("../errors/CommentCompilationWarning");
-const UnsupportedFeatureWarning = require("../errors/UnsupportedFeatureWarning");
+
 const {
 	VariableInfo,
 	getImportAttributes
@@ -16,35 +15,50 @@ const memoize = require("../util/memoize");
 const traverseDestructuringAssignmentProperties = require("../util/traverseDestructuringAssignmentProperties");
 const ContextDependencyHelpers = require("./ContextDependencyHelpers");
 const { getNonOptionalPart } = require("./HarmonyImportDependency");
+const HarmonyImportGuard = require("./HarmonyImportGuard");
 const ImportContextDependency = require("./ImportContextDependency");
 const ImportDependency = require("./ImportDependency");
 const ImportEagerDependency = require("./ImportEagerDependency");
 const { createGetImportPhase } = require("./ImportPhase");
 const ImportWeakDependency = require("./ImportWeakDependency");
 
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../ChunkGroup").RawChunkGroupOptions} RawChunkGroupOptions */
-/** @typedef {import("../ContextModule").ContextMode} ContextMode */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").ImportExpression} ImportExpression */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
-/** @typedef {import("../javascript/JavascriptParser").Members} Members */
-/** @typedef {import("../javascript/JavascriptParser").MembersOptionals} MembersOptionals */
-/** @typedef {import("../javascript/JavascriptParser").ArrowFunctionExpression} ArrowFunctionExpression */
-/** @typedef {import("../javascript/JavascriptParser").FunctionExpression} FunctionExpression */
-/** @typedef {import("../javascript/JavascriptParser").Identifier} Identifier */
-/** @typedef {import("../javascript/JavascriptParser").ObjectPattern} ObjectPattern */
-/** @typedef {import("../javascript/JavascriptParser").CallExpression} CallExpression */
+const getUnsupportedFeatureWarning = memoize(() =>
+	require("../errors/UnsupportedFeatureWarning")
+);
+
+const getCommentCompilationWarning = memoize(() =>
+	require("../errors/CommentCompilationWarning")
+);
+
+/**
+ * @import {
+ * 	ArrowFunctionExpression,
+ * 	FunctionExpression,
+ * 	Identifier,
+ * 	ObjectPattern,
+ * 	CallExpression
+ * } from "estree"
+ */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import { RawChunkGroupOptions } from "../ChunkGroup" */
+/** @import { ContextMode } from "../ContextModule" */
+/** @import { RawReferencedExports } from "../Dependency" */
+/** @import { BuildMeta } from "../Module" */
+/**
+ * @import JavascriptParser, {
+ * 	ImportExpression,
+ * 	Range,
+ * 	JavascriptParserState
+ * } from "../javascript/JavascriptParser"
+ */
 
 /** @typedef {{ references: RawReferencedExports, expression: ImportExpression }} ImportSettings */
 /** @typedef {WeakMap<ImportExpression, RawReferencedExports>} State */
 
-const getHarmonyImportGuard = memoize(() => require("./HarmonyImportGuard"));
-
 /** @type {WeakMap<JavascriptParserState, State>} */
 const parserStateMap = new WeakMap();
 const dynamicImportTag = Symbol("import()");
@@ -195,20 +209,18 @@ const isStaticStringAttributes = (node) => {
 				: key.type === "Literal"
 					? key.value
 					: undefined;
-		if (keyName === "with" || keyName === "assert") {
-			const value = prop.value;
-			if (value.type !== "ObjectExpression") return false;
-			for (const attr of value.properties) {
-				if (attr.type !== "Property" || attr.kind !== "init" || attr.computed) {
-					return false;
-				}
-				const attrValue = attr.value;
-				if (
-					attrValue.type !== "Literal" ||
-					typeof attrValue.value !== "string"
-				) {
-					return false;
-				}
+		// Any other key is an expression webpack cannot account for, and its
+		// value still evaluates, so the argument has to stay.
+		if (keyName !== "with" && keyName !== "assert") return false;
+		const value = prop.value;
+		if (value.type !== "ObjectExpression") return false;
+		for (const attr of value.properties) {
+			if (attr.type !== "Property" || attr.kind !== "init" || attr.computed) {
+				return false;
+			}
+			const attrValue = attr.value;
+			if (attrValue.type !== "Literal" || typeof attrValue.value !== "string") {
+				return false;
 			}
 		}
 	}
@@ -357,7 +369,7 @@ class ImportParserPlugin {
 				for (const e of commentErrors) {
 					const { comment } = e;
 					parser.state.module.addWarning(
-						new CommentCompilationWarning(
+						new (getCommentCompilationWarning())(
 							`Compilation error while processing magic comment(-s): /*${comment.value}*/: ${e.message}`,
 							parser.getLocation(comment)
 						)
@@ -374,7 +386,7 @@ class ImportParserPlugin {
 				if (importOptions.webpackIgnore !== undefined) {
 					if (typeof importOptions.webpackIgnore !== "boolean") {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackIgnore\` expected a boolean, but received: ${importOptions.webpackIgnore}.`,
 								parser.getLocation(expr)
 							)
@@ -387,7 +399,7 @@ class ImportParserPlugin {
 				if (importOptions.webpackChunkName !== undefined) {
 					if (typeof importOptions.webpackChunkName !== "string") {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackChunkName\` expected a string, but received: ${importOptions.webpackChunkName}.`,
 								parser.getLocation(expr)
 							)
@@ -399,7 +411,7 @@ class ImportParserPlugin {
 				if (importOptions.webpackMode !== undefined) {
 					if (typeof importOptions.webpackMode !== "string") {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackMode\` expected a string, but received: ${importOptions.webpackMode}.`,
 								parser.getLocation(expr)
 							)
@@ -415,7 +427,7 @@ class ImportParserPlugin {
 						groupOptions.prefetchOrder = importOptions.webpackPrefetch;
 					} else {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackPrefetch\` expected true or a number, but received: ${importOptions.webpackPrefetch}.`,
 								parser.getLocation(expr)
 							)
@@ -429,7 +441,7 @@ class ImportParserPlugin {
 						groupOptions.preloadOrder = importOptions.webpackPreload;
 					} else {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackPreload\` expected true or a number, but received: ${importOptions.webpackPreload}.`,
 								parser.getLocation(expr)
 							)
@@ -446,7 +458,7 @@ class ImportParserPlugin {
 							(importOptions.webpackFetchPriority);
 					} else {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackFetchPriority\` expected true or "low", "high" or "auto", but received: ${importOptions.webpackFetchPriority}.`,
 								parser.getLocation(expr)
 							)
@@ -459,7 +471,7 @@ class ImportParserPlugin {
 						!(importOptions.webpackInclude instanceof RegExp)
 					) {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackInclude\` expected a regular expression, but received: ${importOptions.webpackInclude}.`,
 								parser.getLocation(expr)
 							)
@@ -474,7 +486,7 @@ class ImportParserPlugin {
 						!(importOptions.webpackExclude instanceof RegExp)
 					) {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackExclude\` expected a regular expression, but received: ${importOptions.webpackExclude}.`,
 								parser.getLocation(expr)
 							)
@@ -492,7 +504,7 @@ class ImportParserPlugin {
 							))
 					)) {
 						parser.state.module.addWarning(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`\`webpackExports\` expected a string or an array of strings, but received: ${importOptions.webpackExports}.`,
 								parser.getLocation(expr)
 							)
@@ -511,7 +523,7 @@ class ImportParserPlugin {
 					importOptions.webpackEntryOptions.worker !== undefined
 				) {
 					parser.state.module.addWarning(
-						new UnsupportedFeatureWarning(
+						new (getUnsupportedFeatureWarning())(
 							"`worker` entry option is not supported in `import()`, it only applies to workers (e.g. `new Worker(new URL(...))`).",
 							parser.getLocation(expr)
 						)
@@ -526,7 +538,7 @@ class ImportParserPlugin {
 				mode !== "weak"
 			) {
 				parser.state.module.addWarning(
-					new UnsupportedFeatureWarning(
+					new (getUnsupportedFeatureWarning())(
 						`\`webpackMode\` expected 'lazy', 'lazy-once', 'eager' or 'weak', but received: ${mode}.`,
 						parser.getLocation(expr)
 					)
@@ -547,7 +559,7 @@ class ImportParserPlugin {
 			) {
 				if (exports) {
 					parser.state.module.addWarning(
-						new UnsupportedFeatureWarning(
+						new (getUnsupportedFeatureWarning())(
 							"You don't need `webpackExports` if the usage of dynamic import is statically analyse-able. You can safely remove the `webpackExports` magic comment.",
 							parser.getLocation(expr)
 						)
@@ -629,7 +641,7 @@ class ImportParserPlugin {
 					dep.optional = Boolean(parser.scope.inTry);
 					depBlock.addDependency(dep);
 					parser.state.current.addBlock(depBlock);
-					getHarmonyImportGuard().attachDependencyGuards(parser, dep);
+					HarmonyImportGuard.attachDependencyGuards(parser, dep);
 				}
 			} else {
 				if (mode === "weak") {
@@ -662,6 +674,18 @@ class ImportParserPlugin {
 					parser
 				);
 				if (!dep) return;
+				// The context module ignores the options argument, but the spec
+				// evaluates it, so anything but a static attributes object stays.
+				const optionsNode = expr.options;
+				if (
+					optionsNode &&
+					optionsNode.range &&
+					!isStaticStringAttributes(optionsNode)
+				) {
+					/** @type {ImportContextDependency} */ (dep).optionsRange =
+						/** @type {Range} */ (optionsNode.range);
+					parser.walkExpression(optionsNode);
+				}
 				dep.loc = parser.getLocation(expr);
 				dep.optional = Boolean(parser.scope.inTry);
 				parser.state.current.addDependency(dep);

package/lib/dependencies/ImportPhase.js

@@ -11,11 +11,18 @@ const getCommentCompilationWarning = memoize(() =>
 	require("../errors/CommentCompilationWarning")
 );
 
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").ExportAllDeclaration} ExportAllDeclaration */
-/** @typedef {import("../javascript/JavascriptParser").ExportNamedDeclaration} ExportNamedDeclaration */
-/** @typedef {import("../javascript/JavascriptParser").ImportDeclaration} ImportDeclaration */
-/** @typedef {import("../javascript/JavascriptParser").ImportExpression} ImportExpression */
+/**
+ * @import {
+ * 	ExportAllDeclaration,
+ * 	ExportNamedDeclaration,
+ * 	ImportDeclaration
+ * } from "estree"
+ */
+/**
+ * @import JavascriptParser, {
+ * 	ImportExpression
+ * } from "../javascript/JavascriptParser"
+ */
 
 /** @typedef {typeof ImportPhase.Evaluation | typeof ImportPhase.Defer | typeof ImportPhase.Source}  ImportPhaseType */
 

package/lib/dependencies/ImportPlugin.js

@@ -16,9 +16,13 @@ const ImportEagerDependency = require("./ImportEagerDependency");
 const ImportParserPlugin = require("./ImportParserPlugin");
 const ImportWeakDependency = require("./ImportWeakDependency");
 
-/** @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 = "ImportPlugin";
 

package/lib/dependencies/ImportWeakDependency.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 ImportWeakDependency extends ImportDependency {
 	/**

package/lib/dependencies/JsonExportsDependency.js

@@ -8,15 +8,19 @@
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("../Dependency").ExportSpec} ExportSpec */
-/** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../json/JsonData")} JsonData */
-/** @typedef {import("../json/JsonData").JsonValue} JsonValue */
+/**
+ * @import {
+ * 	ExportSpec,
+ * 	ExportsSpec,
+ * 	UpdateHashContext
+ * } from "../Dependency"
+ */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import JsonData from "../json/JsonData" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[JsonData, number]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[JsonData, number]>} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
+/** @import { JsonValue } from "../util/fs" */
+/** @import Hash from "../util/Hash" */
 
 /**
  * Defines the get exports from data fn callback.

package/lib/dependencies/LoaderDependency.js

@@ -7,8 +7,8 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @import { GetConditionFn } from "../Dependency" */
+/** @import ModuleGraph from "../ModuleGraph" */
 
 class LoaderDependency extends ModuleDependency {
 	/**

package/lib/dependencies/LoaderImportDependency.js

@@ -7,8 +7,8 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @import { GetConditionFn } from "../Dependency" */
+/** @import ModuleGraph from "../ModuleGraph" */
 
 class LoaderImportDependency extends ModuleDependency {
 	/**

package/lib/dependencies/LoaderPlugin.js

@@ -11,13 +11,17 @@ const LazySet = require("../util/LazySet");
 const LoaderDependency = require("./LoaderDependency");
 const LoaderImportDependency = require("./LoaderImportDependency");
 
-/** @typedef {import("webpack-sources").RawSourceMap} RawSourceMap */
-/** @typedef {import("../Compilation").DependencyConstructor} DependencyConstructor */
-/** @typedef {import("../Compilation").ExecuteModuleExports} ExecuteModuleExports */
-/** @typedef {import("../Compilation").ExecuteModuleResult} ExecuteModuleResult */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
-/** @typedef {import("../Module").FileSystemDependencies} FileSystemDependencies */
+/** @import { RawSourceMap } from "webpack-sources" */
+/**
+ * @import {
+ * 	DependencyConstructor,
+ * 	ExecuteModuleExports,
+ * 	ExecuteModuleResult,
+ * 	FileSystemDependencies
+ * } from "../Compilation"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import { BuildInfo } from "../Module" */
 
 /**
  * Defines the import module callback callback.

package/lib/dependencies/LocalModuleDependency.js

@@ -8,13 +8,13 @@
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[LocalModule, Range | undefined, boolean]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[LocalModule, Range | undefined, boolean]>} ObjectSerializerContext */
-/** @typedef {import("./LocalModule")} LocalModule */
+/** @import LocalModule from "./LocalModule" */
 
 class LocalModuleDependency extends NullDependency {
 	/**

package/lib/dependencies/LocalModulesHelpers.js

@@ -7,7 +7,7 @@
 
 const LocalModule = require("./LocalModule");
 
-/** @typedef {import("../javascript/JavascriptParser").JavascriptParserState} JavascriptParserState */
+/** @import { JavascriptParserState } from "../javascript/JavascriptParser" */
 
 /**
  * Returns resolved module.

package/lib/dependencies/ModuleDecoratorDependency.js

@@ -11,15 +11,14 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import { ReferencedExports, UpdateHashContext } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import ModuleGraph from "../ModuleGraph" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, boolean]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, boolean]>} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import Hash from "../util/Hash" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 class ModuleDecoratorDependency extends NullDependency {
 	/**

package/lib/dependencies/ModuleDependency.js

@@ -8,12 +8,15 @@
 const Dependency = require("../Dependency");
 const DependencyTemplate = require("../DependencyTemplate");
 
-/** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @import { TRANSITIVE } from "../Dependency" */
+/** @import Module from "../Module" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "../serialization/ObjectMiddleware"
+ */
 
 class ModuleDependency extends Dependency {
 	/**

package/lib/dependencies/ModuleDependencyTemplateAsId.js

@@ -7,10 +7,10 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Module from "../Module" */
 
 class ModuleDependencyTemplateAsId extends ModuleDependency.Template {
 	/**

package/lib/dependencies/ModuleDependencyTemplateAsRequireId.js

@@ -7,9 +7,9 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
 
 class ModuleDependencyTemplateAsRequireId extends ModuleDependency.Template {
 	/**

package/lib/dependencies/ModuleHotAcceptDependency.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 ModuleHotAcceptDependency extends ModuleDependency {
 	/**

package/lib/dependencies/ModuleHotDeclineDependency.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 ModuleHotDeclineDependency extends ModuleDependency {
 	/**

package/lib/dependencies/ModuleInitFragmentDependency.js

@@ -9,11 +9,11 @@ const InitFragment = require("../InitFragment");
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string[], string | undefined]>} ObjectSerializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string[], string | undefined]>} ObjectDeserializerContext */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, string[], string | undefined, string | undefined]>} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, string[], string | undefined, string | undefined]>} ObjectDeserializerContext */
 /**
  * A dependency that adds an init fragment to the module
  */
@@ -23,8 +23,9 @@ class ModuleInitFragmentDependency extends NullDependency {
 	 * @param {string} initCode the initialization code
 	 * @param {string[]} runtimeRequirements runtime requirements
 	 * @param {string=} key unique key to avoid emitting the same initialization code twice
+	 * @param {string=} buildTimeInitCode initialization code for build-time execution, when `initCode` is only valid in emitted output
 	 */
-	constructor(initCode, runtimeRequirements, key) {
+	constructor(initCode, runtimeRequirements, key, buildTimeInitCode) {
 		super();
 		/** @type {string} */
 		this.initCode = initCode;
@@ -32,6 +33,8 @@ class ModuleInitFragmentDependency extends NullDependency {
 		this.runtimeRequirements = runtimeRequirements;
 		/** @type {string | undefined} */
 		this.key = key;
+		/** @type {string | undefined} */
+		this.buildTimeInitCode = buildTimeInitCode;
 	}
 
 	/**
@@ -42,7 +45,8 @@ class ModuleInitFragmentDependency extends NullDependency {
 		context
 			.write(this.initCode)
 			.write(this.runtimeRequirements)
-			.write(this.key);
+			.write(this.key)
+			.write(this.buildTimeInitCode);
 		super.serialize(context);
 	}
 
@@ -56,7 +60,9 @@ class ModuleInitFragmentDependency extends NullDependency {
 		this.runtimeRequirements = c1.read();
 		const c2 = c1.rest;
 		this.key = c2.read();
-		super.deserialize(c2.rest);
+		const c3 = c2.rest;
+		this.buildTimeInitCode = c3.read();
+		super.deserialize(c3.rest);
 	}
 }
 
@@ -75,14 +81,22 @@ ModuleInitFragmentDependency.Template = class ModuleInitFragmentDependencyTempla
 	 * @param {DependencyTemplateContext} templateContext the context object
 	 * @returns {void}
 	 */
-	apply(dependency, source, { initFragments, runtimeRequirements }) {
+	apply(
+		dependency,
+		source,
+		{ chunkGraph, initFragments, runtimeRequirements }
+	) {
 		const dep = /** @type {ModuleInitFragmentDependency} */ (dependency);
 		for (const req of dep.runtimeRequirements) {
 			runtimeRequirements.add(req);
 		}
+		const initCode =
+			chunkGraph.buildTimeExecution && dep.buildTimeInitCode !== undefined
+				? dep.buildTimeInitCode
+				: dep.initCode;
 		initFragments.push(
 			new InitFragment(
-				dep.initCode,
+				initCode,
 				InitFragment.STAGE_CONSTANTS,
 				0,
 				dep.key,

package/lib/dependencies/NullDependency.js

@@ -8,9 +8,9 @@
 const Dependency = require("../Dependency");
 const DependencyTemplate = require("../DependencyTemplate");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import { TRANSITIVE } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
 
 /** @typedef {string[]} RawRuntimeRequirements */