Merge branch 'main' into antonis/rn-0.83.1

antonis · web-flow · commit 1e0e8e0bf145 · 2026-02-03T14:48:25.000+01:00
diff --git a/.github/workflows/changelog-preview.yml b/.github/workflows/changelog-preview.yml
@@ -14,5 +14,5 @@ permissions:
 
 jobs:
   changelog-preview:
-    uses: getsentry/craft/.github/workflows/changelog-preview.yml@fd370d4d54bec9ff07f909d88a3c4aec6f0ba22b # V2
+    uses: getsentry/craft/.github/workflows/changelog-preview.yml@beea4aba589c66381258cbd131c5551ae8245b82 # V2
     secrets: inherit
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@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v4.31.11
+        uses: github/codeql-action/init@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
         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@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v4.31.11
+        uses: github/codeql-action/autobuild@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
 
       # ℹ️ 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@19b2f06db2b6f5108140aeb04014ef02b648f789 # pin@v4.31.11
+        uses: github/codeql-action/analyze@b20883b0cd1f46c72ae0ba6d1090936928f9fa30 # pin@v4.32.0
diff --git a/.github/workflows/e2e-v2.yml b/.github/workflows/e2e-v2.yml
@@ -42,17 +42,18 @@ jobs:
     strategy:
       # we want that the matrix keeps running, default is to cancel them if it fails.
       fail-fast: false
+      # Limit parallel jobs to avoid hitting Sauce Labs concurrency limits (max 3 sessions)
+      max-parallel: 2
       matrix:
         rn-architecture: ['legacy', 'new']
         platform: ["ios", "android"]
         include:
           - platform: ios
-            runs-on: macos-26
+            runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:12"]
             name: iOS
             appPlain: performance-tests/test-app-plain.ipa
           - platform: android
-            # Not using the latest version due to a known issue: https://github.com/getsentry/sentry-react-native/issues/4418
-            runs-on: ubuntu-22.04
+            runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
             name: Android
             appPlain: performance-tests/TestAppPlain/android/app/build/outputs/apk/release/app-release.apk
     steps:
@@ -61,17 +62,18 @@ jobs:
       - uses: ./.github/actions/disk-cleanup
         if: ${{ matrix.platform == 'android' }}
 
-      - run: sudo xcode-select -s /Applications/Xcode_26.1.1.app/Contents/Developer
-        if: ${{ matrix.platform == 'ios' }}
-
-      - run: npm i -g corepack
+      - run: corepack enable
       - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 20
           cache: 'yarn'
           cache-dependency-path: yarn.lock
 
+      - name: Install Ninja
+        if: ${{ matrix.platform == 'android' }}
+        run: sudo apt-get update && sudo apt-get install -y ninja-build
+
       - uses: actions/setup-java@v5
         with:
           java-version: '17'
@@ -80,6 +82,11 @@ jobs:
       - name: Gradle cache
         uses: gradle/gradle-build-action@v3
 
+      - uses: ruby/setup-ruby@v1
+        if: ${{ matrix.platform == 'ios' }}
+        with:
+          ruby-version: '3.3.0'
+
       - name: Install Global Dependencies
         run: npm i -g react-native-cli @sentry/cli
 
@@ -115,9 +122,11 @@ jobs:
             if [[ ${{ matrix.rn-architecture }} == 'new' ]]; then
               export RCT_NEW_ARCH_ENABLED=1
             fi
-            pod install
+            bundle install
+            bundle exec pod install
             cd ../..
-            fastlane build_perf_test_app_plain
+            bundle install
+            bundle exec fastlane build_perf_test_app_plain
           fi
         env:
           APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
@@ -143,9 +152,11 @@ jobs:
             if [[ ${{ matrix.rn-architecture }} == 'new' ]]; then
               export RCT_NEW_ARCH_ENABLED=1
             fi
-            pod install
+            bundle install
+            bundle exec pod install
             cd ../..
-            fastlane build_perf_test_app_sentry
+            bundle install
+            bundle exec fastlane build_perf_test_app_sentry
             cd TestAppSentry
           fi
         env:
@@ -189,15 +200,23 @@ jobs:
           # Use Xcode 16 for older RN versions
           - platform: ios
             rn-version: '0.71.19'
+<<<<<<< antonis/rn-0.83.1
             xcode-version: '16.4'
             runs-on: macos-15
           # Use Xcode 26 for newer RN versions (0.84.0-rc.3)
           - platform: ios
             rn-version: '0.84.0-rc.3'
             xcode-version: '26.1.1'
             runs-on: macos-26
+=======
+            runs-on: ["ghcr.io/cirruslabs/macos-sequoia-xcode:16.4", "runner_group_id:12"]
+          # Use Xcode 26 for newer RN versions (0.83.0)
+          - platform: ios
+            rn-version: '0.83.0'
+            runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:12"]
+>>>>>>> main
           - platform: android
-            runs-on: ubuntu-latest
+            runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
         exclude:
           # exclude JSC for new RN versions (keeping the matrix manageable)
           - rn-version: '0.84.0-rc.3'
@@ -247,17 +266,18 @@ jobs:
           echo "SENTRY_RELEASE=$SENTRY_RELEASE"
           echo "SENTRY_DIST=$SENTRY_DIST"
 
-      - run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode-version }}.app/Contents/Developer
-        if: ${{ matrix.platform == 'ios' }}
-
-      - run: npm i -g corepack
+      - run: corepack enable
       - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 20
           cache: 'yarn'
           cache-dependency-path: yarn.lock
 
+      - name: Install Ninja
+        if: ${{ matrix.platform == 'android' }}
+        run: sudo apt-get update && sudo apt-get install -y ninja-build
+
       - uses: actions/setup-java@v5
         with:
           java-version: '17'
@@ -322,10 +342,15 @@ jobs:
         engine: ['hermes']
         include:
           - platform: ios
+<<<<<<< antonis/rn-0.83.1
             rn-version: '0.84.0-rc.3'
             runs-on: macos-26
+=======
+            rn-version: '0.83.0'
+            runs-on:  macos-26
+>>>>>>> main
           - platform: android
-            runs-on: ubuntu-latest
+            runs-on: ["ghcr.io/cirruslabs/ubuntu-runner-amd64:22.04", "runner_group_id:12"]
 
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -354,14 +379,19 @@ jobs:
           path: dev-packages/e2e-tests
 
       - name: Enable Corepack
-        run: npm i -g corepack
+        run: corepack enable
+
       - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
           node-version: 20
           cache: 'yarn'
           cache-dependency-path: yarn.lock
 
+      - name: Install Ninja
+        if: ${{ matrix.platform == 'android' }}
+        run: sudo apt-get update && sudo apt-get install -y ninja-build
+
       - uses: actions/setup-java@v5
         with:
           java-version: '17'
@@ -417,11 +447,15 @@ jobs:
 
       - name: Run tests on iOS
         if: ${{ matrix.platform == 'ios' }}
+        env:
+          # Increase timeout for Maestro iOS driver startup (default is 60s, some CI runners need more time)
+          MAESTRO_DRIVER_STARTUP_TIMEOUT: 120000
         run: ./dev-packages/e2e-tests/cli.mjs ${{ matrix.platform }} --test
 
       - name: Upload logs
         if: ${{ always() }}
         uses: actions/upload-artifact@v6
         with:
           name: ${{ matrix.rn-version }}-${{ matrix.rn-architecture }}-${{ matrix.engine }}-${{ matrix.platform }}-${{ matrix.build-type }}-${{ matrix.ios-use-frameworks }}-logs
-          path: ./dev-packages/e2e-tests/maestro-logs
+          path: |
+            ./dev-packages/e2e-tests/maestro-logs
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,7 +43,7 @@ jobs:
           cache-dependency-path: yarn.lock
 
       - name: Prepare release
-        uses: getsentry/craft@fd370d4d54bec9ff07f909d88a3c4aec6f0ba22b # v2
+        uses: getsentry/craft@beea4aba589c66381258cbd131c5551ae8245b82 # 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
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/setup-node@6044e13b5dc448c55e2357c09f80417699197238 # v6
         with:
           package-manager-cache: false
-          node-version: 18
+          node-version: 20
           cache: 'yarn'
           cache-dependency-path: yarn.lock
 
@@ -106,12 +106,17 @@ jobs:
           [[ "${{ matrix.build-type }}" == "production" ]] && ENABLE_PROD=1 || ENABLE_PROD=0
           [[ "${{ matrix.ios-use-frameworks }}" == "dynamic-frameworks" ]] && export USE_FRAMEWORKS=dynamic
           echo "ENABLE_PROD=$ENABLE_PROD"
+          # Monorepo fix: Point Sentry SDK to correct React Native version (0.81 vs 0.80)
+          export REACT_NATIVE_NODE_MODULES_DIR="$(cd ../node_modules/react-native && pwd)"
           PRODUCTION=$ENABLE_PROD pod install
           cat Podfile.lock | grep $RN_SENTRY_POD_NAME
 
       - name: Build Android App
         if: ${{ matrix.platform == 'android' }}
         working-directory: samples/expo/android
+        env:
+          # Increase memory for Expo SDK 54 lint tasks
+          GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=1g"
         run: |
           [[ "${{ matrix.build-type }}" == "production" ]] && CONFIG='Release' || CONFIG='Debug'
           echo "Building $CONFIG"
diff --git a/.gitignore b/.gitignore
@@ -95,8 +95,9 @@ node_modules.bak
 # SwiftLint
 swiftlint/*
 
-# Sample app
+# Environment variables
 samples/*/.env
+.env
 
 # Local Claude Code settings that should not be committed
 .claude/settings.local.json
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -13,6 +13,25 @@
         "kind": "build",
         "isDefault": true
       }
+    },
+    {
+      "label": "Claude",
+      "type": "shell",
+      "command": "CLAUDE_PATH=$(grep '^CLAUDE_PATH=' .env | cut -d '=' -f2 | tr -d '\"') && $CLAUDE_PATH",
+      "icon": {
+        "color": "terminal.ansiRed",
+        "id": "robot"
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new",
+        "focus": true
+      },
+      "group": {
+        "kind": "none",
+        "isDefault": true
+      },
+      "problemMatcher": []
     }
   ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,9 @@
 - Bump JavaScript SDK from v10.37.0 to v10.38.0 ([#5596](https://github.com/getsentry/sentry-react-native/pull/5596))
   - [changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md#10380)
   - [diff](https://github.com/getsentry/sentry-javascript/compare/10.37.0...10.38.0)
+- Bump Bundler Plugins from v4.8.0 to v4.9.0 ([#5608](https://github.com/getsentry/sentry-react-native/pull/5608))
+  - [changelog](https://github.com/getsentry/sentry-javascript-bundler-plugins/blob/main/CHANGELOG.md#490)
+  - [diff](https://github.com/getsentry/sentry-javascript-bundler-plugins/compare/4.8.0...4.9.0)
 
 ## 7.11.0
 
diff --git a/package.json b/package.json
@@ -61,7 +61,8 @@
   "resolutions": {
     "appium-chromedriver@npm:5.6.73/@xmldom/xmldom": "0.8.10",
     "form-data": "4.0.4",
-    "tar-fs": "^3.1.1"
+    "tar-fs": "^3.1.1",
+    "tar": "^7.5.7"
   },
   "version": "0.0.0",
   "name": "sentry-react-native",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -68,7 +68,7 @@
     "react-native": ">=0.65.0"
   },
   "dependencies": {
-    "@sentry/babel-plugin-component-annotate": "4.8.0",
+    "@sentry/babel-plugin-component-annotate": "4.9.0",
     "@sentry/browser": "10.38.0",
     "@sentry/cli": "2.58.4",
     "@sentry/core": "10.38.0",
diff --git a/samples/expo/components/ExternalLink.tsx b/samples/expo/components/ExternalLink.tsx
@@ -8,12 +8,8 @@ export function ExternalLink(
 ) {
   return (
     <Link
-      hrefAttrs={{
-        // On web, launch the link in a new tab.
-        target: '_blank',
-      }}
+      target="_blank"
       {...props}
-      // @ts-expect-error: External URLs are not typed.
       href={props.href}
       onPress={e => {
         if (Platform.OS !== 'web') {
diff --git a/samples/expo/package.json b/samples/expo/package.json
@@ -24,35 +24,35 @@
   "dependencies": {
     "@sentry/core": "10.38.0",
     "@sentry/react-native": "7.11.0",
-    "@types/react": "~19.0.10",
-    "expo": "^53.0.0",
-    "expo-constants": "~17.1.5",
-    "expo-dev-client": "~5.1.8",
-    "expo-image-picker": "~16.1.4",
-    "expo-linking": "~7.1.4",
-    "expo-router": "~5.0.5",
-    "expo-status-bar": "~2.2.3",
-    "expo-updates": "~0.28.12",
-    "expo-web-browser": "~14.1.6",
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
-    "react-native": "0.79.2",
-    "react-native-gesture-handler": "~2.24.0",
-    "react-native-safe-area-context": "5.4.0",
-    "react-native-screens": "~4.10.0",
-    "react-native-web": "^0.20.0",
-    "typescript": "~5.8.3"
+    "@types/react": "~19.1.10",
+    "expo": "^54.0.0",
+    "expo-constants": "~18.0.13",
+    "expo-dev-client": "~6.0.20",
+    "expo-image-picker": "~17.0.10",
+    "expo-linking": "~8.0.11",
+    "expo-router": "~6.0.22",
+    "expo-status-bar": "~3.0.9",
+    "expo-updates": "~29.0.16",
+    "expo-web-browser": "~15.0.10",
+    "react": "19.1.0",
+    "react-dom": "19.1.0",
+    "react-native": "0.81.5",
+    "react-native-gesture-handler": "~2.28.0",
+    "react-native-safe-area-context": "~5.6.0",
+    "react-native-screens": "~4.16.0",
+    "react-native-web": "^0.21.0",
+    "typescript": "~5.9.2"
   },
   "devDependencies": {
     "@babel/core": "^7.26.0",
     "@babel/preset-env": "^7.26.0",
     "@react-native/eslint-config": "0.79.1",
-    "@sentry/babel-plugin-component-annotate": "4.8.0",
+    "@sentry/babel-plugin-component-annotate": "4.9.0",
     "@types/node": "20.10.4",
     "@typescript-eslint/eslint-plugin": "^8.50.0",
     "@typescript-eslint/parser": "^8.50.0",
     "eslint": "^8.57.0",
-    "eslint-config-expo": "^7.1.2",
+    "eslint-config-expo": "~10.0.0",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-jest": "^29.5.0",
diff --git a/samples/react-native/package.json b/samples/react-native/package.json
@@ -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.8.0",
+    "@sentry/babel-plugin-component-annotate": "4.9.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
