Merge branch 'develop' into onur/fastify-snake-case-span-op

onurtemizkan · web-flow · commit 1abf87c47526 · 2026-01-08T20:27:33.000Z
diff --git a/dev-packages/e2e-tests/test-applications/node-express-incorrect-instrumentation/package.json b/dev-packages/e2e-tests/test-applications/node-express-incorrect-instrumentation/package.json
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "@sentry/node": "latest || *",
-    "@trpc/server": "10.45.3",
-    "@trpc/client": "10.45.2",
+    "@trpc/server": "10.45.4",
+    "@trpc/client": "10.45.4",
     "@types/express": "4.17.17",
     "@types/node": "^18.19.1",
     "express": "4.20.0",
diff --git a/dev-packages/e2e-tests/test-applications/node-express-v5/package.json b/dev-packages/e2e-tests/test-applications/node-express-v5/package.json
@@ -13,8 +13,8 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.10.2",
     "@sentry/node": "latest || *",
-    "@trpc/server": "10.45.3",
-    "@trpc/client": "10.45.2",
+    "@trpc/server": "10.45.4",
+    "@trpc/client": "10.45.4",
     "@types/express": "^4.17.21",
     "@types/node": "^18.19.1",
     "express": "^5.1.0",
diff --git a/dev-packages/e2e-tests/test-applications/node-express/package.json b/dev-packages/e2e-tests/test-applications/node-express/package.json
@@ -13,8 +13,8 @@
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.10.2",
     "@sentry/node": "latest || *",
-    "@trpc/server": "10.45.2",
-    "@trpc/client": "10.45.2",
+    "@trpc/server": "10.45.4",
+    "@trpc/client": "10.45.4",
     "@types/express": "^4.17.21",
     "@types/node": "^18.19.1",
     "express": "^4.21.2",
diff --git a/dev-packages/e2e-tests/test-applications/nuxt-4/nuxt-start-dev-server.bash b/dev-packages/e2e-tests/test-applications/nuxt-4/nuxt-start-dev-server.bash
@@ -43,7 +43,4 @@ else
     echo "Port $TEMP_PORT released successfully"
 fi
 
-echo "Starting nuxt dev with Sentry server config..."
-
-# 4.  Start the actual dev command which should be used for the tests
-NODE_OPTIONS='--import ./.nuxt/dev/sentry.server.config.mjs' nuxt dev
+echo "Nuxt dev server can now be started with '--import ./.nuxt/dev/sentry.server.config.mjs'"
diff --git a/dev-packages/e2e-tests/test-applications/nuxt-4/package.json b/dev-packages/e2e-tests/test-applications/nuxt-4/package.json
@@ -12,7 +12,7 @@
     "clean": "npx nuxi cleanup",
     "test": "playwright test",
     "test:prod": "TEST_ENV=production playwright test",
-    "test:dev": "TEST_ENV=development playwright test environment",
+    "test:dev": "bash ./nuxt-start-dev-server.bash && TEST_ENV=development playwright test environment",
     "test:build": "pnpm install && pnpm build",
     "test:build-canary": "pnpm add nuxt@npm:nuxt-nightly@latest && pnpm add nitropack@npm:nitropack-nightly@latest && pnpm install --force && pnpm build",
     "test:assert": "pnpm test:prod && pnpm test:dev"
diff --git a/dev-packages/e2e-tests/test-applications/nuxt-4/playwright.config.ts b/dev-packages/e2e-tests/test-applications/nuxt-4/playwright.config.ts
@@ -8,7 +8,7 @@ if (!testEnv) {
 
 const getStartCommand = () => {
   if (testEnv === 'development') {
-    return 'bash ./nuxt-start-dev-server.bash';
+    return "NODE_OPTIONS='--import ./.nuxt/dev/sentry.server.config.mjs' nuxt dev -p 3030";
   }
 
   if (testEnv === 'production') {
diff --git a/dev-packages/e2e-tests/test-applications/solid-tanstack-router/package.json b/dev-packages/e2e-tests/test-applications/solid-tanstack-router/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@sentry/solid": "latest || *",
     "@tailwindcss/vite": "^4.0.6",
-    "@tanstack/solid-router": "1.141.8",
+    "@tanstack/solid-router": "^1.141.8",
     "@tanstack/solid-router-devtools": "^1.132.25",
     "@tanstack/solid-start": "^1.132.25",
     "solid-js": "^1.9.5",
diff --git a/dev-packages/e2e-tests/test-applications/solid-tanstack-router/src/main.tsx b/dev-packages/e2e-tests/test-applications/solid-tanstack-router/src/main.tsx
@@ -39,7 +39,7 @@ const indexRoute = createRoute({
 
 const postsRoute = createRoute({
   getParentRoute: () => rootRoute,
-  path: 'posts/',
+  path: 'posts',
 });
 
 const postIdRoute = createRoute({
diff --git a/dev-packages/e2e-tests/test-applications/tanstack-router/package.json b/dev-packages/e2e-tests/test-applications/tanstack-router/package.json
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@sentry/react": "latest || *",
-    "@tanstack/react-router": "1.64.0",
+    "@tanstack/react-router": "^1.64.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
diff --git a/dev-packages/e2e-tests/test-applications/tanstack-router/src/main.tsx b/dev-packages/e2e-tests/test-applications/tanstack-router/src/main.tsx
@@ -41,7 +41,7 @@ const indexRoute = createRoute({
 
 const postsRoute = createRoute({
   getParentRoute: () => rootRoute,
-  path: 'posts/',
+  path: 'posts',
 });
 
 const postIdRoute = createRoute({
diff --git a/dev-packages/e2e-tests/test-applications/tsx-express/package.json b/dev-packages/e2e-tests/test-applications/tsx-express/package.json
@@ -13,8 +13,8 @@
     "@modelcontextprotocol/sdk": "^1.10.2",
     "@sentry/core": "latest || *",
     "@sentry/node": "latest || *",
-    "@trpc/server": "10.45.2",
-    "@trpc/client": "10.45.2",
+    "@trpc/server": "10.45.4",
+    "@trpc/client": "10.45.4",
     "@types/express": "^4.17.21",
     "@types/node": "^18.19.1",
     "express": "^4.21.2",
diff --git a/dev-packages/e2e-tests/test-applications/vue-tanstack-router/package.json b/dev-packages/e2e-tests/test-applications/vue-tanstack-router/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@sentry/vue": "latest || *",
-    "@tanstack/vue-router": "1.141.8",
+    "@tanstack/vue-router": "^1.141.8",
     "vue": "^3.4.15"
   },
   "devDependencies": {
diff --git a/dev-packages/e2e-tests/test-applications/vue-tanstack-router/src/main.ts b/dev-packages/e2e-tests/test-applications/vue-tanstack-router/src/main.ts
@@ -19,7 +19,7 @@ const indexRoute = createRoute({
 
 const postsRoute = createRoute({
   getParentRoute: () => rootRoute,
-  path: 'posts/',
+  path: 'posts',
 });
 
 const postIdRoute = createRoute({
diff --git a/dev-packages/node-integration-tests/package.json b/dev-packages/node-integration-tests/package.json
@@ -30,7 +30,7 @@
     "@hapi/hapi": "^21.3.10",
     "@hono/node-server": "^1.19.4",
     "@langchain/anthropic": "^0.3.10",
-    "@langchain/core": "^0.3.28",
+    "@langchain/core": "^0.3.80",
     "@langchain/langgraph": "^0.2.32",
     "@nestjs/common": "^11",
     "@nestjs/core": "^11",
diff --git a/packages/core/src/utils/time.ts b/packages/core/src/utils/time.ts
@@ -91,8 +91,7 @@ function getBrowserTimeOrigin(): number | undefined {
     return undefined;
   }
 
-  // TOOD: We should probably set a much tighter threshold here as skew can already happen within just a few minutes.
-  const threshold = 3_600_000; // 1 hour in milliseconds
+  const threshold = 300_000; // 5 minutes in milliseconds
   const performanceNow = performance.now();
   const dateNow = Date.now();
 
diff --git a/packages/core/test/lib/utils/time.test.ts b/packages/core/test/lib/utils/time.test.ts
@@ -7,7 +7,7 @@ async function getFreshPerformanceTimeOrigin() {
   return timeModule.browserPerformanceTimeOrigin();
 }
 
-const RELIABLE_THRESHOLD_MS = 3_600_000;
+const RELIABLE_THRESHOLD_MS = 300_000;
 
 describe('browserPerformanceTimeOrigin', () => {
   it('returns `performance.timeOrigin` if it is available and reliable', async () => {
diff --git a/packages/nextjs/src/config/manifest/createRouteManifest.ts b/packages/nextjs/src/config/manifest/createRouteManifest.ts
@@ -28,9 +28,10 @@ function isRouteGroup(name: string): boolean {
   return name.startsWith('(') && name.endsWith(')');
 }
 
-function normalizeRoutePath(routePath: string): string {
+function normalizeRouteGroupPath(routePath: string): string {
   // Remove route group segments from the path
-  return routePath.replace(/\/\([^)]+\)/g, '');
+  // Using positive lookahead with (?=[^)\/]*\)) to avoid polynomial matching
+  return routePath.replace(/\/\((?=[^)/]*\))[^)/]+\)/g, '');
 }
 
 function getDynamicRouteSegment(name: string): string {
@@ -140,7 +141,7 @@ function scanAppDirectory(dir: string, basePath: string = '', includeRouteGroups
 
     if (pageFile) {
       // Conditionally normalize the path based on includeRouteGroups option
-      const routePath = includeRouteGroups ? basePath || '/' : normalizeRoutePath(basePath || '/');
+      const routePath = includeRouteGroups ? basePath || '/' : normalizeRouteGroupPath(basePath || '/');
       const isDynamic = routePath.includes(':');
 
       // Check if this page has generateStaticParams (ISR/SSG indicator)
diff --git a/packages/nextjs/test/config/manifest/suites/route-groups/app/(api_internal)/api/page.tsx b/packages/nextjs/test/config/manifest/suites/route-groups/app/(api_internal)/api/page.tsx
@@ -0,0 +1 @@
+// API Internal Page
diff --git a/packages/nextjs/test/config/manifest/suites/route-groups/app/(auth-v2)/login/page.tsx b/packages/nextjs/test/config/manifest/suites/route-groups/app/(auth-v2)/login/page.tsx
@@ -0,0 +1 @@
+// Login V2 Page
diff --git a/packages/nextjs/test/config/manifest/suites/route-groups/app/(v2.0.beta)/features/page.tsx b/packages/nextjs/test/config/manifest/suites/route-groups/app/(v2.0.beta)/features/page.tsx
@@ -0,0 +1 @@
+// Features Beta Page
diff --git a/packages/nextjs/test/config/manifest/suites/route-groups/route-groups.test.ts b/packages/nextjs/test/config/manifest/suites/route-groups/route-groups.test.ts
@@ -12,11 +12,14 @@ describe('route-groups', () => {
       expect(manifest).toEqual({
         staticRoutes: [
           { path: '/' },
+          { path: '/api' },
           { path: '/login' },
           { path: '/signup' },
+          { path: '/login' }, // from (auth-v2)
           { path: '/dashboard' },
           { path: '/settings/profile' },
           { path: '/public/about' },
+          { path: '/features' },
         ],
         dynamicRoutes: [
           {
@@ -28,6 +31,8 @@ describe('route-groups', () => {
         ],
         isrRoutes: [],
       });
+      // Verify we have 9 static routes total (including duplicates from special chars)
+      expect(manifest.staticRoutes).toHaveLength(9);
     });
 
     test('should handle dynamic routes within route groups', () => {
@@ -37,6 +42,17 @@ describe('route-groups', () => {
       expect(regex.test('/dashboard/abc')).toBe(true);
       expect(regex.test('/dashboard/123/456')).toBe(false);
     });
+
+    test.each([
+      { routeGroup: '(auth-v2)', strippedPath: '/login', description: 'hyphens' },
+      { routeGroup: '(api_internal)', strippedPath: '/api', description: 'underscores' },
+      { routeGroup: '(v2.0.beta)', strippedPath: '/features', description: 'dots' },
+    ])('should strip route groups with $description', ({ routeGroup, strippedPath }) => {
+      // Verify the stripped path exists
+      expect(manifest.staticRoutes.find(route => route.path === strippedPath)).toBeDefined();
+      // Verify the route group was stripped, not included
+      expect(manifest.staticRoutes.find(route => route.path.includes(routeGroup))).toBeUndefined();
+    });
   });
 
   describe('includeRouteGroups: true', () => {
@@ -46,11 +62,14 @@ describe('route-groups', () => {
       expect(manifest).toEqual({
         staticRoutes: [
           { path: '/' },
+          { path: '/(api_internal)/api' },
           { path: '/(auth)/login' },
           { path: '/(auth)/signup' },
+          { path: '/(auth-v2)/login' },
           { path: '/(dashboard)/dashboard' },
           { path: '/(dashboard)/settings/profile' },
           { path: '/(marketing)/public/about' },
+          { path: '/(v2.0.beta)/features' },
         ],
         dynamicRoutes: [
           {
@@ -62,6 +81,7 @@ describe('route-groups', () => {
         ],
         isrRoutes: [],
       });
+      expect(manifest.staticRoutes).toHaveLength(9);
     });
 
     test('should handle dynamic routes within route groups with proper regex escaping', () => {
@@ -92,5 +112,13 @@ describe('route-groups', () => {
       expect(authSignup).toBeDefined();
       expect(marketingPublic).toBeDefined();
     });
+
+    test.each([
+      { fullPath: '/(auth-v2)/login', description: 'hyphens' },
+      { fullPath: '/(api_internal)/api', description: 'underscores' },
+      { fullPath: '/(v2.0.beta)/features', description: 'dots' },
+    ])('should preserve route groups with $description when includeRouteGroups is true', ({ fullPath }) => {
+      expect(manifest.staticRoutes.find(route => route.path === fullPath)).toBeDefined();
+    });
   });
 });
diff --git a/packages/nuxt/src/server/sdk.ts b/packages/nuxt/src/server/sdk.ts
@@ -27,8 +27,8 @@ import type { SentryNuxtServerOptions } from '../common/types';
 export function init(options: SentryNuxtServerOptions): Client | undefined {
   const sentryOptions = {
     environment: !isCjs() && import.meta.dev ? DEV_ENVIRONMENT : DEFAULT_ENVIRONMENT,
-    ...options,
     defaultIntegrations: getNuxtDefaultIntegrations(options),
+    ...options,
   };
 
   applySdkMetadata(sentryOptions, 'nuxt', ['nuxt', 'node']);
diff --git a/packages/nuxt/test/client/sdk.test.ts b/packages/nuxt/test/client/sdk.test.ts
@@ -41,5 +41,41 @@ describe('Nuxt Client SDK', () => {
     it('returns client from init', () => {
       expect(init({})).not.toBeUndefined();
     });
+
+    it('uses default integrations when not provided in options', () => {
+      init({ dsn: 'https://public@dsn.ingest.sentry.io/1337' });
+
+      expect(browserInit).toHaveBeenCalledTimes(1);
+      const callArgs = browserInit.mock.calls[0]?.[0];
+      expect(callArgs).toBeDefined();
+      expect(callArgs?.defaultIntegrations).toBeDefined();
+      expect(Array.isArray(callArgs?.defaultIntegrations)).toBe(true);
+    });
+
+    it('allows options.defaultIntegrations to override default integrations', () => {
+      const customIntegrations = [{ name: 'CustomIntegration' }];
+
+      init({
+        dsn: 'https://public@dsn.ingest.sentry.io/1337',
+        defaultIntegrations: customIntegrations as any,
+      });
+
+      expect(browserInit).toHaveBeenCalledTimes(1);
+      const callArgs = browserInit.mock.calls[0]?.[0];
+      expect(callArgs).toBeDefined();
+      expect(callArgs?.defaultIntegrations).toBe(customIntegrations);
+    });
+
+    it('allows options.defaultIntegrations to be set to false', () => {
+      init({
+        dsn: 'https://public@dsn.ingest.sentry.io/1337',
+        defaultIntegrations: false,
+      });
+
+      expect(browserInit).toHaveBeenCalledTimes(1);
+      const callArgs = browserInit.mock.calls[0]?.[0];
+      expect(callArgs).toBeDefined();
+      expect(callArgs?.defaultIntegrations).toBe(false);
+    });
   });
 });
diff --git a/packages/nuxt/test/server/sdk.test.ts b/packages/nuxt/test/server/sdk.test.ts
@@ -41,6 +41,42 @@ describe('Nuxt Server SDK', () => {
       expect(init({})).not.toBeUndefined();
     });
 
+    it('uses default integrations when not provided in options', () => {
+      init({ dsn: 'https://public@dsn.ingest.sentry.io/1337' });
+
+      expect(nodeInit).toHaveBeenCalledTimes(1);
+      const callArgs = nodeInit.mock.calls[0]?.[0];
+      expect(callArgs).toBeDefined();
+      expect(callArgs?.defaultIntegrations).toBeDefined();
+      expect(Array.isArray(callArgs?.defaultIntegrations)).toBe(true);
+    });
+
+    it('allows options.defaultIntegrations to override default integrations', () => {
+      const customIntegrations = [{ name: 'CustomIntegration' }];
+
+      init({
+        dsn: 'https://public@dsn.ingest.sentry.io/1337',
+        defaultIntegrations: customIntegrations as any,
+      });
+
+      expect(nodeInit).toHaveBeenCalledTimes(1);
+      const callArgs = nodeInit.mock.calls[0]?.[0];
+      expect(callArgs).toBeDefined();
+      expect(callArgs?.defaultIntegrations).toBe(customIntegrations);
+    });
+
+    it('allows options.defaultIntegrations to be set to false', () => {
+      init({
+        dsn: 'https://public@dsn.ingest.sentry.io/1337',
+        defaultIntegrations: false,
+      });
+
+      expect(nodeInit).toHaveBeenCalledTimes(1);
+      const callArgs = nodeInit.mock.calls[0]?.[0];
+      expect(callArgs).toBeDefined();
+      expect(callArgs?.defaultIntegrations).toBe(false);
+    });
+
     describe('lowQualityTransactionsFilter', () => {
       const options = { debug: false };
       const filter = lowQualityTransactionsFilter(options);
diff --git a/packages/react/src/tanstackrouter.ts b/packages/react/src/tanstackrouter.ts
diff --git a/packages/solid/src/tanstackrouter.ts b/packages/solid/src/tanstackrouter.ts
diff --git a/packages/vue/src/tanstackrouter.ts b/packages/vue/src/tanstackrouter.ts
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ if (!testEnv) {`
`8`	`8`
`9`	`9`	`const getStartCommand = () => {`
`10`	`10`	`if (testEnv === 'development') {`
`11`		`- return 'bash ./nuxt-start-dev-server.bash';`
	`11`	`+ return "NODE_OPTIONS='--import ./.nuxt/dev/sentry.server.config.mjs' nuxt dev -p 3030";`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`if (testEnv === 'production') {`