From e3748a0bde80dd1f097fd8000702aba9fca454ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= <sebastian@calyptus.eu>
Date: Tue, 17 Oct 2023 21:43:12 -0400
Subject: [PATCH] [Fizz] Pass cancellation reason to abort (#27536)

This was implemented correctly for Flight but not Fizz. Hard to keep
these many wrappers in sync.
---
 packages/react-dom/src/server/ReactDOMFizzServerBrowser.js | 4 ++--
 packages/react-dom/src/server/ReactDOMFizzServerBun.js     | 2 +-
 packages/react-dom/src/server/ReactDOMFizzServerEdge.js    | 4 ++--
 packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js | 2 +-
 packages/react-dom/src/server/ReactDOMFizzStaticEdge.js    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js b/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js
index 245122071e..48b3df777e 100644
--- a/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js
+++ b/packages/react-dom/src/server/ReactDOMFizzServerBrowser.js
@@ -80,7 +80,7 @@ function renderToReadableStream(
           },
           cancel: (reason): ?Promise<void> => {
             stopFlowing(request);
-            abort(request);
+            abort(request, reason);
           },
         },
         // $FlowFixMe[prop-missing] size() methods are not allowed on byte streams.
@@ -161,7 +161,7 @@ function resume(
           },
           cancel: (reason): ?Promise<void> => {
             stopFlowing(request);
-            abort(request);
+            abort(request, reason);
           },
         },
         // $FlowFixMe[prop-missing] size() methods are not allowed on byte streams.
diff --git a/packages/react-dom/src/server/ReactDOMFizzServerBun.js b/packages/react-dom/src/server/ReactDOMFizzServerBun.js
index 9bcd19fb74..c9271d3444 100644
--- a/packages/react-dom/src/server/ReactDOMFizzServerBun.js
+++ b/packages/react-dom/src/server/ReactDOMFizzServerBun.js
@@ -70,7 +70,7 @@ function renderToReadableStream(
           },
           cancel: (reason): ?Promise<void> => {
             stopFlowing(request);
-            abort(request);
+            abort(request, reason);
           },
         },
         // $FlowFixMe[prop-missing] size() methods are not allowed on byte streams.
diff --git a/packages/react-dom/src/server/ReactDOMFizzServerEdge.js b/packages/react-dom/src/server/ReactDOMFizzServerEdge.js
index 245122071e..48b3df777e 100644
--- a/packages/react-dom/src/server/ReactDOMFizzServerEdge.js
+++ b/packages/react-dom/src/server/ReactDOMFizzServerEdge.js
@@ -80,7 +80,7 @@ function renderToReadableStream(
           },
           cancel: (reason): ?Promise<void> => {
             stopFlowing(request);
-            abort(request);
+            abort(request, reason);
           },
         },
         // $FlowFixMe[prop-missing] size() methods are not allowed on byte streams.
@@ -161,7 +161,7 @@ function resume(
           },
           cancel: (reason): ?Promise<void> => {
             stopFlowing(request);
-            abort(request);
+            abort(request, reason);
           },
         },
         // $FlowFixMe[prop-missing] size() methods are not allowed on byte streams.
diff --git a/packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js b/packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js
index 94e7c32d22..b3db085738 100644
--- a/packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js
+++ b/packages/react-dom/src/server/ReactDOMFizzStaticBrowser.js
@@ -64,7 +64,7 @@ function prerender(
           },
           cancel: (reason): ?Promise<void> => {
             stopFlowing(request);
-            abort(request);
+            abort(request, reason);
           },
         },
         // $FlowFixMe[prop-missing] size() methods are not allowed on byte streams.
diff --git a/packages/react-dom/src/server/ReactDOMFizzStaticEdge.js b/packages/react-dom/src/server/ReactDOMFizzStaticEdge.js
index 94e7c32d22..b3db085738 100644
--- a/packages/react-dom/src/server/ReactDOMFizzStaticEdge.js
+++ b/packages/react-dom/src/server/ReactDOMFizzStaticEdge.js
@@ -64,7 +64,7 @@ function prerender(
           },
           cancel: (reason): ?Promise<void> => {
             stopFlowing(request);
-            abort(request);
+            abort(request, reason);
           },
         },
         // $FlowFixMe[prop-missing] size() methods are not allowed on byte streams.