Skip to content

support errorInfo in onRecoverableError #24591

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

Merged
merged 9 commits into from
Jun 6, 2022
Merged

support errorInfo in onRecoverableError #24591

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6cd4884
extend onRecoverableError API to support errorInfo
gnoff May 20, 2022
8d3c13f
refactor hash to digest
gnoff Jun 2, 2022
ad431e9
only send hash if present
gnoff Jun 2, 2022
7f69424
update test to handle new template emission
gnoff Jun 2, 2022
8b596cd
fix bug in legacy dom server preventing some errors from propagating …
gnoff Jun 6, 2022
8ec1094
fix type
gnoff Jun 6, 2022
393ca1f
test gymnastics
gnoff Jun 6, 2022
b0837f6
switch to __WWW__ gating
gnoff Jun 6, 2022
3b86e0f
use both...
gnoff Jun 6, 2022
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
Prev Previous commit
Next Next commit
only send hash if present
  • Loading branch information
@gnoff
gnoff committed Jun 6, 2022
commit ad431e961b07c8ad36fe4d83b95711864a6e47dc
1 change: 1 addition & 0 deletions packages/react-dom/src/client/ReactDOMHostConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -750,6 +750,7 @@ export function getSuspenseInstanceFallbackErrorDetails(
stack,
};
} else {
// Object gets DCE'd if constructed in tail position and matches callsite destructuring
return {
digest,
};
Expand Down
38 changes: 28 additions & 10 deletions packages/react-dom/src/server/ReactDOMServerFormatConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1527,16 +1527,22 @@ const startClientRenderedSuspenseBoundary = stringToPrecomputedChunk(
const endSuspenseBoundary = stringToPrecomputedChunk('<!--/$-->');

const clientRenderedSuspenseBoundaryError1 = stringToPrecomputedChunk(
'<template data-dgst="',
'<template',
);
const clientRenderedSuspenseBoundaryErrorAttrInterstitial = stringToPrecomputedChunk(
'"',
);
const clientRenderedSuspenseBoundaryError1A = stringToPrecomputedChunk(
'" data-msg="',
' data-dgst="',
);
const clientRenderedSuspenseBoundaryError1B = stringToPrecomputedChunk(
'" data-stck="',
' data-msg="',
);
const clientRenderedSuspenseBoundaryError1C = stringToPrecomputedChunk(
' data-stck="',
);
const clientRenderedSuspenseBoundaryError2 = stringToPrecomputedChunk(
'"></template>',
'></template>',
);

export function pushStartCompletedSuspenseBoundary(
Expand Down Expand Up @@ -1586,24 +1592,36 @@ export function writeStartClientRenderedSuspenseBoundary(
startClientRenderedSuspenseBoundary,
);
writeChunk(destination, clientRenderedSuspenseBoundaryError1);
writeChunk(
destination,
stringToChunk(escapeTextForBrowser(errorDigest || '')),
);
if (errorDigest) {
writeChunk(destination, clientRenderedSuspenseBoundaryError1A);
writeChunk(destination, stringToChunk(escapeTextForBrowser(errorDigest)));
writeChunk(
destination,
clientRenderedSuspenseBoundaryErrorAttrInterstitial,
);
}
if (__DEV__) {
if (errorMesssage) {
writeChunk(destination, clientRenderedSuspenseBoundaryError1A);
writeChunk(destination, clientRenderedSuspenseBoundaryError1B);
writeChunk(
destination,
stringToChunk(escapeTextForBrowser(errorMesssage)),
);
writeChunk(
destination,
clientRenderedSuspenseBoundaryErrorAttrInterstitial,
);
}
if (errorComponentStack) {
writeChunk(destination, clientRenderedSuspenseBoundaryError1B);
writeChunk(destination, clientRenderedSuspenseBoundaryError1C);
writeChunk(
destination,
stringToChunk(escapeTextForBrowser(errorComponentStack)),
);
writeChunk(
destination,
clientRenderedSuspenseBoundaryErrorAttrInterstitial,
);
}
}
result = writeChunkAndReturn(
Expand Down