Skip to content

Commit b1533b0

Browse files
lubieowocelubieowoce
authored
[Flight] Allow overriding request.timeOrigin via options.startTime (#35598)
Currently, IO that finished before the request started is not considered IO: https://github.com/facebook/react/blob/6a0ab4d2dd62dfdf8881ba1c3443c6d5acedc871/packages/react-server/src/ReactFlightServer.js#L5338-L5343 This leads to loss of debug info when a flight stream is deserialized and serialized again. We can solve this by allowing "when the the request started" to be set to a point in the past, when the original stream started by doing ```js const startTime = performance.now() + performance.timeOrigin // ... stuff happens and time passes... ReactServer.renderToReadableStream(..., { startTime }) ```
1 parent 5dad2b4 commit b1533b0

15 files changed

Lines changed: 356 additions & 2 deletions

File tree

‎packages/react-markup/src/ReactMarkupServer.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export function experimental_renderToHTML(
184184
handleFlightError,
185185
options ? options.identifierPrefix : undefined,
186186
undefined,
187+
undefined,
187188
'Markup',
188189
undefined,
189190
false,

‎packages/react-noop-renderer/src/ReactNoopFlightServer.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ type Options = {
7373
signal?: AbortSignal,
7474
debugChannel?: {onMessage?: (message: string)=>void},
7575
onError?: (error: mixed)=>void,
76+
startTime?: number,
7677
};
7778

7879
functionrender(model: ReactClientValue,options?: Options): Destination{
@@ -84,6 +85,7 @@ function render(model: ReactClientValue, options?: Options): Destination {
8485
options ? options.onError : undefined,
8586
options ? options.identifierPrefix : undefined,
8687
undefined,
88+
options ? options.startTime : undefined,
8789
__DEV__&&options ? options.environmentName : undefined,
8890
__DEV__&&options ? options.filterStackFrame : undefined,
8991
__DEV__&&options&&options.debugChannel!==undefined,

‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ type Options = {
146146
onError?: (error: mixed)=>void,
147147
identifierPrefix?: string,
148148
temporaryReferences?: TemporaryReferenceSet,
149+
startTime?: number,
149150
};
150151

151152
typePipeableStream={
@@ -183,6 +184,7 @@ function renderToPipeableStream(
183184
options ? options.onError : undefined,
184185
options ? options.identifierPrefix : undefined,
185186
options ? options.temporaryReferences : undefined,
187+
options ? options.startTime : undefined,
186188
__DEV__&&options ? options.environmentName : undefined,
187189
__DEV__&&options ? options.filterStackFrame : undefined,
188190
debugChannel!==undefined,
@@ -272,6 +274,7 @@ type PrerenderOptions = {
272274
identifierPrefix?: string,
273275
temporaryReferences?: TemporaryReferenceSet,
274276
signal?: AbortSignal,
277+
startTime?: number,
275278
};
276279

277280
typeStaticResult={
@@ -303,6 +306,7 @@ function prerenderToNodeStream(
303306
options ? options.onError : undefined,
304307
options ? options.identifierPrefix : undefined,
305308
options ? options.temporaryReferences : undefined,
309+
options ? options.startTime : undefined,
306310
__DEV__&&options ? options.environmentName : undefined,
307311
__DEV__&&options ? options.filterStackFrame : undefined,
308312
false,

‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -67,6 +68,7 @@ type Options = {
6768
signal?: AbortSignal,
6869
temporaryReferences?: TemporaryReferenceSet,
6970
onError?: (error: mixed)=>void,
71+
startTime?: number,
7072
};
7173

7274
functionstartReadingFromDebugChannelReadableStream(
@@ -128,6 +130,7 @@ export function renderToReadableStream(
128130
options ? options.onError : undefined,
129131
options ? options.identifierPrefix : undefined,
130132
options ? options.temporaryReferences : undefined,
133+
options ? options.startTime : undefined,
131134
__DEV__&&options ? options.environmentName : undefined,
132135
__DEV__&&options ? options.filterStackFrame : undefined,
133136
debugChannelReadable!==undefined,
@@ -215,6 +218,7 @@ export function prerender(
215218
options ? options.onError : undefined,
216219
options ? options.identifierPrefix : undefined,
217220
options ? options.temporaryReferences : undefined,
221+
options ? options.startTime : undefined,
218222
__DEV__&&options ? options.environmentName : undefined,
219223
__DEV__&&options ? options.filterStackFrame : undefined,
220224
false,

‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -72,6 +73,7 @@ type Options = {
7273
signal?: AbortSignal,
7374
temporaryReferences?: TemporaryReferenceSet,
7475
onError?: (error: mixed)=>void,
76+
startTime?: number,
7577
};
7678

7779
functionstartReadingFromDebugChannelReadableStream(
@@ -133,6 +135,7 @@ export function renderToReadableStream(
133135
options ? options.onError : undefined,
134136
options ? options.identifierPrefix : undefined,
135137
options ? options.temporaryReferences : undefined,
138+
options ? options.startTime : undefined,
136139
__DEV__&&options ? options.environmentName : undefined,
137140
__DEV__&&options ? options.filterStackFrame : undefined,
138141
debugChannelReadable!==undefined,
@@ -220,6 +223,7 @@ export function prerender(
220223
options ? options.onError : undefined,
221224
options ? options.identifierPrefix : undefined,
222225
options ? options.temporaryReferences : undefined,
226+
options ? options.startTime : undefined,
223227
__DEV__&&options ? options.environmentName : undefined,
224228
__DEV__&&options ? options.filterStackFrame : undefined,
225229
false,

‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ type Options = {
159159
onError?: (error: mixed)=>void,
160160
identifierPrefix?: string,
161161
temporaryReferences?: TemporaryReferenceSet,
162+
startTime?: number,
162163
};
163164

164165
typePipeableStream={
@@ -195,6 +196,7 @@ export function renderToPipeableStream(
195196
options ? options.onError : undefined,
196197
options ? options.identifierPrefix : undefined,
197198
options ? options.temporaryReferences : undefined,
199+
options ? options.startTime : undefined,
198200
__DEV__&&options ? options.environmentName : undefined,
199201
__DEV__&&options ? options.filterStackFrame : undefined,
200202
debugChannel!==undefined,
@@ -352,6 +354,7 @@ export function renderToReadableStream(
352354
options ? options.onError : undefined,
353355
options ? options.identifierPrefix : undefined,
354356
options ? options.temporaryReferences : undefined,
357+
options ? options.startTime : undefined,
355358
__DEV__&&options ? options.environmentName : undefined,
356359
__DEV__&&options ? options.filterStackFrame : undefined,
357360
debugChannelReadable!==undefined,
@@ -434,6 +437,7 @@ type PrerenderOptions = {
434437
identifierPrefix?: string,
435438
temporaryReferences?: TemporaryReferenceSet,
436439
signal?: AbortSignal,
440+
startTime?: number,
437441
};
438442

439443
typeStaticResult={
@@ -464,6 +468,7 @@ export function prerenderToNodeStream(
464468
options ? options.onError : undefined,
465469
options ? options.identifierPrefix : undefined,
466470
options ? options.temporaryReferences : undefined,
471+
options ? options.startTime : undefined,
467472
__DEV__&&options ? options.environmentName : undefined,
468473
__DEV__&&options ? options.filterStackFrame : undefined,
469474
false,
@@ -526,6 +531,7 @@ export function prerender(
526531
options ? options.onError : undefined,
527532
options ? options.identifierPrefix : undefined,
528533
options ? options.temporaryReferences : undefined,
534+
options ? options.startTime : undefined,
529535
__DEV__&&options ? options.environmentName : undefined,
530536
__DEV__&&options ? options.filterStackFrame : undefined,
531537
false,

‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type Options = {
6464
signal?: AbortSignal,
6565
temporaryReferences?: TemporaryReferenceSet,
6666
onError?: (error: mixed)=>void,
67+
startTime?: number,
6768
};
6869

6970
functionstartReadingFromDebugChannelReadableStream(
@@ -126,6 +127,7 @@ function renderToReadableStream(
126127
options ? options.onError : undefined,
127128
options ? options.identifierPrefix : undefined,
128129
options ? options.temporaryReferences : undefined,
130+
options ? options.startTime : undefined,
129131
__DEV__&&options ? options.environmentName : undefined,
130132
__DEV__&&options ? options.filterStackFrame : undefined,
131133
debugChannelReadable!==undefined,
@@ -214,6 +216,7 @@ function prerender(
214216
options ? options.onError : undefined,
215217
options ? options.identifierPrefix : undefined,
216218
options ? options.temporaryReferences : undefined,
219+
options ? options.startTime : undefined,
217220
__DEV__&&options ? options.environmentName : undefined,
218221
__DEV__&&options ? options.filterStackFrame : undefined,
219222
false,

‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type Options = {
6969
signal?: AbortSignal,
7070
temporaryReferences?: TemporaryReferenceSet,
7171
onError?: (error: mixed)=>void,
72+
startTime?: number,
7273
};
7374

7475
functionstartReadingFromDebugChannelReadableStream(
@@ -131,6 +132,7 @@ function renderToReadableStream(
131132
options ? options.onError : undefined,
132133
options ? options.identifierPrefix : undefined,
133134
options ? options.temporaryReferences : undefined,
135+
options ? options.startTime : undefined,
134136
__DEV__&&options ? options.environmentName : undefined,
135137
__DEV__&&options ? options.filterStackFrame : undefined,
136138
debugChannelReadable!==undefined,
@@ -219,6 +221,7 @@ function prerender(
219221
options ? options.onError : undefined,
220222
options ? options.identifierPrefix : undefined,
221223
options ? options.temporaryReferences : undefined,
224+
options ? options.startTime : undefined,
222225
__DEV__&&options ? options.environmentName : undefined,
223226
__DEV__&&options ? options.filterStackFrame : undefined,
224227
false,

‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannel!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,

‎packages/react-server-dom-unbundled/src/server/ReactFlightDOMServerNode.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannelReadable!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,

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" + '
[Flight] Allow overriding `request.timeOrigin` via `options.startTime… · react/react@b1533b0 · GitHub
Skip to content
Commit b1533b0
Browse files
lubieowocelubieowoce
authored
[Flight] Allow overriding request.timeOrigin via options.startTime (#35598)
Currently, IO that finished before the request started is not considered
IO:
https://github.com/facebook/react/blob/6a0ab4d2dd62dfdf8881ba1c3443c6d5acedc871/packages/react-server/src/ReactFlightServer.js#L5338-L5343
This leads to loss of debug info when a flight stream is deserialized
and serialized again.
We can solve this by allowing "when the the request started" to be set
to a point in the past, when the original stream started by doing
```js
const startTime = performance.now() + performance.timeOrigin
// ... stuff happens and time passes...
ReactServer.renderToReadableStream(..., { startTime })
```
1 parent 5dad2b4 commit b1533b0
15 files changed
Lines changed: 356 additions & 2 deletions
File tree
‎packages/react-markup/src/ReactMarkupServer.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export function experimental_renderToHTML(
184184
handleFlightError,
185185
options ? options.identifierPrefix : undefined,
186186
undefined,
187+
undefined,
187188
'Markup',
188189
undefined,
189190
false,
‎packages/react-noop-renderer/src/ReactNoopFlightServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ type Options = {
7373
signal?: AbortSignal,
7474
debugChannel?: {onMessage?: (message: string)=>void},
7575
onError?: (error: mixed)=>void,
76+
startTime?: number,
7677
};
7778

7879
functionrender(model: ReactClientValue,options?: Options): Destination{
@@ -84,6 +85,7 @@ function render(model: ReactClientValue, options?: Options): Destination {
8485
options ? options.onError : undefined,
8586
options ? options.identifierPrefix : undefined,
8687
undefined,
88+
options ? options.startTime : undefined,
8789
__DEV__&&options ? options.environmentName : undefined,
8890
__DEV__&&options ? options.filterStackFrame : undefined,
8991
__DEV__&&options&&options.debugChannel!==undefined,
‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ type Options = {
146146
onError?: (error: mixed)=>void,
147147
identifierPrefix?: string,
148148
temporaryReferences?: TemporaryReferenceSet,
149+
startTime?: number,
149150
};
150151

151152
typePipeableStream={
@@ -183,6 +184,7 @@ function renderToPipeableStream(
183184
options ? options.onError : undefined,
184185
options ? options.identifierPrefix : undefined,
185186
options ? options.temporaryReferences : undefined,
187+
options ? options.startTime : undefined,
186188
__DEV__&&options ? options.environmentName : undefined,
187189
__DEV__&&options ? options.filterStackFrame : undefined,
188190
debugChannel!==undefined,
@@ -272,6 +274,7 @@ type PrerenderOptions = {
272274
identifierPrefix?: string,
273275
temporaryReferences?: TemporaryReferenceSet,
274276
signal?: AbortSignal,
277+
startTime?: number,
275278
};
276279

277280
typeStaticResult={
@@ -303,6 +306,7 @@ function prerenderToNodeStream(
303306
options ? options.onError : undefined,
304307
options ? options.identifierPrefix : undefined,
305308
options ? options.temporaryReferences : undefined,
309+
options ? options.startTime : undefined,
306310
__DEV__&&options ? options.environmentName : undefined,
307311
__DEV__&&options ? options.filterStackFrame : undefined,
308312
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -67,6 +68,7 @@ type Options = {
6768
signal?: AbortSignal,
6869
temporaryReferences?: TemporaryReferenceSet,
6970
onError?: (error: mixed)=>void,
71+
startTime?: number,
7072
};
7173

7274
functionstartReadingFromDebugChannelReadableStream(
@@ -128,6 +130,7 @@ export function renderToReadableStream(
128130
options ? options.onError : undefined,
129131
options ? options.identifierPrefix : undefined,
130132
options ? options.temporaryReferences : undefined,
133+
options ? options.startTime : undefined,
131134
__DEV__&&options ? options.environmentName : undefined,
132135
__DEV__&&options ? options.filterStackFrame : undefined,
133136
debugChannelReadable!==undefined,
@@ -215,6 +218,7 @@ export function prerender(
215218
options ? options.onError : undefined,
216219
options ? options.identifierPrefix : undefined,
217220
options ? options.temporaryReferences : undefined,
221+
options ? options.startTime : undefined,
218222
__DEV__&&options ? options.environmentName : undefined,
219223
__DEV__&&options ? options.filterStackFrame : undefined,
220224
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -72,6 +73,7 @@ type Options = {
7273
signal?: AbortSignal,
7374
temporaryReferences?: TemporaryReferenceSet,
7475
onError?: (error: mixed)=>void,
76+
startTime?: number,
7577
};
7678

7779
functionstartReadingFromDebugChannelReadableStream(
@@ -133,6 +135,7 @@ export function renderToReadableStream(
133135
options ? options.onError : undefined,
134136
options ? options.identifierPrefix : undefined,
135137
options ? options.temporaryReferences : undefined,
138+
options ? options.startTime : undefined,
136139
__DEV__&&options ? options.environmentName : undefined,
137140
__DEV__&&options ? options.filterStackFrame : undefined,
138141
debugChannelReadable!==undefined,
@@ -220,6 +223,7 @@ export function prerender(
220223
options ? options.onError : undefined,
221224
options ? options.identifierPrefix : undefined,
222225
options ? options.temporaryReferences : undefined,
226+
options ? options.startTime : undefined,
223227
__DEV__&&options ? options.environmentName : undefined,
224228
__DEV__&&options ? options.filterStackFrame : undefined,
225229
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ type Options = {
159159
onError?: (error: mixed)=>void,
160160
identifierPrefix?: string,
161161
temporaryReferences?: TemporaryReferenceSet,
162+
startTime?: number,
162163
};
163164

164165
typePipeableStream={
@@ -195,6 +196,7 @@ export function renderToPipeableStream(
195196
options ? options.onError : undefined,
196197
options ? options.identifierPrefix : undefined,
197198
options ? options.temporaryReferences : undefined,
199+
options ? options.startTime : undefined,
198200
__DEV__&&options ? options.environmentName : undefined,
199201
__DEV__&&options ? options.filterStackFrame : undefined,
200202
debugChannel!==undefined,
@@ -352,6 +354,7 @@ export function renderToReadableStream(
352354
options ? options.onError : undefined,
353355
options ? options.identifierPrefix : undefined,
354356
options ? options.temporaryReferences : undefined,
357+
options ? options.startTime : undefined,
355358
__DEV__&&options ? options.environmentName : undefined,
356359
__DEV__&&options ? options.filterStackFrame : undefined,
357360
debugChannelReadable!==undefined,
@@ -434,6 +437,7 @@ type PrerenderOptions = {
434437
identifierPrefix?: string,
435438
temporaryReferences?: TemporaryReferenceSet,
436439
signal?: AbortSignal,
440+
startTime?: number,
437441
};
438442

439443
typeStaticResult={
@@ -464,6 +468,7 @@ export function prerenderToNodeStream(
464468
options ? options.onError : undefined,
465469
options ? options.identifierPrefix : undefined,
466470
options ? options.temporaryReferences : undefined,
471+
options ? options.startTime : undefined,
467472
__DEV__&&options ? options.environmentName : undefined,
468473
__DEV__&&options ? options.filterStackFrame : undefined,
469474
false,
@@ -526,6 +531,7 @@ export function prerender(
526531
options ? options.onError : undefined,
527532
options ? options.identifierPrefix : undefined,
528533
options ? options.temporaryReferences : undefined,
534+
options ? options.startTime : undefined,
529535
__DEV__&&options ? options.environmentName : undefined,
530536
__DEV__&&options ? options.filterStackFrame : undefined,
531537
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type Options = {
6464
signal?: AbortSignal,
6565
temporaryReferences?: TemporaryReferenceSet,
6666
onError?: (error: mixed)=>void,
67+
startTime?: number,
6768
};
6869

6970
functionstartReadingFromDebugChannelReadableStream(
@@ -126,6 +127,7 @@ function renderToReadableStream(
126127
options ? options.onError : undefined,
127128
options ? options.identifierPrefix : undefined,
128129
options ? options.temporaryReferences : undefined,
130+
options ? options.startTime : undefined,
129131
__DEV__&&options ? options.environmentName : undefined,
130132
__DEV__&&options ? options.filterStackFrame : undefined,
131133
debugChannelReadable!==undefined,
@@ -214,6 +216,7 @@ function prerender(
214216
options ? options.onError : undefined,
215217
options ? options.identifierPrefix : undefined,
216218
options ? options.temporaryReferences : undefined,
219+
options ? options.startTime : undefined,
217220
__DEV__&&options ? options.environmentName : undefined,
218221
__DEV__&&options ? options.filterStackFrame : undefined,
219222
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type Options = {
6969
signal?: AbortSignal,
7070
temporaryReferences?: TemporaryReferenceSet,
7171
onError?: (error: mixed)=>void,
72+
startTime?: number,
7273
};
7374

7475
functionstartReadingFromDebugChannelReadableStream(
@@ -131,6 +132,7 @@ function renderToReadableStream(
131132
options ? options.onError : undefined,
132133
options ? options.identifierPrefix : undefined,
133134
options ? options.temporaryReferences : undefined,
135+
options ? options.startTime : undefined,
134136
__DEV__&&options ? options.environmentName : undefined,
135137
__DEV__&&options ? options.filterStackFrame : undefined,
136138
debugChannelReadable!==undefined,
@@ -219,6 +221,7 @@ function prerender(
219221
options ? options.onError : undefined,
220222
options ? options.identifierPrefix : undefined,
221223
options ? options.temporaryReferences : undefined,
224+
options ? options.startTime : undefined,
222225
__DEV__&&options ? options.environmentName : undefined,
223226
__DEV__&&options ? options.filterStackFrame : undefined,
224227
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannel!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
‎packages/react-server-dom-unbundled/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannelReadable!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
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('^' + ".*" + '
[Flight] Allow overriding `request.timeOrigin` via `options.startTime… · react/react@b1533b0 · GitHub
Skip to content
Commit b1533b0
Browse files
lubieowocelubieowoce
authored
[Flight] Allow overriding request.timeOrigin via options.startTime (#35598)
Currently, IO that finished before the request started is not considered
IO:
https://github.com/facebook/react/blob/6a0ab4d2dd62dfdf8881ba1c3443c6d5acedc871/packages/react-server/src/ReactFlightServer.js#L5338-L5343
This leads to loss of debug info when a flight stream is deserialized
and serialized again.
We can solve this by allowing "when the the request started" to be set
to a point in the past, when the original stream started by doing
```js
const startTime = performance.now() + performance.timeOrigin
// ... stuff happens and time passes...
ReactServer.renderToReadableStream(..., { startTime })
```
1 parent 5dad2b4 commit b1533b0
15 files changed
Lines changed: 356 additions & 2 deletions
File tree
‎packages/react-markup/src/ReactMarkupServer.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export function experimental_renderToHTML(
184184
handleFlightError,
185185
options ? options.identifierPrefix : undefined,
186186
undefined,
187+
undefined,
187188
'Markup',
188189
undefined,
189190
false,
‎packages/react-noop-renderer/src/ReactNoopFlightServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ type Options = {
7373
signal?: AbortSignal,
7474
debugChannel?: {onMessage?: (message: string)=>void},
7575
onError?: (error: mixed)=>void,
76+
startTime?: number,
7677
};
7778

7879
functionrender(model: ReactClientValue,options?: Options): Destination{
@@ -84,6 +85,7 @@ function render(model: ReactClientValue, options?: Options): Destination {
8485
options ? options.onError : undefined,
8586
options ? options.identifierPrefix : undefined,
8687
undefined,
88+
options ? options.startTime : undefined,
8789
__DEV__&&options ? options.environmentName : undefined,
8890
__DEV__&&options ? options.filterStackFrame : undefined,
8991
__DEV__&&options&&options.debugChannel!==undefined,
‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ type Options = {
146146
onError?: (error: mixed)=>void,
147147
identifierPrefix?: string,
148148
temporaryReferences?: TemporaryReferenceSet,
149+
startTime?: number,
149150
};
150151

151152
typePipeableStream={
@@ -183,6 +184,7 @@ function renderToPipeableStream(
183184
options ? options.onError : undefined,
184185
options ? options.identifierPrefix : undefined,
185186
options ? options.temporaryReferences : undefined,
187+
options ? options.startTime : undefined,
186188
__DEV__&&options ? options.environmentName : undefined,
187189
__DEV__&&options ? options.filterStackFrame : undefined,
188190
debugChannel!==undefined,
@@ -272,6 +274,7 @@ type PrerenderOptions = {
272274
identifierPrefix?: string,
273275
temporaryReferences?: TemporaryReferenceSet,
274276
signal?: AbortSignal,
277+
startTime?: number,
275278
};
276279

277280
typeStaticResult={
@@ -303,6 +306,7 @@ function prerenderToNodeStream(
303306
options ? options.onError : undefined,
304307
options ? options.identifierPrefix : undefined,
305308
options ? options.temporaryReferences : undefined,
309+
options ? options.startTime : undefined,
306310
__DEV__&&options ? options.environmentName : undefined,
307311
__DEV__&&options ? options.filterStackFrame : undefined,
308312
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -67,6 +68,7 @@ type Options = {
6768
signal?: AbortSignal,
6869
temporaryReferences?: TemporaryReferenceSet,
6970
onError?: (error: mixed)=>void,
71+
startTime?: number,
7072
};
7173

7274
functionstartReadingFromDebugChannelReadableStream(
@@ -128,6 +130,7 @@ export function renderToReadableStream(
128130
options ? options.onError : undefined,
129131
options ? options.identifierPrefix : undefined,
130132
options ? options.temporaryReferences : undefined,
133+
options ? options.startTime : undefined,
131134
__DEV__&&options ? options.environmentName : undefined,
132135
__DEV__&&options ? options.filterStackFrame : undefined,
133136
debugChannelReadable!==undefined,
@@ -215,6 +218,7 @@ export function prerender(
215218
options ? options.onError : undefined,
216219
options ? options.identifierPrefix : undefined,
217220
options ? options.temporaryReferences : undefined,
221+
options ? options.startTime : undefined,
218222
__DEV__&&options ? options.environmentName : undefined,
219223
__DEV__&&options ? options.filterStackFrame : undefined,
220224
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -72,6 +73,7 @@ type Options = {
7273
signal?: AbortSignal,
7374
temporaryReferences?: TemporaryReferenceSet,
7475
onError?: (error: mixed)=>void,
76+
startTime?: number,
7577
};
7678

7779
functionstartReadingFromDebugChannelReadableStream(
@@ -133,6 +135,7 @@ export function renderToReadableStream(
133135
options ? options.onError : undefined,
134136
options ? options.identifierPrefix : undefined,
135137
options ? options.temporaryReferences : undefined,
138+
options ? options.startTime : undefined,
136139
__DEV__&&options ? options.environmentName : undefined,
137140
__DEV__&&options ? options.filterStackFrame : undefined,
138141
debugChannelReadable!==undefined,
@@ -220,6 +223,7 @@ export function prerender(
220223
options ? options.onError : undefined,
221224
options ? options.identifierPrefix : undefined,
222225
options ? options.temporaryReferences : undefined,
226+
options ? options.startTime : undefined,
223227
__DEV__&&options ? options.environmentName : undefined,
224228
__DEV__&&options ? options.filterStackFrame : undefined,
225229
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ type Options = {
159159
onError?: (error: mixed)=>void,
160160
identifierPrefix?: string,
161161
temporaryReferences?: TemporaryReferenceSet,
162+
startTime?: number,
162163
};
163164

164165
typePipeableStream={
@@ -195,6 +196,7 @@ export function renderToPipeableStream(
195196
options ? options.onError : undefined,
196197
options ? options.identifierPrefix : undefined,
197198
options ? options.temporaryReferences : undefined,
199+
options ? options.startTime : undefined,
198200
__DEV__&&options ? options.environmentName : undefined,
199201
__DEV__&&options ? options.filterStackFrame : undefined,
200202
debugChannel!==undefined,
@@ -352,6 +354,7 @@ export function renderToReadableStream(
352354
options ? options.onError : undefined,
353355
options ? options.identifierPrefix : undefined,
354356
options ? options.temporaryReferences : undefined,
357+
options ? options.startTime : undefined,
355358
__DEV__&&options ? options.environmentName : undefined,
356359
__DEV__&&options ? options.filterStackFrame : undefined,
357360
debugChannelReadable!==undefined,
@@ -434,6 +437,7 @@ type PrerenderOptions = {
434437
identifierPrefix?: string,
435438
temporaryReferences?: TemporaryReferenceSet,
436439
signal?: AbortSignal,
440+
startTime?: number,
437441
};
438442

439443
typeStaticResult={
@@ -464,6 +468,7 @@ export function prerenderToNodeStream(
464468
options ? options.onError : undefined,
465469
options ? options.identifierPrefix : undefined,
466470
options ? options.temporaryReferences : undefined,
471+
options ? options.startTime : undefined,
467472
__DEV__&&options ? options.environmentName : undefined,
468473
__DEV__&&options ? options.filterStackFrame : undefined,
469474
false,
@@ -526,6 +531,7 @@ export function prerender(
526531
options ? options.onError : undefined,
527532
options ? options.identifierPrefix : undefined,
528533
options ? options.temporaryReferences : undefined,
534+
options ? options.startTime : undefined,
529535
__DEV__&&options ? options.environmentName : undefined,
530536
__DEV__&&options ? options.filterStackFrame : undefined,
531537
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type Options = {
6464
signal?: AbortSignal,
6565
temporaryReferences?: TemporaryReferenceSet,
6666
onError?: (error: mixed)=>void,
67+
startTime?: number,
6768
};
6869

6970
functionstartReadingFromDebugChannelReadableStream(
@@ -126,6 +127,7 @@ function renderToReadableStream(
126127
options ? options.onError : undefined,
127128
options ? options.identifierPrefix : undefined,
128129
options ? options.temporaryReferences : undefined,
130+
options ? options.startTime : undefined,
129131
__DEV__&&options ? options.environmentName : undefined,
130132
__DEV__&&options ? options.filterStackFrame : undefined,
131133
debugChannelReadable!==undefined,
@@ -214,6 +216,7 @@ function prerender(
214216
options ? options.onError : undefined,
215217
options ? options.identifierPrefix : undefined,
216218
options ? options.temporaryReferences : undefined,
219+
options ? options.startTime : undefined,
217220
__DEV__&&options ? options.environmentName : undefined,
218221
__DEV__&&options ? options.filterStackFrame : undefined,
219222
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type Options = {
6969
signal?: AbortSignal,
7070
temporaryReferences?: TemporaryReferenceSet,
7171
onError?: (error: mixed)=>void,
72+
startTime?: number,
7273
};
7374

7475
functionstartReadingFromDebugChannelReadableStream(
@@ -131,6 +132,7 @@ function renderToReadableStream(
131132
options ? options.onError : undefined,
132133
options ? options.identifierPrefix : undefined,
133134
options ? options.temporaryReferences : undefined,
135+
options ? options.startTime : undefined,
134136
__DEV__&&options ? options.environmentName : undefined,
135137
__DEV__&&options ? options.filterStackFrame : undefined,
136138
debugChannelReadable!==undefined,
@@ -219,6 +221,7 @@ function prerender(
219221
options ? options.onError : undefined,
220222
options ? options.identifierPrefix : undefined,
221223
options ? options.temporaryReferences : undefined,
224+
options ? options.startTime : undefined,
222225
__DEV__&&options ? options.environmentName : undefined,
223226
__DEV__&&options ? options.filterStackFrame : undefined,
224227
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannel!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
‎packages/react-server-dom-unbundled/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannelReadable!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
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('^' + ".*" + '
[Flight] Allow overriding `request.timeOrigin` via `options.startTime… · react/react@b1533b0 · GitHub
Skip to content
Commit b1533b0
Browse files
lubieowocelubieowoce
authored
[Flight] Allow overriding request.timeOrigin via options.startTime (#35598)
Currently, IO that finished before the request started is not considered
IO:
https://github.com/facebook/react/blob/6a0ab4d2dd62dfdf8881ba1c3443c6d5acedc871/packages/react-server/src/ReactFlightServer.js#L5338-L5343
This leads to loss of debug info when a flight stream is deserialized
and serialized again.
We can solve this by allowing "when the the request started" to be set
to a point in the past, when the original stream started by doing
```js
const startTime = performance.now() + performance.timeOrigin
// ... stuff happens and time passes...
ReactServer.renderToReadableStream(..., { startTime })
```
1 parent 5dad2b4 commit b1533b0
15 files changed
Lines changed: 356 additions & 2 deletions
File tree
‎packages/react-markup/src/ReactMarkupServer.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export function experimental_renderToHTML(
184184
handleFlightError,
185185
options ? options.identifierPrefix : undefined,
186186
undefined,
187+
undefined,
187188
'Markup',
188189
undefined,
189190
false,
‎packages/react-noop-renderer/src/ReactNoopFlightServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ type Options = {
7373
signal?: AbortSignal,
7474
debugChannel?: {onMessage?: (message: string)=>void},
7575
onError?: (error: mixed)=>void,
76+
startTime?: number,
7677
};
7778

7879
functionrender(model: ReactClientValue,options?: Options): Destination{
@@ -84,6 +85,7 @@ function render(model: ReactClientValue, options?: Options): Destination {
8485
options ? options.onError : undefined,
8586
options ? options.identifierPrefix : undefined,
8687
undefined,
88+
options ? options.startTime : undefined,
8789
__DEV__&&options ? options.environmentName : undefined,
8890
__DEV__&&options ? options.filterStackFrame : undefined,
8991
__DEV__&&options&&options.debugChannel!==undefined,
‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ type Options = {
146146
onError?: (error: mixed)=>void,
147147
identifierPrefix?: string,
148148
temporaryReferences?: TemporaryReferenceSet,
149+
startTime?: number,
149150
};
150151

151152
typePipeableStream={
@@ -183,6 +184,7 @@ function renderToPipeableStream(
183184
options ? options.onError : undefined,
184185
options ? options.identifierPrefix : undefined,
185186
options ? options.temporaryReferences : undefined,
187+
options ? options.startTime : undefined,
186188
__DEV__&&options ? options.environmentName : undefined,
187189
__DEV__&&options ? options.filterStackFrame : undefined,
188190
debugChannel!==undefined,
@@ -272,6 +274,7 @@ type PrerenderOptions = {
272274
identifierPrefix?: string,
273275
temporaryReferences?: TemporaryReferenceSet,
274276
signal?: AbortSignal,
277+
startTime?: number,
275278
};
276279

277280
typeStaticResult={
@@ -303,6 +306,7 @@ function prerenderToNodeStream(
303306
options ? options.onError : undefined,
304307
options ? options.identifierPrefix : undefined,
305308
options ? options.temporaryReferences : undefined,
309+
options ? options.startTime : undefined,
306310
__DEV__&&options ? options.environmentName : undefined,
307311
__DEV__&&options ? options.filterStackFrame : undefined,
308312
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -67,6 +68,7 @@ type Options = {
6768
signal?: AbortSignal,
6869
temporaryReferences?: TemporaryReferenceSet,
6970
onError?: (error: mixed)=>void,
71+
startTime?: number,
7072
};
7173

7274
functionstartReadingFromDebugChannelReadableStream(
@@ -128,6 +130,7 @@ export function renderToReadableStream(
128130
options ? options.onError : undefined,
129131
options ? options.identifierPrefix : undefined,
130132
options ? options.temporaryReferences : undefined,
133+
options ? options.startTime : undefined,
131134
__DEV__&&options ? options.environmentName : undefined,
132135
__DEV__&&options ? options.filterStackFrame : undefined,
133136
debugChannelReadable!==undefined,
@@ -215,6 +218,7 @@ export function prerender(
215218
options ? options.onError : undefined,
216219
options ? options.identifierPrefix : undefined,
217220
options ? options.temporaryReferences : undefined,
221+
options ? options.startTime : undefined,
218222
__DEV__&&options ? options.environmentName : undefined,
219223
__DEV__&&options ? options.filterStackFrame : undefined,
220224
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -72,6 +73,7 @@ type Options = {
7273
signal?: AbortSignal,
7374
temporaryReferences?: TemporaryReferenceSet,
7475
onError?: (error: mixed)=>void,
76+
startTime?: number,
7577
};
7678

7779
functionstartReadingFromDebugChannelReadableStream(
@@ -133,6 +135,7 @@ export function renderToReadableStream(
133135
options ? options.onError : undefined,
134136
options ? options.identifierPrefix : undefined,
135137
options ? options.temporaryReferences : undefined,
138+
options ? options.startTime : undefined,
136139
__DEV__&&options ? options.environmentName : undefined,
137140
__DEV__&&options ? options.filterStackFrame : undefined,
138141
debugChannelReadable!==undefined,
@@ -220,6 +223,7 @@ export function prerender(
220223
options ? options.onError : undefined,
221224
options ? options.identifierPrefix : undefined,
222225
options ? options.temporaryReferences : undefined,
226+
options ? options.startTime : undefined,
223227
__DEV__&&options ? options.environmentName : undefined,
224228
__DEV__&&options ? options.filterStackFrame : undefined,
225229
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ type Options = {
159159
onError?: (error: mixed)=>void,
160160
identifierPrefix?: string,
161161
temporaryReferences?: TemporaryReferenceSet,
162+
startTime?: number,
162163
};
163164

164165
typePipeableStream={
@@ -195,6 +196,7 @@ export function renderToPipeableStream(
195196
options ? options.onError : undefined,
196197
options ? options.identifierPrefix : undefined,
197198
options ? options.temporaryReferences : undefined,
199+
options ? options.startTime : undefined,
198200
__DEV__&&options ? options.environmentName : undefined,
199201
__DEV__&&options ? options.filterStackFrame : undefined,
200202
debugChannel!==undefined,
@@ -352,6 +354,7 @@ export function renderToReadableStream(
352354
options ? options.onError : undefined,
353355
options ? options.identifierPrefix : undefined,
354356
options ? options.temporaryReferences : undefined,
357+
options ? options.startTime : undefined,
355358
__DEV__&&options ? options.environmentName : undefined,
356359
__DEV__&&options ? options.filterStackFrame : undefined,
357360
debugChannelReadable!==undefined,
@@ -434,6 +437,7 @@ type PrerenderOptions = {
434437
identifierPrefix?: string,
435438
temporaryReferences?: TemporaryReferenceSet,
436439
signal?: AbortSignal,
440+
startTime?: number,
437441
};
438442

439443
typeStaticResult={
@@ -464,6 +468,7 @@ export function prerenderToNodeStream(
464468
options ? options.onError : undefined,
465469
options ? options.identifierPrefix : undefined,
466470
options ? options.temporaryReferences : undefined,
471+
options ? options.startTime : undefined,
467472
__DEV__&&options ? options.environmentName : undefined,
468473
__DEV__&&options ? options.filterStackFrame : undefined,
469474
false,
@@ -526,6 +531,7 @@ export function prerender(
526531
options ? options.onError : undefined,
527532
options ? options.identifierPrefix : undefined,
528533
options ? options.temporaryReferences : undefined,
534+
options ? options.startTime : undefined,
529535
__DEV__&&options ? options.environmentName : undefined,
530536
__DEV__&&options ? options.filterStackFrame : undefined,
531537
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type Options = {
6464
signal?: AbortSignal,
6565
temporaryReferences?: TemporaryReferenceSet,
6666
onError?: (error: mixed)=>void,
67+
startTime?: number,
6768
};
6869

6970
functionstartReadingFromDebugChannelReadableStream(
@@ -126,6 +127,7 @@ function renderToReadableStream(
126127
options ? options.onError : undefined,
127128
options ? options.identifierPrefix : undefined,
128129
options ? options.temporaryReferences : undefined,
130+
options ? options.startTime : undefined,
129131
__DEV__&&options ? options.environmentName : undefined,
130132
__DEV__&&options ? options.filterStackFrame : undefined,
131133
debugChannelReadable!==undefined,
@@ -214,6 +216,7 @@ function prerender(
214216
options ? options.onError : undefined,
215217
options ? options.identifierPrefix : undefined,
216218
options ? options.temporaryReferences : undefined,
219+
options ? options.startTime : undefined,
217220
__DEV__&&options ? options.environmentName : undefined,
218221
__DEV__&&options ? options.filterStackFrame : undefined,
219222
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type Options = {
6969
signal?: AbortSignal,
7070
temporaryReferences?: TemporaryReferenceSet,
7171
onError?: (error: mixed)=>void,
72+
startTime?: number,
7273
};
7374

7475
functionstartReadingFromDebugChannelReadableStream(
@@ -131,6 +132,7 @@ function renderToReadableStream(
131132
options ? options.onError : undefined,
132133
options ? options.identifierPrefix : undefined,
133134
options ? options.temporaryReferences : undefined,
135+
options ? options.startTime : undefined,
134136
__DEV__&&options ? options.environmentName : undefined,
135137
__DEV__&&options ? options.filterStackFrame : undefined,
136138
debugChannelReadable!==undefined,
@@ -219,6 +221,7 @@ function prerender(
219221
options ? options.onError : undefined,
220222
options ? options.identifierPrefix : undefined,
221223
options ? options.temporaryReferences : undefined,
224+
options ? options.startTime : undefined,
222225
__DEV__&&options ? options.environmentName : undefined,
223226
__DEV__&&options ? options.filterStackFrame : undefined,
224227
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannel!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
‎packages/react-server-dom-unbundled/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannelReadable!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
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" + '
[Flight] Allow overriding `request.timeOrigin` via `options.startTime… · react/react@b1533b0 · GitHub
Skip to content
Commit b1533b0
Browse files
lubieowocelubieowoce
authored
[Flight] Allow overriding request.timeOrigin via options.startTime (#35598)
Currently, IO that finished before the request started is not considered
IO:
https://github.com/facebook/react/blob/6a0ab4d2dd62dfdf8881ba1c3443c6d5acedc871/packages/react-server/src/ReactFlightServer.js#L5338-L5343
This leads to loss of debug info when a flight stream is deserialized
and serialized again.
We can solve this by allowing "when the the request started" to be set
to a point in the past, when the original stream started by doing
```js
const startTime = performance.now() + performance.timeOrigin
// ... stuff happens and time passes...
ReactServer.renderToReadableStream(..., { startTime })
```
1 parent 5dad2b4 commit b1533b0
15 files changed
Lines changed: 356 additions & 2 deletions
File tree
‎packages/react-markup/src/ReactMarkupServer.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export function experimental_renderToHTML(
184184
handleFlightError,
185185
options ? options.identifierPrefix : undefined,
186186
undefined,
187+
undefined,
187188
'Markup',
188189
undefined,
189190
false,
‎packages/react-noop-renderer/src/ReactNoopFlightServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ type Options = {
7373
signal?: AbortSignal,
7474
debugChannel?: {onMessage?: (message: string)=>void},
7575
onError?: (error: mixed)=>void,
76+
startTime?: number,
7677
};
7778

7879
functionrender(model: ReactClientValue,options?: Options): Destination{
@@ -84,6 +85,7 @@ function render(model: ReactClientValue, options?: Options): Destination {
8485
options ? options.onError : undefined,
8586
options ? options.identifierPrefix : undefined,
8687
undefined,
88+
options ? options.startTime : undefined,
8789
__DEV__&&options ? options.environmentName : undefined,
8890
__DEV__&&options ? options.filterStackFrame : undefined,
8991
__DEV__&&options&&options.debugChannel!==undefined,
‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ type Options = {
146146
onError?: (error: mixed)=>void,
147147
identifierPrefix?: string,
148148
temporaryReferences?: TemporaryReferenceSet,
149+
startTime?: number,
149150
};
150151

151152
typePipeableStream={
@@ -183,6 +184,7 @@ function renderToPipeableStream(
183184
options ? options.onError : undefined,
184185
options ? options.identifierPrefix : undefined,
185186
options ? options.temporaryReferences : undefined,
187+
options ? options.startTime : undefined,
186188
__DEV__&&options ? options.environmentName : undefined,
187189
__DEV__&&options ? options.filterStackFrame : undefined,
188190
debugChannel!==undefined,
@@ -272,6 +274,7 @@ type PrerenderOptions = {
272274
identifierPrefix?: string,
273275
temporaryReferences?: TemporaryReferenceSet,
274276
signal?: AbortSignal,
277+
startTime?: number,
275278
};
276279

277280
typeStaticResult={
@@ -303,6 +306,7 @@ function prerenderToNodeStream(
303306
options ? options.onError : undefined,
304307
options ? options.identifierPrefix : undefined,
305308
options ? options.temporaryReferences : undefined,
309+
options ? options.startTime : undefined,
306310
__DEV__&&options ? options.environmentName : undefined,
307311
__DEV__&&options ? options.filterStackFrame : undefined,
308312
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -67,6 +68,7 @@ type Options = {
6768
signal?: AbortSignal,
6869
temporaryReferences?: TemporaryReferenceSet,
6970
onError?: (error: mixed)=>void,
71+
startTime?: number,
7072
};
7173

7274
functionstartReadingFromDebugChannelReadableStream(
@@ -128,6 +130,7 @@ export function renderToReadableStream(
128130
options ? options.onError : undefined,
129131
options ? options.identifierPrefix : undefined,
130132
options ? options.temporaryReferences : undefined,
133+
options ? options.startTime : undefined,
131134
__DEV__&&options ? options.environmentName : undefined,
132135
__DEV__&&options ? options.filterStackFrame : undefined,
133136
debugChannelReadable!==undefined,
@@ -215,6 +218,7 @@ export function prerender(
215218
options ? options.onError : undefined,
216219
options ? options.identifierPrefix : undefined,
217220
options ? options.temporaryReferences : undefined,
221+
options ? options.startTime : undefined,
218222
__DEV__&&options ? options.environmentName : undefined,
219223
__DEV__&&options ? options.filterStackFrame : undefined,
220224
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -72,6 +73,7 @@ type Options = {
7273
signal?: AbortSignal,
7374
temporaryReferences?: TemporaryReferenceSet,
7475
onError?: (error: mixed)=>void,
76+
startTime?: number,
7577
};
7678

7779
functionstartReadingFromDebugChannelReadableStream(
@@ -133,6 +135,7 @@ export function renderToReadableStream(
133135
options ? options.onError : undefined,
134136
options ? options.identifierPrefix : undefined,
135137
options ? options.temporaryReferences : undefined,
138+
options ? options.startTime : undefined,
136139
__DEV__&&options ? options.environmentName : undefined,
137140
__DEV__&&options ? options.filterStackFrame : undefined,
138141
debugChannelReadable!==undefined,
@@ -220,6 +223,7 @@ export function prerender(
220223
options ? options.onError : undefined,
221224
options ? options.identifierPrefix : undefined,
222225
options ? options.temporaryReferences : undefined,
226+
options ? options.startTime : undefined,
223227
__DEV__&&options ? options.environmentName : undefined,
224228
__DEV__&&options ? options.filterStackFrame : undefined,
225229
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ type Options = {
159159
onError?: (error: mixed)=>void,
160160
identifierPrefix?: string,
161161
temporaryReferences?: TemporaryReferenceSet,
162+
startTime?: number,
162163
};
163164

164165
typePipeableStream={
@@ -195,6 +196,7 @@ export function renderToPipeableStream(
195196
options ? options.onError : undefined,
196197
options ? options.identifierPrefix : undefined,
197198
options ? options.temporaryReferences : undefined,
199+
options ? options.startTime : undefined,
198200
__DEV__&&options ? options.environmentName : undefined,
199201
__DEV__&&options ? options.filterStackFrame : undefined,
200202
debugChannel!==undefined,
@@ -352,6 +354,7 @@ export function renderToReadableStream(
352354
options ? options.onError : undefined,
353355
options ? options.identifierPrefix : undefined,
354356
options ? options.temporaryReferences : undefined,
357+
options ? options.startTime : undefined,
355358
__DEV__&&options ? options.environmentName : undefined,
356359
__DEV__&&options ? options.filterStackFrame : undefined,
357360
debugChannelReadable!==undefined,
@@ -434,6 +437,7 @@ type PrerenderOptions = {
434437
identifierPrefix?: string,
435438
temporaryReferences?: TemporaryReferenceSet,
436439
signal?: AbortSignal,
440+
startTime?: number,
437441
};
438442

439443
typeStaticResult={
@@ -464,6 +468,7 @@ export function prerenderToNodeStream(
464468
options ? options.onError : undefined,
465469
options ? options.identifierPrefix : undefined,
466470
options ? options.temporaryReferences : undefined,
471+
options ? options.startTime : undefined,
467472
__DEV__&&options ? options.environmentName : undefined,
468473
__DEV__&&options ? options.filterStackFrame : undefined,
469474
false,
@@ -526,6 +531,7 @@ export function prerender(
526531
options ? options.onError : undefined,
527532
options ? options.identifierPrefix : undefined,
528533
options ? options.temporaryReferences : undefined,
534+
options ? options.startTime : undefined,
529535
__DEV__&&options ? options.environmentName : undefined,
530536
__DEV__&&options ? options.filterStackFrame : undefined,
531537
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type Options = {
6464
signal?: AbortSignal,
6565
temporaryReferences?: TemporaryReferenceSet,
6666
onError?: (error: mixed)=>void,
67+
startTime?: number,
6768
};
6869

6970
functionstartReadingFromDebugChannelReadableStream(
@@ -126,6 +127,7 @@ function renderToReadableStream(
126127
options ? options.onError : undefined,
127128
options ? options.identifierPrefix : undefined,
128129
options ? options.temporaryReferences : undefined,
130+
options ? options.startTime : undefined,
129131
__DEV__&&options ? options.environmentName : undefined,
130132
__DEV__&&options ? options.filterStackFrame : undefined,
131133
debugChannelReadable!==undefined,
@@ -214,6 +216,7 @@ function prerender(
214216
options ? options.onError : undefined,
215217
options ? options.identifierPrefix : undefined,
216218
options ? options.temporaryReferences : undefined,
219+
options ? options.startTime : undefined,
217220
__DEV__&&options ? options.environmentName : undefined,
218221
__DEV__&&options ? options.filterStackFrame : undefined,
219222
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type Options = {
6969
signal?: AbortSignal,
7070
temporaryReferences?: TemporaryReferenceSet,
7171
onError?: (error: mixed)=>void,
72+
startTime?: number,
7273
};
7374

7475
functionstartReadingFromDebugChannelReadableStream(
@@ -131,6 +132,7 @@ function renderToReadableStream(
131132
options ? options.onError : undefined,
132133
options ? options.identifierPrefix : undefined,
133134
options ? options.temporaryReferences : undefined,
135+
options ? options.startTime : undefined,
134136
__DEV__&&options ? options.environmentName : undefined,
135137
__DEV__&&options ? options.filterStackFrame : undefined,
136138
debugChannelReadable!==undefined,
@@ -219,6 +221,7 @@ function prerender(
219221
options ? options.onError : undefined,
220222
options ? options.identifierPrefix : undefined,
221223
options ? options.temporaryReferences : undefined,
224+
options ? options.startTime : undefined,
222225
__DEV__&&options ? options.environmentName : undefined,
223226
__DEV__&&options ? options.filterStackFrame : undefined,
224227
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannel!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
‎packages/react-server-dom-unbundled/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannelReadable!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
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('^' + ".*" + '
[Flight] Allow overriding `request.timeOrigin` via `options.startTime… · react/react@b1533b0 · GitHub
Skip to content
Commit b1533b0
Browse files
lubieowocelubieowoce
authored
[Flight] Allow overriding request.timeOrigin via options.startTime (#35598)
Currently, IO that finished before the request started is not considered
IO:
https://github.com/facebook/react/blob/6a0ab4d2dd62dfdf8881ba1c3443c6d5acedc871/packages/react-server/src/ReactFlightServer.js#L5338-L5343
This leads to loss of debug info when a flight stream is deserialized
and serialized again.
We can solve this by allowing "when the the request started" to be set
to a point in the past, when the original stream started by doing
```js
const startTime = performance.now() + performance.timeOrigin
// ... stuff happens and time passes...
ReactServer.renderToReadableStream(..., { startTime })
```
1 parent 5dad2b4 commit b1533b0
15 files changed
Lines changed: 356 additions & 2 deletions
File tree
‎packages/react-markup/src/ReactMarkupServer.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export function experimental_renderToHTML(
184184
handleFlightError,
185185
options ? options.identifierPrefix : undefined,
186186
undefined,
187+
undefined,
187188
'Markup',
188189
undefined,
189190
false,
‎packages/react-noop-renderer/src/ReactNoopFlightServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ type Options = {
7373
signal?: AbortSignal,
7474
debugChannel?: {onMessage?: (message: string)=>void},
7575
onError?: (error: mixed)=>void,
76+
startTime?: number,
7677
};
7778

7879
functionrender(model: ReactClientValue,options?: Options): Destination{
@@ -84,6 +85,7 @@ function render(model: ReactClientValue, options?: Options): Destination {
8485
options ? options.onError : undefined,
8586
options ? options.identifierPrefix : undefined,
8687
undefined,
88+
options ? options.startTime : undefined,
8789
__DEV__&&options ? options.environmentName : undefined,
8890
__DEV__&&options ? options.filterStackFrame : undefined,
8991
__DEV__&&options&&options.debugChannel!==undefined,
‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ type Options = {
146146
onError?: (error: mixed)=>void,
147147
identifierPrefix?: string,
148148
temporaryReferences?: TemporaryReferenceSet,
149+
startTime?: number,
149150
};
150151

151152
typePipeableStream={
@@ -183,6 +184,7 @@ function renderToPipeableStream(
183184
options ? options.onError : undefined,
184185
options ? options.identifierPrefix : undefined,
185186
options ? options.temporaryReferences : undefined,
187+
options ? options.startTime : undefined,
186188
__DEV__&&options ? options.environmentName : undefined,
187189
__DEV__&&options ? options.filterStackFrame : undefined,
188190
debugChannel!==undefined,
@@ -272,6 +274,7 @@ type PrerenderOptions = {
272274
identifierPrefix?: string,
273275
temporaryReferences?: TemporaryReferenceSet,
274276
signal?: AbortSignal,
277+
startTime?: number,
275278
};
276279

277280
typeStaticResult={
@@ -303,6 +306,7 @@ function prerenderToNodeStream(
303306
options ? options.onError : undefined,
304307
options ? options.identifierPrefix : undefined,
305308
options ? options.temporaryReferences : undefined,
309+
options ? options.startTime : undefined,
306310
__DEV__&&options ? options.environmentName : undefined,
307311
__DEV__&&options ? options.filterStackFrame : undefined,
308312
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -67,6 +68,7 @@ type Options = {
6768
signal?: AbortSignal,
6869
temporaryReferences?: TemporaryReferenceSet,
6970
onError?: (error: mixed)=>void,
71+
startTime?: number,
7072
};
7173

7274
functionstartReadingFromDebugChannelReadableStream(
@@ -128,6 +130,7 @@ export function renderToReadableStream(
128130
options ? options.onError : undefined,
129131
options ? options.identifierPrefix : undefined,
130132
options ? options.temporaryReferences : undefined,
133+
options ? options.startTime : undefined,
131134
__DEV__&&options ? options.environmentName : undefined,
132135
__DEV__&&options ? options.filterStackFrame : undefined,
133136
debugChannelReadable!==undefined,
@@ -215,6 +218,7 @@ export function prerender(
215218
options ? options.onError : undefined,
216219
options ? options.identifierPrefix : undefined,
217220
options ? options.temporaryReferences : undefined,
221+
options ? options.startTime : undefined,
218222
__DEV__&&options ? options.environmentName : undefined,
219223
__DEV__&&options ? options.filterStackFrame : undefined,
220224
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -72,6 +73,7 @@ type Options = {
7273
signal?: AbortSignal,
7374
temporaryReferences?: TemporaryReferenceSet,
7475
onError?: (error: mixed)=>void,
76+
startTime?: number,
7577
};
7678

7779
functionstartReadingFromDebugChannelReadableStream(
@@ -133,6 +135,7 @@ export function renderToReadableStream(
133135
options ? options.onError : undefined,
134136
options ? options.identifierPrefix : undefined,
135137
options ? options.temporaryReferences : undefined,
138+
options ? options.startTime : undefined,
136139
__DEV__&&options ? options.environmentName : undefined,
137140
__DEV__&&options ? options.filterStackFrame : undefined,
138141
debugChannelReadable!==undefined,
@@ -220,6 +223,7 @@ export function prerender(
220223
options ? options.onError : undefined,
221224
options ? options.identifierPrefix : undefined,
222225
options ? options.temporaryReferences : undefined,
226+
options ? options.startTime : undefined,
223227
__DEV__&&options ? options.environmentName : undefined,
224228
__DEV__&&options ? options.filterStackFrame : undefined,
225229
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ type Options = {
159159
onError?: (error: mixed)=>void,
160160
identifierPrefix?: string,
161161
temporaryReferences?: TemporaryReferenceSet,
162+
startTime?: number,
162163
};
163164

164165
typePipeableStream={
@@ -195,6 +196,7 @@ export function renderToPipeableStream(
195196
options ? options.onError : undefined,
196197
options ? options.identifierPrefix : undefined,
197198
options ? options.temporaryReferences : undefined,
199+
options ? options.startTime : undefined,
198200
__DEV__&&options ? options.environmentName : undefined,
199201
__DEV__&&options ? options.filterStackFrame : undefined,
200202
debugChannel!==undefined,
@@ -352,6 +354,7 @@ export function renderToReadableStream(
352354
options ? options.onError : undefined,
353355
options ? options.identifierPrefix : undefined,
354356
options ? options.temporaryReferences : undefined,
357+
options ? options.startTime : undefined,
355358
__DEV__&&options ? options.environmentName : undefined,
356359
__DEV__&&options ? options.filterStackFrame : undefined,
357360
debugChannelReadable!==undefined,
@@ -434,6 +437,7 @@ type PrerenderOptions = {
434437
identifierPrefix?: string,
435438
temporaryReferences?: TemporaryReferenceSet,
436439
signal?: AbortSignal,
440+
startTime?: number,
437441
};
438442

439443
typeStaticResult={
@@ -464,6 +468,7 @@ export function prerenderToNodeStream(
464468
options ? options.onError : undefined,
465469
options ? options.identifierPrefix : undefined,
466470
options ? options.temporaryReferences : undefined,
471+
options ? options.startTime : undefined,
467472
__DEV__&&options ? options.environmentName : undefined,
468473
__DEV__&&options ? options.filterStackFrame : undefined,
469474
false,
@@ -526,6 +531,7 @@ export function prerender(
526531
options ? options.onError : undefined,
527532
options ? options.identifierPrefix : undefined,
528533
options ? options.temporaryReferences : undefined,
534+
options ? options.startTime : undefined,
529535
__DEV__&&options ? options.environmentName : undefined,
530536
__DEV__&&options ? options.filterStackFrame : undefined,
531537
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type Options = {
6464
signal?: AbortSignal,
6565
temporaryReferences?: TemporaryReferenceSet,
6666
onError?: (error: mixed)=>void,
67+
startTime?: number,
6768
};
6869

6970
functionstartReadingFromDebugChannelReadableStream(
@@ -126,6 +127,7 @@ function renderToReadableStream(
126127
options ? options.onError : undefined,
127128
options ? options.identifierPrefix : undefined,
128129
options ? options.temporaryReferences : undefined,
130+
options ? options.startTime : undefined,
129131
__DEV__&&options ? options.environmentName : undefined,
130132
__DEV__&&options ? options.filterStackFrame : undefined,
131133
debugChannelReadable!==undefined,
@@ -214,6 +216,7 @@ function prerender(
214216
options ? options.onError : undefined,
215217
options ? options.identifierPrefix : undefined,
216218
options ? options.temporaryReferences : undefined,
219+
options ? options.startTime : undefined,
217220
__DEV__&&options ? options.environmentName : undefined,
218221
__DEV__&&options ? options.filterStackFrame : undefined,
219222
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type Options = {
6969
signal?: AbortSignal,
7070
temporaryReferences?: TemporaryReferenceSet,
7171
onError?: (error: mixed)=>void,
72+
startTime?: number,
7273
};
7374

7475
functionstartReadingFromDebugChannelReadableStream(
@@ -131,6 +132,7 @@ function renderToReadableStream(
131132
options ? options.onError : undefined,
132133
options ? options.identifierPrefix : undefined,
133134
options ? options.temporaryReferences : undefined,
135+
options ? options.startTime : undefined,
134136
__DEV__&&options ? options.environmentName : undefined,
135137
__DEV__&&options ? options.filterStackFrame : undefined,
136138
debugChannelReadable!==undefined,
@@ -219,6 +221,7 @@ function prerender(
219221
options ? options.onError : undefined,
220222
options ? options.identifierPrefix : undefined,
221223
options ? options.temporaryReferences : undefined,
224+
options ? options.startTime : undefined,
222225
__DEV__&&options ? options.environmentName : undefined,
223226
__DEV__&&options ? options.filterStackFrame : undefined,
224227
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannel!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
‎packages/react-server-dom-unbundled/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannelReadable!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
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('^' + ".*" + '
[Flight] Allow overriding `request.timeOrigin` via `options.startTime… · react/react@b1533b0 · GitHub
Skip to content
Commit b1533b0
Browse files
lubieowocelubieowoce
authored
[Flight] Allow overriding request.timeOrigin via options.startTime (#35598)
Currently, IO that finished before the request started is not considered
IO:
https://github.com/facebook/react/blob/6a0ab4d2dd62dfdf8881ba1c3443c6d5acedc871/packages/react-server/src/ReactFlightServer.js#L5338-L5343
This leads to loss of debug info when a flight stream is deserialized
and serialized again.
We can solve this by allowing "when the the request started" to be set
to a point in the past, when the original stream started by doing
```js
const startTime = performance.now() + performance.timeOrigin
// ... stuff happens and time passes...
ReactServer.renderToReadableStream(..., { startTime })
```
1 parent 5dad2b4 commit b1533b0
15 files changed
Lines changed: 356 additions & 2 deletions
File tree
‎packages/react-markup/src/ReactMarkupServer.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export function experimental_renderToHTML(
184184
handleFlightError,
185185
options ? options.identifierPrefix : undefined,
186186
undefined,
187+
undefined,
187188
'Markup',
188189
undefined,
189190
false,
‎packages/react-noop-renderer/src/ReactNoopFlightServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ type Options = {
7373
signal?: AbortSignal,
7474
debugChannel?: {onMessage?: (message: string)=>void},
7575
onError?: (error: mixed)=>void,
76+
startTime?: number,
7677
};
7778

7879
functionrender(model: ReactClientValue,options?: Options): Destination{
@@ -84,6 +85,7 @@ function render(model: ReactClientValue, options?: Options): Destination {
8485
options ? options.onError : undefined,
8586
options ? options.identifierPrefix : undefined,
8687
undefined,
88+
options ? options.startTime : undefined,
8789
__DEV__&&options ? options.environmentName : undefined,
8890
__DEV__&&options ? options.filterStackFrame : undefined,
8991
__DEV__&&options&&options.debugChannel!==undefined,
‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ type Options = {
146146
onError?: (error: mixed)=>void,
147147
identifierPrefix?: string,
148148
temporaryReferences?: TemporaryReferenceSet,
149+
startTime?: number,
149150
};
150151

151152
typePipeableStream={
@@ -183,6 +184,7 @@ function renderToPipeableStream(
183184
options ? options.onError : undefined,
184185
options ? options.identifierPrefix : undefined,
185186
options ? options.temporaryReferences : undefined,
187+
options ? options.startTime : undefined,
186188
__DEV__&&options ? options.environmentName : undefined,
187189
__DEV__&&options ? options.filterStackFrame : undefined,
188190
debugChannel!==undefined,
@@ -272,6 +274,7 @@ type PrerenderOptions = {
272274
identifierPrefix?: string,
273275
temporaryReferences?: TemporaryReferenceSet,
274276
signal?: AbortSignal,
277+
startTime?: number,
275278
};
276279

277280
typeStaticResult={
@@ -303,6 +306,7 @@ function prerenderToNodeStream(
303306
options ? options.onError : undefined,
304307
options ? options.identifierPrefix : undefined,
305308
options ? options.temporaryReferences : undefined,
309+
options ? options.startTime : undefined,
306310
__DEV__&&options ? options.environmentName : undefined,
307311
__DEV__&&options ? options.filterStackFrame : undefined,
308312
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -67,6 +68,7 @@ type Options = {
6768
signal?: AbortSignal,
6869
temporaryReferences?: TemporaryReferenceSet,
6970
onError?: (error: mixed)=>void,
71+
startTime?: number,
7072
};
7173

7274
functionstartReadingFromDebugChannelReadableStream(
@@ -128,6 +130,7 @@ export function renderToReadableStream(
128130
options ? options.onError : undefined,
129131
options ? options.identifierPrefix : undefined,
130132
options ? options.temporaryReferences : undefined,
133+
options ? options.startTime : undefined,
131134
__DEV__&&options ? options.environmentName : undefined,
132135
__DEV__&&options ? options.filterStackFrame : undefined,
133136
debugChannelReadable!==undefined,
@@ -215,6 +218,7 @@ export function prerender(
215218
options ? options.onError : undefined,
216219
options ? options.identifierPrefix : undefined,
217220
options ? options.temporaryReferences : undefined,
221+
options ? options.startTime : undefined,
218222
__DEV__&&options ? options.environmentName : undefined,
219223
__DEV__&&options ? options.filterStackFrame : undefined,
220224
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -72,6 +73,7 @@ type Options = {
7273
signal?: AbortSignal,
7374
temporaryReferences?: TemporaryReferenceSet,
7475
onError?: (error: mixed)=>void,
76+
startTime?: number,
7577
};
7678

7779
functionstartReadingFromDebugChannelReadableStream(
@@ -133,6 +135,7 @@ export function renderToReadableStream(
133135
options ? options.onError : undefined,
134136
options ? options.identifierPrefix : undefined,
135137
options ? options.temporaryReferences : undefined,
138+
options ? options.startTime : undefined,
136139
__DEV__&&options ? options.environmentName : undefined,
137140
__DEV__&&options ? options.filterStackFrame : undefined,
138141
debugChannelReadable!==undefined,
@@ -220,6 +223,7 @@ export function prerender(
220223
options ? options.onError : undefined,
221224
options ? options.identifierPrefix : undefined,
222225
options ? options.temporaryReferences : undefined,
226+
options ? options.startTime : undefined,
223227
__DEV__&&options ? options.environmentName : undefined,
224228
__DEV__&&options ? options.filterStackFrame : undefined,
225229
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ type Options = {
159159
onError?: (error: mixed)=>void,
160160
identifierPrefix?: string,
161161
temporaryReferences?: TemporaryReferenceSet,
162+
startTime?: number,
162163
};
163164

164165
typePipeableStream={
@@ -195,6 +196,7 @@ export function renderToPipeableStream(
195196
options ? options.onError : undefined,
196197
options ? options.identifierPrefix : undefined,
197198
options ? options.temporaryReferences : undefined,
199+
options ? options.startTime : undefined,
198200
__DEV__&&options ? options.environmentName : undefined,
199201
__DEV__&&options ? options.filterStackFrame : undefined,
200202
debugChannel!==undefined,
@@ -352,6 +354,7 @@ export function renderToReadableStream(
352354
options ? options.onError : undefined,
353355
options ? options.identifierPrefix : undefined,
354356
options ? options.temporaryReferences : undefined,
357+
options ? options.startTime : undefined,
355358
__DEV__&&options ? options.environmentName : undefined,
356359
__DEV__&&options ? options.filterStackFrame : undefined,
357360
debugChannelReadable!==undefined,
@@ -434,6 +437,7 @@ type PrerenderOptions = {
434437
identifierPrefix?: string,
435438
temporaryReferences?: TemporaryReferenceSet,
436439
signal?: AbortSignal,
440+
startTime?: number,
437441
};
438442

439443
typeStaticResult={
@@ -464,6 +468,7 @@ export function prerenderToNodeStream(
464468
options ? options.onError : undefined,
465469
options ? options.identifierPrefix : undefined,
466470
options ? options.temporaryReferences : undefined,
471+
options ? options.startTime : undefined,
467472
__DEV__&&options ? options.environmentName : undefined,
468473
__DEV__&&options ? options.filterStackFrame : undefined,
469474
false,
@@ -526,6 +531,7 @@ export function prerender(
526531
options ? options.onError : undefined,
527532
options ? options.identifierPrefix : undefined,
528533
options ? options.temporaryReferences : undefined,
534+
options ? options.startTime : undefined,
529535
__DEV__&&options ? options.environmentName : undefined,
530536
__DEV__&&options ? options.filterStackFrame : undefined,
531537
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type Options = {
6464
signal?: AbortSignal,
6565
temporaryReferences?: TemporaryReferenceSet,
6666
onError?: (error: mixed)=>void,
67+
startTime?: number,
6768
};
6869

6970
functionstartReadingFromDebugChannelReadableStream(
@@ -126,6 +127,7 @@ function renderToReadableStream(
126127
options ? options.onError : undefined,
127128
options ? options.identifierPrefix : undefined,
128129
options ? options.temporaryReferences : undefined,
130+
options ? options.startTime : undefined,
129131
__DEV__&&options ? options.environmentName : undefined,
130132
__DEV__&&options ? options.filterStackFrame : undefined,
131133
debugChannelReadable!==undefined,
@@ -214,6 +216,7 @@ function prerender(
214216
options ? options.onError : undefined,
215217
options ? options.identifierPrefix : undefined,
216218
options ? options.temporaryReferences : undefined,
219+
options ? options.startTime : undefined,
217220
__DEV__&&options ? options.environmentName : undefined,
218221
__DEV__&&options ? options.filterStackFrame : undefined,
219222
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type Options = {
6969
signal?: AbortSignal,
7070
temporaryReferences?: TemporaryReferenceSet,
7171
onError?: (error: mixed)=>void,
72+
startTime?: number,
7273
};
7374

7475
functionstartReadingFromDebugChannelReadableStream(
@@ -131,6 +132,7 @@ function renderToReadableStream(
131132
options ? options.onError : undefined,
132133
options ? options.identifierPrefix : undefined,
133134
options ? options.temporaryReferences : undefined,
135+
options ? options.startTime : undefined,
134136
__DEV__&&options ? options.environmentName : undefined,
135137
__DEV__&&options ? options.filterStackFrame : undefined,
136138
debugChannelReadable!==undefined,
@@ -219,6 +221,7 @@ function prerender(
219221
options ? options.onError : undefined,
220222
options ? options.identifierPrefix : undefined,
221223
options ? options.temporaryReferences : undefined,
224+
options ? options.startTime : undefined,
222225
__DEV__&&options ? options.environmentName : undefined,
223226
__DEV__&&options ? options.filterStackFrame : undefined,
224227
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannel!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
‎packages/react-server-dom-unbundled/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannelReadable!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
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); }
})();
})();
[Flight] Allow overriding `request.timeOrigin` via `options.startTime… · react/react@b1533b0 · GitHub
Skip to content
Commit b1533b0
Browse files
lubieowocelubieowoce
authored
[Flight] Allow overriding request.timeOrigin via options.startTime (#35598)
Currently, IO that finished before the request started is not considered
IO:
https://github.com/facebook/react/blob/6a0ab4d2dd62dfdf8881ba1c3443c6d5acedc871/packages/react-server/src/ReactFlightServer.js#L5338-L5343
This leads to loss of debug info when a flight stream is deserialized
and serialized again.
We can solve this by allowing "when the the request started" to be set
to a point in the past, when the original stream started by doing
```js
const startTime = performance.now() + performance.timeOrigin
// ... stuff happens and time passes...
ReactServer.renderToReadableStream(..., { startTime })
```
1 parent 5dad2b4 commit b1533b0
15 files changed
Lines changed: 356 additions & 2 deletions
File tree
‎packages/react-markup/src/ReactMarkupServer.js‎
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ export function experimental_renderToHTML(
184184
handleFlightError,
185185
options ? options.identifierPrefix : undefined,
186186
undefined,
187+
undefined,
187188
'Markup',
188189
undefined,
189190
false,
‎packages/react-noop-renderer/src/ReactNoopFlightServer.js‎
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ type Options = {
7373
signal?: AbortSignal,
7474
debugChannel?: {onMessage?: (message: string)=>void},
7575
onError?: (error: mixed)=>void,
76+
startTime?: number,
7677
};
7778

7879
functionrender(model: ReactClientValue,options?: Options): Destination{
@@ -84,6 +85,7 @@ function render(model: ReactClientValue, options?: Options): Destination {
8485
options ? options.onError : undefined,
8586
options ? options.identifierPrefix : undefined,
8687
undefined,
88+
options ? options.startTime : undefined,
8789
__DEV__&&options ? options.environmentName : undefined,
8890
__DEV__&&options ? options.filterStackFrame : undefined,
8991
__DEV__&&options&&options.debugChannel!==undefined,
‎packages/react-server-dom-esm/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ type Options = {
146146
onError?: (error: mixed)=>void,
147147
identifierPrefix?: string,
148148
temporaryReferences?: TemporaryReferenceSet,
149+
startTime?: number,
149150
};
150151

151152
typePipeableStream={
@@ -183,6 +184,7 @@ function renderToPipeableStream(
183184
options ? options.onError : undefined,
184185
options ? options.identifierPrefix : undefined,
185186
options ? options.temporaryReferences : undefined,
187+
options ? options.startTime : undefined,
186188
__DEV__&&options ? options.environmentName : undefined,
187189
__DEV__&&options ? options.filterStackFrame : undefined,
188190
debugChannel!==undefined,
@@ -272,6 +274,7 @@ type PrerenderOptions = {
272274
identifierPrefix?: string,
273275
temporaryReferences?: TemporaryReferenceSet,
274276
signal?: AbortSignal,
277+
startTime?: number,
275278
};
276279

277280
typeStaticResult={
@@ -303,6 +306,7 @@ function prerenderToNodeStream(
303306
options ? options.onError : undefined,
304307
options ? options.identifierPrefix : undefined,
305308
options ? options.temporaryReferences : undefined,
309+
options ? options.startTime : undefined,
306310
__DEV__&&options ? options.environmentName : undefined,
307311
__DEV__&&options ? options.filterStackFrame : undefined,
308312
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -67,6 +68,7 @@ type Options = {
6768
signal?: AbortSignal,
6869
temporaryReferences?: TemporaryReferenceSet,
6970
onError?: (error: mixed)=>void,
71+
startTime?: number,
7072
};
7173

7274
functionstartReadingFromDebugChannelReadableStream(
@@ -128,6 +130,7 @@ export function renderToReadableStream(
128130
options ? options.onError : undefined,
129131
options ? options.identifierPrefix : undefined,
130132
options ? options.temporaryReferences : undefined,
133+
options ? options.startTime : undefined,
131134
__DEV__&&options ? options.environmentName : undefined,
132135
__DEV__&&options ? options.filterStackFrame : undefined,
133136
debugChannelReadable!==undefined,
@@ -215,6 +218,7 @@ export function prerender(
215218
options ? options.onError : undefined,
216219
options ? options.identifierPrefix : undefined,
217220
options ? options.temporaryReferences : undefined,
221+
options ? options.startTime : undefined,
218222
__DEV__&&options ? options.environmentName : undefined,
219223
__DEV__&&options ? options.filterStackFrame : undefined,
220224
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type {
1212
ReactClientValue,
1313
}from'react-server/src/ReactFlightServer';
1414
importtype{ReactFormState,Thenable}from'shared/ReactTypes';
15+
1516
import{
1617
preloadModule,
1718
requireModule,
@@ -72,6 +73,7 @@ type Options = {
7273
signal?: AbortSignal,
7374
temporaryReferences?: TemporaryReferenceSet,
7475
onError?: (error: mixed)=>void,
76+
startTime?: number,
7577
};
7678

7779
functionstartReadingFromDebugChannelReadableStream(
@@ -133,6 +135,7 @@ export function renderToReadableStream(
133135
options ? options.onError : undefined,
134136
options ? options.identifierPrefix : undefined,
135137
options ? options.temporaryReferences : undefined,
138+
options ? options.startTime : undefined,
136139
__DEV__&&options ? options.environmentName : undefined,
137140
__DEV__&&options ? options.filterStackFrame : undefined,
138141
debugChannelReadable!==undefined,
@@ -220,6 +223,7 @@ export function prerender(
220223
options ? options.onError : undefined,
221224
options ? options.identifierPrefix : undefined,
222225
options ? options.temporaryReferences : undefined,
226+
options ? options.startTime : undefined,
223227
__DEV__&&options ? options.environmentName : undefined,
224228
__DEV__&&options ? options.filterStackFrame : undefined,
225229
false,
‎packages/react-server-dom-parcel/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ type Options = {
159159
onError?: (error: mixed)=>void,
160160
identifierPrefix?: string,
161161
temporaryReferences?: TemporaryReferenceSet,
162+
startTime?: number,
162163
};
163164

164165
typePipeableStream={
@@ -195,6 +196,7 @@ export function renderToPipeableStream(
195196
options ? options.onError : undefined,
196197
options ? options.identifierPrefix : undefined,
197198
options ? options.temporaryReferences : undefined,
199+
options ? options.startTime : undefined,
198200
__DEV__&&options ? options.environmentName : undefined,
199201
__DEV__&&options ? options.filterStackFrame : undefined,
200202
debugChannel!==undefined,
@@ -352,6 +354,7 @@ export function renderToReadableStream(
352354
options ? options.onError : undefined,
353355
options ? options.identifierPrefix : undefined,
354356
options ? options.temporaryReferences : undefined,
357+
options ? options.startTime : undefined,
355358
__DEV__&&options ? options.environmentName : undefined,
356359
__DEV__&&options ? options.filterStackFrame : undefined,
357360
debugChannelReadable!==undefined,
@@ -434,6 +437,7 @@ type PrerenderOptions = {
434437
identifierPrefix?: string,
435438
temporaryReferences?: TemporaryReferenceSet,
436439
signal?: AbortSignal,
440+
startTime?: number,
437441
};
438442

439443
typeStaticResult={
@@ -464,6 +468,7 @@ export function prerenderToNodeStream(
464468
options ? options.onError : undefined,
465469
options ? options.identifierPrefix : undefined,
466470
options ? options.temporaryReferences : undefined,
471+
options ? options.startTime : undefined,
467472
__DEV__&&options ? options.environmentName : undefined,
468473
__DEV__&&options ? options.filterStackFrame : undefined,
469474
false,
@@ -526,6 +531,7 @@ export function prerender(
526531
options ? options.onError : undefined,
527532
options ? options.identifierPrefix : undefined,
528533
options ? options.temporaryReferences : undefined,
534+
options ? options.startTime : undefined,
529535
__DEV__&&options ? options.environmentName : undefined,
530536
__DEV__&&options ? options.filterStackFrame : undefined,
531537
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerBrowser.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ type Options = {
6464
signal?: AbortSignal,
6565
temporaryReferences?: TemporaryReferenceSet,
6666
onError?: (error: mixed)=>void,
67+
startTime?: number,
6768
};
6869

6970
functionstartReadingFromDebugChannelReadableStream(
@@ -126,6 +127,7 @@ function renderToReadableStream(
126127
options ? options.onError : undefined,
127128
options ? options.identifierPrefix : undefined,
128129
options ? options.temporaryReferences : undefined,
130+
options ? options.startTime : undefined,
129131
__DEV__&&options ? options.environmentName : undefined,
130132
__DEV__&&options ? options.filterStackFrame : undefined,
131133
debugChannelReadable!==undefined,
@@ -214,6 +216,7 @@ function prerender(
214216
options ? options.onError : undefined,
215217
options ? options.identifierPrefix : undefined,
216218
options ? options.temporaryReferences : undefined,
219+
options ? options.startTime : undefined,
217220
__DEV__&&options ? options.environmentName : undefined,
218221
__DEV__&&options ? options.filterStackFrame : undefined,
219222
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerEdge.js‎
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ type Options = {
6969
signal?: AbortSignal,
7070
temporaryReferences?: TemporaryReferenceSet,
7171
onError?: (error: mixed)=>void,
72+
startTime?: number,
7273
};
7374

7475
functionstartReadingFromDebugChannelReadableStream(
@@ -131,6 +132,7 @@ function renderToReadableStream(
131132
options ? options.onError : undefined,
132133
options ? options.identifierPrefix : undefined,
133134
options ? options.temporaryReferences : undefined,
135+
options ? options.startTime : undefined,
134136
__DEV__&&options ? options.environmentName : undefined,
135137
__DEV__&&options ? options.filterStackFrame : undefined,
136138
debugChannelReadable!==undefined,
@@ -219,6 +221,7 @@ function prerender(
219221
options ? options.onError : undefined,
220222
options ? options.identifierPrefix : undefined,
221223
options ? options.temporaryReferences : undefined,
224+
options ? options.startTime : undefined,
222225
__DEV__&&options ? options.environmentName : undefined,
223226
__DEV__&&options ? options.filterStackFrame : undefined,
224227
false,
‎packages/react-server-dom-turbopack/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannel!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
‎packages/react-server-dom-unbundled/src/server/ReactFlightDOMServerNode.js‎
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ type Options = {
152152
onError?: (error: mixed)=>void,
153153
identifierPrefix?: string,
154154
temporaryReferences?: TemporaryReferenceSet,
155+
startTime?: number,
155156
};
156157

157158
typePipeableStream={
@@ -189,6 +190,7 @@ function renderToPipeableStream(
189190
options ? options.onError : undefined,
190191
options ? options.identifierPrefix : undefined,
191192
options ? options.temporaryReferences : undefined,
193+
options ? options.startTime : undefined,
192194
__DEV__&&options ? options.environmentName : undefined,
193195
__DEV__&&options ? options.filterStackFrame : undefined,
194196
debugChannelReadable!==undefined,
@@ -347,6 +349,7 @@ function renderToReadableStream(
347349
options ? options.onError : undefined,
348350
options ? options.identifierPrefix : undefined,
349351
options ? options.temporaryReferences : undefined,
352+
options ? options.startTime : undefined,
350353
__DEV__&&options ? options.environmentName : undefined,
351354
__DEV__&&options ? options.filterStackFrame : undefined,
352355
debugChannelReadable!==undefined,
@@ -429,6 +432,7 @@ type PrerenderOptions = {
429432
identifierPrefix?: string,
430433
temporaryReferences?: TemporaryReferenceSet,
431434
signal?: AbortSignal,
435+
startTime?: number,
432436
};
433437

434438
typeStaticResult={
@@ -460,6 +464,7 @@ function prerenderToNodeStream(
460464
options ? options.onError : undefined,
461465
options ? options.identifierPrefix : undefined,
462466
options ? options.temporaryReferences : undefined,
467+
options ? options.startTime : undefined,
463468
__DEV__&&options ? options.environmentName : undefined,
464469
__DEV__&&options ? options.filterStackFrame : undefined,
465470
false,
@@ -523,6 +528,7 @@ function prerender(
523528
options ? options.onError : undefined,
524529
options ? options.identifierPrefix : undefined,
525530
options ? options.temporaryReferences : undefined,
531+
options ? options.startTime : undefined,
526532
__DEV__&&options ? options.environmentName : undefined,
527533
__DEV__&&options ? options.filterStackFrame : undefined,
528534
false,
0 commit comments
Comments
 (0)