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

Jump to bottom

Update React from 6230622a1a-20240610 to 3208e73e-20240730 #68330

Merged
merged 9 commits into from
Jul 30, 2024
Merged

Update React from 6230622a1a-20240610 to 3208e73e-20240730 #68330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f273ee4
Update React from `6230622a1a-20240610` to `dfd30974ab-20240613`
eps1lon Jul 23, 2024
77b2502
Update React from `dfd30974ab-20240613` to `01172397-20240716`
eps1lon Jul 16, 2024
ad1b2c4
Update React from `01172397-20240716` to `f6cce072-20240723`
eps1lon Jul 23, 2024
2f0079d
Update assertions for improved stacks in error overlay
eps1lon Jul 24, 2024
2674c97
Update tests with Flight implementation details
eps1lon Jul 24, 2024
1f16e1d
Update React from `f6cce072-20240723` to `76002254-20240724`
eps1lon Jul 25, 2024
f759e07
Update test/development/app-dir/dynamic-error-trace/index.test.ts
eps1lon Jul 29, 2024
8169b2a
Update React from `76002254-20240724` to `941e1b4a-20240729`
eps1lon Jul 30, 2024
9e8c195
Update React from `941e1b4a-20240729` to `3208e73e-20240730`
eps1lon Jul 30, 2024
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
2 changes: 1 addition & 1 deletion .github/.react-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
19.0.0-rc-6230622a1a-20240610
19.0.0-rc-3208e73e-20240730
4 changes: 2 additions & 2 deletions examples/reproduction-template/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
},
"dependencies": {
"next": "canary",
"react": "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0"
"react": "19.0.0-rc-3208e73e-20240730",
"react-dom": "19.0.0-rc-3208e73e-20240730"
},
"devDependencies": {
"@types/node": "20.12.12",
Expand Down
34 changes: 17 additions & 17 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,19 +200,19 @@
"pretty-bytes": "5.3.0",
"pretty-ms": "7.0.0",
"random-seed": "0.3.0",
"react": "19.0.0-rc-6230622a1a-20240610",
"react": "19.0.0-rc-3208e73e-20240730",
"react-17": "npm:[email protected]",
"react-builtin": "npm:[email protected]6230622a1a-20240610",
"react-dom": "19.0.0-rc-6230622a1a-20240610",
"react-builtin": "npm:[email protected]3208e73e-20240730",
"react-dom": "19.0.0-rc-3208e73e-20240730",
"react-dom-17": "npm:[email protected]",
"react-dom-builtin": "npm:[email protected]6230622a1a-20240610",
"react-dom-experimental-builtin": "npm:[email protected]6230622a1a-20240610",
"react-experimental-builtin": "npm:[email protected]6230622a1a-20240610",
"react-is-builtin": "npm:[email protected]6230622a1a-20240610",
"react-server-dom-turbopack": "19.0.0-rc-6230622a1a-20240610",
"react-server-dom-turbopack-experimental": "npm:[email protected]6230622a1a-20240610",
"react-server-dom-webpack": "19.0.0-rc-6230622a1a-20240610",
"react-server-dom-webpack-experimental": "npm:[email protected]6230622a1a-20240610",
"react-dom-builtin": "npm:[email protected]3208e73e-20240730",
"react-dom-experimental-builtin": "npm:[email protected]3208e73e-20240730",
"react-experimental-builtin": "npm:[email protected]3208e73e-20240730",
"react-is-builtin": "npm:[email protected]3208e73e-20240730",
"react-server-dom-turbopack": "19.0.0-rc-3208e73e-20240730",
"react-server-dom-turbopack-experimental": "npm:[email protected]3208e73e-20240730",
"react-server-dom-webpack": "19.0.0-rc-3208e73e-20240730",
"react-server-dom-webpack-experimental": "npm:[email protected]3208e73e-20240730",
"react-ssr-prepass": "1.0.8",
"react-virtualized": "9.22.3",
"relay-compiler": "13.0.2",
Expand All @@ -222,8 +222,8 @@
"resolve-from": "5.0.0",
"sass": "1.54.0",
"satori": "0.10.9",
"scheduler-builtin": "npm:[email protected]6230622a1a-20240610",
"scheduler-experimental-builtin": "npm:[email protected]6230622a1a-20240610",
"scheduler-builtin": "npm:[email protected]3208e73e-20240730",
"scheduler-experimental-builtin": "npm:[email protected]3208e73e-20240730",
"seedrandom": "3.0.5",
"semver": "7.3.7",
"shell-quote": "1.7.3",
Expand Down Expand Up @@ -263,10 +263,10 @@
"@babel/traverse": "7.22.5",
"@types/react": "npm:[email protected]",
"@types/react-dom": "npm:[email protected]",
"react": "19.0.0-rc-6230622a1a-20240610",
"react-dom": "19.0.0-rc-6230622a1a-20240610",
"react-is": "19.0.0-rc-6230622a1a-20240610",
"scheduler": "0.25.0-rc-6230622a1a-20240610"
"react": "19.0.0-rc-3208e73e-20240730",
"react-dom": "19.0.0-rc-3208e73e-20240730",
"react-is": "19.0.0-rc-3208e73e-20240730",
"scheduler": "0.25.0-rc-3208e73e-20240730"
},
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
Expand Down
4 changes: 2 additions & 2 deletions packages/create-next-app/templates/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ export const installTemplate = async ({
* Default dependencies.
*/
dependencies: {
react: "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0",
react: "19.0.0-rc-3208e73e-20240730",
"react-dom": "19.0.0-rc-3208e73e-20240730",
next: version,
},
devDependencies: {},
Expand Down
4 changes: 2 additions & 2 deletions packages/next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@
"@opentelemetry/api": "^1.1.0",
"@playwright/test": "^1.41.2",
"babel-plugin-react-compiler": "*",
"react": "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0",
"react": "19.0.0-rc-3208e73e-20240730",
"react-dom": "19.0.0-rc-3208e73e-20240730",
"sass": "^1.3.0"
},
"peerDependenciesMeta": {
Expand Down
8 changes: 4 additions & 4 deletions ...ges/next/src/client/components/react-dev-overlay/internal/helpers/hydration-error-info.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ export const hydrationErrorState: HydrationErrorState = {}

// https://github.com/facebook/react/blob/main/packages/react-dom/src/__tests__/ReactDOMHydrationDiff-test.js used as a reference
const htmlTagsWarnings = new Set([
'Warning: In HTML, %s cannot be a child of <%s>.%s\nThis will cause a hydration error.%s',
'Warning: In HTML, %s cannot be a descendant of <%s>.\nThis will cause a hydration error.%s',
'Warning: In HTML, text nodes cannot be a child of <%s>.\nThis will cause a hydration error.',
"Warning: In HTML, whitespace text nodes cannot be a child of <%s>. Make sure you don't have any extra whitespace between tags on each line of your source code.\nThis will cause a hydration error.",
'In HTML, %s cannot be a child of <%s>.%s\nThis will cause a hydration error.%s',
'In HTML, %s cannot be a descendant of <%s>.\nThis will cause a hydration error.%s',
'In HTML, text nodes cannot be a child of <%s>.\nThis will cause a hydration error.',
"In HTML, whitespace text nodes cannot be a child of <%s>. Make sure you don't have any extra whitespace between tags on each line of your source code.\nThis will cause a hydration error.",
])

export const getHydrationWarningType = (msg: NullableText): 'tag' | 'text' => {
Expand Down
Loading
Loading