chore: fix lint

fixup tests
chore: fixup linting
2026-04-10 03:01:51 -04:00 · 2020-11-10 14:07:04 -08:00 · 2020-11-10 14:03:02 -08:00 · 2020-11-10 14:03:00 -08:00 · 2020-11-10 14:02:22 -08:00 · 2020-11-10 14:02:22 -08:00
753 changed files with 7091 additions and 34379 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,16 +57,6 @@ parameters:
    type: boolean
    default: false

-# Executors
-executors:
-  linux-arm:
-    resource_class: electronjs/linux-arm
-    machine: true
-
-  linux-arm64:
-    resource_class: electronjs/linux-arm64
-    machine: true
-
 # The config expects the following environment variables to be set:
 #  - "SLACK_WEBHOOK" Slack hook URL to send notifications.
 #
@@ -79,7 +69,7 @@ executors:
 # Build machines configs.
 docker-image: &docker-image
  docker:
-    - image: electron.azurecr.io/build:d818f06a9b1540c7fd38f75ad5a2c493dd6843b6
+    - image: electron.azurecr.io/build:4cec2c5ab66765caa724e37bae2bffb9b29722a5

 machine-linux-medium: &machine-linux-medium
  <<: *docker-image
@@ -168,6 +158,10 @@ env-mas-apple-silicon: &env-mas-apple-silicon
  TARGET_ARCH: arm64
  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1

+# Misc build configuration options.
+env-enable-sccache: &env-enable-sccache
+  USE_SCCACHE: true
+
 env-send-slack-notifications: &env-send-slack-notifications
  NOTIFY_SLACK: true
  
@@ -235,25 +229,6 @@ step-maybe-notify-slack-success: &step-maybe-notify-slack-success
      fi
    when: on_success

-step-maybe-cleanup-arm: &step-maybe-cleanup-arm
-  run:
-    name: Cleanup after testing
-    command: |
-      if  [ "$TARGET_ARCH" == "arm64" ] &&[ "`uname`" == "Darwin" ]; then
-        killall Electron || echo "No Electron processes left running"
-        killall Safari || echo "No Safari processes left running"
-        rm -rf ~/Library/Application\ Support/Electron*
-        rm -rf ~/Library/Application\ Support/electron*
-      elif [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
-        XVFB=/usr/bin/Xvfb
-        /sbin/start-stop-daemon --stop --exec $XVFB || echo "Xvfb not running"
-        pkill electron || echo "electron not running"
-        rm -rf ~/.config/Electron*
-        rm -rf ~/.config/electron*
-      fi
-
-    when: always
-
 step-checkout-electron: &step-checkout-electron
  checkout:
    path: src/electron
@@ -290,7 +265,7 @@ step-gclient-sync: &step-gclient-sync
          if ! git diff-index --quiet HEAD --; then
            # There are changes to the patches. Make a git commit with the updated patches
            git add patches
-            GIT_COMMITTER_NAME="PatchUp" GIT_COMMITTER_EMAIL="73610968+patchup[bot]@users.noreply.github.com" git commit -m "chore: update patches" --author="PatchUp <73610968+patchup[bot]@users.noreply.github.com>"
+            GIT_COMMITTER_NAME="Electron Bot" GIT_COMMITTER_EMAIL="electron@github.com" git commit -m "update patches" --author="Electron Bot <electron@github.com>"
            # Export it
            mkdir -p ../../patches
            git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
@@ -320,14 +295,26 @@ step-setup-env-for-build: &step-setup-env-for-build
      # To find `gn` executable.
      echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV

+      if [ "$USE_SCCACHE" == "true" ]; then
+        # https://github.com/mozilla/sccache
+        SCCACHE_PATH="$PWD/src/electron/external_binaries/sccache"
+        echo 'export SCCACHE_PATH="'"$SCCACHE_PATH"'"' >> $BASH_ENV
+        if [ "$CIRCLE_PR_NUMBER" != "" ]; then
+          #if building a fork set readonly access to sccache
+          echo 'export SCCACHE_BUCKET="electronjs-sccache-ci"' >> $BASH_ENV
+          echo 'export SCCACHE_TWO_TIER=true' >> $BASH_ENV
+        fi
+      fi
+
 step-setup-goma-for-build: &step-setup-goma-for-build
  run:
    name: Setup Goma
    command: |
-      echo 'export NUMBER_OF_NINJA_PROCESSES=300' >> $BASH_ENV
-      if [ "`uname`" == "Darwin" ]; then
-        echo 'ulimit -n 10000' >> $BASH_ENV
-        echo 'sudo launchctl limit maxfiles 65536 200000' >> $BASH_ENV
+      echo 'export USE_GOMA=true' >> $BASH_ENV
+      if [ "`uname`" == "Linux" ]; then
+        echo 'export NUMBER_OF_NINJA_PROCESSES=300' >> $BASH_ENV
+      else
+        echo 'export NUMBER_OF_NINJA_PROCESSES=25' >> $BASH_ENV
      fi
      if [ ! -z "$RAW_GOMA_AUTH" ]; then
        echo $RAW_GOMA_AUTH > ~/.goma_oauth2_config
@@ -336,28 +323,24 @@ step-setup-goma-for-build: &step-setup-goma-for-build
      cd build-tools
      npm install
      mkdir third_party
-      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-      export GOMA_FALLBACK_ON_AUTH_FAILURE=true
-      third_party/goma/goma_ctl.py ensure_start
+      node -e "require('./src/utils/goma.js').downloadAndPrepare()"
+      node -e "require('./src/utils/goma.js').ensure()"
      echo 'export GN_GOMA_FILE='`node -e "console.log(require('./src/utils/goma.js').gnFilePath)"` >> $BASH_ENV
      echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
-      echo 'export GOMA_FALLBACK_ON_AUTH_FAILURE=true' >> $BASH_ENV
      cd ..

 step-restore-brew-cache: &step-restore-brew-cache
  restore_cache:
    paths:
-      - /usr/local/Cellar/gnu-tar
-      - /usr/local/bin/gtar
+      - /usr/local/Homebrew
    keys:
-      - v4-brew-cache-{{ arch }}
+      - v2-brew-cache-{{ arch }}

 step-save-brew-cache: &step-save-brew-cache
  save_cache:
    paths:
-      - /usr/local/Cellar/gnu-tar
-      - /usr/local/bin/gtar
-    key: v4-brew-cache-{{ arch }}
+      - /usr/local/Homebrew
+    key: v2-brew-cache-{{ arch }}
    name: Persisting brew cache

 step-get-more-space-on-mac: &step-get-more-space-on-mac
@@ -478,6 +461,9 @@ step-fix-sync-on-mac: &step-fix-sync-on-mac
        # Fix Clang Install (wrong binary)
        rm -rf src/third_party/llvm-build
        python src/tools/clang/scripts/update.py
+        # Fix Framework Header Installs (symlinks not retained)
+        rm -rf src/electron/external_binaries
+        python src/electron/script/update-external-binaries.py
      fi

 step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
@@ -494,10 +480,8 @@ step-install-gnutar-on-mac: &step-install-gnutar-on-mac
    name: Install gnu-tar on macos
    command: |
      if [ "`uname`" == "Darwin" ]; then
-        if [ ! -d /usr/local/Cellar/gnu-tar/ ]; then
-          brew update
-          brew install gnu-tar
-        fi
+        brew update
+        brew install gnu-tar
        ln -fs /usr/local/bin/gtar /usr/local/bin/tar
      fi

@@ -506,7 +490,11 @@ step-gn-gen-default: &step-gn-gen-default
    name: Default GN gen
    command: |
      cd src
-      gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      if [ "$USE_GOMA" == "true" ]; then
+        gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      else
+        gn gen out/Default --args="import(\"$GN_CONFIG\") cc_wrapper=\"$SCCACHE_PATH\" $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      fi

 step-gn-check: &step-gn-check
  run:
@@ -515,6 +503,7 @@ step-gn-check: &step-gn-check
      cd src
      gn check out/Default //electron:electron_lib
      gn check out/Default //electron:electron_app
+      gn check out/Default //electron:manifests
      gn check out/Default //electron/shell/common/api:mojo
      # Check the hunspell filenames
      node electron/script/gen-hunspell-filenames.js --check
@@ -543,11 +532,14 @@ step-electron-build: &step-electron-build
        ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
        ninja -C out/Default tools/v8_context_snapshot -j $NUMBER_OF_NINJA_PROCESSES
        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-        (cd out/Default; zip mksnapshot.zip mksnapshot_args clang_x64_v8_arm64/gen/v8/embedded.S)
        rm -rf out/Default/clang_x64_v8_arm64/obj

-        # Regenerate because we just deleted some ninja files 
-        gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        # Regenerate because we just deleted some ninja files
+        if [ "$USE_GOMA" == "true" ]; then
+          gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        else
+          gn gen out/Default --args="import(\"$GN_CONFIG\") cc_wrapper=\"$SCCACHE_PATH\" $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        fi
      fi
      ninja -C out/Default electron -j $NUMBER_OF_NINJA_PROCESSES
      node electron/script/check-symlinks.js
@@ -623,7 +615,11 @@ step-electron-maybe-chromedriver-gn-gen: &step-electron-maybe-chromedriver-gn-ge
    command: |
      cd src
      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
-        gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        if [ "$USE_GOMA" == "true" ]; then
+          gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        else
+          gn gen out/chromedriver --args="import(\"$GN_CONFIG\") cc_wrapper=\"$SCCACHE_PATH\" is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+        fi
      fi

 step-electron-chromedriver-build: &step-electron-chromedriver-build
@@ -698,7 +694,6 @@ step-persist-data-for-tests: &step-persist-data-for-tests
      - src/electron
      - src/third_party/electron_node
      - src/third_party/nan
-      - src/cross-arch-snapshots

 step-electron-dist-unzip: &step-electron-dist-unzip
  run:
@@ -735,7 +730,11 @@ step-ffmpeg-gn-gen: &step-ffmpeg-gn-gen
    name: ffmpeg GN gen
    command: |
      cd src
-      gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS"
+      if [ "$USE_GOMA" == "true" ]; then
+        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS"
+      else
+        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") cc_wrapper=\"$SCCACHE_PATH\" $GN_EXTRA_ARGS"
+      fi

 step-ffmpeg-build: &step-ffmpeg-build
  run:
@@ -761,11 +760,7 @@ step-verify-mksnapshot: &step-verify-mksnapshot
    name: Verify mksnapshot
    command: |
      cd src
-      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
-        python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/cross-arch-snapshots
-      else
-        python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default
-      fi
+      python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default

 step-verify-chromedriver: &step-verify-chromedriver
  run:
@@ -782,16 +777,21 @@ step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
        sh -e /etc/init.d/xvfb start
      fi

-step-show-goma-stats: &step-show-goma-stats
+step-show-sccache-stats: &step-show-sccache-stats
  run:
    shell: /bin/bash
-    name: Check goma stats after build
-    command: |      
-      set +e
-      set +o pipefail
-      $LOCAL_GOMA_DIR/goma_ctl.py stat
-      $LOCAL_GOMA_DIR/diagnose_goma_log.py
-      true
+    name: Check sccache/goma stats after build
+    command: |
+      if [ "$SCCACHE_PATH" != "" ]; then
+        $SCCACHE_PATH -s
+      fi
+      if [ "$USE_GOMA" == "true" ]; then
+        set +e
+        set +o pipefail
+        $LOCAL_GOMA_DIR/goma_ctl.py stat
+        $LOCAL_GOMA_DIR/diagnose_goma_log.py
+        true
+      fi
    when: always

 step-mksnapshot-build: &step-mksnapshot-build
@@ -892,6 +892,23 @@ step-maybe-cross-arch-snapshot-store: &step-maybe-cross-arch-snapshot-store
    path: src/cross-arch-snapshots
    destination: cross-arch-snapshots

+step-maybe-trigger-arm-test: &step-maybe-trigger-arm-test
+  run:
+    name: Trigger an arm test on VSTS if applicable
+    command: |
+      cd src
+      # Only run for non-fork prs
+      if [ "$TRIGGER_ARM_TEST" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
+        #Trigger VSTS job, passing along CircleCI job number and branch to build
+        if [ "`uname`" == "Darwin" ]; then
+          echo "Triggering electron-arm2-testing build on Azure DevOps"  
+          node electron/script/release/ci-release-build.js --job=electron-arm2-testing --ci=DevOps --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
+        else
+          echo "Triggering electron-$TARGET_ARCH-testing build on VSTS"  
+          node electron/script/release/ci-release-build.js --job=electron-$TARGET_ARCH-testing --ci=VSTS --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
+        fi
+      fi
+
 step-maybe-generate-typescript-defs: &step-maybe-generate-typescript-defs
  run:
    name: Generate type declarations
@@ -913,8 +930,6 @@ step-ninja-summary: &step-ninja-summary
  run:
    name: Print ninja summary
    command: |
-      set +e
-      set +o pipefail
      python depot_tools/post_build_ninja_summary.py -C src/out/Default

 step-ninja-report: &step-ninja-report
@@ -1183,7 +1198,6 @@ steps-electron-gn-check: &steps-electron-gn-check
    - *step-maybe-early-exit-doc-only-change
    - *step-depot-tools-add-to-path
    - *step-setup-env-for-build
-    - *step-setup-goma-for-build
    - *step-gn-gen-default
    - *step-gn-check

@@ -1217,7 +1231,7 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha

    - *step-depot-tools-add-to-path
    - *step-setup-env-for-build
-    - *step-setup-goma-for-build
+    - *step-restore-brew-cache
    - *step-get-more-space-on-mac
    - *step-install-npm-deps-on-mac
    - *step-fix-sync-on-mac
@@ -1226,13 +1240,26 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
    #Compile ts/js to verify doc change didn't break anything
    - *step-ts-compile

+steps-chromedriver-build: &steps-chromedriver-build
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-setup-env-for-build
+    - *step-fix-sync-on-mac
+
+    - *step-electron-maybe-chromedriver-gn-gen
+    - *step-electron-chromedriver-build
+    - *step-electron-chromedriver-store
+
+    - *step-maybe-notify-slack-failure
+
 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-gn-gen-default

    - run:
@@ -1240,7 +1267,7 @@ steps-native-tests: &steps-native-tests
        command: |
          cd src
          ninja -C out/Default $BUILD_TARGET
-    - *step-show-goma-stats
+    - *step-show-sccache-stats

    - *step-setup-linux-for-headless-testing
    - run:
@@ -1306,14 +1333,8 @@ steps-tests: &steps-tests
          ELECTRON_DISABLE_SECURITY_WARNINGS: 1
        command: |
          cd src
-          if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
-            export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true
-            (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging)
-            (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging)
-          else
-            (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split))
-            (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split))
-          fi
+          (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split))
+          (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split))
    - run:
        name: Check test results existence
        command: |
@@ -1334,8 +1355,6 @@ steps-tests: &steps-tests

    - *step-maybe-notify-slack-failure

-    - *step-maybe-cleanup-arm
-
 steps-test-nan: &steps-test-nan
  steps:
    - attach_workspace:
@@ -1553,7 +1572,7 @@ commands:
            - *step-nodejs-headers-build
            - *step-nodejs-headers-store

-            - *step-show-goma-stats
+            - *step-show-sccache-stats

            # mksnapshot
            - *step-mksnapshot-build
@@ -1608,6 +1627,9 @@ commands:
                steps:
                  - *step-save-out-cache

+            # Trigger tests on arm hardware if needed
+            - *step-maybe-trigger-arm-test
+
            - *step-maybe-notify-slack-failure

  electron-publish:
@@ -1638,14 +1660,13 @@ commands:
            - *step-gclient-sync
            - *step-delete-git-directories
            - *step-minimize-workspace-size-from-checkout
-      - *step-fix-sync-on-mac
+      - *step-fix-sync-on-mac            
      - *step-setup-env-for-build
-      - *step-setup-goma-for-build
      - *step-gn-gen-default

      # Electron app
      - *step-electron-build
-      - *step-show-goma-stats
+      - *step-show-sccache-stats
      - *step-maybe-generate-breakpad-symbols
      - *step-maybe-electron-dist-strip
      - *step-electron-dist-build
@@ -1829,6 +1850,14 @@ jobs:
      <<: *env-testing-build
    <<: *steps-electron-gn-check

+  linux-x64-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
  linux-x64-release:
    <<: *machine-linux-2xlarge
    environment:
@@ -1848,8 +1877,8 @@ jobs:
      <<: *env-linux-2xlarge-release
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -1860,8 +1889,8 @@ jobs:
    environment:
      <<: *env-linux-2xlarge-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -1881,6 +1910,15 @@ jobs:
          checkout: true
          use-out-cache: false

+  linux-ia32-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-ia32
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
  linux-ia32-release:
    <<: *machine-linux-2xlarge
    environment:
@@ -1902,9 +1940,9 @@ jobs:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      <<: *env-ia32
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-32bit-release
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -1916,9 +1954,9 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-ia32
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-32bit-release
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -1935,10 +1973,19 @@ jobs:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
    steps:
      - electron-build:
-          persist: true
+          persist: false
          checkout: true
          use-out-cache: false

+  linux-arm-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-arm
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
  linux-arm-release:
    <<: *machine-linux-2xlarge
    environment:
@@ -1959,10 +2006,10 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-32bit-release
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -1974,9 +2021,9 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-32bit-release
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -1993,7 +2040,7 @@ jobs:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
    steps:
      - electron-build:
-          persist: true
+          persist: false
          checkout: true
          use-out-cache: false

@@ -2005,6 +2052,15 @@ jobs:
      <<: *env-testing-build
    <<: *steps-electron-gn-check

+  linux-arm64-chromedriver:
+    <<: *machine-linux-medium
+    environment:
+      <<: *env-linux-medium
+      <<: *env-arm64
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
  linux-arm64-release:
    <<: *machine-linux-2xlarge
    environment:
@@ -2025,9 +2081,9 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm64
      <<: *env-release-build
+      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2039,8 +2095,8 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm64
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -2087,9 +2143,9 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2100,10 +2156,10 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-apple-silicon
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2114,8 +2170,8 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -2126,9 +2182,9 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-apple-silicon
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -2195,9 +2251,9 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas
      <<: *env-release-build
+      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2209,9 +2265,9 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas-apple-silicon
      <<: *env-release-build
+      <<: *env-enable-sccache
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2223,6 +2279,7 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    steps:
      - electron-publish:
@@ -2235,8 +2292,8 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas-apple-silicon
      <<: *env-release-build
+      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: true
@@ -2381,24 +2438,6 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

-  linux-arm-testing-tests:
-    executor: linux-arm
-    environment:
-      <<: *env-arm
-      <<: *env-global
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-tests
-
-  linux-arm64-testing-tests:
-    executor: linux-arm64
-    environment:
-      <<: *env-arm64
-      <<: *env-global
-      <<: *env-headless-testing
-      <<: *env-stack-dumping
-    <<: *steps-tests
-
  osx-testing-x64-tests:
    <<: *machine-mac-large
    environment:
@@ -2579,19 +2618,15 @@ workflows:
    - osx-publish-x64-skip-checkout:
        requires:
          - mac-checkout
-        context: release-env
    - mas-publish-x64-skip-checkout:
        requires:
          - mac-checkout
-        context: release-env
    - osx-publish-arm64-skip-checkout:
        requires:
          - mac-checkout
-        context: release-env
    - mas-publish-arm64-skip-checkout:
        requires:
          - mac-checkout
-        context: release-env

  lint:
    when: << pipeline.parameters.run-lint >>
@@ -2631,23 +2666,8 @@ workflows:
            - linux-ia32-testing

      - linux-arm-testing
-      - linux-arm-testing-tests:
-          filters:
-            branches:
-              # Do not run this on forked pull requests
-              ignore: /pull\/[0-9]+/        
-          requires:
-            - linux-arm-testing      

      - linux-arm64-testing
-      - linux-arm64-testing-tests:
-          filters:
-            branches:
-              # Do not run this on forked pull requests
-              ignore: /pull\/[0-9]+/        
-          requires:
-            - linux-arm64-testing
-
      - linux-arm64-testing-gn-check:
          requires:
            - linux-checkout-fast
--- a/.env.example
+++ b/.env.example
@@ -4,3 +4,4 @@
 APPVEYOR_CLOUD_TOKEN=
 CIRCLE_TOKEN=
 ELECTRON_GITHUB_TOKEN=
+VSTS_TOKEN=
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,4 @@ ts-gen
 .depshash-target

 # Used to accelerate builds after sync
-patches/mtime-cache.json
-
-spec/fixtures/logo.png
+patches/mtime-cache.json
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -265,6 +265,21 @@ if (is_linux) {
  }
 }

+source_set("manifests") {
+  sources = [
+    "//electron/shell/app/manifests.cc",
+    "//electron/shell/app/manifests.h",
+  ]
+
+  include_dirs = [ "//electron" ]
+
+  deps = [
+    "//electron/shell/common/api:mojo",
+    "//printing/buildflags",
+    "//services/service_manager/public/cpp",
+  ]
+}
+
 npm_action("electron_version_args") {
  script = "generate-version-json"

@@ -313,6 +328,7 @@ source_set("electron_lib") {
    ":electron_fuses",
    ":electron_js2c",
    ":electron_version_header",
+    ":manifests",
    ":resources",
    "buildflags",
    "chromium_src:chrome",
@@ -337,6 +353,7 @@ source_set("electron_lib") {
    "//components/viz/service",
    "//content/public/browser",
    "//content/public/child",
+    "//content/public/common:service_names",
    "//content/public/gpu",
    "//content/public/renderer",
    "//content/public/utility",
@@ -491,7 +508,6 @@ source_set("electron_lib") {
    }
  }
  if (is_linux) {
-    libs = [ "xshmfence" ]
    deps += [
      ":libnotify_loader",
      "//build/config/linux/gtk",
@@ -648,7 +664,6 @@ source_set("electron_lib") {
  }
  if (enable_pdf_viewer) {
    deps += [
-      "//chrome/browser/resources/pdf:pdf_resources",
      "//components/pdf/browser",
      "//components/pdf/renderer",
      "//pdf:pdf_ppapi",
@@ -992,9 +1007,6 @@ if (is_mac) {
    deps = [
      ":electron_app_framework_bundle_data",
      ":electron_app_resources",
-      ":electron_fuses",
-      "//base",
-      "//electron/buildflags",
    ]
    if (is_mas_build) {
      deps += [ ":electron_login_helper_app" ]
@@ -1158,19 +1170,6 @@ if (is_mac) {
        ldflags += [ "/guard:cf,nolongjmp" ]
      }

-      if (current_cpu == "x86") {
-        # Set the initial stack size to 0.5MiB, instead of the 1.5MiB needed by
-        # Chrome's main thread. This saves significant memory on threads (like
-        # those in the Windows thread pool, and others) whose stack size we can
-        # only control through this setting. Because Chrome's main thread needs
-        # a minimum 1.5 MiB stack, the main thread (in 32-bit builds only) uses
-        # fibers to switch to a 1.5 MiB stack before running any other code.
-        ldflags += [ "/STACK:0x80000" ]
-      } else {
-        # Increase the initial stack size. The default is 1MB, this is 8MB.
-        ldflags += [ "/STACK:0x800000" ]
-      }
-
      # This is to support renaming of electron.exe. node-gyp has hard-coded
      # executable names which it will recognise as node. This module definition
      # file claims that the electron executable is in fact named "node.exe",
--- a/6
+++ b/6
@@ -14,13 +14,13 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '89.0.4389.128',
+    '2a55c4f55b99b2191ea59cba1e2f6da4dbb7dee0',
  'node_version':
-    'v14.16.0',
+    'v14.15.0',
  'nan_version':
    '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
  'squirrel.mac_version':
-    'cdc0729c8bf8576bfef18629186e1e9ecf1b0d9f',
+    'a3a5b3f03b824441c014893b18f99a103b2603e9',

  'pyyaml_version': '3.12',
  'requests_version': 'e4d59bedfd3c7f4f254f4f5d036587bcd8152458',
--- a/2
+++ b/2
@@ -1 +1 @@
-12.2.0
+12.0.0-nightly.20201110
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 [![devDependency Status](https://david-dm.org/electron/electron/dev-status.svg)](https://david-dm.org/electron/electron?type=dev)
 [![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.com/invite/electron)

-:memo: Available Translations: 🇨🇳 🇧🇷 🇪🇸 🇯🇵 🇷🇺 🇫🇷 🇺🇸 🇩🇪.
+:memo: Available Translations: 🇨🇳 🇹🇼 🇧🇷 🇪🇸 🇰🇷 🇯🇵 🇷🇺 🇫🇷 🇹🇭 🇳🇱 🇹🇷 🇮🇩 🇺🇦 🇨🇿 🇮🇹 🇵🇱.
 View these docs in other languages at [electron/i18n](https://github.com/electron/i18n/tree/master/content/).

 The Electron framework lets you write cross-platform desktop applications
@@ -29,13 +29,16 @@ The preferred method is to install Electron as a development dependency in your
 app:

 ```sh
-npm install electron --save-dev
+npm install electron --save-dev [--save-exact]
 ```

-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
+The `--save-exact` flag is recommended for Electron prior to version 2, as it does not follow semantic
+versioning. As of version 2.0.0, Electron follows semver, so you don't need `--save-exact` flag. For info on how to manage Electron versions in your apps, see
 [Electron versioning](docs/tutorial/electron-versioning.md).

+For more installation options and troubleshooting tips, see
+[installation](docs/tutorial/installation.md).
+
 ## Quick start & Electron Fiddle

 Use [`Electron Fiddle`](https://github.com/electron/fiddle)
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,7 +36,6 @@ environment:
  ELECTRON_ENABLE_STACK_DUMPING: 1
  MOCHA_REPORTER: mocha-multi-reporters
  MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
-  GOMA_FALLBACK_ON_AUTH_FAILURE: true
 notifications:
  - provider: Webhook
    url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
@@ -142,8 +141,7 @@ build_script:
  - cd build-tools
  - npm install
  - mkdir third_party
-  - ps: >-
-      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
+  - node -e "require('./src/utils/goma.js').downloadAndPrepare()"
  - 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 ..
@@ -153,6 +151,7 @@ build_script:
  - 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:manifests
  - 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 )
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -93,6 +93,6 @@ steps:
  condition: always()

 - powershell: |
-    Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
+    Remove-Item -path $env:APPDATA/Electron* -Recurse
  displayName: 'Delete user app data directories'
  condition: always()
--- a/build/npm-run.py
+++ b/build/npm-run.py
@@ -21,6 +21,6 @@ except subprocess.CalledProcessError as e:
        + "' failed with code '"
        + str(e.returncode)
        + "':\n"
-        + e.output.decode('utf8')
+        + e.output
    )
    sys.exit(e.returncode)
--- a/build/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -163,7 +163,7 @@ if ((globalThis.process || binding.process).argv.includes("--profile-electron-in
        setImmediate: false
      },
      optimization: {
-        minimize: env.mode === 'production',
+        minimize: true,
        minimizer: [
          new TerserPlugin({
            terserOptions: {
--- a/build/webpack/webpack.gni
+++ b/build/webpack/webpack.gni
@@ -22,11 +22,6 @@ template("webpack_build") {
               "//electron/typings/internal-electron.d.ts",
             ] + invoker.inputs

-    mode = "development"
-    if (is_official_build) {
-      mode = "production"
-    }
-
    args = [
      "--config",
      rebase_path(invoker.config_file),
@@ -34,7 +29,6 @@ template("webpack_build") {
      "--output-path=" + rebase_path(get_path_info(invoker.out_file, "dir")),
      "--env.buildflags=" +
          rebase_path("$target_gen_dir/buildflags/buildflags.h"),
-      "--env.mode=" + mode,
    ]
    deps += [ "buildflags" ]

--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -139,23 +139,14 @@ static_library("chrome") {

  if (enable_color_chooser) {
    sources += [
-      "//chrome/browser/devtools/devtools_eye_dropper.cc",
-      "//chrome/browser/devtools/devtools_eye_dropper.h",
      "//chrome/browser/platform_util.cc",
      "//chrome/browser/platform_util.h",
      "//chrome/browser/ui/browser_dialogs.h",
      "//chrome/browser/ui/color_chooser.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",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.h",
    ]

    if (use_aura) {
-      sources += [
-        "//chrome/browser/platform_util_aura.cc",
-        "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc",
-      ]
+      sources += [ "//chrome/browser/platform_util_aura.cc" ]

      if (!is_win) {
        sources += [
@@ -172,8 +163,6 @@ static_library("chrome") {
        "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
        "//chrome/browser/ui/cocoa/color_chooser_mac.h",
        "//chrome/browser/ui/cocoa/color_chooser_mac.mm",
-        "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
-        "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
      ]
      deps += [
        "//components/remote_cocoa/app_shim",
@@ -219,6 +208,8 @@ static_library("chrome") {
      "//chrome/browser/printing/print_view_manager_basic.h",
      "//chrome/browser/printing/printer_query.cc",
      "//chrome/browser/printing/printer_query.h",
+      "//chrome/browser/printing/printing_message_filter.cc",
+      "//chrome/browser/printing/printing_message_filter.h",
      "//chrome/browser/printing/printing_service.cc",
      "//chrome/browser/printing/printing_service.h",
    ]
@@ -295,15 +286,13 @@ static_library("chrome") {
    }
  }

-  if (!is_mas_build) {
-    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.h" ]
-    if (is_mac) {
-      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_mac.cc" ]
-    } else if (is_win) {
-      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_win.cc" ]
-    } else {
-      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.cc" ]
-    }
+  sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.h" ]
+  if (is_mac) {
+    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_mac.cc" ]
+  } else if (is_win) {
+    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_win.cc" ]
+  } else {
+    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.cc" ]
  }
 }

--- a/default_app/default_app.ts
+++ b/default_app/default_app.ts
@@ -41,14 +41,14 @@ ipcMain.handle('bootstrap', (event) => {
  return isTrustedSender(event.sender) ? electronPath : null;
 });

-async function createWindow (backgroundColor?: string) {
+async function createWindow () {
  await app.whenReady();

  const options: Electron.BrowserWindowConstructorOptions = {
    width: 960,
    height: 620,
    autoHideMenuBar: true,
-    backgroundColor,
+    backgroundColor: '#2f3241',
    webPreferences: {
      preload: path.resolve(__dirname, 'preload.js'),
      contextIsolation: true,
@@ -96,7 +96,7 @@ export const loadURL = async (appUrl: string) => {
 };

 export const loadFile = async (appPath: string) => {
-  mainWindow = await createWindow(appPath === 'index.html' ? '#2f3241' : undefined);
+  mainWindow = await createWindow();
  mainWindow.loadFile(appPath);
  mainWindow.focus();
 };
--- a/docs/README.md
+++ b/docs/README.md
@@ -18,14 +18,27 @@ an issue:

 ## Guides and Tutorials

-### Getting started
-
-* [Introduction](tutorial/introduction.md)
-* [Quick Start](tutorial/quick-start.md)
-* [Process Model](tutorial/process-model.md)
-
-### Learning the basics
-
+* [Setting up the Development Environment](tutorial/development-environment.md)
+  * [Setting up macOS](tutorial/development-environment.md#setting-up-macos)
+  * [Setting up Windows](tutorial/development-environment.md#setting-up-windows)
+  * [Setting up Linux](tutorial/development-environment.md#setting-up-linux)
+  * [Choosing an Editor](tutorial/development-environment.md#a-good-editor)
+* [Creating your First App](tutorial/quick-start.md)
+  * [Prerequisites](tutorial/quick-start.md#prerequisites)
+  * [Create a basic application](tutorial/quick-start.md#create-a-basic-application)
+  * [Package and distribute the application](tutorial/quick-start.md#package-and-distribute-the-application)
+* [Boilerplates and CLIs](tutorial/boilerplates-and-clis.md)
+  * [Boilerplate vs CLI](tutorial/boilerplates-and-clis.md#boilerplate-vs-cli)
+  * [electron-forge](tutorial/boilerplates-and-clis.md#electron-forge)
+  * [electron-builder](tutorial/boilerplates-and-clis.md#electron-builder)
+  * [electron-react-boilerplate](tutorial/boilerplates-and-clis.md#electron-react-boilerplate)
+  * [Other Tools and Boilerplates](tutorial/boilerplates-and-clis.md#other-tools-and-boilerplates)
+* [Application Architecture](tutorial/quick-start.md#application-architecture)
+  * [Main and Renderer Processes](tutorial/quick-start.md#main-and-renderer-processes)
+  * [Electron API](tutorial/quick-start.md#electron-api)
+  * [Node.js API](tutorial/quick-start.md#nodejs-api)
+  * [Using Native Node.js Modules](tutorial/using-native-node-modules.md)
+  * [Performance Strategies](tutorial/performance.md)
 * Adding Features to Your App
  * [Notifications](tutorial/notifications.md)
  * [Recent Documents](tutorial/recent-documents.md)
@@ -40,21 +53,9 @@ an issue:
  * [Offscreen Rendering](tutorial/offscreen-rendering.md)
  * [Dark Mode](tutorial/dark-mode.md)
  * [Web embeds in Electron](tutorial/web-embeds.md)
-* [Boilerplates and CLIs](tutorial/boilerplates-and-clis.md)
-  * [Boilerplate vs CLI](tutorial/boilerplates-and-clis.md#boilerplate-vs-cli)
-  * [electron-forge](tutorial/boilerplates-and-clis.md#electron-forge)
-  * [electron-builder](tutorial/boilerplates-and-clis.md#electron-builder)
-  * [electron-react-boilerplate](tutorial/boilerplates-and-clis.md#electron-react-boilerplate)
-  * [Other Tools and Boilerplates](tutorial/boilerplates-and-clis.md#other-tools-and-boilerplates)
-
-### Advanced steps
-
-* Application Architecture
-  * [Using Native Node.js Modules](tutorial/using-native-node-modules.md)
-  * [Performance Strategies](tutorial/performance.md)
-  * [Security Strategies](tutorial/security.md)
-  * [Process Sandboxing](tutorial/sandbox.md)
 * [Accessibility](tutorial/accessibility.md)
+  * [Spectron](tutorial/accessibility.md#spectron)
+  * [Devtron](tutorial/accessibility.md#devtron)
  * [Manually Enabling Accessibility Features](tutorial/accessibility.md#manually-enabling-accessibility-features)
 * [Testing and Debugging](tutorial/application-debugging.md)
  * [Debugging the Main Process](tutorial/debugging-main-process.md)
@@ -63,13 +64,17 @@ an issue:
  * [Testing on Headless CI Systems (Travis, Jenkins)](tutorial/testing-on-headless-ci.md)
  * [DevTools Extension](tutorial/devtools-extension.md)
  * [Automated Testing with a Custom Driver](tutorial/automated-testing-with-a-custom-driver.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)
+* [Security](tutorial/security.md)
+  * [Reporting Security Issues](tutorial/security.md#reporting-security-issues)
+  * [Chromium Security Issues and Upgrades](tutorial/security.md#chromium-security-issues-and-upgrades)
+  * [Electron Security Warnings](tutorial/security.md#electron-security-warnings)
+  * [Security Checklist](tutorial/security.md#checklist-security-recommendations)
 * [Updates](tutorial/updates.md)
  * [Deploying an Update Server](tutorial/updates.md#deploying-an-update-server)
  * [Implementing Updates in Your App](tutorial/updates.md#implementing-updates-in-your-app)
@@ -87,6 +92,11 @@ 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)
+* [Packaging App Source Code with asar](tutorial/application-packaging.md)
+  * [Generating asar Archives](tutorial/application-packaging.md#generating-asar-archives)
+  * [Using asar Archives](tutorial/application-packaging.md#using-asar-archives)
+  * [Limitations](tutorial/application-packaging.md#limitations-of-the-node-api)
+  * [Adding Unpacked Files to asar Archives](tutorial/application-packaging.md#adding-unpacked-files-to-asar-archives)
 * [Testing Widevine CDM](tutorial/testing-widevine-cdm.md)

 ---
@@ -122,8 +132,6 @@ These individual tutorials expand on topics discussed in the guide above.
 * [ipcMain](api/ipc-main.md)
 * [Menu](api/menu.md)
 * [MenuItem](api/menu-item.md)
-* [MessageChannelMain](api/message-channel-main.md)
-* [MessagePortMain](api/message-port-main.md)
 * [net](api/net.md)
 * [netLog](api/net-log.md)
 * [nativeTheme](api/native-theme.md)
@@ -133,7 +141,6 @@ These individual tutorials expand on topics discussed in the guide above.
 * [protocol](api/protocol.md)
 * [screen](api/screen.md)
 * [session](api/session.md)
-* [ShareMenu](api/share-menu.md)
 * [systemPreferences](api/system-preferences.md)
 * [TouchBar](api/touch-bar.md)
 * [Tray](api/tray.md)
@@ -142,15 +149,15 @@ These individual tutorials expand on topics discussed in the guide above.

 ### Modules for the Renderer Process (Web Page):

-* [contextBridge](api/context-bridge.md)
+* [desktopCapturer](api/desktop-capturer.md)
 * [ipcRenderer](api/ipc-renderer.md)
+* [remote](api/remote.md)
 * [webFrame](api/web-frame.md)

 ### Modules for Both Processes:

 * [clipboard](api/clipboard.md)
 * [crashReporter](api/crash-reporter.md)
-* [desktopCapturer](api/desktop-capturer.md)
 * [nativeImage](api/native-image.md)
 * [shell](api/shell.md)

--- a/docs/api/accelerator.md
+++ b/docs/api/accelerator.md
@@ -35,7 +35,7 @@ Linux and Windows to define some accelerators.
 Use `Alt` instead of `Option`. The `Option` key only exists on macOS, whereas
 the `Alt` key is available on all platforms.

-The `Super` (or `Meta`) key is mapped to the `Windows` key on Windows and Linux and
+The `Super` key is mapped to the `Windows` key on Windows and Linux and
 `Cmd` on macOS.

 ## Available modifiers
@@ -48,7 +48,6 @@ The `Super` (or `Meta`) key is mapped to the `Windows` key on Windows and Linux
 * `AltGr`
 * `Shift`
 * `Super`
-* `Meta`

 ## Available key codes

--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -391,7 +391,7 @@ which contains more information about why the render process disappeared. It
 isn't always because it crashed.  The `killed` boolean can be replaced by
 checking `reason === 'killed'` when you switch to that event.

-### Event: 'render-process-gone'
+#### Event: 'render-process-gone'

 Returns:

@@ -406,14 +406,11 @@ Returns:
    * `oom` - Process ran out of memory
    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed
-  * `exitCode` Integer - The exit code of the process, unless `reason` is
-    `launch-failed`, in which case `exitCode` will be a platform-specific
-    launch failure error code.

 Emitted when the renderer process unexpectedly disappears.  This is normally
 because it was crashed or killed.

-### Event: 'child-process-gone'
+#### Event: 'child-process-gone'

 Returns:

@@ -753,8 +750,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/+/master:ui/base/l10n/l10n_util.cc).
+Returns `String` - The current application locale. Possible return values are documented [here](locales.md).

 To set the locale, you'll want to use a command line switch at app startup, which may be found [here](https://github.com/electron/electron/blob/master/docs/api/command-line-switches.md).

@@ -930,10 +926,6 @@ re-add a removed item to a custom category earlier than that will result in the
 entire custom category being omitted from the Jump List. The list of removed
 items can be obtained using `app.getJumpListSettings()`.

-**Note:** The maximum length of a Jump List item's `description` property is
-260 characters. Beyond this limit, the item will not be added to the Jump
-List, nor will it be displayed.
-
 Here's a very simple example of creating a custom Jump List:

 ```javascript
@@ -1182,9 +1174,9 @@ For `infoType` equal to `basic`:

 Using `basic` should be preferred if only basic information like `vendorId` or `driverId` is needed.

-### `app.setBadgeCount([count])` _Linux_ _macOS_
+### `app.setBadgeCount(count)` _Linux_ _macOS_

-* `count` Integer (optional) - If a value is provided, set the badge to the provided value otherwise, on macOS, display a plain white dot (e.g. unknown number of notifications). On Linux, if a value is not provided the badge will not display.
+* `count` Integer

 Returns `Boolean` - Whether the call succeeded.

@@ -1497,12 +1489,3 @@ which native modules you can use in the renderer process.  For more information
 on the direction Electron is going with renderer process restarts and usage of
 native modules in the renderer process please check out this
 [Tracking Issue](https://github.com/electron/electron/issues/18397).
-
-### `app.runningUnderRosettaTranslation` _macOS_ _Readonly_
-
-A `Boolean` which when `true` indicates that the app is currently running
-under the [Rosetta Translator Environment](https://en.wikipedia.org/wiki/Rosetta_(software)).
-
-You can use this property to prompt users to download the arm64 version of
-your application when they are running the x64 version under Rosetta
-incorrectly.
--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -1,16 +1,14 @@
-# BrowserView
-
-A `BrowserView` can be used to embed additional web content into a
-[`BrowserWindow`](browser-window.md). It is like a child window, except that it is positioned
-relative to its owning window. It is meant to be an alternative to the
-`webview` tag.
-
 ## Class: BrowserView

 > Create and control views.

 Process: [Main](../glossary.md#main-process)

+A `BrowserView` can be used to embed additional web content into a
+[`BrowserWindow`](browser-window.md). It is like a child window, except that it is positioned
+relative to its owning window. It is meant to be an alternative to the
+`webview` tag.
+
 ### Example

 ```javascript
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -265,12 +265,12 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      be the absolute file path to the script.
      When node integration is turned off, the preload script can reintroduce
      Node global symbols back to the global scope. See example
-      [here](context-bridge.md#exposing-node-global-symbols).
+      [here](process.md#event-loaded).
    * `sandbox` Boolean (optional) - If set, this will sandbox the renderer
      associated with the window, making it compatible with the Chromium
      OS-level sandbox and disabling the Node.js engine. This is not the same as
      the `nodeIntegration` option and the APIs available to the preload script
-      are more limited. Read more about the option [here](../tutorial/sandbox.md).
+      are more limited. Read more about the option [here](sandbox-option.md).
    * `enableRemoteModule` Boolean (optional) - Whether to enable the [`remote`](remote.md) module.
      Default is `false`.
    * `session` [Session](session.md#class-session) (optional) - Sets the session used by the
@@ -337,19 +337,21 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      more details.
    * `contextIsolation` Boolean (optional) - Whether to run Electron APIs and
      the specified `preload` script in a separate JavaScript context. Defaults
-      to `true`. The context that the `preload` script runs in will only have
-      access to its own dedicated `document` and `window` globals, as well as
-      its own set of JavaScript builtins (`Array`, `Object`, `JSON`, etc.),
-      which are all invisible to the loaded content. The Electron API will only
-      be available in the `preload` script and not the loaded page. This option
-      should be used when loading potentially untrusted remote content to ensure
-      the loaded content cannot tamper with the `preload` script and any
-      Electron APIs being used.  This option uses the same technique used by
-      [Chrome Content Scripts][chrome-content-scripts].  You can access this
-      context in the dev tools by selecting the 'Electron Isolated Context'
-      entry in the combo box at the top of the Console tab.
+      to `false`. The context that the `preload` script runs in will still
+      have full access to the `document` and `window` globals but it will use
+      its own set of JavaScript builtins (`Array`, `Object`, `JSON`, etc.)
+      and will be isolated from any changes made to the global environment
+      by the loaded page. The Electron API will only be available in the
+      `preload` script and not the loaded page. This option should be used when
+      loading potentially untrusted remote content to ensure the loaded content
+      cannot tamper with the `preload` script and any Electron APIs being used.
+      This option uses the same technique used by [Chrome Content Scripts][chrome-content-scripts].
+      You can access this context in the dev tools by selecting the
+      'Electron Isolated Context' entry in the combo box at the top of the
+      Console tab.
    * `worldSafeExecuteJavaScript` Boolean (optional) - If true, values returned from `webFrame.executeJavaScript` will be sanitized to ensure JS values
-      can't unsafely cross between worlds when using `contextIsolation`. Defaults to `true`. _Deprecated_
+      can't unsafely cross between worlds when using `contextIsolation`.  The default
+      is `false`. In Electron 12, the default will be changed to `true`. _Deprecated_
    * `nativeWindowOpen` Boolean (optional) - Whether to use native
      `window.open()`. Defaults to `false`. Child windows will always have node
      integration disabled unless `nodeIntegrationInSubFrames` is true. **Note:** This option is currently
@@ -542,12 +544,6 @@ Note that this is only emitted when the window is being resized manually. Resizi

 Emitted after the window has been resized.

-#### Event: 'resized' _macOS_ _Windows_
-
-Emitted once when the window has finished being resized.
-
-This is usually emitted when the window has been resized manually. On macOS, resizing the window with `setBounds`/`setSize` and setting the `animate` parameter to `true` will also emit this event once resizing has finished.
-
 #### Event: 'will-move' _macOS_ _Windows_

 Returns:
@@ -563,12 +559,12 @@ Note that this is only emitted when the window is being resized manually. Resizi

 Emitted when the window is being moved to a new position.

-#### Event: 'moved' _macOS_ _Windows_
+__Note__: On macOS this event is an alias of `moved`.
+
+#### Event: 'moved' _macOS_

 Emitted once when the window is moved to a new position.

-__Note__: On macOS this event is an alias of `move`.
-
 #### Event: 'enter-full-screen'

 Emitted when the window enters a full-screen state.
@@ -734,7 +730,7 @@ The method will also not return if the extension's manifest is missing or incomp
 is emitted.

 **Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath-options).
+[`ses.loadExtension(path)`](session.md#sesloadextensionpath).

 #### `BrowserWindow.removeExtension(name)` _Deprecated_

@@ -776,7 +772,7 @@ The method will also not return if the extension's manifest is missing or incomp
 is emitted.

 **Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath-options).
+[`ses.loadExtension(path)`](session.md#sesloadextensionpath).

 #### `BrowserWindow.removeDevToolsExtension(name)` _Deprecated_

@@ -1050,7 +1046,7 @@ Returns `Boolean` - Whether the window is in simple (pre-Lion) fullscreen mode.

 Returns `Boolean` - Whether the window is in normal state (not maximized, not minimized, not in fullscreen mode).

-#### `win.setAspectRatio(aspectRatio[, extraSize])`
+#### `win.setAspectRatio(aspectRatio[, extraSize])` _macOS_ _Linux_

 * `aspectRatio` Float - The aspect ratio to maintain for some portion of the
 content view.
@@ -1071,9 +1067,6 @@ the player itself we would call this function with arguments of 16/9 and
 are within the content view--only that they exist. Sum any extra width and
 height areas you have within the overall content view.

-The aspect ratio is not respected when window is resized programmingly with
-APIs like `win.setSize`.
-
 #### `win.setBackgroundColor(backgroundColor)`

 * `backgroundColor` String - Window's background color as a hexadecimal value,
@@ -1386,7 +1379,7 @@ can be be used to listen to changes to tablet mode.

 #### `win.getMediaSourceId()`

-Returns `String` - Window id in the format of DesktopCapturerSource's id. For example "window:1324:0".
+Returns `String` - Window id in the format of DesktopCapturerSource's id. For example "window:1234:0".

 More precisely the format is `window:id:other_id` where `id` is `HWND` on
 Windows, `CGWindowID` (`uint64_t`) on macOS and `Window` (`unsigned long`) on
@@ -1404,8 +1397,6 @@ The native type of the handle is `HWND` on Windows, `NSView*` on macOS, and

 * `message` Integer
 * `callback` Function
-  * `wParam` any - The `wParam` provided to the WndProc
-  * `lParam` any - The `lParam` provided to the WndProc

 Hooks a windows message. The `callback` is called when
 the message is received in the WndProc.
@@ -1458,7 +1449,7 @@ Returns `Boolean` - Whether the window's document has been edited.

 Returns `Promise<NativeImage>` - Resolves with a [NativeImage](native-image.md)

-Captures a snapshot of the page within `rect`. Omitting `rect` will capture the whole visible page. If the page is not visible, `rect` may be empty.
+Captures a snapshot of the page within `rect`. Omitting `rect` will capture the whole visible page.

 #### `win.loadURL(url[, options])`

@@ -1868,13 +1859,6 @@ Replacement API for setBrowserView supporting work with multi browser views.

 * `browserView` [BrowserView](browser-view.md)

-#### `win.setTopBrowserView(browserView)` _Experimental_
-
-* `browserView` [BrowserView](browser-view.md)
-
-Raises `browserView` above other `BrowserView`s attached to `win`.
-Throws an error if `browserView` is not attached to `win`.
-
 #### `win.getBrowserViews()` _Experimental_

 Returns `BrowserView[]` - an array of all BrowserViews that have been attached
--- a/docs/api/client-request.md
+++ b/docs/api/client-request.md
@@ -47,7 +47,6 @@ following properties:
    be aborted. When mode is `manual` the redirection will be cancelled unless
    [`request.followRedirect`](#requestfollowredirect) is invoked synchronously
    during the [`redirect`](#event-redirect) event.  Defaults to `follow`.
-  * `origin` String (optional) - The origin URL of the request.

 `options` properties such as `protocol`, `host`, `hostname`, `port` and `path`
 strictly follow the Node.js model as described in the
@@ -71,7 +70,7 @@ const request = net.request({

 Returns:

-* `response` [IncomingMessage](incoming-message.md) - An object representing the HTTP response message.
+* `response` IncomingMessage - An object representing the HTTP response message.

 #### Event: 'login'

--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -80,12 +80,6 @@ This switch can not be used in `app.commandLine.appendSwitch` since it is parsed
 earlier than user's app is loaded, but you can set the `ELECTRON_ENABLE_LOGGING`
 environment variable to achieve the same effect.

-### --force-fieldtrials=`trials`
-
-Field trials to be forcefully enabled or disabled.
-
-For example: `WebRTC-Audio-Red-For-Opus/Enabled/`
-
 ### --host-rules=`rules`

 A comma-separated list of `rules` that control how hostnames are mapped.
@@ -142,8 +136,7 @@ proxy server flags that are passed.

 ### --no-sandbox

-Disables the Chromium [sandbox](https://www.chromium.org/developers/design-documents/sandbox).
-Forces renderer process and Chromium helper processes to run un-sandboxed.
+Disables Chromium sandbox, which is now enabled by default.
 Should only be used for testing.

 ### --proxy-bypass-list=`hosts`
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -16,7 +16,7 @@ const { app, contentTracing } = require('electron')
 app.whenReady().then(() => {
  (async () => {
    await contentTracing.startRecording({
-      included_categories: ['*']
+      include_categories: ['*']
    })
    console.log('Tracing started')
    await new Promise(resolve => setTimeout(resolve, 5000))
--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -33,7 +33,7 @@ page you load in your renderer executes code in this world.

 ### Isolated World

-When `contextIsolation` is enabled in your `webPreferences` (this is the default behavior since Electron 12.0.0), your `preload` scripts run in an
+When `contextIsolation` is enabled in your `webPreferences`, 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-for-remote-content) docs.

@@ -44,19 +44,19 @@ The `contextBridge` module has the following methods:
 ### `contextBridge.exposeInMainWorld(apiKey, api)` _Experimental_

 * `apiKey` String - The key to inject the API onto `window` with.  The API will be accessible on `window[apiKey]`.
-* `api` any - Your API, more information on what this API can be and how it works is available below.
+* `api` Record<String, any> - Your API object, more information on what this API can be and how it works is available below.

 ## Usage

-### API
+### API Objects

-The `api` provided to [`exposeInMainWorld`](#contextbridgeexposeinmainworldapikey-api-experimental) must be a `Function`, `String`, `Number`, `Array`, `Boolean`, or an object
+The `api` object provided to [`exposeInMainWorld`](#contextbridgeexposeinmainworldapikey-api-experimental) must be an object
 whose keys are strings and values are a `Function`, `String`, `Number`, `Array`, `Boolean`, or another nested object that meets the same conditions.

 `Function` values are proxied to the other context and all other values are **copied** and **frozen**. Any data / primitives sent in
-the API become immutable and updates on either side of the bridge do not result in an update on the other side.
+the API object become immutable and updates on either side of the bridge do not result in an update on the other side.

-An example of a complex API is shown below:
+An example of a complex API object is shown below:

 ```javascript
 const { contextBridge } = require('electron')
@@ -109,22 +109,3 @@ has been included below for completeness:
 | `Symbol` | N/A | ❌ | ❌ | Symbols cannot be copied across contexts so they are dropped |

 If the type you care about is not in the above table, it is probably not supported.
-
-### Exposing Node Global Symbols
-
-The `contextBridge` can be used by the preload script to give your renderer access to Node APIs.
-The table of supported types described above also applies to Node APIs that you expose through `contextBridge`.
-Please note that many Node APIs grant access to local system resources.
-Be very cautious about which globals and APIs you expose to untrusted remote content.
-
-```javascript
-const { contextBridge } = require('electron')
-const crypto = require('crypto')
-contextBridge.exposeInMainWorld('nodeCrypto', {
-  sha256sum (data) {
-    const hash = crypto.createHash('sha256')
-    hash.update(data)
-    return hash.digest('hex')
-  }
-})
-```
--- a/docs/api/cookies.md
+++ b/docs/api/cookies.md
@@ -45,8 +45,6 @@ The following events are available on instances of `Cookies`:

 #### Event: 'changed'

-Returns:
-
 * `event` Event
 * `cookie` [Cookie](structures/cookie.md) - The cookie that was changed.
 * `cause` String - The cause of the change with one of the following values:
--- a/docs/api/crash-reporter.md
+++ b/docs/api/crash-reporter.md
@@ -128,7 +128,7 @@ must be at most 39 bytes long, and values must be no longer than 127 bytes.
 Keys with names longer than the maximum will be silently ignored. Key values
 longer than the maximum length will be truncated.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.

 ### `crashReporter.getLastCrashReport()`

@@ -137,7 +137,7 @@ last crash report. Only crash reports that have been uploaded will be returned;
 even if a crash report is present on disk it will not be returned until it is
 uploaded. In the case that there are no uploaded reports, `null` is returned.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.

 ### `crashReporter.getUploadedReports()`

@@ -146,14 +146,14 @@ Returns [`CrashReport[]`](structures/crash-report.md):
 Returns all uploaded crash reports. Each report contains the date and uploaded
 ID.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.

 ### `crashReporter.getUploadToServer()`

 Returns `Boolean` - Whether reports should be submitted to the server. Set through
 the `start` method or `setUploadToServer`.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.

 ### `crashReporter.setUploadToServer(uploadToServer)`

@@ -162,7 +162,13 @@ the `start` method or `setUploadToServer`.
 This would normally be controlled by user preferences. This has no effect if
 called before `start` is called.

-**Note:** This method is only available in the main process.
+**Note:** Calling this method from the renderer process is deprecated.
+
+### `crashReporter.getCrashesDirectory()` _Deprecated_
+
+Returns `String` - The directory where crashes are temporarily stored before being uploaded.
+
+**Note:** This method is deprecated, use `app.getPath('crashDumps')` instead.

 ### `crashReporter.addExtraParameter(key, value)`

--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -24,7 +24,7 @@ The `dialog` module has the following methods:
  * `buttonLabel` String (optional) - Custom label for the confirmation button, when
    left empty the default label will be used.
  * `filters` [FileFilter[]](structures/file-filter.md) (optional)
-  * `properties` String[]&#32;(optional) - Contains which features the dialog should
+  * `properties` String[] (optional) - Contains which features the dialog should
    use. The following values are supported:
    * `openFile` - Allow files to be selected.
    * `openDirectory` - Allow directories to be selected.
@@ -87,7 +87,7 @@ dialog.showOpenDialogSync(mainWindow, {
  * `buttonLabel` String (optional) - Custom label for the confirmation button, when
    left empty the default label will be used.
  * `filters` [FileFilter[]](structures/file-filter.md) (optional)
-  * `properties` String[]&#32;(optional) - Contains which features the dialog should
+  * `properties` String[] (optional) - Contains which features the dialog should
    use. The following values are supported:
    * `openFile` - Allow files to be selected.
    * `openDirectory` - Allow directories to be selected.
@@ -112,7 +112,7 @@ Returns `Promise<Object>` - Resolve with an object containing the following:

 * `canceled` Boolean - whether or not the dialog was canceled.
 * `filePaths` String[] - An array of file paths chosen by the user. If the dialog is cancelled this will be an empty array.
-* `bookmarks` String[]&#32;(optional) _macOS_ _mas_ - An array matching the `filePaths` array of base64 encoded strings which contains security scoped bookmark data. `securityScopedBookmarks` must be enabled for this to be populated. (For return values, see [table here](#bookmarks-array).)
+* `bookmarks` String[] (optional) _macOS_ _mas_ - An array matching the `filePaths` array of base64 encoded strings which contains security scoped bookmark data. `securityScopedBookmarks` must be enabled for this to be populated. (For return values, see [table here](#bookmarks-array).)

 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.

@@ -154,7 +154,7 @@ dialog.showOpenDialog(mainWindow, {

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `title` String (optional) - The dialog title. Cannot be displayed on some _Linux_ desktop environments.
+  * `title` String (optional)
  * `defaultPath` String (optional) - Absolute directory path, absolute file
    path, or file name to use by default.
  * `buttonLabel` String (optional) - Custom label for the confirmation button, when
@@ -165,7 +165,7 @@ dialog.showOpenDialog(mainWindow, {
    displayed in front of the filename text field.
  * `showsTagField` Boolean (optional) _macOS_ - Show the tags input box,
    defaults to `true`.
-  * `properties` String[]&#32;(optional)
+  * `properties` String[] (optional)
    * `showHiddenFiles` - Show hidden files in dialog.
    * `createDirectory` _macOS_ - Allow creating new directories from dialog.
    * `treatPackageAsDirectory` _macOS_ - Treat packages, such as `.app` folders,
@@ -185,7 +185,7 @@ The `filters` specifies an array of file types that can be displayed, see

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `title` String (optional) - The dialog title. Cannot be displayed on some _Linux_ desktop environments.
+  * `title` String (optional)
  * `defaultPath` String (optional) - Absolute directory path, absolute file
    path, or file name to use by default.
  * `buttonLabel` String (optional) - Custom label for the confirmation button, when
@@ -195,7 +195,7 @@ The `filters` specifies an array of file types that can be displayed, see
  * `nameFieldLabel` String (optional) _macOS_ - Custom label for the text
    displayed in front of the filename text field.
  * `showsTagField` Boolean (optional) _macOS_ - Show the tags input box, defaults to `true`.
-  * `properties` String[]&#32;(optional)
+  * `properties` String[] (optional)
    * `showHiddenFiles` - Show hidden files in dialog.
    * `createDirectory` _macOS_ - Allow creating new directories from dialog.
    * `treatPackageAsDirectory` _macOS_ - Treat packages, such as `.app` folders,
@@ -227,7 +227,7 @@ expanding and collapsing the dialog.
  `"warning"`. On Windows, `"question"` displays the same icon as `"info"`, unless
  you set an icon using the `"icon"` option. On macOS, both `"warning"` and
  `"error"` display the same warning icon.
-  * `buttons` String[]&#32;(optional) - Array of texts for buttons. On Windows, an empty array
+  * `buttons` String[] (optional) - Array of texts for buttons. On Windows, an empty array
    will result in one button labeled "OK".
  * `defaultId` Integer (optional) - Index of the button in the buttons array which will
    be selected by default when the message box opens.
@@ -273,7 +273,7 @@ If `browserWindow` is not shown dialog will not be attached to it. In such case
  `"warning"`. On Windows, `"question"` displays the same icon as `"info"`, unless
  you set an icon using the `"icon"` option. On macOS, both `"warning"` and
  `"error"` display the same warning icon.
-  * `buttons` String[]&#32;(optional) - Array of texts for buttons. On Windows, an empty array
+  * `buttons` String[] (optional) - Array of texts for buttons. On Windows, an empty array
    will result in one button labeled "OK".
  * `defaultId` Integer (optional) - Index of the button in the buttons array which will
    be selected by default when the message box opens.
--- a/docs/api/extensions.md
+++ b/docs/api/extensions.md
@@ -15,7 +15,7 @@ extension capabilities.

 Electron only supports loading unpacked extensions (i.e., `.crx` files do not
 work). Extensions are installed per-`session`. To load an extension, call
-[`ses.loadExtension`](session.md#sesloadextensionpath-options):
+[`ses.loadExtension`](session.md#sesloadextensionpath):

 ```js
 const { session } = require('electron')
@@ -115,9 +115,3 @@ The following methods of `chrome.management` are supported:
 - `chrome.management.getPermissionWarningsByManifest`
 - `chrome.management.onEnabled`
 - `chrome.management.onDisabled`
-
-### `chrome.webRequest`
-
-All features of this API are supported.
-
-> **NOTE:** Electron's [`webRequest`](web-request.md) module takes precedence over `chrome.webRequest` if there are conflicting handlers.
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -82,11 +82,8 @@ win.show()
 * The `blur` filter only applies to the web page, so there is no way to apply
  blur effect to the content below the window (i.e. other applications open on
  the user's system).
-* The window will not be transparent when DevTools is opened.
-* On Windows operating systems,
-  * transparent windows will not work when DWM is
+* On Windows operating systems, transparent windows will not work when DWM is
  disabled.
-  * transparent windows can not be maximized using the Windows system menu or by double clicking the title bar. The reasoning behind this can be seen on [this pull request](https://github.com/electron/electron/pull/28207).
 * On Linux, users have to put `--enable-transparent-visuals --disable-gpu` in
  the command line to disable GPU and allow ARGB to make transparent window,
  this is caused by an upstream bug that [alpha channel doesn't work on some
--- a/docs/api/global-shortcut.md
+++ b/docs/api/global-shortcut.md
@@ -9,7 +9,7 @@ with the operating system so that you can customize the operations for various
 shortcuts.

 **Note:** The shortcut is global; it will work even if the app does
-not have the keyboard focus. This module cannot be used before the `ready`
+not have the keyboard focus. You should not use this module until the `ready`
 event of the app module is emitted.

 ```javascript
--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -61,13 +61,9 @@ 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.
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The main process handles it by listening for `channel` with the
 [`ipcMain`](ipc-main.md) module.
@@ -89,13 +85,9 @@ 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.
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The main process should listen for `channel` with
 [`ipcMain.handle()`](ipc-main.md#ipcmainhandlechannel-listener).
@@ -132,13 +124,9 @@ 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.
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The main process handles it by listening for `channel` with [`ipcMain`](ipc-main.md) module,
 and replies by setting `event.returnValue`.
--- a/docs/api/locales.md
+++ b/docs/api/locales.md
@@ -0,0 +1,142 @@
+# Locales
+
+> Locale values returned by `app.getLocale()`.
+
+Electron uses Chromium's `l10n_util` library to fetch the locale. Possible
+values are listed below:
+
+| Language Code | Language Name |
+|---------------|---------------|
+| af | Afrikaans |
+| am | Amharic |
+| ar | Arabic |
+| az | Azerbaijani |
+| be | Belarusian |
+| bg | Bulgarian |
+| bh | Bihari |
+| bn | Bengali |
+| br | Breton |
+| bs | Bosnian |
+| ca | Catalan |
+| co | Corsican |
+| cs | Czech |
+| cy | Welsh |
+| da | Danish |
+| de | German |
+| de-AT | German (Austria) |
+| de-CH | German (Switzerland) |
+| de-DE | German (Germany) |
+| el | Greek |
+| en | English |
+| en-AU | English (Australia) |
+| en-CA | English (Canada) |
+| en-GB | English (UK) |
+| en-NZ | English (New Zealand) |
+| en-US | English (US) |
+| en-ZA | English (South Africa) |
+| eo | Esperanto |
+| es | Spanish |
+| es-419 | Spanish (Latin America) |
+| et | Estonian |
+| eu | Basque |
+| fa | Persian |
+| fi | Finnish |
+| fil | Filipino |
+| fo | Faroese |
+| fr | French |
+| fr-CA | French (Canada) |
+| fr-CH | French (Switzerland) |
+| fr-FR | French (France) |
+| fy | Frisian |
+| ga | Irish |
+| gd | Scots Gaelic |
+| gl | Galician |
+| gn | Guarani |
+| gu | Gujarati |
+| ha | Hausa |
+| haw | Hawaiian |
+| he | Hebrew |
+| hi | Hindi |
+| hr | Croatian |
+| hu | Hungarian |
+| hy | Armenian |
+| ia | Interlingua |
+| id | Indonesian |
+| is | Icelandic |
+| it | Italian |
+| it-CH | Italian (Switzerland) |
+| it-IT | Italian (Italy) |
+| ja | Japanese |
+| jw | Javanese |
+| ka | Georgian |
+| kk | Kazakh |
+| km | Cambodian |
+| kn | Kannada |
+| ko | Korean |
+| ku | Kurdish |
+| ky | Kyrgyz |
+| la | Latin |
+| ln | Lingala |
+| lo | Laothian |
+| lt | Lithuanian |
+| lv | Latvian |
+| mk | Macedonian |
+| ml | Malayalam |
+| mn | Mongolian |
+| mo | Moldavian |
+| mr | Marathi |
+| ms | Malay |
+| mt | Maltese |
+| nb | Norwegian (Bokmal) |
+| ne | Nepali |
+| nl | Dutch |
+| nn | Norwegian (Nynorsk) |
+| no | Norwegian |
+| oc | Occitan |
+| om | Oromo |
+| or | Oriya |
+| pa | Punjabi |
+| pl | Polish |
+| ps | Pashto |
+| pt | Portuguese |
+| pt-BR | Portuguese (Brazil) |
+| pt-PT | Portuguese (Portugal) |
+| qu | Quechua |
+| rm | Romansh |
+| ro | Romanian |
+| ru | Russian |
+| sd | Sindhi |
+| sh | Serbo-Croatian |
+| si | Sinhalese |
+| sk | Slovak |
+| sl | Slovenian |
+| sn | Shona |
+| so | Somali |
+| sq | Albanian |
+| sr | Serbian |
+| st | Sesotho |
+| su | Sundanese |
+| sv | Swedish |
+| sw | Swahili |
+| ta | Tamil |
+| te | Telugu |
+| tg | Tajik |
+| th | Thai |
+| ti | Tigrinya |
+| tk | Turkmen |
+| to | Tonga |
+| tr | Turkish |
+| tt | Tatar |
+| tw | Twi |
+| ug | Uighur |
+| uk | Ukrainian |
+| ur | Urdu |
+| uz | Uzbek |
+| vi | Vietnamese |
+| xh | Xhosa |
+| yi | Yiddish |
+| yo | Yoruba |
+| zh | Chinese |
+| zh-CN | Chinese (Simplified) |
+| zh-TW | Chinese (Traditional) |
+| zu | Zulu |
--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -88,7 +88,6 @@ The `role` property can have following values:
 * `resetZoom` - Reset the focused page's zoom level to the original size.
 * `zoomIn` - Zoom in the focused page by 10%.
 * `zoomOut` - Zoom out the focused page by 10%.
-* `toggleSpellChecker` - Enable/disable builtin spell checker.
 * `fileMenu` - Whole default "File" menu (Close / Quit)
 * `editMenu` - Whole default "Edit" menu (Undo, Copy, etc.).
 * `viewMenu` - Whole default "View" menu (Reload, Toggle Developer Tools, etc.)
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -1,5 +1,3 @@
-# Menu
-
 ## Class: Menu

 > Create native application menus and context menus.
--- a/docs/api/message-channel-main.md
+++ b/docs/api/message-channel-main.md
@@ -9,15 +9,12 @@ channel messaging.

 ## Class: MessageChannelMain

-> Channel interface for channel messaging in the main process.
-
 Process: [Main](../glossary.md#main-process)

 Example:

 ```js
 // Main process
-const { MessageChannelMain } = require('electron')
 const { port1, port2 } = new MessageChannelMain()
 w.webContents.postMessage('port', null, [port2])
 port1.postMessage({ some: 'message' })
--- a/docs/api/message-port-main.md
+++ b/docs/api/message-port-main.md
@@ -14,8 +14,6 @@ channel messaging.

 ## Class: MessagePortMain

-> Port interface for channel messaging in the main process.
-
 Process: [Main](../glossary.md#main-process)

 ### Instance Methods
--- a/docs/api/modernization/overview.md
+++ b/docs/api/modernization/overview.md
@@ -0,0 +1,10 @@
+## Modernization
+
+The Electron team is currently undergoing an initiative to modernize our API in a few concrete ways. These include: updating our modules to use idiomatic JS properties instead of separate `getPropertyX` and `setPropertyX`, converting callbacks to promises, and removing some other anti-patterns present in our APIs. The current status of the Promise initiative can be tracked in the [promisification](promisification.md) tracking file.
+
+As we work to perform these updates, we seek to create the least disruptive amount of change at any given time, so as many changes as possible will be introduced in a backward compatible manner and deprecated after enough time has passed to give users a chance to upgrade their API calls.
+
+This document and its child documents will be updated to reflect the latest status of our API changes.
+
+* [Promisification](promisification.md)
+* [Property Updates](property-updates.md)
--- a/docs/api/modernization/promisification.md
+++ b/docs/api/modernization/promisification.md
@@ -0,0 +1,42 @@
+## Promisification
+
+The Electron team recently underwent an initiative to convert callback-based APIs to Promise-based ones. See converted functions below:
+
+- [app.getFileIcon(path[, options], callback)](https://github.com/electron/electron/blob/master/docs/api/app.md#getFileIcon)
+- [contents.capturePage([rect, ]callback)](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#capturePage)
+- [contents.executeJavaScript(code[, userGesture, callback])](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#executeJavaScript)
+- [contents.printToPDF(options, callback)](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#printToPDF)
+- [contents.savePage(fullPath, saveType, callback)](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#savePage)
+- [contentTracing.getCategories(callback)](https://github.com/electron/electron/blob/master/docs/api/content-tracing.md#getCategories)
+- [contentTracing.startRecording(options, callback)](https://github.com/electron/electron/blob/master/docs/api/content-tracing.md#startRecording)
+- [contentTracing.stopRecording(resultFilePath, callback)](https://github.com/electron/electron/blob/master/docs/api/content-tracing.md#stopRecording)
+- [contentTracing.getTraceBufferUsage(callback)](https://github.com/electron/electron/blob/master/docs/api/content-tracing.md#getTraceBufferUsage)
+- [cookies.flushStore(callback)](https://github.com/electron/electron/blob/master/docs/api/cookies.md#flushStore)
+- [cookies.get(filter, callback)](https://github.com/electron/electron/blob/master/docs/api/cookies.md#get)
+- [cookies.remove(url, name, callback)](https://github.com/electron/electron/blob/master/docs/api/cookies.md#remove)
+- [cookies.set(details, callback)](https://github.com/electron/electron/blob/master/docs/api/cookies.md#set)
+- [debugger.sendCommand(method[, commandParams, callback])](https://github.com/electron/electron/blob/master/docs/api/debugger.md#sendCommand)
+- [desktopCapturer.getSources(options, callback)](https://github.com/electron/electron/blob/master/docs/api/desktop-capturer.md#getSources)
+- [dialog.showOpenDialog([browserWindow, ]options[, callback])](https://github.com/electron/electron/blob/master/docs/api/dialog.md#showOpenDialog)
+- [dialog.showSaveDialog([browserWindow, ]options[, callback])](https://github.com/electron/electron/blob/master/docs/api/dialog.md#showSaveDialog)
+- [inAppPurchase.purchaseProduct(productID, quantity, callback)](https://github.com/electron/electron/blob/master/docs/api/in-app-purchase.md#purchaseProduct)
+- [inAppPurchase.getProducts(productIDs, callback)](https://github.com/electron/electron/blob/master/docs/api/in-app-purchase.md#getProducts)
+- [dialog.showMessageBox([browserWindow, ]options[, callback])](https://github.com/electron/electron/blob/master/docs/api/dialog.md#showMessageBox)
+- [dialog.showCertificateTrustDialog([browserWindow, ]options, callback)](https://github.com/electron/electron/blob/master/docs/api/dialog.md#showCertificateTrustDialog)
+- [netLog.stopLogging([callback])](https://github.com/electron/electron/blob/master/docs/api/net-log.md#stopLogging)
+- [protocol.isProtocolHandled(scheme, callback)](https://github.com/electron/electron/blob/master/docs/api/protocol.md#isProtocolHandled)
+- [ses.clearHostResolverCache([callback])](https://github.com/electron/electron/blob/master/docs/api/session.md#clearHostResolverCache)
+- [ses.clearStorageData([options, callback])](https://github.com/electron/electron/blob/master/docs/api/session.md#clearStorageData)
+- [ses.setProxy(config, callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#setProxy)
+- [ses.resolveProxy(url, callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#resolveProxy)
+- [ses.getCacheSize(callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#getCacheSize)
+- [ses.clearAuthCache(options[, callback])](https://github.com/electron/electron/blob/master/docs/api/session.md#clearAuthCache)
+- [ses.clearCache(callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#clearCache)
+- [ses.getBlobData(identifier, callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#getBlobData)
+- [shell.openExternal(url[, options, callback])](https://github.com/electron/electron/blob/master/docs/api/shell.md#openExternal)
+- [webFrame.executeJavaScript(code[, userGesture, callback])](https://github.com/electron/electron/blob/master/docs/api/web-frame.md#executeJavaScript)
+- [webFrame.executeJavaScriptInIsolatedWorld(worldId, scripts[, userGesture, callback])](https://github.com/electron/electron/blob/master/docs/api/web-frame.md#executeJavaScriptInIsolatedWorld)
+- [webviewTag.capturePage([rect, ]callback)](https://github.com/electron/electron/blob/master/docs/api/webview-tag.md#capturePage)
+- [webviewTag.executeJavaScript(code[, userGesture, callback])](https://github.com/electron/electron/blob/master/docs/api/webview-tag.md#executeJavaScript)
+- [webviewTag.printToPDF(options, callback)](https://github.com/electron/electron/blob/master/docs/api/webview-tag.md#printToPDF)
+- [win.capturePage([rect, ]callback)](https://github.com/electron/electron/blob/master/docs/api/browser-window.md#capturePage)
--- a/docs/api/modernization/property-updates.md
+++ b/docs/api/modernization/property-updates.md
@@ -0,0 +1,41 @@
+## Property Updates
+
+The Electron team is currently undergoing an initiative to convert separate getter and setter functions in Electron to bespoke properties with `get` and `set` functionality. During this transition period, both the new properties and old getters and setters of these functions will work correctly and be documented.
+
+## Candidates
+
+* `BrowserWindow`
+  * `menubarVisible`
+* `crashReporter` module
+  * `uploadToServer`
+* `webFrame` modules
+  * `zoomFactor`
+  * `zoomLevel`
+  * `audioMuted`
+* `<webview>`
+  * `zoomFactor`
+  * `zoomLevel`
+  * `audioMuted`
+
+## Converted Properties
+
+* `app` module
+  * `accessibilitySupport`
+  * `applicationMenu`
+  * `badgeCount`
+  * `name`
+* `DownloadItem` class
+  * `savePath`
+* `BrowserWindow` module
+  * `autoHideMenuBar`
+  * `resizable`
+  * `maximizable`
+  * `minimizable`
+  * `fullscreenable`
+  * `movable`
+  * `closable`
+  * `backgroundThrottling`
+* `NativeImage`
+  * `isMacTemplateImage`
+* `SystemPreferences` module
+  * `appLevelAppearance`
--- a/docs/api/power-monitor.md
+++ b/docs/api/power-monitor.md
@@ -65,18 +65,3 @@ before considered idle.  `locked` is available on supported systems only.
 Returns `Integer` - Idle time in seconds

 Calculate system idle time in seconds.
-
-### `powerMonitor.isOnBatteryPower()`
-
-Returns `Boolean` - Whether the system is on battery power.
-
-To monitor for changes in this property, use the `on-battery` and `on-ac`
-events.
-
-## Properties
-
-### `powerMonitor.onBatteryPower`
-
-A `Boolean` property. True if the system is on battery power.
-
-See [`powerMonitor.isOnBatteryPower()`](#powermonitorisonbatterypower).
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -42,6 +42,19 @@ In sandboxed renderers the `process` object contains only a subset of the APIs:
 Emitted when Electron has loaded its internal initialization script and is
 beginning to load the web page or the main script.

+It can be used by the preload script to add removed Node global symbols back to
+the global scope when node integration is turned off:
+
+```javascript
+// preload.js
+const _setImmediate = setImmediate
+const _clearImmediate = clearImmediate
+process.once('loaded', () => {
+  global.setImmediate = _setImmediate
+  global.clearImmediate = _clearImmediate
+})
+```
+
 ## Properties

 ### `process.defaultApp` _Readonly_
--- a/docs/api/sandbox-option.md
+++ b/docs/api/sandbox-option.md
@@ -0,0 +1,182 @@
+# `sandbox` Option
+
+> Create a browser window with a sandboxed renderer. With this
+option enabled, the renderer must communicate via IPC to the main process in order to access node APIs.
+
+One of the key security features of Chromium is that all blink rendering/JavaScript
+code is executed within a sandbox. This sandbox uses OS-specific features to ensure
+that exploits in the renderer process cannot harm the system.
+
+In other words, when the sandbox is enabled, the renderers can only make changes
+to the system by delegating tasks to the main process via IPC.
+[Here's](https://www.chromium.org/developers/design-documents/sandbox) more
+information about the sandbox.
+
+Since a major feature in Electron is the ability to run Node.js in the
+renderer process (making it easier to develop desktop applications using web
+technologies), the sandbox is disabled by electron. This is because
+most Node.js APIs require system access. `require()` for example, is not
+possible without file system permissions, which are not available in a sandboxed
+environment.
+
+Usually this is not a problem for desktop applications since the code is always
+trusted, but it makes Electron less secure than Chromium for displaying
+untrusted web content. For applications that require more security, the
+`sandbox` flag will force Electron to spawn a classic Chromium renderer that is
+compatible with the sandbox.
+
+A sandboxed renderer doesn't have a Node.js environment running and doesn't
+expose Node.js JavaScript APIs to client code. The only exception is the preload script,
+which has access to a subset of the Electron renderer API.
+
+Another difference is that sandboxed renderers don't modify any of the default
+JavaScript APIs. Consequently, some APIs such as `window.open` will work as they
+do in Chromium (i.e. they do not return a [`BrowserWindowProxy`](browser-window-proxy.md)).
+
+## Example
+
+To create a sandboxed window, pass `sandbox: true` to `webPreferences`:
+
+```js
+let win
+app.whenReady().then(() => {
+  win = new BrowserWindow({
+    webPreferences: {
+      sandbox: true
+    }
+  })
+  win.loadURL('http://google.com')
+})
+```
+
+In the above code the [`BrowserWindow`](browser-window.md) that was created has Node.js disabled and can communicate
+only via IPC. The use of this option stops Electron from creating a Node.js runtime in the renderer. Also,
+within this new window `window.open` follows the native behavior (by default Electron creates a [`BrowserWindow`](browser-window.md)
+and returns a proxy to this via `window.open`).
+
+[`app.enableSandbox`](app.md#appenablesandbox) can be used to force `sandbox: true` for all `BrowserWindow` instances.
+
+```js
+let win
+app.enableSandbox()
+app.whenReady().then(() => {
+  // no need to pass `sandbox: true` since `app.enableSandbox()` was called.
+  win = new BrowserWindow()
+  win.loadURL('http://google.com')
+})
+```
+
+## Preload
+
+An app can make customizations to sandboxed renderers using a preload script.
+Here's an example:
+
+```js
+let win
+app.whenReady().then(() => {
+  win = new BrowserWindow({
+    webPreferences: {
+      sandbox: true,
+      preload: path.join(app.getAppPath(), 'preload.js')
+    }
+  })
+  win.loadURL('http://google.com')
+})
+```
+
+and preload.js:
+
+```js
+// This file is loaded whenever a javascript context is created. It runs in a
+// private scope that can access a subset of Electron renderer APIs. Without
+// contextIsolation enabled, it's possible to accidentally leak privileged
+// globals like ipcRenderer to web content.
+const { ipcRenderer } = require('electron')
+
+const defaultWindowOpen = window.open
+
+window.open = function customWindowOpen (url, ...args) {
+  ipcRenderer.send('report-window-open', location.origin, url, args)
+  return defaultWindowOpen(url + '?from_electron=1', ...args)
+}
+```
+
+Important things to notice in the preload script:
+
+- Even though the sandboxed renderer doesn't have Node.js running, it still has
+  access to a limited node-like environment: `Buffer`, `process`, `setImmediate`,
+  `clearImmediate` and `require` are available.
+- The preload script must be contained in a single script, but it is possible to have
+  complex preload code composed with multiple modules by using a tool like
+  webpack or browserify. An example of using browserify is below.
+
+To create a browserify bundle and use it as a preload script, something like
+the following should be used:
+
+```sh
+  browserify preload/index.js \
+    -x electron \
+    --insert-global-vars=__filename,__dirname -o preload.js
+```
+
+The `-x` flag should be used with any required module that is already exposed in
+the preload scope, and tells browserify to use the enclosing `require` function
+for it. `--insert-global-vars` will ensure that `process`, `Buffer` and
+`setImmediate` are also taken from the enclosing scope(normally browserify
+injects code for those).
+
+Currently the `require` function provided in the preload scope exposes the
+following modules:
+
+- `electron`
+  - `crashReporter`
+  - `desktopCapturer`
+  - `ipcRenderer`
+  - `nativeImage`
+  - `webFrame`
+- `events`
+- `timers`
+- `url`
+
+More may be added as needed to expose more Electron APIs in the sandbox.
+
+## Rendering untrusted content
+
+Rendering untrusted content in Electron is still somewhat uncharted territory,
+though some apps are finding success (e.g. Beaker Browser). Our goal is to get
+as close to Chrome as we can in terms of the security of sandboxed content, but
+ultimately we will always be behind due to a few fundamental issues:
+
+1. We do not have the dedicated resources or expertise that Chromium has to
+   apply to the security of its product. We do our best to make use of what we
+   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.
+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.
+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.
+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.
+
+Here are some things to consider before rendering untrusted content:
+
+- A preload script can accidentally leak privileged APIs to untrusted code,
+  unless [`contextIsolation`](../tutorial/security.md#3-enable-context-isolation-for-remote-content)
+  is also enabled.
+- Some bug in the V8 engine may allow malicious code to access the renderer
+  preload APIs, effectively granting full access to the system through the
+  `remote` module. Therefore, it is highly recommended to [disable the `remote`
+  module](../tutorial/security.md#15-disable-the-remote-module).
+  If disabling is not feasible, you should selectively [filter the `remote`
+  module](../tutorial/security.md#16-filter-the-remote-module).
+- While we make our best effort to backport Chromium security fixes to older
+  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.
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -483,8 +483,6 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
 })
 ```

-> **NOTE:** The result of this procedure is cached by the network service.
-
 #### `ses.setPermissionRequestHandler(handler)`

 * `handler` Function | null
@@ -492,7 +490,6 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
  * `permission` String - The type of requested permission.
    * `clipboard-read` - Request access to read from the clipboard.
    * `media` -  Request access to media devices such as camera, microphone and speakers.
-    * `display-capture` - Request access to capture the screen.
    * `mediaKeySystem` - Request access to DRM protected content.
    * `geolocation` - Request access to user's current location.
    * `notifications` - Request notification creation and the ability to display them in the user's system tray.
@@ -676,16 +673,6 @@ this session just before normal `preload` scripts run.
 Returns `String[]` an array of paths to preload scripts that have been
 registered.

-#### `ses.setSpellCheckerEnabled(enable)`
-
-* `enable` Boolean
-
-Sets whether to enable the builtin spell checker.
-
-#### `ses.isSpellCheckerEnabled()`
-
-Returns `Boolean` - Whether the builtin spell checker is enabled.
-
 #### `ses.setSpellCheckerLanguages(languages)`

 * `languages` String[] - An array of language codes to enable the spellchecker for.
@@ -743,13 +730,9 @@ will not work on non-persistent (in-memory) sessions.

 **Note:** On macOS and Windows 10 this word will be removed from the OS custom dictionary as well

-#### `ses.loadExtension(path[, options])`
+#### `ses.loadExtension(path)`

 * `path` String - Path to a directory containing an unpacked Chrome extension
-* `options` Object (optional)
-  * `allowFileAccess` Boolean - Whether to allow the extension to read local files over `file://`
-    protocol and inject content scripts into `file://` pages. This is required e.g. for loading
-    devtools extensions on `file://` URLs. Defaults to false.

 Returns `Promise<Extension>` - resolves when the extension is loaded.

@@ -772,11 +755,7 @@ const { app, session } = require('electron')
 const path = require('path')

 app.on('ready', async () => {
-  await session.defaultSession.loadExtension(
-    path.join(__dirname, 'react-devtools'),
-    // allowFileAccess is required to load the devtools extension on file:// URLs.
-    { allowFileAccess: true }
-  )
+  await session.defaultSession.loadExtension(path.join(__dirname, 'react-devtools'))
  // Note that in order to use the React DevTools extension, you'll need to
  // download and unzip a copy of the extension.
 })
@@ -824,10 +803,6 @@ The following properties are available on instances of `Session`:
 A `String[]` array which consists of all the known available spell checker languages.  Providing a language
 code to the `setSpellCheckerLanguages` API that isn't in this array will result in an error.

-#### `ses.spellCheckerEnabled`
-
-A `Boolean` indicating whether builtin spell checker is enabled.
-
 #### `ses.cookies` _Readonly_

 A [`Cookies`](cookies.md) object for this session.
--- a/docs/api/share-menu.md
+++ b/docs/api/share-menu.md
@@ -1,4 +1,8 @@
-# ShareMenu
+## Class: ShareMenu
+
+> Create share menu on macOS.
+
+Process: [Main](../glossary.md#main-process)

 The `ShareMenu` class creates [Share Menu][share-menu] on macOS, which can be
 used to share information from the current context to apps, social media
@@ -7,12 +11,6 @@ accounts, and other services.
 For including the share menu as a submenu of other menus, please use the
 `shareMenu` role of [`MenuItem`](menu-item.md).

-## Class: ShareMenu
-
-> Create share menu on macOS.
-
-Process: [Main](../glossary.md#main-process)
-
 ### `new ShareMenu(sharingItem)`

 * `sharingItem` SharingItem - The item to share.
--- a/docs/api/structures/cancellable-navigation-event.md
+++ b/docs/api/structures/cancellable-navigation-event.md
@@ -0,0 +1,6 @@
+# CancellableNavigationEvent Object extends `Event`
+
+* `returnValue` Object - Set this to cancel the navigation event and optionally return a custom error code or error page
+  * `errorCode` Number - Can be any error code from the [Net Error List](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).  If you provide `errorPage` then this code can not be `-3`. We recommend using `-2` which is `net::Aborted`.
+  * `errorPage` String (optional) - Custom HTML error page to display when the navigation is cancelled.
+
--- a/docs/api/structures/display.md
+++ b/docs/api/structures/display.md
@@ -10,10 +10,9 @@
 * `colorSpace` String -  represent a color space (three-dimensional object which contains all realizable color combinations) for the purpose of color conversions
 * `colorDepth` Number - The number of bits per pixel.
 * `depthPerComponent` Number - The number of bits per color component.
-* `displayFrequency` Number - The display refresh rate.
-* `bounds` [Rectangle](rectangle.md) - the bounds of the display in DIP points.
+* `bounds` [Rectangle](rectangle.md)
 * `size` [Size](size.md)
-* `workArea` [Rectangle](rectangle.md) - the work area of the display in DIP points.
+* `workArea` [Rectangle](rectangle.md)
 * `workAreaSize` [Size](size.md)
 * `internal` Boolean - `true` for an internal display and `false` for an external display

--- a/docs/api/structures/ipc-main-event.md
+++ b/docs/api/structures/ipc-main-event.md
@@ -1,10 +1,8 @@
 # IpcMainEvent Object extends `Event`

-* `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `returnValue` any - Set this to the value to be returned in a synchronous message
 * `sender` WebContents - Returns the `webContents` that sent the message
-* `senderFrame` WebFrameMain _Readonly_ - The frame that sent this message
 * `ports` MessagePortMain[] - A list of MessagePorts that were transferred with this message
 * `reply` Function - A function that will send an IPC message to the renderer frame that sent the original message that you are currently handling.  You should use this method to "reply" to the sent message in order to guarantee the reply will go to the correct process and frame.
  * `channel` String
--- a/docs/api/structures/ipc-main-invoke-event.md
+++ b/docs/api/structures/ipc-main-invoke-event.md
@@ -1,6 +1,4 @@
 # IpcMainInvokeEvent Object extends `Event`

-* `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `sender` WebContents - Returns the `webContents` that sent the message
-* `senderFrame` WebFrameMain _Readonly_ - The frame that sent this message
--- a/docs/api/structures/jump-list-category.md
+++ b/docs/api/structures/jump-list-category.md
@@ -19,7 +19,3 @@
 property set then its `type` is assumed to be `tasks`. If the `name` property
 is set but the `type` property is omitted then the `type` is assumed to be
 `custom`.
-
-**Note:** The maximum length of a Jump List item's `description` property is
-260 characters. Beyond this limit, the item will not be added to the Jump
-List, nor will it be displayed.
--- a/docs/api/structures/jump-list-item.md
+++ b/docs/api/structures/jump-list-item.md
@@ -17,7 +17,7 @@
 * `title` String (optional) - The text to be displayed for the item in the Jump List.
  Should only be set if `type` is `task`.
 * `description` String (optional) - Description of the task (displayed in a tooltip).
-  Should only be set if `type` is `task`. Maximum length 260 characters.
+  Should only be set if `type` is `task`.
 * `iconPath` String (optional) - The absolute path to an icon to be displayed in a
  Jump List, which can be an arbitrary resource file that contains an icon
  (e.g. `.ico`, `.exe`, `.dll`). You can usually specify `process.execPath` to
--- a/docs/api/structures/upload-file.md
+++ b/docs/api/structures/upload-file.md
@@ -1,6 +1,6 @@
 # UploadFile Object

-* `type` 'file' - `file`.
+* `type` String - `file`.
 * `filePath` String - Path of file to be uploaded.
 * `offset` Integer - Defaults to `0`.
 * `length` Integer - Number of bytes to read from `offset`.
--- a/docs/api/structures/upload-raw-data.md
+++ b/docs/api/structures/upload-raw-data.md
@@ -1,4 +1,4 @@
 # UploadRawData Object

-* `type` 'rawData' - `rawData`.
+* `type` String - `rawData`.
 * `bytes` Buffer - Data to be uploaded.
--- a/docs/api/synopsis.md
+++ b/docs/api/synopsis.md
@@ -13,7 +13,7 @@ either process type.

 The basic rule is: if a module is [GUI][gui] or low-level system related, then
 it should be only available in the main process. You need to be familiar with
-the concept of main process vs. renderer process
+the concept of [main process vs. renderer process](../tutorial/quick-start.md#main-and-renderer-processes)
 scripts to be able to use those modules.

 The main process script is like a normal Node.js script:
@@ -43,6 +43,8 @@ extra ability to use node modules if `nodeIntegration` is enabled:
 </html>
 ```

+To run your app, read [Run your app](../tutorial/quick-start.md#run-your-application).
+
 ## Destructuring assignment

 As of 0.37, you can use
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -130,8 +130,6 @@ This is necessary for events such as `NSUserDefaultsDidChangeNotification`.
  * `userInfo` Record<String, unknown>
  * `object` String

-Returns `Number` - The ID of this subscription
-
 Same as `subscribeNotification`, but uses `NSWorkspace.sharedWorkspace.notificationCenter`.
 This is necessary for events such as `NSWorkspaceDidActivateApplicationNotification`.

--- a/docs/api/touch-bar.md
+++ b/docs/api/touch-bar.md
@@ -1,5 +1,3 @@
-# TouchBar
-
 ## Class: TouchBar

 > Create TouchBar layouts for native macOS applications
--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -1,5 +1,3 @@
-# Tray
-
 ## Class: Tray

 > Add icons and context menus to the system's notification area.
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -42,28 +42,7 @@ returns `null`.

 * `id` Integer

-Returns `WebContents` | undefined - A WebContents instance with the given ID, or
-`undefined` if there is no WebContents associated with the given ID.
-
-### `webContents.fromDevToolsTargetId(targetId)`
-
-* `targetId` String - The Chrome DevTools Protocol [TargetID](https://chromedevtools.github.io/devtools-protocol/tot/Target/#type-TargetID) associated with the WebContents instance.
-
-Returns `WebContents` | undefined - A WebContents instance with the given TargetID, or
-`undefined` if there is no WebContents associated with the given TargetID.
-
-When communicating with the [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/),
-it can be useful to lookup a WebContents instance based on its assigned TargetID.
-
-```js
-async function lookupTargetId (browserWindow) {
-  const wc = browserWindow.webContents
-  await wc.debugger.attach('1.3')
-  const { targetInfo } = await wc.debugger.sendCommand('Target.getTargetInfo')
-  const { targetId } = targetInfo
-  const targetWebContents = await webContents.fromDevToolsTargetId(targetId)
-}
-```
+Returns `WebContents` - A WebContents instance with the given ID.

 ## Class: WebContents

@@ -78,6 +57,25 @@ Process: [Main](../glossary.md#main-process)
 Emitted when the navigation is done, i.e. the spinner of the tab has stopped
 spinning, and the `onload` event was dispatched.

+#### Event: 'will-fail-load' _Experimental_
+
+Returns:
+
+* `event` [CancellableNavigationEvent](structures/cancellable-navigation-event.md)
+* `url` String
+* `isInPlace` Boolean
+* `isMainFrame` Boolean
+* `frameProcessId` Integer
+* `frameRoutingId` Integer
+* `errorCode` Integer
+* `errorDescription` String
+
+This event will be emitted after `did-start-loading` and always before the
+`did-fail-load` event for the same navigation.
+
+Settings `event.returnValue` to the appropriate object will result in a custom error page being
+displayed using custom HTML.
+
 #### Event: 'did-fail-load'

 Returns:
@@ -176,7 +174,7 @@ Returns:
  be set. If no post data is to be sent, the value will be `null`. Only defined
  when the window is being created by a form that set `target=_blank`.

-Deprecated in favor of [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
+Deprecated in favor of [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandler-handler).

 Emitted when the page requests to open a new window for a `url`. It could be
 requested by `window.open` or an external link like `<a target='_blank'>`.
@@ -224,7 +222,7 @@ Returns:
      BrowserWindow. They are merged in increasing precedence: options inherited
      from the parent, parsed options from the `features` string from
      `window.open()`, and options given by
-      [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
+      [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandler-handler).
      Unrecognized options are not filtered out.
    * `additionalFeatures` String[] - The non-standard features (features not
      handled Chromium or Electron) _Deprecated_
@@ -241,15 +239,15 @@ Returns:

 Emitted _after_ successful creation of a window via `window.open` in the renderer.
 Not emitted if the creation of the window is canceled from
-[`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
+[`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandler-handler).

 See [`window.open()`](window-open.md) for more details and how to use this in conjunction with `webContents.setWindowOpenHandler`.

-#### Event: 'will-navigate'
+#### Event: 'will-navigate' _Experimental_

 Returns:

-* `event` Event
+* `event` [CancellableNavigationEvent](structures/cancellable-navigation-event.md)
 * `url` String

 Emitted when a user or the page wants to start navigation. It can happen when
@@ -264,6 +262,9 @@ this purpose.

 Calling `event.preventDefault()` will prevent the navigation.

+Settings `event.returnValue` to the appropriate object will result in a custom error page being
+displayed using custom HTML and the navigation being cancelled.
+
 #### Event: 'did-start-navigation'

 Returns:
@@ -422,9 +423,6 @@ Returns:
    * `oom` - Process ran out of memory
    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed
-  * `exitCode` Integer - The exit code of the process, unless `reason` is
-    `launch-failed`, in which case `exitCode` will be a platform-specific
-    launch failure error code.

 Emitted when the renderer process unexpectedly disappears.  This is normally
 because it was crashed or killed.
@@ -1189,7 +1187,6 @@ Ignore application menu shortcuts while this web contents is focused.
    * `url` String - The _resolved_ version of the URL passed to `window.open()`. e.g. opening a window with `window.open('foo')` will yield something like `https://the-origin/the/current/path/foo`.
    * `frameName` String - Name of the window provided in `window.open()`
    * `features` String - Comma separated list of window features provided to `window.open()`.
-
  Returns `{action: 'deny'} | {action: 'allow', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions}` - `deny` cancels the creation of the new
  window. `allow` will allow the new window to be created. Specifying `overrideBrowserWindowOptions` allows customization of the created window.
  Returning an unrecognized value such as a null, undefined, or an object
@@ -1326,7 +1323,8 @@ Inserts `text` to the focused element.
 * `text` String - Content to be searched, must not be empty.
 * `options` Object (optional)
  * `forward` Boolean (optional) - Whether to search forward or backward, defaults to `true`.
-  * `findNext` Boolean (optional) - Whether to begin a new text finding session with this request. Should be `true` for initial requests, and `false` for follow-up requests. Defaults to `false`.
+  * `findNext` Boolean (optional) - Whether the operation is first request or a follow up,
+    defaults to `false`.
  * `matchCase` Boolean (optional) - Whether search should be case-sensitive,
    defaults to `false`.

@@ -1681,7 +1679,8 @@ 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.
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The renderer process can handle the message by listening to `channel` with the
 [`ipcRenderer`](ipc-renderer.md) module.
@@ -1717,9 +1716,7 @@ app.whenReady().then(() => {

 #### `contents.sendToFrame(frameId, channel, ...args)`

-* `frameId` Integer | [number, number] - the ID of the frame to send to, or a
-  pair of `[processId, frameId]` if the frame is in a different process to the
-  main frame.
+* `frameId` Integer
 * `channel` String
 * `...args` any[]

@@ -1729,8 +1726,9 @@ Send an asynchronous message to a specific frame in a renderer process via
 chains will not be 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.
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The renderer process can handle the message by listening to `channel` with the
 [`ipcRenderer`](ipc-renderer.md) module.
@@ -1893,7 +1891,7 @@ Returns `Boolean` - If *offscreen rendering* is enabled returns whether it is cu
 * `fps` Integer

 If *offscreen rendering* is enabled sets the frame rate to the specified number.
-Only values between 1 and 240 are accepted.
+Only values between 1 and 60 are accepted.

 #### `contents.getFrameRate()`

@@ -1991,7 +1989,7 @@ The zoom factor is the zoom percent divided by 100, so 300% = 3.0.
 #### `contents.frameRate`

 An `Integer` property that sets the frame rate of the web contents to the specified number.
-Only values between 1 and 240 are accepted.
+Only values between 1 and 60 are accepted.

 Only applicable if *offscreen rendering* is enabled.

--- a/docs/api/web-frame-main.md
+++ b/docs/api/web-frame-main.md
@@ -26,7 +26,7 @@ win.webContents.on(
 )
 ```

-You can also access frames of existing pages by using the `mainFrame` property
+You can also access frames of existing pages by using the `webFrame` property
 of [`WebContents`](web-contents.md).

 ```javascript
@@ -57,14 +57,13 @@ These methods can be accessed from the `webFrameMain` module:

 ### `webFrameMain.fromId(processId, routingId)`

-* `processId` Integer - An `Integer` representing the internal ID of the process which owns the frame.
-* `routingId` Integer - An `Integer` representing the unique frame ID in the
+* `processId` Integer - An `Integer` representing the id of the process which owns the frame.
+* `routingId` Integer - An `Integer` representing the unique frame id in the
  current renderer process. Routing IDs can be retrieved from `WebFrameMain`
  instances (`frame.routingId`) and are also passed by frame
  specific `WebContents` navigation events (e.g. `did-frame-navigate`).

-Returns `WebFrameMain | undefined` - A frame with the given process and routing IDs,
-or `undefined` if there is no WebFrameMain associated with the given IDs.
+Returns `WebFrameMain` - A frame with the given process and routing IDs.

 ## Class: WebFrameMain

@@ -90,47 +89,6 @@ this limitation.

 Returns `boolean` - Whether the reload was initiated successfully. Only results in `false` when the frame has no history.

-#### `frame.send(channel, ...args)`
-
-* `channel` String
-* `...args` any[]
-
-Send an asynchronous message to the renderer process via `channel`, along with
-arguments. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`postMessage`][], so prototype chains will not be
-included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
-throw an exception.
-
-The renderer process can handle the message by listening to `channel` with the
-[`ipcRenderer`](ipc-renderer.md) module.
-
-#### `frame.postMessage(channel, message, [transfer])`
-
-* `channel` String
-* `message` any
-* `transfer` MessagePortMain[] (optional)
-
-Send a message to the renderer process, optionally transferring ownership of
-zero or more [`MessagePortMain`][] objects.
-
-The transferred `MessagePortMain` objects will be available in the renderer
-process by accessing the `ports` property of the emitted event. When they
-arrive in the renderer, they will be native DOM `MessagePort` objects.
-
-For example:
-
-```js
-// Main process
-const { port1, port2 } = new MessageChannelMain()
-webContents.mainFrame.postMessage('port', { message: 'hello' }, [port1])
-
-// Renderer process
-ipcRenderer.on('port', (e, msg) => {
-  const [port] = e.ports
-  // ...
-})
-```
-
 ### Instance Properties

 #### `frame.url` _Readonly_
--- a/docs/api/web-request.md
+++ b/docs/api/web-request.md
@@ -51,8 +51,6 @@ The following methods are available on instances of `WebRequest`:
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -96,8 +94,6 @@ Some examples of valid `urls`:
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -125,8 +121,6 @@ The `callback` has to be called with a `response` object.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -147,13 +141,12 @@ response are visible by the time this listener is fired.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
    * `statusLine` String
    * `statusCode` Integer
+    * `requestHeaders` Record<string, string>
    * `responseHeaders` Record<string, string[]> (optional)
  * `callback` Function
    * `headersReceivedResponse` Object
@@ -180,8 +173,6 @@ The `callback` has to be called with a `response` object.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -206,8 +197,6 @@ and response headers are available.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -233,8 +222,6 @@ redirect is about to occur.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
@@ -258,8 +245,6 @@ completed.
    * `url` String
    * `method` String
    * `webContentsId` Integer (optional)
-    * `webContents` WebContents (optional)
-    * `frame` WebFrameMain (optional)
    * `resourceType` String
    * `referrer` String
    * `timestamp` Double
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -5,7 +5,7 @@
 Electron's `webview` tag is based on [Chromium's `webview`][chrome-webview], which
 is undergoing dramatic architectural changes. This impacts the stability of `webviews`,
 including rendering, navigation, and event routing. We currently recommend to not
-use the `webview` tag and to consider alternatives, like `iframe`, [Electron's `BrowserView`](browser-view.md),
+use the `webview` tag and to consider alternatives, like `iframe`, Electron's `BrowserView`,
 or an architecture that avoids embedded content altogether.

 ## Enabling
@@ -515,7 +515,8 @@ Inserts `text` to the focused element.
 * `text` String - Content to be searched, must not be empty.
 * `options` Object (optional)
  * `forward` Boolean (optional) - Whether to search forward or backward, defaults to `true`.
-  * `findNext` Boolean (optional) - Whether to begin a new text finding session with this request. Should be `true` for initial requests, and `false` for follow-up requests. Defaults to `false`.
+  * `findNext` Boolean (optional) - Whether the operation is first request or a follow up,
+    defaults to `false`.
  * `matchCase` Boolean (optional) - Whether search should be case-sensitive,
    defaults to `false`.

@@ -718,10 +719,6 @@ Corresponds to the points in time when the spinner of the tab starts spinning.

 Corresponds to the points in time when the spinner of the tab stops spinning.

-### Event: 'did-attach'
-
-Fired when attached to the embedder web contents.
-
 ### Event: 'dom-ready'

 Fired when document in the given frame is loaded.
@@ -842,19 +839,6 @@ this purpose.

 Calling `event.preventDefault()` does __NOT__ have any effect.

-### Event: 'did-start-navigation'
-
-Returns:
-
-* `url` String
-* `isInPlace` Boolean
-* `isMainFrame` Boolean
-* `frameProcessId` Integer
-* `frameRoutingId` Integer
-
-Emitted when any frame (including main) starts navigating. `isInPlace` will be
-`true` for in-page navigations.
-
 ### Event: 'did-navigate'

 Returns:
@@ -867,23 +851,6 @@ This event is not emitted for in-page navigations, such as clicking anchor links
 or updating the `window.location.hash`. Use `did-navigate-in-page` event for
 this purpose.

-### Event: 'did-frame-navigate'
-
-Returns:
-
-* `url` String
-* `httpResponseCode` Integer - -1 for non HTTP navigations
-* `httpStatusText` String - empty for non HTTP navigations,
-* `isMainFrame` Boolean
-* `frameProcessId` Integer
-* `frameRoutingId` Integer
-
-Emitted when any frame navigation is done.
-
-This event is not emitted for in-page navigations, such as clicking anchor links
-or updating the `window.location.hash`. Use `did-navigate-in-page` event for
-this purpose.
-
 ### Event: 'did-navigate-in-page'

 Returns:
@@ -999,4 +966,4 @@ Emitted when DevTools is closed.
 Emitted when DevTools is focused / opened.

 [runtime-enabled-features]: https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/runtime_enabled_features.json5?l=70
-[chrome-webview]: https://developer.chrome.com/docs/extensions/reference/webviewTag/
+[chrome-webview]: https://developer.chrome.com/apps/tags/webview
--- a/docs/api/window-open.md
+++ b/docs/api/window-open.md
@@ -26,7 +26,7 @@ BrowserWindow constructor options are set by, in increasing precedence
 order: options inherited from the parent, parsed options
 from the `features` string from `window.open()`, security-related webPreferences
 inherited from the parent, and options given by
-[`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
+[`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandler-handler).
 Note that `webContents.setWindowOpenHandler` has final say and full privilege
 because it is invoked in the main process.

@@ -83,9 +83,9 @@ const mainWindow = new BrowserWindow()

 mainWindow.webContents.setWindowOpenHandler(({ url }) => {
  if (url.startsWith('https://github.com/')) {
-    return { action: 'allow' }
+    return true
  }
-  return { action: 'deny' }
+  return false
 })

 mainWindow.webContents.on('did-create-window', (childWindow) => {
@@ -117,18 +117,15 @@ const mainWindow = new BrowserWindow({
 mainWindow.webContents.setWindowOpenHandler(({ url }) => {
  if (url === 'about:blank') {
    return {
-      action: 'allow',
-      overrideBrowserWindowOptions: {
-        frame: false,
-        fullscreenable: false,
-        backgroundColor: 'black',
-        webPreferences: {
-          preload: 'my-child-window-preload-script.js'
-        }
+      frame: false,
+      fullscreenable: false,
+      backgroundColor: 'black',
+      webPreferences: {
+        preload: 'my-child-window-preload-script.js'
      }
    }
  }
-  return { action: 'deny' }
+  return false
 })
 ```

--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -6,52 +6,14 @@ Breaking changes will be documented here, and deprecation warnings added to JS c

 This document uses the following convention to categorize breaking changes:

-* **API Changed:** An API was changed in such a way that code that has not been updated is guaranteed to throw an exception.
-* **Behavior Changed:** The behavior of Electron has changed, but not in such a way that an exception will necessarily be thrown.
-* **Default Changed:** Code depending on the old default may break, not necessarily throwing an exception. The old behavior can be restored by explicitly specifying the value.
-* **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
-* **Removed:** An API or feature was removed, and is no longer supported by Electron.
-
-## Planned Breaking API Changes (14.0)
-
-### API Changed: `window.(open)`
-
-The optional parameter `frameName` will no longer set the title of the window. This now follows the specification described by the [native documentation](https://developer.mozilla.org/en-US/docs/Web/API/Window/open#parameters) under the corresponding parameter `windowName`.
-
-If you were using this parameter to set the title of a window, you can instead use [win.setTitle(title)](https://www.electronjs.org/docs/api/browser-window#winsettitletitle).
-
-### Removed: `worldSafeExecuteJavaScript`
-
-In Electron 14, `worldSafeExecuteJavaScript` will be removed.  There is no alternative, please
-ensure your code works with this property enabled.  It has been enabled by default since Electron
-12.
-
-You will be affected by this change if you use either `webFrame.executeJavaScript` or `webFrame.executeJavaScriptInIsolatedWorld`. You will need to ensure that values returned by either of those methods are supported by the [Context Bridge API](api/context-bridge.md#parameter--error--return-type-support) as these methods use the same value passing semantics.
+- **API Changed:** An API was changed in such a way that code that has not been updated is guaranteed to throw an exception.
+- **Behavior Changed:** The behavior of Electron has changed, but not in such a way that an exception will necessarily be thrown.
+- **Default Changed:** Code depending on the old default may break, not necessarily throwing an exception. The old behavior can be restored by explicitly specifying the value.
+- **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
+- **Removed:** An API or feature was removed, and is no longer supported by Electron.

 ## Planned Breaking API Changes (13.0)

-### API Changed: `session.setPermissionCheckHandler(handler)`
-
-The `handler` methods first parameter was previously always a `webContents`, it can now sometimes be `null`.  You should use the `requestingOrigin`, `embeddingOrigin` and `securityOrigin` properties to respond to the permission check correctly.  As the `webContents` can be `null` it can no longer be relied on.
-
-```js
-// Old code
-session.setPermissionCheckHandler((webContents, permission) => {
-  if (webContents.getURL().startsWith('https://google.com/') && permission === 'notification') {
-    return true
-  }
-  return false
-})
-
-// Replace with
-session.setPermissionCheckHandler((webContents, permission, requestingOrigin) => {
-  if (new URL(requestingOrigin).hostname === 'google.com' && permission === 'notification') {
-    return true
-  }
-  return false
-})
-```
-
 ### Removed: `shell.moveItemToTrash()`

 The deprecated synchronous `shell.moveItemToTrash()` API has been removed. Use
@@ -64,78 +26,6 @@ shell.moveItemToTrash(path)
 shell.trashItem(path).then(/* ... */)
 ```

-### Removed: `BrowserWindow` extension APIs
-
-The deprecated extension APIs have been removed:
-
-* `BrowserWindow.addExtension(path)`
-* `BrowserWindow.addDevToolsExtension(path)`
-* `BrowserWindow.removeExtension(name)`
-* `BrowserWindow.removeDevToolsExtension(name)`
-* `BrowserWindow.getExtensions()`
-* `BrowserWindow.getDevToolsExtensions()`
-
-Use the session APIs instead:
-
-* `ses.loadExtension(path)`
-* `ses.removeExtension(extension_id)`
-* `ses.getAllExtensions()`
-
-```js
-// Removed in Electron 13
-BrowserWindow.addExtension(path)
-BrowserWindow.addDevToolsExtension(path)
-// Replace with
-session.defaultSession.loadExtension(path)
-```
-
-```js
-// Removed in Electron 13
-BrowserWindow.removeExtension(name)
-BrowserWindow.removeDevToolsExtension(name)
-// Replace with
-session.defaultSession.removeExtension(extension_id)
-```
-
-```js
-// Removed in Electron 13
-BrowserWindow.getExtensions()
-BrowserWindow.getDevToolsExtensions()
-// Replace with
-session.defaultSession.getAllExtensions()
-```
-
-### Removed: methods in `systemPreferences`
-
-The following `systemPreferences` methods have been deprecated:
-
-* `systemPreferences.isDarkMode()`
-* `systemPreferences.isInvertedColorScheme()`
-* `systemPreferences.isHighContrastColorScheme()`
-
-Use the following `nativeTheme` properties instead:
-
-* `nativeTheme.shouldUseDarkColors`
-* `nativeTheme.shouldUseInvertedColorScheme`
-* `nativeTheme.shouldUseHighContrastColors`
-
-```js
-// Removed in Electron 13
-systemPreferences.isDarkMode()
-// Replace with
-nativeTheme.shouldUseDarkColors
-
-// Removed in Electron 13
-systemPreferences.isInvertedColorScheme()
-// Replace with
-nativeTheme.shouldUseInvertedColorScheme
-
-// Removed in Electron 13
-systemPreferences.isHighContrastColorScheme()
-// Replace with
-nativeTheme.shouldUseHighContrastColors
-```
-
 ## Planned Breaking API Changes (12.0)

 ### Removed: Pepper Flash support
@@ -144,15 +34,6 @@ Chromium has removed support for Flash, and so we must follow suit. See
 Chromium's [Flash Roadmap](https://www.chromium.org/flash-roadmap) for more
 details.

-### Default Changed: `worldSafeExecuteJavaScript` defaults to `true`
-
-In Electron 12, `worldSafeExecuteJavaScript` will be enabled by default.  To restore
-the previous behavior, `worldSafeExecuteJavaScript: false` must be specified in WebPreferences.
-Please note that setting this option to `false` is **insecure**.
-
-This option will be removed in Electron 14 so please migrate your code to support the default
-value.
-
 ### Default Changed: `contextIsolation` defaults to `true`

 In Electron 12, `contextIsolation` will be enabled by default.  To restore
@@ -160,34 +41,19 @@ the previous behavior, `contextIsolation: false` must be specified in WebPrefere

 We [recommend having contextIsolation enabled](https://github.com/electron/electron/blob/master/docs/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`.
-
 For more details see: https://github.com/electron/electron/issues/23506

-### Removed: `crashReporter.getCrashesDirectory()`
-
-The `crashReporter.getCrashesDirectory` method has been removed. Usage
-should be replaced by `app.getPath('crashDumps')`.
-
-```js
-// Removed in Electron 12
-crashReporter.getCrashesDirectory()
-// Replace with
-app.getPath('crashDumps')
-```
-
 ### Removed: `crashReporter` methods in the renderer process

 The following `crashReporter` methods are no longer available in the renderer
 process:

-* `crashReporter.start`
-* `crashReporter.getLastCrashReport`
-* `crashReporter.getUploadedReports`
-* `crashReporter.getUploadToServer`
-* `crashReporter.setUploadToServer`
-* `crashReporter.getCrashesDirectory`
+- `crashReporter.start`
+- `crashReporter.getLastCrashReport`
+- `crashReporter.getUploadedReports`
+- `crashReporter.getUploadToServer`
+- `crashReporter.setUploadToServer`
+- `crashReporter.getCrashesDirectory`

 They should be called only from the main process.

@@ -237,13 +103,7 @@ shell.trashItem(path).then(/* ... */)

 ## Planned Breaking API Changes (11.0)

-### Removed: `BrowserView.{destroy, fromId, fromWebContents, getAllViews}` and `id` property of `BrowserView`
-
-The experimental APIs `BrowserView.{destroy, fromId, fromWebContents, getAllViews}`
-have now been removed. Additionally, the `id` property of `BrowserView`
-has also been removed.
-
-For more detailed information, see [#23578](https://github.com/electron/electron/pull/23578).
+There are no breaking changes planned for 11.0.

 ## Planned Breaking API Changes (10.0)

@@ -278,12 +138,12 @@ app.getPath('crashDumps')
 Calling the following `crashReporter` methods from the renderer process is
 deprecated:

-* `crashReporter.start`
-* `crashReporter.getLastCrashReport`
-* `crashReporter.getUploadedReports`
-* `crashReporter.getUploadToServer`
-* `crashReporter.setUploadToServer`
-* `crashReporter.getCrashesDirectory`
+- `crashReporter.start`
+- `crashReporter.getLastCrashReport`
+- `crashReporter.getUploadedReports`
+- `crashReporter.getUploadToServer`
+- `crashReporter.setUploadToServer`
+- `crashReporter.getCrashesDirectory`

 The only non-deprecated methods remaining in the `crashReporter` module in the
 renderer are `addExtraParameter`, `removeExtraParameter` and `getParameters`.
@@ -325,7 +185,6 @@ We [recommend moving away from the remote
 module](https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31).

 ### `protocol.unregisterProtocol`
-
 ### `protocol.uninterceptProtocol`

 The APIs are now synchronous and the optional callback is no longer needed.
@@ -338,23 +197,14 @@ protocol.unregisterProtocol(scheme)
 ```

 ### `protocol.registerFileProtocol`
-
 ### `protocol.registerBufferProtocol`
-
 ### `protocol.registerStringProtocol`
-
 ### `protocol.registerHttpProtocol`
-
 ### `protocol.registerStreamProtocol`
-
 ### `protocol.interceptFileProtocol`
-
 ### `protocol.interceptStringProtocol`
-
 ### `protocol.interceptBufferProtocol`
-
 ### `protocol.interceptHttpProtocol`
-
 ### `protocol.interceptStreamProtocol`

 The APIs are now synchronous and the optional callback is no longer needed.
@@ -396,47 +246,6 @@ you should plan to update your native modules to be context aware.

 For more detailed information see [#18397](https://github.com/electron/electron/issues/18397).

-### Deprecated: `BrowserWindow` extension APIs
-
-The following extension APIs have been deprecated:
-
-* `BrowserWindow.addExtension(path)`
-* `BrowserWindow.addDevToolsExtension(path)`
-* `BrowserWindow.removeExtension(name)`
-* `BrowserWindow.removeDevToolsExtension(name)`
-* `BrowserWindow.getExtensions()`
-* `BrowserWindow.getDevToolsExtensions()`
-
-Use the session APIs instead:
-
-* `ses.loadExtension(path)`
-* `ses.removeExtension(extension_id)`
-* `ses.getAllExtensions()`
-
-```js
-// Deprecated in Electron 9
-BrowserWindow.addExtension(path)
-BrowserWindow.addDevToolsExtension(path)
-// Replace with
-session.defaultSession.loadExtension(path)
-```
-
-```js
-// Deprecated in Electron 9
-BrowserWindow.removeExtension(name)
-BrowserWindow.removeDevToolsExtension(name)
-// Replace with
-session.defaultSession.removeExtension(extension_id)
-```
-
-```js
-// Deprecated in Electron 9
-BrowserWindow.getExtensions()
-BrowserWindow.getDevToolsExtensions()
-// Replace with
-session.defaultSession.getAllExtensions()
-```
-
 ### Removed: `<webview>.getWebContents()`

 This API, which was deprecated in Electron 8.0, is now removed.
@@ -489,7 +298,7 @@ Clone Algorithm][SCA], the same algorithm used to serialize messages for
 `postMessage`. This brings about a 2x performance improvement for large
 messages, but also brings some breaking changes in behavior.

-* Sending Functions, Promises, WeakMaps, WeakSets, or objects containing any
+- Sending Functions, Promises, WeakMaps, WeakSets, or objects containing any
  such values, over IPC will now throw an exception, instead of silently
  converting the functions to `undefined`.

@@ -503,21 +312,21 @@ ipcRenderer.send('channel', { value: 3, someFunction: () => {} })
 // => throws Error("() => {} could not be cloned.")
 ```

-* `NaN`, `Infinity` and `-Infinity` will now be correctly serialized, instead
+- `NaN`, `Infinity` and `-Infinity` will now be correctly serialized, instead
  of being converted to `null`.
-* Objects containing cyclic references will now be correctly serialized,
+- Objects containing cyclic references will now be correctly serialized,
  instead of being converted to `null`.
-* `Set`, `Map`, `Error` and `RegExp` values will be correctly serialized,
+- `Set`, `Map`, `Error` and `RegExp` values will be correctly serialized,
  instead of being converted to `{}`.
-* `BigInt` values will be correctly serialized, instead of being converted to
+- `BigInt` values will be correctly serialized, instead of being converted to
  `null`.
-* Sparse arrays will be serialized as such, instead of being converted to dense
+- Sparse arrays will be serialized as such, instead of being converted to dense
  arrays with `null`s.
-* `Date` objects will be transferred as `Date` objects, instead of being
+- `Date` objects will be transferred as `Date` objects, instead of being
  converted to their ISO string representation.
-* Typed Arrays (such as `Uint8Array`, `Uint16Array`, `Uint32Array` and so on)
+- Typed Arrays (such as `Uint8Array`, `Uint16Array`, `Uint32Array` and so on)
  will be transferred as such, instead of being converted to Node.js `Buffer`.
-* Node.js `Buffer` objects will be transferred as `Uint8Array`s. You can
+- Node.js `Buffer` objects will be transferred as `Uint8Array`s. You can
  convert a `Uint8Array` back to a Node.js `Buffer` by wrapping the underlying
  `ArrayBuffer`:

@@ -583,55 +392,6 @@ in Electron 8.x, and cease to exist in Electron 9.x. The layout zoom level
 limits are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
 [here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).

-### Deprecated events in `systemPreferences`
-
-The following `systemPreferences` events have been deprecated:
-
-* `inverted-color-scheme-changed`
-* `high-contrast-color-scheme-changed`
-
-Use the new `updated` event on the `nativeTheme` module instead.
-
-```js
-// Deprecated
-systemPreferences.on('inverted-color-scheme-changed', () => { /* ... */ })
-systemPreferences.on('high-contrast-color-scheme-changed', () => { /* ... */ })
-
-// Replace with
-nativeTheme.on('updated', () => { /* ... */ })
-```
-
-### Deprecated: methods in `systemPreferences`
-
-The following `systemPreferences` methods have been deprecated:
-
-* `systemPreferences.isDarkMode()`
-* `systemPreferences.isInvertedColorScheme()`
-* `systemPreferences.isHighContrastColorScheme()`
-
-Use the following `nativeTheme` properties instead:
-
-* `nativeTheme.shouldUseDarkColors`
-* `nativeTheme.shouldUseInvertedColorScheme`
-* `nativeTheme.shouldUseHighContrastColors`
-
-```js
-// Deprecated
-systemPreferences.isDarkMode()
-// Replace with
-nativeTheme.shouldUseDarkColors
-
-// Deprecated
-systemPreferences.isInvertedColorScheme()
-// Replace with
-nativeTheme.shouldUseInvertedColorScheme
-
-// Deprecated
-systemPreferences.isHighContrastColorScheme()
-// Replace with
-nativeTheme.shouldUseHighContrastColors
-```
-
 ## Planned Breaking API Changes (7.0)

 ### Deprecated: Atom.io Node Headers URL
@@ -731,55 +491,6 @@ Note that `webkitdirectory` no longer exposes the path to the selected folder.
 If you require the path to the selected folder rather than the folder contents,
 see the `dialog.showOpenDialog` API ([link](https://github.com/electron/electron/blob/master/docs/api/dialog.md#dialogshowopendialogbrowserwindow-options)).

-### API Changed: Callback-based versions of promisified APIs
-
-Electron 5 and Electron 6 introduced Promise-based versions of existing
-asynchronous APIs and deprecated their older, callback-based counterparts.
-In Electron 7, all deprecated callback-based APIs are now removed.
-
-These functions now only return Promises:
-
-* `app.getFileIcon()` [#15742](https://github.com/electron/electron/pull/15742)
-* `app.dock.show()` [#16904](https://github.com/electron/electron/pull/16904)
-* `contentTracing.getCategories()` [#16583](https://github.com/electron/electron/pull/16583)
-* `contentTracing.getTraceBufferUsage()` [#16600](https://github.com/electron/electron/pull/16600)
-* `contentTracing.startRecording()` [#16584](https://github.com/electron/electron/pull/16584)
-* `contentTracing.stopRecording()` [#16584](https://github.com/electron/electron/pull/16584)
-* `contents.executeJavaScript()` [#17312](https://github.com/electron/electron/pull/17312)
-* `cookies.flushStore()` [#16464](https://github.com/electron/electron/pull/16464)
-* `cookies.get()` [#16464](https://github.com/electron/electron/pull/16464)
-* `cookies.remove()` [#16464](https://github.com/electron/electron/pull/16464)
-* `cookies.set()` [#16464](https://github.com/electron/electron/pull/16464)
-* `debugger.sendCommand()` [#16861](https://github.com/electron/electron/pull/16861)
-* `dialog.showCertificateTrustDialog()` [#17181](https://github.com/electron/electron/pull/17181)
-* `inAppPurchase.getProducts()` [#17355](https://github.com/electron/electron/pull/17355)
-* `inAppPurchase.purchaseProduct()`[#17355](https://github.com/electron/electron/pull/17355)
-* `netLog.stopLogging()` [#16862](https://github.com/electron/electron/pull/16862)
-* `session.clearAuthCache()` [#17259](https://github.com/electron/electron/pull/17259)
-* `session.clearCache()`  [#17185](https://github.com/electron/electron/pull/17185)
-* `session.clearHostResolverCache()` [#17229](https://github.com/electron/electron/pull/17229)
-* `session.clearStorageData()` [#17249](https://github.com/electron/electron/pull/17249)
-* `session.getBlobData()` [#17303](https://github.com/electron/electron/pull/17303)
-* `session.getCacheSize()`  [#17185](https://github.com/electron/electron/pull/17185)
-* `session.resolveProxy()` [#17222](https://github.com/electron/electron/pull/17222)
-* `session.setProxy()`  [#17222](https://github.com/electron/electron/pull/17222)
-* `shell.openExternal()` [#16176](https://github.com/electron/electron/pull/16176)
-* `webContents.loadFile()` [#15855](https://github.com/electron/electron/pull/15855)
-* `webContents.loadURL()` [#15855](https://github.com/electron/electron/pull/15855)
-* `webContents.hasServiceWorker()` [#16535](https://github.com/electron/electron/pull/16535)
-* `webContents.printToPDF()` [#16795](https://github.com/electron/electron/pull/16795)
-* `webContents.savePage()` [#16742](https://github.com/electron/electron/pull/16742)
-* `webFrame.executeJavaScript()` [#17312](https://github.com/electron/electron/pull/17312)
-* `webFrame.executeJavaScriptInIsolatedWorld()` [#17312](https://github.com/electron/electron/pull/17312)
-* `webviewTag.executeJavaScript()` [#17312](https://github.com/electron/electron/pull/17312)
-* `win.capturePage()` [#15743](https://github.com/electron/electron/pull/15743)
-
-These functions now have two forms, synchronous and Promise-based asynchronous:
-
-* `dialog.showMessageBox()`/`dialog.showMessageBoxSync()` [#17298](https://github.com/electron/electron/pull/17298)
-* `dialog.showOpenDialog()`/`dialog.showOpenDialogSync()` [#16973](https://github.com/electron/electron/pull/16973)
-* `dialog.showSaveDialog()`/`dialog.showSaveDialogSync()` [#17054](https://github.com/electron/electron/pull/17054)
-
 ## Planned Breaking API Changes (6.0)

 ### API Changed: `win.setMenu(null)` is now `win.removeMenu()`
@@ -791,6 +502,19 @@ win.setMenu(null)
 win.removeMenu()
 ```

+### API Changed: `contentTracing.getTraceBufferUsage()` is now a promise
+
+```js
+// Deprecated
+contentTracing.getTraceBufferUsage((percentage, value) => {
+  // do something
+})
+// Replace with
+contentTracing.getTraceBufferUsage().then(infoObject => {
+  // infoObject has percentage and value fields
+})
+```
+
 ### API Changed: `electron.screen` in the renderer process should be accessed via `remote`

 ```js
@@ -929,31 +653,6 @@ webFrame.setSpellCheckProvider('en-US', {
 })
 ```

-### API Changed: `webContents.getZoomLevel` and `webContents.getZoomFactor` are now synchronous
-
-`webContents.getZoomLevel` and `webContents.getZoomFactor` no longer take callback parameters,
-instead directly returning their number values.
-
-```js
-// Deprecated
-webContents.getZoomLevel((level) => {
-  console.log(level)
-})
-// Replace with
-const level = webContents.getZoomLevel()
-console.log(level)
-```
-
-```js
-// Deprecated
-webContents.getZoomFactor((factor) => {
-  console.log(factor)
-})
-// Replace with
-const factor = webContents.getZoomFactor()
-console.log(factor)
-```
-
 ## Planned Breaking API Changes (4.0)

 The following list includes the breaking API changes made in Electron 4.0.
--- a/docs/development/build-instructions-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -1,8 +1,6 @@
 # Build Instructions

-Follow the guidelines below for building **Electron itself**, for the purposes of creating custom Electron binaries. For bundling and distributing your app code with the prebuilt Electron binaries, see the [application distribution][application-distribution] guide.
-
-[application-distribution]: ../tutorial/application-distribution.md
+Follow the guidelines below for building Electron.

 ## Platform prerequisites

@@ -88,6 +86,8 @@ $ gclient sync -f
 ```sh
 $ cd src
 $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
+# this next line is needed only if building with sccache
+$ export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
 $ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EXTRA_ARGS"
 ```

@@ -141,6 +141,12 @@ This will build all of what was previously 'libchromiumcontent' (i.e. the
 `content/` directory of `chromium` and its dependencies, incl. WebKit and V8),
 so it will take a while.

+To speed up subsequent builds, you can use [sccache][sccache]. Add the GN arg
+`cc_wrapper = "sccache"` by running `gn args out/Testing` to bring up an
+editor and adding a line to the end of the file.
+
+[sccache]: https://github.com/mozilla/sccache
+
 The built executable will be under `./out/Testing`:

 ```sh
@@ -183,6 +189,7 @@ Not all combinations of source and target CPU/OS are supported by Chromium.
 | Windows x64 | Windows x86   | Automatically tested |
 | Linux x64   | Linux x86     | Automatically tested |

+
 If you test other combinations and find them to work, please update this document :)

 See the GN reference for allowable values of [`target_os`][target_os values]
--- a/docs/development/build-instructions-linux.md
+++ b/docs/development/build-instructions-linux.md
@@ -1,8 +1,6 @@
 # Build Instructions (Linux)

-Follow the guidelines below for building **Electron itself** on Linux, for the purposes of creating custom Electron binaries. For bundling and distributing your app code with the prebuilt Electron binaries, see the [application distribution][application-distribution] guide.
-
-[application-distribution]: ../tutorial/application-distribution.md
+Follow the guidelines below for building Electron on Linux.

 ## Prerequisites

@@ -57,15 +55,6 @@ $ sudo dnf install clang dbus-devel gtk3-devel libnotify-devel \
                   nss-devel python-dbusmock openjdk-8-jre
 ```

-On Arch Linux / Manjaro, install the following libraries:
-
-```sh
-$ sudo pacman -Syu base-devel clang libdbus gtk2 libnotify \
-                   libgnome-keyring alsa-lib libcap libcups libxtst \
-                   libxss nss gcc-multilib curl gperf bison \
-                   python2 python-dbusmock jdk8-openjdk
-```
-
 Other distributions may offer similar packages for installation via package
 managers such as pacman. Or one can compile from source code.

--- a/docs/development/build-instructions-macos.md
+++ b/docs/development/build-instructions-macos.md
@@ -1,8 +1,6 @@
 # Build Instructions (macOS)

-Follow the guidelines below for building **Electron itself** on macOS, for the purposes of creating custom Electron binaries. For bundling and distributing your app code with the prebuilt Electron binaries, see the [application distribution][application-distribution] guide.
-
-[application-distribution]: ../tutorial/application-distribution.md
+Follow the guidelines below for building Electron on macOS.

 ## Prerequisites

@@ -44,7 +42,7 @@ $ pip install pyobjc
 If you're developing Electron and don't plan to redistribute your
 custom Electron build, you may skip this section.

-Official Electron builds are built with [Xcode 12.2](https://download.developer.apple.com/Developer_Tools/Xcode_12.2/Xcode_12.2.xip), and the macOS 11.0 SDK. Building with a newer SDK works too, but the releases currently use the 11.0 SDK.
+Official Electron builds are built with [Xcode 9.4.1](http://adcdownload.apple.com/Developer_Tools/Xcode_9.4.1/Xcode_9.4.1.xip), and the macOS 10.13 SDK.  Building with a newer SDK works too, but the releases currently use the 10.13 SDK.

 ## Building Electron

--- a/docs/development/build-instructions-windows.md
+++ b/docs/development/build-instructions-windows.md
@@ -1,8 +1,6 @@
 # Build Instructions (Windows)

-Follow the guidelines below for building **Electron itself** on Windows, for the purposes of creating custom Electron binaries. For bundling and distributing your app code with the prebuilt Electron binaries, see the [application distribution][application-distribution] guide.
-
-[application-distribution]: ../tutorial/application-distribution.md
+Follow the guidelines below for building Electron on Windows.

 ## Prerequisites

--- a/docs/development/clang-tidy.md
+++ b/docs/development/clang-tidy.md
@@ -10,12 +10,12 @@ files, you need to have built Electron so that it knows which compiler flags
 were used. There is one required option for the script `--output-dir`, which
 tells the script which build directory to pull the compilation information
 from. A typical usage would be:
-`npm run lint:clang-tidy --out-dir ../out/Testing`
+`npm run lint:clang-tiy --out-dir ../out/Testing`

 With no filenames provided, all C/C++/Objective-C files will be checked.
 You can provide a list of files to be checked by passing the filenames after
 the options:
-`npm run lint:clang-tidy --out-dir ../out/Testing shell/browser/api/electron_api_app.cc`
+`npm run lint:clang-tiy --out-dir ../out/Testing shell/browser/api/electron_api_app.cc`

 While `clang-tidy` has a
 [long list](https://clang.llvm.org/extra/clang-tidy/checks/list.html)
--- a/docs/development/coding-style.md
+++ b/docs/development/coding-style.md
@@ -25,7 +25,7 @@ You can run `npm run lint` to show any style issues detected by `cpplint` and
 ## C++ and Python

 For C++ and Python, we follow Chromium's [Coding
-Style](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/styleguide/styleguide.md). You can use
+Style](https://www.chromium.org/developers/coding-style). You can use
 [clang-format](clang-format.md) to format the C++ code automatically. There is
 also a script `script/cpplint.py` to check whether all files conform.

@@ -66,11 +66,11 @@ formatted correctly.

 Electron APIs uses the same capitalization scheme as Node.js:

-* When the module itself is a class like `BrowserWindow`, use `PascalCase`.
-* When the module is a set of APIs, like `globalShortcut`, use `camelCase`.
-* When the API is a property of object, and it is complex enough to be in a
+- When the module itself is a class like `BrowserWindow`, use `PascalCase`.
+- When the module is a set of APIs, like `globalShortcut`, use `camelCase`.
+- When the API is a property of object, and it is complex enough to be in a
  separate chapter like `win.webContents`, use `mixedCase`.
-* For other non-module APIs, use natural titles, like `<webview> Tag` or
+- For other non-module APIs, use natural titles, like `<webview> Tag` or
  `Process Object`.

 When creating a new API, it is preferred to use getters and setters instead of
--- a/docs/development/debugging-instructions-macos.md
+++ b/docs/development/debugging-instructions-macos.md
@@ -26,9 +26,7 @@ you prefer a graphical interface.
 * **.lldbinit**: Create or edit `~/.lldbinit` to allow Chromium code to be properly source-mapped.

   ```text
-   # e.g: ['~/electron/src/tools/lldb']
-   script sys.path[:0] = ['<...path/to/electron/src/tools/lldb>']
-   script import lldbinit
+   command script import ~/electron/src/tools/lldb/lldbinit.py
   ```

 ## Attaching to and Debugging Electron
--- a/docs/development/issues.md
+++ b/docs/development/issues.md
@@ -35,8 +35,46 @@ To submit a bug report:
 When opening a new issue in the [`electron/electron` issue tracker](https://github.com/electron/electron/issues/new/choose), users
 will be presented with a template that should be filled in.

-If you believe that you have found a bug in Electron, please fill out the template
-to the best of your ability.
+```markdown
+<!--
+Thanks for opening an issue! A few things to keep in mind:
+
+- The issue tracker is only for bugs and feature requests.
+- Before reporting a bug, please try reproducing your issue against
+  the latest version of Electron.
+- If you need general advice, join our Slack: http://atom-slack.herokuapp.com
+-->
+
+* Electron version:
+* Operating system:
+
+### Expected behavior
+
+<!-- What do you think should happen? -->
+
+### Actual behavior
+
+<!-- What actually happens? -->
+
+### How to reproduce
+
+<!--
+
+Your best chance of getting this bug looked at quickly is to provide a REPOSITORY that can be cloned and run.
+
+You can fork https://github.com/electron/electron-quick-start and include a link to the branch with your changes.
+
+If you provide a URL, please list the commands required to clone/setup/run your repo e.g.
+
+  $ git clone $YOUR_URL -b $BRANCH
+  $ npm install
+  $ npm start || electron .
+
+-->
+```
+
+If you believe that you have found a bug in Electron, please fill out this
+form to the best of your ability.

 The two most important pieces of information needed to evaluate the report are
 a description of the bug and a simple test case to recreate it. It is easier to fix
--- a/docs/development/pull-requests.md
+++ b/docs/development/pull-requests.md
@@ -36,9 +36,9 @@ $ git fetch upstream
 Build steps and dependencies differ slightly depending on your operating system.
 See these detailed guides on building Electron locally:

-* [Building on macOS](build-instructions-macos.md)
-* [Building on Linux](build-instructions-linux.md)
-* [Building on Windows](build-instructions-windows.md)
+* [Building on macOS](https://electronjs.org/docs/development/build-instructions-macos)
+* [Building on Linux](https://electronjs.org/docs/development/build-instructions-linux)
+* [Building on Windows](https://electronjs.org/docs/development/build-instructions-windows)

 Once you've built the project locally, you're ready to start making changes!

@@ -63,7 +63,7 @@ or tests in the `spec/` folder.
 Please be sure to run `npm run lint` from time to time on any code changes
 to ensure that they follow the project's code style.

-See [coding style](coding-style.md) for
+See [coding style](https://electronjs.org/docs/development/coding-style) for
 more information about best practice when modifying code in different parts of
 the project.

@@ -91,29 +91,29 @@ Before a pull request can be merged, it **must** have a pull request title with

 Examples of commit messages with semantic prefixes:

-* `fix: don't overwrite prevent_default if default wasn't prevented`
-* `feat: add app.isPackaged() method`
-* `docs: app.isDefaultProtocolClient is now available on Linux`
+- `fix: don't overwrite prevent_default if default wasn't prevented`
+- `feat: add app.isPackaged() method`
+- `docs: app.isDefaultProtocolClient is now available on Linux`

 Common prefixes:

-* fix: A bug fix
-* feat: A new feature
-* docs: Documentation changes
-* test: Adding missing tests or correcting existing tests
-* build: Changes that affect the build system
-* ci: Changes to our CI configuration files and scripts
-* perf: A code change that improves performance
-* refactor: A code change that neither fixes a bug nor adds a feature
-* style: Changes that do not affect the meaning of the code (linting)
-* vendor: Bumping a dependency like libchromiumcontent or node
+- fix: A bug fix
+- feat: A new feature
+- docs: Documentation changes
+- test: Adding missing tests or correcting existing tests
+- build: Changes that affect the build system
+- ci: Changes to our CI configuration files and scripts
+- perf: A code change that improves performance
+- refactor: A code change that neither fixes a bug nor adds a feature
+- style: Changes that do not affect the meaning of the code (linting)
+- vendor: Bumping a dependency like libchromiumcontent or node

 Other things to keep in mind when writing a commit message:

 1. The first line should:
-   * contain a short description of the change (preferably 50 characters or less,
+   - contain a short description of the change (preferably 50 characters or less,
     and no more than 72 characters)
-   * be entirely in lowercase with the exception of proper nouns, acronyms, and
+   - be entirely in lowercase with the exception of proper nouns, acronyms, and
   the words that refer to code, like function/variable names
 2. Keep the second line blank.
 3. Wrap all other lines at 72 columns.
@@ -144,7 +144,7 @@ master.
 ### Step 7: Test

 Bug fixes and features should always come with tests. A
-[testing guide](testing.md) has been
+[testing guide](https://electronjs.org/docs/development/testing) has been
 provided to make the process easier. Looking at other tests to see how they
 should be structured can also help.

--- a/docs/development/source-code-directory-structure.md
+++ b/docs/development/source-code-directory-structure.md
@@ -100,5 +100,7 @@ script/ - The set of all scripts Electron runs for a variety of purposes.
    └── uploaders/ - Uploads various release-related files during release.
 ```

+* **tools** - Helper scripts used by GN files.
+  * Scripts put here should never be invoked by users directly, unlike those in `script`.
 * **typings** - TypeScript typings for Electron's internal code.
 * **vendor** - Source code for some third party dependencies.
--- a/docs/fiddles/features/drag-and-drop/index.html
+++ b/docs/fiddles/features/drag-and-drop/index.html
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>Drag the boxes below to somewhere in your OS (Finder/Explorer, Desktop, etc.) to copy an example markdown file.</p>
-    <div style="border:2px solid black;border-radius:3px;padding:5px;display:inline-block" draggable="true" id="drag1">Drag me - File 1</div>
-    <div style="border:2px solid black;border-radius:3px;padding:5px;display:inline-block" draggable="true" id="drag2">Drag me - File 2</div>
-    <script src="renderer.js"></script>
-</body>
-</html>
--- a/docs/fiddles/features/drag-and-drop/main.js
+++ b/docs/fiddles/features/drag-and-drop/main.js
@@ -1,48 +0,0 @@
-const { app, BrowserWindow, ipcMain, nativeImage, NativeImage } = require('electron')
-const path = require('path')
-const fs = require('fs')
-const https = require('https')
-
-function createWindow() {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-const iconName = path.join(__dirname, 'iconForDragAndDrop.png');
-const icon = fs.createWriteStream(iconName);
-
-// Create a new file to copy - you can also copy existing files.
-fs.writeFileSync(path.join(__dirname, 'drag-and-drop-1.md'), '# First file to test drag and drop')
-fs.writeFileSync(path.join(__dirname, 'drag-and-drop-2.md'), '# Second file to test drag and drop')
-
-https.get('https://img.icons8.com/ios/452/drag-and-drop.png', (response) => {
-  response.pipe(icon);
-});
-
-app.whenReady().then(createWindow)
-
-ipcMain.on('ondragstart', (event, filePath) => {
-  event.sender.startDrag({
-    file: path.join(__dirname, filePath),
-    icon: iconName,
-  })
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/drag-and-drop/preload.js
+++ b/docs/fiddles/features/drag-and-drop/preload.js
@@ -1,8 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron')
-const path = require('path')
-
-contextBridge.exposeInMainWorld('electron', {
-  startDrag: (fileName) => {
-    ipcRenderer.send('ondragstart', fileName)
-  }
-})
--- a/docs/fiddles/features/drag-and-drop/renderer.js
+++ b/docs/fiddles/features/drag-and-drop/renderer.js
@@ -1,9 +0,0 @@
-document.getElementById('drag1').ondragstart = (event) => {
-  event.preventDefault()
-  window.electron.startDrag('drag-and-drop-1.md')
-}
-
-document.getElementById('drag2').ondragstart = (event) => {
-  event.preventDefault()
-  window.electron.startDrag('drag-and-drop-2.md')
-}
--- a/docs/fiddles/features/keyboard-shortcuts/global/index.html
+++ b/docs/fiddles/features/keyboard-shortcuts/global/index.html
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>Hit Alt+Ctrl+I on Windows or Opt+Cmd+I on Mac to see a message printed to the console.</p>
-</body>
-</html>
--- a/docs/fiddles/features/keyboard-shortcuts/global/main.js
+++ b/docs/fiddles/features/keyboard-shortcuts/global/main.js
@@ -1,28 +0,0 @@
-const { app, BrowserWindow, globalShortcut } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-  })
-
-  win.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  globalShortcut.register('Alt+CommandOrControl+I', () => {
-    console.log('Electron loves global shortcuts!')
-  })
-}).then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/keyboard-shortcuts/interception-from-main/index.html
+++ b/docs/fiddles/features/keyboard-shortcuts/interception-from-main/index.html
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>Hit Ctrl+I to see a message printed to the console.</p>
-</body>
-</html>
--- a/docs/fiddles/features/keyboard-shortcuts/interception-from-main/main.js
+++ b/docs/fiddles/features/keyboard-shortcuts/interception-from-main/main.js
@@ -1,13 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-app.whenReady().then(() => {
-  const win = new BrowserWindow({ width: 800, height: 600 })
-
-  win.loadFile('index.html')
-  win.webContents.on('before-input-event', (event, input) => {
-    if (input.control && input.key.toLowerCase() === 'i') {
-      console.log('Pressed Control+I')
-      event.preventDefault()
-    }
-  })
-})
--- a/docs/fiddles/features/keyboard-shortcuts/local/index.html
+++ b/docs/fiddles/features/keyboard-shortcuts/local/index.html
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>Hit Alt+Shift+I on Windows, or Opt+Cmd+I on mac to see a message printed to the console.</p>
-</body>
-</html>
--- a/docs/fiddles/features/keyboard-shortcuts/local/main.js
+++ b/docs/fiddles/features/keyboard-shortcuts/local/main.js
@@ -1,36 +0,0 @@
-const { app, BrowserWindow, Menu, MenuItem } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-  })
-
-  win.loadFile('index.html')
-}
-
-const menu = new Menu()
-menu.append(new MenuItem({
-  label: 'Electron',
-  submenu: [{
-    role: 'help',
-    accelerator: process.platform === 'darwin' ? 'Alt+Cmd+I' : 'Alt+Shift+I',
-    click: () => { console.log('Electron rocks!') }
-  }]
-}))
-
-Menu.setApplicationMenu(menu)
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/keyboard-shortcuts/web-apis/index.html
+++ b/docs/fiddles/features/keyboard-shortcuts/web-apis/index.html
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <meta http-equiv="X-Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <title>Hello World!</title>
-  </head>
-  <body>
-    <h1>Hello World!</h1>
-    
-    <p>Hit any key with this window focused to see it captured here.</p>
-    <div><span>Last Key Pressed: </span><span id="last-keypress"></span></div>
-    <script src="./renderer.js"></script>
-  </body>
-</html>
--- a/docs/fiddles/features/keyboard-shortcuts/web-apis/main.js
+++ b/docs/fiddles/features/keyboard-shortcuts/web-apis/main.js
@@ -1,35 +0,0 @@
-// Modules to control application life and create native browser window
-const {app, BrowserWindow} = require('electron')
-const path = require('path')
-
-function createWindow () {
-  // Create the browser window.
-  const mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600,
-  })
-
-  // and load the index.html of the app.
-  mainWindow.loadFile('index.html')
-
-}
-
-// This method will be called when Electron has finished
-// initialization and is ready to create browser windows.
-// Some APIs can only be used after this event occurs.
-app.whenReady().then(() => {
-  createWindow()
-  
-  app.on('activate', function () {
-    // On macOS it's common to re-create a window in the app when the
-    // dock icon is clicked and there are no other windows open.
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
-  })
-})
-
-// Quit when all windows are closed, except on macOS. There, it's common
-// for applications and their menu bar to stay active until the user quits
-// explicitly with Cmd + Q.
-app.on('window-all-closed', function () {
-  if (process.platform !== 'darwin') app.quit()
-})
--- a/docs/fiddles/features/keyboard-shortcuts/web-apis/renderer.js
+++ b/docs/fiddles/features/keyboard-shortcuts/web-apis/renderer.js
@@ -1,7 +0,0 @@
-function handleKeyPress (event) {
-  // You can put code here to handle the keypress.
-  document.getElementById("last-keypress").innerText = event.key
-  console.log(`You pressed ${event.key}`)
-}
-
-window.addEventListener('keyup', handleKeyPress, true)
--- a/docs/fiddles/features/macos-dark-mode/index.html
+++ b/docs/fiddles/features/macos-dark-mode/index.html
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-    <link rel="stylesheet" type="text/css" href="./styles.css">
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>Current theme source: <strong id="theme-source">System</strong></p>
-
-    <button id="toggle-dark-mode">Toggle Dark Mode</button>
-    <button id="reset-to-system">Reset to System Theme</button>
-
-    <script src="renderer.js"></script>
-  </body>
-</body>
-</html>
--- a/docs/fiddles/features/macos-dark-mode/main.js
+++ b/docs/fiddles/features/macos-dark-mode/main.js
@@ -1,43 +0,0 @@
-const { app, BrowserWindow, ipcMain, nativeTheme } = require('electron')
-const path = require('path')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-
-  win.loadFile('index.html')
-
-  ipcMain.handle('dark-mode:toggle', () => {
-    if (nativeTheme.shouldUseDarkColors) {
-      nativeTheme.themeSource = 'light'
-    } else {
-      nativeTheme.themeSource = 'dark'
-    }
-    return nativeTheme.shouldUseDarkColors
-  })
-
-  ipcMain.handle('dark-mode:system', () => {
-    nativeTheme.themeSource = 'system'
-  })
-}
-
-app.whenReady().then(() => {
-  createWindow()
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) {
-      createWindow()
-    }
-  })
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
--- a/docs/fiddles/features/macos-dark-mode/preload.js
+++ b/docs/fiddles/features/macos-dark-mode/preload.js
@@ -1,6 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld('darkMode', {
-  toggle: () => ipcRenderer.invoke('dark-mode:toggle'),
-  system: () => ipcRenderer.invoke('dark-mode:system')
-})
--- a/docs/fiddles/features/macos-dark-mode/renderer.js
+++ b/docs/fiddles/features/macos-dark-mode/renderer.js
@@ -1,9 +0,0 @@
-document.getElementById('toggle-dark-mode').addEventListener('click', async () => {
-  const isDarkMode = await window.darkMode.toggle()
-  document.getElementById('theme-source').innerHTML = isDarkMode ? 'Dark' : 'Light'
-})
-
-document.getElementById('reset-to-system').addEventListener('click', async () => {
-  await window.darkMode.system()
-  document.getElementById('theme-source').innerHTML = 'System'
-})
--- a/docs/fiddles/features/macos-dark-mode/styles.css
+++ b/docs/fiddles/features/macos-dark-mode/styles.css
@@ -1,7 +0,0 @@
-@media (prefers-color-scheme: dark) {
-  body { background: #333; color: white; }
-}
-
-@media (prefers-color-scheme: light) {
-  body { background: #ddd; color: black; }
-}
--- a/docs/fiddles/features/macos-dock-menu/index.html
+++ b/docs/fiddles/features/macos-dock-menu/index.html
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>Right click the dock icon to see the custom menu options.</p>
-</body>
-</html>
--- a/docs/fiddles/features/macos-dock-menu/main.js
+++ b/docs/fiddles/features/macos-dock-menu/main.js
@@ -1,42 +0,0 @@
-const { app, BrowserWindow, Menu } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-  })
-
-  win.loadFile('index.html')
-}
-
-const dockMenu = Menu.buildFromTemplate([
-  {
-    label: 'New Window',
-    click () { console.log('New Window') }
-  }, {
-    label: 'New Window with Settings',
-    submenu: [
-      { label: 'Basic' },
-      { label: 'Pro' }
-    ]
-  },
-  { label: 'New Command...' }
-])
-
-app.whenReady().then(() => {
-  if (process.platform === 'darwin') {
-    app.dock.setMenu(dockMenu)
-  }
-}).then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/notifications/main/index.html
+++ b/docs/fiddles/features/notifications/main/index.html
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>After launching this application, you should see the system notification.</p>
-</body>
-</html>
--- a/docs/fiddles/features/notifications/main/main.js
+++ b/docs/fiddles/features/notifications/main/main.js
@@ -1,31 +0,0 @@
-const { app, BrowserWindow, Notification } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600
-  })
-
-  win.loadFile('index.html')
-}
-
-const NOTIFICATION_TITLE = 'Basic Notification'
-const NOTIFICATION_BODY = 'Notification from the Main process'
-
-function showNotification () {
-  new Notification({ title: NOTIFICATION_TITLE, body: NOTIFICATION_BODY }).show()
-}
-
-app.whenReady().then(createWindow).then(showNotification)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/notifications/renderer/index.html
+++ b/docs/fiddles/features/notifications/renderer/index.html
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>After launching this application, you should see the system notification.</p>
-    <p id="output">Click it to see the effect in this interface.</p>
-
-    <script src="renderer.js"></script>
-</body>
-</html>
--- a/docs/fiddles/features/notifications/renderer/main.js
+++ b/docs/fiddles/features/notifications/renderer/main.js
@@ -1,24 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600
-  })
-
-  win.loadFile('index.html')
-}
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/notifications/renderer/renderer.js
+++ b/docs/fiddles/features/notifications/renderer/renderer.js
@@ -1,6 +0,0 @@
-const NOTIFICATION_TITLE = 'Title'
-const NOTIFICATION_BODY = 'Notification from the Renderer process. Click to log to console.'
-const CLICK_MESSAGE = 'Notification clicked!'
-
-new Notification(NOTIFICATION_TITLE, { body: NOTIFICATION_BODY })
-  .onclick = () => document.getElementById("output").innerText = CLICK_MESSAGE
--- a/docs/fiddles/features/offscreen-rendering/main.js
+++ b/docs/fiddles/features/offscreen-rendering/main.js
@@ -1,29 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-const fs = require('fs')
-const path = require('path')
-
-app.disableHardwareAcceleration()
-
-let win
-
-app.whenReady().then(() => {
-  win = new BrowserWindow({ webPreferences: { offscreen: true } })
-  win.loadURL('https://github.com')
-  win.webContents.on('paint', (event, dirty, image) => {
-    fs.writeFileSync('ex.png', image.toPNG())
-  })
-  win.webContents.setFrameRate(60)
-  console.log(`The screenshot has been successfully saved to ${path.join(process.cwd(), 'ex.png')}`)
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})
--- a/docs/fiddles/features/online-detection/index.html
+++ b/docs/fiddles/features/online-detection/index.html
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Connection status: <strong id='status'></strong></h1>
-    
-    <script src="renderer.js"></script>
-</body>
-</html>
--- a/docs/fiddles/features/online-detection/main.js
+++ b/docs/fiddles/features/online-detection/main.js
@@ -1,26 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-function createWindow () {
-  const onlineStatusWindow = new BrowserWindow({
-    width: 300,
-    height: 200
-  })
-
-  onlineStatusWindow.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  createWindow()
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) {
-      createWindow()
-    }
-  })
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
--- a/docs/fiddles/features/online-detection/renderer.js
+++ b/docs/fiddles/features/online-detection/renderer.js
@@ -1,8 +0,0 @@
-function onlineStatusIndicator () {
-  document.getElementById('status').innerHTML = navigator.onLine ? 'online' : 'offline'
-}
-
-window.addEventListener('online', onlineStatusIndicator)
-window.addEventListener('offline', onlineStatusIndicator)
-
-onlineStatusIndicator()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Samuel Attard	77189f7a39	chore: fix lint	2020-11-10 14:07:04 -08:00
Samuel Attard	28b794216d	fixup tests	2020-11-10 14:03:02 -08:00
Samuel Attard	58d9c451c6	chore: fixup linting	2020-11-10 14:03:00 -08:00
Samuel Attard	71d8a4a466	chore: fixup docs	2020-11-10 14:02:22 -08:00
Samuel Attard	825f3a3a7d	chore: fixup for review	2020-11-10 14:02:22 -08:00
Samuel Attard	b2625db2ba	feat: add support for will-navigate and will-fail-load custom error pages	2020-11-10 14:02:20 -08:00