{"patch":"diff --git a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js\nindex 8cd6804534..fa20f032e0 100644\n--- a\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js\n+++ b\/packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js\n@@ -132,12 +132,6 @@ export function resolveServerReference(\n return [resolvedModuleData.id, resolvedModuleData.chunks, name];\n }\n \n-\/\/ The chunk cache contains all the chunks we've preloaded so far.\n-\/\/ If they're still pending they're a thenable. This map also exists\n-\/\/ in Turbopack but unfortunately it's not exposed so we have to\n-\/\/ replicate it in user space. null means that it has already loaded.\n-const chunkCache: Map> = new Map();\n-\n function requireAsyncModule(id: string): null | Thenable {\n \/\/ We've already loaded all the chunks. We can require the module.\n const promise = __turbopack_require__(id);\n@@ -165,6 +159,13 @@ function requireAsyncModule(id: string): null | Thenable {\n }\n }\n \n+\/\/ Turbopack will return cached promises for the same chunk.\n+\/\/ We still want to keep track of which chunks we have already instrumented\n+\/\/ and which chunks have already been loaded until Turbopack returns instrumented\n+\/\/ thenables directly.\n+const instrumentedChunks: WeakSet> = new WeakSet();\n+const loadedChunks: WeakSet> = new WeakSet();\n+\n function ignoreReject() {\n \/\/ We rely on rejected promises to be handled by another listener.\n }\n@@ -174,19 +175,19 @@ export function preloadModule(\n metadata: ClientReference,\n ): null | Thenable {\n const chunks = metadata[CHUNKS];\n- const promises = [];\n+ const promises: Promise[] = [];\n for (let i = 0; i < chunks.length; i++) {\n const chunkFilename = chunks[i];\n- const entry = chunkCache.get(chunkFilename);\n- if (entry === undefined) {\n- const thenable = loadChunk(chunkFilename);\n+ const thenable = loadChunk(chunkFilename);\n+ if (!loadedChunks.has(thenable)) {\n promises.push(thenable);\n+ }\n+\n+ if (!instrumentedChunks.has(thenable)) {\n \/\/ $FlowFixMe[method-unbinding]\n- const resolve = chunkCache.set.bind(chunkCache, chunkFilename, null);\n+ const resolve = loadedChunks.add.bind(loadedChunks, thenable);\n thenable.then(resolve, ignoreReject);\n- chunkCache.set(chunkFilename, thenable);\n- } else if (entry !== null) {\n- promises.push(entry);\n+ instrumentedChunks.add(thenable);\n }\n }\n if (isAsyncImport(metadata)) {\n","files":[{"status":"M","path":"packages\/react-server-dom-turbopack\/src\/client\/ReactFlightClientConfigBundlerTurbopack.js"}],"commit":{"revision":"d85ec5f5bd778d09214e3429e7fd043c4a152242","subject":"[Flight] Assume `__turbopack_load_by_url__ ` returns a cached Promise (#33792)","authorName":"Sebastian \"Sebbie\" Silbermann","shortRevision":"d85ec5f5bd","authorEmail":"sebastian.silbermann@vercel.com","authoredAt":"2025-07-16T13:20:10+02:00"},"body":"","parents":["fe813143e23675963f92d25fa1fb35b39db40272"]}

dillon1000/react

Files changed