webpack 5.106.2 → 5.107.1

package/lib/dependencies/CommonJsRequireDependency.js

@@ -7,11 +7,18 @@
 
 const Dependency = require("../Dependency");
 const makeSerializable = require("../util/makeSerializable");
+const {
+	ESM_MODULE_EXPORTS_NAME,
+	getRequireEsmModuleExportsAccess,
+	isRequireEsmModuleExportsModule
+} = require("./CommonJsDependencyHelpers");
 const ModuleDependency = require("./ModuleDependency");
-const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
 
+/** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
 /** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
+/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -22,15 +29,23 @@ class CommonJsRequireDependency extends ModuleDependency {
 	/**
 	 * Creates an instance of CommonJsRequireDependency.
 	 * @param {string} request request
-	 * @param {Range=} range location in source code
+	 * @param {Range=} range location in source code of the string-literal argument (gets replaced by the module id)
 	 * @param {string=} context request context
 	 * @param {RawReferencedExports | null=} referencedExports list of referenced exports
+	 * @param {Range=} valueRange location in source code of the whole `require(...)` call (for `require(esm)` interop)
 	 */
-	constructor(request, range, context, referencedExports = null) {
+	constructor(
+		request,
+		range,
+		context,
+		referencedExports = null,
+		valueRange = undefined
+	) {
 		super(request);
 		this.range = range;
 		this._context = context;
 		this.referencedExports = referencedExports;
+		this.valueRange = valueRange;
 	}
 
 	get type() {
@@ -48,6 +63,15 @@ class CommonJsRequireDependency extends ModuleDependency {
 	 * @returns {ReferencedExports} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
+		const importedModule = moduleGraph.getModule(this);
+		if (
+			importedModule &&
+			isRequireEsmModuleExportsModule(importedModule, moduleGraph)
+		) {
+			// `require(esm)` will unwrap the "module.exports" named export; only
+			// that export is observable through this `require()` call.
+			return [[ESM_MODULE_EXPORTS_NAME]];
+		}
 		if (!this.referencedExports) return Dependency.EXPORTS_OBJECT_REFERENCED;
 		return this.referencedExports.map((name) => ({
 			name,
@@ -62,6 +86,7 @@ class CommonJsRequireDependency extends ModuleDependency {
 	serialize(context) {
 		const { write } = context;
 		write(this.referencedExports);
+		write(this.valueRange);
 		super.serialize(context);
 	}
 
@@ -72,11 +97,49 @@ class CommonJsRequireDependency extends ModuleDependency {
 	deserialize(context) {
 		const { read } = context;
 		this.referencedExports = read();
+		this.valueRange = read();
 		super.deserialize(context);
 	}
 }
 
-CommonJsRequireDependency.Template = ModuleDependencyTemplateAsId;
+CommonJsRequireDependency.Template = class CommonJsRequireDependencyTemplate extends (
+	ModuleDependency.Template
+) {
+	/**
+	 * Applies the plugin by registering its hooks on the compiler.
+	 * @param {Dependency} dependency the dependency for which the template should be applied
+	 * @param {ReplaceSource} source the current replace source which can be modified
+	 * @param {DependencyTemplateContext} templateContext the context object
+	 * @returns {void}
+	 */
+	apply(
+		dependency,
+		source,
+		{ runtimeTemplate, moduleGraph, chunkGraph, runtime }
+	) {
+		const dep = /** @type {CommonJsRequireDependency} */ (dependency);
+		if (!dep.range) return;
+		const importedModule = /** @type {Module} */ (moduleGraph.getModule(dep));
+		const content = runtimeTemplate.moduleId({
+			module: importedModule,
+			chunkGraph,
+			request: dep.request,
+			weak: dep.weak
+		});
+		source.replace(dep.range[0], dep.range[1] - 1, content);
+
+		if (dep.valueRange && importedModule) {
+			const access = getRequireEsmModuleExportsAccess(
+				importedModule,
+				moduleGraph,
+				runtime
+			);
+			if (access !== null) {
+				source.insert(dep.valueRange[1], access);
+			}
+		}
+	}
+};
 
 makeSerializable(
 	CommonJsRequireDependency,

package/lib/dependencies/ContextDependency.js

@@ -14,7 +14,7 @@ const memoize = require("../util/memoize");
 /** @typedef {import("../ContextModule").ContextOptions} ContextOptions */
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../WebpackError")} WebpackError */
+/** @typedef {import("../errors/WebpackError")} WebpackError */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 

package/lib/dependencies/ContextDependencyHelpers.js

@@ -48,7 +48,7 @@ const splitContextFromPrefix = (prefix) => {
 /**
  * Defines the get additional dep args type used by this module.
  * @template T
- * @typedef {T extends new (options: ContextDependencyOptions, range: Range, valueRange: Range, ...remains: infer R) => EXPECTED_ANY ? R : []} GetAdditionalDepArgs
+ * @typedef {T extends new (options: ContextDependencyOptions, range: Range, valueRange: Range, ...remains: infer R) => ContextDependency ? R : []} GetAdditionalDepArgs
  */
 
 /**

package/lib/dependencies/CreateRequireParserPlugin.js

@@ -6,7 +6,7 @@
 "use strict";
 
 const { fileURLToPath } = require("url");
-const WebpackError = require("../WebpackError");
+const WebpackError = require("../errors/WebpackError");
 const BasicEvaluatedExpression = require("../javascript/BasicEvaluatedExpression");
 const { VariableInfo } = require("../javascript/JavascriptParser");
 const {

package/lib/dependencies/CriticalDependencyWarning.js

@@ -5,7 +5,7 @@
 
 "use strict";
 
-const WebpackError = require("../WebpackError");
+const WebpackError = require("../errors/WebpackError");
 const makeSerializable = require("../util/makeSerializable");
 
 class CriticalDependencyWarning extends WebpackError {