Explicitly capture getServerSideProps exceptions

frontend/helpers/next-helpers.ts

@@ -52,17 +52,10 @@ export const withNoindexDevDomains: GetServerSidePropsMiddleware = (next) => {
 };
 
 export const withSentry: GetServerSidePropsMiddleware = (next) => {
-   return (context) => {
-      return new Promise((resolve, reject) => {
-         next(context).then(resolve, (e) => {
-            Sentry.captureException(e);
-            console.log('Reporting exception to sentry');
-            console.log(e);
-            setTimeout(() => {
-               console.log('delayed for a bit, now carrying on');
-               reject(e);
-            }, 1000);
-         });
-      });
-   };
+   process.on('unhandledRejection', (reason) => {
+      console.log('[Debug] Reporting exception to sentry', reason);
+      Sentry.captureException(reason);
+      console.log('[Debug] Reported to Sentry');
+   });
+   return next;
 };

frontend/pages/myPage.tsx

@@ -1,18 +1,19 @@
-import { wrapGetServerSidePropsWithSentry } from '@sentry/nextjs';
+import { withSentry } from '@helpers/next-helpers';
 import { GetServerSideProps } from 'next';
 
 const MyComponent = () => {
    return <h1>Hello World!</h1>;
 };
 
-export const getServerSideProps: GetServerSideProps =
-   wrapGetServerSidePropsWithSentry(async (context) => {
+export const getServerSideProps: GetServerSideProps = withSentry(
+   async (context) => {
       if (context.query.myParam === 'two') {
          // only throw conditionally so that this page actually builds
          Promise.reject(new Error("We don't like page two"));
       }
 
       return { props: {} };
-   }, '/myPage');
+   }
+);
 
 export default MyComponent;