Merge branch 'main' into v8

antonis · antonis · commit 764e6b8bc392 · 2026-01-20T13:53:57.000+01:00
# Conflicts:
#	CHANGELOG.md
#	packages/core/package.json
#	yarn.lock
diff --git a/.github/workflows/buildandtest.yml b/.github/workflows/buildandtest.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
@@ -42,7 +42,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
@@ -88,7 +88,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
@@ -112,7 +112,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
@@ -156,7 +156,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
@@ -187,7 +187,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
@@ -222,7 +222,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
diff --git a/.github/workflows/changelog-preview.yml b/.github/workflows/changelog-preview.yml
@@ -13,5 +13,5 @@ permissions:
 
 jobs:
   changelog-preview:
-    uses: getsentry/craft/.github/workflows/changelog-preview.yml@1c58bfd57bfd6a967b6f3fc92bead2c42ee698ce # V2
+    uses: getsentry/craft/.github/workflows/changelog-preview.yml@c6e2f04939b6ee67030588afbb5af76b127d8203 # V2
     secrets: inherit
diff --git a/.github/workflows/codegen.yml b/.github/workflows/codegen.yml
@@ -37,7 +37,7 @@ jobs:
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # pin@v4.31.9
+        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v4.31.10
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -55,7 +55,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # pin@v4.31.9
+        uses: github/codeql-action/autobuild@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v4.31.10
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -66,4 +66,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # pin@v4.31.9
+        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # pin@v4.31.10
diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml
@@ -64,7 +64,7 @@ jobs:
         if: ${{ matrix.platform == 'ios' }}
 
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 20
@@ -250,7 +250,7 @@ jobs:
         if: ${{ matrix.platform == 'ios' }}
 
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 20
@@ -354,7 +354,7 @@ jobs:
 
       - name: Enable Corepack
         run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 20
diff --git a/.github/workflows/native-tests.yml b/.github/workflows/native-tests.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: Enable Corepack
         run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,15 +35,15 @@ jobs:
 
       - run: npm i -g corepack
 
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 20
           cache: yarn
           cache-dependency-path: yarn.lock
 
       - name: Prepare release
-        uses: getsentry/craft@1c58bfd57bfd6a967b6f3fc92bead2c42ee698ce # v2
+        uses: getsentry/craft@c6e2f04939b6ee67030588afbb5af76b127d8203 # v2
         env:
           GITHUB_TOKEN: ${{ steps.token.outputs.token }}
         with:
diff --git a/.github/workflows/sample-application-expo.yml b/.github/workflows/sample-application-expo.yml
@@ -57,7 +57,7 @@ jobs:
 
       - name: Enable Corepack
         run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
diff --git a/.github/workflows/sample-application.yml b/.github/workflows/sample-application.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Enable Corepack
         run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
@@ -276,7 +276,7 @@ jobs:
 
       - name: Enable Corepack
         run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
@@ -27,7 +27,7 @@ jobs:
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           cache-version: 1 # cache the installed gems
       - run: npm i -g corepack
-      - uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6
+      - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 18
diff --git a/.gitignore b/.gitignore
@@ -97,3 +97,6 @@ swiftlint/*
 
 # Sample app
 samples/*/.env
+
+# Local Claude Code settings that should not be committed
+.claude/settings.local.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,12 @@
 - Bump CLI from v2.58.4 to v3.1.0 ([#5523](https://github.com/getsentry/sentry-react-native/pull/5523), [#5471](https://github.com/getsentry/sentry-react-native/pull/5471), [#5514](https://github.com/getsentry/sentry-react-native/pull/5514), [#5502](https://github.com/getsentry/sentry-react-native/pull/5502))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#310)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.58.4...3.1.0)
+- Bump Bundler Plugins from v4.6.2 to v4.7.0 ([#5554](https://github.com/getsentry/sentry-react-native/pull/5554))
+  - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#470)
+  - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/4.6.2...4.7.0)
+- Bump JavaScript SDK from v10.34.0 to v10.35.0 ([#5555](https://github.com/getsentry/sentry-react-native/pull/5555))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10350)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/10.34.0...10.35.0)
 
 ## 7.9.0
 
diff --git a/dev-packages/e2e-tests/package.json b/dev-packages/e2e-tests/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@babel/preset-env": "^7.25.3",
     "@babel/preset-typescript": "^7.18.6",
-    "@sentry/core": "10.34.0",
+    "@sentry/core": "10.35.0",
     "@sentry/react-native": "7.9.0",
     "@types/node": "^20.9.3",
     "@types/react": "^18.2.64",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -68,21 +68,21 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/babel-plugin-component-annotate": "4.6.2",
-    "@sentry/browser": "10.34.0",
+    "@sentry/babel-plugin-component-annotate": "4.7.0",
+    "@sentry/browser": "10.35.0",
     "@sentry/cli": "3.1.0",
-    "@sentry/core": "10.34.0",
-    "@sentry/react": "10.34.0",
-    "@sentry/types": "10.34.0"
+    "@sentry/core": "10.35.0",
+    "@sentry/react": "10.35.0",
+    "@sentry/types": "10.35.0"
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
     "@expo/metro-config": "~0.20.0",
     "@mswjs/interceptors": "^0.25.15",
     "@react-native/babel-preset": "0.80.0",
-    "@sentry-internal/eslint-config-sdk": "10.34.0",
-    "@sentry-internal/eslint-plugin-sdk": "10.34.0",
-    "@sentry-internal/typescript": "10.34.0",
+    "@sentry-internal/eslint-config-sdk": "10.35.0",
+    "@sentry-internal/eslint-plugin-sdk": "10.35.0",
+    "@sentry-internal/typescript": "10.35.0",
     "@sentry/wizard": "6.11.0",
     "@testing-library/react-native": "^13.2.2",
     "@types/jest": "^29.5.13",
diff --git a/samples/expo/package.json b/samples/expo/package.json
@@ -22,7 +22,7 @@
     "eas-build-development-android": "eas build --profile development --platform android"
   },
   "dependencies": {
-    "@sentry/core": "10.34.0",
+    "@sentry/core": "10.35.0",
     "@sentry/react-native": "7.9.0",
     "@types/react": "~19.0.10",
     "expo": "^53.0.0",
@@ -47,7 +47,7 @@
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@react-native/eslint-config": "0.79.1",
-    "@sentry/babel-plugin-component-annotate": "4.6.2",
+    "@sentry/babel-plugin-component-annotate": "4.7.0",
     "@types/node": "20.10.4",
     "@typescript-eslint/eslint-plugin": "^8.50.0",
     "@typescript-eslint/parser": "^8.50.0",
diff --git a/samples/react-native-macos/package.json b/samples/react-native-macos/package.json
@@ -16,8 +16,8 @@
     "@react-navigation/bottom-tabs": "^6.5.12",
     "@react-navigation/native": "^6.1.9",
     "@react-navigation/stack": "^6.3.20",
-    "@sentry/core": "10.34.0",
-    "@sentry/react": "10.34.0",
+    "@sentry/core": "10.35.0",
+    "@sentry/react": "10.35.0",
     "@sentry/react-native": "7.9.0",
     "delay": "^6.0.0",
     "react": "18.2.0",
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
@@ -29,8 +29,8 @@
     "@react-navigation/native-stack": "^7.3.24",
     "@react-navigation/stack": "^7.4.5",
     "@reduxjs/toolkit": "^2.8.2",
-    "@sentry/core": "10.34.0",
-    "@sentry/react": "10.34.0",
+    "@sentry/core": "10.35.0",
+    "@sentry/react": "10.35.0",
     "@sentry/react-native": "7.9.0",
     "@shopify/flash-list": "^2.0.2",
     "delay": "^6.0.0",
@@ -58,7 +58,7 @@
     "@react-native/eslint-config": "0.80.2",
     "@react-native/metro-config": "0.80.2",
     "@react-native/typescript-config": "0.80.2",
-    "@sentry/babel-plugin-component-annotate": "4.6.2",
+    "@sentry/babel-plugin-component-annotate": "4.7.0",
     "@testing-library/react-native": "^13.2.2",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.13.1",
diff --git a/yarn.lock b/yarn.lock
