fix: dangling raw_ptr in ElectronBrowserMainParts dtor (#39593)

* fix: dangling raw_ptr in ElectronBrowserMainParts dtor

Co-authored-by: Charles Kerr <charles@charleskerr.com>

* fixup! fix: dangling raw_ptr in ElectronBrowserMainParts dtor

Browser::WhenReady() holds a reference to JsEnv isolate so must come after

Co-authored-by: Charles Kerr <charles@charleskerr.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Charles Kerr <charles@charleskerr.com>

.circleci/config/base.yml

@@ -579,13 +579,8 @@ step-install-gnutar-on-mac: &step-install-gnutar-on-mac
     command: |
       if [ "`uname`" == "Darwin" ]; then
         if [ ! -d /usr/local/Cellar/gnu-tar/ ]; then
-          if [ "`sysctl -n sysctl.proc_translated`" == "1" ]; then
-            arch -arm64 brew update
-            arch -arm64 brew install gnu-tar
-          else
-            brew update
-            brew install gnu-tar
-          fi
+          brew update
+          brew install gnu-tar
         fi
         ln -fs /usr/local/bin/gtar /usr/local/bin/tar
       fi
@@ -650,7 +645,7 @@ step-nodejs-headers-build: &step-nodejs-headers-build
     name: Build Node.js headers
     command: |
       cd src
-      ninja -C out/Default electron:node_headers
+      ninja -C out/Default third_party/electron_node:headers
 
 step-electron-publish: &step-electron-publish
   run:
@@ -1077,7 +1072,7 @@ commands:
           build-type: << parameters.build-type >>
       - *step-maybe-electron-dist-strip
       - step-electron-dist-build:
-          additional-targets: shell_browser_ui_unittests electron:node_headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip
+          additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip
 
       - *step-show-goma-stats
 
@@ -1877,8 +1872,7 @@ jobs:
   osx-testing-x64:
     executor:
       name: macos
-      size: macos.m1.medium.gen1
-    shell: /usr/bin/arch -arch x86_64 /bin/bash --login -eo pipefail
+      size: macos.x86.medium.gen2
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -1886,15 +1880,6 @@ jobs:
       <<: *env-macos-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     steps:
-      - run:
-          name: Install Rosetta 2
-          command: |
-            /usr/sbin/softwareupdate --install-rosetta --agree-to-license
-            # Trick bashrc into thinking we are arm64 still
-            sed -i '' 's/x86_64/never/g' ~/.bashrc
-            sed -i '' 's/x86_64/never/g' ~/.bash_profile
-            sed -i '' 's/x86_64/never/g' ~/.zshrc
-          shell: /bin/bash --login -eo pipefail
       - electron-build:
           persist: true
           checkout: false

.github/workflows/branch-created.yml

@@ -60,15 +60,16 @@ jobs:
           done
       - name: Generate GitHub App token
         if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
         id: generate-token
-        with:
-          creds: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
-          org: electron
+        env:
+          RELEASE_BOARD_GH_APP_CREDS: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
+        run: |
+          TOKEN=$(npx @electron/github-app-auth --creds=$RELEASE_BOARD_GH_APP_CREDS --org=electron)
+          echo "TOKEN=$TOKEN" >> "$GITHUB_OUTPUT"
       - name: Create Release Project Board
         if: ${{ steps.check-major-version.outputs.MAJOR }}
         env:
-          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
+          GITHUB_TOKEN: ${{ steps.generate-token.outputs.TOKEN }}
           MAJOR: ${{ steps.check-major-version.outputs.MAJOR }}
           ELECTRON_ORG_ID: "O_kgDOAMybxg"
           ELECTRON_REPO_ID: "R_kgDOAI8xSw"
@@ -134,7 +135,7 @@ jobs:
           #
           # Do template replacement for draft issues
           #
-          echo "{\"major\": $MAJOR, \"next-major\": $((MAJOR + 1)), \"prev-major\": $((MAJOR - 1))}" > variables.json
+          echo "{\"major\": $MAJOR, \"next-major\": $((MAJOR + 1))}" > variables.json
 
           # npx mustache is annoyingly slow, so install mustache directly
           yarn add -D mustache

.github/workflows/issue-commented.yml

@@ -5,22 +5,20 @@ on:
     types:
       - created
 
-permissions: {}
+permissions:
+  contents: read
 
 jobs:
   issue-commented:
     name: Remove blocked/need-repro on comment
     if: ${{ contains(github.event.issue.labels.*.name, 'blocked/need-repro') && !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) }}
+    permissions:
+      issues: write
     runs-on: ubuntu-latest
     steps:
-      - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
-        id: generate-token
-        with:
-          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
       - name: Remove label
         env:
-          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           ISSUE_URL: ${{ github.event.issue.html_url }}
         run: |
           gh issue edit $ISSUE_URL --remove-label 'blocked/need-repro'

.github/workflows/issue-labeled.yml

@@ -14,15 +14,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
         id: generate-token
-        with:
-          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
-          org: electron
+        env:
+          RELEASE_BOARD_GH_APP_CREDS: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
+        run: |
+          set -eo pipefail
+          TOKEN=$(npx @electron/github-app-auth --creds=$RELEASE_BOARD_GH_APP_CREDS --org=electron)
+          echo "TOKEN=$TOKEN" >> "$GITHUB_OUTPUT"
       - name: Set status
+        if: ${{ steps.generate-token.outputs.TOKEN }}
         uses: github/update-project-action@2d475e08804f11f4022df7e21f5816531e97cb64 # v2
         with:
-          github_token: ${{ steps.generate-token.outputs.token }}
+          github_token: ${{ steps.generate-token.outputs.TOKEN }}
           organization: electron
           project_number: 90
           content_id: ${{ github.event.issue.node_id }}
@@ -46,18 +49,11 @@ jobs:
           if [[ $COMMENT_COUNT -eq 0 ]]; then
             echo "SHOULD_COMMENT=1" >> "$GITHUB_OUTPUT"
           fi
-      - name: Generate GitHub App token
-        if: ${{ steps.check-for-comment.outputs.SHOULD_COMMENT }}
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
-        id: generate-token
-        with:
-          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
       - name: Create comment
         if: ${{ steps.check-for-comment.outputs.SHOULD_COMMENT }}
         uses: actions-cool/issues-helper@275328970dbc3bfc3bc43f5fe741bf3638300c0a # v3.3.3
         with:
           actions: 'create-comment'
-          token: ${{ steps.generate-token.outputs.token }}
           body: |
             <!-- blocked/need-repro -->
 

.github/workflows/issue-unlabeled.yml

@@ -23,16 +23,18 @@ jobs:
           fi
       - name: Generate GitHub App token
         if: ${{ steps.check-for-blocked-labels.outputs.NOT_BLOCKED }}
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
         id: generate-token
-        with:
-          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
-          org: electron
+        env:
+          RELEASE_BOARD_GH_APP_CREDS: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
+        run: |
+          set -eo pipefail
+          TOKEN=$(npx @electron/github-app-auth --creds=$RELEASE_BOARD_GH_APP_CREDS --org=electron)
+          echo "TOKEN=$TOKEN" >> "$GITHUB_OUTPUT"
       - name: Set status
-        if: ${{ steps.check-for-blocked-labels.outputs.NOT_BLOCKED }}
+        if: ${{ steps.generate-token.outputs.TOKEN }}
         uses: github/update-project-action@2d475e08804f11f4022df7e21f5816531e97cb64 # v2
         with:
-          github_token: ${{ steps.generate-token.outputs.token }}
+          github_token: ${{ steps.generate-token.outputs.TOKEN }}
           organization: electron
           project_number: 90
           content_id: ${{ github.event.issue.node_id }}

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

@@ -14,15 +14,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
         id: generate-token
-        with:
-          creds: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
-          org: electron
+        env:
+          RELEASE_BOARD_GH_APP_CREDS: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
+        run: |
+          set -eo pipefail
+          TOKEN=$(npx @electron/github-app-auth --creds=$RELEASE_BOARD_GH_APP_CREDS --org=electron)
+          echo "TOKEN=$TOKEN" >> "$GITHUB_OUTPUT"
       - name: Set status
-        uses: dsanders11/update-project-action@7ade91760df70df76770a238abee7a4869e01cf8
+        if: ${{ steps.generate-token.outputs.TOKEN }}
+        uses: github/update-project-action@2d475e08804f11f4022df7e21f5816531e97cb64 # v2
         with:
-          github_token: ${{ steps.generate-token.outputs.token }}
+          github_token: ${{ steps.generate-token.outputs.TOKEN }}
           organization: electron
           project_number: 94
           content_id: ${{ github.event.pull_request.node_id }}

.github/workflows/stale.yml

@@ -5,20 +5,15 @@ on:
     # 1:30am every day
     - cron: '30 1 * * *'
 
-permissions: {}
+permissions:
+  issues: write
 
 jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
-        id: generate-token
-        with:
-          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
       - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag: v6.0.1
         with:
-          repo-token: ${{ steps.generate-token.outputs.token }}
           days-before-stale: 90
           days-before-close: 30
           stale-issue-label: stale
@@ -27,21 +22,15 @@ jobs:
             This issue has been automatically marked as stale. **If this issue is still affecting you, please leave any comment** (for example, "bump"), and we'll keep it open. If you have any new additional information—in particular, if this is still reproducible in the [latest version of Electron](https://www.electronjs.org/releases/stable) or in the [beta](https://www.electronjs.org/releases/beta)—please include it with your comment!
           close-issue-message: >
             This issue has been closed due to inactivity, and will not be monitored.  If this is a bug and you can reproduce this issue on a [supported version of Electron](https://www.electronjs.org/docs/latest/tutorial/electron-timelines#timeline) please open a new issue and include instructions for reproducing the issue.
-          exempt-issue-labels: "discussion,security \U0001F512,enhancement :sparkles:,status/confirmed"
+          exempt-issue-labels: "discussion,security \U0001F512,enhancement :sparkles:"
           only-pr-labels: not-a-real-label
   pending-repro:
     runs-on: ubuntu-latest
     if: ${{ always() }}
     needs: stale
     steps:
-      - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@cc6751b3b5e4edc5b9a4ad0a021ac455653b6dc8 # v1.0.0
-        id: generate-token
-        with:
-          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
       - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag: v6.0.1
         with:
-          repo-token: ${{ steps.generate-token.outputs.token }}
           days-before-stale: -1
           days-before-close: 10
           remove-stale-when-updated: false

BUILD.gn

@@ -9,7 +9,6 @@ import("//pdf/features.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//testing/test.gni")
-import("//third_party/electron_node/node.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
 import("//tools/generate_library_loader/generate_library_loader.gni")
 import("//tools/grit/grit_rule.gni")
@@ -543,6 +542,7 @@ source_set("electron_lib") {
 
   if (is_mac) {
     deps += [
+      ":electron_lib_arc",
       "//components/remote_cocoa/app_shim",
       "//components/remote_cocoa/browser",
       "//content/browser:mac_helpers",
@@ -730,8 +730,8 @@ source_set("electron_lib") {
       "//pdf",
     ]
     sources += [
-      "shell/browser/electron_pdf_document_helper_client.cc",
-      "shell/browser/electron_pdf_document_helper_client.h",
+      "shell/browser/electron_pdf_web_contents_helper_client.cc",
+      "shell/browser/electron_pdf_web_contents_helper_client.h",
       "shell/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.cc",
       "shell/browser/extensions/api/pdf_viewer_private/pdf_viewer_private_api.h",
     ]
@@ -744,6 +744,62 @@ source_set("electron_lib") {
   }
 }
 
+if (is_mac) {
+  source_set("electron_lib_arc") {
+    public_configs = [ ":branding" ]
+    include_dirs = [ "." ]
+    sources = [
+      "shell/app/electron_main_delegate_mac.h",
+      "shell/app/electron_main_delegate_mac.mm",
+      "shell/browser/api/electron_api_menu_mac.h",
+      "shell/browser/api/electron_api_menu_mac.mm",
+      "shell/browser/api/electron_api_native_theme_mac.mm",
+      "shell/browser/api/electron_api_push_notifications_mac.mm",
+      "shell/browser/api/electron_api_system_preferences_mac.mm",
+      "shell/browser/browser_mac.mm",
+      "shell/browser/electron_browser_main_parts_mac.mm",
+      "shell/browser/mac/dict_util.h",
+      "shell/browser/mac/dict_util.mm",
+      "shell/browser/mac/electron_application.h",
+      "shell/browser/mac/electron_application.mm",
+      "shell/browser/mac/electron_application_delegate.h",
+      "shell/browser/mac/electron_application_delegate.mm",
+      "shell/browser/native_window_mac.h",
+      "shell/browser/native_window_mac.mm",
+      "shell/browser/ui/cocoa/delayed_native_view_host.h",
+      "shell/browser/ui/cocoa/delayed_native_view_host.mm",
+      "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.h",
+      "shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm",
+      "shell/browser/ui/cocoa/electron_menu_controller.mm",
+      "shell/browser/ui/cocoa/electron_ns_window.h",
+      "shell/browser/ui/cocoa/electron_ns_window.mm",
+      "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
+      "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
+      "shell/browser/ui/cocoa/electron_touch_bar.h",
+      "shell/browser/ui/cocoa/electron_touch_bar.mm",
+      "shell/browser/ui/inspectable_web_contents_view_mac.h",
+      "shell/browser/ui/inspectable_web_contents_view_mac.mm",
+      "shell/browser/ui/tray_icon_cocoa.h",
+      "shell/browser/ui/tray_icon_cocoa.mm",
+    ]
+
+    deps = [
+      "buildflags",
+      "shell/common/api:mojo",
+      "//base",
+      "//skia",
+      "//third_party/electron_node:node_lib",
+      "//third_party/webrtc_overrides:webrtc_component",
+      "//v8",
+    ]
+
+    configs += [
+      "//electron/build/config:mas_build",
+      "//third_party/electron_node:node_internals",
+    ]
+  }
+}
+
 electron_paks("packed_resources") {
   if (is_mac) {
     output_dir = "$root_gen_dir/electron_repack"
@@ -906,7 +962,7 @@ if (is_mac) {
       output_name = electron_helper_name + invoker.helper_name_suffix
       deps = [
         ":electron_framework+link",
-        "//base/allocator:early_zone_registration_apple",
+        "//base/allocator:early_zone_registration_mac",
       ]
       if (!is_mas_build) {
         deps += [ "//sandbox/mac:seatbelt" ]
@@ -1068,7 +1124,7 @@ if (is_mac) {
       ":electron_app_plist",
       ":electron_app_resources",
       ":electron_fuses",
-      "//base/allocator:early_zone_registration_apple",
+      "//base/allocator:early_zone_registration_mac",
       "//electron/buildflags",
     ]
     if (is_mas_build) {
@@ -1511,70 +1567,3 @@ action("libcxx_objects_zip") {
 group("electron") {
   public_deps = [ ":electron_app" ]
 }
-
-##### node_headers
-
-node_dir = "../third_party/electron_node"
-node_files = read_file("$node_dir/filenames.json", "json")
-node_headers_dir = "$root_gen_dir/node_headers"
-
-header_group_index = 0
-header_groups = []
-foreach(header_group, node_files.headers) {
-  copy("node_headers_${header_group_index}") {
-    sources = rebase_path(header_group.files, ".", node_dir)
-    outputs =
-        [ "$node_headers_dir/${header_group.dest_dir}/{{source_file_part}}" ]
-  }
-  header_groups += [ ":node_headers_${header_group_index}" ]
-  header_group_index += 1
-}
-
-copy("zlib_headers") {
-  sources = [
-    "$node_dir/deps/zlib/zconf.h",
-    "$node_dir/deps/zlib/zlib.h",
-  ]
-  outputs = [ "$node_headers_dir/include/node/{{source_file_part}}" ]
-}
-
-copy("node_gypi_headers") {
-  deps = [ ":generate_config_gypi" ]
-  sources = [
-    "$node_dir/common.gypi",
-    "$root_gen_dir/config.gypi",
-  ]
-  outputs = [ "$node_headers_dir/include/node/{{source_file_part}}" ]
-}
-
-action("node_version_header") {
-  inputs = [ "$node_dir/src/node_version.h" ]
-  outputs = [ "$node_headers_dir/include/node/node_version.h" ]
-  script = "script/generate_node_version_header.py"
-  args = rebase_path(inputs) + rebase_path(outputs)
-  if (node_module_version != "") {
-    args += [ "$node_module_version" ]
-  }
-}
-
-action("tar_node_headers") {
-  deps = [ ":copy_node_headers" ]
-  outputs = [ "$root_gen_dir/node_headers.tar.gz" ]
-  script = "script/tar.py"
-  args = [
-    rebase_path("$root_gen_dir/node_headers"),
-    rebase_path(outputs[0]),
-  ]
-}
-
-group("copy_node_headers") {
-  public_deps = header_groups + [
-                  ":node_gypi_headers",
-                  ":node_version_header",
-                  ":zlib_headers",
-                ]
-}
-
-group("node_headers") {
-  public_deps = [ ":tar_node_headers" ]
-}

DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '118.0.5975.0',
+    '118.0.5949.0',
   'node_version':
     'v18.17.1',
   'nan_version':

README.md

@@ -38,7 +38,7 @@ For more installation options and troubleshooting tips, see
 
 Each Electron release provides binaries for macOS, Windows, and Linux.
 
-* macOS (Catalina and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
+* macOS (High Sierra and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
 * Windows (Windows 10 and up): Electron provides `ia32` (`x86`), `x64` (`amd64`), and `arm64` binaries for Windows. Windows on ARM support was added in Electron 5.0.8. Support for Windows 7, 8 and 8.1 was [removed in Electron 23, in line with Chromium's Windows deprecation policy](https://www.electronjs.org/blog/windows-7-to-8-1-deprecation-notice).
 * Linux: The prebuilt binaries of Electron are built on Ubuntu 20.04. They have also been verified to work on:
   * Ubuntu 14.04 and newer
@@ -78,7 +78,7 @@ binary. Use this to spawn Electron from Node scripts:
 
 ```javascript
 const electron = require('electron')
-const proc = require('node:child_process')
+const proc = require('child_process')
 
 // will print something similar to /Users/maf/.../Electron
 console.log(electron)

appveyor-woa.yml

@@ -118,7 +118,7 @@ for:
       - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
       - ps: >-
           if (Test-Path 'env:RAW_GOMA_AUTH') {
-            $goma_login = python3 $env:LOCAL_GOMA_DIR\goma_auth.py info
+            $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
             if ($goma_login -eq 'Login as Fermi Planck') {
               Write-warning "Goma authentication is correct";
             } else {
@@ -167,8 +167,8 @@ for:
       - cd ..\..
       - ninja -C out/Default electron:hunspell_dictionaries_zip
       - ninja -C out/Default electron:electron_chromedriver_zip
-      - ninja -C out/Default electron:node_headers
-      - python3 %LOCAL_GOMA_DIR%\goma_ctl.py stat
+      - ninja -C out/Default third_party/electron_node:headers
+      - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
       - ps: >-
           Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
       - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
@@ -319,4 +319,4 @@ for:
     on_finish:
       # Uncomment these lines to enable RDP
       # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
+      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )

appveyor.yml

@@ -116,7 +116,7 @@ for:
       - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
       - ps: >-
           if (Test-Path 'env:RAW_GOMA_AUTH') {
-            $goma_login = python3 $env:LOCAL_GOMA_DIR\goma_auth.py info
+            $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
             if ($goma_login -eq 'Login as Fermi Planck') {
               Write-warning "Goma authentication is correct";
             } else {
@@ -165,8 +165,8 @@ for:
       - cd ..\..
       - ninja -C out/Default electron:hunspell_dictionaries_zip
       - ninja -C out/Default electron:electron_chromedriver_zip
-      - ninja -C out/Default electron:node_headers
-      - python3 %LOCAL_GOMA_DIR%\goma_ctl.py stat
+      - ninja -C out/Default third_party/electron_node:headers
+      - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
       - ps: >-
           Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
       - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
@@ -319,4 +319,4 @@ for:
     on_finish:
       # Uncomment these lines to enable RDP
       # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
+      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )

build/args/all.gn

@@ -56,7 +56,3 @@ v8_builtins_profiling_log_file = ""
 # https://chromium.googlesource.com/chromium/src/+/main/docs/dangling_ptr.md
 # TODO(vertedinde): hunt down dangling pointers on Linux
 enable_dangling_raw_ptr_checks = false
-
-# This flag speeds up the performance of fork/execve on linux systems.
-# Ref: https://chromium-review.googlesource.com/c/v8/v8/+/4602858
-v8_enable_private_mapping_fork_optimization = true

chromium_src/BUILD.gn

@@ -213,20 +213,7 @@ static_library("chrome") {
   }
 
   if (is_mac) {
-    sources += [
-      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
-      "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
-      "//chrome/browser/icon_loader_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
-      "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
-      "//chrome/browser/platform_util_mac.mm",
-      "//chrome/browser/process_singleton_mac.mm",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
-    ]
+    public_deps += [ ":chrome_lib_arc" ]
   }
 
   if (enable_widevine) {
@@ -342,6 +329,34 @@ static_library("chrome") {
   }
 }
 
+if (is_mac) {
+  source_set("chrome_lib_arc") {
+    include_dirs = [ "." ]
+    sources = [
+      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
+      "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
+      "//chrome/browser/icon_loader_mac.mm",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
+      "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
+      "//chrome/browser/platform_util_mac.mm",
+      "//chrome/browser/process_singleton_mac.mm",
+      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
+      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
+    ]
+
+    deps = [
+      "//base",
+      "//skia",
+      "//third_party/electron_node:node_lib",
+      "//third_party/webrtc_overrides:webrtc_component",
+      "//v8",
+    ]
+  }
+}
+
 source_set("plugins") {
   sources = []
   deps = []

default_app/default_app.ts

@@ -51,17 +51,16 @@ async function createWindow (backgroundColor?: string) {
     autoHideMenuBar: true,
     backgroundColor,
     webPreferences: {
-      preload: url.fileURLToPath(new URL('preload.js', import.meta.url)),
+      preload: path.resolve(__dirname, 'preload.js'),
       contextIsolation: true,
-      sandbox: true,
-      nodeIntegration: false
+      sandbox: true
     },
     useContentSize: true,
     show: false
   };
 
   if (process.platform === 'linux') {
-    options.icon = url.fileURLToPath(new URL('icon.png', import.meta.url));
+    options.icon = path.join(__dirname, 'icon.png');
   }
 
   mainWindow = new BrowserWindow(options);

default_app/main.ts

@@ -1,7 +1,6 @@
 import * as electron from 'electron/main';
 
 import * as fs from 'node:fs';
-import { Module } from 'node:module';
 import * as path from 'node:path';
 import * as url from 'node:url';
 const { app, dialog } = electron;
@@ -16,6 +15,8 @@ type DefaultAppOptions = {
   modules: string[];
 }
 
+const Module = require('node:module');
+
 // Parse command line options.
 const argv = process.argv.slice(1);
 
@@ -70,10 +71,10 @@ if (nextArgIsRequire) {
 
 // Set up preload modules
 if (option.modules.length > 0) {
-  (Module as any)._preloadModules(option.modules);
+  Module._preloadModules(option.modules);
 }
 
-async function loadApplicationPackage (packagePath: string) {
+function loadApplicationPackage (packagePath: string) {
   // Add a flag indicating app is started from default app.
   Object.defineProperty(process, 'defaultApp', {
     configurable: false,
@@ -88,19 +89,11 @@ async function loadApplicationPackage (packagePath: string) {
     let appPath;
     if (fs.existsSync(packageJsonPath)) {
       let packageJson;
-      const emitWarning = process.emitWarning;
       try {
-        process.emitWarning = () => {};
-        packageJson = (await import(url.pathToFileURL(packageJsonPath).toString(), {
-          assert: {
-            type: 'json'
-          }
-        })).default;
+        packageJson = require(packageJsonPath);
       } catch (e) {
         showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${(e as Error).message}`);
         return;
-      } finally {
-        process.emitWarning = emitWarning;
       }
 
       if (packageJson.version) {
@@ -119,15 +112,13 @@ async function loadApplicationPackage (packagePath: string) {
       // Set v8 flags, deliberately lazy load so that apps that do not use this
       // feature do not pay the price
       if (packageJson.v8Flags) {
-        (await import('node:v8')).setFlagsFromString(packageJson.v8Flags);
+        require('node:v8').setFlagsFromString(packageJson.v8Flags);
       }
       appPath = packagePath;
     }
 
-    let filePath: string;
-
     try {
-      filePath = (Module as any)._resolveFilename(packagePath, null, true);
+      const filePath = Module._resolveFilename(packagePath, module, true);
       app.setAppPath(appPath || path.dirname(filePath));
     } catch (e) {
       showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${(e as Error).message}`);
@@ -135,7 +126,7 @@ async function loadApplicationPackage (packagePath: string) {
     }
 
     // Run the app.
-    await import(url.pathToFileURL(filePath).toString());
+    Module._load(packagePath, module, true);
   } catch (e) {
     console.error('App threw an error during load');
     console.error((e as Error).stack || e);
@@ -150,16 +141,16 @@ function showErrorMessage (message: string) {
 }
 
 async function loadApplicationByURL (appUrl: string) {
-  const { loadURL } = await import('./default_app.js');
+  const { loadURL } = await import('./default_app');
   loadURL(appUrl);
 }
 
 async function loadApplicationByFile (appPath: string) {
-  const { loadFile } = await import('./default_app.js');
+  const { loadFile } = await import('./default_app');
   loadFile(appPath);
 }
 
-async function startRepl () {
+function startRepl () {
   if (process.platform === 'win32') {
     console.error('Electron REPL not currently supported on Windows');
     process.exit(1);
@@ -180,8 +171,8 @@ async function startRepl () {
     Using: Node.js ${nodeVersion} and Electron.js ${electronVersion}
   `);
 
-  const { start } = await import('node:repl');
-  const repl = start({
+  const { REPLServer } = require('node:repl');
+  const repl = new REPLServer({
     prompt: '> '
   }).on('exit', () => {
     process.exit(0);
@@ -234,8 +225,8 @@ async function startRepl () {
 
   const electronBuiltins = [...Object.keys(electron), 'original-fs', 'electron'];
 
-  const defaultComplete: Function = repl.completer;
-  (repl as any).completer = (line: string, callback: Function) => {
+  const defaultComplete = repl.completer;
+  repl.completer = (line: string, callback: Function) => {
     const lastSpace = line.lastIndexOf(' ');
     const currentSymbol = line.substring(lastSpace + 1, repl.cursor);
 
@@ -258,11 +249,11 @@ if (option.file && !option.webdriver) {
   const protocol = url.parse(file).protocol;
   const extension = path.extname(file);
   if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:' || protocol === 'chrome:') {
-    await loadApplicationByURL(file);
+    loadApplicationByURL(file);
   } else if (extension === '.html' || extension === '.htm') {
-    await loadApplicationByFile(path.resolve(file));
+    loadApplicationByFile(path.resolve(file));
   } else {
-    await loadApplicationPackage(file);
+    loadApplicationPackage(file);
   }
 } else if (option.version) {
   console.log('v' + process.versions.electron);
@@ -271,7 +262,7 @@ if (option.file && !option.webdriver) {
   console.log(process.versions.modules);
   process.exit(0);
 } else if (option.interactive) {
-  await startRepl();
+  startRepl();
 } else {
   if (!option.noHelp) {
     const welcomeMessage = `
@@ -294,5 +285,5 @@ Options:
     console.log(welcomeMessage);
   }
 
-  await loadApplicationByFile('index.html');
+  loadApplicationByFile('index.html');
 }

default_app/package.json

@@ -1,6 +1,5 @@
 {
   "name": "electron",
   "productName": "Electron",
-  "main": "main.js",
-  "type": "module"
+  "main": "main.js"
 }

default_app/preload.ts

@@ -1,4 +1,4 @@
-const { ipcRenderer, contextBridge } = require('electron/renderer');
+import { ipcRenderer, contextBridge } from 'electron/renderer';
 
 const policy = window.trustedTypes.createPolicy('electron-default-app', {
   // we trust the SVG contents

docs/api/app.md

@@ -1333,7 +1333,7 @@ application name. For example:
 
 ``` js
 const { app } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 const appFolder = path.dirname(process.execPath)
 const updateExe = path.resolve(appFolder, '..', 'Update.exe')
@@ -1404,7 +1404,7 @@ Returns `Function` - This function **must** be called once you have finished acc
 
 ```js
 const { app, dialog } = require('electron')
-const fs = require('node:fs')
+const fs = require('fs')
 
 let filepath
 let bookmark

docs/api/browser-window.md

@@ -1211,7 +1211,7 @@ const win = new BrowserWindow()
 const url = require('url').format({
   protocol: 'file',
   slashes: true,
-  pathname: require('node:path').join(__dirname, 'index.html')
+  pathname: require('path').join(__dirname, 'index.html')
 })
 
 win.loadURL(url)
@@ -1595,6 +1595,25 @@ Passing `null` will reset the position to default.
 Returns `Point | null` - The custom position for the traffic light buttons in
 frameless window, `null` will be returned when there is no custom position.
 
+#### `win.setTrafficLightPosition(position)` _macOS_ _Deprecated_
+
+* `position` [Point](structures/point.md)
+
+Set a custom position for the traffic light buttons in frameless window.
+Passing `{ x: 0, y: 0 }` will reset the position to default.
+
+> **Note**
+> This function is deprecated. Use [setWindowButtonPosition](#winsetwindowbuttonpositionposition-macos) instead.
+
+#### `win.getTrafficLightPosition()` _macOS_ _Deprecated_
+
+Returns `Point` - The custom position for the traffic light buttons in
+frameless window, `{ x: 0, y: 0 }` will be returned when there is no custom
+position.
+
+> **Note**
+> This function is deprecated. Use [getWindowButtonPosition](#wingetwindowbuttonposition-macos) instead.
+
 #### `win.setTouchBar(touchBar)` _macOS_
 
 * `touchBar` TouchBar | null

docs/api/context-bridge.md

@@ -147,7 +147,7 @@ Be very cautious about which globals and APIs you expose to untrusted remote con
 
 ```javascript
 const { contextBridge } = require('electron')
-const crypto = require('node:crypto')
+const crypto = require('crypto')
 contextBridge.exposeInMainWorld('nodeCrypto', {
   sha256sum (data) {
     const hash = crypto.createHash('sha256')

docs/api/extensions.md

@@ -40,41 +40,18 @@ We support the following extensions APIs, with some caveats. Other APIs may
 additionally be supported, but support for any APIs not listed here is
 provisional and may be removed.
 
-### Supported Manifest Keys
-
-- `name`
-- `version`
-- `author`
-- `permissions`
-- `content_scripts`
-- `default_locale`
-- `devtools_page`
-- `short_name`
-- `host_permissions` (Manifest V3)
-- `manifest_version`
-- `background` (Manifest V2)
-- `minimum_chrome_version`
-
-See [Manifest file format](https://developer.chrome.com/docs/extensions/mv3/manifest/) for more information about the purpose of each possible key.
-
 ### `chrome.devtools.inspectedWindow`
 
 All features of this API are supported.
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/devtools_inspectedWindow) for more information.
-
 ### `chrome.devtools.network`
 
 All features of this API are supported.
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/devtools_network) for more information.
-
 ### `chrome.devtools.panels`
 
 All features of this API are supported.
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/devtools_panels) for more information.
-
 ### `chrome.extension`
 
 The following properties of `chrome.extension` are supported:
@@ -86,25 +63,6 @@ The following methods of `chrome.extension` are supported:
 - `chrome.extension.getURL`
 - `chrome.extension.getBackgroundPage`
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/extension) for more information.
-
-### `chrome.management`
-
-The following methods of `chrome.management` are supported:
-
-- `chrome.management.getAll`
-- `chrome.management.get`
-- `chrome.management.getSelf`
-- `chrome.management.getPermissionWarningsById`
-- `chrome.management.getPermissionWarningsByManifest`
-
-The following events of `chrome.management` are supported:
-
-- `chrome.management.onEnabled`
-- `chrome.management.onDisabled`
-
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/management) for more information.
-
 ### `chrome.runtime`
 
 The following properties of `chrome.runtime` are supported:
@@ -131,24 +89,12 @@ The following events of `chrome.runtime` are supported:
 - `chrome.runtime.onConnect`
 - `chrome.runtime.onMessage`
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/runtime) for more information.
-
-### `chrome.scripting`
-
-All features of this API are supported.
-
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/scripting) for more information.
-
 ### `chrome.storage`
 
 The following methods of `chrome.storage` are supported:
 
 - `chrome.storage.local`
 
-`chrome.storage.sync` and `chrome.storage.managed` are **not** supported.
-
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/storage) for more information.
-
 ### `chrome.tabs`
 
 The following methods of `chrome.tabs` are supported:
@@ -165,12 +111,23 @@ The following methods of `chrome.tabs` are supported:
 > tab". Since Electron has no such concept, passing `-1` as a tab ID is not
 > supported and will raise an error.
 
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/tabs) for more information.
+### `chrome.management`
+
+The following methods of `chrome.management` are supported:
+
+- `chrome.management.getAll`
+- `chrome.management.get`
+- `chrome.management.getSelf`
+- `chrome.management.getPermissionWarningsById`
+- `chrome.management.getPermissionWarningsByManifest`
+
+The following events of `chrome.management` are supported:
+
+- `chrome.management.onEnabled`
+- `chrome.management.onDisabled`
 
 ### `chrome.webRequest`
 
 All features of this API are supported.
 
 > **NOTE:** Electron's [`webRequest`](web-request.md) module takes precedence over `chrome.webRequest` if there are conflicting handlers.
-
-See [official documentation](https://developer.chrome.com/docs/extensions/reference/webRequest) for more information.

docs/api/ipc-renderer.md

@@ -192,6 +192,14 @@ ipcMain.on('port', (e, msg) => {
 For more information on using `MessagePort` and `MessageChannel`, see the [MDN
 documentation](https://developer.mozilla.org/en-US/docs/Web/API/MessageChannel).
 
+### `ipcRenderer.sendTo(webContentsId, channel, ...args)` _Deprecated_
+
+* `webContentsId` number
+* `channel` string
+* `...args` any[]
+
+Sends a message to a window with `webContentsId` via `channel`.
+
 ### `ipcRenderer.sendToHost(channel, ...args)`
 
 * `channel` string

docs/api/protocol.md

@@ -33,7 +33,7 @@ to register it to that session explicitly.
 
 ```javascript
 const { app, BrowserWindow, net, protocol, session } = require('electron')
-const path = require('node:path')
+const path = require('path')
 const url = require('url')
 
 app.whenReady().then(() => {
@@ -122,7 +122,7 @@ Example:
 
 ```js
 const { app, net, protocol } = require('electron')
-const { join } = require('node:path')
+const { join } = require('path')
 const { pathToFileURL } = require('url')
 
 protocol.registerSchemesAsPrivileged([

docs/api/session.md

@@ -103,7 +103,7 @@ const { session } = require('electron')
 session.defaultSession.on('will-download', (event, item, webContents) => {
   event.preventDefault()
   require('got')(item.getURL()).then((response) => {
-    require('node:fs').writeFileSync('/somewhere', response.body)
+    require('fs').writeFileSync('/somewhere', response.body)
   })
 })
 ```
@@ -1193,7 +1193,7 @@ automatically.  To clear the handler, call `setBluetoothPairingHandler(null)`.
 
 ```javascript
 const { app, BrowserWindow, session } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 function createWindow () {
   let bluetoothPinCallback = null
@@ -1311,7 +1311,7 @@ The API will generate a [DownloadItem](download-item.md) that can be accessed
 with the [will-download](#event-will-download) event.
 
 **Note:** This does not perform any security checks that relate to a page's origin,
-unlike [`webContents.downloadURL`](web-contents.md#contentsdownloadurlurl-options).
+unlike [`webContents.downloadURL`](web-contents.md#contentsdownloadurlurl).
 
 #### `ses.createInterruptedDownload(options)`
 
@@ -1457,7 +1457,7 @@ extension to be loaded.
 
 ```js
 const { app, session } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 app.whenReady().then(async () => {
   await session.defaultSession.loadExtension(
@@ -1491,7 +1491,7 @@ is emitted.
 
 * `extensionId` string - ID of extension to query
 
-Returns `Extension | null` - The loaded extension with the given ID.
+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.
@@ -1544,7 +1544,7 @@ A [`Protocol`](protocol.md) object for this session.
 
 ```javascript
 const { app, session } = require('electron')
-const path = require('node:path')
+const path = require('path')
 
 app.whenReady().then(() => {
   const protocol = session.fromPartition('some-partition').protocol

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

@@ -1,6 +1,9 @@
 # IpcRendererEvent Object extends `Event`
 
 * `sender` [IpcRenderer](../ipc-renderer.md) - The `IpcRenderer` instance that emitted the event originally
+* `senderId` Integer _Deprecated_ - The `webContents.id` that sent the message, you can call `event.sender.sendTo(event.senderId, ...)` to reply to the message, see [ipcRenderer.sendTo][ipc-renderer-sendto] for more information. This only applies to messages sent from a different renderer. Messages sent directly from the main process set `event.senderId` to `0`.
+* `senderIsMainFrame` boolean (optional) _Deprecated_ - Whether the message sent via [ipcRenderer.sendTo][ipc-renderer-sendto] was sent by the main frame. This is relevant when `nodeIntegrationInSubFrames` is enabled in the originating `webContents`.
 * `ports` [MessagePort][][] - A list of MessagePorts that were transferred with this message
 
+[ipc-renderer-sendto]: ../ipc-renderer.md#ipcrenderersendtowebcontentsid-channel-args-deprecated
 [MessagePort]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort

docs/api/web-contents.md

@@ -1046,11 +1046,9 @@ const win = new BrowserWindow()
 win.loadFile('src/index.html')
 ```
 
-#### `contents.downloadURL(url[, options])`
+#### `contents.downloadURL(url)`
 
 * `url` string
-* `options` Object (optional)
-  * `headers` Record<string, string> (optional) - HTTP request headers.
 
 Initiates a download of the resource at `url` without navigating. The
 `will-download` event of `session` will be triggered.
@@ -1626,7 +1624,6 @@ win.webContents.print(options, (success, errorType) => {
   * `headerTemplate` string (optional) - HTML template for the print header. Should be valid HTML markup with following classes used to inject printing values into them: `date` (formatted print date), `title` (document title), `url` (document location), `pageNumber` (current page number) and `totalPages` (total pages in the document). For example, `<span class=title></span>` would generate span containing the title.
   * `footerTemplate` string (optional) - HTML template for the print footer. Should use the same format as the `headerTemplate`.
   * `preferCSSPageSize` boolean (optional) - Whether or not to prefer page size as defined by css. Defaults to false, in which case the content will be scaled to fit the paper size.
-  * `generateTaggedPDF` boolean (optional) _Experimental_ - Whether or not to generate a tagged (accessible) PDF. Defaults to false. As this property is experimental, the generated PDF may not adhere fully to PDF/UA and WCAG standards.
 
 Returns `Promise<Buffer>` - Resolves with the generated PDF data.
 
@@ -1638,9 +1635,9 @@ An example of `webContents.printToPDF`:
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const fs = require('node:fs')
-const path = require('node:path')
-const os = require('node:os')
+const fs = require('fs')
+const path = require('path')
+const os = require('os')
 
 const win = new BrowserWindow()
 win.loadURL('https://github.com')
@@ -2069,24 +2066,6 @@ Setting the WebRTC IP handling policy allows you to control which IPs are
 exposed via WebRTC. See [BrowserLeaks](https://browserleaks.com/webrtc) for
 more details.
 
-#### `contents.getWebRTCUDPPortRange()`
-
-Returns `Object`:
-
-* `min` Integer - The minimum UDP port number that WebRTC should use.
-* `max` Integer - The maximum UDP port number that WebRTC should use.
-
-By default this value is `{ min: 0, max: 0 }` , which would apply no restriction on the udp port range.
-
-#### `contents.setWebRTCUDPPortRange(udpPortRange)`
-
-* `udpPortRange` Object
-  * `min` Integer - The minimum UDP port number that WebRTC should use.
-  * `max` Integer - The maximum UDP port number that WebRTC should use.
-
-Setting the WebRTC UDP Port Range allows you to restrict the udp port range used by WebRTC. By default the port range is unrestricted.
-**Note:** To reset to an unrestricted port range this value should be set to `{ min: 0, max: 0 }`.
-
 #### `contents.getMediaSourceId(requestWebContents)`
 
 * `requestWebContents` WebContents - Web contents that the id will be registered to.

docs/api/webview-tag.md

@@ -280,11 +280,9 @@ if the page fails to load (see
 Loads the `url` in the webview, the `url` must contain the protocol prefix,
 e.g. the `http://` or `file://`.
 
-### `<webview>.downloadURL(url[, options])`
+### `<webview>.downloadURL(url)`
 
 * `url` string
-* `options` Object (optional)
-  * `headers` Record<string, string> (optional) - HTTP request headers.
 
 Initiates a download of the resource at `url` without navigating.
 
@@ -607,7 +605,6 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
   * `headerTemplate` string (optional) - HTML template for the print header. Should be valid HTML markup with following classes used to inject printing values into them: `date` (formatted print date), `title` (document title), `url` (document location), `pageNumber` (current page number) and `totalPages` (total pages in the document). For example, `<span class=title></span>` would generate span containing the title.
   * `footerTemplate` string (optional) - HTML template for the print footer. Should use the same format as the `headerTemplate`.
   * `preferCSSPageSize` boolean (optional) - Whether or not to prefer page size as defined by css. Defaults to false, in which case the content will be scaled to fit the paper size.
-  * `generateTaggedPDF` boolean (optional) _Experimental_ - Whether or not to generate a tagged (accessible) PDF. Defaults to false. As this property is experimental, the generated PDF may not adhere fully to PDF/UA and WCAG standards.
 
 Returns `Promise<Uint8Array>` - Resolves with the generated PDF data.
 

docs/breaking-changes.md

@@ -12,52 +12,6 @@ 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 (28.0)
-
-### Removed: `BrowserWindow.setTrafficLightPosition(position)`
-
-`BrowserWindow.setTrafficLightPosition(position)` has been removed, the
-`BrowserWindow.setWindowButtonPosition(position)` API should be used instead
-which accepts `null` instead of `{ x: 0, y: 0 }` to reset the position to
-system default.
-
-```js
-// Removed in Electron 28
-win.setTrafficLightPosition({ x: 10, y: 10 })
-win.setTrafficLightPosition({ x: 0, y: 0 })
-
-// Replace with
-win.setWindowButtonPosition({ x: 10, y: 10 })
-win.setWindowButtonPosition(null)
-```
-
-### Removed: `BrowserWindow.getTrafficLightPosition()`
-
-`BrowserWindow.getTrafficLightPosition()` has been removed, the
-`BrowserWindow.getWindowButtonPosition()` API should be used instead
-which returns `null` instead of `{ x: 0, y: 0 }` when there is no custom
-position.
-
-```js
-// Removed in Electron 28
-const pos = win.getTrafficLightPosition()
-if (pos.x === 0 && pos.y === 0) {
-  // No custom position.
-}
-
-// Replace with
-const ret = win.getWindowButtonPosition()
-if (ret === null) {
-  // No custom position.
-}
-```
-
-### Removed: `ipcRenderer.sendTo()`
-
-The `ipcRenderer.sendTo()` API has been removed. It should be replaced by setting up a [`MessageChannel`](tutorial/message-ports.md#setting-up-a-messagechannel-between-two-renderers) between the renderers.
-
-The `senderId` and `senderIsMainFrame` properties of `IpcRendererEvent` have been removed as well.
-
 ## Planned Breaking API Changes (27.0)
 
 ### Removed: macOS 10.13 / 10.14 support

docs/development/build-instructions-gn.md

@@ -225,7 +225,7 @@ generate build headers for the modules to compile against, run the following
 under `src/` directory.
 
 ```sh
-$ ninja -C out/Testing electron:node_headers
+$ ninja -C out/Testing third_party/electron_node:headers
 ```
 
 You can now [run the tests](testing.md#unit-tests).

docs/development/testing.md

@@ -66,7 +66,7 @@ the Node.js source tree.
 2. Node headers have to be compiled for your configuration.
 
    ```powershell
-   ninja -C out\Testing electron:node_headers
+   ninja -C out\Testing third_party\electron_node:headers
    ```
 
 3. The electron.lib has to be copied as node.lib.

docs/fiddles/features/dark-mode/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain, nativeTheme } = require('electron/main')
+const { app, BrowserWindow, ipcMain, nativeTheme } = require('electron')
 const path = require('node:path')
 
 function createWindow () {

docs/fiddles/features/dark-mode/preload.js

@@ -1,4 +1,4 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
+const { contextBridge, ipcRenderer } = require('electron')
 
 contextBridge.exposeInMainWorld('darkMode', {
   toggle: () => ipcRenderer.invoke('dark-mode:toggle'),

docs/fiddles/features/drag-and-drop/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain } = require('electron/main')
+const { app, BrowserWindow, ipcMain } = require('electron')
 const path = require('node:path')
 const fs = require('node:fs')
 const https = require('node:https')

docs/fiddles/features/drag-and-drop/preload.js

@@ -1,5 +1,7 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
+const { contextBridge, ipcRenderer } = require('electron')
 
 contextBridge.exposeInMainWorld('electron', {
-  startDrag: (fileName) => ipcRenderer.send('ondragstart', fileName)
+  startDrag: (fileName) => {
+    ipcRenderer.send('ondragstart', fileName)
+  }
 })

docs/fiddles/features/keyboard-shortcuts/global/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, globalShortcut } = require('electron/main')
+const { app, BrowserWindow, globalShortcut } = require('electron')
 
 function createWindow () {
   const win = new BrowserWindow({

docs/fiddles/features/keyboard-shortcuts/interception-from-main/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 
 app.whenReady().then(() => {
   const win = new BrowserWindow({ width: 800, height: 600 })

docs/fiddles/features/keyboard-shortcuts/local/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, Menu, MenuItem } = require('electron/main')
+const { app, BrowserWindow, Menu, MenuItem } = require('electron')
 
 function createWindow () {
   const win = new BrowserWindow({

docs/fiddles/features/keyboard-shortcuts/web-apis/main.js

@@ -1,5 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 
 function createWindow () {
   // Create the browser window.

docs/fiddles/features/macos-dock-menu/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, Menu } = require('electron/main')
+const { app, BrowserWindow, Menu } = require('electron')
 
 function createWindow () {
   const win = new BrowserWindow({

docs/fiddles/features/notifications/main/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, Notification } = require('electron/main')
+const { app, BrowserWindow, Notification } = require('electron')
 
 function createWindow () {
   const win = new BrowserWindow({

docs/fiddles/features/notifications/renderer/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 
 function createWindow () {
   const win = new BrowserWindow({

docs/fiddles/features/offscreen-rendering/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 const fs = require('node:fs')
 const path = require('node:path')
 

docs/fiddles/features/online-detection/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 
 function createWindow () {
   const onlineStatusWindow = new BrowserWindow({

docs/fiddles/features/progress-bar/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 
 let progressInterval
 

docs/fiddles/features/recent-documents/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 const fs = require('node:fs')
 const path = require('node:path')
 

docs/fiddles/features/represented-file/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 const os = require('node:os')
 
 function createWindow () {

docs/fiddles/features/web-bluetooth/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain } = require('electron/main')
+const { app, BrowserWindow, ipcMain } = require('electron')
 const path = require('node:path')
 
 let bluetoothPinCallback

docs/fiddles/features/web-bluetooth/preload.js

@@ -1,7 +1,7 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
+const { contextBridge, ipcRenderer } = require('electron')
 
 contextBridge.exposeInMainWorld('electronAPI', {
-  cancelBluetoothRequest: () => ipcRenderer.send('cancel-bluetooth-request'),
-  bluetoothPairingRequest: (callback) => ipcRenderer.on('bluetooth-pairing-request', () => callback()),
+  cancelBluetoothRequest: (callback) => ipcRenderer.send('cancel-bluetooth-request', callback),
+  bluetoothPairingRequest: (callback) => ipcRenderer.on('bluetooth-pairing-request', callback),
   bluetoothPairingResponse: (response) => ipcRenderer.send('bluetooth-pairing-response', response)
 })

docs/fiddles/features/web-hid/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 
 function createWindow () {
   const mainWindow = new BrowserWindow({

docs/fiddles/features/web-hid/renderer.js

@@ -1,10 +1,19 @@
-function formatDevices (devices) {
-  return devices.map(device => device.productName).join('<hr>')
-}
-
 async function testIt () {
-  document.getElementById('granted-devices').innerHTML = formatDevices(await navigator.hid.getDevices())
-  document.getElementById('granted-devices2').innerHTML = formatDevices(await navigator.hid.requestDevice({ filters: [] }))
+  const grantedDevices = await navigator.hid.getDevices()
+  let grantedDeviceList = ''
+  grantedDevices.forEach(device => {
+    grantedDeviceList += `<hr>${device.productName}</hr>`
+  })
+  document.getElementById('granted-devices').innerHTML = grantedDeviceList
+  const grantedDevices2 = await navigator.hid.requestDevice({
+    filters: []
+  })
+
+  grantedDeviceList = ''
+  grantedDevices2.forEach(device => {
+    grantedDeviceList += `<hr>${device.productName}</hr>`
+  })
+  document.getElementById('granted-devices2').innerHTML = grantedDeviceList
 }
 
 document.getElementById('clickme').addEventListener('click', testIt)

docs/fiddles/features/web-serial/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 
 function createWindow () {
   const mainWindow = new BrowserWindow({

docs/fiddles/features/web-usb/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 
 function createWindow () {
   const mainWindow = new BrowserWindow({

docs/fiddles/features/web-usb/renderer.js

@@ -7,9 +7,9 @@ async function testIt () {
   const grantedDevices = await navigator.usb.getDevices()
   let grantedDeviceList = ''
   if (grantedDevices.length > 0) {
-    for (const device of grantedDevices) {
+    grantedDevices.forEach(device => {
       grantedDeviceList += `<hr>${getDeviceDetails(device)}</hr>`
-    }
+    })
   } else {
     grantedDeviceList = noDevicesFoundMsg
   }

docs/fiddles/ipc/pattern-1/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain } = require('electron/main')
+const { app, BrowserWindow, ipcMain } = require('electron')
 const path = require('node:path')
 
 function createWindow () {

docs/fiddles/ipc/pattern-1/preload.js

@@ -1,4 +1,4 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
+const { contextBridge, ipcRenderer } = require('electron')
 
 contextBridge.exposeInMainWorld('electronAPI', {
   setTitle: (title) => ipcRenderer.send('set-title', title)

docs/fiddles/ipc/pattern-2/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, ipcMain, dialog } = require('electron/main')
+const { app, BrowserWindow, ipcMain, dialog } = require('electron')
 const path = require('node:path')
 
 async function handleFileOpen () {

docs/fiddles/ipc/pattern-2/preload.js

@@ -1,4 +1,4 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
+const { contextBridge, ipcRenderer } = require('electron')
 
 contextBridge.exposeInMainWorld('electronAPI', {
   openFile: () => ipcRenderer.invoke('dialog:openFile')

docs/fiddles/ipc/pattern-3/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, Menu, ipcMain } = require('electron/main')
+const { app, BrowserWindow, Menu, ipcMain } = require('electron')
 const path = require('node:path')
 
 function createWindow () {

docs/fiddles/ipc/pattern-3/preload.js

@@ -1,5 +1,5 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
+const { contextBridge, ipcRenderer } = require('electron')
 
 contextBridge.exposeInMainWorld('electronAPI', {
-  handleCounter: (callback) => ipcRenderer.on('update-counter', () => callback())
+  handleCounter: (callback) => ipcRenderer.on('update-counter', callback)
 })

docs/fiddles/ipc/webview-new-window/main.js

@@ -1,5 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 const path = require('node:path')
 
 function createWindow () {

docs/fiddles/ipc/webview-new-window/preload.js

@@ -1,4 +1,4 @@
-const { ipcRenderer } = require('electron/renderer')
+const { ipcRenderer } = require('electron')
 const webview = document.getElementById('webview')
 ipcRenderer.on('webview-new-window', (e, webContentsId, details) => {
   console.log('webview-new-window', webContentsId, details)

docs/fiddles/media/screenshot/take-screenshot/index.html

@@ -17,6 +17,9 @@
           <p>Clicking the demo button will take a screenshot of your current screen and open it in your default viewer.</p>
         </div>
     </div>
-    <script src="renderer.js"></script>
+    <script>
+      // You can also require other files to run in this process
+      require('./renderer.js')
+    </script>
   </body>
 </html>

docs/fiddles/media/screenshot/take-screenshot/main.js

@@ -1,38 +1,14 @@
-const { BrowserWindow, app, screen, ipcMain, desktopCapturer, shell } = require('electron/main')
-const fs = require('node:fs').promises
-const os = require('node:os')
-const path = require('node:path')
+const { BrowserWindow, app, screen, ipcMain, desktopCapturer } = require('electron')
 
 let mainWindow = null
 
-function determineScreenShotSize (devicePixelRatio) {
-  const screenSize = screen.getPrimaryDisplay().workAreaSize
-  const maxDimension = Math.max(screenSize.width, screenSize.height)
-  return {
-    width: maxDimension * devicePixelRatio,
-    height: maxDimension * devicePixelRatio
-  }
-}
+ipcMain.handle('get-screen-size', () => {
+  return screen.getPrimaryDisplay().workAreaSize
+})
 
-async function takeScreenshot (devicePixelRatio) {
-  const thumbSize = determineScreenShotSize(devicePixelRatio)
-  const options = { types: ['screen'], thumbnailSize: thumbSize }
-
-  const sources = await desktopCapturer.getSources(options)
-  for (const source of sources) {
-    const sourceName = source.name.toLowerCase()
-    if (sourceName === 'entire screen' || sourceName === 'screen 1') {
-      const screenshotPath = path.join(os.tmpdir(), 'screenshot.png')
-
-      await fs.writeFile(screenshotPath, source.thumbnail.toPNG())
-      shell.openExternal(`file://${screenshotPath}`)
-
-      return `Saved screenshot to: ${screenshotPath}`
-    }
-  }
-}
-
-ipcMain.handle('take-screenshot', (event, devicePixelRatio) => takeScreenshot(devicePixelRatio))
+ipcMain.handle('get-sources', (event, options) => {
+  return desktopCapturer.getSources(options)
+})
 
 function createWindow () {
   const windowOptions = {
@@ -40,7 +16,8 @@ function createWindow () {
     height: 300,
     title: 'Take a Screenshot',
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      contextIsolation: false,
+      nodeIntegration: true
     }
   }
 

docs/fiddles/media/screenshot/take-screenshot/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  takeScreenshot: () => ipcRenderer.invoke('take-screenshot', window.devicePixelRatio)
-})

docs/fiddles/media/screenshot/take-screenshot/renderer.js

@@ -1,7 +1,37 @@
+const { shell, ipcRenderer } = require('electron')
+
+const fs = require('node:fs').promises
+const os = require('node:os')
+const path = require('node:path')
+
 const screenshot = document.getElementById('screen-shot')
 const screenshotMsg = document.getElementById('screenshot-path')
 
 screenshot.addEventListener('click', async (event) => {
   screenshotMsg.textContent = 'Gathering screens...'
-  screenshotMsg.textContent = await window.electronAPI.takeScreenshot()
+  const thumbSize = await determineScreenShotSize()
+  const options = { types: ['screen'], thumbnailSize: thumbSize }
+
+  const sources = await ipcRenderer.invoke('get-sources', options)
+  for (const source of sources) {
+    const sourceName = source.name.toLowerCase()
+    if (sourceName === 'entire screen' || sourceName === 'screen 1') {
+      const screenshotPath = path.join(os.tmpdir(), 'screenshot.png')
+
+      await fs.writeFile(screenshotPath, source.thumbnail.toPNG())
+      shell.openExternal(`file://${screenshotPath}`)
+
+      const message = `Saved screenshot to: ${screenshotPath}`
+      screenshotMsg.textContent = message
+    }
+  }
 })
+
+async function determineScreenShotSize () {
+  const screenSize = await ipcRenderer.invoke('get-screen-size')
+  const maxDimension = Math.max(screenSize.width, screenSize.height)
+  return {
+    width: maxDimension * window.devicePixelRatio,
+    height: maxDimension * window.devicePixelRatio
+  }
+}

docs/fiddles/menus/customize-menus/index.html

@@ -119,6 +119,10 @@
         </div>
       </div>
     </div>
-    <script src="renderer.js"></script>
+
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
   </body>
 </html>

docs/fiddles/menus/customize-menus/main.js

@@ -6,10 +6,8 @@ const {
   ipcMain,
   app,
   shell,
-  dialog,
-  autoUpdater
-} = require('electron/main')
-const path = require('node:path')
+  dialog
+} = require('electron')
 
 const menu = new Menu()
 menu.append(new MenuItem({ label: 'Hello' }))
@@ -68,9 +66,9 @@ const template = [
             // on reload, start fresh and close any old
             // open secondary windows
             if (focusedWindow.id === 1) {
-              for (const win of BrowserWindow.getAllWindows()) {
+              BrowserWindow.getAllWindows().forEach(win => {
                 if (win.id > 1) win.close()
-              }
+              })
             }
             focusedWindow.reload()
           }
@@ -187,7 +185,7 @@ function addUpdateMenuItems (items, position) {
       visible: false,
       key: 'checkForUpdate',
       click: () => {
-        autoUpdater.checkForUpdates()
+        require('electron').autoUpdater.checkForUpdates()
       }
     },
     {
@@ -196,7 +194,7 @@ function addUpdateMenuItems (items, position) {
       visible: false,
       key: 'restartToUpdate',
       click: () => {
-        autoUpdater.quitAndInstall()
+        require('electron').autoUpdater.quitAndInstall()
       }
     }
   ]
@@ -209,15 +207,15 @@ function findReopenMenuItem () {
   if (!menu) return
 
   let reopenMenuItem
-  for (const item of menu.items) {
+  menu.items.forEach(item => {
     if (item.submenu) {
-      for (const subitem of item.submenu.items) {
-        if (subitem.key === 'reopenMenuItem') {
-          reopenMenuItem = subitem
+      item.submenu.items.forEach(item => {
+        if (item.key === 'reopenMenuItem') {
+          reopenMenuItem = item
         }
-      }
+      })
     }
-  }
+  })
   return reopenMenuItem
 }
 
@@ -296,7 +294,8 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      contextIsolation: false,
+      nodeIntegration: true
     }
   })
 

docs/fiddles/menus/customize-menus/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  showContextMenu: () => ipcRenderer.send('show-context-menu')
-})

docs/fiddles/menus/customize-menus/renderer.js

@@ -1,6 +1,8 @@
+const { ipcRenderer } = require('electron')
+
 // Tell main process to show the menu when demo button is clicked
 const contextMenuBtn = document.getElementById('context-menu')
 
 contextMenuBtn.addEventListener('click', () => {
-  window.electronAPI.showContextMenu()
+  ipcRenderer.send('show-context-menu')
 })

docs/fiddles/menus/shortcuts/main.js

@@ -1,5 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, globalShortcut, dialog, shell } = require('electron/main')
+const { app, BrowserWindow, globalShortcut, dialog, shell } = require('electron')
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -9,7 +9,11 @@ function createWindow () {
   // Create the browser window.
   mainWindow = new BrowserWindow({
     width: 800,
-    height: 600
+    height: 600,
+    webPreferences: {
+      contextIsolation: false,
+      nodeIntegration: true
+    }
   })
 
   globalShortcut.register('CommandOrControl+Alt+K', () => {

docs/fiddles/native-ui/dialogs/error-dialog/index.html

@@ -73,6 +73,9 @@ ipcMain.on('open-error-dialog', (event) => {
       </div>
     </div>
 
-    <script src="renderer.js"></script>
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
   </body>
 </html>

docs/fiddles/native-ui/dialogs/error-dialog/main.js

@@ -1,6 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron/main')
-const path = require('node:path')
+const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron')
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -12,7 +11,8 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      contextIsolation: false,
+      nodeIntegration: true
     }
   })
 

docs/fiddles/native-ui/dialogs/error-dialog/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  openErrorDialog: () => ipcRenderer.send('open-error-dialog')
-})

docs/fiddles/native-ui/dialogs/error-dialog/renderer.js

@@ -1,5 +1,7 @@
+const { ipcRenderer } = require('electron')
+
 const errorBtn = document.getElementById('error-dialog')
 
-errorBtn.addEventListener('click', () => {
-  window.electronAPI.openErrorDialog()
+errorBtn.addEventListener('click', event => {
+  ipcRenderer.send('open-error-dialog')
 })

docs/fiddles/native-ui/dialogs/information-dialog/index.html

@@ -96,6 +96,9 @@ ipcMain.on('open-information-dialog', (event) => {
       </div>
     </div>
 
-    <script src="renderer.js"></script>
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
   </body>
 </html>

docs/fiddles/native-ui/dialogs/information-dialog/main.js

@@ -1,6 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron/main')
-const path = require('node:path')
+const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron')
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -12,7 +11,8 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      contextIsolation: false,
+      nodeIntegration: true
     }
   })
 
@@ -59,14 +59,16 @@ app.on('activate', function () {
   }
 })
 
-ipcMain.handle('open-information-dialog', async () => {
+ipcMain.on('open-information-dialog', event => {
   const options = {
     type: 'info',
     title: 'Information',
     message: "This is an information dialog. Isn't it nice?",
     buttons: ['Yes', 'No']
   }
-  return (await dialog.showMessageBox(options)).response
+  dialog.showMessageBox(options, index => {
+    event.sender.send('information-dialog-selection', index)
+  })
 })
 
 // In this file you can include the rest of your app's specific main process

docs/fiddles/native-ui/dialogs/information-dialog/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  openInformationDialog: () => ipcRenderer.invoke('open-information-dialog')
-})

docs/fiddles/native-ui/dialogs/information-dialog/renderer.js

@@ -1,7 +1,14 @@
+const { ipcRenderer } = require('electron')
+
 const informationBtn = document.getElementById('information-dialog')
 
-informationBtn.addEventListener('click', async () => {
-  const index = await window.electronAPI.openInformationDialog()
-  const message = `You selected: ${index === 0 ? 'yes' : 'no'}`
+informationBtn.addEventListener('click', event => {
+  ipcRenderer.send('open-information-dialog')
+})
+
+ipcRenderer.on('information-dialog-selection', (event, index) => {
+  let message = 'You selected '
+  if (index === 0) message += 'yes.'
+  else message += 'no.'
   document.getElementById('info-selection').innerHTML = message
 })

docs/fiddles/native-ui/dialogs/open-file-or-directory/index.html

@@ -100,6 +100,9 @@ ipc.on('open-file-dialog-sheet', function (event) {
       </div>
     </div>
 
-    <script src="renderer.js"></script>
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
   </body>
 </html>

docs/fiddles/native-ui/dialogs/open-file-or-directory/main.js

@@ -1,6 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron/main')
-const path = require('node:path')
+const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron')
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -12,7 +11,8 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      contextIsolation: false,
+      nodeIntegration: true
     }
   })
 
@@ -59,11 +59,17 @@ app.on('activate', function () {
   }
 })
 
-ipcMain.handle('open-file-dialog', async () => {
-  const options = {
-    properties: ['openFile', 'openDirectory']
-  }
-  return (await dialog.showOpenDialog(options)).filePaths
+ipcMain.on('open-file-dialog', event => {
+  dialog.showOpenDialog(
+    {
+      properties: ['openFile', 'openDirectory']
+    },
+    files => {
+      if (files) {
+        event.sender.send('selected-directory', files)
+      }
+    }
+  )
 })
 
 // In this file you can include the rest of your app's specific main process

docs/fiddles/native-ui/dialogs/open-file-or-directory/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  openFileDialog: () => ipcRenderer.invoke('open-file-dialog')
-})

docs/fiddles/native-ui/dialogs/open-file-or-directory/renderer.js

@@ -1,6 +1,11 @@
+const { ipcRenderer } = require('electron')
+
 const selectDirBtn = document.getElementById('select-directory')
 
-selectDirBtn.addEventListener('click', async () => {
-  const path = await window.electronAPI.openFileDialog()
+selectDirBtn.addEventListener('click', event => {
+  ipcRenderer.send('open-file-dialog')
+})
+
+ipcRenderer.on('selected-directory', (event, path) => {
   document.getElementById('selected-file').innerHTML = `You selected: ${path}`
 })

docs/fiddles/native-ui/dialogs/save-dialog/index.html

@@ -83,6 +83,9 @@ ipcMain.on('save-dialog', (event) => {
       </div>
     </div>
 
-    <script src="renderer.js"></script>
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
   </body>
 </html>

docs/fiddles/native-ui/dialogs/save-dialog/main.js

@@ -1,6 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron/main')
-const path = require('node:path')
+const { app, BrowserWindow, ipcMain, dialog, shell } = require('electron')
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -12,7 +11,8 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      contextIsolation: false,
+      nodeIntegration: true
     }
   })
 
@@ -59,12 +59,14 @@ app.on('activate', function () {
   }
 })
 
-ipcMain.handle('save-dialog', async () => {
+ipcMain.on('save-dialog', event => {
   const options = {
     title: 'Save an Image',
     filters: [{ name: 'Images', extensions: ['jpg', 'png', 'gif'] }]
   }
-  return (await dialog.showSaveDialog(options)).filePath
+  dialog.showSaveDialog(options, filename => {
+    event.sender.send('saved-file', filename)
+  })
 })
 
 // In this file you can include the rest of your app's specific main process

docs/fiddles/native-ui/dialogs/save-dialog/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  saveDialog: () => ipcRenderer.invoke('save-dialog')
-})

docs/fiddles/native-ui/dialogs/save-dialog/renderer.js

@@ -1,6 +1,12 @@
+const { ipcRenderer } = require('electron')
+
 const saveBtn = document.getElementById('save-dialog')
 
-saveBtn.addEventListener('click', async () => {
-  const path = await window.electronAPI.saveDialog()
+saveBtn.addEventListener('click', event => {
+  ipcRenderer.send('save-dialog')
+})
+
+ipcRenderer.on('saved-file', (event, path) => {
+  if (!path) path = 'No path'
   document.getElementById('file-saved').innerHTML = `Path selected: ${path}`
 })

docs/fiddles/native-ui/drag-and-drop/index.html

@@ -68,6 +68,9 @@ ipcMain.on('ondragstart', (event, filepath) => {
       </div>
     </div>
 
-    <script src="renderer.js"></script>
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
   </body>
 </html>

docs/fiddles/native-ui/drag-and-drop/main.js

@@ -1,7 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, ipcMain, nativeImage, shell } = require('electron/main')
-const path = require('node:path')
-
+const { app, BrowserWindow, ipcMain, nativeImage, shell } = require('electron')
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let mainWindow
@@ -12,7 +10,8 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      contextIsolation: false,
+      nodeIntegration: true
     }
   })
 
@@ -59,8 +58,7 @@ app.on('activate', function () {
   }
 })
 
-ipcMain.on('ondragstart', (event) => {
-  const filepath = path.join(__dirname, 'renderer.js')
+ipcMain.on('ondragstart', (event, filepath) => {
   const icon = nativeImage.createFromDataURL('data:image/png;base64,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')
 
   event.sender.startDrag({

docs/fiddles/native-ui/drag-and-drop/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  dragStart: () => ipcRenderer.send('ondragstart')
-})

docs/fiddles/native-ui/drag-and-drop/renderer.js

@@ -1,6 +1,8 @@
+const { ipcRenderer } = require('electron')
+
 const dragFileLink = document.getElementById('drag-file-link')
 
 dragFileLink.addEventListener('dragstart', event => {
   event.preventDefault()
-  window.electronAPI.dragStart()
+  ipcRenderer.send('ondragstart', __filename)
 })

docs/fiddles/native-ui/external-links-file-manager/index.html

@@ -95,6 +95,10 @@ for (const link of links) {
         </div>
       </div>
     </div>
-    <script src="renderer.js"></script>
+
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
   </body>
 </html>

docs/fiddles/native-ui/external-links-file-manager/main.js

@@ -1,15 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, shell, ipcMain } = require('electron/main')
-const path = require('node:path')
-const os = require('node:os')
-
-ipcMain.on('open-home-dir', () => {
-  shell.showItemInFolder(os.homedir())
-})
-
-ipcMain.on('open-external', (event, url) => {
-  shell.openExternal(url)
-})
+const { app, BrowserWindow, shell } = require('electron')
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -21,7 +11,8 @@ function createWindow () {
     width: 800,
     height: 600,
     webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      contextIsolation: false,
+      nodeIntegration: true
     }
   })
 

docs/fiddles/native-ui/external-links-file-manager/preload.js

@@ -1,6 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron/renderer')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  openHomeDir: () => ipcRenderer.send('open-home-dir'),
-  openExternal: (url) => ipcRenderer.send('open-external', url)
-})

docs/fiddles/native-ui/external-links-file-manager/renderer.js

@@ -1,10 +1,13 @@
+const { shell } = require('electron')
+const os = require('node:os')
+
 const exLinksBtn = document.getElementById('open-ex-links')
 const fileManagerBtn = document.getElementById('open-file-manager')
 
 fileManagerBtn.addEventListener('click', (event) => {
-  window.electronAPI.openHomeDir()
+  shell.showItemInFolder(os.homedir())
 })
 
 exLinksBtn.addEventListener('click', (event) => {
-  window.electronAPI.openExternal('https://electronjs.org')
+  shell.openExternal('https://electronjs.org')
 })

docs/fiddles/native-ui/notifications/index.html

@@ -59,6 +59,9 @@
       </div>
     </div>
 
-    <script src="renderer.js"></script>
+    <script>
+      // You can also require other files to run in this process
+      require("./renderer.js");
+    </script>
   </body>
 </html>

docs/fiddles/native-ui/notifications/main.js

@@ -1,5 +1,5 @@
 // Modules to control application life and create native browser window
-const { app, BrowserWindow, shell } = require('electron/main')
+const { app, BrowserWindow, shell } = require('electron')
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -9,7 +9,11 @@ function createWindow () {
   // Create the browser window.
   mainWindow = new BrowserWindow({
     width: 800,
-    height: 600
+    height: 600,
+    webPreferences: {
+      contextIsolation: false,
+      nodeIntegration: true
+    }
   })
 
   // and load the index.html of the app.

docs/fiddles/native-ui/tray/main.js

@@ -1,4 +1,4 @@
-const { app, Tray, Menu, nativeImage } = require('electron/main')
+const { app, Tray, Menu, nativeImage } = require('electron')
 
 let tray
 

docs/fiddles/quick-start/main.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 const path = require('node:path')
 
 function createWindow () {

docs/fiddles/screen/fit-screen/main.js

@@ -3,11 +3,14 @@
 // For more info, see:
 // https://www.electronjs.org/docs/latest/api/screen
 
-const { app, BrowserWindow, screen } = require('electron/main')
+const { app, BrowserWindow } = require('electron')
 
 let mainWindow = null
 
 app.whenReady().then(() => {
+  // We cannot require the screen module until the app is ready.
+  const { screen } = require('electron')
+
   // Create a window that fills the screen's available work area.
   const primaryDisplay = screen.getPrimaryDisplay()
   const { width, height } = primaryDisplay.workAreaSize