Skip to content

Commit

Permalink
Revert "Update React from 6230622a1a-20240610 to 76002254-20240724 (#…
Browse files Browse the repository at this point in the history
…68149)" (#68300)

This seems to be causing an crash on vercel-site for our [one of our
top-level
pages](https://vercel-site-git-update-next-v15-0-0-canary-89.vercel.sh/ai)

Reverts #68149
  • Loading branch information
ijjk committed Jul 30, 2024
1 parent 739e0c3 commit c039891
Show file tree
Hide file tree
Showing 156 changed files with 498,902 additions and 339,942 deletions.
2 changes: 1 addition & 1 deletion .github/.react-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
19.0.0-rc-76002254-20240724
19.0.0-rc-6230622a1a-20240610
4 changes: 2 additions & 2 deletions examples/reproduction-template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
},
"dependencies": {
"next": "canary",
"react": "19.0.0-rc-76002254-20240724",
"react-dom": "19.0.0-rc-76002254-20240724"
"react": "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0"
},
"devDependencies": {
"@types/node": "20.12.12",
Expand Down
34 changes: 17 additions & 17 deletions package.json
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-76002254-20240724",
"react": "19.0.0-rc-6230622a1a-20240610",
"react-17": "npm:react@17.0.2",
"react-builtin": "npm:react@19.0.0-rc-76002254-20240724",
"react-dom": "19.0.0-rc-76002254-20240724",
"react-builtin": "npm:react@19.0.0-rc-6230622a1a-20240610",
"react-dom": "19.0.0-rc-6230622a1a-20240610",
"react-dom-17": "npm:react-dom@17.0.2",
"react-dom-builtin": "npm:react-dom@19.0.0-rc-76002254-20240724",
"react-dom-experimental-builtin": "npm:react-dom@0.0.0-experimental-76002254-20240724",
"react-experimental-builtin": "npm:react@0.0.0-experimental-76002254-20240724",
"react-is-builtin": "npm:react-is@19.0.0-rc-76002254-20240724",
"react-server-dom-turbopack": "19.0.0-rc-76002254-20240724",
"react-server-dom-turbopack-experimental": "npm:react-server-dom-turbopack@0.0.0-experimental-76002254-20240724",
"react-server-dom-webpack": "19.0.0-rc-76002254-20240724",
"react-server-dom-webpack-experimental": "npm:react-server-dom-webpack@0.0.0-experimental-76002254-20240724",
"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-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-76002254-20240724",
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-76002254-20240724",
"scheduler-builtin": "npm:scheduler@0.25.0-rc-6230622a1a-20240610",
"scheduler-experimental-builtin": "npm:scheduler@0.0.0-experimental-6230622a1a-20240610",
"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:types-react@19.0.0-rc.0",
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.0",
"react": "19.0.0-rc-76002254-20240724",
"react-dom": "19.0.0-rc-76002254-20240724",
"react-is": "19.0.0-rc-76002254-20240724",
"scheduler": "0.25.0-rc-76002254-20240724"
"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"
},
"patchedDependencies": {
"webpack-sources@3.2.3": "patches/webpack-sources@3.2.3.patch"
Expand Down
4 changes: 2 additions & 2 deletions packages/create-next-app/templates/index.ts
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-76002254-20240724",
"react-dom": "19.0.0-rc-76002254-20240724",
react: "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0",
next: version,
},
devDependencies: {},
Expand Down
4 changes: 2 additions & 2 deletions packages/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,8 @@
"@opentelemetry/api": "^1.1.0",
"@playwright/test": "^1.41.2",
"babel-plugin-react-compiler": "*",
"react": "19.0.0-rc-76002254-20240724",
"react-dom": "19.0.0-rc-76002254-20240724",
"react": "19.0.0-rc.0",
"react-dom": "19.0.0-rc.0",
"sass": "^1.3.0"
},
"peerDependenciesMeta": {
Expand Down
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([
'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.",
'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.",
])

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

0 comments on commit c039891

Please sign in to comment.