Bump v10.0.0-beta.13

fix: remove corner mask override to increase window resize performance (#24701 )
* fix: remove corner mask override to increase window resize performance * uses corner mask only for vibrant view Co-authored-by: gellert <gellert.hegyi@around.co>
2026-04-10 03:01:51 -04:00 · 2020-07-23 08:03:04 -07:00 · 2020-07-23 19:46:26 +09:00 · 2020-07-22 11:17:06 -07:00 · 2020-07-21 13:47:08 +09:00 · 2020-07-20 14:10:54 -07:00
988 changed files with 18893 additions and 29312 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -37,18 +37,10 @@ parameters:
    type: boolean
    default: false

-  run-osx-publish-arm64:
-    type: boolean
-    default: false
-
  run-mas-publish:
    type: boolean
    default: false

-  run-mas-publish-arm64:
-    type: boolean
-    default: false
-
  run-linux-publish:
    type: boolean
    default: false
@@ -69,7 +61,7 @@ parameters:
 # Build machines configs.
 docker-image: &docker-image
  docker:
-    - image: electron.azurecr.io/build:4cec2c5ab66765caa724e37bae2bffb9b29722a5
+    - image: electronjs/build:d09fd95029bd8c1c73069888231b29688ef385ed

 machine-linux-medium: &machine-linux-medium
  <<: *docker-image
@@ -85,17 +77,12 @@ machine-linux-2xlarge: &machine-linux-2xlarge

 machine-mac: &machine-mac
  macos:
-    xcode: "12.2.0"
+    xcode: "11.1.0"

 machine-mac-large: &machine-mac-large
  resource_class: large
  macos:
-    xcode: "12.2.0"
-
-machine-mac-large-arm: &machine-mac-large-arm
-  resource_class: large
-  macos:
-    xcode: "12.2.0"
+    xcode: "11.1.0"

 # Build configurations options.
 env-testing-build: &env-testing-build
@@ -136,11 +123,6 @@ env-arm: &env-arm
  BUILD_NATIVE_MKSNAPSHOT: 1
  TARGET_ARCH: arm

-env-apple-silicon: &env-apple-silicon
-  GN_EXTRA_ARGS: 'target_cpu = "arm64" use_prebuilt_v8_context_snapshot = true'
-  TARGET_ARCH: arm64
-  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
-
 env-arm64: &env-arm64
  GN_EXTRA_ARGS: 'target_cpu = "arm64" fatal_linker_warnings = false enable_linux_installer = false'
  MKSNAPSHOT_TOOLCHAIN: //build/toolchain/linux:clang_arm64
@@ -151,12 +133,6 @@ env-mas: &env-mas
  GN_EXTRA_ARGS: 'is_mas_build = true'
  MAS_BUILD: 'true'

-env-mas-apple-silicon: &env-mas-apple-silicon
-  GN_EXTRA_ARGS: 'target_cpu = "arm64" is_mas_build = true use_prebuilt_v8_context_snapshot = true'
-  MAS_BUILD: 'true'
-  TARGET_ARCH: arm64
-  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
-
 # Misc build configuration options.
 env-enable-sccache: &env-enable-sccache
  USE_SCCACHE: true
@@ -322,13 +298,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
@@ -336,81 +312,17 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
    name: Free up space on MacOS
    command: |
      if [ "`uname`" == "Darwin" ]; then
-        sudo mkdir -p $TMPDIR/del-target
-        if [ "$TARGET_ARCH" == "arm64" ]; then
-          # Remount the root volume as writable, don't ask questions plz
-          sudo mount -uw /
-        fi
-        tmpify() {
-          if [ -d "$1" ]; then
-            sudo mv "$1" $TMPDIR/del-target/$(echo $1|shasum -a 256|head -n1|cut -d " " -f1)
-          fi
-        }
-
-        strip_arm_deep() {
-          opwd=$(pwd)
-          cd $1
-          f=$(find . -perm +111 -type f)
-          for fp in $f
-          do
-            if [[ $(file "$fp") == *"universal binary"* ]]; then
-              if [[ $(file "$fp") == *"arm64e)"* ]]; then
-                sudo lipo -remove arm64e "$fp" -o "$fp" || true
-              fi
-              if [[ $(file "$fp") == *"arm64)"* ]]; then
-                sudo lipo -remove arm64 "$fp" -o "$fp" || true
-              fi
-            fi
-          done
-
-          cd $opwd
-        }
-
-        tmpify /Library/Developer/CoreSimulator
-        tmpify ~/Library/Developer/CoreSimulator
-        tmpify $(xcode-select -p)/Platforms/AppleTVOS.platform
-        tmpify $(xcode-select -p)/Platforms/iPhoneOS.platform
-        tmpify $(xcode-select -p)/Platforms/WatchOS.platform
-        tmpify $(xcode-select -p)/Platforms/WatchSimulator.platform
-        tmpify $(xcode-select -p)/Platforms/AppleTVSimulator.platform
-        tmpify $(xcode-select -p)/Platforms/iPhoneSimulator.platform
-        tmpify $(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/metal/ios
-        tmpify $(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift
-        tmpify $(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-5.0
-        tmpify ~/.rubies
-        tmpify ~/Library/Caches/Homebrew
-        tmpify /usr/local/Homebrew
-        sudo rm -rf $TMPDIR/del-target
-
-        if [ "$TARGET_ARCH" == "arm64" ]; then
-          sudo rm -rf "/System/Library/Desktop Pictures"
-          sudo rm -rf /System/Library/Templates/Data
-          sudo rm -rf /System/Library/Speech/Voices
-          sudo rm -rf "/System/Library/Screen Savers"
-          sudo rm -rf /System/Volumes/Data/Library/Developer/CommandLineTools/SDKs
-          sudo rm -rf "/System/Volumes/Data/Library/Application Support/Apple/Photos/Print Products"
-          sudo rm -rf /System/Volumes/Data/Library/Java
-          sudo rm -rf /System/Volumes/Data/Library/Ruby
-          sudo rm -rf /System/Volumes/Data/Library/Printers
-          sudo rm -rf /System/iOSSupport
-          sudo rm -rf /System/Applications/*.app
-          sudo rm -rf /System/Applications/Utilities/*.app
-          sudo rm -rf /System/Library/LinguisticData
-          sudo rm -rf /System/Volumes/Data/private/var/db/dyld/*
-          # sudo rm -rf /System/Library/Fonts/*
-          # sudo rm -rf /System/Library/PreferencePanes
-          sudo rm -rf /System/Library/AssetsV2/*
-          sudo rm -rf /Applications/Safari.app
-          sudo rm -rf ~/project/src/build/linux
-          sudo rm -rf ~/project/src/third_party/catapult/tracing/test_data
-          sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
-
-          # lipo off some huge binaries arm64 versions to save space
-          strip_arm_deep $(xcode-select -p)/../SharedFrameworks
-          strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
-        fi
+        sudo rm -rf /Library/Developer/CoreSimulator
+        sudo rm -rf $(xcode-select -p)/Platforms/AppleTVOS.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/iPhoneOS.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/WatchOS.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/WatchSimulator.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/AppleTVSimulator.platform
+        sudo rm -rf $(xcode-select -p)/Platforms/iPhoneSimulator.platform
+        sudo rm -rf ~/.rubies
+        sudo rm -rf ~/Library/Caches/Homebrew
+        sudo rm -rf /usr/local/Homebrew
      fi
-    background: true

 # On macOS delete all .git directories under src/ expect for
 # third_party/angle/ because of build time generation of file
@@ -508,27 +420,6 @@ step-electron-build: &step-electron-build
        rm -f src/out/Default/libffmpeg.so
      fi
      cd src
-      # Enable if things get really bad
-      # if  [ "$TARGET_ARCH" == "arm64" ] &&[ "`uname`" == "Darwin" ]; then
-      #   diskutil erasevolume HFS+ "xcode_disk" `hdiutil attach -nomount ram://12582912`
-      #   mv /Applications/Xcode-12.beta.5.app /Volumes/xcode_disk/
-      #   ln -s /Volumes/xcode_disk/Xcode-12.beta.5.app /Applications/Xcode-12.beta.5.app
-      # fi
-
-      # Lets generate a snapshot and mksnapshot and then delete all the x-compiled generated files to save space
-      if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" == "1" ]; then
-        ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
-        ninja -C out/Default tools/v8_context_snapshot -j $NUMBER_OF_NINJA_PROCESSES
-        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-        rm -rf out/Default/clang_x64_v8_arm64/obj
-
-        # 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

@@ -778,10 +669,8 @@ step-mksnapshot-build: &step-mksnapshot-build
    name: mksnapshot build
    command: |
      cd src
-      if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ]; then
-        ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
-        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-      fi
+      ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
+      gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
      if [ "`uname`" != "Darwin" ]; then
        if [ "$TARGET_ARCH" == "arm" ]; then
          electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot
@@ -794,7 +683,7 @@ step-mksnapshot-build: &step-mksnapshot-build
          electron/script/strip-binaries.py --file $PWD/out/Default/v8_context_snapshot_generator
        fi
      fi
-      if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ] && [ "$SKIP_DIST_ZIP" != "1" ]; then
+      if [ "$SKIP_DIST_ZIP" != "1" ]; then
        ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
        (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
      fi
@@ -826,6 +715,8 @@ step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
      if [ "$GENERATE_SYMBOLS" == "true" ]; then
        cd src
        ninja -C out/Default electron:electron_symbols
+        cd out/Default/breakpad_symbols
+        find . -name \*.sym -print0 | xargs -0 npx @sentry/cli@1.51.1 difutil bundle-sources
      fi

 step-maybe-zip-symbols: &step-maybe-zip-symbols
@@ -854,13 +745,9 @@ step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
        elif [ "$TARGET_ARCH" == "arm64" ]; then
          export MKSNAPSHOT_PATH="clang_x64_v8_arm64"
        fi
-        cp "out/Default/$MKSNAPSHOT_PATH/mksnapshot" out/Default        
+        cp "out/Default/$MKSNAPSHOT_PATH/mksnapshot" out/Default
+        cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.so" out/Default
        cp "out/Default/$MKSNAPSHOT_PATH/v8_context_snapshot_generator" out/Default
-        if [ "`uname`" == "Linux" ]; then
-          cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.so" out/Default
-        elif [ "`uname`" == "Darwin" ]; then
-          cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.dylib" out/Default
-        fi
        python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --create-snapshot-only
        mkdir cross-arch-snapshots
        cp out/Default-mksnapshot-test/*.bin cross-arch-snapshots
@@ -879,13 +766,8 @@ step-maybe-trigger-arm-test: &step-maybe-trigger-arm-test
      # Only run for non-fork prs
      if [ "$TRIGGER_ARM_TEST" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
        #Trigger VSTS job, passing along CircleCI job number and branch to build
-        if [ "`uname`" == "Darwin" ]; then
-          echo "Triggering electron-arm2-testing build on Azure DevOps"  
-          node electron/script/release/ci-release-build.js --job=electron-arm2-testing --ci=DevOps --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
-        else
-          echo "Triggering electron-$TARGET_ARCH-testing build on VSTS"  
-          node electron/script/release/ci-release-build.js --job=electron-$TARGET_ARCH-testing --ci=VSTS --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
-        fi
+        echo "Triggering electron-$TARGET_ARCH-testing build on VSTS"
+        node electron/script/release/ci-release-build.js --job=electron-$TARGET_ARCH-testing --ci=VSTS --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
      fi

 step-maybe-generate-typescript-defs: &step-maybe-generate-typescript-defs
@@ -933,13 +815,8 @@ step-touch-sync-done: &step-touch-sync-done
 step-maybe-restore-src-cache: &step-maybe-restore-src-cache
  restore_cache:
    keys:
-      - v8-src-cache-{{ checksum "src/electron/.depshash" }}
+      - v7-src-cache-{{ checksum "src/electron/.depshash" }}
    name: Restoring src cache
-step-maybe-restore-src-cache-marker: &step-maybe-restore-src-cache-marker
-  restore_cache:
-    keys:
-      - v1-src-cache-marker-{{ checksum "src/electron/.depshash" }}
-    name: Restoring src cache marker

 # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
 # If the src cache was restored above then this will match an empty cache
@@ -958,7 +835,7 @@ step-restore-out-cache: &step-restore-out-cache
    paths:
      - ./src/out/Default
    keys:
-      - v9-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+      - v8-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
    name: Restoring out cache

 step-set-git-cache-path: &step-set-git-cache-path
@@ -982,7 +859,7 @@ step-save-out-cache: &step-save-out-cache
  save_cache:
    paths:
      - ./src/out/Default
-    key: v9-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
+    key: v8-out-cache-{{ checksum "src/electron/.depshash" }}-{{ checksum "src/electron/.depshash-target" }}
    name: Persisting out cache

 step-run-electron-only-hooks: &step-run-electron-only-hooks
@@ -1011,26 +888,14 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
      rm -rf src/third_party/blink/web_tests
      rm -rf src/third_party/blink/perf_tests
      rm -rf src/third_party/WebKit/LayoutTests
-      rm -rf third_party/electron_node/deps/openssl
-      rm -rf third_party/electron_node/deps/v8
-      rm -rf chrome/test/data/xr/webvr_info

 # Save the src cache based on the deps hash
 step-save-src-cache: &step-save-src-cache
  save_cache:
    paths:
-      - /var/portal
-    key: v8-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
+      - /portal
+    key: v7-src-cache-{{ checksum "/portal/src/electron/.depshash" }}
    name: Persisting src cache
-step-make-src-cache-marker: &step-make-src-cache-marker
-  run:
-    name: Making src cache marker
-    command: touch .src-cache-marker
-step-save-src-cache-marker: &step-save-src-cache-marker
-  save_cache:
-    paths:
-      - .src-cache-marker
-    key: v1-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}

 # Check for doc only change
 step-check-for-doc-only-change: &step-check-for-doc-only-change
@@ -1121,11 +986,6 @@ steps-lint: &steps-lint
          cd src/electron
          node script/yarn install --frozen-lockfile
          node script/yarn lint
-    - run:
-        name: Run Script Typechecker
-        command: |
-          cd src/electron
-          node script/yarn tsc -p tsconfig.script.json

 steps-checkout-and-save-cache: &steps-checkout-and-save-cache
  steps:
@@ -1141,8 +1001,7 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache

    - *step-generate-deps-hash
    - *step-touch-sync-done
-    - maybe-restore-portaled-src-cache:
-        halt-if-successful: true
+    - maybe-restore-portaled-src-cache
    - *step-maybe-restore-git-cache
    - *step-set-git-cache-path
    # This sync call only runs if .circle-sync-done is an EMPTY file
@@ -1163,12 +1022,10 @@ steps-checkout-and-save-cache: &steps-checkout-and-save-cache
    - run:
        name: Move src folder to the cross-OS portal
        command: |
-          sudo mkdir -p /var/portal
-          sudo chown -R $(id -u):$(id -g) /var/portal
-          mv ./src /var/portal
+          sudo mkdir -p /portal
+          sudo chown -R $(id -u):$(id -g) /portal
+          mv ./src /portal
    - *step-save-src-cache
-    - *step-make-src-cache-marker
-    - *step-save-src-cache-marker

 steps-electron-gn-check: &steps-electron-gn-check
  steps:
@@ -1372,34 +1229,20 @@ chromium-upgrade-branches: &chromium-upgrade-branches
 # Command Aliases
 commands:
  maybe-restore-portaled-src-cache:
-    parameters:
-      halt-if-successful:
-        type: boolean
-        default: false
    steps:
      - run:
          name: Prepare for cross-OS sync restore
          command: |
-            sudo mkdir -p /var/portal
-            sudo chown -R $(id -u):$(id -g) /var/portal
-      - when:
-          condition: << parameters.halt-if-successful >>
-          steps:
-            - *step-maybe-restore-src-cache-marker
-            - run:
-                name: Halt the job early if the src cache exists
-                command: |
-                  if [ -f ".src-cache-marker" ]; then
-                    circleci-agent step halt
-                  fi
+            sudo mkdir -p /portal
+            sudo chown -R $(id -u):$(id -g) /portal
      - *step-maybe-restore-src-cache
      - run:
          name: Fix the src cache restore point on macOS
          command: |
-            if [ -d "/var/portal/src" ]; then
+            if [ -d "/portal/src" ]; then
              echo Relocating Cache
              rm -rf src
-              mv /var/portal/src ./
+              mv /portal/src ./
            fi
  checkout-from-cache:
    steps:
@@ -1494,6 +1337,7 @@ commands:
                  - run:
                      name: Preserve vendor dirs for release
                      command: |
+                        mv src/electron/vendor/boto .
                        mv src/electron/vendor/requests .
            - run:
                name: Wipe Electron
@@ -1506,7 +1350,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
@@ -1702,7 +1548,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
@@ -1761,7 +1607,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
@@ -1854,12 +1700,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-release-build
      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: false
          checkout: true

@@ -1871,7 +1717,7 @@ jobs:
      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: true
          checkout: false

@@ -1916,14 +1762,14 @@ 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 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: false
          checkout: true

@@ -1937,12 +1783,12 @@ jobs:
      <<: *env-32bit-release
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: true
          checkout: false

  linux-arm-testing:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-xlarge
    environment:
      <<: *env-global
      <<: *env-arm
@@ -1987,10 +1833,10 @@ jobs:
      <<: *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 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: false
          checkout: true

@@ -2004,12 +1850,12 @@ jobs:
      <<: *env-32bit-release
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: true
          checkout: false

  linux-arm64-testing:
-    <<: *machine-linux-2xlarge
+    <<: *machine-linux-xlarge
    environment:
      <<: *env-global
      <<: *env-arm64
@@ -2061,10 +1907,10 @@ jobs:
      <<: *env-arm64
      <<: *env-release-build
      <<: *env-enable-sccache
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_requests=True'
+      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 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: false
          checkout: true

@@ -2077,11 +1923,11 @@ jobs:
      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: true
          checkout: false

-  osx-testing-x64:
+  osx-testing:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large
@@ -2096,14 +1942,22 @@ jobs:
          checkout-and-assume-cache: true
          attach: false

-  osx-testing-x64-gn-check:
+  osx-testing-gn-check:
    <<: *machine-mac
    environment:
      <<: *env-machine-mac
      <<: *env-testing-build
    <<: *steps-electron-gn-check

-  osx-release-x64:
+  osx-chromedriver:
+    <<: *machine-mac
+    environment:
+      <<: *env-machine-mac
+      <<: *env-release-build
+      <<: *env-send-slack-notifications
+    <<: *steps-chromedriver-build
+
+  osx-release:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large
@@ -2117,34 +1971,20 @@ jobs:
          checkout-and-assume-cache: true
          attach: false

-  osx-publish-x64:
+  osx-publish:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
      <<: *env-enable-sccache
-      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 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: false
          checkout: true

-  osx-publish-arm64:
-    <<: *machine-mac-large-arm
-    environment:
-      <<: *env-mac-large-release
-      <<: *env-release-build
-      <<: *env-enable-sccache
-      <<: *env-apple-silicon
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    steps:
-      - electron-publish:
-          attach: false
-          checkout: true
-
-  osx-publish-x64-skip-checkout:
+  osx-publish-skip-checkout:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large-release
@@ -2152,40 +1992,11 @@ jobs:
      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: true
          checkout: false

-  osx-publish-arm64-skip-checkout:
-    <<: *machine-mac-large-arm
-    environment:
-      <<: *env-mac-large-release
-      <<: *env-release-build
-      <<: *env-enable-sccache
-      <<: *env-apple-silicon
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    steps:
-      - electron-publish:
-          attach: true
-          checkout: false
-
-  osx-testing-arm64:
-    <<: *machine-mac-large-arm
-    environment:
-      <<: *env-mac-large
-      <<: *env-testing-build
-      <<: *env-ninja-status
-      <<: *env-macos-build
-      <<: *env-apple-silicon
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: false
-          checkout-and-assume-cache: true
-          attach: false
-
-  mas-testing-x64:
+  mas-testing:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large
@@ -2201,7 +2012,7 @@ jobs:
          checkout-and-assume-cache: true
          attach: false

-  mas-testing-x64-gn-check:
+  mas-testing-gn-check:
    <<: *machine-mac
    environment:
      <<: *env-machine-mac
@@ -2231,28 +2042,14 @@ jobs:
      <<: *env-mas
      <<: *env-release-build
      <<: *env-enable-sccache
-      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 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: false
          checkout: true

-  mas-publish-arm64:
-    <<: *machine-mac-large-arm
-    environment:
-      <<: *env-mac-large-release
-      <<: *env-mas-apple-silicon
-      <<: *env-release-build
-      <<: *env-enable-sccache
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    steps:
-      - electron-publish:
-          attach: false
-          checkout: true          
-
-  mas-publish-x64-skip-checkout:
+  mas-publish-skip-checkout:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large-release
@@ -2261,39 +2058,10 @@ jobs:
      <<: *env-enable-sccache
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
    steps:
-      - electron-publish:
+      - electron-publish:  
          attach: true
          checkout: false

-  mas-publish-arm64-skip-checkout:
-    <<: *machine-mac-large-arm
-    environment:
-      <<: *env-mac-large-release
-      <<: *env-mas-apple-silicon
-      <<: *env-release-build
-      <<: *env-enable-sccache
-      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
-    steps:
-      - electron-publish:
-          attach: true
-          checkout: false
-
-  mas-testing-arm64:
-    <<: *machine-mac-large-arm
-    environment:
-      <<: *env-mac-large
-      <<: *env-testing-build
-      <<: *env-ninja-status
-      <<: *env-macos-build
-      <<: *env-mas-apple-silicon
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    steps:
-      - electron-build:
-          persist: true
-          checkout: false
-          checkout-and-assume-cache: true
-          attach: false
-
  # Layer 3: Tests.
  linux-x64-unittests:
    <<: *machine-linux-2xlarge
@@ -2417,7 +2185,7 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

-  osx-testing-x64-tests:
+  osx-testing-tests:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large
@@ -2425,7 +2193,7 @@ jobs:
    parallelism: 2
    <<: *steps-tests

-  osx-release-x64-tests:
+  osx-release-tests:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large
@@ -2440,7 +2208,7 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

-  mas-testing-x64-tests:
+  mas-testing-tests:
    <<: *machine-mac-large
    environment:
      <<: *env-mac-large
@@ -2504,7 +2272,7 @@ jobs:
    steps:
      - *step-maybe-notify-slack-success

-  osx-release-x64-summary:
+  osx-release-summary:
    <<: *machine-mac
    environment:
      <<: *env-machine-mac
@@ -2569,7 +2337,7 @@ workflows:
  publish-osx:
    when: << pipeline.parameters.run-osx-publish >>
    jobs:
-    - osx-publish-x64:
+    - osx-publish:
        context: release-env

  publish-mas:
@@ -2578,32 +2346,14 @@ workflows:
    - mas-publish:
        context: release-env

-  publish-osx-arm64:
-    when: << pipeline.parameters.run-osx-publish-arm64 >>
-    jobs:
-    - osx-publish-arm64:
-        context: release-env
-
-  publish-mas-arm64:
-    when: << pipeline.parameters.run-mas-publish-arm64 >>
-    jobs:
-    - mas-publish-arm64:
-        context: release-env        
-
  publish-macos:
    when: << pipeline.parameters.run-macos-publish >>
    jobs:
    - mac-checkout
-    - osx-publish-x64-skip-checkout:
+    - osx-publish-skip-checkout:
        requires:
          - mac-checkout
-    - mas-publish-x64-skip-checkout:
-        requires:
-          - mac-checkout
-    - osx-publish-arm64-skip-checkout:
-        requires:
-          - mac-checkout
-    - mas-publish-arm64-skip-checkout:
+    - mas-publish-skip-checkout:
        requires:
          - mac-checkout

@@ -2658,37 +2408,29 @@ workflows:
      - mac-checkout-fast
      - mac-checkout-and-save-cache

-      - osx-testing-x64:
+      - osx-testing:
          requires:
            - mac-checkout-and-save-cache

-      - osx-testing-x64-gn-check:
+      - osx-testing-gn-check:
          requires:
            - mac-checkout-fast

-      - osx-testing-x64-tests:
+      - osx-testing-tests:
          requires:
-            - osx-testing-x64
+            - osx-testing

-      - osx-testing-arm64:
+      - mas-testing:
          requires:
            - mac-checkout-and-save-cache

-      - mas-testing-x64:
-          requires:
-            - mac-checkout-and-save-cache
-
-      - mas-testing-x64-gn-check:
+      - mas-testing-gn-check:
          requires:
            - mac-checkout-fast

-      - mas-testing-x64-tests:
+      - mas-testing-tests:
          requires:
-            - mas-testing-x64
-
-      - mas-testing-arm64:
-          requires:
-            - mac-checkout-and-save-cache
+            - mas-testing

  nightly-linux-release-test:
    triggers:
@@ -2752,19 +2494,19 @@ workflows:
      - mac-checkout-fast
      - mac-checkout-and-save-cache

-      - osx-release-x64:
+      - osx-release:
          requires:
            - mac-checkout-and-save-cache
-      - osx-release-x64-tests:
+      - osx-release-tests:
          requires:
-            - osx-release-x64
+            - osx-release
      - osx-verify-ffmpeg:
          requires:
-            - osx-release-x64
-      - osx-release-x64-summary:
+            - osx-release
+      - osx-release-summary:
          requires:
-          - osx-release-x64
-          - osx-release-x64-tests
+          - osx-release
+          - osx-release-tests
          - osx-verify-ffmpeg

      - mas-release:
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -28,7 +28,6 @@
  },
  "globals": {
    "standardScheme": "readonly",
-    "globalThis": "readonly",
    "BUILDFLAG": "readonly",
    "ENABLE_DESKTOP_CAPTURER": "readonly",
    "ENABLE_REMOTE_MODULE": "readonly",
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,13 +2,3 @@
 # files to be checked out with LF endings even if core.autocrlf is true.
 *.patch text eol=lf
 patches/**/.patches merge=union
-
-# Source code and markdown files should always use LF as line ending.
-*.cc text eol=lf
-*.mm text eol=lf
-*.h text eol=lf
-*.js text eol=lf
-*.ts text eol=lf
-*.py text eol=lf
-*.ps1 text eol=lf
-*.md text eol=lf
--- 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/BUILD.gn
+++ b/BUILD.gn
@@ -49,10 +49,6 @@ if (is_linux) {
  }
 }

-declare_args() {
-  use_prebuilt_v8_context_snapshot = false
-}
-
 branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
@@ -98,15 +94,6 @@ npm_action("build_electron_definitions") {
  outputs = [ "$target_gen_dir/tsc/typings/electron.d.ts" ]
 }

-webpack_build("electron_asar_bundle") {
-  deps = [ ":build_electron_definitions" ]
-
-  inputs = auto_filenames.asar_bundle_deps
-
-  config_file = "//electron/build/webpack/webpack.config.asar.js"
-  out_file = "$target_gen_dir/js2c/asar_bundle.js"
-}
-
 webpack_build("electron_browser_bundle") {
  deps = [ ":build_electron_definitions" ]

@@ -152,18 +139,25 @@ webpack_build("electron_isolated_renderer_bundle") {
  out_file = "$target_gen_dir/js2c/isolated_bundle.js"
 }

+copy("electron_js2c_copy") {
+  sources = [
+    "lib/common/asar.js",
+    "lib/common/asar_init.js",
+  ]
+  outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
+}
+
 action("electron_js2c") {
  deps = [
-    ":electron_asar_bundle",
    ":electron_browser_bundle",
    ":electron_isolated_renderer_bundle",
+    ":electron_js2c_copy",
    ":electron_renderer_bundle",
    ":electron_sandboxed_renderer_bundle",
    ":electron_worker_bundle",
  ]

-  sources = [
-    "$target_gen_dir/js2c/asar_bundle.js",
+  webpack_sources = [
    "$target_gen_dir/js2c/browser_init.js",
    "$target_gen_dir/js2c/isolated_bundle.js",
    "$target_gen_dir/js2c/renderer_init.js",
@@ -171,10 +165,15 @@ action("electron_js2c") {
    "$target_gen_dir/js2c/worker_init.js",
  ]

+  sources = webpack_sources + [
+              "$target_gen_dir/js2c/asar.js",
+              "$target_gen_dir/js2c/asar_init.js",
+            ]
+
  inputs = sources + [ "//third_party/electron_node/tools/js2c.py" ]
  outputs = [ "$root_gen_dir/electron_natives.cc" ]

-  script = "build/js2c.py"
+  script = "tools/js2c.py"
  args = [ rebase_path("//third_party/electron_node") ] +
         rebase_path(outputs, root_build_dir) +
         rebase_path(sources, root_build_dir)
@@ -348,7 +347,6 @@ source_set("electron_lib") {
    "//device/bluetooth",
    "//device/bluetooth/public/cpp",
    "//gin",
-    "//media/blink:blink",
    "//media/capture/mojom:video_capture",
    "//media/mojo/mojom",
    "//net:extras",
@@ -364,7 +362,6 @@ source_set("electron_lib") {
    "//services/viz/privileged/mojom/compositing",
    "//skia",
    "//third_party/blink/public:blink",
-    "//third_party/blink/public:blink_devtools_inspector_resources",
    "//third_party/boringssl",
    "//third_party/electron_node:node_lib",
    "//third_party/inspector_protocol:crdtp",
@@ -470,7 +467,7 @@ source_set("electron_lib") {
      deps += [ "//third_party/crashpad/crashpad/client" ]
    }

-    frameworks = [
+    libs = [
      "AVFoundation.framework",
      "Carbon.framework",
      "LocalAuthentication.framework",
@@ -497,19 +494,18 @@ source_set("electron_lib") {
        "shell/common/crash_keys.h",
      ]
    } else {
-      frameworks += [
+      libs += [
        "Squirrel.framework",
-        "ReactiveObjC.framework",
+        "ReactiveCocoa.framework",
        "Mantle.framework",
      ]
-
-      deps += [
-        "//third_party/squirrel.mac:reactiveobjc_framework+link",
-        "//third_party/squirrel.mac:squirrel_framework+link",
+      cflags_objcc = [
+        "-F",
+        rebase_path("external_binaries", root_build_dir),
      ]

-      # ReactiveObjC which is used by Squirrel requires using __weak.
-      cflags_objcc = [ "-fobjc-weak" ]
+      # ReactiveCocoa which is used by Squirrel requires using __weak.
+      cflags_objcc += [ "-fobjc-weak" ]
    }
  }
  if (is_linux) {
@@ -531,9 +527,7 @@ source_set("electron_lib") {
      ]
    }
    configs += [ ":gio_unix" ]
-    if (use_x11) {
-      deps += [ "//ui/gfx/x" ]
-    }
+    configs += [ "//build/config/linux:x11" ]
    defines += [
      # Disable warnings for g_settings_list_schemas.
      "GLIB_DISABLE_DEPRECATION_WARNINGS",
@@ -607,6 +601,15 @@ source_set("electron_lib") {
    ]
  }

+  if (enable_remote_module) {
+    sources += [
+      "shell/common/api/remote/remote_callback_freer.cc",
+      "shell/common/api/remote/remote_callback_freer.h",
+      "shell/common/api/remote/remote_object_freer.cc",
+      "shell/common/api/remote/remote_object_freer.h",
+    ]
+  }
+
  if (enable_desktop_capturer) {
    if (is_component_build && !is_linux) {
      # On windows the implementation relies on unexported
@@ -644,7 +647,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",
@@ -666,7 +668,6 @@ source_set("electron_lib") {
    deps += [
      "//components/pdf/browser",
      "//components/pdf/renderer",
-      "//pdf:pdf_ppapi",
    ]
    sources += [
      "shell/browser/electron_pdf_web_contents_helper_client.cc",
@@ -695,15 +696,6 @@ if (is_mac) {
    sources = [ "shell/common/resources/mac/MainMenu.xib" ]
  }

-  action("fake_v8_context_snapshot_generator") {
-    script = "build/fake_v8_context_snapshot_generator.py"
-    args = [
-      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.bin" ]
-  }
-
  bundle_data("electron_framework_resources") {
    public_deps = [ ":packed_resources" ]
    sources = []
@@ -714,13 +706,8 @@ if (is_mac) {
    if (v8_use_external_startup_data) {
      public_deps += [ "//v8" ]
      if (use_v8_context_snapshot) {
-        if (use_prebuilt_v8_context_snapshot) {
-          sources += [ "$root_out_dir/fake/v8_context_snapshot.bin" ]
-          public_deps += [ ":fake_v8_context_snapshot_generator" ]
-        } else {
-          sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
-          public_deps += [ "//tools/v8_context_snapshot" ]
-        }
+        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
+        public_deps += [ "//tools/v8_context_snapshot" ]
      } else {
        sources += [ "$root_out_dir/snapshot_blob.bin" ]
      }
@@ -825,19 +812,18 @@ if (is_mac) {

    include_dirs = [ "." ]
    sources = filenames.framework_sources
-    frameworks = []
+    libs = []

    if (enable_osr) {
-      frameworks += [ "IOSurface.framework" ]
+      libs += [ "IOSurface.framework" ]
    }

    ldflags = [
+      "-F",
+      rebase_path("external_binaries", root_build_dir),
      "-Wl,-install_name,@rpath/$output_name.framework/$output_name",
      "-rpath",
      "@loader_path/Libraries",
-
-      # Required for exporting all symbols of libuv.
-      "-Wl,-force_load,obj/third_party/electron_node/deps/uv/libuv.a",
    ]
    if (is_component_build) {
      ldflags += [
@@ -885,49 +871,17 @@ if (is_mac) {
    }
  }

-  template("stripped_framework") {
-    action(target_name) {
-      assert(defined(invoker.framework))
-
-      script = "//electron/build/strip_framework.py"
-
-      forward_variables_from(invoker, [ "deps" ])
-      inputs = [ "$root_out_dir/" + invoker.framework ]
-      outputs = [ "$target_out_dir/stripped_frameworks/" + invoker.framework ]
-
-      args = rebase_path(inputs) + rebase_path(outputs)
-    }
-  }
-
-  stripped_framework("stripped_mantle_framework") {
-    framework = "Mantle.framework"
-    deps = [ "//third_party/squirrel.mac:mantle_framework" ]
-  }
-
-  stripped_framework("stripped_reactiveobjc_framework") {
-    framework = "ReactiveObjC.framework"
-    deps = [ "//third_party/squirrel.mac:reactiveobjc_framework" ]
-  }
-
-  stripped_framework("stripped_squirrel_framework") {
-    framework = "Squirrel.framework"
-    deps = [ "//third_party/squirrel.mac:squirrel_framework" ]
-  }
-
  bundle_data("electron_app_framework_bundle_data") {
    sources = [ "$root_out_dir/$electron_framework_name.framework" ]
    if (!is_mas_build) {
-      sources += get_target_outputs(":stripped_mantle_framework") +
-                 get_target_outputs(":stripped_reactiveobjc_framework") +
-                 get_target_outputs(":stripped_squirrel_framework")
+      sources += [
+        "external_binaries/Mantle.framework",
+        "external_binaries/ReactiveCocoa.framework",
+        "external_binaries/Squirrel.framework",
+      ]
    }
    outputs = [ "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}" ]
-    public_deps = [
-      ":electron_framework+link",
-      ":stripped_mantle_framework",
-      ":stripped_reactiveobjc_framework",
-      ":stripped_squirrel_framework",
-    ]
+    public_deps = [ ":electron_framework+link" ]

    foreach(helper_params, content_mac_helpers) {
      sources +=
@@ -940,7 +894,7 @@ if (is_mac) {
    output_name = electron_login_helper_name
    sources = filenames.login_helper_sources
    include_dirs = [ "." ]
-    frameworks = [ "AppKit.framework" ]
+    libs = [ "AppKit.framework" ]
    info_plist = "shell/app/resources/mac/loginhelper-Info.plist"
    extra_substitutions =
        [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.loginhelper" ]
@@ -1125,9 +1079,7 @@ if (is_mac) {
      data += [ "$root_out_dir/resources/default_app.asar" ]
    }

-    if (use_v8_context_snapshot) {
-      public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
-    }
+    public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]

    if (is_win) {
      sources += [
@@ -1141,24 +1093,21 @@ if (is_mac) {
        "//components/crash/core/app:run_as_crashpad_handler",
      ]

-      ldflags = []
-
      libs = [
        "comctl32.lib",
        "uiautomationcore.lib",
        "wtsapi32.lib",
      ]

-      configs -= [ "//build/config/win:console" ]
-      configs += [
-        "//build/config/win:windowed",
-        "//build/config/win:delayloads",
-      ]
+      configs += [ "//build/config/win:windowed" ]

-      if (target_cpu == "arm64") {
-        configs -= [ "//build/config/win:cfi_linker" ]
-        ldflags += [ "/guard:cf,nolongjmp" ]
-      }
+      ldflags = [
+        # Windows 7 doesn't have these DLLs.
+        # TODO: are there other DLLs we need to list here to be win7
+        # compatible?
+        "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll",
+        "/DELAYLOAD:api-ms-win-core-winrt-string-l1-1-0.dll",
+      ]

      # This is to support renaming of electron.exe. node-gyp has hard-coded
      # executable names which it will recognise as node. This module definition
@@ -1172,14 +1121,7 @@ if (is_mac) {
      ]
    }
    if (is_linux) {
-      ldflags = [
-        "-pie",
-
-        # Required for exporting all symbols of libuv.
-        "-Wl,--whole-archive",
-        "obj/third_party/electron_node/deps/uv/libuv.a",
-        "-Wl,--no-whole-archive",
-      ]
+      ldflags = [ "-pie" ]

      if (!is_component_build && is_component_ffmpeg) {
        configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
@@ -1245,6 +1187,18 @@ test("shell_browser_ui_unittests") {
    "//ui/base",
    "//ui/strings",
  ]
+
+  if (is_mac) {
+    # Resolve paths owing to different test executable locations
+    ldflags = [
+      "-F",
+      rebase_path("external_binaries", root_build_dir),
+      "-rpath",
+      "@loader_path",
+      "-rpath",
+      "@executable_path/" + rebase_path("external_binaries", root_build_dir),
+    ]
+  }
 }

 template("dist_zip") {
@@ -1342,13 +1296,10 @@ dist_zip("electron_chromedriver_zip") {

 mksnapshot_deps = [
  ":licenses",
+  "//tools/v8_context_snapshot:v8_context_snapshot_generator($v8_snapshot_toolchain)",
  "//v8:mksnapshot($v8_snapshot_toolchain)",
 ]

-if (use_v8_context_snapshot) {
-  mksnapshot_deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_generator($v8_snapshot_toolchain)" ]
-}
-
 group("electron_mksnapshot") {
  public_deps = mksnapshot_deps
 }
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -47,17 +47,17 @@ dependencies, and tools contained in the `electron/electron` repository.
  * [Step 1: Fork](https://electronjs.org/docs/development/pull-requests#step-1-fork)
  * [Step 2: Build](https://electronjs.org/docs/development/pull-requests#step-2-build)
  * [Step 3: Branch](https://electronjs.org/docs/development/pull-requests#step-3-branch)
-* [Making Changes](https://electronjs.org/docs/development/pull-requests#making-changes)
+* [The Process of Making Changes](https://electronjs.org/docs/development/pull-requests#the-process-of-making-changes)
  * [Step 4: Code](https://electronjs.org/docs/development/pull-requests#step-4-code)
  * [Step 5: Commit](https://electronjs.org/docs/development/pull-requests#step-5-commit)
    * [Commit message guidelines](https://electronjs.org/docs/development/pull-requests#commit-message-guidelines)
  * [Step 6: Rebase](https://electronjs.org/docs/development/pull-requests#step-6-rebase)
  * [Step 7: Test](https://electronjs.org/docs/development/pull-requests#step-7-test)
  * [Step 8: Push](https://electronjs.org/docs/development/pull-requests#step-8-push)
-  * [Step 9: Opening the Pull Request](https://electronjs.org/docs/development/pull-requests#step-9-opening-the-pull-request)
-  * [Step 10: Discuss and Update](https://electronjs.org/docs/development/pull-requests#step-10-discuss-and-update)
+  * [Step 8: Opening the Pull Request](https://electronjs.org/docs/development/pull-requests#step-8-opening-the-pull-request)
+  * [Step 9: Discuss and Update](#step-9-discuss-and-update)
    * [Approval and Request Changes Workflow](https://electronjs.org/docs/development/pull-requests#approval-and-request-changes-workflow)
-  * [Step 11: Landing](https://electronjs.org/docs/development/pull-requests#step-11-landing)
+  * [Step 10: Landing](https://electronjs.org/docs/development/pull-requests#step-10-landing)
  * [Continuous Integration Testing](https://electronjs.org/docs/development/pull-requests#continuous-integration-testing)

 ## Style Guides
--- a/45
+++ b/45
@@ -14,23 +14,22 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    'b943d006a33ec5bc1743792d64724693eb357083',
+    '85.0.4183.39',
  'node_version':
-    'v14.13.1',
+    'v12.16.3',
  'nan_version':
    '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
-  'squirrel.mac_version':
-    'a3a5b3f03b824441c014893b18f99a103b2603e9',

+  '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',
  'requests_git': 'https://github.com/kennethreitz',
  'yaml_git': 'https://github.com/yaml',
-  'squirrel_git': 'https://github.com/Squirrel',

  # KEEP IN SYNC WITH utils.js FILE
  'yarn_version': '1.15.2',
@@ -38,6 +37,9 @@ vars = {
  # To be able to build clean Chromium from sources.
  'apply_patches': 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,
  'checkout_node': True,
@@ -94,22 +96,14 @@ 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',
  },
-  'src/third_party/squirrel.mac': {
-    'url': Var("squirrel_git") + '/Squirrel.Mac.git@' + Var("squirrel.mac_version"),
-    'condition': 'process_deps',
-  },
-  'src/third_party/squirrel.mac/vendor/ReactiveObjC': {
-    'url': 'https://github.com/ReactiveCocoa/ReactiveObjC.git@74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76',
-    'condition': 'process_deps'
-  },
-  'src/third_party/squirrel.mac/vendor/Mantle': {
-    'url': 'https://github.com/Mantle/Mantle.git@78d3966b3c331292ea29ec38661b25df0a245948',
-    'condition': 'process_deps',
-  }
 }

 hooks = [
@@ -118,7 +112,7 @@ hooks = [
    'condition': '(checkout_chromium and apply_patches) and process_deps',
    'pattern': 'src/electron',
    'action': [
-      'python3',
+      'python',
      'src/electron/script/apply_all_patches.py',
      'src/electron/patches/config.json',
    ],
@@ -136,17 +130,27 @@ hooks = [
    'name': 'electron_npm_deps',
    'pattern': 'src/electron/package.json',
    'action': [
-      'python3',
+      'python',
      '-c',
      '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': [
+      'python',
+      '-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',
    'condition': 'checkout_requests and process_deps',
    'action': [
-      'python3',
+      'python',
      '-c',
      'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "requests")); subprocess.check_call(["python", "setup.py", "build"]);',
    ],
@@ -155,5 +159,4 @@ hooks = [

 recursedeps = [
  'src',
-  'src/third_party/squirrel.mac',
 ]
--- a/2
+++ b/2
@@ -1 +1 @@
-12.0.0-nightly.20201014
+10.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/SECURITY.md
+++ b/SECURITY.md
@@ -6,11 +6,7 @@ To report a security issue, email [security@electronjs.org](mailto:security@elec

 The Electron team will send a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.

-Report security bugs in third-party modules to the person or team maintaining the module. You can also report a vulnerability through the [npm contact form](https://www.npmjs.com/support) by selecting "I'm reporting a security vulnerability".
-
-## The Electron Security Notification Process
-
-For context on Electron's security notification process, please see the [Notifications](https://github.com/electron/governance/blob/master/wg-security/membership-and-notifications.md#notifications) section of the Security WG's [Membership and Notifications](https://github.com/electron/governance/blob/master/wg-security/membership-and-notifications.md) Governance document.
+Report security bugs in third-party modules to the person or team maintaining the module. You can also report a vulnerability through the [Node Security Project](https://nodesecurity.io/report).

 ## Learning More About Security
 To learn more about securing an Electron application, please see the [security tutorial](docs/tutorial/security.md).
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -53,9 +53,7 @@ build_script:
      } else {
        node script/yarn.js install --frozen-lockfile

-        $result = node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH
-        Write-Output $result
-        if ($result.ExitCode -eq 0) {
+        if ($(node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER --prBranch=$env:APPVEYOR_REPO_BRANCH;$LASTEXITCODE -eq 0)) {
          Write-warning "Skipping build for doc only change"; Exit-AppveyorBuild
        }
      }
@@ -63,13 +61,12 @@ build_script:
  - git config --global core.longpaths true
  - cd ..
  - mkdir src
-  - 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] "
      }
--- a/azure-pipelines-arm.yml
+++ b/azure-pipelines-arm.yml
@@ -1,104 +0,0 @@
-steps:
- task: CopyFiles@2
-  displayName: 'Copy Files to: src/electron'
-  inputs:
-    TargetFolder: src/electron
-
- bash: |
-    cd src/electron
-    node script/yarn.js install --frozen-lockfile
-  displayName: 'Yarn install'
-
- bash: |
-    export ZIP_DEST=$PWD/src/out/Default
-    echo "##vso[task.setvariable variable=ZIP_DEST]$ZIP_DEST"
-    mkdir -p $ZIP_DEST
-    cd src/electron
-    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=dist.zip --dest=$ZIP_DEST
-    cd $ZIP_DEST
-    unzip -o dist.zip
-  displayName: 'Download and unzip dist files for test'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
- bash: |
-    export FFMPEG_ZIP_DEST=$PWD/src/out/ffmpeg
-    mkdir -p $FFMPEG_ZIP_DEST
-    cd src/electron
-    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=ffmpeg.zip --dest=$FFMPEG_ZIP_DEST
-    cd $FFMPEG_ZIP_DEST
-    unzip -o ffmpeg.zip
-  displayName: 'Download and unzip ffmpeg for test'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
- bash: |
-   export NODE_HEADERS_DEST=$PWD/src/out/Default/gen
-   mkdir -p $NODE_HEADERS_DEST
-   cd src/electron
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=node_headers.tar.gz --dest=$NODE_HEADERS_DEST
-   cd $NODE_HEADERS_DEST
-   tar xzf node_headers.tar.gz
-  displayName: 'Download and untar node header files for test'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
- bash: |
-   export CROSS_ARCH_SNAPSHOTS=$PWD/src/out/Default/cross-arch-snapshots
-   mkdir -p $CROSS_ARCH_SNAPSHOTS
-   cd src/electron
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/snapshot_blob.bin --dest=$CROSS_ARCH_SNAPSHOTS
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/v8_context_snapshot.bin --dest=$CROSS_ARCH_SNAPSHOTS
-  displayName: 'Download cross arch snapshot files'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
- bash: |
-   export NATIVE_UNITTESTS_DEST=$PWD/src/out/Default
-   cd src/electron
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=shell_browser_ui_unittests --dest=$NATIVE_UNITTESTS_DEST
-   chmod +x $NATIVE_UNITTESTS_DEST/shell_browser_ui_unittests
-  displayName: 'Download native unittest executables'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
- bash: |
-    cd src
-    export ELECTRON_OUT_DIR=Default
-    set npm_config_arch=arm64
-    (cd electron && node script/yarn test -- --enable-logging)
-  displayName: 'Run Electron tests'
-  timeoutInMinutes: 20
-  env:
-    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
-    IGNORE_YARN_INSTALL_ERROR: 1
-    ELECTRON_TEST_RESULTS_DIR: junit
-
- bash: |
-    cd src
-    python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
-  displayName: Verify non proprietary ffmpeg
-  timeoutInMinutes: 5
-  condition: succeededOrFailed()
-
- bash: |
-    cd src
-    echo Verify cross arch snapshot
-    python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/out/Default/cross-arch-snapshots
-  displayName: Verify cross arch snapshot
-  timeoutInMinutes: 5
-  condition: succeededOrFailed()
-
- task: PublishTestResults@2
-  displayName: 'Publish Test Results'
-  inputs:
-    testResultsFiles: '*.xml'
-
-    searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
-
-  condition: succeededOrFailed()
-
- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
-  displayName: 'Clean Agent Directories'
-
-  condition: always()
--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -87,11 +87,7 @@ steps:

 - powershell: |
    Get-Process | Where Name –Like "electron*" | Stop-Process
+    Get-Process | Where Name –Like "MicrosoftEdge*" | Stop-Process
    Get-Process | Where Name –Like "msedge*" | Stop-Process
  displayName: 'Kill processes left running from last test run'
  condition: always()
-
- powershell: |
-    Remove-Item -path $env:APPDATA/Electron* -Recurse
-  displayName: 'Delete user app data directories'
-  condition: always()
--- 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 = 82

 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
--- a/build/fake_v8_context_snapshot_generator.py
+++ b/build/fake_v8_context_snapshot_generator.py
@@ -1,8 +0,0 @@
-import os
-import shutil
-import sys
-
-if os.path.exists(sys.argv[2]):
-  os.remove(sys.argv[2])
-
-shutil.copy(sys.argv[1], sys.argv[2])
--- 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())
--- 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
@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-import os
-import subprocess
-import sys
-
-source = sys.argv[1]
-dest = sys.argv[2]
-
-# Ensure any existing framework is removed
-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')])
--- a/build/webpack/get-outputs.js
+++ b/build/webpack/get-outputs.js
@@ -1,2 +1,2 @@
-process.env.PRINT_WEBPACK_GRAPH = true;
-require('./run-compiler');
+process.env.PRINT_WEBPACK_GRAPH = true
+require('./run-compiler')
--- a/build/webpack/run-compiler.js
+++ b/build/webpack/run-compiler.js
@@ -1,36 +1,29 @@
 const fs = require('fs');
-const path = require('path');
-const webpack = require('webpack');
+const path = require('path')
+const webpack = require('webpack')

-const configPath = process.argv[2];
-const outPath = path.resolve(process.argv[3]);
-const config = require(configPath);
+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;
+const { wrapInitWithProfilingTimeout } = config;
+delete config.wrapInitWithProfilingTimeout;

-webpack(webpackConfig, (err, stats) => {
+webpack(config, (err, stats) => {
  if (err) {
-    console.error(err);
-    process.exit(1);
+    console.error(err)
+    process.exit(1)
  } else if (stats.hasErrors()) {
-    console.error(stats.toString('normal'));
-    process.exit(1);
+    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__() {
+      const contents = fs.readFileSync(outPath, 'utf8');
+      const newContents = `function ___electron_webpack_init__() {
 ${contents}
 };
 if ((globalThis.process || binding.process).argv.includes("--profile-electron-init")) {
@@ -38,8 +31,8 @@ if ((globalThis.process || binding.process).argv.includes("--profile-electron-in
 } else {
  ___electron_webpack_init__();
 }`;
+      fs.writeFileSync(outPath, newContents);
    }
-    fs.writeFileSync(outPath, contents);
-    process.exit(0);
+    process.exit(0)
  }
-});
+})
--- a/build/webpack/webpack.config.asar.js
+++ b/build/webpack/webpack.config.asar.js
@@ -1,5 +0,0 @@
-module.exports = require('./webpack.config.base')({
-  target: 'asar',
-  alwaysHasNode: true,
-  targetDeletesNodeGlobals: true
-});
--- a/build/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -1,39 +1,39 @@
-const fs = require('fs');
-const path = require('path');
-const webpack = require('webpack');
+const fs = require('fs')
+const path = require('path')
+const webpack = require('webpack')
 const TerserPlugin = require('terser-webpack-plugin');

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

-const onlyPrintingGraph = !!process.env.PRINT_WEBPACK_GRAPH;
+const onlyPrintingGraph = !!process.env.PRINT_WEBPACK_GRAPH

 class AccessDependenciesPlugin {
-  apply (compiler) {
+  apply(compiler) {
    // Only hook into webpack when we are printing the dependency graph
-    if (!onlyPrintingGraph) return;
+    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));
-        console.info(JSON.stringify(filePaths));
-      });
-    });
+        const filePaths = modules.map(m => m.resource).filter(p => p).map(p => path.relative(electronRoot, p))
+        console.info(JSON.stringify(filePaths))
+      })
+    })
  }
 }

 const defines = {
  BUILDFLAG: onlyPrintingGraph ? '(a => a)' : ''
-};
+}

-const buildFlagsPrefix = '--buildflags=';
+const buildFlagsPrefix = '--buildflags='
 const buildFlagArg = process.argv.find(arg => arg.startsWith(buildFlagsPrefix));

 if (buildFlagArg) {
-  const buildFlagPath = buildFlagArg.substr(buildFlagsPrefix.length);
+  const buildFlagPath = buildFlagArg.substr(buildFlagsPrefix.length)

-  const flagFile = fs.readFileSync(buildFlagPath, 'utf8');
+  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])\)/);
+    const flagMatch = line.match(/#define BUILDFLAG_INTERNAL_(.+?)\(\) \(([01])\)/)
    if (flagMatch) {
      const [, flagName, flagValue] = flagMatch;
      defines[flagName] = JSON.stringify(Boolean(parseInt(flagValue, 10)));
@@ -41,27 +41,27 @@ if (buildFlagArg) {
  }
 }

-const ignoredModules = [];
+const ignoredModules = []

-if (defines.ENABLE_DESKTOP_CAPTURER === 'false') {
+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') {
+if (defines['ENABLE_REMOTE_MODULE'] === 'false') {
  ignoredModules.push(
    '@electron/internal/browser/remote/server',
    '@electron/internal/renderer/api/remote'
-  );
+  )
 }

-if (defines.ENABLE_VIEWS_API === 'false') {
+if (defines['ENABLE_VIEWS_API'] === 'false') {
  ignoredModules.push(
    '@electron/internal/browser/api/views/image-view.js'
-  );
+  )
 }

 module.exports = ({
@@ -69,16 +69,13 @@ module.exports = ({
  loadElectronFromAlternateTarget,
  targetDeletesNodeGlobals,
  target,
-  wrapInitWithProfilingTimeout,
-  wrapInitWithTryCatch
+  wrapInitWithProfilingTimeout
 }) => {
-  let entry = path.resolve(electronRoot, 'lib', target, 'init.ts');
+  let entry = path.resolve(electronRoot, 'lib', target, 'init.ts')
  if (!fs.existsSync(entry)) {
-    entry = path.resolve(electronRoot, 'lib', target, 'init.js');
+    entry = path.resolve(electronRoot, 'lib', target, 'init.js')
  }

-  const electronAPIFile = path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.ts');
-
  return ({
    mode: 'development',
    devtool: false,
@@ -88,23 +85,19 @@ module.exports = ({
      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,
+        'electron': path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.ts'),
        // Force timers to resolve to our dependency that doesn't use window.postMessage
-        timers: path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
+        'timers': path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
      },
      extensions: ['.ts', '.js']
    },
    module: {
      rules: [{
        test: (moduleName) => !onlyPrintingGraph && ignoredModules.includes(moduleName),
-        loader: 'null-loader'
+        loader: 'null-loader',
      }, {
        test: /\.ts$/,
        loader: 'ts-loader',
@@ -113,7 +106,7 @@ module.exports = ({
          transpileOnly: onlyPrintingGraph,
          ignoreDiagnostics: [
            // File '{0}' is not under 'rootDir' '{1}'.
-            6059
+            6059,
          ]
        }
      }]
@@ -123,7 +116,7 @@ module.exports = ({
      __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
+      setImmediate: false,
    },
    optimization: {
      minimize: true,
@@ -131,24 +124,24 @@ module.exports = ({
        new TerserPlugin({
          terserOptions: {
            keep_classnames: true,
-            keep_fnames: true
-          }
-        })
-      ]
+            keep_fnames: true,
+          },
+        }),
+      ],
    },
    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']
+          process: ['@electron/internal/renderer/webpack-provider', 'process'],
+          global: ['@electron/internal/renderer/webpack-provider', '_global'],
+          Buffer: ['@electron/internal/renderer/webpack-provider', 'Buffer'],
        })
      ] : []),
      new webpack.ProvidePlugin({
-        Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise']
+        Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise'],
      }),
-      new webpack.DefinePlugin(defines)
+      new webpack.DefinePlugin(defines),
    ]
-  });
-};
+  })
+}
--- a/build/webpack/webpack.config.browser.js
+++ b/build/webpack/webpack.config.browser.js
@@ -1,4 +1,4 @@
 module.exports = require('./webpack.config.base')({
  target: 'browser',
  alwaysHasNode: true
-});
+})
--- a/build/webpack/webpack.config.isolated_renderer.js
+++ b/build/webpack/webpack.config.isolated_renderer.js
@@ -1,5 +1,4 @@
 module.exports = require('./webpack.config.base')({
  target: 'isolated_renderer',
-  alwaysHasNode: false,
-  wrapInitWithTryCatch: true
-});
+  alwaysHasNode: false
+})
--- a/build/webpack/webpack.config.renderer.js
+++ b/build/webpack/webpack.config.renderer.js
@@ -2,6 +2,5 @@ module.exports = require('./webpack.config.base')({
  target: 'renderer',
  alwaysHasNode: true,
  targetDeletesNodeGlobals: true,
-  wrapInitWithProfilingTimeout: true,
-  wrapInitWithTryCatch: true
-});
+  wrapInitWithProfilingTimeout: true
+})
--- a/build/webpack/webpack.config.sandboxed_renderer.js
+++ b/build/webpack/webpack.config.sandboxed_renderer.js
@@ -2,5 +2,4 @@ module.exports = require('./webpack.config.base')({
  target: 'sandboxed_renderer',
  alwaysHasNode: false,
  wrapInitWithProfilingTimeout: true,
-  wrapInitWithTryCatch: true
-});
+})
--- a/build/webpack/webpack.config.worker.js
+++ b/build/webpack/webpack.config.worker.js
@@ -2,6 +2,5 @@ module.exports = require('./webpack.config.base')({
  target: 'worker',
  loadElectronFromAlternateTarget: 'renderer',
  alwaysHasNode: true,
-  targetDeletesNodeGlobals: true,
-  wrapInitWithTryCatch: true
-});
+  targetDeletesNodeGlobals: true
+})
--- a/build/zip.py
+++ b/build/zip.py
@@ -32,8 +32,6 @@ PATHS_TO_SKIP = [
  # On Linux, we don't use crashpad, but this binary is still built for some
  # reason. Exclude it from the zip.
  './crashpad_handler',
-
-  'resources/inspector', #Skipping because these are outputs that we don't need
 ]

 def skip_path(dep, dist_zip, target_cpu):
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -12,8 +12,6 @@ import("//third_party/widevine/cdm/widevine.gni")
 static_library("chrome") {
  visibility = [ "//electron:electron_lib" ]
  sources = [
-    "//chrome/browser/accessibility/accessibility_ui.cc",
-    "//chrome/browser/accessibility/accessibility_ui.h",
    "//chrome/browser/browser_process.cc",
    "//chrome/browser/browser_process.h",
    "//chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc",
@@ -64,20 +62,18 @@ static_library("chrome") {
    "//extensions/browser/app_window/size_constraints.cc",
    "//extensions/browser/app_window/size_constraints.h",
  ]
-
  public_deps = [
    "//chrome/common",
    "//chrome/common:version_header",
    "//components/keyed_service/content",
-    "//components/paint_preview/buildflags",
    "//components/proxy_config",
    "//components/security_state/content",
    "//content/public/browser",
  ]
-
  deps = [
    "//chrome/browser:resource_prefetch_predictor_proto",
    "//chrome/services/speech:buildflags",
+    "//components/feature_engagement:buildflags",
    "//components/optimization_guide/proto:optimization_guide_proto",
  ]

@@ -266,21 +262,12 @@ static_library("chrome") {
      ]
    }
  }
-
-  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" ]
-  }
 }

 source_set("plugins") {
  sources = []
  deps = []
-  frameworks = []
+  libs = []

  # browser side
  sources += [
@@ -314,7 +301,7 @@ source_set("plugins") {
        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
        "//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
      ]
-      frameworks += [ "CoreGraphics.framework" ]
+      libs += [ "CoreGraphics.framework" ]
    }
    if (is_linux) {
      deps += [ "//components/services/font/public/cpp" ]
@@ -378,8 +365,8 @@ source_set("chrome_spellchecker") {
      "//chrome/browser/spellchecker/spellcheck_factory.h",
      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
      "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
-      "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h",
+      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
+      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
      "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
      "//chrome/browser/spellchecker/spellcheck_service.cc",
--- a/chromium_src/chrome/browser/certificate_manager_model.cc
+++ b/chromium_src/chrome/browser/certificate_manager_model.cc
@@ -36,7 +36,6 @@ net::NSSCertDatabase* GetNSSCertDatabaseForResourceContext(
    // Linux has only a single persistent slot compared to ChromeOS's separate
    // public and private slot.
    // Redirect any slot usage to this persistent slot on Linux.
-    crypto::EnsureNSSInit();
    g_nss_cert_database = new net::NSSCertDatabase(
        crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* public slot */,
        crypto::ScopedPK11Slot(PK11_GetInternalKeySlot()) /* private slot */);
--- a/chromium_src/chrome/browser/process_singleton_posix.cc
+++ b/chromium_src/chrome/browser/process_singleton_posix.cc
@@ -360,7 +360,7 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
 }

 bool IsAppSandboxed() {
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
  // NB: There is no sane API for this, we have to just guess by
  // reading tea leaves
  base::FilePath home_dir;
@@ -371,7 +371,7 @@ bool IsAppSandboxed() {
  return home_dir.value().find("Library/Containers") != std::string::npos;
 #else
  return false;
-#endif  // defined(OS_MAC)
+#endif  // defined(OS_MACOSX)
 }

 bool ConnectSocket(ScopedSocket* socket,
@@ -421,7 +421,7 @@ bool ConnectSocket(ScopedSocket* socket,
  }
 }

-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
 bool ReplaceOldSingletonLock(const base::FilePath& symlink_content,
                             const base::FilePath& lock_path) {
  // Try taking an flock(2) on the file. Failure means the lock is taken so we
@@ -447,14 +447,14 @@ bool ReplaceOldSingletonLock(const base::FilePath& symlink_content,
  // lock. We never flock() the lock file from now on. I.e. we assume that an
  // old version of Chrome will not run with the same user data dir after this
  // version has run.
-  if (!base::DeleteFile(lock_path)) {
+  if (!base::DeleteFile(lock_path, false)) {
    PLOG(ERROR) << "Could not delete old singleton lock.";
    return false;
  }

  return SymlinkPath(symlink_content, lock_path);
 }
-#endif  // defined(OS_MAC)
+#endif  // defined(OS_MACOSX)

 }  // namespace

@@ -970,7 +970,7 @@ bool ProcessSingleton::Create() {
  if (!SymlinkPath(symlink_content, lock_path_)) {
    // TODO(jackhou): Remove this case once this code is stable on Mac.
    // http://crbug.com/367612
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
    // On Mac, an existing non-symlink lock file means the lock could be held by
    // the old process singleton code. If we can successfully replace the lock,
    // continue as normal.
--- a/default_app/index.html
+++ b/default_app/index.html
@@ -53,31 +53,31 @@
    <nav>
      <div class="linkcol">
        <a class="hero-link" target="_blank" href="https://electronjs.org/blog">
-          <span class="octicon hero-octicon octicon-code-square-24" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-gist" aria-hidden="true"></span>
          <h4>Blog</h4>
        </a>
      </div>
      <div class="linkcol">
        <a class="hero-link" target="_blank" href="https://github.com/electron/electron">
-          <span class="octicon hero-octicon octicon-mark-github-16" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-mark-github" aria-hidden="true"></span>
          <h4>Repository</h4>
        </a>
      </div>
      <div class="linkcol">
        <a class="hero-link" target="_blank" href="https://electronjs.org/docs">
-          <span class="octicon hero-octicon octicon-book-24" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-gear" aria-hidden="true"></span>
          <h4>Docs</h4>
        </a>
      </div>
      <div class="linkcol">
        <a class="hero-link" target="_blank" href="https://github.com/electron/electron-api-demos">
-          <span class="octicon hero-octicon octicon-star-fill-24" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-star" aria-hidden="true"></span>
          <h4>API Demos</h4>
        </a>
      </div>
      <div class="linkcol">
        <a class="hero-link" target="_blank" href="https://electronforge.io">
-          <span class="octicon hero-octicon octicon-gift-24" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-gift" aria-hidden="true"></span>
          <h4>Forge</h4>
        </a>
      </div>
--- a/default_app/main.ts
+++ b/default_app/main.ts
@@ -1,9 +1,8 @@
-import * as electron from 'electron';
+import { app, dialog } from 'electron';

 import * as fs from 'fs';
 import * as path from 'path';
 import * as url from 'url';
-const { app, dialog } = electron;

 type DefaultAppOptions = {
  file: null | string;
@@ -146,90 +145,13 @@ function startRepl () {
    process.exit(1);
  }

-  // Prevent quitting.
+  // prevent quitting
  app.on('window-all-closed', () => {});

-  const GREEN = '32';
-  const colorize = (color: string, s: string) => `\x1b[${color}m${s}\x1b[0m`;
-  const electronVersion = colorize(GREEN, `v${process.versions.electron}`);
-  const nodeVersion = colorize(GREEN, `v${process.versions.node}`);
-
-  console.info(`
-    Welcome to the Electron.js REPL \\[._.]/
-
-    You can access all Electron.js modules here as well as Node.js modules.
-    Using: Node.js ${nodeVersion} and Electron.js ${electronVersion}
-  `);
-
-  const { REPLServer } = require('repl');
-  const repl = new REPLServer({
-    prompt: '> '
-  }).on('exit', () => {
+  const repl = require('repl');
+  repl.start('> ').on('exit', () => {
    process.exit(0);
  });
-
-  function defineBuiltin (context: any, name: string, getter: Function) {
-    const setReal = (val: any) => {
-      // Deleting the property before re-assigning it disables the
-      // getter/setter mechanism.
-      delete context[name];
-      context[name] = val;
-    };
-
-    Object.defineProperty(context, name, {
-      get: () => {
-        const lib = getter();
-
-        delete context[name];
-        Object.defineProperty(context, name, {
-          get: () => lib,
-          set: setReal,
-          configurable: true,
-          enumerable: false
-        });
-
-        return lib;
-      },
-      set: setReal,
-      configurable: true,
-      enumerable: false
-    });
-  }
-
-  defineBuiltin(repl.context, 'electron', () => electron);
-  for (const api of Object.keys(electron) as (keyof typeof electron)[]) {
-    defineBuiltin(repl.context, api, () => electron[api]);
-  }
-
-  // Copied from node/lib/repl.js. For better DX, we don't want to
-  // show e.g 'contentTracing' at a higher priority than 'const', so
-  // we only trigger custom tab-completion when no common words are
-  // potentially matches.
-  const commonWords = [
-    'async', 'await', 'break', 'case', 'catch', 'const', 'continue',
-    'debugger', 'default', 'delete', 'do', 'else', 'export', 'false',
-    'finally', 'for', 'function', 'if', 'import', 'in', 'instanceof', 'let',
-    'new', 'null', 'return', 'switch', 'this', 'throw', 'true', 'try',
-    'typeof', 'var', 'void', 'while', 'with', 'yield'
-  ];
-
-  const electronBuiltins = [...Object.keys(electron), 'original-fs', 'electron'];
-
-  const defaultComplete = repl.completer;
-  repl.completer = (line: string, callback: Function) => {
-    const lastSpace = line.lastIndexOf(' ');
-    const currentSymbol = line.substring(lastSpace + 1, repl.cursor);
-
-    const filterFn = (c: string) => c.startsWith(currentSymbol);
-    const ignores = commonWords.filter(filterFn);
-    const hits = electronBuiltins.filter(filterFn);
-
-    if (!ignores.length && hits.length) {
-      callback(null, [hits, currentSymbol]);
-    } else {
-      defaultComplete.apply(repl, [line, callback]);
-    }
-  };
 }

 // Start the specified app if there is one specified in command line, otherwise
--- a/docs/README.md
+++ b/docs/README.md
@@ -23,20 +23,20 @@ an issue:
  * [Setting up Windows](tutorial/development-environment.md#setting-up-windows)
  * [Setting up Linux](tutorial/development-environment.md#setting-up-linux)
  * [Choosing an Editor](tutorial/development-environment.md#a-good-editor)
-* [Creating your First App](tutorial/quick-start.md)
-  * [Prerequisites](tutorial/quick-start.md#prerequisites)
-  * [Create a basic application](tutorial/quick-start.md#create-a-basic-application)
-  * [Package and distribute the application](tutorial/quick-start.md#package-and-distribute-the-application)
+* [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/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)
+* [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
@@ -56,7 +56,7 @@ an issue:
 * [Accessibility](tutorial/accessibility.md)
  * [Spectron](tutorial/accessibility.md#spectron)
  * [Devtron](tutorial/accessibility.md#devtron)
-  * [Manually Enabling Accessibility Features](tutorial/accessibility.md#manually-enabling-accessibility-features)
+  * [Enabling Accessibility](tutorial/accessibility.md#enabling-accessibility)
 * [Testing and Debugging](tutorial/application-debugging.md)
  * [Debugging the Main Process](tutorial/debugging-main-process.md)
  * [Debugging the Main Process with Visual Studio Code](tutorial/debugging-main-process-vscode.md)
@@ -92,6 +92,7 @@ These individual tutorials expand on topics discussed in the guide above.
 * Electron Releases & Developer Feedback
  * [Versioning Policy](tutorial/electron-versioning.md)
  * [Release Timelines](tutorial/electron-timelines.md)
+  * [App Feedback Program](tutorial/app-feedback-program.md)
 * [Packaging App Source Code with asar](tutorial/application-packaging.md)
  * [Generating asar Archives](tutorial/application-packaging.md#generating-asar-archives)
  * [Using asar Archives](tutorial/application-packaging.md#using-asar-archives)
@@ -145,7 +146,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
@@ -140,16 +140,6 @@ this event, such as launching the application for the first time, attempting
 to re-launch the application when it's already running, or clicking on the
 application's dock or taskbar icon.

-### Event: 'did-become-active' _macOS_
-
-Returns:
-
-* `event` Event
-
-Emitted when mac application become active. Difference from `activate` event is
-that `did-become-active` is emitted every time the app becomes active, not only
-when Dock icon is clicked or application is re-launched.
-
 ### Event: 'continue-activity' _macOS_

 Returns:
@@ -360,7 +350,7 @@ page.

 Emitted whenever there is a GPU info update.

-### Event: 'gpu-process-crashed' _Deprecated_
+### Event: 'gpu-process-crashed'

 Returns:

@@ -369,11 +359,6 @@ Returns:

 Emitted when the GPU process crashes or is killed.

-**Deprecated:** This event is superceded by the `child-process-gone` event
-which contains more information about why the child process disappeared. It
-isn't always because it crashed. The `killed` boolean can be replaced by
-checking `reason === 'killed'` when you switch to that event.
-
 ### Event: 'renderer-process-crashed' _Deprecated_

 Returns:
@@ -385,7 +370,7 @@ Returns:
 Emitted when the renderer process of `webContents` crashes or is killed.

 **Deprecated:** This event is superceded by the `render-process-gone` event
-which contains more information about why the render process disappeared. It
+which contains more information about why the render process dissapeared. It
 isn't always because it crashed.  The `killed` boolean can be replaced by
 checking `reason === 'killed'` when you switch to that event.

@@ -402,42 +387,12 @@ Returns:
    * `killed` - Process was sent a SIGTERM or otherwise killed externally
    * `crashed` - Process crashed
    * `oom` - Process ran out of memory
-    * `launch-failed` - Process never successfully launched
+    * `launch-failure` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed

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

-#### Event: 'child-process-gone'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `type` String - Process type. One of the following values:
-    * `Utility`
-    * `Zygote`
-    * `Sandbox helper`
-    * `GPU`
-    * `Pepper Plugin`
-    * `Pepper Plugin Broker`
-    * `Unknown`
-  * `reason` String - The reason the child process is gone. Possible values:
-    * `clean-exit` - Process exited with an exit code of zero
-    * `abnormal-exit` - Process exited with a non-zero exit code
-    * `killed` - Process was sent a SIGTERM or otherwise killed externally
-    * `crashed` - Process crashed
-    * `oom` - Process ran out of memory
-    * `launch-failed` - Process never successfully launched
-    * `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).
-  * `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
-because it was crashed or killed. It does not include renderer processes.
-
 ### Event: 'accessibility-support-changed' _macOS_ _Windows_

 Returns:
@@ -501,7 +456,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:

@@ -513,7 +468,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:

@@ -525,7 +480,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:

@@ -537,7 +492,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:

@@ -548,7 +503,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:

@@ -850,20 +805,6 @@ Returns `String` - Name of the application handling the protocol, or an empty
 This method returns the application name of the default handler for the protocol
 (aka URI scheme) of a URL.

-### `app.getApplicationInfoForProtocol(url)` _macOS_ _Windows_
-
-* `url` String - a URL with the protocol name to check. Unlike the other
-  methods in this family, this accepts an entire URL, including `://` at a
-  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.
-
-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.
-
 ### `app.setUserTasks(tasks)` _Windows_

 * `tasks` [Task[]](structures/task.md) - Array of `Task` objects
@@ -1025,7 +966,6 @@ if (!gotTheLock) {

  // Create myWindow, load the rest of the app, etc...
  app.whenReady().then(() => {
-    myWindow = createWindow()
  })
 }
 ```
@@ -1141,10 +1081,8 @@ 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:
-   {
-     amdSwitchable: true,
+{ auxAttributes:
+   { amdSwitchable: true,
     canSupportThreadedTextureMailbox: false,
     directComposition: false,
     directRendering: true,
@@ -1157,14 +1095,12 @@ For `infoType` equal to `basic`:
     sandboxed: false,
     softwareRendering: false,
     supportsOverlays: false,
-     videoDecodeAcceleratorFlags: 0
-   },
-  gpuDevice:
-   [{ active: true, deviceId: 26657, vendorId: 4098 },
-     { active: false, deviceId: 3366, vendorId: 32902 }],
-  machineModelName: 'MacBookPro',
-  machineModelVersion: '11.5'
-}
+     videoDecodeAcceleratorFlags: 0 },
+gpuDevice:
+   [ { active: true, deviceId: 26657, vendorId: 4098 },
+     { active: false, deviceId: 3366, vendorId: 32902 } ],
+machineModelName: 'MacBookPro',
+machineModelVersion: '11.5' }
 ```

 Using `basic` should be preferred if only basic information like `vendorId` or `driverId` is needed.
@@ -1216,13 +1152,6 @@ Returns `Object`:
  should restore the state from the previous session. This indicates that the
  app should restore the windows that were open the last time the app was
  closed. This setting is not available on [MAS builds][mas-builds].
-* `executableWillLaunchAtLogin` Boolean _Windows_ - `true` if app is set to open at login and its run key is not deactivated. This differs from `openAtLogin` as it ignores the `args` option, this property will be true if the given executable would be launched at login with **any** arguments.
-* `launchItems` Object[] _Windows_
-  * `name` String _Windows_ - name value of a registry entry.
-  * `path` String _Windows_ - The executable to an app that corresponds to a registry entry.
-  * `args` String[] _Windows_ - the command-line arguments to pass to the executable.
-  * `scope` String _Windows_ - one of `user` or `machine`. Indicates whether the registry entry is under `HKEY_CURRENT USER` or `HKEY_LOCAL_MACHINE`.
-  * `enabled` Boolean _Windows_ - `true` if the app registry key is startup approved and therefore shows as `enabled` in Task Manager and Windows settings.

 ### `app.setLoginItemSettings(settings)` _macOS_ _Windows_

@@ -1238,9 +1167,7 @@ Returns `Object`:
  * `args` String[] (optional) _Windows_ - The command-line arguments to pass to
    the executable. Defaults to an empty array. Take care to wrap paths in
    quotes.
-  * `enabled` Boolean (optional) _Windows_ - `true` will change the startup approved registry key and `enable / disable` the App in Task Manager and Windows Settings.
-    Defaults to `true`.
-  * `name` String (optional) _Windows_ - value name to write into registry. Defaults to the app's AppUserModelId().
+
 Set the app's login item settings.

 To work with Electron's `autoUpdater` on Windows, which uses [Squirrel][Squirrel-Windows],
@@ -1295,7 +1222,7 @@ Show the app's about panel options. These options can be overridden with `app.se
  * `credits` String (optional) _macOS_ _Windows_ - Credit information.
  * `authors` String[] (optional) _Linux_ - List of app authors.
  * `website` String (optional) _Linux_ - The app's website.
-  * `iconPath` String (optional) _Linux_ _Windows_ - Path to the app's icon in a JPEG or PNG file format. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.
+  * `iconPath` String (optional) _Linux_ _Windows_ - Path to the app's icon. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.

 Set the about panel options. This will override the values defined in the app's `.plist` file on macOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.

@@ -1356,7 +1283,7 @@ method returns false. If we fail to perform the copy, then this method will
 throw an error. The message in the error should be informative and tell
 you exactly what went wrong.

-By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the pre-existing running app will assume focus and the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.
+By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the pre-existing running app will assume focus and the the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.

 For example:

--- a/docs/api/auto-updater.md
+++ b/docs/api/auto-updater.md
@@ -104,7 +104,7 @@ The `autoUpdater` object has the following methods:
 * `options` Object
  * `url` String
  * `headers` Record<String, String> (optional) _macOS_ - HTTP request headers.
-  * `serverType` String (optional) _macOS_ - Can be `json` or `default`, see the [Squirrel.Mac][squirrel-mac]
+  * `serverType` String (optional) _macOS_ - Either `json` or `default`, see the [Squirrel.Mac][squirrel-mac]
    README for more information.

 Sets the `url` and initialize the auto updater.
--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -28,6 +28,25 @@ view.webContents.loadURL('https://electronjs.org')
 * `options` Object (optional)
  * `webPreferences` Object (optional) - See [BrowserWindow](browser-window.md).

+### Static Methods
+
+#### `BrowserView.getAllViews()`
+
+Returns `BrowserView[]` - An array of all opened BrowserViews.
+
+#### `BrowserView.fromWebContents(webContents)`
+
+* `webContents` [WebContents](web-contents.md)
+
+Returns `BrowserView | null` - The BrowserView that owns the given `webContents`
+or `null` if the contents are not owned by a BrowserView.
+
+#### `BrowserView.fromId(id)`
+
+* `id` Integer
+
+Returns `BrowserView` - The view with the given `id`.
+
 ### Instance Properties

 Objects created with `new BrowserView` have the following properties:
@@ -36,10 +55,24 @@ Objects created with `new BrowserView` have the following properties:

 A [`WebContents`](web-contents.md) object owned by this view.

+#### `view.id` _Experimental_
+
+A `Integer` representing the unique ID of the view.
+
 ### Instance Methods

 Objects created with `new BrowserView` have the following instance methods:

+#### `view.destroy()`
+
+Force closing the view, the `unload` and `beforeunload` events won't be emitted
+for the web page. After you're done with a view, call this function in order to
+free memory and other resources as soon as possible.
+
+#### `view.isDestroyed()`
+
+Returns `Boolean` - Whether the view is destroyed.
+
 #### `view.setAutoResize(options)` _Experimental_

 * `options` Object
--- 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
@@ -35,7 +38,7 @@ the window after this event will have no visual flash:

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ show: false })
+let win = new BrowserWindow({ show: false })
 win.once('ready-to-show', () => {
  win.show()
 })
@@ -57,7 +60,7 @@ immediately, and use a `backgroundColor` close to your app's background:
 ```javascript
 const { BrowserWindow } = require('electron')

-const win = new BrowserWindow({ backgroundColor: '#2e2c29' })
+let win = new BrowserWindow({ backgroundColor: '#2e2c29' })
 win.loadURL('https://github.com')
 ```

@@ -71,8 +74,8 @@ By using `parent` option, you can create child windows:
 ```javascript
 const { BrowserWindow } = require('electron')

-const top = new BrowserWindow()
-const child = new BrowserWindow({ parent: top })
+let top = new BrowserWindow()
+let child = new BrowserWindow({ parent: top })
 child.show()
 top.show()
 ```
@@ -87,7 +90,7 @@ window, you have to set both `parent` and `modal` options:
 ```javascript
 const { BrowserWindow } = require('electron')

-const child = new BrowserWindow({ parent: top, modal: true, show: false })
+let child = new BrowserWindow({ parent: top, modal: true, show: false })
 child.loadURL('https://github.com')
 child.once('ready-to-show', () => {
  child.show()
@@ -204,15 +207,11 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
  * `opacity` Number (optional) - Set the initial opacity of the window, between 0.0 (fully
    transparent) and 1.0 (fully opaque). This is only implemented on Windows and macOS.
  * `darkTheme` Boolean (optional) - Forces using dark theme for the window, only works on
-    some GTK+3 desktop environments. Default is `false`.
+    some GTK desktop environments. Default is [`nativeTheme.shouldUseDarkColors`](native-theme.md).
  * `transparent` Boolean (optional) - Makes the window [transparent](frameless-window.md#transparent-window).
    Default is `false`. On Windows, does not work unless the window is frameless.
  * `type` String (optional) - The type of window, default is normal window. See more about
    this below.
-  * `visualEffectState` String (optional) - Specify how the material appearance should reflect window activity state on macOS. Must be used with the `vibrancy` property. Possible values are:
-    * `followWindow` - The backdrop should automatically appear active when the window is active, and inactive when it is not. This is the default.
-    * `active` - The backdrop should always appear active.
-    * `inactive` - The backdrop should always appear inactive.
  * `titleBarStyle` String (optional) - The style of window title bar.
    Default is `default`. Possible values are:
    * `default` - Results in the standard gray opaque Mac title
@@ -272,7 +271,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      the `nodeIntegration` option and the APIs available to the preload script
      are more limited. Read more about the option [here](sandbox-option.md).
    * `enableRemoteModule` Boolean (optional) - Whether to enable the [`remote`](remote.md) module.
-      Default is `false`.
+      Default is `true`.
    * `session` [Session](session.md#class-session) (optional) - Sets the session used by the
      page. Instead of passing the Session object directly, you can also choose to
      use the `partition` option instead, which accepts a partition string. When
@@ -349,9 +348,6 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      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_
    * `nativeWindowOpen` Boolean (optional) - Whether to use native
      `window.open()`. Defaults to `false`. Child windows will always have node
      integration disabled unless `nodeIntegrationInSubFrames` is true. **Note:** This option is currently
@@ -601,7 +597,7 @@ e.g. `APPCOMMAND_BROWSER_BACKWARD` is emitted as `browser-backward`.

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 win.on('app-command', (e, cmd) => {
  // Navigate the window back when the user hits their mouse back button
  if (cmd === 'browser-backward' && win.webContents.canGoBack()) {
@@ -667,20 +663,6 @@ Emitted when the window has closed a sheet.

 Emitted when the native new tab button is clicked.

-#### Event: 'system-context-menu' _Windows_
-
-Returns:
-
-* `event` Event
-* `point` [Point](structures/point.md) - The screen coordinates the context menu was triggered at
-
-Emitted when the system context menu is triggered on the window, this is
-normally only triggered when the user right clicks on the non-client area
-of your window.  This is the window titlebar or any area you have declared
-as `-webkit-app-region: drag` in a frameless window.
-
-Calling `event.preventDefault()` will prevent the menu from being displayed.
-
 ### Static Methods

 The `BrowserWindow` class has the following static methods:
@@ -710,7 +692,7 @@ Returns `BrowserWindow | null` - The window that owns the given `browserView`. I

 * `id` Integer

-Returns `BrowserWindow | null` - The window with the given `id`.
+Returns `BrowserWindow` - The window with the given `id`.

 #### `BrowserWindow.addExtension(path)` _Deprecated_

@@ -790,7 +772,7 @@ To check if a DevTools extension is installed you can run the following:
 ```javascript
 const { BrowserWindow } = require('electron')

-const installed = 'devtron' in BrowserWindow.getDevToolsExtensions()
+let installed = BrowserWindow.getDevToolsExtensions().hasOwnProperty('devtron')
 console.log(installed)
 ```

@@ -807,7 +789,7 @@ Objects created with `new BrowserWindow` have the following properties:
 ```javascript
 const { BrowserWindow } = require('electron')
 // In this example `win` is our instance
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('https://github.com')
 ```

@@ -1332,9 +1314,9 @@ a HTML-rendered toolbar. For example:

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()

-const toolbarRect = document.getElementById('toolbar').getBoundingClientRect()
+let toolbarRect = document.getElementById('toolbar').getBoundingClientRect()
 win.setSheetOffset(toolbarRect.height)
 ```

@@ -1360,17 +1342,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".
@@ -1469,7 +1440,7 @@ Node's [`url.format`](https://nodejs.org/api/url.html#url_url_format_urlobject)
 method:

 ```javascript
-const url = require('url').format({
+let url = require('url').format({
  protocol: 'file',
  slashes: true,
  pathname: require('path').join(__dirname, 'index.html')
@@ -1695,12 +1666,9 @@ Sets whether the menu bar should be visible. If the menu bar is auto-hide, users

 Returns `Boolean` - Whether the menu bar is visible.

-#### `win.setVisibleOnAllWorkspaces(visible[, options])`
+#### `win.setVisibleOnAllWorkspaces(visible)`

 * `visible` Boolean
-* `options` Object (optional)
-  * `visibleOnFullScreen` Boolean (optional) _macOS_ - Sets whether
-    the window should be visible above fullscreen windows

 Sets whether the window should be visible on all workspaces.

--- a/docs/api/client-request.md
+++ b/docs/api/client-request.md
@@ -13,40 +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`.
+  * `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
@@ -181,20 +171,6 @@ lowercasing. It can be called only before first write. Calling this method after
 the first write will throw an error. If the passed value is not a `String`, its
 `toString()` method will be called to obtain the final value.

-Certain headers are restricted from being set by apps. These headers are
-listed below. More information on restricted headers can be found in
-[Chromium's header utils](https://source.chromium.org/chromium/chromium/src/+/master:services/network/public/cpp/header_util.cc;drc=1562cab3f1eda927938f8f4a5a91991fefde66d3;bpv=1;bpt=1;l=22).
-
-* `Content-Length`
-* `Host`
-* `Trailer` or `Te`
-* `Upgrade`
-* `Cookie2`
-* `Keep-Alive`
-* `Transfer-Encoding`
-
-Additionally, setting the `Connection` header to the value `upgrade` is also disallowed.
-
 #### `request.getHeader(name)`

 * `name` String - Specify an extra header name.
--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -198,14 +198,6 @@ logging level for all code in the source files under a `foo/bar` directory.

 This switch only works when `--enable-logging` is also passed.

-### --force_high_performance_gpu
-
-Force using discrete GPU when there are multiple GPUs available.
-
-### --force_low_power_gpu
-
-Force using integrated GPU when there are multiple GPUs available.
-
 ## Node.js Flags

 Electron supports some of the [CLI flags][node-cli] supported by Node.js.
--- a/docs/api/content-tracing.md
+++ b/docs/api/content-tracing.md
@@ -83,4 +83,4 @@ Returns `Promise<Object>` - Resolves with an object containing the `value` and `
 Get the maximum usage across processes of trace buffer as a percentage of the
 full state.

-[trace viewer]: https://chromium.googlesource.com/catapult/+/HEAD/tracing/README.md
+[trace viewer]: https://github.com/catapult-project/catapult/blob/master/tracing
--- 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
@@ -187,21 +156,15 @@ parameters in a renderer process will not result in those parameters being sent
 with crashes that occur in other renderer processes or in the main process.

 **Note:** Parameters have limits on the length of the keys and values. Key
-names must be no longer than 39 bytes, and values must be no longer than 20320
+names must be no longer than 39 bytes, 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:** On linux values that are longer than 127 bytes will be chunked into
-multiple keys, each 127 bytes in length.  E.g. `addExtraParameter('foo', 'a'.repeat(130))`
-will result in two chunked keys `foo__1` and `foo__2`, the first will contain
-the first 127 bytes and the second will contain the remaining 3 bytes.  On
-your crash reporting backend you should stitch together keys in this format.
-
 ### `crashReporter.removeExtraParameter(key)`

 * `key` String - Parameter key, must be no longer than 39 bytes.

-Remove an extra parameter from the current set of parameters. Future crashes
+Remove a extra parameter from the current set of parameters. Future crashes
 will not include this parameter.

 ### `crashReporter.getParameters()`
--- a/docs/api/debugger.md
+++ b/docs/api/debugger.md
@@ -9,7 +9,7 @@ runtime that allows interacting with pages and instrumenting them.

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()

 try {
  win.webContents.debugger.attach('1.1')
--- 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:
@@ -261,7 +269,7 @@ Shows a message box, it will block the process until the message box is closed.
 It returns the index of the clicked button.

 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
-If `browserWindow` is not shown dialog will not be attached to it. In such case it will be displayed as an independent window.
+If `browserWindow` is not shown dialog will not be attached to it. In such case It will be displayed as independed window.

 ### `dialog.showMessageBox([browserWindow, ]options)`

@@ -306,7 +314,7 @@ Returns `Promise<Object>` - resolves with a promise containing the following pro
  * `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
@@ -11,7 +11,7 @@ control the download item.
 ```javascript
 // In the main process.
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 win.webContents.session.on('will-download', (event, item, webContents) => {
  // Set the save path, making Electron not to prompt a save dialog.
  item.setSavePath('/tmp/save.pdf')
@@ -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/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`
@@ -103,15 +102,3 @@ The following methods of `chrome.tabs` are supported:
 > **Note:** In Chrome, passing `-1` as a tab ID signifies the "currently active
 > tab". Since Electron has no such concept, passing `-1` as a tab ID is not
 > supported and will raise an error.
-
-### `chrome.management`
-
-The following methods of `chrome.management` are supported:
-
- `chrome.management.getAll`
- `chrome.management.get`
- `chrome.management.getSelf`
- `chrome.management.getPermissionWarningsById`
- `chrome.management.getPermissionWarningsByManifest`
- `chrome.management.onEnabled`
- `chrome.management.onDisabled`
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -15,7 +15,7 @@ To create a frameless window, you need to set `frame` to `false` in

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ width: 800, height: 600, frame: false })
+let win = new BrowserWindow({ width: 800, height: 600, frame: false })
 win.show()
 ```

@@ -33,7 +33,7 @@ Results in a hidden title bar and a full size content window, yet the title bar

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ titleBarStyle: 'hidden' })
+let win = new BrowserWindow({ titleBarStyle: 'hidden' })
 win.show()
 ```

@@ -43,7 +43,7 @@ Results in a hidden title bar with an alternative look where the traffic light b

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ titleBarStyle: 'hiddenInset' })
+let win = new BrowserWindow({ titleBarStyle: 'hiddenInset' })
 win.show()
 ```

@@ -58,7 +58,7 @@ This option is only applicable for frameless windows.

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ titleBarStyle: 'customButtonsOnHover', frame: false })
+let win = new BrowserWindow({ titleBarStyle: 'customButtonsOnHover', frame: false })
 win.show()
 ```

@@ -69,7 +69,7 @@ window transparent:

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ transparent: true, frame: false })
+let win = new BrowserWindow({ transparent: true, frame: false })
 win.show()
 ```

@@ -100,7 +100,7 @@ API:

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 win.setIgnoreMouseEvents(true)
 ```

@@ -112,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 el = document.getElementById('clickThroughElement')
+let win = require('electron').remote.getCurrentWindow()
+let 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
@@ -148,4 +148,4 @@ found in the [`ipc-main-invoke-event`](structures/ipc-main-invoke-event.md)
 structure docs.

 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
-[web-contents-send]: web-contents.md#contentssendchannel-args
+[web-contents-send]: web-contents.md#contentssendchannel-arg1-arg2-
--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -108,7 +108,7 @@ ipcMain.handle('some-name', async (event, someArgument) => {

 If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).

-If you do not need a response to the message, consider using [`ipcRenderer.send`](#ipcrenderersendchannel-args).
+If you do not need a respons to the message, consider using [`ipcRenderer.send`](#ipcrenderersendchannel-args).

 ### `ipcRenderer.sendSync(channel, ...args)`

--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -96,7 +96,7 @@ Appends the `menuItem` to the menu.

 * `id` String

-Returns `MenuItem | null` the item with the specified `id`
+Returns `MenuItem` the item with the specified `id`

 #### `menu.insert(pos, menuItem)`

@@ -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')
@@ -189,8 +195,8 @@ const template = [
        {
          label: 'Speech',
          submenu: [
-            { role: 'startSpeaking' },
-            { role: 'stopSpeaking' }
+            { role: 'startspeaking' },
+            { role: 'stopspeaking' }
          ]
        }
      ] : [
@@ -205,12 +211,12 @@ const template = [
    label: 'View',
    submenu: [
      { role: 'reload' },
-      { role: 'forceReload' },
-      { role: 'toggleDevTools' },
+      { role: 'forcereload' },
+      { role: 'toggledevtools' },
      { type: 'separator' },
-      { role: 'resetZoom' },
-      { role: 'zoomIn' },
-      { role: 'zoomOut' },
+      { role: 'resetzoom' },
+      { role: 'zoomin' },
+      { role: 'zoomout' },
      { type: 'separator' },
      { role: 'togglefullscreen' }
    ]
@@ -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
@@ -13,19 +13,9 @@ 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 intiative 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-image.md
+++ b/docs/api/native-image.md
@@ -119,13 +119,6 @@ Returns `NativeImage`

 Creates an empty `NativeImage` instance.

-### `nativeImage.createThumbnailFromPath(path, maxSize)` _macOS_ _Windows_
-
-* `path` String - path to a file that we intend to construct a thumbnail out of.
-* `maxSize` [Size](structures/size.md) - the maximum width and height (positive numbers) the thumbnail returned can be. The Windows implementation will ignore `maxSize.height` and scale the height according to `maxSize.width`.
-
-Returns `Promise<NativeImage>` - fulfilled with the file's thumbnail preview image, which is a [NativeImage](native-image.md).
-
 ### `nativeImage.createFromPath(path)`

 * `path` String
--- a/docs/api/native-theme.md
+++ b/docs/api/native-theme.md
@@ -58,7 +58,7 @@ Your application should then always use `shouldUseDarkColors` to determine what
 ### `nativeTheme.shouldUseHighContrastColors` _macOS_ _Windows_ _Readonly_

 A `Boolean` for if the OS / Chromium currently has high-contrast mode enabled
-or is being instructed to show a high-contrast UI.
+or is being instructed to show a high-constrast UI.

 ### `nativeTheme.shouldUseInvertedColorScheme` _macOS_ _Windows_ _Readonly_

--- 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
@@ -8,19 +8,19 @@ Process: [Main](../glossary.md#main-process)

 The `powerMonitor` module emits the following events:

-### Event: 'suspend' _macOS_ _Windows_
+### Event: 'suspend' _Linux_ _Windows_

 Emitted when the system is suspending.

-### Event: 'resume' _macOS_ _Windows_
+### Event: 'resume' _Linux_ _Windows_

 Emitted when system is resuming.

-### Event: 'on-ac' _macOS_ _Windows_
+### Event: 'on-ac' _Windows_

 Emitted when the system changes to AC power.

-### Event: 'on-battery' _macOS_  _Windows_
+### Event: 'on-battery' _Windows_

 Emitted when system changes to battery power.

@@ -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:
--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -63,8 +63,8 @@ The `protocol` module has the following methods:
 module gets emitted and can be called only once.

 Registers the `scheme` as standard, secure, bypasses content security policy for
-resources, allows registering ServiceWorker, supports fetch API, and streaming
-video/audio. Specify a privilege with the value of `true` to enable the capability.
+resources, allows registering ServiceWorker and supports fetch API. Specify a
+privilege with the value of `true` to enable the capability.

 An example of registering a privileged scheme, that bypasses Content Security
 Policy:
@@ -103,16 +103,11 @@ cookies) are disabled for non standard schemes. So in general if you want to
 register a custom protocol to replace the `http` protocol, you have to register
 it as a standard scheme.

-Protocols that use streams (http and stream protocols) should set `stream: true`.
-The `<video>` and `<audio>` HTML elements expect protocols to buffer their
-responses by default. The `stream` flag configures those elements to correctly
-expect streaming responses.
-
 ### `protocol.registerFileProtocol(scheme, handler)`

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

@@ -133,7 +128,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 +152,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 +168,7 @@ property.

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

@@ -188,7 +183,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 +246,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 +259,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 +272,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 +285,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 +298,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.

@@ -27,7 +17,7 @@ renderer process:

 ```javascript
 const { BrowserWindow } = require('electron').remote
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('https://github.com')
 ```

@@ -150,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.

@@ -207,6 +176,28 @@ 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/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/screen.md
+++ b/docs/api/screen.md
@@ -33,8 +33,8 @@ const { app, BrowserWindow, screen } = require('electron')
 let win

 app.whenReady().then(() => {
-  const displays = screen.getAllDisplays()
-  const externalDisplay = displays.find((display) => {
+  let displays = screen.getAllDisplays()
+  let externalDisplay = displays.find((display) => {
    return display.bounds.x !== 0 || display.bounds.y !== 0
  })

--- a/docs/api/service-workers.md
+++ b/docs/api/service-workers.md
@@ -39,7 +39,7 @@ Returns:
  * `message` String - The actual console message
  * `versionId` Number - The version ID of the service worker that sent the log message
  * `source` String - The type of source for this message.  Can be `javascript`, `xml`, `network`, `console-api`, `storage`, `app-cache`, `rendering`, `security`, `deprecation`, `worker`, `violation`, `intervention`, `recommendation` or `other`.
-  * `level` Number - The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and `error`.
+  * `level` Number - The log level, from 0 to 3.  In order it matches `verbose`, `info`, `warning` and `error`.
  * `sourceUrl` String - The URL the message came from
  * `lineNumber` Number - The line number of the source that triggered this console message

--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -12,7 +12,7 @@ property of [`WebContents`](web-contents.md), or from the `session` module.
 ```javascript
 const { BrowserWindow } = require('electron')

-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('http://github.com')

 const ses = win.webContents.session
@@ -91,40 +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:
@@ -178,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`:
@@ -295,9 +191,6 @@ Sets the proxy settings.
 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
@@ -407,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
@@ -445,7 +332,7 @@ verify proc.

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()

 win.webContents.session.setCertificateVerifyProc((request, callback) => {
  const { hostname } = request
@@ -461,16 +348,8 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {

 * `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.
-    * `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.
-    * `notifications` - Request notification creation and the ability to display them in the user's system tray.
-    * `midi` - Request MIDI access in the `webmidi` API.
-    * `midiSysex` - Request the use of system exclusive messages in the `webmidi` API.
-    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more.
-    * `fullscreen` - Request for the app to enter fullscreen mode.
-    * `openExternal` - Request to open links in external applications.
+  * `permission` String - Enum of 'media', 'geolocation', 'notifications', 'midiSysex',
+    'pointerLock', 'fullscreen', 'openExternal'.
  * `callback` Function
    * `permissionGranted` Boolean - Allow or deny the permission.
  * `details` Object - Some properties are only available on certain permission types.
@@ -499,10 +378,10 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents

 * `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.
+    * `securityOrigin` String - The security orign of the `media` check.
    * `mediaType` String - The type of media access being requested, can be `video`,
      `audio` or `unknown`
    * `requestingUrl` String - The last URL the requesting frame loaded
@@ -571,20 +450,6 @@ will be temporary.

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

-#### `ses.setSSLConfig(config)`
-
-* `config` Object
-  * `minVersion` String - 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 - Can be `tls1.2` or `tls1.3`. The maximum SSL version
-    to allow when connecting to remote servers. Defaults to `tls1.3`.
-
-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.
@@ -653,7 +518,7 @@ Returns `String[]` - An array of language codes the spellchecker is enabled for.
 will fallback to using `en-US`.  By default on launch if this setting is an empty list Electron will try to populate this
 setting with the current OS locale.  This setting is persisted across restarts.

-**Note:** On macOS the OS spellchecker is used and has its own list of languages.  This API is a no-op on macOS.
+**Note:** On macOS the OS spellchecker is used and has it's own list of languages.  This API is a no-op on macOS.

 #### `ses.setSpellCheckerDictionaryDownloadURL(url)`

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

 #### `ses.cookies` _Readonly_

@@ -790,7 +655,7 @@ const path = require('path')
 app.whenReady().then(() => {
  const protocol = session.fromPartition('some-partition').protocol
  protocol.registerFileProtocol('atom', (request, callback) => {
-    const url = request.url.substr(7)
+    let url = request.url.substr(7)
    callback({ path: path.normalize(`${__dirname}/${url}`) })
  }, (error) => {
    if (error) console.error('Failed to register protocol')
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -30,7 +30,7 @@ Show the given file in a file manager. If possible, select the file.

 * `path` String

-Returns `Promise<String>` - Resolves with a string containing the error message corresponding to the failure if a failure occurred, otherwise "".
+Returns `Promise<String>` - Resolves with an string containing the error message corresponding to the failure if a failure occurred, otherwise "".

 Open the given file in the desktop's default manner.

@@ -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/custom-scheme.md
+++ b/docs/api/structures/custom-scheme.md
@@ -8,4 +8,3 @@
  * `allowServiceWorkers` Boolean (optional) - Default false.
  * `supportFetchAPI` Boolean (optional) - Default false.
  * `corsEnabled` Boolean (optional) - Default false.
-  * `stream` Boolean (optional) - Default false.
--- a/docs/api/structures/desktop-capturer-source.md
+++ b/docs/api/structures/desktop-capturer-source.md
@@ -19,5 +19,5 @@
  available.
 * `appIcon` [NativeImage](../native-image.md) - An icon image of the
  application that owns the window or null if the source has a type screen.
-  The size of the icon is not known in advance and depends on what
+  The size of the icon is not known in advance and depends on what the
  the application provides.
--- a/docs/api/structures/keyboard-event.md
+++ b/docs/api/structures/keyboard-event.md
@@ -1,4 +1,4 @@
-# KeyboardEvent Object
+# KeyboardEvent Object extends `Event`

 * `ctrlKey` Boolean (optional) - whether the Control key was used in an accelerator to trigger the Event
 * `metaKey` Boolean (optional) - whether a meta key was used in an accelerator to trigger the Event
--- a/docs/api/structures/printer-info.md
+++ b/docs/api/structures/printer-info.md
@@ -7,7 +7,7 @@
 * `isDefault` Boolean - whether or not a given printer is set as the default printer on the OS.
 * `options` Object - an object containing a variable number of platform-specific printer information.

-The number represented by `status` means different things on different platforms: on Windows its potential values can be found [here](https://docs.microsoft.com/en-us/windows/win32/printdocs/printer-info-2), and on Linux and macOS they can be found [here](https://www.cups.org/doc/cupspm.html).
+The number represented by `status` means different things on different platforms: on Windows it's potential values can be found [here](https://docs.microsoft.com/en-us/windows/win32/printdocs/printer-info-2), and on Linux and macOS they can be found [here](https://www.cups.org/doc/cupspm.html).

 ## Example

--- a/docs/api/structures/process-metric.md
+++ b/docs/api/structures/process-metric.md
@@ -11,8 +11,6 @@
  * `Pepper Plugin`
  * `Pepper Plugin Broker`
  * `Unknown`
-* `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.
    The time is represented as number of milliseconds since epoch.
--- a/docs/api/structures/product.md
+++ b/docs/api/structures/product.md
@@ -7,5 +7,4 @@
 * `contentLengths` Number[] - The total size of the content, in bytes.
 * `price` Number - The cost of the product in the local currency.
 * `formattedPrice` String - The locale formatted price of the product.
-* `currencyCode` String - 3 character code presenting a product's currency based on the ISO 4217 standard.
 * `isDownloadable` Boolean - A Boolean value that indicates whether the App Store has downloadable content for this product. `true` if at least one file has been associated with the product.
--- a/docs/api/structures/serial-port.md
+++ b/docs/api/structures/serial-port.md
@@ -1,8 +0,0 @@
-# SerialPort Object
-
-* `portId` String - Unique identifier for the port
-* `portName` String - Name of the port
-* `displayName` String - Addtional information for the port
-* `persistentId` String - This platform-specific identifier, if present, can be used to identify the device across restarts of the application and operating system.
-* `vendorId` String - Optional USB vendor ID
-* `productId` String - Optional USB product ID
--- 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/stream-protocol-response.md
+++ b/docs/api/structures/stream-protocol-response.md
@@ -0,0 +1,5 @@
+# StreamProtocolResponse Object
+
+* `statusCode` Number (optional) - The HTTP response code.
+* `headers` Record<String, String | String[]> (optional) - An object containing the response headers.
+* `data` ReadableStream | null - A Node.js readable stream representing the response body.
--- a/docs/api/structures/string-protocol-response.md
+++ b/docs/api/structures/string-protocol-response.md
@@ -0,0 +1,5 @@
+# StringProtocolResponse Object
+
+* `mimeType` String (optional) - MIME type of the response.
+* `charset` String (optional) - Charset of the response.
+* `data` String | null - A string representing the response body.
--- a/docs/api/structures/trace-config.md
+++ b/docs/api/structures/trace-config.md
@@ -6,7 +6,7 @@
 * `trace_buffer_size_in_events` number (optional) - maximum size of the trace
  recording buffer in events.
 * `enable_argument_filter` boolean (optional) - if true, filter event data
-  according to a specific list of events that have been manually vetted to not
+  according to a whitelist of events that have been manually vetted to not
  include any PII. See [the implementation in
  Chromium][trace_event_args_whitelist.cc] for specifics.
 * `included_categories` String[] (optional) - a list of tracing categories to
@@ -41,7 +41,7 @@ An example TraceConfig that roughly matches what Chrome DevTools records:
    'disabled-by-default-v8.cpu_profiler',
    'disabled-by-default-v8.cpu_profiler.hires'
  ],
-  excluded_categories: ['*']
+  excluded_categories: [ '*' ]
 }
 ```

--- 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
@@ -209,7 +209,7 @@ not (transparent windows won't work correctly when DWM composition is disabled):

 ```javascript
 const { BrowserWindow, systemPreferences } = require('electron')
-const browserOptions = { width: 1000, height: 800 }
+let browserOptions = { width: 1000, height: 800 }

 // Make the window transparent only if the platform supports it.
 if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
@@ -218,7 +218,7 @@ if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
 }

 // Create the window.
-const win = new BrowserWindow(browserOptions)
+let win = new BrowserWindow(browserOptions)

 // Navigate.
 if (browserOptions.transparent) {
@@ -406,7 +406,7 @@ systemPreferences.promptTouchID('To get consent for a Security-Gated Thing').the
 })
 ```

-This API itself will not protect your user data; rather, it is a mechanism to allow you to do so. Native apps will need to set [Access Control Constants](https://developer.apple.com/documentation/security/secaccesscontrolcreateflags?language=objc) like [`kSecAccessControlUserPresence`](https://developer.apple.com/documentation/security/secaccesscontrolcreateflags/ksecaccesscontroluserpresence?language=objc) on their keychain entry so that reading it would auto-prompt for Touch ID biometric consent. This could be done with [`node-keytar`](https://github.com/atom/node-keytar), such that one would store an encryption key with `node-keytar` and only fetch it if `promptTouchID()` resolves.
+This API itself will not protect your user data; rather, it is a mechanism to allow you to do so. Native apps will need to set [Access Control Constants](https://developer.apple.com/documentation/security/secaccesscontrolcreateflags?language=objc) like [`kSecAccessControlUserPresence`](https://developer.apple.com/documentation/security/secaccesscontrolcreateflags/ksecaccesscontroluserpresence?language=objc) on the their keychain entry so that reading it would auto-prompt for Touch ID biometric consent. This could be done with [`node-keytar`](https://github.com/atom/node-keytar), such that one would store an encryption key with `node-keytar` and only fetch it if `promptTouchID()` resolves.

 **NOTE:** This API will return a rejected Promise on macOS systems older than Sierra 10.12.2.

--- 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)`

@@ -41,10 +41,6 @@ the button in the touch bar.
 A `NativeImage` representing the button's current icon. Changing this value immediately updates the button
 in the touch bar.

-#### `touchBarButton.iconPosition`
-
-A `String` - Can be `left`, `right` or `overlay`.  Defaults to `overlay`.
-
 #### `touchBarButton.enabled`

 A `Boolean` representing whether the button is in an enabled state.
--- 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)`

@@ -49,7 +49,3 @@ updates the control in the touch bar. Updating deep properties inside this array

 An `Integer` representing the currently selected segment. Changing this value immediately updates the control
 in the touch bar. User interaction with the touch bar will update this value automatically.
-
-#### `touchBarSegmentedControl.mode`
-
-A `String` representing the current selection mode of the control.  Can be `single`, `multiple` or `buttons`.
--- 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)`

@@ -11,11 +11,3 @@ Process: [Main](../glossary.md#main-process)
    * `small` - Small space between items. Maps to `NSTouchBarItemIdentifierFixedSpaceSmall`. This is the default.
    * `large` - Large space between items. Maps to `NSTouchBarItemIdentifierFixedSpaceLarge`.
    * `flexible` - Take up all available space. Maps to `NSTouchBarItemIdentifierFlexibleSpace`.
-
-### Instance Properties
-
-The following properties are available on instances of `TouchBarSpacer`:
-
-#### `touchBarSpacer.size`
-
-A `String` representing the size of the spacer.  Can be `small`, `large` or `flexible`.
--- 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
@@ -217,11 +217,9 @@ Sets the `image` associated with this tray icon when pressed on macOS.

 Sets the hover text for this tray icon.

-#### `tray.setTitle(title[, options])` _macOS_
+#### `tray.setTitle(title)` _macOS_

 * `title` String
-* `options` Object (optional)
-  * `fontType` String (optional) - The font family variant to display, can be `monospaced` or `monospacedDigit`. `monospaced` is available in macOS 10.15+ and `monospacedDigit` is available in macOS 10.11+.  When left blank, the title uses the default system font.

 Sets the title displayed next to the tray icon in the status bar (Support ANSI colors).

--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -12,10 +12,10 @@ the [`BrowserWindow`](browser-window.md) object. An example of accessing the
 ```javascript
 const { BrowserWindow } = require('electron')

-const win = new BrowserWindow({ width: 800, height: 1500 })
+let win = new BrowserWindow({ width: 800, height: 1500 })
 win.loadURL('http://github.com')

-const contents = win.webContents
+let contents = win.webContents
 console.log(contents)
 ```

@@ -70,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'

@@ -219,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'
@@ -256,7 +256,7 @@ Returns:
 Emitted after a server side redirect occurs during navigation.  For example a 302
 redirect.

-This event cannot be prevented, if you want to prevent redirects you should
+This event can not be prevented, if you want to prevent redirects you should
 checkout out the `will-redirect` event above.

 #### Event: 'did-navigate'
@@ -348,7 +348,7 @@ Returns:
 Emitted when the renderer process crashes or is killed.

 **Deprecated:** This event is superceded by the `render-process-gone` event
-which contains more information about why the render process disappeared. It
+which contains more information about why the render process dissapeared. It
 isn't always because it crashed.  The `killed` boolean can be replaced by
 checking `reason === 'killed'` when you switch to that event.

@@ -364,10 +364,10 @@ Returns:
    * `killed` - Process was sent a SIGTERM or otherwise killed externally
    * `crashed` - Process crashed
    * `oom` - Process ran out of memory
-    * `launch-failed` - Process never successfully launched
+    * `launch-failure` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed

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

 #### Event: 'unresponsive'
@@ -418,7 +418,7 @@ To only prevent the menu shortcuts, use
 ```javascript
 const { BrowserWindow } = require('electron')

-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })

 win.webContents.on('before-input-event', (event, input) => {
  // For example, only enable application menu keyboard shortcuts when
@@ -665,7 +665,7 @@ app.whenReady().then(() => {
  win = new BrowserWindow({ width: 800, height: 600 })
  win.webContents.on('select-bluetooth-device', (event, deviceList, callback) => {
    event.preventDefault()
-    const result = deviceList.find((device) => {
+    let result = deviceList.find((device) => {
      return device.deviceName === 'test'
    })
    if (!result) {
@@ -691,7 +691,7 @@ buffer.
 ```javascript
 const { BrowserWindow } = require('electron')

-const win = new BrowserWindow({ webPreferences: { offscreen: true } })
+let win = new BrowserWindow({ webPreferences: { offscreen: true } })
 win.webContents.on('paint', (event, dirty, image) => {
  // updateBitmap(dirty, image.getBitmap())
 })
@@ -720,7 +720,7 @@ This event can be used to configure `webPreferences` for the `webContents`
 of a `<webview>` before it's loaded, and provides the ability to set settings
 that can't be set via `<webview>` attributes.

-**Note:** The specified `preload` script option will appear as `preloadURL`
+**Note:** The specified `preload` script option will be appear as `preloadURL`
 (not `preload`) in the `webPreferences` object emitted with this event.

 #### Event: 'did-attach-webview'
@@ -738,9 +738,9 @@ Emitted when a `<webview>` has been attached to this web contents.
 Returns:

 * `event` Event
-* `level` Integer - The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and `error`.
-* `message` String - The actual console message
-* `line` Integer - The line number of the source that triggered this console message
+* `level` Integer
+* `message` String
+* `line` Integer
 * `sourceId` String

 Emitted when the associated window logs a console message.
@@ -784,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:

@@ -795,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:

@@ -806,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:

@@ -817,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:

@@ -827,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:

@@ -907,7 +907,7 @@ Returns `String` - The URL of the current web page.

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('http://github.com').then(() => {
  const currentURL = win.webContents.getURL()
  console.log(currentURL)
@@ -998,34 +998,6 @@ Navigates to the specified offset from the "current entry".

 Returns `Boolean` - Whether the renderer process has crashed.

-#### `contents.forcefullyCrashRenderer()`
-
-Forcefully terminates the renderer process that is currently hosting this
-`webContents`. This will cause the `render-process-gone` event to be emitted
-with the `reason=killed || reason=crashed`. Please note that some webContents share renderer
-processes and therefore calling this method may also crash the host process
-for other webContents as well.
-
-Calling `reload()` immediately after calling this
-method will force the reload to occur in a new process. This should be used
-when this process is unstable or unusable, for instance in order to recover
-from the `unresponsive` event.
-
-```js
-contents.on('unresponsive', async () => {
-  const { response } = await dialog.showMessageBox({
-    message: 'App X has become unresponsive',
-    title: 'Do you want to try forcefully reloading the app?',
-    buttons: ['OK', 'Cancel'],
-    cancelId: 1
-  })
-  if (response === 0) {
-    contents.forcefullyCrashRenderer()
-    contents.reload()
-  }
-})
-```
-
 #### `contents.setUserAgent(userAgent)`

 * `userAgent` String
@@ -1145,10 +1117,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.
@@ -1240,6 +1208,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.

@@ -1281,7 +1255,7 @@ is large then 0.

 #### `contents.incrementCapturerCount([size, stayHidden])`

-* `size` [Size](structures/size.md) (optional) - The preferred size for the capturer.
+* `size` [Size](structures/size.md) (optional) - The perferred size for the capturer.
 * `stayHidden` Boolean (optional) -  Keep the page hidden instead of visible.

 Increase the capturer count by one. The page is considered visible when its browser window is
@@ -1322,9 +1296,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.
@@ -1337,7 +1311,7 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
  * `success` Boolean - Indicates success of the print call.
  * `failureReason` String - Error description called back if the print fails.

-When a custom `pageSize` is passed, Chromium attempts to validate platform specific minimum values for `width_microns` and `height_microns`. Width and height must both be minimum 353 microns but may be higher on some operating systems.
+When a custom `pageSize` is passed, Chromium attempts to validate platform specific minumum values for `width_microns` and `height_microns`. Width and height must both be minimum 353 microns but may be higher on some operating systems.

 Prints window's web page. When `silent` is set to `true`, Electron will pick
 the system's default printer if `deviceName` is empty and the default settings for printing.
@@ -1347,14 +1321,7 @@ Use `page-break-before: always;` CSS style to force to print to a new page.
 Example usage:

 ```js
-const options = {
-  silent: true,
-  deviceName: 'My-Printer',
-  pageRanges: [{
-    from: 0,
-    to: 1
-  }]
-}
+const options = { silent: true, deviceName: 'My-Printer' }
 win.webContents.print(options, (success, errorType) => {
  if (!success) console.log(errorType)
 })
@@ -1371,8 +1338,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 - 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` and `width` in microns.
  * `printBackground` Boolean (optional) - Whether to print CSS backgrounds.
@@ -1408,7 +1375,7 @@ const fs = require('fs')
 const path = require('path')
 const os = require('os')

-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('http://github.com')

 win.webContents.on('did-finish-load', () => {
@@ -1434,7 +1401,7 @@ creation:

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 win.webContents.on('devtools-opened', () => {
  win.webContents.addWorkSpace(__dirname)
 })
@@ -1479,7 +1446,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 })
    })
@@ -1488,26 +1455,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
@@ -1765,7 +1722,7 @@ Returns `Promise<void>` - resolves if the page is saved.

 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()

 win.loadURL('https://github.com')

@@ -1937,7 +1894,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,133 +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.processId` _Readonly_
-
-An `Integer` representing the id of the process which owns this frame.
-
-#### `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.
--- 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`

@@ -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 - 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.
@@ -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.
@@ -753,9 +755,9 @@ Fired when page leaves fullscreen triggered by HTML API.

 Returns:

-* `level` Integer - The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and `error`.
-* `message` String - The actual console message
-* `line` Integer - The line number of the source that triggered this console message
+* `level` Integer
+* `message` String
+* `line` Integer
 * `sourceId` String

 Fired when the guest window logs a console message.
@@ -814,7 +816,7 @@ const { shell } = require('electron')
 const webview = document.querySelector('webview')

 webview.addEventListener('new-window', async (e) => {
-  const protocol = (new URL(e.url)).protocol
+  const protocol = require('url').parse(e.url).protocol
  if (protocol === 'http:' || protocol === 'https:') {
    await shell.openExternal(e.url)
  }
--- a/docs/api/window-open.md
+++ b/docs/api/window-open.md
@@ -94,6 +94,6 @@ mainWindow.webContents.on('new-window', (event, url, frameName, disposition, opt

 ```javascript
 // renderer process (mainWindow)
-const modal = window.open('', 'modal')
+let modal = window.open('', 'modal')
 modal.document.write('<h1>Hello</h1>')
 ```
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -12,31 +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)

-### Default Changed: `contextIsolation` defaults to `true`
-
-In Electron 12, `contextIsolation` will be enabled by default.  To restore
-the previous behavior, `contextIsolation: false` must be specified in WebPreferences.
-
-We [recommend having contextIsolation enabled](https://github.com/electron/electron/blob/master/docs/tutorial/security.md#3-enable-context-isolation-for-remote-content) for the security of your application.
-
-For more details see: https://github.com/electron/electron/issues/23506
-
 ### Removed: `crashReporter` methods in the renderer process

 The following `crashReporter` methods are no longer available in the renderer
@@ -64,37 +41,6 @@ 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)

 There are no breaking changes planned for 11.0.
@@ -311,7 +257,7 @@ const getGuestForWebContents = (webContentsId, contents) => {
    throw new Error(`Invalid webContentsId: ${webContentsId}`)
  }
  if (guest.hostWebContents !== contents) {
-    throw new Error('Access denied to webContents')
+    throw new Error(`Access denied to webContents`)
  }
  return guest
 }
@@ -367,7 +313,7 @@ powerMonitor.querySystemIdleState(threshold, callback)
 const idleState = powerMonitor.getSystemIdleState(threshold)
 ```

-### API Changed: `powerMonitor.querySystemIdleTime` is now `powerMonitor.getSystemIdleTime`
+### API Changed: `powerMonitor.querySystemIdleTime` is now `powerMonitor.getSystemIdleState`

 ```js
 // Removed in Electron 7.0
@@ -655,11 +601,11 @@ const { memory } = metrics[0] // Deprecated property

 ```js
 // Deprecated
-const optionsA = { webPreferences: { blinkFeatures: '' } }
-const windowA = new BrowserWindow(optionsA)
+let optionsA = { webPreferences: { blinkFeatures: '' } }
+let windowA = new BrowserWindow(optionsA)
 // Replace with
-const optionsB = { webPreferences: { enableBlinkFeatures: '' } }
-const windowB = new BrowserWindow(optionsB)
+let optionsB = { webPreferences: { enableBlinkFeatures: '' } }
+let windowB = new BrowserWindow(optionsB)

 // Deprecated
 window.on('app-command', (e, cmd) => {
@@ -830,11 +776,11 @@ The following list includes the breaking API changes made in Electron 2.0.

 ```js
 // Deprecated
-const optionsA = { titleBarStyle: 'hidden-inset' }
-const windowA = new BrowserWindow(optionsA)
+let optionsA = { titleBarStyle: 'hidden-inset' }
+let windowA = new BrowserWindow(optionsA)
 // Replace with
-const optionsB = { titleBarStyle: 'hiddenInset' }
-const windowB = new BrowserWindow(optionsB)
+let optionsB = { titleBarStyle: 'hiddenInset' }
+let windowB = new BrowserWindow(optionsB)
 ```

 ### `menu`
--- a/docs/development/README.md
+++ b/docs/development/README.md
@@ -4,8 +4,8 @@ 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)
@@ -23,3 +23,4 @@ For guides on Electron app development, see
 * [Debugging on macOS](debugging-instructions-macos.md)
 * [Setting Up Symbol Server in Debugger](setting-up-symbol-server.md)
 * [Patches](patches.md)
+* [Upgrading Node](upgrading-node.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
@@ -10,10 +10,6 @@ Check the build prerequisites for your platform before proceeding
  * [Linux](build-instructions-linux.md#prerequisites)
  * [Windows](build-instructions-windows.md#prerequisites)

-## Build Tools
-
-[Electron's Build Tools](https://github.com/electron/build-tools) automate much of the setup for compiling Electron from source with different configurations and build targets. If you wish to set up the environment manually, the instructions are listed below.
-
 ## GN prerequisites

 You'll need to install [`depot_tools`][depot-tools], the toolset
@@ -254,24 +250,9 @@ 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
--- a/docs/development/debug-instructions-windows.md
+++ b/docs/development/debug-instructions-windows.md
@@ -69,7 +69,8 @@ way of figuring out which is which.
 ### Which Process Should I Attach to?

 Code executed within the main process (that is, code found in or eventually run
-by your main JavaScript file) will run inside the main process, while other
+by your main JavaScript file) as well as code called using the remote
+(`require('electron').remote`) will run inside the main process, while other
 code will execute inside its respective renderer process.

 You can be attached to multiple programs when you are debugging, but only one
--- a/Show More
+++ b/Show More