forked from facebook/react
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Flight] Prefix Replayed Console Logs with a Badge (facebook#28403)
Builds on top of facebook#28384. This prefixes each log with a badge similar to how we badge built-ins like "ForwardRef" and "Memo" in the React DevTools. The idea is that we can add such badges in DevTools for Server Components too to carry on the consistency. This puts the "environment" name in the badge which defaults to "Server". So you know which source it is coming from. We try to use the same styling as the React DevTools. We use light-dark mode where available to support the two different color styles, but if it's not available I use a fixed background so that it's always readable even in dark mode. In Terminals, instead of hard coding colors that might not look good with some themes, I use the ANSI color code to flip background/foreground colors in that case. In earlier commits I had it on the end of the line similar to the DevTools badges but for multiline I found it better to prefix it. We could try various options tough. In most cases we can use both ANSI and the `%c` CSS color specifier, because node will only use ANSI and hide the other. Chrome supports both but the color overrides ANSI if it comes later (and Chrome doesn't support color inverting anyway). Safari/Firefox prints the ANSI, so it can only use CSS colors. Therefore in browser builds I exclude ANSI. On the server I support both so if you use Chrome inspector on the server, you get nice colors on both terminal and in the inspector. Since Bun uses WebKit inspector and it prints the ANSI we can't safely emit both there. However, we also can't emit just the color specifier because then it prints in the terminal. oven-sh/bun#9021 So we just use a plain string prefix for now with a bracket until that's fixed. Screen shots: <img width="758" alt="Screenshot 2024-02-21 at 12 56 02 AM" src="https://github.com/facebook/react/assets/63648/4f887ffe-fffe-4402-bf2a-b7890986d60c"> <img width="759" alt="Screenshot 2024-02-21 at 12 56 24 AM" src="https://github.com/facebook/react/assets/63648/f32d432f-f738-4872-a700-ea0a78e6c745"> <img width="514" alt="Screenshot 2024-02-21 at 12 57 10 AM" src="https://github.com/facebook/react/assets/63648/205d2e82-75b7-4e2b-9d9c-aa9e2cbedf39"> <img width="489" alt="Screenshot 2024-02-21 at 12 57 34 AM" src="https://github.com/facebook/react/assets/63648/ea52d1e4-b9fa-431d-ae9e-ccb87631f399"> <img width="516" alt="Screenshot 2024-02-21 at 12 58 23 AM" src="https://github.com/facebook/react/assets/63648/52b50fac-bec0-471d-a457-1a10d8df9172"> <img width="956" alt="Screenshot 2024-02-21 at 12 58 56 AM" src="https://github.com/facebook/react/assets/63648/0096ed61-5eff-4aa9-8a8a-2204e754bd1f">
- Loading branch information
1 parent
19c3266
commit 9a1fd67
Showing
22 changed files
with
323 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
69 changes: 69 additions & 0 deletions
69
packages/react-client/src/ReactFlightClientConsoleConfigBrowser.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
/** | ||
* Copyright (c) Meta Platforms, Inc. and affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
* | ||
* @flow | ||
*/ | ||
|
||
const badgeFormat = '%c%s%c '; | ||
// Same badge styling as DevTools. | ||
const badgeStyle = | ||
// We use a fixed background if light-dark is not supported, otherwise | ||
// we use a transparent background. | ||
'background: #e6e6e6;' + | ||
'background: light-dark(rgba(0,0,0,0.1), rgba(255,255,255,0.25));' + | ||
'color: #000000;' + | ||
'color: light-dark(#000000, #ffffff);' + | ||
'border-radius: 2px'; | ||
const resetStyle = ''; | ||
const pad = ' '; | ||
|
||
export function printToConsole( | ||
methodName: string, | ||
args: Array<any>, | ||
badgeName: string, | ||
): void { | ||
let offset = 0; | ||
switch (methodName) { | ||
case 'dir': | ||
case 'dirxml': | ||
case 'groupEnd': | ||
case 'table': { | ||
// These methods cannot be colorized because they don't take a formatting string. | ||
// eslint-disable-next-line react-internal/no-production-logging | ||
console[methodName].apply(console, args); | ||
return; | ||
} | ||
case 'assert': { | ||
// assert takes formatting options as the second argument. | ||
offset = 1; | ||
} | ||
} | ||
|
||
const newArgs = args.slice(0); | ||
if (typeof newArgs[offset] === 'string') { | ||
newArgs.splice( | ||
offset, | ||
1, | ||
badgeFormat + newArgs[offset], | ||
badgeStyle, | ||
pad + badgeName + pad, | ||
resetStyle, | ||
); | ||
} else { | ||
newArgs.splice( | ||
offset, | ||
0, | ||
badgeFormat, | ||
badgeStyle, | ||
pad + badgeName + pad, | ||
resetStyle, | ||
); | ||
} | ||
|
||
// eslint-disable-next-line react-internal/no-production-logging | ||
console[methodName].apply(console, newArgs); | ||
return; | ||
} |
50 changes: 50 additions & 0 deletions
50
packages/react-client/src/ReactFlightClientConsoleConfigPlain.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/** | ||
* Copyright (c) Meta Platforms, Inc. and affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
* | ||
* @flow | ||
*/ | ||
|
||
const badgeFormat = '[%s] '; | ||
const pad = ' '; | ||
|
||
export function printToConsole( | ||
methodName: string, | ||
args: Array<any>, | ||
badgeName: string, | ||
): void { | ||
let offset = 0; | ||
switch (methodName) { | ||
case 'dir': | ||
case 'dirxml': | ||
case 'groupEnd': | ||
case 'table': { | ||
// These methods cannot be colorized because they don't take a formatting string. | ||
// eslint-disable-next-line react-internal/no-production-logging | ||
console[methodName].apply(console, args); | ||
return; | ||
} | ||
case 'assert': { | ||
// assert takes formatting options as the second argument. | ||
offset = 1; | ||
} | ||
} | ||
|
||
const newArgs = args.slice(0); | ||
if (typeof newArgs[offset] === 'string') { | ||
newArgs.splice( | ||
offset, | ||
1, | ||
badgeFormat + newArgs[offset], | ||
pad + badgeName + pad, | ||
); | ||
} else { | ||
newArgs.splice(offset, 0, badgeFormat, pad + badgeName + pad); | ||
} | ||
|
||
// eslint-disable-next-line react-internal/no-production-logging | ||
console[methodName].apply(console, newArgs); | ||
return; | ||
} |
70 changes: 70 additions & 0 deletions
70
packages/react-client/src/ReactFlightClientConsoleConfigServer.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
/** | ||
* Copyright (c) Meta Platforms, Inc. and affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
* | ||
* @flow | ||
*/ | ||
|
||
// This flips color using ANSI, then sets a color styling, then resets. | ||
const badgeFormat = '\x1b[0m\x1b[7m%c%s\x1b[0m%c '; | ||
// Same badge styling as DevTools. | ||
const badgeStyle = | ||
// We use a fixed background if light-dark is not supported, otherwise | ||
// we use a transparent background. | ||
'background: #e6e6e6;' + | ||
'background: light-dark(rgba(0,0,0,0.1), rgba(255,255,255,0.25));' + | ||
'color: #000000;' + | ||
'color: light-dark(#000000, #ffffff);' + | ||
'border-radius: 2px'; | ||
const resetStyle = ''; | ||
const pad = ' '; | ||
|
||
export function printToConsole( | ||
methodName: string, | ||
args: Array<any>, | ||
badgeName: string, | ||
): void { | ||
let offset = 0; | ||
switch (methodName) { | ||
case 'dir': | ||
case 'dirxml': | ||
case 'groupEnd': | ||
case 'table': { | ||
// These methods cannot be colorized because they don't take a formatting string. | ||
// eslint-disable-next-line react-internal/no-production-logging | ||
console[methodName].apply(console, args); | ||
return; | ||
} | ||
case 'assert': { | ||
// assert takes formatting options as the second argument. | ||
offset = 1; | ||
} | ||
} | ||
|
||
const newArgs = args.slice(0); | ||
if (typeof newArgs[offset] === 'string') { | ||
newArgs.splice( | ||
offset, | ||
1, | ||
badgeFormat + newArgs[offset], | ||
badgeStyle, | ||
pad + badgeName + pad, | ||
resetStyle, | ||
); | ||
} else { | ||
newArgs.splice( | ||
offset, | ||
0, | ||
badgeFormat, | ||
badgeStyle, | ||
pad + badgeName + pad, | ||
resetStyle, | ||
); | ||
} | ||
|
||
// eslint-disable-next-line react-internal/no-production-logging | ||
console[methodName].apply(console, newArgs); | ||
return; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.