Merge branch 'develop' into lazarnikolov/js-2140-tanstack-start-tunnel-adapter

Author: nikolovlazar

.agents/skills/e2e/SKILL.md

@@ -116,7 +116,7 @@ All tests completed successfully. Your SDK changes work correctly with this test
 
 - **No tarballs found**: Run `yarn build && yarn build:tarball` at repository root
 - **Test app not found**: List available apps and ask user to clarify
-- **Verdaccio not running**: Tests should start Verdaccio automatically, but if issues occur, check Docker
+- **Packed tarballs missing**: Run `yarn build:tarball` at the repo root, then `yarn test:prepare` in `dev-packages/e2e-tests`
 - **Build failures**: Fix build errors before running tests
 
 ## Common Test Applications

.craft.yml

@@ -139,6 +139,9 @@ targets:
   - name: npm
     id: '@sentry/react-router'
     includeNames: /^sentry-react-router-\d.*\.tgz$/
+  - name: npm
+    id: '@sentry/nitro'
+    includeNames: /^sentry-nitro-\d.*\.tgz$/
 
   ## 7. Other Packages
   ## 7.1
@@ -256,3 +259,9 @@ targets:
         packageUrl: 'https://www.npmjs.com/package/@sentry/elysia'
         mainDocsUrl: 'https://docs.sentry.io/platforms/javascript/guides/elysia/'
         onlyIfPresent: /^sentry-elysia-\d.*\.tgz$/
+      'npm:@sentry/nitro':
+        name: 'Sentry Nitro SDK'
+        sdkName: 'sentry.javascript.nitro'
+        packageUrl: 'https://www.npmjs.com/package/@sentry/nitro'
+        mainDocsUrl: 'https://docs.sentry.io/platforms/javascript/guides/nitro/'
+        onlyIfPresent: /^sentry-nitro-\d.*\.tgz$/

.cursor/BUGBOT.md

@@ -63,6 +63,7 @@ Do not flag the issues below if they appear in tests.
   - Race conditions when waiting on multiple requests. Ensure that waiting checks are unique enough and don't depend on a hard order when there's a chance that telemetry can be sent in arbitrary order.
   - Timeouts or sleeps in tests. Instead suggest concrete events or other signals to wait on.
 - Flag usage of `getFirstEnvelope*`, `getMultipleEnvelope*` or related test helpers. These are NOT reliable anymore. Instead suggest helpers like `waitForTransaction`, `waitForError`, `waitForSpans`, etc.
+- Flag any new or modified `docker-compose.yml` under `dev-packages/node-integration-tests/suites/` or `dev-packages/node-core-integration-tests/suites/` where a service does not define a `healthcheck:`. The runner uses `docker compose up --wait` and relies on healthchecks to know when services are actually ready; without one the test will race the service's startup.
 
 ## Platform-safe code
 

.github/ISSUE_TEMPLATE/bug.yml

@@ -52,6 +52,7 @@ body:
         - '@sentry/google-cloud-serverless'
         - '@sentry/nestjs'
         - '@sentry/nextjs'
+        - '@sentry/nitro'
         - '@sentry/nuxt'
         - '@sentry/react'
         - '@sentry/react-router'

.github/workflows/build.yml

@@ -935,7 +935,7 @@ jobs:
           matrix.test-application)
         uses: oven-sh/setup-bun@v2
       - name: Set up AWS SAM
-        if: matrix.test-application == 'aws-serverless'
+        if: matrix.test-application == 'aws-serverless' || matrix.test-application == 'aws-serverless-layer'
         uses: aws-actions/setup-sam@v2
         with:
           use-installer: true
@@ -961,18 +961,24 @@ jobs:
         if: steps.restore-tarball-cache.outputs.cache-hit != 'true'
         run: yarn build:tarball
 
-      - name: Validate Verdaccio
-        run: yarn test:validate
+      - name: Prepare e2e tests
+        run: yarn test:prepare
         working-directory: dev-packages/e2e-tests
 
-      - name: Prepare Verdaccio
-        run: yarn test:prepare
+      - name: Validate e2e tests setup
+        run: yarn test:validate
         working-directory: dev-packages/e2e-tests
 
       - name: Copy to temp
         run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
         working-directory: dev-packages/e2e-tests
 
+      - name: Add pnpm overrides
+        run:
+          yarn ci:pnpm-overrides ${{ runner.temp }}/test-application ${{ github.workspace
+          }}/dev-packages/e2e-tests/packed
+        working-directory: dev-packages/e2e-tests
+
       - name: Build E2E app
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 7
@@ -1071,18 +1077,24 @@ jobs:
         if: steps.restore-tarball-cache.outputs.cache-hit != 'true'
         run: yarn build:tarball
 
-      - name: Validate Verdaccio
-        run: yarn test:validate
+      - name: Prepare E2E tests
+        run: yarn test:prepare
         working-directory: dev-packages/e2e-tests
 
-      - name: Prepare Verdaccio
-        run: yarn test:prepare
+      - name: Validate test setup
+        run: yarn test:validate
         working-directory: dev-packages/e2e-tests
 
       - name: Copy to temp
         run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
         working-directory: dev-packages/e2e-tests
 
+      - name: Add pnpm overrides
+        run:
+          yarn ci:pnpm-overrides ${{ runner.temp }}/test-application ${{ github.workspace
+          }}/dev-packages/e2e-tests/packed
+        working-directory: dev-packages/e2e-tests
+
       - name: Build E2E app
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 7

.github/workflows/canary.yml

@@ -120,6 +120,9 @@ jobs:
           - test-application: 'nestjs-microservices'
             build-command: 'test:build-latest'
             label: 'nestjs-microservices (latest)'
+          - test-application: 'nitro-3'
+            build-command: 'test:build-canary'
+            label: 'nitro-3 (canary)'
 
     steps:
       - name: Check out current commit
@@ -140,18 +143,24 @@ jobs:
           path: ${{ env.CACHED_BUILD_PATHS }}
           key: canary-${{ env.HEAD_COMMIT }}
 
-      - name: Validate Verdaccio
-        run: yarn test:validate
+      - name: Prepare e2e tests
+        run: yarn test:prepare
         working-directory: dev-packages/e2e-tests
 
-      - name: Prepare Verdaccio
-        run: yarn test:prepare
+      - name: Validate test setup
+        run: yarn test:validate
         working-directory: dev-packages/e2e-tests
 
       - name: Copy to temp
         run: yarn ci:copy-to-temp ./test-applications/${{ matrix.test-application }} ${{ runner.temp }}/test-application
         working-directory: dev-packages/e2e-tests
 
+      - name: Add pnpm overrides
+        run:
+          yarn ci:pnpm-overrides ${{ runner.temp }}/test-application ${{ github.workspace
+          }}/dev-packages/e2e-tests/packed
+        working-directory: dev-packages/e2e-tests
+
       - name: Build E2E app
         working-directory: ${{ runner.temp }}/test-application
         timeout-minutes: 7

.github/workflows/issue-package-label.yml

@@ -65,6 +65,9 @@ jobs:
               "@sentry.nestjs": {
                 "label": "Nest.js"
               },
+              "@sentry.nitro": {
+                "label": "Nitro"
+              },
               "@sentry.nextjs": {
                 "label": "Next.js"
               },

.gitignore

@@ -39,9 +39,6 @@ local.log
 
 .rpt2_cache
 
-# verdaccio local registry (e2e tests)
-dev-packages/e2e-tests/verdaccio-config/storage/
-
 lint-results.json
 trace.zip
 
@@ -70,6 +67,7 @@ packages/**/*.junit.xml
 
 # Local Claude Code settings that should not be committed
 .claude/settings.local.json
+.claude/worktrees
 
 # Triage report
 **/triage_report.md

.oxlintrc.base.json

@@ -117,6 +117,19 @@
         "max-lines": "off"
       }
     },
+    {
+      "files": ["**/integrations/node-fetch/vendored/**/*.ts"],
+      "rules": {
+        "typescript/consistent-type-imports": "off",
+        "typescript/no-unnecessary-type-assertion": "off",
+        "typescript/no-unsafe-member-access": "off",
+        "typescript/no-explicit-any": "off",
+        "typescript/prefer-for-of": "off",
+        "max-lines": "off",
+        "complexity": "off",
+        "no-param-reassign": "off"
+      }
+    },
     {
       "files": [
         "**/scenarios/**",

.version.json

@@ -1,4 +1,4 @@
 {
   "_comment": "Auto-generated by scripts/bump-version.js. Used by the gitflow sync workflow to detect version bumps. Do not edit manually.",
-  "version": "10.49.0"
+  "version": "10.50.0"
 }