Merge branch 'main' into 5.0.0

Author: krystofwoldrich

.eslintrc.js

@@ -12,6 +12,9 @@ module.exports = {
   settings: {
     version: 'detect', // React version. "detect" automatically picks the version you have installed.
   },
+  ignorePatterns: [
+    'test/react-native/versions/*',
+  ],
   overrides: [
     {
       // Typescript Files
@@ -44,6 +47,13 @@ module.exports = {
         'no-console': 'off',
       },
     },
+    {
+      // RN Versions Test Tools
+      files: ['test/react-native/*'],
+      parserOptions: {
+        ecmaVersion: 2017,
+      },
+    }
   ],
   rules: {
     // Bundle size isn't too much of an issue for React Native.

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # pin@v2
+        uses: github/codeql-action/init@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # pin@v2
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,7 +50,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@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # pin@v2
+        uses: github/codeql-action/autobuild@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # pin@v2
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions
@@ -61,4 +61,4 @@ jobs:
       #   make bootstrap
       #   make release
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c3b6fce4ee2ca25bc1066aa3bf73962fda0e8898 # pin@v2
+        uses: github/codeql-action/analyze@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # pin@v2

.github/workflows/e2e.yml

@@ -13,6 +13,14 @@ env:
   SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
 
 jobs:
+  cancel-previous-workflow:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@b173b6ec0100793626c2d9e6b90435061f4fc3e5 # pin@0.11.0
+        with:
+          access_token: ${{ github.token }}
+
   device-test:
     # Android emulator said to perform best with macos HAXM
     runs-on: macos-latest
@@ -99,10 +107,26 @@ jobs:
           else
             mkdir -p DerivedData
             defaults write com.apple.dt.Xcode ShowBuildOperationDuration YES
-            buildArgs=('-destination' 'platform=iOS Simulator,name=${{ matrix.device }}' 'ONLY_ACTIVE_ARCH=yes' '-sdk' 'iphonesimulator${{ matrix.runtime }}' '-derivedDataPath' $(cd "DerivedData" ; pwd -P))
+            buildArgs=(
+              '-destination' 'platform=iOS Simulator,name=${{ matrix.device }}'
+              'ONLY_ACTIVE_ARCH=yes'
+              '-sdk' 'iphonesimulator${{ matrix.runtime }}'
+              '-derivedDataPath' $(cd "DerivedData" ; pwd -P)
+            )
             echo "buildArgs = ${buildArgs[@]}"
-            xcodebuild -workspace sample.xcworkspace -configuration Release -scheme sample "${buildArgs[@]}" build
-            xcodebuild -project ../node_modules/appium-webdriveragent/WebDriverAgent.xcodeproj -scheme WebDriverAgentRunner GCC_TREAT_WARNINGS_AS_ERRORS=0 COMPILER_INDEX_STORE_ENABLE=NO "${buildArgs[@]}" build
+            xcodebuild \
+              -workspace sample.xcworkspace \
+              -configuration Release \
+              -scheme sample \
+              "${buildArgs[@]}" \
+              build
+            xcodebuild \
+              -project ../node_modules/appium-webdriveragent/WebDriverAgent.xcodeproj \
+              -scheme WebDriverAgentRunner \
+              GCC_TREAT_WARNINGS_AS_ERRORS=0 \
+              COMPILER_INDEX_STORE_ENABLE=NO \
+              "${buildArgs[@]}" \
+              build
           fi
 
       - name: Start Appium Server
@@ -111,7 +135,7 @@ jobs:
 
         # Wait until the Appium server starts.
       - name: Check Appium Server
-        uses: nick-fields/retry@3e91a01664abd3c5cd539100d10d33b9c5b68482 # pin@v2
+        uses: nick-fields/retry@943e742917ac94714d2f408a0e8320f2d1fcafcd # pin@v2
         with:
           timeout_seconds: 60
           max_attempts: 10
@@ -262,3 +286,115 @@ jobs:
           config: ./test/perf/metrics-${{ matrix.platform }}.yml
           sauce-user: ${{ secrets.SAUCE_USERNAME }}
           sauce-key: ${{ secrets.SAUCE_ACCESS_KEY }}
+
+  react-native-build:
+    name: Build RN ${{ matrix.rn-version }} ${{ matrix.rn-architecture }} ${{ matrix.platform }} ${{ matrix.build-type }}
+    runs-on: macos-latest
+    env:
+      RN_DIFF_REPOSITORY: https://github.com/react-native-community/rn-diff-purge.git
+    strategy:
+      fail-fast: false # keeps matrix running if one fails
+      matrix:
+        rn-version: ['0.64.4', '0.70.6']
+        rn-architecture: ['legacy']
+        platform: ['android', 'ios']
+        build-type: ['dev', 'production']
+        include:
+          - platform: ios
+            runtime: '16.0'
+            device: 'iPhone 14'
+        # exclude all rn versions lower than 0.70.0 for new architecture
+        exclude:
+          - rn-version: '0.64.4'
+            rn-architecture: 'new'
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '11'
+          distribution: 'adopt'
+
+      - name: Setup JS Tools
+        run: yarn global add yalc semver
+
+      - name: NPM cache SDK
+        uses: actions/cache@v3
+        id: deps-cache
+        with:
+          path: node_modules
+          key: ${{ github.workflow }}-${{ github.job }}-npm-${{ hashFiles('yarn.lock') }}
+
+      - name: Install SDK JS Dependencies
+        if: steps.deps-cache.outputs['cache-hit'] != 'true'
+        run: yarn install
+
+      - name: Build SDK
+        run: yarn build
+
+      - name: Package SDK
+        run: yalc publish
+
+      - name: Download Plain RN ${{ matrix.rn-version }} App
+        working-directory: test/react-native/versions
+        run: git clone $RN_DIFF_REPOSITORY --branch release/${{ matrix.rn-version }} --single-branch ${{ matrix.rn-version }}
+
+      - name: Add SDK to App
+        working-directory: test/react-native/versions/${{ matrix.rn-version }}/RnDiffApp
+        run: yalc add @sentry/react-native
+
+      - name: Install App JS Dependencies
+        working-directory: test/react-native/versions/${{ matrix.rn-version }}/RnDiffApp
+        run: yarn install
+
+      - name: Install App Pods
+        if: matrix.platform == 'ios'
+        working-directory: test/react-native/versions/${{ matrix.rn-version }}/RnDiffApp/ios
+        run: |
+          [[ "${{ matrix.build-type }}" == "production" ]] && ENABLE_PROD=1 || ENABLE_PROD=0
+          [[ "${{ matrix.rn-architecture }}" == "new" ]] && ENABLE_NEW_ARCH=1 || ENABLE_NEW_ARCH=0
+          echo "ENABLE_PROD=$ENABLE_PROD"
+          echo "ENABLE_NEW_ARCH=$ENABLE_NEW_ARCH"
+          PRODUCTION=$ENABLE_PROD RCT_NEW_ARCH_ENABLED=$ENABLE_NEW_ARCH pod install
+
+      - name: Patch App RN
+        working-directory: test/react-native/versions/${{ matrix.rn-version }}/RnDiffApp
+        run: patch --verbose --strip=0 --force --ignore-whitespace --fuzz 4 < ../../../rn.patch
+
+      - name: Patch iOS App RN
+        if: matrix.platform == 'ios'
+        working-directory: test/react-native
+        run: |
+          ./rn.patch.xcode.js \
+            --project 'versions/${{ matrix.rn-version }}/RnDiffApp/ios/RnDiffApp.xcodeproj/project.pbxproj' \
+            --rn-version '${{ matrix.rn-version }}'
+
+      - name: Build Android App
+        if: matrix.platform == 'android'
+        working-directory: test/react-native/versions/${{ matrix.rn-version }}/RnDiffApp/android
+        run: |
+          if [[ ${{ matrix.rn-architecture }} == 'new' ]]; then
+            perl -i -pe's/newArchEnabled=false/newArchEnabled=true/g' gradle.properties
+            echo 'New Architecture enabled'
+          fi
+          [[ "${{ matrix.build-type }}" == "production" ]] && CONFIG='Release' || CONFIG='Debug'
+          echo "Building $CONFIG"
+          ./gradlew ":app:assemble$CONFIG" -PreactNativeArchitectures=x86
+
+      - name: Build iOS App
+        if: matrix.platform == 'ios'
+        working-directory: test/react-native/versions/${{ matrix.rn-version }}/RnDiffApp/ios
+        run: |
+          [[ "${{ matrix.build-type }}" == "production" ]] && CONFIG='Release' || CONFIG='Debug'
+          echo "Building $CONFIG"
+          derivedData="$(cd "DerivedData" ; pwd -P)"
+          mkdir -p "$derivedData"
+          xcodebuild \
+            -workspace RnDiffApp.xcworkspace \
+            -configuration "$CONFIG" \
+            -scheme RnDiffApp \
+            -destination 'platform=iOS Simulator,name=${{ matrix.device }}' \
+            ONLY_ACTIVE_ARCH=yes \
+            -sdk 'iphonesimulator${{ matrix.runtime }}' \
+            -derivedDataPath "$derivedData" \
+            build

.github/workflows/stale.yml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@9c1b1c6e115ca2af09755448e0dbba24e5061cc8
+      - uses: actions/stale@6f05e4244c9a0b2ed3401882b05d701dd0a7289b
         with:
           repo-token: ${{ github.token }}
           days-before-stale: 21
@@ -28,7 +28,6 @@ jobs:
             ----
 
             "A weed is but an unloved flower." ― _Ella Wheeler Wilcox_ 🥀
-          skip-stale-issue-message: false
           close-issue-label: ""
           close-issue-message: ""
 

.gitignore

@@ -78,3 +78,4 @@ sample/.vscode/.react/debuggerWorker.js
 
 # E2E tests
 sample/*.png
+test/react-native/versions

CHANGELOG.md

@@ -11,6 +11,20 @@
 ### Fixes
 
 - Unreachable fallback to fetch transport if native is not available ([#2695](https://github.com/getsentry/sentry-react-native/pull/2695))
+- Missing `originalException` in `beforeSend` for events from react native error handler ([#2706](https://github.com/getsentry/sentry-react-native/pull/2706))
+- ModulesLoader integration returns original event if native is not available and event modules overwrite native modules ([#2730](https://github.com/getsentry/sentry-react-native/pull/2730))
+
+### Dependencies
+
+- Bump Cocoa SDK from v7.31.3 to v7.31.5 ([#2699](https://github.com/getsentry/sentry-react-native/pull/2699), [#2714](https://github.com/getsentry/sentry-react-native/pull/2714))
+  - [changelog](https://github.com/getsentry/sentry-cocoa/blob/8.0.0/CHANGELOG.md#7315)
+  - [diff](https://github.com/getsentry/sentry-cocoa/compare/7.31.3...7.31.5)
+- Bump JavaScript SDK from v7.26.0 to v7.28.1 ([#2705](https://github.com/getsentry/sentry-react-native/pull/2705), [#2709](https://github.com/getsentry/sentry-react-native/pull/2709), [#2715](https://github.com/getsentry/sentry-react-native/pull/2715))
+  - [changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md#7281)
+  - [diff](https://github.com/getsentry/sentry-javascript/compare/7.26.0...7.28.1)
+- Bump Android SDK from v6.9.2 to v6.11.0 ([#2704](https://github.com/getsentry/sentry-react-native/pull/2704), [#2724](https://github.com/getsentry/sentry-react-native/pull/2724))
+  - [changelog](https://github.com/getsentry/sentry-java/blob/main/CHANGELOG.md#6110)
+  - [diff](https://github.com/getsentry/sentry-java/compare/6.9.2...6.11.0)
 
 ## 4.12.0
 

CONTRIBUTING.md

@@ -124,6 +124,7 @@ target 'sample' do
   # ... react native config
 
 +  pod 'Sentry/HybridSDK', :path => '../../../sentry-cocoa'
++  pod 'SentryPrivate', :path => '../../../sentry-cocoa/SentryPrivate.podspec'
 
   # ... rest of the configuration
 

RNSentry.podspec

@@ -19,7 +19,7 @@ Pod::Spec.new do |s|
   s.preserve_paths = '*.js'
 
   s.dependency 'React-Core'
-  s.dependency 'Sentry/HybridSDK', '7.31.3'
+  s.dependency 'Sentry/HybridSDK', '7.31.5'
 
   s.source_files = 'ios/RNSentry.{h,mm}'
   s.public_header_files = 'ios/RNSentry.h'

android/build.gradle

@@ -42,5 +42,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    api 'io.sentry:sentry-android:6.9.2'
+    api 'io.sentry:sentry-android:6.11.0'
 }

package.json

@@ -17,7 +17,7 @@
     "build:tools": "tsc -p tsconfig.build.tools.json",
     "clean": "rimraf dist coverage",
     "test": "jest",
-    "lint": "eslint .",
+    "lint": "eslint --config .eslintrc.js .",
     "test:watch": "jest --watch",
     "run-ios": "cd sample && yarn react-native run-ios",
     "run-android": "cd sample && yarn react-native run-android"
@@ -42,19 +42,19 @@
     "react-native": ">=0.70.0"
   },
   "dependencies": {
-    "@sentry/browser": "7.26.0",
+    "@sentry/browser": "7.28.1",
     "@sentry/cli": "2.10.0",
-    "@sentry/core": "7.26.0",
-    "@sentry/hub": "7.26.0",
-    "@sentry/integrations": "7.26.0",
-    "@sentry/react": "7.26.0",
-    "@sentry/tracing": "7.26.0",
-    "@sentry/types": "7.26.0",
-    "@sentry/utils": "7.26.0"
+    "@sentry/core": "7.28.1",
+    "@sentry/hub": "7.28.1",
+    "@sentry/integrations": "7.28.1",
+    "@sentry/react": "7.28.1",
+    "@sentry/tracing": "7.28.1",
+    "@sentry/types": "7.28.1",
+    "@sentry/utils": "7.28.1"
   },
   "devDependencies": {
-    "@sentry-internal/eslint-config-sdk": "7.26.0",
-    "@sentry-internal/eslint-plugin-sdk": "7.26.0",
+    "@sentry-internal/eslint-config-sdk": "7.28.1",
+    "@sentry-internal/eslint-plugin-sdk": "7.28.1",
     "@sentry/typescript": "^5.20.1",
     "@sentry/wizard": "2.2.0",
     "@types/jest": "^26.0.15",