Merge branch 'next' into integration/typescript

.buildkite/basic/browser-pipeline.yml

@@ -50,7 +50,7 @@ steps:
       #
       - label: ":browserstack: {{matrix}} non-https tests"
         matrix:
-          # - ios_11 Skipped pending PLAT-14437
+          - ios_11
           - safari_16
         depends_on: "browser-maze-runner-bs"
         timeout_in_minutes: 30
@@ -82,7 +82,7 @@ steps:
           - edge_17
           - safari_10
           - ios_15
-          - android_8
+          - android_9
           - chrome_43
           - chrome_72
           - firefox_78
@@ -109,7 +109,6 @@ steps:
         concurrency_group: "browserstack"
         concurrency_method: eager
 
-
       #
       # BitBar tests
       #
@@ -144,31 +143,31 @@ steps:
         concurrency_group: "bitbar"
         concurrency_method: eager
 
-      # Uncomment the following block to enable IE11 tests on BitBar
-      # - label: ":bitbar: ie_11 Browser tests"
-      #   depends_on: "browser-maze-runner-bb"
-      #   timeout_in_minutes: 30
-      #   plugins:
-      #     docker-compose#v4.12.0:
-      #       pull: browser-maze-runner-bb
-      #       run: browser-maze-runner-bb
-      #       service-ports: true
-      #       use-aliases: true
-      #       command:
-      #         - "--farm=bb"
-      #         - "--browser=ie_11"
-      #         - "--no-tunnel"
-      #         - "--aws-public-ip"
-      #     artifacts#v1.5.0:
-      #       upload:
-      #         - "./test/browser/maze_output/failed/**/*"
-      #     test-collector#v1.10.2:
-      #       files: "reports/TEST-*.xml"
-      #       format: "junit"
-      #       branch: "^main|next$$"
-      #       api-token-env-name: "BROWSER_BUILDKITE_ANALYTICS_TOKEN"
-      #   concurrency: 25
-      #   concurrency_group: "bitbar"
-      #   concurrency_method: eager
-      #   env:
-      #     HOST: "localhost" # IE11 needs the host set to localhost for some reason
+      - label: ":bitbar: ie_11 Browser tests"
+        skip: true # Skipped due to incompatibility
+        depends_on: "browser-maze-runner-bb"
+        timeout_in_minutes: 30
+        plugins:
+          docker-compose#v4.12.0:
+            pull: browser-maze-runner-bb
+            run: browser-maze-runner-bb
+            service-ports: true
+            use-aliases: true
+            command:
+              - "--farm=bb"
+              - "--browser=ie_11"
+              - "--no-tunnel"
+              - "--aws-public-ip"
+          artifacts#v1.5.0:
+            upload:
+              - "./test/browser/maze_output/failed/**/*"
+          test-collector#v1.10.2:
+            files: "reports/TEST-*.xml"
+            format: "junit"
+            branch: "^main|next$$"
+            api-token-env-name: "BROWSER_BUILDKITE_ANALYTICS_TOKEN"
+        concurrency: 25
+        concurrency_group: "bitbar"
+        concurrency_method: eager
+        env:
+          HOST: "localhost" # IE11 needs the host set to localhost

.buildkite/basic/expo-pipeline.yml

@@ -8,29 +8,29 @@ steps:
       depends_on: "publish-js"
       trigger: "bugsnag-expo"
       build:
-        branch: "v53/next"
+        branch: "v54/next"
         env:
           BUGSNAG_JS_BRANCH: "${BUILDKITE_BRANCH}"
           BUGSNAG_JS_COMMIT: "${BUILDKITE_COMMIT}"
           # a branch name that's safe to use as a docker cache identifier
           BUGSNAG_JS_CACHE_SAFE_BRANCH_NAME: "${BRANCH_NAME}"
 
-    - label: "@bugsnag/expo v52/next"
+    - label: "@bugsnag/expo v53/next"
       depends_on: "publish-js"
       trigger: "bugsnag-expo"
       build:
-        branch: "v52/next"
+        branch: "v53/next"
         env:
           BUGSNAG_JS_BRANCH: "${BUILDKITE_BRANCH}"
           BUGSNAG_JS_COMMIT: "${BUILDKITE_COMMIT}"
           # a branch name that's safe to use as a docker cache identifier
           BUGSNAG_JS_CACHE_SAFE_BRANCH_NAME: "${BRANCH_NAME}"
 
-    - label: "@bugsnag/expo v51/next"
+    - label: "@bugsnag/expo v52/next"
       depends_on: "publish-js"
       trigger: "bugsnag-expo"
       build:
-        branch: "v51/next"
+        branch: "v52/next"
         env:
           BUGSNAG_JS_BRANCH: "${BUILDKITE_BRANCH}"
           BUGSNAG_JS_COMMIT: "${BUILDKITE_COMMIT}"

.buildkite/basic/react-native-android-full-pipeline.yml

@@ -74,6 +74,7 @@ steps:
           - "0.79"
 
       - label: ':android: Build react-native-navigation {{matrix}} test fixture APK (Old Arch)'
+        skip: true # Skipped pending PLAT-15027
         key: "build-react-native-navigation-android-fixture-old-arch"
         timeout_in_minutes: 30
         agents:
@@ -98,6 +99,7 @@ steps:
               limit: 1
 
       - label: ':android: Build react-native-navigation {{matrix}} test fixture APK (New Arch)'
+        skip: true # Skipped pending PLAT-15027
         key: "build-react-native-navigation-android-fixture-new-arch"
         timeout_in_minutes: 30
         agents:
@@ -216,6 +218,7 @@ steps:
           - "0.79"
 
       - label: ":bitbar: :android: react-native-navigation {{matrix}} Android 12 (Old Arch) end-to-end tests"
+        skip: true # Skipped pending PLAT-15027
         depends_on: "build-react-native-navigation-android-fixture-old-arch"
         timeout_in_minutes: 10
         plugins:
@@ -257,6 +260,7 @@ steps:
           - "0.72"
 
       - label: ":bitbar: :android: react-native-navigation {{matrix}} Android 12 (New Arch) end-to-end tests"
+        skip: true # Skipped pending PLAT-15027
         depends_on: "build-react-native-navigation-android-fixture-new-arch"
         timeout_in_minutes: 10
         plugins:

.github/workflows/aws-lambda.yml

@@ -24,7 +24,7 @@ jobs:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
 
     - name: Install Ruby
-      uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb
+      uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a
       with:
         ruby-version: '3.1'
 

.github/workflows/branch-sync.yml

@@ -0,0 +1,26 @@
+name: Sync main to next
+on:
+  push:
+    branches: [main]
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Sync main to next
+        uses: bugsnag/github-action-branch-sync@v1
+        with:
+          source-branch: main
+          target-branch: next
+          labels: automation
+          reviewers: ${{ secrets.AUTOMATION_REVIEWERS }}
+          team-reviewers: ${{ secrets.AUTOMATION_TEAM_REVIEWERS }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql.yml

@@ -47,7 +47,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+      uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
       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@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+      uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
 
     # ℹ️ 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@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+      uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/scorecard.yml

@@ -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@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
         with:
           sarif_file: results.sarif
 

.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@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+    - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       id: npm-cache
       if: ${{ !env.ACT }}
       with:

.github/workflows/update-dependencies.yml

@@ -40,7 +40,7 @@ jobs:
       - run: git submodule update --init --recursive
 
       - name: Install ruby
-        uses: ruby/setup-ruby@44511735964dcb71245e7e55f72539531f7bc0eb # v1.257.0
+        uses: ruby/setup-ruby@0481980f17b760ef6bca5e8c55809102a0af1e5a # v1.263.0
         with:
           ruby-version: 2.7
 

CHANGELOG.md

@@ -1,16 +1,37 @@
 # Changelog
 
-## [Unreleased]
+## [8.7.0] - 2025-10-13
+
+### Added
+
+- (electron) Add `codeBundleId` config option to main process  [#2577](https://github.com/bugsnag/bugsnag-js/pull/2577)
+
+### Changed
+
+- Update bugsnag-cocoa to [v6.34.0](https//github.com/bugsnag/bugsnag-cocoa/releases/tag/v6.34.0) [#2571](https://github.com/bugsnag/bugsnag-js/pull/2571)
+
+## [8.6.0] - 2025-09-25
+
+### Added
+
+- Add additional grouping discriminator property to events [#2544](https://github.com/bugsnag/bugsnag-js/pull/2544)
+- (react-native) Handle additional grouping discriminator [#2557](https://github.com/bugsnag/bugsnag-js/pull/2557)
+- (electron) Handle additional grouping discriminator [#2561](https://github.com/bugsnag/bugsnag-js/pull/2561)
 
 ### Changed
 
 - Update bugsnag-cocoa to [v6.33.1](https//github.com/bugsnag/bugsnag-cocoa/releases/tag/v6.33.1) [#2552](https://github.com/bugsnag/bugsnag-js/pull/2552)
 - Update bugsnag-android to [v6.18.0](https//github.com/bugsnag/bugsnag-android/releases/tag/v6.18.0) [#2556](https://github.com/bugsnag/bugsnag-js/pull/2556)
+- (core): Change `startsWith()` to `indexOf() === 0` to support older browsers [#2568](https://github.com/bugsnag/bugsnag-js/pull/2568)
 
 ### Fixed
 
 - (plugin-window-onerror) Guard against errors when trying to call previous handler [#2551](https://github.com/bugsnag/bugsnag-js/pull/2551)
 
+### Dependencies
+
+Update bugsnag-cocoa to [v6.34.0](https//github.com/bugsnag/bugsnag-cocoa/releases/tag/v6.34.0) [#2571](https://github.com/bugsnag/bugsnag-js/pull/2571)
+
 ## [8.5.0] - 2025-09-01
 
 ### Added

docker-compose.yml

@@ -113,7 +113,7 @@ services:
       - ./reports/:/app/test/node/reports/
 
   react-native-maze-runner:
-    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v9-cli
+    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v10-cli
     environment:
       <<: *common-environment
       BITBAR_USERNAME:
@@ -137,7 +137,7 @@ services:
       - ./reports/:/app/reports
 
   react-native-cli-maze-runner:
-    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v9-cli
+    image: 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v10-cli
     environment:
       <<: *common-environment
       BITBAR_USERNAME:

dockerfiles/Dockerfile.browser

@@ -64,7 +64,7 @@ RUN find . -name package.json -type f -mindepth 2 -maxdepth 3 ! -path "./node_mo
 RUN rm -fr **/*/node_modules/
 
 # The maze-runner browser tests (W3C protocol)
-FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v9-cli AS browser-maze-runner
+FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v10-cli AS browser-maze-runner
 
 COPY --from=browser-feature-builder /app/test/browser /app/test/browser/
 WORKDIR /app/test/browser

dockerfiles/Dockerfile.node

@@ -26,7 +26,7 @@ RUN npm pack --verbose packages/plugin-restify/
 RUN npm pack --verbose packages/plugin-hono/
 
 # The maze-runner node tests
-FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v9-cli AS node-maze-runner
+FROM 855461928731.dkr.ecr.us-west-1.amazonaws.com/maze-runner-releases:latest-v10-cli as node-maze-runner
 WORKDIR /app/
 COPY test/node/features test/node/features
 COPY --from=node-feature-builder /app/*.tgz ./

lerna.json

@@ -2,6 +2,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "8.5.0",
+  "version": "8.7.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }