Skip to content

[Flight] Revert Emit Infinite Promise as a Halted Row (#30746) #30748

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2024
Merged

[Flight] Revert Emit Infinite Promise as a Halted Row (#30746) #30748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions packages/react-client/src/ReactFlightClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import {
enableRefAsProp,
enableFlightReadableStream,
enableOwnerStacks,
enableHalt,
} from 'shared/ReactFeatureFlags';

import {
Expand Down Expand Up @@ -1193,6 +1194,10 @@ function parseModelString(
}
case '@': {
// Promise
if (value.length === 2) {
// Infinite promise that never resolves.
return new Promise(() => {});
}
const id = parseInt(value.slice(2), 16);
const chunk = getChunk(response, id);
return chunk;
Expand Down Expand Up @@ -2633,8 +2638,10 @@ function processFullStringRow(
}
// Fallthrough
case 35 /* "#" */: {
resolveBlocked(response, id);
return;
if (enableHalt) {
resolveBlocked(response, id);
return;
}
}
// Fallthrough
default: /* """ "{" "[" "t" "f" "n" "0" - "9" */ {
Expand Down
1 change: 0 additions & 1 deletion packages/react-client/src/__tests__/ReactFlight-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3026,7 +3026,6 @@ describe('ReactFlight', () => {

const promise = mockConsoleLog.mock.calls[0][1].promise;
expect(promise).toBeInstanceOf(Promise);
expect(promise.status).toBe('blocked');

expect(ownerStacks).toEqual(['\n in App (at **)']);
});
Expand Down
9 changes: 5 additions & 4 deletions packages/react-server/src/ReactFlightServer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1817,6 +1817,10 @@ function serializeLazyID(id: number): string {
return '$L' + id.toString(16);
}

function serializeInfinitePromise(): string {
return '$@';
}

function serializePromiseID(id: number): string {
return '$@' + id.toString(16);
}
Expand Down Expand Up @@ -3269,10 +3273,7 @@ function renderConsoleValue(
}
// If it hasn't already resolved (and been instrumented) we just encode an infinite
// promise that will never resolve.
request.pendingChunks++;
const blockedId = request.nextChunkId++;
emitBlockedChunk(request, blockedId);
return serializePromiseID(blockedId);
return serializeInfinitePromise();
}

if (existingReference !== undefined) {
Expand Down