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

package/lib/ids/ChunkModuleIdRangePlugin.js

@@ -11,9 +11,9 @@ const {
 	compareModulesByPreOrderIndexOrIdentifier
 } = require("../util/comparators");
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../ChunkGraph").ModuleComparator} ModuleComparator */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../Module" */
+/** @import { ModuleComparator } from "../ChunkGraph" */
 
 /**
  * Defines the chunk module id range plugin options type used by this module.

package/lib/ids/DeterministicChunkIdsPlugin.js

@@ -12,7 +12,7 @@ const {
 	getUsedChunkIds
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Compiler from "../Compiler" */
 
 /**
  * Defines the deterministic chunk ids plugin options type used by this module.

package/lib/ids/DeterministicModuleIdsPlugin.js

@@ -14,8 +14,8 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../Module" */
 
 /**
  * Defines the deterministic module ids plugin options type used by this module.

package/lib/ids/HashedModuleIdsPlugin.js

@@ -15,8 +15,12 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../../declarations/plugins/ids/HashedModuleIdsPlugin").HashedModuleIdsPluginOptions} HashedModuleIdsPluginOptions */
-/** @typedef {import("../Compiler")} Compiler */
+/**
+ * @import {
+ * 	HashedModuleIdsPluginOptions
+ * } from "../../declarations/plugins/ids/HashedModuleIdsPlugin"
+ */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "HashedModuleIdsPlugin";
 

package/lib/ids/IdHelpers.js

@@ -9,14 +9,13 @@ const createHash = require("../util/createHash");
 const { makePathsRelative } = require("../util/identifier");
 const numberHash = require("../util/numberHash");
 
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Compilation")} Compilation */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../util/Hash").HashFunction} HashFunction */
-/** @typedef {import("../util/identifier").AssociatedObjectForCache} AssociatedObjectForCache */
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../css/CssModule").CssModuleBuildMeta} CssModuleBuildMeta */
+/** @import Chunk from "../Chunk" */
+/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Compilation from "../Compilation" */
+/** @import Module from "../Module" */
+/** @import { HashFunction } from "../util/Hash" */
+/** @import { AssociatedObjectForCache } from "../util/identifier" */
+/** @import { CssModuleBuildMeta } from "../css/CssModule" */
 
 // Numbers longer than this are written in exponential form ("...e+xx"), so a
 // longer string can't be a plain integer id.

package/lib/ids/NamedChunkIdsPlugin.js

@@ -14,7 +14,7 @@ const {
 	getUsedChunkIds
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Compiler from "../Compiler" */
 
 /**
  * Defines the named chunk ids plugin options type used by this module.

package/lib/ids/NamedModuleIdsPlugin.js

@@ -14,7 +14,7 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Compiler from "../Compiler" */
 
 /**
  * Defines the named module ids plugin options type used by this module.

package/lib/ids/NaturalChunkIdsPlugin.js

@@ -8,8 +8,8 @@
 const { compareChunksNatural } = require("../util/comparators");
 const { assignAscendingChunkIds } = require("./IdHelpers");
 
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Chunk from "../Chunk" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "NaturalChunkIdsPlugin";
 

package/lib/ids/NaturalModuleIdsPlugin.js

@@ -13,7 +13,7 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "NaturalModuleIdsPlugin";
 

package/lib/ids/OccurrenceChunkIdsPlugin.js

@@ -8,9 +8,13 @@
 const { compareChunksNatural } = require("../util/comparators");
 const { assignAscendingChunkIds } = require("./IdHelpers");
 
-/** @typedef {import("../../declarations/plugins/ids/OccurrenceChunkIdsPlugin").OccurrenceChunkIdsPluginOptions} OccurrenceChunkIdsPluginOptions */
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Compiler")} Compiler */
+/**
+ * @import {
+ * 	OccurrenceChunkIdsPluginOptions
+ * } from "../../declarations/plugins/ids/OccurrenceChunkIdsPlugin"
+ */
+/** @import Chunk from "../Chunk" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "OccurrenceChunkIdsPlugin";
 

package/lib/ids/OccurrenceModuleIdsPlugin.js

@@ -13,9 +13,13 @@ const {
 	getUsedModuleIdsAndModules
 } = require("./IdHelpers");
 
-/** @typedef {import("../../declarations/plugins/ids/OccurrenceModuleIdsPlugin").OccurrenceModuleIdsPluginOptions} OccurrenceModuleIdsPluginOptions */
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
+/**
+ * @import {
+ * 	OccurrenceModuleIdsPluginOptions
+ * } from "../../declarations/plugins/ids/OccurrenceModuleIdsPlugin"
+ */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../Module" */
 
 const PLUGIN_NAME = "OccurrenceModuleIdsPlugin";
 

package/lib/ids/SyncModuleIdsPlugin.js

@@ -8,10 +8,10 @@
 const { WebpackError } = require("..");
 const { getUsedModuleIdsAndModules } = require("./IdHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").ModuleId} ModuleId */
-/** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
+/** @import { ModuleId } from "../ChunkGraph" */
+/** @import Compiler from "../Compiler" */
+/** @import Module from "../Module" */
+/** @import { IntermediateFileSystem } from "../util/fs" */
 
 /** @typedef {{ [key: string]: ModuleId }} JSONContent */
 

package/lib/index.js

@@ -603,12 +603,22 @@ module.exports = mergeExports(fn, {
 	css: {
 		get CssModulesPlugin() {
 			return require("./css/CssModulesPlugin");
+		},
+		// Experimental native CSS parser + safe minifying serializer (its
+		// `SourceProcessor` / `printer` exports carry the `@experimental` tag).
+		get syntax() {
+			return require("./css/syntax");
 		}
 	},
 
 	html: {
 		get HtmlModulesPlugin() {
 			return require("./html/HtmlModulesPlugin");
+		},
+		// Experimental native HTML parser + safe minifying serializer (its
+		// `SourceProcessor` / `printer` exports carry the `@experimental` tag).
+		get syntax() {
+			return require("./html/syntax");
 		}
 	},
 

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -15,9 +15,9 @@ const {
 	updateHashForEntryStartup
 } = require("./StartupHelpers");
 
-/** @typedef {import("../Compiler")} Compiler */
-/** @typedef {import("../ChunkGraph").EntryModuleWithChunkGroup} EntryModuleWithChunkGroup */
-/** @typedef {import("../CodeGenerationResults")} CodeGenerationResults */
+/** @import Compiler from "../Compiler" */
+/** @import { EntryModuleWithChunkGroup } from "../ChunkGraph" */
+/** @import CodeGenerationResults from "../CodeGenerationResults" */
 
 const PLUGIN_NAME = "ArrayPushCallbackChunkFormatPlugin";
 

package/lib/javascript/BasicEvaluatedExpression.js

@@ -5,12 +5,16 @@
 
 "use strict";
 
-/** @typedef {import("estree").Node} Node */
-/** @typedef {import("./JavascriptParser").Range} Range */
-/** @typedef {import("./JavascriptParser").VariableInfo} VariableInfo */
-/** @typedef {import("./JavascriptParser").Members} Members */
-/** @typedef {import("./JavascriptParser").MembersOptionals} MembersOptionals */
-/** @typedef {import("./JavascriptParser").MemberRanges} MemberRanges */
+/** @import { Node } from "estree" */
+/**
+ * @import {
+ * 	Range,
+ * 	VariableInfo,
+ * 	Members,
+ * 	MembersOptionals,
+ * 	MemberRanges
+ * } from "./JavascriptParser"
+ */
 
 const TypeUnknown = 0;
 const TypeUndefined = 1;
@@ -302,32 +306,32 @@ class BasicEvaluatedExpression {
 	}
 
 	/**
-	 * @returns {string | VariableInfo | undefined} identifier
+	 * @returns {string | InstanceType<VariableInfo> | undefined} identifier
 	 */
 	get identifier() {
 		return this.type === TypeIdentifier
-			? /** @type {string | VariableInfo} */ (this._v1)
+			? /** @type {string | InstanceType<VariableInfo>} */ (this._v1)
 			: undefined;
 	}
 
 	/**
-	 * @param {string | VariableInfo | undefined} value identifier
+	 * @param {string | InstanceType<VariableInfo> | undefined} value identifier
 	 */
 	set identifier(value) {
 		this._v1 = value;
 	}
 
 	/**
-	 * @returns {string | VariableInfo | undefined} root info
+	 * @returns {string | InstanceType<VariableInfo> | undefined} root info
 	 */
 	get rootInfo() {
 		return this.type === TypeIdentifier
-			? /** @type {string | VariableInfo} */ (this._v2)
+			? /** @type {string | InstanceType<VariableInfo>} */ (this._v2)
 			: undefined;
 	}
 
 	/**
-	 * @param {string | VariableInfo | undefined} value root info
+	 * @param {string | InstanceType<VariableInfo> | undefined} value root info
 	 */
 	set rootInfo(value) {
 		this._v2 = value;
@@ -692,8 +696,8 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Set's the value of this expression to a particular identifier and its members.
-	 * @param {string | VariableInfo} identifier identifier to set
-	 * @param {string | VariableInfo} rootInfo root info
+	 * @param {string | InstanceType<VariableInfo>} identifier identifier to set
+	 * @param {string | InstanceType<VariableInfo>} rootInfo root info
 	 * @param {GetMembers} getMembers members
 	 * @param {GetMembersOptionals=} getMembersOptionals optional members
 	 * @param {GetMemberRanges=} getMemberRanges ranges of progressively increasing sub-expressions

package/lib/javascript/ChunkFormatHelpers.js

@@ -7,12 +7,12 @@
 
 const { updateHashForEntryStartup } = require("./StartupHelpers");
 
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Entrypoint")} Entrypoint */
-/** @typedef {import("../util/Hash")} Hash */
-/** @typedef {import("../Compilation").ChunkHashContext} ChunkHashContext */
+/** @import ChunkGraph from "../ChunkGraph" */
+/** @import Module from "../Module" */
+/** @import Chunk from "../Chunk" */
+/** @import Entrypoint from "../Entrypoint" */
+/** @import Hash from "../util/Hash" */
+/** @import { ChunkHashContext } from "../Compilation" */
 
 /**
  * Returns } Object containing chunk entries and runtime chunk.

package/lib/javascript/ChunkHelpers.js

@@ -7,7 +7,7 @@
 
 const Entrypoint = require("../Entrypoint");
 
-/** @typedef {import("../Chunk")} Chunk */
+/** @import Chunk from "../Chunk" */
 
 /**
  * Returns chunks.

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -17,10 +17,13 @@ const {
 	getChunkFilenameTemplate,
 	getCompilationHooks
 } = require("./JavascriptModulesPlugin");
-const { generateEntryStartup } = require("./StartupHelpers");
+const {
+	entryStartupAwaitsChunks,
+	generateEntryStartup
+} = require("./StartupHelpers");
 
-/** @typedef {import("../Chunk")} Chunk */
-/** @typedef {import("../Compiler")} Compiler */
+/** @import Chunk from "../Chunk" */
+/** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "CommonJsChunkFormatPlugin";
 
@@ -38,7 +41,11 @@ class CommonJsChunkFormatPlugin {
 					if (chunk.hasRuntime()) return;
 					if (chunkGraph.getNumberOfEntryModules(chunk) > 0) {
 						set.add(RuntimeGlobals.require);
-						set.add(RuntimeGlobals.startupEntrypoint);
+						// An entry with nothing to wait for is called straight, so the
+						// helper that waits would have no call site.
+						if (entryStartupAwaitsChunks(chunkGraph, chunk)) {
+							set.add(RuntimeGlobals.startupEntrypoint);
+						}
 						set.add(RuntimeGlobals.externalInstallChunk);
 					}
 				}
@@ -47,7 +54,6 @@ class CommonJsChunkFormatPlugin {
 			hooks.renderChunk.tap(PLUGIN_NAME, (modules, renderContext) => {
 				const { chunk, chunkGraph, runtimeTemplate } = renderContext;
 				const source = new ConcatSource();
-				source.add(`exports.id = ${JSON.stringify(chunk.id)};\n`);
 				source.add(`exports.ids = ${JSON.stringify(chunk.ids)};\n`);
 				source.add("exports.modules = ");
 				source.add(modules);

package/lib/javascript/EnableChunkLoadingPlugin.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-/** @typedef {import("../../declarations/WebpackOptions").ChunkLoadingType} ChunkLoadingType */
-/** @typedef {import("../Compiler")} Compiler */
+/** @import { ChunkLoadingType } from "../../declarations/WebpackOptions" */
+/** @import Compiler from "../Compiler" */
 
 /** @typedef {Set<ChunkLoadingType>} ChunkLoadingTypes */
 

package/lib/javascript/JavascriptGenerator.js

@@ -10,29 +10,29 @@ const { RawSource, ReplaceSource } = require("webpack-sources");
 const Generator = require("../Generator");
 const InitFragment = require("../InitFragment");
 const { JAVASCRIPT_TYPES } = require("../ModuleSourceTypeConstants");
+
 const RuntimeGlobals = require("../RuntimeGlobals");
-const CommonJsExportsDependency = require("../dependencies/CommonJsExportsDependency");
-const CommonJsFullRequireDependency = require("../dependencies/CommonJsFullRequireDependency");
-const CommonJsRequireDependency = require("../dependencies/CommonJsRequireDependency");
-const CommonJsSelfReferenceDependency = require("../dependencies/CommonJsSelfReferenceDependency");
-const ContextDependency = require("../dependencies/ContextDependency");
 const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibilityDependency");
-const ImportDependency = require("../dependencies/ImportDependency");
-const RequireResolveDependency = require("../dependencies/RequireResolveDependency");
 
-/** @typedef {import("webpack-sources").Source} Source */
-/** @typedef {import("../Compilation").DependencyConstructor} DependencyConstructor */
-/** @typedef {import("../DependenciesBlock")} DependenciesBlock */
-/** @typedef {import("../Dependency")} Dependency */
-/** @typedef {import("../DependencyTemplate")} DependencyTemplate */
-/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../Generator").GenerateContext} GenerateContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
-/** @typedef {import("../Module").SourceType} SourceType */
-/** @typedef {import("../Module").SourceTypes} SourceTypes */
-/** @typedef {import("./JavascriptModule").JavascriptModuleBuildInfo} JavascriptModuleBuildInfo */
-/** @typedef {import("../NormalModule")} NormalModule */
+/** @import { Source } from "webpack-sources" */
+/** @import { DependencyConstructor } from "../Compilation" */
+/** @import DependenciesBlock from "../DependenciesBlock" */
+/** @import Dependency from "../Dependency" */
+/**
+ * @import DependencyTemplate, {
+ * 	DependencyTemplateContext
+ * } from "../DependencyTemplate"
+ */
+/** @import { GenerateContext } from "../Generator" */
+/**
+ * @import Module, {
+ * 	ConcatenationBailoutReasonContext,
+ * 	SourceType,
+ * 	SourceTypes
+ * } from "../Module"
+ */
+/** @import { JavascriptModuleBuildInfo } from "./JavascriptModule" */
+/** @import NormalModule from "../NormalModule" */
 
 const DEFAULT_SOURCE = {
 	source() {
@@ -50,21 +50,6 @@ const DEFAULT_SOURCE = {
 // TODO: clean up this file
 // replace with newer constructs
 
-// Runtime requirements whose presence on a presentational dependency means the
-// code references the module/exports objects, which do not exist for an inner
-// concatenated module (e.g. `module.id`, `module.hot`, top-level `this`).
-/** @type {ReadonlySet<string>} */
-const CONCATENATION_INCOMPATIBLE_RUNTIME_REQUIREMENTS = new Set([
-	RuntimeGlobals.module,
-	RuntimeGlobals.moduleId,
-	RuntimeGlobals.moduleLoaded,
-	RuntimeGlobals.moduleCache,
-	RuntimeGlobals.exports,
-	RuntimeGlobals.thisAsExports,
-	RuntimeGlobals.harmonyModuleDecorator,
-	RuntimeGlobals.nodeModuleDecorator
-]);
-
 // A wrapped CommonJS module keeps real `module`/`exports` objects and top-level
 // `this`, so only requirements that need a module object webpack does not
 // synthesize here (id, loaded state, cache, decorators) block wrapping.
@@ -77,116 +62,6 @@ const WRAPPING_INCOMPATIBLE_RUNTIME_REQUIREMENTS = new Set([
 	RuntimeGlobals.nodeModuleDecorator
 ]);
 
-/**
- * Returns the reason a CommonJS module cannot take part in concatenation at
- * all — neither hoisted (as a "nice" module) nor wrapped. A module passing
- * this check can be hoisted or wrapped; {@link isCommonJsHoistable} decides
- * which.
- * @param {NormalModule} module the module
- * @returns {string | undefined} reason it can't be concatenated
- */
-const getCommonJsConcatenationBailoutReason = (module) => {
-	const buildMeta = module.buildMeta;
-	// "flagged"/"default" are hoistable; a dynamic (undefined) exports type is a
-	// reassigned/computed `module.exports`, only reachable by wrapping. Proper ESM
-	// modules ("namespace") never reach this path.
-	if (
-		!buildMeta ||
-		(buildMeta.exportsType !== "flagged" &&
-			buildMeta.exportsType !== "default" &&
-			buildMeta.exportsType !== undefined)
-	) {
-		return "Module is not an ECMAScript module";
-	}
-	// Sloppy-mode modules bail out in ModuleConcatenationPlugin anyway,
-	// so skip the dependency scan for them (most of node_modules)
-	if (!(/** @type {JavascriptModuleBuildInfo} */ (module.buildInfo).strict)) {
-		return "Module is not in strict mode";
-	}
-	const wrapped = !isCommonJsHoistable(module);
-	// A dynamic exports type only makes sense when wrapping; a hoistable module
-	// with no static exports keeps its previous (bailed) behavior.
-	if (buildMeta.exportsType === undefined && !wrapped) {
-		return "Module is not an ECMAScript module";
-	}
-	for (const dep of module.dependencies) {
-		if (
-			dep instanceof CommonJsExportsDependency ||
-			dep instanceof CommonJsSelfReferenceDependency
-		) {
-			// Any export shape is fine: hoisted modules restrict these below,
-			// wrapped modules keep them verbatim inside the wrapper.
-			continue;
-		} else if (
-			dep instanceof CommonJsRequireDependency ||
-			dep instanceof CommonJsFullRequireDependency ||
-			dep instanceof RequireResolveDependency ||
-			dep instanceof ContextDependency
-		) {
-			// A wrapped module renders with its own module ids intact, so a
-			// require() target that is itself inlined (no id) would break. Only
-			// hoisted ("nice") modules — whose require targets always stay
-			// external — may keep these.
-			if (wrapped) {
-				return `Module uses ${dep.type} which is not supported when wrapping`;
-			}
-		} else if (!(dep instanceof ImportDependency)) {
-			return `Module uses an unsupported dependency (${dep.type})`;
-		}
-	}
-	if (module.presentationalDependencies !== undefined) {
-		const incompatible = wrapped
-			? WRAPPING_INCOMPATIBLE_RUNTIME_REQUIREMENTS
-			: CONCATENATION_INCOMPATIBLE_RUNTIME_REQUIREMENTS;
-		for (const dep of module.presentationalDependencies) {
-			const runtimeRequirements =
-				/** @type {{ runtimeRequirements?: ReadonlySet<string> | null }} */
-				(dep).runtimeRequirements;
-			if (!runtimeRequirements) continue;
-			for (const requirement of runtimeRequirements) {
-				if (incompatible.has(requirement)) {
-					return `Module uses ${requirement}`;
-				}
-			}
-		}
-	}
-	return undefined;
-};
-
-/**
- * A "nice" CommonJS module has a static list of exports, assigned only via
- * plain `exports.x = …` / `module.exports.x = …`, and never uses the
- * `module`/`exports` objects in any other way, so every reference can be
- * rewritten to a hoisted module-scope variable. Modules eligible for
- * concatenation but not hoistable are wrapped instead.
- * @param {NormalModule} module the module
- * @returns {boolean} true when the module can be hoisted rather than wrapped
- */
-const isCommonJsHoistable = (module) => {
-	for (const dep of module.dependencies) {
-		if (dep instanceof CommonJsExportsDependency) {
-			if (dep.base !== "exports" && dep.base !== "module.exports") return false;
-			if (dep.names.length === 0) return false;
-		} else if (dep instanceof CommonJsSelfReferenceDependency) {
-			if (dep.base !== "exports" && dep.base !== "module.exports") return false;
-			if (dep.names.length === 0) return false;
-			// `exports.f()` passes the exports object as `this`
-			if (dep.call && dep.names.length === 1) return false;
-		}
-	}
-	return true;
-};
-
-/**
- * Whether a concatenation-eligible CommonJS module must be wrapped (rendered
- * inside an IIFE with real `module`/`exports` objects) rather than hoisted.
- * @param {NormalModule} module the module
- * @returns {boolean} true when the module needs wrapping
- */
-const isCommonJsWrapped = (module) =>
-	getCommonJsConcatenationBailoutReason(module) === undefined &&
-	!isCommonJsHoistable(module);
-
 const deprecatedGetInitFragments = util.deprecate(
 	/**
 	 * Handles the callback logic for this hook.
@@ -233,30 +108,56 @@ class JavascriptGenerator extends Generator {
 	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
 	 */
 	getConcatenationBailoutReason(module, context) {
-		// Harmony modules and CommonJS modules with statically rewritable
-		// exports are valid for optimization
-		if (
-			!module.buildMeta ||
-			module.buildMeta.exportsType !== "namespace" ||
-			module.presentationalDependencies === undefined ||
-			!module.presentationalDependencies.some(
+		const buildMeta = module.buildMeta;
+		const buildInfo = /** @type {JavascriptModuleBuildInfo | undefined} */ (
+			module.buildInfo
+		);
+		const presentationalDependencies = module.presentationalDependencies;
+		// An ESM is a "namespace" module carrying the interop flag the harmony
+		// parser emits; anything else is treated as CommonJS below
+		const isESM =
+			buildMeta !== undefined &&
+			buildMeta.exportsType === "namespace" &&
+			presentationalDependencies !== undefined &&
+			presentationalDependencies.some(
 				(d) => d instanceof HarmonyCompatibilityDependency
-			)
-		) {
-			// CommonJS concatenation is opt-in via optimization.concatenateCommonJsModules
-			const reason = context.concatenateCommonJsModules
-				? getCommonJsConcatenationBailoutReason(module)
-				: "Module is not an ECMAScript module";
-			if (reason !== undefined) return reason;
+			);
+
+		if (!isESM) {
+			// CommonJS concatenation is opt-in via optimization.concatenateModules.commonjs
+			if (!context.concatenateCommonJsModules) {
+				return "Module is not an ECMAScript module";
+			}
+			// Concatenated CommonJS always runs wrapped, with real `module`/`exports`,
+			// so only a foreign exports shape rules the module out (an undefined
+			// exports type is a dynamic `module.exports`, which wrapping supports)
+			if (buildMeta === undefined) {
+				return "Module is neither an ECMAScript module nor a CommonJS";
+			}
+			// Sloppy-mode modules bail out in ModuleConcatenationPlugin anyway,
+			// so skip the dependency scan for them (most of node_modules)
+			if (buildInfo === undefined || !buildInfo.strict) {
+				return "Module is not in strict mode";
+			}
+			if (presentationalDependencies !== undefined) {
+				for (const dep of presentationalDependencies) {
+					const runtimeRequirements =
+						/** @type {{ runtimeRequirements?: ReadonlySet<string> | null }} */
+						(dep).runtimeRequirements;
+					if (!runtimeRequirements) continue;
+					for (const requirement of runtimeRequirements) {
+						if (WRAPPING_INCOMPATIBLE_RUNTIME_REQUIREMENTS.has(requirement)) {
+							return `Module uses ${requirement}`;
+						}
+					}
+				}
+			}
 		}
 
 		// Some expressions are not compatible with module concatenation
 		// because they may produce unexpected results. The plugin bails out
 		// if some were detected upfront.
-		const buildInfo = /** @type {JavascriptModuleBuildInfo | undefined} */ (
-			module.buildInfo
-		);
-		if (buildInfo && buildInfo.moduleConcatenationBailout) {
+		if (buildInfo !== undefined && buildInfo.moduleConcatenationBailout) {
 			return `Module uses ${buildInfo.moduleConcatenationBailout}`;
 		}
 	}
@@ -431,9 +332,8 @@ class JavascriptGenerator extends Generator {
 	 * @returns {Source | null} generated code
 	 */
 	generateError(error, module, generateContext) {
-		return new RawSource(`throw new Error(${JSON.stringify(error.message)});`);
+		return new RawSource(Generator.throwBuildErrorCode(error));
 	}
 }
 
 module.exports = JavascriptGenerator;
-module.exports.isCommonJsWrapped = isCommonJsWrapped;