From c83be7da9f0861770d7df52842d1c3dfe60f0927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= Date: Sun, 9 Nov 2025 15:19:43 -0500 Subject: [PATCH] [Fizz] Simplify createSuspenseBoundary path (#35087) Small follow up to #35068. Since this is now a single argument we can simplify the creation branching a bit and make sure it's const. --- packages/react-server/src/ReactFizzServer.js | 50 ++++++-------------- 1 file changed, 14 insertions(+), 36 deletions(-) diff --git a/packages/react-server/src/ReactFizzServer.js b/packages/react-server/src/ReactFizzServer.js index 3a92a17377..4f0ece3f98 100644 --- a/packages/react-server/src/ReactFizzServer.js +++ b/packages/react-server/src/ReactFizzServer.js @@ -1291,24 +1291,13 @@ function renderSuspenseBoundary( const defer: boolean = enableCPUSuspense && props.defer === true; const fallbackAbortSet: Set = new Set(); - let newBoundary: SuspenseBoundary; - if (canHavePreamble(task.formatContext)) { - newBoundary = createSuspenseBoundary( - request, - task.row, - fallbackAbortSet, - createPreamble(), - defer, - ); - } else { - newBoundary = createSuspenseBoundary( - request, - task.row, - fallbackAbortSet, - null, - defer, - ); - } + const newBoundary = createSuspenseBoundary( + request, + task.row, + fallbackAbortSet, + canHavePreamble(task.formatContext) ? createPreamble() : null, + defer, + ); const insertionIndex = parentSegment.chunks.length; // The children of the boundary segment is actually the fallback. @@ -1603,24 +1592,13 @@ function replaySuspenseBoundary( const defer: boolean = enableCPUSuspense && props.defer === true; const fallbackAbortSet: Set = new Set(); - let resumedBoundary: SuspenseBoundary; - if (canHavePreamble(task.formatContext)) { - resumedBoundary = createSuspenseBoundary( - request, - task.row, - fallbackAbortSet, - createPreamble(), - defer, - ); - } else { - resumedBoundary = createSuspenseBoundary( - request, - task.row, - fallbackAbortSet, - null, - defer, - ); - } + const resumedBoundary = createSuspenseBoundary( + request, + task.row, + fallbackAbortSet, + canHavePreamble(task.formatContext) ? createPreamble() : null, + defer, + ); resumedBoundary.parentFlushed = true; // We restore the same id of this boundary as was used during prerender. resumedBoundary.rootSegmentID = id;