[CC] Fix hanging dynamic promise when abandoning render

lubieowoce · lubieowoce · commit 91dead03eeed · 2025-12-01T13:44:37.000+01:00
diff --git a/packages/next/src/server/app-render/staged-rendering.ts b/packages/next/src/server/app-render/staged-rendering.ts
@@ -40,7 +40,10 @@ export class StagedRenderingController {
             this.runtimeStagePromise.promise.catch(ignoreReject) // avoid unhandled rejections
             this.runtimeStagePromise.reject(reason)
           }
-          if (this.currentStage < RenderStage.Dynamic) {
+          if (
+            this.currentStage < RenderStage.Dynamic ||
+            this.currentStage === RenderStage.Abandoned
+          ) {
             this.dynamicStagePromise.promise.catch(ignoreReject) // avoid unhandled rejections
             this.dynamicStagePromise.reject(reason)
           }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,10 @@ export class StagedRenderingController {`
`40`	`40`	`this.runtimeStagePromise.promise.catch(ignoreReject) // avoid unhandled rejections`
`41`	`41`	`this.runtimeStagePromise.reject(reason)`
`42`	`42`	`}`
`43`		`- if (this.currentStage < RenderStage.Dynamic) {`
	`43`	`+ if (`
	`44`	`+ this.currentStage < RenderStage.Dynamic \|\|`
	`45`	`+ this.currentStage === RenderStage.Abandoned`
	`46`	`+ ) {`
`44`	`47`	`this.dynamicStagePromise.promise.catch(ignoreReject) // avoid unhandled rejections`
`45`	`48`	`this.dynamicStagePromise.reject(reason)`
`46`	`49`	`}`