From 6286c9724cd022cd0db4442ca49c2cc1831d0e83 Mon Sep 17 00:00:00 2001
From: Luca Forstner <luca.forstner@sentry.io>
Date: Fri, 6 Dec 2024 10:35:28 +0000
Subject: [PATCH] feat(nextjs)!: Make `withSentryConfig()` always return an
 async function

---
 packages/nextjs/src/config/types.ts           |  2 +-
 .../nextjs/src/config/withSentryConfig.ts     | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/nextjs/src/config/types.ts b/packages/nextjs/src/config/types.ts
index 44dfb544654f..ddf1460ca75e 100644
--- a/packages/nextjs/src/config/types.ts
+++ b/packages/nextjs/src/config/types.ts
@@ -448,7 +448,7 @@ export type SentryBuildOptions = {
 export type NextConfigFunction = (
   phase: string,
   defaults: { defaultConfig: NextConfigObject },
-) => NextConfigObject | PromiseLike<NextConfigObject>;
+) => Promise<NextConfigObject>;
 
 /**
  * Webpack config
diff --git a/packages/nextjs/src/config/withSentryConfig.ts b/packages/nextjs/src/config/withSentryConfig.ts
index 4c815498b1db..fa8c165ef213 100644
--- a/packages/nextjs/src/config/withSentryConfig.ts
+++ b/packages/nextjs/src/config/withSentryConfig.ts
@@ -20,11 +20,14 @@ let showedExportModeTunnelWarning = false;
  * @param sentryBuildOptions Additional options to configure instrumentation and
  * @returns The modified config to be exported
  */
-// TODO(v9): Always return an async function here to allow us to do async things like grabbing a deterministic build ID.
-export function withSentryConfig<C>(nextConfig?: C, sentryBuildOptions: SentryBuildOptions = {}): C {
+export function withSentryConfig(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  nextConfig?: any,
+  sentryBuildOptions: SentryBuildOptions = {},
+): NextConfigFunction {
   const castNextConfig = (nextConfig as NextConfig) || {};
-  if (typeof castNextConfig === 'function') {
-    return function (this: unknown, ...webpackConfigFunctionArgs: unknown[]): ReturnType<NextConfigFunction> {
+  return async function (this: unknown, ...webpackConfigFunctionArgs: unknown[]): ReturnType<NextConfigFunction> {
+    if (typeof castNextConfig === 'function') {
       const maybePromiseNextConfig: ReturnType<typeof castNextConfig> = castNextConfig.apply(
         this,
         webpackConfigFunctionArgs,
@@ -37,10 +40,10 @@ export function withSentryConfig<C>(nextConfig?: C, sentryBuildOptions: SentryBu
       }
 
       return getFinalConfigObject(maybePromiseNextConfig, sentryBuildOptions);
-    } as C;
-  } else {
-    return getFinalConfigObject(castNextConfig, sentryBuildOptions) as C;
-  }
+    } else {
+      return getFinalConfigObject(castNextConfig, sentryBuildOptions);
+    }
+  };
 }
 
 // Modify the materialized object form of the user's next config by deleting the `sentry` property and wrapping the