Patch up rebase

Author: lforst

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

@@ -27,7 +27,7 @@ const origGetStaticProps = userPageModule.getStaticProps;
 const origGetServerSideProps = userPageModule.getServerSideProps;
 
 if (typeof origGetInitialProps === 'function') {
-  pageComponent.getInitialProps = Sentry.withSentryGetInitialProps(
+  pageComponent.getInitialProps = Sentry.withSentryServerSideGetInitialProps(
     origGetInitialProps,
     '__ROUTE__',
   ) as NextPageComponent['getInitialProps'];

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

@@ -1,3 +1,3 @@
 export { withSentryGetStaticProps } from './withSentryGetStaticProps';
-export { withSentryGetInitialProps } from './withSentryGetInitialProps';
 export { withSentryGetServerSideProps } from './withSentryGetServerSideProps';
+export { withSentryServerSideGetInitialProps } from './withSentryServerSideGetInitialProps';

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

@@ -1,3 +1,4 @@
+import { hasTracingEnabled } from '@sentry/tracing';
 import { GetServerSideProps } from 'next';
 
 import { isBuild } from '../../utils/isBuild';

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

@@ -125,7 +125,11 @@ function addServerIntegrations(options: NextjsOptions): void {
 export type { SentryWebpackPluginOptions } from './config/types';
 export { withSentryConfig } from './config';
 export { isBuild } from './utils/isBuild';
-export { withSentryGetServerSideProps, withSentryGetStaticProps, withSentryGetInitialProps } from './config/wrappers';
+export {
+  withSentryGetServerSideProps,
+  withSentryGetStaticProps,
+  withSentryServerSideGetInitialProps,
+} 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