Upgrade to React v18.2 (#1571)

* Upgrade to React 18.2 * Remove error catching for Suspense bug * Remove unnecessary Suspense boundaries * Add changeset * Revert bad types update * Fix types version again * hello darkness my old friend
Shopify · Jun 15, 2022 · accdc78 · accdc78
1 parent 2f75247
commit accdc78
Show file tree

Hide file tree

Showing 17 changed files with 46 additions and 18,785 deletions.
diff --git a/.changeset/silver-buses-warn.md b/.changeset/silver-buses-warn.md
@@ -0,0 +1,5 @@
+---
+'@shopify/hydrogen': patch
+---
+
+Upgrade Hydrogen to React v18.2. To update your app, run `yarn add @shopify/hydrogen@latest react@latest react-dom@latest`.
diff --git a/examples/api-routes/package.json b/examples/api-routes/package.json
@@ -20,8 +20,8 @@
     "@shopify/hydrogen": "latest",
     "body-parser": "^1.20.0",
     "compression": "^1.7.4",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "serve-static": "^1.14.1"
   }
 }
diff --git a/examples/css-modules/package.json b/examples/css-modules/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@shopify/hydrogen": "latest",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   }
 }
diff --git a/examples/google-analytics/package.json b/examples/google-analytics/package.json
@@ -20,8 +20,8 @@
     "@shopify/hydrogen": "latest",
     "body-parser": "^1.20.0",
     "compression": "^1.7.4",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "serve-static": "^1.14.1"
   }
 }
diff --git a/examples/meta-pixel/package.json b/examples/meta-pixel/package.json
@@ -20,8 +20,8 @@
     "@shopify/hydrogen": "latest",
     "body-parser": "^1.20.0",
     "compression": "^1.7.4",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "serve-static": "^1.14.1"
   }
 }
diff --git a/packages/hydrogen-ui/package.json b/packages/hydrogen-ui/package.json
@@ -69,8 +69,8 @@
     "vitest": "^0.9.4"
   },
   "peerDependencies": {
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "dependencies": {
     "type-fest": "^2.12.2"

diff --git a/packages/hydrogen/package.json b/packages/hydrogen/package.json
@@ -91,8 +91,8 @@
   "peerDependencies": {
     "body-parser": "^1.20.0",
     "compression": "^1.7.4",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "serve-static": "^1.14.1",
     "vite": "^2.9.0"
   },

diff --git a/packages/hydrogen/src/entry-client.tsx b/packages/hydrogen/src/entry-client.tsx
@@ -128,8 +128,6 @@ const renderHydrogen: ClientHandler = async (ClientWrapper) => {
     // Default to StrictMode on, unless explicitly turned off
     config.strictMode !== false ? StrictMode : Fragment;
 
-  let hasCaughtError = false;
-
   hydrateRoot(
     root,
     <>
@@ -140,22 +138,7 @@ const renderHydrogen: ClientHandler = async (ClientWrapper) => {
           </Suspense>
         </ErrorBoundary>
       </RootComponent>
-    </>,
-    {
-      onRecoverableError(e: any) {
-        if (__HYDROGEN_DEV__ && !hasCaughtError) {
-          hasCaughtError = true;
-          console.log(
-            `React encountered an error while attempting to hydrate the application. ` +
-              `This is likely due to a bug in React's Suspense behavior related to experimental server components, ` +
-              `and it is safe to ignore this error.\n` +
-              `Visit this issue to learn more: https://github.com/Shopify/hydrogen/issues/920.\n\n` +
-              `The original error is printed below:`
-          );
-          console.log(e);
-        }
-      },
-    }
+    </>
   );
 };
 

diff --git a/packages/playground/async-config/package.json b/packages/playground/async-config/package.json
@@ -19,7 +19,7 @@
     "@cloudflare/kv-asset-handler": "*",
     "@shopify/hydrogen": "^0.24.0",
     "miniflare": "^1.3.3",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   }
 }
diff --git a/packages/playground/server-components/package.json b/packages/playground/server-components/package.json
@@ -19,7 +19,7 @@
     "@cloudflare/kv-asset-handler": "*",
     "@shopify/hydrogen": "^0.24.0",
     "miniflare": "^1.3.3",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0"
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   }
 }