Merge branch 'develop' into lforst-nextjs-instrumentation-client

Author: Luca Forstner

.github/workflows/build.yml

@@ -274,6 +274,9 @@ jobs:
         uses: ./.github/actions/restore-cache
         with:
           dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check for duplicate dependencies in lockfile
+        # Run `yarn dedupe-deps:fix` locally to resolve any duplicates.
+        run: yarn dedupe-deps:check
       - name: Lint source files
         run: yarn lint:lerna
       - name: Lint for ES compatibility

.github/workflows/canary.yml

@@ -108,6 +108,12 @@ jobs:
           - test-application: 'react-router-6'
             build-command: 'test:build-canary'
             label: 'react-router-6 (canary)'
+          - test-application: 'nuxt-3'
+            build-command: 'test:build-canary'
+            label: 'nuxt-3 (canary)'
+          - test-application: 'nuxt-4'
+            build-command: 'test:build-canary'
+            label: 'nuxt-4 (canary)'
 
     steps:
       - name: Check out current commit

CHANGELOG.md

@@ -10,6 +10,34 @@
 
 - "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
 
+## 9.6.1
+
+- feat(deps): bump @prisma/instrumentation from 6.4.1 to 6.5.0 ([#15714](https://github.com/getsentry/sentry-javascript/pull/15714))
+- feat(deps): bump @sentry/cli from 2.42.2 to 2.42.3 ([#15711](https://github.com/getsentry/sentry-javascript/pull/15711))
+- fix(nextjs): Re-patch router if it is overridden by Next.js ([#15721](https://github.com/getsentry/sentry-javascript/pull/15721))
+- fix(nuxt): Add Nitro Rollup plugin to inject Sentry server config ([#15710](https://github.com/getsentry/sentry-javascript/pull/15710))
+- chore(deps): Bump rollup to 4.35.0 ([#15651](https://github.com/getsentry/sentry-javascript/pull/15651))
+
+## 9.6.0
+
+### Important Changes
+
+- **feat(tanstackstart): Add `@sentry/tanstackstart-react` package and make `@sentry/tanstackstart` package a utility package ([#15629](https://github.com/getsentry/sentry-javascript/pull/15629))**
+
+  Since TanStack Start is supposed to be a generic framework that supports libraries like React and Solid, the `@sentry/tanstackstart` SDK package was renamed to `@sentry/tanstackstart-react` to reflect that the SDK is specifically intended to be used for React TanStack Start applications.
+  Note that the TanStack Start SDK is still in alpha status and may be subject to breaking changes in non-major package updates.
+
+### Other Changes
+
+- feat(astro): Accept all vite-plugin options ([#15638](https://github.com/getsentry/sentry-javascript/pull/15638))
+- feat(deps): bump @sentry/webpack-plugin from 3.2.1 to 3.2.2 ([#15627](https://github.com/getsentry/sentry-javascript/pull/15627))
+- feat(tanstackstart): Refine initial API ([#15574](https://github.com/getsentry/sentry-javascript/pull/15574))
+- fix(core): Ensure `fill` only patches functions ([#15632](https://github.com/getsentry/sentry-javascript/pull/15632))
+- fix(nextjs): Consider `pageExtensions` when looking for instrumentation file ([#15701](https://github.com/getsentry/sentry-javascript/pull/15701))
+- fix(remix): Null-check `options` ([#15610](https://github.com/getsentry/sentry-javascript/pull/15610))
+- fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation ([#15578](https://github.com/getsentry/sentry-javascript/pull/15578))
+- fix(sveltekit): Guard process variable ([#15605](https://github.com/getsentry/sentry-javascript/pull/15605))
+
 Work in this release was contributed by @angelikatyborska and @nwalters512. Thank you for your contributions!
 
 ## 9.5.0

dev-packages/browser-integration-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-integration-tests",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "main": "index.js",
   "license": "MIT",
   "engines": {
@@ -42,7 +42,7 @@
     "@babel/preset-typescript": "^7.16.7",
     "@playwright/test": "~1.50.0",
     "@sentry-internal/rrweb": "2.34.0",
-    "@sentry/browser": "9.5.0",
+    "@sentry/browser": "9.6.1",
     "axios": "1.8.2",
     "babel-loader": "^8.2.2",
     "fflate": "0.8.2",

dev-packages/bundle-analyzer-scenarios/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/bundle-analyzer-scenarios",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "description": "Scenarios to test bundle analysis with",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

dev-packages/clear-cache-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/clear-cache-gh-action",
   "description": "An internal Github Action to clear GitHub caches.",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "license": "MIT",
   "engines": {
     "node": ">=18"

dev-packages/e2e-tests/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/e2e-tests",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "license": "MIT",
   "private": true,
   "scripts": {

dev-packages/e2e-tests/test-applications/debug-id-sourcemaps/package.json

@@ -13,7 +13,7 @@
     "@sentry/node": "latest || *"
   },
   "devDependencies": {
-    "rollup": "^4.24.2",
+    "rollup": "^4.35.0",
     "vitest": "^0.34.6",
     "@sentry/rollup-plugin": "2.22.6"
   },

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

@@ -21,8 +21,10 @@
     "@playwright/test": "~1.50.0",
     "@sentry-internal/test-utils": "link:../../../test-utils"
   },
-  "overrides": {
-    "nitropack": "~2.9.7",
-    "ofetch": "^1.4.0"
+  "pnpm": {
+    "overrides": {
+      "nitropack": "~2.9.7",
+      "ofetch": "^1.4.0"
+    }
   }
 }

dev-packages/e2e-tests/test-applications/nuxt-3/package.json

@@ -12,6 +12,7 @@
     "clean": "npx nuxi cleanup",
     "test": "playwright test",
     "test:build": "pnpm install && pnpm build",
+    "test:build-canary": "pnpm add nuxt@npm:nuxt-nightly@3x && pnpm add nitropack@npm:nitropack-nightly@latest && pnpm install --force && pnpm build",
     "test:assert": "pnpm test"
   },
   "dependencies": {
@@ -21,5 +22,13 @@
   "devDependencies": {
     "@playwright/test": "~1.50.0",
     "@sentry-internal/test-utils": "link:../../../test-utils"
+  },
+  "sentryTest": {
+    "optionalVariants": [
+      {
+        "build-command": "test:build-canary",
+        "label": "nuxt-3 (canary)"
+      }
+    ]
   }
 }