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

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,39 @@ 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);
+		const requireDep = dep.requireDependency;
+		if (requireDep) {
+			const connection = moduleGraph.getConnection(requireDep);
+			if (connection) {
+				if (connection.isTargetActive(runtime)) {
+					if (
+						concatenationScope !== undefined &&
+						requireDep.rendersAsConcatenatedReference(
+							connection,
+							concatenationScope
+						)
+					) {
+						return;
+					}
+				} else if (requireDep.isEvaluationOnly()) {
+					// Skip when the paired call became `0`; dead-branch still needs the header.
+					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);
 	}

package/lib/dependencies/RequireIncludeDependency.js

@@ -10,12 +10,12 @@ const Template = require("../Template");
 const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import { ReferencedExports } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 class RequireIncludeDependency extends ModuleDependency {
 	/**

package/lib/dependencies/RequireIncludeDependencyParserPlugin.js

@@ -13,9 +13,8 @@ const {
 const makeSerializable = require("../util/makeSerializable");
 const RequireIncludeDependency = require("./RequireIncludeDependency");
 
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { DependencyLocation } from "../Dependency" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "RequireIncludeDependencyParserPlugin";
 

package/lib/dependencies/RequireIncludePlugin.js

@@ -12,9 +12,13 @@ const {
 const RequireIncludeDependency = require("./RequireIncludeDependency");
 const RequireIncludeDependencyParserPlugin = require("./RequireIncludeDependencyParserPlugin");
 
-/** @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 = "RequireIncludePlugin";
 

package/lib/dependencies/RequireJsStuffPlugin.js

@@ -15,9 +15,13 @@ const {
 } = require("../javascript/JavascriptParserHelpers");
 const ConstDependency = require("./ConstDependency");
 
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import JavascriptParser from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "RequireJsStuffPlugin";
 

package/lib/dependencies/RequireResolveContextDependency.js

@@ -9,10 +9,10 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ContextDependencyTemplateAsId = require("./ContextDependencyTemplateAsId");
 
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range]>} ObjectSerializerContext */
-/** @typedef {import("./ContextDependency").ContextDependencyOptions} ContextDependencyOptions */
+/** @import { ContextDependencyOptions } from "./ContextDependency" */
 
 class RequireResolveContextDependency extends ContextDependency {
 	/**

package/lib/dependencies/RequireResolveDependency.js

@@ -10,10 +10,10 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 const ModuleDependencyAsId = require("./ModuleDependencyTemplateAsId");
 
-/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
+/** @import { ReferencedExports } from "../Dependency" */
+/** @import ModuleGraph from "../ModuleGraph" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import { RuntimeSpec } from "../util/runtime" */
 
 class RequireResolveDependency extends ModuleDependency {
 	/**

package/lib/dependencies/RequireResolveHeaderDependency.js

@@ -8,10 +8,10 @@
 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<[Range]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */
 

package/lib/dependencies/RuntimeRequirementsDependency.js

@@ -8,14 +8,13 @@
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("./NullDependency").RawRuntimeRequirements} RawRuntimeRequirements */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import { RawRuntimeRequirements } from "./NullDependency" */
+/** @import Dependency, { UpdateHashContext } from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Set<string>]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Set<string>]>} ObjectSerializerContext */
-/** @typedef {import("../util/Hash")} Hash */
+/** @import Hash from "../util/Hash" */
 
 class RuntimeRequirementsDependency extends NullDependency {
 	/**

package/lib/dependencies/StaticExportsDependency.js

@@ -8,8 +8,8 @@
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @import { ExportsSpec } from "../Dependency" */
+/** @import ModuleGraph from "../ModuleGraph" */
 /** @typedef {string[] | true} Exports */
 
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Exports, boolean]>} ObjectDeserializerContext */

package/lib/dependencies/SystemPlugin.js

@@ -20,11 +20,14 @@ const makeSerializable = require("../util/makeSerializable");
 const ConstDependency = require("./ConstDependency");
 const SystemRuntimeModule = require("./SystemRuntimeModule");
 
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../javascript/JavascriptParser")} Parser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import { DependencyLocation } from "../Dependency" */
+/** @import Parser, { Range } from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "SystemPlugin";
 
@@ -167,5 +170,6 @@ makeSerializable(
 	"SystemImportDeprecationWarning"
 );
 
+SystemPlugin.SystemImportDeprecationWarning = SystemImportDeprecationWarning;
+
 module.exports = SystemPlugin;
-module.exports.SystemImportDeprecationWarning = SystemImportDeprecationWarning;

package/lib/dependencies/SystemRuntimeModule.js

@@ -14,6 +14,16 @@ class SystemRuntimeModule extends RuntimeModule {
 		super("system");
 	}
 
+	/**
+	 * Returns true, if the runtime module should get it's own scope.
+	 * When false, `generate()` must emit complete statements ending with `;`
+	 * so a following runtime IIFE is not parsed as a call (ASI).
+	 * @returns {boolean} true, if the runtime module should get it's own scope
+	 */
+	shouldIsolate() {
+		return false;
+	}
+
 	/**
 	 * Generates runtime code for this runtime module.
 	 * @returns {string | null} runtime code

package/lib/dependencies/TopLevelAwaitDependency.js

@@ -8,13 +8,17 @@ const isGeneratorLowered = require("../async-modules/isGeneratorLowered");
 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("../Module")} Module */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import Module from "../Module" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/**
+ * @import {
+ * 	ObjectDeserializerContext,
+ * 	ObjectSerializerContext
+ * } from "../serialization/ObjectMiddleware"
+ */
 
 /**
  * Marks a top-level `await` expression so it can be rewritten to `(yield …)`

package/lib/dependencies/URLContextDependency.js

@@ -9,8 +9,8 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ContextDependencyTemplateAsRequireCall = require("./ContextDependencyTemplateAsRequireCall");
 
-/** @typedef {import("../ContextModule").ContextOptions} ContextOptions */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ContextOptions } from "../ContextModule" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range]>} ObjectSerializerContext */