Bump v20.3.1

Co-authored-by: VerteDinde <vertedinde@electronjs.org>

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: VerteDinde <vertedinde@electronjs.org>

.circleci/config/base.yml

@@ -455,7 +455,7 @@ step-delete-git-directories: &step-delete-git-directories
     command: |
       if [ "`uname`" == "Darwin" ]; then
         cd src
-        ( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" -not -path "./electron/*" ) | xargs rm -rf
+        ( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" ) | xargs rm -rf
       fi
 
 # On macOS the yarn install command during gclient sync was run on a linux
@@ -494,11 +494,6 @@ step-fix-sync: &step-fix-sync
         # Remove extra output from calling gclient getdep which always calls update_depot_tools
         sed -i '' "s/Updating depot_tools... //g" esbuild_ensure_file
         cipd ensure --root src/third_party/devtools-frontend/src/third_party/esbuild -ensure-file esbuild_ensure_file
-
-        # Fix ninja (wrong binary)
-        echo 'infra/3pp/tools/ninja/${platform}' `gclient getdep --deps-file=src/DEPS -r 'src/third_party/ninja:infra/3pp/tools/ninja/${platform}'` > ninja_ensure_file
-        sed -i '' "s/Updating depot_tools... //g" ninja_ensure_file
-        cipd ensure --root src/third_party/ninja -ensure-file ninja_ensure_file
       fi
 
       cd src/third_party/angle
@@ -641,9 +636,9 @@ step-electron-publish: &step-electron-publish
       cd src/electron
       if [ "$UPLOAD_TO_STORAGE" == "1" ]; then
         echo 'Uploading Electron release distribution to Azure'
-        script/release/uploaders/upload.py --verbose --upload_to_storage
+        script/release/uploaders/upload.py --verbose --UPLOAD_TO_STORAGE
       else
-        echo 'Uploading Electron release distribution to GitHub releases'
+        echo 'Uploading Electron release distribution to Github releases'
         script/release/uploaders/upload.py --verbose
       fi
 
@@ -667,7 +662,6 @@ step-persist-data-for-tests: &step-persist-data-for-tests
       - src/buildtools/third_party/libc++
       - src/buildtools/third_party/libc++abi
       - src/out/Default/obj/buildtools/third_party
-      - src/v8/tools/builtins-pgo
 
 step-electron-dist-unzip: &step-electron-dist-unzip
   run:
@@ -819,7 +813,7 @@ step-maybe-zip-symbols: &step-maybe-zip-symbols
       cd src
       export BUILD_PATH="$PWD/out/Default"
       ninja -C out/Default electron:licenses
-      ninja -C out/Default electron:electron_version_file
+      ninja -C out/Default electron:electron_version
       DELETE_DSYMS_AFTER_ZIP=1 electron/script/zip-symbols.py -b $BUILD_PATH
 
 step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
@@ -879,12 +873,12 @@ step-touch-sync-done: &step-touch-sync-done
 step-maybe-restore-src-cache: &step-maybe-restore-src-cache
   restore_cache:
     keys:
-      - v16-src-cache-{{ checksum "src/electron/.depshash" }}
+      - v14-src-cache-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache
 step-maybe-restore-src-cache-marker: &step-maybe-restore-src-cache-marker
   restore_cache:
     keys:
-      - v16-src-cache-marker-{{ checksum "src/electron/.depshash" }}
+      - v14-src-cache-marker-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache marker
 
 # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
@@ -899,6 +893,14 @@ step-maybe-restore-git-cache: &step-maybe-restore-git-cache
       - v1-git-cache-{{ checksum "src/electron/.circle-sync-done" }}
     name: Conditionally restoring git cache
 
+step-restore-out-cache: &step-restore-out-cache
+  restore_cache:
+    paths:
+      - ./src/out/Default
+    keys:
+      - v10-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+    name: Restoring out cache
+
 step-set-git-cache-path: &step-set-git-cache-path
   run:
     name: Set GIT_CACHE_PATH to make gclient to use the cache
@@ -916,6 +918,13 @@ step-save-git-cache: &step-save-git-cache
     key: v1-git-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
     name: Persisting git cache
 
+step-save-out-cache: &step-save-out-cache
+  save_cache:
+    paths:
+      - ./src/out/Default
+    key: v10-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+    name: Persisting out cache
+
 step-run-electron-only-hooks: &step-run-electron-only-hooks
   run:
     name: Run Electron Only Hooks
@@ -945,16 +954,13 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
       rm -rf third_party/electron_node/deps/openssl
       rm -rf third_party/electron_node/deps/v8
       rm -rf chrome/test/data/xr/webvr_info
-      rm -rf src/third_party/angle/third_party/VK-GL-CTS/src
-      rm -rf src/third_party/swift-toolchain
-      rm -rf src/third_party/swiftshader/tests/regres/testlists
 
 # Save the src cache based on the deps hash
 step-save-src-cache: &step-save-src-cache
   save_cache:
     paths:
       - /var/portal
-    key: v16-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v14-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
     name: Persisting src cache
 step-make-src-cache-marker: &step-make-src-cache-marker
   run:
@@ -964,7 +970,7 @@ step-save-src-cache-marker: &step-save-src-cache-marker
   save_cache:
     paths:
       - .src-cache-marker
-    key: v16-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v14-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
 
 step-maybe-early-exit-no-doc-change: &step-maybe-early-exit-no-doc-change
   run:
@@ -985,7 +991,7 @@ step-ts-compile: &step-ts-compile
       do
         out="${f:29}"
         if [ "$out" != "base.js" ]; then
-          node script/yarn webpack --config $f --output-filename=$out --output-path=./.tmp --env mode=development
+          node script/yarn webpack --config $f --output-filename=$out --output-path=./.tmp --env.mode=development
         fi
       done
 
@@ -1001,17 +1007,9 @@ steps-electron-gn-check: &steps-electron-gn-check
     - *step-generate-deps-hash
     - *step-touch-sync-done
     - maybe-restore-portaled-src-cache
-    - run:
-        name: Ensure src checkout worked
-        command: |
-          if [ ! -d "src/third_party/blink" ]; then
-            echo src cache was not restored for an unknown reason
-            exit 1
-          fi
-    - run:
-        name: Wipe Electron
-        command: rm -rf src/electron
-    - *step-checkout-electron
+    - *step-wait-for-goma
+    - *step-gn-gen-default
+    - *step-gn-check
 
 steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-change
   steps:
@@ -1054,16 +1052,19 @@ steps-tests: &steps-tests
             export LLVM_SYMBOLIZER_PATH=$PWD/third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer
             export MOCHA_TIMEOUT=180000
             echo "Piping output to ASAN_SYMBOLIZE ($ASAN_SYMBOLIZE)"
-            (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.ts | circleci tests split --split-by=timings)) 2>&1 | $ASAN_SYMBOLIZE
+            (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split --split-by=timings)) 2>&1 | $ASAN_SYMBOLIZE
+            (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split --split-by=timings)) 2>&1 | $ASAN_SYMBOLIZE
           else
             if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
               export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true
               (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging)
+              (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging)
             else
               if [ "$TARGET_ARCH" == "ia32" ]; then
                 npm_config_arch=x64 node electron/node_modules/dugite/script/download-git.js
               fi
-              (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.ts | circleci tests split --split-by=timings))
+              (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split --split-by=timings))
+              (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split --split-by=timings))
             fi
           fi
     - run:
@@ -1072,6 +1073,9 @@ steps-tests: &steps-tests
           cd src
 
           # Check if test results exist and are not empty.
+          if [ ! -s "junit/test-results-remote.xml" ]; then
+            exit 1
+          fi
           if [ ! -s "junit/test-results-main.xml" ]; then
             exit 1
           fi
@@ -1290,6 +1294,9 @@ commands:
       build:
         type: boolean
         default: true
+      use-out-cache:
+        type: boolean
+        default: true
       restore-src-cache:
         type: boolean
         default: true
@@ -1412,6 +1419,10 @@ commands:
             - *step-delete-git-directories
 
             # Electron app
+            - when:
+                condition: << parameters.use-out-cache >>
+                steps:
+                  - *step-restore-out-cache
             - *step-gn-gen-default
             - *step-electron-build
             - *step-maybe-electron-dist-strip
@@ -1454,6 +1465,22 @@ commands:
           condition: << parameters.build >>
           steps:
             - move_and_store_all_artifacts
+            - run:
+                name: Remove the big things on macOS, this seems to be better on average
+                command: |
+                  if [ "`uname`" == "Darwin" ]; then
+                    mkdir -p src/out/Default
+                    cd src/out/Default
+                    find . -type f -size +50M -delete
+                    mkdir -p gen/electron
+                    cd gen/electron
+                    # These files do not seem to like being in a cache, let us remove them
+                    find . -type f -name '*_pkg_info' -delete
+                  fi
+            - when:
+                condition: << parameters.use-out-cache >>
+                steps:
+                  - *step-save-out-cache
 
             - *step-maybe-notify-slack-failure
 
@@ -1607,6 +1634,7 @@ jobs:
           persist: true
           checkout: false
           checkout-and-assume-cache: true
+          use-out-cache: false
 
   linux-x64-testing-asan:
     executor:
@@ -1623,6 +1651,7 @@ jobs:
       - electron-build:
           persist: true
           checkout: true
+          use-out-cache: false
           build-nonproprietary-ffmpeg: false
 
   linux-x64-testing-no-run-as-node:
@@ -1639,6 +1668,7 @@ jobs:
       - electron-build:
           persist: false
           checkout: true
+          use-out-cache: false
 
   linux-x64-testing-gn-check:
     executor:
@@ -1689,6 +1719,7 @@ jobs:
           persist: true
           checkout: false
           checkout-and-assume-cache: true
+          use-out-cache: false
 
   linux-arm-publish:
     executor:
@@ -1731,6 +1762,7 @@ jobs:
           persist: true
           checkout: false
           checkout-and-assume-cache: true
+          use-out-cache: false
 
   linux-arm64-testing-gn-check:
     executor:

.github/CODEOWNERS

@@ -4,7 +4,7 @@
 # https://git-scm.com/docs/gitignore
 
 # Upgrades WG
-/patches/                               @electron/patch-owners
+/patches/                               @electron/wg-upgrades @electron/wg-security
 DEPS                                    @electron/wg-upgrades
 
 # Releases WG

.github/stale.yml

@@ -1,14 +0,0 @@
-daysUntilStale: 90
-daysUntilClose: 30
-exemptLabels:
-  - discussion
-  - security 🔒
-  - "enhancement :sparkles:"
-staleLabel: stale
-markComment: >
-  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!
-closeComment: >
-  This issue has been closed as it was considered stale, this issue 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 ensure a repro is provided.
-  

.github/workflows/electron_woa_testing.yml

@@ -117,6 +117,21 @@ jobs:
         MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
         MOCHA_REPORTER: mocha-multi-reporters
         ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
+    - name: Run Electron Remote based tests
+      if: ${{ success() || failure() }}
+      run: |
+        cd src
+        set npm_config_nodedir=%cd%\out\Default\gen\node_headers
+        set npm_config_arch=arm64
+        cd electron
+        node script/yarn test --runners=remote --enable-logging --disable-features=CalculateNativeWinOcclusion
+      env:
+        ELECTRON_OUT_DIR: Default
+        IGNORE_YARN_INSTALL_ERROR: 1
+        ELECTRON_TEST_RESULTS_DIR: junit
+        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
+        MOCHA_REPORTER: mocha-multi-reporters
+        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
     - name: Verify ffmpeg
       run: |
         cd src

.github/workflows/issue-labeled.yml

@@ -1,24 +0,0 @@
-name: Issue Labeled
-
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  issue-labeled:
-    runs-on: ubuntu-latest
-    steps:
-      - name: blocked/need-repro
-        if: github.event.label.name == 'blocked/need-repro'
-        uses: actions-cool/issues-helper@dad28fdb88da5f082c04659b7373d85790f9b135 # v3.3.0
-        with:
-          actions: 'create-comment'
-          body: |
-            Hello @${{ github.event.issue.user.login }}. Thanks for reporting this and helping to make Electron better!
-
-            Would it be possible for you to make a standalone testcase with only the code necessary to reproduce the issue? For example, [Electron Fiddle](https://www.electronjs.org/fiddle) is a great tool for making small test cases and makes it easy to publish your test case to a [gist](https://gist.github.com) that Electron maintainers can use.
-
-            Stand-alone test cases make fixing issues go more smoothly: it ensure everyone's looking at the same issue, it removes all unnecessary variables from the equation, and it can also provide the basis for automated regression tests. 
-
-            Now adding the `blocked/need-repro` label for this reason. After you make a test case, please link to it in a followup comment. This issue will be closed in 10 days if the above is not addressed.
-  

.github/workflows/release_dependency_versions.yml

@@ -1,31 +0,0 @@
-name: Trigger Major Release Dependency Updates
-
-on:
-  release:
-    types: [published]
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  check_tag:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Check Tag
-      run: |
-        if [[ ${{ github.event.release.tag_name }} =~ ^v[0-9]+\.0\.0$ ]]; then
-          echo ::set-output name=should_release::true
-        fi
-  trigger:
-    runs-on: ubuntu-latest
-    needs: check_tag
-    if: needs.check_tag.outputs.should_release == 'true'
-    steps:
-      - uses: actions/checkout@v3
-      - name: Trigger New chromedriver Release
-        run: |
-          gh api /repos/:owner/chromedriver/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'
-      - name: Trigger New mksnapshot Release
-        run: |
-          gh api /repos/:owner/mksnapshot/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'

.gitignore

@@ -41,7 +41,7 @@ spec/.hash
 .eslintcache*
 
 # Generated native addon files
-/spec/fixtures/native-addon/echo/build/
+/spec-main/fixtures/native-addon/echo/build/
 
 # If someone runs tsc this is where stuff will end up
 ts-gen
@@ -53,4 +53,4 @@ ts-gen
 # Used to accelerate builds after sync
 patches/mtime-cache.json
 
-spec/fixtures/logo.png
+spec/fixtures/logo.png

.husky/.gitignore

@@ -0,0 +1 @@
+_

.nvmrc

@@ -1 +1 @@
-16
+14

BUILD.gn

@@ -107,14 +107,6 @@ branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
 electron_mac_bundle_id = branding.mac_bundle_id
-electron_version = exec_script("script/print-version.py",
-                               [],
-                               "trim string",
-                               [
-                                 ".git/packed-refs",
-                                 ".git/HEAD",
-                                 "script/lib/get-version.js",
-                               ])
 
 if (is_mas_build) {
   assert(is_mac,
@@ -143,7 +135,7 @@ config("electron_lib_config") {
   include_dirs = [ "." ]
 }
 
-# We generate the definitions twice here, once in //electron/electron.d.ts
+# We geneate the definitions twice here, once in //electron/electron.d.ts
 # and once in $target_gen_dir
 # The one in $target_gen_dir is used for the actual TSC build later one
 # and the one in //electron/electron.d.ts is used by your IDE (vscode)
@@ -210,15 +202,6 @@ webpack_build("electron_isolated_renderer_bundle") {
   out_file = "$target_gen_dir/js2c/isolated_bundle.js"
 }
 
-webpack_build("electron_utility_bundle") {
-  deps = [ ":build_electron_definitions" ]
-
-  inputs = auto_filenames.utility_bundle_deps
-
-  config_file = "//electron/build/webpack/webpack.config.utility.js"
-  out_file = "$target_gen_dir/js2c/utility_init.js"
-}
-
 action("electron_js2c") {
   deps = [
     ":electron_asar_bundle",
@@ -226,7 +209,6 @@ action("electron_js2c") {
     ":electron_isolated_renderer_bundle",
     ":electron_renderer_bundle",
     ":electron_sandboxed_renderer_bundle",
-    ":electron_utility_bundle",
     ":electron_worker_bundle",
   ]
 
@@ -236,7 +218,6 @@ action("electron_js2c") {
     "$target_gen_dir/js2c/isolated_bundle.js",
     "$target_gen_dir/js2c/renderer_init.js",
     "$target_gen_dir/js2c/sandbox_bundle.js",
-    "$target_gen_dir/js2c/utility_init.js",
     "$target_gen_dir/js2c/worker_init.js",
   ]
 
@@ -321,9 +302,12 @@ npm_action("electron_version_args") {
 
   outputs = [ "$target_gen_dir/electron_version.args" ]
 
-  args = rebase_path(outputs) + [ "$electron_version" ]
+  args = rebase_path(outputs)
 
-  inputs = [ "script/generate-version-json.js" ]
+  inputs = [
+    "ELECTRON_VERSION",
+    "script/generate-version-json.js",
+  ]
 }
 
 templated_file("electron_version_header") {
@@ -335,39 +319,6 @@ templated_file("electron_version_header") {
   args_files = get_target_outputs(":electron_version_args")
 }
 
-templated_file("electron_win_rc") {
-  deps = [ ":electron_version_args" ]
-
-  template = "build/templates/electron_rc.tmpl"
-  output = "$target_gen_dir/win-resources/electron.rc"
-
-  args_files = get_target_outputs(":electron_version_args")
-}
-
-copy("electron_win_resource_files") {
-  sources = [
-    "shell/browser/resources/win/electron.ico",
-    "shell/browser/resources/win/resource.h",
-  ]
-  outputs = [ "$target_gen_dir/win-resources/{{source_file_part}}" ]
-}
-
-templated_file("electron_version_file") {
-  deps = [ ":electron_version_args" ]
-
-  template = "build/templates/version_string.tmpl"
-  output = "$root_build_dir/version"
-
-  args_files = get_target_outputs(":electron_version_args")
-}
-
-group("electron_win32_resources") {
-  public_deps = [
-    ":electron_win_rc",
-    ":electron_win_resource_files",
-  ]
-}
-
 action("electron_fuses") {
   script = "build/fuses/build.py"
 
@@ -417,7 +368,6 @@ source_set("electron_lib") {
     "chromium_src:chrome",
     "chromium_src:chrome_spellchecker",
     "shell/common/api:mojo",
-    "shell/services/node/public/mojom",
     "//base:base_static",
     "//base/allocator:buildflags",
     "//chrome:strings",
@@ -441,7 +391,6 @@ source_set("electron_lib") {
     "//components/user_prefs",
     "//components/viz/host",
     "//components/viz/service",
-    "//components/webrtc",
     "//content/public/browser",
     "//content/public/child",
     "//content/public/gpu",
@@ -454,6 +403,9 @@ source_set("electron_lib") {
     "//media/mojo/mojom",
     "//net:extras",
     "//net:net_resources",
+    "//ppapi/host",
+    "//ppapi/proxy",
+    "//ppapi/shared_impl",
     "//printing/buildflags",
     "//services/device/public/cpp/geolocation",
     "//services/device/public/cpp/hid",
@@ -540,6 +492,13 @@ source_set("electron_lib") {
     ]
   }
 
+  if (is_linux) {
+    deps += [
+      "//components/crash/content/browser",
+      "//ui/gtk:gtk_config",
+    ]
+  }
+
   if (is_mac) {
     deps += [
       "//components/remote_cocoa/app_shim",
@@ -602,17 +561,13 @@ source_set("electron_lib") {
       ":electron_gtk_stubs",
       ":libnotify_loader",
       "//build/config/linux/gtk",
-      "//components/crash/content/browser",
       "//dbus",
       "//device/bluetooth",
-      "//third_party/crashpad/crashpad/client",
       "//ui/base/ime/linux",
       "//ui/events/devices/x11",
       "//ui/events/platform/x11",
-      "//ui/gtk:gtk_config",
-      "//ui/linux:linux_ui",
-      "//ui/linux:linux_ui_factory",
       "//ui/views/controls/webview",
+      "//ui/views/linux_ui:linux_ui_factory",
       "//ui/wm",
     ]
     if (ozone_platform_x11) {
@@ -663,23 +618,11 @@ source_set("electron_lib") {
   if (enable_plugins) {
     deps += [ "chromium_src:plugins" ]
     sources += [
-      "shell/common/plugin_info.cc",
-      "shell/common/plugin_info.h",
-      "shell/renderer/electron_renderer_pepper_host_factory.cc",
-      "shell/renderer/electron_renderer_pepper_host_factory.h",
       "shell/renderer/pepper_helper.cc",
       "shell/renderer/pepper_helper.h",
     ]
   }
 
-  if (enable_ppapi) {
-    deps += [
-      "//ppapi/host",
-      "//ppapi/proxy",
-      "//ppapi/shared_impl",
-    ]
-  }
-
   if (enable_run_as_node) {
     sources += [
       "shell/app/node_main.cc",
@@ -729,6 +672,8 @@ source_set("electron_lib") {
 
   if (enable_basic_printing) {
     sources += [
+      "shell/browser/printing/print_preview_message_handler.cc",
+      "shell/browser/printing/print_preview_message_handler.h",
       "shell/browser/printing/print_view_manager_electron.cc",
       "shell/browser/printing/print_view_manager_electron.h",
       "shell/renderer/printing/print_render_frame_helper_delegate.cc",
@@ -805,6 +750,7 @@ if (is_mac) {
   electron_helper_name = "$electron_product_name Helper"
   electron_login_helper_name = "$electron_product_name Login Helper"
   electron_framework_version = "A"
+  electron_version = read_file("ELECTRON_VERSION", "trim string")
 
   mac_xib_bundle_data("electron_xibs") {
     sources = [ "shell/common/resources/mac/MainMenu.xib" ]
@@ -955,13 +901,6 @@ if (is_mac) {
         "@executable_path/../../../../../..",
       ]
     }
-
-    # For component ffmpeg under non-component build, it is linked from
-    # @loader_path. However the ffmpeg.dylib is moved to a different place
-    # when generating app bundle, and we should change to link from @rpath.
-    if (is_component_ffmpeg && !is_component_build) {
-      ldflags += [ "-Wcrl,installnametool,-change,@loader_path/libffmpeg.dylib,@rpath/libffmpeg.dylib" ]
-    }
   }
 
   template("electron_helper_app") {
@@ -1245,7 +1184,6 @@ if (is_mac) {
       ":default_app_asar",
       ":electron_app_manifest",
       ":electron_lib",
-      ":electron_win32_resources",
       ":packed_resources",
       "//components/crash/core/app",
       "//content:sandbox_helper_win",
@@ -1279,7 +1217,8 @@ if (is_mac) {
 
     if (is_win) {
       sources += [
-        "$target_gen_dir/win-resources/electron.rc",
+        # TODO: we should be generating our .rc files more like how chrome does
+        "shell/browser/resources/win/electron.rc",
         "shell/browser/resources/win/resource.h",
       ]
 
@@ -1461,10 +1400,15 @@ group("licenses") {
   ]
 }
 
+copy("electron_version") {
+  sources = [ "ELECTRON_VERSION" ]
+  outputs = [ "$root_build_dir/version" ]
+}
+
 dist_zip("electron_dist_zip") {
   data_deps = [
     ":electron_app",
-    ":electron_version_file",
+    ":electron_version",
     ":licenses",
   ]
   if (is_linux) {

DEPS

@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '108.0.5359.48',
+    '104.0.5112.124',
   'node_version':
-    'v16.17.1',
+    'v16.15.0',
   'nan_version':
     '16fa32231e2ccd89d2804b3f765319128b20c4ac',
   'squirrel.mac_version':

ELECTRON_VERSION

@@ -0,0 +1 @@
+20.3.1

README.md

@@ -2,17 +2,17 @@
 
 [![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/main.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/main)
 [![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)
+[![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.com/invite/APGC3k5yaH)
 
 :memo: Available Translations: 🇨🇳 🇧🇷 🇪🇸 🇯🇵 🇷🇺 🇫🇷 🇺🇸 🇩🇪.
-View these docs in other languages on our [Crowdin](https://crowdin.com/project/electron) project.
+View these docs in other languages at [electron/i18n](https://github.com/electron/i18n/tree/master/content/).
 
 The Electron framework lets you write cross-platform desktop applications
 using JavaScript, HTML and CSS. It is based on [Node.js](https://nodejs.org/) and
 [Chromium](https://www.chromium.org) and is used by the [Atom
 editor](https://github.com/atom/atom) and many other [apps](https://electronjs.org/apps).
 
-Follow [@electronjs](https://twitter.com/electronjs) on Twitter for important
+Follow [@ElectronJS](https://twitter.com/electronjs) on Twitter for important
 announcements.
 
 This project adheres to the Contributor Covenant

appveyor.yml

@@ -3,7 +3,7 @@
 #  - "GN_EXTRA_ARGS" Additional gn arguments for a build config,
 #      e.g. 'target_cpu="x86"' to build for a 32bit platform.
 #      https://gn.googlesource.com/gn/+/master/docs/reference.md#target_cpu
-#      Don't forget to set up "NPM_CONFIG_ARCH" and "TARGET_ARCH" accordingly
+#      Don't forget to set up "NPM_CONFIG_ARCH" and "TARGET_ARCH" accordningly
 #      if you pass a custom value for 'target_cpu'.
 #  - "ELECTRON_RELEASE" Set it to '1' upload binaries on success.
 #  - "NPM_CONFIG_ARCH" E.g. 'x86'. Is used to build native Node.js modules.
@@ -12,7 +12,7 @@
 #      Is used in some publishing scripts, but does NOT affect the Electron binary.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
 #  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
-#      Otherwise the release will be uploaded to the GitHub Releases.
+#      Otherwise the release will be uploaded to the Github Releases.
 #      (The value is only checked if "ELECTRON_RELEASE" is defined.)
 #
 # The publishing scripts expect access tokens to be defined as env vars,
@@ -34,281 +34,214 @@ environment:
   MOCHA_REPORTER: mocha-multi-reporters
   MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
   GOMA_FALLBACK_ON_AUTH_FAILURE: true
-
-  matrix:
-
-  - job_name: Build
-
-  - job_name: Test
-    job_depends_on: Build
-
-clone_folder: C:\projects\src\electron
-
-# the first failed job cancels other jobs and fails entire build
-matrix:
-  fast_finish: true
-
-for:
-
-  -
-    matrix:
-      only:
-        - job_name: Build
-
-    init:
-    - ps: >-
-        if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-          Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-        }
-
-    build_script:
-    - ps: |
+build_script:
+  - ps: >-
+      if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
+        Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
+      } else {
         node script/yarn.js install --frozen-lockfile
-        node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
-        if ($LASTEXITCODE -eq 0) {
-          Write-warning "Skipping tests for doc only change"; Exit-AppveyorBuild
+
+        $result = node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
+        Write-Output $result
+        if ($result.ExitCode -eq 0) {
+          Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
         }
-        $global:LASTEXITCODE = 0
-    - cd ..
-    - ps: Write-Host "Building $env:GN_CONFIG build"
-    - git config --global core.longpaths true
-    - update_depot_tools.bat
-    - ps: >-
-        if (Test-Path 'env:RAW_GOMA_AUTH') {
-          $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
-          $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
-        }
-    - git clone https://github.com/electron/build-tools.git
-    - cd build-tools
-    - npm install
-    - mkdir third_party
-    - ps: >-
-        node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-    - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
-    - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
-    - cd ..\..
-    - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
-    - ps: >-
-        if (Test-Path 'env:RAW_GOMA_AUTH') {
-          $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 {
-            Write-warning "WARNING!!!!!! Goma authentication is incorrect; please update Goma auth token.";
-            $host.SetShouldExit(1)
-          }
-        }
-    - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
-    - ps: >-
-        if ($env:GN_CONFIG -ne 'release') {
-          $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
-        }
-    - >-
-        gclient config
-        --name "src\electron"
-        --unmanaged
-        %GCLIENT_EXTRA_ARGS%
-        "https://github.com/electron/electron"
-    - ps: >-
-        if ($env:GN_CONFIG -eq 'release') {
-          $env:RUN_GCLIENT_SYNC="true"
+      }
+  - echo "Building $env:GN_CONFIG build"
+  - git config --global core.longpaths true
+  - cd ..
+  - mkdir src
+  - update_depot_tools.bat
+  - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
+  - ps: >-
+      if (Test-Path 'env:RAW_GOMA_AUTH') {
+        $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
+        $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
+      }
+  - git clone https://github.com/electron/build-tools.git
+  - cd build-tools
+  - npm install
+  - mkdir third_party
+  - ps: >-
+      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
+  - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
+  - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
+  - cd ..
+  - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
+  - ps: >-
+      if (Test-Path 'env:RAW_GOMA_AUTH') {
+        $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 {
-          cd src\electron
-          node script\generate-deps-hash.js
-          $depshash = Get-Content .\.depshash -Raw 
-          $zipfile = "Z:\$depshash.7z"
-          cd ..\..
-          if (Test-Path -Path $zipfile) {
-            # file exists, unzip and then gclient sync
-            7z x -y $zipfile -mmt=14 -aoa
-            if (-not (Test-Path -Path "src\buildtools")) {
-              # the zip file must be corrupt - resync
-              $env:RUN_GCLIENT_SYNC="true"
-              if ($env:TARGET_ARCH -ne 'ia32') {
-                # only save on x64/woa to avoid contention saving
-                $env:SAVE_GCLIENT_SRC="true"
-              }
-            } else {
-              # update angle
-              cd src\third_party\angle
-              git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
-              git fetch
-              cd ..\..\..
-            }
-          } else {    
-            # file does not exist, gclient sync, then zip
+          Write-warning "WARNING!!!!!! Goma authentication is incorrect; please update Goma auth token.";
+          $host.SetShouldExit(1)
+        }
+      }
+  - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
+  - ps: >-
+      if ($env:GN_CONFIG -ne 'release') {
+        $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
+      }
+  - >-
+      gclient config
+      --name "src\electron"
+      --unmanaged
+      %GCLIENT_EXTRA_ARGS%
+      "https://github.com/electron/electron"
+  - ps: >-
+      if ($env:GN_CONFIG -eq 'release') {
+        $env:RUN_GCLIENT_SYNC="true"
+      } else {
+        cd src\electron
+        node script\generate-deps-hash.js
+        $depshash = Get-Content .\.depshash -Raw 
+        $zipfile = "Z:\$depshash.7z"
+        cd ..\..
+        if (Test-Path -Path $zipfile) {
+          # file exists, unzip and then gclient sync
+          7z x -y $zipfile -mmt=30 -aoa
+          if (-not (Test-Path -Path "src\buildtools")) {
+            # the zip file must be corrupt - resync
             $env:RUN_GCLIENT_SYNC="true"
             if ($env:TARGET_ARCH -ne 'ia32') {
               # only save on x64/woa to avoid contention saving
               $env:SAVE_GCLIENT_SRC="true"
             }
+          } else {
+            # update angle
+            cd src\third_party\angle
+            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
+            git fetch
+            cd ..\..\..
+          }
+        } else {    
+          # file does not exist, gclient sync, then zip
+          $env:RUN_GCLIENT_SYNC="true"
+          if ($env:TARGET_ARCH -ne 'ia32') {
+            # only save on x64/woa to avoid contention saving
+            $env:SAVE_GCLIENT_SRC="true"
           }
         }
-    - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync )
-    - ps: >-
-        if ($env:SAVE_GCLIENT_SRC -eq 'true') {
-          # archive current source for future use 
-          # only run on x64/woa to avoid contention saving
-          $(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30)
-          if ($LASTEXITCODE -ne 0) {
-            Write-warning "Could not save source to shared drive; continuing anyway"
-          }
-          # build time generation of file gen/angle/angle_commit.h depends on
-          # third_party/angle/.git
-          # https://chromium-review.googlesource.com/c/angle/angle/+/2074924       
-          $(7z a $zipfile src\third_party\angle\.git)
-          if ($LASTEXITCODE -ne 0) {
-            Write-warning "Failed to add third_party\angle\.git; continuing anyway"
-          }
-          # build time generation of file dawn/common/Version_autogen.h depends on third_party/dawn/.git/HEAD
-          # https://dawn-review.googlesource.com/c/dawn/+/83901        
-          $(7z a $zipfile src\third_party\dawn\.git)
-          if ($LASTEXITCODE -ne 0) {
-            Write-warning "Failed to add third_party\dawn\.git; continuing anyway"
-          }
+      }
+  - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync )
+  - ps: >-
+      if ($env:SAVE_GCLIENT_SRC -eq 'true') {
+        # archive current source for future use 
+        # only run on x64/woa to avoid contention saving
+        $(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30)
+        if ($LASTEXITCODE -ne 0) {
+          Write-warning "Could not save source to shared drive; continuing anyway"
         }
-    - cd src
-    - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
-    - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
-    - gn check out/Default //electron:electron_lib
-    - gn check out/Default //electron:electron_app
-    - gn check out/Default //electron/shell/common/api:mojo
-    - if DEFINED GN_GOMA_FILE (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
-    - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
-    - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
-    - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
-    - ninja -C out/Default electron:electron_dist_zip
-    - ninja -C out/Default shell_browser_ui_unittests
-    - gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-    - ninja -C out/Default electron:electron_mksnapshot_zip
-    - cd out\Default
-    - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
-    - cd ..\..
-    - ninja -C out/Default electron:hunspell_dictionaries_zip
-    - ninja -C out/Default electron:electron_chromedriver_zip
-    - ninja -C out/Default third_party/electron_node:headers
-    - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
-    - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
-    - 7z a node_headers.zip out\Default\gen\node_headers
-    - 7z a builtins-pgo.zip v8\tools\builtins-pgo
-    - ps: >-
-        if ($env:GN_CONFIG -eq 'release') {
-          # Needed for msdia140.dll on 64-bit windows
-          $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
-          ninja -C out/Default electron:electron_symbols
+        # build time generation of file gen/angle/angle_commit.h depends on
+        # third_party/angle/.git
+        # https://chromium-review.googlesource.com/c/angle/angle/+/2074924       
+        $(7z a $zipfile src\third_party\angle\.git)
+        if ($LASTEXITCODE -ne 0) {
+          Write-warning "Failed to add third_party\angle\.git; continuing anyway"
         }
-    - ps: >-
-        if ($env:GN_CONFIG -eq 'release') {
-          python3 electron\script\zip-symbols.py
-          appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+        # build time generation of file dawn/common/Version_autogen.h depends on third_party/dawn/.git/HEAD
+        # https://dawn-review.googlesource.com/c/dawn/+/83901        
+        $(7z a $zipfile src\third_party\dawn\.git)
+        if ($LASTEXITCODE -ne 0) {
+          Write-warning "Failed to add third_party\dawn\.git; continuing anyway"
+        }
+      }
+  - cd src
+  - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
+  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
+  - gn check out/Default //electron:electron_lib
+  - gn check out/Default //electron:electron_app
+  - gn check out/Default //electron/shell/common/api:mojo
+  - if DEFINED GN_GOMA_FILE (ninja -j 300 -C out/Default electron:electron_app) else (ninja -C out/Default electron:electron_app)
+  - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
+  - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") %GN_EXTRA_ARGS%"
+  - ninja -C out/ffmpeg electron:electron_ffmpeg_zip
+  - ninja -C out/Default electron:electron_dist_zip
+  - ninja -C out/Default shell_browser_ui_unittests
+  - gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
+  - ninja -C out/Default electron:electron_mksnapshot_zip
+  - cd out\Default
+  - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
+  - cd ..\..
+  - ninja -C out/Default electron:hunspell_dictionaries_zip
+  - ninja -C out/Default electron:electron_chromedriver_zip
+  - ninja -C out/Default third_party/electron_node:headers
+  - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
+  - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
+  - 7z a node_headers.zip out\Default\gen\node_headers
+  - ps: >-
+      if ($env:GN_CONFIG -eq 'release') {
+        # Needed for msdia140.dll on 64-bit windows
+        $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
+        ninja -C out/Default electron:electron_symbols
+      }
+  - ps: >-
+      if ($env:GN_CONFIG -eq 'release') {
+        python electron\script\zip-symbols.py
+        appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+      } else {
+        # It's useful to have pdb files when debugging testing builds that are
+        # built on CI.
+        7z a pdb.zip out\Default\*.pdb
+      }
+  - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
+test_script:
+  # Workaround for https://github.com/appveyor/ci/issues/2420
+  - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
+  - ps: >-
+      if ((-Not (Test-Path Env:\TEST_WOA)) -And (-Not (Test-Path Env:\ELECTRON_RELEASE)) -And ($env:GN_CONFIG -in "testing", "release")) {
+        $env:RUN_TESTS="true"
+      }
+  - ps: >-
+      if ($env:RUN_TESTS -eq 'true') {
+        New-Item .\out\Default\gen\node_headers\Release -Type directory
+        Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
+      } else {
+        echo "Skipping tests for $env:GN_CONFIG build"
+      }
+  - cd electron
+  # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
+  - if "%RUN_TESTS%"=="true" ( echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
+  - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeperately --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
+  - if "%RUN_TESTS%"=="true" ( echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )  
+  - cd ..
+  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
+  - echo "About to verify mksnapshot"
+  - if "%RUN_TESTS%"=="true" ( echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd% )
+  - echo "Done verifying mksnapshot"
+  - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
+  - echo "Done verifying chromedriver"
+deploy_script:
+  - cd electron
+  - ps: >-
+      if (Test-Path Env:\ELECTRON_RELEASE) {
+        if (Test-Path Env:\UPLOAD_TO_STORAGE) {
+          Write-Output "Uploading Electron release distribution to azure"
+          & python script\release\uploaders\upload.py --verbose --upload_to_storage
         } else {
-          # It's useful to have pdb files when debugging testing builds that are
-          # built on CI.
-          7z a pdb.zip out\Default\*.pdb
+          Write-Output "Uploading Electron release distribution to github releases"
+          & python script\release\uploaders\upload.py --verbose
         }
-    - python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
-   
-    deploy_script:
-      - cd electron
-      - ps: >-
-          if (Test-Path Env:\ELECTRON_RELEASE) {
-            if (Test-Path Env:\UPLOAD_TO_STORAGE) {
-              Write-Output "Uploading Electron release distribution to azure"
-              & python3 script\release\uploaders\upload.py --verbose --upload_to_storage
-            } else {
-              Write-Output "Uploading Electron release distribution to github releases"
-              & python3 script\release\uploaders\upload.py --verbose
-            }
-          } elseif (Test-Path Env:\TEST_WOA) {
-            node script/release/ci-release-build.js --job=electron-woa-testing --ci=GHA --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
-          }
-    on_finish:
-      # Uncomment this lines to enable RDP
-      #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - cd C:\projects\src
-      - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
-      - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
-      - if exist out\Default\shell_browser_ui_unittests.exe (appveyor-retry appveyor PushArtifact out\Default\shell_browser_ui_unittests.exe)
-      - if exist out\Default\chromedriver.zip (appveyor-retry appveyor PushArtifact out\Default\chromedriver.zip)
-      - if exist out\ffmpeg\ffmpeg.zip (appveyor-retry appveyor PushArtifact out\ffmpeg\ffmpeg.zip)
-      - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
-      - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
-      - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
-      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
-      - if exist builtins-pgo.zip (appveyor-retry appveyor PushArtifact builtins-pgo.zip)
-      - ps: >-
-          if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
-            appveyor-retry appveyor PushArtifact pdb.zip
-          }        
+      } elseif (Test-Path Env:\TEST_WOA) {
+        node script/release/ci-release-build.js --job=electron-woa-testing --ci=GHA --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
+      }
+on_finish:
+  # Uncomment this lines to enable RDP
+  #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+  - cd ..
+  - if exist out\Default\windows_toolchain_profile.json ( appveyor-retry appveyor PushArtifact out\Default\windows_toolchain_profile.json )
+  - if exist out\Default\dist.zip (appveyor-retry appveyor PushArtifact out\Default\dist.zip)
+  - if exist out\Default\shell_browser_ui_unittests.exe (appveyor-retry appveyor PushArtifact out\Default\shell_browser_ui_unittests.exe)
+  - if exist out\Default\chromedriver.zip (appveyor-retry appveyor PushArtifact out\Default\chromedriver.zip)
+  - if exist out\ffmpeg\ffmpeg.zip (appveyor-retry appveyor PushArtifact out\ffmpeg\ffmpeg.zip)
+  - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
+  - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
+  - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
+  - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
+  - ps: >-
+      if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
+        appveyor-retry appveyor PushArtifact pdb.zip
+      }
 
-  -
-    matrix:
-      only:
-        - job_name: Test
-
-    init:
-    - ps: |
-        if ($env:RUN_TESTS -ne 'true') {
-          Write-warning "Skipping tests for $env:APPVEYOR_PROJECT_NAME"; Exit-AppveyorBuild
-        }
-        if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
-          Write-warning "Skipping PR build for branch"; Exit-AppveyorBuild
-        }
-    build_script:
-    - ps: |
-        node script/yarn.js install --frozen-lockfile
-        node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
-        if ($LASTEXITCODE -eq 0) {
-          Write-warning "Skipping tests for doc only change"; Exit-AppveyorBuild
-        }
-        $global:LASTEXITCODE = 0
-    - ps: |
-        cd ..
-        mkdir out\Default
-        cd ..
-        # Download build artifacts
-        $apiUrl = 'https://ci.appveyor.com/api'             
-        $build_info = Invoke-RestMethod -Method Get -Uri "$apiUrl/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/builds/$env:APPVEYOR_BUILD_ID"
-        $artifacts_to_download = @('dist.zip','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib','builtins-pgo.zip')
-        foreach ($job in $build_info.build.jobs) {
-          if ($job.name -eq "Build") {
-            $jobId = $job.jobId
-            foreach($artifact_name in $artifacts_to_download) {
-              if ($artifact_name -eq 'shell_browser_ui_unittests.exe' -Or $artifact_name -eq 'electron.lib') {
-                $outfile = "src\out\Default\$artifact_name"
-              } else {
-                $outfile = $artifact_name
-              }
-              Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
-            }
-          }
-        }
-    - ps: |
-        $out_default_zips = @('dist.zip','chromedriver.zip','mksnapshot.zip')
-        foreach($zip_name in $out_default_zips) {
-          7z x -y -osrc\out\Default $zip_name
-        }
-    - ps: 7z x -y -osrc\out\ffmpeg ffmpeg.zip
-    - ps: 7z x -y -osrc node_headers.zip
-    - ps: 7z x -y -osrc builtins-pgo.zip
-
-    test_script:
-      # Workaround for https://github.com/appveyor/ci/issues/2420
-      - set "PATH=%PATH%;C:\Program Files\Git\mingw64\libexec\git-core"
-      - ps: |
-          cd src
-          New-Item .\out\Default\gen\node_headers\Release -Type directory
-          Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
-      - cd electron
-      - echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log
-      - echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log
-      - cd ..
-      - echo Verifying non proprietary ffmpeg & python3 electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
-      - echo "About to verify mksnapshot"
-      - echo Verifying mksnapshot & python3 electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd%
-      - echo "Done verifying mksnapshot"
-      - echo Verifying chromedriver & python3 electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd%
-      - echo "Done verifying chromedriver"
-    
-    on_finish:
-      - 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

@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 110
+node_module_version = 107
 
 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
@@ -46,5 +46,4 @@ enable_cet_shadow_stack = false
 # Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
 is_cfi = false
 
-# TODO: fix this once sysroots have been updated.
-use_qt = false
+v8_enable_sandboxed_pointers = false

build/args/native_tests.gn

@@ -1,4 +1,4 @@
-root_extra_deps = [ "//electron/spec-chromium:spec" ]
+root_extra_deps = [ "//electron/spec" ]
 
 dcheck_always_on = true
 is_debug = false

build/asar.gni

@@ -1,22 +1,33 @@
-template("node_action") {
-  assert(defined(invoker.script), "Need script path to run")
-  assert(defined(invoker.args), "Need script arguments")
+import("node.gni")
 
+# TODO(MarshallOfSound): Move to electron/node, this is the only place it is used now
+# Run an action with a given working directory. Behaves identically to the
+# action() target type, with the exception that it changes directory before
+# running the script.
+#
+# Parameters:
+#   cwd [required]: Directory to change to before running the script.
+template("chdir_action") {
   action(target_name) {
     forward_variables_from(invoker,
+                           "*",
                            [
-                             "deps",
-                             "public_deps",
-                             "sources",
-                             "inputs",
-                             "outputs",
+                             "script",
+                             "args",
                            ])
-    if (!defined(inputs)) {
-      inputs = []
+    assert(defined(cwd), "Need cwd in $target_name")
+    script = "//electron/build/run-in-dir.py"
+    if (defined(sources)) {
+      sources += [ invoker.script ]
+    } else {
+      assert(defined(inputs))
+      inputs += [ invoker.script ]
     }
-    inputs += [ invoker.script ]
-    script = "//electron/build/run-node.py"
-    args = [ rebase_path(invoker.script) ] + invoker.args
+    args = [
+      rebase_path(cwd),
+      rebase_path(invoker.script),
+    ]
+    args += invoker.args
   }
 }
 

build/config/BUILD.gn

@@ -1,3 +1,23 @@
+config("build_time_executable") {
+  configs = []
+
+  if (is_electron_build && !is_component_build) {
+    # The executables which have this config applied are dependent on ffmpeg,
+    # which is always a shared library in an Electron build. However, in the
+    # non-component build, executables don't have rpath set to search for
+    # libraries in the executable's directory, so ffmpeg cannot be found. So
+    # let's make sure rpath is set here.
+    # See '//build/config/gcc/BUILD.gn' for details on the rpath setting.
+    if (is_linux) {
+      configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
+    }
+
+    if (is_mac) {
+      ldflags = [ "-Wl,-rpath,@loader_path/." ]
+    }
+  }
+}
+
 # For MAS build, we force defining "MAS_BUILD".
 config("mas_build") {
   if (is_mas_build) {

build/fuses/build.py

@@ -19,13 +19,17 @@ TEMPLATE_H = """
 #define FUSE_EXPORT __attribute__((visibility("default")))
 #endif
 
-namespace electron::fuses {
+namespace electron {
+
+namespace fuses {
 
 extern const volatile char kFuseWire[];
 
 {getters}
 
-}  // namespace electron::fuses
+}  // namespace fuses
+
+}  // namespace electron
 
 #endif  // ELECTRON_FUSES_H_
 """
@@ -33,13 +37,17 @@ extern const volatile char kFuseWire[];
 TEMPLATE_CC = """
 #include "electron/fuses.h"
 
-namespace electron::fuses {
+namespace electron {
+
+namespace fuses {
 
 const volatile char kFuseWire[] = { /* sentinel */ {sentinel}, /* fuse_version */ {fuse_version}, /* fuse_wire_length */ {fuse_wire_length}, /* fuse_wire */ {initial_config}};
 
 {getters}
 
-}  // namespace electron:fuses
+}
+
+}
 """
 
 with open(os.path.join(dir_path, "fuses.json5"), 'r') as f:

build/js2c.py

@@ -8,7 +8,9 @@ TEMPLATE = """
 #include "node_native_module.h"
 #include "node_internals.h"
 
-namespace node::native_module {{
+namespace node {{
+
+namespace native_module {{
 
 {definitions}
 
@@ -16,7 +18,9 @@ void NativeModuleLoader::LoadEmbedderJavaScriptSource() {{
   {initializers}
 }}
 
-}}  // namespace node::native_module
+}}  // namespace native_module
+
+}}  // namespace node
 """
 
 def main():

build/mac/make_locale_dirs.py

@@ -4,7 +4,7 @@
 # Cocoa .app bundle. The presence of these empty directories is sufficient to
 # convince Cocoa that the application supports the named localization, even if
 # an InfoPlist.strings file is not provided. Chrome uses these empty locale
-# directories for its helper executable bundles, which do not otherwise
+# directoires for its helper executable bundles, which do not otherwise
 # require any direct Cocoa locale support.
 
 import os

build/node.gni

@@ -0,0 +1,21 @@
+template("node_action") {
+  assert(defined(invoker.script), "Need script path to run")
+  assert(defined(invoker.args), "Need script argumets")
+
+  action(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "public_deps",
+                             "sources",
+                             "inputs",
+                             "outputs",
+                           ])
+    if (!defined(inputs)) {
+      inputs = []
+    }
+    inputs += [ invoker.script ]
+    script = "//electron/build/run-node.py"
+    args = [ rebase_path(invoker.script) ] + invoker.args
+  }
+}

build/npm.gni

@@ -1,7 +1,7 @@
 template("npm_action") {
   assert(defined(invoker.script),
          "Need script name to run (must be defined in package.json)")
-  assert(defined(invoker.args), "Need script arguments")
+  assert(defined(invoker.args), "Need script argumets")
 
   action("npm_pre_flight_" + target_name) {
     inputs = [

build/rules.gni

@@ -51,7 +51,7 @@ template("compile_ib_files") {
 # Template to compile and package Mac XIB files as bundle data.
 # Arguments
 #     sources:
-#         list of string, sources to compile
+#         list of string, sources to comiple
 #     output_path:
 #         (optional) string, the path to use for the outputs list in the
 #         bundle_data step. If unspecified, defaults to bundle_resources_dir.

build/templates/version_string.tmpl

@@ -1 +0,0 @@
-$full_version

build/webpack/webpack.config.base.js

@@ -75,17 +75,9 @@ module.exports = ({
 
     if (targetDeletesNodeGlobals) {
       plugins.push(new webpack.ProvidePlugin({
-        Buffer: ['@electron/internal/common/webpack-provider', 'Buffer'],
+        process: ['@electron/internal/common/webpack-provider', 'process'],
         global: ['@electron/internal/common/webpack-provider', '_global'],
-        process: ['@electron/internal/common/webpack-provider', 'process']
-      }));
-    }
-
-    // Webpack 5 no longer polyfills process or Buffer.
-    if (!alwaysHasNode) {
-      plugins.push(new webpack.ProvidePlugin({
-        Buffer: ['buffer', 'Buffer'],
-        process: 'process/browser'
+        Buffer: ['@electron/internal/common/webpack-provider', 'Buffer']
       }));
     }
 
@@ -137,12 +129,7 @@ if ((globalThis.process || binding.process).argv.includes("--profile-electron-in
           // Force timers to resolve to our dependency that doesn't use window.postMessage
           timers: path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
         },
-        extensions: ['.ts', '.js'],
-        fallback: {
-          // We provide our own "timers" import above, any usage of setImmediate inside
-          // one of our renderer bundles should import it from the 'timers' package
-          setImmediate: false
-        }
+        extensions: ['.ts', '.js']
       },
       module: {
         rules: [{
@@ -163,7 +150,10 @@ if ((globalThis.process || binding.process).argv.includes("--profile-electron-in
       },
       node: {
         __dirname: false,
-        __filename: false
+        __filename: false,
+        // We provide our own "timers" import above, any usage of setImmediate inside
+        // one of our renderer bundles should import it from the 'timers' package
+        setImmediate: false
       },
       optimization: {
         minimize: env.mode === 'production',

build/webpack/webpack.config.utility.js

@@ -1,4 +0,0 @@
-module.exports = require('./webpack.config.base')({
-  target: 'utility',
-  alwaysHasNode: true
-});

build/webpack/webpack.gni

@@ -30,14 +30,11 @@ template("webpack_build") {
     args = [
       "--config",
       rebase_path(invoker.config_file),
-      "--output-filename",
-      get_path_info(invoker.out_file, "file"),
-      "--output-path",
-      rebase_path(get_path_info(invoker.out_file, "dir")),
-      "--env",
-      "buildflags=" + rebase_path("$target_gen_dir/buildflags/buildflags.h"),
-      "--env",
-      "mode=" + mode,
+      "--output-filename=" + get_path_info(invoker.out_file, "file"),
+      "--output-path=" + rebase_path(get_path_info(invoker.out_file, "dir")),
+      "--env.buildflags=" +
+          rebase_path("$target_gen_dir/buildflags/buildflags.h"),
+      "--env.mode=" + mode,
     ]
     deps += [ "//electron/buildflags" ]
 

chromium_src/BUILD.gn

@@ -6,7 +6,6 @@ import("//build/config/ozone.gni")
 import("//build/config/ui.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//electron/buildflags/buildflags.gni")
-import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//third_party/widevine/cdm/widevine.gni")
 
@@ -105,7 +104,6 @@ static_library("chrome") {
       "//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",
@@ -157,7 +155,10 @@ static_library("chrome") {
     "//services/strings",
   ]
 
-  deps = [ "//chrome/browser:resource_prefetch_predictor_proto" ]
+  deps = [
+    "//chrome/browser:resource_prefetch_predictor_proto",
+    "//components/optimization_guide/proto:optimization_guide_proto",
+  ]
 
   if (is_linux) {
     sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
@@ -230,12 +231,6 @@ static_library("chrome") {
       "//chrome/browser/printing/printer_query.h",
       "//chrome/browser/printing/printing_service.cc",
       "//chrome/browser/printing/printing_service.h",
-      "//components/printing/browser/print_to_pdf/pdf_print_job.cc",
-      "//components/printing/browser/print_to_pdf/pdf_print_job.h",
-      "//components/printing/browser/print_to_pdf/pdf_print_result.cc",
-      "//components/printing/browser/print_to_pdf/pdf_print_result.h",
-      "//components/printing/browser/print_to_pdf/pdf_print_utils.cc",
-      "//components/printing/browser/print_to_pdf/pdf_print_utils.h",
     ]
 
     if (enable_oop_printing) {
@@ -375,20 +370,15 @@ source_set("plugins") {
   deps += [
     "//components/strings",
     "//media:media_buildflags",
+    "//ppapi/buildflags",
+    "//ppapi/host",
+    "//ppapi/proxy",
+    "//ppapi/proxy:ipc",
+    "//ppapi/shared_impl",
     "//services/device/public/mojom",
     "//skia",
     "//storage/browser",
   ]
-
-  if (enable_ppapi) {
-    deps += [
-      "//ppapi/buildflags",
-      "//ppapi/host",
-      "//ppapi/proxy",
-      "//ppapi/proxy:ipc",
-      "//ppapi/shared_impl",
-    ]
-  }
 }
 
 # This source set is just so we don't have to depend on all of //chrome/browser
@@ -402,10 +392,6 @@ source_set("chrome_spellchecker") {
 
   if (enable_builtin_spellchecker) {
     sources += [
-      "//chrome/browser/profiles/profile_keyed_service_factory.cc",
-      "//chrome/browser/profiles/profile_keyed_service_factory.h",
-      "//chrome/browser/profiles/profile_selections.cc",
-      "//chrome/browser/profiles/profile_selections.h",
       "//chrome/browser/spellchecker/spell_check_host_chrome_impl.cc",
       "//chrome/browser/spellchecker/spell_check_host_chrome_impl.h",
       "//chrome/browser/spellchecker/spellcheck_custom_dictionary.cc",
@@ -414,19 +400,14 @@ source_set("chrome_spellchecker") {
       "//chrome/browser/spellchecker/spellcheck_factory.h",
       "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
       "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
+      "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc",
+      "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h",
+      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
+      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
       "//chrome/browser/spellchecker/spellcheck_service.cc",
       "//chrome/browser/spellchecker/spellcheck_service.h",
     ]
 
-    if (!is_mac) {
-      sources += [
-        "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc",
-        "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h",
-        "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
-        "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
-      ]
-    }
-
     if (has_spellcheck_panel) {
       sources += [
         "//chrome/browser/spellchecker/spell_check_panel_host_impl.cc",

default_app/main.ts

@@ -83,7 +83,7 @@ function loadApplicationPackage (packagePath: string) {
   });
 
   try {
-    // Override app's package.json data.
+    // Override app name and version.
     packagePath = path.resolve(packagePath);
     const packageJsonPath = path.join(packagePath, 'package.json');
     let appPath;
@@ -104,16 +104,6 @@ function loadApplicationPackage (packagePath: string) {
       } else if (packageJson.name) {
         app.name = packageJson.name;
       }
-      if (packageJson.desktopName) {
-        app.setDesktopName(packageJson.desktopName);
-      } else {
-        app.setDesktopName(`${app.name}.desktop`);
-      }
-      // Set v8 flags, deliberately lazy load so that apps that do not use this
-      // feature do not pay the price
-      if (packageJson.v8Flags) {
-        require('v8').setFlagsFromString(packageJson.v8Flags);
-      }
       appPath = packagePath;
     }
 

docs/README.md

@@ -83,6 +83,7 @@ These individual tutorials expand on topics discussed in the guide above.
 * Electron Releases & Developer Feedback
   * [Versioning Policy](tutorial/electron-versioning.md)
   * [Release Timelines](tutorial/electron-timelines.md)
+* [Testing Widevine CDM](tutorial/testing-widevine-cdm.md)
 
 ---
 

docs/api/app.md

@@ -130,11 +130,6 @@ set `NSPrincipalClass` to `AtomApplication`.
 
 You should call `event.preventDefault()` if you want to handle this event.
 
-As with the `open-file` event, be sure to register a listener for the `open-url`
-event early in your application startup to detect if the the application being
-is being opened to handle a URL. If you register the listener in response to a
-`ready` event, you'll miss URLs that trigger the launch of your application.
-
 ### Event: 'activate' _macOS_
 
 Returns:
@@ -715,9 +710,7 @@ To set the locale, you'll want to use a command line switch at app startup, whic
 **Note:** When distributing your packaged app, you have to also ship the
 `locales` folder.
 
-**Note:** This API must be called after the `ready` event is emitted.
-
-**Note:** To see example return values of this API compared to other locale and language APIs, see [`app.getPreferredSystemLanguages()`](#appgetpreferredsystemlanguages).
+**Note:** On Windows, you have to call it after the `ready` events gets emitted.
 
 ### `app.getLocaleCountryCode()`
 
@@ -725,44 +718,6 @@ Returns `string` - User operating system's locale two-letter [ISO 3166](https://
 
 **Note:** When unable to detect locale country code, it returns empty string.
 
-### `app.getSystemLocale()`
-
-Returns `string` - The current system locale. On Windows and Linux, it is fetched using Chromium's `i18n` library. On macOS, `[NSLocale currentLocale]` is used instead. To get the user's current system language, which is not always the same as the locale, it is better to use [`app.getPreferredSystemLanguages()`](#appgetpreferredsystemlanguages).
-
-Different operating systems also use the regional data differently:
-
-* Windows 11 uses the regional format for numbers, dates, and times.
-* macOS Monterey uses the region for formatting numbers, dates, times, and for selecting the currency symbol to use.
-
-Therefore, this API can be used for purposes such as choosing a format for rendering dates and times in a calendar app, especially when the developer wants the format to be consistent with the OS.
-
-**Note:** This API must be called after the `ready` event is emitted.
-
-**Note:** To see example return values of this API compared to other locale and language APIs, see [`app.getPreferredSystemLanguages()`](#appgetpreferredsystemlanguages).
-
-### `app.getPreferredSystemLanguages()`
-
-Returns `string[]` - The user's preferred system languages from most preferred to least preferred, including the country codes if applicable. A user can modify and add to this list on Windows or macOS through the Language and Region settings.
-
-The API uses `GlobalizationPreferences` (with a fallback to `GetSystemPreferredUILanguages`) on Windows, `\[NSLocale preferredLanguages\]` on macOS, and `g_get_language_names` on Linux.
-
-This API can be used for purposes such as deciding what language to present the application in.
-
-Here are some examples of return values of the various language and locale APIs with different configurations:
-
-* For Windows, where the application locale is German, the regional format is Finnish (Finland), and the preferred system languages from most to least preferred are French (Canada), English (US), Simplified Chinese (China), Finnish, and Spanish (Latin America):
-  * `app.getLocale()` returns `'de'`
-  * `app.getSystemLocale()` returns `'fi-FI'`
-  * `app.getPreferredSystemLanguages()` returns `['fr-CA', 'en-US', 'zh-Hans-CN', 'fi', 'es-419']`
-* On macOS, where the application locale is German, the region is Finland, and the preferred system languages from most to least preferred are French (Canada), English (US), Simplified Chinese, and Spanish (Latin America):
-  * `app.getLocale()` returns `'de'`
-  * `app.getSystemLocale()` returns `'fr-FI'`
-  * `app.getPreferredSystemLanguages()` returns `['fr-CA', 'en-US', 'zh-Hans-FI', 'es-419']`
-
-Both the available languages and regions and the possible return values differ between the two operating systems.
-
-As can be seen with the example above, on Windows, it is possible that a preferred system language has no country code, and that one of the preferred system languages corresponds with the language used for the regional format. On macOS, the region serves more as a default country code: the user doesn't need to have Finnish as a preferred language to use Finland as the region,and the country code `FI` is used as the country code for preferred system languages that do not have associated countries in the language name.
-
 ### `app.addRecentDocument(path)` _macOS_ _Windows_
 
 * `path` string
@@ -1237,7 +1192,7 @@ For `infoType` equal to `basic`:
 }
 ```
 
-Using `basic` should be preferred if only basic information like `vendorId` or `deviceId` is needed.
+Using `basic` should be preferred if only basic information like `vendorId` or `driverId` is needed.
 
 ### `app.setBadgeCount([count])` _Linux_ _macOS_
 
@@ -1426,7 +1381,7 @@ method returns false. If we fail to perform the copy, then this method will
 throw an error. The message in the error should be informative and tell
 you exactly what went wrong.
 
-By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the preexisting running app will assume focus and the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.
+By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the pre-existing running app will assume focus and the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.
 
 For example:
 

docs/api/browser-window.md

@@ -652,36 +652,18 @@ The following app commands are explicitly supported on Linux:
 * `browser-backward`
 * `browser-forward`
 
-#### Event: 'scroll-touch-begin' _macOS_ _Deprecated_
+#### Event: 'scroll-touch-begin' _macOS_
 
 Emitted when scroll wheel event phase has begun.
 
-> **Note**
-> This event is deprecated beginning in Electron 22.0.0. See [Breaking
-> Changes](breaking-changes.md#deprecated-browserwindow-scroll-touch--events)
-> for details of how to migrate to using the [WebContents
-> `input-event`](api/web-contents.md#event-input-event) event.
-
-#### Event: 'scroll-touch-end' _macOS_ _Deprecated_
+#### Event: 'scroll-touch-end' _macOS_
 
 Emitted when scroll wheel event phase has ended.
 
-> **Note**
-> This event is deprecated beginning in Electron 22.0.0. See [Breaking
-> Changes](breaking-changes.md#deprecated-browserwindow-scroll-touch--events)
-> for details of how to migrate to using the [WebContents
-> `input-event`](api/web-contents.md#event-input-event) event.
-
-#### Event: 'scroll-touch-edge' _macOS_ _Deprecated_
+#### Event: 'scroll-touch-edge' _macOS_
 
 Emitted when scroll wheel event phase filed upon reaching the edge of element.
 
-> **Note**
-> This event is deprecated beginning in Electron 22.0.0. See [Breaking
-> Changes](breaking-changes.md#deprecated-browserwindow-scroll-touch--events)
-> for details of how to migrate to using the [WebContents
-> `input-event`](api/web-contents.md#event-input-event) event.
-
 #### Event: 'swipe' _macOS_
 
 Returns:

docs/api/context-bridge.md

@@ -46,12 +46,6 @@ The `contextBridge` module has the following methods:
 * `apiKey` string - The key to inject the API onto `window` with.  The API will be accessible on `window[apiKey]`.
 * `api` any - Your API, more information on what this API can be and how it works is available below.
 
-### `contextBridge.exposeInIsolatedWorld(worldId, apiKey, api)`
-
-* `worldId` Integer - The ID of the world to inject the API into. `0` is the default world, `999` is the world used by Electron's `contextIsolation` feature. Using 999 would expose the object for preload context. We recommend using 1000+ while creating isolated world.
-* `apiKey` string - The key to inject the API onto `window` with.  The API will be accessible on `window[apiKey]`.
-* `api` any - Your API, more information on what this API can be and how it works is available below.
-
 ## Usage
 
 ### API
@@ -90,26 +84,6 @@ contextBridge.exposeInMainWorld(
 )
 ```
 
-An example of `exposeInIsolatedWorld` is shown below:
-
-```javascript
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInIsolatedWorld(
-  1004,
-  'electron',
-  {
-    doThing: () => ipcRenderer.send('do-a-thing')
-  }
-)
-```
-
-```javascript
-// Renderer (In isolated world id1004)
-
-window.electron.doThing()
-```
-
 ### API Functions
 
 `Function` values that you bind through the `contextBridge` are proxied through Electron to ensure that contexts remain isolated.  This

docs/api/environment-variables.md

@@ -139,7 +139,8 @@ green and non-draggable regions will be colored red to aid debugging.
 
 ### `ELECTRON_DEBUG_NOTIFICATIONS`
 
-Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common actions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.
+Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common a
+tions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.
 
 Sample output:
 

docs/api/ipc-renderer.md

@@ -96,6 +96,14 @@ Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will no
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
+> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects will throw an exception.
+>
+> Since the main process does not have support for DOM objects such as
+> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
+> Electron's IPC to the main process, as the main process would have no way to decode
+> them. Attempting to send such objects over IPC will result in an error.
+
 The main process should listen for `channel` with
 [`ipcMain.handle()`](./ipc-main.md#ipcmainhandlechannel-listener).
 
@@ -118,21 +126,6 @@ If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRender
 
 If you do not need a response to the message, consider using [`ipcRenderer.send`](#ipcrenderersendchannel-args).
 
-> **Note**
-> Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
->
-> Since the main process does not have support for DOM objects such as
-> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
-> Electron's IPC to the main process, as the main process would have no way to decode
-> them. Attempting to send such objects over IPC will result in an error.
-
-> **Note**
-> If the handler in the main process throws an error,
-> the promise returned by `invoke` will reject.
-> However, the `Error` object in the renderer process
-> will not be the same as the one thrown in the main process.
-
 ### `ipcRenderer.sendSync(channel, ...args)`
 
 * `channel` string

docs/api/menu-item.md

@@ -14,7 +14,7 @@ See [`Menu`](menu.md) for examples.
     * `menuItem` MenuItem
     * `browserWindow` [BrowserWindow](browser-window.md) | undefined - This will not be defined if no window is open.
     * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `showSubstitutions`, `toggleSmartQuotes`, `toggleSmartDashes`, `toggleTextReplacement`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, 'showSubstitutions', 'toggleSmartQuotes', 'toggleSmartDashes', 'toggleTextReplacement', `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
     `click` property will be ignored. See [roles](#roles).
   * `type` string (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
     `radio`.

docs/api/native-image.md

@@ -149,7 +149,7 @@ console.log(image)
 * `options` Object
   * `width` Integer
   * `height` Integer
-  * `scaleFactor` Number (optional) - Defaults to 1.0.
+  * `scaleFactor` Double (optional) - Defaults to 1.0.
 
 Returns `NativeImage`
 
@@ -162,7 +162,7 @@ pixel data returned by `toBitmap()`. The specific format is platform-dependent.
 * `options` Object (optional)
   * `width` Integer (optional) - Required for bitmap buffers.
   * `height` Integer (optional) - Required for bitmap buffers.
-  * `scaleFactor` Number (optional) - Defaults to 1.0.
+  * `scaleFactor` Double (optional) - Defaults to 1.0.
 
 Returns `NativeImage`
 
@@ -225,7 +225,7 @@ The following methods are available on instances of the `NativeImage` class:
 #### `image.toPNG([options])`
 
 * `options` Object (optional)
-  * `scaleFactor` Number (optional) - Defaults to 1.0.
+  * `scaleFactor` Double (optional) - Defaults to 1.0.
 
 Returns `Buffer` - A [Buffer][buffer] that contains the image's `PNG` encoded data.
 
@@ -238,7 +238,7 @@ Returns `Buffer` - A [Buffer][buffer] that contains the image's `JPEG` encoded d
 #### `image.toBitmap([options])`
 
 * `options` Object (optional)
-  * `scaleFactor` Number (optional) - Defaults to 1.0.
+  * `scaleFactor` Double (optional) - Defaults to 1.0.
 
 Returns `Buffer` - A [Buffer][buffer] that contains a copy of the image's raw bitmap pixel
 data.
@@ -246,14 +246,14 @@ data.
 #### `image.toDataURL([options])`
 
 * `options` Object (optional)
-  * `scaleFactor` Number (optional) - Defaults to 1.0.
+  * `scaleFactor` Double (optional) - Defaults to 1.0.
 
 Returns `string` - The data URL of the image.
 
 #### `image.getBitmap([options])`
 
 * `options` Object (optional)
-  * `scaleFactor` Number (optional) - Defaults to 1.0.
+  * `scaleFactor` Double (optional) - Defaults to 1.0.
 
 Returns `Buffer` - A [Buffer][buffer] that contains the image's raw bitmap pixel data.
 
@@ -276,7 +276,7 @@ Returns `boolean` - Whether the image is empty.
 
 #### `image.getSize([scaleFactor])`
 
-* `scaleFactor` Number (optional) - Defaults to 1.0.
+* `scaleFactor` Double (optional) - Defaults to 1.0.
 
 Returns [`Size`](structures/size.md).
 
@@ -317,20 +317,20 @@ will be preserved in the resized image.
 
 #### `image.getAspectRatio([scaleFactor])`
 
-* `scaleFactor` Number (optional) - Defaults to 1.0.
+* `scaleFactor` Double (optional) - Defaults to 1.0.
 
-Returns `Number` - The image's aspect ratio.
+Returns `Float` - The image's aspect ratio.
 
 If `scaleFactor` is passed, this will return the aspect ratio corresponding to the image representation most closely matching the passed value.
 
 #### `image.getScaleFactors()`
 
-Returns `Number[]` - An array of all scale factors corresponding to representations for a given nativeImage.
+Returns `Float[]` - An array of all scale factors corresponding to representations for a given nativeImage.
 
 #### `image.addRepresentation(options)`
 
 * `options` Object
-  * `scaleFactor` Number (optional) - The scale factor to add the image representation for.
+  * `scaleFactor` Double - The scale factor to add the image representation for.
   * `width` Integer (optional) - Defaults to 0. Required if a bitmap buffer
     is specified as `buffer`.
   * `height` Integer (optional) - Defaults to 0. Required if a bitmap buffer

docs/api/parent-port.md

@@ -1,46 +0,0 @@
-# parentPort
-
-> Interface for communication with parent process.
-
-Process: [Utility](../glossary.md#utility-process)
-
-`parentPort` is an [EventEmitter][event-emitter].
-_This object is not exported from the `'electron'` module. It is only available as a property of the process object in the Electron API._
-
-```js
-// Main process
-const child = utilityProcess.fork(path.join(__dirname, 'test.js'))
-child.postMessage({ message: 'hello' })
-child.on('message', (data) => {
-  console.log(data) // hello world!
-})
-
-// Child process
-process.parentPort.on('message', (e) => {
-  process.parentPort.postMessage(`${e.data} world!`)
-})
-```
-
-## Events
-
-The `parentPort` object emits the following events:
-
-### Event: 'message'
-
-Returns:
-
-* `messageEvent` Object
-  * `data` any
-  * `ports` MessagePortMain[]
-
-Emitted when the process receives a message. Messages received on
-this port will be queued up until a handler is registered for this
-event.
-
-## Methods
-
-### `parentPort.postMessage(message)`
-
-* `message` any
-
-Sends a message from the process to its parent.

docs/api/process.md

@@ -113,7 +113,6 @@ A `string` representing the current process's type, can be:
 * `browser` - The main process
 * `renderer` - A renderer process
 * `worker` - In a web worker
-* `utility` - In a node process launched as a service
 
 ### `process.versions.chrome` _Readonly_
 
@@ -135,11 +134,6 @@ Each frame has its own JavaScript context. When contextIsolation is enabled, the
 world also has a separate JavaScript context.
 This property is only available in the renderer process.
 
-### `process.parentPort`
-
-A [`Electron.ParentPort`](parent-port.md) property if this is a [`UtilityProcess`](utility-process.md)
-(or `null` otherwise) allowing communication with the parent process.
-
 ## Methods
 
 The `process` object has the following methods:

docs/api/push-notifications.md

@@ -1,48 +0,0 @@
-# pushNotifications
-
-Process: [Main](../glossary.md#main-process)
-
-> Register for and receive notifications from remote push notification services
-
-For example, when registering for push notifications via Apple push notification services (APNS):
-
-```javascript
-const { pushNotifications, Notification } = require('electron')
-
-pushNotifications.registerForAPNSNotifications().then((token) => {
-  // forward token to your remote notification server
-})
-
-pushNotifications.on('received-apns-notification', (event, userInfo) => {
-  // generate a new Notification object with the relevant userInfo fields
-})
-```
-
-## Events
-
-The `pushNotification` module emits the following events:
-
-#### Event: 'received-apns-notification' _macOS_
-
-Returns:
-
-* `userInfo` Record<String, any>
-
-Emitted when the app receives a remote notification while running.
-See: https://developer.apple.com/documentation/appkit/nsapplicationdelegate/1428430-application?language=objc
-
-## Methods
-
-The `pushNotification` module has the following methods:
-
-### `pushNotifications.registerForAPNSNotifications()` _macOS_
-
-Returns `Promise<string>`
-
-Registers the app with Apple Push Notification service (APNS) to receive [Badge, Sound, and Alert](https://developer.apple.com/documentation/appkit/sremotenotificationtype?language=objc) notifications. If registration is successful, the promise will be resolved with the APNS device token. Otherwise, the promise will be rejected with an error message.
-See: https://developer.apple.com/documentation/appkit/nsapplication/1428476-registerforremotenotificationtyp?language=objc
-
-### `pushNotifications.unregisterForAPNSNotifications()` _macOS_
-
-Unregisters the app from notifications received from APNS.
-See: https://developer.apple.com/documentation/appkit/nsapplication/1428747-unregisterforremotenotifications?language=objc

docs/api/session.md

@@ -385,50 +385,6 @@ callback from `select-serial-port` is called.  This event is intended for use
 when using a UI to ask users to pick a port so that the UI can be updated
 to remove the specified port.
 
-#### Event: 'serial-port-revoked'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `port` [SerialPort](structures/serial-port.md)
-  * `frame` [WebFrameMain](web-frame-main.md)
-  * `origin` string - The origin that the device has been revoked from.
-
-Emitted after `SerialPort.forget()` has been called.  This event can be used
-to help maintain persistent storage of permissions when `setDevicePermissionHandler` is used.
-
-```js
-// Browser Process
-const { app, BrowserWindow } = require('electron')
-
-app.whenReady().then(() => {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600
-  })
-
-  win.webContents.session.on('serial-port-revoked', (event, details) => {
-    console.log(`Access revoked for serial device from origin ${details.origin}`)
-  })
-})
-```
-
-```js
-// Renderer Process
-
-const portConnect = async () => {
-  // Request a port.
-  const port = await navigator.serial.requestPort()
-
-  // Wait for the serial port to open.
-  await port.open({ baudRate: 9600 })
-
-  // ...later, revoke access to the serial port.
-  await port.forget()
-}
-```
-
 ### Instance Methods
 
 The following methods are available on instances of `Session`:
@@ -679,7 +635,7 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
     * `notifications` - Request notification creation and the ability to display them in the user's system tray.
     * `midi` - Request MIDI access in the `webmidi` API.
     * `midiSysex` - Request the use of system exclusive messages in the `webmidi` API.
-    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more. These requests always appear to originate from the main frame.
+    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more.
     * `fullscreen` - Request for the app to enter fullscreen mode.
     * `openExternal` - Request to open links in external applications.
     * `unknown` - An unrecognized permission request
@@ -742,60 +698,6 @@ session.fromPartition('some-partition').setPermissionCheckHandler((webContents,
 })
 ```
 
-#### `ses.setDisplayMediaRequestHandler(handler)`
-
-* `handler` Function | null
-  * `request` Object
-    * `frame` [WebFrameMain](web-frame-main.md) - Frame that is requesting access to media.
-    * `securityOrigin` String - Origin of the page making the request.
-    * `videoRequested` Boolean - true if the web content requested a video stream.
-    * `audioRequested` Boolean - true if the web content requested an audio stream.
-    * `userGesture` Boolean - Whether a user gesture was active when this request was triggered.
-  * `callback` Function
-    * `streams` Object
-      * `video` Object | [WebFrameMain](web-frame-main.md) (optional)
-        * `id` String - The id of the stream being granted. This will usually
-          come from a [DesktopCapturerSource](structures/desktop-capturer-source.md)
-          object.
-        * `name` String - The name of the stream being granted. This will
-          usually come from a [DesktopCapturerSource](structures/desktop-capturer-source.md)
-          object.
-      * `audio` String | [WebFrameMain](web-frame-main.md) (optional) - If
-        a string is specified, can be `loopback` or `loopbackWithMute`.
-        Specifying a loopback device will capture system audio, and is
-        currently only supported on Windows. If a WebFrameMain is specified,
-        will capture audio from that frame.
-
-This handler will be called when web content requests access to display media
-via the `navigator.mediaDevices.getDisplayMedia` API. Use the
-[desktopCapturer](desktop-capturer.md) API to choose which stream(s) to grant
-access to.
-
-```javascript
-const { session, desktopCapturer } = require('electron')
-
-session.defaultSession.setDisplayMediaRequestHandler((request, callback) => {
-  desktopCapturer.getSources({ types: ['screen'] }).then((sources) => {
-    // Grant access to the first screen found.
-    callback({ video: sources[0] })
-  })
-})
-```
-
-Passing a [WebFrameMain](web-frame-main.md) object as a video or audio stream
-will capture the video or audio stream from that frame.
-
-```javascript
-const { session } = require('electron')
-
-session.defaultSession.setDisplayMediaRequestHandler((request, callback) => {
-  // Allow the tab to capture itself.
-  callback({ video: request.frame })
-})
-```
-
-Passing `null` instead of a function resets the handler to its default state.
-
 #### `ses.setDevicePermissionHandler(handler)`
 
 * `handler` Function\<boolean> | null
@@ -867,71 +769,6 @@ app.whenReady().then(() => {
 })
 ```
 
-#### `ses.setBluetoothPairingHandler(handler)` _Windows_ _Linux_
-
-* `handler` Function | null
-  * `details` Object
-    * `deviceId` string
-    * `pairingKind` string - The type of pairing prompt being requested.
-      One of the following values:
-      * `confirm`
-        This prompt is requesting confirmation that the Bluetooth device should
-        be paired.
-      * `confirmPin`
-        This prompt is requesting confirmation that the provided PIN matches the
-        pin displayed on the device.
-      * `providePin`
-        This prompt is requesting that a pin be provided for the device.
-    * `frame` [WebFrameMain](web-frame-main.md)
-    * `pin` string (optional) - The pin value to verify if `pairingKind` is `confirmPin`.
-  * `callback` Function
-    * `response` Object
-      * `confirmed` boolean - `false` should be passed in if the dialog is canceled.
-        If the `pairingKind` is `confirm` or `confirmPin`, this value should indicate
-        if the pairing is confirmed.  If the `pairingKind` is `providePin` the value
-        should be `true` when a value is provided.
-      * `pin` string | null (optional) - When the `pairingKind` is `providePin`
-        this value should be the required pin for the Bluetooth device.
-
-Sets a handler to respond to Bluetooth pairing requests. This handler
-allows developers to handle devices that require additional validation
-before pairing.  When a handler is not defined, any pairing on Linux or Windows
-that requires additional validation will be automatically cancelled.
-macOS does not require a handler because macOS handles the pairing
-automatically.  To clear the handler, call `setBluetoothPairingHandler(null)`.
-
-```javascript
-
-const { app, BrowserWindow, ipcMain, session } = require('electron')
-
-let bluetoothPinCallback = null
-
-function createWindow () {
-  const mainWindow = new BrowserWindow({
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-}
-
-// Listen for an IPC message from the renderer to get the response for the Bluetooth pairing.
-ipcMain.on('bluetooth-pairing-response', (event, response) => {
-  bluetoothPinCallback(response)
-})
-
-mainWindow.webContents.session.setBluetoothPairingHandler((details, callback) => {
-  bluetoothPinCallback = callback
-  // Send a IPC message to the renderer to prompt the user to confirm the pairing.
-  // Note that this will require logic in the renderer to handle this message and
-  // display a prompt to the user.
-  mainWindow.webContents.send('bluetooth-pairing-request', details)
-})
-
-app.whenReady().then(() => {
-  createWindow()
-})
-```
-
 #### `ses.clearHostResolverCache()`
 
 Returns `Promise<void>` - Resolves when the operation is complete.
@@ -1095,7 +932,7 @@ Returns `string[]` - An array of language codes the spellchecker is enabled for.
 will fallback to using `en-US`.  By default on launch if this setting is an empty list Electron will try to populate this
 setting with the current OS locale.  This setting is persisted across restarts.
 
-**Note:** On macOS the OS spellchecker is used and has its own list of languages. On macOS, this API will return whichever languages have been configured by the OS.
+**Note:** On macOS the OS spellchecker is used and has its own list of languages.  This API is a no-op on macOS.
 
 #### `ses.setSpellCheckerDictionaryDownloadURL(url)`
 

docs/api/structures/input-event.md

@@ -1,16 +1,5 @@
 # InputEvent Object
 
-* `type` string - Can be `undefined`, `mouseDown`, `mouseUp`, `mouseMove`,
-  `mouseEnter`, `mouseLeave`, `contextMenu`, `mouseWheel`, `rawKeyDown`,
-  `keyDown`, `keyUp`, `char`, `gestureScrollBegin`, `gestureScrollEnd`,
-  `gestureScrollUpdate`, `gestureFlingStart`, `gestureFlingCancel`,
-  `gesturePinchBegin`, `gesturePinchEnd`, `gesturePinchUpdate`,
-  `gestureTapDown`, `gestureShowPress`, `gestureTap`, `gestureTapCancel`,
-  `gestureShortPress`, `gestureLongPress`, `gestureLongTap`,
-  `gestureTwoFingerTap`, `gestureTapUnconfirmed`, `gestureDoubleTap`,
-  `touchStart`, `touchMove`, `touchEnd`, `touchCancel`, `touchScrollStarted`,
-  `pointerDown`, `pointerUp`, `pointerMove`, `pointerRawUpdate`,
-  `pointerCancel` or `pointerCausedUaAction`.
 * `modifiers` string[] (optional) - An array of modifiers of the event, can
   be `shift`, `control`, `ctrl`, `alt`, `meta`, `command`, `cmd`, `isKeypad`,
   `isAutoRepeat`, `leftButtonDown`, `middleButtonDown`, `rightButtonDown`,

docs/api/structures/keyboard-input-event.md

@@ -1,6 +1,6 @@
 # KeyboardInputEvent Object extends `InputEvent`
 
-* `type` string - The type of the event, can be `rawKeyDown`, `keyDown`, `keyUp` or `char`.
+* `type` string - The type of the event, can be `keyDown`, `keyUp` or `char`.
 * `keyCode` string - The character that will be sent
   as the keyboard event. Should only use the valid key codes in
   [Accelerator](../accelerator.md).

docs/api/structures/new-window-web-contents-event.md

@@ -0,0 +1,3 @@
+# NewWindowWebContentsEvent Object extends `Event`
+
+* `newGuest` BrowserWindow (optional)

docs/api/utility-process.md

@@ -1,137 +0,0 @@
-# utilityProcess
-
-`utilityProcess` creates a child process with
-Node.js and Message ports enabled. It provides the equivalent of [`child_process.fork`][] API from Node.js
-but instead uses [Services API][] from Chromium to launch the child process.
-
-Process: [Main](../glossary.md#main-process)<br />
-
-## Methods
-
-### `utilityProcess.fork(modulePath[, args][, options])`
-
-* `modulePath` string - Path to the script that should run as entrypoint in the child process.
-* `args` string[] (optional) - List of string arguments that will be available as `process.argv`
-  in the child process.
-* `options` Object (optional)
-  * `env` Object (optional) - Environment key-value pairs. Default is `process.env`.
-  * `execArgv` string[] (optional) - List of string arguments passed to the executable.
-  * `cwd` string (optional) - Current working directory of the child process.
-  * `stdio` (string[] | string) (optional) - Allows configuring the mode for `stdout` and `stderr`
-    of the child process. Default is `inherit`.
-    String value can be one of `pipe`, `ignore`, `inherit`, for more details on these values you can refer to
-    [stdio][] documentation from Node.js. Currently this option only supports configuring `stdout` and
-    `stderr` to either `pipe`, `inherit` or `ignore`. Configuring `stdin` is not supported; `stdin` will
-    always be ignored.
-    For example, the supported values will be processed as following:
-    * `pipe`: equivalent to ['ignore', 'pipe', 'pipe'] (the default)
-    * `ignore`: equivalent to 'ignore', 'ignore', 'ignore']
-    * `inherit`: equivalent to ['ignore', 'inherit', 'inherit']
-  * `serviceName` string (optional) - Name of the process that will appear in `name` property of
-    [`child-process-gone` event of `app`](app.md#event-child-process-gone).
-    Default is `node.mojom.NodeService`.
-  * `allowLoadingUnsignedLibraries` boolean (optional) _macOS_ - With this flag, the utility process will be
-    launched via the `Electron Helper (Plugin).app` helper executable on macOS, which can be
-    codesigned with `com.apple.security.cs.disable-library-validation` and
-    `com.apple.security.cs.allow-unsigned-executable-memory` entitlements. This will allow the utility process
-    to load unsigned libraries. Unless you specifically need this capability, it is best to leave this disabled.
-    Default is `false`.
-
-Returns [`UtilityProcess`](utility-process.md#class-utilityprocess)
-
-## Class: UtilityProcess
-
-> Instances of the `UtilityProcess` represent the Chromium spawned child process
-> with Node.js integration.
-
-`UtilityProcess` is an [EventEmitter][event-emitter].
-
-### Instance Methods
-
-#### `child.postMessage(message, [transfer])`
-
-* `message` any
-* `transfer` MessagePortMain[] (optional)
-
-Send a message to the child process, optionally transferring ownership of
-zero or more [`MessagePortMain`][] objects.
-
-For example:
-
-```js
-// Main process
-const { port1, port2 } = new MessageChannelMain()
-const child = utilityProcess.fork(path.join(__dirname, 'test.js'))
-child.postMessage({ message: 'hello' }, [port1])
-
-// Child process
-process.parentPort.once('message', (e) => {
-  const [port] = e.ports
-  // ...
-})
-```
-
-#### `child.kill()`
-
-Returns `boolean`
-
-Terminates the process gracefully. On POSIX, it uses SIGTERM
-but will ensure the process is reaped on exit. This function returns
-true if the kill is successful, and false otherwise.
-
-### Instance Properties
-
-#### `child.pid`
-
-A `Integer | undefined` representing the process identifier (PID) of the child process.
-If the child process fails to spawn due to errors, then the value is `undefined`. When
-the child process exits, then the value is `undefined` after the `exit` event is emitted.
-
-#### `child.stdout`
-
-A `NodeJS.ReadableStream | null` that represents the child process's stdout.
-If the child was spawned with options.stdio[1] set to anything other than 'pipe', then this will be `null`.
-When the child process exits, then the value is `null` after the `exit` event is emitted.
-
-```js
-// Main process
-const { port1, port2 } = new MessageChannelMain()
-const child = utilityProcess.fork(path.join(__dirname, 'test.js'))
-child.stdout.on('data', (data) => {
-  console.log(`Received chunk ${data}`)
-})
-```
-
-#### `child.stderr`
-
-A `NodeJS.ReadableStream | null` that represents the child process's stderr.
-If the child was spawned with options.stdio[2] set to anything other than 'pipe', then this will be `null`.
-When the child process exits, then the value is `null` after the `exit` event is emitted.
-
-### Instance Events
-
-#### Event: 'spawn'
-
-Emitted once the child process has spawned successfully.
-
-#### Event: 'exit'
-
-Returns:
-
-* `code` number - Contains the exit code for
-the process obtained from waitpid on posix, or GetExitCodeProcess on windows.
-
-Emitted after the child process ends.
-
-#### Event: 'message'
-
-Returns:
-
-* `message` any
-
-Emitted when the child process sends a message using [`process.parentPort.postMessage()`](process.md#processparentport).
-
-[`child_process.fork`]: https://nodejs.org/dist/latest-v16.x/docs/api/child_process.html#child_processforkmodulepath-args-options
-[Services API]: https://chromium.googlesource.com/chromium/src/+/master/docs/mojo_and_services.md
-[stdio]: https://nodejs.org/dist/latest/docs/api/child_process.html#optionsstdio
-[event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter

docs/api/web-contents.md

@@ -45,13 +45,6 @@ returns `null`.
 Returns `WebContents` | undefined - A WebContents instance with the given ID, or
 `undefined` if there is no WebContents associated with the given ID.
 
-### `webContents.fromFrame(frame)`
-
-* `frame` WebFrameMain
-
-Returns `WebContents` | undefined - A WebContents instance with the given WebFrameMain, or
-`undefined` if there is no WebContents associated with the given WebFrameMain.
-
 ### `webContents.fromDevToolsTargetId(targetId)`
 
 * `targetId` string - The Chrome DevTools Protocol [TargetID](https://chromedevtools.github.io/devtools-protocol/tot/Target/#type-TargetID) associated with the WebContents instance.
@@ -137,6 +130,10 @@ Corresponds to the points in time when the spinner of the tab stopped spinning.
 
 #### Event: 'dom-ready'
 
+Returns:
+
+* `event` Event
+
 Emitted when the document in the top-level frame is loaded.
 
 #### Event: 'page-title-updated'
@@ -159,17 +156,63 @@ Returns:
 
 Emitted when page receives favicon urls.
 
-#### Event: 'content-bounds-updated'
+#### Event: 'new-window' _Deprecated_
 
 Returns:
 
-* `event` Event
-* `bounds` [Rectangle](structures/rectangle.md) - requested new content bounds
+* `event` NewWindowWebContentsEvent
+* `url` string
+* `frameName` string
+* `disposition` string - Can be `default`, `foreground-tab`, `background-tab`,
+  `new-window`, `save-to-disk` and `other`.
+* `options` BrowserWindowConstructorOptions - The options which will be used for creating the new
+  [`BrowserWindow`](browser-window.md).
+* `additionalFeatures` string[] - The non-standard features (features not handled
+  by Chromium or Electron) given to `window.open()`. Deprecated, and will now
+  always be the empty array `[]`.
+* `referrer` [Referrer](structures/referrer.md) - The referrer that will be
+  passed to the new window. May or may not result in the `Referer` header being
+  sent, depending on the referrer policy.
+* `postBody` [PostBody](structures/post-body.md) (optional) - The post data that
+  will be sent to the new window, along with the appropriate headers that will
+  be set. If no post data is to be sent, the value will be `null`. Only defined
+  when the window is being created by a form that set `target=_blank`.
 
-Emitted when the page calls `window.moveTo`, `window.resizeTo` or related APIs.
+Deprecated in favor of [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
 
-By default, this will move the window. To prevent that behavior, call
-`event.preventDefault()`.
+Emitted when the page requests to open a new window for a `url`. It could be
+requested by `window.open` or an external link like `<a target='_blank'>`.
+
+By default a new `BrowserWindow` will be created for the `url`.
+
+Calling `event.preventDefault()` will prevent Electron from automatically creating a
+new [`BrowserWindow`](browser-window.md). If you call `event.preventDefault()` and manually create a new
+[`BrowserWindow`](browser-window.md) then you must set `event.newGuest` to reference the new [`BrowserWindow`](browser-window.md)
+instance, failing to do so may result in unexpected behavior. For example:
+
+```javascript
+myBrowserWindow.webContents.on('new-window', (event, url, frameName, disposition, options, additionalFeatures, referrer, postBody) => {
+  event.preventDefault()
+  const win = new BrowserWindow({
+    webContents: options.webContents, // use existing webContents if provided
+    show: false
+  })
+  win.once('ready-to-show', () => win.show())
+  if (!options.webContents) {
+    const loadOptions = {
+      httpReferrer: referrer
+    }
+    if (postBody != null) {
+      const { data, contentType, boundary } = postBody
+      loadOptions.postData = postBody.data
+      loadOptions.extraHeaders = `content-type: ${contentType}; boundary=${boundary}`
+    }
+
+    win.loadURL(url, loadOptions) // existing webContents will be navigated automatically
+  }
+  event.newGuest = win
+})
+```
 
 #### Event: 'did-create-window'
 
@@ -411,16 +454,6 @@ Emitted when a plugin process has crashed.
 
 Emitted when `webContents` is destroyed.
 
-#### Event: 'input-event'
-
-Returns:
-
-* `event` Event
-* `inputEvent` [InputEvent](structures/input-event.md)
-
-Emitted when an input event is sent to the WebContents. See
-[InputEvent](structures/input-event.md) for details.
-
 #### Event: 'before-input-event'
 
 Returns:
@@ -829,8 +862,6 @@ Returns:
 
 Emitted when the renderer process sends an asynchronous message via `ipcRenderer.send()`.
 
-See also [`webContents.ipc`](#contentsipc-readonly), which provides an [`IpcMain`](ipc-main.md)-like interface for responding to IPC messages specifically from this WebContents.
-
 #### Event: 'ipc-message-sync'
 
 Returns:
@@ -841,8 +872,6 @@ Returns:
 
 Emitted when the renderer process sends a synchronous message via `ipcRenderer.sendSync()`.
 
-See also [`webContents.ipc`](#contentsipc-readonly), which provides an [`IpcMain`](ipc-main.md)-like interface for responding to IPC messages specifically from this WebContents.
-
 #### Event: 'preferred-size-changed'
 
 Returns:
@@ -951,21 +980,6 @@ Returns `string` - The title of the current web page.
 
 Returns `boolean` - Whether the web page is destroyed.
 
-#### `contents.close([opts])`
-
-* `opts` Object (optional)
-  * `waitForBeforeUnload` boolean - if true, fire the `beforeunload` event
-    before closing the page. If the page prevents the unload, the WebContents
-    will not be closed. The [`will-prevent-unload`](#event-will-prevent-unload)
-    will be fired if the page requests prevention of unload.
-
-Closes the page, as if the web content had called `window.close()`.
-
-If the page is successfully closed (i.e. the unload is not prevented by the
-page, or `waitForBeforeUnload` is false or unspecified), the WebContents will
-be destroyed and no longer usable. The [`destroyed`](#event-destroyed) event
-will be emitted.
-
 #### `contents.focus()`
 
 Focuses the web page.
@@ -1414,7 +1428,7 @@ Returns `Promise<PrinterInfo[]>` - Resolves with a [`PrinterInfo[]`](structures/
   * `header` string (optional) - string to be printed as page header.
   * `footer` string (optional) - string to be printed as page footer.
   * `pageSize` string | Size (optional) - Specify page size of the printed document. Can be `A3`,
-  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` and `width`.
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`.
 * `callback` Function (optional)
   * `success` boolean - Indicates success of the print call.
   * `failureReason` string - Error description called back if the print fails.
@@ -1445,28 +1459,43 @@ win.webContents.print(options, (success, errorType) => {
 #### `contents.printToPDF(options)`
 
 * `options` Object
-  * `landscape` boolean (optional) - Paper orientation.`true` for landscape, `false` for portrait. Defaults to false.
-  * `displayHeaderFooter` boolean (optional) - Whether to display header and footer. Defaults to false.
-  * `printBackground` boolean (optional) - Whether to print background graphics. Defaults to false.
-  * `scale` number(optional)  - Scale of the webpage rendering. Defaults to 1.
-  * `pageSize` string | Size (optional) - Specify page size of the generated PDF. Can be `A0`, `A1`, `A2`, `A3`,
-  `A4`, `A5`, `A6`, `Legal`, `Letter`, `Tabloid`, `Ledger`, or an Object containing `height` and `width` in inches. Defaults to `Letter`.
-  * `margins` Object (optional)
-    * `top` number (optional) - Top margin in inches. Defaults to 1cm (~0.4 inches).
-    * `bottom` number (optional) - Bottom margin in inches. Defaults to 1cm (~0.4 inches).
-    * `left` number (optional) - Left margin in inches. Defaults to 1cm (~0.4 inches).
-    * `right` number (optional) - Right margin in inches. Defaults to 1cm (~0.4 inches).
-  * `pageRanges` string (optional) - Paper ranges to print, e.g., '1-5, 8, 11-13'. Defaults to the empty string, which means print all pages.
-  * `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.
+  * `headerFooter` Record<string, string> (optional) - the header and footer for the PDF.
+    * `title` string - The title for the PDF header.
+    * `url` string - the url for the PDF footer.
+  * `landscape` boolean (optional) - `true` for landscape, `false` for portrait.
+  * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
+    default margin, 1 for no margin, and 2 for minimum margin.
+  * `scaleFactor` number (optional) - The scale factor of the web page. Can range from 0 to 100.
+  * `pageRanges` Record<string, number> (optional) - The page range to print.
+    * `from` number - Index of the first page to print (0-based).
+    * `to` number - Index of the last page to print (inclusive) (0-based).
+  * `pageSize` string | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` and `width` in microns.
+  * `printBackground` boolean (optional) - Whether to print CSS backgrounds.
+  * `printSelectionOnly` boolean (optional) - Whether to print selection only.
 
 Returns `Promise<Buffer>` - Resolves with the generated PDF data.
 
-Prints the window's web page as PDF.
+Prints window's web page as PDF with Chromium's preview printing custom
+settings.
 
 The `landscape` will be ignored if `@page` CSS at-rule is used in the web page.
 
+By default, an empty `options` will be regarded as:
+
+```javascript
+{
+  marginsType: 0,
+  printBackground: false,
+  printSelectionOnly: false,
+  landscape: false,
+  pageSize: 'A4',
+  scaleFactor: 100
+}
+```
+
+Use `page-break-before: always;` CSS style to force to print to a new page.
+
 An example of `webContents.printToPDF`:
 
 ```javascript
@@ -1475,7 +1504,7 @@ const fs = require('fs')
 const path = require('path')
 const os = require('os')
 
-const win = new BrowserWindow()
+const win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('http://github.com')
 
 win.webContents.on('did-finish-load', () => {
@@ -1492,8 +1521,6 @@ win.webContents.on('did-finish-load', () => {
 })
 ```
 
-See [Page.printToPdf](https://chromedevtools.github.io/devtools-protocol/tot/Page/#method-printToPDF) for more information.
-
 #### `contents.addWorkSpace(path)`
 
 * `path` string
@@ -1973,35 +2000,6 @@ This corresponds to the [animationPolicy][] accessibility feature in Chromium.
 
 ### Instance Properties
 
-#### `contents.ipc` _Readonly_
-
-An [`IpcMain`](ipc-main.md) scoped to just IPC messages sent from this
-WebContents.
-
-IPC messages sent with `ipcRenderer.send`, `ipcRenderer.sendSync` or
-`ipcRenderer.postMessage` will be delivered in the following order:
-
-1. `contents.on('ipc-message')`
-2. `contents.mainFrame.on(channel)`
-3. `contents.ipc.on(channel)`
-4. `ipcMain.on(channel)`
-
-Handlers registered with `invoke` will be checked in the following order. The
-first one that is defined will be called, the rest will be ignored.
-
-1. `contents.mainFrame.handle(channel)`
-2. `contents.handle(channel)`
-3. `ipcMain.handle(channel)`
-
-A handler or event listener registered on the WebContents will receive IPC
-messages sent from any frame, including child frames. In most cases, only the
-main frame can send IPC messages. However, if the `nodeIntegrationInSubFrames`
-option is enabled, it is possible for child frames to send IPC messages also.
-In that case, handlers should check the `senderFrame` property of the IPC event
-to ensure that the message is coming from the expected frame. Alternatively,
-register handlers on the appropriate frame directly using the
-[`WebFrameMain.ipc`](web-frame-main.md#frameipc-readonly) interface.
-
 #### `contents.audioMuted`
 
 A `boolean` property that determines whether this page is muted.
@@ -2061,11 +2059,6 @@ when the page becomes backgrounded. This also affects the Page Visibility API.
 
 A [`WebFrameMain`](web-frame-main.md) property that represents the top frame of the page's frame hierarchy.
 
-#### `contents.opener` _Readonly_
-
-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.
-
 [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-frame-main.md

@@ -140,31 +140,6 @@ ipcRenderer.on('port', (e, msg) => {
 
 ### Instance Properties
 
-#### `frame.ipc` _Readonly_
-
-An [`IpcMain`](ipc-main.md) instance scoped to the frame.
-
-IPC messages sent with `ipcRenderer.send`, `ipcRenderer.sendSync` or
-`ipcRenderer.postMessage` will be delivered in the following order:
-
-1. `contents.on('ipc-message')`
-2. `contents.mainFrame.on(channel)`
-3. `contents.ipc.on(channel)`
-4. `ipcMain.on(channel)`
-
-Handlers registered with `invoke` will be checked in the following order. The
-first one that is defined will be called, the rest will be ignored.
-
-1. `contents.mainFrame.handle(channel)`
-2. `contents.handle(channel)`
-3. `ipcMain.handle(channel)`
-
-In most cases, only the main frame of a WebContents can send or receive IPC
-messages. However, if the `nodeIntegrationInSubFrames` option is enabled, it is
-possible for child frames to send and receive IPC messages also. The
-[`WebContents.ipc`](web-contents.md#contentsipc-readonly) interface may be more
-convenient when `nodeIntegrationInSubFrames` is not enabled.
-
 #### `frame.url` _Readonly_
 
 A `string` representing the current URL of the frame.

docs/api/web-request.md

@@ -28,7 +28,7 @@ const { session } = require('electron')
 
 // Modify the user agent for all requests to the following urls.
 const filter = {
-  urls: ['https://*.github.com/*', '*://electron.github.io/*']
+  urls: ['https://*.github.com/*', '*://electron.github.io']
 }
 
 session.defaultSession.webRequest.onBeforeSendHeaders(filter, (details, callback) => {

docs/api/webview-tag.md

@@ -565,21 +565,21 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
 ### `<webview>.printToPDF(options)`
 
 * `options` Object
-  * `landscape` boolean (optional) - Paper orientation.`true` for landscape, `false` for portrait. Defaults to false.
-  * `displayHeaderFooter` boolean (optional) - Whether to display header and footer. Defaults to false.
-  * `printBackground` boolean (optional) - Whether to print background graphics. Defaults to false.
-  * `scale` number(optional)  - Scale of the webpage rendering. Defaults to 1.
-  * `pageSize` string | Size (optional) - Specify page size of the generated PDF. Can be `A0`, `A1`, `A2`, `A3`,
-  `A4`, `A5`, `A6`, `Legal`, `Letter`, `Tabloid`, `Ledger`, or an Object containing `height` and `width` in inches. Defaults to `Letter`.
-  * `margins` Object (optional)
-    * `top` number (optional) - Top margin in inches. Defaults to 1cm (~0.4 inches).
-    * `bottom` number (optional) - Bottom margin in inches. Defaults to 1cm (~0.4 inches).
-    * `left` number (optional) - Left margin in inches. Defaults to 1cm (~0.4 inches).
-    * `right` number (optional) - Right margin in inches. Defaults to 1cm (~0.4 inches).
-  * `pageRanges` string (optional) - Paper ranges to print, e.g., '1-5, 8, 11-13'. Defaults to the empty string, which means print all pages.
-  * `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.
+  * `headerFooter` Record<string, string> (optional) - the header and footer for the PDF.
+    * `title` string - The title for the PDF header.
+    * `url` string - the url for the PDF footer.
+  * `landscape` boolean (optional) - `true` for landscape, `false` for portrait.
+  * `marginsType` Integer (optional) - Specifies the type of margins to use. Uses 0 for
+    default margin, 1 for no margin, and 2 for minimum margin.
+    and `width` in microns.
+  * `scaleFactor` number (optional) - The scale factor of the web page. Can range from 0 to 100.
+  * `pageRanges` Record<string, number> (optional) - The page range to print. On macOS, only the first range is honored.
+    * `from` number - Index of the first page to print (0-based).
+    * `to` number - Index of the last page to print (inclusive) (0-based).
+  * `pageSize` string | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
+  * `printBackground` boolean (optional) - Whether to print CSS backgrounds.
+  * `printSelectionOnly` boolean (optional) - Whether to print selection only.
 
 Returns `Promise<Uint8Array>` - Resolves with the generated PDF data.
 
@@ -805,6 +805,33 @@ const requestId = webview.findInPage('test')
 console.log(requestId)
 ```
 
+### Event: 'new-window'
+
+Returns:
+
+* `url` string
+* `frameName` string
+* `disposition` string - Can be `default`, `foreground-tab`, `background-tab`,
+  `new-window`, `save-to-disk` and `other`.
+* `options` BrowserWindowConstructorOptions - The options which should be used for creating the new
+  [`BrowserWindow`](browser-window.md).
+
+Fired when the guest page attempts to open a new browser window.
+
+The following example code opens the new url in system's default browser.
+
+```javascript
+const { shell } = require('electron')
+const webview = document.querySelector('webview')
+
+webview.addEventListener('new-window', async (e) => {
+  const protocol = (new URL(e.url)).protocol
+  if (protocol === 'http:' || protocol === 'https:') {
+    await shell.openExternal(e.url)
+  }
+})
+```
+
 ### Event: 'will-navigate'
 
 Returns:

docs/breaking-changes.md

@@ -12,138 +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 (23.0)
-
-### Removed: BrowserWindow `scroll-touch-*` events
-
-The deprecated `scroll-touch-begin`, `scroll-touch-end` and `scroll-touch-edge`
-events on BrowserWindow have been removed. Instead, use the newly available
-[`input-event` event](api/web-contents.md#event-input-event) on WebContents.
-
-```js
-// Removed in Electron 23.0
-win.on('scroll-touch-begin', scrollTouchBegin)
-win.on('scroll-touch-edge', scrollTouchEdge)
-win.on('scroll-touch-end', scrollTouchEnd)
-
-// Replace with
-win.webContents.on('input-event', (_, event) => {
-  if (event.type === 'gestureScrollBegin') {
-    scrollTouchBegin()
-  } else if (event.type === 'gestureScrollUpdate') {
-    scrollTouchEdge()
-  } else if (event.type === 'gestureScrollEnd') {
-    scrollTouchEnd()
-  }
-})
-```
-
-## Planned Breaking API Changes (22.0)
-
-### Removed: WebContents `new-window` event
-
-The `new-window` event of WebContents has been removed. It is replaced by [`webContents.setWindowOpenHandler()`](api/web-contents.md#contentssetwindowopenhandlerhandler).
-
-```js
-// Removed in Electron 21
-webContents.on('new-window', (event) => {
-  event.preventDefault()
-})
-
-// Replace with
-webContents.setWindowOpenHandler((details) => {
-  return { action: 'deny' }
-})
-```
-
-### Deprecated: BrowserWindow `scroll-touch-*` events
-
-The `scroll-touch-begin`, `scroll-touch-end` and `scroll-touch-edge` events on
-BrowserWindow are deprecated. Instead, use the newly available [`input-event`
-event](api/web-contents.md#event-input-event) on WebContents.
-
-```js
-// Deprecated
-win.on('scroll-touch-begin', scrollTouchBegin)
-win.on('scroll-touch-edge', scrollTouchEdge)
-win.on('scroll-touch-end', scrollTouchEnd)
-
-// Replace with
-win.webContents.on('input-event', (_, event) => {
-  if (event.type === 'gestureScrollBegin') {
-    scrollTouchBegin()
-  } else if (event.type === 'gestureScrollUpdate') {
-    scrollTouchEdge()
-  } else if (event.type === 'gestureScrollEnd') {
-    scrollTouchEnd()
-  }
-})
-```
-
-## Planned Breaking API Changes (21.0)
-
-### Behavior Changed: V8 Memory Cage enabled
-
-The V8 memory cage has been enabled, which has implications for native modules
-which wrap non-V8 memory with `ArrayBuffer` or `Buffer`. See the [blog post
-about the V8 memory cage](https://www.electronjs.org/blog/v8-memory-cage) for
-more details.
-
-### API Changed: `webContents.printToPDF()`
-
-`webContents.printToPDF()` has been modified to conform to [`Page.printToPDF`](https://chromedevtools.github.io/devtools-protocol/tot/Page/#method-printToPDF) in the Chrome DevTools Protocol. This has been changes in order to
-address changes upstream that made our previous implementation untenable and rife with bugs.
-
-**Arguments Changed**
-
-* `pageRanges`
-
-**Arguments Removed**
-
-* `printSelectionOnly`
-* `marginsType`
-* `headerFooter`
-* `scaleFactor`
-
-**Arguments Added**
-
-* `headerTemplate`
-* `footerTemplate`
-* `displayHeaderFooter`
-* `margins`
-* `scale`
-* `preferCSSPageSize`
-
-```js
-// Main process
-const { webContents } = require('electron')
-
-webContents.printToPDF({
-  landscape: true,
-  displayHeaderFooter: true,
-  printBackground: true,
-  scale: 2,
-  pageSize: 'Ledger',
-  margins: {
-    top: 2,
-    bottom: 2,
-    left: 2,
-    right: 2
-  },
-  pageRanges: '1-5, 8, 11-13',
-  headerTemplate: '<h1>Title</h1>',
-  footerTemplate: '<div><span class="pageNumber"></span></div>',
-  preferCSSPageSize: true
-}).then(data => {
-  fs.writeFile(pdfPath, data, (error) => {
-    if (error) throw error
-    console.log(`Wrote PDF successfully to ${pdfPath}`)
-  })
-}).catch(error => {
-  console.log(`Failed to write PDF to ${pdfPath}: `, error)
-})
-```
-
 ## Planned Breaking API Changes (20.0)
 
 ### Default Changed: renderers without `nodeIntegration: true` are sandboxed by default

docs/development/README.md

@@ -54,7 +54,7 @@ See [issues](issues.md) for more information.
 Most pull requests opened against the `electron/electron` repository include
 changes to either the C/C++ code in the `shell/` folder,
 the TypeScript code in the `lib/` folder, the documentation in `docs/`,
-or tests in the `spec/` folder.
+or tests in the `spec/` and `spec-main/` folders.
 
 See [pull requests](pull-requests.md) for more information.
 
@@ -64,7 +64,7 @@ If you want to add a new API module to Electron, you'll want to look in [creatin
 
 Electron has a fully-fledged governance system that oversees activity in Electron and whose working groups are responsible for areas like APIs, releases, and upgrades to Electron's dependencies including Chromium and Node.js. Depending on how frequently and to what end you want to contribute, you may want to consider joining a working group.
 
-Details about each group and their responsibilities can be found in the [governance repo](https://github.com/electron/governance).
+Details about each group and their reponsibilities can be found in the [governance repo](https://github.com/electron/governance).
 
 ## Patches in Electron
 

docs/development/build-instructions-gn.md

@@ -281,22 +281,9 @@ $ cd electron
 $ gclient sync -f
 ```
 
-This may also happen if you have checked out a branch (as opposed to having a detached head) in `electron/src/`
-or some other dependency’s repository. If that is the case, a `git checkout --detach HEAD` in the appropriate repository should do the trick.
-
 ### I'm being asked for a username/password for chromium-internal.googlesource.com
 
 If you see a prompt for `Username for 'https://chrome-internal.googlesource.com':` when running `gclient sync` on Windows, it's probably because the `DEPOT_TOOLS_WIN_TOOLCHAIN` environment variable is not set to 0. Open `Control Panel` → `System and Security` → `System` → `Advanced system settings` and add a system variable
 `DEPOT_TOOLS_WIN_TOOLCHAIN` with value `0`.  This tells `depot_tools` to use
 your locally installed version of Visual Studio (by default, `depot_tools` will
 try to download a Google-internal version that only Googlers have access to).
-
-### `e` Module not found
-
-If `e` is not recognized despite running `npm i -g @electron/build-tools`, ie:
-
-```sh
-Error: Cannot find module '/Users/<user>/.electron_build_tools/src/e'
-```
-
-We recommend installing Node through [nvm](https://github.com/nvm-sh/nvm). This allows for easier Node version management, and is often a fix for missing `e` modules.

docs/development/build-instructions-linux.md

@@ -47,10 +47,10 @@ $ sudo yum install clang dbus-devel gtk3-devel libnotify-devel \
 On Fedora, install the following libraries:
 
 ```sh
-$ sudo dnf install clang dbus-devel gperf gtk3-devel \
-                   libnotify-devel libgnome-keyring-devel libcap-devel \
+$ sudo dnf install clang dbus-devel gtk3-devel libnotify-devel \
+                   libgnome-keyring-devel xorg-x11-server-utils libcap-devel \
                    cups-devel libXtst-devel alsa-lib-devel libXrandr-devel \
-                   nss-devel python-dbusmock
+                   nss-devel python-dbusmock openjdk-8-jre
 ```
 
 On Arch Linux / Manjaro, install the following libraries:

docs/development/build-instructions-macos.md

@@ -13,46 +13,6 @@ Follow the guidelines below for building **Electron itself** on macOS, for the p
 * [node.js](https://nodejs.org) (external)
 * Python >= 3.7
 
-### Arm64-specific prerequisites
-
-* Rosetta 2
-  * We recommend installing Rosetta if using dependencies that need to cross-compile on x64 and arm64 machines. Rosetta can be installed by using the softwareupdate command line tool.
-  * `$ softwareupdate --install-rosetta`
-
 ## Building Electron
 
 See [Build Instructions: GN](build-instructions-gn.md).
-
-## Troubleshooting
-
-### Xcode "incompatible architecture" errors (MacOS arm64-specific)
-
-If both Xcode and Xcode command line tools are installed (`$ xcode -select --install`, or directly download the correct version [here](https://developer.apple.com/download/all/?q=command%20line%20tools)), but the stack trace says otherwise like so:
-
-```sh
-xcrun: error: unable to load libxcrun
-(dlopen(/Users/<user>/.electron_build_tools/third_party/Xcode/Xcode.app/Contents/Developer/usr/lib/libxcrun.dylib (http://xcode.app/Contents/Developer/usr/lib/libxcrun.dylib), 0x0005):
- tried: '/Users/<user>/.electron_build_tools/third_party/Xcode/Xcode.app/Contents/Developer/usr/lib/libxcrun.dylib (http://xcode.app/Contents/Developer/usr/lib/libxcrun.dylib)'
- (mach-o file, but is an incompatible architecture (have (x86_64), need (arm64e))), '/Users/<user>/.electron_build_tools/third_party/Xcode/Xcode-11.1.0.app/Contents/Developer/usr/lib/libxcrun.dylib (http://xcode-11.1.0.app/Contents/Developer/usr/lib/libxcrun.dylib)' (mach-o file, but is an incompatible architecture (have (x86_64), need (arm64e)))).`
-```
-
-If you are on arm64 architecture, the build script may be pointing to the wrong Xcode version (11.x.y doesn't support arm64). Navigate to `/Users/<user>/.electron_build_tools/third_party/Xcode/` and rename `Xcode-13.3.0.app` to `Xcode.app` to ensure the right Xcode version is used.
-
-### Certificates fail to verify
-
-installing [`certifi`](https://pypi.org/project/certifi/) will fix the following error:
-
-```sh
-________ running 'python3 src/tools/clang/scripts/update.py' in '/Users/<user>/electron'
-Downloading https://commondatastorage.googleapis.com/chromium-browser-clang/Mac_arm64/clang-llvmorg-15-init-15652-g89a99ec9-1.tgz
-<urlopen error [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:997)>
-Retrying in 5 s ...
-Downloading https://commondatastorage.googleapis.com/chromium-browser-clang/Mac_arm64/clang-llvmorg-15-init-15652-g89a99ec9-1.tgz
-<urlopen error [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:997)>
-Retrying in 10 s ...
-Downloading https://commondatastorage.googleapis.com/chromium-browser-clang/Mac_arm64/clang-llvmorg-15-init-15652-g89a99ec9-1.tgz
-<urlopen error [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: unable to get local issuer certificate (_ssl.c:997)>
-Retrying in 20 s ...
-```
-
-This issue has to do with Python 3.6 using its [own](https://github.com/python/cpython/blob/560ea272b01acaa6c531cc7d94331b2ef0854be6/Mac/BuildScript/resources/ReadMe.rtf#L35) copy of OpenSSL in lieu of the deprecated Apple-supplied OpenSSL libraries. `certifi` adds a curated bundle of default root certificates. This issue is documented in the Electron repo [here](https://github.com/electron/build-tools/issues/55). Further information about this issue can be found [here](https://stackoverflow.com/questions/27835619/urllib-and-ssl-certificate-verify-failed-error) and [here](https://stackoverflow.com/questions/40684543/how-to-make-python-use-ca-certificates-from-mac-os-truststore).

docs/development/debugging.md

@@ -9,7 +9,7 @@ Some of the more common approaches are outlined below.
 
 Chromium contains logging macros which can aid debugging by printing information to console in C++ and Objective-C++.
 
-You might use this to print out variable values, function names, and line numbers, amongst other things.
+You might use this to print out variable values, function names, and line numbers, amonst other things.
 
 Some examples:
 
@@ -25,7 +25,7 @@ See [logging.h](https://chromium.googlesource.com/chromium/src/base/+/refs/heads
 
 ## Printing Stacktraces
 
-Chromium contains a helper to print stack traces to console without interrupting the program.
+Chromium contains a helper to print stack traces to console without interrrupting the program.
 
 ```cpp
 #include "base/debug/stack_trace.h"

docs/development/source-code-directory-structure.md

@@ -72,7 +72,8 @@ Electron
 |       |         message loop into Chromium's message loop.
 |       └── api/ - The implementation of common APIs, and foundations of
 |                  Electron's built-in modules.
-├── spec/ - Components of Electron's test suite run in the main process.
+├── spec/ - Components of Electron's test suite run in the renderer process.
+├── spec-main/ - Components of Electron's test suite run in the main process.
 └── BUILD.gn - Building rules of Electron.
 ```
 

docs/development/testing.md

@@ -32,6 +32,9 @@ app (surprise!) that can be found in the `spec` folder. Note that it has
 its own `package.json` and that its dependencies are therefore not defined
 in the top-level `package.json`.
 
+To run only tests in a specific process, run `npm run test --runners=PROCESS`
+where `PROCESS` is one of `main` or `remote`.
+
 To run only specific tests matching a pattern, run `npm run test --
 -g=PATTERN`, replacing the `PATTERN` with a regex that matches the tests
 you would like to run. As an example: If you want to run only IPC tests, you

docs/experimental.md

@@ -20,4 +20,4 @@ happen at an API WG meeting.  Things to consider when discussing / nominating:
 * During that time no major bugs / issues should have been caused by the adoption of this feature
 * The API is stable enough and hasn't been heavily impacted by Chromium upgrades
 * Is anyone using the API?
-* Is the API fulfilling the original proposed use cases, does it have any gaps?
+* Is the API fulfilling the original proposed usecases, does it have any gaps?

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

@@ -1,13 +1,10 @@
-const {app, BrowserWindow, ipcMain} = require('electron')
+const {app, BrowserWindow} = require('electron')
 const path = require('path')
 
 function createWindow () {
   const mainWindow = new BrowserWindow({
     width: 800,
-    height: 600,
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }    
+    height: 600
   })
 
   mainWindow.webContents.on('select-bluetooth-device', (event, deviceList, callback) => {
@@ -17,18 +14,6 @@ function createWindow () {
     } 
   })
 
-  // Listen for a message from the renderer to get the response for the Bluetooth pairing.
-  ipcMain.on('bluetooth-pairing-response', (event, response) => {
-    bluetoothPinCallback(response)
-  })
-
-  mainWindow.webContents.session.setBluetoothPairingHandler((details, callback) => {
-
-    bluetoothPinCallback = callback
-    // Send a message to the renderer to prompt the user to confirm the pairing.
-    mainWindow.webContents.send('bluetooth-pairing-request', details)
-  })  
-
   mainWindow.loadFile('index.html')
 }
 

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

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

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

@@ -5,30 +5,4 @@ async function testIt() {
   document.getElementById('device-name').innerHTML = device.name || `ID: ${device.id}`
 }
 
-document.getElementById('clickme').addEventListener('click',testIt)
-
-window.electronAPI.bluetoothPairingRequest((event, details) => {
-  const response = {}
-  
-  switch (details.pairingKind) {
-    case 'confirm': {
-      response.confirmed = confirm(`Do you want to connect to device ${details.deviceId}?`)
-      break
-    }
-    case 'confirmPin': {
-      response.confirmed = confirm(`Does the pin ${details.pin} match the pin displayed on device ${details.deviceId}?`)
-      break
-    }
-    case 'providePin': {
-      const pin = prompt(`Please provide a pin for ${details.deviceId}.`)
-      if (pin) {
-        response.pin = pin
-        response.confirmed = true
-      } else {
-        response.confirmed = false
-      }
-    }
-  }
-
-  window.electronAPI.bluetoothPairingResponse(response)
-})
+document.getElementById('clickme').addEventListener('click',testIt)

docs/glossary.md

@@ -194,15 +194,6 @@ overly prescriptive about how it should be used. Userland enables users to
 create and share tools that provide additional functionality on top of what is
 available in "core".
 
-### utility process
-
-The utility process is a child of the main process that allows running any
-untrusted services that cannot be run in the main process. Chromium uses this
-process to perform network I/O, audio/video processing, device inputs etc.
-In Electron, you can create this process using [UtilityProcess][] API.
-
-See also: [process](#process), [main process](#main-process)
-
 ### V8
 
 V8 is Google's open source JavaScript engine. It is written in C++ and is
@@ -240,5 +231,4 @@ embedded content.
 [renderer]: #renderer-process
 [userland]: #userland
 [using native node modules]: tutorial/using-native-node-modules.md
-[UtilityProcess]: api/utility-process.md
 [v8]: #v8

docs/tutorial/accessibility.md

@@ -44,4 +44,6 @@ CFStringRef kAXManualAccessibility = CFSTR("AXManualAccessibility");
 ```
 
 [a11y-docs]: https://www.chromium.org/developers/design-documents/accessibility#TOC-How-Chrome-detects-the-presence-of-Assistive-Technology
+[a11y-devtools]: https://github.com/GoogleChrome/accessibility-developer-tools
+[a11y-devtools-wiki]: https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules
 [setAccessibilitySupportEnabled]: ../api/app.md#appsetaccessibilitysupportenabledenabled-macos-windows

docs/tutorial/automated-testing.md

@@ -22,7 +22,7 @@ There are a few ways that you can set up testing using WebDriver.
 Node.js package for testing with WebDriver. Its ecosystem also includes various plugins
 (e.g. reporter and services) that can help you put together your test setup.
 
-#### Install the test runner
+#### Install the testrunner
 
 First you need to run the WebdriverIO starter toolkit in your project root directory:
 

docs/tutorial/code-signing.md

@@ -52,17 +52,15 @@ ways to get your application signed and notarized.
 If you're using Electron's favorite build tool, getting your application signed
 and notarized requires a few additions to your configuration. [Forge](https://electronforge.io) is a
 collection of the official Electron tools, using [`electron-packager`],
-[`@electron/osx-sign`], and [`@electron/notarize`] under the hood.
+[`electron-osx-sign`], and [`electron-notarize`] under the hood.
 
-Detailed instructions on how to configure your application can be found in the
-[Signing macOS Apps](https://www.electronforge.io/guides/code-signing/code-signing-macos) guide in
-the Electron Forge docs.
+Detailed instructions on how to configure your application can be found in the [Electron Forge Code Signing Tutorial](https://www.electronforge.io/guides/code-signing/code-signing-macos).
 
 ### Using Electron Packager
 
 If you're not using an integrated build pipeline like Forge, you
-are likely using [`electron-packager`], which includes [`@electron/osx-sign`] and
-[`@electron/notarize`].
+are likely using [`electron-packager`], which includes [`electron-osx-sign`] and
+[`electron-notarize`].
 
 If you're using Packager's API, you can pass [in configuration that both signs
 and notarizes your application](https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html).
@@ -72,7 +70,13 @@ const packager = require('electron-packager')
 
 packager({
   dir: '/path/to/my/app',
-  osxSign: {},
+  osxSign: {
+    identity: 'Developer ID Application: Felix Rieseberg (LT94ZKYDCJ)',
+    'hardened-runtime': true,
+    entitlements: 'entitlements.plist',
+    'entitlements-inherit': 'entitlements.plist',
+    'signature-flags': 'library'
+  },
   osxNotarize: {
     appleId: 'felix@felix.fun',
     appleIdPassword: 'my-apple-id-password'
@@ -80,6 +84,26 @@ packager({
 })
 ```
 
+The `entitlements.plist` file referenced here needs the following macOS-specific entitlements
+to assure the Apple security mechanisms that your app is doing these things
+without meaning any harm:
+
+```xml title="entitlements.plist"
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.debugger</key>
+    <true/>
+  </dict>
+</plist>
+```
+
+Up until Electron 12, the `com.apple.security.cs.allow-unsigned-executable-memory` entitlement was required
+as well. However, it should not be used anymore if it can be avoided.
+
 ### Signing Mac App Store applications
 
 See the [Mac App Store Guide].
@@ -189,14 +213,15 @@ can find [its documentation here](https://www.electron.build/code-signing).
 See the [Windows Store Guide].
 
 [apple developer program]: https://developer.apple.com/programs/
-[`electron-forge`]: https://github.com/electron/forge
-[`@electron/osx-sign`]: https://github.com/electron/osx-sign
+[`electron-builder`]: https://github.com/electron-userland/electron-builder
+[`electron-forge`]: https://github.com/electron-userland/electron-forge
+[`electron-osx-sign`]: https://github.com/electron-userland/electron-osx-sign
 [`electron-packager`]: https://github.com/electron/electron-packager
-[`@electron/notarize`]: https://github.com/electron/notarize
+[`electron-notarize`]: https://github.com/electron/electron-notarize
 [`electron-winstaller`]: https://github.com/electron/windows-installer
-[`electron-wix-msi`]: https://github.com/electron-userland/electron-wix-msi
+[`electron-wix-msi`]: https://github.com/felixrieseberg/electron-wix-msi
 [xcode]: https://developer.apple.com/xcode
-[signing certificates]: https://developer.apple.com/support/certificates/
+[signing certificates]: https://github.com/electron/electron-osx-sign/wiki/1.-Getting-Started#certificates
 [mac app store guide]: ./mac-app-store-submission-guide.md
 [windows store guide]: ./windows-store-guide.md
 [maker-squirrel]: https://www.electronforge.io/config/makers/squirrel.windows

docs/tutorial/devices.md

@@ -16,10 +16,6 @@ with bluetooth devices. In order to use this API in Electron, developers will
 need to handle the [`select-bluetooth-device` event on the webContents](../api/web-contents.md#event-select-bluetooth-device)
 associated with the device request.
 
-Additionally, [`ses.setBluetoothPairingHandler(handler)`](../api/session.md#sessetbluetoothpairinghandlerhandler-windows-linux)
-can be used to handle pairing to bluetooth devices on Windows or Linux when
-additional validation such as a pin is needed.
-
 ### Example
 
 This example demonstrates an Electron application that automatically selects
@@ -47,7 +43,7 @@ the WebHID API:
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
   can be used to provide default permissioning to devices without first calling
   for permission to devices via `navigator.hid.requestDevice`.  Additionally,
-  the default behavior of Electron is to store granted device permission through
+  the default behavior of Electron is to store granted device permision through
   the lifetime of the corresponding WebContents.  If longer term storage is
   needed, a developer can store granted device permissions (eg when handling
   the `select-hid-device` event) and then read from that storage with
@@ -96,7 +92,7 @@ There are several additional APIs for working with the Web Serial API:
 * [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
   can be used to provide default permissioning to devices without first calling
   for permission to devices via `navigator.serial.requestPort`.  Additionally,
-  the default behavior of Electron is to store granted device permission through
+  the default behavior of Electron is to store granted device permision through
   the lifetime of the corresponding WebContents.  If longer term storage is
   needed, a developer can store granted device permissions (eg when handling
   the `select-serial-port` event) and then read from that storage with

docs/tutorial/electron-timelines.md

@@ -7,29 +7,28 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 
 ## Timeline
 
-| Electron | Alpha | Beta | Stable | EOL | Chrome | Node | Supported |
-| ------- | ----- | ------- | ------ | ------ | ---- | ---- | ---- |
-| 22.0.0 | 2022-Sep-29 | 2022-Oct-25 | 2022-Nov-29 | TBD | M108 | TBD | ✅ |
-| 21.0.0 | 2022-Aug-04 | 2022-Aug-30 | 2022-Sep-27 | TBD | M106 | v16.17 | ✅ |
-| 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | TBD | M104 | v16.15 | ✅ |
-| 19.0.0 | 2022-Mar-31 | 2022-Apr-26 | 2022-May-24 | TBD | M102 | v16.14 | ✅ |
-| 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | 2022-Sep-27 | M100 | v16.13 | 🚫 |
-| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | 2022-Aug-02 | M98 | v16.13 | 🚫 |
-| 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | 2022-May-24 | M96 | v16.9 | 🚫 |
-| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | 2022-May-24 | M94 | v16.5 | 🚫 |
-| 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | 2022-Mar-29 | M93 | v14.17 | 🚫 |
-| 13.0.0 | -- | 2021-Mar-04 | 2021-May-25 | 2022-Feb-01 | M91 | v14.16 | 🚫 |
-| 12.0.0 | -- | 2020-Nov-19 | 2021-Mar-02 | 2021-Nov-16 | M89 | v14.16 | 🚫 |
-| 11.0.0 | -- | 2020-Aug-27 | 2020-Nov-17 | 2021-Aug-31 | M87 | v12.18 | 🚫 |
-| 10.0.0 | -- | 2020-May-21 | 2020-Aug-25 | 2021-May-25 | M85 | v12.16 | 🚫 |
-| 9.0.0 | -- | 2020-Feb-06 | 2020-May-19 | 2021-Mar-02 | M83 | v12.14 | 🚫 |
-| 8.0.0 | -- | 2019-Oct-24 | 2020-Feb-04 | 2020-Nov-17 | M80 | v12.13 | 🚫 |
-| 7.0.0 | -- | 2019-Aug-01 | 2019-Oct-22 | 2020-Aug-25 | M78 | v12.8 | 🚫 |
-| 6.0.0 | -- | 2019-Apr-25 | 2019-Jul-30 | 2020-May-19 | M76 | v12.14.0 | 🚫 |
-| 5.0.0 | -- | 2019-Jan-22 | 2019-Apr-23 | 2020-Feb-04 | M73 | v12.0 | 🚫 |
-| 4.0.0 | -- | 2018-Oct-11 | 2018-Dec-20 | 2019-Oct-22 | M69 | v10.11 | 🚫 |
-| 3.0.0 | -- | 2018-Jun-21 | 2018-Sep-18 | 2019-Jul-30 | M66 | v10.2 | 🚫 |
-| 2.0.0 | -- | 2018-Feb-21 | 2018-May-01 | 2019-Apr-23 | M61 | v8.9 | 🚫 |
+| Electron | Alpha | Beta | Stable | Chrome | Node | Supported |
+| ------- | ----- | ------- | ------ | ------ | ---- | ---- |
+| 2.0.0 | -- | 2018-Feb-21 | 2018-May-01 | M61 | v8.9 | 🚫 |
+| 3.0.0 | -- | 2018-Jun-21 | 2018-Sep-18 | M66 | v10.2 | 🚫 |
+| 4.0.0 | -- | 2018-Oct-11 | 2018-Dec-20 | M69 | v10.11 | 🚫 |
+| 5.0.0 | -- | 2019-Jan-22 | 2019-Apr-24 | M73 | v12.0 | 🚫 |
+| 6.0.0 | -- | 2019-May-01 | 2019-Jul-30 | M76 | v12.4 | 🚫 |
+| 7.0.0 | -- | 2019-Aug-01 | 2019-Oct-22 | M78 | v12.8 | 🚫 |
+| 8.0.0 | -- | 2019-Oct-24 | 2020-Feb-04 | M80 | v12.13 | 🚫 |
+| 9.0.0 | -- | 2020-Feb-06 | 2020-May-19 | M83 | v12.14 | 🚫 |
+| 10.0.0 | -- | 2020-May-21 | 2020-Aug-25 | M85 | v12.16 | 🚫 |
+| 11.0.0 | -- | 2020-Aug-27 | 2020-Nov-17 | M87 | v12.18 | 🚫 |
+| 12.0.0 | -- | 2020-Nov-19 | 2021-Mar-02 | M89 | v14.16 | 🚫 |
+| 13.0.0 | -- | 2021-Mar-04 | 2021-May-25 | M91 | v14.16 | 🚫 |
+| 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 | 🚫 |
+| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 | 🚫 |
+| 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 | 🚫 |
+| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 | 🚫 |
+| 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | v16.13 | ✅ |
+| 19.0.0 | 2022-Mar-31 | 2022-Apr-26 | 2022-May-24 | M102 | v16.14 | ✅ |
+| 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | M104 | v16.15 | ✅ |
+| 21.0.0 | 2022-Aug-04 | 2022-Aug-30 | 2022-Sep-27 | M106 | TBD | ✅ |
 
 **Notes:**
 

docs/tutorial/electron-versioning.md

@@ -18,7 +18,7 @@ npm install --save-dev electron@latest
 
 There are several major changes from our 1.x strategy outlined below. Each change is intended to satisfy the needs and priorities of developers/maintainers and app developers.
 
-1. Strict use of the [SemVer](#semver) spec
+1. Strict use of the the [SemVer](#semver) spec
 2. Introduction of semver-compliant `-beta` tags
 3. Introduction of [conventional commit messages](https://conventionalcommits.org/)
 4. Well-defined stabilization branches

docs/tutorial/examples.md

@@ -50,7 +50,7 @@ guide!).
 
 You can find the full list of "How to?" in the sidebar. If there is
 something that you would like to do that is not documented, please join
-our [Discord server][discord] and let us know!
+our [Discord server][] and let us know!
 
-[discord]: https://discord.gg/electronjs
+[discord server]: https://discord.com/invite/electron
 [fiddle]: https://www.electronjs.org/fiddle

docs/tutorial/introduction.md

@@ -69,7 +69,7 @@ Are you getting stuck anywhere? Here are a few links to places to look:
 [tutorial]: tutorial-1-prerequisites.md
 [api documentation]: ../api/app.md
 [chromium]: https://www.chromium.org/
-[discord]: https://discord.gg/electronjs
+[discord]: https://discord.com/invite/APGC3k5yaH
 [examples]: examples.md
 [fiddle]: https://electronjs.org/fiddle
 [issue-tracker]: https://github.com/electron/electron/issues

docs/tutorial/mac-app-store-submission-guide.md

@@ -11,7 +11,7 @@ This guide provides information on:
 To sign Electron apps, the following tools must be installed first:
 
 * Xcode 11 or above.
-* The [@electron/osx-sign] npm module.
+* The [electron-osx-sign][electron-osx-sign] npm module.
 
 You also have to register an Apple Developer account and join the
 [Apple Developer Program][developer-program].
@@ -103,7 +103,7 @@ Apps submitted to the Mac App Store must run under Apple's
 the App Sandbox. The standard darwin build of Electron will fail to launch
 when run under App Sandbox.
 
-When signing the app with `@electron/osx-sign`, it will automatically add the
+When signing the app with `electron-osx-sign`, it will automatically add the
 necessary entitlements to your app's entitlements, but if you are using custom
 entitlements, you must ensure App Sandbox capacity is added:
 
@@ -120,7 +120,7 @@ entitlements, you must ensure App Sandbox capacity is added:
 
 #### Extra steps without `electron-osx-sign`
 
-If you are signing your app without using `@electron/osx-sign`, you must ensure
+If you are signing your app without using `electron-osx-sign`, you must ensure
 the app bundle's entitlements have at least following keys:
 
 ```xml
@@ -170,22 +170,22 @@ your Apple Developer account's Team ID as its value:
 </plist>
 ```
 
-When using `@electron/osx-sign` the `ElectronTeamID` key will be added
+When using `electron-osx-sign` the `ElectronTeamID` key will be added
 automatically by extracting the Team ID from the certificate's name. You may
-need to manually add this key if `@electron/osx-sign` could not find the correct
+need to manually add this key if `electron-osx-sign` could not find the correct
 Team ID.
 
 ### Sign apps for development
 
 To sign an app that can run on your development machine, you must sign it with
 the "Apple Development" certificate and pass the provisioning profile to
-`@electron/osx-sign`.
+`electron-osx-sign`.
 
 ```bash
 electron-osx-sign YourApp.app --identity='Apple Development' --provisioning-profile=/path/to/yourapp.provisionprofile
 ```
 
-If you are signing without `@electron/osx-sign`, you must place the provisioning
+If you are signing without `electron-osx-sign`, you must place the provisioning
 profile to `YourApp.app/Contents/embedded.provisionprofile`.
 
 The signed app can only run on the machines that registered by the provisioning
@@ -213,7 +213,7 @@ use App Sandbox.
 electron-osx-sign YourApp.app --identity='Developer ID Application' --no-gatekeeper-assess
 ```
 
-By passing `--no-gatekeeper-assess`, `@electron/osx-sign` will skip the macOS
+By passing `--no-gatekeeper-assess`, the `electron-osx-sign` will skip the macOS
 GateKeeper check as your app usually has not been notarized yet by this step.
 
 <!-- TODO(zcbenz): Add a chapter about App Notarization -->
@@ -232,7 +232,7 @@ how to meet the Mac App Store requirements.
 
 ### Upload
 
-[Apple Transporter][apple-transporter] should be used to upload the signed app to App Store
+The Application Loader should be used to upload the signed app to iTunes
 Connect for processing, making sure you have [created a record][create-record]
 before uploading.
 
@@ -341,12 +341,11 @@ Electron uses following cryptographic algorithms:
 * RIPEMD - [ISO/IEC 10118-3](https://webstore.ansi.org/RecordDetail.aspx?sku=ISO%2FIEC%2010118-3:2004)
 
 [developer-program]: https://developer.apple.com/support/compare-memberships/
-[@electron/osx-sign]: https://github.com/electron/electron-osx-sign
+[electron-osx-sign]: https://github.com/electron/electron-osx-sign
 [app-sandboxing]: https://developer.apple.com/app-sandboxing/
 [app-notarization]: https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution
 [submitting-your-app]: https://developer.apple.com/library/mac/documentation/IDEs/Conceptual/AppDistributionGuide/SubmittingYourApp/SubmittingYourApp.html
-[create-record]: https://help.apple.com/app-store-connect/#/dev2cd126805
-[apple-transporter]: https://help.apple.com/itc/transporteruserguide/en.lproj/static.html
+[create-record]: https://developer.apple.com/library/ios/documentation/LanguagesUtilities/Conceptual/iTunesConnect_Guide/Chapters/CreatingiTunesConnectRecord.html
 [submit-for-review]: https://developer.apple.com/library/ios/documentation/LanguagesUtilities/Conceptual/iTunesConnect_Guide/Chapters/SubmittingTheApp.html
 [export-compliance]: https://help.apple.com/app-store-connect/#/devc3f64248f
 [user-selected]: https://developer.apple.com/library/mac/documentation/Miscellaneous/Reference/EntitlementKeyReference/Chapters/EnablingAppSandbox.html#//apple_ref/doc/uid/TP40011195-CH4-SW6

docs/tutorial/multithreading.md

@@ -20,8 +20,6 @@ const win = new BrowserWindow({
 The `nodeIntegrationInWorker` can be used independent of `nodeIntegration`, but
 `sandbox` must not be set to `true`.
 
-**Note:** This option is not available in [`SharedWorker`s](https://developer.mozilla.org/en-US/docs/Web/API/SharedWorker) or [`Service Worker`s](https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorker) owing to incompatibilities in sandboxing policies.
-
 ## Available APIs
 
 All built-in modules of Node.js are supported in Web Workers, and `asar`

docs/tutorial/performance.md

@@ -419,18 +419,6 @@ environment that needs to handle both Node.js and browser environments.
 As of writing this article, the popular choices include [Webpack][webpack],
 [Parcel][parcel], and [rollup.js][rollup].
 
-### 8. Call `Menu.setApplicationMenu(null)` when you do not need a default menu
-
-Electron will set a default menu on startup with some standard entries. But there are reasons your application might want to change that and it will benefit startup performance.
-
-#### Why?
-
-If you build your own menu or use a frameless window without native menu, you should tell Electron early enough to not setup the default menu.
-
-#### How?
-
-Call `Menu.setApplicationMenu(null)` before `app.on("ready")`. This will prevent Electron from setting a default menu. See also https://github.com/electron/electron/issues/35512 for a related discussion.
-
 [security]: ./security.md
 [chrome-devtools-tutorial]: https://developers.google.com/web/tools/chrome-devtools/evaluate-performance/
 [worker-threads]: https://nodejs.org/api/worker_threads.html

docs/tutorial/process-model.md

@@ -83,7 +83,7 @@ terminated as well.
 
 The main process also controls your application's lifecycle through Electron's
 [`app`][app] module. This module provides a large set of events and methods
-that you can use to add custom application behaviour (for instance, programmatically
+that you can use to add custom application behaviour (for instance, programatically
 quitting your application, modifying the application dock, or showing an About panel).
 
 As a practical example, the app shown in the [quick start guide][quick-start-lifecycle]
@@ -214,25 +214,8 @@ This feature is incredibly useful for two main purposes:
   URL, you can add custom properties onto the renderer's `window` global that can
   be used for desktop-only logic on the web client's side.
 
-## The utility process
-
-Each Electron app can spawn multiple child processes from the main process using
-the [UtilityProcess][] API. The utility process runs in a Node.js environment,
-meaning it has the ability to `require` modules and use all of Node.js APIs.
-The utility process can be used to host for example: untrusted services,
-CPU intensive tasks or crash prone components which would have previously
-been hosted in the main process or process spawned with Node.js [`child_process.fork`][] API.
-The primary difference between the utility process and process spawned by Node.js
-child_process module is that the utility process can establish a communication
-channel with a renderer process using [`MessagePort`][]s. An Electron app can
-always prefer the [UtilityProcess][] API over Node.js [`child_process.fork`][] API when
-there is need to fork a child process from the main process.
-
 [window-mdn]: https://developer.mozilla.org/en-US/docs/Web/API/Window
-[`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
-[`child_process.fork`]: https://nodejs.org/dist/latest-v16.x/docs/api/child_process.html#child_processforkmodulepath-args-options
 [context-isolation]: ./context-isolation.md
 [context-bridge]: ../api/context-bridge.md
 [ipcrenderer]: ../api/ipc-renderer.md
-[UtilityProcess]: ../api/utility-process.md
 [tutorial]: ./tutorial-1-prerequisites.md

docs/tutorial/security.md

@@ -113,7 +113,6 @@ You should at least follow these steps to improve the security of your applicati
 14. [Disable or limit creation of new windows](#14-disable-or-limit-creation-of-new-windows)
 15. [Do not use `shell.openExternal` with untrusted content](#15-do-not-use-shellopenexternal-with-untrusted-content)
 16. [Use a current version of Electron](#16-use-a-current-version-of-electron)
-17. [Validate the `sender` of all IPC messages](#17-validate-the-sender-of-all-ipc-messages)
 
 To automate the detection of misconfigurations and insecure patterns, it is
 possible to use
@@ -131,8 +130,10 @@ like `HTTP`. Similarly, we recommend the use of `WSS` over `WS`, `FTPS` over
 
 #### Why?
 
-`HTTPS` has two main benefits:
+`HTTPS` has three main benefits:
 
+1. It authenticates the remote server, ensuring your app connects to the correct
+   host instead of an impersonator.
 1. It ensures data integrity, asserting that the data was not modified while in
    transit between your application and the host.
 1. It encrypts the traffic between your user and the destination host, making it

docs/tutorial/snapcraft.md

@@ -237,6 +237,8 @@ apps:
     desktop: usr/share/applications/desktop.desktop
 ```
 
+[snapcraft.io]: https://snapcraft.io/
+[snapcraft-store]: https://snapcraft.io/store/
 [snapcraft-syntax]: https://docs.snapcraft.io/build-snaps/syntax
 [electron-packager]: https://github.com/electron/electron-packager
 [electron-forge]: https://github.com/electron-userland/electron-forge

docs/tutorial/testing-widevine-cdm.md

@@ -0,0 +1,95 @@
+# Testing Widevine CDM
+
+In Electron you can use the Widevine CDM library shipped with Chrome browser.
+
+Widevine Content Decryption Modules (CDMs) are how streaming services protect
+content using HTML5 video to web browsers without relying on an NPAPI plugin
+like Flash or Silverlight. Widevine support is an alternative solution for
+streaming services that currently rely on Silverlight for playback of
+DRM-protected video content. It will allow websites to show DRM-protected video
+content in Firefox without the use of NPAPI plugins. The Widevine CDM runs in an
+open-source CDM sandbox providing better user security than NPAPI plugins.
+
+#### Note on VMP
+
+As of [`Electron v1.8.0 (Chrome v59)`](https://electronjs.org/releases#1.8.1),
+the below steps are may only be some of the necessary steps to enable Widevine;
+any app on or after that version intending to use the Widevine CDM may need to
+be signed using a license obtained from [Widevine](https://www.widevine.com/)
+itself.
+
+Per [Widevine](https://www.widevine.com/):
+
+> Chrome 59 (and later) includes support for Verified Media Path (VMP). VMP
+> provides a method to verify the authenticity of a device platform. For browser
+> deployments, this will provide an additional signal to determine if a
+> browser-based implementation is reliable and secure.
+>
+> The proxy integration guide has been updated with information about VMP and
+> how to issue licenses.
+>
+> Widevine recommends our browser-based integrations (vendors and browser-based
+> applications) add support for VMP.
+
+To enable video playback with this new restriction,
+[castLabs](https://castlabs.com/open-source/downstream/) has created a
+[fork](https://github.com/castlabs/electron-releases) that has implemented the
+necessary changes to enable Widevine to be played in an Electron application if
+one has obtained the necessary licenses from widevine.
+
+## Getting the library
+
+Open `chrome://components/` in Chrome browser, find `Widevine Content Decryption Module`
+and make sure it is up to date, then you can find the library files from the
+application directory.
+
+### On Windows
+
+The library file `widevinecdm.dll` will be under
+`Program Files(x86)/Google/Chrome/Application/CHROME_VERSION/WidevineCdm/_platform_specific/win_(x86|x64)/`
+directory.
+
+### On macOS
+
+The library file `libwidevinecdm.dylib` will be under
+`/Applications/Google Chrome.app/Contents/Versions/CHROME_VERSION/Google Chrome Framework.framework/Versions/A/Libraries/WidevineCdm/_platform_specific/mac_(x86|x64)/`
+directory.
+
+**Note:** Make sure that chrome version used by Electron is greater than or
+equal to the `min_chrome_version` value of Chrome's widevine cdm component.
+The value can be found in `manifest.json` under `WidevineCdm` directory.
+
+## Using the library
+
+After getting the library files, you should pass the path to the file
+with `--widevine-cdm-path` command line switch, and the library's version
+with `--widevine-cdm-version` switch. The command line switches have to be
+passed before the `ready` event of `app` module gets emitted.
+
+Example code:
+
+```javascript
+const { app, BrowserWindow } = require('electron')
+
+// You have to pass the directory that contains widevine library here, it is
+// * `libwidevinecdm.dylib` on macOS,
+// * `widevinecdm.dll` on Windows.
+app.commandLine.appendSwitch('widevine-cdm-path', '/path/to/widevine_library')
+// The version of plugin can be got from `chrome://components` page in Chrome.
+app.commandLine.appendSwitch('widevine-cdm-version', '1.4.8.866')
+
+let win = null
+app.whenReady().then(() => {
+  win = new BrowserWindow()
+  win.show()
+})
+```
+
+## Verifying Widevine CDM support
+
+To verify whether widevine works, you can use following ways:
+
+* Open https://shaka-player-demo.appspot.com/ and load a manifest that uses
+`Widevine`.
+* Open http://www.dash-player.com/demo/drm-test-area/, check whether the page
+says `bitdash uses Widevine in your browser`, then play the video.

docs/tutorial/tutorial-1-prerequisites.md

@@ -26,15 +26,6 @@ work on Windows, macOS, and Linux with a single JavaScript codebase.
 This tutorial will guide you through the process of developing a desktop
 application with Electron and distributing it to end users.
 
-## Goals
-
-This tutorial starts by guiding you through the process of piecing together
-a minimal Electron application from scratch, then teaches you how to
-package and distribute it to users using Electron Forge.
-
-If you prefer to get a project started with a single-command boilerplate, we recommend you start
-with Electron Forge's [`create-electron-app`](https://www.electronforge.io/) command.
-
 ## Assumptions
 
 Electron is a native wrapper layer for web apps and is run in a Node.js environment.

docs/tutorial/tutorial-2-first-app.md

@@ -186,7 +186,7 @@ by creating a barebones web page in an `index.html` file in the root folder of y
 ```
 
 Now that you have a web page, you can load it into an Electron [BrowserWindow][browser-window].
-Replace the contents of your `main.js` file with the following code. We will explain each
+Replace the contents your `main.js` file with the following code. We will explain each
 highlighted block separately.
 
 ```js {1,3-10,12-14} title='main.js' showLineNumbers
@@ -369,12 +369,12 @@ run. Create a launch.json configuration in a new `.vscode` folder in your projec
       "name": "Renderer",
       "port": 9222,
       "request": "attach",
-      "type": "chrome",
+      "type": "pwa-chrome",
       "webRoot": "${workspaceFolder}"
     },
     {
       "name": "Main",
-      "type": "node",
+      "type": "pwa-node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
       "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
@@ -398,11 +398,11 @@ What we have done in the `launch.json` file is to create 3 configurations:
 - `Main` is used to start the main process and also expose port 9222 for remote debugging
   (`--remote-debugging-port=9222`). This is the port that we will use to attach the debugger
   for the `Renderer`. Because the main process is a Node.js process, the type is set to
-  `node`.
+  `pwa-node` (`pwa-` is the prefix that tells VS Code to use the latest JavaScript debugger).
 - `Renderer` is used to debug the renderer process. Because the main process is the one
   that creates the process, we have to "attach" to it (`"request": "attach"`) instead of
   creating a new one.
-  The renderer process is a web one, so the debugger we have to use is `chrome`.
+  The renderer process is a web one, so the debugger we have to use is `pwa-chrome`.
 - `Main + renderer` is a [compound task] that executes the previous ones simultaneously.
 
 :::caution
@@ -435,7 +435,7 @@ This file controls Electron's **main process**, which runs an instance of Node.j
 responsible for your app's lifecycle, displaying native interfaces, performing privileged operations,
 and managing renderer processes.
 
-**Renderer processes** (or renderers for short) are responsible for displaying graphical content. You can
+**Renderer processes** (or renderers for short) are responsible for display graphical content. You can
 load a web page into a renderer by pointing it to either a web address or a local HTML file.
 Renderers behave very similarly to regular web pages and have access to the same web APIs.
 

docs/tutorial/tutorial-3-preload.md

@@ -203,8 +203,7 @@ loading the HTML file so that the handler is guaranteed to be ready before
 you send out the `invoke` call from the renderer.
 
 ```js {1,11} title="main.js"
-const { app, BrowserWindow, ipcMain } = require('electron')
-const path = require('path')
+const { ipcMain } = require('electron')
 
 const createWindow = () => {
   const win = new BrowserWindow({
@@ -217,7 +216,6 @@ const createWindow = () => {
   ipcMain.handle('ping', () => 'pong')
   win.loadFile('index.html')
 }
-app.whenReady().then(createWindow)
 ```
 
 Once you have the sender and receiver set up, you can now send messages from the renderer

docs/tutorial/tutorial-4-adding-features.md

@@ -62,7 +62,7 @@ into end users' hands.
 
 <!-- Link labels -->
 
-[discord]: https://discord.gg/electronjs
+[discord]: https://discord.com/invite/APGC3k5yaH
 [github]: https://github.com/electron/electronjs.org-new/issues/new
 [how-to]: ./examples.md
 [node-platform]: https://nodejs.org/api/process.html#process_process_platform

docs/tutorial/tutorial-5-packaging.md

@@ -70,9 +70,10 @@ the [Electron Forge CLI documentation].
 :::
 
 You should also notice that your package.json now has a few more packages installed
-under `devDependencies`, and a new `forge.config.js` file that exports a configuration
-object. You should see multiple makers (packages that generate distributable app bundles) in the
-pre-populated configuration, one for each target platform.
+under your `devDependencies`, and contains an added `config.forge` field with an array
+of makers configured. **Makers** are Forge plugins that create distributables from
+your source code. You should see multiple makers in the pre-populated configuration,
+one for each target platform.
 
 ### Creating a distributable
 
@@ -110,14 +111,13 @@ Electron Forge can be configured to create distributables in different OS-specif
 
 :::
 
-:::tip Creating and adding application icons
+:::tip Creating and Adding Application Icons
 
-Setting custom application icons requires a few additions to your config.
-Check out [Forge's icon tutorial] for more information.
+Setting custom application icons requires a few additions to your config. Check out [Forge's icon tutorial] for more information.
 
 :::
 
-:::info Packaging without Electron Forge
+:::note Packaging without Electron Forge
 
 If you want to manually package your code, or if you're just interested understanding the
 mechanics behind packaging an Electron app, check out the full [Application Packaging]
@@ -136,51 +136,64 @@ Code signing is a security technology that you use to certify that a desktop app
 created by a known source. Windows and macOS have their own OS-specific code signing
 systems that will make it difficult for users to download or launch unsigned applications.
 
+If you already have code signing certificates for Windows and macOS, you can set your
+credentials in your Forge configuration. Otherwise, please refer to the full
+[Code Signing] documentation to learn how to purchase a certificate and for more information
+on the desktop app code signing process.
+
 On macOS, code signing is done at the app packaging level. On Windows, distributable installers
-are signed instead. If you already have code signing certificates for Windows and macOS, you can set
-your credentials in your Forge configuration.
-
-:::info
-
-For more information on code signing, check out the
-[Signing macOS Apps](https://www.electronforge.io/guides/code-signing) guide in the Forge docs.
-
-:::
+are signed instead.
 
 <Tabs>
   <TabItem value="macos" label="macOS" default>
 
-```js title='forge.config.js'
-module.exports = {
-  packagerConfig: {
-    osxSign: {},
-    //...
-    osxNotarize: {
-      tool: 'notarytool',
-      appleId: process.env.APPLE_ID,
-      appleIdPassword: process.env.APPLE_PASSWORD,
-      teamId: process.env.APPLE_TEAM_ID,
+```json title='package.json' {6-18}
+{
+  //...
+  "config": {
+    "forge": {
+      //...
+      "packagerConfig": {
+        "osxSign": {
+          "identity": "Developer ID Application: Felix Rieseberg (LT94ZKYDCJ)",
+          "hardened-runtime": true,
+          "entitlements": "entitlements.plist",
+          "entitlements-inherit": "entitlements.plist",
+          "signature-flags": "library"
+        },
+        "osxNotarize": {
+          "appleId": "felix@felix.fun",
+          "appleIdPassword": "this-is-a-secret"
+        }
+      }
+      //...
     }
-    //...
   }
+  //...
 }
 ```
 
   </TabItem>
   <TabItem value="windows" label="Windows">
 
-```js title='forge.config.js'
-module.exports = {
+```json title='package.json'  {6-14}
+{
   //...
-  makers: [
-    {
-      name: '@electron-forge/maker-squirrel',
-      config: {
-        certificateFile: './cert.pfx',
-        certificatePassword: process.env.CERTIFICATE_PASSWORD,
-      },
-    },
-  ],
+  "config": {
+    "forge": {
+      //...
+      "makers": [
+        {
+          "name": "@electron-forge/maker-squirrel",
+          "config": {
+            "certificateFile": "./cert.pfx",
+            "certificatePassword": "this-is-a-secret"
+          }
+        }
+      ]
+      //...
+    }
+  }
   //...
 }
 ```
@@ -201,12 +214,13 @@ information.
 
 [`@electron/osx-sign`]: https://github.com/electron/osx-sign
 [application packaging]: ./application-distribution.md
+[code signing]: ./code-signing.md
 [`electron-packager`]: https://github.com/electron/electron-packager
 [`electron-winstaller`]: https://github.com/electron/windows-installer
 [electron forge]: https://www.electronforge.io
 [electron forge cli documentation]: https://www.electronforge.io/cli#commands
 [makers]: https://www.electronforge.io/config/makers
-[forge's icon tutorial]: https://www.electronforge.io/guides/create-and-add-icons
+[Forge's icon tutorial]: https://www.electronforge.io/guides/create-and-add-icons
 
 <!-- Tutorial links -->
 

docs/tutorial/tutorial-6-publishing-updating.md

@@ -27,7 +27,7 @@ into your app code.
 ## Using update.electronjs.org
 
 The Electron maintainers provide a free auto-updating service for open-source apps
-at [https://update.electronjs.org](https://update.electronjs.org). Its requirements are:
+at https://update.electronjs.org. Its requirements are:
 
 - Your app runs on macOS or Windows
 - Your app has a public GitHub repository
@@ -78,21 +78,27 @@ Once you have it installed, you need to set it up in your Forge
 configuration. A full list of options is documented in the Forge's
 [`PublisherGitHubConfig`] API docs.
 
-```js title='forge.config.js'
-module.exports = {
-  publishers: [
-    {
-      name: '@electron-forge/publisher-github',
-      config: {
-        repository: {
-          owner: 'github-user-name',
-          name: 'github-repo-name',
-        },
-        prerelease: false,
-        draft: true,
-      },
-    },
-  ],
+```json title='package.json' {6-16}
+{
+  //...
+  "config": {
+    "forge": {
+      "publishers": [
+        {
+          "name": "@electron-forge/publisher-github",
+          "config": {
+            "repository": {
+              "owner": "github-user-name",
+              "name": "github-repo-name"
+            },
+            "prerelease": false,
+            "draft": true
+          }
+        }
+      ]
+    }
+  }
+  //...
 }
 ```
 
@@ -220,7 +226,7 @@ rest of our docs and happy developing! If you have questions, please stop by our
 
 [autoupdater]: ../api/auto-updater.md
 [code-signed]: ./code-signing.md
-[discord server]: https://discord.gg/electronjs
+[discord server]: https://discord.com/invite/APGC3k5yaH
 [electron fiddle]: https://electronjs.org/fiddle
 [fiddle-build]: https://github.com/electron/fiddle/blob/master/.github/workflows/build.yaml
 [fiddle-forge-config]: https://github.com/electron/fiddle/blob/master/forge.config.js

docs/tutorial/window-customization.md

@@ -115,7 +115,7 @@ const win = new BrowserWindow({
 })
 ```
 
-On either platform `titleBarOverlay` can also be an object. On both macOS and Windows, the height of the overlay can be specified with the `height` property. On Windows, the color of the overlay and its symbols can be specified using the `color` and `symbolColor` properties respectively.
+On Windows, you can also specify additional parameters. The color of the overlay and its symbols can be specified by setting `titleBarOverlay` to an object and using the `color` and `symbolColor` properties respectively. The height of the overlay can also be specified with the `height` property.
 
 If a color option is not specified, the color will default to its system color for the window control buttons. Similarly, if the height option is not specified it will default to the default height:
 

filenames.auto.gni

@@ -36,12 +36,10 @@ auto_filenames = {
     "docs/api/net-log.md",
     "docs/api/net.md",
     "docs/api/notification.md",
-    "docs/api/parent-port.md",
     "docs/api/power-monitor.md",
     "docs/api/power-save-blocker.md",
     "docs/api/process.md",
     "docs/api/protocol.md",
-    "docs/api/push-notifications.md",
     "docs/api/safe-storage.md",
     "docs/api/screen.md",
     "docs/api/service-workers.md",
@@ -63,7 +61,6 @@ auto_filenames = {
     "docs/api/touch-bar-spacer.md",
     "docs/api/touch-bar.md",
     "docs/api/tray.md",
-    "docs/api/utility-process.md",
     "docs/api/web-contents.md",
     "docs/api/web-frame-main.md",
     "docs/api/web-frame.md",
@@ -100,6 +97,7 @@ auto_filenames = {
     "docs/api/structures/mime-typed-buffer.md",
     "docs/api/structures/mouse-input-event.md",
     "docs/api/structures/mouse-wheel-input-event.md",
+    "docs/api/structures/new-window-web-contents-event.md",
     "docs/api/structures/notification-action.md",
     "docs/api/structures/notification-response.md",
     "docs/api/structures/payment-discount.md",
@@ -138,11 +136,11 @@ auto_filenames = {
   ]
 
   sandbox_bundle_deps = [
+    "lib/common/api/deprecate.ts",
     "lib/common/api/native-image.ts",
     "lib/common/define-properties.ts",
     "lib/common/ipc-messages.ts",
     "lib/common/web-view-methods.ts",
-    "lib/common/webpack-globals-provider.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
     "lib/renderer/api/ipc-renderer.ts",
@@ -214,7 +212,6 @@ auto_filenames = {
     "lib/browser/api/power-monitor.ts",
     "lib/browser/api/power-save-blocker.ts",
     "lib/browser/api/protocol.ts",
-    "lib/browser/api/push-notifications.ts",
     "lib/browser/api/safe-storage.ts",
     "lib/browser/api/screen.ts",
     "lib/browser/api/session.ts",
@@ -222,7 +219,6 @@ auto_filenames = {
     "lib/browser/api/system-preferences.ts",
     "lib/browser/api/touch-bar.ts",
     "lib/browser/api/tray.ts",
-    "lib/browser/api/utility-process.ts",
     "lib/browser/api/view.ts",
     "lib/browser/api/views/image-view.ts",
     "lib/browser/api/web-contents-view.ts",
@@ -241,11 +237,11 @@ auto_filenames = {
     "lib/browser/rpc-server.ts",
     "lib/browser/web-view-events.ts",
     "lib/common/api/clipboard.ts",
+    "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.ts",
     "lib/common/api/shell.ts",
     "lib/common/define-properties.ts",
-    "lib/common/deprecate.ts",
     "lib/common/init.ts",
     "lib/common/ipc-messages.ts",
     "lib/common/reset-search-paths.ts",
@@ -262,6 +258,7 @@ auto_filenames = {
 
   renderer_bundle_deps = [
     "lib/common/api/clipboard.ts",
+    "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.ts",
     "lib/common/api/shell.ts",
@@ -300,6 +297,7 @@ auto_filenames = {
 
   worker_bundle_deps = [
     "lib/common/api/clipboard.ts",
+    "lib/common/api/deprecate.ts",
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.ts",
     "lib/common/api/shell.ts",
@@ -334,20 +332,4 @@ auto_filenames = {
     "typings/internal-ambient.d.ts",
     "typings/internal-electron.d.ts",
   ]
-
-  utility_bundle_deps = [
-    "lib/browser/message-port-main.ts",
-    "lib/common/define-properties.ts",
-    "lib/common/init.ts",
-    "lib/common/reset-search-paths.ts",
-    "lib/utility/api/exports/electron.ts",
-    "lib/utility/api/module-list.ts",
-    "lib/utility/init.ts",
-    "lib/utility/parent-port.ts",
-    "package.json",
-    "tsconfig.electron.json",
-    "tsconfig.json",
-    "typings/internal-ambient.d.ts",
-    "typings/internal-electron.d.ts",
-  ]
 }

filenames.gni

@@ -129,7 +129,6 @@ filenames = {
     "shell/browser/api/electron_api_menu_mac.mm",
     "shell/browser/api/electron_api_native_theme_mac.mm",
     "shell/browser/api/electron_api_power_monitor_mac.mm",
-    "shell/browser/api/electron_api_push_notifications_mac.mm",
     "shell/browser/api/electron_api_system_preferences_mac.mm",
     "shell/browser/api/electron_api_web_contents_mac.mm",
     "shell/browser/auto_updater_mac.mm",
@@ -297,8 +296,6 @@ filenames = {
     "shell/browser/api/electron_api_printing.cc",
     "shell/browser/api/electron_api_protocol.cc",
     "shell/browser/api/electron_api_protocol.h",
-    "shell/browser/api/electron_api_push_notifications.cc",
-    "shell/browser/api/electron_api_push_notifications.h",
     "shell/browser/api/electron_api_safe_storage.cc",
     "shell/browser/api/electron_api_safe_storage.h",
     "shell/browser/api/electron_api_screen.cc",
@@ -313,8 +310,6 @@ filenames = {
     "shell/browser/api/electron_api_tray.h",
     "shell/browser/api/electron_api_url_loader.cc",
     "shell/browser/api/electron_api_url_loader.h",
-    "shell/browser/api/electron_api_utility_process.cc",
-    "shell/browser/api/electron_api_utility_process.h",
     "shell/browser/api/electron_api_view.cc",
     "shell/browser/api/electron_api_view.h",
     "shell/browser/api/electron_api_web_contents.cc",
@@ -418,6 +413,8 @@ filenames = {
     "shell/browser/media/media_capture_devices_dispatcher.h",
     "shell/browser/media/media_device_id_salt.cc",
     "shell/browser/media/media_device_id_salt.h",
+    "shell/browser/media/media_stream_devices_controller.cc",
+    "shell/browser/media/media_stream_devices_controller.h",
     "shell/browser/microtasks_runner.cc",
     "shell/browser/microtasks_runner.h",
     "shell/browser/native_browser_view.cc",
@@ -465,6 +462,8 @@ filenames = {
     "shell/browser/notifications/platform_notification_service.h",
     "shell/browser/plugins/plugin_utils.cc",
     "shell/browser/plugins/plugin_utils.h",
+    "shell/browser/pref_store_delegate.cc",
+    "shell/browser/pref_store_delegate.h",
     "shell/browser/protocol_registry.cc",
     "shell/browser/protocol_registry.h",
     "shell/browser/relauncher.cc",
@@ -507,6 +506,8 @@ filenames = {
     "shell/browser/ui/tray_icon_observer.h",
     "shell/browser/ui/webui/accessibility_ui.cc",
     "shell/browser/ui/webui/accessibility_ui.h",
+    "shell/browser/unresponsive_suppressor.cc",
+    "shell/browser/unresponsive_suppressor.h",
     "shell/browser/web_contents_permission_helper.cc",
     "shell/browser/web_contents_permission_helper.h",
     "shell/browser/web_contents_preferences.cc",
@@ -517,8 +518,6 @@ filenames = {
     "shell/browser/web_view_guest_delegate.h",
     "shell/browser/web_view_manager.cc",
     "shell/browser/web_view_manager.h",
-    "shell/browser/webauthn/electron_authenticator_request_delegate.cc",
-    "shell/browser/webauthn/electron_authenticator_request_delegate.h",
     "shell/browser/window_list.cc",
     "shell/browser/window_list.h",
     "shell/browser/window_list_observer.h",
@@ -577,14 +576,11 @@ filenames = {
     "shell/common/gin_converters/hid_device_info_converter.h",
     "shell/common/gin_converters/image_converter.cc",
     "shell/common/gin_converters/image_converter.h",
-    "shell/common/gin_converters/media_converter.cc",
-    "shell/common/gin_converters/media_converter.h",
     "shell/common/gin_converters/message_box_converter.cc",
     "shell/common/gin_converters/message_box_converter.h",
     "shell/common/gin_converters/native_window_converter.h",
     "shell/common/gin_converters/net_converter.cc",
     "shell/common/gin_converters/net_converter.h",
-    "shell/common/gin_converters/serial_port_info_converter.h",
     "shell/common/gin_converters/std_converter.h",
     "shell/common/gin_converters/time_converter.cc",
     "shell/common/gin_converters/time_converter.h",
@@ -650,6 +646,8 @@ filenames = {
     "shell/common/process_util.h",
     "shell/common/skia_util.cc",
     "shell/common/skia_util.h",
+    "shell/common/v8_value_converter.cc",
+    "shell/common/v8_value_converter.h",
     "shell/common/v8_value_serializer.cc",
     "shell/common/v8_value_serializer.h",
     "shell/common/world_ids.h",
@@ -674,16 +672,16 @@ filenames = {
     "shell/renderer/electron_render_frame_observer.h",
     "shell/renderer/electron_renderer_client.cc",
     "shell/renderer/electron_renderer_client.h",
+    "shell/renderer/electron_renderer_pepper_host_factory.cc",
+    "shell/renderer/electron_renderer_pepper_host_factory.h",
     "shell/renderer/electron_sandboxed_renderer_client.cc",
     "shell/renderer/electron_sandboxed_renderer_client.h",
+    "shell/renderer/guest_view_container.cc",
+    "shell/renderer/guest_view_container.h",
     "shell/renderer/renderer_client_base.cc",
     "shell/renderer/renderer_client_base.h",
     "shell/renderer/web_worker_observer.cc",
     "shell/renderer/web_worker_observer.h",
-    "shell/services/node/node_service.cc",
-    "shell/services/node/node_service.h",
-    "shell/services/node/parent_port.cc",
-    "shell/services/node/parent_port.h",
     "shell/utility/electron_content_utility_client.cc",
     "shell/utility/electron_content_utility_client.h",
   ]

filenames.libcxx.gni

@@ -42,11 +42,9 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/is_sorted.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/is_sorted_until.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/iter_swap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/iterator_operations.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/lexicographical_compare.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/lower_bound.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/make_heap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/make_projected.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/max.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/max_element.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/merge.h",
@@ -69,92 +67,14 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/pop_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/prev_permutation.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/push_heap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_adjacent_find.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_all_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_any_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_binary_search.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_clamp.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy_backward.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_copy_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_count.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_count_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_equal.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_equal_range.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_fill.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_fill_n.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_end.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_first_of.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_if.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_find_if_not.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_for_each.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_for_each_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_generate.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_generate_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_includes.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_inplace_merge.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_heap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_heap_until.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_partitioned.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_permutation.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_sorted.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_is_sorted_until.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_iterator_concept.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_lexicographical_compare.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_lower_bound.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_make_heap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_max.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_max_element.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_merge.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_min.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_min_element.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_minmax.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_minmax_element.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_mismatch.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_move.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_move_backward.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_next_permutation.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_none_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_nth_element.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partial_sort.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partial_sort_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partition.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partition_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_partition_point.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_pop_heap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_prev_permutation.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_push_heap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove_copy_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_remove_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_replace.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_replace_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_replace_copy_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_replace_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_reverse.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_reverse_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_rotate.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_rotate_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_sample.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_search.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_search_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_set_difference.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_set_intersection.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_set_symmetric_difference.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_set_union.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_shuffle.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_sort.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_sort_heap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_stable_partition.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_stable_sort.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_swap_ranges.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_transform.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_unique.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_unique_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_upper_bound.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/remove.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_copy.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_copy_if.h",
@@ -184,11 +104,9 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/stable_sort.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/swap_ranges.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/transform.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/uniform_random_bit_generator_adaptor.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/unique.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/unique_copy.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/unwrap_iter.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/unwrap_range.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/upper_bound.h",
   "//buildtools/third_party/libc++/trunk/include/__assert",
   "//buildtools/third_party/libc++/trunk/include/__availability",
@@ -200,33 +118,15 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__bsd_locale_fallbacks.h",
   "//buildtools/third_party/libc++/trunk/include/__charconv/chars_format.h",
   "//buildtools/third_party/libc++/trunk/include/__charconv/from_chars_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__charconv/tables.h",
-  "//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_base_10.h",
   "//buildtools/third_party/libc++/trunk/include/__charconv/to_chars_result.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/calendar.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/convert_to_timespec.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/convert_to_tm.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/day.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/duration.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/file_clock.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/formatter.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/hh_mm_ss.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/high_resolution_clock.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/literals.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/month.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/month_weekday.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/monthday.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/ostream.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/parser_std_format_spec.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/statically_widen.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/steady_clock.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/system_clock.h",
   "//buildtools/third_party/libc++/trunk/include/__chrono/time_point.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/weekday.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/year.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/year_month.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/year_month_day.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/year_month_weekday.h",
   "//buildtools/third_party/libc++/trunk/include/__compare/common_comparison_category.h",
   "//buildtools/third_party/libc++/trunk/include/__compare/compare_partial_order_fallback.h",
   "//buildtools/third_party/libc++/trunk/include/__compare/compare_strong_order_fallback.h",
@@ -269,7 +169,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__coroutine/noop_coroutine_handle.h",
   "//buildtools/third_party/libc++/trunk/include/__coroutine/trivial_awaitables.h",
   "//buildtools/third_party/libc++/trunk/include/__debug",
-  "//buildtools/third_party/libc++/trunk/include/__debug_utils/randomize_range.h",
   "//buildtools/third_party/libc++/trunk/include/__errc",
   "//buildtools/third_party/libc++/trunk/include/__filesystem/copy_options.h",
   "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_entry.h",
@@ -287,16 +186,10 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__filesystem/recursive_directory_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__filesystem/space_info.h",
   "//buildtools/third_party/libc++/trunk/include/__filesystem/u8path.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/buffer.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/concepts.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/enable_insertable.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/extended_grapheme_cluster_table.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_arg.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/format_arg_store.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_args.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_context.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_error.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/format_functions.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_fwd.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_parse_context.h",
   "//buildtools/third_party/libc++/trunk/include/__format/format_string.h",
@@ -307,11 +200,9 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_floating_point.h",
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_integer.h",
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_integral.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/formatter_output.h",
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_pointer.h",
   "//buildtools/third_party/libc++/trunk/include/__format/formatter_string.h",
   "//buildtools/third_party/libc++/trunk/include/__format/parser_std_format_spec.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/unicode.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binary_function.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binary_negate.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/bind.h",
@@ -319,7 +210,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__functional/bind_front.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binder1st.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binder2nd.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/boyer_moore_searcher.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/compose.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/default_searcher.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/function.h",
@@ -340,19 +230,11 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__functional/unary_negate.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/unwrap_ref.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/weak_result_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__fwd/array.h",
-  "//buildtools/third_party/libc++/trunk/include/__fwd/get.h",
-  "//buildtools/third_party/libc++/trunk/include/__fwd/hash.h",
-  "//buildtools/third_party/libc++/trunk/include/__fwd/pair.h",
-  "//buildtools/third_party/libc++/trunk/include/__fwd/span.h",
-  "//buildtools/third_party/libc++/trunk/include/__fwd/string_view.h",
-  "//buildtools/third_party/libc++/trunk/include/__fwd/tuple.h",
   "//buildtools/third_party/libc++/trunk/include/__hash_table",
   "//buildtools/third_party/libc++/trunk/include/__ios/fpos.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/access.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/advance.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/back_insert_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/bounded_iter.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/common_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/concepts.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/counted_iterator.h",
@@ -373,7 +255,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__iterator/iterator_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/mergeable.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/move_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/move_sentinel.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/next.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/ostream_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/ostreambuf_iterator.h",
@@ -387,29 +268,23 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__iterator/sortable.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/unreachable_sentinel.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/wrap_iter.h",
+  "//buildtools/third_party/libc++/trunk/include/__libcpp_version",
   "//buildtools/third_party/libc++/trunk/include/__locale",
   "//buildtools/third_party/libc++/trunk/include/__mbstate_t.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/addressof.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/align.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/allocate_at_least.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocation_guard.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocator.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocator_arg_t.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/allocator_traits.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/assume_aligned.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/auto_ptr.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/builtin_new_allocator.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/compressed_pair.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/concepts.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/construct_at.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/destruct_n.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/pointer_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/ranges_construct_at.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/ranges_uninitialized_algorithms.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/raw_storage_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/shared_ptr.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/swap_allocator.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/temp_value.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/temporary_buffer.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/unique_ptr.h",
@@ -480,10 +355,8 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/empty_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/enable_borrowed_range.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/enable_view.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/filter_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/iota_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/join_view.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/lazy_split_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/non_propagating_cache.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/owning_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/range_adaptor.h",
@@ -498,16 +371,16 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/transform_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/view_interface.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/views.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/zip_view.h",
   "//buildtools/third_party/libc++/trunk/include/__split_buffer",
   "//buildtools/third_party/libc++/trunk/include/__std_stream",
-  "//buildtools/third_party/libc++/trunk/include/__string/char_traits.h",
-  "//buildtools/third_party/libc++/trunk/include/__string/extern_template_lists.h",
+  "//buildtools/third_party/libc++/trunk/include/__string",
   "//buildtools/third_party/libc++/trunk/include/__support/android/locale_bionic.h",
   "//buildtools/third_party/libc++/trunk/include/__support/fuchsia/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/gettod_zos.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/ibm/limits.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/locale_mgmt_zos.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/nanosleep.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/ibm/support.h",
   "//buildtools/third_party/libc++/trunk/include/__support/ibm/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/musl/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/newlib/xlocale.h",
@@ -515,6 +388,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__support/solaris/floatingpoint.h",
   "//buildtools/third_party/libc++/trunk/include/__support/solaris/wchar.h",
   "//buildtools/third_party/libc++/trunk/include/__support/solaris/xlocale.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/win32/limits_msvc_win32.h",
   "//buildtools/third_party/libc++/trunk/include/__support/win32/locale_win32.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__nop_locale_mgmt.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__posix_l_fallback.h",
@@ -523,150 +397,14 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__thread/timed_backoff_policy.h",
   "//buildtools/third_party/libc++/trunk/include/__threading_support",
   "//buildtools/third_party/libc++/trunk/include/__tree",
-  "//buildtools/third_party/libc++/trunk/include/__tuple/apply_cv.h",
-  "//buildtools/third_party/libc++/trunk/include/__tuple/make_tuple_types.h",
-  "//buildtools/third_party/libc++/trunk/include/__tuple/sfinae_helpers.h",
-  "//buildtools/third_party/libc++/trunk/include/__tuple/tuple_element.h",
-  "//buildtools/third_party/libc++/trunk/include/__tuple/tuple_indices.h",
-  "//buildtools/third_party/libc++/trunk/include/__tuple/tuple_like.h",
-  "//buildtools/third_party/libc++/trunk/include/__tuple/tuple_size.h",
-  "//buildtools/third_party/libc++/trunk/include/__tuple/tuple_types.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_const.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_cv.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_lvalue_reference.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_pointer.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_rvalue_reference.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/add_volatile.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/aligned_storage.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/aligned_union.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/alignment_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/apply_cv.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/can_extract_key.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/common_reference.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/common_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/conditional.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/conjunction.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/copy_cv.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/copy_cvref.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/decay.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/dependent_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/disjunction.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/enable_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/extent.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/has_unique_object_representation.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/has_virtual_destructor.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/integral_constant.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_abstract.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_aggregate.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_allocator.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_arithmetic.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_array.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_base_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_bounded_array.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_callable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_char_like_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_class.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_compound.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_const.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_constant_evaluated.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_convertible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_copy_assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_copy_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_core_convertible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_default_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_destructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_empty.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_enum.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_final.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_floating_point.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_function.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_fundamental.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_implicitly_default_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_integral.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_literal_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_member_function_pointer.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_member_object_pointer.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_member_pointer.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_move_assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_move_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_convertible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_copy_assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_copy_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_default_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_destructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_move_assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_nothrow_move_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_null_pointer.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_object.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_pod.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_pointer.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_polymorphic.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_primary_template.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_reference.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_reference_wrapper.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_referenceable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_same.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_scalar.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_scoped_enum.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_signed.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_signed_integer.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_standard_layout.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_swappable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivial.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_copy_assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_copy_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_copyable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_default_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_destructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_move_assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_move_constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_unbounded_array.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_union.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_unsigned.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_unsigned_integer.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_valid_expansion.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_void.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_volatile.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/lazy.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/make_32_64_or_128_bit.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/make_const_lvalue_ref.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/make_signed.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/make_unsigned.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/maybe_const.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/nat.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/negation.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/noexcept_move_assign_container.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/promote.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/rank.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_all_extents.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_const.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_const_ref.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_cv.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_cvref.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_extent.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_pointer.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_reference.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/remove_volatile.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/result_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/type_identity.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/type_list.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/underlying_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__type_traits/void_t.h",
+  "//buildtools/third_party/libc++/trunk/include/__tuple",
   "//buildtools/third_party/libc++/trunk/include/__undef_macros",
   "//buildtools/third_party/libc++/trunk/include/__utility/as_const.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/auto_cast.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/cmp.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/convert_to_integral.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/declval.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/exchange.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/forward.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/forward_like.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/in_place.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/integer_sequence.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/move.h",
@@ -679,7 +417,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__utility/transaction.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/unreachable.h",
   "//buildtools/third_party/libc++/trunk/include/__variant/monostate.h",
-  "//buildtools/third_party/libc++/trunk/include/__verbose_abort",
   "//buildtools/third_party/libc++/trunk/include/algorithm",
   "//buildtools/third_party/libc++/trunk/include/any",
   "//buildtools/third_party/libc++/trunk/include/array",
@@ -775,7 +512,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/map",
   "//buildtools/third_party/libc++/trunk/include/math.h",
   "//buildtools/third_party/libc++/trunk/include/memory",
-  "//buildtools/third_party/libc++/trunk/include/module.modulemap.in",
+  "//buildtools/third_party/libc++/trunk/include/module.modulemap",
   "//buildtools/third_party/libc++/trunk/include/mutex",
   "//buildtools/third_party/libc++/trunk/include/new",
   "//buildtools/third_party/libc++/trunk/include/numbers",
@@ -795,7 +532,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/span",
   "//buildtools/third_party/libc++/trunk/include/sstream",
   "//buildtools/third_party/libc++/trunk/include/stack",
-  "//buildtools/third_party/libc++/trunk/include/stdatomic.h",
   "//buildtools/third_party/libc++/trunk/include/stdbool.h",
   "//buildtools/third_party/libc++/trunk/include/stddef.h",
   "//buildtools/third_party/libc++/trunk/include/stdexcept",

lib/asar/fs-wrapper.ts

@@ -60,8 +60,8 @@ const splitPath = (archivePathOrBuffer: string | Buffer) => {
 // Convert asar archive's Stats object to fs's Stats object.
 let nextInode = 0;
 
-const uid = process.getuid?.() ?? 0;
-const gid = process.getgid?.() ?? 0;
+const uid = process.getuid != null ? process.getuid() : 0;
+const gid = process.getgid != null ? process.getgid() : 0;
 
 const fakeTime = new Date();
 
@@ -263,7 +263,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
   };
 
   const { lstat } = fs;
-  fs.lstat = (pathArgument: string, options: any, callback: any) => {
+  fs.lstat = function (pathArgument: string, options: any, callback: any) {
     const pathInfo = splitPath(pathArgument);
     if (typeof options === 'function') {
       callback = options;
@@ -382,10 +382,10 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
 
   fs.promises.realpath = util.promisify(fs.realpath.native);
 
-  const { exists: nativeExists } = fs;
-  fs.exists = function exists (pathArgument: string, callback: any) {
+  const { exists } = fs;
+  fs.exists = (pathArgument: string, callback: any) => {
     const pathInfo = splitPath(pathArgument);
-    if (!pathInfo.isAsar) return nativeExists(pathArgument, callback);
+    if (!pathInfo.isAsar) return exists(pathArgument, callback);
     const { asarPath, filePath } = pathInfo;
 
     const archive = getOrCreateArchive(asarPath);
@@ -399,9 +399,9 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
     nextTick(callback, [pathExists]);
   };
 
-  fs.exists[util.promisify.custom] = function exists (pathArgument: string) {
+  fs.exists[util.promisify.custom] = (pathArgument: string) => {
     const pathInfo = splitPath(pathArgument);
-    if (!pathInfo.isAsar) return nativeExists[util.promisify.custom](pathArgument);
+    if (!pathInfo.isAsar) return exists[util.promisify.custom](pathArgument);
     const { asarPath, filePath } = pathInfo;
 
     const archive = getOrCreateArchive(asarPath);

lib/browser/api/app.ts

@@ -1,7 +1,6 @@
 import * as fs from 'fs';
 
-import { Menu } from 'electron/main';
-import * as deprecate from '@electron/internal/common/deprecate';
+import { Menu, deprecate } from 'electron/main';
 
 const bindings = process._linkedBinding('electron_browser_app');
 const commandLine = process._linkedBinding('electron_common_command_line');

lib/browser/api/auto-updater/squirrel-update-win.ts

@@ -20,7 +20,7 @@ const spawnUpdate = function (args: string[], detached: boolean, callback: Funct
 
   try {
     // Ensure we don't spawn multiple squirrel processes
-    // Process spawned, same args:        Attach events to already running process
+    // Process spawned, same args:        Attach events to alread running process
     // Process spawned, different args:   Return with error
     // No process spawned:                Spawn new process
     if (spawnedProcess && !isSameArgs(args)) {
@@ -68,7 +68,7 @@ const spawnUpdate = function (args: string[], detached: boolean, callback: Funct
     if (code !== 0) {
       // Disabled for backwards compatibility:
       // eslint-disable-next-line standard/no-callback-literal
-      return callback(`Command failed: ${signal ?? code}\n${stderr}`);
+      return callback(`Command failed: ${signal != null ? signal : code}\n${stderr}`);
     }
 
     // Success.

lib/browser/api/browser-window.ts

@@ -1,6 +1,5 @@
 import { BaseWindow, WebContents, Event, BrowserView, TouchBar } from 'electron/main';
 import type { BrowserWindow as BWT } from 'electron/main';
-import * as deprecate from '@electron/internal/common/deprecate';
 const { BrowserWindow } = process._linkedBinding('electron_browser_window') as { BrowserWindow: typeof BWT };
 
 Object.setPrototypeOf(BrowserWindow.prototype, BaseWindow.prototype);
@@ -45,28 +44,6 @@ BrowserWindow.prototype._init = function (this: BWT) {
     this.on(event as any, visibilityChanged);
   }
 
-  const warn = deprecate.warnOnceMessage('\'scroll-touch-{begin,end,edge}\' are deprecated and will be removed. Please use the WebContents \'input-event\' event instead.');
-  this.webContents.on('input-event', (_, e) => {
-    if (e.type === 'gestureScrollBegin') {
-      if (this.listenerCount('scroll-touch-begin') !== 0) {
-        warn();
-        this.emit('scroll-touch-edge');
-        this.emit('scroll-touch-begin');
-      }
-    } else if (e.type === 'gestureScrollUpdate') {
-      if (this.listenerCount('scroll-touch-edge') !== 0) {
-        warn();
-        this.emit('scroll-touch-edge');
-      }
-    } else if (e.type === 'gestureScrollEnd') {
-      if (this.listenerCount('scroll-touch-end') !== 0) {
-        warn();
-        this.emit('scroll-touch-edge');
-        this.emit('scroll-touch-end');
-      }
-    }
-  });
-
   // Notify the creation of the window.
   const event = process._linkedBinding('electron_browser_event').createEmpty();
   app.emit('browser-window-created', event, this);

lib/browser/api/crash-reporter.ts

@@ -1,5 +1,4 @@
-import { app } from 'electron/main';
-import * as deprecate from '@electron/internal/common/deprecate';
+import { app, deprecate } from 'electron/main';
 
 const binding = process._linkedBinding('electron_browser_crash_reporter');
 

lib/browser/api/desktop-capturer.ts

@@ -9,7 +9,8 @@ let currentlyRunning: {
 
 // |options.types| can't be empty and must be an array
 function isValid (options: Electron.SourcesOptions) {
-  return Array.isArray(options?.types);
+  const types = options ? options.types : undefined;
+  return Array.isArray(types);
 }
 
 export async function getSources (args: Electron.SourcesOptions) {

lib/browser/api/ipc-main.ts

@@ -2,4 +2,7 @@ import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
 
 const ipcMain = new IpcMainImpl();
 
+// Do not throw exception when channel name is "error".
+ipcMain.on('error', () => {});
+
 export default ipcMain;

lib/browser/api/menu.ts

@@ -142,7 +142,7 @@ Menu.prototype.insert = function (pos, item) {
   if (item.icon) this.setIcon(pos, item.icon);
   if (item.role) this.setRole(pos, item.role);
 
-  // Make menu accessible to items.
+  // Make menu accessable to items.
   item.overrideReadOnlyProperty('menu', this);
 
   // Remember the items.

lib/browser/api/module-list.ts

@@ -22,7 +22,6 @@ export const browserModuleList: ElectronInternal.ModuleEntry[] = [
   { name: 'Notification', loader: () => require('./notification') },
   { name: 'powerMonitor', loader: () => require('./power-monitor') },
   { name: 'powerSaveBlocker', loader: () => require('./power-save-blocker') },
-  { name: 'pushNotifications', loader: () => require('./push-notifications') },
   { name: 'protocol', loader: () => require('./protocol') },
   { name: 'safeStorage', loader: () => require('./safe-storage') },
   { name: 'screen', loader: () => require('./screen') },
@@ -31,7 +30,6 @@ export const browserModuleList: ElectronInternal.ModuleEntry[] = [
   { name: 'systemPreferences', loader: () => require('./system-preferences') },
   { name: 'TouchBar', loader: () => require('./touch-bar') },
   { name: 'Tray', loader: () => require('./tray') },
-  { name: 'utilityProcess', loader: () => require('./utility-process') },
   { name: 'View', loader: () => require('./view') },
   { name: 'webContents', loader: () => require('./web-contents') },
   { name: 'WebContentsView', loader: () => require('./web-contents-view') },

lib/browser/api/push-notifications.ts

@@ -1,3 +0,0 @@
-const { pushNotifications } = process._linkedBinding('electron_browser_push_notifications');
-
-export default pushNotifications;

lib/browser/api/touch-bar.ts

@@ -395,7 +395,7 @@ class TouchBar extends EventEmitter implements Electron.TouchBar {
     this.on('change', changeListener);
 
     const escapeItemListener = (item: Electron.TouchBarItemType | null) => {
-      window._setEscapeTouchBarItem(item ?? {});
+      window._setEscapeTouchBarItem(item != null ? item : {});
     };
     this.on('escape-item-change', escapeItemListener);
 

lib/browser/api/utility-process.ts

@@ -1,150 +0,0 @@
-import { EventEmitter } from 'events';
-import { Duplex, PassThrough } from 'stream';
-import { Socket } from 'net';
-import { MessagePortMain } from '@electron/internal/browser/message-port-main';
-const { _fork } = process._linkedBinding('electron_browser_utility_process');
-
-class ForkUtilityProcess extends EventEmitter {
-  #handle: ElectronInternal.UtilityProcessWrapper | null;
-  #stdout: Duplex | null = null;
-  #stderr: Duplex | null = null;
-  constructor (modulePath: string, args?: string[], options?: Electron.ForkOptions) {
-    super();
-
-    if (!modulePath) {
-      throw new Error('Missing UtilityProcess entry script.');
-    }
-
-    if (args == null) {
-      args = [];
-    } else if (typeof args === 'object' && !Array.isArray(args)) {
-      options = args;
-      args = [];
-    }
-
-    if (options == null) {
-      options = {};
-    } else {
-      options = { ...options };
-    }
-
-    if (!options) {
-      throw new Error('Options cannot be undefined.');
-    }
-
-    if (options.execArgv != null) {
-      if (!Array.isArray(options.execArgv)) {
-        throw new Error('execArgv must be an array of strings.');
-      }
-    }
-
-    if (options.serviceName != null) {
-      if (typeof options.serviceName !== 'string') {
-        throw new Error('serviceName must be a string.');
-      }
-    }
-
-    if (options.cwd != null) {
-      if (typeof options.cwd !== 'string') {
-        throw new Error('cwd path must be a string.');
-      }
-    }
-
-    if (typeof options.stdio === 'string') {
-      const stdio : Array<'pipe' | 'ignore' | 'inherit'> = [];
-      switch (options.stdio) {
-        case 'inherit':
-        case 'ignore':
-          stdio.push('ignore', options.stdio, options.stdio);
-          break;
-        case 'pipe':
-          this.#stderr = new PassThrough();
-          this.#stdout = new PassThrough();
-          stdio.push('ignore', options.stdio, options.stdio);
-          break;
-        default:
-          throw new Error('stdio must be of the following values: inherit, pipe, ignore');
-      }
-      options.stdio = stdio;
-    } else if (Array.isArray(options.stdio)) {
-      if (options.stdio.length >= 3) {
-        if (options.stdio[0] !== 'ignore') {
-          throw new Error('stdin value other than ignore is not supported.');
-        }
-
-        if (options.stdio[1] === 'pipe') {
-          this.#stdout = new PassThrough();
-        } else if (options.stdio[1] !== 'ignore' && options.stdio[1] !== 'inherit') {
-          throw new Error('stdout configuration must be of the following values: inherit, pipe, ignore');
-        }
-
-        if (options.stdio[2] === 'pipe') {
-          this.#stderr = new PassThrough();
-        } else if (options.stdio[2] !== 'ignore' && options.stdio[2] !== 'inherit') {
-          throw new Error('stderr configuration must be of the following values: inherit, pipe, ignore');
-        }
-      } else {
-        throw new Error('configuration missing for stdin, stdout or stderr.');
-      }
-    }
-
-    this.#handle = _fork({ options, modulePath, args });
-    this.#handle!.emit = (channel: string | symbol, ...args: any[]) => {
-      if (channel === 'exit') {
-        try {
-          this.emit('exit', ...args);
-        } finally {
-          this.#handle = null;
-          if (this.#stdout) {
-            this.#stdout.removeAllListeners();
-            this.#stdout = null;
-          }
-          if (this.#stderr) {
-            this.#stderr.removeAllListeners();
-            this.#stderr = null;
-          }
-        }
-        return false;
-      } else if (channel === 'stdout' && this.#stdout) {
-        new Socket({ fd: args[0], readable: true }).pipe(this.#stdout);
-        return true;
-      } else if (channel === 'stderr' && this.#stderr) {
-        new Socket({ fd: args[0], readable: true }).pipe(this.#stderr);
-        return true;
-      } else {
-        return this.emit(channel, ...args);
-      }
-    };
-  }
-
-  get pid () {
-    return this.#handle?.pid;
-  }
-
-  get stdout () {
-    return this.#stdout;
-  }
-
-  get stderr () {
-    return this.#stderr;
-  }
-
-  postMessage (message: any, transfer?: MessagePortMain[]) {
-    if (Array.isArray(transfer)) {
-      transfer = transfer.map((o: any) => o instanceof MessagePortMain ? o._internalPort : o);
-      return this.#handle?.postMessage(message, transfer);
-    }
-    return this.#handle?.postMessage(message);
-  }
-
-  kill () : boolean {
-    if (this.#handle === null) {
-      return false;
-    }
-    return this.#handle.kill();
-  }
-}
-
-export function fork (modulePath: string, args?: string[], options?: Electron.ForkOptions) {
-  return new ForkUtilityProcess(modulePath, args, options);
-}