build: migrate Windows release builds to GHA (#45465)

* build: migrate Windows release builds to GHA (#45137)

* build: migrate release builds to GHA

* build: alter CI jobs release script

* build: use windows builders for win-publish (#45340)

* build: remove generate-sas-token (#45347)

* build: add win toolchain for release builds (#45380)

* build: add win toolchain for release builds

* build: fix installed_software.json script

* chore: run pwsh script within src

* build: fixup uploader arch

.env.example

@@ -1,4 +1,5 @@
 # These env vars are only necessary for creating Electron releases.
 # See docs/development/releasing.md
 
+APPVEYOR_CLOUD_TOKEN=
 ELECTRON_GITHUB_TOKEN=

.github/CODEOWNERS

@@ -8,9 +8,13 @@
 DEPS                                    @electron/wg-upgrades
 
 # Releases WG
+/.github/workflows/update_appveyor_image.yml @electron/wg-releases
 /docs/breaking-changes.md               @electron/wg-releases
 /npm/                                   @electron/wg-releases
 /script/release                         @electron/wg-releases
+appveyor.yml                            @electron/wg-releases
+appveyor-bake.yml                       @electron/wg-releases
+appveyor-woa.yml                        @electron/wg-releases
 
 # Security WG
 /lib/browser/devtools.ts                @electron/wg-security

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,3 @@
-blank_issues_enabled: false
 contact_links:
   - name: Discord Chat
     url: https://discord.gg/APGC3k5yaH

.github/ISSUE_TEMPLATE/maintainer_issue.yml

@@ -1,14 +0,0 @@
-name: Maintainer Issue (not for public use)
-description: Only to be created by Electron maintainers
-body:
-- type: checkboxes
-  attributes:
-    label: Confirmation
-    options:
-      - label: I am a [maintainer](https://github.com/orgs/electron/people) of the Electron project. (If not, please create a [different issue type](https://github.com/electron/electron/issues/new/).)
-        required: true
-- type: textarea
-  attributes:
-    label: Description
-  validations:
-    required: true

.github/PULL_REQUEST_TEMPLATE.md

@@ -13,7 +13,7 @@ Contributors guide: https://github.com/electron/electron/blob/main/CONTRIBUTING.
 - [ ] PR description included and stakeholders cc'd
 - [ ] `npm test` passes
 - [ ] tests are [changed or added](https://github.com/electron/electron/blob/main/docs/development/testing.md)
-- [ ] relevant API documentation, tutorials, and examples are updated and follow the [documentation style guide](https://github.com/electron/electron/blob/main/docs/development/style-guide.md)
+- [ ] relevant documentation, tutorials, templates and examples are changed or added
 - [ ] [PR release notes](https://github.com/electron/clerk/blob/main/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/main/README.md#examples).
 
 #### Release Notes

.github/actions/build-electron/action.yml

@@ -108,9 +108,7 @@ runs:
         if [ "${{ inputs.target-platform }}" = "win" ]; then
           cd out/Default
           powershell Compress-Archive -update mksnapshot_args mksnapshot.zip
-          powershell mkdir mktmp\\gen\\v8
-          powershell Copy-Item gen\\v8\\embedded.S mktmp\\gen\\v8
-          powershell Compress-Archive -update -Path mktmp\\gen mksnapshot.zip
+          powershell Compress-Archive -update gen/v8/embedded.S mksnapshot.zip
         else
           (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
         fi

.github/actions/checkout/action.yml

@@ -20,8 +20,6 @@ runs:
     uses: ./src/electron/.github/actions/install-dependencies
   - name: Install Build Tools
     uses: ./src/electron/.github/actions/install-build-tools
-  - name: Set Chromium Git Cookie
-    uses: ./src/electron/.github/actions/set-chromium-cookie
   - name: Get Depot Tools
     shell: bash
     run: |
@@ -75,10 +73,10 @@ runs:
     if: steps.check-cache.outputs.cache_exists == 'false' && inputs.use-cache  == 'true'
     shell: bash
     run: |    
-      # if there is less than 35 GB free space then creating the cache might fail so exit early
+      # if there is less than 20 GB free space then creating the cache might fail so exit early
       freespace=`df -m /mnt/cross-instance-cache | grep -w /mnt/cross-instance-cache | awk '{print $4}'`
       freespace_human=`df -h /mnt/cross-instance-cache | grep -w /mnt/cross-instance-cache | awk '{print $4}'`
-      if [ $freespace -le 35000 ]; then
+      if [ $freespace -le 20000 ]; then
         echo "The cross mount cache has $freespace_human free space which is not enough - exiting"
         exit 1
       else

.github/actions/set-chromium-cookie/action.yml

@@ -1,26 +0,0 @@
-name: 'Set Chromium Git Cookie'
-description: 'Sets an authenticated cookie from Chromium to allow for a higher request limit'
-runs:
-  using: "composite"
-  steps:
-  - name: Set the git cookie from chromium.googlesource.com (Unix)
-    if: ${{ runner.os != 'Windows' && env.CHROMIUM_GIT_COOKIE }}
-    shell: bash
-    run: |
-      eval 'set +o history' 2>/dev/null || setopt HIST_IGNORE_SPACE 2>/dev/null
-      touch ~/.gitcookies
-      chmod 0600 ~/.gitcookies
-
-      git config --global http.cookiefile ~/.gitcookies
-
-      tr , \\t <<\__END__ >>~/.gitcookies
-      ${{ env.CHROMIUM_GIT_COOKIE }}
-      __END__
-      eval 'set -o history' 2>/dev/null || unsetopt HIST_IGNORE_SPACE 2>/dev/null
-  - name: Set the git cookie from chromium.googlesource.com (Windows)
-    if: ${{ runner.os == 'Windows' && env.CHROMIUM_GIT_COOKIE_WINDOWS_STRING }}
-    shell: cmd
-    run: |
-      git config --global http.cookiefile "%USERPROFILE%\.gitcookies"
-      powershell -noprofile -nologo -command Write-Output "${{ env.CHROMIUM_GIT_COOKIE_WINDOWS_STRING }}" >>"%USERPROFILE%\.gitcookies"
-

.github/workflows/archaeologist-dig.yml

@@ -13,7 +13,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup Node.js/npm
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
         with:
           node-version: 20.11.x
       - name: Setting Up Dig Site
@@ -41,7 +41,7 @@ jobs:
           sha-file: .dig-old
           filename: electron.old.d.ts
       - name: Upload artifacts
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 #v4.6.1
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b #v4.5.0
         with:
           name: artifacts
           path: electron/artifacts

.github/workflows/branch-created.yml

@@ -94,7 +94,7 @@ jobs:
             }))
       - name: Create Release Project Board
         if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/copy-project@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/copy-project@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         id: create-release-board
         with:
           drafts: true
@@ -114,14 +114,14 @@ jobs:
           GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
       - name: Find Previous Release Project Board
         if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/find-project@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/find-project@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         id: find-prev-release-board
         with:
           title: ${{ steps.generate-project-metadata.outputs.prev-prev-major }}-x-y
           token: ${{ steps.generate-token.outputs.token }}
       - name: Close Previous Release Project Board
         if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/close-project@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/close-project@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         with:
           project-number: ${{ steps.find-prev-release-board.outputs.number }}
           token: ${{ steps.generate-token.outputs.token }}

.github/workflows/build.yml

@@ -100,7 +100,6 @@ jobs:
         - /mnt/cross-instance-cache:/mnt/cross-instance-cache
         - /var/run/sas:/var/run/sas
     env:
-      CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     outputs:
       build-image-sha: ${{ needs.setup.outputs.build-image-sha }}
@@ -127,7 +126,6 @@ jobs:
         - /mnt/cross-instance-cache:/mnt/cross-instance-cache
         - /var/run/sas:/var/run/sas
     env:
-      CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
       PATCH_UP_APP_CREDS: ${{ secrets.PATCH_UP_APP_CREDS }}
     outputs:
@@ -152,8 +150,6 @@ jobs:
       volumes:
         - /mnt/cross-instance-cache:/mnt/cross-instance-cache
     env:
-      CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}
-      CHROMIUM_GIT_COOKIE_WINDOWS_STRING: ${{ secrets.CHROMIUM_GIT_COOKIE_WINDOWS_STRING }}
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_win=True'
       TARGET_OS: 'win'
       ELECTRON_DEPOT_TOOLS_WIN_TOOLCHAIN: '1'

.github/workflows/clean-src-cache.yml

@@ -1,12 +1,8 @@
 name: Clean Source Cache
 
-description: |
-  This workflow cleans up the source cache on the cross-instance cache volume
-  to free up space. It runs daily at midnight and clears files older than 15 days.
-
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "0 0 * * SUN"  # Run at midnight every Sunday
 
 jobs:
   clean-src-cache:
@@ -21,5 +17,5 @@ jobs:
       shell: bash
       run: |
         df -h /mnt/cross-instance-cache
-        find /mnt/cross-instance-cache -type f -mtime +15 -delete
+        find /mnt/cross-instance-cache -type f -mtime +30 -delete
         df -h /mnt/cross-instance-cache

.github/workflows/issue-commented.yml

@@ -10,7 +10,7 @@ permissions: {}
 jobs:
   issue-commented:
     name: Remove blocked/{need-info,need-repro} on comment
-    if: ${{ (contains(github.event.issue.labels.*.name, 'blocked/need-repro') || contains(github.event.issue.labels.*.name, 'blocked/need-info ❌')) && !contains(fromJSON('["MEMBER", "OWNER", "COLLABORATOR"]'), github.event.comment.author_association) && github.event.comment.user.type != 'Bot' }}
+    if: ${{ (contains(github.event.issue.labels.*.name, 'blocked/need-repro') || contains(github.event.issue.labels.*.name, 'blocked/need-info ❌')) && !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) && github.event.comment.user.type != 'Bot' }}
     runs-on: ubuntu-latest
     steps:
       - name: Generate GitHub App token

.github/workflows/issue-labeled.yml

@@ -20,13 +20,12 @@ jobs:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
           org: electron
       - name: Set status
-        uses: dsanders11/project-actions/edit-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/edit-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           project-number: 90
           field: Status
           field-value: ✅ Triaged
-          fail-if-item-not-found: false
   issue-labeled-blocked:
     name: blocked/* label added
     if: startsWith(github.event.label.name, 'blocked/')
@@ -39,13 +38,12 @@ jobs:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
           org: electron
       - name: Set status
-        uses: dsanders11/project-actions/edit-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/edit-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           project-number: 90
           field: Status
           field-value: 🛑 Blocked
-          fail-if-item-not-found: false
   issue-labeled-blocked-need-repro:
     name: blocked/need-repro label added
     if: github.event.label.name == 'blocked/need-repro'

.github/workflows/issue-opened.yml

@@ -19,7 +19,7 @@ jobs:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
           org: electron
       - name: Add to Issue Triage
-        uses: dsanders11/project-actions/add-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/add-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         with:
           field: Reporter
           field-value: ${{ github.event.issue.user.login }}

.github/workflows/issue-transferred.yml

@@ -10,7 +10,6 @@ jobs:
   issue-transferred:
     name: Issue Transferred
     runs-on: ubuntu-latest
-    if: ${{ !github.event.changes.new_repository.private }}
     steps:
       - name: Generate GitHub App token
         uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
@@ -19,9 +18,7 @@ jobs:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
           org: electron
       - name: Remove from issue triage
-        uses: dsanders11/project-actions/delete-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/delete-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           project-number: 90
-          item: ${{ github.event.changes.new_issue.html_url }}
-          fail-if-item-not-found: false

.github/workflows/issue-unlabeled.yml

@@ -30,10 +30,9 @@ jobs:
           org: electron
       - name: Set status
         if: ${{ steps.check-for-blocked-labels.outputs.NOT_BLOCKED }}
-        uses: dsanders11/project-actions/edit-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/edit-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           project-number: 90
           field: Status
           field-value: 📥 Was Blocked
-          fail-if-item-not-found: false

.github/workflows/pipeline-electron-lint.yml

@@ -12,9 +12,6 @@ concurrency:
   group: electron-lint-${{ github.ref_protected == true && github.run_id || github.ref }}
   cancel-in-progress: ${{ github.ref_protected != true }}
 
-env:
-  CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}  
-
 jobs:
   lint:
     name: Lint
@@ -30,8 +27,6 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Install Dependencies
       uses: ./src/electron/.github/actions/install-dependencies
-    - name: Set Chromium Git Cookie
-      uses: ./src/electron/.github/actions/set-chromium-cookie
     - name: Setup third_party Depot Tools
       shell: bash
       run: |

.github/workflows/pipeline-segment-electron-build.yml

@@ -65,8 +65,6 @@ concurrency:
   cancel-in-progress: ${{ github.ref_protected != true }}
 
 env:
-  CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}
-  CHROMIUM_GIT_COOKIE_WINDOWS_STRING: ${{ secrets.CHROMIUM_GIT_COOKIE_WINDOWS_STRING }}
   ELECTRON_ARTIFACTS_BLOB_STORAGE: ${{ secrets.ELECTRON_ARTIFACTS_BLOB_STORAGE }}
   ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
   SUDOWOODO_EXCHANGE_URL: ${{ secrets.SUDOWOODO_EXCHANGE_URL }}
@@ -102,7 +100,7 @@ jobs:
       run: df -h
     - name: Setup Node.js/npm
       if: ${{ inputs.target-platform == 'macos' }}
-      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
+      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
       with:
         node-version: 20.11.x
         cache: yarn
@@ -127,8 +125,6 @@ jobs:
           GN_EXTRA_ARGS='is_asan=true'
         fi
         echo "GN_EXTRA_ARGS=$GN_EXTRA_ARGS" >> $GITHUB_ENV
-    - name: Set Chromium Git Cookie
-      uses: ./src/electron/.github/actions/set-chromium-cookie
     - name: Get Depot Tools
       timeout-minutes: 5
       run: |

.github/workflows/pipeline-segment-electron-test.yml

@@ -36,8 +36,6 @@ permissions:
   pull-requests: read
 
 env:
-  CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}
-  CHROMIUM_GIT_COOKIE_WINDOWS_STRING: ${{ secrets.CHROMIUM_GIT_COOKIE_WINDOWS_STRING }}
   ELECTRON_OUT_DIR: Default
   ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
 
@@ -76,10 +74,9 @@ jobs:
         echo "C:\Program Files\Git\cmd" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "C:\Program Files\Git\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
         echo "C:\Python311" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        cp "C:\Python311\python.exe" "C:\Python311\python3.exe"
     - name: Setup Node.js/npm
       if: ${{ inputs.target-platform == 'win' }}
-      uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a
+      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
       with:
         node-version: 20.11.x
     - name: Add TCC permissions on macOS
@@ -115,9 +112,6 @@ jobs:
             configure_sys_tccdb "$values"
           fi
         done
-    - name: Turn off the unexpectedly quit dialog on macOS
-      if: ${{ inputs.target-platform == 'macos' }}
-      run: defaults write com.apple.CrashReporter DialogType server
     - name: Checkout Electron
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
@@ -126,8 +120,6 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
     - name: Install Dependencies
       uses: ./src/electron/.github/actions/install-dependencies
-    - name: Set Chromium Git Cookie
-      uses: ./src/electron/.github/actions/set-chromium-cookie
     - name: Get Depot Tools
       timeout-minutes: 5
       run: |
@@ -147,12 +139,12 @@ jobs:
         echo "DISABLE_CRASH_REPORTER_TESTS=true" >> $GITHUB_ENV
         echo "IS_ASAN=true" >> $GITHUB_ENV
     - name: Download Generated Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: generated_artifacts_${{ env.ARTIFACT_KEY }}
         path: ./generated_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
     - name: Download Src Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: src_artifacts_${{ env.ARTIFACT_KEY }}
         path: ./src_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
@@ -247,7 +239,7 @@ jobs:
       if: always() && !cancelled()
     - name: Upload Test Artifacts
       if: always() && !cancelled()
-      uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1
+      uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b
       with:
         name: test_artifacts_${{ env.ARTIFACT_KEY }}_${{ matrix.shard }}
         path: src/electron/spec/artifacts

.github/workflows/pipeline-segment-node-nan-test.yml

@@ -31,7 +31,6 @@ concurrency:
   cancel-in-progress: ${{ github.ref_protected != true }}
 
 env:
-  CHROMIUM_GIT_COOKIE: ${{ secrets.CHROMIUM_GIT_COOKIE }}
   ELECTRON_OUT_DIR: Default
   ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
 
@@ -39,7 +38,7 @@ jobs:
   node-tests:
     name: Run Node.js Tests
     runs-on: electron-arc-linux-amd64-8core
-    timeout-minutes: 30
+    timeout-minutes: 20
     env: 
       TARGET_ARCH: ${{ inputs.target-arch }}
       BUILD_TYPE: linux
@@ -58,8 +57,6 @@ jobs:
         e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }}
     - name: Install Dependencies
       uses: ./src/electron/.github/actions/install-dependencies
-    - name: Set Chromium Git Cookie
-      uses: ./src/electron/.github/actions/set-chromium-cookie
     - name: Get Depot Tools
       timeout-minutes: 5
       run: |
@@ -70,12 +67,12 @@ jobs:
     - name: Add Depot Tools to PATH
       run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
     - name: Download Generated Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
         path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
     - name: Download Src Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: src_artifacts_linux_${{ env.TARGET_ARCH }}
         path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}
@@ -102,7 +99,7 @@ jobs:
   nan-tests:
     name: Run Nan Tests
     runs-on: electron-arc-linux-amd64-4core
-    timeout-minutes: 30
+    timeout-minutes: 20
     env: 
       TARGET_ARCH: ${{ inputs.target-arch }}
       BUILD_TYPE: linux
@@ -121,8 +118,6 @@ jobs:
         e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }}
     - name: Install Dependencies
       uses: ./src/electron/.github/actions/install-dependencies
-    - name: Set Chromium Git Cookie
-      uses: ./src/electron/.github/actions/set-chromium-cookie
     - name: Get Depot Tools
       timeout-minutes: 5
       run: |
@@ -133,12 +128,12 @@ jobs:
     - name: Add Depot Tools to PATH
       run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
     - name: Download Generated Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
         path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
     - name: Download Src Artifacts
-      uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806
+      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
       with:
         name: src_artifacts_linux_${{ env.TARGET_ARCH }}
         path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}

.github/workflows/pull-request-labeled.yml

@@ -33,7 +33,7 @@ jobs:
           creds: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
           org: electron
       - name: Set status
-        uses: dsanders11/project-actions/edit-item@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/edit-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         with:
           token: ${{ steps.generate-token.outputs.token }}
           project-number: 94

.github/workflows/scorecards.yml

@@ -28,7 +28,7 @@ jobs:
 
       # This is a pre-submit / pre-release.
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -42,7 +42,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@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: SARIF file
           path: results.sarif
@@ -50,6 +50,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
         with:
           sarif_file: results.sarif

.github/workflows/stable-prep-items.yml

@@ -27,7 +27,7 @@ jobs:
           PROJECT_NUMBER=$(gh project list --owner electron --format json | jq -r '.projects | map(select(.title | test("^[0-9]+-x-y$"))) | max_by(.number) | .number')
           echo "PROJECT_NUMBER=$PROJECT_NUMBER" >> "$GITHUB_OUTPUT"
       - name: Update Completed Stable Prep Items
-        uses: dsanders11/project-actions/completed-by@9c80cd31f58599941c64f74636bea95ba5d46090 # v1.5.1
+        uses: dsanders11/project-actions/completed-by@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
         with:
           field: Prep Status
           field-value: ✅ Complete

.github/workflows/stale.yml

@@ -16,7 +16,7 @@ jobs:
         id: generate-token
         with:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # tag: v9.1.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # tag: v9.0.0
         with:
           repo-token: ${{ steps.generate-token.outputs.token }}
           days-before-stale: 90
@@ -39,7 +39,7 @@ jobs:
         id: generate-token
         with:
           creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
-      - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # tag: v9.1.0
+      - uses: actions/stale@28ca1036281a5e5922ead5184a1bbf96e5fc984e # tag: v9.0.0
         with:
           repo-token: ${{ steps.generate-token.outputs.token }}
           days-before-stale: -1

.github/workflows/update_appveyor_image.yml

@@ -0,0 +1,78 @@
+name: Update AppVeyor Image
+
+# Run chron daily Mon-Fri
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 8 * * 1-5' # runs 8:00 every business day (see https://crontab.guru)
+
+permissions: {}
+
+jobs:
+  bake-appveyor-image:
+    name: Bake AppVeyor Image
+    runs-on: ubuntu-latest
+    steps:
+    - name: Generate GitHub App token
+      uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
+      id: generate-token
+      with:
+        creds: ${{ secrets.APPVEYOR_UPDATER_GH_APP_CREDS }}
+    - name: Checkout
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        fetch-depth: 0
+        token: ${{ steps.generate-token.outputs.token }}
+        ref: ${{ github.event.pull_request.head.sha }}
+    - name: Setup Node.js
+      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
+      with:
+        node-version: 20.11.x
+    - name: Yarn install
+      run: |
+        node script/yarn.js install --frozen-lockfile
+    - name: Set Repo for Commit
+      run: git config --global --add safe.directory $GITHUB_WORKSPACE
+    - name: Check AppVeyor Image
+      env:
+        APPVEYOR_TOKEN: ${{ secrets.APPVEYOR_TOKEN }}
+      run: |
+        node ./script/prepare-appveyor
+        if [ -f ./image_version.txt ]; then
+          echo "APPVEYOR_IMAGE_VERSION="$(cat image_version.txt)"" >> $GITHUB_ENV
+          rm image_version.txt
+        fi
+    - name: (Optionally) Update Appveyor Image
+      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
+      uses: mikefarah/yq@4839dbbf80445070a31c7a9c1055da527db2d5ee # v4.44.6
+      with:
+        cmd: |
+          yq '.image = "${{ env.APPVEYOR_IMAGE_VERSION }}"' "appveyor.yml" > "appveyor2.yml"
+          yq '.image = "${{ env.APPVEYOR_IMAGE_VERSION }}"' "appveyor-woa.yml" > "appveyor-woa2.yml"
+    - name: (Optionally) Generate Commit Diff
+      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
+      run: |
+        diff -w -B appveyor.yml appveyor2.yml > appveyor.diff || true
+        patch -f appveyor.yml < appveyor.diff
+        rm appveyor2.yml appveyor.diff
+        git add appveyor.yml
+    - name: (Optionally) Generate Commit Diff for WOA
+      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
+      run: |
+        diff -w -B appveyor-woa.yml appveyor-woa2.yml > appveyor-woa.diff || true
+        patch -f appveyor-woa.yml < appveyor-woa.diff
+        rm appveyor-woa2.yml appveyor-woa.diff
+        git add appveyor-woa.yml
+    - name: (Optionally) Commit to Branch
+      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
+      uses: dsanders11/github-app-commit-action@43de6da2f4d927e997c0784c7a0b61bd19ad6aac # v1.5.0
+      with:
+        message: 'build: update appveyor image to latest version'
+        ref: bump-appveyor-image
+        token: ${{ steps.generate-token.outputs.token }}
+    - name: (Optionally) Create Pull Request
+      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
+      run: |
+        printf "This PR updates appveyor.yml to the latest baked image, ${{ env.APPVEYOR_IMAGE_VERSION }}.\n\nNotes: none" | gh pr create --head bump-appveyor-image --label no-backport --label semver/none --title 'build: update appveyor image to latest version' --body-file=-
+      env:
+        GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}

.github/workflows/windows-publish.yml

@@ -34,7 +34,7 @@ jobs:
       build-image-sha: ${{ inputs.build-image-sha }}
     steps:
     - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
       with:
         path: src/electron
         fetch-depth: 0

BUILD.gn

@@ -224,21 +224,11 @@ webpack_build("electron_utility_bundle") {
   out_file = "$target_gen_dir/js2c/utility_init.js"
 }
 
-webpack_build("electron_preload_realm_bundle") {
-  deps = [ ":build_electron_definitions" ]
-
-  inputs = auto_filenames.preload_realm_bundle_deps
-
-  config_file = "//electron/build/webpack/webpack.config.preload_realm.js"
-  out_file = "$target_gen_dir/js2c/preload_realm_bundle.js"
-}
-
 action("electron_js2c") {
   deps = [
     ":electron_browser_bundle",
     ":electron_isolated_renderer_bundle",
     ":electron_node_bundle",
-    ":electron_preload_realm_bundle",
     ":electron_renderer_bundle",
     ":electron_sandboxed_renderer_bundle",
     ":electron_utility_bundle",
@@ -250,7 +240,6 @@ action("electron_js2c") {
     "$target_gen_dir/js2c/browser_init.js",
     "$target_gen_dir/js2c/isolated_bundle.js",
     "$target_gen_dir/js2c/node_init.js",
-    "$target_gen_dir/js2c/preload_realm_bundle.js",
     "$target_gen_dir/js2c/renderer_init.js",
     "$target_gen_dir/js2c/sandbox_bundle.js",
     "$target_gen_dir/js2c/utility_init.js",
@@ -441,7 +430,6 @@ source_set("electron_lib") {
     "chromium_src:chrome_spellchecker",
     "shell/common:mojo",
     "shell/common:plugin",
-    "shell/common:web_contents_utility",
     "shell/services/node/public/mojom",
     "//base:base_static",
     "//base/allocator:buildflags",
@@ -451,7 +439,7 @@ source_set("electron_lib") {
     "//components/autofill/core/common:features",
     "//components/certificate_transparency",
     "//components/compose:buildflags",
-    "//components/embedder_support:user_agent",
+    "//components/embedder_support:browser_util",
     "//components/input:input",
     "//components/language/core/browser",
     "//components/net_log",

CONTRIBUTING.md

@@ -71,4 +71,4 @@ See [Coding Style](https://electronjs.org/docs/development/coding-style) for inf
 ## Further Reading
 
 For more in-depth guides on developing Electron, see
-[/docs/development](/docs/development/README.md).
+[/docs/development](/docs/development/README.md)

DEPS

@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '136.0.7062.0',
+    '134.0.6968.0',
   'node_version':
-    'v22.14.0',
+    'v22.9.0',
   'nan_version':
     'e14bdcd1f72d62bca1d541b66da43130384ec213',
   'squirrel.mac_version':
@@ -62,6 +62,10 @@ vars = {
 
   'checkout_nacl':
     False,
+  'checkout_libaom':
+    True,
+  'checkout_oculus_sdk':
+    False,
   'checkout_openxr':
     False,
   'build_with_chromium':
@@ -70,6 +74,8 @@ vars = {
     False,
   'checkout_android_native_support':
     False,
+  'checkout_google_benchmark':
+    False,
   'checkout_clang_tidy':
     True,
 }

README.md

@@ -1,6 +1,7 @@
 [![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org)
 
 [![GitHub Actions Build Status](https://github.com/electron/electron/actions/workflows/build.yml/badge.svg)](https://github.com/electron/electron/actions/workflows/build.yml)
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/4lggi9dpjc1qob7k/branch/main?svg=true)](https://ci.appveyor.com/project/electron-bot/electron-ljo26/branch/main)
 [![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.gg/electronjs)
 
 :memo: Available Translations: 🇨🇳 🇧🇷 🇪🇸 🇯🇵 🇷🇺 🇫🇷 🇺🇸 🇩🇪.

build/args/all.gn

@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json
-node_module_version = 135
+node_module_version = 133
 
 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
@@ -48,8 +48,7 @@ enable_cet_shadow_stack = false
 is_cfi = false
 
 # TODO: fix this once sysroots have been updated.
-use_qt5 = false
-use_qt6 = false
+use_qt = false
 
 # Disables the builtins PGO for V8
 v8_builtins_profiling_log_file = ""
@@ -66,6 +65,11 @@ v8_enable_private_mapping_fork_optimization = true
 # Expose public V8 symbols for native modules.
 v8_expose_public_symbols = true
 
+# Disables unsafe-buffers-usage plugin due to incompatibilities with our reclient implementation
+# Ref: https://chromium-review.googlesource.com/c/chromium/src/+/5426599
+# Ref: https://github.com/electron/electron/commit/8e20f16ea35eeaeb149ae63bad3703d782665f6a
+clang_unsafe_buffers_paths = ""
+
 # Disable snapshotting a page when printing for its content to be analyzed for
 # sensitive content by enterprise users.
 enterprise_cloud_content_analysis = false
@@ -74,4 +78,5 @@ enterprise_cloud_content_analysis = false
 # https://issues.chromium.org/issues/40943039
 content_enable_legacy_ipc = true
 
+# Electron has its own unsafe-buffers enforcement directories.
 clang_unsafe_buffers_paths = "//electron/electron_unsafe_buffers_paths.txt"

build/profile_toolchain.py

@@ -45,7 +45,7 @@ def windows_profile():
     win_sdk_dir = SetEnvironmentAndGetSDKDir()
     path = NormalizePath(os.environ['GYP_MSVS_OVERRIDE_PATH'])
 
-    # since current windows executable are symbols path dependent,
+    # since current windows executable are symbols path dependant,
     # profile the current directory too
     return {
         'pwd': os.getcwd(),

build/webpack/webpack.config.preload_realm.js

@@ -1,6 +0,0 @@
-module.exports = require('./webpack.config.base')({
-  target: 'preload_realm',
-  alwaysHasNode: false,
-  wrapInitWithProfilingTimeout: true,
-  wrapInitWithTryCatch: true
-});

chromium_src/BUILD.gn

@@ -68,8 +68,6 @@ static_library("chrome") {
     "//chrome/browser/picture_in_picture/picture_in_picture_occlusion_tracker_observer.h",
     "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc",
     "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.h",
-    "//chrome/browser/picture_in_picture/picture_in_picture_window_manager_uma_helper.cc",
-    "//chrome/browser/picture_in_picture/picture_in_picture_window_manager_uma_helper.h",
     "//chrome/browser/picture_in_picture/scoped_picture_in_picture_occlusion_observation.cc",
     "//chrome/browser/picture_in_picture/scoped_picture_in_picture_occlusion_observation.h",
     "//chrome/browser/platform_util.cc",
@@ -199,7 +197,6 @@ static_library("chrome") {
     "//chrome/browser/ui/webui/tab_search:mojo_bindings",
     "//chrome/browser/web_applications/mojom:mojom_web_apps_enum",
     "//components/enterprise/buildflags",
-    "//components/enterprise/common/proto:browser_events_proto",
     "//components/enterprise/common/proto:connectors_proto",
     "//components/enterprise/obfuscation/core:enterprise_obfuscation",
     "//components/safe_browsing/core/browser/db:safebrowsing_proto",

default_app/preload.ts

@@ -34,25 +34,18 @@ async function loadSVG (element: HTMLSpanElement) {
 
 async function initialize () {
   const electronPath = await ipcRenderer.invoke('bootstrap');
-  function replaceText (selector: string, text: string, link?: string) {
+
+  function replaceText (selector: string, text: string) {
     const element = document.querySelector<HTMLElement>(selector);
     if (element) {
-      if (link) {
-        const anchor = document.createElement('a');
-        anchor.textContent = text;
-        anchor.href = link;
-        anchor.target = '_blank';
-        element.appendChild(anchor);
-      } else {
-        element.innerText = text;
-      }
+      element.innerText = text;
     }
   }
 
-  replaceText('.electron-version', `Electron v${process.versions.electron}`, 'https://electronjs.org/docs');
-  replaceText('.chrome-version', `Chromium v${process.versions.chrome}`, 'https://developer.chrome.com/docs/chromium');
-  replaceText('.node-version', `Node v${process.versions.node}`, `https://nodejs.org/docs/v${process.versions.node}/api`);
-  replaceText('.v8-version', `v8 v${process.versions.v8}`, 'https://v8.dev/docs');
+  replaceText('.electron-version', `Electron v${process.versions.electron}`);
+  replaceText('.chrome-version', `Chromium v${process.versions.chrome}`);
+  replaceText('.node-version', `Node v${process.versions.node}`);
+  replaceText('.v8-version', `v8 v${process.versions.v8}`);
   replaceText('.command-example', `${electronPath} path-to-app`);
 
   for (const element of document.querySelectorAll<HTMLSpanElement>('.octicon')) {

docs/api/command-line-switches.md

@@ -313,12 +313,6 @@ Set the default value of the `verbatim` parameter in the Node.js [`dns.lookup()`
 
 The default is `verbatim` and `dns.setDefaultResultOrder()` have higher priority than `--dns-result-order`.
 
-### `--diagnostic-dir=directory`
-
-Set the directory to which all Node.js diagnostic output files are written. Defaults to current working directory.
-
-Affects the default output directory of [v8.setHeapSnapshotNearHeapLimit](https://nodejs.org/docs/latest/api/v8.html#v8setheapsnapshotnearheaplimitlimit).
-
 [app]: app.md
 [append-switch]: command-line.md#commandlineappendswitchswitch-value
 [debugging-main-process]: ../tutorial/debugging-main-process.md

docs/api/dialog.md

@@ -228,7 +228,7 @@ The `filters` specifies an array of file types that can be displayed, see
 **Note:** On macOS, using the asynchronous version is recommended to avoid issues when
 expanding and collapsing the dialog.
 
-### `dialog.showMessageBoxSync([window, ]options)`
+### `dialog.showMessageBoxSync([wndow, ]options)`
 
 * `window` [BaseWindow](base-window.md) (optional)
 * `options` Object

docs/api/extensions-api.md

@@ -1,124 +0,0 @@
-## Class: Extensions
-
-> Load and interact with extensions.
-
-Process: [Main](../glossary.md#main-process)<br />
-_This class is not exported from the `'electron'` module. It is only available as a return value of other methods in the Electron API._
-
-Instances of the `Extensions` class are accessed by using `extensions` property of
-a `Session`.
-
-### Instance Events
-
-The following events are available on instances of `Extensions`:
-
-#### Event: 'extension-loaded'
-
-Returns:
-
-* `event` Event
-* `extension` [Extension](structures/extension.md)
-
-Emitted after an extension is loaded. This occurs whenever an extension is
-added to the "enabled" set of extensions. This includes:
-
-* Extensions being loaded from `Extensions.loadExtension`.
-* Extensions being reloaded:
-  * from a crash.
-  * if the extension requested it ([`chrome.runtime.reload()`](https://developer.chrome.com/extensions/runtime#method-reload)).
-
-#### Event: 'extension-unloaded'
-
-Returns:
-
-* `event` Event
-* `extension` [Extension](structures/extension.md)
-
-Emitted after an extension is unloaded. This occurs when
-`Session.removeExtension` is called.
-
-#### Event: 'extension-ready'
-
-Returns:
-
-* `event` Event
-* `extension` [Extension](structures/extension.md)
-
-Emitted after an extension is loaded and all necessary browser state is
-initialized to support the start of the extension's background page.
-
-### Instance Methods
-
-The following methods are available on instances of `Extensions`:
-
-#### `extensions.loadExtension(path[, options])`
-
-* `path` string - Path to a directory containing an unpacked Chrome extension
-* `options` Object (optional)
-  * `allowFileAccess` boolean - Whether to allow the extension to read local files over `file://`
-    protocol and inject content scripts into `file://` pages. This is required e.g. for loading
-    devtools extensions on `file://` URLs. Defaults to false.
-
-Returns `Promise<Extension>` - resolves when the extension is loaded.
-
-This method will raise an exception if the extension could not be loaded. If
-there are warnings when installing the extension (e.g. if the extension
-requests an API that Electron does not support) then they will be logged to the
-console.
-
-Note that Electron does not support the full range of Chrome extensions APIs.
-See [Supported Extensions APIs](extensions.md#supported-extensions-apis) for
-more details on what is supported.
-
-Note that in previous versions of Electron, extensions that were loaded would
-be remembered for future runs of the application. This is no longer the case:
-`loadExtension` must be called on every boot of your app if you want the
-extension to be loaded.
-
-```js
-const { app, session } = require('electron')
-const path = require('node:path')
-
-app.whenReady().then(async () => {
-  await session.defaultSession.extensions.loadExtension(
-    path.join(__dirname, 'react-devtools'),
-    // allowFileAccess is required to load the devtools extension on file:// URLs.
-    { allowFileAccess: true }
-  )
-  // Note that in order to use the React DevTools extension, you'll need to
-  // download and unzip a copy of the extension.
-})
-```
-
-This API does not support loading packed (.crx) extensions.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-**Note:** Loading extensions into in-memory (non-persistent) sessions is not
-supported and will throw an error.
-
-#### `extensions.removeExtension(extensionId)`
-
-* `extensionId` string - ID of extension to remove
-
-Unloads an extension.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-#### `extensions.getExtension(extensionId)`
-
-* `extensionId` string - ID of extension to query
-
-Returns `Extension | null` - The loaded extension with the given ID.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-#### `extensions.getAllExtensions()`
-
-Returns `Extension[]` - A list of all loaded extensions.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.

docs/api/extensions.md

@@ -14,7 +14,7 @@ but it also happens to support some other extension capabilities.
 
 Electron only supports loading unpacked extensions (i.e., `.crx` files do not
 work). Extensions are installed per-`session`. To load an extension, call
-[`ses.extensions.loadExtension`](extensions-api.md#extensionsloadextensionpath-options):
+[`ses.loadExtension`](session.md#sesloadextensionpath-options):
 
 ```js
 const { session } = require('electron')

docs/api/global-shortcut.md

@@ -12,17 +12,9 @@ shortcuts.
 not have the keyboard focus. This module cannot be used before the `ready`
 event of the app module is emitted.
 
-Please also note that it is also possible to use Chromium's
-`GlobalShortcutsPortal` implementation, which allows apps to bind global
-shortcuts when running within a Wayland session.
-
 ```js
 const { app, globalShortcut } = require('electron')
 
-// Enable usage of Portal's globalShortcuts. This is essential for cases when
-// the app runs in a Wayland session.
-app.commandLine.appendSwitch('enable-features', 'GlobalShortcutsPortal')
-
 app.whenReady().then(() => {
   // Register a 'CommandOrControl+X' shortcut listener.
   const ret = globalShortcut.register('CommandOrControl+X', () => {

docs/api/in-app-purchase.md

@@ -10,13 +10,13 @@ The `inAppPurchase` module emits the following events:
 
 ### Event: 'transactions-updated'
 
+Emitted when one or more transactions have been updated.
+
 Returns:
 
 * `event` Event
 * `transactions` Transaction[] - Array of [`Transaction`](structures/transaction.md) objects.
 
-Emitted when one or more transactions have been updated.
-
 ## Methods
 
 The `inAppPurchase` module has the following methods:

docs/api/ipc-main-service-worker.md

@@ -1,75 +0,0 @@
-## Class: IpcMainServiceWorker
-
-> Communicate asynchronously from the main process to service workers.
-
-Process: [Main](../glossary.md#main-process)
-
-> [!NOTE]
-> This API is a subtle variation of [`IpcMain`](ipc-main.md)—targeted for
-> communicating with service workers. For communicating with web frames,
-> consult the `IpcMain` documentation.
-
-<!-- TODO(samuelmaddock): refactor doc gen to allow generics to reduce duplication -->
-
-### Instance Methods
-
-#### `ipcMainServiceWorker.on(channel, listener)`
-
-* `channel` string
-* `listener` Function
-  * `event` [IpcMainServiceWorkerEvent][ipc-main-service-worker-event]
-  * `...args` any[]
-
-Listens to `channel`, when a new message arrives `listener` would be called with
-`listener(event, args...)`.
-
-#### `ipcMainServiceWorker.once(channel, listener)`
-
-* `channel` string
-* `listener` Function
-  * `event` [IpcMainServiceWorkerEvent][ipc-main-service-worker-event]
-  * `...args` any[]
-
-Adds a one time `listener` function for the event. This `listener` is invoked
-only the next time a message is sent to `channel`, after which it is removed.
-
-#### `ipcMainServiceWorker.removeListener(channel, listener)`
-
-* `channel` string
-* `listener` Function
-  * `...args` any[]
-
-Removes the specified `listener` from the listener array for the specified
-`channel`.
-
-#### `ipcMainServiceWorker.removeAllListeners([channel])`
-
-* `channel` string (optional)
-
-Removes listeners of the specified `channel`.
-
-#### `ipcMainServiceWorker.handle(channel, listener)`
-
-* `channel` string
-* `listener` Function\<Promise\<any\> | any\>
-  * `event` [IpcMainServiceWorkerInvokeEvent][ipc-main-service-worker-invoke-event]
-  * `...args` any[]
-
-#### `ipcMainServiceWorker.handleOnce(channel, listener)`
-
-* `channel` string
-* `listener` Function\<Promise\<any\> | any\>
-  * `event` [IpcMainServiceWorkerInvokeEvent][ipc-main-service-worker-invoke-event]
-  * `...args` any[]
-
-Handles a single `invoke`able IPC message, then removes the listener. See
-`ipcMainServiceWorker.handle(channel, listener)`.
-
-#### `ipcMainServiceWorker.removeHandler(channel)`
-
-* `channel` string
-
-Removes any handler for `channel`, if present.
-
-[ipc-main-service-worker-event]:../api/structures/ipc-main-service-worker-event.md
-[ipc-main-service-worker-invoke-event]:../api/structures/ipc-main-service-worker-invoke-event.md

docs/api/navigation-history.md

@@ -5,16 +5,7 @@
 Process: [Main](../glossary.md#main-process)<br />
 _This class is not exported from the `'electron'` module. It is only available as a return value of other methods in the Electron API._
 
-Each [NavigationEntry](./structures/navigation-entry.md) corresponds to a specific visited page.
-The indexing system follows a sequential order, where the entry for the earliest visited
-page is at index 0 and the entry for the most recent visited page is at index N.
-
-Some APIs in this class also accept an _offset_, which is an integer representing the relative
-position of an index from the current entry according to the above indexing system (i.e. an offset
-value of `1` would represent going forward in history by one page).
-
-Maintaining this ordered list of navigation entries enables seamless navigation both backward and
-forward through the user's browsing history.
+Each navigation entry corresponds to a specific page. The indexing system follows a sequential order, where the first available navigation entry is at index 0, representing the earliest visited page, and the latest navigation entry is at index N, representing the most recent page. Maintaining this ordered list of navigation entries enables seamless navigation both backward and forward through the user's browsing history.
 
 ### Instance Methods
 
@@ -30,7 +21,7 @@ Returns `boolean` - Whether the browser can go forward to next web page.
 
 * `offset` Integer
 
-Returns `boolean` - Whether the web page can go to the specified relative `offset` from the current entry.
+Returns `boolean` - Whether the web page can go to the specified `offset` from the current entry.
 
 #### `navigationHistory.clear()`
 
@@ -66,7 +57,7 @@ Navigates browser to the specified absolute web page index.
 
 * `offset` Integer
 
-Navigates to the specified relative offset from the current entry.
+Navigates to the specified offset from the current entry.
 
 #### `navigationHistory.length()`
 
@@ -83,22 +74,3 @@ Returns `boolean` - Whether the navigation entry was removed from the webContent
 #### `navigationHistory.getAllEntries()`
 
 Returns [`NavigationEntry[]`](structures/navigation-entry.md) - WebContents complete history.
-
-#### `navigationHistory.restore(options)`
-
-Restores navigation history and loads the given entry in the in stack. Will make a best effort
-to restore not just the navigation stack but also the state of the individual pages - for instance
-including HTML form values or the scroll position. It's recommended to call this API before any
-navigation entries are created, so ideally before you call `loadURL()` or `loadFile()` on the
-`webContents` object.
-
-This API allows you to create common flows that aim to restore, recreate, or clone other webContents.
-
-* `options` Object
-  * `entries` [NavigationEntry[]](structures/navigation-entry.md) - Result of a prior `getAllEntries()` call
-  * `index` Integer (optional) - Index of the stack that should be loaded. If you set it to `0`, the webContents will load the first (oldest) entry. If you leave it undefined, Electron will automatically load the last (newest) entry.
-
-Returns `Promise<void>` - the promise will resolve when the page has finished loading the selected navigation entry
-(see [`did-finish-load`](web-contents.md#event-did-finish-load)), and rejects
-if the page fails to load (see
-[`did-fail-load`](web-contents.md#event-did-fail-load)). A noop rejection handler is already attached, which avoids unhandled rejection errors.

docs/api/power-monitor.md

@@ -26,10 +26,7 @@ Emitted when system changes to battery power.
 
 ### Event: 'thermal-state-change' _macOS_
 
-Returns:
-
-* `details` Event\<\>
-  * `state` string - The system's new thermal state. Can be `unknown`, `nominal`, `fair`, `serious`, `critical`.
+* `state` string - The system's new thermal state. Can be `unknown`, `nominal`, `fair`, `serious`, `critical`.
 
 Emitted when the thermal state of the system changes. Notification of a change
 in the thermal status of the system, such as entering a critical temperature
@@ -47,8 +44,7 @@ See https://developer.apple.com/library/archive/documentation/Performance/Concep
 
 Returns:
 
-* `details` Event\<\>
-  * `limit` number - The operating system's advertised speed limit for CPUs, in percent.
+* `limit` number - The operating system's advertised speed limit for CPUs, in percent.
 
 Notification of a change in the operating system's advertised speed limit for
 CPUs, in percent. Values below 100 indicate that the system is impairing

docs/api/process.md

@@ -114,7 +114,6 @@ A `string` representing the current process's type, can be:
 
 * `browser` - The main process
 * `renderer` - A renderer process
-* `service-worker` - In a service worker
 * `worker` - In a web worker
 * `utility` - In a node process launched as a service
 

docs/api/service-worker-main.md

@@ -15,19 +15,6 @@ _This class is not exported from the `'electron'` module. It is only available a
 
 Returns `boolean` - Whether the service worker has been destroyed.
 
-#### `serviceWorker.send(channel, ...args)` _Experimental_
-
-- `channel` string
-- `...args` any[]
-
-Send an asynchronous message to the service worker process via `channel`, along with
-arguments. Arguments will be serialized with the [Structured Clone Algorithm][SCA],
-just like [`postMessage`][], so prototype chains will not be included.
-Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will throw an exception.
-
-The service worker process can handle the message by listening to `channel` with the
-[`ipcRenderer`](ipc-renderer.md) module.
-
 #### `serviceWorker.startTask()` _Experimental_
 
 Returns `Object`:
@@ -38,10 +25,6 @@ Initiate a task to keep the service worker alive until ended.
 
 ### Instance Properties
 
-#### `serviceWorker.ipc` _Readonly_ _Experimental_
-
-An [`IpcMainServiceWorker`](ipc-main-service-worker.md) instance scoped to the service worker.
-
 #### `serviceWorker.scope` _Readonly_ _Experimental_
 
 A `string` representing the scope URL of the service worker.
@@ -49,6 +32,3 @@ A `string` representing the scope URL of the service worker.
 #### `serviceWorker.versionId` _Readonly_ _Experimental_
 
 A `number` representing the ID of the specific version of the service worker script in its scope.
-
-[SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
-[`postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage

docs/api/service-workers.md

@@ -107,6 +107,8 @@ Returns `Promise<ServiceWorkerMain>` - Resolves with the service worker when it'
 
 Starts the service worker or does nothing if already running.
 
+<!-- TODO(samuelmaddock): extend example to send IPC after starting worker -->
+
 ```js
 const { app, session } = require('electron')
 const { serviceWorkers } = session.defaultSession
@@ -118,8 +120,7 @@ app.on('browser-window-created', async (event, window) => {
   for (const scope of workerScopes) {
     try {
       // Ensure worker is started
-      const serviceWorker = await serviceWorkers.startWorkerForScope(scope)
-      serviceWorker.send('window-created', { windowId: window.id })
+      await serviceWorkers.startWorkerForScope(scope)
     } catch (error) {
       console.error(`Failed to start service worker for ${scope}`)
       console.error(error)

docs/api/session.md

@@ -651,7 +651,7 @@ Clears the session’s HTTP cache.
     `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
     specified, clear all storage types.
   * `quotas` string[] (optional) - The types of quotas to clear, can be
-    `temporary`. If not specified, clear all quotas.
+    `temporary`, `syncable`. If not specified, clear all quotas.
 
 Returns `Promise<void>` - resolves when the storage data has been cleared.
 
@@ -933,7 +933,6 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents
     * `storage-access` - Allows content loaded in a third-party context to request access to third-party cookies using the [Storage Access API](https://developer.mozilla.org/en-US/docs/Web/API/Storage_Access_API).
     * `top-level-storage-access` -  Allow top-level sites to request third-party cookie access on behalf of embedded content originating from another site in the same related website set using the [Storage Access API](https://developer.mozilla.org/en-US/docs/Web/API/Storage_Access_API).
     * `usb` - Expose non-standard Universal Serial Bus (USB) compatible devices services to the web with the [WebUSB API](https://developer.mozilla.org/en-US/docs/Web/API/WebUSB_API).
-    * `deprecated-sync-clipboard-read` _Deprecated_ - Request access to run `document.execCommand("paste")`
   * `requestingOrigin` string - The origin URL of the permission check
   * `details` Object - Some properties are only available on certain permission types.
     * `embeddingOrigin` string (optional) - The origin of the frame embedding the frame that made the permission check.  Only set for cross-origin sub frames making permission checks.
@@ -1485,7 +1484,7 @@ will not work on non-persistent (in-memory) sessions.
 
 **Note:** On macOS and Windows 10 this word will be removed from the OS custom dictionary as well
 
-#### `ses.loadExtension(path[, options])` _Deprecated_
+#### `ses.loadExtension(path[, options])`
 
 * `path` string - Path to a directory containing an unpacked Chrome extension
 * `options` Object (optional)
@@ -1532,9 +1531,7 @@ is emitted.
 **Note:** Loading extensions into in-memory (non-persistent) sessions is not
 supported and will throw an error.
 
-**Deprecated:** Use the new `ses.extensions.loadExtension` API.
-
-#### `ses.removeExtension(extensionId)` _Deprecated_
+#### `ses.removeExtension(extensionId)`
 
 * `extensionId` string - ID of extension to remove
 
@@ -1543,9 +1540,7 @@ Unloads an extension.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Deprecated:** Use the new `ses.extensions.removeExtension` API.
-
-#### `ses.getExtension(extensionId)` _Deprecated_
+#### `ses.getExtension(extensionId)`
 
 * `extensionId` string - ID of extension to query
 
@@ -1554,17 +1549,13 @@ Returns `Extension | null` - The loaded extension with the given ID.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Deprecated:** Use the new `ses.extensions.getExtension` API.
-
-#### `ses.getAllExtensions()` _Deprecated_
+#### `ses.getAllExtensions()`
 
 Returns `Extension[]` - A list of all loaded extensions.
 
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.
 
-**Deprecated:** Use the new `ses.extensions.getAllExtensions` API.
-
 #### `ses.getStoragePath()`
 
 Returns `string | null` - The absolute file system path where data for this
@@ -1627,10 +1618,6 @@ session is persisted on disk.  For in memory sessions this returns `null`.
 
 A [`Cookies`](cookies.md) object for this session.
 
-#### `ses.extensions` _Readonly_
-
-A [`Extensions`](extensions-api.md) object for this session.
-
 #### `ses.serviceWorkers` _Readonly_
 
 A [`ServiceWorkers`](service-workers.md) object for this session.

docs/api/structures/base-window-options.md

@@ -97,10 +97,9 @@
   * `height` Integer (optional) - The height of the title bar and Window Controls Overlay in pixels. Default is system height.
 * `trafficLightPosition` [Point](point.md) (optional) _macOS_ -
   Set a custom position for the traffic light buttons in frameless windows.
-* `roundedCorners` boolean (optional) _macOS_ _Windows_ - Whether frameless window
-  should have rounded corners. Default is `true`. Setting this property
-  to `false` will prevent the window from being fullscreenable on macOS.
-  On Windows versions older than Windows 11 Build 22000 this property has no effect, and frameless windows will not have rounded corners.
+* `roundedCorners` boolean (optional) _macOS_ - Whether frameless window
+  should have rounded corners on macOS. Default is `true`. Setting this property
+  to `false` will prevent the window from being fullscreenable.
 * `thickFrame` boolean (optional) - Use `WS_THICKFRAME` style for frameless windows on
   Windows, which adds standard window frame. Setting it to `false` will remove
   window shadow and window animations. Default is `true`.
@@ -150,7 +149,7 @@ Possible values are:
     focus, keyboard or mouse events, but you can use `globalShortcut` to receive
     input sparingly.
   * The `panel` type enables the window to float on top of full-screened apps
-    by adding the `NSWindowStyleMaskNonactivatingPanel` style mask, normally
+    by adding the `NSWindowStyleMaskNonactivatingPanel` style mask,normally
     reserved for NSPanel, at runtime. Also, the window will appear on all
     spaces (desktops).
 * On Windows, possible type is `toolbar`.

docs/api/structures/display.md

@@ -5,7 +5,7 @@
 * `colorDepth` number - The number of bits per pixel.
 * `colorSpace` string -  represent a color space (three-dimensional object which contains all realizable color combinations) for the purpose of color conversions.
 * `depthPerComponent` number - The number of bits per color component.
-* `detected` boolean - `true` if the display is detected by the system.
+* `detected` boolean - `true`` if the display is detected by the system.
 * `displayFrequency` number - The display refresh rate.
 * `id` number - Unique identifier associated with the display. A value of of -1 means the display is invalid or the correct `id` is not yet known, and a value of -10 means the display is a virtual display assigned to a unified desktop.
 * `internal` boolean - `true` for an internal display and `false` for an external display.

docs/api/structures/ipc-main-event.md

@@ -1,6 +1,5 @@
 # IpcMainEvent Object extends `Event`
 
-* `type` String - Possible values include `frame`
 * `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `returnValue` any - Set this to the value to be returned in a synchronous message

docs/api/structures/ipc-main-invoke-event.md

@@ -1,6 +1,5 @@
 # IpcMainInvokeEvent Object extends `Event`
 
-* `type` String - Possible values include `frame`
 * `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `sender` [WebContents](../web-contents.md) - Returns the `webContents` that sent the message

docs/api/structures/ipc-main-service-worker-event.md

@@ -1,11 +0,0 @@
-# IpcMainServiceWorkerEvent Object extends `Event`
-
-* `type` String - Possible values include `service-worker`.
-* `serviceWorker` [ServiceWorkerMain](../service-worker-main.md) _Readonly_ - The service worker that sent this message
-* `versionId` Number - The service worker version ID.
-* `session` Session - The [`Session`](../session.md) instance with which the event is associated.
-* `returnValue` any - Set this to the value to be returned in a synchronous message
-* `ports` [MessagePortMain](../message-port-main.md)[] - A list of MessagePorts that were transferred with this message
-* `reply` Function - A function that will send an IPC message to the renderer frame that sent the original message that you are currently handling.  You should use this method to "reply" to the sent message in order to guarantee the reply will go to the correct process and frame.
-  * `channel` string
-  * `...args` any[]

docs/api/structures/ipc-main-service-worker-invoke-event.md

@@ -1,6 +0,0 @@
-# IpcMainServiceWorkerInvokeEvent Object extends `Event`
-
-* `type` String - Possible values include `service-worker`.
-* `serviceWorker` [ServiceWorkerMain](../service-worker-main.md) _Readonly_ - The service worker that sent this message
-* `versionId` Number - The service worker version ID.
-* `session` Session - The [`Session`](../session.md) instance with which the event is associated.

docs/api/structures/navigation-entry.md

@@ -2,6 +2,3 @@
 
 * `url` string
 * `title` string
-* `pageState` string (optional) - A base64 encoded data string containing Chromium page state
-  including information like the current scroll position or form values. It is committed by
-  Chromium before a navigation event and on a regular interval.

docs/api/structures/preload-script-registration.md

@@ -1,6 +1,6 @@
 # PreloadScriptRegistration Object
 
 * `type` string - Context type where the preload script will be executed.
-  Possible values include `frame` or `service-worker`.
+  Possible values include `frame`.
 * `id` string (optional) - Unique ID of preload script. Defaults to a random UUID.
 * `filePath` string - Path of the script file. Must be an absolute path.

docs/api/structures/preload-script.md

@@ -1,6 +1,6 @@
 # PreloadScript Object
 
 * `type` string - Context type where the preload script will be executed.
-  Possible values include `frame` or `service-worker`.
+  Possible values include `frame`.
 * `id` string - Unique ID of preload script.
 * `filePath` string - Path of the script file. Must be an absolute path.

docs/api/structures/printer-info.md

@@ -3,6 +3,8 @@
 * `name` string - the name of the printer as understood by the OS.
 * `displayName` string - the name of the printer as shown in Print Preview.
 * `description` string - a longer description of the printer's type.
+* `status` number - the current status of the printer.
+* `isDefault` boolean - whether or not a given printer is set as the default printer on the OS.
 * `options` Object - an object containing a variable number of platform-specific printer information.
 
 The number represented by `status` means different things on different platforms: on Windows its potential values can be found [here](https://learn.microsoft.com/en-us/windows/win32/printdocs/printer-info-2), and on Linux and macOS they can be found [here](https://www.cups.org/doc/cupspm.html).
@@ -17,6 +19,8 @@ may be different on each platform.
   name: 'Austin_4th_Floor_Printer___C02XK13BJHD4',
   displayName: 'Austin 4th Floor Printer @ C02XK13BJHD4',
   description: 'TOSHIBA ColorMFP',
+  status: 3,
+  isDefault: false,
   options: {
     copies: '1',
     'device-uri': 'dnssd://Austin%204th%20Floor%20Printer%20%40%20C02XK13BJHD4._ipps._tcp.local./?uuid=71687f1e-1147-3274-6674-22de61b110bd',

docs/api/structures/web-preferences.md

@@ -148,7 +148,6 @@
   this will cause the `preferred-size-changed` event to be emitted on the
   `WebContents` when the preferred size changes. Default is `false`.
 * `transparent` boolean (optional) - Whether to enable background transparency for the guest page. Default is `true`. **Note:** The guest page's text and background colors are derived from the [color scheme](https://developer.mozilla.org/en-US/docs/Web/CSS/color-scheme) of its root element. When transparency is enabled, the text color will still change accordingly but the background will remain transparent.
-* `enableDeprecatedPaste` boolean (optional) _Deprecated_ - Whether to enable the `paste` [execCommand](https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand). Default is `false`.
 
 [chrome-content-scripts]: https://developer.chrome.com/extensions/content_scripts#execution-environment
 [runtime-enabled-features]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/runtime_enabled_features.json5

docs/api/structures/web-request-filter.md

@@ -1,5 +1,4 @@
 # WebRequestFilter Object
 
-* `urls` string[] - Array of [URL patterns](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Match_patterns) used to include requests that match these patterns. Use the pattern `<all_urls>` to match all URLs.
-* `excludeUrls` string[] (optional) - Array of [URL patterns](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Match_patterns) used to exclude requests that match these patterns.
-* `types` string[] (optional) - Array of types that will be used to filter out the requests that do not match the types. When not specified, all types will be matched. Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media` or `webSocket`.
+* `urls` string[] - Array of [URL patterns](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Match_patterns) that will be used to filter out the requests that do not match the URL patterns.
+* `types` String[] (optional) - Array of types that will be used to filter out the requests that do not match the types. When not specified, all types will be matched. Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media` or `webSocket`.

docs/api/system-preferences.md

@@ -6,7 +6,7 @@ Process: [Main](../glossary.md#main-process), [Utility](../glossary.md#utility-p
 
 ```js
 const { systemPreferences } = require('electron')
-console.log(systemPreferences.getEffectiveAppearance())
+console.log(systemPreferences.isAeroGlassEnabled())
 ```
 
 ## Events
@@ -181,6 +181,38 @@ Some popular `key` and `type`s are:
 Removes the `key` in `NSUserDefaults`. This can be used to restore the default
 or global value of a `key` previously set with `setUserDefault`.
 
+### `systemPreferences.isAeroGlassEnabled()` _Windows_
+
+Returns `boolean` - `true` if [DWM composition][dwm-composition] (Aero Glass) is
+enabled, and `false` otherwise.
+
+An example of using it to determine if you should create a transparent window or
+not (transparent windows won't work correctly when DWM composition is disabled):
+
+```js
+const { BrowserWindow, systemPreferences } = require('electron')
+const browserOptions = { width: 1000, height: 800 }
+
+// Make the window transparent only if the platform supports it.
+if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
+  browserOptions.transparent = true
+  browserOptions.frame = false
+}
+
+// Create the window.
+const win = new BrowserWindow(browserOptions)
+
+// Navigate.
+if (browserOptions.transparent) {
+  win.loadFile('index.html')
+} else {
+  // No transparency, so we load a fallback that uses basic styles.
+  win.loadFile('fallback.html')
+}
+```
+
+[dwm-composition]: https://learn.microsoft.com/en-us/windows/win32/dwm/composition-ovw
+
 ### `systemPreferences.getAccentColor()` _Windows_ _macOS_
 
 Returns `string` - The users current system wide accent color preference in RGBA

docs/api/view.md

@@ -106,12 +106,6 @@ Examples of valid `color` values:
 
 * `visible` boolean - If false, the view will be hidden from display.
 
-#### `view.getVisible()`
-
-Returns `boolean` - Whether the view should be drawn. Note that this is
-different from whether the view is visible on screen—it may still be obscured
-or out of view.
-
 ### Instance Properties
 
 Objects created with `new View` have the following properties:

docs/api/web-contents.md

@@ -898,8 +898,6 @@ copying data between CPU and GPU memory, with Chromium's hardware acceleration s
 Only a limited number of textures can exist at the same time, so it's important that you call `texture.release()` as soon as you're done with the texture.
 By managing the texture lifecycle by yourself, you can safely pass the `texture.textureInfo` to other processes through IPC.
 
-More details can be found in the [offscreen rendering tutorial](../tutorial/offscreen-rendering.md). To learn about how to handle the texture in native code, refer to [offscreen rendering's code documentation.](https://github.com/electron/electron/blob/main/shell/browser/osr/README.md).
-
 ```js
 const { BrowserWindow } = require('electron')
 
@@ -911,7 +909,7 @@ win.webContents.on('paint', async (e, dirty, image) => {
     await new Promise(resolve => setTimeout(resolve, 50))
 
     // You can send the native texture handle to native code for importing into your rendering pipeline.
-    // Read more at https://github.com/electron/electron/blob/main/shell/browser/osr/README.md
+    // For example: https://github.com/electron/electron/tree/main/spec/fixtures/native-addon/osr-gpu
     // importTextureHandle(dirty, e.texture.textureInfo)
 
     // You must call `e.texture.release()` as soon as possible, before the underlying frame pool is drained.
@@ -2391,14 +2389,9 @@ A [`WebFrameMain`](web-frame-main.md) property that represents the top frame of
 
 #### `contents.opener` _Readonly_
 
-A [`WebFrameMain | null`](web-frame-main.md) property that represents the frame that opened this WebContents, either
+A [`WebFrameMain`](web-frame-main.md) property that represents the frame that opened this WebContents, either
 with open(), or by navigating a link with a target attribute.
 
-#### `contents.focusedFrame` _Readonly_
-
-A [`WebFrameMain | null`](web-frame-main.md) property that represents the currently focused frame in this WebContents.
-Can be the top frame, an inner `<iframe>`, or `null` if nothing is focused.
-
 [keyboardevent]: https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm

docs/api/web-request.md

@@ -73,7 +73,6 @@ The `callback` has to be called with an `response` object.
 Some examples of valid `urls`:
 
 ```js
-'<all_urls>'
 'http://foo:1234/'
 'http://foo.com/'
 'http://foo:1234/bar'

docs/breaking-changes.md

@@ -12,67 +12,8 @@ This document uses the following convention to categorize breaking changes:
 * **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
 * **Removed:** An API or feature was removed, and is no longer supported by Electron.
 
-## Planned Breaking API Changes (36.0)
-
-### Removed:`isDefault` and `status` properties on `PrinterInfo`
-
-These properties have been removed from the PrinterInfo Object
-because they have been removed from upstream Chromium.
-
-### Removed: `quota` type `syncable` in `Session.clearStorageData(options)`
-
-When calling `Session.clearStorageData(options)`, the `options.quota` type
-`syncable` is no longer supported because it has been
-[removed](https://chromium-review.googlesource.com/c/chromium/src/+/6309405)
-from upstream Chromium.
-
-### Deprecated: `quota` property in `Session.clearStorageData(options)`
-
-When calling `Session.clearStorageData(options)`, the `options.quota`
-property is deprecated. Since the `syncable` type was removed, there
-is only type left -- `'temporary'` -- so specifying it is unnecessary.
-
-### Deprecated: Extension methods and events on `session`
-
-`session.loadExtension`, `session.removeExtension`, `session.getExtension`,
-`session.getAllExtensions`, 'extension-loaded' event, 'extension-unloaded'
-event, and 'extension-ready' events have all moved to the new
-`session.extensions` class.
-
-### Removed: `systemPreferences.isAeroGlassEnabled()`
-
-The `systemPreferences.isAeroGlassEnabled()` function has been removed without replacement.
-It has been always returning `true` since Electron 23, which only supports Windows 10+, where DWM composition can no longer be disabled.
-
-https://learn.microsoft.com/en-us/windows/win32/dwm/composition-ovw#disabling-dwm-composition-windows7-and-earlier
-
 ## Planned Breaking API Changes (35.0)
 
-### Behavior Changed: Dialog API's `defaultPath` option on Linux
-
-On Linux, the required portal version for file dialogs has been reverted
-to 3 from 4. Using the `defaultPath` option of the Dialog API is not
-supported when using portal file chooser dialogs unless the portal
-backend is version 4 or higher. The `--xdg-portal-required-version`
-[command-line switch](/api/command-line-switches.md#--xdg-portal-required-versionversion)
-can be used to force a required version for your application.
-See [#44426](https://github.com/electron/electron/pull/44426) for more details.
-
-### Deprecated: `getFromVersionID` on `session.serviceWorkers`
-
-The `session.serviceWorkers.fromVersionID(versionId)` API has been deprecated
-in favor of `session.serviceWorkers.getInfoFromVersionID(versionId)`. This was
-changed to make it more clear which object is returned with the introduction
-of the `session.serviceWorkers.getWorkerFromVersionID(versionId)` API.
-
-```js
-// Deprecated
-session.serviceWorkers.fromVersionID(versionId)
-
-// Replace with
-session.serviceWorkers.getInfoFromVersionID(versionId)
-```
-
 ### Deprecated: `setPreloads`, `getPreloads` on `Session`
 
 `registerPreloadScript`, `unregisterPreloadScript`, and `getPreloadScripts` are introduced as a
@@ -92,6 +33,21 @@ session.registerPreloadScript({
 })
 ```
 
+### Deprecated: `getFromVersionID` on `session.serviceWorkers`
+
+The `session.serviceWorkers.fromVersionID(versionId)` API has been deprecated
+in favor of `session.serviceWorkers.getInfoFromVersionID(versionId)`. This was
+changed to make it more clear which object is returned with the introduction
+of the `session.serviceWorkers.getWorkerFromVersionID(versionId)` API.
+
+```js
+// Deprecated
+session.serviceWorkers.fromVersionID(versionId)
+
+// Replace with
+session.serviceWorkers.getInfoFromVersionID(versionId)
+```
+
 ### Deprecated: `level`, `message`, `line`, and `sourceId` arguments in `console-message` event on `WebContents`
 
 The `console-message` event on `WebContents` has been updated to provide details on the `Event`
@@ -107,29 +63,6 @@ webContents.on('console-message', ({ level, message, lineNumber, sourceId, frame
 
 Additionally, `level` is now a string with possible values of `info`, `warning`, `error`, and `debug`.
 
-### Behavior Changed: `urls` property of `WebRequestFilter`.
-
-Previously, an empty urls array was interpreted as including all URLs. To explicitly include all URLs, developers should now use the `<all_urls>` pattern, which is a [designated URL pattern](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Match_patterns#all_urls) that matches every possible URL. This change clarifies the intent and ensures more predictable behavior.
-
-```js
-// Deprecated
-const deprecatedFilter = {
-  urls: []
-}
-
-// Replace with
-const newFilter = {
-  urls: ['<all_urls>']
-}
-```
-
-### Deprecated: `systemPreferences.isAeroGlassEnabled()`
-
-The `systemPreferences.isAeroGlassEnabled()` function has been deprecated without replacement.
-It has been always returning `true` since Electron 23, which only supports Windows 10+, where DWM composition can no longer be disabled.
-
-https://learn.microsoft.com/en-us/windows/win32/dwm/composition-ovw#disabling-dwm-composition-windows7-and-earlier
-
 ## Planned Breaking API Changes (34.0)
 
 ### Behavior Changed: menu bar will be hidden during fullscreen on Windows
@@ -140,15 +73,6 @@ This brings the behavior to parity with Linux. Prior behavior: Menu bar is still
 
 ## Planned Breaking API Changes (33.0)
 
-### Deprecated: `document.execCommand("paste")`
-
-The synchronous clipboard read API [document.execCommand("paste")](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Interact_with_the_clipboard) has been
-deprecated in favor of [async clipboard API](https://developer.mozilla.org/en-US/docs/Web/API/Clipboard_API). This is to align with the browser defaults.
-
-The `enableDeprecatedPaste` option on `WebPreferences` that triggers the permission
-checks for this API and the associated permission type `deprecated-sync-clipboard-read`
-are also deprecated.
-
 ### Behavior Changed: frame properties may retrieve detached WebFrameMain instances or none at all
 
 APIs which provide access to a `WebFrameMain` instance may return an instance

docs/development/api-history-migration-guide.md

@@ -65,7 +65,7 @@ Verify that the Pull Request is correct and make a corresponding entry in the
 API History:
 
 > [!NOTE]
-> Refer to the [API History section of `style-guide.md`](./style-guide.md#api-history)
+> Refer to the [API History section of `styleguide.md`](../styleguide.md#api-history)
 for information on how to create API History blocks.
 
 `````markdown

docs/fiddles/features/window-customization/custom-title-bar/custom-drag-region/main.js

@@ -4,7 +4,7 @@ function createWindow () {
   const win = new BrowserWindow({
     // remove the default titlebar
     titleBarStyle: 'hidden',
-    // expose window controls in Windows/Linux
+    // expose window controlls in Windows/Linux
     ...(process.platform !== 'darwin' ? { titleBarOverlay: true } : {})
   })
 

docs/fiddles/features/window-customization/custom-title-bar/custom-title-bar/main.js

@@ -4,7 +4,7 @@ function createWindow () {
   const win = new BrowserWindow({
     // remove the default titlebar
     titleBarStyle: 'hidden',
-    // expose window controls in Windows/Linux
+    // expose window controlls in Windows/Linux
     ...(process.platform !== 'darwin' ? { titleBarOverlay: true } : {})
   })
 

docs/fiddles/features/window-customization/custom-title-bar/native-window-controls/main.js

@@ -4,7 +4,7 @@ function createWindow () {
   const win = new BrowserWindow({
     // remove the default titlebar
     titleBarStyle: 'hidden',
-    // expose window controls in Windows/Linux
+    // expose window controlls in Windows/Linux
     ...(process.platform !== 'darwin' ? { titleBarOverlay: true } : {})
   })
   win.loadURL('https://example.com')

docs/styleguide.md

@@ -195,7 +195,7 @@ required[, optional]
 More detailed information on each of the arguments is noted in an unordered list
 below the method. The type of argument is notated by either JavaScript primitives
 (e.g. `string`, `Promise`, or `Object`), a custom API structure like Electron's
-[`Cookie`](../api/structures/cookie.md), or the wildcard `any`.
+[`Cookie`](api/structures/cookie.md), or the wildcard `any`.
 
 If the argument is of type `Array`, use `[]` shorthand with the type of value
 inside the array (for example,`any[]` or `string[]`).
@@ -290,7 +290,7 @@ The purpose of the API History block is to describe when/where/how/why an API wa
 Each API change listed in the block should include a link to the
 PR where that change was made along with an optional short description of the
 change. If applicable, include the [heading id](https://gist.github.com/asabaylus/3071099)
-for that change from the [breaking changes documentation](../breaking-changes.md).
+for that change from the [breaking changes documentation](./breaking-changes.md).
 
 The [API History linting script][api-history-linting-script] (`lint:api-history`)
 validates API History blocks in the Electron documentation against the schema and

docs/tutorial/custom-title-bar.md

@@ -5,7 +5,7 @@
 Application windows have a default [chrome][] applied by the OS. Not to be confused
 with the Google Chrome browser, window _chrome_ refers to the parts of the window (e.g.
 title bar, toolbars, controls) that are not a part of the main web content. While the
-default title bar provided by the OS chrome is sufficient for simple use cases, many
+default title bar provided by the OS chrome is sufficent for simple use cases, many
 applications opt to remove it. Implementing a custom title bar can help your application
 feel more modern and consistent across platforms.
 

docs/tutorial/custom-window-styles.md

@@ -19,7 +19,7 @@ To create a frameless window, set the [`BaseWindowContructorOptions`][] `frame`
 
 To create a fully transparent window, set the [`BaseWindowContructorOptions`][] `transparent` param in the `BrowserWindow` constructor to `true`.
 
-The following fiddle takes advantage of a transparent window and CSS styling to create
+The following fiddle takes advantage of a tranparent window and CSS styling to create
 the illusion of a circular window.
 
 ```fiddle docs/fiddles/features/window-customization/custom-window-styles/transparent-windows

docs/tutorial/devtools-extension.md

@@ -96,9 +96,9 @@ of the extension is not working as expected.
 [devtools-extension]: https://developer.chrome.com/extensions/devtools
 [session]: ../api/session.md
 [react-devtools]: https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi
-[load-extension]: ../api/extensions-api.md#extensionsloadextensionpath-options
+[load-extension]: ../api/session.md#sesloadextensionpath-options
 [extension-structure]: ../api/structures/extension.md
-[remove-extension]: ../api/extensions-api.md#extensionsremoveextensionextensionid
+[remove-extension]: ../api/session.md#sesremoveextensionextensionid
 [electron-devtools-installer]: https://github.com/MarshallOfSound/electron-devtools-installer
 [supported-extension-apis]: ../api/extensions.md
 [issue-tracker]: https://github.com/electron/electron/issues

docs/tutorial/electron-timelines.md

@@ -9,11 +9,10 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 
 | Electron | Alpha | Beta | Stable | EOL | Chrome | Node | Supported |
 | ------- | ----- | ------- | ------ | ------ | ---- | ---- | ---- |
-| 36.0.0 |  2025-Mar-06 | 2025-Apr-02 | 2025-Apr-29 | 2025-Oct-28 | M136 | TBD | ✅ |
-| 35.0.0 |  2025-Jan-16 | 2025-Feb-05 | 2025-Mar-04 | 2025-Sep-02 | M134 | v22.14 | ✅ |
+| 35.0.0 |  2025-Jan-16 | 2025-Feb-05 | 2025-Mar-04 | 2025-Sep-02 | M134 | TBD | ✅ |
 | 34.0.0 |  2024-Oct-17 | 2024-Nov-13 | 2025-Jan-14 | 2025-Jun-24 | M132 | v20.18 | ✅ |
 | 33.0.0 |  2024-Aug-22 | 2024-Sep-18 | 2024-Oct-15 | 2025-Apr-29 | M130 | v20.18 | ✅ |
-| 32.0.0 |  2024-Jun-14 | 2024-Jul-24 | 2024-Aug-20 | 2025-Mar-04 | M128 | v20.16 | 🚫 |
+| 32.0.0 |  2024-Jun-14 | 2024-Jul-24 | 2024-Aug-20 | 2025-Mar-04 | M128 | v20.16 | ✅ |
 | 31.0.0 |  2024-Apr-18 | 2024-May-15 | 2024-Jun-11 | 2025-Jan-14 | M126 | v20.14 | 🚫 |
 | 30.0.0 |  2024-Feb-22 | 2024-Mar-20 | 2024-Apr-16 | 2024-Oct-15 | M124 | v20.11 | 🚫 |
 | 29.0.0 |  2023-Dec-07 | 2024-Jan-24 | 2024-Feb-20 | 2024-Aug-20 | M122 | v20.9 | 🚫 |

docs/tutorial/native-code-and-electron.md

@@ -1,380 +0,0 @@
-# Native Code and Electron
-
-One of Electron's most powerful features is the ability to combine web technologies with native code - both for compute-intensive logic as well as for the occasional native user interface, where desired.
-
-Electron does so by building on top of "Native Node.js Addons". You've probably already come across a few of them - packages like the famous [sqlite](https://www.npmjs.com/package/sqlite3) use native code to combine JavaScript and native technologies. You can use this feature to extend your Electron application with anything a fully native application can do:
-
-* Access native platform APIs not available in JavaScript. Any macOS, Windows, or Linux operating system API is available to you.
-* Create UI components that interact with native desktop frameworks.
-* Integrate with existing native libraries.
-* Implement performance-critical code that runs faster than JavaScript.
-
-Native Node.js addons are dynamically-linked shared objects (on Unix-like systems) or DLL files (on Windows) that can be loaded into Node.js or Electron using the `require()` or `import` functions. They behave just like regular JavaScript modules but provide an interface to code written in C++, Rust, or other languages that can compile to native code.
-
-# Tutorial: Creating a Native Node.js Addon for Electron
-
-This tutorial will walk you through building a basic Node.js native addon that can be used in Electron applications. We'll focus on concepts common to all platforms, using C++ as the implementation language. Once you complete this tutorial common to all native Node.js addons, you can move on to one of our platform-specific tutorials.
-
-## Requirements
-
-This tutorial assumes you have Node.js and npm installed, as well as the basic tools necessary for compiling code on your platform (like Visual Studio on Windows, Xcode on macOS, or GCC/Clang on Linux). You can find detailed instructions in the [`node-gyp` readme](https://github.com/nodejs/node-gyp?tab=readme-ov-file).
-
-### Requirements: macOS
-
-To build native Node.js addons on macOS, you'll need the Xcode Command Line Tools. These provide the necessary compilers and build tools (namely, `clang`, `clang++`, and `make`). The following command will prompt you to install the Command Line Tools if they aren't already installed.
-
-```sh
-xcode-select --install
-```
-
-### Requirements: Windows
-
-The official Node.js installer offers the optional installation of "Tools for Native Modules", which installs everything required for the basic compilation of C++ modules - specifically, Python 3 and the "Visual Studio Desktop development with C++" workload. Alternatively, you can use `chocolatey`, `winget`, or the Windows Store.
-
-### Requirements: Linux
-
-* [A supported version of Python](https://devguide.python.org/versions/)
-* `make`
-* A proper C/C++ compiler toolchain, like [GCC](https://gcc.gnu.org)
-
-## 1) Creating a package
-
-First, create a new Node.js package that will contain your native addon:
-
-```sh
-mkdir my-native-addon
-cd my-native-addon
-npm init -y
-```
-
-This creates a basic `package.json` file. Next, we'll install the necessary dependencies:
-
-```sh
-npm install node-addon-api bindings
-```
-
-* `node-addon-api`: This is a C++ wrapper for the low-level Node.js API that makes it easier to build addons. It provides a C++ object-oriented API that's more convenient and safer to use than the raw C-style API.
-* `bindings`: A helper module that simplifies the process of loading your compiled native addon. It handles finding your compiled `.node` file automatically.
-
-Now, let's update our `package.json` to include the appropriate build scripts. We will explain what these specifically do further below.
-
-```json title='package.json'
-{
-  "name": "my-native-addon",
-  "version": "1.0.0",
-  "description": "A native addon for Electron",
-  "main": "js/index.js",
-  "scripts": {
-    "clean": "node -e \"require('fs').rmSync('build', { recursive: true, force: true })\"",
-    "build": "node-gyp configure && node-gyp build"
-  },
-  "dependencies": {
-    "bindings": "^1.5.0",
-    "node-addon-api": "^8.3.0"
-  },
-  "devDependencies": {
-    "node-gyp": "^11.1.0"
-  }
-}
-```
-
-These scripts will:
-
-* `clean`: Remove the build directory, allowing for a fresh build
-* `build`: Run the standard node-gyp build process to compile your addon
-
-## 2) Setting up the build system
-
-Node.js addons use a build system called `node-gyp`, which is a cross-platform command-line tool written in Node.js. It compiles native addon modules for Node.js using platform-specific build tools behind the scenes:
-
-* On Windows: Visual Studio
-* On macOS: Xcode or command-line tools
-* On Linux: GCC or similar compilers
-
-### Configuring `node-gyp`
-
-The `binding.gyp` file is a JSON-like configuration file that tells node-gyp how to build your native addon. It's similar to a make file or a project file but in a platform-independent format. Let's create a basic `binding.gyp` file:
-
-```json title='binding.gyp'
-{
-  "targets": [
-    {
-      "target_name": "my_addon",
-      "sources": [
-        "src/my_addon.cc",
-        "src/cpp_code.cc"
-      ],
-      "include_dirs": [
-        "<!@(node -p \"require('node-addon-api').include\")",
-        "include"
-      ],
-      "dependencies": [
-        "<!(node -p \"require('node-addon-api').gyp\")"
-      ],
-      "defines": [
-        "NODE_ADDON_API_CPP_EXCEPTIONS"
-      ],
-      "cflags!": ["-fno-exceptions"],
-      "cflags_cc!": ["-fno-exceptions"],
-      "xcode_settings": {
-        "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-        "CLANG_CXX_LIBRARY": "libc++",
-        "MACOSX_DEPLOYMENT_TARGET": "10.14"
-      },
-      "msvs_settings": {
-        "VCCLCompilerTool": {
-          "ExceptionHandling": 1
-        }
-      }
-    }
-  ]
-}
-```
-
-Let's break down this configuration:
-
-* `target_name`: The name of your addon. This determines the filename of the compiled module (my_addon.node).
-* `sources`: List of source files to compile. We'll have two files: the main addon file and our actual C++ implementation.
-* `include_dirs`: Directories to search for header files. The cryptic-looking line `<!@(node -p \"require('node-addon-api').include\")` runs a Node.js command to get the path to the node-addon-api include directory.
-* `dependencies`: The `node-addon-api` dependency. Similar to the include dirs, this executes a Node.js command to get the proper configuration.
-* `defines`: Preprocessor definitions. Here we're enabling C++ exceptions for node-addon-api.
-Platform-specific settings:
-* `cflags`! and cflags_cc!: Compiler flags for Unix-like systems
-* `xcode_settings`: Settings specific to macOS/Xcode compiler
-* `msvs_settings`: Settings specific to Microsoft Visual Studio on Windows
-
-Now, create the directory structure for our project:
-
-```sh
-mkdir src
-mkdir include
-mkdir js
-```
-
-This creates:
-
-* `src/`: Where our source files will go
-* `include/`: For header files
-* `js/`: For our JavaScript wrapper
-
-## 3) "Hello World" from C++
-
-Let's start by defining our C++ interface in a header file. Create `include/cpp_code.h`:
-
-```cpp
-#pragma once
-#include <string>
-
-namespace cpp_code {
-    // A simple function that takes a string input and returns a string
-    std::string hello_world(const std::string& input);
-} // namespace cpp_code
-```
-
-The `#pragma once` directive is a header guard that prevents the file from being included multiple times in the same compilation unit. The actual function declaration is inside a namespace to avoid potential name conflicts.
-
-Next, let's implement the function in `src/cpp_code.cc`:
-
-```cpp title='src/cpp_code.cc'
-#include <string>
-#include "../include/cpp_code.h"
-
-namespace cpp_code {
-    std::string hello_world(const std::string& input) {
-        // Simply concatenate strings and return
-        return "Hello from C++! You said: " + input;
-    }
-} // namespace cpp_code
-```
-
-This is a simple implementation that just adds some text to the input string and returns it.
-
-Now, let's create the addon code that bridges our C++ code with the Node.js/JavaScript world. Create `src/my_addon.cc`:
-
-```cpp title='src/my_addon.cc'
-#include <napi.h>
-#include <string>
-#include "../include/cpp_code.h"
-
-// Create a class that will be exposed to JavaScript
-class MyAddon : public Napi::ObjectWrap<MyAddon> {
-public:
-    // This static method defines the class for JavaScript
-    static Napi::Object Init(Napi::Env env, Napi::Object exports) {
-        // Define the JavaScript class with method(s)
-        Napi::Function func = DefineClass(env, "MyAddon", {
-            InstanceMethod("helloWorld", &MyAddon::HelloWorld)
-        });
-
-        // Create a persistent reference to the constructor
-        Napi::FunctionReference* constructor = new Napi::FunctionReference();
-        *constructor = Napi::Persistent(func);
-        env.SetInstanceData(constructor);
-
-        // Set the constructor on the exports object
-        exports.Set("MyAddon", func);
-        return exports;
-    }
-
-    // Constructor
-    MyAddon(const Napi::CallbackInfo& info)
-        : Napi::ObjectWrap<MyAddon>(info) {}
-
-private:
-    // Method that will be exposed to JavaScript
-    Napi::Value HelloWorld(const Napi::CallbackInfo& info) {
-        Napi::Env env = info.Env();
-
-        // Validate arguments (expecting one string)
-        if (info.Length() < 1 || !info[0].IsString()) {
-            Napi::TypeError::New(env, "Expected string argument").ThrowAsJavaScriptException();
-            return env.Null();
-        }
-
-        // Convert JavaScript string to C++ string
-        std::string input = info[0].As<Napi::String>();
-
-        // Call our C++ function
-        std::string result = cpp_code::hello_world(input);
-
-        // Convert C++ string back to JavaScript string and return
-        return Napi::String::New(env, result);
-    }
-};
-
-// Initialize the addon
-Napi::Object Init(Napi::Env env, Napi::Object exports) {
-    return MyAddon::Init(env, exports);
-}
-
-// Register the initialization function
-NODE_API_MODULE(my_addon, Init)
-```
-
-Let's break down this code:
-
-1. We define a `MyAddon` class that inherits from `Napi::ObjectWrap<MyAddon>`, which handles wrapping our C++ class for JavaScript.
-2. The `Init` static method:
-  2.1 Defines a JavaScript class with a method called `helloWorld`
-  2.2 Creates a persistent reference to the constructor (to prevent garbage collection)
-  2.3 Exports the class constructor
-3. The constructor simply passes its arguments to the parent class.
-4. The `HelloWorld` method:
-  4.1 Gets the Napi environment
-  4.2 Validates input arguments (expecting a string)
-  4.3 Converts the JavaScript string to a C++ string
-  4.4 Calls our C++ function
-  4.5 Converts the result back to a JavaScript string and returns it
-5. We define an initialization function and register it with NODE_API_MODULE macro, which makes our module loadable by Node.js.
-
-Now, let's create a JavaScript wrapper to make the addon easier to use. Create `js/index.js`:
-
-```js title='js/index.js' @ts-expect-error=[5]
-const EventEmitter = require('events')
-
-// Load the native addon using the 'bindings' module
-// This will look for the compiled .node file in various places
-const bindings = require('bindings')
-const native = bindings('my_addon')
-
-// Create a nice JavaScript wrapper
-class MyNativeAddon extends EventEmitter {
-  constructor () {
-    super()
-
-    // Create an instance of our C++ class
-    this.addon = new native.MyAddon()
-  }
-
-  // Wrap the C++ method with a nicer JavaScript API
-  helloWorld (input = '') {
-    if (typeof input !== 'string') {
-      throw new TypeError('Input must be a string')
-    }
-    return this.addon.helloWorld(input)
-  }
-}
-
-// Export a singleton instance
-if (process.platform === 'win32' || process.platform === 'darwin' || process.platform === 'linux') {
-  module.exports = new MyNativeAddon()
-} else {
-  // Provide a fallback for unsupported platforms
-  console.warn('Native addon not supported on this platform')
-
-  module.exports = {
-    helloWorld: (input) => `Hello from JS! You said: ${input}`
-  }
-}
-```
-
-This JavaScript wrapper:
-
-1. Uses `bindings` to load our compiled native addon
-1. Creates a class that extends EventEmitter (useful for future extensions that might emit events)
-1. Instantiates our C++ class and provides a simpler API
-1. Adds some input validation on the JavaScript side
-1. Exports a singleton instance of our wrapper
-1. Handles unsupported platforms gracefully
-
-### Building and testing the addon
-
-Now we can build our native addon:
-
-```sh
-npm run build
-```
-
-This will run `node-gyp configure` and `node-gyp build` to compile our C++ code into a `.node` file.
-Let's create a simple test script to verify everything works. Create `test.js` in the project root:
-
-```js title='test.js' @ts-expect-error=[2]
-// Load our addon
-const myAddon = require('./js')
-
-// Try the helloWorld function
-const result = myAddon.helloWorld('This is a test')
-
-// Should print: "Hello from C++! You said: This is a test"
-console.log(result)
-```
-
-Run the test:
-
-```sh
-node test.js
-```
-
-If everything works correctly, you should see:
-
-```txt
-Hello from C++! You said: This is a test
-```
-
-### Using the addon in Electron
-
-To use this addon in an Electron application, you would:
-
-1. Include it as a dependency in your Electron project
-1. Build it targeting your specific Electron version. `electron-forge` handles this step automatically for you - for more details, see [Native Node Modules](./using-native-node-modules.md).
-1. Import and use it just like any other module in a process that has Node.js enabled.
-
-```js @ts-expect-error=[2]
-// In your main process
-const myAddon = require('my-native-addon')
-console.log(myAddon.helloWorld('Electron'))
-```
-
-## References and further learning
-
-Native addon development can be written in several languages beyond C++. Rust can be used with crates like [`napi-rs`](https://github.com/napi-rs/napi-rs), [`neon`](https://neon-rs.dev/), or [`node-bindgen`](https://github.com/infinyon/node-bindgen). Objective-C/Swift can be used through Objective-C++ on macOS.
-
-The specific implementation details differ significantly by platform, especially when accessing platform-specific APIs or UI frameworks, like Windows' Win32 API, COM components, UWP/WinRT - or macOS's Cocoa, AppKit, or ObjectiveC runtime.
-
-This means that you'll likely use two groups of references for your native code: First, on the Node.js side, use the [N-API documentation](https://nodejs.org/api/n-api.html) to learn about creating and exposing complex structures to JavaScript - like asynchronous thread-safe function calls or creating JavaScript-native objects (`error`, `promise`, etc). Secondly, on the side of the technology you're working with, you'll likely be looking at their lower-level documentation:
-
-* [Microsoft C++, C, and Assembler documentation](https://learn.microsoft.com/en-us/cpp/?view=msvc-170)
-* [C++/WinRT](https://learn.microsoft.com/en-us/windows/uwp/cpp-and-winrt-apis/)
-* [MSVC-170 C++ Documentation](https://learn.microsoft.com/en-us/cpp/cpp/?view=msvc-170)
-* [Apple Developer Documentation](https://developer.apple.com/documentation)
-* [Programming with Objective-C](https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/ProgrammingWithObjectiveC/Introduction/Introduction.html#//apple_ref/doc/uid/TP40011210)

docs/tutorial/navigation-history.md

@@ -69,25 +69,8 @@ if (navigationHistory.canGoToOffset(2)) {
 }
 ```
 
-## Restoring history
-
-A common flow is that you want to restore the history of a webContents - for instance to implement an "undo close tab" feature. To do so, you can call `navigationHistory.restore({ index, entries })`. This will restore the webContent's navigation history and the webContents location in said history, meaning that `goBack()` and `goForward()` navigate you through the stack as expected.
-
-```js @ts-type={navigationHistory:Electron.NavigationHistory}
-
-const firstWindow = new BrowserWindow()
-
-// Later, you want a second window to have the same history and navigation position
-async function restore () {
-  const entries = firstWindow.webContents.navigationHistory.getAllEntries()
-  const index = firstWindow.webContents.navigationHistory.getActiveIndex()
-
-  const secondWindow = new BrowserWindow()
-  await secondWindow.webContents.navigationHistory.restore({ index, entries })
-}
-```
-
 Here's a full example that you can open with Electron Fiddle:
 
 ```fiddle docs/fiddles/features/navigation-history
+
 ```

docs/tutorial/offscreen-rendering.md

@@ -14,7 +14,7 @@ _Notes_:
 * There are two rendering modes that can be used (see the section below) and only
 the dirty area is passed to the `paint` event to be more efficient.
 * You can stop/continue the rendering as well as set the frame rate.
-* When `webPreferences.offscreen.useSharedTexture` is not `true`, the maximum frame rate is 240 because greater values bring only performance
+* The maximum frame rate is 240 because greater values bring only performance
 losses with no benefits.
 * When nothing is happening on a webpage, no frames are generated.
 * An offscreen window is always created as a
@@ -36,8 +36,7 @@ setting.
     This is an advanced feature requiring a native node module to work with your own code.
     The frames are directly copied in GPU textures, thus this mode is very fast because
     there's no CPU-GPU memory copies overhead, and you can directly import the shared
-    texture to your own rendering program. You can read more details at
-    [here](https://github.com/electron/electron/blob/main/shell/browser/osr/README.md).
+    texture to your own rendering program.
 
 2. Use CPU shared memory bitmap
 

docs/tutorial/online-offline-events.md

@@ -57,7 +57,10 @@ Finally, create a `main.js` file for main process that creates the window.
 const { app, BrowserWindow } = require('electron')
 
 const createWindow = () => {
-  const onlineStatusWindow = new BrowserWindow()
+  const onlineStatusWindow = new BrowserWindow({
+    width: 400,
+    height: 100
+  })
 
   onlineStatusWindow.loadFile('index.html')
 }

docs/tutorial/security.md

@@ -810,7 +810,7 @@ potential error cases, and refer to
 You should not directly expose Electron's APIs, especially IPC, to untrusted web content in your
 preload scripts.
 
-#### Why?
+### Why?
 
 Exposing raw APIs like `ipcRenderer.on` is dangerous because it gives renderer processes direct
 access to the entire IPC event system, allowing them to listen for any IPC events, not just the ones
@@ -823,7 +823,7 @@ events, passing the callback directly means the renderer gets access to this eve
 
 In short, we want the untrusted web content to only have access to necessary information and APIs.
 
-#### How?
+### How?
 
 ```js title='preload'.js'
 // Bad

docs/tutorial/tutorial-3-preload.md

@@ -252,7 +252,7 @@ apps often use the preload script to set up inter-process communication (IPC) in
 to pass arbitrary messages between the two kinds of processes.
 
 In the next part of the tutorial, we will be showing you resources on adding more
-functionality to your app, then teaching you how to distribute your app to users.
+functionality to your app, then teaching you distributing your app to users.
 
 <!-- Links -->
 

docs/why-electron.md

@@ -22,7 +22,7 @@ If you want to focus on building a great product without figuring out how you ca
 
 ### Reliability
 
-Web technologies are the most-used foundation for user interfaces on the planet. They have been hardened accordingly. Modern computers have been optimized from the CPU to the operating system to be good at running web technologies. The manufacturers of your user’s devices—be that an Android phone or the latest MacBook—will ensure that they can visit websites, play videos on YouTube, or display emails. In turn, they’ll also ensure that your app has a stable foundation, even if you have just one user.
+Web technologies are the most-used foundation for user interfaces on the planet. The have been hardened accordingly. Modern computers have been optimized from the CPU to the operating system to be good at running web technologies. The manufacturers of your user’s devices—be that an Android phone or the latest MacBook—will ensure that they can visit websites, play videos on YouTube, or display emails. In turn, they’ll also ensure that your app has a stable foundation, even if you have just one user.
 
 If you want to focus on building a great product without debugging a weird quirk that nobody has found before, the web is a safe bet.
 

electron_paks.gni

@@ -176,7 +176,7 @@ template("electron_paks") {
     }
 
     source_patterns = [
-      "${root_gen_dir}/chrome/branded_strings_",
+      "${root_gen_dir}/chrome/chromium_strings_",
       "${root_gen_dir}/chrome/locale_settings_",
       "${root_gen_dir}/chrome/platform_locale_settings_",
       "${root_gen_dir}/chrome/generated_resources_",

electron_resources.grd

@@ -2,7 +2,7 @@
 <!-- The Resource ids for messages start from 31750 and for includes
      it starts from 31950, make sure they don't overlap when the limit
      exceeds in //tools/gritsettings/resource_ids -->
-<grit latest_public_release="0" current_release="1"
+<grit latest_public_release="0" current_release="1" output_all_resource_defines="false"
       source_lang_id="en">
   <outputs>
     <output filename="grit/electron_resources.h" type="rc_header">

filenames.auto.gni

@@ -21,12 +21,10 @@ auto_filenames = {
     "docs/api/dock.md",
     "docs/api/download-item.md",
     "docs/api/environment-variables.md",
-    "docs/api/extensions-api.md",
     "docs/api/extensions.md",
     "docs/api/global-shortcut.md",
     "docs/api/in-app-purchase.md",
     "docs/api/incoming-message.md",
-    "docs/api/ipc-main-service-worker.md",
     "docs/api/ipc-main.md",
     "docs/api/ipc-renderer.md",
     "docs/api/menu-item.md",
@@ -97,8 +95,6 @@ auto_filenames = {
     "docs/api/structures/input-event.md",
     "docs/api/structures/ipc-main-event.md",
     "docs/api/structures/ipc-main-invoke-event.md",
-    "docs/api/structures/ipc-main-service-worker-event.md",
-    "docs/api/structures/ipc-main-service-worker-invoke-event.md",
     "docs/api/structures/ipc-renderer-event.md",
     "docs/api/structures/jump-list-category.md",
     "docs/api/structures/jump-list-item.md",
@@ -176,8 +172,6 @@ auto_filenames = {
     "lib/renderer/api/web-utils.ts",
     "lib/renderer/common-init.ts",
     "lib/renderer/inspector.ts",
-    "lib/renderer/ipc-native-setup.ts",
-    "lib/renderer/ipc-renderer-bindings.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
     "lib/renderer/security-warnings.ts",
@@ -267,7 +261,6 @@ auto_filenames = {
     "lib/browser/guest-view-manager.ts",
     "lib/browser/guest-window-manager.ts",
     "lib/browser/init.ts",
-    "lib/browser/ipc-dispatch.ts",
     "lib/browser/ipc-main-impl.ts",
     "lib/browser/ipc-main-internal-utils.ts",
     "lib/browser/ipc-main-internal.ts",
@@ -312,8 +305,6 @@ auto_filenames = {
     "lib/renderer/common-init.ts",
     "lib/renderer/init.ts",
     "lib/renderer/inspector.ts",
-    "lib/renderer/ipc-native-setup.ts",
-    "lib/renderer/ipc-renderer-bindings.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
     "lib/renderer/security-warnings.ts",
@@ -348,7 +339,6 @@ auto_filenames = {
     "lib/renderer/api/module-list.ts",
     "lib/renderer/api/web-frame.ts",
     "lib/renderer/api/web-utils.ts",
-    "lib/renderer/ipc-renderer-bindings.ts",
     "lib/renderer/ipc-renderer-internal-utils.ts",
     "lib/renderer/ipc-renderer-internal.ts",
     "lib/worker/init.ts",
@@ -389,27 +379,4 @@ auto_filenames = {
     "typings/internal-ambient.d.ts",
     "typings/internal-electron.d.ts",
   ]
-
-  preload_realm_bundle_deps = [
-    "lib/common/api/native-image.ts",
-    "lib/common/define-properties.ts",
-    "lib/common/ipc-messages.ts",
-    "lib/common/webpack-globals-provider.ts",
-    "lib/preload_realm/api/exports/electron.ts",
-    "lib/preload_realm/api/module-list.ts",
-    "lib/preload_realm/init.ts",
-    "lib/renderer/api/context-bridge.ts",
-    "lib/renderer/api/ipc-renderer.ts",
-    "lib/renderer/ipc-native-setup.ts",
-    "lib/renderer/ipc-renderer-bindings.ts",
-    "lib/renderer/ipc-renderer-internal-utils.ts",
-    "lib/renderer/ipc-renderer-internal.ts",
-    "lib/sandboxed_renderer/pre-init.ts",
-    "lib/sandboxed_renderer/preload.ts",
-    "package.json",
-    "tsconfig.electron.json",
-    "tsconfig.json",
-    "typings/internal-ambient.d.ts",
-    "typings/internal-electron.d.ts",
-  ]
 }

filenames.gni

@@ -324,7 +324,6 @@ filenames = {
     "shell/browser/api/gpu_info_enumerator.h",
     "shell/browser/api/gpuinfo_manager.cc",
     "shell/browser/api/gpuinfo_manager.h",
-    "shell/browser/api/ipc_dispatcher.h",
     "shell/browser/api/message_port.cc",
     "shell/browser/api/message_port.h",
     "shell/browser/api/process_metric.cc",
@@ -356,8 +355,6 @@ filenames = {
     "shell/browser/draggable_region_provider.h",
     "shell/browser/electron_api_ipc_handler_impl.cc",
     "shell/browser/electron_api_ipc_handler_impl.h",
-    "shell/browser/electron_api_sw_ipc_handler_impl.cc",
-    "shell/browser/electron_api_sw_ipc_handler_impl.h",
     "shell/browser/electron_autofill_driver.cc",
     "shell/browser/electron_autofill_driver.h",
     "shell/browser/electron_autofill_driver_factory.cc",
@@ -661,8 +658,6 @@ filenames = {
     "shell/common/gin_helper/pinnable.h",
     "shell/common/gin_helper/promise.cc",
     "shell/common/gin_helper/promise.h",
-    "shell/common/gin_helper/reply_channel.cc",
-    "shell/common/gin_helper/reply_channel.h",
     "shell/common/gin_helper/trackable_object.cc",
     "shell/common/gin_helper/trackable_object.h",
     "shell/common/gin_helper/wrappable.cc",
@@ -712,22 +707,14 @@ filenames = {
     "shell/renderer/electron_api_service_impl.h",
     "shell/renderer/electron_autofill_agent.cc",
     "shell/renderer/electron_autofill_agent.h",
-    "shell/renderer/electron_ipc_native.cc",
-    "shell/renderer/electron_ipc_native.h",
     "shell/renderer/electron_render_frame_observer.cc",
     "shell/renderer/electron_render_frame_observer.h",
     "shell/renderer/electron_renderer_client.cc",
     "shell/renderer/electron_renderer_client.h",
     "shell/renderer/electron_sandboxed_renderer_client.cc",
     "shell/renderer/electron_sandboxed_renderer_client.h",
-    "shell/renderer/preload_realm_context.cc",
-    "shell/renderer/preload_realm_context.h",
-    "shell/renderer/preload_utils.cc",
-    "shell/renderer/preload_utils.h",
     "shell/renderer/renderer_client_base.cc",
     "shell/renderer/renderer_client_base.h",
-    "shell/renderer/service_worker_data.cc",
-    "shell/renderer/service_worker_data.h",
     "shell/renderer/web_worker_observer.cc",
     "shell/renderer/web_worker_observer.h",
     "shell/services/node/node_service.cc",
@@ -739,8 +726,6 @@ filenames = {
   ]
 
   lib_sources_extensions = [
-    "shell/browser/api/electron_api_extensions.cc",
-    "shell/browser/api/electron_api_extensions.h",
     "shell/browser/extensions/api/extension_action/extension_action_api.cc",
     "shell/browser/extensions/api/extension_action/extension_action_api.h",
     "shell/browser/extensions/api/management/electron_management_api_delegate.cc",
@@ -759,6 +744,8 @@ filenames = {
     "shell/browser/extensions/electron_browser_context_keyed_service_factories.h",
     "shell/browser/extensions/electron_component_extension_resource_manager.cc",
     "shell/browser/extensions/electron_component_extension_resource_manager.h",
+    "shell/browser/extensions/electron_display_info_provider.cc",
+    "shell/browser/extensions/electron_display_info_provider.h",
     "shell/browser/extensions/electron_extension_host_delegate.cc",
     "shell/browser/extensions/electron_extension_host_delegate.h",
     "shell/browser/extensions/electron_extension_loader.cc",

filenames.libcxx.gni

@@ -257,7 +257,6 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__chrono/exception.h",
   "//third_party/libc++/src/include/__chrono/file_clock.h",
   "//third_party/libc++/src/include/__chrono/formatter.h",
-  "//third_party/libc++/src/include/__chrono/gps_clock.h",
   "//third_party/libc++/src/include/__chrono/hh_mm_ss.h",
   "//third_party/libc++/src/include/__chrono/high_resolution_clock.h",
   "//third_party/libc++/src/include/__chrono/leap_second.h",
@@ -272,13 +271,11 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__chrono/steady_clock.h",
   "//third_party/libc++/src/include/__chrono/sys_info.h",
   "//third_party/libc++/src/include/__chrono/system_clock.h",
-  "//third_party/libc++/src/include/__chrono/tai_clock.h",
   "//third_party/libc++/src/include/__chrono/time_point.h",
   "//third_party/libc++/src/include/__chrono/time_zone.h",
   "//third_party/libc++/src/include/__chrono/time_zone_link.h",
   "//third_party/libc++/src/include/__chrono/tzdb.h",
   "//third_party/libc++/src/include/__chrono/tzdb_list.h",
-  "//third_party/libc++/src/include/__chrono/utc_clock.h",
   "//third_party/libc++/src/include/__chrono/weekday.h",
   "//third_party/libc++/src/include/__chrono/year.h",
   "//third_party/libc++/src/include/__chrono/year_month.h",
@@ -1385,11 +1382,8 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__filesystem/space_info.h",
   "//third_party/libc++/src/include/__filesystem/u8path.h",
   "//third_party/libc++/src/include/__flat_map/flat_map.h",
-  "//third_party/libc++/src/include/__flat_map/flat_multimap.h",
   "//third_party/libc++/src/include/__flat_map/key_value_iterator.h",
-  "//third_party/libc++/src/include/__flat_map/sorted_equivalent.h",
   "//third_party/libc++/src/include/__flat_map/sorted_unique.h",
-  "//third_party/libc++/src/include/__flat_map/utils.h",
   "//third_party/libc++/src/include/__format/buffer.h",
   "//third_party/libc++/src/include/__format/concepts.h",
   "//third_party/libc++/src/include/__format/container_adaptor.h",
@@ -1525,6 +1519,7 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__locale",
   "//third_party/libc++/src/include/__locale_dir/locale_base_api/android.h",
   "//third_party/libc++/src/include/__locale_dir/locale_base_api/bsd_locale_fallbacks.h",
+  "//third_party/libc++/src/include/__locale_dir/locale_base_api/fuchsia.h",
   "//third_party/libc++/src/include/__locale_dir/locale_base_api/ibm.h",
   "//third_party/libc++/src/include/__locale_dir/locale_base_api/musl.h",
   "//third_party/libc++/src/include/__locale_dir/locale_base_api/openbsd.h",
@@ -1533,10 +1528,6 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__locale_dir/support/apple.h",
   "//third_party/libc++/src/include/__locale_dir/support/bsd_like.h",
   "//third_party/libc++/src/include/__locale_dir/support/freebsd.h",
-  "//third_party/libc++/src/include/__locale_dir/support/fuchsia.h",
-  "//third_party/libc++/src/include/__locale_dir/support/linux.h",
-  "//third_party/libc++/src/include/__locale_dir/support/no_locale/characters.h",
-  "//third_party/libc++/src/include/__locale_dir/support/no_locale/strtonum.h",
   "//third_party/libc++/src/include/__locale_dir/support/windows.h",
   "//third_party/libc++/src/include/__math/abs.h",
   "//third_party/libc++/src/include/__math/copysign.h",
@@ -1577,17 +1568,16 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__memory/array_cookie.h",
   "//third_party/libc++/src/include/__memory/assume_aligned.h",
   "//third_party/libc++/src/include/__memory/auto_ptr.h",
+  "//third_party/libc++/src/include/__memory/builtin_new_allocator.h",
   "//third_party/libc++/src/include/__memory/compressed_pair.h",
   "//third_party/libc++/src/include/__memory/concepts.h",
   "//third_party/libc++/src/include/__memory/construct_at.h",
-  "//third_party/libc++/src/include/__memory/destroy.h",
   "//third_party/libc++/src/include/__memory/destruct_n.h",
   "//third_party/libc++/src/include/__memory/inout_ptr.h",
   "//third_party/libc++/src/include/__memory/noexcept_move_assign_container.h",
   "//third_party/libc++/src/include/__memory/out_ptr.h",
   "//third_party/libc++/src/include/__memory/pointer_traits.h",
   "//third_party/libc++/src/include/__memory/ranges_construct_at.h",
-  "//third_party/libc++/src/include/__memory/ranges_destroy.h",
   "//third_party/libc++/src/include/__memory/ranges_uninitialized_algorithms.h",
   "//third_party/libc++/src/include/__memory/raw_storage_iterator.h",
   "//third_party/libc++/src/include/__memory/shared_count.h",
@@ -1911,7 +1901,6 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__utility/cmp.h",
   "//third_party/libc++/src/include/__utility/convert_to_integral.h",
   "//third_party/libc++/src/include/__utility/declval.h",
-  "//third_party/libc++/src/include/__utility/element_count.h",
   "//third_party/libc++/src/include/__utility/empty.h",
   "//third_party/libc++/src/include/__utility/exception_guard.h",
   "//third_party/libc++/src/include/__utility/exchange.h",

lib/browser/api/service-worker-main.ts

@@ -1,27 +1,5 @@
-import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
-
 const { ServiceWorkerMain } = process._linkedBinding('electron_browser_service_worker_main');
 
-Object.defineProperty(ServiceWorkerMain.prototype, 'ipc', {
-  get () {
-    const ipc = new IpcMainImpl();
-    Object.defineProperty(this, 'ipc', { value: ipc });
-    return ipc;
-  }
-});
-
-ServiceWorkerMain.prototype.send = function (channel, ...args) {
-  if (typeof channel !== 'string') {
-    throw new TypeError('Missing required channel argument');
-  }
-
-  try {
-    return this._send(false /* internal */, channel, args);
-  } catch (e) {
-    console.error('Error sending from ServiceWorkerMain: ', e);
-  }
-};
-
 ServiceWorkerMain.prototype.startTask = function () {
   // TODO(samuelmaddock): maybe make timeout configurable in the future
   const hasTimeout = false;

lib/browser/api/session.ts

@@ -1,5 +1,4 @@
 import { fetchWithSession } from '@electron/internal/browser/api/net-fetch';
-import { addIpcDispatchListeners } from '@electron/internal/browser/ipc-dispatch';
 import * as deprecate from '@electron/internal/common/deprecate';
 
 import { net } from 'electron/main';
@@ -22,25 +21,6 @@ Object.defineProperty(systemPickerVideoSource, 'id', {
 systemPickerVideoSource.name = '';
 Object.freeze(systemPickerVideoSource);
 
-Session.prototype._init = function () {
-  addIpcDispatchListeners(this);
-
-  if (this.extensions) {
-    const rerouteExtensionEvent = (eventName: string) => {
-      const warn = deprecate.warnOnce(`${eventName} event`, `session.extensions ${eventName} event`);
-      this.extensions.on(eventName as any, (...args: any[]) => {
-        if (this.listenerCount(eventName) !== 0) {
-          warn();
-          this.emit(eventName, ...args);
-        }
-      });
-    };
-    rerouteExtensionEvent('extension-loaded');
-    rerouteExtensionEvent('extension-unloaded');
-    rerouteExtensionEvent('extension-ready');
-  }
-};
-
 Session.prototype.fetch = function (input: RequestInfo, init?: RequestInit) {
   return fetchWithSession(input, init, this, net.request);
 };
@@ -82,35 +62,6 @@ Session.prototype.setPreloads = function (preloads) {
   });
 };
 
-Session.prototype.getAllExtensions = deprecate.moveAPI(
-  function (this: Electron.Session) {
-    return this.extensions.getAllExtensions();
-  },
-  'session.getAllExtensions',
-  'session.extensions.getAllExtensions'
-);
-Session.prototype.getExtension = deprecate.moveAPI(
-  function (this: Electron.Session, extensionId) {
-    return this.extensions.getExtension(extensionId);
-  },
-  'session.getExtension',
-  'session.extensions.getExtension'
-);
-Session.prototype.loadExtension = deprecate.moveAPI(
-  function (this: Electron.Session, path, options) {
-    return this.extensions.loadExtension(path, options);
-  },
-  'session.loadExtension',
-  'session.extensions.loadExtension'
-);
-Session.prototype.removeExtension = deprecate.moveAPI(
-  function (this: Electron.Session, extensionId) {
-    return this.extensions.removeExtension(extensionId);
-  },
-  'session.removeExtension',
-  'session.extensions.removeExtension'
-);
-
 export default {
   fromPartition,
   fromPath,

lib/browser/api/web-contents.ts

@@ -1,12 +1,14 @@
 import { openGuestWindow, makeWebPreferences, parseContentTypeFormat } from '@electron/internal/browser/guest-window-manager';
 import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
+import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
+import { MessagePortMain } from '@electron/internal/browser/message-port-main';
 import { parseFeatures } from '@electron/internal/browser/parse-features-string';
 import * as deprecate from '@electron/internal/common/deprecate';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-import { app, session, webFrameMain, dialog } from 'electron/main';
-import type { BrowserWindowConstructorOptions, MessageBoxOptions, NavigationEntry } from 'electron/main';
+import { app, ipcMain, session, webFrameMain, dialog } from 'electron/main';
+import type { BrowserWindowConstructorOptions, MessageBoxOptions } from 'electron/main';
 
 import * as path from 'path';
 import * as url from 'url';
@@ -16,6 +18,8 @@ import * as url from 'url';
 // eslint-disable-next-line no-unused-expressions
 session;
 
+const webFrameMainBinding = process._linkedBinding('electron_browser_web_frame_main');
+
 let nextId = 0;
 const getNextId = function () {
   return ++nextId;
@@ -339,8 +343,8 @@ WebContents.prototype.loadFile = function (filePath, options = {}) {
 
 type LoadError = { errorCode: number, errorDescription: string, url: string };
 
-function _awaitNextLoad (this: Electron.WebContents, navigationUrl: string) {
-  return new Promise<void>((resolve, reject) => {
+WebContents.prototype.loadURL = function (url, options) {
+  const p = new Promise<void>((resolve, reject) => {
     const resolveAndCleanup = () => {
       removeListeners();
       resolve();
@@ -398,7 +402,7 @@ function _awaitNextLoad (this: Electron.WebContents, navigationUrl: string) {
       // the only one is with a bad scheme, perhaps ERR_INVALID_ARGUMENT
       // would be more appropriate.
       if (!error) {
-        error = { errorCode: -2, errorDescription: 'ERR_FAILED', url: navigationUrl };
+        error = { errorCode: -2, errorDescription: 'ERR_FAILED', url };
       }
       finishListener();
     };
@@ -422,10 +426,6 @@ function _awaitNextLoad (this: Electron.WebContents, navigationUrl: string) {
     this.on('did-stop-loading', stopLoadingListener);
     this.on('destroyed', stopLoadingListener);
   });
-};
-
-WebContents.prototype.loadURL = function (url, options) {
-  const p = _awaitNextLoad.call(this, url);
   // Add a no-op rejection handler to silence the unhandled rejection error.
   p.catch(() => {});
   this._loadURL(url, options ?? {});
@@ -476,6 +476,24 @@ WebContents.prototype._callWindowOpenHandler = function (event: Electron.Event,
   }
 };
 
+const addReplyToEvent = (event: Electron.IpcMainEvent) => {
+  const { processId, frameId } = event;
+  event.reply = (channel: string, ...args: any[]) => {
+    event.sender.sendToFrame([processId, frameId], channel, ...args);
+  };
+};
+
+const addSenderToEvent = (event: Electron.IpcMainEvent | Electron.IpcMainInvokeEvent, sender: Electron.WebContents) => {
+  event.sender = sender;
+};
+
+const addReturnValueToEvent = (event: Electron.IpcMainEvent) => {
+  Object.defineProperty(event, 'returnValue', {
+    set: (value) => event._replyChannel.sendReply(value),
+    get: () => {}
+  });
+};
+
 const commandLine = process._linkedBinding('electron_common_command_line');
 const environment = process._linkedBinding('electron_common_environment');
 
@@ -555,6 +573,28 @@ WebContents.prototype._init = function () {
     enumerable: true
   });
 
+  /**
+   * Cached IPC emitters sorted by dispatch priority.
+   * Caching is used to avoid frequent array allocations.
+   *
+   * 0: WebFrameMain ipc
+   * 1: WebContents ipc
+   * 2: ipcMain
+   */
+  const cachedIpcEmitters: (ElectronInternal.IpcMainInternal | undefined)[] = [undefined, ipc, ipcMain];
+
+  // Get list of relevant IPC emitters for dispatch.
+  const getIpcEmittersForEvent = (event: Electron.IpcMainEvent | Electron.IpcMainInvokeEvent): (ElectronInternal.IpcMainInternal | undefined)[] => {
+    // Lookup by FrameTreeNode ID to ensure IPCs received after a frame swap are
+    // always received. This occurs when a RenderFrame sends an IPC while it's
+    // unloading and its internal state is pending deletion.
+    const { frameTreeNodeId } = event;
+    const webFrameByFtn = frameTreeNodeId ? webFrameMainBinding._fromFtnIdIfExists(frameTreeNodeId) : undefined;
+    cachedIpcEmitters[0] = webFrameByFtn?.ipc;
+
+    return cachedIpcEmitters;
+  };
+
   // Add navigationHistory property which handles session history,
   // maintaining a list of navigation entries for backward and forward navigation.
   Object.defineProperty(this, 'navigationHistory', {
@@ -571,32 +611,77 @@ WebContents.prototype._init = function () {
       length: this._historyLength.bind(this),
       getEntryAtIndex: this._getNavigationEntryAtIndex.bind(this),
       removeEntryAtIndex: this._removeNavigationEntryAtIndex.bind(this),
-      getAllEntries: this._getHistory.bind(this),
-      restore: ({ index, entries }: { index?: number, entries: NavigationEntry[] }) => {
-        if (index === undefined) {
-          index = entries.length - 1;
-        }
-
-        if (index < 0 || !entries[index]) {
-          throw new Error('Invalid index. Index must be a positive integer and within the bounds of the entries length.');
-        }
-
-        const p = _awaitNextLoad.call(this, entries[index].url);
-        p.catch(() => {});
-
-        try {
-          this._restoreHistory(index, entries);
-        } catch (error) {
-          return Promise.reject(error);
-        }
-
-        return p;
-      }
+      getAllEntries: this._getHistory.bind(this)
     },
     writable: false,
     enumerable: true
   });
 
+  // Dispatch IPC messages to the ipc module.
+  this.on('-ipc-message', function (this: Electron.WebContents, event, internal, channel, args) {
+    addSenderToEvent(event, this);
+    if (internal) {
+      ipcMainInternal.emit(channel, event, ...args);
+    } else {
+      addReplyToEvent(event);
+      this.emit('ipc-message', event, channel, ...args);
+      for (const ipcEmitter of getIpcEmittersForEvent(event)) {
+        ipcEmitter?.emit(channel, event, ...args);
+      }
+    }
+  });
+
+  this.on('-ipc-invoke', async function (this: Electron.WebContents, event, internal, channel, args) {
+    addSenderToEvent(event, this);
+    const replyWithResult = (result: any) => event._replyChannel.sendReply({ result });
+    const replyWithError = (error: Error) => {
+      console.error(`Error occurred in handler for '${channel}':`, error);
+      event._replyChannel.sendReply({ error: error.toString() });
+    };
+    const targets: (ElectronInternal.IpcMainInternal | undefined)[] = internal ? [ipcMainInternal] : getIpcEmittersForEvent(event);
+    const target = targets.find(target => (target as any)?._invokeHandlers.has(channel));
+    if (target) {
+      const handler = (target as any)._invokeHandlers.get(channel);
+      try {
+        replyWithResult(await Promise.resolve(handler(event, ...args)));
+      } catch (err) {
+        replyWithError(err as Error);
+      }
+    } else {
+      replyWithError(new Error(`No handler registered for '${channel}'`));
+    }
+  });
+
+  this.on('-ipc-message-sync', function (this: Electron.WebContents, event, internal, channel, args) {
+    addSenderToEvent(event, this);
+    addReturnValueToEvent(event);
+    if (internal) {
+      ipcMainInternal.emit(channel, event, ...args);
+    } else {
+      addReplyToEvent(event);
+      const ipcEmitters = getIpcEmittersForEvent(event);
+      if (
+        this.listenerCount('ipc-message-sync') === 0 &&
+        ipcEmitters.every(emitter => !emitter || emitter.listenerCount(channel) === 0)
+      ) {
+        console.warn(`WebContents #${this.id} called ipcRenderer.sendSync() with '${channel}' channel without listeners.`);
+      }
+      this.emit('ipc-message-sync', event, channel, ...args);
+      for (const ipcEmitter of ipcEmitters) {
+        ipcEmitter?.emit(channel, event, ...args);
+      }
+    }
+  });
+
+  this.on('-ipc-ports', function (this: Electron.WebContents, event: Electron.IpcMainEvent, internal: boolean, channel: string, message: any, ports: any[]) {
+    addSenderToEvent(event, this);
+    event.ports = ports.map(p => new MessagePortMain(p));
+    const ipcEmitters = getIpcEmittersForEvent(event);
+    for (const ipcEmitter of ipcEmitters) {
+      ipcEmitter?.emit(channel, event, message);
+    }
+  });
+
   this.on('render-process-gone', (event, details) => {
     app.emit('render-process-gone', event, this, details);
 

lib/browser/devtools.ts

@@ -69,7 +69,6 @@ const assertChromeDevTools = function (contents: Electron.WebContents, api: stri
 
 ipcMainInternal.handle(IPC_MESSAGES.INSPECTOR_CONTEXT_MENU, function (event, items: ContextMenuItem[], isEditMenu: boolean) {
   return new Promise<number | void>(resolve => {
-    if (event.type !== 'frame') return;
     assertChromeDevTools(event.sender, 'window.InspectorFrontendHost.showContextMenuAtPoint()');
 
     const template = isEditMenu ? getEditMenuItems() : convertToMenuTemplate(items, resolve);
@@ -81,7 +80,6 @@ ipcMainInternal.handle(IPC_MESSAGES.INSPECTOR_CONTEXT_MENU, function (event, ite
 });
 
 ipcMainInternal.handle(IPC_MESSAGES.INSPECTOR_SELECT_FILE, async function (event) {
-  if (event.type !== 'frame') return [];
   assertChromeDevTools(event.sender, 'window.UI.createFileSelectorElement()');
 
   const result = await dialog.showOpenDialog({});
@@ -94,7 +92,6 @@ ipcMainInternal.handle(IPC_MESSAGES.INSPECTOR_SELECT_FILE, async function (event
 });
 
 ipcMainUtils.handleSync(IPC_MESSAGES.INSPECTOR_CONFIRM, async function (event, message: string = '', title: string = '') {
-  if (event.type !== 'frame') return;
   assertChromeDevTools(event.sender, 'window.confirm()');
 
   const options = {

lib/browser/guest-view-manager.ts

@@ -155,7 +155,7 @@ const createGuest = function (embedder: Electron.WebContents, embedderFrameId: n
   }
 
   // Dispatch guest's IPC messages to embedder.
-  guest.on('-ipc-message-host' as any, function (event: Electron.IpcMainEvent, channel: string, args: any[]) {
+  guest.on('ipc-message-host' as any, function (event: Electron.IpcMainEvent, channel: string, args: any[]) {
     sendToEmbedder(IPC_MESSAGES.GUEST_VIEW_INTERNAL_DISPATCH_EVENT, 'ipc-message', {
       frameId: [event.processId, event.frameId],
       channel,
@@ -267,10 +267,9 @@ const isWebViewTagEnabled = function (contents: Electron.WebContents) {
 };
 
 const makeSafeHandler = function<Event extends { sender: Electron.WebContents }> (channel: string, handler: (event: Event, ...args: any[]) => any) {
-  return (event: Electron.IpcMainInvokeEvent | Electron.IpcMainServiceWorkerInvokeEvent, ...args: any[]) => {
-    if (event.type !== 'frame') return;
+  return (event: Event, ...args: any[]) => {
     if (isWebViewTagEnabled(event.sender)) {
-      return handler(event as unknown as Event, ...args);
+      return handler(event, ...args);
     } else {
       console.error(`<webview> IPC message ${channel} sent by WebContents with <webview> disabled (${event.sender.id})`);
       throw new Error('<webview> disabled');
@@ -282,7 +281,7 @@ const handleMessage = function (channel: string, handler: (event: Electron.IpcMa
   ipcMainInternal.handle(channel, makeSafeHandler(channel, handler));
 };
 
-const handleMessageSync = function (channel: string, handler: (event: { sender: Electron.WebContents }, ...args: any[]) => any) {
+const handleMessageSync = function (channel: string, handler: (event: ElectronInternal.IpcMainInternalEvent, ...args: any[]) => any) {
   ipcMainUtils.handleSync(channel, makeSafeHandler(channel, handler));
 };
 
@@ -295,10 +294,8 @@ handleMessageSync(IPC_MESSAGES.GUEST_VIEW_MANAGER_DETACH_GUEST, function (event,
 });
 
 // this message is sent by the actual <webview>
-ipcMainInternal.on(IPC_MESSAGES.GUEST_VIEW_MANAGER_FOCUS_CHANGE, function (event, focus: boolean) {
-  if (event.type === 'frame') {
-    event.sender.emit('-focus-change', {}, focus);
-  }
+ipcMainInternal.on(IPC_MESSAGES.GUEST_VIEW_MANAGER_FOCUS_CHANGE, function (event: ElectronInternal.IpcMainInternalEvent, focus: boolean) {
+  event.sender.emit('-focus-change', {}, focus);
 });
 
 handleMessage(IPC_MESSAGES.GUEST_VIEW_MANAGER_CALL, function (event, guestInstanceId: number, method: string, args: any[]) {

lib/browser/ipc-dispatch.ts

@@ -1,151 +0,0 @@
-import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
-import { MessagePortMain } from '@electron/internal/browser/message-port-main';
-
-import type { ServiceWorkerMain } from 'electron/main';
-import { ipcMain } from 'electron/main';
-
-const v8Util = process._linkedBinding('electron_common_v8_util');
-const webFrameMainBinding = process._linkedBinding('electron_browser_web_frame_main');
-
-const addReplyToEvent = (event: Electron.IpcMainEvent) => {
-  const { processId, frameId } = event;
-  event.reply = (channel: string, ...args: any[]) => {
-    event.sender.sendToFrame([processId, frameId], channel, ...args);
-  };
-};
-
-const addReturnValueToEvent = (event: Electron.IpcMainEvent | Electron.IpcMainServiceWorkerEvent) => {
-  Object.defineProperty(event, 'returnValue', {
-    set: (value) => event._replyChannel.sendReply(value),
-    get: () => {}
-  });
-};
-
-const getServiceWorkerFromEvent = (event: Electron.IpcMainServiceWorkerEvent | Electron.IpcMainServiceWorkerInvokeEvent): ServiceWorkerMain | undefined => {
-  return event.session.serviceWorkers._getWorkerFromVersionIDIfExists(event.versionId);
-};
-const addServiceWorkerPropertyToEvent = (event: Electron.IpcMainServiceWorkerEvent | Electron.IpcMainServiceWorkerInvokeEvent) => {
-  Object.defineProperty(event, 'serviceWorker', {
-    get: () => event.session.serviceWorkers.getWorkerFromVersionID(event.versionId)
-  });
-};
-
-/**
- * Cached IPC emitters sorted by dispatch priority.
- * Caching is used to avoid frequent array allocations.
- */
-const cachedIpcEmitters: (ElectronInternal.IpcMainInternal | undefined)[] = [
-  undefined, // WebFrameMain ipc
-  undefined, // WebContents ipc
-  ipcMain
-];
-
-// Get list of relevant IPC emitters for dispatch.
-const getIpcEmittersForFrameEvent = (event: Electron.IpcMainEvent | Electron.IpcMainInvokeEvent): (ElectronInternal.IpcMainInternal | undefined)[] => {
-  // Lookup by FrameTreeNode ID to ensure IPCs received after a frame swap are
-  // always received. This occurs when a RenderFrame sends an IPC while it's
-  // unloading and its internal state is pending deletion.
-  const { frameTreeNodeId } = event;
-  const webFrameByFtn = frameTreeNodeId ? webFrameMainBinding._fromFtnIdIfExists(frameTreeNodeId) : undefined;
-  cachedIpcEmitters[0] = webFrameByFtn?.ipc;
-  cachedIpcEmitters[1] = event.sender.ipc;
-  return cachedIpcEmitters;
-};
-
-/**
- * Listens for IPC dispatch events on `api`.
- */
-export function addIpcDispatchListeners (api: NodeJS.EventEmitter) {
-  api.on('-ipc-message' as any, function (event: Electron.IpcMainEvent | Electron.IpcMainServiceWorkerEvent, channel: string, args: any[]) {
-    const internal = v8Util.getHiddenValue<boolean>(event, 'internal');
-
-    if (internal) {
-      ipcMainInternal.emit(channel, event, ...args);
-    } else if (event.type === 'frame') {
-      addReplyToEvent(event);
-      event.sender.emit('ipc-message', event, channel, ...args);
-      for (const ipcEmitter of getIpcEmittersForFrameEvent(event)) {
-        ipcEmitter?.emit(channel, event, ...args);
-      }
-    } else if (event.type === 'service-worker') {
-      addServiceWorkerPropertyToEvent(event);
-      getServiceWorkerFromEvent(event)?.ipc.emit(channel, event, ...args);
-    }
-  } as any);
-
-  api.on('-ipc-invoke' as any, async function (event: Electron.IpcMainInvokeEvent | Electron.IpcMainServiceWorkerInvokeEvent, channel: string, args: any[]) {
-    const internal = v8Util.getHiddenValue<boolean>(event, 'internal');
-
-    const replyWithResult = (result: any) => event._replyChannel.sendReply({ result });
-    const replyWithError = (error: Error) => {
-      console.error(`Error occurred in handler for '${channel}':`, error);
-      event._replyChannel.sendReply({ error: error.toString() });
-    };
-
-    const targets: (Electron.IpcMainServiceWorker | ElectronInternal.IpcMainInternal | undefined)[] = [];
-
-    if (internal) {
-      targets.push(ipcMainInternal);
-    } else if (event.type === 'frame') {
-      targets.push(...getIpcEmittersForFrameEvent(event));
-    } else if (event.type === 'service-worker') {
-      addServiceWorkerPropertyToEvent(event);
-      const workerIpc = getServiceWorkerFromEvent(event)?.ipc;
-      targets.push(workerIpc);
-    }
-
-    const target = targets.find(target => (target as any)?._invokeHandlers.has(channel));
-    if (target) {
-      const handler = (target as any)._invokeHandlers.get(channel);
-      try {
-        replyWithResult(await Promise.resolve(handler(event, ...args)));
-      } catch (err) {
-        replyWithError(err as Error);
-      }
-    } else {
-      replyWithError(new Error(`No handler registered for '${channel}'`));
-    }
-  } as any);
-
-  api.on('-ipc-message-sync' as any, function (event: Electron.IpcMainEvent | Electron.IpcMainServiceWorkerEvent, channel: string, args: any[]) {
-    const internal = v8Util.getHiddenValue<boolean>(event, 'internal');
-    addReturnValueToEvent(event);
-    if (internal) {
-      ipcMainInternal.emit(channel, event, ...args);
-    } else if (event.type === 'frame') {
-      addReplyToEvent(event);
-      const webContents = event.sender;
-      const ipcEmitters = getIpcEmittersForFrameEvent(event);
-      if (
-        webContents.listenerCount('ipc-message-sync') === 0 &&
-        ipcEmitters.every(emitter => !emitter || emitter.listenerCount(channel) === 0)
-      ) {
-        console.warn(`WebContents #${webContents.id} called ipcRenderer.sendSync() with '${channel}' channel without listeners.`);
-      }
-      webContents.emit('ipc-message-sync', event, channel, ...args);
-      for (const ipcEmitter of ipcEmitters) {
-        ipcEmitter?.emit(channel, event, ...args);
-      }
-    } else if (event.type === 'service-worker') {
-      addServiceWorkerPropertyToEvent(event);
-      getServiceWorkerFromEvent(event)?.ipc.emit(channel, event, ...args);
-    }
-  } as any);
-
-  api.on('-ipc-message-host', function (event: Electron.IpcMainEvent, channel: string, args: any[]) {
-    event.sender.emit('-ipc-message-host', event, channel, args);
-  });
-
-  api.on('-ipc-ports' as any, function (event: Electron.IpcMainEvent | Electron.IpcMainServiceWorkerEvent, channel: string, message: any, ports: any[]) {
-    event.ports = ports.map(p => new MessagePortMain(p));
-    if (event.type === 'frame') {
-      const ipcEmitters = getIpcEmittersForFrameEvent(event);
-      for (const ipcEmitter of ipcEmitters) {
-        ipcEmitter?.emit(channel, event, message);
-      }
-    } if (event.type === 'service-worker') {
-      addServiceWorkerPropertyToEvent(event);
-      getServiceWorkerFromEvent(event)?.ipc.emit(channel, event, message);
-    }
-  } as any);
-}

lib/browser/ipc-main-internal-utils.ts

@@ -19,7 +19,7 @@ export function invokeInWebContents<T> (sender: Electron.WebContents, command: s
     const requestId = ++nextId;
     const channel = `${command}_RESPONSE_${requestId}`;
     ipcMainInternal.on(channel, function handler (event, error: Error, result: any) {
-      if (event.type === 'frame' && event.sender !== sender) {
+      if (event.sender !== sender) {
         console.error(`Reply to ${command} sent by unexpected WebContents (${event.sender.id})`);
         return;
       }

lib/browser/rpc-server.ts

@@ -9,8 +9,6 @@ import * as path from 'path';
 
 // Implements window.close()
 ipcMainInternal.on(IPC_MESSAGES.BROWSER_WINDOW_CLOSE, function (event) {
-  if (event.type !== 'frame') return;
-
   const window = event.sender.getOwnerBrowserWindow();
   if (window) {
     window.close();
@@ -19,12 +17,10 @@ ipcMainInternal.on(IPC_MESSAGES.BROWSER_WINDOW_CLOSE, function (event) {
 });
 
 ipcMainInternal.handle(IPC_MESSAGES.BROWSER_GET_LAST_WEB_PREFERENCES, function (event) {
-  if (event.type !== 'frame') return;
   return event.sender.getLastWebPreferences();
 });
 
 ipcMainInternal.handle(IPC_MESSAGES.BROWSER_GET_PROCESS_MEMORY_INFO, function (event) {
-  if (event.type !== 'frame') return;
   return event.sender._getProcessMemoryInfo();
 });
 
@@ -49,23 +45,16 @@ ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, function (event, me
 });
 
 const getPreloadScriptsFromEvent = (event: ElectronInternal.IpcMainInternalEvent) => {
-  const session: Electron.Session = event.type === 'service-worker' ? event.session : event.sender.session;
-  let preloadScripts = session.getPreloadScripts();
+  const session: Electron.Session = event.sender.session;
+  const preloadScripts = session.getPreloadScripts();
+  const framePreloads = preloadScripts.filter(script => script.type === 'frame');
 
-  if (event.type === 'frame') {
-    preloadScripts = preloadScripts.filter(script => script.type === 'frame');
-
-    const webPrefPreload = event.sender._getPreloadScript();
-    if (webPrefPreload) preloadScripts.push(webPrefPreload);
-  } else if (event.type === 'service-worker') {
-    preloadScripts = preloadScripts.filter(script => script.type === 'service-worker');
-  } else {
-    throw new Error(`getPreloadScriptsFromEvent: event.type is invalid (${(event as any).type})`);
-  }
+  const webPrefPreload = event.sender._getPreloadScript();
+  if (webPrefPreload) framePreloads.push(webPrefPreload);
 
   // TODO(samuelmaddock): Remove filter after Session.setPreloads is fully
   // deprecated. The new API will prevent relative paths from being registered.
-  return preloadScripts.filter(script => path.isAbsolute(script.filePath));
+  return framePreloads.filter(script => path.isAbsolute(script.filePath));
 };
 
 const readPreloadScript = async function (script: Electron.PreloadScript): Promise<ElectronInternal.PreloadScript> {
@@ -106,6 +95,5 @@ ipcMainUtils.handleSync(IPC_MESSAGES.BROWSER_NONSANDBOX_LOAD, function (event) {
 });
 
 ipcMainInternal.on(IPC_MESSAGES.BROWSER_PRELOAD_ERROR, function (event, preloadPath: string, error: Error) {
-  if (event.type !== 'frame') return;
-  event.sender?.emit('preload-error', event, preloadPath, error);
+  event.sender.emit('preload-error', event, preloadPath, error);
 });

lib/node/asar-fs-wrapper.ts

@@ -24,8 +24,6 @@ const nextTick = (functionToCall: Function, args: any[] = []) => {
   process.nextTick(() => functionToCall(...args));
 };
 
-const binding = internalBinding('fs');
-
 // Cache asar archive objects.
 const cachedArchives = new Map<string, NodeJS.AsarArchive>();
 
@@ -707,137 +705,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
   };
 
   type ReaddirOptions = { encoding: BufferEncoding | null; withFileTypes?: false, recursive?: false } | undefined | null;
-  type ReaddirCallback = (err: NodeJS.ErrnoException | null, files?: string[]) => void;
-
-  const processReaddirResult = (args: any) => (args.context.withFileTypes ? handleDirents(args) : handleFilePaths(args));
-
-  function handleDirents ({ result, currentPath, context }: { result: any[], currentPath: string, context: any }) {
-    const length = result[0].length;
-    for (let i = 0; i < length; i++) {
-      const resultPath = path.join(currentPath, result[0][i]);
-      const info = splitPath(resultPath);
-
-      let type = result[1][i];
-      if (info.isAsar) {
-        const archive = getOrCreateArchive(info.asarPath);
-        if (!archive) return;
-        const stats = archive.stat(info.filePath);
-        if (!stats) continue;
-        type = stats.type;
-      }
-
-      const dirent = getDirent(currentPath, result[0][i], type);
-      const stat = internalBinding('fs').internalModuleStat(binding, resultPath);
-
-      context.readdirResults.push(dirent);
-      if (dirent.isDirectory() || stat === 1) {
-        context.pathsQueue.push(path.join(dirent.path, dirent.name));
-      }
-    }
-  }
-
-  function handleFilePaths ({ result, currentPath, context }: { result: string[], currentPath: string, context: any }) {
-    for (let i = 0; i < result.length; i++) {
-      const resultPath = path.join(currentPath, result[i]);
-      const relativeResultPath = path.relative(context.basePath, resultPath);
-      const stat = internalBinding('fs').internalModuleStat(binding, resultPath);
-      context.readdirResults.push(relativeResultPath);
-
-      if (stat === 1) {
-        context.pathsQueue.push(resultPath);
-      }
-    }
-  }
-
-  function readdirRecursive (basePath: string, options: ReaddirOptions, callback: ReaddirCallback) {
-    const context = {
-      withFileTypes: Boolean(options!.withFileTypes),
-      encoding: options!.encoding,
-      basePath,
-      readdirResults: [],
-      pathsQueue: [basePath]
-    };
-
-    let i = 0;
-
-    function read (pathArg: string) {
-      const req = new binding.FSReqCallback();
-      req.oncomplete = (err: any, result: string) => {
-        if (err) {
-          callback(err);
-          return;
-        }
-
-        if (result === undefined) {
-          callback(null, context.readdirResults);
-          return;
-        }
-
-        processReaddirResult({
-          result,
-          currentPath: pathArg,
-          context
-        });
-
-        if (i < context.pathsQueue.length) {
-          read(context.pathsQueue[i++]);
-        } else {
-          callback(null, context.readdirResults);
-        }
-      };
-
-      const pathInfo = splitPath(pathArg);
-      if (pathInfo.isAsar) {
-        let readdirResult;
-        const { asarPath, filePath } = pathInfo;
-
-        const archive = getOrCreateArchive(asarPath);
-        if (!archive) {
-          const error = createError(AsarError.INVALID_ARCHIVE, { asarPath });
-          nextTick(callback, [error]);
-          return;
-        }
-
-        readdirResult = archive.readdir(filePath);
-        if (!readdirResult) {
-          const error = createError(AsarError.NOT_FOUND, { asarPath, filePath });
-          nextTick(callback, [error]);
-          return;
-        }
-
-        // If we're in an asar dir, we need to ensure the result is in the same format as the
-        // native call to readdir withFileTypes i.e. an array of arrays.
-        if (context.withFileTypes) {
-          readdirResult = [
-            [...readdirResult], readdirResult.map((p: string) => {
-              return internalBinding('fs').internalModuleStat(binding, path.join(pathArg, p));
-            })
-          ];
-        }
-
-        processReaddirResult({
-          result: readdirResult,
-          currentPath: pathArg,
-          context
-        });
-
-        if (i < context.pathsQueue.length) {
-          read(context.pathsQueue[i++]);
-        } else {
-          callback(null, context.readdirResults);
-        }
-      } else {
-        binding.readdir(
-          pathArg,
-          context.encoding,
-          context.withFileTypes,
-          req
-        );
-      }
-    }
-
-    read(context.pathsQueue[i++]);
-  }
+  type ReaddirCallback = (err: NodeJS.ErrnoException | null, files: string[]) => void;
 
   const { readdir } = fs;
   fs.readdir = function (pathArgument: string, options: ReaddirOptions, callback: ReaddirCallback) {
@@ -852,7 +720,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
     }
 
     if (options?.recursive) {
-      readdirRecursive(pathArgument, options, callback);
+      nextTick(callback!, [null, readdirSyncRecursive(pathArgument, options)]);
       return;
     }
 
@@ -903,7 +771,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
     }
 
     if (options?.recursive) {
-      return readdirRecursivePromises(pathArgument, options);
+      return readdirRecursive(pathArgument, options);
     }
 
     const pathInfo = splitPath(pathArgument);
@@ -1000,10 +868,12 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
     return readPackageJSON(realPath, isESM, base, specifier);
   };
 
+  const binding = internalBinding('fs');
+
   const { internalModuleStat } = binding;
-  internalBinding('fs').internalModuleStat = (receiver: unknown, pathArgument: string) => {
+  internalBinding('fs').internalModuleStat = (pathArgument: string) => {
     const pathInfo = splitPath(pathArgument);
-    if (!pathInfo.isAsar) return internalModuleStat(receiver, pathArgument);
+    if (!pathInfo.isAsar) return internalModuleStat(pathArgument);
     const { asarPath, filePath } = pathInfo;
 
     // -ENOENT
@@ -1018,7 +888,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
   };
 
   const { kUsePromises } = binding;
-  async function readdirRecursivePromises (originalPath: string, options: ReaddirOptions) {
+  async function readdirRecursive (originalPath: string, options: ReaddirOptions) {
     const result: any[] = [];
 
     const pathInfo = splitPath(originalPath);
@@ -1038,7 +908,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
       if (withFileTypes) {
         initialItem = [
           [...initialItem], initialItem.map((p: string) => {
-            return internalBinding('fs').internalModuleStat(binding, path.join(originalPath, p));
+            return internalBinding('fs').internalModuleStat(path.join(originalPath, p));
           })
         ];
       }
@@ -1071,7 +941,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
 
               readdirResult = [
                 [...files], files.map((p: string) => {
-                  return internalBinding('fs').internalModuleStat(binding, path.join(direntPath, p));
+                  return internalBinding('fs').internalModuleStat(path.join(direntPath, p));
                 })
               ];
             } else {
@@ -1092,7 +962,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
         const { 0: pathArg, 1: readDir } = queue.pop();
         for (const ent of readDir) {
           const direntPath = path.join(pathArg, ent);
-          const stat = internalBinding('fs').internalModuleStat(binding, direntPath);
+          const stat = internalBinding('fs').internalModuleStat(direntPath);
           result.push(path.relative(originalPath, direntPath));
 
           if (stat === 1) {
@@ -1122,13 +992,11 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
   }
 
   function readdirSyncRecursive (basePath: string, options: ReaddirOptions) {
-    const context = {
-      withFileTypes: Boolean(options!.withFileTypes),
-      encoding: options!.encoding,
-      basePath,
-      readdirResults: [] as any,
-      pathsQueue: [basePath]
-    };
+    const withFileTypes = Boolean(options!.withFileTypes);
+    const encoding = options!.encoding;
+
+    const readdirResults: string[] = [];
+    const pathsQueue = [basePath];
 
     function read (pathArg: string) {
       let readdirResult;
@@ -1143,37 +1011,62 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
         if (!readdirResult) return;
         // If we're in an asar dir, we need to ensure the result is in the same format as the
         // native call to readdir withFileTypes i.e. an array of arrays.
-        if (context.withFileTypes) {
+        if (withFileTypes) {
           readdirResult = [
             [...readdirResult], readdirResult.map((p: string) => {
-              return internalBinding('fs').internalModuleStat(binding, path.join(pathArg, p));
+              return internalBinding('fs').internalModuleStat(path.join(pathArg, p));
             })
           ];
         }
       } else {
         readdirResult = binding.readdir(
           path.toNamespacedPath(pathArg),
-          context.encoding,
-          context.withFileTypes
+          encoding,
+          withFileTypes
         );
       }
 
-      if (readdirResult === undefined) {
-        return;
+      if (readdirResult === undefined) return;
+
+      if (withFileTypes) {
+        const length = readdirResult[0].length;
+        for (let i = 0; i < length; i++) {
+          const resultPath = path.join(pathArg, readdirResult[0][i]);
+          const info = splitPath(resultPath);
+
+          let type = readdirResult[1][i];
+          if (info.isAsar) {
+            const archive = getOrCreateArchive(info.asarPath);
+            if (!archive) return;
+            const stats = archive.stat(info.filePath);
+            if (!stats) continue;
+            type = stats.type;
+          }
+
+          const dirent = getDirent(pathArg, readdirResult[0][i], type);
+
+          readdirResults.push(dirent);
+          if (dirent.isDirectory()) {
+            pathsQueue.push(path.join(dirent.path, dirent.name));
+          }
+        }
+      } else {
+        for (let i = 0; i < readdirResult.length; i++) {
+          const resultPath = path.join(pathArg, readdirResult[i]);
+          const relativeResultPath = path.relative(basePath, resultPath);
+          const stat = internalBinding('fs').internalModuleStat(resultPath);
+
+          readdirResults.push(relativeResultPath);
+          if (stat === 1) pathsQueue.push(resultPath);
+        }
       }
-
-      processReaddirResult({
-        result: readdirResult,
-        currentPath: pathArg,
-        context
-      });
     }
 
-    for (let i = 0; i < context.pathsQueue.length; i++) {
-      read(context.pathsQueue[i]);
+    for (let i = 0; i < pathsQueue.length; i++) {
+      read(pathsQueue[i]);
     }
 
-    return context.readdirResults;
+    return readdirResults;
   }
 
   // Calling mkdir for directory inside asar archive should throw ENOTDIR

lib/preload_realm/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-  "rules": {
-    "no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          "electron",
-          "electron/main"
-        ],
-        "patterns": [
-          "./*",
-          "../*",
-          "@electron/internal/browser/*"
-        ]
-      }
-    ]
-  }
-}

lib/preload_realm/api/exports/electron.ts

@@ -1,6 +0,0 @@
-import { defineProperties } from '@electron/internal/common/define-properties';
-import { moduleList } from '@electron/internal/preload_realm/api/module-list';
-
-module.exports = {};
-
-defineProperties(module.exports, moduleList);

lib/preload_realm/api/module-list.ts

@@ -1,14 +0,0 @@
-export const moduleList: ElectronInternal.ModuleEntry[] = [
-  {
-    name: 'contextBridge',
-    loader: () => require('@electron/internal/renderer/api/context-bridge')
-  },
-  {
-    name: 'ipcRenderer',
-    loader: () => require('@electron/internal/renderer/api/ipc-renderer')
-  },
-  {
-    name: 'nativeImage',
-    loader: () => require('@electron/internal/common/api/native-image')
-  }
-];

lib/preload_realm/init.ts

@@ -1,58 +0,0 @@
-import '@electron/internal/sandboxed_renderer/pre-init';
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
-import { createPreloadProcessObject, executeSandboxedPreloadScripts } from '@electron/internal/sandboxed_renderer/preload';
-
-import * as events from 'events';
-
-declare const binding: {
-  get: (name: string) => any;
-  process: NodeJS.Process;
-  createPreloadScript: (src: string) => Function
-};
-
-const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils') as typeof ipcRendererUtilsModule;
-
-const {
-  preloadScripts,
-  process: processProps
-} = ipcRendererUtils.invokeSync<{
-  preloadScripts: ElectronInternal.PreloadScript[];
-  process: NodeJS.Process;
-}>(IPC_MESSAGES.BROWSER_SANDBOX_LOAD);
-
-const electron = require('electron');
-
-const loadedModules = new Map<string, any>([
-  ['electron', electron],
-  ['electron/common', electron],
-  ['events', events],
-  ['node:events', events]
-]);
-
-const loadableModules = new Map<string, Function>([
-  ['url', () => require('url')],
-  ['node:url', () => require('url')]
-]);
-
-const preloadProcess = createPreloadProcessObject();
-
-Object.assign(preloadProcess, binding.process);
-Object.assign(preloadProcess, processProps);
-
-Object.assign(process, processProps);
-
-require('@electron/internal/renderer/ipc-native-setup');
-
-executeSandboxedPreloadScripts({
-  loadedModules,
-  loadableModules,
-  process: preloadProcess,
-  createPreloadScript: binding.createPreloadScript,
-  exposeGlobals: {
-    Buffer,
-    // FIXME(samuelmaddock): workaround webpack bug replacing this with just
-    // `__webpack_require__.g,` which causes script error
-    global: globalThis
-  }
-}, preloadScripts);