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

Label React syncs in GitHub with type: react-sync #67628

Closed
wants to merge 4 commits into from
Closed

Label React syncs in GitHub with type: react-sync #67628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d7a7de
Update React from 6230622a1a to a26e3f403e
eps1lon Jul 10, 2024
0b3bde4
Go back to using exact React versions in Pages Router
eps1lon Jul 10, 2024
801d7c7
Adjust error overlay impl now that React removed the "Warning: " prefix
eps1lon Jun 18, 2024
a4c50b5
Label React syncs in GitHub
eps1lon Jul 10, 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
3 changes: 2 additions & 1 deletion .github/labeler.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@
"packages/next-swc/**",
"packages/next/**",
"packages/react-refresh-utils/**"
]
],
"type: react-sync": [".react-version"]
}
}
1 change: 1 addition & 0 deletions .react-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
19.0.0-rc-a26e3f403e-20240611
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-a26e3f403e-20240611",
"react-17": "npm:react@17.0.2",
"react-builtin": "npm:react@19.0.0-rc-6230622a1a-20240610",
"react-dom": "19.0.0-rc-6230622a1a-20240610",
"react-builtin": "npm:react@19.0.0-rc-a26e3f403e-20240611",
"react-dom": "19.0.0-rc-a26e3f403e-20240611",
"react-dom-17": "npm:react-dom@17.0.2",
"react-dom-builtin": "npm:react-dom@19.0.0-rc-6230622a1a-20240610",
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-6230622a1a-20240610",
"react-experimental-builtin": "npm:react@0.0.0-experimental-6230622a1a-20240610",
"react-is-builtin": "npm:react-is@19.0.0-rc-6230622a1a-20240610",
"react-server-dom-turbopack": "19.0.0-rc-6230622a1a-20240610",
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-6230622a1a-20240610",
"react-server-dom-webpack": "19.0.0-rc-6230622a1a-20240610",
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-6230622a1a-20240610",
"react-dom-builtin": "npm:react-dom@19.0.0-rc-a26e3f403e-20240611",
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-a26e3f403e-20240611",
"react-experimental-builtin": "npm:react@0.0.0-experimental-a26e3f403e-20240611",
"react-is-builtin": "npm:react-is@19.0.0-rc-a26e3f403e-20240611",
"react-server-dom-turbopack": "19.0.0-rc-a26e3f403e-20240611",
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-a26e3f403e-20240611",
"react-server-dom-webpack": "19.0.0-rc-a26e3f403e-20240611",
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-a26e3f403e-20240611",
"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:scheduler@0.25.0-rc-6230622a1a-20240610",
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-6230622a1a-20240610",
"scheduler-builtin": "npm:scheduler@0.25.0-rc-a26e3f403e-20240611",
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-a26e3f403e-20240611",
"seedrandom": "3.0.5",
"semver": "7.3.7",
"shell-quote": "1.7.3",
Expand Down Expand Up @@ -257,10 +257,10 @@
"@babel/traverse": "7.22.5",
"@types/react": "npm:types-react@19.0.0-rc.0",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
"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-a26e3f403e-20240611",
"react-dom": "19.0.0-rc-a26e3f403e-20240611",
"react-is": "19.0.0-rc-a26e3f403e-20240611",
"scheduler": "0.25.0-rc-a26e3f403e-20240611"
},
"engines": {
"node": ">=18.18.0",
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-a26e3f403e-20240611",
"react-dom": "19.0.0-rc-a26e3f403e-20240611",
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 @@ -105,8 +105,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-a26e3f403e-20240611",
"react-dom": "19.0.0-rc-a26e3f403e-20240611",
"sass": "^1.3.0"
},
"peerDependenciesMeta": {
Expand Down
18 changes: 9 additions & 9 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,19 +17,19 @@ 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.",
'Warning: Expected server HTML to contain a matching <%s> in <%s>.%s',
'Warning: Did not expect server HTML to contain a <%s> in <%s>.%s',
'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.",
'Expected server HTML to contain a matching <%s> in <%s>.%s',
'Did not expect server HTML to contain a <%s> in <%s>.%s',
])
const textAndTagsMismatchWarnings = new Set([
'Warning: Expected server HTML to contain a matching text node for "%s" in <%s>.%s',
'Warning: Did not expect server HTML to contain the text node "%s" in <%s>.%s',
'Expected server HTML to contain a matching text node for "%s" in <%s>.%s',
'Did not expect server HTML to contain the text node "%s" in <%s>.%s',
])
const textMismatchWarning =
'Warning: Text content did not match. Server: "%s" Client: "%s"%s'
'Text content did not match. Server: "%s" Client: "%s"%s'

export const getHydrationWarningType = (
msg: NullableText
Expand Down
Loading
Loading