fix: hash entry chunks after runtime chunks to prevent stale hash references (#20724)

xiaoxiaojx · web-flow · commit f88338d0398a · 2026-03-30T17:38:39.000+03:00
diff --git a/.changeset/fix-chunk-hash-ordering.md b/.changeset/fix-chunk-hash-ordering.md
@@ -0,0 +1,5 @@
+---
+"webpack": patch
+---
+
+Hash entry chunks after runtime chunks to prevent stale content hash references in watch mode
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -4497,31 +4497,42 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 
 		this.logger.time("hashing: sort chunks");
 		/*
-		 * all non-runtime chunks need to be hashes first,
-		 * since runtime chunk might use their hashes.
-		 * runtime chunks need to be hashed in the correct order
-		 * since they may depend on each other (for async entrypoints).
-		 * So we put all non-runtime chunks first and hash them in any order.
-		 * And order runtime chunks according to referenced between each other.
-		 * Chunks need to be in deterministic order since we add hashes to full chunk
-		 * during these hashing.
+		 * Chunks are hashed in 4 categories, in this order:
+		 * 1. Async chunks - no hash dependencies on other chunks
+		 * 2. Non-entry initial chunks (e.g. shared split chunks) - no hash
+		 *    dependencies on other chunks, but runtime chunks may read their
+		 *    hashes via GetChunkFilenameRuntimeModule (dependentHash)
+		 * 3. Runtime chunks - may use hashes of async and non-entry initial
+		 *    chunks (via GetChunkFilenameRuntimeModule). Ordered by references
+		 *    between each other (for async entrypoints)
+		 * 4. Entry chunks - may depend on runtimeChunk.hash (via
+		 *    createChunkHashHandler for ESM/CJS entry importing runtime)
+		 *
+		 * This ordering ensures all hash dependencies flow in one direction:
+		 * async/initial → runtime → entry, with no circular dependencies.
+		 * Chunks within each category are sorted by id for determinism.
 		 */
 		/** @type {Chunk[]} */
 		const unorderedRuntimeChunks = [];
 		/** @type {Chunk[]} */
 		const initialChunks = [];
 		/** @type {Chunk[]} */
+		const entryChunks = [];
+		/** @type {Chunk[]} */
 		const asyncChunks = [];
 		for (const c of this.chunks) {
 			if (c.hasRuntime()) {
 				unorderedRuntimeChunks.push(c);
+			} else if (chunkGraph.getNumberOfEntryModules(c) > 0) {
+				entryChunks.push(c);
 			} else if (c.canBeInitial()) {
 				initialChunks.push(c);
 			} else {
 				asyncChunks.push(c);
 			}
 		}
 		unorderedRuntimeChunks.sort(byId);
+		entryChunks.sort(byId);
 		initialChunks.sort(byId);
 		asyncChunks.sort(byId);
 
@@ -4693,8 +4704,9 @@ This prevents using hashes of each other and should be avoided.`);
 			this.logger.timeAggregate("hashing: hash chunks");
 		};
 		for (const chunk of asyncChunks) processChunk(chunk);
-		for (const chunk of runtimeChunks) processChunk(chunk);
 		for (const chunk of initialChunks) processChunk(chunk);
+		for (const chunk of runtimeChunks) processChunk(chunk);
+		for (const chunk of entryChunks) processChunk(chunk);
 		if (errors.length > 0) {
 			errors.sort(
 				compareSelect((err) => err.module, compareModulesByIdentifier)
diff --git a/test/test262-cases b/test/test262-cases
@@ -1 +1 @@
-Subproject commit 5c8206929d81b2d3d727ca6aac56c18358c8d790
+Subproject commit e974f93c2cc764f2279a3bf8b18b973008dca2f8
diff --git a/test/watchCases/cache/stale-runtime-chunk-hash/0/entry2.js b/test/watchCases/cache/stale-runtime-chunk-hash/0/entry2.js
@@ -0,0 +1,2 @@
+import { value } from "./shared";
+export default value;
diff --git a/test/watchCases/cache/stale-runtime-chunk-hash/0/index.js b/test/watchCases/cache/stale-runtime-chunk-hash/0/index.js
@@ -0,0 +1,6 @@
+import { value } from "./shared";
+
+it("should not have stale runtime chunk hash references", () => {
+	expect(value).toBe(WATCH_STEP === "0" ? "shared-v0" : "shared-v1");
+	expect(STATS_JSON.errors).toHaveLength(0);
+});
diff --git a/test/watchCases/cache/stale-runtime-chunk-hash/0/shared.js b/test/watchCases/cache/stale-runtime-chunk-hash/0/shared.js
@@ -0,0 +1 @@
+export const value = "shared-v0";
diff --git a/test/watchCases/cache/stale-runtime-chunk-hash/1/shared.js b/test/watchCases/cache/stale-runtime-chunk-hash/1/shared.js
@@ -0,0 +1 @@
+export const value = "shared-v1";
diff --git a/test/watchCases/cache/stale-runtime-chunk-hash/test.config.js b/test/watchCases/cache/stale-runtime-chunk-hash/test.config.js
@@ -0,0 +1,12 @@
+"use strict";
+
+const fs = require("fs");
+
+module.exports = {
+	findBundle(_i, options) {
+		return fs
+			.readdirSync(options.output.path)
+			.filter((f) => /^bundle\./.test(f))
+			.map((f) => `./${f}`);
+	}
+};
diff --git a/test/watchCases/cache/stale-runtime-chunk-hash/webpack.config.js b/test/watchCases/cache/stale-runtime-chunk-hash/webpack.config.js
@@ -0,0 +1,33 @@
+"use strict";
+
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	entry: {
+		bundle: "./index.js",
+		entry2: { import: "./entry2.js", runtime: "runtime" }
+	},
+	mode: "production",
+	cache: {
+		type: "memory"
+	},
+	output: {
+		filename: "[name].[contenthash].js",
+		library: { type: "commonjs-module" }
+	},
+	optimization: {
+		splitChunks: {
+			minSize: 1,
+			chunks: "all",
+			cacheGroups: {
+				shared: {
+					test: /shared/,
+					name: "shared",
+					chunks: "all",
+					enforce: true
+				}
+			}
+		},
+		minimize: false,
+		concatenateModules: false
+	}
+};

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"webpack": patch
 +---
++
 +Hash entry chunks after runtime chunks to prevent stale content hash references in watch mode
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+import { value } from "./shared";`
	`2`	`+export default value;`