re-add hydration support to React 18 errors #69757
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Warning This pull request is not mergeable via GitHub because a downstack PR is open. Once all requirements are satisfied, merge this PR as a stack on Graphite.
This stack of pull requests is managed by Graphite. Learn more about stacking. |
ztanner
force-pushed
the
09-05-re-add_hydration_support_to_react_18_errors
branch
from
f20e3c5 to
e7a914c
Compare
ztanner
commented
Sep 5, 2024
| 'Warning: Text content did not match. Server: "%s" Client: "%s"%s' | ||
|
|
||
| const isTextMismatchWarning = (msg: NullableText) => textMismatchWarning === msg | ||
| const isTextInTagsMismatchWarning = (msg: NullableText) => |
There was a problem hiding this comment.
ztanner
commented
Sep 5, 2024
| ...args, | ||
| // We tack on the hydration error message to the console.error message so that | ||
| // it matches the error we display in the redbox overlay | ||
| `\nSee more info here: https://nextjs.org/docs/messages/react-hydration-error`, |
There was a problem hiding this comment.
Supports behavior that was lost from:
ztanner
commented
Sep 5, 2024
| @@ -38,7 +37,7 @@ describe.skip('Error overlay for hydration errors (React 18)', () => { | |||
| await session.assertHasRedbox() | |||
|
|
|||
| expect(await session.getRedboxDescription()).toMatchInlineSnapshot(` | |||
| "Error: Text content does not match server-rendered HTML. | |||
| "Text content does not match server-rendered HTML. | |||
There was a problem hiding this comment.
Slight change in behavior but showing Error: in an error overlay feels a bit redundant
ztanner
force-pushed
the
09-05-re-add_hydration_support_to_react_18_errors
branch
from
e7a914c to
81ceea6
Compare
ztanner
commented
Sep 5, 2024
| @@ -307,7 +307,9 @@ export function Errors({ | |||
| {/* If there's hydration warning, skip displaying the error name */} | |||
| {hydrationWarning ? '' : error.name + ': '} | |||
| <HotlinkedText | |||
| text={hydrationWarning || error.message} | |||
| text={ | |||
| isAppDir ? hydrationWarning || error.message : error.message | |||
There was a problem hiding this comment.
Reverts the Errors.tsx changes from:
to match the React 18 behavior when not in app dir
Failing test suitesCommit: f7a2265
Expand output● Production Usage › should output traces Read more about building and testing Next.js in contributing.md.
Expand output● minified module ids › production mode › should have no long module ids for basic modules ● minified module ids › production mode › should have no long module ids for external modules ● minified module ids › production mode › should have no long module ids for async loader modules ● minified module ids › production mode › should have no long module id for the next client runtime module Read more about building and testing Next.js in contributing.md.
Expand output● getServerSideProps › should dedupe server data requests Read more about building and testing Next.js in contributing.md. |
ztanner
force-pushed
the
09-05-re-add_hydration_support_to_react_18_errors
branch
from
81ceea6 to
546d978
Compare
ztanner
changed the base branch from
sebbie/08-30-react-sync_cleanup_inaccurate_peer_dependencies
to
canary
ztanner
force-pushed
the
09-05-re-add_hydration_support_to_react_18_errors
branch
from
546d978 to
39fa29b
Compare
ijjk
added
create-next-app
ztanner
changed the base branch from
canary
to
sebbie/08-30-react-sync_cleanup_inaccurate_peer_dependencies
ztanner
force-pushed
the
09-05-re-add_hydration_support_to_react_18_errors
branch
from
39fa29b to
4360de1
Compare
ztanner
commented
Sep 5, 2024
| @@ -4,7 +4,8 @@ import { FileRef, nextTestSetup } from 'e2e-utils' | |||
| import { outdent } from 'outdent' | |||
| import path from 'path' | |||
|
|
|||
| describe('Error overlay for hydration errors (React 19)', () => { | |||
| // TODO: Enable once React 19 support is added to pages. | |||
| describe.skip('Error overlay for hydration errors (React 19)', () => { | |||
There was a problem hiding this comment.
This can't run because we throw in pages if 18 is used
ztanner
force-pushed
the
09-05-re-add_hydration_support_to_react_18_errors
branch
from
4360de1 to
f7a2265
Compare
This was referenced Sep 5, 2024
huozhi
approved these changes
Sep 5, 2024
ztanner
merged commit 1de62ed
into
sebbie/08-30-react-sync_cleanup_inaccurate_peer_dependencies
18 of 23 checks passed
ztanner
deleted the
09-05-re-add_hydration_support_to_react_18_errors
branch
ztanner
added a commit
that referenced
this pull request
Sep 6, 2024
Re-lands hydration support for React 18 errors by reverting some things that were part of #65058. Annotated specific parts with comments.
ztanner
added a commit
that referenced
this pull request
Sep 9, 2024
Re-lands hydration support for React 18 errors by reverting some things that were part of #65058. Annotated specific parts with comments.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re-lands hydration support for React 18 errors by reverting some things that were part of #65058. Annotated specific parts with comments.