Skip to content

Throw on hydration mismatch and force client rendering if boundary hasn't suspended within concurrent root #22629

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 15 commits into from
Nov 9, 2021
Merged

Throw on hydration mismatch and force client rendering if boundary hasn't suspended within concurrent root #22629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c36d778
Throw on hydration mismatch
salazarm Oct 26, 2021
4f8850c
remove debugger
salazarm Oct 26, 2021
8828ebc
update error message
salazarm Oct 26, 2021
a55dcaf
update error message part2...
salazarm Oct 26, 2021
0b6a14d
fix test?
salazarm Oct 26, 2021
4ecbb47
test? :(
salazarm Oct 26, 2021
2cf8d38
tests 4real
salazarm Oct 26, 2021
b25e7d2
remove useRefAccessWarning gating
salazarm Oct 26, 2021
8d03a46
split markSuspenseBoundary and getNearestBoundary
salazarm Oct 26, 2021
6c9abd8
also assert html is correct
salazarm Oct 26, 2021
3da4d94
replace-fork
salazarm Oct 26, 2021
ae40665
also remove client render flag on suspend
salazarm Nov 8, 2021
6b48b45
replace-fork
salazarm Nov 8, 2021
935e8f8
merge?
salazarm Nov 8, 2021
646472f
fix mismerge????
salazarm Nov 8, 2021
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
update error message part2...
  • Loading branch information
@salazarm
salazarm committed Oct 26, 2021
commit a55dcafde45d4b001483726ae9db39dac46ee0d4
7 changes: 6 additions & 1 deletion packages/react-reconciler/src/ReactFiberThrow.new.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,12 @@ function throwException(
suspenseBoundary.flags |= ForceClientRender;
return;
}
if (hasShouldCapture && value && value.message === 'Hydration mismatch') {
if (
hasShouldCapture &&
value &&
value.message ===
'An error occurred during hydration. The server HTML was replaced with client content'
) {
// swallow mismatch error
return;
}
Expand Down
7 changes: 6 additions & 1 deletion packages/react-reconciler/src/ReactFiberThrow.old.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,12 @@ function throwException(
suspenseBoundary.flags |= ForceClientRender;
return;
}
if (hasShouldCapture && value && value.message === 'Hydration mismatch') {
if (
hasShouldCapture &&
value &&
value.message ===
'An error occurred during hydration. The server HTML was replaced with client content'
) {
// swallow mismatch error
return;
}
Expand Down