Commit a9f14cb

Browse files
sebmarkbagesebmarkbage
authored
Fix Logging of Immediately Resolved Promises (#31610)
This avoid re-emitting the yellow "Event" log when we ping inside the original event. Instead of treating events as repeated when we get repeated updates, we treat them as repeated if we've ever logged out this event before. Additionally, in the case the prerender sibling flag is on we need to ensure that if a render gets interrupted when it has been suspended we treat that as "Prewarm" instead of "Interrupted Render". Before: <img width="539" alt="Screenshot 2024-11-19 at 2 39 44 PM" src="https://github.com/user-attachments/assets/190ca50c-5168-40d8-a6fd-6b9a583af1f0"> After: <img width="1004" alt="Screenshot 2024-11-21 at 4 53 16 PM" src="https://github.com/user-attachments/assets/0c441ada-1ed1-412c-8935-aaf040c25dfe">
1 parent c11c951 commit a9f14cb

2 files changed

Lines changed: 33 additions & 26 deletions

File tree

‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ import {
265265
startProfilerTimer,
266266
stopProfilerTimerIfRunningAndRecordDuration,
267267
stopProfilerTimerIfRunningAndRecordIncompleteDuration,
268-
markUpdateAsRepeat,
269268
trackSuspendedTime,
270269
startYieldTimer,
271270
yieldStartTime,
@@ -927,6 +926,7 @@ export function performWorkOnRoot(
927926
// We've returned from yielding to the event loop. Let's log the time it took.
928927
constyieldEndTime=now();
929928
switch(yieldReason){
929+
caseSuspendedOnImmediate:
930930
caseSuspendedOnData:
931931
logSuspendedYieldTime(yieldStartTime,yieldEndTime,yieldedFiber);
932932
break;
@@ -1009,7 +1009,6 @@ export function performWorkOnRoot(
10091009
setCurrentTrackFromLanes(lanes);
10101010
logInconsistentRender(renderStartTime,renderEndTime);
10111011
finalizeRender(lanes,renderEndTime);
1012-
markUpdateAsRepeat(lanes);
10131012
}
10141013
// A store was mutated in an interleaved event. Render again,
10151014
// synchronously, to block further mutations.
@@ -1036,7 +1035,6 @@ export function performWorkOnRoot(
10361035
setCurrentTrackFromLanes(lanes);
10371036
logErroredRenderPhase(renderStartTime,renderEndTime);
10381037
finalizeRender(lanes,renderEndTime);
1039-
markUpdateAsRepeat(lanes);
10401038
}
10411039
lanes=errorRetryLanes;
10421040
exitStatus=recoverFromConcurrentError(
@@ -1740,7 +1738,18 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
17401738
previousRenderStartTime>0
17411739
){
17421740
setCurrentTrackFromLanes(workInProgressRootRenderLanes);
1743-
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1741+
if(
1742+
workInProgressRootExitStatus===RootSuspended||
1743+
workInProgressRootExitStatus===RootSuspendedWithDelay
1744+
){
1745+
// If the root was already suspended when it got interrupted and restarted,
1746+
// then this is considered a prewarm and not an interrupted render because
1747+
// we couldn't have shown anything anyway so it's not a bad thing that we
1748+
// got interrupted.
1749+
logSuspendedRenderPhase(previousRenderStartTime,renderStartTime);
1750+
}else{
1751+
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1752+
}
17441753
finalizeRender(workInProgressRootRenderLanes,renderStartTime);
17451754
}
17461755

‎packages/react-reconciler/src/ReactProfilerTimer.js‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ export function startUpdateTimerByLane(lane: Lane): void {
8080
blockingUpdateTime=now();
8181
constnewEventTime=resolveEventTimeStamp();
8282
constnewEventType=resolveEventType();
83-
blockingEventIsRepeat=
84-
newEventTime===blockingEventTime&&
85-
newEventType===blockingEventType;
83+
if(
84+
newEventTime!==blockingEventTime||
85+
newEventType!==blockingEventType
86+
){
87+
blockingEventIsRepeat=false;
88+
}
8689
blockingEventTime=newEventTime;
8790
blockingEventType=newEventType;
8891
}
@@ -92,29 +95,19 @@ export function startUpdateTimerByLane(lane: Lane): void {
9295
if(transitionStartTime<0){
9396
constnewEventTime=resolveEventTimeStamp();
9497
constnewEventType=resolveEventType();
95-
transitionEventIsRepeat=
96-
newEventTime===transitionEventTime&&
97-
newEventType===transitionEventType;
98+
if(
99+
newEventTime!==transitionEventTime||
100+
newEventType!==transitionEventType
101+
){
102+
transitionEventIsRepeat=false;
103+
}
98104
transitionEventTime=newEventTime;
99105
transitionEventType=newEventType;
100106
}
101107
}
102108
}
103109
}
104110

105-
exportfunctionmarkUpdateAsRepeat(lanes: Lanes): void{
106-
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
107-
return;
108-
}
109-
// We're about to do a retry of this render. It is not a new update, so treat this
110-
// as a repeat within the same event.
111-
if(includesSyncLane(lanes)||includesBlockingLane(lanes)){
112-
blockingEventIsRepeat=true;
113-
}elseif(includesTransitionLane(lanes)){
114-
transitionEventIsRepeat=true;
115-
}
116-
}
117-
118111
exportfunctiontrackSuspendedTime(lanes: Lanes,renderEndTime: number){
119112
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
120113
return;
@@ -129,6 +122,7 @@ export function trackSuspendedTime(lanes: Lanes, renderEndTime: number) {
129122
exportfunctionclearBlockingTimers(): void{
130123
blockingUpdateTime=-1.1;
131124
blockingSuspendedTime=-1.1;
125+
blockingEventIsRepeat=true;
132126
}
133127

134128
exportfunctionstartAsyncTransitionTimer(): void{
@@ -139,9 +133,12 @@ export function startAsyncTransitionTimer(): void {
139133
transitionStartTime=now();
140134
constnewEventTime=resolveEventTimeStamp();
141135
constnewEventType=resolveEventType();
142-
transitionEventIsRepeat=
143-
newEventTime===transitionEventTime&&
144-
newEventType===transitionEventType;
136+
if(
137+
newEventTime!==transitionEventTime||
138+
newEventType!==transitionEventType
139+
){
140+
transitionEventIsRepeat=false;
141+
}
145142
transitionEventTime=newEventTime;
146143
transitionEventType=newEventType;
147144
}
@@ -173,6 +170,7 @@ export function clearTransitionTimers(): void {
173170
transitionStartTime=-1.1;
174171
transitionUpdateTime=-1.1;
175172
transitionSuspendedTime=-1.1;
173+
transitionEventIsRepeat=true;
176174
}
177175

178176
exportfunctionclampBlockingTimers(finalTime: number): void{

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Commit a9f14cb
Browse files
sebmarkbagesebmarkbage
authored
Fix Logging of Immediately Resolved Promises (#31610)
This avoid re-emitting the yellow "Event" log when we ping inside the
original event. Instead of treating events as repeated when we get
repeated updates, we treat them as repeated if we've ever logged out
this event before.
Additionally, in the case the prerender sibling flag is on we need to
ensure that if a render gets interrupted when it has been suspended we
treat that as "Prewarm" instead of "Interrupted Render".
Before:
<img width="539" alt="Screenshot 2024-11-19 at 2 39 44 PM"
src="https://github.com/user-attachments/assets/190ca50c-5168-40d8-a6fd-6b9a583af1f0">
After:
<img width="1004" alt="Screenshot 2024-11-21 at 4 53 16 PM"
src="https://github.com/user-attachments/assets/0c441ada-1ed1-412c-8935-aaf040c25dfe">
1 parent c11c951 commit a9f14cb
2 files changed
Lines changed: 33 additions & 26 deletions
File tree
‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ import {
265265
startProfilerTimer,
266266
stopProfilerTimerIfRunningAndRecordDuration,
267267
stopProfilerTimerIfRunningAndRecordIncompleteDuration,
268-
markUpdateAsRepeat,
269268
trackSuspendedTime,
270269
startYieldTimer,
271270
yieldStartTime,
@@ -927,6 +926,7 @@ export function performWorkOnRoot(
927926
// We've returned from yielding to the event loop. Let's log the time it took.
928927
constyieldEndTime=now();
929928
switch(yieldReason){
929+
caseSuspendedOnImmediate:
930930
caseSuspendedOnData:
931931
logSuspendedYieldTime(yieldStartTime,yieldEndTime,yieldedFiber);
932932
break;
@@ -1009,7 +1009,6 @@ export function performWorkOnRoot(
10091009
setCurrentTrackFromLanes(lanes);
10101010
logInconsistentRender(renderStartTime,renderEndTime);
10111011
finalizeRender(lanes,renderEndTime);
1012-
markUpdateAsRepeat(lanes);
10131012
}
10141013
// A store was mutated in an interleaved event. Render again,
10151014
// synchronously, to block further mutations.
@@ -1036,7 +1035,6 @@ export function performWorkOnRoot(
10361035
setCurrentTrackFromLanes(lanes);
10371036
logErroredRenderPhase(renderStartTime,renderEndTime);
10381037
finalizeRender(lanes,renderEndTime);
1039-
markUpdateAsRepeat(lanes);
10401038
}
10411039
lanes=errorRetryLanes;
10421040
exitStatus=recoverFromConcurrentError(
@@ -1740,7 +1738,18 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
17401738
previousRenderStartTime>0
17411739
){
17421740
setCurrentTrackFromLanes(workInProgressRootRenderLanes);
1743-
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1741+
if(
1742+
workInProgressRootExitStatus===RootSuspended||
1743+
workInProgressRootExitStatus===RootSuspendedWithDelay
1744+
){
1745+
// If the root was already suspended when it got interrupted and restarted,
1746+
// then this is considered a prewarm and not an interrupted render because
1747+
// we couldn't have shown anything anyway so it's not a bad thing that we
1748+
// got interrupted.
1749+
logSuspendedRenderPhase(previousRenderStartTime,renderStartTime);
1750+
}else{
1751+
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1752+
}
17441753
finalizeRender(workInProgressRootRenderLanes,renderStartTime);
17451754
}
17461755

‎packages/react-reconciler/src/ReactProfilerTimer.js‎
Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ export function startUpdateTimerByLane(lane: Lane): void {
8080
blockingUpdateTime=now();
8181
constnewEventTime=resolveEventTimeStamp();
8282
constnewEventType=resolveEventType();
83-
blockingEventIsRepeat=
84-
newEventTime===blockingEventTime&&
85-
newEventType===blockingEventType;
83+
if(
84+
newEventTime!==blockingEventTime||
85+
newEventType!==blockingEventType
86+
){
87+
blockingEventIsRepeat=false;
88+
}
8689
blockingEventTime=newEventTime;
8790
blockingEventType=newEventType;
8891
}
@@ -92,29 +95,19 @@ export function startUpdateTimerByLane(lane: Lane): void {
9295
if(transitionStartTime<0){
9396
constnewEventTime=resolveEventTimeStamp();
9497
constnewEventType=resolveEventType();
95-
transitionEventIsRepeat=
96-
newEventTime===transitionEventTime&&
97-
newEventType===transitionEventType;
98+
if(
99+
newEventTime!==transitionEventTime||
100+
newEventType!==transitionEventType
101+
){
102+
transitionEventIsRepeat=false;
103+
}
98104
transitionEventTime=newEventTime;
99105
transitionEventType=newEventType;
100106
}
101107
}
102108
}
103109
}
104110

105-
exportfunctionmarkUpdateAsRepeat(lanes: Lanes): void{
106-
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
107-
return;
108-
}
109-
// We're about to do a retry of this render. It is not a new update, so treat this
110-
// as a repeat within the same event.
111-
if(includesSyncLane(lanes)||includesBlockingLane(lanes)){
112-
blockingEventIsRepeat=true;
113-
}elseif(includesTransitionLane(lanes)){
114-
transitionEventIsRepeat=true;
115-
}
116-
}
117-
118111
exportfunctiontrackSuspendedTime(lanes: Lanes,renderEndTime: number){
119112
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
120113
return;
@@ -129,6 +122,7 @@ export function trackSuspendedTime(lanes: Lanes, renderEndTime: number) {
129122
exportfunctionclearBlockingTimers(): void{
130123
blockingUpdateTime=-1.1;
131124
blockingSuspendedTime=-1.1;
125+
blockingEventIsRepeat=true;
132126
}
133127

134128
exportfunctionstartAsyncTransitionTimer(): void{
@@ -139,9 +133,12 @@ export function startAsyncTransitionTimer(): void {
139133
transitionStartTime=now();
140134
constnewEventTime=resolveEventTimeStamp();
141135
constnewEventType=resolveEventType();
142-
transitionEventIsRepeat=
143-
newEventTime===transitionEventTime&&
144-
newEventType===transitionEventType;
136+
if(
137+
newEventTime!==transitionEventTime||
138+
newEventType!==transitionEventType
139+
){
140+
transitionEventIsRepeat=false;
141+
}
145142
transitionEventTime=newEventTime;
146143
transitionEventType=newEventType;
147144
}
@@ -173,6 +170,7 @@ export function clearTransitionTimers(): void {
173170
transitionStartTime=-1.1;
174171
transitionUpdateTime=-1.1;
175172
transitionSuspendedTime=-1.1;
173+
transitionEventIsRepeat=true;
176174
}
177175

178176
exportfunctionclampBlockingTimers(finalTime: number): void{
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit a9f14cb
Browse files
sebmarkbagesebmarkbage
authored
Fix Logging of Immediately Resolved Promises (#31610)
This avoid re-emitting the yellow "Event" log when we ping inside the
original event. Instead of treating events as repeated when we get
repeated updates, we treat them as repeated if we've ever logged out
this event before.
Additionally, in the case the prerender sibling flag is on we need to
ensure that if a render gets interrupted when it has been suspended we
treat that as "Prewarm" instead of "Interrupted Render".
Before:
<img width="539" alt="Screenshot 2024-11-19 at 2 39 44 PM"
src="https://github.com/user-attachments/assets/190ca50c-5168-40d8-a6fd-6b9a583af1f0">
After:
<img width="1004" alt="Screenshot 2024-11-21 at 4 53 16 PM"
src="https://github.com/user-attachments/assets/0c441ada-1ed1-412c-8935-aaf040c25dfe">
1 parent c11c951 commit a9f14cb
2 files changed
Lines changed: 33 additions & 26 deletions
File tree
‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ import {
265265
startProfilerTimer,
266266
stopProfilerTimerIfRunningAndRecordDuration,
267267
stopProfilerTimerIfRunningAndRecordIncompleteDuration,
268-
markUpdateAsRepeat,
269268
trackSuspendedTime,
270269
startYieldTimer,
271270
yieldStartTime,
@@ -927,6 +926,7 @@ export function performWorkOnRoot(
927926
// We've returned from yielding to the event loop. Let's log the time it took.
928927
constyieldEndTime=now();
929928
switch(yieldReason){
929+
caseSuspendedOnImmediate:
930930
caseSuspendedOnData:
931931
logSuspendedYieldTime(yieldStartTime,yieldEndTime,yieldedFiber);
932932
break;
@@ -1009,7 +1009,6 @@ export function performWorkOnRoot(
10091009
setCurrentTrackFromLanes(lanes);
10101010
logInconsistentRender(renderStartTime,renderEndTime);
10111011
finalizeRender(lanes,renderEndTime);
1012-
markUpdateAsRepeat(lanes);
10131012
}
10141013
// A store was mutated in an interleaved event. Render again,
10151014
// synchronously, to block further mutations.
@@ -1036,7 +1035,6 @@ export function performWorkOnRoot(
10361035
setCurrentTrackFromLanes(lanes);
10371036
logErroredRenderPhase(renderStartTime,renderEndTime);
10381037
finalizeRender(lanes,renderEndTime);
1039-
markUpdateAsRepeat(lanes);
10401038
}
10411039
lanes=errorRetryLanes;
10421040
exitStatus=recoverFromConcurrentError(
@@ -1740,7 +1738,18 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
17401738
previousRenderStartTime>0
17411739
){
17421740
setCurrentTrackFromLanes(workInProgressRootRenderLanes);
1743-
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1741+
if(
1742+
workInProgressRootExitStatus===RootSuspended||
1743+
workInProgressRootExitStatus===RootSuspendedWithDelay
1744+
){
1745+
// If the root was already suspended when it got interrupted and restarted,
1746+
// then this is considered a prewarm and not an interrupted render because
1747+
// we couldn't have shown anything anyway so it's not a bad thing that we
1748+
// got interrupted.
1749+
logSuspendedRenderPhase(previousRenderStartTime,renderStartTime);
1750+
}else{
1751+
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1752+
}
17441753
finalizeRender(workInProgressRootRenderLanes,renderStartTime);
17451754
}
17461755

‎packages/react-reconciler/src/ReactProfilerTimer.js‎
Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ export function startUpdateTimerByLane(lane: Lane): void {
8080
blockingUpdateTime=now();
8181
constnewEventTime=resolveEventTimeStamp();
8282
constnewEventType=resolveEventType();
83-
blockingEventIsRepeat=
84-
newEventTime===blockingEventTime&&
85-
newEventType===blockingEventType;
83+
if(
84+
newEventTime!==blockingEventTime||
85+
newEventType!==blockingEventType
86+
){
87+
blockingEventIsRepeat=false;
88+
}
8689
blockingEventTime=newEventTime;
8790
blockingEventType=newEventType;
8891
}
@@ -92,29 +95,19 @@ export function startUpdateTimerByLane(lane: Lane): void {
9295
if(transitionStartTime<0){
9396
constnewEventTime=resolveEventTimeStamp();
9497
constnewEventType=resolveEventType();
95-
transitionEventIsRepeat=
96-
newEventTime===transitionEventTime&&
97-
newEventType===transitionEventType;
98+
if(
99+
newEventTime!==transitionEventTime||
100+
newEventType!==transitionEventType
101+
){
102+
transitionEventIsRepeat=false;
103+
}
98104
transitionEventTime=newEventTime;
99105
transitionEventType=newEventType;
100106
}
101107
}
102108
}
103109
}
104110

105-
exportfunctionmarkUpdateAsRepeat(lanes: Lanes): void{
106-
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
107-
return;
108-
}
109-
// We're about to do a retry of this render. It is not a new update, so treat this
110-
// as a repeat within the same event.
111-
if(includesSyncLane(lanes)||includesBlockingLane(lanes)){
112-
blockingEventIsRepeat=true;
113-
}elseif(includesTransitionLane(lanes)){
114-
transitionEventIsRepeat=true;
115-
}
116-
}
117-
118111
exportfunctiontrackSuspendedTime(lanes: Lanes,renderEndTime: number){
119112
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
120113
return;
@@ -129,6 +122,7 @@ export function trackSuspendedTime(lanes: Lanes, renderEndTime: number) {
129122
exportfunctionclearBlockingTimers(): void{
130123
blockingUpdateTime=-1.1;
131124
blockingSuspendedTime=-1.1;
125+
blockingEventIsRepeat=true;
132126
}
133127

134128
exportfunctionstartAsyncTransitionTimer(): void{
@@ -139,9 +133,12 @@ export function startAsyncTransitionTimer(): void {
139133
transitionStartTime=now();
140134
constnewEventTime=resolveEventTimeStamp();
141135
constnewEventType=resolveEventType();
142-
transitionEventIsRepeat=
143-
newEventTime===transitionEventTime&&
144-
newEventType===transitionEventType;
136+
if(
137+
newEventTime!==transitionEventTime||
138+
newEventType!==transitionEventType
139+
){
140+
transitionEventIsRepeat=false;
141+
}
145142
transitionEventTime=newEventTime;
146143
transitionEventType=newEventType;
147144
}
@@ -173,6 +170,7 @@ export function clearTransitionTimers(): void {
173170
transitionStartTime=-1.1;
174171
transitionUpdateTime=-1.1;
175172
transitionSuspendedTime=-1.1;
173+
transitionEventIsRepeat=true;
176174
}
177175

178176
exportfunctionclampBlockingTimers(finalTime: number): void{
0 commit comments
Comments
 (0)

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

Skip to content
Commit a9f14cb
Browse files
sebmarkbagesebmarkbage
authored
Fix Logging of Immediately Resolved Promises (#31610)
This avoid re-emitting the yellow "Event" log when we ping inside the
original event. Instead of treating events as repeated when we get
repeated updates, we treat them as repeated if we've ever logged out
this event before.
Additionally, in the case the prerender sibling flag is on we need to
ensure that if a render gets interrupted when it has been suspended we
treat that as "Prewarm" instead of "Interrupted Render".
Before:
<img width="539" alt="Screenshot 2024-11-19 at 2 39 44 PM"
src="https://github.com/user-attachments/assets/190ca50c-5168-40d8-a6fd-6b9a583af1f0">
After:
<img width="1004" alt="Screenshot 2024-11-21 at 4 53 16 PM"
src="https://github.com/user-attachments/assets/0c441ada-1ed1-412c-8935-aaf040c25dfe">
1 parent c11c951 commit a9f14cb
2 files changed
Lines changed: 33 additions & 26 deletions
File tree
‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ import {
265265
startProfilerTimer,
266266
stopProfilerTimerIfRunningAndRecordDuration,
267267
stopProfilerTimerIfRunningAndRecordIncompleteDuration,
268-
markUpdateAsRepeat,
269268
trackSuspendedTime,
270269
startYieldTimer,
271270
yieldStartTime,
@@ -927,6 +926,7 @@ export function performWorkOnRoot(
927926
// We've returned from yielding to the event loop. Let's log the time it took.
928927
constyieldEndTime=now();
929928
switch(yieldReason){
929+
caseSuspendedOnImmediate:
930930
caseSuspendedOnData:
931931
logSuspendedYieldTime(yieldStartTime,yieldEndTime,yieldedFiber);
932932
break;
@@ -1009,7 +1009,6 @@ export function performWorkOnRoot(
10091009
setCurrentTrackFromLanes(lanes);
10101010
logInconsistentRender(renderStartTime,renderEndTime);
10111011
finalizeRender(lanes,renderEndTime);
1012-
markUpdateAsRepeat(lanes);
10131012
}
10141013
// A store was mutated in an interleaved event. Render again,
10151014
// synchronously, to block further mutations.
@@ -1036,7 +1035,6 @@ export function performWorkOnRoot(
10361035
setCurrentTrackFromLanes(lanes);
10371036
logErroredRenderPhase(renderStartTime,renderEndTime);
10381037
finalizeRender(lanes,renderEndTime);
1039-
markUpdateAsRepeat(lanes);
10401038
}
10411039
lanes=errorRetryLanes;
10421040
exitStatus=recoverFromConcurrentError(
@@ -1740,7 +1738,18 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
17401738
previousRenderStartTime>0
17411739
){
17421740
setCurrentTrackFromLanes(workInProgressRootRenderLanes);
1743-
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1741+
if(
1742+
workInProgressRootExitStatus===RootSuspended||
1743+
workInProgressRootExitStatus===RootSuspendedWithDelay
1744+
){
1745+
// If the root was already suspended when it got interrupted and restarted,
1746+
// then this is considered a prewarm and not an interrupted render because
1747+
// we couldn't have shown anything anyway so it's not a bad thing that we
1748+
// got interrupted.
1749+
logSuspendedRenderPhase(previousRenderStartTime,renderStartTime);
1750+
}else{
1751+
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1752+
}
17441753
finalizeRender(workInProgressRootRenderLanes,renderStartTime);
17451754
}
17461755

‎packages/react-reconciler/src/ReactProfilerTimer.js‎
Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ export function startUpdateTimerByLane(lane: Lane): void {
8080
blockingUpdateTime=now();
8181
constnewEventTime=resolveEventTimeStamp();
8282
constnewEventType=resolveEventType();
83-
blockingEventIsRepeat=
84-
newEventTime===blockingEventTime&&
85-
newEventType===blockingEventType;
83+
if(
84+
newEventTime!==blockingEventTime||
85+
newEventType!==blockingEventType
86+
){
87+
blockingEventIsRepeat=false;
88+
}
8689
blockingEventTime=newEventTime;
8790
blockingEventType=newEventType;
8891
}
@@ -92,29 +95,19 @@ export function startUpdateTimerByLane(lane: Lane): void {
9295
if(transitionStartTime<0){
9396
constnewEventTime=resolveEventTimeStamp();
9497
constnewEventType=resolveEventType();
95-
transitionEventIsRepeat=
96-
newEventTime===transitionEventTime&&
97-
newEventType===transitionEventType;
98+
if(
99+
newEventTime!==transitionEventTime||
100+
newEventType!==transitionEventType
101+
){
102+
transitionEventIsRepeat=false;
103+
}
98104
transitionEventTime=newEventTime;
99105
transitionEventType=newEventType;
100106
}
101107
}
102108
}
103109
}
104110

105-
exportfunctionmarkUpdateAsRepeat(lanes: Lanes): void{
106-
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
107-
return;
108-
}
109-
// We're about to do a retry of this render. It is not a new update, so treat this
110-
// as a repeat within the same event.
111-
if(includesSyncLane(lanes)||includesBlockingLane(lanes)){
112-
blockingEventIsRepeat=true;
113-
}elseif(includesTransitionLane(lanes)){
114-
transitionEventIsRepeat=true;
115-
}
116-
}
117-
118111
exportfunctiontrackSuspendedTime(lanes: Lanes,renderEndTime: number){
119112
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
120113
return;
@@ -129,6 +122,7 @@ export function trackSuspendedTime(lanes: Lanes, renderEndTime: number) {
129122
exportfunctionclearBlockingTimers(): void{
130123
blockingUpdateTime=-1.1;
131124
blockingSuspendedTime=-1.1;
125+
blockingEventIsRepeat=true;
132126
}
133127

134128
exportfunctionstartAsyncTransitionTimer(): void{
@@ -139,9 +133,12 @@ export function startAsyncTransitionTimer(): void {
139133
transitionStartTime=now();
140134
constnewEventTime=resolveEventTimeStamp();
141135
constnewEventType=resolveEventType();
142-
transitionEventIsRepeat=
143-
newEventTime===transitionEventTime&&
144-
newEventType===transitionEventType;
136+
if(
137+
newEventTime!==transitionEventTime||
138+
newEventType!==transitionEventType
139+
){
140+
transitionEventIsRepeat=false;
141+
}
145142
transitionEventTime=newEventTime;
146143
transitionEventType=newEventType;
147144
}
@@ -173,6 +170,7 @@ export function clearTransitionTimers(): void {
173170
transitionStartTime=-1.1;
174171
transitionUpdateTime=-1.1;
175172
transitionSuspendedTime=-1.1;
173+
transitionEventIsRepeat=true;
176174
}
177175

178176
exportfunctionclampBlockingTimers(finalTime: number): void{
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Commit a9f14cb
Browse files
sebmarkbagesebmarkbage
authored
Fix Logging of Immediately Resolved Promises (#31610)
This avoid re-emitting the yellow "Event" log when we ping inside the
original event. Instead of treating events as repeated when we get
repeated updates, we treat them as repeated if we've ever logged out
this event before.
Additionally, in the case the prerender sibling flag is on we need to
ensure that if a render gets interrupted when it has been suspended we
treat that as "Prewarm" instead of "Interrupted Render".
Before:
<img width="539" alt="Screenshot 2024-11-19 at 2 39 44 PM"
src="https://github.com/user-attachments/assets/190ca50c-5168-40d8-a6fd-6b9a583af1f0">
After:
<img width="1004" alt="Screenshot 2024-11-21 at 4 53 16 PM"
src="https://github.com/user-attachments/assets/0c441ada-1ed1-412c-8935-aaf040c25dfe">
1 parent c11c951 commit a9f14cb
2 files changed
Lines changed: 33 additions & 26 deletions
File tree
‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ import {
265265
startProfilerTimer,
266266
stopProfilerTimerIfRunningAndRecordDuration,
267267
stopProfilerTimerIfRunningAndRecordIncompleteDuration,
268-
markUpdateAsRepeat,
269268
trackSuspendedTime,
270269
startYieldTimer,
271270
yieldStartTime,
@@ -927,6 +926,7 @@ export function performWorkOnRoot(
927926
// We've returned from yielding to the event loop. Let's log the time it took.
928927
constyieldEndTime=now();
929928
switch(yieldReason){
929+
caseSuspendedOnImmediate:
930930
caseSuspendedOnData:
931931
logSuspendedYieldTime(yieldStartTime,yieldEndTime,yieldedFiber);
932932
break;
@@ -1009,7 +1009,6 @@ export function performWorkOnRoot(
10091009
setCurrentTrackFromLanes(lanes);
10101010
logInconsistentRender(renderStartTime,renderEndTime);
10111011
finalizeRender(lanes,renderEndTime);
1012-
markUpdateAsRepeat(lanes);
10131012
}
10141013
// A store was mutated in an interleaved event. Render again,
10151014
// synchronously, to block further mutations.
@@ -1036,7 +1035,6 @@ export function performWorkOnRoot(
10361035
setCurrentTrackFromLanes(lanes);
10371036
logErroredRenderPhase(renderStartTime,renderEndTime);
10381037
finalizeRender(lanes,renderEndTime);
1039-
markUpdateAsRepeat(lanes);
10401038
}
10411039
lanes=errorRetryLanes;
10421040
exitStatus=recoverFromConcurrentError(
@@ -1740,7 +1738,18 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
17401738
previousRenderStartTime>0
17411739
){
17421740
setCurrentTrackFromLanes(workInProgressRootRenderLanes);
1743-
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1741+
if(
1742+
workInProgressRootExitStatus===RootSuspended||
1743+
workInProgressRootExitStatus===RootSuspendedWithDelay
1744+
){
1745+
// If the root was already suspended when it got interrupted and restarted,
1746+
// then this is considered a prewarm and not an interrupted render because
1747+
// we couldn't have shown anything anyway so it's not a bad thing that we
1748+
// got interrupted.
1749+
logSuspendedRenderPhase(previousRenderStartTime,renderStartTime);
1750+
}else{
1751+
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1752+
}
17441753
finalizeRender(workInProgressRootRenderLanes,renderStartTime);
17451754
}
17461755

‎packages/react-reconciler/src/ReactProfilerTimer.js‎
Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ export function startUpdateTimerByLane(lane: Lane): void {
8080
blockingUpdateTime=now();
8181
constnewEventTime=resolveEventTimeStamp();
8282
constnewEventType=resolveEventType();
83-
blockingEventIsRepeat=
84-
newEventTime===blockingEventTime&&
85-
newEventType===blockingEventType;
83+
if(
84+
newEventTime!==blockingEventTime||
85+
newEventType!==blockingEventType
86+
){
87+
blockingEventIsRepeat=false;
88+
}
8689
blockingEventTime=newEventTime;
8790
blockingEventType=newEventType;
8891
}
@@ -92,29 +95,19 @@ export function startUpdateTimerByLane(lane: Lane): void {
9295
if(transitionStartTime<0){
9396
constnewEventTime=resolveEventTimeStamp();
9497
constnewEventType=resolveEventType();
95-
transitionEventIsRepeat=
96-
newEventTime===transitionEventTime&&
97-
newEventType===transitionEventType;
98+
if(
99+
newEventTime!==transitionEventTime||
100+
newEventType!==transitionEventType
101+
){
102+
transitionEventIsRepeat=false;
103+
}
98104
transitionEventTime=newEventTime;
99105
transitionEventType=newEventType;
100106
}
101107
}
102108
}
103109
}
104110

105-
exportfunctionmarkUpdateAsRepeat(lanes: Lanes): void{
106-
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
107-
return;
108-
}
109-
// We're about to do a retry of this render. It is not a new update, so treat this
110-
// as a repeat within the same event.
111-
if(includesSyncLane(lanes)||includesBlockingLane(lanes)){
112-
blockingEventIsRepeat=true;
113-
}elseif(includesTransitionLane(lanes)){
114-
transitionEventIsRepeat=true;
115-
}
116-
}
117-
118111
exportfunctiontrackSuspendedTime(lanes: Lanes,renderEndTime: number){
119112
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
120113
return;
@@ -129,6 +122,7 @@ export function trackSuspendedTime(lanes: Lanes, renderEndTime: number) {
129122
exportfunctionclearBlockingTimers(): void{
130123
blockingUpdateTime=-1.1;
131124
blockingSuspendedTime=-1.1;
125+
blockingEventIsRepeat=true;
132126
}
133127

134128
exportfunctionstartAsyncTransitionTimer(): void{
@@ -139,9 +133,12 @@ export function startAsyncTransitionTimer(): void {
139133
transitionStartTime=now();
140134
constnewEventTime=resolveEventTimeStamp();
141135
constnewEventType=resolveEventType();
142-
transitionEventIsRepeat=
143-
newEventTime===transitionEventTime&&
144-
newEventType===transitionEventType;
136+
if(
137+
newEventTime!==transitionEventTime||
138+
newEventType!==transitionEventType
139+
){
140+
transitionEventIsRepeat=false;
141+
}
145142
transitionEventTime=newEventTime;
146143
transitionEventType=newEventType;
147144
}
@@ -173,6 +170,7 @@ export function clearTransitionTimers(): void {
173170
transitionStartTime=-1.1;
174171
transitionUpdateTime=-1.1;
175172
transitionSuspendedTime=-1.1;
173+
transitionEventIsRepeat=true;
176174
}
177175

178176
exportfunctionclampBlockingTimers(finalTime: number): void{
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit a9f14cb
Browse files
sebmarkbagesebmarkbage
authored
Fix Logging of Immediately Resolved Promises (#31610)
This avoid re-emitting the yellow "Event" log when we ping inside the
original event. Instead of treating events as repeated when we get
repeated updates, we treat them as repeated if we've ever logged out
this event before.
Additionally, in the case the prerender sibling flag is on we need to
ensure that if a render gets interrupted when it has been suspended we
treat that as "Prewarm" instead of "Interrupted Render".
Before:
<img width="539" alt="Screenshot 2024-11-19 at 2 39 44 PM"
src="https://github.com/user-attachments/assets/190ca50c-5168-40d8-a6fd-6b9a583af1f0">
After:
<img width="1004" alt="Screenshot 2024-11-21 at 4 53 16 PM"
src="https://github.com/user-attachments/assets/0c441ada-1ed1-412c-8935-aaf040c25dfe">
1 parent c11c951 commit a9f14cb
2 files changed
Lines changed: 33 additions & 26 deletions
File tree
‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ import {
265265
startProfilerTimer,
266266
stopProfilerTimerIfRunningAndRecordDuration,
267267
stopProfilerTimerIfRunningAndRecordIncompleteDuration,
268-
markUpdateAsRepeat,
269268
trackSuspendedTime,
270269
startYieldTimer,
271270
yieldStartTime,
@@ -927,6 +926,7 @@ export function performWorkOnRoot(
927926
// We've returned from yielding to the event loop. Let's log the time it took.
928927
constyieldEndTime=now();
929928
switch(yieldReason){
929+
caseSuspendedOnImmediate:
930930
caseSuspendedOnData:
931931
logSuspendedYieldTime(yieldStartTime,yieldEndTime,yieldedFiber);
932932
break;
@@ -1009,7 +1009,6 @@ export function performWorkOnRoot(
10091009
setCurrentTrackFromLanes(lanes);
10101010
logInconsistentRender(renderStartTime,renderEndTime);
10111011
finalizeRender(lanes,renderEndTime);
1012-
markUpdateAsRepeat(lanes);
10131012
}
10141013
// A store was mutated in an interleaved event. Render again,
10151014
// synchronously, to block further mutations.
@@ -1036,7 +1035,6 @@ export function performWorkOnRoot(
10361035
setCurrentTrackFromLanes(lanes);
10371036
logErroredRenderPhase(renderStartTime,renderEndTime);
10381037
finalizeRender(lanes,renderEndTime);
1039-
markUpdateAsRepeat(lanes);
10401038
}
10411039
lanes=errorRetryLanes;
10421040
exitStatus=recoverFromConcurrentError(
@@ -1740,7 +1738,18 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
17401738
previousRenderStartTime>0
17411739
){
17421740
setCurrentTrackFromLanes(workInProgressRootRenderLanes);
1743-
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1741+
if(
1742+
workInProgressRootExitStatus===RootSuspended||
1743+
workInProgressRootExitStatus===RootSuspendedWithDelay
1744+
){
1745+
// If the root was already suspended when it got interrupted and restarted,
1746+
// then this is considered a prewarm and not an interrupted render because
1747+
// we couldn't have shown anything anyway so it's not a bad thing that we
1748+
// got interrupted.
1749+
logSuspendedRenderPhase(previousRenderStartTime,renderStartTime);
1750+
}else{
1751+
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1752+
}
17441753
finalizeRender(workInProgressRootRenderLanes,renderStartTime);
17451754
}
17461755

‎packages/react-reconciler/src/ReactProfilerTimer.js‎
Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ export function startUpdateTimerByLane(lane: Lane): void {
8080
blockingUpdateTime=now();
8181
constnewEventTime=resolveEventTimeStamp();
8282
constnewEventType=resolveEventType();
83-
blockingEventIsRepeat=
84-
newEventTime===blockingEventTime&&
85-
newEventType===blockingEventType;
83+
if(
84+
newEventTime!==blockingEventTime||
85+
newEventType!==blockingEventType
86+
){
87+
blockingEventIsRepeat=false;
88+
}
8689
blockingEventTime=newEventTime;
8790
blockingEventType=newEventType;
8891
}
@@ -92,29 +95,19 @@ export function startUpdateTimerByLane(lane: Lane): void {
9295
if(transitionStartTime<0){
9396
constnewEventTime=resolveEventTimeStamp();
9497
constnewEventType=resolveEventType();
95-
transitionEventIsRepeat=
96-
newEventTime===transitionEventTime&&
97-
newEventType===transitionEventType;
98+
if(
99+
newEventTime!==transitionEventTime||
100+
newEventType!==transitionEventType
101+
){
102+
transitionEventIsRepeat=false;
103+
}
98104
transitionEventTime=newEventTime;
99105
transitionEventType=newEventType;
100106
}
101107
}
102108
}
103109
}
104110

105-
exportfunctionmarkUpdateAsRepeat(lanes: Lanes): void{
106-
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
107-
return;
108-
}
109-
// We're about to do a retry of this render. It is not a new update, so treat this
110-
// as a repeat within the same event.
111-
if(includesSyncLane(lanes)||includesBlockingLane(lanes)){
112-
blockingEventIsRepeat=true;
113-
}elseif(includesTransitionLane(lanes)){
114-
transitionEventIsRepeat=true;
115-
}
116-
}
117-
118111
exportfunctiontrackSuspendedTime(lanes: Lanes,renderEndTime: number){
119112
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
120113
return;
@@ -129,6 +122,7 @@ export function trackSuspendedTime(lanes: Lanes, renderEndTime: number) {
129122
exportfunctionclearBlockingTimers(): void{
130123
blockingUpdateTime=-1.1;
131124
blockingSuspendedTime=-1.1;
125+
blockingEventIsRepeat=true;
132126
}
133127

134128
exportfunctionstartAsyncTransitionTimer(): void{
@@ -139,9 +133,12 @@ export function startAsyncTransitionTimer(): void {
139133
transitionStartTime=now();
140134
constnewEventTime=resolveEventTimeStamp();
141135
constnewEventType=resolveEventType();
142-
transitionEventIsRepeat=
143-
newEventTime===transitionEventTime&&
144-
newEventType===transitionEventType;
136+
if(
137+
newEventTime!==transitionEventTime||
138+
newEventType!==transitionEventType
139+
){
140+
transitionEventIsRepeat=false;
141+
}
145142
transitionEventTime=newEventTime;
146143
transitionEventType=newEventType;
147144
}
@@ -173,6 +170,7 @@ export function clearTransitionTimers(): void {
173170
transitionStartTime=-1.1;
174171
transitionUpdateTime=-1.1;
175172
transitionSuspendedTime=-1.1;
173+
transitionEventIsRepeat=true;
176174
}
177175

178176
exportfunctionclampBlockingTimers(finalTime: number): void{
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Commit a9f14cb
Browse files
sebmarkbagesebmarkbage
authored
Fix Logging of Immediately Resolved Promises (#31610)
This avoid re-emitting the yellow "Event" log when we ping inside the
original event. Instead of treating events as repeated when we get
repeated updates, we treat them as repeated if we've ever logged out
this event before.
Additionally, in the case the prerender sibling flag is on we need to
ensure that if a render gets interrupted when it has been suspended we
treat that as "Prewarm" instead of "Interrupted Render".
Before:
<img width="539" alt="Screenshot 2024-11-19 at 2 39 44 PM"
src="https://github.com/user-attachments/assets/190ca50c-5168-40d8-a6fd-6b9a583af1f0">
After:
<img width="1004" alt="Screenshot 2024-11-21 at 4 53 16 PM"
src="https://github.com/user-attachments/assets/0c441ada-1ed1-412c-8935-aaf040c25dfe">
1 parent c11c951 commit a9f14cb
2 files changed
Lines changed: 33 additions & 26 deletions
File tree
‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ import {
265265
startProfilerTimer,
266266
stopProfilerTimerIfRunningAndRecordDuration,
267267
stopProfilerTimerIfRunningAndRecordIncompleteDuration,
268-
markUpdateAsRepeat,
269268
trackSuspendedTime,
270269
startYieldTimer,
271270
yieldStartTime,
@@ -927,6 +926,7 @@ export function performWorkOnRoot(
927926
// We've returned from yielding to the event loop. Let's log the time it took.
928927
constyieldEndTime=now();
929928
switch(yieldReason){
929+
caseSuspendedOnImmediate:
930930
caseSuspendedOnData:
931931
logSuspendedYieldTime(yieldStartTime,yieldEndTime,yieldedFiber);
932932
break;
@@ -1009,7 +1009,6 @@ export function performWorkOnRoot(
10091009
setCurrentTrackFromLanes(lanes);
10101010
logInconsistentRender(renderStartTime,renderEndTime);
10111011
finalizeRender(lanes,renderEndTime);
1012-
markUpdateAsRepeat(lanes);
10131012
}
10141013
// A store was mutated in an interleaved event. Render again,
10151014
// synchronously, to block further mutations.
@@ -1036,7 +1035,6 @@ export function performWorkOnRoot(
10361035
setCurrentTrackFromLanes(lanes);
10371036
logErroredRenderPhase(renderStartTime,renderEndTime);
10381037
finalizeRender(lanes,renderEndTime);
1039-
markUpdateAsRepeat(lanes);
10401038
}
10411039
lanes=errorRetryLanes;
10421040
exitStatus=recoverFromConcurrentError(
@@ -1740,7 +1738,18 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
17401738
previousRenderStartTime>0
17411739
){
17421740
setCurrentTrackFromLanes(workInProgressRootRenderLanes);
1743-
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1741+
if(
1742+
workInProgressRootExitStatus===RootSuspended||
1743+
workInProgressRootExitStatus===RootSuspendedWithDelay
1744+
){
1745+
// If the root was already suspended when it got interrupted and restarted,
1746+
// then this is considered a prewarm and not an interrupted render because
1747+
// we couldn't have shown anything anyway so it's not a bad thing that we
1748+
// got interrupted.
1749+
logSuspendedRenderPhase(previousRenderStartTime,renderStartTime);
1750+
}else{
1751+
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1752+
}
17441753
finalizeRender(workInProgressRootRenderLanes,renderStartTime);
17451754
}
17461755

‎packages/react-reconciler/src/ReactProfilerTimer.js‎
Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ export function startUpdateTimerByLane(lane: Lane): void {
8080
blockingUpdateTime=now();
8181
constnewEventTime=resolveEventTimeStamp();
8282
constnewEventType=resolveEventType();
83-
blockingEventIsRepeat=
84-
newEventTime===blockingEventTime&&
85-
newEventType===blockingEventType;
83+
if(
84+
newEventTime!==blockingEventTime||
85+
newEventType!==blockingEventType
86+
){
87+
blockingEventIsRepeat=false;
88+
}
8689
blockingEventTime=newEventTime;
8790
blockingEventType=newEventType;
8891
}
@@ -92,29 +95,19 @@ export function startUpdateTimerByLane(lane: Lane): void {
9295
if(transitionStartTime<0){
9396
constnewEventTime=resolveEventTimeStamp();
9497
constnewEventType=resolveEventType();
95-
transitionEventIsRepeat=
96-
newEventTime===transitionEventTime&&
97-
newEventType===transitionEventType;
98+
if(
99+
newEventTime!==transitionEventTime||
100+
newEventType!==transitionEventType
101+
){
102+
transitionEventIsRepeat=false;
103+
}
98104
transitionEventTime=newEventTime;
99105
transitionEventType=newEventType;
100106
}
101107
}
102108
}
103109
}
104110

105-
exportfunctionmarkUpdateAsRepeat(lanes: Lanes): void{
106-
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
107-
return;
108-
}
109-
// We're about to do a retry of this render. It is not a new update, so treat this
110-
// as a repeat within the same event.
111-
if(includesSyncLane(lanes)||includesBlockingLane(lanes)){
112-
blockingEventIsRepeat=true;
113-
}elseif(includesTransitionLane(lanes)){
114-
transitionEventIsRepeat=true;
115-
}
116-
}
117-
118111
exportfunctiontrackSuspendedTime(lanes: Lanes,renderEndTime: number){
119112
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
120113
return;
@@ -129,6 +122,7 @@ export function trackSuspendedTime(lanes: Lanes, renderEndTime: number) {
129122
exportfunctionclearBlockingTimers(): void{
130123
blockingUpdateTime=-1.1;
131124
blockingSuspendedTime=-1.1;
125+
blockingEventIsRepeat=true;
132126
}
133127

134128
exportfunctionstartAsyncTransitionTimer(): void{
@@ -139,9 +133,12 @@ export function startAsyncTransitionTimer(): void {
139133
transitionStartTime=now();
140134
constnewEventTime=resolveEventTimeStamp();
141135
constnewEventType=resolveEventType();
142-
transitionEventIsRepeat=
143-
newEventTime===transitionEventTime&&
144-
newEventType===transitionEventType;
136+
if(
137+
newEventTime!==transitionEventTime||
138+
newEventType!==transitionEventType
139+
){
140+
transitionEventIsRepeat=false;
141+
}
145142
transitionEventTime=newEventTime;
146143
transitionEventType=newEventType;
147144
}
@@ -173,6 +170,7 @@ export function clearTransitionTimers(): void {
173170
transitionStartTime=-1.1;
174171
transitionUpdateTime=-1.1;
175172
transitionSuspendedTime=-1.1;
173+
transitionEventIsRepeat=true;
176174
}
177175

178176
exportfunctionclampBlockingTimers(finalTime: number): void{
0 commit comments
Comments
 (0)

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

Skip to content
Commit a9f14cb
Browse files
sebmarkbagesebmarkbage
authored
Fix Logging of Immediately Resolved Promises (#31610)
This avoid re-emitting the yellow "Event" log when we ping inside the
original event. Instead of treating events as repeated when we get
repeated updates, we treat them as repeated if we've ever logged out
this event before.
Additionally, in the case the prerender sibling flag is on we need to
ensure that if a render gets interrupted when it has been suspended we
treat that as "Prewarm" instead of "Interrupted Render".
Before:
<img width="539" alt="Screenshot 2024-11-19 at 2 39 44 PM"
src="https://github.com/user-attachments/assets/190ca50c-5168-40d8-a6fd-6b9a583af1f0">
After:
<img width="1004" alt="Screenshot 2024-11-21 at 4 53 16 PM"
src="https://github.com/user-attachments/assets/0c441ada-1ed1-412c-8935-aaf040c25dfe">
1 parent c11c951 commit a9f14cb
2 files changed
Lines changed: 33 additions & 26 deletions
File tree
‎packages/react-reconciler/src/ReactFiberWorkLoop.js‎
Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ import {
265265
startProfilerTimer,
266266
stopProfilerTimerIfRunningAndRecordDuration,
267267
stopProfilerTimerIfRunningAndRecordIncompleteDuration,
268-
markUpdateAsRepeat,
269268
trackSuspendedTime,
270269
startYieldTimer,
271270
yieldStartTime,
@@ -927,6 +926,7 @@ export function performWorkOnRoot(
927926
// We've returned from yielding to the event loop. Let's log the time it took.
928927
constyieldEndTime=now();
929928
switch(yieldReason){
929+
caseSuspendedOnImmediate:
930930
caseSuspendedOnData:
931931
logSuspendedYieldTime(yieldStartTime,yieldEndTime,yieldedFiber);
932932
break;
@@ -1009,7 +1009,6 @@ export function performWorkOnRoot(
10091009
setCurrentTrackFromLanes(lanes);
10101010
logInconsistentRender(renderStartTime,renderEndTime);
10111011
finalizeRender(lanes,renderEndTime);
1012-
markUpdateAsRepeat(lanes);
10131012
}
10141013
// A store was mutated in an interleaved event. Render again,
10151014
// synchronously, to block further mutations.
@@ -1036,7 +1035,6 @@ export function performWorkOnRoot(
10361035
setCurrentTrackFromLanes(lanes);
10371036
logErroredRenderPhase(renderStartTime,renderEndTime);
10381037
finalizeRender(lanes,renderEndTime);
1039-
markUpdateAsRepeat(lanes);
10401038
}
10411039
lanes=errorRetryLanes;
10421040
exitStatus=recoverFromConcurrentError(
@@ -1740,7 +1738,18 @@ function prepareFreshStack(root: FiberRoot, lanes: Lanes): Fiber {
17401738
previousRenderStartTime>0
17411739
){
17421740
setCurrentTrackFromLanes(workInProgressRootRenderLanes);
1743-
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1741+
if(
1742+
workInProgressRootExitStatus===RootSuspended||
1743+
workInProgressRootExitStatus===RootSuspendedWithDelay
1744+
){
1745+
// If the root was already suspended when it got interrupted and restarted,
1746+
// then this is considered a prewarm and not an interrupted render because
1747+
// we couldn't have shown anything anyway so it's not a bad thing that we
1748+
// got interrupted.
1749+
logSuspendedRenderPhase(previousRenderStartTime,renderStartTime);
1750+
}else{
1751+
logInterruptedRenderPhase(previousRenderStartTime,renderStartTime);
1752+
}
17441753
finalizeRender(workInProgressRootRenderLanes,renderStartTime);
17451754
}
17461755

‎packages/react-reconciler/src/ReactProfilerTimer.js‎
Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,12 @@ export function startUpdateTimerByLane(lane: Lane): void {
8080
blockingUpdateTime=now();
8181
constnewEventTime=resolveEventTimeStamp();
8282
constnewEventType=resolveEventType();
83-
blockingEventIsRepeat=
84-
newEventTime===blockingEventTime&&
85-
newEventType===blockingEventType;
83+
if(
84+
newEventTime!==blockingEventTime||
85+
newEventType!==blockingEventType
86+
){
87+
blockingEventIsRepeat=false;
88+
}
8689
blockingEventTime=newEventTime;
8790
blockingEventType=newEventType;
8891
}
@@ -92,29 +95,19 @@ export function startUpdateTimerByLane(lane: Lane): void {
9295
if(transitionStartTime<0){
9396
constnewEventTime=resolveEventTimeStamp();
9497
constnewEventType=resolveEventType();
95-
transitionEventIsRepeat=
96-
newEventTime===transitionEventTime&&
97-
newEventType===transitionEventType;
98+
if(
99+
newEventTime!==transitionEventTime||
100+
newEventType!==transitionEventType
101+
){
102+
transitionEventIsRepeat=false;
103+
}
98104
transitionEventTime=newEventTime;
99105
transitionEventType=newEventType;
100106
}
101107
}
102108
}
103109
}
104110

105-
exportfunctionmarkUpdateAsRepeat(lanes: Lanes): void{
106-
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
107-
return;
108-
}
109-
// We're about to do a retry of this render. It is not a new update, so treat this
110-
// as a repeat within the same event.
111-
if(includesSyncLane(lanes)||includesBlockingLane(lanes)){
112-
blockingEventIsRepeat=true;
113-
}elseif(includesTransitionLane(lanes)){
114-
transitionEventIsRepeat=true;
115-
}
116-
}
117-
118111
exportfunctiontrackSuspendedTime(lanes: Lanes,renderEndTime: number){
119112
if(!enableProfilerTimer||!enableComponentPerformanceTrack){
120113
return;
@@ -129,6 +122,7 @@ export function trackSuspendedTime(lanes: Lanes, renderEndTime: number) {
129122
exportfunctionclearBlockingTimers(): void{
130123
blockingUpdateTime=-1.1;
131124
blockingSuspendedTime=-1.1;
125+
blockingEventIsRepeat=true;
132126
}
133127

134128
exportfunctionstartAsyncTransitionTimer(): void{
@@ -139,9 +133,12 @@ export function startAsyncTransitionTimer(): void {
139133
transitionStartTime=now();
140134
constnewEventTime=resolveEventTimeStamp();
141135
constnewEventType=resolveEventType();
142-
transitionEventIsRepeat=
143-
newEventTime===transitionEventTime&&
144-
newEventType===transitionEventType;
136+
if(
137+
newEventTime!==transitionEventTime||
138+
newEventType!==transitionEventType
139+
){
140+
transitionEventIsRepeat=false;
141+
}
145142
transitionEventTime=newEventTime;
146143
transitionEventType=newEventType;
147144
}
@@ -173,6 +170,7 @@ export function clearTransitionTimers(): void {
173170
transitionStartTime=-1.1;
174171
transitionUpdateTime=-1.1;
175172
transitionSuspendedTime=-1.1;
173+
transitionEventIsRepeat=true;
176174
}
177175

178176
exportfunctionclampBlockingTimers(finalTime: number): void{
0 commit comments
Comments
 (0)