Skip to content

Commit bf4170e

Browse files
committed
Always load the external runtime if one is provided
1 parent ee7fee8 commit bf4170e

File tree

3 files changed

+2
-16
lines changed

3 files changed

+2
-16
lines changed

packages/react-dom-bindings/src/server/ReactFizzConfigDOM.js

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5089,15 +5089,10 @@ export function writePreambleStart(
50895089
destination: Destination,
50905090
resumableState: ResumableState,
50915091
renderState: RenderState,
5092-
willFlushAllSegments: boolean,
50935092
skipExpect?: boolean, // Used as an override by ReactFizzConfigMarkup
50945093
): void {
50955094
// This function must be called exactly once on every request
5096-
if (
5097-
enableFizzExternalRuntime &&
5098-
!willFlushAllSegments &&
5099-
renderState.externalRuntimeScript
5100-
) {
5095+
if (enableFizzExternalRuntime && renderState.externalRuntimeScript) {
51015096
// If the root segment is incomplete due to suspended tasks
51025097
// (e.g. willFlushAllSegments = false) and we are using data
51035098
// streaming format, ensure the external runtime is sent.

packages/react-markup/src/ReactFizzConfigMarkup.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,12 @@ export function writePreambleStart(
208208
destination: Destination,
209209
resumableState: ResumableState,
210210
renderState: RenderState,
211-
willFlushAllSegments: boolean,
212211
skipExpect?: boolean, // Used as an override by ReactFizzConfigMarkup
213212
): void {
214213
return writePreambleStartImpl(
215214
destination,
216215
resumableState,
217216
renderState,
218-
willFlushAllSegments,
219217
true, // skipExpect
220218
);
221219
}

packages/react-server/src/ReactFizzServer.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4835,14 +4835,7 @@ function flushPreamble(
48354835
preambleSegments: Array<Array<Segment>>,
48364836
) {
48374837
// The preamble is ready.
4838-
const willFlushAllSegments =
4839-
request.allPendingTasks === 0 && request.trackedPostpones === null;
4840-
writePreambleStart(
4841-
destination,
4842-
request.resumableState,
4843-
request.renderState,
4844-
willFlushAllSegments,
4845-
);
4838+
writePreambleStart(destination, request.resumableState, request.renderState);
48464839
for (let i = 0; i < preambleSegments.length; i++) {
48474840
const segments = preambleSegments[i];
48484841
for (let j = 0; j < segments.length; j++) {

0 commit comments

Comments
 (0)