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

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;

package/lib/javascript/JavascriptModule.js

@@ -7,17 +7,23 @@
 const NormalModule = require("../NormalModule");
 const makeSerializable = require("../util/makeSerializable");
 
-/** @typedef {import("../Module").BuildMeta} BuildMeta */
-/** @typedef {import("../NormalModule").NormalModuleBuildInfo} NormalModuleBuildInfo */
-/** @typedef {import("../NormalModule").NormalModuleCreateData} NormalModuleCreateData */
+/** @import { BuildMeta } from "../Module" */
+/**
+ * @import {
+ * 	NormalModuleBuildInfo,
+ * 	NormalModuleCreateData
+ * } from "../NormalModule"
+ */
 
 /**
  * Defines the build info properties specific to javascript modules.
  * @typedef {object} KnownJavascriptModuleBuildInfo
  * @property {string=} moduleConcatenationBailout using in CommonJs
  * @property {boolean=} needCreateRequire using in APIPlugin
+ * @property {boolean=} usingPublicPathOverride module reassigns `__webpack_public_path__` at runtime, using in APIPlugin
  * @property {Set<string>=} pureFunctions names of locally declared functions known to be free of side effects
  * @property {boolean=} inlineExports whether this module was parsed with `optimization.inlineExports` enabled (gates inlining of its exports)
+ * @property {boolean=} usesTopLevelUsingDeclaration module scope holds a `using`/`await using` declaration, so its resources must be disposed when the module finished evaluating
  */
 
 /** @typedef {NormalModuleBuildInfo & KnownJavascriptModuleBuildInfo} JavascriptModuleBuildInfo */