Skip to content

[pull] main from facebook:main #346

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
Oct 20, 2025
+23 −17
Merged

[pull] main from facebook:main #346

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
4 changes: 2 additions & 2 deletions packages/internal-test-utils/debugInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function normalizeIOInfo(config: DebugInfoConfig, ioInfo) {
if (promise) {
promise.then(); // init
if (promise.status === 'fulfilled') {
if (ioInfo.name === 'RSC stream') {
if (ioInfo.name === 'rsc stream') {
copy.byteSize = 0;
copy.value = {
value: 'stream',
Expand Down Expand Up @@ -117,7 +117,7 @@ export function getDebugInfo(config: DebugInfoConfig, obj) {
for (let i = 0; i < debugInfo.length; i++) {
if (
debugInfo[i].awaited &&
debugInfo[i].awaited.name === 'RSC stream' &&
debugInfo[i].awaited.name === 'rsc stream' &&
config.ignoreRscStreamInfo
) {
// Ignore RSC stream I/O info.
Expand Down
2 changes: 1 addition & 1 deletion packages/react-client/src/ReactFlightClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2721,7 +2721,7 @@ export function createStreamState(
(debugValuePromise: any).status = 'fulfilled';
(debugValuePromise: any).value = streamDebugValue;
streamState._debugInfo = {
name: 'RSC stream',
name: 'rsc stream',
start: response._debugStartTime,
end: response._debugStartTime, // will be updated once we finish a chunk
byteSize: 0, // will be updated as we resolve a data chunk
Expand Down
10 changes: 8 additions & 2 deletions packages/react-devtools-shared/src/backend/fiber/renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6171,7 +6171,10 @@ export function attach(
}
}
const newIO = asyncInfo.awaited;
if (newIO.name === 'RSC stream' && newIO.value != null) {
if (
(newIO.name === 'RSC stream' || newIO.name === 'rsc stream') &&
newIO.value != null
) {
const streamPromise = newIO.value;
// Special case RSC stream entries to pick the last entry keyed by the stream.
const existingEntry = streamEntries.get(streamPromise);
Expand Down Expand Up @@ -6230,7 +6233,10 @@ export function attach(
continue;
}
foundIOEntries.add(ioInfo);
if (ioInfo.name === 'RSC stream' && ioInfo.value != null) {
if (
(ioInfo.name === 'RSC stream' || ioInfo.name === 'rsc stream') &&
ioInfo.value != null
) {
const streamPromise = ioInfo.value;
// Special case RSC stream entries to pick the last entry keyed by the stream.
const existingEntry = streamEntries.get(streamPromise);
Expand Down
24 changes: 12 additions & 12 deletions packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -867,7 +867,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -985,7 +985,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -1460,7 +1460,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"byteSize": 0,
"end": 0,
"env": "Server",
"name": "RSC stream",
"name": "rsc stream",
"start": 0,
"value": {
"value": "stream",
Expand All @@ -1475,7 +1475,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -1789,7 +1789,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -2083,7 +2083,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -2499,7 +2499,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -2665,7 +2665,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -2845,7 +2845,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -3130,7 +3130,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down Expand Up @@ -3275,7 +3275,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
"awaited": {
"byteSize": 0,
"end": 0,
"name": "RSC stream",
"name": "rsc stream",
"owner": null,
"start": 0,
"value": {
Expand Down
Loading