Skip to content
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

[dev-overlay] Harden types when handling hydration mismatches #77334

Merged
merged 1 commit into from
Apr 2, 2025
+7 −2
Merged

[dev-overlay] Harden types when handling hydration mismatches #77334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions packages/next/src/client/components/errors/attach-hydration-error-state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
import {
hydrationErrorState,
getReactHydrationDiffSegments,
type HydrationErrorState,
} from './hydration-error-info'

export function attachHydrationErrorState(error: Error) {
Expand All @@ -27,15 +28,19 @@ export function attachHydrationErrorState(error: Error) {
if (reactHydrationDiffSegments) {
const diff = reactHydrationDiffSegments[1]
parsedHydrationErrorState = {
...(error as any).details,
...((error as any).details as HydrationErrorState),
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.details was any so it hid that we assigned [string] to [string, string, string]

...hydrationErrorState,
// If diff is present in error, we don't need to pick up the console logged warning.
// - if hydration error has diff, and is not hydration diff log, then it's a normal hydration error.
// - if hydration error no diff, then leverage the one from the hydration diff log.

warning: (diff && !isHydrationWarning
? null
: hydrationErrorState.warning) || [getDefaultHydrationErrorMessage()],
: hydrationErrorState.warning) || [
getDefaultHydrationErrorMessage(),
'',
'',
],
// When it's hydration diff log, do not show notes section.
// This condition is only for the 1st squashed error.
notes: isHydrationWarning ? '' : reactHydrationDiffSegments[0],
Expand Down
Loading