merge stuff

Author: chargome

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

@@ -16,17 +16,17 @@ import type {
  */
 export function constructTurbopackConfig({
   userNextConfig,
-  manifest,
+  routeManifest,
 }: {
   userNextConfig: NextConfigObject;
   userSentryOptions: SentryBuildOptions;
-  manifest?: RouteManifest;
+  routeManifest?: RouteManifest;
 }): TurbopackOptions {
   const newConfig: TurbopackOptions = {
     ...userNextConfig.turbopack,
   };
 
-  if (manifest) {
+  if (routeManifest) {
     newConfig.rules = safelyAddTurbopackRule(newConfig.rules, {
       matcher: '**/instrumentation-client.*',
       rule: {
@@ -35,7 +35,7 @@ export function constructTurbopackConfig({
             loader: path.resolve(__dirname, '../loaders/valueInjectionLoader.js'),
             options: {
               values: {
-                _sentryRouteManifest: JSON.stringify(manifest),
+                _sentryRouteManifest: JSON.stringify(routeManifest),
               },
             },
           },

packages/nextjs/src/config/withSentryConfig.ts

@@ -320,7 +320,7 @@ function getFinalConfigObject(
         ? constructTurbopackConfig({
             userNextConfig: incomingUserNextConfigObject,
             userSentryOptions,
-            manifest: routeManifest,
+            routeManifest,
           })
         : undefined,
   };

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

@@ -48,7 +48,7 @@ describe('constructTurbopackConfig', () => {
       const result = constructTurbopackConfig({
         userNextConfig,
         userSentryOptions: mockSentryOptions,
-        manifest: mockRouteManifest,
+        routeManifest: mockRouteManifest,
       });
 
       expect(result).toEqual({
@@ -76,10 +76,10 @@ describe('constructTurbopackConfig', () => {
       constructTurbopackConfig({
         userNextConfig,
         userSentryOptions: mockSentryOptions,
-        manifest: mockRouteManifest,
+        routeManifest: mockRouteManifest,
       });
 
-      expect(pathResolveSpy).toHaveBeenCalledWith(expect.any(String), 'loaders/valueInjectionLoader.js');
+      expect(pathResolveSpy).toHaveBeenCalledWith(expect.any(String), '../loaders/valueInjectionLoader.js');
     });
   });
 
@@ -126,7 +126,7 @@ describe('constructTurbopackConfig', () => {
       const result = constructTurbopackConfig({
         userNextConfig,
         userSentryOptions: mockSentryOptions,
-        manifest: mockRouteManifest,
+        routeManifest: mockRouteManifest,
       });
 
       expect(result).toEqual({
@@ -172,7 +172,7 @@ describe('constructTurbopackConfig', () => {
       const result = constructTurbopackConfig({
         userNextConfig,
         userSentryOptions: mockSentryOptions,
-        manifest: mockRouteManifest,
+        routeManifest: mockRouteManifest,
       });
 
       expect(result).toEqual({
@@ -191,7 +191,7 @@ describe('constructTurbopackConfig', () => {
       const result = constructTurbopackConfig({
         userNextConfig,
         userSentryOptions: mockSentryOptions,
-        manifest: emptyManifest,
+        routeManifest: emptyManifest,
       });
 
       expect(result).toEqual({
@@ -224,7 +224,7 @@ describe('constructTurbopackConfig', () => {
       const result = constructTurbopackConfig({
         userNextConfig,
         userSentryOptions: mockSentryOptions,
-        manifest: complexManifest,
+        routeManifest: complexManifest,
       });
 
       expect(result).toEqual({