move withSentry into wrappers directory

Author: lobsterkatie

packages/nextjs/src/config/templates/apiProxyLoaderTemplate.ts

@@ -14,7 +14,7 @@ import type { PageConfig } from 'next';
 
 // We import this from `withSentry` rather than directly from `next` because our version can work simultaneously with
 // multiple versions of next. See note in `withSentry` for more.
-import type { NextApiHandler } from '../../utils/withSentry';
+import type { NextApiHandler } from '../wrappers/withSentry';
 
 type NextApiModule = {
   default: NextApiHandler;

packages/nextjs/src/config/wrappers/index.ts

@@ -5,3 +5,4 @@ export { withSentryServerSideDocumentGetInitialProps } from './withSentryServerS
 export { withSentryServerSideErrorGetInitialProps } from './withSentryServerSideErrorGetInitialProps';
 export { withSentryGetServerSideProps } from './withSentryGetServerSideProps';
 export { withSentryAPI } from './withSentryAPI';
+export { withSentry } from './withSentry';

packages/nextjs/src/utils/withSentry.ts renamed to packages/nextjs/src/config/wrappers/withSentry.ts

@@ -1,8 +1,8 @@
 import { formatAsCode, nextLogger } from '../../utils/nextLogger';
 // We import these types from `withSentry` rather than directly from `next` because our version can work simultaneously
 // with multiple versions of next. See note in `withSentry` for more.
-import type { NextApiHandler, WrappedNextApiHandler } from '../../utils/withSentry';
-import { withSentry } from '../../utils/withSentry';
+import type { NextApiHandler, WrappedNextApiHandler } from './withSentry';
+import { withSentry } from './withSentry';
 
 /**
  * Wrap the given API route handler for tracing and error capturing. Thin wrapper around `withSentry`, which only

packages/nextjs/src/config/wrappers/withSentryAPI.ts

@@ -135,8 +135,8 @@ export {
   withSentryServerSideDocumentGetInitialProps,
   withSentryServerSideErrorGetInitialProps,
   withSentryAPI,
+  withSentry,
 } from './config/wrappers';
-export { withSentry } from './utils/withSentry';
 
 // Wrap various server methods to enable error monitoring and tracing. (Note: This only happens for non-Vercel
 // deployments, because the current method of doing the wrapping a) crashes Next 12 apps deployed to Vercel and

packages/nextjs/src/index.server.ts

@@ -4,7 +4,7 @@ import { Client, ClientOptions } from '@sentry/types';
 import * as utils from '@sentry/utils';
 import { NextApiHandler, NextApiRequest, NextApiResponse } from 'next';
 
-import { AugmentedNextApiResponse, withSentry, WrappedNextApiHandler } from '../../src/utils/withSentry';
+import { AugmentedNextApiResponse, withSentry, WrappedNextApiHandler } from '../../src/config/wrappers/withSentry';
 
 const FLUSH_DURATION = 200;