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

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 */
 

package/lib/dependencies/ProvidedDependency.js

@@ -13,18 +13,22 @@ const makeSerializable = require("../util/makeSerializable");
 const { propertyAccess } = require("../util/property");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @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 */
-/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
-/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/**
+ * @import {
+ * 	ReferencedExports,
+ * 	UpdateHashContext,
+ * 	ExportInfoName
+ * } from "../Dependency"
+ */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import ModuleGraphConnection from "../ModuleGraphConnection" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[string, ExportInfoName[]]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[string, ExportInfoName[]]>} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import Hash from "../util/Hash" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 class ProvidedDependency extends ModuleDependency {
 	/**

package/lib/dependencies/PureExpressionDependency.js

@@ -10,18 +10,17 @@ const makeSerializable = require("../util/makeSerializable");
 const { filterRuntime, runtimeToString } = require("../util/runtime");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").RuntimeSpec} RuntimeSpec */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Module from "../Module" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { ConnectionState } from "../ModuleGraphConnection" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Set<string> | false]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Set<string> | false]>} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
+/** @import Hash from "../util/Hash" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 class PureExpressionDependency extends NullDependency {
 	/**

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

package/lib/dependencies/RequireContextDependencyParserPlugin.js

@@ -7,10 +7,8 @@
 
 const RequireContextDependency = require("./RequireContextDependency");
 
-/** @typedef {import("../ContextModule").ContextMode} ContextMode */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ContextMode } from "../ContextModule" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "RequireContextDependencyParserPlugin";
 

package/lib/dependencies/RequireContextPlugin.js

@@ -14,10 +14,14 @@ const ContextElementDependency = require("./ContextElementDependency");
 const RequireContextDependency = require("./RequireContextDependency");
 const RequireContextDependencyParserPlugin = require("./RequireContextDependencyParserPlugin");
 
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../javascript/JavascriptParser")} Parser */
+/**
+ * @import {
+ * 	JavascriptParserOptions,
+ * 	ResolveOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import Parser from "../javascript/JavascriptParser" */
 
 /** @type {ResolveOptions} */
 const EMPTY_RESOLVE_OPTIONS = {};

package/lib/dependencies/RequireEnsureDependenciesBlock.js

@@ -8,8 +8,8 @@
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("../AsyncDependenciesBlock").GroupOptions} GroupOptions */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+/** @import { GroupOptions } from "../AsyncDependenciesBlock" */
+/** @import { DependencyLocation } from "../Dependency" */
 
 class RequireEnsureDependenciesBlock extends AsyncDependenciesBlock {
 	/**

package/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js

@@ -10,14 +10,11 @@ const RequireEnsureDependency = require("./RequireEnsureDependency");
 const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
 const getFunctionExpression = require("./getFunctionExpression");
 
-/** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("estree").SpreadElement} SpreadElement */
-/** @typedef {import("../AsyncDependenciesBlock").GroupOptions} GroupOptions */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("./getFunctionExpression").FunctionExpressionResult} FunctionExpressionResult */
+/** @import { Expression, SpreadElement } from "estree" */
+/** @import { GroupOptions } from "../AsyncDependenciesBlock" */
+/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import { FunctionExpressionResult } from "./getFunctionExpression" */
 
 const PLUGIN_NAME = "RequireEnsureDependenciesBlockParserPlugin";
 

package/lib/dependencies/RequireEnsureDependency.js

@@ -9,11 +9,11 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../AsyncDependenciesBlock")} AsyncDependenciesBlock */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import AsyncDependenciesBlock from "../AsyncDependenciesBlock" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range, Range | false]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, Range | false]>} ObjectSerializerContext */
 
@@ -82,7 +82,7 @@ RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate extends
 	apply(
 		dependency,
 		source,
-		{ runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements }
+		{ module, runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements }
 	) {
 		const dep = /** @type {RequireEnsureDependency} */ (dependency);
 		const depBlock = /** @type {AsyncDependenciesBlock} */ (
@@ -92,7 +92,8 @@ RequireEnsureDependency.Template = class RequireEnsureDependencyTemplate extends
 			chunkGraph,
 			block: depBlock,
 			message: "require.ensure",
-			runtimeRequirements
+			runtimeRequirements,
+			originModule: module
 		});
 		const range = dep.range;
 		const contentRange = dep.contentRange;

package/lib/dependencies/RequireEnsurePlugin.js

@@ -17,9 +17,13 @@ const RequireEnsureDependenciesBlockParserPlugin = require("./RequireEnsureDepen
 const RequireEnsureDependency = require("./RequireEnsureDependency");
 const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
 
-/** @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 = "RequireEnsurePlugin";
 

package/lib/dependencies/RequireHeaderDependency.js

@@ -7,24 +7,29 @@
 
 const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
+const HarmonyImportGuard = require("./HarmonyImportGuard");
 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 */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import CommonJsRequireDependency from "./CommonJsRequireDependency" */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, CommonJsRequireDependency | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, CommonJsRequireDependency | undefined]>} ObjectSerializerContext */
 
 class RequireHeaderDependency extends NullDependency {
 	/**
 	 * Creates an instance of RequireHeaderDependency.
-	 * @param {Range} range range
+	 * @param {Range} range range of the `require` callee
+	 * @param {CommonJsRequireDependency=} requireDependency paired require dep (unset for conditional `require(a ? b : c)`)
 	 */
-	constructor(range) {
+	constructor(range, requireDependency) {
 		super();
 		if (!Array.isArray(range)) throw new Error("range must be valid");
 		this.range = range;
+		/** @type {CommonJsRequireDependency | undefined} */
+		this.requireDependency = requireDependency;
 	}
 
 	/**
@@ -32,7 +37,7 @@ class RequireHeaderDependency extends NullDependency {
 	 * @param {ObjectSerializerContext} context context
 	 */
 	serialize(context) {
-		context.write(this.range);
+		context.write(this.range).write(this.requireDependency);
 		super.serialize(context);
 	}
 
@@ -42,8 +47,10 @@ class RequireHeaderDependency extends NullDependency {
 	 * @returns {RequireHeaderDependency} RequireHeaderDependency
 	 */
 	static deserialize(context) {
-		const obj = new RequireHeaderDependency(context.read());
-		obj.deserialize(context);
+		const range = context.read();
+		const c1 = context.rest;
+		const obj = new RequireHeaderDependency(range, c1.read());
+		obj.deserialize(c1.rest);
 		return obj;
 	}
 }
@@ -63,8 +70,40 @@ RequireHeaderDependency.Template = class RequireHeaderDependencyTemplate extends
 	 * @param {DependencyTemplateContext} templateContext the context object
 	 * @returns {void}
 	 */
-	apply(dependency, source, { runtimeRequirements }) {
+	apply(
+		dependency,
+		source,
+		{ moduleGraph, runtime, runtimeRequirements, concatenationScope }
+	) {
 		const dep = /** @type {RequireHeaderDependency} */ (dependency);
+
+		// the paired require dependency already replaced the whole call
+		if (
+			concatenationScope !== undefined &&
+			concatenationScope.isInsideReplacedRequire(dep.range[0])
+		) {
+			return;
+		}
+
+		const requireDep = dep.requireDependency;
+		// Skip when the paired call became `0`; dead-branch still needs the header.
+		if (requireDep) {
+			const connection = moduleGraph.getConnection(requireDep);
+			if (
+				connection &&
+				!connection.isTargetActive(runtime) &&
+				requireDep.isEvaluationOnly()
+			) {
+				const guards = requireDep.branchGuards;
+				if (
+					guards === undefined ||
+					!HarmonyImportGuard.isDeadByGuards(guards, moduleGraph, runtime)
+				) {
+					return;
+				}
+			}
+		}
+
 		runtimeRequirements.add(RuntimeGlobals.require);
 		source.replace(dep.range[0], dep.range[1] - 1, RuntimeGlobals.require);
 	}