Ensure thrown errors that are handled by React are associated with the original component not Next.js error boundaries

Author: eps1lon

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(

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.