fix value injection cry

Author: chargome

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

@@ -24,41 +24,48 @@ export function constructTurbopackConfig({
     ...userNextConfig.turbopack,
   };
 
-  if (routeManifest) {
-    newConfig.rules = safelyAddTurbopackRule(newConfig.rules, {
-      matcher: '**/instrumentation-client.*',
-      rule: {
-        loaders: [
-          {
-            loader: path.resolve(__dirname, '..', 'loaders', 'valueInjectionLoader.js'),
-            options: {
-              values: {
-                _sentryRouteManifest: JSON.stringify(routeManifest),
-              },
-            },
+  const isomorphicValues = {
+    _sentryNextJsVersion: nextJsVersion || '',
+  };
+
+  const clientValues = {
+    ...isomorphicValues,
+    _sentryRouteManifest: JSON.stringify(routeManifest),
+  };
+
+  const serverValues = {
+    ...isomorphicValues,
+  };
+
+  // Client value injection
+  newConfig.rules = safelyAddTurbopackRule(newConfig.rules, {
+    matcher: '**/instrumentation-client.*',
+    rule: {
+      loaders: [
+        {
+          loader: path.resolve(__dirname, '..', 'loaders', 'valueInjectionLoader.js'),
+          options: {
+            ...clientValues,
           },
-        ],
-      },
-    });
-  }
+        },
+      ],
+    },
+  });
 
-  if (nextJsVersion) {
-    newConfig.rules = safelyAddTurbopackRule(newConfig.rules, {
-      matcher: '**/instrumentation.*',
-      rule: {
-        loaders: [
-          {
-            loader: path.resolve(__dirname, '..', 'loaders', 'valueInjectionLoader.js'),
-            options: {
-              values: {
-                _sentryNextJsVersion: nextJsVersion,
-              },
-            },
+  // Server value injection
+  newConfig.rules = safelyAddTurbopackRule(newConfig.rules, {
+    matcher: '**/instrumentation.*',
+    rule: {
+      loaders: [
+        {
+          loader: path.resolve(__dirname, '..', 'loaders', 'valueInjectionLoader.js'),
+          options: {
+            ...serverValues,
           },
-        ],
-      },
-    });
-  }
+        },
+      ],
+    },
+  });
 
   return newConfig;
 }

packages/nextjs/src/config/webpack.ts

@@ -728,14 +728,14 @@ function addValueInjectionLoader({
     // Only inject if release creation is not explicitly disabled (to maintain build determinism)
     SENTRY_RELEASE: releaseToInject && !buildContext.dev ? { id: releaseToInject } : undefined,
     _sentryBasePath: buildContext.dev ? userNextConfig.basePath : undefined,
+    _sentryNextJsVersion: nextJsVersion,
   };
 
   const serverValues = {
     ...isomorphicValues,
     // Make sure that if we have a windows path, the backslashes are interpreted as such (rather than as escape
     // characters)
     _sentryRewriteFramesDistDir: userNextConfig.distDir?.replace(/\\/g, '\\\\') || '.next',
-    _sentryNextJsVersion: nextJsVersion || '0.0.0',
   };
 
   const clientValues = {