webpack 5.108.2 → 5.108.3

package/lib/dependencies/HarmonyAcceptDependency.js

@@ -19,8 +19,6 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("./HarmonyAcceptImportDependency")} HarmonyAcceptImportDependency */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, HarmonyAcceptImportDependency[], boolean]>} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, HarmonyAcceptImportDependency[], boolean]>} ObjectSerializerContext */
-/** @typedef {import("../Module")} Module */
-/** @typedef {import("../Module").ModuleId} ModuleId */
 
 class HarmonyAcceptDependency extends NullDependency {
 	/**
@@ -91,26 +89,20 @@ HarmonyAcceptDependency.Template = class HarmonyAcceptDependencyTemplate extends
 			chunkGraph
 		} = templateContext;
 
-		/**
-		 * Gets dependency module id.
-		 * @param {Dependency} dependency the dependency to get module id for
-		 * @returns {ModuleId | null} the module id or null if not found
-		 */
-		const getDependencyModuleId = (dependency) =>
-			chunkGraph.getModuleId(
-				/** @type {Module} */ (moduleGraph.getModule(dependency))
-			);
-
 		/**
 		 * Checks whether this harmony accept dependency is related harmony import dependency.
 		 * @param {Dependency} a the first dependency
 		 * @param {Dependency} b the second dependency
 		 * @returns {boolean} true if the dependencies are related
 		 */
-		const isRelatedHarmonyImportDependency = (a, b) =>
-			a !== b &&
-			b instanceof HarmonyImportDependency &&
-			getDependencyModuleId(a) === getDependencyModuleId(b);
+		const isRelatedHarmonyImportDependency = (a, b) => {
+			if (a === b || !(b instanceof HarmonyImportDependency)) return false;
+			// Compare modules by reference: an unresolved import (ignored/failed, or a
+			// deferred lazy-barrel re-export) has no module, and a module not in any
+			// chunk has a null id — so comparing ids would crash or miss real matches.
+			const moduleA = moduleGraph.getModule(a);
+			return moduleA !== null && moduleA === moduleGraph.getModule(b);
+		};
 
 		/**
 		 * HarmonyAcceptImportDependency lacks a lot of information, such as the defer property.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack",
-  "version": "5.108.2",
+  "version": "5.108.3",
   "description": "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff.",
   "homepage": "https://github.com/webpack/webpack",
   "bugs": "https://github.com/webpack/webpack/issues",