Merge branch 'next' into integration/typescript

gingerbenw · gingerbenw · commit b466c31326b7 · 2025-04-08T14:54:48.000+01:00
diff --git a/.buildkite/basic/react-native-ios-full-pipeline.yml b/.buildkite/basic/react-native-ios-full-pipeline.yml
@@ -216,7 +216,7 @@ steps:
         concurrency: 5
         concurrency_group: "browserstack-app"
         concurrency_method: eager
-      
+
       - label: ":bitbar: :mac: RN {{matrix}} iOS (Old Arch) end-to-end tests"
         depends_on: "build-react-native-ios-fixture-old-arch-full"
         timeout_in_minutes: 40
diff --git a/.github/workflows/aws-lambda.yml b/.github/workflows/aws-lambda.yml
@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
 
     - name: Install Ruby
-      uses: ruby/setup-ruby@922ebc4c5262cd14e07bb0e1db020984b6c064fe
+      uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252
       with:
         ruby-version: '3.1'
 
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -47,7 +47,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+      uses: github/codeql-action/init@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -61,7 +61,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, 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@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+      uses: github/codeql-action/autobuild@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -74,6 +74,6 @@ jobs:
     #     ./location_of_script_within_repo/buildscript.sh
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+      uses: github/codeql-action/analyze@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
       with:
         category: "/language:${{matrix.language}}"
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: SARIF file
           path: results.sarif
@@ -68,7 +68,7 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
         with:
           sarif_file: results.sarif
 
@@ -77,4 +77,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: gradle/actions/wrapper-validation@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
+      - uses: gradle/actions/wrapper-validation@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
diff --git a/.github/workflows/test-electron.yml b/.github/workflows/test-electron.yml
@@ -30,7 +30,7 @@ jobs:
       if: ${{ !env.ACT }}
       run: |
         echo "::set-output name=dir::$(npm config get cache)"
-    - uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+    - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       id: npm-cache
       if: ${{ !env.ACT }}
       with:
@@ -66,7 +66,7 @@ jobs:
         START_LOCAL_NPM: 1
         VERBOSE: 1
         ELECTRON_VERSION: ${{ matrix.electron }}
-    - uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+    - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
       if: failure()
       with:
         name: cucumber-failures
diff --git a/.github/workflows/update-dependencies.yml b/.github/workflows/update-dependencies.yml
@@ -40,7 +40,7 @@ jobs:
       - run: git submodule update --init --recursive
 
       - name: Install ruby
-        uses: ruby/setup-ruby@922ebc4c5262cd14e07bb0e1db020984b6c064fe # v1.226.0
+        uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1.229.0
         with:
           ruby-version: 2.7
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@
 - Update bugsnag-android to [v6.12.1](https//github.com/bugsnag/bugsnag-android/releases/tag/v6.12.1) [#2359](https://github.com/bugsnag/bugsnag-js/pull/2359)
 - Update bugsnag-cocoa to [v6.32.1](https//github.com/bugsnag/bugsnag-cocoa/releases/tag/v6.32.1) [#2355](https://github.com/bugsnag/bugsnag-js/pull/2355)
 
+### Fixed
+
+- (react-native) Fix double reported unhandled js errors when using new architecture [#2398](https://github.com/bugsnag/bugsnag-js/pull/2398)
+
 ## [8.3.0] - 2025-03-04
 
 This release adds support for React Native 0.77 and 0.78 to `@bugsnag/react-native`
diff --git a/packages/react-native/ios/BugsnagReactNative/BugsnagReactNativePlugin.m b/packages/react-native/ios/BugsnagReactNative/BugsnagReactNativePlugin.m
@@ -39,7 +39,7 @@ - (void)load:(BugsnagClient *)client {
     // so we need to use an onSendError block and discard based on the error message instead.
     #ifdef RCT_NEW_ARCH_ENABLED
     [client.configuration addOnSendErrorBlock:^BOOL (BugsnagEvent *event) {
-        return ![event.errors[0].errorMessage hasPrefix:@"Exception in HostFunction: Unhandled JS Exception"];
+        return ![event.errors[0].errorMessage containsString:@"Unhandled JS Exception:"];
     }];
     #endif
 }
diff --git a/scripts/init-rn-cli.sh b/scripts/init-rn-cli.sh
@@ -29,7 +29,7 @@ expect "What is your Bugsnag build endpoint?" { send -- "http://localhost:9339/b
 expect "If you want the latest version of @bugsnag/react-native hit enter, otherwise type the version you want" { send -- "$notifier_version\r" }
 expect "What is your Bugsnag project API key?" { send -- "1234567890ABCDEF1234567890ABCDEF\r" }
 expect "Do you want to install the BugSnag CLI to allow you to upload JavaScript source maps?" { send -- "Y\r" }
-expect "If you want the latest version of @bugsnag/cli hit enter, otherwise type the version you want" { send -- "3.0.0-beta.0\r" }
+expect "If you want the latest version of @bugsnag/cli hit enter, otherwise type the version you want" { send -- "\r" }
 expect "See https://docs.bugsnag.com/platforms/react-native/react-native/showing-full-stacktraces for details." { send -- "\r" }
 expect "Do you want to update your Xcode build phase to output JavaScript source maps?" { send -- "Y\r" }
 expect "This will enable you to see full native stacktraces. It can't be done automatically." { send -- "\r" }
diff --git a/test/react-native/features/fixtures/scenario-launcher/src/lib/ScenarioLauncher.js b/test/react-native/features/fixtures/scenario-launcher/src/lib/ScenarioLauncher.js
@@ -24,8 +24,6 @@ async function runScenario (scenarioName, apiKey, notifyEndpoint, sessionEndpoin
   console.error('[Bugsnag ScenarioLauncher] clearing persistent data')
   NativeInterface.clearPersistentData()
 
-  console.error(`[Bugsnag ScenarioLauncher] with config: ${JSON.stringify(nativeConfig)} (native) and ${JSON.stringify(jsConfig)} (js)`)
-
   // start the native client
   console.error('[Bugsnag ScenarioLauncher] starting native Bugsnag')
   await NativeInterface.startBugsnag(nativeConfig)
diff --git a/test/react-native/features/steps/react-native-steps.rb b/test/react-native/features/steps/react-native-steps.rb
@@ -50,46 +50,39 @@ def execute_command(action, scenario_name = '', scenario_data = '')
 def wait_for_app_state(expected_state)
   max_attempts = 20
   attempts = 0
-  state = get_app_state
+  manager = Maze::Api::Appium::AppManager.new
+  state = manager.state
   until (attempts >= max_attempts) || state == expected_state
     attempts += 1
-    state = get_app_state
+    state = manager.state
     sleep 0.5
   end
   $logger.warn "App state #{state} instead of #{expected_state} after 10s" unless state == expected_state
   state
 end
 
-def get_app_state
-  case Maze::Helper.get_current_platform
-  when 'ios'
-    Maze.driver.app_state('com.bugsnag.fixtures.reactnative')
-  when 'android'
-    Maze.driver.app_state('com.reactnative')
-  end
-end
-
 When('I relaunch the app after a crash') do
   state = wait_for_app_state :not_running
   # TODO: Really we should be using terminate_app/activate_app with the newer Appium client,
   #       but for some reason they seem to make some scenarios flaky (presumably due to the
   #       nature of how/when they close the app).
+  manager = Maze::Api::Appium::AppManager.new
   if state != :not_running
-    Maze.driver.close_app
-    # Maze.driver.terminate_app Maze.driver.app_id
+    manager.close
+    # manager.terminate
   end
-  Maze.driver.launch_app
-  # Maze.driver.activate_app Maze.driver.app_id
+  manager.launch
+  # manager.activate
 end
 
 When('I clear any error dialogue') do
   # Error dialogue is auto-cleared on IOS
-  next unless Maze.driver.capabilities['os'] == 'android'
+  next unless Maze::Helper.get_current_platform == 'android'
 
-  driver = Maze.driver
-  driver.click_element('android:id/button1') if driver.wait_for_element('android:id/button1', 3)
-  driver.click_element('android:id/aerr_close') if driver.wait_for_element('android:id/aerr_close', 3)
-  driver.click_element('android:id/aerr_restart') if driver.wait_for_element('android:id/aerr_restart', 3)
+  manager = Maze::Api::Appium::UiManager.new
+  manager.click_element('android:id/button1') if manager.wait_for_element('android:id/button1', 3)
+  manager.click_element('android:id/aerr_close') if manager.wait_for_element('android:id/aerr_close', 3)
+  manager.click_element('android:id/aerr_restart') if manager.wait_for_element('android:id/aerr_restart', 3)
 end
 
 When('I configure Bugsnag for {string}') do |scenario_name|
@@ -170,7 +163,7 @@ def get_app_state
   payload_value = Maze::Helper.read_key_path(payload, "events.0.#{field_path}")
 
   expected_value = get_value_for_arch_and_version(table)
-  
+
   unless expected_value.eql?('@skip')
     assert_equal_with_nullability(expected_value, payload_value)
   end
diff --git a/test/react-native/features/support/env.rb b/test/react-native/features/support/env.rb
@@ -10,7 +10,7 @@
 
 Before do
   # See https://www.browserstack.com/docs/app-automate/appium/troubleshooting/app-orientation-issues
-  Maze.driver.set_rotation(:portrait)
+  Maze::Api::Appium::DeviceManager.new.set_rotation(:portrait)
 end
 
 Before('@android_only') do |_scenario|
@@ -45,4 +45,4 @@
 Before('@skip_new_arch_below_074') do |scenario|
   current_version = ENV['RN_VERSION'].nil? ? 0 : ENV['RN_VERSION'].to_f
   skip_this_scenario("Skipping scenario") if ENV['RCT_NEW_ARCH_ENABLED'].eql?('1') && current_version < 0.74
-end
+end
diff --git a/test/react-native/features/unhandled-ios.feature b/test/react-native/features/unhandled-ios.feature
@@ -32,9 +32,9 @@ Scenario: Reporting an Unhandled Native error
   Then I wait to receive an error
   And the event "exceptions.0.errorClass" equals the version-dependent string:
   | arch | version | value                   |
-  | new  | 0.78    | N8facebook3jsi7JSErrorE |
-  | new  | 0.77    | N8facebook3jsi7JSErrorE |
-  | new  | 0.76    | N8facebook3jsi7JSErrorE |
+  | new  | 0.78    | NSException             |
+  | new  | 0.77    | NSException             |
+  | new  | 0.76    | NSException             |
   | new  | 0.75    | N8facebook3jsi7JSErrorE |
   | new  | 0.74    | N8facebook3jsi7JSErrorE |
   | new  | 0.73    | N8facebook3jsi7JSErrorE |
@@ -45,9 +45,9 @@ Scenario: Reporting an Unhandled Native error
   And the event "unhandled" is true
   And the event "exceptions.0.message" equals the version-dependent string:
   | arch | version | value                                                                                                                     |
-  | new  | 0.78    | Exception in HostFunction: UnhandledNativeErrorScenario\n\nError: Exception in HostFunction: UnhandledNativeErrorScenario |
-  | new  | 0.77    | Exception in HostFunction: UnhandledNativeErrorScenario\n\nError: Exception in HostFunction: UnhandledNativeErrorScenario |
-  | new  | 0.76    | Exception in HostFunction: UnhandledNativeErrorScenario\n\nError: Exception in HostFunction: UnhandledNativeErrorScenario |
+  | new  | 0.78    | UnhandledNativeErrorScenario                                                                                              |
+  | new  | 0.77    | UnhandledNativeErrorScenario                                                                                              |
+  | new  | 0.76    | UnhandledNativeErrorScenario                                                                                              |
   | new  | 0.75    | Exception in HostFunction: UnhandledNativeErrorScenario\n\nError: Exception in HostFunction: UnhandledNativeErrorScenario |
   | new  | 0.74    | Exception in HostFunction: UnhandledNativeErrorScenario\n\nError: Exception in HostFunction: UnhandledNativeErrorScenario |
   | new  | 0.73    | Exception in HostFunction: UnhandledNativeErrorScenario\n\nError: Exception in HostFunction: UnhandledNativeErrorScenario |

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ - (void)load:(BugsnagClient *)client {`
`39`	`39`	`// so we need to use an onSendError block and discard based on the error message instead.`
`40`	`40`	`#ifdef RCT_NEW_ARCH_ENABLED`
`41`	`41`	`[client.configuration addOnSendErrorBlock:^BOOL (BugsnagEvent *event) {`
`42`		`- return ![event.errors[0].errorMessage hasPrefix:@"Exception in HostFunction: Unhandled JS Exception"];`
	`42`	`+ return ![event.errors[0].errorMessage containsString:@"Unhandled JS Exception:"];`
`43`	`43`	`}];`
`44`	`44`	`#endif`
`45`	`45`	`}`