Skip to content

Commit 21272a6

Browse files
authored
Lower case "rsc stream" debug info (#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

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Lower case "rsc stream" debug info (#34921) · react/react@21272a6 · GitHub
Skip to content

Commit 21272a6

Browse files
authored
Lower case "rsc stream" debug info (#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

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Lower case "rsc stream" debug info (#34921) · react/react@21272a6 · GitHub
Skip to content

Commit 21272a6

Browse files
authored
Lower case "rsc stream" debug info (#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

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Lower case "rsc stream" debug info (#34921) · react/react@21272a6 · GitHub
Skip to content

Commit 21272a6

Browse files
authored
Lower case "rsc stream" debug info (#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

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Lower case "rsc stream" debug info (#34921) · react/react@21272a6 · GitHub
Skip to content

Commit 21272a6

Browse files
authored
Lower case "rsc stream" debug info (#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

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Lower case "rsc stream" debug info (#34921) · react/react@21272a6 · GitHub
Skip to content

Commit 21272a6

Browse files
authored
Lower case "rsc stream" debug info (#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

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Lower case "rsc stream" debug info (#34921) · react/react@21272a6 · GitHub
Skip to content

Commit 21272a6

Browse files
authored
Lower case "rsc stream" debug info (#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

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎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(leti=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)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); Lower case "rsc stream" debug info (#34921) · react/react@21272a6 · GitHub
Skip to content

Commit 21272a6

Browse files
authored
Lower case "rsc stream" debug info (#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

4 files changed

Lines changed: 23 additions & 17 deletions

File tree

‎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(leti=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)