import types from wrappers rather than withSentry specifically

Author: lobsterkatie

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

@@ -12,9 +12,9 @@ import * as origModule from '__RESOURCE_PATH__';
 import * as Sentry from '@sentry/nextjs';
 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 '../wrappers/withSentry';
+// We import this from `wrappers` rather than directly from `next` because our version can work simultaneously with
+// multiple versions of next. See note in `wrappers/withSentry` for more.
+import type { NextApiHandler } from '../wrappers';
 
 type NextApiModule = {
   default: NextApiHandler;

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

@@ -1,3 +1,5 @@
+export type { AugmentedNextApiResponse, NextApiHandler, WrappedNextApiHandler } from './withSentry';
+
 export { withSentryGetStaticProps } from './withSentryGetStaticProps';
 export { withSentryServerSideGetInitialProps } from './withSentryServerSideGetInitialProps';
 export { withSentryServerSideAppGetInitialProps } from './withSentryServerSideAppGetInitialProps';

packages/nextjs/test/config/withSentry.test.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/config/wrappers/withSentry';
+import { AugmentedNextApiResponse, withSentry, WrappedNextApiHandler } from '../../src/config/wrappers';
 
 const FLUSH_DURATION = 200;