[Fizz] Push a stalled use() to the ownerStack/debugTask#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
eps1lon wants to merge 10 commits into from
Closed

[Fizz] Push a stalled use() to the ownerStack/debugTask #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd5a4c6
[Fizz] Push a stalled use() to the ownerStack/debugTask
eps1lon Nov 26, 2025
5aab310
Use forked implementation of performWork
eps1lon Nov 26, 2025
b53420e
Explain why the ConsoleTask is incomplete
eps1lon Nov 27, 2025
5a24906
should we reset thenables to unknown status?
eps1lon Nov 27, 2025
3be7b3c
Current behavior for what happens if you resolve before React gets a …
eps1lon Nov 28, 2025
70db38b
Ensure we rerender with the original suspender
eps1lon Nov 28, 2025
4cc34ff
Current behavior with lazy types
eps1lon Nov 28, 2025
0e0779c
Rerender through Lazy Components in dev if we were already aborting
eps1lon Nov 29, 2025
38e1360
Ensure the temporary corruption of internal state goes unnoticed
eps1lon Nov 29, 2025
cbfb89e
Revert fixture changes
eps1lon Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
195 changes: 188 additions & 7 deletions packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,28 @@ describe('ReactFlightDOMNode', () => {
);
}

/**
* Removes all stackframes not pointing into this file
*/
function ignoreListStack(str) {
if (!str) {
return str;
}

let ignoreListedStack = '';
const lines = str.split('\n');

// eslint-disable-next-line no-for-of-loops/no-for-of-loops
for (const line of lines) {
if (line.indexOf(__filename) === -1) {
} else {
ignoreListedStack += '\n' + line.replace(__dirname, '.');
}
}

return ignoreListedStack;
}

function readResult(stream) {
return new Promise((resolve, reject) => {
let buffer = '';
Expand DownExpand Up@@ -784,6 +806,165 @@ describe('ReactFlightDOMNode', () => {
}
});

// @gate enableHalt
it('includes source locations in component and owner stacks for halted Client components', async () => {
function SharedComponent({p1, p2, p3}) {
use(p1);
use(p2);
use(p3);
return <div>Hello, Dave!</div>;
}
const ClientComponentOnTheServer = clientExports(SharedComponent);
const ClientComponentOnTheClient = clientExports(
SharedComponent,
123,
'path/to/chunk.js',
);

let resolvePendingPromise;
function ServerComponent() {
const p1 = Promise.resolve();
const p2 = new Promise(resolve => {
resolvePendingPromise = value => {
p2.status = 'fulfilled';
p2.value = value;
resolve(value);
};
});
const p3 = new Promise(() => {});
return ReactServer.createElement(ClientComponentOnTheClient, {
p1: p1,
p2: p2,
p3: p3,
});
}

function App() {
return ReactServer.createElement(
'html',
null,
ReactServer.createElement(
'body',
null,
ReactServer.createElement(
ReactServer.Suspense,
{fallback: 'Loading...'},
ReactServer.createElement(ServerComponent, null),
),
),
);
}

const errors = [];
const rscStream = await serverAct(() =>
ReactServerDOMServer.renderToPipeableStream(
ReactServer.createElement(App, null),
webpackMap,
),
);

const readable = new Stream.PassThrough(streamOptions);
rscStream.pipe(readable);

function ClientRoot({response}) {
return use(response);
}

const serverConsumerManifest = {
moduleMap: {
[webpackMap[ClientComponentOnTheClient.$$id].id]: {
'*': webpackMap[ClientComponentOnTheServer.$$id],
},
},
moduleLoading: webpackModuleLoading,
};

expect(errors).toEqual([]);

function ClientRoot({response}) {
return use(response);
}

const response = ReactServerDOMClient.createFromNodeStream(
readable,
serverConsumerManifest,
);

let componentStack;
let ownerStack;

const clientAbortController = new AbortController();

const fizzPrerenderStreamResult = ReactDOMFizzStatic.prerender(
React.createElement(ClientRoot, {response}),
{
signal: clientAbortController.signal,
onError(error, errorInfo) {
componentStack = errorInfo.componentStack;
ownerStack = React.captureOwnerStack
? React.captureOwnerStack()
: null;
},
},
);

resolvePendingPromise('custom-instrum-resolve');
await serverAct(
async () =>
new Promise(resolve => {
setImmediate(() => {
clientAbortController.abort();
resolve();
});
}),
);

const fizzPrerenderStream = await fizzPrerenderStreamResult;
const prerenderHTML = await readWebResult(fizzPrerenderStream.prelude);

expect(prerenderHTML).toContain('Loading...');

if (__DEV__) {
expect(normalizeCodeLocInfo(componentStack)).toBe(
'\n' +
' in SharedComponent (at **)\n' +
' in ServerComponent' +
(gate(flags => flags.enableAsyncDebugInfo) ? ' (at **)' : '') +
'\n' +
' in Suspense\n' +
' in body\n' +
' in html\n' +
' in App (at **)\n' +
' in ClientRoot (at **)',
);
} else {
expect(normalizeCodeLocInfo(componentStack)).toBe(
'\n' +
' in SharedComponent (at **)\n' +
' in Suspense\n' +
' in body\n' +
' in html\n' +
' in ClientRoot (at **)',
);
}

if (__DEV__) {
expect(ignoreListStack(ownerStack)).toBe(
// eslint-disable-next-line react-internal/safe-string-coercion
'' +
// The concrete location may change as this test is updated.
// Just make sure they still point at React.use(p2)
(gate(flags => flags.enableAsyncDebugInfo)
? '\n at SharedComponent (./ReactFlightDOMNode-test.js:813:7)'
: '') +
'\n at ServerComponent (file://./ReactFlightDOMNode-test.js:835:26)' +
'\n at App (file://./ReactFlightDOMNode-test.js:852:25)',
);
} else {
expect(ownerStack).toBeNull();
}
});

// @gate enableHalt
it('includes deeper location for aborted stacks', async () => {
async function getData() {
Expand DownExpand Up@@ -1364,12 +1545,12 @@ describe('ReactFlightDOMNode', () => {
'\n' +
' in Dynamic' +
(gate(flags => flags.enableAsyncDebugInfo)
? ' (file://ReactFlightDOMNode-test.js:1238:27)\n'
? ' (file://ReactFlightDOMNode-test.js:1419:27)\n'
: '\n') +
' in body\n' +
' in html\n' +
' in App (file://ReactFlightDOMNode-test.js:1251:25)\n' +
' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
' in App (file://ReactFlightDOMNode-test.js:1432:25)\n' +
' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
);
} else {
expect(
Expand All@@ -1378,7 +1559,7 @@ describe('ReactFlightDOMNode', () => {
'\n' +
' in body\n' +
' in html\n' +
' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
);
}

Expand All@@ -1388,16 +1569,16 @@ describe('ReactFlightDOMNode', () => {
normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
).toBe(
'\n' +
' in Dynamic (file://ReactFlightDOMNode-test.js:1238:27)\n' +
' in App (file://ReactFlightDOMNode-test.js:1251:25)',
' in Dynamic (file://ReactFlightDOMNode-test.js:1419:27)\n' +
' in App (file://ReactFlightDOMNode-test.js:1432:25)',
);
} else {
expect(
normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
).toBe(
'' +
'\n' +
' in App (file://ReactFlightDOMNode-test.js:1251:25)',
' in App (file://ReactFlightDOMNode-test.js:1432:25)',
);
}
} else {
Expand Down
104 changes: 98 additions & 6 deletions packages/react-server/src/ReactFizzServer.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,14 @@ import assign from 'shared/assign';
import noop from 'shared/noop';
import getComponentNameFromType from 'shared/getComponentNameFromType';
import isArray from 'shared/isArray';
import {SuspenseException, getSuspendedThenable} from './ReactFizzThenable';
import {
SuspenseException,
getSuspendedThenable,
ensureSuspendableThenableStateDEV,
getSuspendedCallSiteStackDEV,
getSuspendedCallSiteDebugTaskDEV,
setCaptureSuspendedCallSiteDEV,
} from './ReactFizzThenable';

// Linked list representing the identity of a component given the component/tag name and key.
// The name might be minified but we assume that it's going to be the same generated name. Typically
Expand DownExpand Up@@ -1023,6 +1030,85 @@ function pushHaltedAwaitOnComponentStack(
}
}

// performWork + retryTask without mutation
function rerenderStalledTask(request: Request, task: Task): void {
const prevContext = getActiveContext();
const prevDispatcher = ReactSharedInternals.H;
ReactSharedInternals.H = HooksDispatcher;
const prevAsyncDispatcher = ReactSharedInternals.A;
ReactSharedInternals.A = DefaultAsyncDispatcher;

const prevRequest = currentRequest;
currentRequest = request;

const prevGetCurrentStackImpl = ReactSharedInternals.getCurrentStack;
ReactSharedInternals.getCurrentStack = getCurrentStackInDEV;

const prevResumableState = currentResumableState;
setCurrentResumableState(request.resumableState);
switchContext(task.context);
const prevTaskInDEV = currentTaskInDEV;
setCurrentTaskInDEV(task);
try {
retryNode(request, task);
} catch (x) {
// Suspended again.
resetHooksState();
} finally {
setCurrentTaskInDEV(prevTaskInDEV);
setCurrentResumableState(prevResumableState);

ReactSharedInternals.H = prevDispatcher;
ReactSharedInternals.A = prevAsyncDispatcher;

ReactSharedInternals.getCurrentStack = prevGetCurrentStackImpl;
if (prevDispatcher === HooksDispatcher) {
// This means that we were in a reentrant work loop. This could happen
// in a renderer that supports synchronous work like renderToString,
// when it's called from within another renderer.
// Normally we don't bother switching the contexts to their root/default
// values when leaving because we'll likely need the same or similar
// context again. However, when we're inside a synchronous loop like this
// we'll to restore the context to what it was before returning.
switchContext(prevContext);
}
currentRequest = prevRequest;
}
}

function pushSuspendedCallSiteOnComponentStack(
request: Request,
task: Task,
): void {
setCaptureSuspendedCallSiteDEV(true);
const restoreThenableState = ensureSuspendableThenableStateDEV(
// refined at the callsite
((task.thenableState: any): ThenableState),
);
try {
rerenderStalledTask(request, task);
} finally {
restoreThenableState();
setCaptureSuspendedCallSiteDEV(false);
}

const suspendCallSiteStack = getSuspendedCallSiteStackDEV();
const suspendCallSiteDebugTask = getSuspendedCallSiteDebugTaskDEV();

if (suspendCallSiteStack !== null) {
const ownerStack = task.componentStack;
task.componentStack = {
// The owner of the suspended call site would be the owner of this task.
// We need the task itself otherwise we'd miss a frame.
owner: ownerStack,
parent: suspendCallSiteStack.parent,
stack: suspendCallSiteStack.stack,
type: suspendCallSiteStack.type,
};
}
task.debugTask = suspendCallSiteDebugTask;
}

function pushServerComponentStack(
task: Task,
debugInfo: void | null | ReactDebugInfo,
Expand DownExpand Up@@ -2716,14 +2802,23 @@ function renderLazyComponent(
ref: any,
): void {
let Component;
let previouslyAbortingDEV;
if (__DEV__) {
previouslyAbortingDEV = request.status === ABORTING;
Component = callLazyInitInDEV(lazyComponent);
} else {
const payload = lazyComponent._payload;
const init = lazyComponent._init;
Component = init(payload);
}
if (request.status === ABORTING) {
if (
request.status === ABORTING &&
// If we already started rendering the Lazy Componentn in an aborting state
// and reach this point, the lazy was already resolved.
// We don't bail here again since this is most likely a discarded rerender
// to get the stack where we suspended in dev.
(!__DEV__ || !previouslyAbortingDEV)
) {
// eslint-disable-next-line no-throw-literal
throw null;
}
Expand DownExpand Up@@ -4535,12 +4630,9 @@ function abortTask(task: Task, request: Request, error: mixed): void {
debugInfo = node._debugInfo;
}
pushHaltedAwaitOnComponentStack(task, debugInfo);
/*
if (task.thenableState !== null) {
// TODO: If we were stalled inside use() of a Client Component then we should
// rerender to get the stack trace from the use() call.
pushSuspendedCallSiteOnComponentStack(request, task);
}
*/
}
}

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

Skip to content
[Fizz] Push a stalled use() to the ownerStack/debugTask#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

eps1lon
wants to merge
10
commits into

from

 Closed


[Fizz] Push a stalled use() to the ownerStack/debugTask
#13
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
fd5a4c6

[Fizz] Push a stalled use() to the ownerStack/debugTask


eps1lon Nov 26, 2025
5aab310

Use forked implementation of performWork


eps1lon Nov 26, 2025
b53420e

Explain why the ConsoleTask is incomplete


eps1lon Nov 27, 2025
5a24906

should we reset thenables to unknown status?


eps1lon Nov 27, 2025
3be7b3c

Current behavior for what happens if you resolve before React gets a …


eps1lon Nov 28, 2025
70db38b

Ensure we rerender with the original suspender


eps1lon Nov 28, 2025
4cc34ff

Current behavior with lazy types


eps1lon Nov 28, 2025
0e0779c

Rerender through Lazy Components in dev if we were already aborting


eps1lon Nov 29, 2025
38e1360

Ensure the temporary corruption of internal state goes unnoticed


eps1lon Nov 29, 2025
cbfb89e

Revert fixture changes


eps1lon Dec 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


195 changes: 188 additions & 7 deletions
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,28 @@ describe('ReactFlightDOMNode', () => {
 );
 }

 /**
 * Removes all stackframes not pointing into this file
 */
 function ignoreListStack(str) {
 if (!str) {
 return str;
 }

 let ignoreListedStack = '';
 const lines = str.split('\n');

 // eslint-disable-next-line no-for-of-loops/no-for-of-loops
 for (const line of lines) {
 if (line.indexOf(__filename) === -1) {
 } else {
 ignoreListedStack += '\n' + line.replace(__dirname, '.');
 }
 }

 return ignoreListedStack;
 }

 function readResult(stream) {
 return new Promise((resolve, reject) => {
 let buffer = '';
Expand DownExpand Up@@ -784,6 +806,165 @@ describe('ReactFlightDOMNode', () => {
 }
 });

 // @gate enableHalt
 it('includes source locations in component and owner stacks for halted Client components', async () => {
 function SharedComponent({p1, p2, p3}) {
 use(p1);
 use(p2);
 use(p3);
 return <div>Hello, Dave!</div>;
 }
 const ClientComponentOnTheServer = clientExports(SharedComponent);
 const ClientComponentOnTheClient = clientExports(
 SharedComponent,
 123,
 'path/to/chunk.js',
 );

 let resolvePendingPromise;
 function ServerComponent() {
 const p1 = Promise.resolve();
 const p2 = new Promise(resolve => {
 resolvePendingPromise = value => {
 p2.status = 'fulfilled';
 p2.value = value;
 resolve(value);
 };
 });
 const p3 = new Promise(() => {});
 return ReactServer.createElement(ClientComponentOnTheClient, {
 p1: p1,
 p2: p2,
 p3: p3,
 });
 }

 function App() {
 return ReactServer.createElement(
 'html',
 null,
 ReactServer.createElement(
 'body',
 null,
 ReactServer.createElement(
 ReactServer.Suspense,
 {fallback: 'Loading...'},
 ReactServer.createElement(ServerComponent, null),
 ),
 ),
 );
 }

 const errors = [];
 const rscStream = await serverAct(() =>
 ReactServerDOMServer.renderToPipeableStream(
 ReactServer.createElement(App, null),
 webpackMap,
 ),
 );

 const readable = new Stream.PassThrough(streamOptions);
 rscStream.pipe(readable);

 function ClientRoot({response}) {
 return use(response);
 }

 const serverConsumerManifest = {
 moduleMap: {
 [webpackMap[ClientComponentOnTheClient.$$id].id]: {
 '*': webpackMap[ClientComponentOnTheServer.$$id],
 },
 },
 moduleLoading: webpackModuleLoading,
 };

 expect(errors).toEqual([]);

 function ClientRoot({response}) {
 return use(response);
 }

 const response = ReactServerDOMClient.createFromNodeStream(
 readable,
 serverConsumerManifest,
 );

 let componentStack;
 let ownerStack;

 const clientAbortController = new AbortController();

 const fizzPrerenderStreamResult = ReactDOMFizzStatic.prerender(
 React.createElement(ClientRoot, {response}),
 {
 signal: clientAbortController.signal,
 onError(error, errorInfo) {
 componentStack = errorInfo.componentStack;
 ownerStack = React.captureOwnerStack
 ? React.captureOwnerStack()
 : null;
 },
 },
 );

 resolvePendingPromise('custom-instrum-resolve');
 await serverAct(
 async () =>
 new Promise(resolve => {
 setImmediate(() => {
 clientAbortController.abort();
 resolve();
 });
 }),
 );

 const fizzPrerenderStream = await fizzPrerenderStreamResult;
 const prerenderHTML = await readWebResult(fizzPrerenderStream.prelude);

 expect(prerenderHTML).toContain('Loading...');

 if (__DEV__) {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in ServerComponent' +
 (gate(flags => flags.enableAsyncDebugInfo) ? ' (at **)' : '') +
 '\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in App (at **)\n' +
 ' in ClientRoot (at **)',
 );
 } else {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (at **)',
 );
 }

 if (__DEV__) {
 expect(ignoreListStack(ownerStack)).toBe(
 // eslint-disable-next-line react-internal/safe-string-coercion
 '' +
 // The concrete location may change as this test is updated.
 // Just make sure they still point at React.use(p2)
 (gate(flags => flags.enableAsyncDebugInfo)
 ? '\n at SharedComponent (./ReactFlightDOMNode-test.js:813:7)'
 : '') +
 '\n at ServerComponent (file://./ReactFlightDOMNode-test.js:835:26)' +
 '\n at App (file://./ReactFlightDOMNode-test.js:852:25)',
 );
 } else {
 expect(ownerStack).toBeNull();
 }
 });

 // @gate enableHalt
 it('includes deeper location for aborted stacks', async () => {
 async function getData() {
Expand DownExpand Up@@ -1364,12 +1545,12 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in Dynamic' +
 (gate(flags => flags.enableAsyncDebugInfo)
 ? ' (file://ReactFlightDOMNode-test.js:1238:27)\n'
 ? ' (file://ReactFlightDOMNode-test.js:1419:27)\n'
 : '\n') +
 ' in body\n' +
 ' in html\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 } else {
 expect(
Expand All@@ -1378,7 +1559,7 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 }

Expand All@@ -1388,16 +1569,16 @@ describe('ReactFlightDOMNode', () => {
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '\n' +
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1238:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1419:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 } else {
 expect(
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '' +
 '\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 }
 } else {
Expand Down

104 changes: 98 additions & 6 deletions
packages/react-server/src/ReactFizzServer.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,14 @@ import assign from 'shared/assign';
import noop from 'shared/noop';
import getComponentNameFromType from 'shared/getComponentNameFromType';
import isArray from 'shared/isArray';
import {SuspenseException, getSuspendedThenable} from './ReactFizzThenable';
import {
 SuspenseException,
 getSuspendedThenable,
 ensureSuspendableThenableStateDEV,
 getSuspendedCallSiteStackDEV,
 getSuspendedCallSiteDebugTaskDEV,
 setCaptureSuspendedCallSiteDEV,
} from './ReactFizzThenable';

// Linked list representing the identity of a component given the component/tag name and key.
// The name might be minified but we assume that it's going to be the same generated name. Typically
Expand DownExpand Up@@ -1023,6 +1030,85 @@ function pushHaltedAwaitOnComponentStack(
 }
}

// performWork + retryTask without mutation
function rerenderStalledTask(request: Request, task: Task): void {
 const prevContext = getActiveContext();
 const prevDispatcher = ReactSharedInternals.H;
 ReactSharedInternals.H = HooksDispatcher;
 const prevAsyncDispatcher = ReactSharedInternals.A;
 ReactSharedInternals.A = DefaultAsyncDispatcher;

 const prevRequest = currentRequest;
 currentRequest = request;

 const prevGetCurrentStackImpl = ReactSharedInternals.getCurrentStack;
 ReactSharedInternals.getCurrentStack = getCurrentStackInDEV;

 const prevResumableState = currentResumableState;
 setCurrentResumableState(request.resumableState);
 switchContext(task.context);
 const prevTaskInDEV = currentTaskInDEV;
 setCurrentTaskInDEV(task);
 try {
 retryNode(request, task);
 } catch (x) {
 // Suspended again.
 resetHooksState();
 } finally {
 setCurrentTaskInDEV(prevTaskInDEV);
 setCurrentResumableState(prevResumableState);

 ReactSharedInternals.H = prevDispatcher;
 ReactSharedInternals.A = prevAsyncDispatcher;

 ReactSharedInternals.getCurrentStack = prevGetCurrentStackImpl;
 if (prevDispatcher === HooksDispatcher) {
 // This means that we were in a reentrant work loop. This could happen
 // in a renderer that supports synchronous work like renderToString,
 // when it's called from within another renderer.
 // Normally we don't bother switching the contexts to their root/default
 // values when leaving because we'll likely need the same or similar
 // context again. However, when we're inside a synchronous loop like this
 // we'll to restore the context to what it was before returning.
 switchContext(prevContext);
 }
 currentRequest = prevRequest;
 }
}

function pushSuspendedCallSiteOnComponentStack(
 request: Request,
 task: Task,
): void {
 setCaptureSuspendedCallSiteDEV(true);
 const restoreThenableState = ensureSuspendableThenableStateDEV(
 // refined at the callsite
 ((task.thenableState: any): ThenableState),
 );
 try {
 rerenderStalledTask(request, task);
 } finally {
 restoreThenableState();
 setCaptureSuspendedCallSiteDEV(false);
 }

 const suspendCallSiteStack = getSuspendedCallSiteStackDEV();
 const suspendCallSiteDebugTask = getSuspendedCallSiteDebugTaskDEV();

 if (suspendCallSiteStack !== null) {
 const ownerStack = task.componentStack;
 task.componentStack = {
 // The owner of the suspended call site would be the owner of this task.
 // We need the task itself otherwise we'd miss a frame.
 owner: ownerStack,
 parent: suspendCallSiteStack.parent,
 stack: suspendCallSiteStack.stack,
 type: suspendCallSiteStack.type,
 };
 }
 task.debugTask = suspendCallSiteDebugTask;
}

function pushServerComponentStack(
 task: Task,
 debugInfo: void | null | ReactDebugInfo,
Expand DownExpand Up@@ -2716,14 +2802,23 @@ function renderLazyComponent(
 ref: any,
): void {
 let Component;
 let previouslyAbortingDEV;
 if (__DEV__) {
 previouslyAbortingDEV = request.status === ABORTING;
 Component = callLazyInitInDEV(lazyComponent);
 } else {
 const payload = lazyComponent._payload;
 const init = lazyComponent._init;
 Component = init(payload);
 }
 if (request.status === ABORTING) {
 if (
 request.status === ABORTING &&
 // If we already started rendering the Lazy Componentn in an aborting state
 // and reach this point, the lazy was already resolved.
 // We don't bail here again since this is most likely a discarded rerender
 // to get the stack where we suspended in dev.
 (!__DEV__ || !previouslyAbortingDEV)
 ) {
 // eslint-disable-next-line no-throw-literal
 throw null;
 }
Expand DownExpand Up@@ -4535,12 +4630,9 @@ function abortTask(task: Task, request: Request, error: mixed): void {
 debugInfo = node._debugInfo;
 }
 pushHaltedAwaitOnComponentStack(task, debugInfo);
 /*
 if (task.thenableState !== null) {
 // TODO: If we were stalled inside use() of a Client Component then we should
 // rerender to get the stack trace from the use() call.
 pushSuspendedCallSiteOnComponentStack(request, task);
 }
 */
 }
 }

Expand Down
Loading
Loading

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

Skip to content
[Fizz] Push a stalled use() to the ownerStack/debugTask#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

eps1lon
wants to merge
10
commits into

from

 Closed


[Fizz] Push a stalled use() to the ownerStack/debugTask
#13
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
fd5a4c6

[Fizz] Push a stalled use() to the ownerStack/debugTask


eps1lon Nov 26, 2025
5aab310

Use forked implementation of performWork


eps1lon Nov 26, 2025
b53420e

Explain why the ConsoleTask is incomplete


eps1lon Nov 27, 2025
5a24906

should we reset thenables to unknown status?


eps1lon Nov 27, 2025
3be7b3c

Current behavior for what happens if you resolve before React gets a …


eps1lon Nov 28, 2025
70db38b

Ensure we rerender with the original suspender


eps1lon Nov 28, 2025
4cc34ff

Current behavior with lazy types


eps1lon Nov 28, 2025
0e0779c

Rerender through Lazy Components in dev if we were already aborting


eps1lon Nov 29, 2025
38e1360

Ensure the temporary corruption of internal state goes unnoticed


eps1lon Nov 29, 2025
cbfb89e

Revert fixture changes


eps1lon Dec 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


195 changes: 188 additions & 7 deletions
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,28 @@ describe('ReactFlightDOMNode', () => {
 );
 }

 /**
 * Removes all stackframes not pointing into this file
 */
 function ignoreListStack(str) {
 if (!str) {
 return str;
 }

 let ignoreListedStack = '';
 const lines = str.split('\n');

 // eslint-disable-next-line no-for-of-loops/no-for-of-loops
 for (const line of lines) {
 if (line.indexOf(__filename) === -1) {
 } else {
 ignoreListedStack += '\n' + line.replace(__dirname, '.');
 }
 }

 return ignoreListedStack;
 }

 function readResult(stream) {
 return new Promise((resolve, reject) => {
 let buffer = '';
Expand DownExpand Up@@ -784,6 +806,165 @@ describe('ReactFlightDOMNode', () => {
 }
 });

 // @gate enableHalt
 it('includes source locations in component and owner stacks for halted Client components', async () => {
 function SharedComponent({p1, p2, p3}) {
 use(p1);
 use(p2);
 use(p3);
 return <div>Hello, Dave!</div>;
 }
 const ClientComponentOnTheServer = clientExports(SharedComponent);
 const ClientComponentOnTheClient = clientExports(
 SharedComponent,
 123,
 'path/to/chunk.js',
 );

 let resolvePendingPromise;
 function ServerComponent() {
 const p1 = Promise.resolve();
 const p2 = new Promise(resolve => {
 resolvePendingPromise = value => {
 p2.status = 'fulfilled';
 p2.value = value;
 resolve(value);
 };
 });
 const p3 = new Promise(() => {});
 return ReactServer.createElement(ClientComponentOnTheClient, {
 p1: p1,
 p2: p2,
 p3: p3,
 });
 }

 function App() {
 return ReactServer.createElement(
 'html',
 null,
 ReactServer.createElement(
 'body',
 null,
 ReactServer.createElement(
 ReactServer.Suspense,
 {fallback: 'Loading...'},
 ReactServer.createElement(ServerComponent, null),
 ),
 ),
 );
 }

 const errors = [];
 const rscStream = await serverAct(() =>
 ReactServerDOMServer.renderToPipeableStream(
 ReactServer.createElement(App, null),
 webpackMap,
 ),
 );

 const readable = new Stream.PassThrough(streamOptions);
 rscStream.pipe(readable);

 function ClientRoot({response}) {
 return use(response);
 }

 const serverConsumerManifest = {
 moduleMap: {
 [webpackMap[ClientComponentOnTheClient.$$id].id]: {
 '*': webpackMap[ClientComponentOnTheServer.$$id],
 },
 },
 moduleLoading: webpackModuleLoading,
 };

 expect(errors).toEqual([]);

 function ClientRoot({response}) {
 return use(response);
 }

 const response = ReactServerDOMClient.createFromNodeStream(
 readable,
 serverConsumerManifest,
 );

 let componentStack;
 let ownerStack;

 const clientAbortController = new AbortController();

 const fizzPrerenderStreamResult = ReactDOMFizzStatic.prerender(
 React.createElement(ClientRoot, {response}),
 {
 signal: clientAbortController.signal,
 onError(error, errorInfo) {
 componentStack = errorInfo.componentStack;
 ownerStack = React.captureOwnerStack
 ? React.captureOwnerStack()
 : null;
 },
 },
 );

 resolvePendingPromise('custom-instrum-resolve');
 await serverAct(
 async () =>
 new Promise(resolve => {
 setImmediate(() => {
 clientAbortController.abort();
 resolve();
 });
 }),
 );

 const fizzPrerenderStream = await fizzPrerenderStreamResult;
 const prerenderHTML = await readWebResult(fizzPrerenderStream.prelude);

 expect(prerenderHTML).toContain('Loading...');

 if (__DEV__) {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in ServerComponent' +
 (gate(flags => flags.enableAsyncDebugInfo) ? ' (at **)' : '') +
 '\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in App (at **)\n' +
 ' in ClientRoot (at **)',
 );
 } else {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (at **)',
 );
 }

 if (__DEV__) {
 expect(ignoreListStack(ownerStack)).toBe(
 // eslint-disable-next-line react-internal/safe-string-coercion
 '' +
 // The concrete location may change as this test is updated.
 // Just make sure they still point at React.use(p2)
 (gate(flags => flags.enableAsyncDebugInfo)
 ? '\n at SharedComponent (./ReactFlightDOMNode-test.js:813:7)'
 : '') +
 '\n at ServerComponent (file://./ReactFlightDOMNode-test.js:835:26)' +
 '\n at App (file://./ReactFlightDOMNode-test.js:852:25)',
 );
 } else {
 expect(ownerStack).toBeNull();
 }
 });

 // @gate enableHalt
 it('includes deeper location for aborted stacks', async () => {
 async function getData() {
Expand DownExpand Up@@ -1364,12 +1545,12 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in Dynamic' +
 (gate(flags => flags.enableAsyncDebugInfo)
 ? ' (file://ReactFlightDOMNode-test.js:1238:27)\n'
 ? ' (file://ReactFlightDOMNode-test.js:1419:27)\n'
 : '\n') +
 ' in body\n' +
 ' in html\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 } else {
 expect(
Expand All@@ -1378,7 +1559,7 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 }

Expand All@@ -1388,16 +1569,16 @@ describe('ReactFlightDOMNode', () => {
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '\n' +
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1238:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1419:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 } else {
 expect(
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '' +
 '\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 }
 } else {
Expand Down

104 changes: 98 additions & 6 deletions
packages/react-server/src/ReactFizzServer.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,14 @@ import assign from 'shared/assign';
import noop from 'shared/noop';
import getComponentNameFromType from 'shared/getComponentNameFromType';
import isArray from 'shared/isArray';
import {SuspenseException, getSuspendedThenable} from './ReactFizzThenable';
import {
 SuspenseException,
 getSuspendedThenable,
 ensureSuspendableThenableStateDEV,
 getSuspendedCallSiteStackDEV,
 getSuspendedCallSiteDebugTaskDEV,
 setCaptureSuspendedCallSiteDEV,
} from './ReactFizzThenable';

// Linked list representing the identity of a component given the component/tag name and key.
// The name might be minified but we assume that it's going to be the same generated name. Typically
Expand DownExpand Up@@ -1023,6 +1030,85 @@ function pushHaltedAwaitOnComponentStack(
 }
}

// performWork + retryTask without mutation
function rerenderStalledTask(request: Request, task: Task): void {
 const prevContext = getActiveContext();
 const prevDispatcher = ReactSharedInternals.H;
 ReactSharedInternals.H = HooksDispatcher;
 const prevAsyncDispatcher = ReactSharedInternals.A;
 ReactSharedInternals.A = DefaultAsyncDispatcher;

 const prevRequest = currentRequest;
 currentRequest = request;

 const prevGetCurrentStackImpl = ReactSharedInternals.getCurrentStack;
 ReactSharedInternals.getCurrentStack = getCurrentStackInDEV;

 const prevResumableState = currentResumableState;
 setCurrentResumableState(request.resumableState);
 switchContext(task.context);
 const prevTaskInDEV = currentTaskInDEV;
 setCurrentTaskInDEV(task);
 try {
 retryNode(request, task);
 } catch (x) {
 // Suspended again.
 resetHooksState();
 } finally {
 setCurrentTaskInDEV(prevTaskInDEV);
 setCurrentResumableState(prevResumableState);

 ReactSharedInternals.H = prevDispatcher;
 ReactSharedInternals.A = prevAsyncDispatcher;

 ReactSharedInternals.getCurrentStack = prevGetCurrentStackImpl;
 if (prevDispatcher === HooksDispatcher) {
 // This means that we were in a reentrant work loop. This could happen
 // in a renderer that supports synchronous work like renderToString,
 // when it's called from within another renderer.
 // Normally we don't bother switching the contexts to their root/default
 // values when leaving because we'll likely need the same or similar
 // context again. However, when we're inside a synchronous loop like this
 // we'll to restore the context to what it was before returning.
 switchContext(prevContext);
 }
 currentRequest = prevRequest;
 }
}

function pushSuspendedCallSiteOnComponentStack(
 request: Request,
 task: Task,
): void {
 setCaptureSuspendedCallSiteDEV(true);
 const restoreThenableState = ensureSuspendableThenableStateDEV(
 // refined at the callsite
 ((task.thenableState: any): ThenableState),
 );
 try {
 rerenderStalledTask(request, task);
 } finally {
 restoreThenableState();
 setCaptureSuspendedCallSiteDEV(false);
 }

 const suspendCallSiteStack = getSuspendedCallSiteStackDEV();
 const suspendCallSiteDebugTask = getSuspendedCallSiteDebugTaskDEV();

 if (suspendCallSiteStack !== null) {
 const ownerStack = task.componentStack;
 task.componentStack = {
 // The owner of the suspended call site would be the owner of this task.
 // We need the task itself otherwise we'd miss a frame.
 owner: ownerStack,
 parent: suspendCallSiteStack.parent,
 stack: suspendCallSiteStack.stack,
 type: suspendCallSiteStack.type,
 };
 }
 task.debugTask = suspendCallSiteDebugTask;
}

function pushServerComponentStack(
 task: Task,
 debugInfo: void | null | ReactDebugInfo,
Expand DownExpand Up@@ -2716,14 +2802,23 @@ function renderLazyComponent(
 ref: any,
): void {
 let Component;
 let previouslyAbortingDEV;
 if (__DEV__) {
 previouslyAbortingDEV = request.status === ABORTING;
 Component = callLazyInitInDEV(lazyComponent);
 } else {
 const payload = lazyComponent._payload;
 const init = lazyComponent._init;
 Component = init(payload);
 }
 if (request.status === ABORTING) {
 if (
 request.status === ABORTING &&
 // If we already started rendering the Lazy Componentn in an aborting state
 // and reach this point, the lazy was already resolved.
 // We don't bail here again since this is most likely a discarded rerender
 // to get the stack where we suspended in dev.
 (!__DEV__ || !previouslyAbortingDEV)
 ) {
 // eslint-disable-next-line no-throw-literal
 throw null;
 }
Expand DownExpand Up@@ -4535,12 +4630,9 @@ function abortTask(task: Task, request: Request, error: mixed): void {
 debugInfo = node._debugInfo;
 }
 pushHaltedAwaitOnComponentStack(task, debugInfo);
 /*
 if (task.thenableState !== null) {
 // TODO: If we were stalled inside use() of a Client Component then we should
 // rerender to get the stack trace from the use() call.
 pushSuspendedCallSiteOnComponentStack(request, task);
 }
 */
 }
 }

Expand Down
Loading
Loading

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

Skip to content
[Fizz] Push a stalled use() to the ownerStack/debugTask#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

eps1lon
wants to merge
10
commits into

from

 Closed


[Fizz] Push a stalled use() to the ownerStack/debugTask
#13
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
fd5a4c6

[Fizz] Push a stalled use() to the ownerStack/debugTask


eps1lon Nov 26, 2025
5aab310

Use forked implementation of performWork


eps1lon Nov 26, 2025
b53420e

Explain why the ConsoleTask is incomplete


eps1lon Nov 27, 2025
5a24906

should we reset thenables to unknown status?


eps1lon Nov 27, 2025
3be7b3c

Current behavior for what happens if you resolve before React gets a …


eps1lon Nov 28, 2025
70db38b

Ensure we rerender with the original suspender


eps1lon Nov 28, 2025
4cc34ff

Current behavior with lazy types


eps1lon Nov 28, 2025
0e0779c

Rerender through Lazy Components in dev if we were already aborting


eps1lon Nov 29, 2025
38e1360

Ensure the temporary corruption of internal state goes unnoticed


eps1lon Nov 29, 2025
cbfb89e

Revert fixture changes


eps1lon Dec 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


195 changes: 188 additions & 7 deletions
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,28 @@ describe('ReactFlightDOMNode', () => {
 );
 }

 /**
 * Removes all stackframes not pointing into this file
 */
 function ignoreListStack(str) {
 if (!str) {
 return str;
 }

 let ignoreListedStack = '';
 const lines = str.split('\n');

 // eslint-disable-next-line no-for-of-loops/no-for-of-loops
 for (const line of lines) {
 if (line.indexOf(__filename) === -1) {
 } else {
 ignoreListedStack += '\n' + line.replace(__dirname, '.');
 }
 }

 return ignoreListedStack;
 }

 function readResult(stream) {
 return new Promise((resolve, reject) => {
 let buffer = '';
Expand DownExpand Up@@ -784,6 +806,165 @@ describe('ReactFlightDOMNode', () => {
 }
 });

 // @gate enableHalt
 it('includes source locations in component and owner stacks for halted Client components', async () => {
 function SharedComponent({p1, p2, p3}) {
 use(p1);
 use(p2);
 use(p3);
 return <div>Hello, Dave!</div>;
 }
 const ClientComponentOnTheServer = clientExports(SharedComponent);
 const ClientComponentOnTheClient = clientExports(
 SharedComponent,
 123,
 'path/to/chunk.js',
 );

 let resolvePendingPromise;
 function ServerComponent() {
 const p1 = Promise.resolve();
 const p2 = new Promise(resolve => {
 resolvePendingPromise = value => {
 p2.status = 'fulfilled';
 p2.value = value;
 resolve(value);
 };
 });
 const p3 = new Promise(() => {});
 return ReactServer.createElement(ClientComponentOnTheClient, {
 p1: p1,
 p2: p2,
 p3: p3,
 });
 }

 function App() {
 return ReactServer.createElement(
 'html',
 null,
 ReactServer.createElement(
 'body',
 null,
 ReactServer.createElement(
 ReactServer.Suspense,
 {fallback: 'Loading...'},
 ReactServer.createElement(ServerComponent, null),
 ),
 ),
 );
 }

 const errors = [];
 const rscStream = await serverAct(() =>
 ReactServerDOMServer.renderToPipeableStream(
 ReactServer.createElement(App, null),
 webpackMap,
 ),
 );

 const readable = new Stream.PassThrough(streamOptions);
 rscStream.pipe(readable);

 function ClientRoot({response}) {
 return use(response);
 }

 const serverConsumerManifest = {
 moduleMap: {
 [webpackMap[ClientComponentOnTheClient.$$id].id]: {
 '*': webpackMap[ClientComponentOnTheServer.$$id],
 },
 },
 moduleLoading: webpackModuleLoading,
 };

 expect(errors).toEqual([]);

 function ClientRoot({response}) {
 return use(response);
 }

 const response = ReactServerDOMClient.createFromNodeStream(
 readable,
 serverConsumerManifest,
 );

 let componentStack;
 let ownerStack;

 const clientAbortController = new AbortController();

 const fizzPrerenderStreamResult = ReactDOMFizzStatic.prerender(
 React.createElement(ClientRoot, {response}),
 {
 signal: clientAbortController.signal,
 onError(error, errorInfo) {
 componentStack = errorInfo.componentStack;
 ownerStack = React.captureOwnerStack
 ? React.captureOwnerStack()
 : null;
 },
 },
 );

 resolvePendingPromise('custom-instrum-resolve');
 await serverAct(
 async () =>
 new Promise(resolve => {
 setImmediate(() => {
 clientAbortController.abort();
 resolve();
 });
 }),
 );

 const fizzPrerenderStream = await fizzPrerenderStreamResult;
 const prerenderHTML = await readWebResult(fizzPrerenderStream.prelude);

 expect(prerenderHTML).toContain('Loading...');

 if (__DEV__) {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in ServerComponent' +
 (gate(flags => flags.enableAsyncDebugInfo) ? ' (at **)' : '') +
 '\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in App (at **)\n' +
 ' in ClientRoot (at **)',
 );
 } else {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (at **)',
 );
 }

 if (__DEV__) {
 expect(ignoreListStack(ownerStack)).toBe(
 // eslint-disable-next-line react-internal/safe-string-coercion
 '' +
 // The concrete location may change as this test is updated.
 // Just make sure they still point at React.use(p2)
 (gate(flags => flags.enableAsyncDebugInfo)
 ? '\n at SharedComponent (./ReactFlightDOMNode-test.js:813:7)'
 : '') +
 '\n at ServerComponent (file://./ReactFlightDOMNode-test.js:835:26)' +
 '\n at App (file://./ReactFlightDOMNode-test.js:852:25)',
 );
 } else {
 expect(ownerStack).toBeNull();
 }
 });

 // @gate enableHalt
 it('includes deeper location for aborted stacks', async () => {
 async function getData() {
Expand DownExpand Up@@ -1364,12 +1545,12 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in Dynamic' +
 (gate(flags => flags.enableAsyncDebugInfo)
 ? ' (file://ReactFlightDOMNode-test.js:1238:27)\n'
 ? ' (file://ReactFlightDOMNode-test.js:1419:27)\n'
 : '\n') +
 ' in body\n' +
 ' in html\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 } else {
 expect(
Expand All@@ -1378,7 +1559,7 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 }

Expand All@@ -1388,16 +1569,16 @@ describe('ReactFlightDOMNode', () => {
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '\n' +
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1238:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1419:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 } else {
 expect(
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '' +
 '\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 }
 } else {
Expand Down

104 changes: 98 additions & 6 deletions
packages/react-server/src/ReactFizzServer.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,14 @@ import assign from 'shared/assign';
import noop from 'shared/noop';
import getComponentNameFromType from 'shared/getComponentNameFromType';
import isArray from 'shared/isArray';
import {SuspenseException, getSuspendedThenable} from './ReactFizzThenable';
import {
 SuspenseException,
 getSuspendedThenable,
 ensureSuspendableThenableStateDEV,
 getSuspendedCallSiteStackDEV,
 getSuspendedCallSiteDebugTaskDEV,
 setCaptureSuspendedCallSiteDEV,
} from './ReactFizzThenable';

// Linked list representing the identity of a component given the component/tag name and key.
// The name might be minified but we assume that it's going to be the same generated name. Typically
Expand DownExpand Up@@ -1023,6 +1030,85 @@ function pushHaltedAwaitOnComponentStack(
 }
}

// performWork + retryTask without mutation
function rerenderStalledTask(request: Request, task: Task): void {
 const prevContext = getActiveContext();
 const prevDispatcher = ReactSharedInternals.H;
 ReactSharedInternals.H = HooksDispatcher;
 const prevAsyncDispatcher = ReactSharedInternals.A;
 ReactSharedInternals.A = DefaultAsyncDispatcher;

 const prevRequest = currentRequest;
 currentRequest = request;

 const prevGetCurrentStackImpl = ReactSharedInternals.getCurrentStack;
 ReactSharedInternals.getCurrentStack = getCurrentStackInDEV;

 const prevResumableState = currentResumableState;
 setCurrentResumableState(request.resumableState);
 switchContext(task.context);
 const prevTaskInDEV = currentTaskInDEV;
 setCurrentTaskInDEV(task);
 try {
 retryNode(request, task);
 } catch (x) {
 // Suspended again.
 resetHooksState();
 } finally {
 setCurrentTaskInDEV(prevTaskInDEV);
 setCurrentResumableState(prevResumableState);

 ReactSharedInternals.H = prevDispatcher;
 ReactSharedInternals.A = prevAsyncDispatcher;

 ReactSharedInternals.getCurrentStack = prevGetCurrentStackImpl;
 if (prevDispatcher === HooksDispatcher) {
 // This means that we were in a reentrant work loop. This could happen
 // in a renderer that supports synchronous work like renderToString,
 // when it's called from within another renderer.
 // Normally we don't bother switching the contexts to their root/default
 // values when leaving because we'll likely need the same or similar
 // context again. However, when we're inside a synchronous loop like this
 // we'll to restore the context to what it was before returning.
 switchContext(prevContext);
 }
 currentRequest = prevRequest;
 }
}

function pushSuspendedCallSiteOnComponentStack(
 request: Request,
 task: Task,
): void {
 setCaptureSuspendedCallSiteDEV(true);
 const restoreThenableState = ensureSuspendableThenableStateDEV(
 // refined at the callsite
 ((task.thenableState: any): ThenableState),
 );
 try {
 rerenderStalledTask(request, task);
 } finally {
 restoreThenableState();
 setCaptureSuspendedCallSiteDEV(false);
 }

 const suspendCallSiteStack = getSuspendedCallSiteStackDEV();
 const suspendCallSiteDebugTask = getSuspendedCallSiteDebugTaskDEV();

 if (suspendCallSiteStack !== null) {
 const ownerStack = task.componentStack;
 task.componentStack = {
 // The owner of the suspended call site would be the owner of this task.
 // We need the task itself otherwise we'd miss a frame.
 owner: ownerStack,
 parent: suspendCallSiteStack.parent,
 stack: suspendCallSiteStack.stack,
 type: suspendCallSiteStack.type,
 };
 }
 task.debugTask = suspendCallSiteDebugTask;
}

function pushServerComponentStack(
 task: Task,
 debugInfo: void | null | ReactDebugInfo,
Expand DownExpand Up@@ -2716,14 +2802,23 @@ function renderLazyComponent(
 ref: any,
): void {
 let Component;
 let previouslyAbortingDEV;
 if (__DEV__) {
 previouslyAbortingDEV = request.status === ABORTING;
 Component = callLazyInitInDEV(lazyComponent);
 } else {
 const payload = lazyComponent._payload;
 const init = lazyComponent._init;
 Component = init(payload);
 }
 if (request.status === ABORTING) {
 if (
 request.status === ABORTING &&
 // If we already started rendering the Lazy Componentn in an aborting state
 // and reach this point, the lazy was already resolved.
 // We don't bail here again since this is most likely a discarded rerender
 // to get the stack where we suspended in dev.
 (!__DEV__ || !previouslyAbortingDEV)
 ) {
 // eslint-disable-next-line no-throw-literal
 throw null;
 }
Expand DownExpand Up@@ -4535,12 +4630,9 @@ function abortTask(task: Task, request: Request, error: mixed): void {
 debugInfo = node._debugInfo;
 }
 pushHaltedAwaitOnComponentStack(task, debugInfo);
 /*
 if (task.thenableState !== null) {
 // TODO: If we were stalled inside use() of a Client Component then we should
 // rerender to get the stack trace from the use() call.
 pushSuspendedCallSiteOnComponentStack(request, task);
 }
 */
 }
 }

Expand Down
Loading
Loading

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

Skip to content
[Fizz] Push a stalled use() to the ownerStack/debugTask#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

eps1lon
wants to merge
10
commits into

from

 Closed


[Fizz] Push a stalled use() to the ownerStack/debugTask
#13
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
fd5a4c6

[Fizz] Push a stalled use() to the ownerStack/debugTask


eps1lon Nov 26, 2025
5aab310

Use forked implementation of performWork


eps1lon Nov 26, 2025
b53420e

Explain why the ConsoleTask is incomplete


eps1lon Nov 27, 2025
5a24906

should we reset thenables to unknown status?


eps1lon Nov 27, 2025
3be7b3c

Current behavior for what happens if you resolve before React gets a …


eps1lon Nov 28, 2025
70db38b

Ensure we rerender with the original suspender


eps1lon Nov 28, 2025
4cc34ff

Current behavior with lazy types


eps1lon Nov 28, 2025
0e0779c

Rerender through Lazy Components in dev if we were already aborting


eps1lon Nov 29, 2025
38e1360

Ensure the temporary corruption of internal state goes unnoticed


eps1lon Nov 29, 2025
cbfb89e

Revert fixture changes


eps1lon Dec 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


195 changes: 188 additions & 7 deletions
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,28 @@ describe('ReactFlightDOMNode', () => {
 );
 }

 /**
 * Removes all stackframes not pointing into this file
 */
 function ignoreListStack(str) {
 if (!str) {
 return str;
 }

 let ignoreListedStack = '';
 const lines = str.split('\n');

 // eslint-disable-next-line no-for-of-loops/no-for-of-loops
 for (const line of lines) {
 if (line.indexOf(__filename) === -1) {
 } else {
 ignoreListedStack += '\n' + line.replace(__dirname, '.');
 }
 }

 return ignoreListedStack;
 }

 function readResult(stream) {
 return new Promise((resolve, reject) => {
 let buffer = '';
Expand DownExpand Up@@ -784,6 +806,165 @@ describe('ReactFlightDOMNode', () => {
 }
 });

 // @gate enableHalt
 it('includes source locations in component and owner stacks for halted Client components', async () => {
 function SharedComponent({p1, p2, p3}) {
 use(p1);
 use(p2);
 use(p3);
 return <div>Hello, Dave!</div>;
 }
 const ClientComponentOnTheServer = clientExports(SharedComponent);
 const ClientComponentOnTheClient = clientExports(
 SharedComponent,
 123,
 'path/to/chunk.js',
 );

 let resolvePendingPromise;
 function ServerComponent() {
 const p1 = Promise.resolve();
 const p2 = new Promise(resolve => {
 resolvePendingPromise = value => {
 p2.status = 'fulfilled';
 p2.value = value;
 resolve(value);
 };
 });
 const p3 = new Promise(() => {});
 return ReactServer.createElement(ClientComponentOnTheClient, {
 p1: p1,
 p2: p2,
 p3: p3,
 });
 }

 function App() {
 return ReactServer.createElement(
 'html',
 null,
 ReactServer.createElement(
 'body',
 null,
 ReactServer.createElement(
 ReactServer.Suspense,
 {fallback: 'Loading...'},
 ReactServer.createElement(ServerComponent, null),
 ),
 ),
 );
 }

 const errors = [];
 const rscStream = await serverAct(() =>
 ReactServerDOMServer.renderToPipeableStream(
 ReactServer.createElement(App, null),
 webpackMap,
 ),
 );

 const readable = new Stream.PassThrough(streamOptions);
 rscStream.pipe(readable);

 function ClientRoot({response}) {
 return use(response);
 }

 const serverConsumerManifest = {
 moduleMap: {
 [webpackMap[ClientComponentOnTheClient.$$id].id]: {
 '*': webpackMap[ClientComponentOnTheServer.$$id],
 },
 },
 moduleLoading: webpackModuleLoading,
 };

 expect(errors).toEqual([]);

 function ClientRoot({response}) {
 return use(response);
 }

 const response = ReactServerDOMClient.createFromNodeStream(
 readable,
 serverConsumerManifest,
 );

 let componentStack;
 let ownerStack;

 const clientAbortController = new AbortController();

 const fizzPrerenderStreamResult = ReactDOMFizzStatic.prerender(
 React.createElement(ClientRoot, {response}),
 {
 signal: clientAbortController.signal,
 onError(error, errorInfo) {
 componentStack = errorInfo.componentStack;
 ownerStack = React.captureOwnerStack
 ? React.captureOwnerStack()
 : null;
 },
 },
 );

 resolvePendingPromise('custom-instrum-resolve');
 await serverAct(
 async () =>
 new Promise(resolve => {
 setImmediate(() => {
 clientAbortController.abort();
 resolve();
 });
 }),
 );

 const fizzPrerenderStream = await fizzPrerenderStreamResult;
 const prerenderHTML = await readWebResult(fizzPrerenderStream.prelude);

 expect(prerenderHTML).toContain('Loading...');

 if (__DEV__) {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in ServerComponent' +
 (gate(flags => flags.enableAsyncDebugInfo) ? ' (at **)' : '') +
 '\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in App (at **)\n' +
 ' in ClientRoot (at **)',
 );
 } else {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (at **)',
 );
 }

 if (__DEV__) {
 expect(ignoreListStack(ownerStack)).toBe(
 // eslint-disable-next-line react-internal/safe-string-coercion
 '' +
 // The concrete location may change as this test is updated.
 // Just make sure they still point at React.use(p2)
 (gate(flags => flags.enableAsyncDebugInfo)
 ? '\n at SharedComponent (./ReactFlightDOMNode-test.js:813:7)'
 : '') +
 '\n at ServerComponent (file://./ReactFlightDOMNode-test.js:835:26)' +
 '\n at App (file://./ReactFlightDOMNode-test.js:852:25)',
 );
 } else {
 expect(ownerStack).toBeNull();
 }
 });

 // @gate enableHalt
 it('includes deeper location for aborted stacks', async () => {
 async function getData() {
Expand DownExpand Up@@ -1364,12 +1545,12 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in Dynamic' +
 (gate(flags => flags.enableAsyncDebugInfo)
 ? ' (file://ReactFlightDOMNode-test.js:1238:27)\n'
 ? ' (file://ReactFlightDOMNode-test.js:1419:27)\n'
 : '\n') +
 ' in body\n' +
 ' in html\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 } else {
 expect(
Expand All@@ -1378,7 +1559,7 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 }

Expand All@@ -1388,16 +1569,16 @@ describe('ReactFlightDOMNode', () => {
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '\n' +
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1238:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1419:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 } else {
 expect(
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '' +
 '\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 }
 } else {
Expand Down

104 changes: 98 additions & 6 deletions
packages/react-server/src/ReactFizzServer.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,14 @@ import assign from 'shared/assign';
import noop from 'shared/noop';
import getComponentNameFromType from 'shared/getComponentNameFromType';
import isArray from 'shared/isArray';
import {SuspenseException, getSuspendedThenable} from './ReactFizzThenable';
import {
 SuspenseException,
 getSuspendedThenable,
 ensureSuspendableThenableStateDEV,
 getSuspendedCallSiteStackDEV,
 getSuspendedCallSiteDebugTaskDEV,
 setCaptureSuspendedCallSiteDEV,
} from './ReactFizzThenable';

// Linked list representing the identity of a component given the component/tag name and key.
// The name might be minified but we assume that it's going to be the same generated name. Typically
Expand DownExpand Up@@ -1023,6 +1030,85 @@ function pushHaltedAwaitOnComponentStack(
 }
}

// performWork + retryTask without mutation
function rerenderStalledTask(request: Request, task: Task): void {
 const prevContext = getActiveContext();
 const prevDispatcher = ReactSharedInternals.H;
 ReactSharedInternals.H = HooksDispatcher;
 const prevAsyncDispatcher = ReactSharedInternals.A;
 ReactSharedInternals.A = DefaultAsyncDispatcher;

 const prevRequest = currentRequest;
 currentRequest = request;

 const prevGetCurrentStackImpl = ReactSharedInternals.getCurrentStack;
 ReactSharedInternals.getCurrentStack = getCurrentStackInDEV;

 const prevResumableState = currentResumableState;
 setCurrentResumableState(request.resumableState);
 switchContext(task.context);
 const prevTaskInDEV = currentTaskInDEV;
 setCurrentTaskInDEV(task);
 try {
 retryNode(request, task);
 } catch (x) {
 // Suspended again.
 resetHooksState();
 } finally {
 setCurrentTaskInDEV(prevTaskInDEV);
 setCurrentResumableState(prevResumableState);

 ReactSharedInternals.H = prevDispatcher;
 ReactSharedInternals.A = prevAsyncDispatcher;

 ReactSharedInternals.getCurrentStack = prevGetCurrentStackImpl;
 if (prevDispatcher === HooksDispatcher) {
 // This means that we were in a reentrant work loop. This could happen
 // in a renderer that supports synchronous work like renderToString,
 // when it's called from within another renderer.
 // Normally we don't bother switching the contexts to their root/default
 // values when leaving because we'll likely need the same or similar
 // context again. However, when we're inside a synchronous loop like this
 // we'll to restore the context to what it was before returning.
 switchContext(prevContext);
 }
 currentRequest = prevRequest;
 }
}

function pushSuspendedCallSiteOnComponentStack(
 request: Request,
 task: Task,
): void {
 setCaptureSuspendedCallSiteDEV(true);
 const restoreThenableState = ensureSuspendableThenableStateDEV(
 // refined at the callsite
 ((task.thenableState: any): ThenableState),
 );
 try {
 rerenderStalledTask(request, task);
 } finally {
 restoreThenableState();
 setCaptureSuspendedCallSiteDEV(false);
 }

 const suspendCallSiteStack = getSuspendedCallSiteStackDEV();
 const suspendCallSiteDebugTask = getSuspendedCallSiteDebugTaskDEV();

 if (suspendCallSiteStack !== null) {
 const ownerStack = task.componentStack;
 task.componentStack = {
 // The owner of the suspended call site would be the owner of this task.
 // We need the task itself otherwise we'd miss a frame.
 owner: ownerStack,
 parent: suspendCallSiteStack.parent,
 stack: suspendCallSiteStack.stack,
 type: suspendCallSiteStack.type,
 };
 }
 task.debugTask = suspendCallSiteDebugTask;
}

function pushServerComponentStack(
 task: Task,
 debugInfo: void | null | ReactDebugInfo,
Expand DownExpand Up@@ -2716,14 +2802,23 @@ function renderLazyComponent(
 ref: any,
): void {
 let Component;
 let previouslyAbortingDEV;
 if (__DEV__) {
 previouslyAbortingDEV = request.status === ABORTING;
 Component = callLazyInitInDEV(lazyComponent);
 } else {
 const payload = lazyComponent._payload;
 const init = lazyComponent._init;
 Component = init(payload);
 }
 if (request.status === ABORTING) {
 if (
 request.status === ABORTING &&
 // If we already started rendering the Lazy Componentn in an aborting state
 // and reach this point, the lazy was already resolved.
 // We don't bail here again since this is most likely a discarded rerender
 // to get the stack where we suspended in dev.
 (!__DEV__ || !previouslyAbortingDEV)
 ) {
 // eslint-disable-next-line no-throw-literal
 throw null;
 }
Expand DownExpand Up@@ -4535,12 +4630,9 @@ function abortTask(task: Task, request: Request, error: mixed): void {
 debugInfo = node._debugInfo;
 }
 pushHaltedAwaitOnComponentStack(task, debugInfo);
 /*
 if (task.thenableState !== null) {
 // TODO: If we were stalled inside use() of a Client Component then we should
 // rerender to get the stack trace from the use() call.
 pushSuspendedCallSiteOnComponentStack(request, task);
 }
 */
 }
 }

Expand Down
Loading
Loading

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

Skip to content
[Fizz] Push a stalled use() to the ownerStack/debugTask#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

eps1lon
wants to merge
10
commits into

from

 Closed


[Fizz] Push a stalled use() to the ownerStack/debugTask
#13
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
fd5a4c6

[Fizz] Push a stalled use() to the ownerStack/debugTask


eps1lon Nov 26, 2025
5aab310

Use forked implementation of performWork


eps1lon Nov 26, 2025
b53420e

Explain why the ConsoleTask is incomplete


eps1lon Nov 27, 2025
5a24906

should we reset thenables to unknown status?


eps1lon Nov 27, 2025
3be7b3c

Current behavior for what happens if you resolve before React gets a …


eps1lon Nov 28, 2025
70db38b

Ensure we rerender with the original suspender


eps1lon Nov 28, 2025
4cc34ff

Current behavior with lazy types


eps1lon Nov 28, 2025
0e0779c

Rerender through Lazy Components in dev if we were already aborting


eps1lon Nov 29, 2025
38e1360

Ensure the temporary corruption of internal state goes unnoticed


eps1lon Nov 29, 2025
cbfb89e

Revert fixture changes


eps1lon Dec 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


195 changes: 188 additions & 7 deletions
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,28 @@ describe('ReactFlightDOMNode', () => {
 );
 }

 /**
 * Removes all stackframes not pointing into this file
 */
 function ignoreListStack(str) {
 if (!str) {
 return str;
 }

 let ignoreListedStack = '';
 const lines = str.split('\n');

 // eslint-disable-next-line no-for-of-loops/no-for-of-loops
 for (const line of lines) {
 if (line.indexOf(__filename) === -1) {
 } else {
 ignoreListedStack += '\n' + line.replace(__dirname, '.');
 }
 }

 return ignoreListedStack;
 }

 function readResult(stream) {
 return new Promise((resolve, reject) => {
 let buffer = '';
Expand DownExpand Up@@ -784,6 +806,165 @@ describe('ReactFlightDOMNode', () => {
 }
 });

 // @gate enableHalt
 it('includes source locations in component and owner stacks for halted Client components', async () => {
 function SharedComponent({p1, p2, p3}) {
 use(p1);
 use(p2);
 use(p3);
 return <div>Hello, Dave!</div>;
 }
 const ClientComponentOnTheServer = clientExports(SharedComponent);
 const ClientComponentOnTheClient = clientExports(
 SharedComponent,
 123,
 'path/to/chunk.js',
 );

 let resolvePendingPromise;
 function ServerComponent() {
 const p1 = Promise.resolve();
 const p2 = new Promise(resolve => {
 resolvePendingPromise = value => {
 p2.status = 'fulfilled';
 p2.value = value;
 resolve(value);
 };
 });
 const p3 = new Promise(() => {});
 return ReactServer.createElement(ClientComponentOnTheClient, {
 p1: p1,
 p2: p2,
 p3: p3,
 });
 }

 function App() {
 return ReactServer.createElement(
 'html',
 null,
 ReactServer.createElement(
 'body',
 null,
 ReactServer.createElement(
 ReactServer.Suspense,
 {fallback: 'Loading...'},
 ReactServer.createElement(ServerComponent, null),
 ),
 ),
 );
 }

 const errors = [];
 const rscStream = await serverAct(() =>
 ReactServerDOMServer.renderToPipeableStream(
 ReactServer.createElement(App, null),
 webpackMap,
 ),
 );

 const readable = new Stream.PassThrough(streamOptions);
 rscStream.pipe(readable);

 function ClientRoot({response}) {
 return use(response);
 }

 const serverConsumerManifest = {
 moduleMap: {
 [webpackMap[ClientComponentOnTheClient.$$id].id]: {
 '*': webpackMap[ClientComponentOnTheServer.$$id],
 },
 },
 moduleLoading: webpackModuleLoading,
 };

 expect(errors).toEqual([]);

 function ClientRoot({response}) {
 return use(response);
 }

 const response = ReactServerDOMClient.createFromNodeStream(
 readable,
 serverConsumerManifest,
 );

 let componentStack;
 let ownerStack;

 const clientAbortController = new AbortController();

 const fizzPrerenderStreamResult = ReactDOMFizzStatic.prerender(
 React.createElement(ClientRoot, {response}),
 {
 signal: clientAbortController.signal,
 onError(error, errorInfo) {
 componentStack = errorInfo.componentStack;
 ownerStack = React.captureOwnerStack
 ? React.captureOwnerStack()
 : null;
 },
 },
 );

 resolvePendingPromise('custom-instrum-resolve');
 await serverAct(
 async () =>
 new Promise(resolve => {
 setImmediate(() => {
 clientAbortController.abort();
 resolve();
 });
 }),
 );

 const fizzPrerenderStream = await fizzPrerenderStreamResult;
 const prerenderHTML = await readWebResult(fizzPrerenderStream.prelude);

 expect(prerenderHTML).toContain('Loading...');

 if (__DEV__) {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in ServerComponent' +
 (gate(flags => flags.enableAsyncDebugInfo) ? ' (at **)' : '') +
 '\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in App (at **)\n' +
 ' in ClientRoot (at **)',
 );
 } else {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (at **)',
 );
 }

 if (__DEV__) {
 expect(ignoreListStack(ownerStack)).toBe(
 // eslint-disable-next-line react-internal/safe-string-coercion
 '' +
 // The concrete location may change as this test is updated.
 // Just make sure they still point at React.use(p2)
 (gate(flags => flags.enableAsyncDebugInfo)
 ? '\n at SharedComponent (./ReactFlightDOMNode-test.js:813:7)'
 : '') +
 '\n at ServerComponent (file://./ReactFlightDOMNode-test.js:835:26)' +
 '\n at App (file://./ReactFlightDOMNode-test.js:852:25)',
 );
 } else {
 expect(ownerStack).toBeNull();
 }
 });

 // @gate enableHalt
 it('includes deeper location for aborted stacks', async () => {
 async function getData() {
Expand DownExpand Up@@ -1364,12 +1545,12 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in Dynamic' +
 (gate(flags => flags.enableAsyncDebugInfo)
 ? ' (file://ReactFlightDOMNode-test.js:1238:27)\n'
 ? ' (file://ReactFlightDOMNode-test.js:1419:27)\n'
 : '\n') +
 ' in body\n' +
 ' in html\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 } else {
 expect(
Expand All@@ -1378,7 +1559,7 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 }

Expand All@@ -1388,16 +1569,16 @@ describe('ReactFlightDOMNode', () => {
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '\n' +
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1238:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1419:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 } else {
 expect(
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '' +
 '\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 }
 } else {
Expand Down

104 changes: 98 additions & 6 deletions
packages/react-server/src/ReactFizzServer.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,14 @@ import assign from 'shared/assign';
import noop from 'shared/noop';
import getComponentNameFromType from 'shared/getComponentNameFromType';
import isArray from 'shared/isArray';
import {SuspenseException, getSuspendedThenable} from './ReactFizzThenable';
import {
 SuspenseException,
 getSuspendedThenable,
 ensureSuspendableThenableStateDEV,
 getSuspendedCallSiteStackDEV,
 getSuspendedCallSiteDebugTaskDEV,
 setCaptureSuspendedCallSiteDEV,
} from './ReactFizzThenable';

// Linked list representing the identity of a component given the component/tag name and key.
// The name might be minified but we assume that it's going to be the same generated name. Typically
Expand DownExpand Up@@ -1023,6 +1030,85 @@ function pushHaltedAwaitOnComponentStack(
 }
}

// performWork + retryTask without mutation
function rerenderStalledTask(request: Request, task: Task): void {
 const prevContext = getActiveContext();
 const prevDispatcher = ReactSharedInternals.H;
 ReactSharedInternals.H = HooksDispatcher;
 const prevAsyncDispatcher = ReactSharedInternals.A;
 ReactSharedInternals.A = DefaultAsyncDispatcher;

 const prevRequest = currentRequest;
 currentRequest = request;

 const prevGetCurrentStackImpl = ReactSharedInternals.getCurrentStack;
 ReactSharedInternals.getCurrentStack = getCurrentStackInDEV;

 const prevResumableState = currentResumableState;
 setCurrentResumableState(request.resumableState);
 switchContext(task.context);
 const prevTaskInDEV = currentTaskInDEV;
 setCurrentTaskInDEV(task);
 try {
 retryNode(request, task);
 } catch (x) {
 // Suspended again.
 resetHooksState();
 } finally {
 setCurrentTaskInDEV(prevTaskInDEV);
 setCurrentResumableState(prevResumableState);

 ReactSharedInternals.H = prevDispatcher;
 ReactSharedInternals.A = prevAsyncDispatcher;

 ReactSharedInternals.getCurrentStack = prevGetCurrentStackImpl;
 if (prevDispatcher === HooksDispatcher) {
 // This means that we were in a reentrant work loop. This could happen
 // in a renderer that supports synchronous work like renderToString,
 // when it's called from within another renderer.
 // Normally we don't bother switching the contexts to their root/default
 // values when leaving because we'll likely need the same or similar
 // context again. However, when we're inside a synchronous loop like this
 // we'll to restore the context to what it was before returning.
 switchContext(prevContext);
 }
 currentRequest = prevRequest;
 }
}

function pushSuspendedCallSiteOnComponentStack(
 request: Request,
 task: Task,
): void {
 setCaptureSuspendedCallSiteDEV(true);
 const restoreThenableState = ensureSuspendableThenableStateDEV(
 // refined at the callsite
 ((task.thenableState: any): ThenableState),
 );
 try {
 rerenderStalledTask(request, task);
 } finally {
 restoreThenableState();
 setCaptureSuspendedCallSiteDEV(false);
 }

 const suspendCallSiteStack = getSuspendedCallSiteStackDEV();
 const suspendCallSiteDebugTask = getSuspendedCallSiteDebugTaskDEV();

 if (suspendCallSiteStack !== null) {
 const ownerStack = task.componentStack;
 task.componentStack = {
 // The owner of the suspended call site would be the owner of this task.
 // We need the task itself otherwise we'd miss a frame.
 owner: ownerStack,
 parent: suspendCallSiteStack.parent,
 stack: suspendCallSiteStack.stack,
 type: suspendCallSiteStack.type,
 };
 }
 task.debugTask = suspendCallSiteDebugTask;
}

function pushServerComponentStack(
 task: Task,
 debugInfo: void | null | ReactDebugInfo,
Expand DownExpand Up@@ -2716,14 +2802,23 @@ function renderLazyComponent(
 ref: any,
): void {
 let Component;
 let previouslyAbortingDEV;
 if (__DEV__) {
 previouslyAbortingDEV = request.status === ABORTING;
 Component = callLazyInitInDEV(lazyComponent);
 } else {
 const payload = lazyComponent._payload;
 const init = lazyComponent._init;
 Component = init(payload);
 }
 if (request.status === ABORTING) {
 if (
 request.status === ABORTING &&
 // If we already started rendering the Lazy Componentn in an aborting state
 // and reach this point, the lazy was already resolved.
 // We don't bail here again since this is most likely a discarded rerender
 // to get the stack where we suspended in dev.
 (!__DEV__ || !previouslyAbortingDEV)
 ) {
 // eslint-disable-next-line no-throw-literal
 throw null;
 }
Expand DownExpand Up@@ -4535,12 +4630,9 @@ function abortTask(task: Task, request: Request, error: mixed): void {
 debugInfo = node._debugInfo;
 }
 pushHaltedAwaitOnComponentStack(task, debugInfo);
 /*
 if (task.thenableState !== null) {
 // TODO: If we were stalled inside use() of a Client Component then we should
 // rerender to get the stack trace from the use() call.
 pushSuspendedCallSiteOnComponentStack(request, task);
 }
 */
 }
 }

Expand Down
Loading
Loading

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

Skip to content
[Fizz] Push a stalled use() to the ownerStack/debugTask#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

eps1lon
wants to merge
10
commits into

from

 Closed


[Fizz] Push a stalled use() to the ownerStack/debugTask
#13
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
fd5a4c6

[Fizz] Push a stalled use() to the ownerStack/debugTask


eps1lon Nov 26, 2025
5aab310

Use forked implementation of performWork


eps1lon Nov 26, 2025
b53420e

Explain why the ConsoleTask is incomplete


eps1lon Nov 27, 2025
5a24906

should we reset thenables to unknown status?


eps1lon Nov 27, 2025
3be7b3c

Current behavior for what happens if you resolve before React gets a …


eps1lon Nov 28, 2025
70db38b

Ensure we rerender with the original suspender


eps1lon Nov 28, 2025
4cc34ff

Current behavior with lazy types


eps1lon Nov 28, 2025
0e0779c

Rerender through Lazy Components in dev if we were already aborting


eps1lon Nov 29, 2025
38e1360

Ensure the temporary corruption of internal state goes unnoticed


eps1lon Nov 29, 2025
cbfb89e

Revert fixture changes


eps1lon Dec 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


195 changes: 188 additions & 7 deletions
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,28 @@ describe('ReactFlightDOMNode', () => {
 );
 }

 /**
 * Removes all stackframes not pointing into this file
 */
 function ignoreListStack(str) {
 if (!str) {
 return str;
 }

 let ignoreListedStack = '';
 const lines = str.split('\n');

 // eslint-disable-next-line no-for-of-loops/no-for-of-loops
 for (const line of lines) {
 if (line.indexOf(__filename) === -1) {
 } else {
 ignoreListedStack += '\n' + line.replace(__dirname, '.');
 }
 }

 return ignoreListedStack;
 }

 function readResult(stream) {
 return new Promise((resolve, reject) => {
 let buffer = '';
Expand DownExpand Up@@ -784,6 +806,165 @@ describe('ReactFlightDOMNode', () => {
 }
 });

 // @gate enableHalt
 it('includes source locations in component and owner stacks for halted Client components', async () => {
 function SharedComponent({p1, p2, p3}) {
 use(p1);
 use(p2);
 use(p3);
 return <div>Hello, Dave!</div>;
 }
 const ClientComponentOnTheServer = clientExports(SharedComponent);
 const ClientComponentOnTheClient = clientExports(
 SharedComponent,
 123,
 'path/to/chunk.js',
 );

 let resolvePendingPromise;
 function ServerComponent() {
 const p1 = Promise.resolve();
 const p2 = new Promise(resolve => {
 resolvePendingPromise = value => {
 p2.status = 'fulfilled';
 p2.value = value;
 resolve(value);
 };
 });
 const p3 = new Promise(() => {});
 return ReactServer.createElement(ClientComponentOnTheClient, {
 p1: p1,
 p2: p2,
 p3: p3,
 });
 }

 function App() {
 return ReactServer.createElement(
 'html',
 null,
 ReactServer.createElement(
 'body',
 null,
 ReactServer.createElement(
 ReactServer.Suspense,
 {fallback: 'Loading...'},
 ReactServer.createElement(ServerComponent, null),
 ),
 ),
 );
 }

 const errors = [];
 const rscStream = await serverAct(() =>
 ReactServerDOMServer.renderToPipeableStream(
 ReactServer.createElement(App, null),
 webpackMap,
 ),
 );

 const readable = new Stream.PassThrough(streamOptions);
 rscStream.pipe(readable);

 function ClientRoot({response}) {
 return use(response);
 }

 const serverConsumerManifest = {
 moduleMap: {
 [webpackMap[ClientComponentOnTheClient.$$id].id]: {
 '*': webpackMap[ClientComponentOnTheServer.$$id],
 },
 },
 moduleLoading: webpackModuleLoading,
 };

 expect(errors).toEqual([]);

 function ClientRoot({response}) {
 return use(response);
 }

 const response = ReactServerDOMClient.createFromNodeStream(
 readable,
 serverConsumerManifest,
 );

 let componentStack;
 let ownerStack;

 const clientAbortController = new AbortController();

 const fizzPrerenderStreamResult = ReactDOMFizzStatic.prerender(
 React.createElement(ClientRoot, {response}),
 {
 signal: clientAbortController.signal,
 onError(error, errorInfo) {
 componentStack = errorInfo.componentStack;
 ownerStack = React.captureOwnerStack
 ? React.captureOwnerStack()
 : null;
 },
 },
 );

 resolvePendingPromise('custom-instrum-resolve');
 await serverAct(
 async () =>
 new Promise(resolve => {
 setImmediate(() => {
 clientAbortController.abort();
 resolve();
 });
 }),
 );

 const fizzPrerenderStream = await fizzPrerenderStreamResult;
 const prerenderHTML = await readWebResult(fizzPrerenderStream.prelude);

 expect(prerenderHTML).toContain('Loading...');

 if (__DEV__) {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in ServerComponent' +
 (gate(flags => flags.enableAsyncDebugInfo) ? ' (at **)' : '') +
 '\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in App (at **)\n' +
 ' in ClientRoot (at **)',
 );
 } else {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (at **)',
 );
 }

 if (__DEV__) {
 expect(ignoreListStack(ownerStack)).toBe(
 // eslint-disable-next-line react-internal/safe-string-coercion
 '' +
 // The concrete location may change as this test is updated.
 // Just make sure they still point at React.use(p2)
 (gate(flags => flags.enableAsyncDebugInfo)
 ? '\n at SharedComponent (./ReactFlightDOMNode-test.js:813:7)'
 : '') +
 '\n at ServerComponent (file://./ReactFlightDOMNode-test.js:835:26)' +
 '\n at App (file://./ReactFlightDOMNode-test.js:852:25)',
 );
 } else {
 expect(ownerStack).toBeNull();
 }
 });

 // @gate enableHalt
 it('includes deeper location for aborted stacks', async () => {
 async function getData() {
Expand DownExpand Up@@ -1364,12 +1545,12 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in Dynamic' +
 (gate(flags => flags.enableAsyncDebugInfo)
 ? ' (file://ReactFlightDOMNode-test.js:1238:27)\n'
 ? ' (file://ReactFlightDOMNode-test.js:1419:27)\n'
 : '\n') +
 ' in body\n' +
 ' in html\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 } else {
 expect(
Expand All@@ -1378,7 +1559,7 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 }

Expand All@@ -1388,16 +1569,16 @@ describe('ReactFlightDOMNode', () => {
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '\n' +
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1238:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1419:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 } else {
 expect(
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '' +
 '\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 }
 } else {
Expand Down

104 changes: 98 additions & 6 deletions
packages/react-server/src/ReactFizzServer.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,14 @@ import assign from 'shared/assign';
import noop from 'shared/noop';
import getComponentNameFromType from 'shared/getComponentNameFromType';
import isArray from 'shared/isArray';
import {SuspenseException, getSuspendedThenable} from './ReactFizzThenable';
import {
 SuspenseException,
 getSuspendedThenable,
 ensureSuspendableThenableStateDEV,
 getSuspendedCallSiteStackDEV,
 getSuspendedCallSiteDebugTaskDEV,
 setCaptureSuspendedCallSiteDEV,
} from './ReactFizzThenable';

// Linked list representing the identity of a component given the component/tag name and key.
// The name might be minified but we assume that it's going to be the same generated name. Typically
Expand DownExpand Up@@ -1023,6 +1030,85 @@ function pushHaltedAwaitOnComponentStack(
 }
}

// performWork + retryTask without mutation
function rerenderStalledTask(request: Request, task: Task): void {
 const prevContext = getActiveContext();
 const prevDispatcher = ReactSharedInternals.H;
 ReactSharedInternals.H = HooksDispatcher;
 const prevAsyncDispatcher = ReactSharedInternals.A;
 ReactSharedInternals.A = DefaultAsyncDispatcher;

 const prevRequest = currentRequest;
 currentRequest = request;

 const prevGetCurrentStackImpl = ReactSharedInternals.getCurrentStack;
 ReactSharedInternals.getCurrentStack = getCurrentStackInDEV;

 const prevResumableState = currentResumableState;
 setCurrentResumableState(request.resumableState);
 switchContext(task.context);
 const prevTaskInDEV = currentTaskInDEV;
 setCurrentTaskInDEV(task);
 try {
 retryNode(request, task);
 } catch (x) {
 // Suspended again.
 resetHooksState();
 } finally {
 setCurrentTaskInDEV(prevTaskInDEV);
 setCurrentResumableState(prevResumableState);

 ReactSharedInternals.H = prevDispatcher;
 ReactSharedInternals.A = prevAsyncDispatcher;

 ReactSharedInternals.getCurrentStack = prevGetCurrentStackImpl;
 if (prevDispatcher === HooksDispatcher) {
 // This means that we were in a reentrant work loop. This could happen
 // in a renderer that supports synchronous work like renderToString,
 // when it's called from within another renderer.
 // Normally we don't bother switching the contexts to their root/default
 // values when leaving because we'll likely need the same or similar
 // context again. However, when we're inside a synchronous loop like this
 // we'll to restore the context to what it was before returning.
 switchContext(prevContext);
 }
 currentRequest = prevRequest;
 }
}

function pushSuspendedCallSiteOnComponentStack(
 request: Request,
 task: Task,
): void {
 setCaptureSuspendedCallSiteDEV(true);
 const restoreThenableState = ensureSuspendableThenableStateDEV(
 // refined at the callsite
 ((task.thenableState: any): ThenableState),
 );
 try {
 rerenderStalledTask(request, task);
 } finally {
 restoreThenableState();
 setCaptureSuspendedCallSiteDEV(false);
 }

 const suspendCallSiteStack = getSuspendedCallSiteStackDEV();
 const suspendCallSiteDebugTask = getSuspendedCallSiteDebugTaskDEV();

 if (suspendCallSiteStack !== null) {
 const ownerStack = task.componentStack;
 task.componentStack = {
 // The owner of the suspended call site would be the owner of this task.
 // We need the task itself otherwise we'd miss a frame.
 owner: ownerStack,
 parent: suspendCallSiteStack.parent,
 stack: suspendCallSiteStack.stack,
 type: suspendCallSiteStack.type,
 };
 }
 task.debugTask = suspendCallSiteDebugTask;
}

function pushServerComponentStack(
 task: Task,
 debugInfo: void | null | ReactDebugInfo,
Expand DownExpand Up@@ -2716,14 +2802,23 @@ function renderLazyComponent(
 ref: any,
): void {
 let Component;
 let previouslyAbortingDEV;
 if (__DEV__) {
 previouslyAbortingDEV = request.status === ABORTING;
 Component = callLazyInitInDEV(lazyComponent);
 } else {
 const payload = lazyComponent._payload;
 const init = lazyComponent._init;
 Component = init(payload);
 }
 if (request.status === ABORTING) {
 if (
 request.status === ABORTING &&
 // If we already started rendering the Lazy Componentn in an aborting state
 // and reach this point, the lazy was already resolved.
 // We don't bail here again since this is most likely a discarded rerender
 // to get the stack where we suspended in dev.
 (!__DEV__ || !previouslyAbortingDEV)
 ) {
 // eslint-disable-next-line no-throw-literal
 throw null;
 }
Expand DownExpand Up@@ -4535,12 +4630,9 @@ function abortTask(task: Task, request: Request, error: mixed): void {
 debugInfo = node._debugInfo;
 }
 pushHaltedAwaitOnComponentStack(task, debugInfo);
 /*
 if (task.thenableState !== null) {
 // TODO: If we were stalled inside use() of a Client Component then we should
 // rerender to get the stack trace from the use() call.
 pushSuspendedCallSiteOnComponentStack(request, task);
 }
 */
 }
 }

Expand Down
Loading
Loading

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

Skip to content
[Fizz] Push a stalled use() to the ownerStack/debugTask#13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

eps1lon
wants to merge
10
commits into

from

 Closed


[Fizz] Push a stalled use() to the ownerStack/debugTask
#13
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
fd5a4c6

[Fizz] Push a stalled use() to the ownerStack/debugTask


eps1lon Nov 26, 2025
5aab310

Use forked implementation of performWork


eps1lon Nov 26, 2025
b53420e

Explain why the ConsoleTask is incomplete


eps1lon Nov 27, 2025
5a24906

should we reset thenables to unknown status?


eps1lon Nov 27, 2025
3be7b3c

Current behavior for what happens if you resolve before React gets a …


eps1lon Nov 28, 2025
70db38b

Ensure we rerender with the original suspender


eps1lon Nov 28, 2025
4cc34ff

Current behavior with lazy types


eps1lon Nov 28, 2025
0e0779c

Rerender through Lazy Components in dev if we were already aborting


eps1lon Nov 29, 2025
38e1360

Ensure the temporary corruption of internal state goes unnoticed


eps1lon Nov 29, 2025
cbfb89e

Revert fixture changes


eps1lon Dec 4, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


195 changes: 188 additions & 7 deletions
packages/react-server-dom-webpack/src/__tests__/ReactFlightDOMNode-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -108,6 +108,28 @@ describe('ReactFlightDOMNode', () => {
 );
 }

 /**
 * Removes all stackframes not pointing into this file
 */
 function ignoreListStack(str) {
 if (!str) {
 return str;
 }

 let ignoreListedStack = '';
 const lines = str.split('\n');

 // eslint-disable-next-line no-for-of-loops/no-for-of-loops
 for (const line of lines) {
 if (line.indexOf(__filename) === -1) {
 } else {
 ignoreListedStack += '\n' + line.replace(__dirname, '.');
 }
 }

 return ignoreListedStack;
 }

 function readResult(stream) {
 return new Promise((resolve, reject) => {
 let buffer = '';
Expand DownExpand Up@@ -784,6 +806,165 @@ describe('ReactFlightDOMNode', () => {
 }
 });

 // @gate enableHalt
 it('includes source locations in component and owner stacks for halted Client components', async () => {
 function SharedComponent({p1, p2, p3}) {
 use(p1);
 use(p2);
 use(p3);
 return <div>Hello, Dave!</div>;
 }
 const ClientComponentOnTheServer = clientExports(SharedComponent);
 const ClientComponentOnTheClient = clientExports(
 SharedComponent,
 123,
 'path/to/chunk.js',
 );

 let resolvePendingPromise;
 function ServerComponent() {
 const p1 = Promise.resolve();
 const p2 = new Promise(resolve => {
 resolvePendingPromise = value => {
 p2.status = 'fulfilled';
 p2.value = value;
 resolve(value);
 };
 });
 const p3 = new Promise(() => {});
 return ReactServer.createElement(ClientComponentOnTheClient, {
 p1: p1,
 p2: p2,
 p3: p3,
 });
 }

 function App() {
 return ReactServer.createElement(
 'html',
 null,
 ReactServer.createElement(
 'body',
 null,
 ReactServer.createElement(
 ReactServer.Suspense,
 {fallback: 'Loading...'},
 ReactServer.createElement(ServerComponent, null),
 ),
 ),
 );
 }

 const errors = [];
 const rscStream = await serverAct(() =>
 ReactServerDOMServer.renderToPipeableStream(
 ReactServer.createElement(App, null),
 webpackMap,
 ),
 );

 const readable = new Stream.PassThrough(streamOptions);
 rscStream.pipe(readable);

 function ClientRoot({response}) {
 return use(response);
 }

 const serverConsumerManifest = {
 moduleMap: {
 [webpackMap[ClientComponentOnTheClient.$$id].id]: {
 '*': webpackMap[ClientComponentOnTheServer.$$id],
 },
 },
 moduleLoading: webpackModuleLoading,
 };

 expect(errors).toEqual([]);

 function ClientRoot({response}) {
 return use(response);
 }

 const response = ReactServerDOMClient.createFromNodeStream(
 readable,
 serverConsumerManifest,
 );

 let componentStack;
 let ownerStack;

 const clientAbortController = new AbortController();

 const fizzPrerenderStreamResult = ReactDOMFizzStatic.prerender(
 React.createElement(ClientRoot, {response}),
 {
 signal: clientAbortController.signal,
 onError(error, errorInfo) {
 componentStack = errorInfo.componentStack;
 ownerStack = React.captureOwnerStack
 ? React.captureOwnerStack()
 : null;
 },
 },
 );

 resolvePendingPromise('custom-instrum-resolve');
 await serverAct(
 async () =>
 new Promise(resolve => {
 setImmediate(() => {
 clientAbortController.abort();
 resolve();
 });
 }),
 );

 const fizzPrerenderStream = await fizzPrerenderStreamResult;
 const prerenderHTML = await readWebResult(fizzPrerenderStream.prelude);

 expect(prerenderHTML).toContain('Loading...');

 if (__DEV__) {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in ServerComponent' +
 (gate(flags => flags.enableAsyncDebugInfo) ? ' (at **)' : '') +
 '\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in App (at **)\n' +
 ' in ClientRoot (at **)',
 );
 } else {
 expect(normalizeCodeLocInfo(componentStack)).toBe(
 '\n' +
 ' in SharedComponent (at **)\n' +
 ' in Suspense\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (at **)',
 );
 }

 if (__DEV__) {
 expect(ignoreListStack(ownerStack)).toBe(
 // eslint-disable-next-line react-internal/safe-string-coercion
 '' +
 // The concrete location may change as this test is updated.
 // Just make sure they still point at React.use(p2)
 (gate(flags => flags.enableAsyncDebugInfo)
 ? '\n at SharedComponent (./ReactFlightDOMNode-test.js:813:7)'
 : '') +
 '\n at ServerComponent (file://./ReactFlightDOMNode-test.js:835:26)' +
 '\n at App (file://./ReactFlightDOMNode-test.js:852:25)',
 );
 } else {
 expect(ownerStack).toBeNull();
 }
 });

 // @gate enableHalt
 it('includes deeper location for aborted stacks', async () => {
 async function getData() {
Expand DownExpand Up@@ -1364,12 +1545,12 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in Dynamic' +
 (gate(flags => flags.enableAsyncDebugInfo)
 ? ' (file://ReactFlightDOMNode-test.js:1238:27)\n'
 ? ' (file://ReactFlightDOMNode-test.js:1419:27)\n'
 : '\n') +
 ' in body\n' +
 ' in html\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 } else {
 expect(
Expand All@@ -1378,7 +1559,7 @@ describe('ReactFlightDOMNode', () => {
 '\n' +
 ' in body\n' +
 ' in html\n' +
 ' in ClientRoot (ReactFlightDOMNode-test.js:1326:16)',
 ' in ClientRoot (ReactFlightDOMNode-test.js:1507:16)',
 );
 }

Expand All@@ -1388,16 +1569,16 @@ describe('ReactFlightDOMNode', () => {
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '\n' +
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1238:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in Dynamic (file://ReactFlightDOMNode-test.js:1419:27)\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 } else {
 expect(
 normalizeCodeLocInfo(ownerStack, {preserveLocation: true}),
 ).toBe(
 '' +
 '\n' +
 ' in App (file://ReactFlightDOMNode-test.js:1251:25)',
 ' in App (file://ReactFlightDOMNode-test.js:1432:25)',
 );
 }
 } else {
Expand Down

104 changes: 98 additions & 6 deletions
packages/react-server/src/ReactFizzServer.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,7 +190,14 @@ import assign from 'shared/assign';
import noop from 'shared/noop';
import getComponentNameFromType from 'shared/getComponentNameFromType';
import isArray from 'shared/isArray';
import {SuspenseException, getSuspendedThenable} from './ReactFizzThenable';
import {
 SuspenseException,
 getSuspendedThenable,
 ensureSuspendableThenableStateDEV,
 getSuspendedCallSiteStackDEV,
 getSuspendedCallSiteDebugTaskDEV,
 setCaptureSuspendedCallSiteDEV,
} from './ReactFizzThenable';

// Linked list representing the identity of a component given the component/tag name and key.
// The name might be minified but we assume that it's going to be the same generated name. Typically
Expand DownExpand Up@@ -1023,6 +1030,85 @@ function pushHaltedAwaitOnComponentStack(
 }
}

// performWork + retryTask without mutation
function rerenderStalledTask(request: Request, task: Task): void {
 const prevContext = getActiveContext();
 const prevDispatcher = ReactSharedInternals.H;
 ReactSharedInternals.H = HooksDispatcher;
 const prevAsyncDispatcher = ReactSharedInternals.A;
 ReactSharedInternals.A = DefaultAsyncDispatcher;

 const prevRequest = currentRequest;
 currentRequest = request;

 const prevGetCurrentStackImpl = ReactSharedInternals.getCurrentStack;
 ReactSharedInternals.getCurrentStack = getCurrentStackInDEV;

 const prevResumableState = currentResumableState;
 setCurrentResumableState(request.resumableState);
 switchContext(task.context);
 const prevTaskInDEV = currentTaskInDEV;
 setCurrentTaskInDEV(task);
 try {
 retryNode(request, task);
 } catch (x) {
 // Suspended again.
 resetHooksState();
 } finally {
 setCurrentTaskInDEV(prevTaskInDEV);
 setCurrentResumableState(prevResumableState);

 ReactSharedInternals.H = prevDispatcher;
 ReactSharedInternals.A = prevAsyncDispatcher;

 ReactSharedInternals.getCurrentStack = prevGetCurrentStackImpl;
 if (prevDispatcher === HooksDispatcher) {
 // This means that we were in a reentrant work loop. This could happen
 // in a renderer that supports synchronous work like renderToString,
 // when it's called from within another renderer.
 // Normally we don't bother switching the contexts to their root/default
 // values when leaving because we'll likely need the same or similar
 // context again. However, when we're inside a synchronous loop like this
 // we'll to restore the context to what it was before returning.
 switchContext(prevContext);
 }
 currentRequest = prevRequest;
 }
}

function pushSuspendedCallSiteOnComponentStack(
 request: Request,
 task: Task,
): void {
 setCaptureSuspendedCallSiteDEV(true);
 const restoreThenableState = ensureSuspendableThenableStateDEV(
 // refined at the callsite
 ((task.thenableState: any): ThenableState),
 );
 try {
 rerenderStalledTask(request, task);
 } finally {
 restoreThenableState();
 setCaptureSuspendedCallSiteDEV(false);
 }

 const suspendCallSiteStack = getSuspendedCallSiteStackDEV();
 const suspendCallSiteDebugTask = getSuspendedCallSiteDebugTaskDEV();

 if (suspendCallSiteStack !== null) {
 const ownerStack = task.componentStack;
 task.componentStack = {
 // The owner of the suspended call site would be the owner of this task.
 // We need the task itself otherwise we'd miss a frame.
 owner: ownerStack,
 parent: suspendCallSiteStack.parent,
 stack: suspendCallSiteStack.stack,
 type: suspendCallSiteStack.type,
 };
 }
 task.debugTask = suspendCallSiteDebugTask;
}

function pushServerComponentStack(
 task: Task,
 debugInfo: void | null | ReactDebugInfo,
Expand DownExpand Up@@ -2716,14 +2802,23 @@ function renderLazyComponent(
 ref: any,
): void {
 let Component;
 let previouslyAbortingDEV;
 if (__DEV__) {
 previouslyAbortingDEV = request.status === ABORTING;
 Component = callLazyInitInDEV(lazyComponent);
 } else {
 const payload = lazyComponent._payload;
 const init = lazyComponent._init;
 Component = init(payload);
 }
 if (request.status === ABORTING) {
 if (
 request.status === ABORTING &&
 // If we already started rendering the Lazy Componentn in an aborting state
 // and reach this point, the lazy was already resolved.
 // We don't bail here again since this is most likely a discarded rerender
 // to get the stack where we suspended in dev.
 (!__DEV__ || !previouslyAbortingDEV)
 ) {
 // eslint-disable-next-line no-throw-literal
 throw null;
 }
Expand DownExpand Up@@ -4535,12 +4630,9 @@ function abortTask(task: Task, request: Request, error: mixed): void {
 debugInfo = node._debugInfo;
 }
 pushHaltedAwaitOnComponentStack(task, debugInfo);
 /*
 if (task.thenableState !== null) {
 // TODO: If we were stalled inside use() of a Client Component then we should
 // rerender to get the stack trace from the use() call.
 pushSuspendedCallSiteOnComponentStack(request, task);
 }
 */
 }
 }

Expand Down
Loading
Loading