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

package/lib/debug/ProfilingPlugin.js

@@ -13,14 +13,18 @@ const {
 } = require("../ModuleTypeConstants");
 const { dirname, mkdirpSync } = require("../util/fs");
 
-/** @typedef {import("inspector").Session} Session */
-/** @typedef {import("tapable").FullTap} FullTap */
-/** @typedef {import("../../declarations/plugins/debug/ProfilingPlugin").ProfilingPluginOptions} ProfilingPluginOptions */
-/** @typedef {import("../Compilation")} Compilation */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../NormalModuleFactory")} NormalModuleFactory */
-/** @typedef {import("../ResolverFactory")} ResolverFactory */
-/** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
+/** @import { Session } from "inspector" */
+/** @import { FullTap } from "tapable" */
+/**
+ * @import {
+ * 	ProfilingPluginOptions
+ * } from "../../declarations/plugins/debug/ProfilingPlugin"
+ */
+/** @import Compilation from "../Compilation" */
+/** @import Compiler from "../Compiler" */
+/** @import NormalModuleFactory from "../NormalModuleFactory" */
+/** @import ResolverFactory from "../ResolverFactory" */
+/** @import { IntermediateFileSystem } from "../util/fs" */
 
 /**
  * Defines the hook type used by this module.
@@ -619,5 +623,6 @@ const makeNewProfiledTapFn = (hookName, tracer, { name, type, fn }) => {
 	}
 };
 
+ProfilingPlugin.Profiler = Profiler;
+
 module.exports = ProfilingPlugin;
-module.exports.Profiler = Profiler;

package/lib/deno/DenoTargetPlugin.js

@@ -8,7 +8,7 @@
 const ExternalsPlugin = require("../ExternalsPlugin");
 const { coreModules } = require("../node/nodeBuiltins");
 
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Compiler from "../Compiler" */
 
 // Deno only resolves node.js core modules through the `node:` specifier, so the
 // prefix is baked into the external request for both `import` and `require`.

package/lib/dependencies/AMDDefineDependency.js

@@ -9,101 +9,123 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
-/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("./LocalModule")} LocalModule */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import LocalModule from "./LocalModule" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { Range } from "../javascript/JavascriptParser" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, Range | null, Range | null, Range | null, string | null, LocalModule | null]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range | null, Range | null, Range | null, string | null, LocalModule | null]>} ObjectSerializerContext */
 
-/** @type {Record<string, { definition: string, content: string, requests: string[] }>} */
-const DEFINITIONS = {
-	f: {
-		definition: "var __WEBPACK_AMD_DEFINE_RESULT__;",
-		content: `!(__WEBPACK_AMD_DEFINE_RESULT__ = (#).call(exports, ${RuntimeGlobals.require}, exports, module),
-		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
-		requests: [
-			RuntimeGlobals.require,
-			RuntimeGlobals.exports,
-			RuntimeGlobals.module
-		]
-	},
-	o: {
-		definition: "",
-		content: "!(module.exports = #)",
-		requests: [RuntimeGlobals.module]
-	},
-	of: {
-		definition:
-			"var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;",
-		content: `!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#),
+/**
+ * @typedef {object} Definition
+ * @property {string} definition variable declarations
+ * @property {string} content replacement text
+ * @property {string[]} requests runtime requirements
+ */
+
+/** @type {Map<string, Record<string, Definition>>} */
+const definitionsCache = new Map();
+
+/**
+ * @param {string} moduleArgument the module argument name
+ * @param {string} exportsArgument the exports argument name
+ * @returns {Record<string, Definition>} definitions by branch
+ */
+const getDefinitions = (moduleArgument, exportsArgument) => {
+	const key = `${moduleArgument} ${exportsArgument}`;
+	const cached = definitionsCache.get(key);
+	if (cached !== undefined) return cached;
+	/** @type {Record<string, Definition>} */
+	const definitions = {
+		f: {
+			definition: "var __WEBPACK_AMD_DEFINE_RESULT__;",
+			content: `!(__WEBPACK_AMD_DEFINE_RESULT__ = (#).call(${exportsArgument}, ${RuntimeGlobals.require}, ${exportsArgument}, ${moduleArgument}),
+		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (${moduleArgument}.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
+			requests: [
+				RuntimeGlobals.require,
+				RuntimeGlobals.exports,
+				RuntimeGlobals.module
+			]
+		},
+		o: {
+			definition: "",
+			content: `!(${moduleArgument}.exports = #)`,
+			requests: [RuntimeGlobals.module]
+		},
+		of: {
+			definition:
+				"var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;",
+			content: `!(__WEBPACK_AMD_DEFINE_FACTORY__ = (#),
 		__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-		(__WEBPACK_AMD_DEFINE_FACTORY__.call(exports, ${RuntimeGlobals.require}, exports, module)) :
+		(__WEBPACK_AMD_DEFINE_FACTORY__.call(${exportsArgument}, ${RuntimeGlobals.require}, ${exportsArgument}, ${moduleArgument})) :
 		__WEBPACK_AMD_DEFINE_FACTORY__),
-		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
-		requests: [
-			RuntimeGlobals.require,
-			RuntimeGlobals.exports,
-			RuntimeGlobals.module
-		]
-	},
-	af: {
-		definition:
-			"var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;",
-		content: `!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_RESULT__ = (#).apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__),
-		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
-		requests: [RuntimeGlobals.exports, RuntimeGlobals.module]
-	},
-	ao: {
-		definition: "",
-		content: "!(#, module.exports = #)",
-		requests: [RuntimeGlobals.module]
-	},
-	aof: {
-		definition:
-			"var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;",
-		content: `!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_FACTORY__ = (#),
+		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (${moduleArgument}.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
+			requests: [
+				RuntimeGlobals.require,
+				RuntimeGlobals.exports,
+				RuntimeGlobals.module
+			]
+		},
+		af: {
+			definition:
+				"var __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;",
+			content: `!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_RESULT__ = (#).apply(${exportsArgument}, __WEBPACK_AMD_DEFINE_ARRAY__),
+		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (${moduleArgument}.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
+			requests: [RuntimeGlobals.exports, RuntimeGlobals.module]
+		},
+		ao: {
+			definition: "",
+			content: `!(#, ${moduleArgument}.exports = #)`,
+			requests: [RuntimeGlobals.module]
+		},
+		aof: {
+			definition:
+				"var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;",
+			content: `!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, __WEBPACK_AMD_DEFINE_FACTORY__ = (#),
 		__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
-		(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
-		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
-		requests: [RuntimeGlobals.exports, RuntimeGlobals.module]
-	},
-	lf: {
-		definition: "var XXX, XXXmodule;",
-		content: `!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = (#).call(XXXmodule.exports, ${RuntimeGlobals.require}, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))`,
-		requests: [RuntimeGlobals.require, RuntimeGlobals.module]
-	},
-	lo: {
-		definition: "var XXX;",
-		content: "!(XXX = #)",
-		requests: []
-	},
-	lof: {
-		definition: "var XXX, XXXfactory, XXXmodule;",
-		content: `!(XXXfactory = (#), (typeof XXXfactory === 'function' ? ((XXXmodule = { id: YYY, exports: {}, loaded: false }), (XXX = XXXfactory.call(XXXmodule.exports, ${RuntimeGlobals.require}, XXXmodule.exports, XXXmodule)), (XXXmodule.loaded = true), XXX === undefined && (XXX = XXXmodule.exports)) : XXX = XXXfactory))`,
-		requests: [RuntimeGlobals.require, RuntimeGlobals.module]
-	},
-	laf: {
-		definition: "var __WEBPACK_AMD_DEFINE_ARRAY__, XXX, XXXexports;",
-		content:
-			"!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, XXX = (#).apply(XXXexports = {}, __WEBPACK_AMD_DEFINE_ARRAY__), XXX === undefined && (XXX = XXXexports))",
-		requests: []
-	},
-	lao: {
-		definition: "var XXX;",
-		content: "!(#, XXX = #)",
-		requests: []
-	},
-	laof: {
-		definition: "var XXXarray, XXXfactory, XXXexports, XXX;",
-		content: `!(XXXarray = #, XXXfactory = (#),
+		(__WEBPACK_AMD_DEFINE_FACTORY__.apply(${exportsArgument}, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
+		__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (${moduleArgument}.exports = __WEBPACK_AMD_DEFINE_RESULT__))`,
+			requests: [RuntimeGlobals.exports, RuntimeGlobals.module]
+		},
+		lf: {
+			definition: "var XXX, XXXmodule;",
+			content: `!(XXXmodule = { id: YYY, exports: {}, loaded: false }, XXX = (#).call(XXXmodule.exports, ${RuntimeGlobals.require}, XXXmodule.exports, XXXmodule), XXXmodule.loaded = true, XXX === undefined && (XXX = XXXmodule.exports))`,
+			requests: [RuntimeGlobals.require, RuntimeGlobals.module]
+		},
+		lo: {
+			definition: "var XXX;",
+			content: "!(XXX = #)",
+			requests: []
+		},
+		lof: {
+			definition: "var XXX, XXXfactory, XXXmodule;",
+			content: `!(XXXfactory = (#), (typeof XXXfactory === 'function' ? ((XXXmodule = { id: YYY, exports: {}, loaded: false }), (XXX = XXXfactory.call(XXXmodule.exports, ${RuntimeGlobals.require}, XXXmodule.exports, XXXmodule)), (XXXmodule.loaded = true), XXX === undefined && (XXX = XXXmodule.exports)) : XXX = XXXfactory))`,
+			requests: [RuntimeGlobals.require, RuntimeGlobals.module]
+		},
+		laf: {
+			definition: "var __WEBPACK_AMD_DEFINE_ARRAY__, XXX, XXXexports;",
+			content:
+				"!(__WEBPACK_AMD_DEFINE_ARRAY__ = #, XXX = (#).apply(XXXexports = {}, __WEBPACK_AMD_DEFINE_ARRAY__), XXX === undefined && (XXX = XXXexports))",
+			requests: []
+		},
+		lao: {
+			definition: "var XXX;",
+			content: "!(#, XXX = #)",
+			requests: []
+		},
+		laof: {
+			definition: "var XXXarray, XXXfactory, XXXexports, XXX;",
+			content: `!(XXXarray = #, XXXfactory = (#),
 		(typeof XXXfactory === 'function' ?
 			((XXX = XXXfactory.apply(XXXexports = {}, XXXarray)), XXX === undefined && (XXX = XXXexports)) :
 			(XXX = XXXfactory)
 		))`,
-		requests: []
-	}
+			requests: []
+		}
+	};
+	definitionsCache.set(key, definitions);
+	return definitions;
 };
 
 class AMDDefineDependency extends NullDependency {
@@ -181,10 +203,13 @@ AMDDefineDependency.Template = class AMDDefineDependencyTemplate extends (
 	 * @param {DependencyTemplateContext} templateContext the context object
 	 * @returns {void}
 	 */
-	apply(dependency, source, { runtimeRequirements }) {
+	apply(dependency, source, { module, runtimeRequirements }) {
 		const dep = /** @type {AMDDefineDependency} */ (dependency);
 		const branch = this.branch(dep);
-		const { definition, content, requests } = DEFINITIONS[branch];
+		const { definition, content, requests } = getDefinitions(
+			module.moduleArgument,
+			module.exportsArgument
+		)[branch];
 		for (const req of requests) {
 			runtimeRequirements.add(req);
 		}

package/lib/dependencies/AMDDefineDependencyParserPlugin.js

@@ -16,23 +16,33 @@ const DynamicExports = require("./DynamicExports");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const { addLocalModule, getLocalModule } = require("./LocalModulesHelpers");
 
-/** @typedef {import("estree").ArrowFunctionExpression} ArrowFunctionExpression */
-/** @typedef {import("estree").CallExpression} CallExpression */
-/** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("estree").FunctionExpression} FunctionExpression */
-/** @typedef {import("estree").Identifier} Identifier */
-/** @typedef {import("estree").Literal} Literal */
-/** @typedef {import("estree").MemberExpression} MemberExpression */
-/** @typedef {import("estree").ObjectExpression} ObjectExpression */
-/** @typedef {import("estree").SpreadElement} SpreadElement */
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").ExportedVariableInfo} ExportedVariableInfo */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("./LocalModule")} LocalModule */
+/**
+ * @import {
+ * 	ArrowFunctionExpression,
+ * 	CallExpression,
+ * 	Expression,
+ * 	FunctionExpression,
+ * 	Identifier,
+ * 	Literal,
+ * 	MemberExpression,
+ * 	ObjectExpression,
+ * 	SpreadElement
+ * } from "estree"
+ */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Dependency from "../Dependency" */
+/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
+/**
+ * @import JavascriptParser, {
+ * 	ExportedVariableInfo,
+ * 	Range
+ * } from "../javascript/JavascriptParser"
+ */
+/** @import LocalModule from "./LocalModule" */
 
 /**
  * Checks whether this object is bound function expression.
@@ -343,6 +353,9 @@ class AMDDefineDependencyParserPlugin {
 				return;
 		}
 		DynamicExports.bailout(parser.state);
+		parser.state.compilation.moduleGraph
+			.getOptimizationBailout(parser.state.module)
+			.push("AMD bailout: define() prevents static exports analysis");
 		/** @type {Identifier[] | null} */
 		let fnParams = null;
 		let fnParamsOffset = 0;

package/lib/dependencies/AMDPlugin.js

@@ -32,13 +32,15 @@ const ConstDependency = require("./ConstDependency");
 const LocalModuleDependency = require("./LocalModuleDependency");
 const UnsupportedDependency = require("./UnsupportedDependency");
 
-/** @typedef {import("../../declarations/WebpackOptions").Amd} Amd */
-/** @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 */
-/** @typedef {import("../javascript/BasicEvaluatedExpression").GetMembers} GetMembers */
+/**
+ * @import {
+ * 	Amd,
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import Parser, { Range } from "../javascript/JavascriptParser" */
+/** @import { GetMembers } from "../javascript/BasicEvaluatedExpression" */
 
 const PLUGIN_NAME = "AMDPlugin";
 

package/lib/dependencies/AMDRequireArrayDependency.js

@@ -10,11 +10,11 @@ const makeSerializable = require("../util/makeSerializable");
 const LocalModuleDependency = require("./LocalModuleDependency");
 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("./AMDRequireItemDependency")} AMDRequireItemDependency */
+/** @import { ReplaceSource } from "webpack-sources" */
+/** @import Dependency from "../Dependency" */
+/** @import { DependencyTemplateContext } from "../DependencyTemplate" */
+/** @import { Range } from "../javascript/JavascriptParser" */
+/** @import AMDRequireItemDependency from "./AMDRequireItemDependency" */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[(string | LocalModuleDependency | AMDRequireItemDependency)[], Range]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[(string | LocalModuleDependency | AMDRequireItemDependency)[], Range]>} ObjectSerializerContext */
 

package/lib/dependencies/AMDRequireContextDependency.js

@@ -8,10 +8,10 @@
 const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 
-/** @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 AMDRequireContextDependency extends ContextDependency {
 	/**

package/lib/dependencies/AMDRequireDependenciesBlock.js

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

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -6,7 +6,8 @@
 "use strict";
 
 const RuntimeGlobals = require("../RuntimeGlobals");
-const UnsupportedFeatureWarning = require("../errors/UnsupportedFeatureWarning");
+const memoize = require("../util/memoize");
+
 const AMDRequireArrayDependency = require("./AMDRequireArrayDependency");
 const AMDRequireContextDependency = require("./AMDRequireContextDependency");
 const AMDRequireDependenciesBlock = require("./AMDRequireDependenciesBlock");
@@ -19,18 +20,28 @@ const { getLocalModule } = require("./LocalModulesHelpers");
 const UnsupportedDependency = require("./UnsupportedDependency");
 const getFunctionExpression = require("./getFunctionExpression");
 
-/** @typedef {import("estree").CallExpression} CallExpression */
-/** @typedef {import("estree").Expression} Expression */
-/** @typedef {import("estree").Identifier} Identifier */
-/** @typedef {import("estree").SourceLocation} SourceLocation */
-/** @typedef {import("estree").SpreadElement} SpreadElement */
-/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
-/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
-/** @typedef {import("./LocalModule")} LocalModule */
+const getUnsupportedFeatureWarning = memoize(() =>
+	require("../errors/UnsupportedFeatureWarning")
+);
+
+/**
+ * @import {
+ * 	CallExpression,
+ * 	Expression,
+ * 	Identifier,
+ * 	SourceLocation,
+ * 	SpreadElement
+ * } from "estree"
+ */
+/**
+ * @import {
+ * 	JavascriptParserOptions
+ * } from "../../declarations/WebpackOptions"
+ */
+/** @import Dependency, { DependencyLocation } from "../Dependency" */
+/** @import BasicEvaluatedExpression from "../javascript/BasicEvaluatedExpression" */
+/** @import JavascriptParser, { Range } from "../javascript/JavascriptParser" */
+/** @import LocalModule from "./LocalModule" */
 
 const PLUGIN_NAME = "AMDRequireDependenciesBlockParserPlugin";
 
@@ -355,7 +366,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 							parser.getLocation(expr)
 						);
 						parser.state.module.addError(
-							new UnsupportedFeatureWarning(
+							new (getUnsupportedFeatureWarning())(
 								`Cannot statically analyse 'require(…, …)' in line ${loc.start.line}`,
 								loc
 							)

package/lib/dependencies/AMDRequireDependency.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 | null, Range | null, boolean, boolean]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, Range, Range | null, Range | null, boolean, boolean]>} ObjectSerializerContext */
 
@@ -97,7 +97,7 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends (
 	apply(
 		dependency,
 		source,
-		{ runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements }
+		{ module, runtimeTemplate, moduleGraph, chunkGraph, runtimeRequirements }
 	) {
 		const dep = /** @type {AMDRequireDependency} */ (dependency);
 		const depBlock = /** @type {AsyncDependenciesBlock} */ (
@@ -107,7 +107,8 @@ AMDRequireDependency.Template = class AMDRequireDependencyTemplate extends (
 			chunkGraph,
 			block: depBlock,
 			message: "AMD require",
-			runtimeRequirements
+			runtimeRequirements,
+			originModule: module
 		});
 
 		// has array range but no function range

package/lib/dependencies/AMDRequireItemDependency.js

@@ -9,7 +9,7 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
 
-/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @import { Range } from "../javascript/JavascriptParser" */
 
 class AMDRequireItemDependency extends ModuleDependency {
 	/**

package/lib/dependencies/AMDRuntimeModules.js

@@ -8,13 +8,23 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
-/** @typedef {import("./AMDPlugin").AmdOptions} AmdOptions */
+/** @import { AmdOptions } from "./AMDPlugin" */
 
 class AMDDefineRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("amd define");
 	}
 
+	/**
+	 * 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
@@ -29,6 +39,16 @@ class AMDDefineRuntimeModule extends RuntimeModule {
 }
 
 class AMDOptionsRuntimeModule extends RuntimeModule {
+	/**
+	 * 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;
+	}
+
 	/**
 	 * Creates an instance of AMDOptionsRuntimeModule.
 	 * @param {AmdOptions} options the AMD options