Merge branch 'develop' into sig/remix-run-update

s1gr1d · web-flow · commit ee26a0b6252e · 2026-01-28T14:30:19.000+01:00
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,6 +15,7 @@ updates:
     ignore:
       - dependency-name: '@opentelemetry/instrumentation'
       - dependency-name: '@opentelemetry/instrumentation-*'
+      - dependency-name: 'typescript'
     groups:
       opentelemetry:
         patterns:
@@ -25,7 +26,7 @@ updates:
     versioning-strategy: increase
     commit-message:
       prefix: feat
-      prefix-development: feat
+      prefix-development: chore
       include: scope
     exclude-paths:
       - 'dev-packages/e2e-tests/test-applications/**'
diff --git a/.github/workflows/external-contributors.yml b/.github/workflows/external-contributors.yml
@@ -37,13 +37,13 @@ jobs:
 
       - name: Generate GitHub App token
         id: app-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         with:
           app-id: ${{ vars.GITFLOW_APP_ID }}
           private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}
 
       - name: Create PR with changes
-        uses: peter-evans/create-pull-request@98357b18bf14b5342f975ff684046ec3b2a07725
+        uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0
         with:
           token: ${{ steps.app-token.outputs.token }}
           commit-message: 'chore: Add external contributor to CHANGELOG.md'
diff --git a/.github/workflows/gitflow-sync-develop.yml b/.github/workflows/gitflow-sync-develop.yml
@@ -27,7 +27,7 @@ jobs:
 
       - name: Generate GitHub App token
         id: app-token
-        uses: actions/create-github-app-token@v1
+        uses: actions/create-github-app-token@v2
         with:
           app-id: ${{ vars.GITFLOW_APP_ID }}
           private-key: ${{ secrets.GITFLOW_APP_PRIVATE_KEY }}
diff --git a/.gitignore b/.gitignore
@@ -64,3 +64,6 @@ packages/gatsby/gatsby-node.d.ts
 
 #junit reports
 packages/**/*.junit.xml
+
+# Local Claude Code settings that should not be committed
+.claude/settings.local.json
diff --git a/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/package.json b/dev-packages/e2e-tests/test-applications/hydrogen-react-router-7/package.json
@@ -24,14 +24,14 @@
     "isbot": "^5.1.22",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router": "7.9.6",
-    "react-router-dom": "7.9.6"
+    "react-router": "7.13.0",
+    "react-router-dom": "7.13.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.2",
     "@playwright/test": "~1.56.0",
-    "@react-router/dev": "7.9.6",
-    "@react-router/fs-routes": "7.9.6",
+    "@react-router/dev": "7.13.0",
+    "@react-router/fs-routes": "7.13.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@shopify/cli": "3.80.4",
     "@shopify/hydrogen-codegen": "^0.3.3",
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-custom/package.json
@@ -6,17 +6,17 @@
   "dependencies": {
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "^7.1.5",
-    "@react-router/node": "^7.1.5",
-    "@react-router/serve": "^7.1.5",
+    "react-router": "^7.13.0",
+    "@react-router/node": "^7.13.0",
+    "@react-router/serve": "^7.13.0",
     "@sentry/react-router": "latest || *",
     "isbot": "^5.1.17"
   },
   "devDependencies": {
     "@types/react": "18.3.1",
     "@types/react-dom": "18.3.1",
     "@types/node": "^20",
-    "@react-router/dev": "^7.1.5",
+    "@react-router/dev": "^7.13.0",
     "@playwright/test": "~1.56.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "typescript": "^5.6.3",
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-node-20-18/package.json
@@ -6,17 +6,17 @@
   "dependencies": {
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "7.9.6",
-    "@react-router/node": "7.9.6",
-    "@react-router/serve": "7.9.6",
+    "react-router": "7.13.0",
+    "@react-router/node": "7.13.0",
+    "@react-router/serve": "7.13.0",
     "@sentry/react-router": "latest || *",
     "isbot": "^5.1.17"
   },
   "devDependencies": {
     "@types/react": "18.3.1",
     "@types/react-dom": "18.3.1",
     "@types/node": "^20",
-    "@react-router/dev": "7.9.6",
+    "@react-router/dev": "7.13.0",
     "@playwright/test": "~1.56.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "typescript": "^5.6.3",
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa-node-20-18/package.json
@@ -18,16 +18,16 @@
   },
   "dependencies": {
     "@sentry/react-router": "latest || *",
-    "@react-router/node": "7.9.6",
-    "@react-router/serve": "7.9.6",
+    "@react-router/node": "7.13.0",
+    "@react-router/serve": "7.13.0",
     "isbot": "^5.1.27",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "7.9.6"
+    "react-router": "7.13.0"
   },
   "devDependencies": {
     "@playwright/test": "~1.56.0",
-    "@react-router/dev": "7.9.6",
+    "@react-router/dev": "7.13.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@tailwindcss/vite": "^4.1.4",
     "@types/node": "^20",
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework-spa/package.json
@@ -18,16 +18,16 @@
   },
   "dependencies": {
     "@sentry/react-router": "latest || *",
-    "@react-router/node": "^7.11.0",
-    "@react-router/serve": "^7.11.0",
+    "@react-router/node": "^7.13.0",
+    "@react-router/serve": "^7.13.0",
     "isbot": "^5.1.27",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "^7.11.0"
+    "react-router": "^7.13.0"
   },
   "devDependencies": {
     "@playwright/test": "~1.56.0",
-    "@react-router/dev": "^7.11.0",
+    "@react-router/dev": "^7.13.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@tailwindcss/vite": "^4.1.4",
     "@types/node": "^20",
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-framework/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-framework/package.json
@@ -6,17 +6,17 @@
   "dependencies": {
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "^7.1.5",
-    "@react-router/node": "^7.1.5",
-    "@react-router/serve": "^7.1.5",
+    "react-router": "^7.13.0",
+    "@react-router/node": "^7.13.0",
+    "@react-router/serve": "^7.13.0",
     "@sentry/react-router": "latest || *",
     "isbot": "^5.1.17"
   },
   "devDependencies": {
     "@types/react": "18.3.1",
     "@types/react-dom": "18.3.1",
     "@types/node": "^20",
-    "@react-router/dev": "^7.1.5",
+    "@react-router/dev": "^7.13.0",
     "@playwright/test": "~1.56.0",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "typescript": "^5.6.3",
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts b/dev-packages/e2e-tests/test-applications/react-router-7-lazy-routes/tests/transactions.test.ts
@@ -1308,3 +1308,128 @@ test('Slow lazy route navigation with early span end still gets parameterized ro
   expect(event.contexts?.trace?.op).toBe('navigation');
   expect(event.contexts?.trace?.data?.['sentry.source']).toBe('route');
 });
+
+test('Captured navigation context is used instead of stale window.location during rapid navigation', async ({
+  page,
+}) => {
+  // Validates fix for race condition where captureCurrentLocation would use stale WINDOW.location.
+  // Navigate to slow route, then quickly to another route before lazy handler resolves.
+  await page.goto('/');
+
+  const allNavigationTransactions: Array<{ name: string; traceId: string }> = [];
+
+  const collectorPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    if (transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation') {
+      allNavigationTransactions.push({
+        name: transactionEvent.transaction,
+        traceId: transactionEvent.contexts.trace.trace_id || '',
+      });
+    }
+    return allNavigationTransactions.length >= 2;
+  });
+
+  const slowFetchLink = page.locator('id=navigation-to-slow-fetch');
+  await expect(slowFetchLink).toBeVisible();
+  await slowFetchLink.click();
+
+  // Navigate away quickly before slow-fetch's async handler resolves
+  await page.waitForTimeout(50);
+
+  const anotherLink = page.locator('id=navigation-to-another');
+  await anotherLink.click();
+
+  await expect(page.locator('id=another-lazy-route')).toBeVisible({ timeout: 10000 });
+
+  await page.waitForTimeout(2000);
+
+  await Promise.race([
+    collectorPromise,
+    new Promise<'timeout'>(resolve => setTimeout(() => resolve('timeout'), 3000)),
+  ]).catch(() => {});
+
+  expect(allNavigationTransactions.length).toBeGreaterThanOrEqual(1);
+
+  // /another-lazy transaction must have correct name (not corrupted by slow-fetch handler)
+  const anotherLazyTransaction = allNavigationTransactions.find(t => t.name.startsWith('/another-lazy/sub'));
+  expect(anotherLazyTransaction).toBeDefined();
+
+  const corruptedToRoot = allNavigationTransactions.filter(t => t.name === '/');
+  expect(corruptedToRoot.length).toBe(0);
+
+  if (allNavigationTransactions.length >= 2) {
+    const uniqueNames = new Set(allNavigationTransactions.map(t => t.name));
+    expect(uniqueNames.size).toBe(allNavigationTransactions.length);
+  }
+});
+
+test('Second navigation span is not corrupted by first slow lazy handler completing late', async ({ page }) => {
+  // Validates fix for race condition where slow lazy handler would update the wrong span.
+  // Navigate to slow route (which fetches /api/slow-data), then quickly to fast route.
+  // Without fix: second transaction gets wrong name and/or contains leaked spans.
+
+  await page.goto('/');
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const allNavigationTransactions: Array<{ name: string; traceId: string; spans: any[] }> = [];
+
+  const collectorPromise = waitForTransaction('react-router-7-lazy-routes', async transactionEvent => {
+    if (transactionEvent?.transaction && transactionEvent.contexts?.trace?.op === 'navigation') {
+      allNavigationTransactions.push({
+        name: transactionEvent.transaction,
+        traceId: transactionEvent.contexts.trace.trace_id || '',
+        spans: transactionEvent.spans || [],
+      });
+    }
+    return false;
+  });
+
+  // Navigate to slow-fetch (500ms lazy delay, fetches /api/slow-data)
+  const slowFetchLink = page.locator('id=navigation-to-slow-fetch');
+  await expect(slowFetchLink).toBeVisible();
+  await slowFetchLink.click();
+
+  // Wait 150ms (before 500ms lazy loading completes), then navigate away
+  await page.waitForTimeout(150);
+
+  const anotherLink = page.locator('id=navigation-to-another');
+  await anotherLink.click();
+
+  await expect(page.locator('id=another-lazy-route')).toBeVisible({ timeout: 10000 });
+
+  // Wait for slow-fetch lazy handler to complete and transactions to be sent
+  await page.waitForTimeout(2000);
+
+  await Promise.race([
+    collectorPromise,
+    new Promise<'timeout'>(resolve => setTimeout(() => resolve('timeout'), 3000)),
+  ]).catch(() => {});
+
+  expect(allNavigationTransactions.length).toBeGreaterThanOrEqual(1);
+
+  // /another-lazy transaction must have correct name, not "/slow-fetch/:id"
+  const anotherLazyTransaction = allNavigationTransactions.find(t => t.name.startsWith('/another-lazy/sub'));
+  expect(anotherLazyTransaction).toBeDefined();
+
+  // Key assertion 2: /another-lazy transaction must NOT contain spans from /slow-fetch route
+  // The /api/slow-data fetch is triggered by the slow-fetch route's lazy loading
+  if (anotherLazyTransaction) {
+    const leakedSpans = anotherLazyTransaction.spans.filter(
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (span: any) => span.description?.includes('slow-data') || span.data?.url?.includes('slow-data'),
+    );
+    expect(leakedSpans.length).toBe(0);
+  }
+
+  // Key assertion 3: If slow-fetch transaction exists, verify it has the correct name
+  // (not corrupted to /another-lazy)
+  const slowFetchTransaction = allNavigationTransactions.find(t => t.name.includes('slow-fetch'));
+  if (slowFetchTransaction) {
+    expect(slowFetchTransaction.name).toMatch(/\/slow-fetch/);
+    // Verify slow-fetch transaction doesn't contain spans that belong to /another-lazy
+    const wrongSpans = slowFetchTransaction.spans.filter(
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (span: any) => span.description?.includes('another-lazy') || span.data?.url?.includes('another-lazy'),
+    );
+    expect(wrongSpans.length).toBe(0);
+  }
+});
diff --git a/dev-packages/e2e-tests/test-applications/react-router-7-spa/package.json b/dev-packages/e2e-tests/test-applications/react-router-7-spa/package.json
@@ -8,7 +8,7 @@
     "@types/react-dom": "18.3.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router": "^7.0.1"
+    "react-router": "^7.13.0"
   },
   "devDependencies": {
     "@playwright/test": "~1.56.0",
diff --git a/packages/ember/package.json b/packages/ember/package.json
@@ -57,7 +57,7 @@
     "@types/ember-resolver": "5.0.13",
     "@types/ember__debug": "^3.16.5",
     "@types/qunit": "~2.19.11",
-    "@types/rsvp": "~4.0.3",
+    "@types/rsvp": "~4.0.9",
     "babel-eslint": "~10.1.0",
     "broccoli-asset-rev": "~3.0.0",
     "ember-cli": "~4.12.3",
diff --git a/packages/react-router/package.json b/packages/react-router/package.json
@@ -58,10 +58,10 @@
     "glob": "11.1.0"
   },
   "devDependencies": {
-    "@react-router/dev": "^7.5.2",
-    "@react-router/node": "^7.5.2",
+    "@react-router/dev": "^7.13.0",
+    "@react-router/node": "^7.13.0",
     "react": "^18.3.1",
-    "react-router": "^7.9.2",
+    "react-router": "^7.13.0",
     "vite": "^6.1.0"
   },
   "peerDependencies": {
diff --git a/packages/react-router/src/server/createSentryHandleError.ts b/packages/react-router/src/server/createSentryHandleError.ts
@@ -1,5 +1,5 @@
 import { captureException, flushIfServerless } from '@sentry/core';
-import type { ActionFunctionArgs, HandleErrorFunction, LoaderFunctionArgs } from 'react-router';
+import type { HandleErrorFunction } from 'react-router';
 
 export type SentryHandleErrorOptions = {
   logErrors?: boolean;
@@ -11,10 +11,7 @@ export type SentryHandleErrorOptions = {
  * @returns A Sentry-instrumented handleError function
  */
 export function createSentryHandleError({ logErrors = false }: SentryHandleErrorOptions): HandleErrorFunction {
-  const handleError = async function handleError(
-    error: unknown,
-    args: LoaderFunctionArgs | ActionFunctionArgs,
-  ): Promise<void> {
+  const handleError: HandleErrorFunction = async function handleError(error, args): Promise<void> {
     // React Router may abort some interrupted requests, don't report those
     if (!args.request.signal.aborted) {
       captureException(error, {
diff --git a/packages/react-router/test/server/createSentryHandleRequest.test.ts b/packages/react-router/test/server/createSentryHandleRequest.test.ts
@@ -48,7 +48,11 @@ describe('createSentryHandleRequest', () => {
       manifestPath: '/path/to/manifest',
     },
     routeModules: {},
-    future: { unstable_subResourceIntegrity: false, v8_middleware: false },
+    future: {
+      unstable_subResourceIntegrity: false,
+      v8_middleware: false,
+      unstable_trailingSlashAwareDataRequests: false,
+    },
     isSpaMode: false,
     staticHandlerContext: {
       matches: [
diff --git a/packages/react/src/reactrouter-compat-utils/instrumentation.tsx b/packages/react/src/reactrouter-compat-utils/instrumentation.tsx
diff --git a/packages/react/src/reactrouter-compat-utils/lazy-routes.tsx b/packages/react/src/reactrouter-compat-utils/lazy-routes.tsx
diff --git a/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx b/packages/react/test/reactrouter-compat-utils/instrumentation.test.tsx
diff --git a/packages/react/test/reactrouter-compat-utils/lazy-routes.test.ts b/packages/react/test/reactrouter-compat-utils/lazy-routes.test.ts
diff --git a/packages/remix/package.json b/packages/remix/package.json
diff --git a/yarn.lock b/yarn.lock
