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

Upgrade React from 313332d1-20250326 to 63779030-20250328 #77643

Merged
merged 7 commits into from
Apr 1, 2025
Merged

Upgrade React from 313332d1-20250326 to 63779030-20250328 #77643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e3ea4ac
Update `react@experimental`
vercel-release-bot Mar 31, 2025
4e4e19f
Update `react`
vercel-release-bot Mar 31, 2025
0929a36
Updated peer dependency references in apps
vercel-release-bot Mar 31, 2025
8ad31d8
Updated peer dependency references in libraries
vercel-release-bot Mar 31, 2025
3b21533
Update lockfile
vercel-release-bot Mar 31, 2025
dcaab1b
ncc-compiled
vercel-release-bot Mar 31, 2025
fbdfcdf
Handle new hydration message format
eps1lon Apr 1, 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
30 changes: 15 additions & 15 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,16 +227,16 @@
"pretty-ms": "7.0.0",
"random-seed": "0.3.0",
"react": "19.0.0",
"react-builtin": "npm:react@19.1.0-canary-313332d1-20250326",
"react-builtin": "npm:react@19.2.0-canary-63779030-20250328",
"react-dom": "19.0.0",
"react-dom-builtin": "npm:react-dom@19.1.0-canary-313332d1-20250326",
"react-dom-experimental-builtin": "npm:[email protected]313332d1-20250326",
"react-experimental-builtin": "npm:[email protected]313332d1-20250326",
"react-is-builtin": "npm:react-is@19.1.0-canary-313332d1-20250326",
"react-server-dom-turbopack": "19.1.0-canary-313332d1-20250326",
"react-server-dom-turbopack-experimental": "npm:[email protected]313332d1-20250326",
"react-server-dom-webpack": "19.1.0-canary-313332d1-20250326",
"react-server-dom-webpack-experimental": "npm:[email protected]313332d1-20250326",
"react-dom-builtin": "npm:react-dom@19.2.0-canary-63779030-20250328",
"react-dom-experimental-builtin": "npm:[email protected]63779030-20250328",
"react-experimental-builtin": "npm:[email protected]63779030-20250328",
"react-is-builtin": "npm:react-is@19.2.0-canary-63779030-20250328",
"react-server-dom-turbopack": "19.2.0-canary-63779030-20250328",
"react-server-dom-turbopack-experimental": "npm:[email protected]63779030-20250328",
"react-server-dom-webpack": "19.2.0-canary-63779030-20250328",
"react-server-dom-webpack-experimental": "npm:[email protected]63779030-20250328",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
Expand All @@ -246,8 +246,8 @@
"resolve-from": "5.0.0",
"sass": "1.54.0",
"satori": "0.12.2",
"scheduler-builtin": "npm:scheduler@0.26.0-canary-313332d1-20250326",
"scheduler-experimental-builtin": "npm:[email protected]313332d1-20250326",
"scheduler-builtin": "npm:scheduler@0.27.0-canary-63779030-20250328",
"scheduler-experimental-builtin": "npm:[email protected]63779030-20250328",
"seedrandom": "3.0.5",
"semver": "7.3.7",
"shell-quote": "1.7.3",
Expand Down Expand Up @@ -290,10 +290,10 @@
"@types/react": "19.0.8",
"@types/react-dom": "19.0.3",
"jest-snapshot": "30.0.0-alpha.6",
"react": "19.1.0-canary-313332d1-20250326",
"react-dom": "19.1.0-canary-313332d1-20250326",
"react-is": "19.1.0-canary-313332d1-20250326",
"scheduler": "0.26.0-canary-313332d1-20250326"
"react": "19.2.0-canary-63779030-20250328",
"react-dom": "19.2.0-canary-63779030-20250328",
"react-is": "19.2.0-canary-63779030-20250328",
"scheduler": "0.27.0-canary-63779030-20250328"
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]",
Expand Down
3 changes: 2 additions & 1 deletion packages/next/src/client/components/is-hydration-error.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import isError from '../../lib/is-error'

const hydrationErrorRegex =
/hydration failed|while hydrating|content does not match|did not match|HTML didn't match/i
/hydration failed|while hydrating|content does not match|did not match|HTML didn't match|text didn't match/i

const reactUnifiedMismatchWarning = `Hydration failed because the server rendered HTML didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:`

const reactHydrationStartMessages = [
reactUnifiedMismatchWarning,
`Hydration failed because the server rendered text didn't match the client. As a result this tree will be regenerated on the client. This can happen if a SSR-ed Client Component used:`,
Copy link
Member

Choose a reason for hiding this comment

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

facebook/react#32763

The default message should still read "HTML". Though this does highlight that we currently drop the original message. So if you do have a text mismatch, we still unintentionally say "rendered HTML" instead of "rendered text". We'll see if this gets fixed during the upcoming refactors. Not too urgent to fix.

`A tree hydrated but some attributes of the server rendered HTML didn't match the client properties. This won't be patched up. This can happen if a SSR-ed Client Component used:`,
]

Expand Down
460 changes: 251 additions & 209 deletions packages/next/src/compiled/react-dom-experimental/cjs/react-dom-client.development.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading