diff --git a/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js b/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js
index d6d85b96ce702..22d2279578ff0 100644
--- a/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js
+++ b/packages/react-dom/src/__tests__/ReactDOMFizzServer-test.js
@@ -10695,4 +10695,93 @@ describe('ReactDOMFizzServer', () => {
expect(getVisibleChildren(container)).toEqual(Success!
);
});
+
+ it('should always flush the boundaries contributing the preamble regardless of their size', async () => {
+ const longDescription =
+ `I need to make this segment somewhat large because it needs to be large enought to be outlined during the initial flush. Setting the progressive chunk size to near zero isn't enough because there is a fixed minimum size that we use to avoid doing the size tracking altogether and this needs to be larger than that at least.
+
+Unfortunately that previous paragraph wasn't quite long enough so I'll continue with some more prose and maybe throw on some repeated additional strings at the end for good measure.
+
+` + 'a'.repeat(500);
+
+ const randomTag = Math.random().toString(36).slice(2, 10);
+
+ function App() {
+ return (
+
+
+
+ {longDescription}
+
+
+
+ );
+ }
+
+ let streamedContent = '';
+ writable.on('data', chunk => (streamedContent += chunk));
+
+ await act(() => {
+ renderToPipeableStream(, {progressiveChunkSize: 100}).pipe(
+ writable,
+ );
+ });
+
+ // We don't use the DOM here b/c we execute scripts which hides whether a fallback was shown briefly
+ // Instead we assert that we never emitted the fallback of the Suspense boundary around the body.
+ expect(streamedContent).not.toContain(randomTag);
+ });
+
+ it('should track byte size of shells that may contribute to the preamble when determining if the blocking render exceeds the max size', async () => {
+ const longDescription =
+ `I need to make this segment somewhat large because it needs to be large enought to be outlined during the initial flush. Setting the progressive chunk size to near zero isn't enough because there is a fixed minimum size that we use to avoid doing the size tracking altogether and this needs to be larger than that at least.
+
+Unfortunately that previous paragraph wasn't quite long enough so I'll continue with some more prose and maybe throw on some repeated additional strings at the end for good measure.
+
+` + 'a'.repeat(500);
+
+ const randomTag = Math.random().toString(36).slice(2, 10);
+
+ function App() {
+ return (
+ <>
+
+
+
+ {longDescription}
+
+
+
+ Outside Preamble
+
+ );
+ }
+
+ let streamedContent = '';
+ writable.on('data', chunk => (streamedContent += chunk));
+
+ const errors = [];
+ await act(() => {
+ renderToPipeableStream(, {
+ progressiveChunkSize: 5,
+ onError(e) {
+ errors.push(e);
+ },
+ }).pipe(writable);
+ });
+
+ if (gate(flags => flags.enableFizzBlockingRender)) {
+ expect(errors.length).toBe(1);
+ expect(errors[0].message).toContain(
+ // We set the chunk size low enough that the threshold rounds to zero kB
+ 'This rendered a large document (>0 kB) without any Suspense boundaries around most of it.',
+ );
+ } else {
+ expect(errors.length).toBe(0);
+ }
+
+ // We don't use the DOM here b/c we execute scripts which hides whether a fallback was shown briefly
+ // Instead we assert that we never emitted the fallback of the Suspense boundary around the body.
+ expect(streamedContent).not.toContain(randomTag);
+ });
});
diff --git a/packages/react-server/src/ReactFizzServer.js b/packages/react-server/src/ReactFizzServer.js
index b0df51e0bba64..d619385ec7db3 100644
--- a/packages/react-server/src/ReactFizzServer.js
+++ b/packages/react-server/src/ReactFizzServer.js
@@ -460,7 +460,13 @@ function isEligibleForOutlining(
// For very small boundaries, don't bother producing a fallback for outlining.
// The larger this limit is, the more we can save on preparing fallbacks in case we end up
// outlining.
- return boundary.byteSize > 500;
+ return (
+ boundary.byteSize > 500 &&
+ // For boundaries that can possibly contribute to the preamble we don't want to outline
+ // them regardless of their size since the fallbacks should only be emitted if we've
+ // errored the boundary.
+ boundary.contentPreamble === null
+ );
}
function defaultErrorHandler(error: mixed) {
@@ -5498,6 +5504,9 @@ function preparePreambleFromSegment(
// This boundary is complete. It might have inner boundaries which are pending
// and able to provide a preamble so we have to check it's children
hoistPreambleState(request.renderState, preamble);
+ // We track this boundary's byteSize on the request since it will always flush with
+ // the request since it may contribute to the preamble
+ request.byteSize += boundary.byteSize;
const boundaryRootSegment = boundary.completedSegments[0];
if (!boundaryRootSegment) {
// Using the same error from flushSegment to avoid making a new one since conceptually the problem is still the same
@@ -5544,6 +5553,7 @@ function preparePreamble(request: Request) {
request.completedPreambleSegments === null
) {
const collectedPreambleSegments: Array> = [];
+ const originalRequestByteSize = request.byteSize;
const hasPendingPreambles = preparePreambleFromSegment(
request,
request.completedRootSegment,
@@ -5551,6 +5561,10 @@ function preparePreamble(request: Request) {
);
if (isPreambleReady(request.renderState, hasPendingPreambles)) {
request.completedPreambleSegments = collectedPreambleSegments;
+ } else {
+ // We restore the original size since the preamble is not ready
+ // and we will prepare it again.
+ request.byteSize = originalRequestByteSize;
}
}
}