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)"
+      }
+    ]
   }
 }

dev-packages/e2e-tests/test-applications/nuxt-4/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@latest && pnpm add nitropack@npm:nitropack-nightly@latest && pnpm install --force && pnpm build",
     "test:assert": "pnpm test"
   },
   "dependencies": {
@@ -25,5 +26,13 @@
   },
   "overrides": {
     "@vercel/nft": "0.27.4"
+  },
+  "sentryTest": {
+    "optionalVariants": [
+      {
+        "build-command": "test:build-canary",
+        "label": "nuxt-4 (canary)"
+      }
+    ]
   }
 }

dev-packages/external-contributor-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/external-contributor-gh-action",
   "description": "An internal Github Action to add external contributors to the CHANGELOG.md file.",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "license": "MIT",
   "engines": {
     "node": ">=18"

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

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/node-integration-tests",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "license": "MIT",
   "engines": {
     "node": ">=18"
@@ -30,9 +30,9 @@
     "@nestjs/common": "10.4.6",
     "@nestjs/core": "10.4.6",
     "@nestjs/platform-express": "10.4.6",
-    "@sentry/aws-serverless": "9.5.0",
-    "@sentry/core": "9.5.0",
-    "@sentry/node": "9.5.0",
+    "@sentry/aws-serverless": "9.6.1",
+    "@sentry/core": "9.6.1",
+    "@sentry/node": "9.6.1",
     "@types/mongodb": "^3.6.20",
     "@types/mysql": "^2.15.21",
     "@types/pg": "^8.6.5",

dev-packages/rollup-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/rollup-utils",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "description": "Rollup utilities used at Sentry for the Sentry JavaScript SDK",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/rollup-utils",

dev-packages/size-limit-gh-action/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sentry-internal/size-limit-gh-action",
   "description": "An internal Github Action to compare the current size of a PR against the one on develop.",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "license": "MIT",
   "engines": {
     "node": ">=18"

dev-packages/test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "9.5.0",
+  "version": "9.6.1",
   "name": "@sentry-internal/test-utils",
   "author": "Sentry",
   "license": "MIT",
@@ -45,7 +45,7 @@
   },
   "devDependencies": {
     "@playwright/test": "~1.50.0",
-    "@sentry/core": "9.5.0"
+    "@sentry/core": "9.6.1"
   },
   "volta": {
     "extends": "../../package.json"

lerna.json

@@ -1,5 +1,5 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "npmClient": "yarn"
 }

package.json

@@ -29,6 +29,8 @@
     "lint:lerna": "lerna run lint",
     "lint:prettier": "prettier \"**/*.{md,css,yml,yaml}\" \"packages/**/**.{ts,js,mjs,cjs,mts,cts,jsx,tsx,astro,vue}\" --check",
     "lint:es-compatibility": "es-check es2020 ./packages/*/build/{bundles,npm/cjs,cjs}/*.js && es-check es2020 ./packages/*/build/{npm/esm,esm}/*.js --module",
+    "dedupe-deps:check": "yarn-deduplicate yarn.lock --list --fail",
+    "dedupe-deps:fix": "yarn-deduplicate yarn.lock",
     "postpublish": "lerna run --stream --concurrency 1 postpublish",
     "test": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests}\" test",
     "test:unit": "lerna run --ignore \"@sentry-internal/{browser-integration-tests,e2e-tests,integration-shims,node-integration-tests}\" test:unit",
@@ -126,7 +128,7 @@
     "npm-run-all2": "^6.2.0",
     "prettier": "^3.1.1",
     "rimraf": "^5.0.10",
-    "rollup": "^4.24.2",
+    "rollup": "^4.35.0",
     "rollup-plugin-cleanup": "^3.2.1",
     "rollup-plugin-license": "^3.3.1",
     "size-limit": "~11.1.6",
@@ -135,7 +137,8 @@
     "ts-node": "10.9.1",
     "typescript": "~5.0.0",
     "vitest": "^2.1.8",
-    "yalc": "^1.0.0-pre.53"
+    "yalc": "^1.0.0-pre.53",
+    "yarn-deduplicate": "6.0.2"
   },
   "//_resolutions_comment": [
     "Because new versions of strip-ansi, string-width, and wrap-ansi are ESM only packages,",

packages/angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/angular",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "description": "Official Sentry SDK for Angular",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/angular",
@@ -21,8 +21,8 @@
     "rxjs": "^6.5.5 || ^7.x"
   },
   "dependencies": {
-    "@sentry/browser": "9.5.0",
-    "@sentry/core": "9.5.0",
+    "@sentry/browser": "9.6.1",
+    "@sentry/core": "9.6.1",
     "tslib": "^2.4.1"
   },
   "devDependencies": {

packages/astro/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/astro",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "description": "Official Sentry SDK for Astro",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/astro",
@@ -56,9 +56,9 @@
     "astro": ">=3.x || >=4.0.0-beta || >=5.x"
   },
   "dependencies": {
-    "@sentry/browser": "9.5.0",
-    "@sentry/core": "9.5.0",
-    "@sentry/node": "9.5.0",
+    "@sentry/browser": "9.6.1",
+    "@sentry/core": "9.6.1",
+    "@sentry/node": "9.6.1",
     "@sentry/vite-plugin": "^2.22.6"
   },
   "devDependencies": {

packages/aws-serverless/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/aws-serverless",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "description": "Official Sentry SDK for AWS Lambda and AWS Serverless Environments",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/serverless",
@@ -68,8 +68,8 @@
     "@opentelemetry/instrumentation": "^0.57.2",
     "@opentelemetry/instrumentation-aws-lambda": "0.50.3",
     "@opentelemetry/instrumentation-aws-sdk": "0.49.1",
-    "@sentry/core": "9.5.0",
-    "@sentry/node": "9.5.0",
+    "@sentry/core": "9.6.1",
+    "@sentry/node": "9.6.1",
     "@types/aws-lambda": "^8.10.62"
   },
   "devDependencies": {

packages/browser-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry-internal/browser-utils",
-  "version": "9.5.0",
+  "version": "9.6.1",
   "description": "Browser Utilities for all Sentry JavaScript SDKs",
   "repository": "git://github.com/getsentry/sentry-javascript.git",
   "homepage": "https://github.com/getsentry/sentry-javascript/tree/master/packages/browser-utils",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sentry/core": "9.5.0"
+    "@sentry/core": "9.6.1"
   },
   "scripts": {
     "build": "run-p build:transpile build:types",