Bump v11.0.0-beta.13

docs: move breaking-changes-ns.md contents to breaking-changes.md (#25947 )
Co-authored-by: Milan Burda <milan.burda@gmail.com>
2026-02-26 03:01:17 -05:00 · 2020-10-15 08:02:38 -07:00 · 2020-10-15 10:51:21 +09:00 · 2020-10-15 10:49:07 +09:00 · 2020-10-14 18:37:41 -07:00 · 2020-10-13 18:22:33 -07:00
808 changed files with 13757 additions and 19134 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -107,7 +107,6 @@ env-release-build: &env-release-build
  STRIP_BINARIES: true
  GENERATE_SYMBOLS: true
  CHECK_DIST_MANIFEST: '1'
-  IS_RELEASE: true

 env-headless-testing: &env-headless-testing
  DISPLAY: ':99.0'
@@ -158,6 +157,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
  
@@ -253,34 +256,23 @@ step-gclient-sync: &step-gclient-sync
          "$CIRCLE_REPOSITORY_URL"

        ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags
-        if [ "$IS_RELEASE" != "true" ]; then
-          # Re-export all the patches to check if there were changes.
-          python src/electron/script/export_all_patches.py src/electron/patches/config.json
-          cd src/electron
-          git update-index --refresh || true
-          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="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
-            if (node ./script/push-patch.js 2> /dev/null > /dev/null); then
-              echo
-              echo "======================================================================"
-              echo "Changes to the patches when applying, we have auto-pushed the diff to the current branch"
-              echo "A new CI job will kick off shortly"
-              echo "======================================================================"
-              exit 1
-            else
-              echo
-              echo "======================================================================"
-              echo "There were changes to the patches when applying."
-              echo "Check the CI artifacts for a patch you can apply to fix it."
-              echo "======================================================================"
-              exit 1
-            fi
-          fi
+        # Re-export all the patches to check if there were changes.
+        python src/electron/script/export_all_patches.py src/electron/patches/config.json
+        cd src/electron
+        git update-index --refresh || true
+        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="Electron Bot" GIT_COMMITTER_EMAIL="anonymous@electronjs.org" git commit -m "update patches" --author="Electron Bot <anonymous@electronjs.org>"
+          # Export it
+          mkdir -p ../../patches
+          git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
+          echo
+          echo "======================================================================"
+          echo "There were changes to the patches when applying."
+          echo "Check the CI artifacts for a patch you can apply to fix it."
+          echo "======================================================================"
+          exit 1
        fi
      fi

@@ -291,14 +283,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
@@ -307,7 +311,7 @@ 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 })"
+      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
@@ -318,13 +322,13 @@ step-restore-brew-cache: &step-restore-brew-cache
    paths:
      - /usr/local/Homebrew
    keys:
-      - v2-brew-cache-{{ arch }}
+      - v1-brew-cache-{{ arch }}

 step-save-brew-cache: &step-save-brew-cache
  save_cache:
    paths:
      - /usr/local/Homebrew
-    key: v2-brew-cache-{{ arch }}
+    key: v1-brew-cache-{{ arch }}
    name: Persisting brew cache

 step-get-more-space-on-mac: &step-get-more-space-on-mac
@@ -474,7 +478,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:
@@ -514,8 +522,12 @@ step-electron-build: &step-electron-build
        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
        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
@@ -560,9 +572,6 @@ step-electron-dist-build: &step-electron-dist-build
            if [ x"$MAS_BUILD" == x"true" ]; then
              target_os=mac_mas
            fi
-            if [ "$TARGET_ARCH" == "arm64" ]; then
-              target_cpu=arm64
-            fi
          elif [ "`uname`" == "Linux" ]; then
            target_os=linux
            if [ x"$TARGET_ARCH" == x ]; then
@@ -591,7 +600,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
@@ -646,10 +659,10 @@ step-electron-publish: &step-electron-publish
      cd src/electron
      if [ "$UPLOAD_TO_S3" == "1" ]; then
        echo 'Uploading Electron release distribution to S3'
-        script/release/uploaders/upload.py --verbose --upload_to_s3
+        script/release/uploaders/upload.py --upload_to_s3
      else
        echo 'Uploading Electron release distribution to Github releases'
-        script/release/uploaders/upload.py --verbose
+        script/release/uploaders/upload.py
      fi

 step-persist-data-for-tests: &step-persist-data-for-tests
@@ -702,7 +715,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:
@@ -745,16 +762,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
@@ -1161,7 +1183,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

@@ -1195,7 +1216,6 @@ 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
@@ -1205,13 +1225,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:
@@ -1219,7 +1252,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:
@@ -1467,6 +1500,7 @@ commands:
                  - run:
                      name: Preserve vendor dirs for release
                      command: |
+                        mv src/electron/vendor/boto .
                        mv src/electron/vendor/requests .
            - run:
                name: Wipe Electron
@@ -1479,7 +1513,9 @@ commands:
                  - run:
                      name: Preserve vendor dirs for release
                      command: |
+                        rm -rf src/electron/vendor/boto
                        rm -rf src/electron/vendor/requests
+                        mv boto src/electron/vendor
                        mv requests src/electron/vendor/requests
            - *step-generate-deps-hash-cleanly
            - *step-mark-sync-done
@@ -1524,7 +1560,7 @@ commands:
            - *step-nodejs-headers-build
            - *step-nodejs-headers-store

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

            # mksnapshot
            - *step-mksnapshot-build
@@ -1612,14 +1648,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
@@ -1676,7 +1711,7 @@ jobs:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True --custom-var=checkout_requests=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
    steps:
      - electron-build:
          persist: false
@@ -1735,7 +1770,7 @@ jobs:
      <<: *env-linux-2xlarge
      <<: *env-testing-build
      <<: *env-macos-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac --custom-var=checkout_requests=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
    steps:
      - electron-build:
          persist: false
@@ -1803,6 +1838,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:
@@ -1820,10 +1863,10 @@ jobs:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge-release
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --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
@@ -1834,8 +1877,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
@@ -1855,6 +1898,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:
@@ -1873,12 +1925,12 @@ jobs:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge-release
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --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
@@ -1890,9 +1942,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
@@ -1913,6 +1965,15 @@ jobs:
          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:
@@ -1933,10 +1994,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'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -1948,9 +2009,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
@@ -1979,6 +2040,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:
@@ -1999,9 +2069,9 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm64
      <<: *env-release-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_requests=True'
+      <<: *env-enable-sccache
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2013,8 +2083,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
@@ -2061,9 +2131,9 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
+      <<: *env-enable-sccache
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2074,10 +2144,10 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
+      <<: *env-enable-sccache
      <<: *env-apple-silicon
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2088,8 +2158,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
@@ -2100,9 +2170,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
@@ -2169,9 +2239,9 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas
      <<: *env-release-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
+      <<: *env-enable-sccache
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2183,9 +2253,9 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas-apple-silicon
      <<: *env-release-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
+      <<: *env-enable-sccache
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_boto=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-      <<: *env-ninja-status
    steps:
      - electron-publish:
          attach: false
@@ -2197,6 +2267,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:
@@ -2209,8 +2280,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
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -8,45 +8,45 @@
  "rules": {
    "semi": ["error", "always"],
    "no-var": "error",
-    "no-unused-vars": "off",
-    "no-global-assign": "off",
-    "guard-for-in": "error",
+    "no-unused-vars": 0,
+    "no-global-assign": 0,
+    "guard-for-in": 2,
    "@typescript-eslint/no-unused-vars": ["error", {
      "vars": "all",
      "args": "after-used",
-      "ignoreRestSiblings": true
+      "ignoreRestSiblings": false
    }],
    "prefer-const": ["error", {
      "destructuring": "all"
    }],
    "standard/no-callback-literal": "off",
-    "node/no-deprecated-api": "off"
+    "node/no-deprecated-api": 0
  },
  "parserOptions": {
    "ecmaVersion": 6,
    "sourceType": "module"
  },
+  "globals": {
+    "standardScheme": "readonly",
+    "globalThis": "readonly",
+    "BUILDFLAG": "readonly",
+    "ENABLE_DESKTOP_CAPTURER": "readonly",
+    "ENABLE_REMOTE_MODULE": "readonly",
+    "ENABLE_VIEWS_API": "readonly",
+    "BigInt": "readonly"
+  },
  "overrides": [
    {
      "files": "*.js",
      "rules": {
-        "@typescript-eslint/no-unused-vars": "off"
-      }
-    },
-    {
-      "files": "*.ts",
-      "rules": {
-        "no-undef": "off",
-        "no-redeclare": "off",
-        "@typescript-eslint/no-redeclare": ["error"],
-        "no-use-before-define": "off"
+          "@typescript-eslint/no-unused-vars": "off"
      }
    },
    {
      "files": "*.d.ts",
      "rules": {
-        "no-useless-constructor": "off",
-        "@typescript-eslint/no-unused-vars": "off"
+          "no-useless-constructor": "off",
+          "@typescript-eslint/no-unused-vars": "off"
      }
    }
  ]
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -10,12 +10,3 @@ DEPS                                    @electron/wg-upgrades
 # Releases WG
 /npm/                                   @electron/wg-releases
 /script/release                         @electron/wg-releases
-
-# Security WG
-/lib/browser/rpc-server.ts              @electron/wg-security
-
-# Remote Change Disliker
-/lib/browser/remote/                    @nornagon
-/lib/renderer/remote/                   @nornagon
-/lib/renderer/api/remote.ts             @nornagon
-/docs/api/remote.md                     @nornagon
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,7 +13,9 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN
 - [ ] `npm test` passes
 - [ ] tests are [changed or added](https://github.com/electron/electron/blob/master/docs/development/testing.md)
 - [ ] relevant documentation is changed or added
+- [ ] PR title follows semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
 - [ ] [PR release notes](https://github.com/electron/clerk/blob/master/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/master/README.md#examples).
+- [ ] This is **NOT A BREAKING CHANGE**. Breaking changes may not be merged to master until 11-x-y is branched.

 #### Release Notes

--- a/.gitignore
+++ b/.gitignore
@@ -65,7 +65,4 @@ ts-gen

 # Used to accelerate CI builds
 .depshash
-.depshash-target
-
-# Used to accelerate builds after sync
-patches/mtime-cache.json
+.depshash-target
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -184,6 +184,7 @@ target_gen_default_app_js = "$target_gen_dir/js/default_app"

 typescript_build("default_app_js") {
  deps = [ ":build_electron_definitions" ]
+  type_root = rebase_path("$target_gen_dir/tsc/electron/typings")

  sources = filenames.default_app_ts_sources

@@ -302,19 +303,6 @@ templated_file("electron_version_header") {
  args_files = get_target_outputs(":electron_version_args")
 }

-action("electron_fuses") {
-  script = "build/fuses/build.py"
-
-  inputs = [ "build/fuses/fuses.json" ]
-
-  outputs = [
-    "$target_gen_dir/fuses.h",
-    "$target_gen_dir/fuses.cc",
-  ]
-
-  args = rebase_path(outputs)
-}
-
 source_set("electron_lib") {
  configs += [ "//v8:external_startup_data" ]
  configs += [ "//third_party/electron_node:node_internals" ]
@@ -325,7 +313,6 @@ source_set("electron_lib") {
  ]

  deps = [
-    ":electron_fuses",
    ":electron_js2c",
    ":electron_version_header",
    ":manifests",
@@ -338,6 +325,7 @@ source_set("electron_lib") {
    "//base/allocator:buildflags",
    "//chrome/app:command_ids",
    "//chrome/app/resources:platform_locale_settings",
+    "//chrome/services/printing/public/mojom",
    "//components/certificate_transparency",
    "//components/language/core/browser",
    "//components/net_log",
@@ -384,7 +372,6 @@ source_set("electron_lib") {
    "//third_party/libyuv",
    "//third_party/webrtc_overrides:webrtc_component",
    "//third_party/widevine/cdm:headers",
-    "//third_party/zlib/google:zip",
    "//ui/base/idle",
    "//ui/events:dom_keycode_converter",
    "//ui/gl",
@@ -520,13 +507,15 @@ source_set("electron_lib") {
      "//ui/wm",
    ]
    if (use_x11) {
-      sources += filenames.lib_sources_linux_x11
      deps += [
        "//ui/gfx/x",
        "//ui/gtk/x",
      ]
    }
    configs += [ ":gio_unix" ]
+    if (use_x11) {
+      deps += [ "//ui/gfx/x" ]
+    }
    defines += [
      # Disable warnings for g_settings_list_schemas.
      "GLIB_DISABLE_DEPRECATION_WARNINGS",
@@ -631,10 +620,7 @@ source_set("electron_lib") {
      "shell/renderer/printing/print_render_frame_helper_delegate.cc",
      "shell/renderer/printing/print_render_frame_helper_delegate.h",
    ]
-    deps += [
-      "//chrome/services/printing/public/mojom",
-      "//components/printing/common:mojo_interfaces",
-    ]
+    deps += [ "//components/printing/common:mojo_interfaces" ]
  }

  if (enable_electron_extensions) {
@@ -644,7 +630,6 @@ source_set("electron_lib") {
      "shell/common/extensions/api",
      "shell/common/extensions/api:extensions_features",
      "//chrome/browser/resources:component_extension_resources",
-      "//components/update_client:update_client",
      "//components/zoom",
      "//extensions/browser",
      "//extensions/browser:core_api_provider",
@@ -673,16 +658,6 @@ source_set("electron_lib") {
      "shell/browser/electron_pdf_web_contents_helper_client.h",
    ]
  }
-
-  sources += get_target_outputs(":electron_fuses")
-
-  if (is_win && enable_win_dark_mode_window_ui) {
-    sources += [
-      "shell/browser/win/dark_mode.cc",
-      "shell/browser/win/dark_mode.h",
-    ]
-    libs += [ "uxtheme.lib" ]
-  }
 }

 electron_paks("packed_resources") {
@@ -708,10 +683,10 @@ if (is_mac) {
  action("fake_v8_context_snapshot_generator") {
    script = "build/fake_v8_context_snapshot_generator.py"
    args = [
-      rebase_path("$root_out_dir/$v8_context_snapshot_filename"),
-      rebase_path("$root_out_dir/fake/$v8_context_snapshot_filename"),
+      rebase_path("$root_out_dir/v8_context_snapshot.bin"),
+      rebase_path("$root_out_dir/fake/v8_context_snapshot.bin"),
    ]
-    outputs = [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
+    outputs = [ "$root_out_dir/fake/v8_context_snapshot.bin" ]
  }

  bundle_data("electron_framework_resources") {
@@ -725,10 +700,10 @@ if (is_mac) {
      public_deps += [ "//v8" ]
      if (use_v8_context_snapshot) {
        if (use_prebuilt_v8_context_snapshot) {
-          sources += [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
+          sources += [ "$root_out_dir/fake/v8_context_snapshot.bin" ]
          public_deps += [ ":fake_v8_context_snapshot_generator" ]
        } else {
-          sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
+          sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
          public_deps += [ "//tools/v8_context_snapshot" ]
        }
      } else {
@@ -1159,7 +1134,6 @@ if (is_mac) {
        "wtsapi32.lib",
      ]

-      configs -= [ "//build/config/win:console" ]
      configs += [
        "//build/config/win:windowed",
        "//build/config/win:delayloads",
--- a/57
+++ b/57
@@ -14,17 +14,19 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '3a75ada69d1ac06d6903a2c981ab90a8162f1ba0',
+    '87.0.4280.11',
  'node_version':
-    'v14.15.1',
+    'v12.18.3',
  'nan_version':
    '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
  'squirrel.mac_version':
-    'a3a5b3f03b824441c014893b18f99a103b2603e9',
+    '44468f858ce0d25c27bd5e674abfa104e0119738',

+  'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
  'pyyaml_version': '3.12',
  'requests_version': 'e4d59bedfd3c7f4f254f4f5d036587bcd8152458',

+  'boto_git': 'https://github.com/boto',
  'chromium_git': 'https://chromium.googlesource.com',
  'electron_git': 'https://github.com/electron',
  'nodejs_git': 'https://github.com/nodejs',
@@ -38,8 +40,8 @@ vars = {
  # To be able to build clean Chromium from sources.
  'apply_patches': True,

-  # To use an mtime cache for patched files to speed up builds.
-  'use_mtime_cache': True,
+  # Python interface to Amazon Web Services. Is used for releases only.
+  'checkout_boto': False,

  # To allow in-house builds to checkout those manually.
  'checkout_chromium': True,
@@ -78,8 +80,6 @@ vars = {
    False,
  'checkout_google_benchmark':
    False,
-  'checkout_clang_tidy':
-    True,
 }

 deps = {
@@ -99,6 +99,10 @@ deps = {
    'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
    'condition': 'checkout_pyyaml and process_deps',
  },
+  'src/electron/vendor/boto': {
+    'url': Var('boto_git') + '/boto.git' + '@' +  Var('boto_version'),
+    'condition': 'checkout_boto and process_deps',
+  },
  'src/electron/vendor/requests': {
    'url': Var('requests_git') + '/requests.git' + '@' +  Var('requests_version'),
    'condition': 'checkout_requests and process_deps',
@@ -117,23 +121,6 @@ deps = {
  }
 }

-pre_deps_hooks = [
-  {
-    'name': 'generate_mtime_cache',
-    'condition': '(checkout_chromium and apply_patches and use_mtime_cache) and process_deps',
-    'pattern': 'src/electron',
-    'action': [
-      'python3',
-      'src/electron/script/patches-mtime-cache.py',
-      'generate',
-      '--cache-file',
-      'src/electron/patches/mtime-cache.json',
-      '--patches-config',
-      'src/electron/patches/config.json',
-    ],
-  },
-]
-
 hooks = [
  {
    'name': 'patch_chromium',
@@ -145,18 +132,6 @@ hooks = [
      'src/electron/patches/config.json',
    ],
  },
-  {
-    'name': 'apply_mtime_cache',
-    'condition': '(checkout_chromium and apply_patches and use_mtime_cache) and process_deps',
-    'pattern': 'src/electron',
-    'action': [
-      'python3',
-      'src/electron/script/patches-mtime-cache.py',
-      'apply',
-      '--cache-file',
-      'src/electron/patches/mtime-cache.json',
-    ],
-  },
  {
    'name': 'electron_external_binaries',
    'pattern': 'src/electron/script/update-external-binaries.py',
@@ -175,6 +150,16 @@ hooks = [
      'import os, subprocess; os.chdir(os.path.join("src", "electron")); subprocess.check_call(["python", "script/lib/npx.py", "yarn@' + (Var("yarn_version")) + '", "install", "--frozen-lockfile"]);',
    ],
  },
+  {
+    'name': 'setup_boto',
+    'pattern': 'src/electron',
+    'condition': 'checkout_boto and process_deps',
+    'action': [
+      'python3',
+      '-c',
+      'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "boto")); subprocess.check_call(["python", "setup.py", "build"]);',
+    ],
+  },
  {
    'name': 'setup_requests',
    'pattern': 'src/electron',
--- a/2
+++ b/2
@@ -1 +1 @@
-12.0.0-beta.8
+11.0.0-beta.13
--- a/README.md
+++ b/README.md
@@ -4,7 +4,6 @@
 [![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/master.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/master)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/4lggi9dpjc1qob7k/branch/master?svg=true)](https://ci.appveyor.com/project/electron-bot/electron-ljo26/branch/master)
 [![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: 🇨🇳 🇹🇼 🇧🇷 🇪🇸 🇰🇷 🇯🇵 🇷🇺 🇫🇷 🇹🇭 🇳🇱 🇹🇷 🇮🇩 🇺🇦 🇨🇿 🇮🇹 🇵🇱.
 View these docs in other languages at [electron/i18n](https://github.com/electron/i18n/tree/master/content/).
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -66,9 +66,10 @@ build_script:
  - update_depot_tools.bat
  - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
  - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
+  - ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
  - ps: >-
      if ($env:GN_CONFIG -eq 'release') {
-        $env:GCLIENT_EXTRA_ARGS="$env:GCLIENT_EXTRA_ARGS --custom-var=checkout_requests=True"
+        $env:GCLIENT_EXTRA_ARGS="$env:GCLIENT_EXTRA_ARGS --custom-var=checkout_boto=True --custom-var=checkout_requests=True"
      } else {
        $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
      }
@@ -100,11 +101,6 @@ build_script:
          } else {
            # update external binaries
            python src/electron/script/update-external-binaries.py
-            # update angle
-            cd src\third_party\angle
-            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
-            git fetch
-            cd ..\..\..
          }
        } else {    
          # file does not exist, gclient sync, then zip
@@ -126,30 +122,31 @@ build_script:
        }
        # build time generation of file gen/angle/angle_commit.h depends on
        # third_party/angle/.git
-        # https://chromium-review.googlesource.com/c/angle/angle/+/2074924       
+        # https://chromium-review.googlesource.com/c/angle/angle/+/2074924
        $(7z a $zipfile src\third_party\angle\.git)
        if ($LASTEXITCODE -ne 0) {
          Write-warning "Failed to add third_party\angle\.git; continuing anyway"
        }
      }
  - ps: >-
-      if (Test-Path 'env:RAW_GOMA_AUTH') {
-        $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
-        $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
+      if ($env:GN_CONFIG -ne 'release') {
+        if (Test-Path 'env:RAW_GOMA_AUTH') {
+          $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
+          $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE      
+        }
+        git clone https://github.com/electron/build-tools.git
+        cd build-tools
+        npm install
+        mkdir third_party
+        node -e "require('./src/utils/goma.js').downloadAndPrepare()"
+        $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
+        $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
+        cd ..
+        .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
      }
-  - git clone https://github.com/electron/build-tools.git
-  - cd build-tools
-  - npm install
-  - mkdir third_party
-  - ps: >-
-      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-  - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
-  - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
-  - cd ..
-  - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
  - cd src
  - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
-  - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
+  - if DEFINED GN_GOMA_FILE (gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% ") else (gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") %GN_EXTRA_ARGS% cc_wrapper=\"%SCCACHE_PATH%\"")
  - gn check out/Default //electron:electron_lib
  - gn check out/Default //electron:electron_app
  - gn check out/Default //electron:manifests
@@ -168,7 +165,7 @@ build_script:
  - ninja -C out/Default electron:hunspell_dictionaries_zip
  - ninja -C out/Default electron:electron_chromedriver_zip
  - ninja -C out/Default third_party/electron_node:headers
-  - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
+  - if "%GN_CONFIG%"=="testing" ( python %LOCAL_GOMA_DIR%\goma_ctl.py stat )
  - python electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
  - appveyor PushArtifact out/Default/windows_toolchain_profile.json
  - appveyor PushArtifact out/Default/dist.zip
@@ -212,8 +209,7 @@ test_script:
        echo "Skipping tests for $env:GN_CONFIG build"
      }
  - cd electron
-  # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging --disable-features=CalculateNativeWinOcclusion )
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging)
  - cd ..
  - if "%RUN_TESTS%"=="true" ( echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg )
  - echo "About to verify mksnapshot"
@@ -227,10 +223,10 @@ deploy_script:
      if (Test-Path Env:\ELECTRON_RELEASE) {
        if (Test-Path Env:\UPLOAD_TO_S3) {
          Write-Output "Uploading Electron release distribution to s3"
-          & python script\release\uploaders\upload.py --verbose --upload_to_s3
+          & python script\release\uploaders\upload.py --upload_to_s3
        } else {
          Write-Output "Uploading Electron release distribution to github releases"
-          & python script\release\uploaders\upload.py --verbose
+          & python script\release\uploaders\upload.py
        }
      } elseif (Test-Path Env:\TEST_WOA) {
        node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -63,8 +63,7 @@ steps:
    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
    set npm_config_arch=arm64
    cd electron
-    # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-    node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion
+    node script/yarn test -- --enable-logging --verbose
  displayName: 'Run Electron tests'
  env:
    ELECTRON_OUT_DIR: Default
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]

 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 87
+node_module_version = 85

 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
--- a/build/fuses/build.py
+++ b/build/fuses/build.py
@@ -1,101 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import os
-import sys
-
-dir_path = os.path.dirname(os.path.realpath(__file__))
-
-SENTINEL = "dL7pKGdnNz796PbbjQWNKmHXBZaB9tsX"
-
-TEMPLATE_H = """
-#ifndef ELECTRON_FUSES_H_
-#define ELECTRON_FUSES_H_
-
-#if defined(WIN32)
-#define FUSE_EXPORT __declspec(dllexport)
-#else
-#define FUSE_EXPORT __attribute__((visibility("default")))
-#endif
-
-namespace electron {
-
-namespace fuses {
-
-extern const volatile char kFuseWire[];
-
-{getters}
-
-}  // namespace fuses
-
-}  // namespace electron
-
-#endif  // ELECTRON_FUSES_H_
-"""
-
-TEMPLATE_CC = """
-#include "electron/fuses.h"
-
-namespace electron {
-
-namespace fuses {
-
-const volatile char kFuseWire[] = { /* sentinel */ {sentinel}, /* fuse_version */ {fuse_version}, /* fuse_wire_length */ {fuse_wire_length}, /* fuse_wire */ {initial_config}};
-
-{getters}
-
-}
-
-}
-"""
-
-with open(os.path.join(dir_path, "fuses.json"), 'r') as f:
-  fuse_defaults = json.load(f)
-
-fuse_version = fuse_defaults['_version']
-del fuse_defaults['_version']
-del fuse_defaults['_schema']
-del fuse_defaults['_comment']
-
-if fuse_version >= pow(2, 8):
-  raise Exception("Fuse version can not exceed one byte in size")
-
-fuses = fuse_defaults.keys()
-
-initial_config = ""
-getters_h = ""
-getters_cc = ""
-index = len(SENTINEL) + 1
-for fuse in fuses:
-  index += 1
-  initial_config += fuse_defaults[fuse]
-  name = ''.join(word.title() for word in fuse.split('_'))
-  getters_h += "FUSE_EXPORT bool Is{name}Enabled();\n".replace("{name}", name)
-  getters_cc += """
-bool Is{name}Enabled() {
-  return kFuseWire[{index}] == '1';
-}
-""".replace("{name}", name).replace("{index}", str(index))
-
-def c_hex(n):
-  s = hex(n)[2:]
-  return "0x" + s.rjust(2, '0')
-
-def hex_arr(s):
-  arr = []
-  for char in s:
-    arr.append(c_hex(ord(char)))
-  return ",".join(arr)
-
-header = TEMPLATE_H.replace("{getters}", getters_h.strip())
-impl = TEMPLATE_CC.replace("{sentinel}", hex_arr(SENTINEL))
-impl = impl.replace("{fuse_version}", c_hex(fuse_version))
-impl = impl.replace("{fuse_wire_length}", c_hex(len(fuses)))
-impl = impl.replace("{initial_config}", hex_arr(initial_config))
-impl = impl.replace("{getters}", getters_cc.strip())
-
-with open(sys.argv[1], 'w') as f:
-  f.write(header)
-
-with open(sys.argv[2], 'w') as f:
-  f.write(impl)
--- a/build/fuses/fuses.json
+++ b/build/fuses/fuses.json
@@ -1,6 +0,0 @@
-{
-  "_comment": "Modifying the fuse schema in any breaking way should result in the _version prop being incremented.  NEVER remove a fuse or change its meaning, instead mark it as removed with 'r'",
-  "_schema": "0 == off, 1 == on, r == removed fuse",
-  "_version": 1,
-  "run_as_node": "1"
-}
--- a/build/npm-run.py
+++ b/build/npm-run.py
@@ -15,12 +15,5 @@ args = [cmd, "run",
 try:
    subprocess.check_output(args, stderr=subprocess.STDOUT)
 except subprocess.CalledProcessError as e:
-    print(
-        "NPM script '"
-        + sys.argv[2]
-        + "' failed with code '"
-        + str(e.returncode)
-        + "':\n"
-        + e.output
-    )
+    print("NPM script '" + sys.argv[2] + "' failed with code '" + str(e.returncode) + "':\n" + e.output)
    sys.exit(e.returncode)
--- a/build/profile_toolchain.py
+++ b/build/profile_toolchain.py
@@ -11,6 +11,7 @@ import find_depot_tools
 from vs_toolchain import \
    SetEnvironmentAndGetRuntimeDllDirs, \
    SetEnvironmentAndGetSDKDir, \
+    GetVisualStudioVersion, \
    NormalizePath

 sys.path.append("%s/win_toolchain" % find_depot_tools.add_depot_tools_to_path())
@@ -19,10 +20,10 @@ from get_toolchain_if_necessary import CalculateHash


@contextlib.contextmanager
-def cwd(directory):
+def cwd(dir):
    curdir = os.getcwd()
    try:
-        os.chdir(directory)
+        os.chdir(dir)
        yield
    finally:
        os.chdir(curdir)
@@ -70,18 +71,12 @@ def windows_profile():
    win_sdk_dir = SetEnvironmentAndGetSDKDir()
    path = NormalizePath(os.environ['GYP_MSVS_OVERRIDE_PATH'])

-    # since current windows executable are symbols path dependant,
-    # profile the current directory too
    return {
-        'pwd': os.getcwd(),
+        'pwd': os.getcwd(), # since current windows executable are symbols path dependant, profile the current directory too
        'installed_software': windows_installed_software(),
        'sdks': [
            {'name': 'vs', 'path': path, 'hash': calculate_hash(path)},
-            {
-                'name': 'wsdk',
-                'path': win_sdk_dir,
-                'hash': calculate_hash(win_sdk_dir),
-            },
+            {'name': 'wsdk', 'path': win_sdk_dir, 'hash': calculate_hash(win_sdk_dir)}
        ],
        'runtime_lib_dirs': runtime_dll_dirs,
    }
@@ -99,5 +94,5 @@ if __name__ == '__main__':
  parser = optparse.OptionParser()
  parser.add_option('--output-json', metavar='FILE', default='profile.json',
                    help='write information about toolchain to FILE')
-  opts, args = parser.parse_args()
-  sys.exit(main(opts))
+  options, args = parser.parse_args()
+  sys.exit(main(options))
--- a/build/run-in-dir.py
+++ b/build/run-in-dir.py
@@ -1,5 +1,6 @@
 import sys
 import os
+import subprocess

 def main(argv):
  cwd = argv[1]
--- a/build/strip_framework.py
+++ b/build/strip_framework.py
@@ -12,7 +12,5 @@ subprocess.check_output(["rm", "-rf", dest])
 subprocess.check_output(["cp", "-a", source, dest])

 # Strip headers, we do not need to ship them
-subprocess.check_output(["rm", "-r", os.path.join(dest, "Headers")])
-subprocess.check_output(
-    ["rm", "-r", os.path.join(dest, "Versions", "Current", "Headers")]
-)
+subprocess.check_output(["rm", "-r", os.path.join(dest, 'Headers')])
+subprocess.check_output(["rm", "-r", os.path.join(dest, 'Versions', 'Current', 'Headers')])
--- a/build/tsc.gni
+++ b/build/tsc.gni
@@ -26,12 +26,19 @@ template("typescript_build") {
      "//electron/typings/internal-electron.d.ts",
    ]

+    type_roots = "node_modules/@types,typings"
+    if (defined(invoker.type_root)) {
+      type_roots += "," + invoker.type_root
+    }
+
    base_out_path = invoker.output_gen_dir + "/electron/"
    args = [
      "-p",
      rebase_path(invoker.tsconfig),
      "--outDir",
      rebase_path("$base_out_path" + invoker.output_dir_name),
+      "--typeRoots",
+      type_roots,
    ]

    outputs = []
--- a/build/webpack/get-outputs.js
+++ b/build/webpack/get-outputs.js
@@ -0,0 +1,2 @@
+process.env.PRINT_WEBPACK_GRAPH = true;
+require('./run-compiler');
--- a/build/webpack/run-compiler.js
+++ b/build/webpack/run-compiler.js
@@ -0,0 +1,45 @@
+const fs = require('fs');
+const path = require('path');
+const webpack = require('webpack');
+
+const configPath = process.argv[2];
+const outPath = path.resolve(process.argv[3]);
+const config = require(configPath);
+config.output = {
+  path: path.dirname(outPath),
+  filename: path.basename(outPath)
+};
+
+const { wrapInitWithProfilingTimeout, wrapInitWithTryCatch, ...webpackConfig } = config;
+
+webpack(webpackConfig, (err, stats) => {
+  if (err) {
+    console.error(err);
+    process.exit(1);
+  } else if (stats.hasErrors()) {
+    console.error(stats.toString('normal'));
+    process.exit(1);
+  } else {
+    let contents = fs.readFileSync(outPath, 'utf8');
+    if (wrapInitWithTryCatch) {
+      contents = `try {
+${contents}
+} catch (err) {
+  console.error('Electron ${webpackConfig.output.filename} script failed to run');
+  console.error(err);
+}`;
+    }
+    if (wrapInitWithProfilingTimeout) {
+      contents = `function ___electron_webpack_init__() {
+${contents}
+};
+if ((globalThis.process || binding.process).argv.includes("--profile-electron-init")) {
+  setTimeout(___electron_webpack_init__, 0);
+} else {
+  ___electron_webpack_init__();
+}`;
+    }
+    fs.writeFileSync(outPath, contents);
+    process.exit(0);
+  }
+});
--- a/build/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -2,12 +2,16 @@ const fs = require('fs');
 const path = require('path');
 const webpack = require('webpack');
 const TerserPlugin = require('terser-webpack-plugin');
-const WrapperPlugin = require('wrapper-webpack-plugin');

 const electronRoot = path.resolve(__dirname, '../..');

+const onlyPrintingGraph = !!process.env.PRINT_WEBPACK_GRAPH;
+
 class AccessDependenciesPlugin {
  apply (compiler) {
+    // Only hook into webpack when we are printing the dependency graph
+    if (!onlyPrintingGraph) return;
+
    compiler.hooks.compilation.tap('AccessDependenciesPlugin', compilation => {
      compilation.hooks.finishModules.tap('AccessDependenciesPlugin', modules => {
        const filePaths = modules.map(m => m.resource).filter(p => p).map(p => path.relative(electronRoot, p));
@@ -17,6 +21,49 @@ class AccessDependenciesPlugin {
  }
 }

+const defines = {
+  BUILDFLAG: onlyPrintingGraph ? '(a => a)' : ''
+};
+
+const buildFlagsPrefix = '--buildflags=';
+const buildFlagArg = process.argv.find(arg => arg.startsWith(buildFlagsPrefix));
+
+if (buildFlagArg) {
+  const buildFlagPath = buildFlagArg.substr(buildFlagsPrefix.length);
+
+  const flagFile = fs.readFileSync(buildFlagPath, 'utf8');
+  for (const line of flagFile.split(/(\r\n|\r|\n)/g)) {
+    const flagMatch = line.match(/#define BUILDFLAG_INTERNAL_(.+?)\(\) \(([01])\)/);
+    if (flagMatch) {
+      const [, flagName, flagValue] = flagMatch;
+      defines[flagName] = JSON.stringify(Boolean(parseInt(flagValue, 10)));
+    }
+  }
+}
+
+const ignoredModules = [];
+
+if (defines.ENABLE_DESKTOP_CAPTURER === 'false') {
+  ignoredModules.push(
+    '@electron/internal/browser/desktop-capturer',
+    '@electron/internal/browser/api/desktop-capturer',
+    '@electron/internal/renderer/api/desktop-capturer'
+  );
+}
+
+if (defines.ENABLE_REMOTE_MODULE === 'false') {
+  ignoredModules.push(
+    '@electron/internal/browser/remote/server',
+    '@electron/internal/renderer/api/remote'
+  );
+}
+
+if (defines.ENABLE_VIEWS_API === 'false') {
+  ignoredModules.push(
+    '@electron/internal/browser/api/views/image-view.js'
+  );
+}
+
 module.exports = ({
  alwaysHasNode,
  loadElectronFromAlternateTarget,
@@ -32,148 +79,76 @@ module.exports = ({

  const electronAPIFile = path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.ts');

-  return (env = {}, argv = {}) => {
-    const onlyPrintingGraph = !!env.PRINT_WEBPACK_GRAPH;
-    const outputFilename = argv['output-filename'] || `${target}.bundle.js`;
-
-    const defines = {
-      BUILDFLAG: onlyPrintingGraph ? '(a => a)' : ''
-    };
-
-    if (env.buildflags) {
-      const flagFile = fs.readFileSync(env.buildflags, 'utf8');
-      for (const line of flagFile.split(/(\r\n|\r|\n)/g)) {
-        const flagMatch = line.match(/#define BUILDFLAG_INTERNAL_(.+?)\(\) \(([01])\)/);
-        if (flagMatch) {
-          const [, flagName, flagValue] = flagMatch;
-          defines[flagName] = JSON.stringify(Boolean(parseInt(flagValue, 10)));
+  return ({
+    mode: 'development',
+    devtool: false,
+    entry,
+    target: alwaysHasNode ? 'node' : 'web',
+    output: {
+      filename: `${target}.bundle.js`
+    },
+    wrapInitWithProfilingTimeout,
+    wrapInitWithTryCatch,
+    resolve: {
+      alias: {
+        '@electron/internal': path.resolve(electronRoot, 'lib'),
+        electron$: electronAPIFile,
+        'electron/main$': electronAPIFile,
+        'electron/renderer$': electronAPIFile,
+        'electron/common$': electronAPIFile,
+        // Force timers to resolve to our dependency that doesn't use window.postMessage
+        timers: path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
+      },
+      extensions: ['.ts', '.js']
+    },
+    module: {
+      rules: [{
+        test: (moduleName) => !onlyPrintingGraph && ignoredModules.includes(moduleName),
+        loader: 'null-loader'
+      }, {
+        test: /\.ts$/,
+        loader: 'ts-loader',
+        options: {
+          configFile: path.resolve(electronRoot, 'tsconfig.electron.json'),
+          transpileOnly: onlyPrintingGraph,
+          ignoreDiagnostics: [
+            // File '{0}' is not under 'rootDir' '{1}'.
+            6059
+          ]
        }
-      }
-    }
-
-    const ignoredModules = [];
-
-    if (defines.ENABLE_DESKTOP_CAPTURER === 'false') {
-      ignoredModules.push(
-        '@electron/internal/browser/desktop-capturer',
-        '@electron/internal/browser/api/desktop-capturer',
-        '@electron/internal/renderer/api/desktop-capturer'
-      );
-    }
-
-    if (defines.ENABLE_REMOTE_MODULE === 'false') {
-      ignoredModules.push(
-        '@electron/internal/browser/remote/server',
-        '@electron/internal/renderer/api/remote'
-      );
-    }
-
-    if (defines.ENABLE_VIEWS_API === 'false') {
-      ignoredModules.push(
-        '@electron/internal/browser/api/views/image-view.js'
-      );
-    }
-
-    const plugins = [];
-
-    if (onlyPrintingGraph) {
-      plugins.push(new AccessDependenciesPlugin());
-    }
-
-    if (targetDeletesNodeGlobals) {
-      plugins.push(new webpack.ProvidePlugin({
-        process: ['@electron/internal/common/webpack-provider', 'process'],
-        global: ['@electron/internal/common/webpack-provider', '_global'],
-        Buffer: ['@electron/internal/common/webpack-provider', 'Buffer']
-      }));
-    }
-
-    plugins.push(new webpack.ProvidePlugin({
-      Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise']
-    }));
-
-    plugins.push(new webpack.DefinePlugin(defines));
-
-    if (wrapInitWithProfilingTimeout) {
-      plugins.push(new WrapperPlugin({
-        header: 'function ___electron_webpack_init__() {',
-        footer: `
-};
-if ((globalThis.process || binding.process).argv.includes("--profile-electron-init")) {
-  setTimeout(___electron_webpack_init__, 0);
-} else {
-  ___electron_webpack_init__();
-}`
-      }));
-    }
-
-    if (wrapInitWithTryCatch) {
-      plugins.push(new WrapperPlugin({
-        header: 'try {',
-        footer: `
-} catch (err) {
-  console.error('Electron ${outputFilename} script failed to run');
-  console.error(err);
-}`
-      }));
-    }
-
-    return {
-      mode: 'development',
-      devtool: false,
-      entry,
-      target: alwaysHasNode ? 'node' : 'web',
-      output: {
-        filename: outputFilename
-      },
-      resolve: {
-        alias: {
-          '@electron/internal': path.resolve(electronRoot, 'lib'),
-          electron$: electronAPIFile,
-          'electron/main$': electronAPIFile,
-          'electron/renderer$': electronAPIFile,
-          'electron/common$': electronAPIFile,
-          // Force timers to resolve to our dependency that doesn't use window.postMessage
-          timers: path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
-        },
-        extensions: ['.ts', '.js']
-      },
-      module: {
-        rules: [{
-          test: (moduleName) => !onlyPrintingGraph && ignoredModules.includes(moduleName),
-          loader: 'null-loader'
-        }, {
-          test: /\.ts$/,
-          loader: 'ts-loader',
-          options: {
-            configFile: path.resolve(electronRoot, 'tsconfig.electron.json'),
-            transpileOnly: onlyPrintingGraph,
-            ignoreDiagnostics: [
-              // File '{0}' is not under 'rootDir' '{1}'.
-              6059
-            ]
+      }]
+    },
+    node: {
+      __dirname: false,
+      __filename: false,
+      // We provide our own "timers" import above, any usage of setImmediate inside
+      // one of our renderer bundles should import it from the 'timers' package
+      setImmediate: false
+    },
+    optimization: {
+      minimize: true,
+      minimizer: [
+        new TerserPlugin({
+          terserOptions: {
+            keep_classnames: true,
+            keep_fnames: true
          }
-        }]
-      },
-      node: {
-        __dirname: false,
-        __filename: false,
-        // We provide our own "timers" import above, any usage of setImmediate inside
-        // one of our renderer bundles should import it from the 'timers' package
-        setImmediate: false
-      },
-      optimization: {
-        minimize: true,
-        minimizer: [
-          new TerserPlugin({
-            terserOptions: {
-              keep_classnames: true,
-              keep_fnames: true
-            }
-          })
-        ]
-      },
-      plugins
-    };
-  };
+        })
+      ]
+    },
+    plugins: [
+      new AccessDependenciesPlugin(),
+      ...(targetDeletesNodeGlobals ? [
+        new webpack.ProvidePlugin({
+          process: ['@electron/internal/common/webpack-provider', 'process'],
+          global: ['@electron/internal/common/webpack-provider', '_global'],
+          Buffer: ['@electron/internal/common/webpack-provider', 'Buffer']
+        })
+      ] : []),
+      new webpack.ProvidePlugin({
+        Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise']
+      }),
+      new webpack.DefinePlugin(defines)
+    ]
+  });
 };
--- a/build/webpack/webpack.gni
+++ b/build/webpack/webpack.gni
@@ -16,6 +16,7 @@ template("webpack_build") {
    inputs = [
               invoker.config_file,
               "//electron/build/webpack/webpack.config.base.js",
+               "//electron/build/webpack/run-compiler.js",
               "//electron/tsconfig.json",
               "//electron/yarn.lock",
               "//electron/typings/internal-ambient.d.ts",
@@ -23,12 +24,9 @@ template("webpack_build") {
             ] + invoker.inputs

    args = [
-      "--config",
      rebase_path(invoker.config_file),
-      "--output-filename=" + get_path_info(invoker.out_file, "file"),
-      "--output-path=" + rebase_path(get_path_info(invoker.out_file, "dir")),
-      "--env.buildflags=" +
-          rebase_path("$target_gen_dir/buildflags/buildflags.h"),
+      rebase_path(invoker.out_file),
+      "--buildflags=" + rebase_path("$target_gen_dir/buildflags/buildflags.h"),
    ]
    deps += [ "buildflags" ]

--- a/build/zip.py
+++ b/build/zip.py
@@ -9,8 +9,7 @@ EXTENSIONS_TO_SKIP = [
  '.pdb',
  '.mojom.js',
  '.mojom-lite.js',
-  '.info',
-  '.m.js'
+  '.info'
 ]

 PATHS_TO_SKIP = [
@@ -20,12 +19,11 @@ PATHS_TO_SKIP = [
  './libVkICD_mock_',
  # Skip because these are outputs that we don't need.
  './VkICD_mock_',
-  # Skip because its an output of create_bundle from
-  # //build/config/mac/rules.gni that we don't need
+  # Skip because its an output of create_bundle from //build/config/mac/rules.gni
+  # that we don't need
  'Electron.dSYM',
  # Refs https://chromium-review.googlesource.com/c/angle/angle/+/2425197.
-  # Remove this when Angle themselves remove the file:
-  # https://issuetracker.google.com/issues/168736059
+  # Remove this when Angle themselves remove the file: https://issuetracker.google.com/issues/168736059
  'gen/angle/angle_commit.h',
  # //chrome/browser:resources depends on this via
  # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
@@ -51,12 +49,7 @@ def skip_path(dep, dist_zip, target_cpu):
  should_skip = (
    any(dep.startswith(path) for path in PATHS_TO_SKIP) or
    any(dep.endswith(ext) for ext in EXTENSIONS_TO_SKIP) or
-    (
-      "arm" in target_cpu
-      and dist_zip == "mksnapshot.zip"
-      and dep == "snapshot_blob.bin"
-    )
-  )
+    ('arm' in target_cpu and dist_zip == 'mksnapshot.zip' and dep == 'snapshot_blob.bin'))
  if should_skip:
    print("Skipping {}".format(dep))
  return should_skip
@@ -70,7 +63,7 @@ def execute(argv):
    raise e

 def main(argv):
-  dist_zip, runtime_deps, target_cpu, _, flatten_val = argv
+  dist_zip, runtime_deps, target_cpu, target_os, flatten_val = argv
  should_flatten = flatten_val == "true"
  dist_files = set()
  with open(runtime_deps) as f:
@@ -81,28 +74,17 @@ def main(argv):
  if sys.platform == 'darwin' and not should_flatten:
    execute(['zip', '-r', '-y', dist_zip] + list(dist_files))
  else:
-    with zipfile.ZipFile(
-      dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True
-    ) as z:
+    with zipfile.ZipFile(dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True) as z:
      for dep in dist_files:
        if os.path.isdir(dep):
-          for root, _, files in os.walk(dep):
-            for filename in files:
-              z.write(os.path.join(root, filename))
+          for root, dirs, files in os.walk(dep):
+            for file in files:
+              z.write(os.path.join(root, file))
        else:
          basename = os.path.basename(dep)
          dirname = os.path.dirname(dep)
-          arcname = (
-            os.path.join(dirname, 'chrome-sandbox')
-            if basename == 'chrome_sandbox'
-            else dep
-          )
-          z.write(
-            dep,
-            os.path.basename(arcname)
-            if should_flatten
-            else arcname,
-          )
+          arcname = os.path.join(dirname, 'chrome-sandbox') if basename == 'chrome_sandbox' else dep
+          z.write(dep, os.path.basename(arcname) if should_flatten else arcname)

 if __name__ == '__main__':
  sys.exit(main(sys.argv[1:]))
--- a/buildflags/BUILD.gn
+++ b/buildflags/BUILD.gn
@@ -14,13 +14,13 @@ buildflag_header("buildflags") {
    "ENABLE_OSR=$enable_osr",
    "ENABLE_REMOTE_MODULE=$enable_remote_module",
    "ENABLE_VIEWS_API=$enable_views_api",
+    "ENABLE_PEPPER_FLASH=$enable_pepper_flash",
    "ENABLE_PDF_VIEWER=$enable_pdf_viewer",
    "ENABLE_TTS=$enable_tts",
    "ENABLE_COLOR_CHOOSER=$enable_color_chooser",
    "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
    "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
    "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
-    "ENABLE_WIN_DARK_MODE_WINDOW_UI=$enable_win_dark_mode_window_ui",
    "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
  ]
 }
--- a/buildflags/buildflags.gni
+++ b/buildflags/buildflags.gni
@@ -28,12 +28,12 @@ declare_args() {
  # Should not be enabled for release build.
  enable_fake_location_provider = !is_official_build

+  # Enable flash plugin support.
+  enable_pepper_flash = true
+
  # Enable Chrome extensions support.
  enable_electron_extensions = true

  # Enable Spellchecker support
  enable_builtin_spellchecker = true
-
-  # Undocumented Windows dark mode API
-  enable_win_dark_mode_window_ui = false
 }
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -93,18 +93,9 @@ static_library("chrome") {

  if (is_linux) {
    sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
-    if (use_x11) {
-      sources += [
-        "//chrome/browser/extensions/global_shortcut_listener_x11.cc",
-        "//chrome/browser/extensions/global_shortcut_listener_x11.h",
-      ]
-    } else if (use_ozone) {
-      sources += [
-        "//chrome/browser/extensions/global_shortcut_listener_ozone.cc",
-        "//chrome/browser/extensions/global_shortcut_listener_ozone.h",
-      ]
-    }
    sources += [
+      "//chrome/browser/extensions/global_shortcut_listener_x11.cc",
+      "//chrome/browser/extensions/global_shortcut_listener_x11.h",
      "//chrome/browser/ui/views/status_icons/concat_menu_model.cc",
      "//chrome/browser/ui/views/status_icons/concat_menu_model.h",
      "//chrome/browser/ui/views/status_icons/status_icon_linux_dbus.cc",
@@ -286,15 +277,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" ]
  }
 }

@@ -307,6 +296,8 @@ source_set("plugins") {
  sources += [
    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc",
    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h",
+    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.cc",
+    "//chrome/browser/renderer_host/pepper/pepper_broker_message_filter.h",
    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
  ]
@@ -319,6 +310,26 @@ source_set("plugins") {
  if (enable_pdf_viewer) {
    deps += [ "//components/pdf/browser" ]
  }
+  if (enable_pepper_flash) {
+    sources += [
+      "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.cc",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_browser_host.h",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.cc",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_clipboard_message_filter.h",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.cc",
+      "//chrome/browser/renderer_host/pepper/pepper_flash_drm_host.h",
+    ]
+    if (is_mac) {
+      sources += [
+        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
+        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
+      ]
+      frameworks += [ "CoreGraphics.framework" ]
+    }
+    if (is_linux) {
+      deps += [ "//components/services/font/public/cpp" ]
+    }
+  }

  # renderer side
  sources += [
@@ -327,7 +338,19 @@ source_set("plugins") {
    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
  ]
-  if (enable_pdf_viewer) {
+  if (enable_pepper_flash) {
+    sources += [
+      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_drm_renderer_host.h",
+      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_fullscreen_host.h",
+      "//chrome/renderer/pepper/pepper_flash_menu_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_menu_host.h",
+      "//chrome/renderer/pepper/pepper_flash_renderer_host.cc",
+      "//chrome/renderer/pepper/pepper_flash_renderer_host.h",
+    ]
+  }
+  if (enable_pepper_flash || enable_pdf_viewer) {
    sources += [
      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
@@ -354,7 +377,6 @@ source_set("chrome_spellchecker") {
  sources = []
  deps = []
  libs = []
-  public_deps = []

  if (enable_builtin_spellchecker) {
    sources += [
@@ -372,6 +394,7 @@ source_set("chrome_spellchecker") {
      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
      "//chrome/browser/spellchecker/spellcheck_service.cc",
      "//chrome/browser/spellchecker/spellcheck_service.h",
+      "//chrome/common/pref_names.h",
    ]

    if (has_spellcheck_panel) {
@@ -394,11 +417,9 @@ source_set("chrome_spellchecker") {
      "//components/spellcheck:buildflags",
      "//components/sync",
    ]
-
-    public_deps += [ "//chrome/common:constants" ]
  }

-  public_deps += [
+  public_deps = [
    "//components/spellcheck/browser",
    "//components/spellcheck/common",
    "//components/spellcheck/renderer",
--- a/chromium_src/chrome/browser/process_singleton_posix.cc
+++ b/chromium_src/chrome/browser/process_singleton_posix.cc
@@ -826,9 +826,10 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcessWithTimeout(
  to_send.append(current_dir.value());

  const std::vector<std::string>& argv = electron::ElectronCommandLine::argv();
-  for (const auto& arg : argv) {
+  for (std::vector<std::string>::const_iterator it = argv.begin();
+       it != argv.end(); ++it) {
    to_send.push_back(kTokenDelimiter);
-    to_send.append(arg);
+    to_send.append(*it);
  }

  // Send the message
--- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
+++ b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
@@ -122,7 +122,8 @@ void GlobalMenuBarRegistrarX11::OnNameOwnerChanged(GObject* /* ignored */,
                                                   GParamSpec* /* ignored */) {
  // If the name owner changed, we need to reregister all the live x11::Window
  // with the system.
-  for (const auto& window : live_windows_) {
-    RegisterXWindow(window);
+  for (std::set<x11::Window>::const_iterator it = live_windows_.begin();
+       it != live_windows_.end(); ++it) {
+    RegisterXWindow(*it);
  }
 }
--- a/docs/README.md
+++ b/docs/README.md
@@ -18,20 +18,27 @@ an issue:

 ## Guides and Tutorials

-### Quickstart
-
-* [Quick Start Guide](tutorial/quick-start.md)
-  * [Prerequisites](tutorial/quick-start.md#prerequisites)
-  * [Create a basic application](tutorial/quick-start.md#create-a-basic-application)
-  * [Run your application](tutorial/quick-start.md#run-your-application)
-  * [Package and distribute the application](tutorial/quick-start.md#package-and-distribute-the-application)
-
-### Learning the basics
-
-* [Electron's Process Model](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)
+* [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/first-app.md)
+  * [Installing Electron](tutorial/first-app.md#installing-electron)
+  * [Electron Development in a Nutshell](tutorial/first-app.md#electron-development-in-a-nutshell)
+  * [Running Your App](tutorial/first-app.md#running-your-app)
+* [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/application-architecture.md)
+  * [Main and Renderer Processes](tutorial/application-architecture.md#main-and-renderer-processes)
+  * [Using Electron's APIs](tutorial/application-architecture.md#using-electron-apis)
+  * [Using Node.js APIs](tutorial/application-architecture.md#using-nodejs-apis)
+  * [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)
@@ -44,26 +51,15 @@ an issue:
  * [Represented File for macOS BrowserWindows](tutorial/represented-file.md)
  * [Native File Drag & Drop](tutorial/native-file-drag-drop.md)
  * [Offscreen Rendering](tutorial/offscreen-rendering.md)
-  * [Dark Mode](tutorial/dark-mode.md)
+  * [Supporting macOS Dark Mode](tutorial/mojave-dark-mode-guide.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)
 * [Accessibility](tutorial/accessibility.md)
-  * [Manually Enabling Accessibility Features](tutorial/accessibility.md#manually-enabling-accessibility-features)
+  * [Spectron](tutorial/accessibility.md#spectron)
+  * [Devtron](tutorial/accessibility.md#devtron)
+  * [Enabling Accessibility](tutorial/accessibility.md#enabling-accessibility)
 * [Testing and Debugging](tutorial/application-debugging.md)
  * [Debugging the Main Process](tutorial/debugging-main-process.md)
-  * [Debugging with Visual Studio Code](tutorial/debugging-vscode.md)
+  * [Debugging the Main Process with Visual Studio Code](tutorial/debugging-main-process-vscode.md)
  * [Using Selenium and WebDriver](tutorial/using-selenium-and-webdriver.md)
  * [Testing on Headless CI Systems (Travis, Jenkins)](tutorial/testing-on-headless-ci.md)
  * [DevTools Extension](tutorial/devtools-extension.md)
@@ -74,6 +70,11 @@ an issue:
  * [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)
@@ -97,6 +98,7 @@ These individual tutorials expand on topics discussed in the guide above.
  * [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)
+* [Using Pepper Flash Plugin](tutorial/using-pepper-flash-plugin.md)

 ---

@@ -133,7 +135,6 @@ These individual tutorials expand on topics discussed in the guide above.
 * [MenuItem](api/menu-item.md)
 * [net](api/net.md)
 * [netLog](api/net-log.md)
-* [nativeTheme](api/native-theme.md)
 * [Notification](api/notification.md)
 * [powerMonitor](api/power-monitor.md)
 * [powerSaveBlocker](api/power-save-blocker.md)
@@ -144,7 +145,6 @@ These individual tutorials expand on topics discussed in the guide above.
 * [TouchBar](api/touch-bar.md)
 * [Tray](api/tray.md)
 * [webContents](api/web-contents.md)
-* [webFrameMain](api/web-frame-main.md)

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

--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -32,12 +32,10 @@ In most cases, you should do everything in the `ready` event handler.

 Returns:

-* `event` Event
-* `launchInfo` Record<string, any> | [NotificationResponse](structures/notification-response.md) _macOS_
+* `launchInfo` unknown _macOS_

 Emitted once, when Electron has finished initializing. On macOS, `launchInfo`
-holds the `userInfo` of the `NSUserNotification` or information from
-[`UNNotificationResponse`](structures/notification-response.md) that was used to open the
+holds the `userInfo` of the `NSUserNotification` that was used to open the
 application, if it was launched from Notification Center. You can also call
 `app.isReady()` to check if this event has already fired and `app.whenReady()`
 to get a Promise that is fulfilled when Electron is initialized.
@@ -434,8 +432,7 @@ Returns:
    * `integrity-failure` - Windows code integrity checks failed
  * `exitCode` Number - The exit code for the process
      (e.g. status from waitpid if on posix, from GetExitCodeProcess on Windows).
-  * `serviceName` String (optional) - The non-localized name of the process.
-  * `name` String (optional) - The name of the process.
+  * `name` String (optional) - The name of the process. i.e. for plugins it might be Flash.
    Examples for utility: `Audio Service`, `Content Decryption Module Service`, `Network Service`, `Video Capture`, etc.

 Emitted when the child process unexpectedly disappears. This is normally
@@ -504,7 +501,7 @@ Returns:
 Emitted when `desktopCapturer.getSources()` is called in the renderer process of `webContents`.
 Calling `event.preventDefault()` will make it return empty sources.

-### Event: 'remote-require' _Deprecated_
+### Event: 'remote-require'

 Returns:

@@ -516,7 +513,7 @@ Emitted when `remote.require()` is called in the renderer process of `webContent
 Calling `event.preventDefault()` will prevent the module from being returned.
 Custom value can be returned by setting `event.returnValue`.

-### Event: 'remote-get-global' _Deprecated_
+### Event: 'remote-get-global'

 Returns:

@@ -528,7 +525,7 @@ Emitted when `remote.getGlobal()` is called in the renderer process of `webConte
 Calling `event.preventDefault()` will prevent the global from being returned.
 Custom value can be returned by setting `event.returnValue`.

-### Event: 'remote-get-builtin' _Deprecated_
+### Event: 'remote-get-builtin'

 Returns:

@@ -540,7 +537,7 @@ Emitted when `remote.getBuiltin()` is called in the renderer process of `webCont
 Calling `event.preventDefault()` will prevent the module from being returned.
 Custom value can be returned by setting `event.returnValue`.

-### Event: 'remote-get-current-window' _Deprecated_
+### Event: 'remote-get-current-window'

 Returns:

@@ -551,7 +548,7 @@ Emitted when `remote.getCurrentWindow()` is called in the renderer process of `w
 Calling `event.preventDefault()` will prevent the object from being returned.
 Custom value can be returned by setting `event.returnValue`.

-### Event: 'remote-get-current-web-contents' _Deprecated_
+### Event: 'remote-get-current-web-contents'

 Returns:

@@ -682,6 +679,7 @@ Returns `String` - The current application directory.
  * `videos` Directory for a user's videos.
  * `recent` Directory for the user's recent files (Windows only).
  * `logs` Directory for your app's log folder.
+  * `pepperFlashSystemPlugin` Full path to the system version of the Pepper Flash plugin.
  * `crashDumps` Directory where crash dumps are stored.

 Returns `String` - A path to a special directory or file associated with `name`. On
@@ -859,10 +857,9 @@ This method returns the application name of the default handler for the protocol
  minimum (e.g. `https://`).

 Returns `Promise<Object>` - Resolve with an object containing the following:
-
-* `icon` NativeImage - the display icon of the app handling the protocol.
-* `path` String  - installation path of the app handling the protocol.
-* `name` String - display name of the app handling the protocol.
+  * `icon` NativeImage - the display icon of the app handling the protocol.
+  * `path` String  - installation path of the app handling the protocol.
+  * `name` String - display name of the app handling the protocol.

 This method returns a promise that contains the application name, icon and path of the default handler for the protocol
 (aka URI scheme) of a URL.
@@ -1092,7 +1089,6 @@ Changes the [Application User Model ID][app-user-model-id] to `id`.
 Sets the activation policy for a given app.

 Activation policy types:
-
 * 'regular' - The application is an ordinary app that appears in the Dock and may have a user interface.
 * 'accessory' - The application doesn’t appear in the Dock and doesn’t have a menu bar, but it may be activated programmatically or by clicking on one of its windows.
 * 'prohibited' - The application doesn’t appear in the Dock and may not create windows or be activated.
@@ -1107,7 +1103,7 @@ Activation policy types:

 Imports the certificate in pkcs12 format into the platform certificate store.
 `callback` is called with the `result` of import operation, a value of `0`
-indicates success while any other value indicates failure according to Chromium [net_error_list](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).
+indicates success while any other value indicates failure according to Chromium [net_error_list](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).

 ### `app.disableHardwareAcceleration()`

@@ -1144,7 +1140,6 @@ For `infoType` equal to `complete`:

 For `infoType` equal to `basic`:
  Promise is fulfilled with `Object` containing fewer attributes than when requested with `complete`. Here's an example of basic response:
-
 ```js
 {
  auxAttributes:
@@ -1345,7 +1340,7 @@ systems Application folder. Use in combination with `app.moveToApplicationsFolde
 ### `app.moveToApplicationsFolder([options])` _macOS_

 * `options` Object (optional)
-  * `conflictHandler` Function\<Boolean> (optional) - A handler for potential conflict in move failure.
+  * `conflictHandler` Function<Boolean> (optional) - A handler for potential conflict in move failure.
    * `conflictType` String - The type of move conflict encountered by the handler; can be `exists` or `existsAndRunning`, where `exists` means that an app of the same name is present in the Applications directory and `existsAndRunning` means both that it exists and that it's presently running.

 Returns `Boolean` - Whether the move was successful. Please note that if
@@ -1489,12 +1484,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-window.md
+++ b/docs/api/browser-window.md
@@ -8,6 +8,9 @@ Process: [Main](../glossary.md#main-process)
 // In the main process.
 const { BrowserWindow } = require('electron')

+// Or use `remote` from the renderer process.
+// const { BrowserWindow } = require('electron').remote
+
 const win = new BrowserWindow({ width: 800, height: 600 })

 // Load a remote URL
@@ -337,17 +340,18 @@ 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 `false`. 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`.  The default
      is `false`. In Electron 12, the default will be changed to `true`. _Deprecated_
@@ -397,11 +401,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      * `bypassHeatCheck` - Bypass code caching heuristics but with lazy compilation
      * `bypassHeatCheckAndEagerCompile` - Same as above except compilation is eager.
      Default policy is `code`.
-    * `enablePreferredSizeMode` Boolean (optional) - Whether to enable
-      preferred size mode. The preferred size is the minimum size needed to
-      contain the layout of the document—without requiring scrolling. Enabling
-      this will cause the `preferred-size-changed` event to be emitted on the
-      `WebContents` when the preferred size changes. Default is `false`.

 When setting minimum or maximum window size with `minWidth`/`maxWidth`/
 `minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
@@ -467,7 +466,6 @@ window.onbeforeunload = (e) => {
  e.returnValue = false // equivalent to `return false` but not recommended
 }
 ```
-
 _**Note**: There is a subtle difference between the behaviors of `window.onbeforeunload = handler` and `window.addEventListener('beforeunload', handler)`. It is recommended to always set the `event.returnValue` explicitly, instead of only returning a value, as the former works more consistently within Electron._

 #### Event: 'closed'
@@ -543,12 +541,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:
@@ -564,12 +556,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.
@@ -865,7 +857,7 @@ A `Boolean` property that determines whether the menu bar should be visible.

 **Note:** If the menu bar is auto-hide, users can still bring up the menu bar by pressing the single `Alt` key.

-#### `win.kiosk`
+####  `win.kiosk`

 A `Boolean` property that determines whether the window is in kiosk mode.

@@ -1055,7 +1047,7 @@ Returns `Boolean` - Whether the window is in normal state (not maximized, not mi

 * `aspectRatio` Float - The aspect ratio to maintain for some portion of the
 content view.
-* `extraSize` [Size](structures/size.md) (optional) _macOS_ - The extra size not to be included while
+ * `extraSize` [Size](structures/size.md) (optional) _macOS_ - The extra size not to be included while
 maintaining the aspect ratio.

 This will make a window maintain an aspect ratio. The extra size allows a
@@ -1371,17 +1363,6 @@ Enters or leaves kiosk mode.

 Returns `Boolean` - Whether the window is in kiosk mode.

-#### `win.isTabletMode()` _Windows_
-
-Returns `Boolean` - Whether the window is in Windows 10 tablet mode.
-
-Since Windows 10 users can [use their PC as tablet](https://support.microsoft.com/en-us/help/17210/windows-10-use-your-pc-like-a-tablet),
-under this mode apps can choose to optimize their UI for tablets, such as
-enlarging the titlebar and hiding titlebar buttons.
-
-This API returns whether the window is in tablet mode, and the `resize` event
-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:1234:0".
@@ -1463,7 +1444,7 @@ Captures a snapshot of the page within `rect`. Omitting `rect` will capture the
  * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer URL.
  * `userAgent` String (optional) - A user agent originating the request.
  * `extraHeaders` String (optional) - Extra headers separated by "\n"
-  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md)) (optional)
+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadBlob[]](structures/upload-blob.md)) (optional)
  * `baseURLForDataURL` String (optional) - Base URL (with trailing path separator) for files to be loaded by the data URL. This is needed only if the specified `url` is a data URL and needs to load other files.

 Returns `Promise<void>` - the promise will resolve when the page has finished loading
@@ -1745,9 +1726,7 @@ events.
 Prevents the window contents from being captured by other apps.

 On macOS it sets the NSWindow's sharingType to NSWindowSharingNone.
-On Windows it calls SetWindowDisplayAffinity with `WDA_EXCLUDEFROMCAPTURE`.
-For Windows 10 version 2004 and up the window will be removed from capture entirely,
-older Windows versions behave as if `WDA_MONITOR` is applied capturing a black window.
+On Windows it calls SetWindowDisplayAffinity with `WDA_MONITOR`.

 #### `win.setFocusable(focusable)` _macOS_ _Windows_

--- a/docs/api/client-request.md
+++ b/docs/api/client-request.md
@@ -13,41 +13,30 @@ interface and is therefore an [EventEmitter][event-emitter].
 the request URL. If it is an object, it is expected to fully specify an HTTP request via the
 following properties:
  * `method` String (optional) - The HTTP request method. Defaults to the GET
-    method.
+method.
  * `url` String (optional) - The request URL. Must be provided in the absolute
-    form with the protocol scheme specified as http or https.
+form with the protocol scheme specified as http or https.
  * `session` Session (optional) - The [`Session`](session.md) instance with
-    which the request is associated.
+which the request is associated.
  * `partition` String (optional) - The name of the [`partition`](session.md)
-    with which the request is associated. Defaults to the empty string. The
-    `session` option supersedes `partition`. Thus if a `session` is explicitly
-    specified, `partition` is ignored.
-  * `credentials` String (optional) - Can be `include` or `omit`. Whether to
-    send [credentials](https://fetch.spec.whatwg.org/#credentials) with this
-    request. If set to `include`, credentials from the session associated with
-    the request will be used. If set to `omit`, credentials will not be sent
-    with the request (and the `'login'` event will not be triggered in the
-    event of a 401). This matches the behavior of the
-    [fetch](https://fetch.spec.whatwg.org/#concept-request-credentials-mode)
-    option of the same name. If this option is not specified, authentication
-    data from the session will be sent, and cookies will not be sent (unless
-    `useSessionCookies` is set).
+  with which the request is associated. Defaults to the empty string. The
+`session` option prevails on `partition`. Thus if a `session` is explicitly
+specified, `partition` is ignored.
  * `useSessionCookies` Boolean (optional) - Whether to send cookies with this
-    request from the provided session. If `credentials` is specified, this
-    option has no effect. Default is `false`.
-  * `protocol` String (optional) - Can be `http:` or `https:`. The protocol
-    scheme in the form 'scheme:'. Defaults to 'http:'.
+    request from the provided session.  This will make the `net` request's
+    cookie behavior match a `fetch` request. Default is `false`.
+  * `protocol` String (optional) - The protocol scheme in the form 'scheme:'.
+Currently supported values are 'http:' or 'https:'. Defaults to 'http:'.
  * `host` String (optional) - The server host provided as a concatenation of
-    the hostname and the port number 'hostname:port'.
+the hostname and the port number 'hostname:port'.
  * `hostname` String (optional) - The server host name.
  * `port` Integer (optional) - The server's listening port number.
  * `path` String (optional) - The path part of the request URL.
-  * `redirect` String (optional) - Can be `follow`, `error` or `manual`. The
-    redirect mode for this request. When mode is `error`, any redirection will
-    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.
+  * `redirect` String (optional) - The redirect mode for this request. Should be
+one of `follow`, `error` or `manual`. Defaults to `follow`. When mode is `error`,
+any redirection will be aborted. When mode is `manual` the redirection will be
+cancelled unless [`request.followRedirect`](#requestfollowredirect) is invoked
+synchronously during the [`redirect`](#event-redirect) event.

 `options` properties such as `protocol`, `host`, `hostname`, `port` and `path`
 strictly follow the Node.js model as described in the
@@ -99,7 +88,6 @@ request.on('login', (authInfo, callback) => {
  callback('username', 'password')
 })
 ```
-
 Providing empty credentials will cancel the request and report an authentication
 error on the response object:

@@ -141,6 +129,7 @@ Emitted as the last event in the HTTP request-response transaction. The `close`
 event indicates that no more events will be emitted on either the `request` or
 `response` objects.

+
 #### Event: 'redirect'

 Returns:
--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -64,7 +64,6 @@ Forces the maximum disk space to be used by the disk cache, in bytes.
 ### --enable-api-filtering-logging

 Enables caller stack logging for the following APIs (filtering events):
-
 - `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
 - `remote.require()` / `remote-require`
 - `remote.getGlobal()` / `remote-get-builtin`
@@ -172,6 +171,14 @@ authentication [per Chromium issue](https://bugs.chromium.org/p/chromium/issues/

 Enables remote debugging over HTTP on the specified `port`.

+### --ppapi-flash-path=`path`
+
+Sets the `path` of the pepper flash plugin.
+
+### --ppapi-flash-version=`version`
+
+Sets the `version` of the pepper flash plugin.
+
 ### --v=`log_level`

 Gives the default maximal active V-logging level; 0 is the default. Normally
@@ -228,13 +235,12 @@ See the [Debugging the Main Process][debugging-main-process] guide for more deta
 Aliased to `--debug[=[host:]port`.

 ### --inspect-publish-uid=stderr,http
-
 Specify ways of the inspector web socket url exposure.

 By default inspector websocket url is available in stderr and under /json/list endpoint on http://host:port/json/list.

 [app]: app.md
-[append-switch]: command-line.md#commandlineappendswitchswitch-value
+[append-switch]: app.md#appcommandlineappendswitchswitch-value
 [ready]: app.md#event-ready
 [play-silent-audio]: https://github.com/atom/atom/pull/9485/files
 [debugging-main-process]: ../tutorial/debugging-main-process.md
--- 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
@@ -108,4 +108,5 @@ has been included below for completeness:
 | [Cloneable Types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm) | Simple | ✅ | ✅ | See the linked document on cloneable types |
 | `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.
--- a/docs/api/crash-reporter.md
+++ b/docs/api/crash-reporter.md
@@ -39,37 +39,6 @@ is an implementation detail driven by Chromium, and it may change in future. In
 particular, crashpad is newer and will likely eventually replace breakpad on
 all platforms.

-### Note about Node child processes on Linux
-
-If you are using the Node.js `child_process` module and want to report crashes
-from those processes on Linux, there is an extra step you will need to take to
-properly initialize the crash reporter in the child process. This is not
-necessary on Mac or Windows, as those platforms use Crashpad, which
-automatically monitors child processes.
-
-Since `require('electron')` is not available in Node child processes, the
-following APIs are available on the `process` object in Node child processes.
-Note that, on Linux, each Node child process has its own separate instance of
-the breakpad crash reporter. This is dissimilar to renderer child processes,
-which have a "stub" breakpad reporter which returns information to the main
-process for reporting.
-
-#### `process.crashReporter.start(options)`
-
-See [`crashReporter.start()`](#crashreporterstartoptions).
-
-#### `process.crashReporter.getParameters()`
-
-See [`crashReporter.getParameters()`](#crashreportergetparameters).
-
-#### `process.crashReporter.addExtraParameter(key, value)`
-
-See [`crashReporter.addExtraParameter(key, value)`](#crashreporteraddextraparameterkey-value).
-
-#### `process.crashReporter.removeExtraParameter(key)`
-
-See [`crashReporter.removeExtraParameter(key)`](#crashreporterremoveextraparameterkey).
-
 ## Methods

 The `crashReporter` module has the following methods:
@@ -90,7 +59,7 @@ The `crashReporter` module has the following methods:
  * `rateLimit` Boolean (optional) _macOS_ _Windows_ - If true, limit the
    number of crashes uploaded to 1/hour. Default is `false`.
  * `compress` Boolean (optional) - If true, crash reports will be compressed
-    and uploaded with `Content-Encoding: gzip`. Default is `true`.
+    and uploaded with `Content-Encoding: gzip`. Default is `false`.
  * `extra` Record<String, String> (optional) - Extra string key/value
    annotations that will be sent along with crash reports that are generated
    in the main process. Only string values are supported. Crashes generated in
@@ -128,7 +97,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 +106,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 +115,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 +131,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/desktop-capturer.md
+++ b/docs/api/desktop-capturer.md
@@ -95,7 +95,7 @@ Returns `Promise<DesktopCapturerSource[]>` - Resolves with an array of [`Desktop
 which can detected by [`systemPreferences.getMediaAccessStatus`].

 [`navigator.mediaDevices.getUserMedia`]: https://developer.mozilla.org/en/docs/Web/API/MediaDevices/getUserMedia
-[`systemPreferences.getMediaAccessStatus`]: system-preferences.md#systempreferencesgetmediaaccessstatusmediatype-windows-macos
+[`systemPreferences.getMediaAccessStatus`]: system-preferences.md#systempreferencesgetmediaaccessstatusmediatype-macos

 ## Caveats

--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -11,6 +11,14 @@ const { dialog } = require('electron')
 console.log(dialog.showOpenDialog({ properties: ['openFile', 'multiSelections'] }))
 ```

+The Dialog is opened from Electron's main thread. If you want to use the dialog
+object from a renderer process, remember to access it using the remote:
+
+```javascript
+const { dialog } = require('electron').remote
+console.log(dialog)
+```
+
 ## Methods

 The `dialog` module has the following methods:
@@ -205,10 +213,9 @@ The `filters` specifies an array of file types that can be displayed, see
  * `securityScopedBookmarks` Boolean (optional) _macOS_ _mas_ - Create a [security scoped bookmark](https://developer.apple.com/library/content/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html#//apple_ref/doc/uid/TP40011183-CH3-SW16) when packaged for the Mac App Store. If this option is enabled and the file doesn't already exist a blank file will be created at the chosen path.

 Returns `Promise<Object>` - Resolve with an object containing the following:
-
-* `canceled` Boolean - whether or not the dialog was canceled.
-* `filePath` String (optional) - If the dialog is canceled, this will be `undefined`.
-* `bookmark` String (optional) _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present. (For return values, see [table here](#bookmarks-array).)
+  * `canceled` Boolean - whether or not the dialog was canceled.
+  * `filePath` String (optional) - If the dialog is canceled, this will be `undefined`.
+  * `bookmark` String (optional) _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present. (For return values, see [table here](#bookmarks-array).)

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

@@ -222,7 +229,6 @@ expanding and collapsing the dialog.

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `message` String - Content of the message box.
  * `type` String (optional) - Can be `"none"`, `"info"`, `"error"`, `"question"` or
  `"warning"`. On Windows, `"question"` displays the same icon as `"info"`, unless
  you set an icon using the `"icon"` option. On macOS, both `"warning"` and
@@ -232,6 +238,7 @@ expanding and collapsing the dialog.
  * `defaultId` Integer (optional) - Index of the button in the buttons array which will
    be selected by default when the message box opens.
  * `title` String (optional) - Title of the message box, some platforms will not show it.
+  * `message` String - Content of the message box.
  * `detail` String (optional) - Extra information of the message.
  * `checkboxLabel` String (optional) - If provided, the message box will
    include a checkbox with the given label.
@@ -268,7 +275,6 @@ If `browserWindow` is not shown dialog will not be attached to it. In such case

 * `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
-  * `message` String - Content of the message box.
  * `type` String (optional) - Can be `"none"`, `"info"`, `"error"`, `"question"` or
  `"warning"`. On Windows, `"question"` displays the same icon as `"info"`, unless
  you set an icon using the `"icon"` option. On macOS, both `"warning"` and
@@ -278,6 +284,7 @@ If `browserWindow` is not shown dialog will not be attached to it. In such case
  * `defaultId` Integer (optional) - Index of the button in the buttons array which will
    be selected by default when the message box opens.
  * `title` String (optional) - Title of the message box, some platforms will not show it.
+  * `message` String - Content of the message box.
  * `detail` String (optional) - Extra information of the message.
  * `checkboxLabel` String (optional) - If provided, the message box will
    include a checkbox with the given label.
@@ -303,12 +310,11 @@ If `browserWindow` is not shown dialog will not be attached to it. In such case
    via `Alt-W` on Windows and Linux.

 Returns `Promise<Object>` - resolves with a promise containing the following properties:
-
-* `response` Number - The index of the clicked button.
-* `checkboxChecked` Boolean - The checked state of the checkbox if
+  * `response` Number - The index of the clicked button.
+  * `checkboxChecked` Boolean - The checked state of the checkbox if
  `checkboxLabel` was set. Otherwise `false`.

-Shows a message box.
+Shows a message box, it will block the process until the message box is closed.

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

--- a/docs/api/download-item.md
+++ b/docs/api/download-item.md
@@ -79,7 +79,6 @@ The `downloadItem` object has the following methods:
 * `path` String - Set the save file path of the download item.

 The API is only available in session's `will-download` callback function.
-If `path` doesn't exist, Electron will try to make the directory recursively.
 If user doesn't set the save path via the API, Electron will use the original
 routine to determine the save path; this usually prompts a save dialog.

--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -105,7 +105,6 @@ Don't use the global menu bar on Linux.
 Set the trash implementation on Linux. Default is `gio`.

 Options:
-
 * `gvfs-trash`
 * `trash-cli`
 * `kioclient5`
@@ -116,6 +115,7 @@ Options:
 The following environment variables are intended primarily for development and
 debugging purposes.

+
 ### `ELECTRON_ENABLE_LOGGING`

 Prints Chrome's internal logging to the console.
--- a/docs/api/extensions.md
+++ b/docs/api/extensions.md
@@ -74,7 +74,6 @@ The following methods of `chrome.runtime` are supported:

 - `chrome.runtime.getBackgroundPage`
 - `chrome.runtime.getManifest`
- `chrome.runtime.getPlatformInfo`
 - `chrome.runtime.getURL`
 - `chrome.runtime.connect`
 - `chrome.runtime.sendMessage`
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -12,6 +12,7 @@ options on the [`BrowserWindow`](browser-window.md) class.
 To create a frameless window, you need to set `frame` to `false` in
 [BrowserWindow](browser-window.md)'s `options`:

+
 ```javascript
 const { BrowserWindow } = require('electron')
 const win = new BrowserWindow({ width: 800, height: 600, frame: false })
@@ -87,7 +88,7 @@ win.show()
 * 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
-  NVidia drivers](https://bugs.chromium.org/p/chromium/issues/detail?id=369209) on
+  NVidia drivers](https://code.google.com/p/chromium/issues/detail?id=369209) on
  Linux.
 * On Mac, the native window shadow will not be shown on a transparent window.

@@ -111,19 +112,13 @@ optional parameter can be used to forward mouse move messages to the web page,
 allowing events such as `mouseleave` to be emitted:

 ```javascript
-const { ipcRenderer } = require('electron')
+const win = require('electron').remote.getCurrentWindow()
 const el = document.getElementById('clickThroughElement')
 el.addEventListener('mouseenter', () => {
-  ipcRenderer.send('set-ignore-mouse-events', true, { forward: true })
+  win.setIgnoreMouseEvents(true, { forward: true })
 })
 el.addEventListener('mouseleave', () => {
-  ipcRenderer.send('set-ignore-mouse-events', false)
-})
-
-// Main process
-const { ipcMain } = require('electron')
-ipcMain.on('set-ignore-mouse-events', (event, ...args) => {
-  BrowserWindow.fromWebContents(event.sender).setIgnoreMouseEvents(...args)
+  win.setIgnoreMouseEvents(false)
 })
 ```

--- a/docs/api/incoming-message.md
+++ b/docs/api/incoming-message.md
@@ -20,7 +20,7 @@ applicative code.

 #### Event: 'end'

-Indicates that response body has ended. Must be placed before 'data' event.
+Indicates that response body has ended.

 #### Event: 'aborted'

--- a/docs/api/ipc-main.md
+++ b/docs/api/ipc-main.md
@@ -91,7 +91,7 @@ Removes listeners of the specified `channel`.
 ### `ipcMain.handle(channel, listener)`

 * `channel` String
-* `listener` Function<Promise\<void> | any>
+* `listener` Function<Promise<void> | any>
  * `event` IpcMainInvokeEvent
  * `...args` any[]

@@ -123,7 +123,7 @@ WebContents is the source of the invoke request.
 ### `ipcMain.handleOnce(channel, listener)`

 * `channel` String
-* `listener` Function<Promise\<void> | any>
+* `listener` Function<Promise<void> | any>
  * `event` IpcMainInvokeEvent
  * `...args` any[]

--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -61,15 +61,10 @@ 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
+> **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.

-> **NOTE:** Since the main process does not have support for DOM objects such as
-> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
-> Electron's IPC to the main process, as the main process would have no way to decode
-> them. Attempting to send such objects over IPC will result in an error.
-
 The main process handles it by listening for `channel` with the
 [`ipcMain`](ipc-main.md) module.

@@ -94,16 +89,10 @@ throw an exception.
 > special Electron objects is deprecated, and will begin throwing an exception
 > starting with Electron 9.

-> **NOTE:** Since the main process does not have support for DOM objects such as
-> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
-> Electron's IPC to the main process, as the main process would have no way to decode
-> them. Attempting to send such objects over IPC will result in an error.
-
 The main process should listen for `channel` with
 [`ipcMain.handle()`](ipc-main.md#ipcmainhandlechannel-listener).

 For example:
-
 ```javascript
 // Renderer process
 ipcRenderer.invoke('some-name', someArgument).then((result) => {
@@ -138,11 +127,6 @@ throw an exception.
 > special Electron objects is deprecated, and will begin throwing an exception
 > starting with Electron 9.

-> **NOTE:** Since the main process does not have support for DOM objects such as
-> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
-> Electron's IPC to the main process, as the main process would have no way to decode
-> them. Attempting to send such objects over IPC will result in an error.
-
 The main process handles it by listening for `channel` with [`ipcMain`](ipc-main.md) module,
 and replies by setting `event.returnValue`.

@@ -165,7 +149,6 @@ The transferred `MessagePort` objects will be available in the main process as
 property of the emitted event.

 For example:
-
 ```js
 // Renderer process
 const { port1, port2 } = new MessageChannel()
--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -14,7 +14,7 @@ See [`Menu`](menu.md) for examples.
    * `menuItem` MenuItem
    * `browserWindow` [BrowserWindow](browser-window.md) | undefined - This will not be defined if no window is open.
    * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` String (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
    `click` property will be ignored. See [roles](#roles).
  * `type` String (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
    `radio`.
@@ -31,7 +31,6 @@ See [`Menu`](menu.md) for examples.
    menu items.
  * `registerAccelerator` Boolean (optional) _Linux_ _Windows_ - If false, the accelerator won't be registered
    with the system, but it will still be displayed. Defaults to true.
-  * `sharingItem` SharingItem (optional) _macOS_ - The item to share when the `role` is `shareMenu`.
  * `submenu` (MenuItemConstructorOptions[] | [Menu](menu.md)) (optional) - Should be specified
    for `submenu` type menu items. If `submenu` is specified, the `type: 'submenu'` can be omitted.
    If the value is not a [`Menu`](menu.md) then it will be automatically converted to one using
@@ -88,7 +87,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.)
@@ -114,7 +112,6 @@ The following additional roles are available on _macOS_:
 * `services` - The submenu is a ["Services"](https://developer.apple.com/documentation/appkit/nsapplication/1428608-servicesmenu?language=objc) menu. This is only intended for use in the Application Menu and is *not* the same as the "Services" submenu used in context menus in macOS apps, which is not implemented in Electron.
 * `recentDocuments` - The submenu is an "Open Recent" menu.
 * `clearRecentDocuments` - Map to the `clearRecentDocuments` action.
-* `shareMenu` - The submenu is [share menu][ShareMenu]. The `sharingItem` property must also be set to indicate the item to share.

 When specifying a `role` on macOS, `label` and `accelerator` are the only
 options that will affect the menu item. All other options will be ignored.
@@ -139,7 +136,6 @@ A `String` indicating the item's visible label.

 A `Function` that is fired when the MenuItem receives a click event.
 It can be called with `menuItem.click(event, focusedWindow, focusedWebContents)`.
-
 * `event` [KeyboardEvent](structures/keyboard-event.md)
 * `focusedWindow` [BrowserWindow](browser-window.md)
 * `focusedWebContents` [WebContents](web-contents.md)
@@ -204,12 +200,6 @@ system or just displayed.

 This property can be dynamically changed.

-#### `menuItem.sharingItem` _macOS_
-
-A `SharingItem` indicating the item to share when the `role` is `shareMenu`.
-
-This property can be dynamically changed.
-
 #### `menuItem.commandId`

 A `Number` indicating an item's sequential unique id.
@@ -217,5 +207,3 @@ A `Number` indicating an item's sequential unique id.
 #### `menuItem.menu`

 A `Menu` that the item is a part of.
-
-[ShareMenu]: https://developer.apple.com/design/human-interface-guidelines/macos/extensions/share-extensions/
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -141,7 +141,13 @@ can have a submenu.

 ## Examples

-An example of creating the application menu with the simple template API:
+The `Menu` class is only available in the main process, but you can also use it
+in the render process via the [`remote`](remote.md) module.
+
+### Main process
+
+An example of creating the application menu in the main process with the
+simple template API:

 ```javascript
 const { app, Menu } = require('electron')
@@ -251,36 +257,26 @@ Menu.setApplicationMenu(menu)

 ### Render process

-To create menus initiated by the renderer process, send the required
-information to the main process using IPC and have the main process display the
-menu on behalf of the renderer.
+Below is an example of creating a menu dynamically in a web page
+(render process) by using the [`remote`](remote.md) module, and showing it when
+the user right clicks the page:

-Below is an example of showing a menu when the user right clicks the page:
+```html
+<!-- index.html -->
+<script>
+const { remote } = require('electron')
+const { Menu, MenuItem } = remote
+
+const menu = new Menu()
+menu.append(new MenuItem({ label: 'MenuItem1', click() { console.log('item 1 clicked') } }))
+menu.append(new MenuItem({ type: 'separator' }))
+menu.append(new MenuItem({ label: 'MenuItem2', type: 'checkbox', checked: true }))

-```js
-// renderer
 window.addEventListener('contextmenu', (e) => {
  e.preventDefault()
-  ipcRenderer.send('show-context-menu')
-})
-
-ipcRenderer.on('context-menu-command', (e, command) => {
-  // ...
-})
-
-// main
-ipcMain.on('show-context-menu', (event) => {
-  const template = [
-    {
-      label: 'Menu Item 1',
-      click: () => { event.sender.send('context-menu-command', 'menu-item-1') }
-    },
-    { type: 'separator' },
-    { label: 'Menu Item 2', type: 'checkbox', checked: true }
-  ]
-  const menu = Menu.buildFromTemplate(template)
-  menu.popup(BrowserWindow.fromWebContents(event.sender))
-})
+  menu.popup({ window: remote.getCurrentWindow() })
+}, false)
+</script>
 ```

 ## Notes on macOS Application Menu
--- a/docs/api/message-channel-main.md
+++ b/docs/api/message-channel-main.md
@@ -12,21 +12,10 @@ channel messaging.
 Process: [Main](../glossary.md#main-process)

 Example:
-
 ```js
-// Main process
 const { port1, port2 } = new MessageChannelMain()
 w.webContents.postMessage('port', null, [port2])
 port1.postMessage({ some: 'message' })
-
-// Renderer process
-const { ipcRenderer } = require('electron')
-ipcRenderer.on('port', (e) => {
-  // e.ports is a list of ports sent along with this message
-  e.ports[0].on('message', (messageEvent) => {
-    console.log(messageEvent.data)
-  })
-})
 ```

 ### Instance Properties
--- a/docs/api/modernization/overview.md
+++ b/docs/api/modernization/overview.md
@@ -1,6 +1,6 @@
 ## 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.
+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.

--- a/docs/api/modernization/property-updates.md
+++ b/docs/api/modernization/property-updates.md
@@ -27,7 +27,7 @@ The Electron team is currently undergoing an initiative to convert separate gett
 * `DownloadItem` class
  * `savePath`
 * `BrowserWindow` module
-  * `autoHideMenuBar`
+  * `autohideMenuBar`
  * `resizable`
  * `maximizable`
  * `minimizable`
--- a/docs/api/native-theme.md
+++ b/docs/api/native-theme.md
@@ -34,7 +34,6 @@ Setting this property to `system` will remove the override and
 everything will be reset to the OS default.  By default `themeSource` is `system`.

 Settings this property to `dark` will have the following effects:
-
 * `nativeTheme.shouldUseDarkColors` will be `true` when accessed
 * Any UI Electron renders on Linux and Windows including context menus, devtools, etc. will use the dark UI.
 * Any UI the OS renders on macOS including menus, window frames, etc. will use the dark UI.
@@ -42,7 +41,6 @@ Settings this property to `dark` will have the following effects:
 * The `updated` event will be emitted

 Settings this property to `light` will have the following effects:
-
 * `nativeTheme.shouldUseDarkColors` will be `false` when accessed
 * Any UI Electron renders on Linux and Windows including context menus, devtools, etc. will use the light UI.
 * Any UI the OS renders on macOS including menus, window frames, etc. will use the light UI.
@@ -51,7 +49,6 @@ Settings this property to `light` will have the following effects:

 The usage of this property should align with a classic "dark mode" state machine in your application
 where the user has three options.
-
 * `Follow OS` --> `themeSource = 'system'`
 * `Dark Mode` --> `themeSource = 'dark'`
 * `Light Mode` --> `themeSource = 'light'`
--- a/docs/api/net.md
+++ b/docs/api/net.md
@@ -8,7 +8,7 @@ The `net` module is a client-side API for issuing HTTP(S) requests. It is
 similar to the [HTTP](https://nodejs.org/api/http.html) and
 [HTTPS](https://nodejs.org/api/https.html) modules of Node.js but uses
 Chromium's native networking library instead of the Node.js implementation,
-offering better support for web proxies. It also supports checking network status.
+offering better support for web proxies.

 The following is a non-exhaustive list of why you may consider using the `net`
 module instead of the native Node.js modules:
@@ -62,25 +62,3 @@ Creates a [`ClientRequest`](./client-request.md) instance using the provided
 `options` which are directly forwarded to the `ClientRequest` constructor.
 The `net.request` method would be used to issue both secure and insecure HTTP
 requests according to the specified protocol scheme in the `options` object.
-
-### `net.isOnline()`
-
-Returns `Boolean` - Whether there is currently internet connection.
-
-A return value of `false` is a pretty strong indicator that the user
-won't be able to connect to remote sites. However, a return value of
-`true` is inconclusive; even if some link is up, it is uncertain
-whether a particular connection attempt to a particular remote site
-will be successful.
-
-## Properties
-
-### `net.online` _Readonly_
-
-A `Boolean` property. Whether there is currently internet connection.
-
-A return value of `false` is a pretty strong indicator that the user
-won't be able to connect to remote sites. However, a return value of
-`true` is inconclusive; even if some link is up, it is uncertain
-whether a particular connection attempt to a particular remote site
-will be successful.
--- a/docs/api/notification.md
+++ b/docs/api/notification.md
@@ -29,9 +29,9 @@ Returns `Boolean` - Whether or not desktop notifications are supported on the cu
 ### `new Notification([options])`

 * `options` Object (optional)
-  * `title` String (optional) - A title for the notification, which will be shown at the top of the notification window when it is shown.
+  * `title` String - A title for the notification, which will be shown at the top of the notification window when it is shown.
  * `subtitle` String (optional) _macOS_ - A subtitle for the notification, which will be displayed below the title.
-  * `body` String (optional) - The body text of the notification, which will be displayed below the title or subtitle.
+  * `body` String - The body text of the notification, which will be displayed below the title or subtitle.
  * `silent` Boolean (optional) - Whether or not to emit an OS notification noise when showing the notification.
  * `icon` (String | [NativeImage](native-image.md)) (optional) - An icon to use in the notification.
  * `hasReply` Boolean (optional) _macOS_ - Whether or not to add an inline reply option to the notification.
@@ -41,7 +41,6 @@ Returns `Boolean` - Whether or not desktop notifications are supported on the cu
  * `urgency` String (optional) _Linux_ - The urgency level of the notification. Can be 'normal', 'critical', or 'low'.
  * `actions` [NotificationAction[]](structures/notification-action.md) (optional) _macOS_ - Actions to add to the notification. Please read the available actions and limitations in the `NotificationAction` documentation.
  * `closeButtonText` String (optional) _macOS_ - A custom title for the close button of an alert. An empty string will cause the default localized text to be used.
-  * `toastXml` String (optional) _Windows_ - A custom description of the Notification on Windows superseding all properties above. Provides full customization of design and behavior of the notification.

 ### Instance Events

@@ -95,15 +94,6 @@ Returns:
 * `event` Event
 * `index` Number - The index of the action that was activated.

-#### Event: 'failed' _Windows_
-
-Returns:
-
-* `event` Event
-* `error` String - The error encountered during execution of the `show()` method.
-
-Emitted when an error is encountered while creating and showing the native notification.
-
 ### Instance Methods

 Objects created with `new Notification` have the following instance methods:
@@ -172,10 +162,6 @@ If `timeoutType` is set to 'never', the notification never expires. It stays ope

 A [`NotificationAction[]`](structures/notification-action.md) property representing the actions of the notification.

-#### `notification.toastXml` _Windows_
-
-A `String` property representing the custom Toast XML of the notification.
-
 ### Playing Sounds

 On macOS, you can specify the name of the sound you'd like to play when the
--- a/docs/api/power-monitor.md
+++ b/docs/api/power-monitor.md
@@ -39,14 +39,6 @@ Emitted when the system is about to lock the screen.

 Emitted as soon as the systems screen is unlocked.

-### Event: 'user-did-become-active' _macOS_
-
-Emitted when a login session is activated. See [documentation](https://developer.apple.com/documentation/appkit/nsworkspacesessiondidbecomeactivenotification?language=objc) for more information.
-
-### Event: 'user-did-resign-active' _macOS_
-
-Emitted when a login session is deactivated. See [documentation](https://developer.apple.com/documentation/appkit/nsworkspacesessiondidresignactivenotification?language=objc) for more information.
-
 ## Methods

 The `powerMonitor` module has the following methods:
@@ -65,18 +57,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
@@ -11,7 +11,6 @@ It adds the following events, properties, and methods:
 ## Sandbox

 In sandboxed renderers the `process` object contains only a subset of the APIs:
-
 - `crash()`
 - `hang()`
 - `getCreationTime()`
@@ -105,7 +104,6 @@ A `Boolean` that controls whether or not deprecations printed to `stderr` includ
 This property is instead of the `--trace-deprecation` command line flag.

 ### `process.traceProcessWarnings`
-
 A `Boolean` that controls whether or not process warnings printed to `stderr` include
 their stack trace. Setting this to `true` will print stack traces for process warnings
 (including deprecations). This property is instead of the `--trace-warnings` command
--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -112,7 +112,7 @@ expect streaming responses.

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` (String | [ProtocolResponse](structures/protocol-response.md))

@@ -133,7 +133,7 @@ from protocols that follow the "generic URI syntax" like `file:`.

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` (Buffer | [ProtocolResponse](structures/protocol-response.md))

@@ -157,7 +157,7 @@ protocol.registerBufferProtocol('atom', (request, callback) => {

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` (String | [ProtocolResponse](structures/protocol-response.md))

@@ -173,7 +173,7 @@ property.

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` ProtocolResponse

@@ -188,7 +188,7 @@ should be called with an object that has the `url` property.

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` (ReadableStream | [ProtocolResponse](structures/protocol-response.md))

@@ -251,7 +251,7 @@ Returns `Boolean` - Whether `scheme` is already registered.

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` (String | [ProtocolResponse](structures/protocol-response.md))

@@ -264,7 +264,7 @@ which sends a file as a response.

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` (String | [ProtocolResponse](structures/protocol-response.md))

@@ -277,7 +277,7 @@ which sends a `String` as a response.

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` (Buffer | [ProtocolResponse](structures/protocol-response.md))

@@ -290,7 +290,7 @@ which sends a `Buffer` as a response.

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` [ProtocolResponse](structures/protocol-response.md)

@@ -303,7 +303,7 @@ which sends a new HTTP request as a response.

 * `scheme` String
 * `handler` Function
-  * `request` [ProtocolRequest](structures/protocol-request.md)
+  * `request` ProtocolRequest
  * `callback` Function
    * `response` (ReadableStream | [ProtocolResponse](structures/protocol-response.md))

--- a/docs/api/remote.md
+++ b/docs/api/remote.md
@@ -4,16 +4,6 @@

 Process: [Renderer](../glossary.md#renderer-process)

-> ⚠️ WARNING ⚠️
-> The `remote` module is [deprecated](https://github.com/electron/electron/issues/21408).
-> Instead of `remote`, use [`ipcRenderer`](ipc-renderer.md) and
-> [`ipcMain`](ipc-main.md).
->
-> Read more about why the `remote` module is deprecated [here](https://medium.com/@nornagon/electrons-remote-module-considered-harmful-70d69500f31).
->
-> If you still want to use `remote` despite the performance and security
-> concerns, see [@electron/remote](https://github.com/electron/remote).
-
 The `remote` module provides a simple way to do inter-process communication
 (IPC) between the renderer process (web page) and the main process.

@@ -35,7 +25,6 @@ win.loadURL('https://github.com')
 you can use [webContents.executeJavaScript](web-contents.md#contentsexecutejavascriptcode-usergesture).

 **Note:** The remote module can be disabled for security reasons in the following contexts:
-
 - [`BrowserWindow`](browser-window.md) - by setting the `enableRemoteModule` option to `false`.
 - [`<webview>`](webview-tag.md) - by setting the `enableremotemodule` attribute to `false`.

@@ -151,32 +140,11 @@ console.log(app)

 The `remote` module has the following methods:

-### `remote.getCurrentWindow()`
+### `remote.require(module)`

-Returns [`BrowserWindow`](browser-window.md) - The window to which this web page
-belongs.
+* `module` String

-**Note:** Do not use `removeAllListeners` on [`BrowserWindow`](browser-window.md).
-Use of this can remove all [`blur`](https://developer.mozilla.org/en-US/docs/Web/Events/blur)
-listeners, disable click events on touch bar buttons, and other unintended
-consequences.
-
-### `remote.getCurrentWebContents()`
-
-Returns [`WebContents`](web-contents.md) - The web contents of this web page.
-
-### `remote.getGlobal(name)`
-
-* `name` String
-
-Returns `any` - The global variable of `name` (e.g. `global[name]`) in the main
-process.
-
-## Properties
-
-### `remote.require`
-
-A `NodeJS.Require` function equivalent to `require(module)` in the main process.
+Returns `any` - The object returned by `require(module)` in the main process.
 Modules specified by their relative path will resolve relative to the entrypoint
 of the main process.

@@ -208,6 +176,29 @@ module.exports = 'bar'
 const foo = require('electron').remote.require('./foo') // bar
 ```

+### `remote.getCurrentWindow()`
+
+Returns [`BrowserWindow`](browser-window.md) - The window to which this web page
+belongs.
+
+**Note:** Do not use `removeAllListeners` on [`BrowserWindow`](browser-window.md).
+Use of this can remove all [`blur`](https://developer.mozilla.org/en-US/docs/Web/Events/blur)
+listeners, disable click events on touch bar buttons, and other unintended
+consequences.
+
+### `remote.getCurrentWebContents()`
+
+Returns [`WebContents`](web-contents.md) - The web contents of this web page.
+
+### `remote.getGlobal(name)`
+
+* `name` String
+
+Returns `any` - The global variable of `name` (e.g. `global[name]`) in the main
+process.
+
+## Properties
+
 ### `remote.process` _Readonly_

 A `NodeJS.Process` object.  The `process` object in the main process. This is the same as
--- a/docs/api/sandbox-option.md
+++ b/docs/api/sandbox-option.md
@@ -88,17 +88,26 @@ 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')
+// private scope that can access a subset of Electron renderer APIs. We must be
+// careful to not leak any objects into the global scope!
+const { ipcRenderer, remote } = require('electron')
+const fs = remote.require('fs')
+
+// read a configuration file using the `fs` module
+const buf = fs.readFileSync('allowed-popup-urls.json')
+const allowedUrls = JSON.parse(buf.toString('utf8'))

 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)
+function customWindowOpen (url, ...args) {
+  if (allowedUrls.indexOf(url) === -1) {
+    ipcRenderer.sendSync('blocked-popup-notification', location.origin, url)
+    return null
+  }
+  return defaultWindowOpen(url, ...args)
 }
+
+window.open = customWindowOpen
 ```

 Important things to notice in the preload script:
@@ -106,6 +115,8 @@ 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 can indirectly access all APIs from the main process through the
+  `remote` and `ipcRenderer` modules.
 - 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.
@@ -133,12 +144,15 @@ following modules:
  - `desktopCapturer`
  - `ipcRenderer`
  - `nativeImage`
+  - `remote`
  - `webFrame`
 - `events`
 - `timers`
 - `url`

-More may be added as needed to expose more Electron APIs in the sandbox.
+More may be added as needed to expose more Electron APIs in the sandbox, but any
+module in the main process can already be used through
+`electron.remote.require`.

 ## Rendering untrusted content

--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -91,41 +91,6 @@ session.defaultSession.on('will-download', (event, item, webContents) => {
 })
 ```

-#### Event: 'extension-loaded'
-
-Returns:
-
-* `event` Event
-* `extension` [Extension](structures/extension.md)
-
-Emitted after an extension is loaded. This occurs whenever an extension is
-added to the "enabled" set of extensions. This includes:
-
- Extensions being loaded from `Session.loadExtension`.
- Extensions being reloaded:
-  * from a crash.
-  * if the extension requested it ([`chrome.runtime.reload()`](https://developer.chrome.com/extensions/runtime#method-reload)).
-
-#### Event: 'extension-unloaded'
-
-Returns:
-
-* `event` Event
-* `extension` [Extension](structures/extension.md)
-
-Emitted after an extension is unloaded. This occurs when
-`Session.removeExtension` is called.
-
-#### Event: 'extension-ready'
-
-Returns:
-
-* `event` Event
-* `extension` [Extension](structures/extension.md)
-
-Emitted after an extension is loaded and all necessary browser state is
-initialized to support the start of the extension's background page.
-
 #### Event: 'preconnect'

 Returns:
@@ -179,76 +144,6 @@ Emitted when a hunspell dictionary file download fails.  For details
 on the failure you should collect a netlog and inspect the download
 request.

-#### Event: 'select-serial-port' _Experimental_
-
-Returns:
-
-* `event` Event
-* `portList` [SerialPort[]](structures/serial-port.md)
-* `webContents` [WebContents](web-contents.md)
-* `callback` Function
-  * `portId` String
-
-Emitted when a serial port needs to be selected when a call to
-`navigator.serial.requestPort` is made. `callback` should be called with
-`portId` to be selected, passing an empty string to `callback` will
-cancel the request.  Additionally, permissioning on `navigator.serial` can
-be managed by using [ses.setPermissionCheckHandler(handler)](#sessetpermissioncheckhandlerhandler)
-with the `serial` permission.
-
-Because this is an experimental feature it is disabled by default.  To enable this feature, you
-will need to use the `--enable-features=ElectronSerialChooser` command line switch.  Additionally
-because this is an experimental Chromium feature you will need to set `enableBlinkFeatures: 'Serial'`
-on the `webPreferences` property when opening a BrowserWindow.
-
-```javascript
-const { app, BrowserWindow } = require('electron')
-
-let win = null
-app.commandLine.appendSwitch('enable-features', 'ElectronSerialChooser')
-
-app.whenReady().then(() => {
-  win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      enableBlinkFeatures: 'Serial'
-    }
-  })
-  win.webContents.session.on('select-serial-port', (event, portList, callback) => {
-    event.preventDefault()
-    const selectedPort = portList.find((device) => {
-      return device.vendorId === 0x2341 && device.productId === 0x0043
-    })
-    if (!selectedPort) {
-      callback('')
-    } else {
-      callback(result1.portId)
-    }
-  })
-})
-```
-
-#### Event: 'serial-port-added' _Experimental_
-
-Returns:
-
-* `event` Event
-* `port` [SerialPort](structures/serial-port.md)
-* `webContents` [WebContents](web-contents.md)
-
-Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a new serial port becomes available.  For example, this event will fire when a new USB device is plugged in.
-
-#### Event: 'serial-port-removed' _Experimental_
-
-Returns:
-
-* `event` Event
-* `port` [SerialPort](structures/serial-port.md)
-* `webContents` [WebContents](web-contents.md)
-
-Emitted after `navigator.serial.requestPort` has been called and `select-serial-port` has fired if a serial port has been removed.  For example, this event will fire when a USB device is unplugged.
-
 ### Instance Methods

 The following methods are available on instances of `Session`:
@@ -284,27 +179,6 @@ Writes any unwritten DOMStorage data to disk.
 #### `ses.setProxy(config)`

 * `config` Object
-  * `mode` String (optional) - The proxy mode. Should be one of `direct`,
-    `auto_detect`, `pac_script`, `fixed_servers` or `system`. If it's
-    unspecified, it will be automatically determined based on other specified
-    options.
-    * `direct`
-      In direct mode all connections are created directly, without any proxy involved.
-    * `auto_detect`
-      In auto_detect mode the proxy configuration is determined by a PAC script that can
-      be downloaded at http://wpad/wpad.dat.
-    * `pac_script`
-      In pac_script mode the proxy configuration is determined by a PAC script that is
-      retrieved from the URL specified in the `pacScript`. This is the default mode
-      if `pacScript` is specified.
-    * `fixed_servers`
-      In fixed_servers mode the proxy configuration is specified in `proxyRules`.
-      This is the default mode if `proxyRules` is specified.
-    * `system`
-      In system mode the proxy configuration is taken from the operating system.
-      Note that the system mode is different from setting no proxy configuration.
-      In the latter case, Electron falls back to the system settings
-      only if no command-line options influence the proxy configuration.
  * `pacScript` String (optional) - The URL associated with the PAC file.
  * `proxyRules` String (optional) - Rules indicating which proxies to use.
  * `proxyBypassRules` String (optional) - Rules indicating which URLs should
@@ -314,12 +188,9 @@ Returns `Promise<void>` - Resolves when the proxy setting process is complete.

 Sets the proxy settings.

-When `mode` is unspecified, `pacScript` and `proxyRules` are provided together, the `proxyRules`
+When `pacScript` and `proxyRules` are provided together, the `proxyRules`
 option is ignored and `pacScript` configuration is applied.

-You may need `ses.closeAllConnections` to close currently in flight connections to prevent
-pooled sockets using previous proxy from being reused by future requests.
-
 The `proxyRules` has to follow the rules below:

 ```sh
@@ -355,7 +226,7 @@ The `proxyBypassRules` is a comma separated list of rules described below:
     "foobar.com", "*foobar.com", "*.foobar.com", "*foobar.com:99",
     "https://x.*.y.com:99"

-* `"." HOSTNAME_SUFFIX_PATTERN [ ":" PORT ]`
+ * `"." HOSTNAME_SUFFIX_PATTERN [ ":" PORT ]`

   Match a particular domain suffix.

@@ -388,10 +259,6 @@ The `proxyBypassRules` is a comma separated list of rules described below:

 Returns `Promise<String>` - Resolves with the proxy information for `url`.

-#### `ses.forceReloadProxyConfig()`
-
-Returns `Promise<void>` - Resolves when the all internal states of proxy service is reset and the latest proxy configuration is reapplied if it's already available. The pac script will be fetched from `pacScript` again if the proxy mode is `pac_script`.
-
 #### `ses.setDownloadPath(path)`

 * `path` String - The download location.
@@ -433,12 +300,6 @@ window.webContents.session.enableNetworkEmulation({ offline: true })

 Preconnects the given number of sockets to an origin.

-#### `ses.closeAllConnections()`
-
-Returns `Promise<void>` - Resolves when all connections are closed.
-
-**Note:** It will terminate / fail all requests currently in flight.
-
 #### `ses.disableNetworkEmulation()`

 Disables any network emulation already active for the `session`. Resets to
@@ -455,7 +316,7 @@ the original network configuration.
    * `errorCode` Integer - Error code.
  * `callback` Function
    * `verificationResult` Integer - Value can be one of certificate error codes
-    from [here](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).
+    from [here](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).
    Apart from the certificate error codes, the following special codes can be used.
      * `0` - Indicates success and disables Certificate Transparency verification.
      * `-2` - Indicates failure.
@@ -483,14 +344,11 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
 })
 ```

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

 * `handler` Function | null
  * `webContents` [WebContents](web-contents.md) - WebContents requesting the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
  * `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.
    * `mediaKeySystem` - Request access to DRM protected content.
    * `geolocation` - Request access to user's current location.
@@ -526,9 +384,9 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents

 #### `ses.setPermissionCheckHandler(handler)`

-* `handler` Function\<Boolean> | null
+* `handler` Function<Boolean> | null
  * `webContents` [WebContents](web-contents.md) - WebContents checking the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
-  * `permission` String - Type of permission check.  Valid values are `midiSysex`, `notifications`, `geolocation`, `media`,`mediaKeySystem`,`midi`, `pointerLock`, `fullscreen`, `openExternal`, or `serial`.
+  * `permission` String - Enum of 'media'.
  * `requestingOrigin` String - The origin URL of the permission check
  * `details` Object - Some properties are only available on certain permission types.
    * `securityOrigin` String - The security origin of the `media` check.
@@ -600,29 +458,6 @@ will be temporary.

 Returns `String` - The user agent for this session.

-#### `ses.setSSLConfig(config)`
-
-* `config` Object
-  * `minVersion` String (optional) - Can be `tls1`, `tls1.1`, `tls1.2` or `tls1.3`. The
-    minimum SSL version to allow when connecting to remote servers. Defaults to
-    `tls1`.
-  * `maxVersion` String (optional) - Can be `tls1.2` or `tls1.3`. The maximum SSL version
-    to allow when connecting to remote servers. Defaults to `tls1.3`.
-  * `disabledCipherSuites` Integer[] (optional) - List of cipher suites which
-    should be explicitly prevented from being used in addition to those
-    disabled by the net built-in policy.
-    Supported literal forms: 0xAABB, where AA is `cipher_suite[0]` and BB is
-    `cipher_suite[1]`, as defined in RFC 2246, Section 7.4.1.2. Unrecognized but
-    parsable cipher suites in this form will not return an error.
-    Ex: To disable TLS_RSA_WITH_RC4_128_MD5, specify 0x0004, while to
-    disable TLS_ECDH_ECDSA_WITH_RC4_128_SHA, specify 0xC002.
-    Note that TLSv1.3 ciphers cannot be disabled using this mechanism.
-
-Sets the SSL configuration for the session. All subsequent network requests
-will use the new configuration. Existing network connections (such as WebSocket
-connections) will not be terminated, but old sockets in the pool will not be
-reused for new connections.
-
 #### `ses.getBlobData(identifier)`

 * `identifier` String - Valid UUID.
@@ -675,16 +510,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.
@@ -813,11 +638,7 @@ The following properties are available on instances of `Session`:
 #### `ses.availableSpellCheckerLanguages` _Readonly_

 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.
+code to the `setSpellCheckerLanaguages` API that isn't in this array will result in an error.

 #### `ses.cookies` _Readonly_

@@ -841,12 +662,12 @@ const path = require('path')

 app.whenReady().then(() => {
  const protocol = session.fromPartition('some-partition').protocol
-  if (!protocol.registerFileProtocol('atom', (request, callback) => {
+  protocol.registerFileProtocol('atom', (request, callback) => {
    const url = request.url.substr(7)
    callback({ path: path.normalize(`${__dirname}/${url}`) })
-  })) {
-    console.error('Failed to register protocol')
-  }
+  }, (error) => {
+    if (error) console.error('Failed to register protocol')
+  })
 })
 ```

--- a/docs/api/share-menu.md
+++ b/docs/api/share-menu.md
@@ -1,45 +0,0 @@
-## 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
-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).
-
-### `new ShareMenu(sharingItem)`
-
-* `sharingItem` SharingItem - The item to share.
-
-Creates a new share menu.
-
-### Instance Methods
-
-The `shareMenu` object has the following instance methods:
-
-#### `shareMenu.popup([options])`
-
-* `options` PopupOptions (optional)
-  * `browserWindow` [BrowserWindow](browser-window.md) (optional) - Default is the focused window.
-  * `x` Number (optional) - Default is the current mouse cursor position.
-    Must be declared if `y` is declared.
-  * `y` Number (optional) - Default is the current mouse cursor position.
-    Must be declared if `x` is declared.
-  * `positioningItem` Number (optional) _macOS_ - The index of the menu item to
-    be positioned under the mouse cursor at the specified coordinates. Default
-    is -1.
-  * `callback` Function (optional) - Called when menu is closed.
-
-Pops up this menu as a context menu in the [`BrowserWindow`](browser-window.md).
-
-#### `shareMenu.closePopup([browserWindow])`
-
-* `browserWindow` [BrowserWindow](browser-window.md) (optional) - Default is the focused window.
-
-Closes the context menu in the `browserWindow`.
-
-[share-menu]: https://developer.apple.com/design/human-interface-guidelines/macos/extensions/share-extensions/
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -45,27 +45,15 @@ Returns `Promise<void>`

 Open the given external protocol URL in the desktop's default manner. (For example, mailto: URLs in the user's default mail agent).

-### `shell.moveItemToTrash(fullPath[, deleteOnFail])` _Deprecated_
+### `shell.moveItemToTrash(fullPath[, deleteOnFail])`

 * `fullPath` String
 * `deleteOnFail` Boolean (optional) - Whether or not to unilaterally remove the item if the Trash is disabled or unsupported on the volume. _macOS_

 Returns `Boolean` - Whether the item was successfully moved to the trash or otherwise deleted.

-> NOTE: This method is deprecated. Use `shell.trashItem` instead.
-
 Move the given file to trash and returns a boolean status for the operation.

-### `shell.trashItem(path)`
-
-* `path` String - path to the item to be moved to the trash.
-
-Returns `Promise<void>` - Resolves when the operation has been completed.
-Rejects if there was an error while deleting the requested item.
-
-This moves a path to the OS-specific trash location (Trash on macOS, Recycle
-Bin on Windows, and a desktop-environment-specific location on Linux).
-
 ### `shell.beep()`

 Play the beep sound.
--- a/docs/api/structures/display.md
+++ b/docs/api/structures/display.md
@@ -10,7 +10,6 @@
 * `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)
 * `size` [Size](size.md)
 * `workArea` [Rectangle](rectangle.md)
--- a/docs/api/structures/ipc-renderer-event.md
+++ b/docs/api/structures/ipc-renderer-event.md
@@ -4,4 +4,4 @@
 * `senderId` Integer - The `webContents.id` that sent the message, you can call `event.sender.sendTo(event.senderId, ...)` to reply to the message, see [ipcRenderer.sendTo][ipc-renderer-sendto] for more information. This only applies to messages sent from a different renderer. Messages sent directly from the main process set `event.senderId` to `0`.
 * `ports` MessagePort[] - A list of MessagePorts that were transferred with this message

-[ipc-renderer-sendto]: ../ipc-renderer.md#ipcrenderersendtowebcontentsid-channel-args
+[ipc-renderer-sendto]: #ipcrenderersendtowindowid-channel--arg1-arg2-
--- a/docs/api/structures/new-window-web-contents-event.md
+++ b/docs/api/structures/new-window-web-contents-event.md
@@ -1,3 +1,4 @@
 # NewWindowWebContentsEvent Object extends `Event`

 * `newGuest` BrowserWindow (optional)
+
--- a/docs/api/structures/notification-response.md
+++ b/docs/api/structures/notification-response.md
@@ -1,7 +0,0 @@
-# NotificationResponse Object
-
-* `actionIdentifier` String - The identifier string of the action that the user selected.
-* `date` Number - The delivery date of the notification.
-* `identifier` String - The unique identifier for this notification request.
-* `userInfo` Record<String, any> - A dictionary of custom information associated with the notification.
-* `userText` String (optional) - The text entered or chosen by the user.
--- a/docs/api/structures/process-metric.md
+++ b/docs/api/structures/process-metric.md
@@ -11,8 +11,7 @@
  * `Pepper Plugin`
  * `Pepper Plugin Broker`
  * `Unknown`
-* `serviceName` String (optional) - The non-localized name of the process.
-* `name` String (optional) - The name of the process.
+* `name` String (optional) - The name of the process. i.e. for plugins it might be Flash.
    Examples for utility: `Audio Service`, `Content Decryption Module Service`, `Network Service`, `Video Capture`, etc.
 * `cpu` [CPUUsage](cpu-usage.md) - CPU usage of the process.
 * `creationTime` Number - Creation time for this process.
--- a/docs/api/structures/protocol-response.md
+++ b/docs/api/structures/protocol-response.md
@@ -28,7 +28,7 @@
 * `session` Session (optional) - The session used for requesting URL, by default
  the HTTP request will reuse the current session. Setting `session` to `null`
  would use a random independent session. This is only used for URL responses.
-* `uploadData` [ProtocolResponseUploadData](protocol-response-upload-data.md) (optional) - The data used as upload data. This is only
+* `uploadData` ProtocolResponseUploadData (optional) - The data used as upload data. This is only
  used for URL responses when `method` is `"POST"`.

-[net-error]: https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h
+[net-error]: https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h
--- a/docs/api/structures/serial-port.md
+++ b/docs/api/structures/serial-port.md
@@ -1,10 +0,0 @@
-# SerialPort Object
-
-* `portId` String - Unique identifier for the port.
-* `portName` String - Name of the port.
-* `displayName` String - A string suitable for display to the user for describing this device.
-* `vendorId` String - Optional USB vendor ID.
-* `productId` String - Optional USB product ID.
-* `serialNumber` String - The USB device serial number.
-* `usbDriverName` String (optional) - Represents a single serial port on macOS can be enumerated by multiple drivers.
-* `deviceInstanceId` String (optional) - A stable identifier on Windows that can be used for device permissions.
--- a/docs/api/structures/sharing-item.md
+++ b/docs/api/structures/sharing-item.md
@@ -1,5 +0,0 @@
-# SharingItem Object
-
-* `texts` String[] (optional) - An array of text to share.
-* `filePaths` String[] (optional) - An array of files to share.
-* `urls` String[] (optional) - An array of URLs to share.
--- a/docs/api/structures/shortcut-details.md
+++ b/docs/api/structures/shortcut-details.md
@@ -13,5 +13,3 @@ target's icon.
 DLL or EXE. Default is 0.
 * `appUserModelId` String (optional) - The Application User Model ID. Default
 is empty.
-* `toastActivatorClsid` String (optional) - The Application Toast Activator CLSID. Needed
-for participating in Action Center.
--- a/docs/api/structures/upload-blob.md
+++ b/docs/api/structures/upload-blob.md
@@ -0,0 +1,4 @@
+# UploadBlob Object
+
+* `type` String - `blob`.
+* `blobUUID` String - UUID of blob data to upload.
--- a/docs/api/synopsis.md
+++ b/docs/api/synopsis.md
@@ -9,11 +9,11 @@ the [native modules](../tutorial/using-native-node-modules.md)).
 Electron also provides some extra built-in modules for developing native
 desktop applications. Some modules are only available in the main process, some
 are only available in the renderer process (web page), and some can be used in
-either process type.
+both processes.

 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](../tutorial/quick-start.md#main-and-renderer-processes)
+the concept of [main process vs. renderer process](../tutorial/application-architecture.md#main-and-renderer-processes)
 scripts to be able to use those modules.

 The main process script is like a normal Node.js script:
@@ -29,21 +29,21 @@ app.whenReady().then(() => {
 ```

 The renderer process is no different than a normal web page, except for the
-extra ability to use node modules if `nodeIntegration` is enabled:
+extra ability to use node modules:

 ```html
 <!DOCTYPE html>
 <html>
 <body>
 <script>
-  const fs = require('fs')
-  console.log(fs.readFileSync(__filename, 'utf8'))
+  const { app } = require('electron').remote
+  console.log(app.getVersion())
 </script>
 </body>
 </html>
 ```

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

 ## Destructuring assignment

--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -51,6 +51,8 @@ Returns:

 Returns `Boolean` - Whether the system is in Dark Mode.

+**Note:** On macOS 10.15 Catalina in order for this API to return the correct value when in the "automatic" dark mode setting you must either have `NSRequiresAquaSystemAppearance=false` in your `Info.plist` or be on Electron `>=7.0.0`.  See the [dark mode guide](../tutorial/mojave-dark-mode-guide.md) for more information.
+
 **Deprecated:** Should use the new [`nativeTheme.shouldUseDarkColors`](native-theme.md#nativethemeshouldusedarkcolors-readonly) API.

 ### `systemPreferences.isSwipeTrackingFromScrollEventsEnabled()` _macOS_
--- a/docs/api/touch-bar-button.md
+++ b/docs/api/touch-bar-button.md
@@ -2,7 +2,7 @@

 > Create a button in the touch bar for native macOS applications

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarButton(options)`

--- a/docs/api/touch-bar-color-picker.md
+++ b/docs/api/touch-bar-color-picker.md
@@ -2,7 +2,7 @@

 > Create a color picker in the touch bar for native macOS applications

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarColorPicker(options)`

--- a/docs/api/touch-bar-group.md
+++ b/docs/api/touch-bar-group.md
@@ -2,7 +2,7 @@

 > Create a group in the touch bar for native macOS applications

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarGroup(options)`

--- a/docs/api/touch-bar-label.md
+++ b/docs/api/touch-bar-label.md
@@ -2,7 +2,7 @@

 > Create a label in the touch bar for native macOS applications

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarLabel(options)`

--- a/docs/api/touch-bar-other-items-proxy.md
+++ b/docs/api/touch-bar-other-items-proxy.md
@@ -7,6 +7,6 @@
 >
 > Note: Only one instance of this class can be added per TouchBar.

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarOtherItemsProxy()`
--- a/docs/api/touch-bar-popover.md
+++ b/docs/api/touch-bar-popover.md
@@ -2,7 +2,7 @@

 > Create a popover in the touch bar for native macOS applications

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarPopover(options)`

--- a/docs/api/touch-bar-scrubber.md
+++ b/docs/api/touch-bar-scrubber.md
@@ -2,7 +2,7 @@

 > Create a scrubber (a scrollable selector)

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarScrubber(options)`

--- a/docs/api/touch-bar-segmented-control.md
+++ b/docs/api/touch-bar-segmented-control.md
@@ -2,7 +2,7 @@

 > Create a segmented control (a button group) where one button has a selected state

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarSegmentedControl(options)`

--- a/docs/api/touch-bar-slider.md
+++ b/docs/api/touch-bar-slider.md
@@ -2,7 +2,7 @@

 > Create a slider in the touch bar for native macOS applications

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarSlider(options)`

--- a/docs/api/touch-bar-spacer.md
+++ b/docs/api/touch-bar-spacer.md
@@ -2,7 +2,7 @@

 > Create a spacer between two items in the touch bar for native macOS applications

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBarSpacer(options)`

--- a/docs/api/touch-bar.md
+++ b/docs/api/touch-bar.md
@@ -2,7 +2,7 @@

 > Create TouchBar layouts for native macOS applications

-Process: [Main](../glossary.md#main-process)
+Process: [Main](../tutorial/application-architecture.md#main-and-renderer-processes)

 ### `new TouchBar(options)`

--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -52,12 +52,12 @@ app.whenReady().then(() => {
  appIcon.setContextMenu(contextMenu)
 })
 ```
-
 * On Windows it is recommended to use `ICO` icons to get best visual effects.

 If you want to keep exact same behaviors on all platforms, you should not
 rely on the `click` event and always attach a context menu to the tray icon.

+
 ### `new Tray(image, [guid])`

 * `image` ([NativeImage](native-image.md) | String)
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -42,8 +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.
+Returns `WebContents` - A WebContents instance with the given ID.

 ## Class: WebContents

@@ -71,7 +70,7 @@ Returns:
 * `frameRoutingId` Integer

 This event is like `did-finish-load` but emitted when the load failed.
-The full list of error codes and their meaning is available [here](https://source.chromium.org/chromium/chromium/src/+/master:net/base/net_error_list.h).
+The full list of error codes and their meaning is available [here](https://code.google.com/p/chromium/codesearch#chromium/src/net/base/net_error_list.h).

 #### Event: 'did-fail-provisional-load'

@@ -135,7 +134,7 @@ Returns:

 Emitted when page receives favicon urls.

-#### Event: 'new-window' _Deprecated_
+#### Event: 'new-window'

 Returns:

@@ -156,8 +155,6 @@ 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).
-
 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'>`.

@@ -192,39 +189,6 @@ myBrowserWindow.webContents.on('new-window', (event, url, frameName, disposition
 })
 ```

-#### Event: 'did-create-window'
-
-Returns:
-* `window` BrowserWindow
-* `details` Object
-    * `url` String - URL for the created window.
-    * `frameName` String - Name given to the created window in the
-      `window.open()` call.
-    * `options` BrowserWindowConstructorOptions - The options used to create the
-      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).
-      Unrecognized options are not filtered out.
-    * `additionalFeatures` String[] - The non-standard features (features not
-      handled Chromium or Electron) _Deprecated_
-    * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
-      passed to the new window. May or may not result in the `Referer` header
-      being sent, depending on the referrer policy.
-    * `postBody` [PostBody](structures/post-body.md) (optional) - The post data
-      that will be sent to the new window, along with the appropriate headers
-      that will be set. If no post data is to be sent, the value will be `null`.
-      Only defined when the window is being created by a form that set
-      `target=_blank`.
-    * `disposition` String - Can be `default`, `foreground-tab`,
-      `background-tab`, `new-window`, `save-to-disk` and `other`.
-
-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).
-
-See [`window.open()`](window-open.md) for more details and how to use this in conjunction with `webContents.setWindowOpenHandler`.
-
 #### Event: 'will-navigate'

 Returns:
@@ -255,7 +219,7 @@ Returns:
 * `frameProcessId` Integer
 * `frameRoutingId` Integer

-Emitted when any frame (including main) starts navigating. `isInPlace` will be
+Emitted when any frame (including main) starts navigating. `isInplace` will be
 `true` for in-page navigations.

 #### Event: 'will-redirect'
@@ -474,7 +438,6 @@ Emitted when the window leaves a full-screen state triggered by HTML API.
 #### Event: 'zoom-changed'

 Returns:
-
 * `event` Event
 * `zoomDirection` String - Can be `in` or `out`.

@@ -821,7 +784,7 @@ Returns:
 Emitted when `desktopCapturer.getSources()` is called in the renderer process.
 Calling `event.preventDefault()` will make it return empty sources.

-#### Event: 'remote-require' _Deprecated_
+#### Event: 'remote-require'

 Returns:

@@ -832,7 +795,7 @@ Emitted when `remote.require()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the module from being returned.
 Custom value can be returned by setting `event.returnValue`.

-#### Event: 'remote-get-global' _Deprecated_
+#### Event: 'remote-get-global'

 Returns:

@@ -843,7 +806,7 @@ Emitted when `remote.getGlobal()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the global from being returned.
 Custom value can be returned by setting `event.returnValue`.

-#### Event: 'remote-get-builtin' _Deprecated_
+#### Event: 'remote-get-builtin'

 Returns:

@@ -854,7 +817,7 @@ Emitted when `remote.getBuiltin()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the module from being returned.
 Custom value can be returned by setting `event.returnValue`.

-#### Event: 'remote-get-current-window' _Deprecated_
+#### Event: 'remote-get-current-window'

 Returns:

@@ -864,7 +827,7 @@ Emitted when `remote.getCurrentWindow()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the object from being returned.
 Custom value can be returned by setting `event.returnValue`.

-#### Event: 'remote-get-current-web-contents' _Deprecated_
+#### Event: 'remote-get-current-web-contents'

 Returns:

@@ -874,19 +837,6 @@ Emitted when `remote.getCurrentWebContents()` is called in the renderer process.
 Calling `event.preventDefault()` will prevent the object from being returned.
 Custom value can be returned by setting `event.returnValue`.

-#### Event: 'preferred-size-changed'
-
-Returns:
-
-* `event` Event
-* `preferredSize` [Size](structures/size.md) - The minimum size needed to
-  contain the layout of the document—without requiring scrolling.
-
-Emitted when the `WebContents` preferred size has changed.
-
-This event will only be emitted when `enablePreferredSizeMode` is set to `true`
-in `webPreferences`.
-
 ### Instance Methods

 #### `contents.loadURL(url[, options])`
@@ -896,7 +846,7 @@ in `webPreferences`.
  * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer url.
  * `userAgent` String (optional) - A user agent originating the request.
  * `extraHeaders` String (optional) - Extra headers separated by "\n".
-  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md)) (optional)
+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadBlob[]](structures/upload-blob.md)) (optional)
  * `baseURLForDataURL` String (optional) - Base url (with trailing path separator) for files to be loaded by the data url. This is needed only if the specified `url` is a data url and needs to load other files.

 Returns `Promise<void>` - the promise will resolve when the page has finished loading
@@ -1159,22 +1109,6 @@ Works like `executeJavaScript` but evaluates `scripts` in an isolated context.

 Ignore application menu shortcuts while this web contents is focused.

-#### `contents.setWindowOpenHandler(handler)`
-
-* `handler` Function<{action: 'deny'} | {action: 'allow', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions}>
-  * `details` Object
-    * `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
-  without a recognized 'action' value will result in a console error and have
-  the same effect as returning `{action: 'deny'}`.
-
-Called before creating a window when `window.open()` is called from the
-renderer. See [`window.open()`](window-open.md) for more details and how to use this in conjunction with `did-create-window`.
-
 #### `contents.setAudioMuted(muted)`

 * `muted` Boolean
@@ -1211,10 +1145,6 @@ increment above or below represents zooming 20% larger or smaller to default
 limits of 300% and 50% of original size, respectively. The formula for this is
 `scale := 1.2 ^ level`.

-> **NOTE**: The zoom policy at the Chromium level is same-origin, meaning that the
-> zoom level for a specific domain propagates across all instances of windows with
-> the same domain. Differentiating the window URLs will make zoom work per-window.
-
 #### `contents.getZoomLevel()`

 Returns `Number` - the current zoom level.
@@ -1306,6 +1236,12 @@ Inserts `text` to the focused element.
    defaults to `false`.
  * `matchCase` Boolean (optional) - Whether search should be case-sensitive,
    defaults to `false`.
+  * `wordStart` Boolean (optional) - Whether to look only at the start of words.
+    defaults to `false`.
+  * `medialCapitalAsWordStart` Boolean (optional) - When combined with `wordStart`,
+    accepts a match in the middle of a word if the match begins with an
+    uppercase letter followed by a lowercase or non-letter.
+    Accepts several other intra-word matches, defaults to `false`.

 Returns `Integer` - The request id used for the request.

@@ -1388,9 +1324,9 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
  * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
  * `collate` Boolean (optional) - Whether the web page should be collated.
  * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Object[]  (optional) - The page range to print. On macOS, only one range is honored.
-    * `from` Number - Index of the first page to print (0-based).
-    * `to` Number - Index of the last page to print (inclusive) (0-based).
+  * `pageRanges` Record<string, number> (optional) - The page range to print.
+    * `from` Number - the start page.
+    * `to` Number - the end page.
  * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
  * `dpi` Record<string, number> (optional)
    * `horizontal` Number (optional) - The horizontal dpi.
@@ -1416,10 +1352,10 @@ Example usage:
 const options = {
  silent: true,
  deviceName: 'My-Printer',
-  pageRanges: [{
+  pageRanges: {
    from: 0,
    to: 1
-  }]
+  }
 }
 win.webContents.print(options, (success, errorType) => {
  if (!success) console.log(errorType)
@@ -1437,8 +1373,8 @@ win.webContents.print(options, (success, errorType) => {
    default margin, 1 for no margin, and 2 for minimum margin.
  * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
  * `pageRanges` Record<string, number> (optional) - The page range to print.
-    * `from` Number - Index of the first page to print (0-based).
-    * `to` Number - Index of the last page to print (inclusive) (0-based).
+    * `from` Number - zero-based index of the first page to print.
+    * `to` Number - zero-based index of the last page to print (inclusive).
  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height` and `width` in microns.
  * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
@@ -1545,7 +1481,7 @@ An example of showing devtools in a `<webview>` tag:
  <webview id="browser" src="https://github.com"></webview>
  <webview id="devtools" src="about:blank"></webview>
  <script>
-    const { ipcRenderer } = require('electron')
+    const { webContents } = require('electron').remote
    const emittedOnce = (element, eventName) => new Promise(resolve => {
      element.addEventListener(eventName, event => resolve(event), { once: true })
    })
@@ -1554,26 +1490,16 @@ An example of showing devtools in a `<webview>` tag:
    const browserReady = emittedOnce(browserView, 'dom-ready')
    const devtoolsReady = emittedOnce(devtoolsView, 'dom-ready')
    Promise.all([browserReady, devtoolsReady]).then(() => {
-      const targetId = browserView.getWebContentsId()
-      const devtoolsId = devtoolsView.getWebContentsId()
-      ipcRenderer.send('open-devtools', targetId, devtoolsId)
+      const browser = webContents.fromId(browserView.getWebContentsId())
+      const devtools = webContents.fromId(devtoolsView.getWebContentsId())
+      browser.setDevToolsWebContents(devtools)
+      browser.openDevTools()
    })
  </script>
 </body>
 </html>
 ```

-```js
-// Main process
-const { ipcMain, webContents } = require('electron')
-ipcMain.on('open-devtools', (event, targetContentsId, devtoolsContentsId) => {
-  const target = webContents.fromId(targetContentsId)
-  const devtools = webContents.fromId(devtoolsContentsId)
-  target.setDevToolsWebContents(devtools)
-  target.openDevTools()
-})
-```
-
 An example of showing devtools in a `BrowserWindow`:

 ```js
@@ -1743,7 +1669,6 @@ 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()
@@ -2004,7 +1929,3 @@ A [`Debugger`](debugger.md) instance for this webContents.

 A `Boolean` property that determines whether or not this WebContents will throttle animations and timers
 when the page becomes backgrounded. This also affects the Page Visibility API.
-
-#### `contents.mainFrame` _Readonly_
-
-A [`WebFrameMain`](web-frame-main.md) property that represents the top frame of the page's frame hierarchy.
--- a/docs/api/web-frame-main.md
+++ b/docs/api/web-frame-main.md
@@ -1,142 +0,0 @@
-# webFrameMain
-
-> Control web pages and iframes.
-
-Process: [Main](../glossary.md#main-process)
-
-The `webFrameMain` module can be used to lookup frames across existing
-[`WebContents`](web-contents.md) instances. Navigation events are the common
-use case.
-
-```javascript
-const { BrowserWindow, webFrameMain } = require('electron')
-
-const win = new BrowserWindow({ width: 800, height: 1500 })
-win.loadURL('https://twitter.com')
-
-win.webContents.on(
-  'did-frame-navigate',
-  (event, url, isMainFrame, frameProcessId, frameRoutingId) => {
-    const frame = webFrameMain.fromId(frameProcessId, frameRoutingId)
-    if (frame) {
-      const code = 'document.body.innerHTML = document.body.innerHTML.replaceAll("heck", "h*ck")'
-      frame.executeJavaScript(code)
-    }
-  }
-)
-```
-
-You can also access frames of existing pages by using the `webFrame` property
-of [`WebContents`](web-contents.md).
-
-```javascript
-const { BrowserWindow } = require('electron')
-
-async function main () {
-  const win = new BrowserWindow({ width: 800, height: 600 })
-  await win.loadURL('https://reddit.com')
-
-  const youtubeEmbeds = win.webContents.mainFrame.frames.filter((frame) => {
-    try {
-      const url = new URL(frame.url)
-      return url.host === 'www.youtube.com'
-    } catch {
-      return false
-    }
-  })
-
-  console.log(youtubeEmbeds)
-}
-
-main()
-```
-
-## Methods
-
-These methods can be accessed from the `webFrameMain` module:
-
-### `webFrameMain.fromId(processId, routingId)`
-
-* `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` - A frame with the given process and routing IDs.
-
-## Class: WebFrameMain
-
-Process: [Main](../glossary.md#main-process)
-
-### Instance Methods
-
-#### `frame.executeJavaScript(code[, userGesture])`
-
-* `code` String
-* `userGesture` Boolean (optional) - Default is `false`.
-
-Returns `Promise<unknown>` - A promise that resolves with the result of the executed
-code or is rejected if execution throws or results in a rejected promise.
-
-Evaluates `code` in page.
-
-In the browser window some HTML APIs like `requestFullScreen` can only be
-invoked by a gesture from the user. Setting `userGesture` to `true` will remove
-this limitation.
-
-#### `frame.reload()`
-
-Returns `boolean` - Whether the reload was initiated successfully. Only results in `false` when the frame has no history.
-
-### Instance Properties
-
-#### `frame.url` _Readonly_
-
-A `string` representing the current URL of the frame.
-
-#### `frame.top` _Readonly_
-
-A `WebFrameMain | null` representing top frame in the frame hierarchy to which `frame`
-belongs.
-
-#### `frame.parent` _Readonly_
-
-A `WebFrameMain | null` representing parent frame of `frame`, the property would be
-`null` if `frame` is the top frame in the frame hierarchy.
-
-#### `frame.frames` _Readonly_
-
-A `WebFrameMain[]` collection containing the direct descendents of `frame`.
-
-#### `frame.framesInSubtree` _Readonly_
-
-A `WebFrameMain[]` collection containing every frame in the subtree of `frame`,
-including itself. This can be useful when traversing through all frames.
-
-#### `frame.frameTreeNodeId` _Readonly_
-
-An `Integer` representing the id of the frame's internal FrameTreeNode
-instance. This id is browser-global and uniquely identifies a frame that hosts
-content. The identifier is fixed at the creation of the frame and stays
-constant for the lifetime of the frame. When the frame is removed, the id is
-not used again.
-
-#### `frame.name` _Readonly_
-
-A `String` representing the frame name.
-
-#### `frame.osProcessId` _Readonly_
-
-An `Integer` representing the operating system `pid` of the process which owns this frame.
-
-#### `frame.processId` _Readonly_
-
-An `Integer` representing the Chromium internal `pid` of the process which owns this frame.
-This is not the same as the OS process ID; to read that use `frame.osProcessId`.
-
-#### `frame.routingId` _Readonly_
-
-An `Integer` representing the unique frame id in the current renderer process.
-Distinct `WebFrameMain` instances that refer to the same underlying frame will
-have the same `routingId`.
--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -41,10 +41,6 @@ Changes the zoom level to the specified level. The original size is 0 and each
 increment above or below represents zooming 20% larger or smaller to default
 limits of 300% and 50% of original size, respectively.

-> **NOTE**: The zoom policy at the Chromium level is same-origin, meaning that the
-> zoom level for a specific domain propagates across all instances of windows with
-> the same domain. Differentiating the window URLs will make zoom work per-window.
-
 ### `webFrame.getZoomLevel()`

 Returns `Number` - The current zoom level.
@@ -175,7 +171,6 @@ reject and the `result` would be `undefined`. This is because Chromium does not
 dispatch errors of isolated worlds to foreign worlds.

 ### `webFrame.setIsolatedWorldInfo(worldId, info)`
-
 * `worldId` Integer - The ID of the world to run the javascript in, `0` is the default world, `999` is the world used by Electrons `contextIsolation` feature. Chrome extensions reserve the range of IDs in `[1 << 20, 1 << 29)`. You can provide any integer here.
 * `info` Object
  * `securityOrigin` String (optional) - Security origin for the isolated world.
@@ -258,20 +253,6 @@ renderer process.

 Returns `WebFrame` - that has the supplied `routingId`, `null` if not found.

-### `webFrame.isWordMisspelled(word)`
-
-* `word` String - The word to be spellchecked.
-
-Returns `Boolean` - True if the word is misspelled according to the built in
-spellchecker, false otherwise. If no dictionary is loaded, always return false.
-
-### `webFrame.getWordSuggestions(word)`
-
-* `word` String - The misspelled word.
-
-Returns `String[]` - A list of suggested words for a given word. If the word
-is spelled correctly, the result will be empty.
-
 ## Properties

 ### `webFrame.top` _Readonly_
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -137,7 +137,7 @@ This option is disabled by default in the guest page.
 ```

 A `Boolean`. When this attribute is `false` the guest page in `webview` will not have access
-to the [`remote`](remote.md) module. The remote module is unavailable by default.
+to the [`remote`](remote.md) module. The remote module is available by default.

 ### `plugins`

@@ -274,7 +274,7 @@ webview.addEventListener('dom-ready', () => {
  * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer url.
  * `userAgent` String (optional) - A user agent originating the request.
  * `extraHeaders` String (optional) - Extra headers separated by "\n"
-  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md)) (optional)
+  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md) | [UploadBlob[]](structures/upload-blob.md)) (optional)
  * `baseURLForDataURL` String (optional) - Base url (with trailing path separator) for files to be loaded by the data url. This is needed only if the specified `url` is a data url and needs to load other files.

 Returns `Promise<void>` - The promise will resolve when the page has finished loading
@@ -519,6 +519,12 @@ Inserts `text` to the focused element.
    defaults to `false`.
  * `matchCase` Boolean (optional) - Whether search should be case-sensitive,
    defaults to `false`.
+  * `wordStart` Boolean (optional) - Whether to look only at the start of words.
+    defaults to `false`.
+  * `medialCapitalAsWordStart` Boolean (optional) - When combined with `wordStart`,
+    accepts a match in the middle of a word if the match begins with an
+    uppercase letter followed by a lowercase or non-letter.
+    Accepts several other intra-word matches, defaults to `false`.

 Returns `Integer` - The request id used for the request.

@@ -554,9 +560,9 @@ Stops any `findInPage` request for the `webview` with the provided `action`.
  * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
  * `collate` Boolean (optional) - Whether the web page should be collated.
  * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Object[] (optional) - The page range to print.
-    * `from` Number - Index of the first page to print (0-based).
-    * `to` Number - Index of the last page to print (inclusive) (0-based).
+  * `pageRanges` Record<string, number> (optional) - The page range to print.
+    * `from` Number - zero-based index of the first page to print.
+    * `to` Number - zero-based index of the last page to print (inclusive).
  * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
  * `dpi` Record<string, number> (optional)
    * `horizontal` Number (optional) - The horizontal dpi.
@@ -581,9 +587,9 @@ Prints `webview`'s web page. Same as `webContents.print([options])`.
    default margin, 1 for no margin, and 2 for minimum margin.
    and `width` in microns.
  * `scaleFactor` Number (optional) - The scale factor of the web page. Can range from 0 to 100.
-  * `pageRanges` Record<string, number> (optional) - The page range to print. On macOS, only the first range is honored.
-    * `from` Number - Index of the first page to print (0-based).
-    * `to` Number - Index of the last page to print (inclusive) (0-based).
+  * `pageRanges` Record<string, number> (optional) - The page range to print.
+    * `from` Number - the first page to print.
+    * `to` Number - the last page to print (inclusive).
  * `pageSize` String | Size (optional) - Specify page size of the generated PDF. Can be `A3`,
  `A4`, `A5`, `Legal`, `Letter`, `Tabloid` or an Object containing `height`
  * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
@@ -642,10 +648,6 @@ increment above or below represents zooming 20% larger or smaller to default
 limits of 300% and 50% of original size, respectively. The formula for this is
 `scale := 1.2 ^ level`.

-> **NOTE**: The zoom policy at the Chromium level is same-origin, meaning that the
-> zoom level for a specific domain propagates across all instances of windows with
-> the same domain. Differentiating the window URLs will make zoom work per-window.
-
 ### `<webview>.getZoomFactor()`

 Returns `Number` - the current zoom factor.
--- a/docs/api/window-open.md
+++ b/docs/api/window-open.md
@@ -1,34 +1,18 @@
-# Opening windows from the renderer
+# `window.open` Function

-There are several ways to control how windows are created from trusted or
-untrusted content within a renderer. Windows can be created from the renderer in two ways:
+> Open a new window and load a URL.

- clicking on links or submitting forms adorned with `target=_blank`
- JavaScript calling `window.open()`
+When `window.open` is called to create a new window in a web page, a new instance
+of [`BrowserWindow`](browser-window.md) will be created for the `url` and a proxy will be returned
+to `window.open` to let the page have limited control over it.

-In non-sandboxed renderers, or when `nativeWindowOpen` is false (the default), this results in the creation of a
-[`BrowserWindowProxy`](browser-window-proxy.md), a light wrapper around
-`BrowserWindow`.
+The proxy has limited standard functionality implemented to be
+compatible with traditional web pages. For full control of the new window
+you should create a `BrowserWindow` directly.

-However, when the `sandbox` (or directly, `nativeWindowOpen`) option is set, a
-`Window` instance is created, as you'd expect in the browser. For same-origin
-content, the new window is created within the same process, enabling the parent
-to access the child window directly. This can be very useful for app sub-windows that act
-as preference panels, or similar, as the parent can render to the sub-window
-directly, as if it were a `div` in the parent.
-
-Electron pairs this native Chrome `Window` with a BrowserWindow under the hood.
-You can take advantage of all the customization available when creating a
-BrowserWindow in the main process by using `webContents.setWindowOpenHandler()`
-for renderer-created windows.
-
-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).
-Note that `webContents.setWindowOpenHandler` has final say and full privilege
-because it is invoked in the main process.
+The newly created `BrowserWindow` will inherit the parent window's options by
+default. To override inherited options you can set them in the `features`
+string.

 ### `window.open(url[, frameName][, features])`

@@ -36,22 +20,15 @@ because it is invoked in the main process.
 * `frameName` String (optional)
 * `features` String (optional)

-Returns [`BrowserWindowProxy`](browser-window-proxy.md) | [`Window`](https://developer.mozilla.org/en-US/docs/Web/API/Window)
+Returns [`BrowserWindowProxy`](browser-window-proxy.md) - Creates a new window
+and returns an instance of `BrowserWindowProxy` class.

-`features` is a comma-separated key-value list, following the standard format of
-the browser. Electron will parse `BrowserWindowConstructorOptions` out of this
-list where possible, for convenience. For full control and better ergonomics,
-consider using `webContents.setWindowOpenHandler` to customize the
-BrowserWindow creation.
-
-A subset of `WebPreferences` can be set directly,
-unnested, from the features string: `zoomFactor`, `nodeIntegration`, `preload`,
-`javascript`, `contextIsolation`, and `webviewTag`.
+The `features` string follows the format of standard browser, but each feature
+has to be a field of `BrowserWindow`'s options. These are the features you can set via `features` string: `zoomFactor`, `nodeIntegration`, `preload`, `javascript`, `contextIsolation`, `webviewTag`.

 For example:
-
 ```js
-window.open('https://github.com', '_blank', 'top=500,left=200,frame=false,nodeIntegration=no')
+window.open('https://github.com', '_blank', 'nodeIntegration=no')
 ```

 **Notes:**
@@ -63,74 +40,60 @@ window.open('https://github.com', '_blank', 'top=500,left=200,frame=false,nodeIn
 * JavaScript will always be disabled in the opened `window` if it is disabled on
  the parent window.
 * Non-standard features (that are not handled by Chromium or Electron) given in
-  `features` will be passed to any registered `webContents`'s
-  `did-create-window` event handler in the `additionalFeatures` argument.
+  `features` will be passed to any registered `webContent`'s `new-window` event
+  handler in the `additionalFeatures` argument.

-To customize or cancel the creation of the window, you can optionally set an
-override handler with `webContents.setWindowOpenHandler()` from the main
-process. Returning `false` cancels the window, while returning an object sets
-the `BrowserWindowConstructorOptions` used when creating the window. Note that
-this is more powerful than passing options through the feature string, as the
-renderer has more limited privileges in deciding security preferences than the
-main process.
+### `window.opener.postMessage(message, targetOrigin)`

-### `BrowserWindowProxy` example
+* `message` String
+* `targetOrigin` String

-```javascript
+Sends a message to the parent window with the specified origin or `*` for no
+origin preference.

-// main.js
-const mainWindow = new BrowserWindow()
+### Using Chrome's `window.open()` implementation

-mainWindow.webContents.setWindowOpenHandler(({ url }) => {
-  if (url.startsWith('https://github.com/')) {
-    return true
-  }
-  return false
-})
+If you want to use Chrome's built-in `window.open()` implementation, set
+`nativeWindowOpen` to `true` in the `webPreferences` options object.

-mainWindow.webContents.on('did-create-window', (childWindow) => {
-  // For example...
-  childWindow.webContents('will-navigate', (e) => {
-    e.preventDefault()
-  })
-})
+Native `window.open()` allows synchronous access to opened windows so it is
+convenient choice if you need to open a dialog or a preferences window.
+
+This option can also be set on `<webview>` tags as well:
+
+```html
+<webview webpreferences="nativeWindowOpen=yes"></webview>
 ```

-```javascript
-// renderer.js
-const windowProxy = window.open('https://github.com/', null, 'minimizable=false')
-windowProxy.postMessage('hi', '*')
-```
-
-### Native `Window` example
+The creation of the `BrowserWindow` is customizable via `WebContents`'s
+`new-window` event.

 ```javascript
-// main.js
+// main process
 const mainWindow = new BrowserWindow({
+  width: 800,
+  height: 600,
  webPreferences: {
    nativeWindowOpen: true
  }
 })
-
-// In this example, only windows with the `about:blank` url will be created.
-// All other urls will be blocked.
-mainWindow.webContents.setWindowOpenHandler(({ url }) => {
-  if (url === 'about:blank') {
-    return {
-      frame: false,
-      fullscreenable: false,
-      backgroundColor: 'black',
-      webPreferences: {
-        preload: 'my-child-window-preload-script.js'
-      }
-    }
+mainWindow.webContents.on('new-window', (event, url, frameName, disposition, options, additionalFeatures) => {
+  if (frameName === 'modal') {
+    // open window as modal
+    event.preventDefault()
+    Object.assign(options, {
+      modal: true,
+      parent: mainWindow,
+      width: 100,
+      height: 100
+    })
+    event.newGuest = new BrowserWindow(options)
  }
-  return false
 })
 ```

 ```javascript
 // renderer process (mainWindow)
-const childWindow = window.open('', 'modal')
-childWindow.document.write('<h1>Hello</h1>')
+const modal = window.open('', 'modal')
+modal.document.write('<h1>Hello</h1>')
 ```
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -12,28 +12,8 @@ This document uses the following convention to categorize breaking changes:
 - **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
 - **Removed:** An API or feature was removed, and is no longer supported by Electron.

-## Planned Breaking API Changes (13.0)
-
-### Removed: `shell.moveItemToTrash()`
-
-The deprecated synchronous `shell.moveItemToTrash()` API has been removed. Use
-the asynchronous `shell.trashItem()` instead.
-
-```js
-// Removed in Electron 13
-shell.moveItemToTrash(path)
-// Replace with
-shell.trashItem(path).then(/* ... */)
-```
-
 ## Planned Breaking API Changes (12.0)

-### Removed: Pepper Flash support
-
-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: `contextIsolation` defaults to `true`

 In Electron 12, `contextIsolation` will be enabled by default.  To restore
@@ -43,18 +23,6 @@ We [recommend having contextIsolation enabled](https://github.com/electron/elect

 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
@@ -82,45 +50,9 @@ If your crash ingestion server does not support compressed payloads, you can
 turn off compression by specifying `{ compress: false }` in the crash reporter
 options.

-### Deprecated: `remote` module
-
-The `remote` module is deprecated in Electron 12, and will be removed in
-Electron 14. It is replaced by the
-[`@electron/remote`](https://github.com/electron/remote) module.
-
-```js
-// Deprecated in Electron 12:
-const { BrowserWindow } = require('electron').remote
-```
-
-```js
-// Replace with:
-const { BrowserWindow } = require('@electron/remote')
-
-// In the main process:
-require('@electron/remote/main').initialize()
-```
-
-### Deprecated: `shell.moveItemToTrash()`
-
-The synchronous `shell.moveItemToTrash()` has been replaced by the new,
-asynchronous `shell.trashItem()`.
-
-```js
-// Deprecated in Electron 12
-shell.moveItemToTrash(path)
-// Replace with
-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)

@@ -263,45 +195,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.
@@ -357,7 +250,6 @@ messages, but also brings some breaking changes in behavior.
 - 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`.
-
 ```js
 // Previously:
 ipcRenderer.send('channel', { value: 3, someFunction: () => {} })
@@ -367,7 +259,6 @@ ipcRenderer.send('channel', { value: 3, someFunction: () => {} })
 ipcRenderer.send('channel', { value: 3, someFunction: () => {} })
 // => throws Error("() => {} could not be cloned.")
 ```
-
 - `NaN`, `Infinity` and `-Infinity` will now be correctly serialized, instead
  of being converted to `null`.
 - Objects containing cyclic references will now be correctly serialized,
@@ -385,7 +276,6 @@ ipcRenderer.send('channel', { value: 3, someFunction: () => {} })
 - 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`:
-
 ```js
 Buffer.from(value.buffer, value.byteOffset, value.byteLength)
 ```
@@ -521,7 +411,6 @@ the folder, similarly to Chrome, Firefox, and Edge
 ([link to MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/HTMLInputElement/webkitdirectory)).

 As an illustration, take a folder with this structure:
-
 ```console
 folder
 ├── file1
@@ -530,13 +419,11 @@ folder
 ```

 In Electron <=6, this would return a `FileList` with a `File` object for:
-
 ```console
 path/to/folder
 ```

 In Electron 7, this now returns a `FileList` with a `File` object for:
-
 ```console
 /path/to/folder/file3
 /path/to/folder/file2
@@ -691,9 +578,7 @@ webFrame.setIsolatedWorldInfo(
 ```

 ### API Changed: `webFrame.setSpellCheckProvider` now takes an asynchronous callback
-
 The `spellCheck` callback is now asynchronous, and `autoCorrectWord` parameter has been removed.
-
 ```js
 // Deprecated
 webFrame.setSpellCheckProvider('en-US', true, {
--- a/docs/development/README.md
+++ b/docs/development/README.md
@@ -4,15 +4,14 @@ These guides are intended for people working on the Electron project itself.
 For guides on Electron app development, see
 [/docs/README.md](../README.md#guides-and-tutorials).

-* [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md)
-* [Contributing to Electron](https://github.com/electron/electron/blob/master/CONTRIBUTING.md)
+* [Code of Conduct](../../CODE_OF_CONDUCT.md)
+* [Contributing to Electron](../../CONTRIBUTING.md)
 * [Issues](issues.md)
 * [Pull Requests](pull-requests.md)
 * [Documentation Styleguide](coding-style.md#documentation)
 * [Source Code Directory Structure](source-code-directory-structure.md)
 * [Coding Style](coding-style.md)
 * [Using clang-format on C++ Code](clang-format.md)
-* [Using clang-tidy on C++ Code](clang-tidy.md)
 * [Build System Overview](build-system-overview.md)
 * [Build Instructions (macOS)](build-instructions-macos.md)
 * [Build Instructions (Windows)](build-instructions-windows.md)
--- a/docs/development/azure-vm-setup.md
+++ b/docs/development/azure-vm-setup.md
@@ -49,7 +49,7 @@ Example Use Case:
        * Master VHD URI - use URI obtained @ end of previous step
        * Location use `East US`

-6. Log back into Azure and find the VM you just created in Home < Virtual Machines < `$YOUR_NEW_VM`
+6. Log back into Azure and find the VM you just created in Homee < Virtual Machines < `$YOUR_NEW_VM`
    * You can download a RDP (Remote Desktop) file to access the VM.

 7. Using Microsoft Remote Desktop, click `Connect` to connect to the VM.
--- a/docs/development/build-instructions-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -6,9 +6,9 @@ Follow the guidelines below for building Electron.

 Check the build prerequisites for your platform before proceeding

-* [macOS](build-instructions-macos.md#prerequisites)
-* [Linux](build-instructions-linux.md#prerequisites)
-* [Windows](build-instructions-windows.md#prerequisites)
+  * [macOS](build-instructions-macos.md#prerequisites)
+  * [Linux](build-instructions-linux.md#prerequisites)
+  * [Windows](build-instructions-windows.md#prerequisites)

 ## Build Tools

@@ -26,7 +26,7 @@ Security` → `System` → `Advanced system settings` and add a system variable
 your locally installed version of Visual Studio (by default, `depot_tools` will
 try to download a Google-internal version that only Googlers have access to).

-[depot-tools]: https://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up
+[depot-tools]: http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up

 ### Setting up the git cache

@@ -53,7 +53,7 @@ $ gclient sync --with_branch_heads --with_tags
 > Instead of `https://github.com/electron/electron`, you can use your own fork
 > here (something like `https://github.com/<username>/electron`).

-### A note on pulling/pushing
+#### A note on pulling/pushing

 If you intend to `git pull` or `git push` from the official `electron`
 repository in the future, you now need to update the respective folder's
@@ -74,7 +74,6 @@ Running `gclient sync -f` ensures that all dependencies required
 to build Electron match that file.

 So, in order to pull, you'd run the following commands:
-
 ```sh
 $ cd src/electron
 $ git pull
@@ -92,7 +91,6 @@ $ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EX
 ```

 Or on Windows (without the optional argument):
-
 ```sh
 $ cd src
 $ set CHROMIUM_BUILDTOOLS_PATH=%cd%\buildtools
@@ -126,13 +124,11 @@ $ gn gen out/Release --args="import(\"//electron/build/args/release.gn\") $GN_EX
 Nota Bene: This will also take a while and probably heat up your lap.

 For the testing configuration:
-
 ```sh
 $ ninja -C out/Testing electron
 ```

 For the release configuration:
-
 ```sh
 $ ninja -C out/Release electron
 ```
@@ -160,13 +156,11 @@ $ ./out/Testing/electron
 ### Packaging

 On linux, first strip the debugging and symbol information:
-
 ```sh
 electron/script/strip-binaries.py -d out/Release
 ```

 To package the electron build as a distributable zip file:
-
 ```sh
 ninja -C out/Release electron:electron_dist_zip
 ```
@@ -183,12 +177,12 @@ $ gn gen out/Testing-x86 --args='... target_cpu = "x86"'

 Not all combinations of source and target CPU/OS are supported by Chromium.

-| Host        | Target        | Status               |
-|-------------|---------------|----------------------|
-| Windows x64 | Windows arm64 | Experimental         |
-| Windows x64 | Windows x86   | Automatically tested |
-| Linux x64   | Linux x86     | Automatically tested |
-
+<table>
+<tr><th>Host</th><th>Target</th><th>Status</th></tr>
+<tr><td>Windows x64</td><td>Windows arm64</td><td>Experimental</td>
+<tr><td>Windows x64</td><td>Windows x86</td><td>Automatically tested</td></tr>
+<tr><td>Linux x64</td><td>Linux x86</td><td>Automatically tested</td></tr>
+</table>

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

@@ -199,7 +193,6 @@ and [`target_cpu`][target_cpu values].
 [target_cpu values]: https://gn.googlesource.com/gn/+/master/docs/reference.md#built_in-predefined-variables-target_cpu_the-desired-cpu-architecture-for-the-build-possible-values

 #### Windows on Arm (experimental)
-
 To cross-compile for Windows on Arm, [follow Chromium's guide](https://chromium.googlesource.com/chromium/src/+/refs/heads/master/docs/windows_build_instructions.md#Visual-Studio) to get the necessary dependencies, SDK and libraries, then build with `ELECTRON_BUILDING_WOA=1` in your environment before running `gclient sync`.

 ```bat
@@ -208,7 +201,6 @@ gclient sync -f --with_branch_heads --with_tags
 ```

 Or (if using PowerShell):
-
 ```powershell
 $env:ELECTRON_BUILDING_WOA=1
 gclient sync -f --with_branch_heads --with_tags
@@ -216,6 +208,7 @@ gclient sync -f --with_branch_heads --with_tags

 Next, run `gn gen` as above with `target_cpu="arm64"`.

+
 ## Tests

 To run the tests, you'll first need to build the test modules against the
@@ -261,27 +254,11 @@ New-ItemProperty -Path "HKLM:\System\CurrentControlSet\Services\Lanmanworkstatio

 ## Troubleshooting

-### gclient sync complains about rebase
-
-If `gclient sync` is interrupted the git tree may be left in a bad state, leading to a cryptic message when running `gclient sync` in the future:
-
-```plaintext
-2> Conflict while rebasing this branch.
-2> Fix the conflict and run gclient again.
-2> See man git-rebase for details.
-```
-
-If there are no git conflicts or rebases in `src/electron`, you may need to abort a `git am` in `src`:
-
-```sh
-$ cd ../
-$ git am --abort
-$ cd electron
-$ gclient sync -f
-```
+### Stale locks in the git cache
+If `gclient sync` is interrupted while using the git cache, it will leave
+the cache locked. To remove the lock, pass the `--ignore_locks` argument to `gclient sync`.

 ### I'm being asked for a username/password for chromium-internal.googlesource.com
-
 If you see a prompt for `Username for 'https://chrome-internal.googlesource.com':` when running `gclient sync` on Windows, it's probably because the `DEPOT_TOOLS_WIN_TOOLCHAIN` environment variable is not set to 0. Open `Control Panel` → `System and Security` → `System` → `Advanced system settings` and add a system variable
 `DEPOT_TOOLS_WIN_TOOLCHAIN` with value `0`.  This tells `depot_tools` to use
 your locally installed version of Visual Studio (by default, `depot_tools` will
--- a/docs/development/build-instructions-windows.md
+++ b/docs/development/build-instructions-windows.md
@@ -13,10 +13,17 @@ Follow the guidelines below for building Electron on Windows.
  set a few environment variables to point the toolchains to your installation path.
    * `vs2019_install = DRIVE:\path\to\Microsoft Visual Studio\2019\Community`, replacing `2019` and `Community` with your installed versions and replacing `DRIVE:` with the drive that Visual Studio is on. Often, this will be `C:`.
    * `WINDOWSSDKDIR = DRIVE:\path\to\Windows Kits\10`, replacing `DRIVE:` with the drive that Windows Kits is on. Often, this will be `C:`.
+* [Python 2.7.10 or higher](http://www.python.org/download/releases/2.7/)
+  * Contrary to the `depot_tools` setup instructions linked below, you will need
+  to use your locally installed Python with at least version 2.7.10 (with
+  support for TLS 1.2). To do so, make sure that in **PATH**, your locally
+  installed Python comes before the `depot_tools` folder. Right now
+  `depot_tools` still comes with Python 2.7.6, which will cause the `gclient`
+  command to fail (see https://crbug.com/868864).
  * [Python for Windows (pywin32) Extensions](https://pypi.org/project/pywin32/#files)
  is also needed in order to run the build process.
 * [Node.js](https://nodejs.org/download/)
-* [Git](https://git-scm.com)
+* [Git](http://git-scm.com)
 * Debugging Tools for Windows of Windows SDK 10.0.15063.468 if you plan on
 creating a full distribution since `symstore.exe` is used for creating a symbol
 store from `.pdb` files.
@@ -43,13 +50,6 @@ building with Visual Studio will come in the future.
 **Note:** Even though Visual Studio is not used for building, it's still
 **required** because we need the build toolchains it provides.

-## Exclude source tree from Windows Security
-
-Windows Security doesn't like one of the files in the Chromium source code
-(see https://crbug.com/441184), so it will constantly delete it, causing `gclient sync` issues.
-You can exclude the source tree from being monitored by Windows Security by
-[following these instructions](https://support.microsoft.com/en-us/windows/add-an-exclusion-to-windows-security-811816c0-4dfd-af4a-47e4-c301afe13b26).
-
 ## Building

 See [Build Instructions: GN](build-instructions-gn.md)
--- a/docs/development/chromium-development.md
+++ b/docs/development/chromium-development.md
@@ -8,6 +8,6 @@
 - [Code Search](https://cs.chromium.org/)
 - [Source Code](https://cs.chromium.org/chromium/src/)
 - [Development Calendar and Release Info](https://www.chromium.org/developers/calendar)
- [Discussion Groups](https://www.chromium.org/developers/discussion-groups)
+- [Discussion Groups](http://www.chromium.org/developers/discussion-groups)

 See also [V8 Development](v8-development.md)
--- a/docs/development/clang-format.md
+++ b/docs/development/clang-format.md
@@ -1,6 +1,6 @@
 # Using clang-format on C++ Code

-[`clang-format`](https://clang.llvm.org/docs/ClangFormat.html) is a tool to
+[`clang-format`](http://clang.llvm.org/docs/ClangFormat.html) is a tool to
 automatically format C/C++/Objective-C code, so that developers don't need to
 worry about style issues during code reviews.

@@ -30,6 +30,6 @@ run `git-clang-format HEAD~1`. See `git-clang-format -h` for more details.
 You can also integrate `clang-format` directly into your favorite editors.
 For further guidance on setting up editor integration, see these pages:

-* [Atom](https://atom.io/packages/clang-format)
-* [Vim & Emacs](https://clang.llvm.org/docs/ClangFormat.html#vim-integration)
-* [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=xaver.clang-format)
+  * [Atom](https://atom.io/packages/clang-format)
+  * [Vim & Emacs](http://clang.llvm.org/docs/ClangFormat.html#vim-integration)
+  * [Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=xaver.clang-format)
--- a/docs/development/clang-tidy.md
+++ b/docs/development/clang-tidy.md
@@ -1,37 +0,0 @@
-# Using clang-tidy on C++ Code
-
-[`clang-tidy`](https://clang.llvm.org/extra/clang-tidy/) is a tool to
-automatically check C/C++/Objective-C code for style violations, programming
-errors, and best practices.
-
-Electron's `clang-tidy` integration is provided as a linter script which can
-be run with `npm run lint:clang-tidy`. While `clang-tidy` checks your on-disk
-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-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-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)
-of possible checks, in Electron only a few are enabled by default. At the
-moment Electron doesn't have a `.clang-tidy` config, so `clang-tidy` will
-find the one from Chromium at `src/.clang-tidy` and use the checks which
-Chromium has enabled. You can change which checks are run by using the
-`--checks=` option. This is passed straight through to `clang-tidy`, so see
-its documentation for full details. Wildcards can be used, and checks can
-be disabled by prefixing a `-`. By default any checks listed are added to
-those in `.clang-tidy`, so if you'd like to limit the checks to specific
-ones you should first exclude all checks then add back what you want, like
-`--checks=-*,performance*`.
-
-Running `clang-tidy` is rather slow - internally it compiles each file and
-then runs the checks so it will always be some factor slower than compilation.
-While you can use parallel runs to speed it up using the `--jobs|-j` option,
-`clang-tidy` also uses a lot of memory during its checks, so it can easily
-run into out-of-memory errors. As such the default number of jobs is one.
--- a/docs/development/coding-style.md
+++ b/docs/development/coding-style.md
@@ -47,7 +47,7 @@ formatted correctly.

 ## JavaScript

-* Write [standard](https://www.npmjs.com/package/standard) JavaScript style.
+* Write [standard](https://npm.im/standard) JavaScript style.
 * File names should be concatenated with `-` instead of `_`, e.g.
  `file-name.js` rather than `file_name.js`, because in
  [github/atom](https://github.com/github/atom) module names are usually in
--- a/Show More
+++ b/Show More