abort fallback task on abort

gnoff · gnoff · commit b0a175b3acad · 2023-01-10T13:09:08.000-08:00
diff --git a/packages/react-server/src/ReactFizzServer.js b/packages/react-server/src/ReactFizzServer.js
@@ -2515,6 +2515,11 @@ export function abort(request: Request, reason: mixed): void {
       abortableTasks.forEach(task => abortTask(task, request, error));
       abortableTasks.clear();
     }
+    const fallbackTask = request.fallbackTask;
+    if (fallbackTask) {
+      request.fallbackTask = null;
+      abortTaskSoft.call(request, fallbackTask);
+    }
     if (request.destination !== null) {
       flushCompletedQueues(request, request.destination);
     }

Original file line number	Diff line number	Diff line change
`@@ -2515,6 +2515,11 @@ export function abort(request: Request, reason: mixed): void {`
`2515`	`2515`	`abortableTasks.forEach(task => abortTask(task, request, error));`
`2516`	`2516`	`abortableTasks.clear();`
`2517`	`2517`	`}`
	`2518`	`+ const fallbackTask = request.fallbackTask;`
	`2519`	`+ if (fallbackTask) {`
	`2520`	`+ request.fallbackTask = null;`
	`2521`	`+ abortTaskSoft.call(request, fallbackTask);`
	`2522`	`+ }`
`2518`	`2523`	`if (request.destination !== null) {`
`2519`	`2524`	`flushCompletedQueues(request, request.destination);`
`2520`	`2525`	`}`