Ensure we rerender with the original suspender

eps1lon · eps1lon · commit 21ead2caace4 · 2025-11-28T14:03:08.000+01:00
diff --git a/fixtures/fizz/package.json b/fixtures/fizz/package.json
@@ -34,7 +34,7 @@
     "start": "concurrently \"npm run start:server\" \"npm run start:bundler\"",
     "dev:server": "cross-env NODE_ENV=development nodemon -- --inspect server/server.js",
     "start:server": "cross-env NODE_ENV=production nodemon -- server/server.js",
-    "dev:bundler": "cross-env NODE_ENV=development nodemon -- scripts/build.js",
+    "dev:bundler": "cross-env NODE_OPTIONS=--openssl-legacy-provider NODE_ENV=development nodemon -- scripts/build.js",
     "start:bundler": "cross-env NODE_ENV=production nodemon -- scripts/build.js"
   },
   "babel": {
diff --git a/fixtures/fizz/server/delays.js b/fixtures/fizz/server/delays.js
@@ -12,7 +12,7 @@
 exports.API_DELAY = 2000;
 
 // How long the server waits for data before giving up.
-exports.ABORT_DELAY = 10000;
+exports.ABORT_DELAY = 1;
 
 // How long serving the JS bundles is delayed.
 exports.JS_BUNDLE_DELAY = 4000;
diff --git a/fixtures/fizz/src/App.js b/fixtures/fizz/src/App.js
@@ -26,7 +26,6 @@ export default function App({assets, promise, title}) {
   return (
     <Html assets={assets} title={title}>
       <h1>{title}</h1>
-      {components}
       <h1>all done</h1>
       <h2>or maybe not</h2>
       <Suspense fallback="loading more...">
diff --git a/fixtures/fizz/yarn.lock b/fixtures/fizz/yarn.lock
@@ -3176,7 +3176,7 @@ isobject@^3.0.0, isobject@^3.0.1:
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
 
-"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
+js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
@@ -3300,13 +3300,6 @@ lodash@^4.17.15, lodash@^4.17.19:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-loose-envify@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
-  integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
-  dependencies:
-    js-tokens "^3.0.0 || ^4.0.0"
-
 lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
@@ -4095,13 +4088,12 @@ rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dom@^18.2.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d"
-  integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==
+react-dom@^19.0.0:
+  version "19.2.0"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-19.2.0.tgz#00ed1e959c365e9a9d48f8918377465466ec3af8"
+  integrity sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==
   dependencies:
-    loose-envify "^1.1.0"
-    scheduler "^0.23.0"
+    scheduler "^0.27.0"
 
 react-error-boundary@^3.1.3:
   version "3.1.4"
@@ -4110,12 +4102,10 @@ react-error-boundary@^3.1.3:
   dependencies:
     "@babel/runtime" "^7.12.5"
 
-react@^18.2.0:
-  version "18.2.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
-  integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==
-  dependencies:
-    loose-envify "^1.1.0"
+react@^19.0.0:
+  version "19.2.0"
+  resolved "https://registry.yarnpkg.com/react/-/react-19.2.0.tgz#d33dd1721698f4376ae57a54098cb47fc75d93a5"
+  integrity sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==
 
 read-pkg@^4.0.1:
   version "4.0.1"
@@ -4383,12 +4373,10 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-scheduler@^0.23.0:
-  version "0.23.0"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.0.tgz#ba8041afc3d30eb206a487b6b384002e4e61fdfe"
-  integrity sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==
-  dependencies:
-    loose-envify "^1.1.0"
+scheduler@^0.27.0:
+  version "0.27.0"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.27.0.tgz#0c4ef82d67d1e5c1e359e8fc76d3a87f045fe5bd"
+  integrity sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==
 
 schema-utils@^1.0.0:
   version "1.0.0"
diff --git a/packages/react-server/src/ReactFizzServer.js b/packages/react-server/src/ReactFizzServer.js
@@ -193,6 +193,7 @@ import isArray from 'shared/isArray';
 import {
   SuspenseException,
   getSuspendedThenable,
+  ensureSuspendableThenableStateDEV,
   getSuspendedCallSiteStackDEV,
   getSuspendedCallSiteDebugTaskDEV,
   setCaptureSuspendedCallSiteDEV,
@@ -1030,7 +1031,7 @@ function pushHaltedAwaitOnComponentStack(
 }
 
 // performWork + retryTask without mutation
-function rerenderHaltedTask(request: Request, task: Task): void {
+function rerenderStalledTask(request: Request, task: Task): void {
   const prevContext = getActiveContext();
   const prevDispatcher = ReactSharedInternals.H;
   ReactSharedInternals.H = HooksDispatcher;
@@ -1080,9 +1081,14 @@ function pushSuspendedCallSiteOnComponentStack(
   task: Task,
 ): void {
   setCaptureSuspendedCallSiteDEV(true);
+  const restoreThenableState = ensureSuspendableThenableStateDEV(
+    // refined at the callsite
+    ((task.thenableState: any): ThenableState),
+  );
   try {
-    rerenderHaltedTask(request, task);
+    rerenderStalledTask(request, task);
   } finally {
+    restoreThenableState();
     setCaptureSuspendedCallSiteDEV(false);
   }
 
@@ -4616,13 +4622,6 @@ function abortTask(task: Task, request: Request, error: mixed): void {
       }
       pushHaltedAwaitOnComponentStack(task, debugInfo);
       if (task.thenableState !== null) {
-        // TODO: really?
-        // If the thenable was resolved in the meantime, we won't get a stack.
-        // We won't know which thenable in thenableState is newly settled though.
-        // We can't just clear status fields on each thenable because then the
-        // stack may point at a thenable that wasn't stalled. In those cases
-        // it's better to point at the callsite of the stalled Component as an
-        // entrypoint instead of the wrong thenable.
         pushSuspendedCallSiteOnComponentStack(request, task);
       }
     }
diff --git a/packages/react-server/src/ReactFizzThenable.js b/packages/react-server/src/ReactFizzThenable.js
@@ -7,12 +7,9 @@
  * @flow
  */
 
-// Corresponds to ReactFiberWakeable and ReactFlightWakeable modules. Generally,
+// Corresponds to ReactFiberThenable and ReactFlightThenable modules. Generally,
 // changes to one module should be reflected in the others.
 
-// TODO: Rename this module and the corresponding Fiber one to "Thenable"
-// instead of "Wakeable". Or some other more appropriate name.
-
 import type {
   Thenable,
   PendingThenable,
@@ -185,6 +182,10 @@ export function setCaptureSuspendedCallSiteDEV(capture: boolean): void {
 let suspendedCallSiteStack: ComponentStackNode | null = null;
 let suspendedCallSiteDebugTask: ConsoleTask | null = null;
 function captureSuspendedCallSite(): void {
+  // This is currently only used when aborting in Fizz.
+  // You can only abort the render in Fizz and Flight.
+  // In Fiber we only track suspended use via DevTools.
+  // In Flight, we track suspended use via async debug info.
   const currentTask = currentTaskInDEV;
   if (currentTask === null) {
     // eslint-disable-next-line react-internal/prod-error-codes -- not a prod error
@@ -248,3 +249,36 @@ export function getSuspendedCallSiteDebugTaskDEV(): ConsoleTask | null {
     );
   }
 }
+
+export function ensureSuspendableThenableStateDEV(
+  thenableState: ThenableState,
+): () => void {
+  if (__DEV__) {
+    const lastThenable = thenableState[thenableState.length - 1];
+    switch (lastThenable.status) {
+      case 'fulfilled':
+        const previousThenableValue = lastThenable.value;
+        delete lastThenable.value;
+        delete (lastThenable: any).status;
+        return () => {
+          lastThenable.value = previousThenableValue;
+          lastThenable.status = 'fulfilled';
+        };
+      case 'rejected':
+        const previousThenableReason = lastThenable.reason;
+        delete lastThenable.reason;
+        delete (lastThenable: any).status;
+        return () => {
+          lastThenable.reason = previousThenableReason;
+          lastThenable.status = 'rejected';
+        };
+    }
+    return noop;
+  } else {
+    // eslint-disable-next-line react-internal/prod-error-codes
+    throw new Error(
+      'ensureSuspendableThenableStateDEV was called in a production environment. ' +
+        'This is a bug in React.',
+    );
+  }
+}
diff --git a/packages/react-server/src/__tests__/ReactServer-test.js b/packages/react-server/src/__tests__/ReactServer-test.js
@@ -163,8 +163,8 @@ describe('ReactServer', () => {
       __DEV__
         ? '' +
             // The concrete location may change as this test is updated
-            // Just make sure they still point at the same code
-            '\n    at Component (./ReactServer-test.js:95:13)' +
+            // Just make sure they still point at React.use(p2)
+            '\n    at Component (./ReactServer-test.js:94:13)' +
             '\n    at Indirection (./ReactServer-test.js:101:44)' +
             '\n    at App (./ReactServer-test.js:109:46)'
         : null,
