Merge branch 'develop' into manual-master-sync-dev

Author: andreiborza

.github/workflows/create-issue-for-unreferenced-prs.yml

@@ -19,6 +19,11 @@ concurrency:
 jobs:
   check_for_issue_reference:
     runs-on: ubuntu-latest
+    if: |
+      !contains(github.event.pull_request.labels.*.name, 'Dev: Gitflow')
+      && !startsWith(github.event.pull_request.head.ref, 'external-contributor/')
+      && !startsWith(github.event.pull_request.head.ref, 'prepare-release/')
+      && !startsWith(github.event.pull_request.head.ref, 'dependabot/')
     steps:
       - name: Check PR Body and Title for Issue Reference
         uses: actions/github-script@v8

.github/workflows/gitflow-merge-conflict.yml

@@ -19,6 +19,7 @@ jobs:
         uses: actions/github-script@v8
         with:
           script: |
+            const initialDelay = 60_000; // Wait 1 minute before first check to let CI start
             const retryInterval = 30_000;
             const maxRetries = 10; // (30 seconds * 10 retries) = 5 minutes
 
@@ -39,6 +40,10 @@ jobs:
             let attempt = 0;
             let mergeable = null;
 
+            // Wait before first check to give CI time to start
+            console.log(`Waiting ${initialDelay/1000} seconds before first check to let CI start...`);
+            await sleep(initialDelay);
+
             while (attempt < maxRetries) {
               attempt++;
               console.log(`Attempt ${attempt}/${maxRetries}: Checking if PR is mergeable...`);

dev-packages/browser-integration-tests/utils/replayHelpers.ts

@@ -115,7 +115,6 @@ export function collectReplayRequests(
   const replayEvents: ReplayEvent[] = [];
   const replayRecordingSnapshots: RecordingSnapshot[] = [];
 
-  // eslint-disable-next-line @typescript-eslint/no-floating-promises
   const promise = page.waitForResponse(res => {
     const req = res.request();
 

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.6.0",
-    "react-router-dom": "^7.6.0"
+    "react-router": "7.9.6",
+    "react-router-dom": "7.9.6"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.2",
     "@playwright/test": "~1.53.2",
-    "@react-router/dev": "7.6.0",
-    "@react-router/fs-routes": "7.6.0",
+    "@react-router/dev": "7.9.6",
+    "@react-router/fs-routes": "7.9.6",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@shopify/cli": "3.80.4",
     "@shopify/hydrogen-codegen": "^0.3.3",

dev-packages/e2e-tests/test-applications/nuxt-3/tests/middleware.test.ts

@@ -121,7 +121,11 @@ test.describe('Server Middleware Instrumentation', () => {
         type: 'Error',
         mechanism: expect.objectContaining({
           handled: false,
-          type: 'auto.middleware.nuxt',
+          // Type changes depending on whether it is being wrapped by Nitro or not
+          // This is a timing problem, sometimes Nitro can capture the error first, and sometimes it can't
+          // If nitro captures the error first, the type will be 'chained'
+          // If Sentry captures the error first, the type will be 'auto.middleware.nuxt'
+          type: expect.stringMatching(/^(auto\.middleware\.nuxt|chained)$/),
         }),
       }),
     );

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.1.5",
-    "@react-router/node": "^7.1.5",
-    "@react-router/serve": "^7.1.5",
+    "react-router": "7.9.6",
+    "@react-router/node": "7.9.6",
+    "@react-router/serve": "7.9.6",
     "@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.9.6",
     "@playwright/test": "~1.53.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "typescript": "^5.6.3",

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.5.3",
-    "@react-router/serve": "^7.5.3",
+    "@react-router/node": "7.9.6",
+    "@react-router/serve": "7.9.6",
     "isbot": "^5.1.27",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-router": "^7.1.5"
+    "react-router": "7.9.6"
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",
-    "@react-router/dev": "^7.5.3",
+    "@react-router/dev": "7.9.6",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@tailwindcss/vite": "^4.1.4",
     "@types/node": "^20",

dev-packages/e2e-tests/test-applications/solidstart-dynamic-import/package.json

@@ -18,7 +18,7 @@
     "@playwright/test": "~1.53.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.0.2",
     "@solidjs/testing-library": "^0.8.7",
     "@testing-library/jest-dom": "^6.4.2",

dev-packages/e2e-tests/test-applications/solidstart-spa/package.json

@@ -18,7 +18,7 @@
     "@playwright/test": "~1.53.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.0.2",
     "@solidjs/testing-library": "^0.8.7",
     "@testing-library/jest-dom": "^6.4.2",

dev-packages/e2e-tests/test-applications/solidstart-top-level-import/package.json

@@ -18,7 +18,7 @@
     "@playwright/test": "~1.53.2",
     "@sentry-internal/test-utils": "link:../../../test-utils",
     "@solidjs/meta": "^0.29.4",
-    "@solidjs/router": "^0.13.4",
+    "@solidjs/router": "^0.15.0",
     "@solidjs/start": "^1.0.2",
     "@solidjs/testing-library": "^0.8.7",
     "@testing-library/jest-dom": "^6.4.2",