do not create new promises in patch-fetch

lubieowoce · lubieowoce · commit 52c586b70fbc · 2025-10-18T07:39:57.000+02:00
diff --git a/packages/next/src/server/lib/patch-fetch.ts b/packages/next/src/server/lib/patch-fetch.ts
@@ -562,10 +562,8 @@ export function createPatchedFetcher(
                   cacheSignal.endRead()
                   cacheSignal = null
                 }
-                await workUnitStore.stagedRendering.delayUntilStage(
-                  RenderStage.Dynamic,
-                  undefined,
-                  undefined
+                await workUnitStore.stagedRendering.waitForStage(
+                  RenderStage.Dynamic
                 )
               }
               break
@@ -690,10 +688,8 @@ export function createPatchedFetcher(
                       cacheSignal.endRead()
                       cacheSignal = null
                     }
-                    await workUnitStore.stagedRendering.delayUntilStage(
-                      RenderStage.Dynamic,
-                      undefined,
-                      undefined
+                    await workUnitStore.stagedRendering.waitForStage(
+                      RenderStage.Dynamic
                     )
                   }
                   break
@@ -964,10 +960,8 @@ export function createPatchedFetcher(
                     process.env.NODE_ENV === 'development' &&
                     workUnitStore.stagedRendering
                   ) {
-                    await workUnitStore.stagedRendering.delayUntilStage(
-                      RenderStage.Dynamic,
-                      undefined,
-                      undefined
+                    await workUnitStore.stagedRendering.waitForStage(
+                      RenderStage.Dynamic
                     )
                   }
                   break
@@ -1094,10 +1088,8 @@ export function createPatchedFetcher(
                       cacheSignal.endRead()
                       cacheSignal = null
                     }
-                    await workUnitStore.stagedRendering.delayUntilStage(
-                      RenderStage.Dynamic,
-                      undefined,
-                      undefined
+                    await workUnitStore.stagedRendering.waitForStage(
+                      RenderStage.Dynamic
                     )
                   }
                   break
@@ -1142,10 +1134,8 @@ export function createPatchedFetcher(
                       process.env.NODE_ENV === 'development' &&
                       workUnitStore.stagedRendering
                     ) {
-                      await workUnitStore.stagedRendering.delayUntilStage(
-                        RenderStage.Dynamic,
-                        undefined,
-                        undefined
+                      await workUnitStore.stagedRendering.waitForStage(
+                        RenderStage.Dynamic
                       )
                     }
                     break

Original file line number	Diff line number	Diff line change
`@@ -562,10 +562,8 @@ export function createPatchedFetcher(`
`562`	`562`	`cacheSignal.endRead()`
`563`	`563`	`cacheSignal = null`
`564`	`564`	`}`
`565`		`- await workUnitStore.stagedRendering.delayUntilStage(`
`566`		`- RenderStage.Dynamic,`
`567`		`- undefined,`
`568`		`- undefined`
	`565`	`+ await workUnitStore.stagedRendering.waitForStage(`
	`566`	`+ RenderStage.Dynamic`
`569`	`567`	`)`
`570`	`568`	`}`
`571`	`569`	`break`
`@@ -690,10 +688,8 @@ export function createPatchedFetcher(`
`690`	`688`	`cacheSignal.endRead()`
`691`	`689`	`cacheSignal = null`
`692`	`690`	`}`
`693`		`- await workUnitStore.stagedRendering.delayUntilStage(`
`694`		`- RenderStage.Dynamic,`
`695`		`- undefined,`
`696`		`- undefined`
	`691`	`+ await workUnitStore.stagedRendering.waitForStage(`
	`692`	`+ RenderStage.Dynamic`
`697`	`693`	`)`
`698`	`694`	`}`
`699`	`695`	`break`
`@@ -964,10 +960,8 @@ export function createPatchedFetcher(`
`964`	`960`	`process.env.NODE_ENV === 'development' &&`
`965`	`961`	`workUnitStore.stagedRendering`
`966`	`962`	`) {`
`967`		`- await workUnitStore.stagedRendering.delayUntilStage(`
`968`		`- RenderStage.Dynamic,`
`969`		`- undefined,`
`970`		`- undefined`
	`963`	`+ await workUnitStore.stagedRendering.waitForStage(`
	`964`	`+ RenderStage.Dynamic`
`971`	`965`	`)`
`972`	`966`	`}`
`973`	`967`	`break`
`@@ -1094,10 +1088,8 @@ export function createPatchedFetcher(`
`1094`	`1088`	`cacheSignal.endRead()`
`1095`	`1089`	`cacheSignal = null`
`1096`	`1090`	`}`
`1097`		`- await workUnitStore.stagedRendering.delayUntilStage(`
`1098`		`- RenderStage.Dynamic,`
`1099`		`- undefined,`
`1100`		`- undefined`
	`1091`	`+ await workUnitStore.stagedRendering.waitForStage(`
	`1092`	`+ RenderStage.Dynamic`
`1101`	`1093`	`)`
`1102`	`1094`	`}`
`1103`	`1095`	`break`
`@@ -1142,10 +1134,8 @@ export function createPatchedFetcher(`
`1142`	`1134`	`process.env.NODE_ENV === 'development' &&`
`1143`	`1135`	`workUnitStore.stagedRendering`
`1144`	`1136`	`) {`
`1145`		`- await workUnitStore.stagedRendering.delayUntilStage(`
`1146`		`- RenderStage.Dynamic,`
`1147`		`- undefined,`
`1148`		`- undefined`
	`1137`	`+ await workUnitStore.stagedRendering.waitForStage(`
	`1138`	`+ RenderStage.Dynamic`
`1149`	`1139`	`)`
`1150`	`1140`	`}`
`1151`	`1141`	`break`