Skip to content

Commit 21272a6

Browse files
sebmarkbagesebmarkbage
authored
Lower case "rsc stream" debug info (facebook#34921)
This is an aesthetic thing. Most simple I/O entries are things like "script", "stylesheet", "fetch" etc. which are all a single word and lower case. The "RSC stream" name sticks out and draws unnecessary attention to itself where as it's really the least interesting to look at. I don't love the name because I'm not sure how to explain it. It's really mainly the byte size of the payload itself without considering things like server awaits things which will have their own cause. So I'm trying to communicate the download size of the stream of downloading the `.rsc` file or the `"rsc stream"`.
1 parent 1440f4f commit 21272a6

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

‎packages/internal-test-utils/debugInfo.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function normalizeIOInfo(config: DebugInfoConfig, ioInfo) {
6464
if (promise) {
6565
promise.then(); // init
6666
if (promise.status === 'fulfilled') {
67-
if (ioInfo.name === 'RSC stream') {
67+
if (ioInfo.name === 'rsc stream') {
6868
copy.byteSize = 0;
6969
copy.value = {
7070
value: 'stream',
@@ -117,7 +117,7 @@ export function getDebugInfo(config: DebugInfoConfig, obj) {
117117
for (let i = 0; i < debugInfo.length; i++) {
118118
if (
119119
debugInfo[i].awaited &&
120-
debugInfo[i].awaited.name === 'RSC stream' &&
120+
debugInfo[i].awaited.name === 'rsc stream' &&
121121
config.ignoreRscStreamInfo
122122
) {
123123
// Ignore RSC stream I/O info.

‎packages/react-client/src/ReactFlightClient.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2721,7 +2721,7 @@ export function createStreamState(
27212721
(debugValuePromise: any).status = 'fulfilled';
27222722
(debugValuePromise: any).value = streamDebugValue;
27232723
streamState._debugInfo = {
2724-
name: 'RSC stream',
2724+
name: 'rsc stream',
27252725
start: response._debugStartTime,
27262726
end: response._debugStartTime, // will be updated once we finish a chunk
27272727
byteSize: 0, // will be updated as we resolve a data chunk

‎packages/react-devtools-shared/src/backend/fiber/renderer.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6171,7 +6171,10 @@ export function attach(
61716171
}
61726172
}
61736173
const newIO = asyncInfo.awaited;
6174-
if (newIO.name === 'RSC stream' && newIO.value != null) {
6174+
if (
6175+
(newIO.name === 'RSC stream' || newIO.name === 'rsc stream') &&
6176+
newIO.value != null
6177+
) {
61756178
const streamPromise = newIO.value;
61766179
// Special case RSC stream entries to pick the last entry keyed by the stream.
61776180
const existingEntry = streamEntries.get(streamPromise);
@@ -6230,7 +6233,10 @@ export function attach(
62306233
continue;
62316234
}
62326235
foundIOEntries.add(ioInfo);
6233-
if (ioInfo.name === 'RSC stream' && ioInfo.value != null) {
6236+
if (
6237+
(ioInfo.name === 'RSC stream' || ioInfo.name === 'rsc stream') &&
6238+
ioInfo.value != null
6239+
) {
62346240
const streamPromise = ioInfo.value;
62356241
// Special case RSC stream entries to pick the last entry keyed by the stream.
62366242
const existingEntry = streamEntries.get(streamPromise);

‎packages/react-server/src/__tests__/ReactFlightAsyncDebugInfo-test.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
459459
"awaited": {
460460
"byteSize": 0,
461461
"end": 0,
462-
"name": "RSC stream",
462+
"name": "rsc stream",
463463
"owner": null,
464464
"start": 0,
465465
"value": {
@@ -867,7 +867,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
867867
"awaited": {
868868
"byteSize": 0,
869869
"end": 0,
870-
"name": "RSC stream",
870+
"name": "rsc stream",
871871
"owner": null,
872872
"start": 0,
873873
"value": {
@@ -985,7 +985,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
985985
"awaited": {
986986
"byteSize": 0,
987987
"end": 0,
988-
"name": "RSC stream",
988+
"name": "rsc stream",
989989
"owner": null,
990990
"start": 0,
991991
"value": {
@@ -1460,7 +1460,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
14601460
"byteSize": 0,
14611461
"end": 0,
14621462
"env": "Server",
1463-
"name": "RSC stream",
1463+
"name": "rsc stream",
14641464
"start": 0,
14651465
"value": {
14661466
"value": "stream",
@@ -1475,7 +1475,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
14751475
"awaited": {
14761476
"byteSize": 0,
14771477
"end": 0,
1478-
"name": "RSC stream",
1478+
"name": "rsc stream",
14791479
"owner": null,
14801480
"start": 0,
14811481
"value": {
@@ -1789,7 +1789,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
17891789
"awaited": {
17901790
"byteSize": 0,
17911791
"end": 0,
1792-
"name": "RSC stream",
1792+
"name": "rsc stream",
17931793
"owner": null,
17941794
"start": 0,
17951795
"value": {
@@ -2083,7 +2083,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
20832083
"awaited": {
20842084
"byteSize": 0,
20852085
"end": 0,
2086-
"name": "RSC stream",
2086+
"name": "rsc stream",
20872087
"owner": null,
20882088
"start": 0,
20892089
"value": {
@@ -2499,7 +2499,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
24992499
"awaited": {
25002500
"byteSize": 0,
25012501
"end": 0,
2502-
"name": "RSC stream",
2502+
"name": "rsc stream",
25032503
"owner": null,
25042504
"start": 0,
25052505
"value": {
@@ -2665,7 +2665,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
26652665
"awaited": {
26662666
"byteSize": 0,
26672667
"end": 0,
2668-
"name": "RSC stream",
2668+
"name": "rsc stream",
26692669
"owner": null,
26702670
"start": 0,
26712671
"value": {
@@ -2845,7 +2845,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
28452845
"awaited": {
28462846
"byteSize": 0,
28472847
"end": 0,
2848-
"name": "RSC stream",
2848+
"name": "rsc stream",
28492849
"owner": null,
28502850
"start": 0,
28512851
"value": {
@@ -3130,7 +3130,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
31303130
"awaited": {
31313131
"byteSize": 0,
31323132
"end": 0,
3133-
"name": "RSC stream",
3133+
"name": "rsc stream",
31343134
"owner": null,
31353135
"start": 0,
31363136
"value": {
@@ -3275,7 +3275,7 @@ describe('ReactFlightAsyncDebugInfo', () => {
32753275
"awaited": {
32763276
"byteSize": 0,
32773277
"end": 0,
3278-
"name": "RSC stream",
3278+
"name": "rsc stream",
32793279
"owner": null,
32803280
"start": 0,
32813281
"value": {

0 commit comments

Comments
 (0)