Revert React 19 upgrade (#10482 and #10491) (#10495)

redwoodjs · Apr 22, 2024 · d78968c · d78968c
1 parent 9e4475a
commit d78968c
Show file tree

Hide file tree

Showing 39 changed files with 90 additions and 454 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -237,10 +237,6 @@ jobs:
 
       - name: Run `rw build --no-prerender`
         run: |
-          yarn why @apollo/client
-          tree .yarn
-          tree node_modules/@apollo/client/react/hooks/internal
-          cat node_modules/@apollo/client/react/hooks/internal/useRenderGuard.js
           yarn rw build --no-prerender
         working-directory: ${{ steps.set-up-test-project.outputs.test-project-path }}
 

diff --git a/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch
diff --git a/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch b/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch
diff --git a/__fixtures__/fragment-test-project/web/package.json b/__fixtures__/fragment-test-project/web/package.json
@@ -16,8 +16,8 @@
     "@redwoodjs/router": "7.0.0",
     "@redwoodjs/web": "7.0.0",
     "humanize-string": "2.1.0",
-    "react": "19.0.0-canary-36e62c603-20240418",
-    "react-dom": "19.0.0-canary-36e62c603-20240418"
+    "react": "18.3.0-canary-a870b2d54-20240314",
+    "react-dom": "18.3.0-canary-a870b2d54-20240314"
   },
   "devDependencies": {
     "@redwoodjs/vite": "7.0.0",

diff --git a/__fixtures__/test-project-rsa/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/__fixtures__/test-project-rsa/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch
diff --git a/__fixtures__/test-project-rsa/web/package.json b/__fixtures__/test-project-rsa/web/package.json
@@ -15,8 +15,8 @@
     "@redwoodjs/forms": "8.0.0-canary.144",
     "@redwoodjs/router": "8.0.0-canary.144",
     "@redwoodjs/web": "8.0.0-canary.144",
-    "react": "19.0.0-canary-36e62c603-20240418",
-    "react-dom": "19.0.0-canary-36e62c603-20240418"
+    "react": "18.3.0-canary-a870b2d54-20240314",
+    "react-dom": "18.3.0-canary-a870b2d54-20240314"
   },
   "devDependencies": {
     "@redwoodjs/vite": "8.0.0-canary.144",

diff --git a/...t-rsc-external-packages-and-cells/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/...t-rsc-external-packages-and-cells/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch
diff --git a/__fixtures__/test-project-rsc-external-packages-and-cells/web/package.json b/__fixtures__/test-project-rsc-external-packages-and-cells/web/package.json
@@ -18,8 +18,8 @@
     "@redwoodjs/web": "7.0.0-canary.1011",
     "@tobbe.dev/rsc-test": "0.0.5",
     "client-only": "0.0.1",
-    "react": "19.0.0-canary-36e62c603-20240418",
-    "react-dom": "19.0.0-canary-36e62c603-20240418"
+    "react": "18.3.0-canary-a870b2d54-20240314",
+    "react-dom": "18.3.0-canary-a870b2d54-20240314"
   },
   "devDependencies": {
     "@redwoodjs/vite": "7.0.0-canary.1011",

diff --git a/__fixtures__/test-project/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch b/__fixtures__/test-project/.yarn/patches/@apollo-client-npm-3.9.9-15c2e13518.patch
diff --git a/...xtures__/test-project/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch b/...xtures__/test-project/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch
diff --git a/__fixtures__/test-project/package.json b/__fixtures__/test-project/package.json
@@ -20,8 +20,5 @@
   "prisma": {
     "seed": "yarn rw exec seed"
   },
-  "packageManager": "yarn@4.1.1",
-  "resolutions": {
-    "@storybook/react-dom-shim@npm:7.6.17": "patch:@storybook/react-dom-shim@npm%3A7.6.17#~/.yarn/patches/@storybook-react-dom-shim-npm-7.6.17-789bc900f0.patch"
-  }
+  "packageManager": "yarn@4.1.1"
 }