dot dot dot

Author: BYK

packages/nextjs/src/client/index.ts

@@ -43,7 +43,6 @@ 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
@@ -144,9 +143,9 @@ function getDefaultIntegrations(options: BrowserOptions): Integration[] {
   );
 
   // Auto-enable Spotlight from NEXT_PUBLIC_SENTRY_SPOTLIGHT env var
-  // The value is injected at build time via the valueInjectionLoader because
-  // our SDK code in node_modules is not processed by Next.js DefinePlugin
-  const spotlightEnvValue = globalWithInjectedValues._sentrySpotlight;
+  // The value is injected at build time via buildTimeVariables in withSentryConfig
+  // following the same pattern as _sentryRelease
+  const spotlightEnvValue = process.env._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

@@ -45,7 +45,6 @@ export function constructTurbopackConfig({
     routeManifest,
     nextJsVersion,
     tunnelPath,
-    userNextConfig,
   });
 
   for (const { matcher, rule } of valueInjectionRules) {

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

@@ -1,6 +1,6 @@
 import * as path from 'path';
 import type { RouteManifest } from '../manifest/types';
-import type { JSONValue, NextConfigObject, TurbopackMatcherWithRule } from '../types';
+import type { JSONValue, TurbopackMatcherWithRule } from '../types';
 
 /**
  * Generate the value injection rules for client and server in turbopack config.
@@ -9,12 +9,10 @@ export function generateValueInjectionRules({
   routeManifest,
   nextJsVersion,
   tunnelPath,
-  userNextConfig,
 }: {
   routeManifest?: RouteManifest;
   nextJsVersion?: string;
   tunnelPath?: string;
-  userNextConfig?: NextConfigObject;
 }): TurbopackMatcherWithRule[] {
   const rules: TurbopackMatcherWithRule[] = [];
   const isomorphicValues: Record<string, JSONValue> = {};
@@ -30,14 +28,6 @@ export function generateValueInjectionRules({
     clientValues._sentryRouteManifest = JSON.stringify(routeManifest);
   }
 
-  // Inject Spotlight config from NEXT_PUBLIC_SENTRY_SPOTLIGHT
-  // Turbopack is only used in dev mode, so we always inject this
-  // We check both userNextConfig.env (from next.config.js) and process.env (from .env files or shell)
-  const spotlightValue = userNextConfig?.env?.NEXT_PUBLIC_SENTRY_SPOTLIGHT ?? process.env.NEXT_PUBLIC_SENTRY_SPOTLIGHT;
-  if (spotlightValue) {
-    clientValues._sentrySpotlight = spotlightValue;
-  }
-
   // Inject tunnel route path for both client and server
   if (tunnelPath) {
     isomorphicValues._sentryRewritesTunnelPath = tunnelPath;

packages/nextjs/src/config/webpack.ts

@@ -763,12 +763,6 @@ function addValueInjectionLoader({
       ? 'true'
       : undefined,
     _sentryRouteManifest: JSON.stringify(routeManifest),
-    // Inject Spotlight config from NEXT_PUBLIC_SENTRY_SPOTLIGHT (only in dev mode)
-    // This is needed because our SDK code in node_modules is not processed by Next.js DefinePlugin
-    // We check both userNextConfig.env (from next.config.js) and process.env (from .env files or shell)
-    _sentrySpotlight: buildContext.dev
-      ? (userNextConfig.env?.NEXT_PUBLIC_SENTRY_SPOTLIGHT ?? process.env.NEXT_PUBLIC_SENTRY_SPOTLIGHT)
-      : undefined,
   };
 
   if (buildContext.isServer) {

packages/nextjs/src/config/withSentryConfig.ts

@@ -520,6 +520,13 @@ function setUpBuildTimeVariables(
     buildTimeVariables._sentryRelease = releaseName;
   }
 
+  // Inject Spotlight config from NEXT_PUBLIC_SENTRY_SPOTLIGHT env var
+  // We check both userNextConfig.env (from next.config.js) and process.env (from .env files or shell)
+  const spotlightValue = userNextConfig.env?.NEXT_PUBLIC_SENTRY_SPOTLIGHT ?? process.env.NEXT_PUBLIC_SENTRY_SPOTLIGHT;
+  if (spotlightValue) {
+    buildTimeVariables._sentrySpotlight = spotlightValue;
+  }
+
   if (typeof userNextConfig.env === 'object') {
     userNextConfig.env = { ...buildTimeVariables, ...userNextConfig.env };
   } else if (userNextConfig.env === undefined) {