Skip to content

Commit c83be7d

Browse files
authored
[Fizz] Simplify createSuspenseBoundary path (facebook#35087)
Small follow up to facebook#35068. Since this is now a single argument we can simplify the creation branching a bit and make sure it's const.
1 parent 6362b5c commit c83be7d

File tree

1 file changed

+14
-36
lines changed

1 file changed

+14
-36
lines changed

packages/react-server/src/ReactFizzServer.js

Lines changed: 14 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,24 +1291,13 @@ function renderSuspenseBoundary(
12911291
const defer: boolean = enableCPUSuspense && props.defer === true;
12921292

12931293
const fallbackAbortSet: Set<Task> = new Set();
1294-
let newBoundary: SuspenseBoundary;
1295-
if (canHavePreamble(task.formatContext)) {
1296-
newBoundary = createSuspenseBoundary(
1297-
request,
1298-
task.row,
1299-
fallbackAbortSet,
1300-
createPreamble(),
1301-
defer,
1302-
);
1303-
} else {
1304-
newBoundary = createSuspenseBoundary(
1305-
request,
1306-
task.row,
1307-
fallbackAbortSet,
1308-
null,
1309-
defer,
1310-
);
1311-
}
1294+
const newBoundary = createSuspenseBoundary(
1295+
request,
1296+
task.row,
1297+
fallbackAbortSet,
1298+
canHavePreamble(task.formatContext) ? createPreamble() : null,
1299+
defer,
1300+
);
13121301

13131302
const insertionIndex = parentSegment.chunks.length;
13141303
// The children of the boundary segment is actually the fallback.
@@ -1603,24 +1592,13 @@ function replaySuspenseBoundary(
16031592
const defer: boolean = enableCPUSuspense && props.defer === true;
16041593

16051594
const fallbackAbortSet: Set<Task> = new Set();
1606-
let resumedBoundary: SuspenseBoundary;
1607-
if (canHavePreamble(task.formatContext)) {
1608-
resumedBoundary = createSuspenseBoundary(
1609-
request,
1610-
task.row,
1611-
fallbackAbortSet,
1612-
createPreamble(),
1613-
defer,
1614-
);
1615-
} else {
1616-
resumedBoundary = createSuspenseBoundary(
1617-
request,
1618-
task.row,
1619-
fallbackAbortSet,
1620-
null,
1621-
defer,
1622-
);
1623-
}
1595+
const resumedBoundary = createSuspenseBoundary(
1596+
request,
1597+
task.row,
1598+
fallbackAbortSet,
1599+
canHavePreamble(task.formatContext) ? createPreamble() : null,
1600+
defer,
1601+
);
16241602
resumedBoundary.parentFlushed = true;
16251603
// We restore the same id of this boundary as was used during prerender.
16261604
resumedBoundary.rootSegmentID = id;

0 commit comments

Comments
 (0)