Ensure thrown errors that are handled by React are associated with th…

…e original component not Next.js error boundaries
vercel · Jul 18, 2024 · 7df7b6b · 7df7b6b
1 parent ecd2be6
commit 7df7b6b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/next/src/client/components/not-found-boundary.tsx b/packages/next/src/client/components/not-found-boundary.tsx
@@ -66,8 +66,9 @@ class NotFoundErrorBoundary extends React.Component<
         notFoundTriggered: true,
       }
     }
-    // Re-throw if error is not for 404
-    throw error
+    return {
+      notFoundTriggered: false,
+    }
   }
 
   static getDerivedStateFromProps(

diff --git a/packages/next/src/client/components/redirect-boundary.tsx b/packages/next/src/client/components/redirect-boundary.tsx
@@ -54,8 +54,10 @@ export class RedirectErrorBoundary extends React.Component<
       const redirectType = getRedirectTypeFromError(error)
       return { redirect: url, redirectType }
     }
-    // Re-throw if error is not for redirect
-    throw error
+    return {
+      redirect: null,
+      redirectType: null,
+    }
   }
 
   // Explicit type is needed to avoid the generated `.d.ts` having a wide return type that could be specific the the `@types/react` version.