turbopack...

Author: BYK

packages/nextjs/src/client/index.ts

@@ -43,6 +43,7 @@ const globalWithInjectedValues = GLOBAL_OBJ as typeof GLOBAL_OBJ & {
   _sentryBasePath?: string;
   _sentryRelease?: string;
   _experimentalThirdPartyOriginStackFrames?: string;
+  _sentrySpotlight?: string;
 };
 
 // Treeshakable guard to remove all code related to tracing
@@ -143,9 +144,10 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
   );
 
   // Auto-enable Spotlight from NEXT_PUBLIC_SENTRY_SPOTLIGHT env var
-  // The value is injected at build time via DefinePlugin in webpack.ts
-  // We use DefinePlugin because Next.js doesn't replace process.env.* in node_modules code
-  const spotlightEnvValue = process.env._sentrySpotlight;
+  // The value is injected at build time:
+  // - Webpack: via DefinePlugin which replaces process.env._sentrySpotlight
+  // - Turbopack: via valueInjectionLoader which sets globalThis._sentrySpotlight
+  const spotlightEnvValue = process.env._sentrySpotlight || globalWithInjectedValues._sentrySpotlight;
   if (spotlightEnvValue !== undefined && options.spotlight === undefined) {
     const boolValue = envToBool(spotlightEnvValue, { strict: true });
     const spotlightConfig = boolValue !== null ? boolValue : spotlightEnvValue;

packages/nextjs/src/config/turbopack/constructTurbopackConfig.ts

@@ -18,11 +18,13 @@ export function constructTurbopackConfig({
   userSentryOptions,
   routeManifest,
   nextJsVersion,
+  spotlightConfig,
 }: {
   userNextConfig: NextConfigObject;
   userSentryOptions?: SentryBuildOptions;
   routeManifest?: RouteManifest;
   nextJsVersion?: string;
+  spotlightConfig?: string;
 }): TurbopackOptions {
   // If sourcemaps are disabled, we don't need to enable native debug ids as this will add build time.
   const shouldEnableNativeDebugIds =
@@ -45,6 +47,7 @@ export function constructTurbopackConfig({
     routeManifest,
     nextJsVersion,
     tunnelPath,
+    spotlightConfig,
   });
 
   for (const { matcher, rule } of valueInjectionRules) {

packages/nextjs/src/config/turbopack/generateValueInjectionRules.ts

@@ -9,10 +9,12 @@ export function generateValueInjectionRules({
   routeManifest,
   nextJsVersion,
   tunnelPath,
+  spotlightConfig,
 }: {
   routeManifest?: RouteManifest;
   nextJsVersion?: string;
   tunnelPath?: string;
+  spotlightConfig?: string;
 }): TurbopackMatcherWithRule[] {
   const rules: TurbopackMatcherWithRule[] = [];
   const isomorphicValues: Record<string, JSONValue> = {};
@@ -33,6 +35,11 @@ export function generateValueInjectionRules({
     isomorphicValues._sentryRewritesTunnelPath = tunnelPath;
   }
 
+  // Inject Spotlight config for client (Spotlight is a client-side feature)
+  if (spotlightConfig) {
+    clientValues._sentrySpotlight = spotlightConfig;
+  }
+
   if (Object.keys(isomorphicValues).length > 0) {
     clientValues = { ...clientValues, ...isomorphicValues };
     serverValues = { ...serverValues, ...isomorphicValues };

packages/nextjs/src/config/withSentryConfig.ts

@@ -351,6 +351,10 @@ function getFinalConfigObject(
     );
   }
 
+  // Calculate spotlight config once for both webpack and turbopack
+  const spotlightConfig =
+    incomingUserNextConfigObject.env?.NEXT_PUBLIC_SENTRY_SPOTLIGHT ?? process.env.NEXT_PUBLIC_SENTRY_SPOTLIGHT;
+
   let turboPackConfig: TurbopackOptions | undefined;
 
   if (isTurbopack) {
@@ -359,6 +363,7 @@ function getFinalConfigObject(
       userSentryOptions,
       routeManifest,
       nextJsVersion,
+      spotlightConfig,
     });
   }
 
@@ -462,10 +467,7 @@ function getFinalConfigObject(
             routeManifest,
             nextJsVersion,
             useRunAfterProductionCompileHook: shouldUseRunAfterProductionCompileHook,
-            // Spotlight config from NEXT_PUBLIC_SENTRY_SPOTLIGHT env var
-            spotlightConfig:
-              incomingUserNextConfigObject.env?.NEXT_PUBLIC_SENTRY_SPOTLIGHT ??
-              process.env.NEXT_PUBLIC_SENTRY_SPOTLIGHT,
+            spotlightConfig,
           }),
         }
       : {}),