Bump v18.3.15

* chore: cherry-pick a66438897056 from pdfium

* chore: update patches

Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: Electron Bot <electron@github.com>

.circleci/config/base.yml

@@ -24,7 +24,7 @@ parameters:
   linux-publish-arch-limit:
     type: enum
     default: all
-    enum: ["all", "arm", "arm64", "x64"]
+    enum: ["all", "arm", "arm64", "x64", "ia32"]
 
   run-macos-publish:
     type: boolean
@@ -107,6 +107,12 @@ env-unittests: &env-unittests
   BUILD_TARGET: electron/spec:chromium_unittests
   TESTS_CONFIG: src/electron/spec/configs/unittests.yml
 
+# Build targets options.
+env-ia32: &env-ia32
+  GN_EXTRA_ARGS: 'target_cpu = "x86"'
+  NPM_CONFIG_ARCH: ia32
+  TARGET_ARCH: ia32
+
 env-arm: &env-arm
   GN_EXTRA_ARGS: 'target_cpu = "arm"'
   MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm
@@ -216,7 +222,6 @@ step-maybe-cleanup-arm64-mac: &step-maybe-cleanup-arm64-mac
         rm -rf ~/Library/Application\ Support/electron*
         security delete-generic-password -l "Chromium Safe Storage" || echo "✓ Keychain does not contain password from tests"
         security delete-generic-password -l "Electron Test Main Safe Storage" || echo "✓ Keychain does not contain password from tests"
-        security delete-generic-password -a "electron-test-safe-storage" || echo "✓ Keychain does not contain password from tests"
       elif [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
         XVFB=/usr/bin/Xvfb
         /sbin/start-stop-daemon --stop --exec $XVFB || echo "Xvfb not running"
@@ -236,25 +241,11 @@ step-depot-tools-get: &step-depot-tools-get
     name: Get depot tools
     command: |
       git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-      cd depot_tools
-      git fetch --depth 1 origin b7d8efd8bee494f4cfacacc19cf50fc4d4be3900
-      git checkout b7d8efd8bee494f4cfacacc19cf50fc4d4be3900
-      touch .disable_auto_update
-      cd ..
+      # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
       if [ "`uname`" == "Darwin" ]; then
-        # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
         sed -i '' '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
       else
         sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-        # Remove swift-format dep from cipd on macOS until we send a patch upstream.
-        cd depot_tools
-        patch gclient.py -R \<<'EOF'
-      676,677c676
-      <         packages = dep_value.get('packages', [])
-      <         for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')):
-      ---
-      >         for package in dep_value.get('packages', []):
-      EOF
       fi
 
 step-depot-tools-add-to-path: &step-depot-tools-add-to-path
@@ -360,14 +351,14 @@ step-restore-brew-cache: &step-restore-brew-cache
       - /usr/local/Cellar/gnu-tar
       - /usr/local/bin/gtar
     keys:
-      - v5-brew-cache-{{ arch }}
+      - v4-brew-cache-{{ arch }}
 
 step-save-brew-cache: &step-save-brew-cache
   save_cache:
     paths:
       - /usr/local/Cellar/gnu-tar
       - /usr/local/bin/gtar
-    key: v5-brew-cache-{{ arch }}
+    key: v4-brew-cache-{{ arch }}
     name: Persisting brew cache
 
 step-get-more-space-on-mac: &step-get-more-space-on-mac
@@ -376,7 +367,6 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
     command: |
       if [ "`uname`" == "Darwin" ]; then
         sudo mkdir -p $TMPDIR/del-target
-
         tmpify() {
           if [ -d "$1" ]; then
             sudo mv "$1" $TMPDIR/del-target/$(echo $1|shasum -a 256|head -n1|cut -d " " -f1)
@@ -448,11 +438,9 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
     background: true
 
 # On macOS delete all .git directories under src/ expect for
-# third_party/angle/ and third_party/dawn/ because of build time generation of files
+# third_party/angle/ because of build time generation of file
 # gen/angle/commit.h depends on third_party/angle/.git/HEAD
 # https://chromium-review.googlesource.com/c/angle/angle/+/2074924
-# and dawn/common/Version_autogen.h depends on  third_party/dawn/.git/HEAD
-# https://dawn-review.googlesource.com/c/dawn/+/83901
 # TODO: maybe better to always leave out */.git/HEAD file for all targets ?
 step-delete-git-directories: &step-delete-git-directories
   run:
@@ -460,7 +448,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/*" ) | xargs rm -rf
       fi
 
 # On macOS the yarn install command during gclient sync was run on a linux
@@ -476,13 +464,6 @@ step-install-npm-deps-on-mac: &step-install-npm-deps-on-mac
         node script/yarn install
       fi
 
-step-install-npm-deps: &step-install-npm-deps
-  run:
-    name: Install node_modules
-    command: |
-      cd src/electron
-      node script/yarn install --frozen-lockfile
-
 # This step handles the differences between the linux "gclient sync"
 # and the expected state on macOS
 step-fix-sync: &step-fix-sync
@@ -553,7 +534,7 @@ step-gn-check: &step-gn-check
 step-electron-build: &step-electron-build
   run:
     name: Electron build
-    no_output_timeout: 60m
+    no_output_timeout: 30m
     command: |
       # On arm platforms we generate a cross-arch ffmpeg that ninja does not seem
       # to realize is not correct / should be rebuilt.  We delete it here so it is
@@ -594,6 +575,8 @@ step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
       if [ "$STRIP_BINARIES" == "true" ] && [ "`uname`" == "Linux" ]; then
         if [ x"$TARGET_ARCH" == x ]; then
           target_cpu=x64
+        elif [ "$TARGET_ARCH" == "ia32" ]; then
+          target_cpu=x86
         else
           target_cpu="$TARGET_ARCH"
         fi
@@ -643,7 +626,7 @@ step-electron-publish: &step-electron-publish
         echo 'Uploading Electron release distribution to Azure'
         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
 
@@ -656,7 +639,6 @@ step-persist-data-for-tests: &step-persist-data-for-tests
       - src/out/Default/mksnapshot.zip
       - src/out/Default/chromedriver.zip
       - src/out/Default/gen/node_headers
-      - src/out/Default/overlapped-checker
       - src/out/ffmpeg/ffmpeg.zip
       - src/electron
       - src/third_party/electron_node
@@ -683,6 +665,13 @@ step-electron-dist-unzip: &step-electron-dist-unzip
       #    passed.
       unzip -:o dist.zip
 
+step-ffmpeg-unzip: &step-ffmpeg-unzip
+  run:
+    name: Unzip ffmpeg.zip
+    command: |
+      cd src/out/ffmpeg
+      unzip -:o ffmpeg.zip
+
 step-mksnapshot-unzip: &step-mksnapshot-unzip
   run:
     name: Unzip mksnapshot.zip
@@ -711,6 +700,13 @@ step-ffmpeg-build: &step-ffmpeg-build
       cd src
       ninja -C out/ffmpeg electron:electron_ffmpeg_zip -j $NUMBER_OF_NINJA_PROCESSES
 
+step-verify-ffmpeg: &step-verify-ffmpeg
+  run:
+    name: Verify ffmpeg
+    command: |
+      cd src
+      python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
+
 step-verify-mksnapshot: &step-verify-mksnapshot
   run:
     name: Verify mksnapshot
@@ -818,7 +814,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
@@ -878,12 +874,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
@@ -898,6 +894,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:
+      - v9-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
@@ -915,6 +919,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: v9-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
@@ -944,16 +955,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:
@@ -963,7 +971,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:
@@ -977,16 +985,9 @@ step-ts-compile: &step-ts-compile
   run:
     name: Run TS/JS compile on doc only change
     command: |
-      cd src/electron
-      node script/yarn create-typescript-definitions
-      node script/yarn tsc -p tsconfig.default_app.json --noEmit
-      for f in build/webpack/*.js
-      do
-        out="${f:29}"
-        if [ "$out" != "base.js" ]; then
-          node script/yarn webpack --config $f --output-filename=$out --output-path=./.tmp --env.mode=development
-        fi
-      done
+      cd src
+      ninja -C out/Default electron:default_app_js -j $NUMBER_OF_NINJA_PROCESSES
+      ninja -C out/Default electron:electron_js2c -j $NUMBER_OF_NINJA_PROCESSES
 
 # List of all steps.
 steps-electron-gn-check: &steps-electron-gn-check
@@ -1008,11 +1009,86 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
   steps:
     # Checkout - Copied from steps-checkout
     - *step-checkout-electron
-    - *step-install-npm-deps
+    - *step-depot-tools-get
+    - *step-depot-tools-add-to-path
+    - *step-restore-brew-cache
+    - *step-install-gnutar-on-mac
+    - *step-get-more-space-on-mac
+    - *step-setup-goma-for-build
+    - *step-generate-deps-hash
+    - *step-touch-sync-done
+    - maybe-restore-portaled-src-cache
+    - *step-maybe-restore-git-cache
+    - *step-set-git-cache-path
+    # This sync call only runs if .circle-sync-done is an EMPTY file
+    - *step-gclient-sync
+    # These next few steps reset Electron to the correct commit regardless of which cache was restored
+    - run:
+        name: Wipe Electron
+        command: rm -rf src/electron
+    - *step-checkout-electron
+    - *step-run-electron-only-hooks
+    - *step-generate-deps-hash-cleanly
+    - *step-mark-sync-done
+    - *step-minimize-workspace-size-from-checkout
+
+    - *step-depot-tools-add-to-path
+    - *step-setup-env-for-build
+    - *step-wait-for-goma
+    - *step-get-more-space-on-mac
+    - *step-install-npm-deps-on-mac
+    - *step-fix-sync
+    - *step-gn-gen-default
 
     #Compile ts/js to verify doc change didn't break anything
     - *step-ts-compile
 
+steps-native-tests: &steps-native-tests
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-setup-env-for-build
+    - *step-setup-goma-for-build
+    - *step-wait-for-goma
+    - *step-gn-gen-default
+
+    - run:
+        name: Build tests
+        command: |
+          cd src
+          ninja -C out/Default $BUILD_TARGET
+    - *step-show-goma-stats
+
+    - *step-setup-linux-for-headless-testing
+    - run:
+        name: Run tests
+        command: |
+          mkdir test_results
+          python src/electron/script/native-tests.py run \
+            --config $TESTS_CONFIG \
+            --tests-dir src/out/Default \
+            --output-dir test_results  \
+            $TESTS_ARGS
+
+    - store_artifacts:
+        path: test_results
+        destination: test_results  # Put it in the root folder.
+    - store_test_results:
+        path: test_results
+
+steps-verify-ffmpeg: &steps-verify-ffmpeg
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-electron-dist-unzip
+    - *step-ffmpeg-unzip
+    - *step-setup-linux-for-headless-testing
+
+    - *step-verify-ffmpeg
+    - *step-maybe-notify-slack-failure
+
 steps-tests: &steps-tests
   steps:
     - attach_workspace:
@@ -1194,7 +1270,6 @@ commands:
             mv_if_exist src/out/Default/hunspell_dictionaries.zip
             mv_if_exist src/cross-arch-snapshots
             mv_if_exist src/out/electron_ninja_log
-            mv_if_exist src/out/Default/.ninja_log
           when: always
       - store_artifacts:
           path: generated_artifacts
@@ -1250,6 +1325,8 @@ commands:
                   target_os=linux
                   if [ x"$TARGET_ARCH" == x ]; then
                     target_cpu=x64
+                  elif [ "$TARGET_ARCH" == "ia32" ]; then
+                    target_cpu=x86
                   else
                     target_cpu="$TARGET_ARCH"
                   fi
@@ -1287,6 +1364,9 @@ commands:
       build:
         type: boolean
         default: true
+      use-out-cache:
+        type: boolean
+        default: true
       restore-src-cache:
         type: boolean
         default: true
@@ -1409,11 +1489,15 @@ 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
             - step-electron-dist-build:
-                additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip
+                additional-targets: shell_browser_ui_unittests third_party/electron_node:headers electron:hunspell_dictionaries_zip
 
             - *step-show-goma-stats
 
@@ -1451,6 +1535,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
 
@@ -1604,6 +1704,7 @@ jobs:
           persist: true
           checkout: false
           checkout-and-assume-cache: true
+          use-out-cache: false
 
   linux-x64-testing-asan:
     executor:
@@ -1620,6 +1721,7 @@ jobs:
       - electron-build:
           persist: true
           checkout: true
+          use-out-cache: false
           build-nonproprietary-ffmpeg: false
 
   linux-x64-testing-no-run-as-node:
@@ -1636,6 +1738,7 @@ jobs:
       - electron-build:
           persist: false
           checkout: true
+          use-out-cache: false
 
   linux-x64-testing-gn-check:
     executor:
@@ -1668,6 +1771,44 @@ jobs:
                 attach: false
                 checkout: true
 
+  linux-ia32-testing:
+    executor:
+      name: linux-docker
+      size: xlarge
+    environment:
+      <<: *env-global
+      <<: *env-ia32
+      <<: *env-testing-build
+      <<: *env-ninja-status
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+    steps:
+      - electron-build:
+          persist: true
+          checkout: true
+          use-out-cache: false
+
+  linux-ia32-publish:
+    executor:
+      name: linux-docker
+      size: 2xlarge
+    environment:
+      <<: *env-linux-2xlarge-release
+      <<: *env-ia32
+      <<: *env-release-build
+      <<: *env-32bit-release
+      UPLOAD_TO_STORAGE: << pipeline.parameters.upload-to-storage >>
+      <<: *env-ninja-status
+    steps:
+      - run: echo running
+      - when:
+          condition:
+            or:
+              - equal: ["all", << pipeline.parameters.linux-publish-arch-limit >>]
+              - equal: ["ia32", << pipeline.parameters.linux-publish-arch-limit >>]
+          steps:
+            - electron-publish:
+                attach: false
+                checkout: true
 
   linux-arm-testing:
     executor:
@@ -1686,6 +1827,7 @@ jobs:
           persist: true
           checkout: false
           checkout-and-assume-cache: true
+          use-out-cache: false
 
   linux-arm-publish:
     executor:
@@ -1728,6 +1870,7 @@ jobs:
           persist: true
           checkout: false
           checkout-and-assume-cache: true
+          use-out-cache: false
 
   linux-arm64-testing-gn-check:
     executor:
@@ -1790,7 +1933,7 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     <<: *steps-electron-gn-check
 
-  osx-publish-x64:
+  osx-publish-x64-skip-checkout:
     executor:
       name: macos
       size: macos.x86.medium.gen2
@@ -1811,7 +1954,7 @@ jobs:
                 attach: true
                 checkout: false
 
-  osx-publish-arm64:
+  osx-publish-arm64-skip-checkout:
     executor:
       name: macos
       size: macos.x86.medium.gen2
@@ -1881,7 +2024,7 @@ jobs:
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
     <<: *steps-electron-gn-check
 
-  mas-publish-x64:
+  mas-publish-x64-skip-checkout:
     executor:
       name: macos
       size: macos.x86.medium.gen2
@@ -1902,7 +2045,7 @@ jobs:
                 attach: true
                 checkout: false
 
-  mas-publish-arm64:
+  mas-publish-arm64-skip-checkout:
     executor:
       name: macos
       size: macos.x86.medium.gen2
@@ -1988,6 +2131,61 @@ jobs:
       <<: *env-stack-dumping
     <<: *steps-test-node
 
+  linux-x64-verify-ffmpeg:
+    executor:
+      name: linux-docker
+      size: medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-headless-testing
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-ffmpeg
+
+  linux-ia32-testing-tests:
+    executor:
+      name: linux-docker
+      size: medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-ia32
+      <<: *env-headless-testing
+      <<: *env-stack-dumping
+    parallelism: 3
+    <<: *steps-tests
+
+  linux-ia32-testing-nan:
+    executor:
+      name: linux-docker
+      size: medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-ia32
+      <<: *env-headless-testing
+      <<: *env-stack-dumping
+    <<: *steps-test-nan
+
+  linux-ia32-testing-node:
+    executor:
+      name: linux-docker
+      size: xlarge
+    environment:
+      <<: *env-linux-medium
+      <<: *env-ia32
+      <<: *env-headless-testing
+      <<: *env-stack-dumping
+    <<: *steps-test-node
+
+  linux-ia32-verify-ffmpeg:
+    executor:
+      name: linux-docker
+      size: medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-ia32
+      <<: *env-headless-testing
+      <<: *env-send-slack-notifications
+    <<: *steps-verify-ffmpeg
+
   linux-arm-testing-tests:
     executor: linux-arm
     environment:
@@ -2044,6 +2242,17 @@ jobs:
       <<: *env-runner
     <<: *steps-tests
 
+  # Layer 4: Summary.
+  linux-release-summary:
+    executor:
+      name: linux-docker
+      size: medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-send-slack-notifications
+    steps:
+      - *step-maybe-notify-slack-success
+
 # List all workflows
 workflows:
   docs-only:
@@ -2060,6 +2269,8 @@ workflows:
     jobs:
     - linux-x64-publish:
         context: release-env
+    - linux-ia32-publish:
+        context: release-env
     - linux-arm-publish:
         context: release-env
     - linux-arm64-publish:
@@ -2069,19 +2280,19 @@ workflows:
     when: << pipeline.parameters.run-macos-publish >>
     jobs:
     - mac-checkout
-    - osx-publish-x64:
+    - osx-publish-x64-skip-checkout:
         requires:
           - mac-checkout
         context: release-env
-    - mas-publish-x64:
+    - mas-publish-x64-skip-checkout:
         requires:
           - mac-checkout
         context: release-env
-    - osx-publish-arm64:
+    - osx-publish-arm64-skip-checkout:
         requires:
           - mac-checkout
         context: release-env
-    - mas-publish-arm64:
+    - mas-publish-arm64-skip-checkout:
         requires:
           - mac-checkout
         context: release-env
@@ -2118,6 +2329,18 @@ workflows:
       - linux-x64-testing-node:
           requires:
             - linux-x64-testing
+      - linux-ia32-testing:
+          requires:
+            - linux-make-src-cache
+      - linux-ia32-testing-tests:
+          requires:
+            - linux-ia32-testing
+      - linux-ia32-testing-nan:
+          requires:
+            - linux-ia32-testing
+      - linux-ia32-testing-node:
+          requires:
+            - linux-ia32-testing
       - linux-arm-testing:
           requires:
             - linux-make-src-cache

.eslintrc.json

@@ -1,5 +1,4 @@
 {
-  "root": true,
   "extends": "standard",
   "parser": "@typescript-eslint/parser",
   "plugins": ["@typescript-eslint"],

.git-blame-ignore-revs

@@ -1,5 +0,0 @@
-# Atom --> Electron rename
-d9321f4df751fa32813fab1b6387bbd61bd681d0
-34c4c8d5088fa183f56baea28809de6f2a427e02
-# Enable JS Semicolons
-5d657dece4102e5e5304d42e8004b6ad64c0fcda

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -17,11 +17,8 @@ body:
 - type: input
   attributes:
     label: Electron Version
-    description: |
-      What version of Electron are you using?
-      
-      Note: Please only report issues for [currently supported versions of Electron](https://www.electronjs.org/docs/latest/tutorial/support#currently-supported-versions).
-    placeholder: 17.0.0
+    description: What version of Electron are you using?
+    placeholder: 12.0.0
   validations:
     required: true
 - type: dropdown
@@ -56,7 +53,7 @@ body:
   attributes:
     label: Last Known Working Electron version
     description: What is the last version of Electron this worked in, if applicable?
-    placeholder: 16.0.0
+    placeholder: 11.0.0
 - type: textarea
   attributes:
     label: Expected Behavior

.github/semantic.yml

@@ -0,0 +1,2 @@
+# Always validate the PR title, and ignore the commits
+titleOnly: true

.github/workflows/electron_woa_testing.yml

@@ -0,0 +1,178 @@
+name: Electron WOA Testing
+
+on:
+  push:    
+    branches: '**'
+  workflow_dispatch:
+    inputs:
+      appveyor_job_id:
+        description: 'Job Id of Appveyor WOA job to test'
+        type: text
+        required: true
+
+jobs:
+  electron-woa-init:
+    if: ${{ github.event_name == 'push' && github.repository == 'electron/electron' }}
+    runs-on: ubuntu-latest
+    steps:
+        - name: Dummy step for push event
+          run: |
+            echo "This job is a needed initialization step for Electron WOA testing.  Another test result will appear once the electron-woa-testing build is done."
+
+  electron-woa-testing:    
+    if: ${{ github.event_name == 'workflow_dispatch' && github.repository == 'electron/electron' }}    
+    runs-on: [self-hosted, woa]  
+    permissions:
+      checks: write
+      pull-requests: write
+    steps:
+    - uses: LouisBrunner/checks-action@v1.1.1
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: electron-woa-testing
+        status: in_progress
+        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}    
+        output: |
+          {"summary":"Test In Progress","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}        
+    - name: Clean Workspace
+      run: |
+        Remove-Item * -Recurse -Force
+      shell: powershell
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        path: src\electron
+        fetch-depth: 0
+    - name: Yarn install
+      run: |
+        cd src\electron
+        node script/yarn.js install --frozen-lockfile
+    - name: Download and extract dist.zip for test
+      run: |
+        $localArtifactPath = "$pwd\dist.zip"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/dist.zip"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\Default -y $localArtifactPath
+      shell: powershell
+    - name: Download and extract native test executables for test
+      run: |
+        $localArtifactPath = "src\out\Default\shell_browser_ui_unittests.exe"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/shell_browser_ui_unittests.exe"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+      shell: powershell
+    - name: Download and extract ffmpeg.zip for test
+      run: |
+        $localArtifactPath = "$pwd\ffmpeg.zip"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/ffmpeg.zip"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\ffmpeg $localArtifactPath
+      shell: powershell
+    - name: Download node headers for test
+      run: |
+        $localArtifactPath = "src\node_headers.zip"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/node_headers.zip"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+        cd src
+        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
+      shell: powershell
+    - name: Download electron.lib for test
+      run: |
+        $localArtifactPath = "src\out\Default\electron.lib"
+        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/electron.lib"
+        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+      shell: powershell
+    # Uncomment the following block if pdb files are needed to debug issues
+    # - name: Download pdb files for detailed stacktraces
+    #   if: ${{ github.event_name == 'workflow_dispatch' }}
+    #   run: |
+    #     try {
+    #       $localArtifactPath = "src\pdb.zip"
+    #       $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/pdb.zip"
+    #       Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
+    #       cd src
+    #       & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y pdb.zip
+    #     } catch {
+    #       Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
+    #     } finally {
+    #       $global:LASTEXITCODE = 0
+    #     }
+    #   shell: powershell
+    - name: Setup node headers
+      run: |
+        New-Item src\out\Default\gen\node_headers\Release -Type directory
+        Copy-Item -path src\out\Default\electron.lib -destination src\out\Default\gen\node_headers\Release\node.lib
+      shell: powershell
+    - name: Run Electron Main process tests
+      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=main --enable-logging --disable-features=CalculateNativeWinOcclusion  
+      env:
+        ELECTRON_ENABLE_STACK_DUMPING: true
+        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: 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
+        echo "Verifying non proprietary ffmpeg"
+        python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
+      shell: cmd
+    - name: Kill processes left running from last test run
+      if: ${{ always() }}
+      run: |
+        Get-Process | Where Name -Like "electron*" | Stop-Process
+        Get-Process | Where Name -Like "msedge*" | Stop-Process
+      shell: powershell
+    - name: Delete user app data directories
+      if: ${{ always() }}
+      run: |
+        Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
+      shell: powershell
+    - uses: LouisBrunner/checks-action@v1.1.1
+      if: ${{ success() }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: electron-woa-testing
+        conclusion: "${{ job.status }}"
+        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        output: |
+          {"summary":"${{ job.status }}","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}
+    - uses: LouisBrunner/checks-action@v1.1.1
+      if: ${{ success() }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: electron-woa-testing
+        conclusion: "${{ job.status }}"
+        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        output: |
+          {"summary":"Job Succeeded","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}          
+    - uses: LouisBrunner/checks-action@v1.1.1
+      if: ${{ ! success() }}
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        name: electron-woa-testing
+        conclusion: "${{ job.status }}"
+        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+        output: |
+          {"summary":"Job Failed","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}                    

.github/workflows/semantic.yml

@@ -7,14 +7,8 @@ on:
       - edited
       - synchronize
 
-permissions:
-  contents: read
-
 jobs:
   main:
-    permissions:
-      pull-requests: read  # for amannn/action-semantic-pull-request to analyze PRs
-      statuses: write  # for amannn/action-semantic-pull-request to mark status of analyzed PR
     name: Validate PR Title
     runs-on: ubuntu-latest
     steps:

.github/workflows/update_appveyor_image.yml

@@ -1,62 +0,0 @@
-name: Update AppVeyor Image
-
-# Run chron daily Mon-Fri
-on:
-  schedule:
-    - cron: '0 8 * * 1-5' # runs 8:00 every business day (see https://crontab.guru)
-
-permissions:
-  contents: write
-  pull-requests: write
-
-jobs:
-  bake-appveyor-image:
-    name: Bake AppVeyor Image
-    permissions:
-      contents: write
-      pull-requests: write  # to create a new PR with updated Appveyor images
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        fetch-depth: 0
-    - name: Yarn install
-      run: |
-        node script/yarn.js install --frozen-lockfile
-    - name: Set Repo for Commit
-      run: git config --global --add safe.directory $GITHUB_WORKSPACE
-    - name: Check AppVeyor Image
-      env:
-        APPVEYOR_TOKEN: ${{ secrets.APPVEYOR_TOKEN }}
-      run: |
-        node ./script/prepare-appveyor
-        if [ -f ./image_version.txt ]; then
-          echo "APPVEYOR_IMAGE_VERSION="$(cat image_version.txt)"" >> $GITHUB_ENV
-          rm image_version.txt
-        fi
-    - name: (Optionally) Update Appveyor Image
-      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: mikefarah/yq@v4.27.2
-      with:
-        cmd: yq '.image = "${{ env.APPVEYOR_IMAGE_VERSION }}"' "appveyor.yml" > "appveyor2.yml"
-    - name: (Optionally) Generate Commit Diff
-      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      run: |
-        diff -w -B appveyor.yml appveyor2.yml > appveyor.diff || true
-        patch -f appveyor.yml < appveyor.diff
-        rm appveyor2.yml appveyor.diff
-    - name: (Optionally) Commit and Pull Request
-      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: peter-evans/create-pull-request@v4
-      with:
-        token: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
-        commit-message: 'build: update appveyor image to latest version'
-        committer: GitHub <noreply@github.com>
-        author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-        signoff: false
-        branch: bump-appveyor-image
-        delete-branch: true
-        title: 'build: update appveyor image to latest version'
-        body: |
-          This PR updates appveyor.yml to the latest baked image, ${{ env.APPVEYOR_IMAGE_VERSION }}.

BUILD.gn

@@ -37,7 +37,7 @@ if (is_mac) {
   import("build/rules.gni")
 
   assert(
-      mac_deployment_target == "10.13",
+      mac_deployment_target == "10.11.0",
       "Chromium has updated the mac_deployment_target, please update this assert, update the supported versions documentation (docs/tutorial/support.md) and flag this as a breaking change")
 }
 
@@ -79,13 +79,6 @@ if (is_linux) {
     ]
   }
 
-  # Generates electron_gtk_stubs.h header which contains
-  # stubs for extracting function ptrs from the gtk library.
-  # Function signatures for which stubs are required should be
-  # declared in electron_gtk.sigs, currently this file contains
-  # signatures for the functions used with native file chooser
-  # implementation. In future, this file can be extended to contain
-  # gtk4 stubs to switch gtk version in runtime.
   generate_stubs("electron_gtk_stubs") {
     sigs = [
       "shell/browser/ui/electron_gdk_pixbuf.sigs",
@@ -107,14 +100,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,
@@ -241,7 +226,6 @@ action("electron_js2c") {
 action("generate_config_gypi") {
   outputs = [ "$root_gen_dir/config.gypi" ]
   script = "script/generate-config-gypi.py"
-  inputs = [ "//third_party/electron_node/configure.py" ]
   args = rebase_path(outputs) + [ target_cpu ]
 }
 
@@ -310,9 +294,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") {
@@ -324,39 +311,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"
 
@@ -408,7 +362,6 @@ source_set("electron_lib") {
     "shell/common/api:mojo",
     "//base:base_static",
     "//base/allocator:buildflags",
-    "//chrome:strings",
     "//chrome/app:command_ids",
     "//chrome/app/resources:platform_locale_settings",
     "//components/autofill/core/common:features",
@@ -441,6 +394,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",
@@ -558,8 +514,6 @@ source_set("electron_lib") {
       "StoreKit.framework",
     ]
 
-    weak_frameworks = [ "QuickLookThumbnailing.framework" ]
-
     sources += [
       "shell/browser/ui/views/autofill_popup_view.cc",
       "shell/browser/ui/views/autofill_popup_view.h",
@@ -601,8 +555,8 @@ source_set("electron_lib") {
       "//ui/base/ime/linux",
       "//ui/events/devices/x11",
       "//ui/events/platform/x11",
+      "//ui/gtk",
       "//ui/views/controls/webview",
-      "//ui/views/linux_ui:linux_ui_factory",
       "//ui/wm",
     ]
     if (ozone_platform_x11) {
@@ -651,15 +605,8 @@ source_set("electron_lib") {
   }
 
   if (enable_plugins) {
-    deps += [
-      "chromium_src:plugins",
-      "//ppapi/host",
-      "//ppapi/proxy",
-      "//ppapi/shared_impl",
-    ]
+    deps += [ "chromium_src:plugins" ]
     sources += [
-      "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",
     ]
@@ -763,7 +710,7 @@ source_set("electron_lib") {
       "//components/pdf/browser:interceptors",
       "//components/pdf/common",
       "//components/pdf/renderer",
-      "//pdf",
+      "//pdf:pdf_ppapi",
     ]
     sources += [
       "shell/browser/electron_pdf_web_contents_helper_client.cc",
@@ -773,6 +720,14 @@ source_set("electron_lib") {
 
   sources += get_target_outputs(":electron_fuses")
 
+  if (is_win && enable_win_dark_mode_window_ui) {
+    sources += [
+      "shell/browser/win/dark_mode.cc",
+      "shell/browser/win/dark_mode.h",
+    ]
+    libs += [ "uxtheme.lib" ]
+  }
+
   if (allow_runtime_configurable_key_storage) {
     defines += [ "ALLOW_RUNTIME_CONFIGURABLE_KEY_STORAGE" ]
   }
@@ -792,6 +747,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" ]
@@ -856,11 +812,16 @@ if (is_mac) {
     # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
     bundle_data("electron_swiftshader_binaries") {
       sources = [
+        "$root_out_dir/egl_intermediates/libswiftshader_libEGL.dylib",
+        "$root_out_dir/egl_intermediates/libswiftshader_libGLESv2.dylib",
         "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
         "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
       ]
       outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
-      public_deps = [ "//ui/gl:swiftshader_vk_library_copy" ]
+      public_deps = [
+        "//ui/gl:swiftshader_egl_library_copy",
+        "//ui/gl:swiftshader_vk_library_copy",
+      ]
     }
   }
   group("electron_angle_library") {
@@ -949,10 +910,7 @@ if (is_mac) {
       assert(defined(invoker.helper_name_suffix))
 
       output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [
-        ":electron_framework+link",
-        "//base/allocator:early_zone_registration_mac",
-      ]
+      deps = [ ":electron_framework+link" ]
       if (!is_mas_build) {
         deps += [ "//sandbox/mac:seatbelt" ]
       }
@@ -1060,14 +1018,14 @@ if (is_mac) {
   action("electron_app_lproj_dirs") {
     outputs = []
 
-    foreach(locale, locales_as_apple_outputs) {
+    foreach(locale, locales_as_mac_outputs) {
       outputs += [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
     }
     script = "build/mac/make_locale_dirs.py"
     args = rebase_path(outputs)
   }
 
-  foreach(locale, locales_as_apple_outputs) {
+  foreach(locale, locales_as_mac_outputs) {
     bundle_data("electron_app_strings_${locale}_bundle_data") {
       sources = [ "$target_gen_dir/app_infoplist_strings/$locale.lproj" ]
       outputs = [ "{{bundle_resources_dir}}/$locale.lproj" ]
@@ -1076,7 +1034,7 @@ if (is_mac) {
   }
   group("electron_app_strings_bundle_data") {
     public_deps = []
-    foreach(locale, locales_as_apple_outputs) {
+    foreach(locale, locales_as_mac_outputs) {
       public_deps += [ ":electron_app_strings_${locale}_bundle_data" ]
     }
   }
@@ -1112,7 +1070,6 @@ if (is_mac) {
       ":electron_app_plist",
       ":electron_app_resources",
       ":electron_fuses",
-      "//base/allocator:early_zone_registration_mac",
       "//electron/buildflags",
     ]
     if (is_mas_build) {
@@ -1156,18 +1113,21 @@ if (is_mac) {
       deps = [ ":electron_app" ]
     }
 
-    extract_symbols("egl_syms") {
-      binary = "$root_out_dir/libEGL.dylib"
+    extract_symbols("swiftshader_egl_syms") {
+      binary = "$root_out_dir/libswiftshader_libEGL.dylib"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      dsym_file = "$root_out_dir/libEGL.dylib.dSYM/Contents/Resources/DWARF/libEGL.dylib"
-      deps = [ "//third_party/angle:libEGL" ]
+      dsym_file = "$root_out_dir/libswiftshader_libEGL.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libEGL.dylib"
+      deps =
+          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
     }
 
-    extract_symbols("gles_syms") {
-      binary = "$root_out_dir/libGLESv2.dylib"
+    extract_symbols("swiftshader_gles_syms") {
+      binary = "$root_out_dir/libswiftshader_libGLESv2.dylib"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      dsym_file = "$root_out_dir/libGLESv2.dylib.dSYM/Contents/Resources/DWARF/libGLESv2.dylib"
-      deps = [ "//third_party/angle:libGLESv2" ]
+      dsym_file = "$root_out_dir/libswiftshader_libGLESv2.dylib.dSYM/Contents/Resources/DWARF/libswiftshader_libGLESv2.dylib"
+      deps = [
+        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
+      ]
     }
 
     extract_symbols("crashpad_handler_syms") {
@@ -1179,10 +1139,10 @@ if (is_mac) {
 
     group("electron_symbols") {
       deps = [
-        ":egl_syms",
         ":electron_app_syms",
         ":electron_framework_syms",
-        ":gles_syms",
+        ":swiftshader_egl_syms",
+        ":swiftshader_gles_syms",
       ]
 
       if (!is_mas_build) {
@@ -1225,7 +1185,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",
@@ -1259,7 +1218,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",
       ]
 
@@ -1341,23 +1301,27 @@ if (is_mac) {
       deps = [ ":electron_app" ]
     }
 
-    extract_symbols("egl_symbols") {
-      binary = "$root_out_dir/libEGL$_target_shared_library_suffix"
+    extract_symbols("swiftshader_egl_symbols") {
+      binary = "$root_out_dir/swiftshader/libEGL$_target_shared_library_suffix"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [ "//third_party/angle:libEGL" ]
+      deps =
+          [ "//third_party/swiftshader/src/OpenGL/libEGL:swiftshader_libEGL" ]
     }
 
-    extract_symbols("gles_symbols") {
-      binary = "$root_out_dir/libGLESv2$_target_shared_library_suffix"
+    extract_symbols("swiftshader_gles_symbols") {
+      binary =
+          "$root_out_dir/swiftshader/libGLESv2$_target_shared_library_suffix"
       symbol_dir = "$root_out_dir/breakpad_symbols"
-      deps = [ "//third_party/angle:libGLESv2" ]
+      deps = [
+        "//third_party/swiftshader/src/OpenGL/libGLESv2:swiftshader_libGLESv2",
+      ]
     }
 
     group("electron_symbols") {
       deps = [
-        ":egl_symbols",
         ":electron_app_symbols",
-        ":gles_symbols",
+        ":swiftshader_egl_symbols",
+        ":swiftshader_gles_symbols",
       ]
     }
   }
@@ -1441,10 +1405,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

@@ -1,12 +1,28 @@
-gclient_gn_args_from = 'src'
+gclient_gn_args_file = 'src/build/config/gclient_args.gni'
+gclient_gn_args = [
+  'build_with_chromium',
+  'checkout_android',
+  'checkout_android_native_support',
+  'checkout_libaom',
+  'checkout_nacl',
+  'checkout_pgo_profiles',
+  'checkout_oculus_sdk',
+  'checkout_openxr',
+  'checkout_google_benchmark',
+  'mac_xcode_version',
+  'generate_location_tags',
+]
 
 vars = {
   'chromium_version':
-    '104.0.5112.124',
+    '100.0.4896.160',
   'node_version':
-    'v16.15.0',
+    'v16.13.2',
   'nan_version':
-    '16fa32231e2ccd89d2804b3f765319128b20c4ac',
+    # The following commit hash of NAN is v2.14.2 with *only* changes to the
+    # test suite. This should be updated to a specific tag when one becomes
+    # available.
+    '65b32af46e9d7fab2e4ff657751205b3865f4920',
   'squirrel.mac_version':
     '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',
 

ELECTRON_VERSION

@@ -0,0 +1 @@
+18.3.15

README.md

@@ -34,17 +34,6 @@ For more installation options and troubleshooting tips, see
 [installation](docs/tutorial/installation.md). For info on how to manage Electron versions in your apps, see
 [Electron versioning](docs/tutorial/electron-versioning.md).
 
-## Platform support
-
-Each Electron release provides binaries for macOS, Windows, and Linux.
-
-* macOS (High Sierra and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
-* Windows (Windows 7 and up): Electron provides `ia32` (`x86`), `x64` (`amd64`), and `arm64` binaries for Windows. Windows on ARM support was added in Electron 5.0.8.
-* Linux: The prebuilt binaries of Electron are built on Ubuntu 20.04. They have also been verified to work on:
-  * Ubuntu 14.04 and newer
-  * Fedora 24 and newer
-  * Debian 8 and newer
-
 ## Quick start & Electron Fiddle
 
 Use [`Electron Fiddle`](https://github.com/electron/fiddle)
@@ -65,10 +54,12 @@ npm start
 
 ## Resources for learning Electron
 
-* [electronjs.org/docs](https://electronjs.org/docs) - All of Electron's documentation
-* [electron/fiddle](https://github.com/electron/fiddle) - A tool to build, run, and package small Electron experiments
-* [electron/electron-quick-start](https://github.com/electron/electron-quick-start) - A very basic starter Electron app
-* [electronjs.org/community#boilerplates](https://electronjs.org/community#boilerplates) - Sample starter apps created by the community
+- [electronjs.org/docs](https://electronjs.org/docs) - All of Electron's documentation
+- [electron/fiddle](https://github.com/electron/fiddle) - A tool to build, run, and package small Electron experiments
+- [electron/electron-quick-start](https://github.com/electron/electron-quick-start) - A very basic starter Electron app
+- [electronjs.org/community#boilerplates](https://electronjs.org/community#boilerplates) - Sample starter apps created by the community
+- [electron/simple-samples](https://github.com/electron/simple-samples) - Small applications with ideas for taking them further
+- [electron/electron-api-demos](https://github.com/electron/electron-api-demos) - An Electron app that teaches you how to use Electron
 
 ## Programmatic usage
 
@@ -89,15 +80,11 @@ const child = proc.spawn(electron)
 
 ### Mirrors
 
-* [China](https://npmmirror.com/mirrors/electron/)
+- [China](https://npmmirror.com/mirrors/electron)
 
-See the [Advanced Installation Instructions](https://www.electronjs.org/docs/latest/tutorial/installation#mirror) to learn how to use a custom mirror.
+## Documentation Translations
 
-## Documentation translations
-
-We crowdsource translations for our documentation via [Crowdin](https://crowdin.com/project/electron).
-We currently accept translations for Chinese (Simplified), French, German, Japanese, Portuguese,
-Russian, and Spanish.
+Find documentation translations in [electron/i18n](https://github.com/electron/i18n).
 
 ## Contributing
 
@@ -106,10 +93,10 @@ If you are interested in reporting/fixing issues and contributing directly to th
 ## Community
 
 Info on reporting bugs, getting help, finding third-party tools and sample apps,
-and more can be found on the [Community page](https://www.electronjs.org/community).
+and more can be found in the [support document](docs/tutorial/support.md#finding-support).
 
 ## License
 
 [MIT](https://github.com/electron/electron/blob/main/LICENSE)
 
-When using Electron logos, make sure to follow [OpenJS Foundation Trademark Policy](https://openjsf.org/wp-content/uploads/sites/84/2021/01/OpenJS-Foundation-Trademark-Policy-2021-01-12.docx.pdf).
+When using the Electron or other GitHub logos, be sure to follow the [GitHub logo guidelines](https://github.com/logos).

appveyor-bake.yml

@@ -1,52 +0,0 @@
-# The config is used to bake appveyor images, not for running CI jobs.
-# The config expects the following environment variables to be set:
-#  - "APPVEYOR_BAKE_IMAGE" e.g. 'electron-99.0.4767.0'. Name of the image to be baked.
-#      Typically named after the Chromium version on which the image is built.
-#      This can be set dynamically in the prepare-appveyor script.
-
-version: 1.0.{build}
-build_cloud: electronhq-16-core
-image: Windows_Default_Appveyor
-environment:
-  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
-  ELECTRON_OUT_DIR: Default
-  ELECTRON_ENABLE_STACK_DUMPING: 1
-  MOCHA_REPORTER: mocha-multi-reporters
-  MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
-  GOMA_FALLBACK_ON_AUTH_FAILURE: true
-  DEPOT_TOOLS_WIN_TOOLCHAIN: 0
-  PYTHONIOENCODING: UTF-8
-build_script:
-  - ps: Resize-Partition -DriveLetter C -Size (256GB) # ensure initial partition size
-  - ps: Get-Partition -DriveLetter C
-  - git config --global core.longpaths true
-  - cd ..
-  - mkdir src
-  - ps: git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git  
-  - ps: $env:PATH="$pwd\depot_tools;$env:PATH"  
-  - update_depot_tools.bat
-  - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
-  - src\electron\script\setup-win-for-dev.bat
-  - >-
-      gclient config
-      --name "src\electron"
-      --unmanaged
-      %GCLIENT_EXTRA_ARGS%
-      "https://github.com/electron/electron"
-  - ps: cd src\electron
-  - ps: node script\generate-deps-hash.js
-  - ps: $depshash = Get-Content .\.depshash -Raw
-  - ps: Copy-Item -path .\.depshash -destination ..\.depshash
-  - ps: cd ..\..
-  - gclient sync --with_branch_heads --with_tags --nohooks
-  - ps: regsvr32 /s "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\DIA SDK\bin\amd64\msdia140.dll"
-on_image_bake:
-  - ps: >-
-      echo "Baking image: $env:APPVEYOR_BAKE_IMAGE at dir $PWD"
-  - ps: Remove-Item -Recurse -Force $pwd\depot_tools
-  - ps: Remove-Item -Recurse -Force $pwd\src\electron
-# Uncomment these lines to enable RDP
-#on_finish:
-#  - ps: >-
-#       $env:APPVEYOR_RDP_PASSWORD = "electron"
-#       $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

appveyor-woa.yml

@@ -1,286 +0,0 @@
-# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor.yml 
-# IF APPLICABLE!!!! 
-#
-#
-# The config expects the following environment variables to be set:
-#  - "GN_CONFIG" Build type. One of {'testing', 'release'}.
-#  - "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
-#      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.
-#      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "TARGET_ARCH" value.
-#  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
-#      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.
-#      (The value is only checked if "ELECTRON_RELEASE" is defined.)
-#
-# The publishing scripts expect access tokens to be defined as env vars,
-# but those are not covered here.
-#
-# AppVeyor docs on variables:
-# https://www.appveyor.com/docs/environment-variables/
-# https://www.appveyor.com/docs/build-configuration/#secure-variables
-# https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
-
-version: 1.0.{build}
-build_cloud: electronhq-16-core
-image: e-106.0.5249.199
-environment:
-  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
-  ELECTRON_OUT_DIR: Default
-  ELECTRON_ENABLE_STACK_DUMPING: 1
-  ELECTRON_ALSO_LOG_TO_STDERR: 1
-  MOCHA_REPORTER: mocha-multi-reporters
-  MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
-  GOMA_FALLBACK_ON_AUTH_FAILURE: true
-  DEPOT_TOOLS_WIN_TOOLCHAIN: 0
-  PYTHONIOENCODING: UTF-8
-
-  matrix:
-
-    - job_name: Build Arm on X64 Windows
-    - job_name: Test On Windows On Arm Hardware
-      job_depends_on: Build Arm on X64 Windows
-      APPVEYOR_BUILD_WORKER_IMAGE: base-woa
-      APPVEYOR_BUILD_WORKER_CLOUD: electronhq-woa
-
-clone_folder: C:\projects\src\electron
-
-skip_branch_with_pr: true
-
-# the first failed job cancels other jobs and fails entire build
-matrix:
-  fast_finish: true
-
-for:
-
-  - matrix:
-      only:
-        - job_name: Build Arm on X64 Windows
-
-    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 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
-      - ps: >-
-          if (Test-Path -Path "$pwd\depot_tools") {
-            Remove-Item -Recurse -Force $pwd\depot_tools
-          }
-      - ps: >-
-          if (Test-Path -Path "$pwd\build-tools") {
-            Remove-Item -Recurse -Force $pwd\build-tools
-          }
-      - ps: | 
-          git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-          cd depot_tools
-          git fetch --depth 1 origin b7d8efd8bee494f4cfacacc19cf50fc4d4be3900
-          git checkout b7d8efd8bee494f4cfacacc19cf50fc4d4be3900
-          New-Item -Name .disable_auto_update -ItemType File
-          bootstrap\win_tools.bat
-          cd ..
-      - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
-      - ps: >-
-          if (Test-Path -Path "$pwd\src\electron") {
-            Remove-Item -Recurse -Force $pwd\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 {
-              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"
-      # Patches are applied in the image bake. Check depshash to see if patches have changed. 
-      - ps: $env:RUN_GCLIENT_SYNC="false"
-      - ps: $depshash_baked = Get-Content .\src\.depshash -Raw
-      - ps: cd src\electron
-      - ps: node script\generate-deps-hash.js
-      - ps: $depshash = Get-Content .\.depshash -Raw
-      - ps: cd ..\..
-      - ps: >-
-          if ($depshash_baked -ne $depshash) {
-            $env:RUN_GCLIENT_SYNC="true"
-          }
-      - if "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags ) else ( gclient runhooks )
-      - cd src
-      - ps: $env:PATH="$pwd\third_party\ninja;$env:PATH"
-      - 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/default_mksnapshot_args
-      # Remove unused args from mksnapshot_args
-      - ps: >-
-          Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') } | Set-Content 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
-      - ps: >-
-          Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
-      - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
-      - 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') {
-            python3 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
-          }
-      - 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
-            }
-          }
-    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)
-      - ps: >-
-          if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
-            appveyor-retry appveyor PushArtifact pdb.zip
-          }
-  - matrix:
-      only:
-        - job_name: Test On Windows On Arm Hardware
-
-    environment:
-        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
-
-    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 build for doc only change"; Exit-AppveyorBuild
-          }
-          $global:LASTEXITCODE = 0
-      - cd ..
-      - mkdir out\Default
-      - cd ..
-      - ps: |
-          # 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','ffmpeg.zip','node_headers.zip','pdb.zip','electron.lib')
-          foreach ($job in $build_info.build.jobs) {
-            if ($job.name -eq "Build Arm on X64 Windows") {
-              $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','pdb.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
-
-    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
-      - set npm_config_nodedir=%cd%\out\Default\gen\node_headers          
-      - set npm_config_arch=arm64
-      - cd electron
-      # Explicitly set npm_config_arch because the .env doesn't persist
-      - ps: >-
-          if ($env:TARGET_ARCH -eq 'ia32') {
-            $env:npm_config_arch = "ia32"
-          }
-      - echo Running main test suite & node script/yarn test  --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion
-      - cd ..
-      - echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
-    
-    on_finish:
-      # Uncomment these lines to enable RDP
-      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )

appveyor.yml

@@ -1,13 +1,9 @@
-# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor-woa.yml 
-# IF APPLICABLE!!!! 
-#
-#
 # The config expects the following environment variables to be set:
 #  - "GN_CONFIG" Build type. One of {'testing', 'release'}.
 #  - "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.
@@ -16,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,
@@ -27,259 +23,217 @@
 # https://www.appveyor.com/docs/build-configuration/#secure-variables
 # https://www.appveyor.com/docs/build-configuration/#custom-environment-variables
 
+# Uncomment these lines to enable RDP
+#on_finish:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+
 version: 1.0.{build}
-build_cloud: electronhq-16-core
-image: e-104.0.5112.124-fix
+build_cloud: electron-16-core
+image: vs2019bt-16.6.2
 environment:
-  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
+  GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   ELECTRON_OUT_DIR: Default
   ELECTRON_ENABLE_STACK_DUMPING: 1
   ELECTRON_ALSO_LOG_TO_STDERR: 1
   MOCHA_REPORTER: mocha-multi-reporters
   MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
   GOMA_FALLBACK_ON_AUTH_FAILURE: true
-  DEPOT_TOOLS_WIN_TOOLCHAIN: 0
-  PYTHONIOENCODING: UTF-8
+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
 
-  matrix:
-
-    - job_name: Build
-    - job_name: Test
-      job_depends_on: Build
-
-clone_folder: C:\projects\src\electron
-
-skip_branch_with_pr: true
-
-# the first failed job cancels other jobs and fails entire build
-matrix:
-  fast_finish: true
-
-for:
-
-  - matrix:
-      only:
-        - job_name: Build
-
-    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 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
-      - ps: >-
-          if (Test-Path -Path "$pwd\depot_tools") {
-            Remove-Item -Recurse -Force $pwd\depot_tools
-          }
-      - ps: >-
-          if (Test-Path -Path "$pwd\build-tools") {
-            Remove-Item -Recurse -Force $pwd\build-tools
-          }
-      - ps: |
-          git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-          cd depot_tools
-          git fetch --depth 1 origin b7d8efd8bee494f4cfacacc19cf50fc4d4be3900
-          git checkout b7d8efd8bee494f4cfacacc19cf50fc4d4be3900
-          New-Item -Name .disable_auto_update -ItemType File
-          bootstrap\win_tools.bat
-          cd ..
-      - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
-      - ps: >-
-          if (Test-Path -Path "$pwd\src\electron") {
-            Remove-Item -Recurse -Force $pwd\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 {
-              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"
-      # Patches are applied in the image bake. Check depshash to see if patches have changed. 
-      - ps: $env:RUN_GCLIENT_SYNC="false"
-      - ps: $depshash_baked = Get-Content .\src\.depshash -Raw
-      - ps: cd src\electron
-      - ps: node script\generate-deps-hash.js
-      - ps: $depshash = Get-Content .\.depshash -Raw
-      - ps: cd ..\..
-      - ps: >-
-          if ($depshash_baked -ne $depshash) {
+        $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
+        }
+      }
+  - 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 {
+          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 "%RUN_GCLIENT_SYNC%"=="true" ( gclient sync --with_branch_heads --with_tags ) else ( gclient runhooks )
-      - 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/default_mksnapshot_args
-      # Remove unused args from mksnapshot_args
-      - ps: >-
-          Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') } | Set-Content 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
-      - ps: >-
-          Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
-      - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
-      - 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') {
-            python3 electron\script\zip-symbols.py
-            appveyor-retry appveyor PushArtifact out/Default/symbols.zip
+            if ($env:TARGET_ARCH -ne 'ia32') {
+              # only save on x64/woa to avoid contention saving
+              $env:SAVE_GCLIENT_SRC="true"
+            }
           } else {
-            # It's useful to have pdb files when debugging testing builds that are
-            # built on CI.
-            7z a pdb.zip out\Default\*.pdb
+            # update angle
+            cd src\third_party\angle
+            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
+            git fetch
+            cd ..\..\..
           }
-      - 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
-            }
+        } 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"
           }
-    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)
-      - 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
-          }
-    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 build for doc only change"; Exit-AppveyorBuild
-          }
-          $global:LASTEXITCODE = 0
-      - cd ..
-      - mkdir out\Default
-      - cd ..
-      - ps: |
-          # 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')
-          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
-
-    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
-      # Explicitly set npm_config_arch because the .env doesn't persist
-      - ps: >-
-          if ($env:TARGET_ARCH -eq 'ia32') {
-            $env:npm_config_arch = "ia32"
-          }
-      - 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 & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
-      - echo "About to verify mksnapshot"
-      - echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd%
-      - echo "Done verifying mksnapshot"
-      - echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd%
-      - echo "Done verifying chromedriver"
-    
-    on_finish:
-      # Uncomment these lines to enable RDP
-      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
+        }
+      }
+  - if "%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"
+        }
+      }
+  - 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
+  - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
+  - appveyor PushArtifact out/Default/windows_toolchain_profile.json
+  - appveyor PushArtifact out/Default/dist.zip
+  - appveyor PushArtifact out/Default/shell_browser_ui_unittests.exe
+  - appveyor PushArtifact out/Default/chromedriver.zip
+  - appveyor PushArtifact out/ffmpeg/ffmpeg.zip
+  - 7z a node_headers.zip out\Default\gen\node_headers
+  - appveyor PushArtifact node_headers.zip
+  - appveyor PushArtifact out/Default/mksnapshot.zip
+  - appveyor PushArtifact out/Default/hunspell_dictionaries.zip
+  - appveyor PushArtifact out/Default/electron.lib
+  - 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
+        appveyor-retry appveyor PushArtifact pdb.zip
+      }
+  - 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"
+  - if exist %cd%\electron.log ( appveyor-retry appveyor PushArtifact %cd%\electron.log )
+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 {
+          Write-Output "Uploading Electron release distribution to github releases"
+          & python 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:
+  - if exist src\electron\electron.log ( appveyor-retry appveyor PushArtifact src\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 = 107
+node_module_version = 103
 
 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
@@ -27,23 +27,17 @@ enable_basic_printing = true
 angle_enable_vulkan_validation_layers = false
 dawn_enable_vulkan_validation_layers = false
 
+# This breaks native node modules
+libcxx_abi_unstable = false
+
 # These are disabled because they cause the zip manifest to differ between
 # testing and release builds.
 # See https://chromium-review.googlesource.com/c/chromium/src/+/2774898.
 enable_pseudolocales = false
 
+is_cfi = false
+
 # Make application name configurable at runtime for cookie crypto
 allow_runtime_configurable_key_storage = true
 
-# CET shadow stack is incompatible with v8, until v8 is CET compliant
-# enabling this flag causes main process crashes where CET is enabled
-# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=357
 enable_cet_shadow_stack = false
-
-# For similar reasons, disable CFI, which is not well supported in V8.
-# Chromium doesn't have any problems with this because they do not run
-# V8 in the browser process.
-# Ref: https://source.chromium.org/chromium/chromium/src/+/45fba672185aae233e75d6ddc81ea1e0b30db050:v8/BUILD.gn;l=281
-is_cfi = false
-
-v8_enable_sandboxed_pointers = false

build/fuses/fuses.json5

@@ -7,6 +7,5 @@
   "node_options": "1",
   "node_cli_inspect": "1",
   "embedded_asar_integrity_validation": "0",
-  "only_load_app_from_asar": "0",
-  "load_browser_process_specific_v8_snapshot": "0"
+  "only_load_app_from_asar": "0"
 }

build/profile_toolchain.py

@@ -5,6 +5,8 @@ import sys
 import os
 import optparse
 import json
+import re
+import subprocess
 
 sys.path.append("%s/../../build" % os.path.dirname(os.path.realpath(__file__)))
 
@@ -34,10 +36,56 @@ def calculate_hash(root):
         return CalculateHash('.', None)
 
 def windows_installed_software():
-    # file_path = os.path.join(os.getcwd(), 'installed_software.json')
-    # return json.loads(open('installed_software.json').read().decode('utf-8'))
-    f = open('installed_software.json', encoding='utf-8-sig')
-    return json.load(f)
+    powershell_command = [
+        "Get-CimInstance",
+        "-Namespace",
+        "root\cimv2",
+        "-Class",
+        "Win32_product",
+        "|",
+        "Select",
+        "vendor,",
+        "description,",
+        "@{l='install_location';e='InstallLocation'},",
+        "@{l='install_date';e='InstallDate'},",
+        "@{l='install_date_2';e='InstallDate2'},",
+        "caption,",
+        "version,",
+        "name,",
+        "@{l='sku_number';e='SKUNumber'}",
+        "|",
+        "ConvertTo-Json",
+    ]
+
+    proc = subprocess.Popen(
+        ["powershell.exe", "-Command", "-"],
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+    )
+
+    stdout, _ = proc.communicate(" ".join(powershell_command).encode("utf-8"))
+
+    if proc.returncode != 0:
+        raise RuntimeError("Failed to get list of installed software")
+
+    # On AppVeyor there's other output related to PSReadline,
+    # so grab only the JSON output and ignore everything else
+    json_match = re.match(
+        r".*(\[.*{.*}.*\]).*", stdout.decode("utf-8"), re.DOTALL
+    )
+
+    if not json_match:
+        raise RuntimeError(
+            "Couldn't find JSON output for list of installed software"
+        )
+
+    # Filter out missing keys
+    return list(
+        map(
+            lambda info: {k: info[k] for k in info if info[k]},
+            json.loads(json_match.group(1)),
+        )
+    )
 
 
 def windows_profile():

build/templates/version_string.tmpl

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

buildflags/BUILD.gn

@@ -19,6 +19,7 @@ buildflag_header("buildflags") {
     "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
     "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
     "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
+    "ENABLE_WIN_DARK_MODE_WINDOW_UI=$enable_win_dark_mode_window_ui",
     "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
   ]
 }

buildflags/buildflags.gni

@@ -31,4 +31,7 @@ declare_args() {
 
   # Enable Spellchecker support
   enable_builtin_spellchecker = true
+
+  # Undocumented Windows dark mode API
+  enable_win_dark_mode_window_ui = false
 }

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")
 
@@ -56,14 +55,6 @@ static_library("chrome") {
     "//chrome/browser/process_singleton.h",
     "//chrome/browser/process_singleton_internal.cc",
     "//chrome/browser/process_singleton_internal.h",
-    "//chrome/browser/themes/browser_theme_pack.cc",
-    "//chrome/browser/themes/browser_theme_pack.h",
-    "//chrome/browser/themes/custom_theme_supplier.cc",
-    "//chrome/browser/themes/custom_theme_supplier.h",
-    "//chrome/browser/themes/theme_properties.cc",
-    "//chrome/browser/themes/theme_properties.h",
-    "//chrome/browser/ui/color/chrome_color_mixers.cc",
-    "//chrome/browser/ui/color/chrome_color_mixers.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc",
@@ -78,11 +69,6 @@ static_library("chrome") {
     "//chrome/browser/ui/exclusive_access/keyboard_lock_controller.h",
     "//chrome/browser/ui/exclusive_access/mouse_lock_controller.cc",
     "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h",
-    "//chrome/browser/ui/frame/window_frame_util.cc",
-    "//chrome/browser/ui/frame/window_frame_util.h",
-    "//chrome/browser/ui/native_window_tracker.h",
-    "//chrome/browser/ui/ui_features.cc",
-    "//chrome/browser/ui/ui_features.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
@@ -102,8 +88,6 @@ static_library("chrome") {
       "//chrome/browser/icon_loader_mac.mm",
       "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
       "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
       "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
       "//chrome/browser/process_singleton_mac.mm",
       "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
@@ -122,8 +106,6 @@ static_library("chrome") {
       "//chrome/browser/ui/view_ids.h",
       "//chrome/browser/win/chrome_process_finder.cc",
       "//chrome/browser/win/chrome_process_finder.h",
-      "//chrome/browser/win/titlebar_config.cc",
-      "//chrome/browser/win/titlebar_config.h",
       "//chrome/browser/win/titlebar_config.h",
       "//chrome/child/v8_crashpad_support_win.cc",
       "//chrome/child/v8_crashpad_support_win.h",
@@ -137,15 +119,12 @@ static_library("chrome") {
   if (use_aura) {
     sources += [
       "//chrome/browser/platform_util_aura.cc",
-      "//chrome/browser/ui/aura/native_window_tracker_aura.cc",
-      "//chrome/browser/ui/aura/native_window_tracker_aura.h",
       "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc",
     ]
   }
 
   public_deps = [
     "//chrome/browser:dev_ui_browser_resources",
-    "//chrome/browser/ui/color:mixers",
     "//chrome/common",
     "//chrome/common:version_header",
     "//components/keyed_service/content",
@@ -327,6 +306,8 @@ static_library("chrome") {
         "//chrome/browser/pdf/pdf_frame_util.h",
         "//chrome/browser/plugins/pdf_iframe_navigation_throttle.cc",
         "//chrome/browser/plugins/pdf_iframe_navigation_throttle.h",
+        "//chrome/renderer/pepper/chrome_pdf_print_client.cc",
+        "//chrome/renderer/pepper/chrome_pdf_print_client.h",
       ]
       deps += [
         "//components/pdf/browser",
@@ -364,6 +345,8 @@ source_set("plugins") {
   sources += [
     "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
     "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
+    "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
+    "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
   ]
@@ -371,20 +354,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_plugins) {
-    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

default_app/default_app.ts

@@ -66,9 +66,9 @@ async function createWindow (backgroundColor?: string) {
   mainWindow = new BrowserWindow(options);
   mainWindow.on('ready-to-show', () => mainWindow!.show());
 
-  mainWindow.webContents.setWindowOpenHandler(details => {
-    shell.openExternal(decorateURL(details.url));
-    return { action: 'deny' };
+  mainWindow.webContents.on('new-window', (event, url) => {
+    event.preventDefault();
+    shell.openExternal(decorateURL(url));
   });
 
   mainWindow.webContents.session.setPermissionRequestHandler((webContents, permission, done) => {

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

@@ -64,11 +64,11 @@ an issue:
   * [Automated Testing](tutorial/automated-testing.md)
   * [REPL](tutorial/repl.md)
 * [Distribution](tutorial/application-distribution.md)
+  * [Supported Platforms](tutorial/support.md#supported-platforms)
   * [Code Signing](tutorial/code-signing.md)
   * [Mac App Store](tutorial/mac-app-store-submission-guide.md)
   * [Windows Store](tutorial/windows-store-guide.md)
   * [Snapcraft](tutorial/snapcraft.md)
-  * [ASAR Archives](tutorial/asar-archives.md)
 * [Updates](tutorial/updates.md)
 * [Getting Support](tutorial/support.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

@@ -582,10 +582,6 @@ You should seek to use the `steal` option as sparingly as possible.
 
 Hides all application windows without minimizing them.
 
-### `app.isHidden()` _macOS_
-
-Returns `boolean` - `true` if the application—including all of its windows—is hidden (e.g. with `Command-H`), `false` otherwise.
-
 ### `app.show()` _macOS_
 
 Shows application windows after they were hidden. Does not automatically focus
@@ -611,18 +607,9 @@ Returns `string` - The current application directory.
     * `%APPDATA%` on Windows
     * `$XDG_CONFIG_HOME` or `~/.config` on Linux
     * `~/Library/Application Support` on macOS
-  * `userData` The directory for storing your app's configuration files, which
-    by default is the `appData` directory appended with your app's name. By
-    convention files storing user data should be written to this directory, and
-    it is not recommended to write large files here because some environments
-    may backup this directory to cloud storage.
-  * `sessionData` The directory for storing data generated by `Session`, such
-    as localStorage, cookies, disk cache, downloaded dictionaries, network
-    state, devtools files. By default this points to `userData`. Chromium may
-    write very large disk cache here, so if your app does not rely on browser
-    storage like localStorage or cookies to save user data, it is recommended
-    to set this directory to other locations to avoid polluting the `userData`
-    directory.
+  * `userData` The directory for storing your app's configuration files, which by
+    default it is the `appData` directory appended with your app's name.
+  * `cache`
   * `temp` Temporary directory.
   * `exe` The current executable file.
   * `module` The `libchromiumcontent` library.
@@ -672,9 +659,9 @@ In that case, the directory should be created with `fs.mkdirSync` or similar.
 
 You can only override paths of a `name` defined in `app.getPath`.
 
-By default, web pages' cookies and caches will be stored under the `sessionData`
+By default, web pages' cookies and caches will be stored under the `userData`
 directory. If you want to change this location, you have to override the
-`sessionData` path before the `ready` event of the `app` module is emitted.
+`userData` path before the `ready` event of the `app` module is emitted.
 
 ### `app.getVersion()`
 
@@ -703,7 +690,7 @@ Overrides the current application's name.
 ### `app.getLocale()`
 
 Returns `string` - The current application locale, fetched using Chromium's `l10n_util` library.
-Possible return values are documented [here](https://source.chromium.org/chromium/chromium/src/+/main:ui/base/l10n/l10n_util.cc).
+Possible return values are documented [here](https://source.chromium.org/chromium/chromium/src/+/master:ui/base/l10n/l10n_util.cc).
 
 To set the locale, you'll want to use a command line switch at app startup, which may be found [here](command-line-switches.md).
 
@@ -1072,7 +1059,7 @@ Activation policy types:
 
 Imports the certificate in pkcs12 format into the platform certificate store.
 `callback` is called with the `result` of import operation, a value of `0`
-indicates success while any other value indicates failure according to Chromium [net_error_list](https://source.chromium.org/chromium/chromium/src/+/main:net/base/net_error_list.h).
+indicates success while any other value indicates failure according to Chromium [net_error_list](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).
 
 ### `app.configureHostResolver(options)`
 

docs/api/browser-view.md

@@ -11,9 +11,6 @@ relative to its owning window. It is meant to be an alternative to the
 
 Process: [Main](../glossary.md#main-process)
 
-This module cannot be used until the `ready` event of the `app`
-module is emitted.
-
 ### Example
 
 ```javascript

docs/api/browser-window.md

@@ -4,9 +4,6 @@
 
 Process: [Main](../glossary.md#main-process)
 
-This module cannot be used until the `ready` event of the `app`
-module is emitted.
-
 ```javascript
 // In the main process.
 const { BrowserWindow } = require('electron')
@@ -67,7 +64,7 @@ win.loadURL('https://github.com')
 ```
 
 Note that even for apps that use `ready-to-show` event, it is still recommended
-to set `backgroundColor` to make the app feel more native.
+to set `backgroundColor` to make app feel more native.
 
 Some examples of valid `backgroundColor` values include:
 
@@ -161,20 +158,20 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `useContentSize` boolean (optional) - The `width` and `height` would be used as web
     page's size, which means the actual window's size will include window
     frame's size and be slightly larger. Default is `false`.
-  * `center` boolean (optional) - Show window in the center of the screen. Default is `false`.
+  * `center` boolean (optional) - Show window in the center of the screen.
   * `minWidth` Integer (optional) - Window's minimum width. Default is `0`.
   * `minHeight` Integer (optional) - Window's minimum height. Default is `0`.
   * `maxWidth` Integer (optional) - Window's maximum width. Default is no limit.
   * `maxHeight` Integer (optional) - Window's maximum height. Default is no limit.
   * `resizable` boolean (optional) - Whether window is resizable. Default is `true`.
-  * `movable` boolean (optional) _macOS_ _Windows_ - Whether window is
-    movable. This is not implemented on Linux. Default is `true`.
-  * `minimizable` boolean (optional) _macOS_ _Windows_ - Whether window is
-    minimizable. This is not implemented on Linux. Default is `true`.
-  * `maximizable` boolean (optional) _macOS_ _Windows_ - Whether window is
-    maximizable. This is not implemented on Linux. Default is `true`.
-  * `closable` boolean (optional) _macOS_ _Windows_ - Whether window is
-    closable. This is not implemented on Linux. Default is `true`.
+  * `movable` boolean (optional) - Whether window is movable. This is not implemented
+    on Linux. Default is `true`.
+  * `minimizable` boolean (optional) - Whether window is minimizable. This is not
+    implemented on Linux. Default is `true`.
+  * `maximizable` boolean (optional) - Whether window is maximizable. This is not
+    implemented on Linux. Default is `true`.
+  * `closable` boolean (optional) - Whether window is closable. This is not implemented
+    on Linux. Default is `true`.
   * `focusable` boolean (optional) - Whether the window can be focused. Default is
     `true`. On Windows setting `focusable: false` also implies setting
     `skipTaskbar: true`. On Linux setting `focusable: false` makes the window
@@ -188,10 +185,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `fullscreenable` boolean (optional) - Whether the window can be put into fullscreen
     mode. On macOS, also whether the maximize/zoom button should toggle full
     screen mode or maximize window. Default is `true`.
-  * `simpleFullscreen` boolean (optional) _macOS_ - Use pre-Lion fullscreen on
-    macOS. Default is `false`.
-  * `skipTaskbar` boolean (optional) _macOS_ _Windows_ - Whether to show the window in taskbar.
-    Default is `false`.
+  * `simpleFullscreen` boolean (optional) - Use pre-Lion fullscreen on macOS. Default is `false`.
+  * `skipTaskbar` boolean (optional) - Whether to show the window in taskbar. Default is
+    `false`.
   * `kiosk` boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
   * `title` string (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
   * `icon` ([NativeImage](native-image.md) | string) (optional) - The window icon. On Windows it is
@@ -205,30 +201,27 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `parent` BrowserWindow (optional) - Specify parent window. Default is `null`.
   * `modal` boolean (optional) - Whether this is a modal window. This only works when the
     window is a child window. Default is `false`.
-  * `acceptFirstMouse` boolean (optional) _macOS_ - Whether clicking an
-    inactive window will also click through to the web contents. Default is
-    `false` on macOS. This option is not configurable on other platforms.
+  * `acceptFirstMouse` boolean (optional) - Whether clicking an inactive window will also
+  click through to the web contents. Default is `false` on macOS. This option is not
+  configurable on other platforms.
   * `disableAutoHideCursor` boolean (optional) - Whether to hide cursor when typing.
     Default is `false`.
   * `autoHideMenuBar` boolean (optional) - Auto hide the menu bar unless the `Alt`
     key is pressed. Default is `false`.
-  * `enableLargerThanScreen` boolean (optional) _macOS_ - Enable the window to
-    be resized larger than screen. Only relevant for macOS, as other OSes
-    allow larger-than-screen windows by default. Default is `false`.
+  * `enableLargerThanScreen` boolean (optional) - Enable the window to be resized larger
+    than screen. Only relevant for macOS, as other OSes allow
+    larger-than-screen windows by default. Default is `false`.
   * `backgroundColor` string (optional) - The window's background color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. Alpha in #AARRGGBB format is supported if `transparent` is set to `true`. Default is `#FFF` (white). See [win.setBackgroundColor](browser-window.md#winsetbackgroundcolorbackgroundcolor) for more information.
   * `hasShadow` boolean (optional) - Whether window should have a shadow. Default is `true`.
-  * `opacity` number (optional) _macOS_ _Windows_ - Set the initial opacity of
-    the window, between 0.0 (fully transparent) and 1.0 (fully opaque). This
-    is only implemented on Windows and macOS.
+  * `opacity` number (optional) - Set the initial opacity of the window, between 0.0 (fully
+    transparent) and 1.0 (fully opaque). This is only implemented on Windows and macOS.
   * `darkTheme` boolean (optional) - Forces using dark theme for the window, only works on
     some GTK+3 desktop environments. Default is `false`.
   * `transparent` boolean (optional) - Makes the window [transparent](../tutorial/window-customization.md#create-transparent-windows).
     Default is `false`. On Windows, does not work unless the window is frameless.
   * `type` string (optional) - The type of window, default is normal window. See more about
     this below.
-  * `visualEffectState` string (optional) _macOS_ - Specify how the material
-    appearance should reflect window activity state on macOS. Must be used
-    with the `vibrancy` property. Possible values are:
+  * `visualEffectState` string (optional) - Specify how the material appearance should reflect window activity state on macOS. Must be used with the `vibrancy` property. Possible values are:
     * `followWindow` - The backdrop should automatically appear active when the window is active, and inactive when it is not. This is the default.
     * `active` - The backdrop should always appear active.
     * `inactive` - The backdrop should always appear inactive.
@@ -236,42 +229,36 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     Default is `default`. Possible values are:
     * `default` - Results in the standard title bar for macOS or Windows respectively.
     * `hidden` - Results in a hidden title bar and a full size content window. On macOS, the window still has the standard window controls (“traffic lights”) in the top left. On Windows, when combined with `titleBarOverlay: true` it will activate the Window Controls Overlay (see `titleBarOverlay` for more information), otherwise no window controls will be shown.
-    * `hiddenInset` _macOS_ - Only on macOS, results in a hidden title bar
-      with an alternative look where the traffic light buttons are slightly
-      more inset from the window edge.
-    * `customButtonsOnHover` _macOS_ - Only on macOS, results in a hidden
-      title bar and a full size content window, the traffic light buttons will
-      display when being hovered over in the top left of the window.
-      **Note:** This option is currently experimental.
-  * `trafficLightPosition` [Point](structures/point.md) (optional) _macOS_ -
-    Set a custom position for the traffic light buttons in frameless windows.
-  * `roundedCorners` boolean (optional) _macOS_ - Whether frameless window
-    should have rounded corners on macOS. Default is `true`. Setting this property
-    to `false` will prevent the window from being fullscreenable.
-  * `fullscreenWindowTitle` boolean (optional) _macOS_ _Deprecated_ - Shows
-    the title in the title bar in full screen mode on macOS for `hiddenInset`
-    titleBarStyle. Default is `false`.
+    * `hiddenInset` - Only on macOS, results in a hidden title bar with an alternative look
+      where the traffic light buttons are slightly more inset from the window edge.
+    * `customButtonsOnHover` - Only on macOS, results in a hidden title bar and a full size
+      content window, the traffic light buttons will display when being hovered
+      over in the top left of the window.  **Note:** This option is currently
+      experimental.
+  * `trafficLightPosition` [Point](structures/point.md) (optional) - Set a
+    custom position for the traffic light buttons in frameless windows.
+  * `roundedCorners` boolean (optional) - Whether frameless window should have
+    rounded corners on macOS. Default is `true`.
+  * `fullscreenWindowTitle` boolean (optional) _Deprecated_ - Shows the title in
+    the title bar in full screen mode on macOS for `hiddenInset` titleBarStyle.
+    Default is `false`.
   * `thickFrame` boolean (optional) - Use `WS_THICKFRAME` style for frameless windows on
     Windows, which adds standard window frame. Setting it to `false` will remove
     window shadow and window animations. Default is `true`.
-  * `vibrancy` string (optional) _macOS_ - Add a type of vibrancy effect to
-    the window, only on macOS. Can be `appearance-based`, `light`, `dark`,
-    `titlebar`, `selection`, `menu`, `popover`, `sidebar`, `medium-light`,
-    `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`,
-    `tooltip`, `content`, `under-window`, or `under-page`. Please note that
-    `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` are
-    deprecated and have been removed in macOS Catalina (10.15).
-  * `zoomToPageWidth` boolean (optional) _macOS_ - Controls the behavior on
-    macOS when option-clicking the green stoplight button on the toolbar or by
-    clicking the Window > Zoom menu item. If `true`, the window will grow to
-    the preferred width of the web page when zoomed, `false` will cause it to
-    zoom to the width of the screen. This will also affect the behavior when
-    calling `maximize()` directly. Default is `false`.
-  * `tabbingIdentifier` string (optional) _macOS_ - Tab group name, allows
-    opening the window as a native tab on macOS 10.12+. Windows with the same
-    tabbing identifier will be grouped together. This also adds a native new
-    tab button to your window's tab bar and allows your `app` and window to
-    receive the `new-window-for-tab` event.
+  * `vibrancy` string (optional) - Add a type of vibrancy effect to the window, only on
+    macOS. Can be `appearance-based`, `light`, `dark`, `titlebar`, `selection`,
+    `menu`, `popover`, `sidebar`, `medium-light`, `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`, `tooltip`, `content`, `under-window`, or `under-page`. Please note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` are deprecated and have been removed in macOS Catalina (10.15).
+  * `zoomToPageWidth` boolean (optional) - Controls the behavior on macOS when
+    option-clicking the green stoplight button on the toolbar or by clicking the
+    Window > Zoom menu item. If `true`, the window will grow to the preferred
+    width of the web page when zoomed, `false` will cause it to zoom to the
+    width of the screen. This will also affect the behavior when calling
+    `maximize()` directly. Default is `false`.
+  * `tabbingIdentifier` string (optional) - Tab group name, allows opening the
+    window as a native tab on macOS 10.12+. Windows with the same tabbing
+    identifier will be grouped together. This also adds a native new tab button
+    to your window's tab bar and allows your `app` and window to receive the
+    `new-window-for-tab` event.
   * `webPreferences` Object (optional) - Settings of web page's features.
     * `devTools` boolean (optional) - Whether to enable DevTools. If it is set to `false`, can not use `BrowserWindow.webContents.openDevTools()` to open DevTools. Default is `true`.
     * `nodeIntegration` boolean (optional) - Whether node integration is enabled.
@@ -323,8 +310,8 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
     * `plugins` boolean (optional) - Whether plugins should be enabled. Default is `false`.
     * `experimentalFeatures` boolean (optional) - Enables Chromium's experimental features.
       Default is `false`.
-    * `scrollBounce` boolean (optional) _macOS_ - Enables scroll bounce
-      (rubber banding) effect on macOS. Default is `false`.
+    * `scrollBounce` boolean (optional) - Enables scroll bounce (rubber banding) effect on
+      macOS. Default is `false`.
     * `enableBlinkFeatures` string (optional) - A list of feature strings separated by `,`, like
       `CSSVariables,KeyboardEventKey` to enable. The full list of supported feature
       strings can be found in the [RuntimeEnabledFeatures.json5][runtime-enabled-features]
@@ -426,17 +413,13 @@ Possible values are:
 
 * On Linux, possible types are `desktop`, `dock`, `toolbar`, `splash`,
   `notification`.
-* On macOS, possible types are `desktop`, `textured`, `panel`.
+* On macOS, possible types are `desktop`, `textured`.
   * The `textured` type adds metal gradient appearance
-    (`NSWindowStyleMaskTexturedBackground`).
+    (`NSTexturedBackgroundWindowMask`).
   * The `desktop` type places the window at the desktop background window level
     (`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
     focus, keyboard or mouse events, but you can use `globalShortcut` to receive
     input sparingly.
-  * The `panel` type enables the window to float on top of full-screened apps
-    by adding the `NSWindowStyleMaskNonactivatingPanel` style mask,normally
-    reserved for NSPanel, at runtime. Also, the window will appear on all
-    spaces (desktops).
 * On Windows, possible type is `toolbar`.
 
 ### Instance Events
@@ -791,7 +774,7 @@ A `boolean` property that determines whether the window is in fullscreen mode.
 
 A `boolean` property that determines whether the window is focusable.
 
-#### `win.visibleOnAllWorkspaces` _macOS_ _Linux_
+#### `win.visibleOnAllWorkspaces`
 
 A `boolean` property that determines whether the window is visible on all workspaces.
 
@@ -828,13 +811,13 @@ A `string` property that determines the title of the native window.
 
 **Note:** The title of the web page can be different from the title of the native window.
 
-#### `win.minimizable` _macOS_ _Windows_
+#### `win.minimizable`
 
 A `boolean` property that determines whether the window can be manually minimized by user.
 
 On Linux the setter is a no-op, although the getter returns `true`.
 
-#### `win.maximizable` _macOS_ _Windows_
+#### `win.maximizable`
 
 A `boolean` property that determines whether the window can be manually maximized by user.
 
@@ -849,13 +832,13 @@ maximizes the window.
 
 A `boolean` property that determines whether the window can be manually resized by user.
 
-#### `win.closable` _macOS_ _Windows_
+#### `win.closable`
 
 A `boolean` property that determines whether the window can be manually closed by user.
 
 On Linux the setter is a no-op, although the getter returns `true`.
 
-#### `win.movable` _macOS_ _Windows_
+#### `win.movable`
 
 A `boolean` property that determines Whether the window can be moved by user.
 
@@ -1324,7 +1307,7 @@ win.setSheetOffset(toolbarRect.height)
 
 Starts or stops flashing the window to attract user's attention.
 
-#### `win.setSkipTaskbar(skip)` _macOS_ _Windows_
+#### `win.setSkipTaskbar(skip)`
 
 * `skip` boolean
 
@@ -1652,7 +1635,7 @@ Changes window icon.
 
 Sets whether the window traffic light buttons should be visible.
 
-#### `win.setAutoHideMenuBar(hide)` _Windows_ _Linux_
+#### `win.setAutoHideMenuBar(hide)`
 
 * `hide` boolean
 
@@ -1661,7 +1644,7 @@ menu bar will only show when users press the single `Alt` key.
 
 If the menu bar is already visible, calling `setAutoHideMenuBar(true)` won't hide it immediately.
 
-#### `win.isMenuBarAutoHide()` _Windows_ _Linux_
+#### `win.isMenuBarAutoHide()`
 
 Returns `boolean` - Whether menu bar automatically hides itself.
 
@@ -1671,11 +1654,11 @@ Returns `boolean` - Whether menu bar automatically hides itself.
 
 Sets whether the menu bar should be visible. If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.
 
-#### `win.isMenuBarVisible()` _Windows_ _Linux_
+#### `win.isMenuBarVisible()`
 
 Returns `boolean` - Whether the menu bar is visible.
 
-#### `win.setVisibleOnAllWorkspaces(visible[, options])` _macOS_ _Linux_
+#### `win.setVisibleOnAllWorkspaces(visible[, options])`
 
 * `visible` boolean
 * `options` Object (optional)
@@ -1693,7 +1676,7 @@ Sets whether the window should be visible on all workspaces.
 
 **Note:** This API does nothing on Windows.
 
-#### `win.isVisibleOnAllWorkspaces()` _macOS_ _Linux_
+#### `win.isVisibleOnAllWorkspaces()`
 
 Returns `boolean` - Whether the window is visible on all workspaces.
 

docs/api/client-request.md

@@ -185,7 +185,7 @@ the first write will throw an error. If the passed value is not a `string`, its
 
 Certain headers are restricted from being set by apps. These headers are
 listed below. More information on restricted headers can be found in
-[Chromium's header utils](https://source.chromium.org/chromium/chromium/src/+/main:services/network/public/cpp/header_util.cc;drc=1562cab3f1eda927938f8f4a5a91991fefde66d3;bpv=1;bpt=1;l=22).
+[Chromium's header utils](https://source.chromium.org/chromium/chromium/src/+/master:services/network/public/cpp/header_util.cc;drc=1562cab3f1eda927938f8f4a5a91991fefde66d3;bpv=1;bpt=1;l=22).
 
 * `Content-Length`
 * `Host`

docs/api/command-line-switches.md

@@ -274,8 +274,8 @@ By default inspector websocket url is available in stderr and under /json/list e
 [ready]: app.md#event-ready
 [play-silent-audio]: https://github.com/atom/atom/pull/9485/files
 [debugging-main-process]: ../tutorial/debugging-main-process.md
-[logging]: https://source.chromium.org/chromium/chromium/src/+/main:base/logging.h
+[logging]: https://source.chromium.org/chromium/chromium/src/+/master:base/logging.h
 [node-cli]: https://nodejs.org/api/cli.html
 [play-silent-audio]: https://github.com/atom/atom/pull/9485/files
 [ready]: app.md#event-ready
-[severities]: https://source.chromium.org/chromium/chromium/src/+/main:base/logging.h?q=logging::LogSeverity&ss=chromium
+[severities]: https://source.chromium.org/chromium/chromium/src/+/master:base/logging.h?q=logging::LogSeverity&ss=chromium

docs/api/content-tracing.md

@@ -36,7 +36,7 @@ Returns `Promise<string[]>` - resolves with an array of category groups once all
 
 Get a set of category groups. The category groups can change as new code paths
 are reached. See also the [list of built-in tracing
-categories](https://chromium.googlesource.com/chromium/src/+/main/base/trace_event/builtin_categories.h).
+categories](https://chromium.googlesource.com/chromium/src/+/master/base/trace_event/builtin_categories.h).
 
 > **NOTE:** Electron adds a non-default tracing category called `"electron"`.
 > This category can be used to capture Electron-specific tracing events.

docs/api/context-bridge.md

@@ -35,7 +35,7 @@ page you load in your renderer executes code in this world.
 
 When `contextIsolation` is enabled in your `webPreferences` (this is the default behavior since Electron 12.0.0), your `preload` scripts run in an
 "Isolated World".  You can read more about context isolation and what it affects in the
-[security](../tutorial/security.md#3-enable-context-isolation) docs.
+[security](../tutorial/security.md#3-enable-context-isolation-for-remote-content) docs.
 
 ## Methods
 

docs/api/ipc-main.md

@@ -1,10 +1,3 @@
----
-title: "ipcMain"
-description: "Communicate asynchronously from the main process to renderer processes."
-slug: ipc-main
-hide_title: false
----
-
 # ipcMain
 
 > Communicate asynchronously from the main process to renderer processes.
@@ -16,9 +9,7 @@ process, it handles asynchronous and synchronous messages sent from a renderer
 process (web page). Messages sent from a renderer will be emitted to this
 module.
 
-For usage examples, check out the [IPC tutorial].
-
-## Sending messages
+## Sending Messages
 
 It is also possible to send messages from the main process to the renderer
 process, see [webContents.send][web-contents-send] for more information.
@@ -30,6 +21,36 @@ process, see [webContents.send][web-contents-send] for more information.
   coming from frames that aren't the main frame (e.g. iframes) whereas
   `event.sender.send(...)` will always send to the main frame.
 
+An example of sending and handling messages between the render and main
+processes:
+
+```javascript
+// In main process.
+const { ipcMain } = require('electron')
+ipcMain.on('asynchronous-message', (event, arg) => {
+  console.log(arg) // prints "ping"
+  event.reply('asynchronous-reply', 'pong')
+})
+
+ipcMain.on('synchronous-message', (event, arg) => {
+  console.log(arg) // prints "ping"
+  event.returnValue = 'pong'
+})
+```
+
+```javascript
+// In renderer process (web page).
+// NB. Electron APIs are only accessible from preload, unless contextIsolation is disabled.
+// See https://www.electronjs.org/docs/tutorial/process-model#preload-scripts for more details.
+const { ipcRenderer } = require('electron')
+console.log(ipcRenderer.sendSync('synchronous-message', 'ping')) // prints "pong"
+
+ipcRenderer.on('asynchronous-reply', (event, arg) => {
+  console.log(arg) // prints "pong"
+})
+ipcRenderer.send('asynchronous-message', 'ping')
+```
+
 ## Methods
 
 The `ipcMain` module has the following method to listen for events:
@@ -38,7 +59,7 @@ The `ipcMain` module has the following method to listen for events:
 
 * `channel` string
 * `listener` Function
-  * `event` [IpcMainEvent][ipc-main-event]
+  * `event` IpcMainEvent
   * `...args` any[]
 
 Listens to `channel`, when a new message arrives `listener` would be called with
@@ -48,7 +69,7 @@ Listens to `channel`, when a new message arrives `listener` would be called with
 
 * `channel` string
 * `listener` Function
-  * `event` [IpcMainEvent][ipc-main-event]
+  * `event` IpcMainEvent
   * `...args` any[]
 
 Adds a one time `listener` function for the event. This `listener` is invoked
@@ -72,8 +93,8 @@ Removes listeners of the specified `channel`.
 ### `ipcMain.handle(channel, listener)`
 
 * `channel` string
-* `listener` Function<Promise\<void&#62; | any&#62;
-  * `event` [IpcMainInvokeEvent][ipc-main-invoke-event]
+* `listener` Function<Promise\<void> | any>
+  * `event` IpcMainInvokeEvent
   * `...args` any[]
 
 Adds a handler for an `invoke`able IPC. This handler will be called whenever a
@@ -83,14 +104,14 @@ If `listener` returns a Promise, the eventual result of the promise will be
 returned as a reply to the remote caller. Otherwise, the return value of the
 listener will be used as the value of the reply.
 
-```js title='Main Process'
+```js
+// Main process
 ipcMain.handle('my-invokable-ipc', async (event, ...args) => {
   const result = await somePromise(...args)
   return result
 })
-```
 
-```js title='Renderer Process'
+// Renderer process
 async () => {
   const result = await ipcRenderer.invoke('my-invokable-ipc', arg1, arg2)
   // ...
@@ -109,7 +130,7 @@ provided to the renderer process. Please refer to
 ### `ipcMain.handleOnce(channel, listener)`
 
 * `channel` string
-* `listener` Function<Promise\<void&#62; | any&#62;
+* `listener` Function<Promise\<void> | any>
   * `event` IpcMainInvokeEvent
   * `...args` any[]
 
@@ -125,16 +146,13 @@ Removes any handler for `channel`, if present.
 ## IpcMainEvent object
 
 The documentation for the `event` object passed to the `callback` can be found
-in the [`ipc-main-event`][ipc-main-event] structure docs.
+in the [`ipc-main-event`](structures/ipc-main-event.md) structure docs.
 
 ## IpcMainInvokeEvent object
 
 The documentation for the `event` object passed to `handle` callbacks can be
-found in the [`ipc-main-invoke-event`][ipc-main-invoke-event]
+found in the [`ipc-main-invoke-event`](structures/ipc-main-invoke-event.md)
 structure docs.
 
-[IPC tutorial]: ../tutorial/ipc.md
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
-[web-contents-send]: ../api/web-contents.md#contentssendchannel-args
-[ipc-main-event]:../api/structures/ipc-main-event.md
-[ipc-main-invoke-event]:../api/structures/ipc-main-invoke-event.md
+[web-contents-send]: web-contents.md#contentssendchannel-args

docs/api/ipc-renderer.md

@@ -1,10 +1,3 @@
----
-title: "ipcRenderer"
-description: "Communicate asynchronously from a renderer process to the main process."
-slug: ipc-renderer
-hide_title: false
----
-
 # ipcRenderer
 
 > Communicate asynchronously from a renderer process to the main process.
@@ -16,7 +9,7 @@ methods so you can send synchronous and asynchronous messages from the render
 process (web page) to the main process. You can also receive replies from the
 main process.
 
-See [IPC tutorial](../tutorial/ipc.md) for code examples.
+See [ipcMain](ipc-main.md) for code examples.
 
 ## Methods
 
@@ -77,7 +70,7 @@ throw an exception.
 > them. Attempting to send such objects over IPC will result in an error.
 
 The main process handles it by listening for `channel` with the
-[`ipcMain`](./ipc-main.md) module.
+[`ipcMain`](ipc-main.md) module.
 
 If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).
 
@@ -96,8 +89,16 @@ 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).
+[`ipcMain.handle()`](ipc-main.md#ipcmainhandlechannel-listener).
 
 For example:
 
@@ -118,31 +119,16 @@ 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
 * `...args` any[]
 
-Returns `any` - The value sent back by the [`ipcMain`](./ipc-main.md) handler.
+Returns `any` - The value sent back by the [`ipcMain`](ipc-main.md) handler.
 
 Send a message to the main process via `channel` and expect a result
 synchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`window.postMessage`], so prototype chains will not be
+Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
@@ -154,13 +140,13 @@ throw an exception.
 > 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 handles it by listening for `channel` with [`ipcMain`](./ipc-main.md) module,
+The main process handles it by listening for `channel` with [`ipcMain`](ipc-main.md) module,
 and replies by setting `event.returnValue`.
 
 > :warning: **WARNING**: Sending a synchronous message will block the whole
 > renderer process until the reply is received, so use this method only as a
 > last resort. It's much better to use the asynchronous version,
-> [`invoke()`](./ipc-renderer.md#ipcrendererinvokechannel-args).
+> [`invoke()`](ipc-renderer.md#ipcrendererinvokechannel-args).
 
 ### `ipcRenderer.postMessage(channel, message, [transfer])`
 
@@ -172,7 +158,7 @@ Send a message to the main process, optionally transferring ownership of zero
 or more [`MessagePort`][] objects.
 
 The transferred `MessagePort` objects will be available in the main process as
-[`MessagePortMain`](./message-port-main.md) objects by accessing the `ports`
+[`MessagePortMain`](message-port-main.md) objects by accessing the `ports`
 property of the emitted event.
 
 For example:
@@ -211,7 +197,7 @@ the host page instead of the main process.
 ## Event object
 
 The documentation for the `event` object passed to the `callback` can be found
-in the [`ipc-renderer-event`](./structures/ipc-renderer-event.md) structure docs.
+in the [`ipc-renderer-event`](structures/ipc-renderer-event.md) structure docs.
 
 [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/protocol.md

@@ -10,12 +10,11 @@ An example of implementing a protocol that has the same effect as the
 ```javascript
 const { app, protocol } = require('electron')
 const path = require('path')
-const url = require('url')
 
 app.whenReady().then(() => {
   protocol.registerFileProtocol('atom', (request, callback) => {
-    const filePath = url.fileURLToPath('file://' + request.url.slice('atom://'.length))
-    callback(filePath)
+    const url = request.url.substr(7)
+    callback({ path: path.normalize(`${__dirname}/${url}`) })
   })
 })
 ```
@@ -176,7 +175,7 @@ property.
 * `handler` Function
   * `request` [ProtocolRequest](structures/protocol-request.md)
   * `callback` Function
-    * `response` [ProtocolResponse](structures/protocol-response.md)
+    * `response` ProtocolResponse
 
 Returns `boolean` - Whether the protocol was successfully registered
 

docs/api/session.md

@@ -253,11 +253,9 @@ Returns:
   * `device` [HIDDevice[]](structures/hid-device.md)
   * `frame` [WebFrameMain](web-frame-main.md)
 
-Emitted after `navigator.hid.requestDevice` has been called and
-`select-hid-device` has fired if a new device becomes available before
-the callback from `select-hid-device` is called.  This event is intended for
-use when using a UI to ask users to pick a device so that the UI can be updated
-with the newly added device.
+Emitted when a new HID device becomes available. For example, when a new USB device is plugged in.
+
+This event will only be emitted after `navigator.hid.requestDevice` has been called and `select-hid-device` has fired.
 
 #### Event: 'hid-device-removed'
 
@@ -268,24 +266,9 @@ Returns:
   * `device` [HIDDevice[]](structures/hid-device.md)
   * `frame` [WebFrameMain](web-frame-main.md)
 
-Emitted after `navigator.hid.requestDevice` has been called and
-`select-hid-device` has fired if a device has been removed before the callback
-from `select-hid-device` is called.  This event is intended for use when using
-a UI to ask users to pick a device so that the UI can be updated to remove the
-specified device.
+Emitted when a HID device has been removed.  For example, this event will fire when a USB device is unplugged.
 
-#### Event: 'hid-device-revoked'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `device` [HIDDevice[]](structures/hid-device.md)
-  * `origin` string (optional) - The origin that the device has been revoked from.
-
-Emitted after `HIDDevice.forget()` has been called.  This event can be used
-to help maintain persistent storage of permissions when
-`setDevicePermissionHandler` is used.
+This event will only be emitted after `navigator.hid.requestDevice` has been called and `select-hid-device` has fired.
 
 #### Event: 'select-serial-port'
 
@@ -365,11 +348,7 @@ Returns:
 * `port` [SerialPort](structures/serial-port.md)
 * `webContents` [WebContents](web-contents.md)
 
-Emitted after `navigator.serial.requestPort` has been called and
-`select-serial-port` has fired if a new serial port becomes available before
-the 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
-with the newly added port.
+Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a new serial port becomes available.  For example, this event will fire when a new USB device is plugged in.
 
 #### Event: 'serial-port-removed'
 
@@ -379,11 +358,7 @@ Returns:
 * `port` [SerialPort](structures/serial-port.md)
 * `webContents` [WebContents](web-contents.md)
 
-Emitted after `navigator.serial.requestPort` has been called and
-`select-serial-port` has fired if a serial port has been removed before the
-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.
+Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a serial port has been removed.  For example, this event will fire when a USB device is unplugged.
 
 ### Instance Methods
 
@@ -592,7 +567,7 @@ the original network configuration.
     * `errorCode` Integer - Error code.
   * `callback` Function
     * `verificationResult` Integer - Value can be one of certificate error codes
-    from [here](https://source.chromium.org/chromium/chromium/src/+/main:net/base/net_error_list.h).
+    from [here](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).
     Apart from the certificate error codes, the following special codes can be used.
       * `0` - Indicates success and disables Certificate Transparency verification.
       * `-2` - Indicates failure.
@@ -635,10 +610,9 @@ 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.
-    * `window-placement` - Request access to enumerate screens using the [`getScreenDetails`](https://developer.chrome.com/en/articles/multi-screen-window-placement/) API.
     * `unknown` - An unrecognized permission request
   * `callback` Function
     * `permissionGranted` boolean - Allow or deny the permission.
@@ -706,6 +680,7 @@ session.fromPartition('some-partition').setPermissionCheckHandler((webContents,
     * `deviceType` string - The type of device that permission is being requested on, can be `hid` or `serial`.
     * `origin` string - The origin URL of the device permission check.
     * `device` [HIDDevice](structures/hid-device.md) | [SerialPort](structures/serial-port.md)- the device that permission is being requested for.
+    * `frame` [WebFrameMain](web-frame-main.md) - WebFrameMain checking the device permission.
 
 Sets the handler which can be used to respond to device permission checks for the `session`.
 Returning `true` will allow the device to be permitted and `false` will reject it.
@@ -713,8 +688,8 @@ To clear the handler, call `setDevicePermissionHandler(null)`.
 This handler can be used to provide default permissioning to devices without first calling for permission
 to devices (eg via `navigator.hid.requestDevice`).  If this handler is not defined, the default device
 permissions as granted through device selection (eg via `navigator.hid.requestDevice`) will be used.
-Additionally, the default behavior of Electron is to store granted device permision in memory.
-If longer term storage is needed, a developer can store granted device
+Additionally, 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 `setDevicePermissionHandler`.
 
 ```javascript
@@ -1050,7 +1025,7 @@ is emitted.
 
 #### `ses.getStoragePath()`
 
-Returns `string | null` - The absolute file system path where data for this
+A `string | null` indicating the absolute file system path where data for this
 session is persisted on disk.  For in memory sessions this returns `null`.
 
 ### Instance Properties

docs/api/structures/protocol-response.md

@@ -31,4 +31,4 @@
 * `uploadData` [ProtocolResponseUploadData](protocol-response-upload-data.md) (optional) - The data used as upload data. This is only
   used for URL responses when `method` is `"POST"`.
 
-[net-error]: https://source.chromium.org/chromium/chromium/src/+/main:net/base/net_error_list.h
+[net-error]: https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h

docs/api/structures/trace-config.md

@@ -8,7 +8,7 @@
 * `enable_argument_filter` boolean (optional) - if true, filter event data
   according to a specific list of events that have been manually vetted to not
   include any PII. See [the implementation in
-  Chromium][trace_event_args_allowlist.cc] for specifics.
+  Chromium][trace_event_args_whitelist.cc] for specifics.
 * `included_categories` string[] (optional) - a list of tracing categories to
   include. Can include glob-like patterns using `*` at the end of the category
   name. See [tracing categories][] for the list of categories.
@@ -45,7 +45,7 @@ An example TraceConfig that roughly matches what Chrome DevTools records:
 }
 ```
 
-[tracing categories]: https://chromium.googlesource.com/chromium/src/+/main/base/trace_event/builtin_categories.h
-[memory-infra docs]: https://chromium.googlesource.com/chromium/src/+/main/docs/memory-infra/memory_infra_startup_tracing.md#the-advanced-way
-[trace_event_args_allowlist.cc]: https://chromium.googlesource.com/chromium/src/+/main/services/tracing/public/cpp/trace_event_args_allowlist.cc
+[tracing categories]: https://chromium.googlesource.com/chromium/src/+/master/base/trace_event/builtin_categories.h
+[memory-infra docs]: https://chromium.googlesource.com/chromium/src/+/master/docs/memory-infra/memory_infra_startup_tracing.md#the-advanced-way
+[trace_event_args_whitelist.cc]: https://chromium.googlesource.com/chromium/src/+/master/services/tracing/public/cpp/trace_event_args_whitelist.cc
 [histogram]: https://chromium.googlesource.com/chromium/src.git/+/HEAD/tools/metrics/histograms/README.md

docs/api/system-preferences.md

@@ -183,11 +183,11 @@ Some popular `key` and `type`s are:
 * `NSPreferredWebServices`: `dictionary`
 * `NSUserDictionaryReplacementItems`: `array`
 
-### `systemPreferences.setUserDefault<Type extends keyof UserDefaultTypes>(key, type, value)` _macOS_
+### `systemPreferences.setUserDefault(key, type, value)` _macOS_
 
 * `key` string
-* `type` Type - Can be `string`, `boolean`, `integer`, `float`, `double`, `url`, `array` or `dictionary`.
-* `value` UserDefaultTypes[Type]
+* `type` string - Can be `string`, `boolean`, `integer`, `float`, `double`, `url`, `array` or `dictionary`.
+* `value` string
 
 Set the value of `key` in `NSUserDefaults`.
 

docs/api/tray.md

@@ -25,20 +25,15 @@ app.whenReady().then(() => {
 })
 ```
 
-__Platform Considerations__
-
-If you want to keep exact same behaviors on all platforms, you should not
-rely on the `click` event; instead, always attach a context menu to the tray icon.
-
-__Linux__
+__Platform limitations:__
 
+* On Linux the app indicator will be used if it is supported, otherwise
+  `GtkStatusIcon` will be used instead.
 * On Linux distributions that only have app indicator support, you have to
   install `libappindicator1` to make the tray icon work.
-* The app indicator will be used if it is supported, otherwise
-  `GtkStatusIcon` will be used instead.
 * App indicator will only be shown when it has a context menu.
-* The `click` event is ignored when using the app indicator.
-* In order for changes made to individual `MenuItem`s to take effect,
+* When app indicator is used on Linux, the `click` event is ignored.
+* On Linux in order for changes made to individual `MenuItem`s to take effect,
   you have to call `setContextMenu` again. For example:
 
 ```javascript
@@ -60,16 +55,10 @@ app.whenReady().then(() => {
 })
 ```
 
-__MacOS__
+* On Windows it is recommended to use `ICO` icons to get best visual effects.
 
-* Icons passed to the Tray constructor should be [Template Images](native-image.md#template-image).
-* To make sure your icon isn't grainy on retina monitors, be sure your `@2x` image is 144dpi.
-* If you are bundling your application (e.g., with webpack for development), be sure that the file names are not being mangled or hashed. The filename needs to end in Template, and the `@2x` image needs to have the same filename as the standard image, or MacOS will not magically invert your image's colors or use the high density image.
-* 16x16 (72dpi) and 32x32@2x (144dpi) work well for most icons.
-
-__Windows__
-
-* It is recommended to use `ICO` icons to get best visual effects.
+If you want to keep exact same behaviors on all platforms, you should not
+rely on the `click` event and always attach a context menu to the tray icon.
 
 ### `new Tray(image, [guid])`
 

docs/api/web-contents.md

@@ -35,7 +35,7 @@ for all windows, webviews, opened devtools, and devtools extension background pa
 
 ### `webContents.getFocusedWebContents()`
 
-Returns `WebContents` | null - The web contents that is focused in this application, otherwise
+Returns `WebContents` - The web contents that is focused in this application, otherwise
 returns `null`.
 
 ### `webContents.fromId(id)`
@@ -92,7 +92,7 @@ Returns:
 * `frameRoutingId` Integer
 
 This event is like `did-finish-load` but emitted when the load failed.
-The full list of error codes and their meaning is available [here](https://source.chromium.org/chromium/chromium/src/+/main:net/base/net_error_list.h).
+The full list of error codes and their meaning is available [here](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).
 
 #### Event: 'did-fail-provisional-load'
 
@@ -820,6 +820,9 @@ This event can be used to configure `webPreferences` for the `webContents`
 of a `<webview>` before it's loaded, and provides the ability to set settings
 that can't be set via `<webview>` attributes.
 
+**Note:** The specified `preload` script option will appear as `preloadURL`
+(not `preload`) in the `webPreferences` object emitted with this event.
+
 #### Event: 'did-attach-webview'
 
 Returns:

docs/api/web-frame-main.md

@@ -144,16 +144,6 @@ ipcRenderer.on('port', (e, msg) => {
 
 A `string` representing the current URL of the frame.
 
-#### `frame.origin` _Readonly_
-
-A `string` representing the current origin of the frame, serialized according
-to [RFC 6454](https://www.rfc-editor.org/rfc/rfc6454). This may be different
-from the URL. For instance, if the frame is a child window opened to
-`about:blank`, then `frame.origin` will return the parent frame's origin, while
-`frame.url` will return the empty string. Pages without a scheme/host/port
-triple origin will have the serialized origin of `"null"` (that is, the string
-containing the letters n, u, l, l).
-
 #### `frame.top` _Readonly_
 
 A `WebFrameMain | null` representing top frame in the frame hierarchy to which `frame`
@@ -205,6 +195,3 @@ have the same `routingId`.
 A `string` representing the [visibility state](https://developer.mozilla.org/en-US/docs/Web/API/Document/visibilityState) of the frame.
 
 See also how the [Page Visibility API](browser-window.md#page-visibility) is affected by other Electron APIs.
-
-[SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
-[`postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage

docs/api/web-frame.md

@@ -110,7 +110,7 @@ webFrame.setSpellCheckProvider('en-US', {
 })
 ```
 
-### `webFrame.insertCSS(css[, options])`
+#### `webFrame.insertCSS(css[, options])`
 
 * `css` string
 * `options` Object (optional)

docs/api/webview-tag.md

@@ -158,6 +158,9 @@ When the guest page doesn't have node integration this script will still have
 access to all Node APIs, but global objects injected by Node will be deleted
 after this script has finished executing.
 
+**Note:** This option will appear as `preloadURL` (not `preload`) in
+the `webPreferences` specified to the `will-attach-webview` event.
+
 ### `httpreferrer`
 
 ```html
@@ -556,7 +559,7 @@ Stops any `findInPage` request for the `webview` with the provided `action`.
   * `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` in microns.
+  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`.
 
 Returns `Promise<void>`
 

docs/api/window-open.md

@@ -73,11 +73,6 @@ creating the window. Note that this is more powerful than passing options
 through the feature string, as the renderer has more limited privileges in
 deciding security preferences than the main process.
 
-In addition to passing in `action` and `overrideBrowserWindowOptions`,
-`outlivesOpener` can be passed like: `{ action: 'allow', outlivesOpener: true,
-overrideBrowserWindowOptions: { ... } }`. If set to `true`, the newly created
-window will not close when the opener window closes. The default value is `false`.
-
 ### Native `Window` example
 
 ```javascript

docs/breaking-changes.md

@@ -34,19 +34,9 @@ window manager. There is not a direct equivalent for Wayland, and the known
 workarounds have unacceptable tradeoffs (e.g. Window.is_skip_taskbar in GNOME
 requires unsafe mode), so Electron is unable to support this feature on Linux.
 
-### API Changed: `session.setDevicePermissionHandler(handler)`
-
-The handler invoked when `session.setDevicePermissionHandler(handler)` is used
-has a change to its arguments.  This handler no longer is passed a frame
-`[WebFrameMain](api/web-frame-main.md)`, but instead is passed the `origin`, which
-is the origin that is checking for device permission.
-
 ## Planned Breaking API Changes (19.0)
 
-### Removed: IA32 Linux binaries
-
-This is a result of Chromium 102.0.4999.0 dropping support for IA32 Linux.
-This concludes the [removal of support for IA32 Linux](#removed-ia32-linux-support).
+*None (yet)*
 
 ## Planned Breaking API Changes (18.0)
 
@@ -382,7 +372,7 @@ value.
 In Electron 12, `contextIsolation` will be enabled by default.  To restore
 the previous behavior, `contextIsolation: false` must be specified in WebPreferences.
 
-We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation) for the security of your application.
+We [recommend having contextIsolation enabled](tutorial/security.md#3-enable-context-isolation-for-remote-content) for the security of your application.
 
 Another implication is that `require()` cannot be used in the renderer process unless
 `nodeIntegration` is `true` and `contextIsolation` is `false`.
@@ -1213,10 +1203,6 @@ not present, then the native module will fail to load on Windows, with an error
 message like `Cannot find module`. See the [native module
 guide](/docs/tutorial/using-native-node-modules.md) for more.
 
-### Removed: IA32 Linux support
-
-Electron 18 will no longer run on 32-bit Linux systems. See [discontinuing support for 32-bit Linux](https://www.electronjs.org/blog/linux-32bit-support) for more information.
-
 ## Breaking API Changes (3.0)
 
 The following list includes the breaking API changes in Electron 3.0.

docs/development/build-instructions-gn.md

@@ -196,12 +196,12 @@ If you test other combinations and find them to work, please update this documen
 See the GN reference for allowable values of [`target_os`][target_os values]
 and [`target_cpu`][target_cpu values].
 
-[target_os values]: https://gn.googlesource.com/gn/+/main/docs/reference.md#built_in-predefined-variables-target_os_the-desired-operating-system-for-the-build-possible-values
-[target_cpu values]: https://gn.googlesource.com/gn/+/main/docs/reference.md#built_in-predefined-variables-target_cpu_the-desired-cpu-architecture-for-the-build-possible-values
+[target_os values]: https://gn.googlesource.com/gn/+/master/docs/reference.md#built_in-predefined-variables-target_os_the-desired-operating-system-for-the-build-possible-values
+[target_cpu values]: https://gn.googlesource.com/gn/+/master/docs/reference.md#built_in-predefined-variables-target_cpu_the-desired-cpu-architecture-for-the-build-possible-values
 
 #### Windows on Arm (experimental)
 
-To cross-compile for Windows on Arm, [follow Chromium's guide](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/windows_build_instructions.md#Visual-Studio) to get the necessary dependencies, SDK and libraries, then build with `ELECTRON_BUILDING_WOA=1` in your environment before running `gclient sync`.
+To cross-compile for Windows on Arm, [follow Chromium's guide](https://chromium.googlesource.com/chromium/src/+/refs/heads/master/docs/windows_build_instructions.md#Visual-Studio) to get the necessary dependencies, SDK and libraries, then build with `ELECTRON_BUILDING_WOA=1` in your environment before running `gclient sync`.
 
 ```bat
 set ELECTRON_BUILDING_WOA=1

docs/development/build-instructions-linux.md

@@ -82,7 +82,7 @@ $ sudo apt-get install libc6-dev-arm64-cross linux-libc-dev-arm64-cross \
                        g++-aarch64-linux-gnu
 ```
 
-And to cross-compile for `arm` or targets, you should pass the
+And to cross-compile for `arm` or `ia32` targets, you should pass the
 `target_cpu` parameter to `gn gen`:
 
 ```sh

docs/development/build-instructions-windows.md

@@ -9,12 +9,14 @@ Follow the guidelines below for building **Electron itself** on Windows, for the
 * Windows 10 / Server 2012 R2 or higher
 * Visual Studio 2017 15.7.2 or higher - [download VS 2019 Community Edition for
   free](https://www.visualstudio.com/vs/)
-  * See [the Chromium build documentation](https://chromium.googlesource.com/chromium/src/+/main/docs/windows_build_instructions.md#visual-studio) for more details on which Visual Studio
+  * See [the Chromium build documentation](https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md#visual-studio) for more details on which Visual Studio
   components are required.
   * If your Visual Studio is installed in a directory other than the default, you'll need to
   set a few environment variables to point the toolchains to your installation path.
     * `vs2019_install = DRIVE:\path\to\Microsoft Visual Studio\2019\Community`, replacing `2019` and `Community` with your installed versions and replacing `DRIVE:` with the drive that Visual Studio is on. Often, this will be `C:`.
     * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`, replacing `DRIVE:` with the drive that Windows Kits is on. Often, this will be `C:`.
+  * [Python for Windows (pywin32) Extensions](https://pypi.org/project/pywin32/#files)
+  is also needed in order to run the build process.
 * [Node.js](https://nodejs.org/download/)
 * [Git](https://git-scm.com)
 * Debugging Tools for Windows of Windows SDK 10.0.15063.468 if you plan on

docs/development/issues.md

@@ -24,7 +24,7 @@ contribute:
 
 ## Asking for General Help
 
-[The Electron website](https://electronjs.org/community) has a
+["Finding Support"](../tutorial/support.md#finding-support) has a
 list of resources for getting programming help, reporting security issues,
 contributing, and more. Please use the issue tracker for bugs only!
 

docs/faq.md

@@ -135,7 +135,7 @@ is only available in renderer processes.
 
 If [sub-pixel anti-aliasing](https://alienryderflex.com/sub_pixel/) is deactivated, then fonts on LCD screens can look blurry. Example:
 
-![Subpixel rendering example](images/subpixel-rendering-screenshot.gif)
+![subpixel rendering example]
 
 Sub-pixel anti-aliasing needs a non-transparent background of the layer containing the font glyphs. (See [this issue](https://github.com/electron/electron/issues/6344#issuecomment-420371918) for more info).
 
@@ -161,3 +161,4 @@ Notice that just setting the background in the CSS does not have the desired eff
 [indexed-db]: https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API
 [message-port]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
 [browser-window]: api/browser-window.md
+[subpixel rendering example]: images/subpixel-rendering-screenshot.gif

docs/fiddles/communication/two-processes/asynchronous-messages/index.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+  </head>
+  <body>
+    <div>
+      <div>
+        <h1>Asynchronous messages</h1>
+        <i>Supports: Win, macOS, Linux <span>|</span> Process: Both</i>
+        <div>
+          <div>
+            <button id="async-msg">Ping</button>
+            <span id="async-reply"></span>
+          </div>
+          <p>Using <code>ipc</code> to send messages between processes asynchronously is the preferred method since it will return when finished without blocking other operations in the same process.</p>
+
+          <p>This example sends a "ping" from this process (renderer) to the main process. The main process then replies with "pong".</p>
+        </div>
+      </div>
+    </div>
+    <script>
+      // You can also require other files to run in this process
+      require('./renderer.js')
+    </script>
+  </body>
+</html>

docs/fiddles/communication/two-processes/asynchronous-messages/main.js

@@ -0,0 +1,29 @@
+const { app, BrowserWindow, ipcMain } = require('electron')
+
+let mainWindow = null
+
+function createWindow () {
+  const windowOptions = {
+    width: 600,
+    height: 400,
+    title: 'Asynchronous messages',
+    webPreferences: {
+      nodeIntegration: true
+    }
+  }
+
+  mainWindow = new BrowserWindow(windowOptions)
+  mainWindow.loadFile('index.html')
+
+  mainWindow.on('closed', () => {
+    mainWindow = null
+  })
+}
+
+app.whenReady().then(() => {
+  createWindow()
+})
+
+ipcMain.on('asynchronous-message', (event, arg) => {
+  event.sender.send('asynchronous-reply', 'pong')
+})

docs/fiddles/communication/two-processes/asynchronous-messages/renderer.js

@@ -0,0 +1,12 @@
+const { ipcRenderer } = require('electron')
+
+const asyncMsgBtn = document.getElementById('async-msg')
+
+asyncMsgBtn.addEventListener('click', () => {
+  ipcRenderer.send('asynchronous-message', 'ping')
+})
+
+ipcRenderer.on('asynchronous-reply', (event, arg) => {
+  const message = `Asynchronous message reply: ${arg}`
+  document.getElementById('async-reply').innerHTML = message
+})

docs/fiddles/communication/two-processes/synchronous-messages/index.html

@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+  </head>
+  <body>
+    <div>
+      <div>
+        <h1>Synchronous messages</h1>
+        <i>Supports: Win, macOS, Linux <span>|</span> Process: Both</i>
+        <div>
+          <div>
+            <button id="sync-msg">Ping</button>
+            <span id="sync-reply"></span>
+          </div>
+          <p>You can use the <code>ipc</code> module to send synchronous messages between processes as well, but note that the synchronous nature of this method means that it <b>will block</b> other operations while completing its task.</p>
+          
+          <p>This example sends a synchronous message, "ping", from this process (renderer) to the main process. The main process then replies with "pong".</p>
+        </div>
+      </div>
+    </div>
+    <script>
+      // You can also require other files to run in this process
+      require('./renderer.js')
+    </script>
+  </body>
+</html> 

docs/fiddles/communication/two-processes/synchronous-messages/main.js

@@ -0,0 +1,29 @@
+const { app, BrowserWindow, ipcMain } = require('electron')
+
+let mainWindow = null
+
+function createWindow () {
+  const windowOptions = {
+    width: 600,
+    height: 400,
+    title: 'Synchronous Messages',
+    webPreferences: {
+      nodeIntegration: true
+    }
+  }
+
+  mainWindow = new BrowserWindow(windowOptions)
+  mainWindow.loadFile('index.html')
+
+  mainWindow.on('closed', () => {
+    mainWindow = null
+  })
+}
+
+app.whenReady().then(() => {
+  createWindow()
+})
+
+ipcMain.on('synchronous-message', (event, arg) => {
+    event.returnValue = 'pong'
+})

docs/fiddles/communication/two-processes/synchronous-messages/renderer.js

@@ -0,0 +1,9 @@
+const { ipcRenderer } = require('electron')
+
+const syncMsgBtn = document.getElementById('sync-msg')
+
+syncMsgBtn.addEventListener('click', () => {
+    const reply = ipcRenderer.sendSync('synchronous-message', 'ping')
+    const message = `Synchronous message reply: ${reply}`
+    document.getElementById('sync-reply').innerHTML = message
+})

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

@@ -1,4 +1,5 @@
 const { contextBridge, ipcRenderer } = require('electron')
+const path = require('path')
 
 contextBridge.exposeInMainWorld('electron', {
   startDrag: (fileName) => {

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

@@ -8,24 +8,20 @@ function createWindow () {
   })
   
   mainWindow.webContents.session.on('select-hid-device', (event, details, callback) => {
-    //Add events to handle devices being added or removed before the callback on
-    //`select-hid-device` is called.
-    mainWindow.webContents.session.on('hid-device-added', (event, device) => {    
-      console.log('hid-device-added FIRED WITH', device)
-      //Optionally update details.deviceList
-    })
-  
-    mainWindow.webContents.session.on('hid-device-removed', (event, device) => {    
-      console.log('hid-device-removed FIRED WITH', device)
-      //Optionally update details.deviceList
-    })
-
     event.preventDefault()
     if (details.deviceList && details.deviceList.length > 0) {
       callback(details.deviceList[0].deviceId)
     }
   })
 
+  mainWindow.webContents.session.on('hid-device-added', (event, device) => {    
+    console.log('hid-device-added FIRED WITH', device)
+  })
+
+  mainWindow.webContents.session.on('hid-device-removed', (event, device) => {    
+    console.log('hid-device-removed FIRED WITH', device)
+  })
+
   mainWindow.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
     if (permission === 'hid' && details.securityOrigin === 'file:///') {
       return true

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

@@ -8,19 +8,6 @@ function createWindow () {
   })
   
   mainWindow.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {
-
-    //Add listeners to handle ports being added or removed before the callback for `select-serial-port`
-    //is called.
-    mainWindow.webContents.session.on('serial-port-added', (event, port) => {
-      console.log('serial-port-added FIRED WITH', port)
-      //Optionally update portList to add the new port
-    })
-  
-    mainWindow.webContents.session.on('serial-port-removed', (event, port) => {
-      console.log('serial-port-removed FIRED WITH', port)
-      //Optionally update portList to remove the port
-    })
-
     event.preventDefault()
     if (portList && portList.length > 0) {
       callback(portList[0].portId)
@@ -29,20 +16,24 @@ function createWindow () {
     }
   })
 
+  mainWindow.webContents.session.on('serial-port-added', (event, port) => {
+    console.log('serial-port-added FIRED WITH', port)
+  })
+
+  mainWindow.webContents.session.on('serial-port-removed', (event, port) => {
+    console.log('serial-port-removed FIRED WITH', port)
+  })
+
   mainWindow.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
     if (permission === 'serial' && details.securityOrigin === 'file:///') {
       return true
     }
-    
-    return false
   })
 
   mainWindow.webContents.session.setDevicePermissionHandler((details) => {
     if (details.deviceType === 'serial' && details.origin === 'file://') {
       return true
     }
-    
-    return false
   })
   
   mainWindow.loadFile('index.html')

docs/glossary.md

@@ -91,7 +91,7 @@ An IPC system for communicating intra- or inter-process, and that's important
 because Chrome is keen on being able to split its work into separate processes
 or not, depending on memory pressures etc.
 
-See https://chromium.googlesource.com/chromium/src/+/main/mojo/README.md
+See https://chromium.googlesource.com/chromium/src/+/master/mojo/README.md
 
 See also: [IPC](#ipc)
 

docs/images/tutorial-release-schedule.svg

@@ -0,0 +1,97 @@
+<?xml version="1.0" standalone="yes"?>
+<svg width="520" height="220" version="1.1" xmlns="http://www.w3.org/2000/svg">
+  <marker id="arrow" viewBox="-1 0 12 10" refX="10.5" refY="5" markerWidth="8" markerHeight="8" orient="auto">
+    <path d="M 0 0 L 10 5 L 0 10"/>
+  </marker>
+  <g transform="translate(0,40)">
+    <!-- master -->
+    <text x="60" y="30" text-anchor="end" alignment-baseline="middle">master</text>
+    <path d="M70 30 H 500" stroke-width="2" stroke="black"/>
+    <!-- v2.0 -->
+    <g>
+      <path d="M100 30 l 20 30 H 200" stroke-width="2" stroke="black" fill="transparent"/>
+      <text x="110" y="60" text-anchor="end" alignment-baseline="middle">2.0</text>
+      <circle cx="120" cy="60" r="5"/>
+      <text x="110" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 120,60)">v2.0.0-beta0</text>
+      <circle cx="200" cy="60" r="5"/>
+      <text x="190" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 200,60)">v2.0.0</text>
+    </g>
+    <!-- v2.1 -->
+    <g transform="translate(130,0)">
+      <path d="M100 30 l 20 30 H 200" stroke-width="2" stroke="black" fill="transparent"/>
+      <text x="110" y="60" text-anchor="end" alignment-baseline="middle">2.1</text>
+      <circle cx="120" cy="60" r="5"/>
+      <text x="110" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 120,60)">v2.1.0-beta0</text>
+      <circle cx="160" cy="60" r="5"/>
+      <text x="150" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 160,60)">v2.1.0-beta1</text>
+      <circle cx="200" cy="60" r="5"/>
+      <text x="190" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 200,60)">v2.1.0</text>
+    </g>
+    <!-- v3.0 -->
+    <g transform="translate(260,0)">
+      <path d="M100 30 l 20 30 H 200" stroke-width="2" stroke="black" fill="transparent"/>
+      <text x="110" y="60" text-anchor="end" alignment-baseline="middle">3.0</text>
+      <circle cx="120" cy="60" r="5"/>
+      <text x="110" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 120,60)">v3.0.0-beta0</text>
+      <circle cx="200" cy="60" r="5"/>
+      <text x="190" y="60" text-anchor="end" alignment-baseline="middle" transform="rotate(-60 200,60)">v3.0.0</text>
+    </g>
+    <!-- Bug fixes -->
+    <g transform="translate(160,30)">
+      <circle cx="0" cy="0" r="3"/>
+      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
+      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
+    </g>
+    <g transform="translate(260,30)">
+      <circle cx="0" cy="0" r="3"/>
+      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
+      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
+    </g>
+    <g transform="translate(280,30)">
+      <circle cx="0" cy="0" r="3"/>
+      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
+      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
+    </g>
+    <g transform="translate(400,30)">
+      <circle cx="0" cy="0" r="3"/>
+      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
+      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
+    </g>
+    <g transform="translate(430,30)">
+      <circle cx="0" cy="0" r="3"/>
+      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">bug fix</text>
+      <path d="M0 0 l0,30" marker-end="url(#arrow)" stroke-dasharray="2,2" stroke="#000"/>
+    </g>
+    <!-- Features -->
+    <g transform="translate(130,30)">
+      <circle cx="0" cy="0" r="3"/>
+      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">feature</text>
+    </g>
+    <g transform="translate(200,30)">
+      <circle cx="0" cy="0" r="3"/>
+      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">feature</text>
+    </g>
+    <g transform="translate(340,30)">
+      <circle cx="0" cy="0" r="3"/>
+      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)">feature</text>
+    </g>
+    <!-- Chromium update -->
+    <g transform="translate(310,30)">
+      <circle cx="0" cy="0" r="3"/>
+      <text x="10" y="0" text-anchor="start" alignment-baseline="middle" transform="rotate(-60 0,0)"><tspan>chromium</tspan><tspan dy="10" x="10">update</tspan></text>
+    </g>
+    <!-- Timeline -->
+    <g transform="translate(100,160)">
+      <text x="50" y="0" text-anchor="middle" alignment-baseline="text-after-edge">~1 week</text>
+      <path d="M0 0 l0 10 l0 -5 H100l0 -5l0 10" stroke-width="2" stroke="black" fill="transparent"/>
+    </g>
+    <g transform="translate(230,160)">
+      <text x="50" y="0" text-anchor="middle" alignment-baseline="text-after-edge">~1 week</text>
+      <path d="M0 0 l0 10 l0 -5 H100l0 -5l0 10" stroke-width="2" stroke="black" fill="transparent"/>
+    </g>
+    <g transform="translate(360,160)">
+      <text x="50" y="0" text-anchor="middle" alignment-baseline="text-after-edge">~1 week</text>
+      <path d="M0 0 l0 10 l0 -5 H100l0 -5l0 10" stroke-width="2" stroke="black" fill="transparent"/>
+    </g>
+  </g>
+</svg>

docs/tutorial/application-distribution.md

@@ -11,8 +11,8 @@ can either use specialized tooling or manual approaches.
 ## With tooling
 
 There are a couple tools out there that exist to package and distribute your Electron app.
-We recommend using [Electron Forge](./forge-overview.md). You can check out
-its [documentation](https://www.electronforge.io) directly, or refer to the [Packaging and Distribution](./tutorial-5-packaging.md)
+We recommend using [Electron Forge](https://www.electronforge.io). You can check out
+its documentation directly, or refer to the [Packaging and Distribution](./tutorial-5-packaging.md)
 part of the Electron tutorial.
 
 ## Manual packaging

docs/tutorial/asar-archives.md

@@ -1,175 +0,0 @@
----
-title: ASAR Archives
-description: What is ASAR archive and how does it affect the application.
-slug: asar-archives
-hide_title: false
----
-
-After creating an [application distribution](application-distribution.md), the
-app's source code are usually bundled into an [ASAR
-archive](https://github.com/electron/asar), which is a simple extensive archive
-format designed for Electron apps. By bundling the app we can mitigate issues
-around long path names on Windows, speed up `require` and conceal your source
-code from cursory inspection.
-
-The bundled app runs in a virtual file system and most APIs would just work
-normally, but for some cases you might want to work on ASAR archives explicitly
-due to a few caveats.
-
-## Using ASAR Archives
-
-In Electron there are two sets of APIs: Node APIs provided by Node.js and Web
-APIs provided by Chromium. Both APIs support reading files from ASAR archives.
-
-### Node API
-
-With special patches in Electron, Node APIs like `fs.readFile` and `require`
-treat ASAR archives as virtual directories, and the files in it as normal
-files in the filesystem.
-
-For example, suppose we have an `example.asar` archive under `/path/to`:
-
-```sh
-$ asar list /path/to/example.asar
-/app.js
-/file.txt
-/dir/module.js
-/static/index.html
-/static/main.css
-/static/jquery.min.js
-```
-
-Read a file in the ASAR archive:
-
-```javascript
-const fs = require('fs')
-fs.readFileSync('/path/to/example.asar/file.txt')
-```
-
-List all files under the root of the archive:
-
-```javascript
-const fs = require('fs')
-fs.readdirSync('/path/to/example.asar')
-```
-
-Use a module from the archive:
-
-```javascript
-require('./path/to/example.asar/dir/module.js')
-```
-
-You can also display a web page in an ASAR archive with `BrowserWindow`:
-
-```javascript
-const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
-
-win.loadURL('file:///path/to/example.asar/static/index.html')
-```
-
-### Web API
-
-In a web page, files in an archive can be requested with the `file:` protocol.
-Like the Node API, ASAR archives are treated as directories.
-
-For example, to get a file with `$.get`:
-
-```html
-<script>
-let $ = require('./jquery.min.js')
-$.get('file:///path/to/example.asar/file.txt', (data) => {
-  console.log(data)
-})
-</script>
-```
-
-### Treating an ASAR archive as a Normal File
-
-For some cases like verifying the ASAR archive's checksum, we need to read the
-content of an ASAR archive as a file. For this purpose you can use the built-in
-`original-fs` module which provides original `fs` APIs without `asar` support:
-
-```javascript
-const originalFs = require('original-fs')
-originalFs.readFileSync('/path/to/example.asar')
-```
-
-You can also set `process.noAsar` to `true` to disable the support for `asar` in
-the `fs` module:
-
-```javascript
-const fs = require('fs')
-process.noAsar = true
-fs.readFileSync('/path/to/example.asar')
-```
-
-## Limitations of the Node API
-
-Even though we tried hard to make ASAR archives in the Node API work like
-directories as much as possible, there are still limitations due to the
-low-level nature of the Node API.
-
-### Archives Are Read-only
-
-The archives can not be modified so all Node APIs that can modify files will not
-work with ASAR archives.
-
-### Working Directory Can Not Be Set to Directories in Archive
-
-Though ASAR archives are treated as directories, there are no actual
-directories in the filesystem, so you can never set the working directory to
-directories in ASAR archives. Passing them as the `cwd` option of some APIs
-will also cause errors.
-
-### Extra Unpacking on Some APIs
-
-Most `fs` APIs can read a file or get a file's information from ASAR archives
-without unpacking, but for some APIs that rely on passing the real file path to
-underlying system calls, Electron will extract the needed file into a
-temporary file and pass the path of the temporary file to the APIs to make them
-work. This adds a little overhead for those APIs.
-
-APIs that requires extra unpacking are:
-
-* `child_process.execFile`
-* `child_process.execFileSync`
-* `fs.open`
-* `fs.openSync`
-* `process.dlopen` - Used by `require` on native modules
-
-### Fake Stat Information of `fs.stat`
-
-The `Stats` object returned by `fs.stat` and its friends on files in `asar`
-archives is generated by guessing, because those files do not exist on the
-filesystem. So you should not trust the `Stats` object except for getting file
-size and checking file type.
-
-### Executing Binaries Inside ASAR archive
-
-There are Node APIs that can execute binaries like `child_process.exec`,
-`child_process.spawn` and `child_process.execFile`, but only `execFile` is
-supported to execute binaries inside ASAR archive.
-
-This is because `exec` and `spawn` accept `command` instead of `file` as input,
-and `command`s are executed under shell. There is no reliable way to determine
-whether a command uses a file in asar archive, and even if we do, we can not be
-sure whether we can replace the path in command without side effects.
-
-## Adding Unpacked Files to ASAR archives
-
-As stated above, some Node APIs will unpack the file to the filesystem when
-called. Apart from the performance issues, various anti-virus scanners might
-be triggered by this behavior.
-
-As a workaround, you can leave various files unpacked using the `--unpack` option.
-In the following example, shared libraries of native Node.js modules will not be
-packed:
-
-```sh
-$ asar pack app app.asar --unpack *.node
-```
-
-After running the command, you will notice that a folder named `app.asar.unpacked`
-was created together with the `app.asar` file. It contains the unpacked files
-and should be shipped together with the `app.asar` archive.

docs/tutorial/asar-integrity.md

@@ -1,53 +0,0 @@
----
-title: 'ASAR Integrity'
-description: 'An experimental feature that ensures the validity of ASAR contents at runtime.'
-slug: asar-integrity
-hide_title: false
----
-
-## Platform Support
-
-Currently ASAR integrity checking is only supported on macOS.
-
-## Requirements
-
-### Electron Forge / Electron Packager
-
-If you are using `>= electron-packager@15.4.0` or `>= @electron-forge/core@6.0.0-beta.61` then all these requirements are met for you automatically and you can skip to [Toggling the Fuse](#toggling-the-fuse).
-
-### Other build systems
-
-In order to enable ASAR integrity checking you need to ensure that your `app.asar` file was generated by a version of the `asar` npm package that supports asar integrity.  Support was introduced in version `3.1.0`.
-
-Your must then populate a valid `ElectronAsarIntegrity` dictionary block in your packaged apps `Info.plist`.  An example is included below.
-
-```plist
-<key>ElectronAsarIntegrity</key>
-<dict>
-  <key>Resources/app.asar</key>
-  <dict>
-    <key>algorithm</key>
-    <string>SHA256</string>
-    <key>hash</key>
-    <string>9d1f61ea03c4bb62b4416387a521101b81151da0cfbe18c9f8c8b818c5cebfac</string>
-  </dict>
-</dict>
-```
-
-Valid `algorithm` values are currently `SHA256` only.  The `hash` is a hash of the ASAR header using the given algorithm.  The `asar` package exposes a `getRawHeader` method whose result can then be hashed to generate this value.
-
-## Toggling the Fuse
-
-ASAR integrity checking is currently disabled by default and can be enabled by toggling a fuse. See [Electron Fuses](fuses.md) for more information on what Electron Fuses are and how they work.  When enabling this fuse you typically also want to enable the `onlyLoadAppFromAsar` fuse otherwise the validity checking can be bypassed via the Electron app code search path.
-
-```js
-require('@electron/fuses').flipFuses(
-  // E.g. /a/b/Foo.app
-  pathToPackagedApp,
-  {
-    version: FuseVersion.V1,
-    [FuseV1Options.EnableEmbeddedAsarIntegrityValidation]: true,
-    [FuseV1Options.OnlyLoadAppFromAsar]: true
-  }
-)
-```

docs/tutorial/boilerplates-and-clis.md

@@ -26,8 +26,10 @@ beginners, using a command line tool is likely to be helpful*.
 
 ## electron-forge
 
-Electron Forge is a tool for packaging and publishing Electron applications. It unifies Electron's tooling ecosystem
-into a single extensible interface so that anyone can jump right into making Electron apps.
+A "complete tool for building modern Electron applications". Electron Forge
+unifies the existing (and well maintained) build tools for Electron development
+into a cohesive package so that anyone can jump right in to Electron
+development.
 
 Forge comes with [a ready-to-use template](https://electronforge.io/templates) using Webpack as a bundler. It includes an example typescript configuration and provides two configuration files to enable easy customization. It uses the same core modules used by the
 greater Electron community (like [`electron-packager`](https://github.com/electron/electron-packager)) –

docs/tutorial/code-signing.md

@@ -54,11 +54,85 @@ and notarized requires a few additions to your configuration. [Forge](https://el
 collection of the official Electron tools, using [`electron-packager`],
 [`electron-osx-sign`], and [`electron-notarize`] under the hood.
 
-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).
+Let's take a look at an example `package.json` configuration with all required fields. Not all of them are
+required: the tools will be clever enough to automatically find a suitable `identity`, for instance,
+but we recommend that you are explicit.
+
+```json title="package.json" {7}
+{
+  "name": "my-app",
+  "version": "0.0.1",
+  "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": "my-apple-id-password"
+        }
+      }
+    }
+  }
+}
+```
+
+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>
+```
+
+Note that 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.
+
+To see all of this in action, check out Electron Fiddle's source code,
+[especially its `electron-forge` configuration
+file](https://github.com/electron/fiddle/blob/master/forge.config.js).
+
+If you plan to access the microphone or camera within your app using Electron's APIs, you'll also
+need to add the following entitlements:
+
+```xml title="entitlements.plist"
+<key>com.apple.security.device.audio-input</key>
+<true/>
+<key>com.apple.security.device.camera</key>
+<true/>
+```
+
+If these are not present in your app's entitlements when you invoke, for example:
+
+```js title="main.js"
+const { systemPreferences } = require('electron')
+const microphone = systemPreferences.askForMediaAccess('microphone')
+```
+
+Your app may crash. See the Resource Access section in [Hardened Runtime](https://developer.apple.com/documentation/security/hardened_runtime) for more information and entitlements you may need.
+
+### Using Electron Builder
+
+Electron Builder comes with a custom solution for signing your application. You
+can find [its documentation here](https://www.electron.build/code-signing).
 
 ### Using Electron Packager
 
-If you're not using an integrated build pipeline like Forge, you
+If you're not using an integrated build pipeline like Forge or Builder, you
 are likely using [`electron-packager`], which includes [`electron-osx-sign`] and
 [`electron-notarize`].
 
@@ -130,7 +204,36 @@ commit it to your source code.
 
 ### Using Electron Forge
 
-Electron Forge is the recommended way to sign your `Squirrel.Windows` and `WiX MSI` installers. 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).
+Once you have a code signing certificate file (`.pfx`), you can sign
+[Squirrel.Windows][maker-squirrel] and [MSI][maker-msi] installers in Electron Forge
+with the `certificateFile` and `certificatePassword` fields in their respective
+configuration objects.
+
+For example, if you keep your Forge config in your `package.json` file and are
+creating a Squirrel.Windows installer:
+
+```json {9-15} title='package.json'
+{
+  "name": "my-app",
+  "version": "0.0.1",
+  //...
+  "config": {
+    "forge": {
+      "packagerConfig": {},
+      "makers": [
+        {
+          "name": "@electron-forge/maker-squirrel",
+          "config": {
+            "certificateFile": "./cert.pfx",
+            "certificatePassword": "this-is-a-secret"
+          }
+        }
+      ]
+    }
+  }
+  //...
+}
+```
 
 ### Using electron-winstaller (Squirrel.Windows)
 

docs/tutorial/devices.md

@@ -36,10 +36,8 @@ the WebHID API:
   can be used to select a HID device when a call to
   `navigator.hid.requestDevice` is made.  Additionally the [`hid-device-added`](../api/session.md#event-hid-device-added)
   and [`hid-device-removed`](../api/session.md#event-hid-device-removed) events
-  on the Session can be used to handle devices being plugged in or unplugged
-  when handling the `select-hid-device` event.
-  **Note:** These events only fire until the callback from `select-hid-device`
-  is called.  They are not intended to be used as a generic hid device listener.
+  on the Session can be used to handle devices being plugged in or unplugged during the
+  `navigator.hid.requestDevice` process.
 * [`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,
@@ -84,11 +82,8 @@ There are several additional APIs for working with the Web Serial API:
 
 * The [`serial-port-added`](../api/session.md#event-serial-port-added)
   and [`serial-port-removed`](../api/session.md#event-serial-port-removed) events
-  on the Session can be used to handle devices being plugged in or unplugged
-  when handling the `select-serial-port` event.
-  **Note:** These events only fire until the callback from `select-serial-port`
-  is called.  They are not intended to be used as a generic serial port
-  listener.
+  on the Session can be used to handle devices being plugged in or unplugged during the
+  `navigator.serial.requestPort` process.
 * [`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,

docs/tutorial/distribution-overview.md

@@ -11,7 +11,7 @@ you can deliver it to your users.
 ## Packaging
 
 To distribute your app with Electron, you need to package all your resources and assets
-into an executable and rebrand it. To do this, you can either use specialized tooling like Electron Forge
+into an executable and rebrand it. To do this, you can either use specialized tooling
 or do it manually. See the [Application Packaging][application-packaging] tutorial
 for more information.
 

docs/tutorial/electron-timelines.md

@@ -1,102 +1,30 @@
-# Electron Releases
+# Electron Release Timelines
 
-Electron frequently releases major versions alongside every other Chromium release.
-This document focuses on the release cadence and version support policy.
-For a more in-depth guide on our git branches and how Electron uses semantic versions,
-check out our [Electron Versioning](./electron-versioning.md) doc.
+Special notes:
 
-## Timeline
-
-| 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:**
-
-* The `-alpha.1`, `-beta.1`, and `stable` dates are our solid release dates.
-* We strive for weekly alpha/beta releases, but we often release more than scheduled.
+* The `-beta.1` and `stable` dates are our solid release dates.
+* We strive for weekly beta releases, however we often release more betas than scheduled.
 * All dates are our goals but there may be reasons for adjusting the stable deadline, such as security bugs.
+* Take a look at the [5.0.0 Timeline blog post](https://electronjs.org/blog/electron-5-0-timeline) for info about publicizing our release dates.
+* Since Electron 6.0, we've been targeting every other Chromium version and releasing our stable on the same day as Chrome stable. You can reference Chromium's release schedule [here](https://chromiumdash.appspot.com/schedule). See [Electron's new release cadence blog post](https://www.electronjs.org/blog/12-week-cadence) for more details on our release schedule.
+* Starting in Electron 16.0, we will release on an 8-week cadence. See [Electron's new 8-week cadence blog post](https://www.electronjs.org/blog/8-week-cadence) for more details.
 
-**Historical changes:**
-
-* Since Electron 5, Electron has been publicizing its release dates ([see blog post](https://electronjs.org/blog/electron-5-0-timeline)).
-* Since Electron 6, Electron major versions have been targeting every other Chromium major version. Each Electron stable should happen on the same day as Chrome stable ([see blog post](https://www.electronjs.org/blog/12-week-cadence)).
-* Since Electron 16, Electron has been releasing major versions on an 8-week cadence in accordance to Chrome's change to a 4-week release cadence ([see blog post](https://www.electronjs.org/blog/8-week-cadence)).
-
-:::info Chrome release dates
-
-Chromium has the own public release schedule [here](https://chromiumdash.appspot.com/schedule).
-
-:::
-
-## Version support policy
-
-:::info
-
-Beginning in September 2021 (Electron 15), the Electron team
-will temporarily support the latest **four** stable major versions. This
-extended support is intended to help Electron developers transition to
-the [new 8-week release cadence](https://electronjs.org/blog/8-week-cadence),
-and will continue until the release of Electron 19. At that time,
-the Electron team will drop support back to the latest three stable major versions.
-
-:::
-
-The latest three *stable* major versions are supported by the Electron team.
-For example, if the latest release is 6.1.x, then the 5.0.x as well
-as the 4.2.x series are supported. We only support the latest minor release
-for each stable release series. This means that in the case of a security fix,
-6.1.x will receive the fix, but we will not release a new version of 6.0.x.
-
-The latest stable release unilaterally receives all fixes from `main`,
-and the version prior to that receives the vast majority of those fixes
-as time and bandwidth warrants. The oldest supported release line will receive
-only security fixes directly.
-
-### Breaking API changes
-
-When an API is changed or removed in a way that breaks existing functionality, the
-previous functionality will be supported for a minimum of two major versions when
-possible before being removed. For example, if a function takes three arguments,
-and that number is reduced to two in major version 10, the three-argument version would
-continue to work until, at minimum, major version 12. Past the minimum two-version
-threshold, we will attempt to support backwards compatibility beyond two versions
-until the maintainers feel the maintenance burden is too high to continue doing so.
-
-### End-of-life
-
-When a release branch reaches the end of its support cycle, the series
-will be deprecated in NPM and a final end-of-support release will be
-made. This release will add a warning to inform that an unsupported
-version of Electron is in use.
-
-These steps are to help app developers learn when a branch they're
-using becomes unsupported, but without being excessively intrusive
-to end users.
-
-If an application has exceptional circumstances and needs to stay
-on an unsupported series of Electron, developers can silence the
-end-of-support warning by omitting the final release from the app's
-`package.json` `devDependencies`. For example, since the 1-6-x series
-ended with an end-of-support 1.6.18 release, developers could choose
-to stay in the 1-6-x series without warnings with `devDependency` of
-`"electron": 1.6.0 - 1.6.17`.
+| Electron | Alpha | Beta | Stable | Chrome | Node |
+| ------- | ----- | ------- | ------ | ------ | ---- |
+| 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 | TBD |

docs/tutorial/electron-versioning.md

@@ -48,7 +48,7 @@ Stabilization branches are branches that run parallel to `main`, taking in only
 
 Since Electron 8, stabilization branches are always **major** version lines, and named against the following template `$MAJOR-x-y` e.g. `8-x-y`.  Prior to that we used **minor** version lines and named them as `$MAJOR-$MINOR-x` e.g. `2-0-x`.
 
-We allow for multiple stabilization branches to exist simultaneously, one for each supported version. For more details on which versions are supported, see our [Electron Releases](./electron-timelines.md) doc.
+We allow for multiple stabilization branches to exist simultaneously, one for each supported version. For more details on which versions are supported, see our [Electron Release Timelines](./electron-timelines.md) doc.
 
 ![Multiple Stability Branches](../images/versioning-sketch-2.png)
 
@@ -107,15 +107,6 @@ A few examples of how various SemVer ranges will pick up new releases:
 
 ![Semvers and Releases](../images/versioning-sketch-7.png)
 
-### Backport request process
-
-All supported release lines will accept external pull requests to backport
-fixes previously merged to `main`, though this may be on a case-by-case
-basis for some older supported lines. All contested decisions around release
-line backports will be resolved by the
-[Releases Working Group](https://github.com/electron/governance/tree/main/wg-releases)
-as an agenda item at their weekly meeting the week the backport PR is raised.
-
 ## Feature flags
 
 Feature flags are a common practice in Chromium, and are well-established in the web-development ecosystem. In the context of Electron, a feature flag or **soft branch** must have the following properties:

docs/tutorial/forge-overview.md

@@ -1,36 +0,0 @@
-# Distributing Apps With Electron Forge
-
-Electron Forge is a tool for packaging and publishing Electron applications.
-It unifies Electron's build tooling ecosystem into
-a single extensible interface so that anyone can jump right into making Electron apps.
-
-## Getting started
-
-The [Electron Forge docs] contain detailed information on taking your application
-from source code to your end users' machines.
-This includes:
-
-* Packaging your application [(package)]
-* Generating executables and installers for each OS [(make)], and,
-* Publishing these files to online platforms to download [(publish)].
-
-For beginners, we recommend following through Electron's [tutorial] to develop, build,
-package and publish your first Electron app. If you have already developed an app on your machine
-and want to start on packaging and distribution, start from [step 5] of the tutorial.
-
-## Getting help
-
-* If you need help with developing your app, our [community Discord server][discord] is a great place
-to get advice from other Electron app developers.
-* If you suspect you're running into a bug with Forge, please check the [GitHub issue tracker]
-to see if any existing issues match your problem. If not, feel free to fill out our bug report
-template and submit a new issue.
-
-[Electron Forge Docs]: https://www.electronforge.io/
-[step 5]: ./tutorial-5-packaging.md
-[(package)]: https://www.electronforge.io/cli#package
-[(make)]: https://www.electronforge.io/cli#make
-[(publish)]: https://www.electronforge.io/cli#publish
-[GitHub issue tracker]: https://github.com/electron-userland/electron-forge/issues
-[discord]: https://discord.gg/APGC3k5yaH
-[tutorial]: https://www.electronjs.org/docs/latest/tutorial/tutorial-prerequisites

docs/tutorial/fuses.md

@@ -8,59 +8,6 @@ For a subset of Electron functionality it makes sense to disable certain feature
 
 Fuses are the solution to this problem, at a high level they are "magic bits" in the Electron binary that can be flipped when packaging your Electron app to enable / disable certain features / restrictions.  Because they are flipped at package time before you code sign your app the OS becomes responsible for ensuring those bits aren't flipped back via OS level code signing validation (Gatekeeper / App Locker).
 
-## Current Fuses
-
-### `runAsNode`
-
-**Default:** Enabled
-**@electron/fuses:** `FuseV1Options.RunAsNode`
-
-The runAsNode fuse toggles whether the `ELECTRON_RUN_AS_NODE` environment variable is respected or not.  Please note that if this fuse is disabled then `process.fork` in the main process will not function as expected as it depends on this environment variable to function.
-
-### `cookieEncryption`
-
-**Default:** Disabled
-**@electron/fuses:** `FuseV1Options.EnableCookieEncryption`
-
-The cookieEncryption fuse toggles whether the cookie store on disk is encrypted using OS level cryptography keys.  By default the sqlite database that Chromium uses to store cookies stores the values in plaintext.  If you wish to ensure your apps cookies are encrypted in the same way Chrome does then you should enable this fuse.  Please note it is a one-way transition, if you enable this fuse existing unencrypted cookies will be encrypted-on-write but if you then disable the fuse again your cookie store will effectively be corrupt and useless.  Most apps can safely enable this fuse.
-
-### `nodeOptions`
-
-**Default:** Enabled
-**@electron/fuses:** `FuseV1Options.EnableNodeOptionsEnvironmentVariable`
-
-The nodeOptions fuse toggles whether the [`NODE_OPTIONS`](https://nodejs.org/api/cli.html#node_optionsoptions) environment variable is respected or not.  This environment variable can be used to pass all kinds of custom options to the Node.js runtime and isn't typically used by apps in production.  Most apps can safely disable this fuse.
-
-### `nodeCliInspect`
-
-**Default:** Enabled
-**@electron/fuses:** `FuseV1Options.EnableNodeCliInspectArguments`
-
-The nodeCliInspect fuse toggles whether the `--inspect`, `--inspect-brk`, etc. flags are respected or not.  When disabled it also ensures that `SIGUSR1` signal does not initialize the main process inspector.  Most apps can safely disable this fuse.
-
-### `embeddedAsarIntegrityValidation`
-
-**Default:** Disabled
-**@electron/fuses:** `FuseV1Options.EnableEmbeddedAsarIntegrityValidation`
-
-The embeddedAsarIntegrityValidation fuse toggles an experimental feature on macOS that validates the content of the `app.asar` file when it is loaded.  This feature is designed to have a minimal performance impact but may marginally slow down file reads from inside the `app.asar` archive.
-
-For more information on how to use asar integrity validation please read the [Asar Integrity](asar-integrity.md) documentation.
-
-### `onlyLoadAppFromAsar`
-
-**Default:** Disabled
-**@electron/fuses:** `FuseV1Options.OnlyLoadAppFromAsar`
-
-The onlyLoadAppFromAsar fuse changes the search system that Electron uses to locate your app code.  By default Electron will search in the following order `app.asar` -> `app` -> `default_app.asar`.  When this fuse is enabled the search order becomes a single entry `app.asar` thus ensuring that when combined with the `embeddedAsarIntegrityValidation` fuse it is impossible to load non-validated code.
-
-### `loadBrowserProcessSpecificV8Snapshot`
-
-**Default:** Disabled
-**@electron/fuses:** `FuseV1Options.LoadBrowserProcessSpecificV8Snapshot`
-
-The loadBrowserProcessSpecificV8Snapshot fuse changes which V8 snapshot file is used for the browser process.  By default Electron's processes will all use the same V8 snapshot file.  When this fuse is enabled the browser process uses the file called `browser_v8_context_snapshot.bin` for its V8 snapshot. The other processes will use the V8 snapshot file that they normally do.
-
 ## How do I flip the fuses?
 
 ### The easy way
@@ -73,18 +20,11 @@ require('@electron/fuses').flipFuses(
   require('electron'),
   // Fuses to flip
   {
-    version: FuseVersion.V1,
-    [FuseV1Options.RunAsNode]: false
+    runAsNode: false
   }
 )
 ```
 
-You can validate the fuses have been flipped or check the fuse status of an arbitrary Electron app using the fuses CLI.
-
-```bash
- npx @electron/fuses read --app /Applications/Foo.app
-```
-
 ### The hard way
 
 #### Quick Glossary

docs/tutorial/in-app-purchases.md

@@ -116,7 +116,7 @@ inAppPurchase.getProducts(PRODUCT_IDS).then(products => {
     console.log(`The price of ${product.localizedTitle} is ${product.formattedPrice}.`)
   })
 
-  // Ask the user which product they want to purchase.
+  // Ask the user which product he/she wants to purchase.
   const selectedProduct = products[0]
   const selectedQuantity = 1
 

docs/tutorial/introduction.md

@@ -44,14 +44,14 @@ are the different categories and what you can expect on each one:
   application.
 - **Processes in Electron**: In-depth reference on Electron processes and how to work with them.
 - **Best Practices**: Important checklists to keep in mind when developing an Electron app.
-- **Examples**: Quick references to add features to your Electron app.
+- **How-To Examples**: Quick references to add features to your Electron app.
 - **Development**: Miscellaneous development guides.
 - **Distribution**: Learn how to distribute your app to end users.
-- **Testing And Debugging**: How to debug JavaScript, write tests, and other tools used
+- **Testing and debugging**: How to debug JavaScript, write tests, and other tools used
   to create quality Electron applications.
-- **References**: Useful links to better understand how the Electron project works
+- **Resources**: Useful links to better understand how the Electron project works
   and is organized.
-- **Contributing**: Compiling Electron and making contributions can be daunting.
+- **Contributing to Electron**: Compiling Electron and making contributions can be daunting.
   We try to make it easier in this section.
 
 ## Getting help
@@ -66,7 +66,6 @@ Are you getting stuck anywhere? Here are a few links to places to look:
 
 <!-- Links -->
 
-[tutorial]: tutorial-1-prerequisites.md
 [api documentation]: ../api/app.md
 [chromium]: https://www.chromium.org/
 [discord]: https://discord.com/invite/APGC3k5yaH

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

@@ -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.
 
@@ -345,8 +345,7 @@ Electron uses following cryptographic algorithms:
 [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/message-ports.md

@@ -101,7 +101,7 @@ app.whenReady().then(async () => {
     }
   })
 
-  const secondaryWindow = new BrowserWindow({
+  const secondaryWindow = BrowserWindow({
     show: false,
     webPreferences: {
       contextIsolation: false,
@@ -144,7 +144,7 @@ to use `contextIsolation` and set up specific contextBridge calls for each of yo
 expected messages, but for the simplicity of this example we don't. You can find an
 example of context isolation further down this page at [Communicating directly between the main process and the main world of a context-isolated page](#communicating-directly-between-the-main-process-and-the-main-world-of-a-context-isolated-page)
 
-That means window.electronMessagePort is globally available and you can call
+That means window.messagePort is globally available and you can call
 `postMessage` on it from anywhere in your app to send a message to the other
 renderer.
 
@@ -272,7 +272,7 @@ const makeStreamingRequest = (element, callback) => {
 }
 
 makeStreamingRequest(42, (data) => {
-  console.log('got response data:', data)
+  console.log('got response data:', event.data)
 })
 // We will see "got response data: 42" 10 times.
 ```

docs/tutorial/native-file-drag-drop.md

@@ -22,6 +22,7 @@ In `preload.js` use the [`contextBridge`] to inject a method `window.electron.st
 
 ```js
 const { contextBridge, ipcRenderer } = require('electron')
+const path = require('path')
 
 contextBridge.exposeInMainWorld('electron', {
   startDrag: (fileName) => {

docs/tutorial/quick-start.md

@@ -66,7 +66,7 @@ Your `package.json` file should look something like this:
 Then, install the `electron` package into your app's `devDependencies`.
 
 ```sh npm2yarn
-npm install --save-dev electron
+$ npm install --save-dev electron
 ```
 
 > Note: If you're encountering any issues with installing Electron, please
@@ -403,7 +403,7 @@ app.on('window-all-closed', () => {
 ```js
 // preload.js
 
-// All the Node.js APIs are available in the preload process.
+// All of the Node.js APIs are available in the preload process.
 // It has the same sandbox as a Chrome extension.
 window.addEventListener('DOMContentLoaded', () => {
   const replaceText = (selector, text) => {

docs/tutorial/sandbox.md

@@ -12,10 +12,28 @@ the GPU service and the network service.
 
 See Chromium's [Sandbox design document][sandbox] for more information.
 
-Starting from Electron 20, the sandbox is enabled for renderer processes without any
-further configuration. If you want to disable the sandbox for a process, see the
-[Disabling the sandbox for a single process](#disabling-the-sandbox-for-a-single-process)
-section.
+## Electron's sandboxing policies
+
+Electron comes with a mixed sandbox environment, meaning sandboxed processes can run
+alongside privileged ones. By default, renderer processes are not sandboxed, but
+utility processes are. Note that as in Chromium, the main (browser) process is
+privileged and cannot be sandboxed.
+
+Historically, this mixed sandbox approach was established because having Node.js available
+in the renderer is an extremely powerful tool for app developers. Unfortunately, this
+feature is also an equally massive security vulnerability.
+
+Theoretically, unsandboxed renderers are not a problem for desktop applications that
+only display trusted code, but they make Electron less secure than Chromium for
+displaying untrusted web content. However, even purportedly trusted code may be
+dangerous — there are countless attack vectors that malicious actors can use, from
+cross-site scripting to content injection to man-in-the-middle attacks on remotely loaded
+websites, just to name a few. For this reason, we recommend enabling renderer sandboxing
+for the vast majority of cases under an abundance of caution.
+
+<!--TODO: update this guide when #28466 is either solved or closed -->
+Note that there is an active discussion in the issue tracker to enable renderer sandboxing
+by default. See [#28466][issue-28466]) for details.
 
 ## Sandbox behaviour in Electron
 
@@ -28,17 +46,12 @@ When renderer processes in Electron are sandboxed, they behave in the same way a
 regular Chrome renderer would. A sandboxed renderer won't have a Node.js
 environment initialized.
 
+<!-- TODO(erickzhao): when we have a solid guide for IPC, link it here -->
 Therefore, when the sandbox is enabled, renderer processes can only perform privileged
 tasks (such as interacting with the filesystem, making changes to the system, or spawning
 subprocesses) by delegating these tasks to the main process via inter-process
 communication (IPC).
 
-:::note
-
-For more info on inter-process communication, check out our [IPC guide](./ipc.md).
-
-:::
-
 ### Preload scripts
 
 In order to allow renderer processes to communicate with the main process, preload
@@ -53,7 +66,7 @@ but can only import a subset of Electron and Node's built-in modules:
 
 In addition, the preload script also polyfills certain Node.js primitives as globals:
 
-* [`Buffer`](https://nodejs.org/api/buffer.html)
+* [`Buffer`](https://nodejs.org/api/Buffer.html)
 * [`process`](../api/process.md)
 * [`clearImmediate`](https://nodejs.org/api/timers.html#timers_clearimmediate_immediate)
 * [`setImmediate`](https://nodejs.org/api/timers.html#timers_setimmediate_callback_args)
@@ -70,17 +83,13 @@ privileged APIs to untrusted code running in the renderer process unless
 
 ## Configuring the sandbox
 
-For most apps, sandboxing is the best choice. In certain use cases that are incompatible with
-the sandbox (for instance, when using native node modules in the renderer),
-it is possible to disable the sandbox for specific processes. This comes with security
-risks, especially if any untrusted code or content is present in the unsandboxed process.
+### Enabling the sandbox for a single process
 
-### Disabling the sandbox for a single process
+In Electron, renderer sandboxing can be enabled on a per-process basis with
+the `sandbox: true` preference in the [`BrowserWindow`][browser-window] constructor.
 
-In Electron, renderer sandboxing can be disabled on a per-process basis with
-the `sandbox: false` preference in the [`BrowserWindow`][browser-window] constructor.
-
-```js title='main.js'
+```js
+// main.js
 app.whenReady().then(() => {
   const win = new BrowserWindow({
     webPreferences: {
@@ -91,30 +100,17 @@ app.whenReady().then(() => {
 })
 ```
 
-Sandboxing is also disabled whenever Node.js integration is enabled in the renderer.
-This can be done through the BrowserWindow constructor with the `nodeIntegration: true` flag.
-
-```js title='main.js'
-app.whenReady().then(() => {
-  const win = new BrowserWindow({
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-  win.loadURL('https://google.com')
-})
-```
-
 ### Enabling the sandbox globally
 
 If you want to force sandboxing for all renderers, you can also use the
 [`app.enableSandbox`][enable-sandbox] API. Note that this API has to be called before the
 app's `ready` event.
 
-```js title='main.js'
+```js
+// main.js
 app.enableSandbox()
 app.whenReady().then(() => {
-  // any sandbox:false calls are overridden since `app.enableSandbox()` was called.
+  // no need to pass `sandbox: true` since `app.enableSandbox()` was called.
   const win = new BrowserWindow()
   win.loadURL('https://google.com')
 })
@@ -143,16 +139,16 @@ issues:
    have, to inherit everything we can from Chromium, and to respond quickly to
    security issues, but Electron cannot be as secure as Chromium without the
    resources that Chromium is able to dedicate.
-1. Some security features in Chrome (such as Safe Browsing and Certificate
+2. Some security features in Chrome (such as Safe Browsing and Certificate
    Transparency) require a centralized authority and dedicated servers, both of
    which run counter to the goals of the Electron project. As such, we disable
    those features in Electron, at the cost of the associated security they
    would otherwise bring.
-1. There is only one Chromium, whereas there are many thousands of apps built
+3. There is only one Chromium, whereas there are many thousands of apps built
    on Electron, all of which behave slightly differently. Accounting for those
    differences can yield a huge possibility space, and make it challenging to
    ensure the security of the platform in unusual use cases.
-1. We can't push security updates to users directly, so we rely on app vendors
+4. We can't push security updates to users directly, so we rely on app vendors
    to upgrade the version of Electron underlying their app in order for
    security updates to reach users.
 
@@ -161,7 +157,7 @@ versions of Electron, we do not make a guarantee that every fix will be
 backported. Your best chance at staying secure is to be on the latest stable
 version of Electron.
 
-[sandbox]: https://chromium.googlesource.com/chromium/src/+/main/docs/design/sandbox.md
+[sandbox]: https://chromium.googlesource.com/chromium/src/+/master/docs/design/sandbox.md
 [issue-28466]: https://github.com/electron/electron/issues/28466
 [browser-window]: ../api/browser-window.md
 [enable-sandbox]: ../api/app.md#appenablesandbox

docs/tutorial/security.md

@@ -99,7 +99,7 @@ You should at least follow these steps to improve the security of your applicati
 
 1. [Only load secure content](#1-only-load-secure-content)
 2. [Disable the Node.js integration in all renderers that display remote content](#2-do-not-enable-nodejs-integration-for-remote-content)
-3. [Enable context isolation in all renderers](#3-enable-context-isolation)
+3. [Enable context isolation in all renderers that display remote content](#3-enable-context-isolation-for-remote-content)
 4. [Enable process sandboxing](#4-enable-process-sandboxing)
 5. [Use `ses.setPermissionRequestHandler()` in all sessions that load remote content](#5-handle-session-permission-requests-from-remote-content)
 6. [Do not disable `webSecurity`](#6-do-not-disable-websecurity)
@@ -225,7 +225,7 @@ do consume Node.js modules or features. Preload scripts continue to have access
 to `require` and other Node.js features, allowing developers to expose a custom
 API to remotely loaded content via the [contextBridge API](../api/context-bridge.md).
 
-### 3. Enable Context Isolation
+### 3. Enable Context Isolation for remote content
 
 :::info
 This recommendation is the default behavior in Electron since 12.0.0.
@@ -256,7 +256,7 @@ the sandbox in all renderers. Loading, reading or processing any untrusted
 content in an unsandboxed process, including the main process, is not advised.
 
 :::info
-For more information on what Process Sandboxing is and how to enable it please
+For more information on what `contextIsolation` is and how to enable it please
 see our dedicated [Process Sandboxing](sandbox.md) document.
 :::info
 
@@ -279,12 +279,11 @@ security-conscious developers might want to assume the very opposite.
 
 ```js title='main.js (Main Process)'
 const { session } = require('electron')
-const URL = require('url').URL
 
 session
   .fromPartition('some-partition')
   .setPermissionRequestHandler((webContents, permission, callback) => {
-    const parsedUrl = new URL(webContents.getURL())
+    const url = webContents.getURL()
 
     if (permission === 'notifications') {
       // Approves the permissions request
@@ -292,7 +291,7 @@ session
     }
 
     // Verify URL
-    if (parsedUrl.protocol !== 'https:' || parsedUrl.host !== 'example.com') {
+    if (!url.startsWith('https://example.com/')) {
       // Denies the permissions request
       return callback(false)
     }
@@ -563,6 +562,7 @@ app.on('web-contents-created', (event, contents) => {
   contents.on('will-attach-webview', (event, webPreferences, params) => {
     // Strip away preload scripts if unused or verify their location is legitimate
     delete webPreferences.preload
+    delete webPreferences.preloadURL
 
     // Disable Node.js integration
     webPreferences.nodeIntegration = false
@@ -724,41 +724,6 @@ Migrate your app one major version at a time, while referring to Electron's
 [Breaking Changes][breaking-changes] document to see if any code needs to
 be updated.
 
-### 17. Validate the `sender` of all IPC messages
-
-You should always validate incoming IPC messages `sender` property to ensure you
-aren't performing actions or sending information to untrusted renderers.
-
-#### Why?
-
-All Web Frames can in theory send IPC messages to the main process, including
-iframes and child windows in some scenarios.  If you have an IPC message that returns
-user data to the sender via `event.reply` or performs privileged actions that the renderer
-can't natively, you should ensure you aren't listening to third party web frames.
-
-You should be validating the `sender` of **all** IPC messages by default.
-
-#### How?
-
-```js title='main.js (Main Process)'
-// Bad
-ipcMain.handle('get-secrets', () => {
-  return getSecrets();
-});
-
-// Good
-ipcMain.handle('get-secrets', (e) => {
-  if (!validateSender(e.senderFrame)) return null;
-  return getSecrets();
-});
-
-function validateSender(frame) {
-  // Value the host of the URL using an actual URL parser and an allowlist
-  if ((new URL(frame.url)).host === 'electronjs.org') return true;
-  return false;
-}
-```
-
 [breaking-changes]: ../breaking-changes.md
 [browser-window]: ../api/browser-window.md
 [browser-view]: ../api/browser-view.md

docs/tutorial/support.md

@@ -1,5 +1,128 @@
-# This doc has moved!
+# Electron Support
 
-* For information on supported releases, see the [Electron Releases](./electron-timelines.md) doc.
-* For community support on Electron, see the [Community page](https://www.electronjs.org/community).
-* For platform support info, see the [README](https://github.com/electron/electron/blob/main/README.md).
+## Finding Support
+
+If you have a security concern,
+please see the [security document](https://github.com/electron/electron/tree/main/SECURITY.md).
+
+If you're looking for programming help,
+for answers to questions,
+or to join in discussion with other developers who use Electron,
+you can interact with the community in these locations:
+
+* [Electron's Discord server](https://discord.com/invite/APGC3k5yaH) has channels for:
+  * Getting help
+  * Ecosystem apps like [Electron Forge](https://github.com/electron-userland/electron-forge) and [Electron Fiddle](https://github.com/electron/fiddle)
+  * Sharing ideas with other Electron app developers
+  * And more!
+* [`electron`](https://discuss.atom.io/c/electron) category on the Atom forums
+* `#electron` channel on [Atom's Slack](https://discuss.atom.io/t/join-us-on-slack/16638?source_topic_id=25406)
+* [`electron-ru`](https://telegram.me/electron_ru) *(Russian)*
+* [`electron-br`](https://electron-br.slack.com) *(Brazilian Portuguese)*
+* [`electron-kr`](https://electron-kr.github.io/electron-kr) *(Korean)*
+* [`electron-jp`](https://electron-jp.slack.com) *(Japanese)*
+* [`electron-tr`](https://electron-tr.herokuapp.com) *(Turkish)*
+* [`electron-id`](https://electron-id.slack.com) *(Indonesia)*
+* [`electron-pl`](https://electronpl.github.io) *(Poland)*
+
+If you'd like to contribute to Electron,
+see the [contributing document](https://github.com/electron/electron/blob/main/CONTRIBUTING.md).
+
+If you've found a bug in a [supported version](#supported-versions) of Electron,
+please report it with the [issue tracker](../development/issues.md).
+
+[awesome-electron](https://github.com/sindresorhus/awesome-electron)
+is a community-maintained list of useful example apps,
+tools and resources.
+
+## Supported Versions
+
+_**Note:** Beginning in September 2021 with Electron 15, the Electron team
+will temporarily support the latest **four** stable major versions. This
+extended support is intended to help Electron developers transition to
+the [new eight week release cadence](https://electronjs.org/blog/8-week-cadence), and will continue until May 2022, with
+the release of Electron 19. At that time, the Electron team will drop support
+back to the latest three stable major versions._
+
+The latest three *stable* major versions are supported by the Electron team.
+For example, if the latest release is 6.1.x, then the 5.0.x as well
+as the 4.2.x series are supported.  We only support the latest minor release
+for each stable release series.  This means that in the case of a security fix
+6.1.x will receive the fix, but we will not release a new version of 6.0.x.
+
+The latest stable release unilaterally receives all fixes from `main`,
+and the version prior to that receives the vast majority of those fixes
+as time and bandwidth warrants. The oldest supported release line will receive
+only security fixes directly.
+
+All supported release lines will accept external pull requests to backport
+fixes previously merged to `main`, though this may be on a case-by-case
+basis for some older supported lines. All contested decisions around release
+line backports will be resolved by the [Releases Working Group](https://github.com/electron/governance/tree/main/wg-releases) as an agenda item at their weekly meeting the week the backport PR is raised.
+
+When an API is changed or removed in a way that breaks existing functionality, the
+previous functionality will be supported for a minimum of two major versions when
+possible before being removed. For example, if a function takes three arguments,
+and that number is reduced to two in major version 10, the three-argument version would
+continue to work until, at minimum, major version 12. Past the minimum two-version
+threshold, we will attempt to support backwards compatibility beyond two versions
+until the maintainers feel the maintenance burden is too high to continue doing so.
+
+### Currently supported versions
+
+* 18.x.y
+* 17.x.y
+* 16.x.y
+* 15.x.y
+
+### End-of-life
+
+When a release branch reaches the end of its support cycle, the series
+will be deprecated in NPM and a final end-of-support release will be
+made. This release will add a warning to inform that an unsupported
+version of Electron is in use.
+
+These steps are to help app developers learn when a branch they're
+using becomes unsupported, but without being excessively intrusive
+to end users.
+
+If an application has exceptional circumstances and needs to stay
+on an unsupported series of Electron, developers can silence the
+end-of-support warning by omitting the final release from the app's
+`package.json` `devDependencies`. For example, since the 1-6-x series
+ended with an end-of-support 1.6.18 release, developers could choose
+to stay in the 1-6-x series without warnings with `devDependency` of
+`"electron": 1.6.0 - 1.6.17`.
+
+## Supported Platforms
+
+Following platforms are supported by Electron:
+
+### macOS
+
+Only 64bit binaries are provided for macOS, and the minimum macOS version
+supported is macOS 10.11 (El Capitan).
+
+Native support for Apple Silicon (`arm64`) devices was added in Electron 11.0.0.
+
+### Windows
+
+Windows 7 and later are supported, older operating systems are not supported
+(and do not work).
+
+Both `ia32` (`x86`) and `x64` (`amd64`) binaries are provided for Windows.
+[Native support for Windows on Arm (`arm64`) devices was added in Electron 6.0.8.](windows-arm.md).
+Running apps packaged with previous versions is possible using the ia32 binary.
+
+### Linux
+
+The prebuilt binaries of Electron are built on Ubuntu 18.04.
+
+Whether the prebuilt binary can run on a distribution depends on whether the
+distribution includes the libraries that Electron is linked to on the building
+platform, so only Ubuntu 18.04 is guaranteed to work, but following platforms
+are also verified to be able to run the prebuilt binaries of Electron:
+
+* Ubuntu 14.04 and newer
+* Fedora 24 and newer
+* Debian 8 and newer

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

@@ -123,7 +123,7 @@ the list of versions in the [electron/releases] repository.
 [homebrew]: https://brew.sh/
 [mdn-guide]: https://developer.mozilla.org/en-US/docs/Learn/
 [node]: https://nodejs.org/
-[node-guide]: https://nodejs.dev/en/learn/
+[node-guide]: https://nodejs.dev/learn
 [node-download]: https://nodejs.org/en/download/
 [nvm]: https://github.com/nvm-sh/nvm
 [process-model]: ./process-model.md

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

@@ -350,7 +350,7 @@ app.whenReady().then(() => {
 
 ## Optional: Debugging from VS Code
 
-If you want to debug your application using VS Code, you need to attach VS Code to
+If you want to debug your application using VS Code, you have need attach VS Code to
 both the main and renderer processes. Here is a sample configuration for you to
 run. Create a launch.json configuration in a new `.vscode` folder in your project:
 
@@ -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

docs/tutorial/tutorial-3-preload.md

@@ -38,25 +38,7 @@ called a **preload**.
 ## Augmenting the renderer with a preload script
 
 A BrowserWindow's preload script runs in a context that has access to both the HTML DOM
-and a limited subset of Node.js and Electron APIs.
-
-:::info Preload script sandboxing
-
-From Electron 20 onwards, preload scripts are **sandboxed** by default and no longer have access
-to a full Node.js environment. Practically, this means that you have a polyfilled `require`
-function that only has access to a limited set of APIs.
-
-| Available API      | Details                                                                                                                                                                                                                                                        |
-| ------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Electron modules   | Renderer process modules                                                                                                                                                                                                                                       |
-| Node.js modules    | [`events`](https://nodejs.org/api/events.html), [`timers`](https://nodejs.org/api/timers.html), [`url`](https://nodejs.org/api/url.html)                                                                                                                       |
-| Polyfilled globals | [`Buffer`](https://nodejs.org/api/buffer.html), [`process`](../api/process.md), [`clearImmediate`](https://nodejs.org/api/timers.html#timers_clearimmediate_immediate), [`setImmediate`](https://nodejs.org/api/timers.html#timers_setimmediate_callback_args) |
-
-For more information, check out the [Process Sandboxing](./sandbox.md) guide.
-
-:::
-
-Preload scripts are injected before a web page loads in the renderer,
+and a Node.js environment. Preload scripts are injected before a web page loads in the renderer,
 similar to a Chrome extension's [content scripts][content-script]. To add features to your renderer
 that require privileged access, you can define [global] objects through the
 [contextBridge][contextbridge] API.

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

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

docs/tutorial/tutorial-5-packaging.md

@@ -111,12 +111,6 @@ Electron Forge can be configured to create distributables in different OS-specif
 
 :::
 
-:::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.
-
-:::
-
 :::note Packaging without Electron Forge
 
 If you want to manually package your code, or if you're just interested understanding the
@@ -220,7 +214,6 @@ information.
 [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
 
 <!-- Tutorial links -->
 

docs/tutorial/window-customization.md

@@ -115,9 +115,9 @@ const win = new BrowserWindow({
 })
 ```
 
-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:
+On Windows, you can also specify the color of the overlay and its symbols by setting
+`titleBarOverlay` to an object with the `color` and `symbolColor` properties. If an option
+is not specified, the color will default to its system color for the window control buttons:
 
 ```javascript title='main.js'
 // on Windows
@@ -126,8 +126,7 @@ const win = new BrowserWindow({
   titleBarStyle: 'hidden',
   titleBarOverlay: {
     color: '#2f3241',
-    symbolColor: '#74b1be',
-    height: 60
+    symbolColor: '#74b1be'
   }
 })
 ```
@@ -136,10 +135,6 @@ const win = new BrowserWindow({
 > color and dimension values from a renderer using a set of readonly
 > [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars].
 
-### Limitations
-
-* Transparent colors are currently not supported. Progress updates for this feature can be found in PR [#33567](https://github.com/electron/electron/issues/33567).
-
 ## Create transparent windows
 
 By setting the `transparent` option to `true`, you can make a fully transparent window.

electron_paks.gni

@@ -19,12 +19,14 @@ template("electron_repack_percent") {
     # All sources should also have deps for completeness.
     sources = [
       "$root_gen_dir/components/components_resources_${percent}_percent.pak",
+      "$root_gen_dir/content/app/resources/content_resources_${percent}_percent.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_scaled_resources_${percent}_percent.pak",
       "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak",
     ]
 
     deps = [
       "//components/resources",
+      "//content/app/resources",
       "//third_party/blink/public:scaled_resources_${percent}_percent",
       "//ui/resources",
     ]
@@ -52,8 +54,6 @@ template("electron_extra_paks") {
                            ])
     output = "${invoker.output_dir}/resources.pak"
     sources = [
-      "$root_gen_dir/chrome/browser_resources.pak",
-      "$root_gen_dir/chrome/common_resources.pak",
       "$root_gen_dir/chrome/dev_ui_browser_resources.pak",
       "$root_gen_dir/components/components_resources.pak",
       "$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
@@ -65,12 +65,11 @@ template("electron_extra_paks") {
       "$root_gen_dir/net/net_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/inspector_overlay_resources.pak",
+      "$root_gen_dir/ui/resources/webui_resources.pak",
       "$target_gen_dir/electron_resources.pak",
     ]
     deps = [
       "//chrome/browser:dev_ui_browser_resources",
-      "//chrome/browser:resources",
-      "//chrome/common:resources",
       "//components/resources",
       "//content:content_resources",
       "//content:dev_ui_content_resources",
@@ -174,25 +173,19 @@ template("electron_paks") {
     }
 
     source_patterns = [
-      "${root_gen_dir}/chrome/locale_settings_",
       "${root_gen_dir}/chrome/platform_locale_settings_",
-      "${root_gen_dir}/chrome/generated_resources_",
-      "${root_gen_dir}/components/strings/components_locale_settings_",
       "${root_gen_dir}/components/strings/components_strings_",
+      "${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
+      "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
       "${root_gen_dir}/device/bluetooth/strings/bluetooth_strings_",
       "${root_gen_dir}/extensions/strings/extensions_strings_",
       "${root_gen_dir}/services/strings/services_strings_",
-      "${root_gen_dir}/third_party/blink/public/strings/blink_accessibility_strings_",
-      "${root_gen_dir}/third_party/blink/public/strings/blink_strings_",
       "${root_gen_dir}/ui/strings/app_locale_settings_",
       "${root_gen_dir}/ui/strings/ax_strings_",
       "${root_gen_dir}/ui/strings/ui_strings_",
     ]
     deps = [
-      "//chrome/app:generated_resources",
-      "//chrome/app/resources:locale_settings",
       "//chrome/app/resources:platform_locale_settings",
-      "//components/strings:components_locale_settings",
       "//components/strings:components_strings",
       "//device/bluetooth/strings",
       "//extensions/strings",
@@ -208,7 +201,7 @@ template("electron_paks") {
     output_dir = "${invoker.output_dir}/locales"
 
     if (is_mac) {
-      output_locales = locales_as_apple_outputs
+      output_locales = locales_as_mac_outputs
     } else {
       output_locales = platform_pak_locales
     }

electron_resources.grd

@@ -11,8 +11,15 @@
     <output filename="electron_resources.pak" type="data_package" />
   </outputs>
   <release seq="1" allow_pseudo="false">
+    <messages fallback_to_english="true">
+      <!-- TODO(deepak1556): Add translations,
+           check https://www.chromium.org/developers/design-documents/ui-localization -->
+      <part file="electron_strings.grdp" />
+    </messages>
     <includes>
       <include name="IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE" file="${target_gen_dir}/shell_devtools_discovery_page.html" use_base_dir="false" type="BINDATA" />
+      <include name="IDR_PDF_MANIFEST" file="../chrome/browser/resources/pdf/manifest.json" type="BINDATA" />
+      <include name="IDR_CRYPTOTOKEN_MANIFEST" file="../chrome/browser/resources/cryptotoken/manifest.json" type="BINDATA" />
     </includes>
   </release>
 </grit>

electron_strings.grdp

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="utf-8"?>
+<grit-part>
+  <!-- Windows Caption Buttons -->
+  <message name="IDS_APP_ACCNAME_CLOSE" desc="The accessible name for the Close button.">
+    Close
+  </message>
+  <message name="IDS_APP_ACCNAME_MINIMIZE" desc="The accessible name for the Minimize button.">
+    Minimize
+  </message>
+  <message name="IDS_APP_ACCNAME_MAXIMIZE" desc="The accessible name for the Maximize button.">
+    Maximize
+  </message>
+  <message name="IDS_APP_ACCNAME_RESTORE" desc="The accessible name for the Restore button.">
+    Restore
+  </message>
+
+  <!-- Printing Service -->
+  <message name="IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME" desc="The name of the utility process used for printing conversions.">
+    Printing Service
+  </message>
+  <message name="IDS_PRINT_INVALID_PRINTER_SETTINGS" desc="Message to display when selected printer is not reachable or its settings are invalid.">
+    The selected printer is not available or not installed correctly. <ph name="BR">&lt;br&gt;</ph> Check your printer or try selecting another printer.
+  </message>
+  <message name="IDS_DEFAULT_PRINT_DOCUMENT_TITLE" desc="Default title for a print document">
+    Untitled Document
+  </message>
+
+  <!-- Desktop Capturer API -->
+  <message name="IDS_DESKTOP_MEDIA_PICKER_SINGLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there is only one monitor.">
+    Entire Screen
+  </message>
+  <message name="IDS_DESKTOP_MEDIA_PICKER_MULTIPLE_SCREEN_NAME" desc="Name for screens in the desktop media picker UI when there are multiple monitors.">
+    {SCREEN_INDEX, plural, =1{Screen #} other{Screen #}}
+  </message>
+
+  <!-- File Select Helper-->
+  <message name="IDS_IMAGE_FILES" desc="The description of the image file extensions in the select file dialog.">
+    Image Files
+  </message>
+  <message name="IDS_AUDIO_FILES" desc="The description of the audio file extensions in the select file dialog.">
+    Audio Files
+  </message>
+  <message name="IDS_VIDEO_FILES" desc="The description of the video file extensions in the select file dialog.">
+    Video Files
+  </message>
+  <message name="IDS_CUSTOM_FILES" desc="The description of the custom file extensions in the select file dialog.">
+    Custom Files
+  </message>
+  <message name="IDS_DEFAULT_DOWNLOAD_FILENAME" desc="Default name for downloaded files when we have no idea what they could be.">
+    download
+  </message>
+
+  <!-- Picture-in-Picture -->
+  <if expr="is_macosx">
+    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
+      Picture in Picture
+    </message>
+  </if>
+  <if expr="not is_macosx">
+    <message name="IDS_PICTURE_IN_PICTURE_TITLE_TEXT" desc="Title of the Picture-in-Picture window. This appears in the system tray and window header.">
+      Picture in picture
+    </message>
+  </if>
+  <message name="IDS_PICTURE_IN_PICTURE_PAUSE_CONTROL_TEXT" desc="Text label of the pause control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently playing.">
+    Pause
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_PLAY_CONTROL_TEXT" desc="Text label of the play control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently paused.">
+    Play
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_REPLAY_CONTROL_TEXT" desc="Text label of the replay control button. The button appears when the user hovers over the Picture-in-Picture window and the video is ended.">
+    Play from the beginning
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_BACK_TO_TAB_CONTROL_TEXT" desc="Text label of the back to tab control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Back to video player
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently unmuted.">
+    Mute
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_CONTROL_TEXT" desc="Text label of the mute control button. The button appears when the user hovers over the Picture-in-Picture window and the video is currently muted.">
+    Unmute
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_SKIP_AD_CONTROL_TEXT" desc="Text label of the skip ad control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Skip Ad
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_MUTE_MICROPHONE_TEXT" desc="Text label of the mute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Mute microphone
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_MICROPHONE_TEXT" desc="Text label of the unmute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Unmute microphone
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_TURN_ON_CAMERA_TEXT" desc="Text label of the turn on camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Turn on camera
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_TURN_OFF_CAMERA_TEXT" desc="Text label of the turn off camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Turn off camera
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_HANG_UP_TEXT" desc="Text label of the hang up control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Hang up
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_CLOSE_CONTROL_TEXT" desc="Text label of the close control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Close
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_RESIZE_HANDLE_TEXT" desc="Text label of the resize handle. The button appears when the user hovers over the Picture-in-Picture window.">
+    Resize
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_PLAY_PAUSE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles between play and pause controls.">
+    Toggle video to play or pause
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_MUTE_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button toggles mute state.">
+    Toggle mute
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_NEXT_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes next track action.">
+    Next track
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_PREVIOUS_TRACK_CONTROL_ACCESSIBLE_TEXT" desc="Accessible text label used for the controls button in the Picture-in-Picture window. The button invokes previous track action.">
+    Previous track
+  </message>
+  <message name="IDS_SPELLCHECK_DICTIONARY" use_name_for_id="true">
+    en-US
+  </message>
+  <message name="IDS_ACCEPT_LANGUAGES" use_name_for_id="true">
+    en-US,en
+  </message>
+  <if expr="is_win">
+    <message name="IDS_UTILITY_PROCESS_UTILITY_WIN_NAME" desc="The name of the utility process used to handle Windows utility operations.">
+      Windows Utilities
+    </message>
+  </if>
+  <message name="IDS_DOWNLOAD_MORE_ACTIONS"
+          desc="Tooltip of a button on the downloads page that shows a menu with actions like 'Open downloads folder' or 'Clear all'">
+    More actions
+  </message>
+  <!-- Badging -->
+  <message name="IDS_SATURATED_BADGE_CONTENT" desc="The content to display when the application's badge is too large to display to indicate that the badge is more than a given maximum. This string should be as short as possible, preferably only one character beyond the content">
+    <ph name="MAXIMUM_VALUE">$1<ex>99</ex></ph>+
+  </message>
+  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_SATURATED" desc="The accessibility text which will be read by a screen reader when the notification count is too large to display (e.g. greater than 99).">
+    {MAX_UNREAD_NOTIFICATIONS, plural, =1 {More than 1 unread notification} other {More than # unread notifications}}
+  </message>
+  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS_UNSPECIFIED" desc="The accessibility text which will be read by a screen reader when there are some unspecified number of notifications, or user attention is required">
+    Unread Notifications
+  </message>
+  <message name="IDS_BADGE_UNREAD_NOTIFICATIONS" desc="The accessibility text which will be read by a screen reader when there are notifcatications">
+    {UNREAD_NOTIFICATIONS, plural, =1 {1 Unread Notification} other {# Unread Notifications}}
+  </message>
+  <message name="IDS_HID_CHOOSER_ITEM_WITHOUT_NAME" desc="User option displaying the device IDs for a Human Interface Device (HID) without a device name.">
+        Unknown Device (<ph name="DEVICE_ID">$1<ex>1234:abcd</ex></ph>) </message>
+  <if expr="is_win">
+    <then>
+      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for a graphic (image) on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
+        Unlabeled graphic
+      </message>
+    </then>
+    <else>
+      <message name="IDS_AX_UNLABELED_IMAGE_ROLE_DESCRIPTION" desc="Accessibility role description for an image on a web page or PDF that does not have a description for blind users." is_accessibility_with_no_ui="true">
+        Unlabeled image
+      </message>
+    </else>
+  </if>
+</grit-part>

filenames.gni

@@ -86,8 +86,6 @@ filenames = {
     "shell/browser/ui/message_box_win.cc",
     "shell/browser/ui/tray_icon_win.cc",
     "shell/browser/ui/views/electron_views_delegate_win.cc",
-    "shell/browser/ui/views/win_icon_painter.cc",
-    "shell/browser/ui/views/win_icon_painter.h",
     "shell/browser/ui/views/win_frame_view.cc",
     "shell/browser/ui/views/win_frame_view.h",
     "shell/browser/ui/views/win_caption_button.cc",
@@ -108,8 +106,6 @@ filenames = {
     "shell/browser/ui/win/notify_icon.h",
     "shell/browser/ui/win/taskbar_host.cc",
     "shell/browser/ui/win/taskbar_host.h",
-    "shell/browser/win/dark_mode.cc",
-    "shell/browser/win/dark_mode.h",
     "shell/browser/win/scoped_hstring.cc",
     "shell/browser/win/scoped_hstring.h",
     "shell/common/api/electron_api_native_image_win.cc",
@@ -170,8 +166,6 @@ filenames = {
     "shell/browser/ui/cocoa/electron_native_widget_mac.mm",
     "shell/browser/ui/cocoa/electron_ns_window_delegate.h",
     "shell/browser/ui/cocoa/electron_ns_window_delegate.mm",
-    "shell/browser/ui/cocoa/electron_ns_panel.h",
-    "shell/browser/ui/cocoa/electron_ns_panel.mm",
     "shell/browser/ui/cocoa/electron_ns_window.h",
     "shell/browser/ui/cocoa/electron_ns_window.mm",
     "shell/browser/ui/cocoa/electron_preview_item.h",
@@ -573,7 +567,6 @@ filenames = {
     "shell/common/gin_converters/gfx_converter.h",
     "shell/common/gin_converters/guid_converter.h",
     "shell/common/gin_converters/gurl_converter.h",
-    "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/message_box_converter.cc",
@@ -672,6 +665,8 @@ 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",

filenames.hunspell.gni

@@ -7,16 +7,11 @@ hunspell_dictionaries = [
   "//third_party/hunspell_dictionaries/da-DK-3-0.bdic",
   "//third_party/hunspell_dictionaries/de-DE-3-0.bdic",
   "//third_party/hunspell_dictionaries/el-GR-3-0.bdic",
-  "//third_party/hunspell_dictionaries/en-AU-10-0.bdic",
-  "//third_party/hunspell_dictionaries/en-AU-10-1.bdic",
-  "//third_party/hunspell_dictionaries/en-CA-10-0.bdic",
-  "//third_party/hunspell_dictionaries/en-CA-10-1.bdic",
-  "//third_party/hunspell_dictionaries/en-GB-10-0.bdic",
-  "//third_party/hunspell_dictionaries/en-GB-10-1.bdic",
-  "//third_party/hunspell_dictionaries/en-GB-oxendict-10-0.bdic",
-  "//third_party/hunspell_dictionaries/en-GB-oxendict-10-1.bdic",
-  "//third_party/hunspell_dictionaries/en-US-10-0.bdic",
-  "//third_party/hunspell_dictionaries/en-US-10-1.bdic",
+  "//third_party/hunspell_dictionaries/en-AU-9-0.bdic",
+  "//third_party/hunspell_dictionaries/en-CA-9-0.bdic",
+  "//third_party/hunspell_dictionaries/en-GB-9-0.bdic",
+  "//third_party/hunspell_dictionaries/en-GB-oxendict-9-0.bdic",
+  "//third_party/hunspell_dictionaries/en-US-9-0.bdic",
   "//third_party/hunspell_dictionaries/es-ES-3-0.bdic",
   "//third_party/hunspell_dictionaries/et-EE-3-0.bdic",
   "//third_party/hunspell_dictionaries/fa-IR-9-0.bdic",
@@ -51,7 +46,6 @@ hunspell_dictionaries = [
   "//third_party/hunspell_dictionaries/tg-TG-5-0.bdic",
   "//third_party/hunspell_dictionaries/tr-TR-4-0.bdic",
   "//third_party/hunspell_dictionaries/uk-UA-4-0.bdic",
-  "//third_party/hunspell_dictionaries/uk-UA-5-0.bdic",
   "//third_party/hunspell_dictionaries/vi-VN-3-0.bdic",
   "//third_party/hunspell_dictionaries/xx-XX-3-0.bdic",
 ]

filenames.libcxx.gni

@@ -1,376 +1,49 @@
 libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/CMakeLists.txt",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/adjacent_find.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/all_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/any_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/binary_search.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/clamp.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/comp.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/comp_ref_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy_backward.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/copy_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/count.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/count_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/equal.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/equal_range.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/fill.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/fill_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/find.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_end.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_first_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/find_if_not.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/generate.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/generate_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/half_positive.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_found_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_fun_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_in_out_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_in_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_out_out_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/in_out_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/includes.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/inplace_merge.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_heap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_heap_until.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_partitioned.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/is_permutation.h",
-  "//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/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/max.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/max_element.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/merge.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/min.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/min_element.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/min_max_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/minmax.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/minmax_element.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/mismatch.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/move.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/move_backward.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/next_permutation.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/none_of.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/nth_element.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/partial_sort.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/partial_sort_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/partition.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/partition_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/partition_point.h",
-  "//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_find.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_max_element.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_mismatch.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_swap_ranges.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",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/remove_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace_copy_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/replace_if.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/reverse.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/reverse_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/rotate.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/rotate_copy.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/sample.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/search.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/search_n.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_difference.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_intersection.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_symmetric_difference.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/set_union.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/shift_left.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/shift_right.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/shuffle.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/sift_down.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/sort.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/sort_heap.h",
-  "//buildtools/third_party/libc++/trunk/include/__algorithm/stable_partition.h",
-  "//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/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/upper_bound.h",
-  "//buildtools/third_party/libc++/trunk/include/__assert",
   "//buildtools/third_party/libc++/trunk/include/__availability",
-  "//buildtools/third_party/libc++/trunk/include/__bit/bit_cast.h",
-  "//buildtools/third_party/libc++/trunk/include/__bit/byteswap.h",
   "//buildtools/third_party/libc++/trunk/include/__bit_reference",
   "//buildtools/third_party/libc++/trunk/include/__bits",
   "//buildtools/third_party/libc++/trunk/include/__bsd_locale_defaults.h",
   "//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/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/duration.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/file_clock.h",
-  "//buildtools/third_party/libc++/trunk/include/__chrono/high_resolution_clock.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/__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",
-  "//buildtools/third_party/libc++/trunk/include/__compare/compare_three_way.h",
-  "//buildtools/third_party/libc++/trunk/include/__compare/compare_three_way_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__compare/compare_weak_order_fallback.h",
-  "//buildtools/third_party/libc++/trunk/include/__compare/is_eq.h",
-  "//buildtools/third_party/libc++/trunk/include/__compare/ordering.h",
-  "//buildtools/third_party/libc++/trunk/include/__compare/partial_order.h",
-  "//buildtools/third_party/libc++/trunk/include/__compare/strong_order.h",
-  "//buildtools/third_party/libc++/trunk/include/__compare/synth_three_way.h",
-  "//buildtools/third_party/libc++/trunk/include/__compare/three_way_comparable.h",
-  "//buildtools/third_party/libc++/trunk/include/__compare/weak_order.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/arithmetic.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/assignable.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/boolean_testable.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/class_or_enum.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/common_reference_with.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/common_with.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/constructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/convertible_to.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/copyable.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/derived_from.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/destructible.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/different_from.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/equality_comparable.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/invocable.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/movable.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/predicate.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/regular.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/relation.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/same_as.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/semiregular.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/swappable.h",
-  "//buildtools/third_party/libc++/trunk/include/__concepts/totally_ordered.h",
   "//buildtools/third_party/libc++/trunk/include/__config",
   "//buildtools/third_party/libc++/trunk/include/__config_site.in",
-  "//buildtools/third_party/libc++/trunk/include/__coroutine/coroutine_handle.h",
-  "//buildtools/third_party/libc++/trunk/include/__coroutine/coroutine_traits.h",
-  "//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/__errc",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/copy_options.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_entry.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/directory_options.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/file_status.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/file_time_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/file_type.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/filesystem_error.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/operations.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/path.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/path_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/perm_options.h",
-  "//buildtools/third_party/libc++/trunk/include/__filesystem/perms.h",
-  "//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/format_arg.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_fwd.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/format_parse_context.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/format_string.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/format_to_n_result.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/formatter.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/formatter_bool.h",
-  "//buildtools/third_party/libc++/trunk/include/__format/formatter_char.h",
-  "//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_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/__functional/binary_function.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/binary_negate.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/bind.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/bind_back.h",
-  "//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/compose.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/default_searcher.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/function.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/hash.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/identity.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/invoke.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/is_transparent.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/mem_fn.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/mem_fun_ref.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/not_fn.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/operations.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/perfect_forward.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/pointer_to_binary_function.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/pointer_to_unary_function.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/ranges_operations.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/reference_wrapper.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/unary_function.h",
-  "//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/__functional_03",
+  "//buildtools/third_party/libc++/trunk/include/__functional_base",
+  "//buildtools/third_party/libc++/trunk/include/__functional_base_03",
   "//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/common_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/concepts.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/counted_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/data.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/default_sentinel.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/distance.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/empty.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/erase_if_container.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/front_insert_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/incrementable_traits.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/indirectly_comparable.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/insert_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/istream_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/istreambuf_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/iter_move.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/iter_swap.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/iterator.h",
   "//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/next.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/ostream_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/ostreambuf_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/permutable.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/prev.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/projected.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/readable_traits.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/reverse_access.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/reverse_iterator.h",
-  "//buildtools/third_party/libc++/trunk/include/__iterator/size.h",
-  "//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/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/auto_ptr.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/pointer_safety.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/temporary_buffer.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/uninitialized_algorithms.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/unique_ptr.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/uses_allocator.h",
-  "//buildtools/third_party/libc++/trunk/include/__memory/voidify.h",
   "//buildtools/third_party/libc++/trunk/include/__mutex_base",
   "//buildtools/third_party/libc++/trunk/include/__node_handle",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/accumulate.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/adjacent_difference.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/exclusive_scan.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/gcd_lcm.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/inclusive_scan.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/inner_product.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/iota.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/midpoint.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/partial_sum.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/reduce.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/transform_exclusive_scan.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/transform_inclusive_scan.h",
-  "//buildtools/third_party/libc++/trunk/include/__numeric/transform_reduce.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/bernoulli_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/binomial_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/cauchy_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/chi_squared_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/clamp_to_integral.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/default_random_engine.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/discard_block_engine.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/discrete_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/exponential_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/extreme_value_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/fisher_f_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/gamma_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/generate_canonical.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/geometric_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/independent_bits_engine.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/is_seed_sequence.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/is_valid.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/knuth_b.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/linear_congruential_engine.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/log2.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/lognormal_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/mersenne_twister_engine.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/negative_binomial_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/normal_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/piecewise_constant_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/piecewise_linear_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/poisson_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/random_device.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/ranlux.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/seed_seq.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/shuffle_order_engine.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/student_t_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/subtract_with_carry_engine.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/uniform_int_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/uniform_random_bit_generator.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/uniform_real_distribution.h",
-  "//buildtools/third_party/libc++/trunk/include/__random/weibull_distribution.h",
+  "//buildtools/third_party/libc++/trunk/include/__nullptr",
   "//buildtools/third_party/libc++/trunk/include/__ranges/access.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/all.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/common_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/concepts.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/copyable_box.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/counted.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/dangling.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/data.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/drop_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/empty.h",
-  "//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/iota_view.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/join_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",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/rbegin.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/ref_view.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/rend.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/reverse_view.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/single_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/size.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/subrange.h",
-  "//buildtools/third_party/libc++/trunk/include/__ranges/take_view.h",
-  "//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/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",
@@ -378,12 +51,14 @@ libcxx_headers = [
   "//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_aix.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",
+  "//buildtools/third_party/libc++/trunk/include/__support/nuttx/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/openbsd/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/solaris/floatingpoint.h",
   "//buildtools/third_party/libc++/trunk/include/__support/solaris/wchar.h",
@@ -393,30 +68,11 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__nop_locale_mgmt.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__posix_l_fallback.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__strtonum_fallback.h",
-  "//buildtools/third_party/libc++/trunk/include/__thread/poll_with_backoff.h",
-  "//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",
   "//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/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/in_place.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/integer_sequence.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/move.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/pair.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/piecewise_construct.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/priority_tag.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/rel_ops.h",
-  "//buildtools/third_party/libc++/trunk/include/__utility/swap.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/to_underlying.h",
-  "//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/algorithm",
   "//buildtools/third_party/libc++/trunk/include/any",
   "//buildtools/third_party/libc++/trunk/include/array",
@@ -443,7 +99,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/complex.h",
   "//buildtools/third_party/libc++/trunk/include/concepts",
   "//buildtools/third_party/libc++/trunk/include/condition_variable",
-  "//buildtools/third_party/libc++/trunk/include/coroutine",
   "//buildtools/third_party/libc++/trunk/include/csetjmp",
   "//buildtools/third_party/libc++/trunk/include/csignal",
   "//buildtools/third_party/libc++/trunk/include/cstdarg",
@@ -456,7 +111,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/ctgmath",
   "//buildtools/third_party/libc++/trunk/include/ctime",
   "//buildtools/third_party/libc++/trunk/include/ctype.h",
-  "//buildtools/third_party/libc++/trunk/include/cuchar",
   "//buildtools/third_party/libc++/trunk/include/cwchar",
   "//buildtools/third_party/libc++/trunk/include/cwctype",
   "//buildtools/third_party/libc++/trunk/include/deque",
@@ -468,6 +122,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/experimental/algorithm",
   "//buildtools/third_party/libc++/trunk/include/experimental/coroutine",
   "//buildtools/third_party/libc++/trunk/include/experimental/deque",
+  "//buildtools/third_party/libc++/trunk/include/experimental/filesystem",
   "//buildtools/third_party/libc++/trunk/include/experimental/forward_list",
   "//buildtools/third_party/libc++/trunk/include/experimental/functional",
   "//buildtools/third_party/libc++/trunk/include/experimental/iterator",
@@ -550,7 +205,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/type_traits",
   "//buildtools/third_party/libc++/trunk/include/typeindex",
   "//buildtools/third_party/libc++/trunk/include/typeinfo",
-  "//buildtools/third_party/libc++/trunk/include/uchar.h",
   "//buildtools/third_party/libc++/trunk/include/unordered_map",
   "//buildtools/third_party/libc++/trunk/include/unordered_set",
   "//buildtools/third_party/libc++/trunk/include/utility",

filenames.libcxxabi.gni

@@ -1,5 +1,4 @@
 libcxxabi_headers = [
-  "//buildtools/third_party/libc++abi/trunk/include/CMakeLists.txt",
   "//buildtools/third_party/libc++abi/trunk/include/__cxxabi_config.h",
   "//buildtools/third_party/libc++abi/trunk/include/cxxabi.h",
 ]

lib/browser/.eslintrc.json

@@ -18,4 +18,4 @@
       }
     ]
   }
-}
+}