Merge branch 'main' into antonis/expo-sample-54

Author: antonis

.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,13 @@ jobs:
           # Use Xcode 16 for older RN versions
           - platform: ios
             rn-version: '0.71.19'
-            xcode-version: '16.4'
-            runs-on: macos-15
+            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'
-            xcode-version: '26.1.1'
-            runs-on: macos-26
+            runs-on: ["ghcr.io/cirruslabs/macos-tahoe-xcode:26.2.0", "runner_group_id:12"]
           - 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.83.0'
@@ -247,17 +256,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'
@@ -323,9 +333,9 @@ jobs:
         include:
           - platform: ios
             rn-version: '0.83.0'
-            runs-on: macos-26
+            runs-on:  macos-26
           - 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 +364,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 +432,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

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
 

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",

samples/expo/package.json

@@ -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.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",

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",

yarn.lock

@@ -11052,10 +11052,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/babel-plugin-component-annotate@npm:4.8.0":
-  version: 4.8.0
-  resolution: "@sentry/babel-plugin-component-annotate@npm:4.8.0"
-  checksum: 50ba4710c0d53d61ec688fdca1895bf6820724e3f86efbfc4acbded8f7ba5da85ae73b6072ce17ec67dd08e16b47d4e5d3d957dc1ae0b9fdaf65109b1ad0b656
+"@sentry/babel-plugin-component-annotate@npm:4.9.0":
+  version: 4.9.0
+  resolution: "@sentry/babel-plugin-component-annotate@npm:4.9.0"
+  checksum: 2b98e96936ab8c3aa8376d4d37f3da2df39ed9433b4177e4cd433d2b50d8fd026cf00252fa99987dca0de976f8151dd5b373e92a34ba863989fec31ea145b721
   languageName: node
   linkType: hard
 
@@ -11271,7 +11271,7 @@ __metadata:
     "@sentry-internal/eslint-config-sdk": 10.38.0
     "@sentry-internal/eslint-plugin-sdk": 10.38.0
     "@sentry-internal/typescript": 10.38.0
-    "@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
@@ -30762,7 +30762,7 @@ __metadata:
     "@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
     "@sentry/core": 10.38.0
     "@sentry/react-native": 7.11.0
     "@types/node": 20.10.4
@@ -30859,7 +30859,7 @@ __metadata:
     "@react-navigation/native-stack": ^7.3.24
     "@react-navigation/stack": ^7.4.5
     "@reduxjs/toolkit": ^2.8.2
-    "@sentry/babel-plugin-component-annotate": 4.8.0
+    "@sentry/babel-plugin-component-annotate": 4.9.0
     "@sentry/core": 10.38.0
     "@sentry/react": 10.38.0
     "@sentry/react-native": 7.11.0