From ca0b9f4020ae2e49ba3ffe4a5cd96f06257177d5 Mon Sep 17 00:00:00 2001 From: mofeiZ Date: Wed, 20 Sep 2023 20:46:08 +0000 Subject: [PATCH] [Fizz] Allow passing a reason to `abortStream` (#26992) ## Summary Currently `ReactFizzServer.abort` allows you to pass in the a `reason` error, which then gets passed to the `onError` handler for each task that ends up getting aborted. This adds in the ability to pass down that same `reason` error to `ReactDOMServerFB.abortStream` as well. ## How did you test this change? Added a test case to ReactDOMServerFB-test.internal.js DiffTrain build for [1f4936660dcaba2e5722013f0ad12d7369543a9f](https://github.com/facebook/react/commit/1f4936660dcaba2e5722013f0ad12d7369543a9f) --- compiled/facebook-www/REVISION | 2 +- compiled/facebook-www/ReactDOMServerStreaming-dev.modern.js | 4 ++-- compiled/facebook-www/ReactDOMServerStreaming-prod.modern.js | 4 ++-- compiled/facebook-www/ReactTestRenderer-dev.modern.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/compiled/facebook-www/REVISION b/compiled/facebook-www/REVISION index 585d5cc297..afde297ed4 100644 --- a/compiled/facebook-www/REVISION +++ b/compiled/facebook-www/REVISION @@ -1 +1 @@ -b775564d35d6fe9f9acead0f380bbc86bb6bdd2c +1f4936660dcaba2e5722013f0ad12d7369543a9f diff --git a/compiled/facebook-www/ReactDOMServerStreaming-dev.modern.js b/compiled/facebook-www/ReactDOMServerStreaming-dev.modern.js index 8665a048f5..73744478ab 100644 --- a/compiled/facebook-www/ReactDOMServerStreaming-dev.modern.js +++ b/compiled/facebook-www/ReactDOMServerStreaming-dev.modern.js @@ -12848,8 +12848,8 @@ function renderToStream(children, options) { }; } -function abortStream(stream) { - abort(stream.request); +function abortStream(stream, reason) { + abort(stream.request, reason); } function renderNextChunk(stream) { diff --git a/compiled/facebook-www/ReactDOMServerStreaming-prod.modern.js b/compiled/facebook-www/ReactDOMServerStreaming-prod.modern.js index ac945c4903..64c3e993a7 100644 --- a/compiled/facebook-www/ReactDOMServerStreaming-prod.modern.js +++ b/compiled/facebook-www/ReactDOMServerStreaming-prod.modern.js @@ -4633,8 +4633,8 @@ function abort(request, reason) { logRecoverableError(request, error$34), fatalError(request, error$34); } } -exports.abortStream = function (stream) { - abort(stream.request); +exports.abortStream = function (stream, reason) { + abort(stream.request, reason); }; exports.debug = function (stream) { stream = stream.request; diff --git a/compiled/facebook-www/ReactTestRenderer-dev.modern.js b/compiled/facebook-www/ReactTestRenderer-dev.modern.js index 94082349c7..270eb38db3 100644 --- a/compiled/facebook-www/ReactTestRenderer-dev.modern.js +++ b/compiled/facebook-www/ReactTestRenderer-dev.modern.js @@ -24360,7 +24360,7 @@ function createFiberRoot( return root; } -var ReactVersion = "18.3.0-www-modern-5efbcf55"; +var ReactVersion = "18.3.0-www-modern-6126abbd"; // Might add PROFILE later.