Bump v13.6.0

fix: don't use private enterprise APIs in MAS build (#31486 )
* fix: don't use private enterprise APIs in MAS build * Update .patches * fix: update mas patch Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: VerteDinde <keeleymhammond@gmail.com>
2026-02-19 03:14:51 -05:00 · 2021-10-20 17:28:06 -07:00 · 2021-10-21 09:16:04 +09:00 · 2021-10-21 09:09:33 +09:00 · 2021-10-15 13:33:03 +09:00 · 2021-10-13 14:39:02 -07:00
774 changed files with 19174 additions and 23562 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -79,7 +79,7 @@ executors:
 # Build machines configs.
 docker-image: &docker-image
  docker:
-    - image: electron.azurecr.io/build:d818f06a9b1540c7fd38f75ad5a2c493dd6843b6
+    - image: electron.azurecr.io/build:6555a80939fb4c3ddf9343b3f140e573f40de225

 machine-linux-medium: &machine-linux-medium
  <<: *docker-image
@@ -95,17 +95,21 @@ machine-linux-2xlarge: &machine-linux-2xlarge

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

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

 machine-mac-large-arm: &machine-mac-large-arm
  resource_class: large
  macos:
-    xcode: "12.2.0"
+    xcode: "12.4.0"
+
+machine-mac-arm64: &machine-mac-arm64
+  resource_class: electronjs/macos-arm64
+  machine: true

 # Build configurations options.
 env-testing-build: &env-testing-build
@@ -151,6 +155,7 @@ 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
+  npm_config_arch: arm64

 env-arm64: &env-arm64
  GN_EXTRA_ARGS: 'target_cpu = "arm64" fatal_linker_warnings = false enable_linux_installer = false'
@@ -235,7 +240,7 @@ step-maybe-notify-slack-success: &step-maybe-notify-slack-success
      fi
    when: on_success

-step-maybe-cleanup-arm: &step-maybe-cleanup-arm
+step-maybe-cleanup-arm64-mac: &step-maybe-cleanup-arm64-mac
  run:
    name: Cleanup after testing
    command: |
@@ -484,7 +489,7 @@ step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
  run:
    name: Import and trust self-signed codesigning cert on MacOS
    command: |
-      if [ "`uname`" == "Darwin" ]; then
+      if  [ "$TARGET_ARCH" != "arm64" ] && [ "`uname`" == "Darwin" ]; then
        cd src/electron
        ./script/codesign/generate-identity.sh
      fi
@@ -518,6 +523,7 @@ step-gn-check: &step-gn-check
      gn check out/Default //electron/shell/common/api:mojo
      # Check the hunspell filenames
      node electron/script/gen-hunspell-filenames.js --check
+      node electron/script/gen-libc++-filenames.js --check

 step-electron-build: &step-electron-build
  run:
@@ -544,7 +550,9 @@ step-electron-build: &step-electron-build
        ninja -C out/Default tools/v8_context_snapshot -j $NUMBER_OF_NINJA_PROCESSES
        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
        (cd out/Default; zip mksnapshot.zip mksnapshot_args clang_x64_v8_arm64/gen/v8/embedded.S)
+        rm -rf out/Default/clang_x64_v8_arm64/gen
        rm -rf out/Default/clang_x64_v8_arm64/obj
+        rm -rf out/Default/clang_x64/obj

        # Regenerate because we just deleted some ninja files 
        gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
@@ -699,6 +707,11 @@ step-persist-data-for-tests: &step-persist-data-for-tests
      - src/third_party/electron_node
      - src/third_party/nan
      - src/cross-arch-snapshots
+      - src/third_party/llvm-build
+      - src/build/linux
+      - src/buildtools/third_party/libc++
+      - src/buildtools/third_party/libc++abi
+      - src/out/Default/obj/buildtools/third_party

 step-electron-dist-unzip: &step-electron-dist-unzip
  run:
@@ -707,28 +720,34 @@ step-electron-dist-unzip: &step-electron-dist-unzip
      cd src/out/Default
      # -o  overwrite files WITHOUT prompting
      # TODO(alexeykuzmin): Remove '-o' when it's no longer needed.
-      unzip -o dist.zip
+      # -: allows to extract archive members into  locations  outside
+      #    of the current ``extraction root folder''.
+      #    ASan builds have the llvm-symbolizer binaries listed as
+      #    runtime_deps, with their paths as `../../third_party/...`
+      #    unzip exits with non-zero code on such zip files unless -: is
+      #    passed.
+      unzip -:o dist.zip

 step-ffmpeg-unzip: &step-ffmpeg-unzip
  run:
    name: Unzip ffmpeg.zip
    command: |
      cd src/out/ffmpeg
-      unzip -o ffmpeg.zip
+      unzip -:o ffmpeg.zip

 step-mksnapshot-unzip: &step-mksnapshot-unzip
  run:
    name: Unzip mksnapshot.zip
    command: |
      cd src/out/Default
-      unzip -o mksnapshot.zip
+      unzip -:o mksnapshot.zip

 step-chromedriver-unzip: &step-chromedriver-unzip
  run:
    name: Unzip chromedriver.zip
    command: |
      cd src/out/Default
-      unzip -o chromedriver.zip
+      unzip -:o chromedriver.zip

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

 step-verify-chromedriver: &step-verify-chromedriver
  run:
    name: Verify ChromeDriver
    command: |
-      cd src
-      python electron/script/verify-chromedriver.py --source-root "$PWD" --build-dir out/Default
+      if [ "$IS_ASAN" != "1" ]; then
+        cd src
+        python electron/script/verify-chromedriver.py --source-root "$PWD" --build-dir out/Default
+      fi

 step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
  run:
@@ -839,6 +862,17 @@ step-hunspell-store: &step-hunspell-store
    path: src/out/Default/hunspell_dictionaries.zip
    destination: hunspell_dictionaries.zip

+step-maybe-generate-libcxx: &step-maybe-generate-libcxx
+  run:
+    name: maybe generate libcxx
+    command: |
+      cd src
+      if [ "`uname`" == "Linux" ]; then
+        ninja -C out/Default electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
+        ninja -C out/Default electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
+        ninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
+      fi
+
 step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
  run:
    name: Generate breakpad symbols
@@ -857,7 +891,7 @@ step-maybe-zip-symbols: &step-maybe-zip-symbols
      export BUILD_PATH="$PWD/out/Default"
      ninja -C out/Default electron:licenses
      ninja -C out/Default electron:electron_version
-      electron/script/zip-symbols.py -b $BUILD_PATH
+      DELETE_DSYMS_AFTER_ZIP=1 electron/script/zip-symbols.py -b $BUILD_PATH

 step-symbols-store: &step-symbols-store
  store_artifacts:
@@ -868,7 +902,7 @@ step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
  run:
    name: Generate cross arch snapshot (arm/arm64)
    command: |
-      if [ "$TRIGGER_ARM_TEST" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
+      if [ "$GENERATE_CROSS_ARCH_SNAPSHOT" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
        cd src
        if [ "$TARGET_ARCH" == "arm" ]; then
          export MKSNAPSHOT_PATH="clang_x86_v8_arm"
@@ -1013,7 +1047,7 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
    name: Remove some unused data to avoid storing it in the workspace/cache
    command: |
      rm -rf src/android_webview
-      rm -rf src/ios
+      rm -rf src/ios/chrome
      rm -rf src/third_party/blink/web_tests
      rm -rf src/third_party/blink/perf_tests
      rm -rf src/third_party/WebKit/LayoutTests
@@ -1271,18 +1305,6 @@ steps-verify-ffmpeg: &steps-verify-ffmpeg
    - *step-verify-ffmpeg
    - *step-maybe-notify-slack-failure

-steps-verify-chromedriver: &steps-verify-chromedriver
-  steps:
-    - attach_workspace:
-        at: .
-    - *step-depot-tools-add-to-path
-    - *step-electron-dist-unzip
-    - *step-chromedriver-unzip
-    - *step-setup-linux-for-headless-testing
-
-    - *step-verify-chromedriver
-    - *step-maybe-notify-slack-failure
-
 steps-tests: &steps-tests
  steps:
    - attach_workspace:
@@ -1306,13 +1328,26 @@ steps-tests: &steps-tests
          ELECTRON_DISABLE_SECURITY_WARNINGS: 1
        command: |
          cd src
-          if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
-            export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true
-            (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging)
-            (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging)
+          if [ "$IS_ASAN" == "1" ]; then
+            ASAN_SYMBOLIZE="$PWD/tools/valgrind/asan/asan_symbolize.py --executable-path=$PWD/out/Default/electron"
+            export ASAN_OPTIONS="symbolize=0 handle_abort=1"
+            export G_SLICE=always-malloc
+            export NSS_DISABLE_ARENA_FREE_LIST=1
+            export NSS_DISABLE_UNLOAD=1
+            export LLVM_SYMBOLIZER_PATH=$PWD/third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer
+            export MOCHA_TIMEOUT=180000
+            echo "Piping output to ASAN_SYMBOLIZE ($ASAN_SYMBOLIZE)"
+            (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split)) 2>&1 | $ASAN_SYMBOLIZE
+            (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split)) 2>&1 | $ASAN_SYMBOLIZE
          else
-            (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split))
-            (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split))
+            if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+              export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true
+              (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging)
+              (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging)
+            else
+              (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split))
+              (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split))
+            fi
          fi
    - run:
        name: Check test results existence
@@ -1334,7 +1369,7 @@ steps-tests: &steps-tests

    - *step-maybe-notify-slack-failure

-    - *step-maybe-cleanup-arm
+    - *step-maybe-cleanup-arm64-mac

 steps-test-nan: &steps-test-nan
  steps:
@@ -1450,9 +1485,9 @@ commands:
      restore-src-cache:
        type: boolean
        default: true
-      preserve-vendor-dirs:
+      build-nonproprietary-ffmpeg:
        type: boolean
-        default: false
+        default: true
    steps:
      - when:
          condition: << parameters.attach >>
@@ -1490,26 +1525,11 @@ commands:
            - store_artifacts:
                path: patches
            # These next few steps reset Electron to the correct commit regardless of which cache was restored
-            - when:
-                condition: << parameters.preserve-vendor-dirs >>
-                steps:
-                  - run:
-                      name: Preserve vendor dirs for release
-                      command: |
-                        mv src/electron/vendor/requests .
            - run:
                name: Wipe Electron
                command: rm -rf src/electron
            - *step-checkout-electron
            - *step-run-electron-only-hooks
-            - when:
-                condition: << parameters.preserve-vendor-dirs >>
-                steps:
-                  - run:
-                      name: Preserve vendor dirs for release
-                      command: |
-                        rm -rf src/electron/vendor/requests
-                        mv requests src/electron/vendor/requests
            - *step-generate-deps-hash-cleanly
            - *step-mark-sync-done
            - *step-minimize-workspace-size-from-checkout
@@ -1566,10 +1586,13 @@ commands:
            - *step-electron-chromedriver-build
            - *step-electron-chromedriver-store

-            # ffmpeg
-            - *step-ffmpeg-gn-gen
-            - *step-ffmpeg-build
-            - *step-ffmpeg-store
+            - when:
+                condition: << parameters.build-nonproprietary-ffmpeg >>
+                steps:
+                  # ffmpeg
+                  - *step-ffmpeg-gn-gen
+                  - *step-ffmpeg-build
+                  - *step-ffmpeg-store

            # hunspell
            - *step-hunspell-build
@@ -1675,6 +1698,9 @@ commands:
      - *step-hunspell-build
      - *step-hunspell-store

+      # libcxx
+      - *step-maybe-generate-libcxx
+
      # typescript defs
      - *step-maybe-generate-typescript-defs

@@ -1702,7 +1728,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'
    steps:
      - electron-build:
          persist: false
@@ -1710,7 +1736,6 @@ jobs:
          checkout: true
          persist-checkout: true
          restore-src-cache: false
-          preserve-vendor-dirs: true

  linux-checkout-fast:
    <<: *machine-linux-2xlarge
@@ -1761,7 +1786,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'
    steps:
      - electron-build:
          persist: false
@@ -1769,7 +1794,6 @@ jobs:
          checkout: true
          persist-checkout: true
          restore-src-cache: false
-          preserve-vendor-dirs: true

  mac-checkout-fast:
    <<: *machine-linux-2xlarge
@@ -1808,6 +1832,22 @@ jobs:
          checkout: true
          use-out-cache: false

+  linux-x64-testing-asan:
+    <<: *machine-linux-2xlarge
+    environment:
+      <<: *env-global
+      <<: *env-testing-build
+      <<: *env-ninja-status
+      CHECK_DIST_MANIFEST: '0'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+      GN_EXTRA_ARGS: 'is_asan = true'
+    steps:
+      - electron-build:
+          persist: true
+          checkout: true
+          use-out-cache: false
+          build-nonproprietary-ffmpeg: false
+
  linux-x64-testing-no-run-as-node:
    <<: *machine-linux-2xlarge
    environment:
@@ -1846,7 +1886,6 @@ jobs:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge-release
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      <<: *env-release-build
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
      <<: *env-ninja-status
@@ -1899,7 +1938,6 @@ jobs:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge-release
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      <<: *env-ia32
      <<: *env-release-build
      <<: *env-32bit-release
@@ -1932,6 +1970,7 @@ jobs:
      <<: *env-testing-build
      <<: *env-ninja-status
      TRIGGER_ARM_TEST: true
+      GENERATE_CROSS_ARCH_SNAPSHOT: true
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
    steps:
      - electron-build:
@@ -1960,7 +1999,7 @@ jobs:
      <<: *env-arm
      <<: *env-release-build
      <<: *env-32bit-release
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_requests=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
      <<: *env-ninja-status
    steps:
@@ -1990,6 +2029,7 @@ jobs:
      <<: *env-testing-build
      <<: *env-ninja-status
      TRIGGER_ARM_TEST: true
+      GENERATE_CROSS_ARCH_SNAPSHOT: true
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
    steps:
      - electron-build:
@@ -2025,7 +2065,7 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm64
      <<: *env-release-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_requests=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
      <<: *env-ninja-status
    steps:
@@ -2087,7 +2127,6 @@ jobs:
    environment:
      <<: *env-mac-large-release
      <<: *env-release-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
      <<: *env-ninja-status
    steps:
@@ -2101,7 +2140,6 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-release-build
      <<: *env-apple-silicon
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
      <<: *env-ninja-status
    steps:
@@ -2143,6 +2181,7 @@ jobs:
      <<: *env-macos-build
      <<: *env-apple-silicon
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+      GENERATE_CROSS_ARCH_SNAPSHOT: true
    steps:
      - electron-build:
          persist: true
@@ -2195,7 +2234,6 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas
      <<: *env-release-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
      <<: *env-ninja-status
    steps:
@@ -2209,7 +2247,6 @@ jobs:
      <<: *env-mac-large-release
      <<: *env-mas-apple-silicon
      <<: *env-release-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
      <<: *env-ninja-status
    steps:
@@ -2251,6 +2288,7 @@ jobs:
      <<: *env-macos-build
      <<: *env-mas-apple-silicon
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+      GENERATE_CROSS_ARCH_SNAPSHOT: true
    steps:
      - electron-build:
          persist: true
@@ -2303,6 +2341,17 @@ jobs:
    parallelism: 3
    <<: *steps-tests

+  linux-x64-testing-asan-tests:
+    <<: *machine-linux-xlarge
+    environment:
+      <<: *env-linux-medium
+      <<: *env-headless-testing
+      <<: *env-stack-dumping
+      IS_ASAN: '1'
+      DISABLE_CRASH_REPORTER_TESTS: '1'
+    parallelism: 3
+    <<: *steps-tests
+
  linux-x64-testing-nan:
    <<: *machine-linux-medium
    environment:
@@ -2422,6 +2471,14 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

+  osx-testing-arm64-tests:  
+    <<: *machine-mac-arm64
+    environment:
+      <<: *env-mac-large
+      <<: *env-stack-dumping
+      <<: *env-apple-silicon
+    <<: *steps-tests
+
  mas-testing-x64-tests:
    <<: *machine-mac-large
    environment:
@@ -2445,6 +2502,14 @@ jobs:
      <<: *env-send-slack-notifications
    <<: *steps-verify-ffmpeg

+  mas-testing-arm64-tests:
+    <<: *machine-mac-arm64
+    environment:
+      <<: *env-mac-large
+      <<: *env-stack-dumping
+      <<: *env-apple-silicon
+    <<: *steps-tests
+
  # Layer 4: Summary.
  linux-x64-release-summary:
    <<: *machine-linux-medium
@@ -2605,6 +2670,7 @@ workflows:
      - linux-checkout-and-save-cache

      - linux-x64-testing
+      - linux-x64-testing-asan
      - linux-x64-testing-no-run-as-node
      - linux-x64-testing-gn-check:
          requires:
@@ -2612,6 +2678,9 @@ workflows:
      - linux-x64-testing-tests:
          requires:
            - linux-x64-testing
+      - linux-x64-testing-asan-tests:
+          requires:
+            - linux-x64-testing-asan
      - linux-x64-testing-nan:
          requires:
            - linux-x64-testing
@@ -2675,6 +2744,14 @@ workflows:
          requires:
            - mac-checkout-and-save-cache

+      - osx-testing-arm64-tests:
+          filters:
+            branches:
+              # Do not run this on forked pull requests
+              ignore: /pull\/[0-9]+/
+          requires:
+            - osx-testing-arm64
+
      - mas-testing-x64:
          requires:
            - mac-checkout-and-save-cache
@@ -2691,6 +2768,14 @@ workflows:
          requires:
            - mac-checkout-and-save-cache

+      - mas-testing-arm64-tests:
+          filters:
+            branches:
+              # Do not run this on forked pull requests
+              ignore: /pull\/[0-9]+/
+          requires:
+            - mas-testing-arm64
+
  nightly-linux-release-test:
    triggers:
      - schedule:
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,2 @@
 *
 !tools/xvfb-init.sh
-!build/install-build-deps.sh
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -1,27 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for Electron
-
---
-
-<!--  As an open source project with a dedicated but small maintainer team, it can sometimes take a long time for issues to be addressed so please be patient and we will get back to you as soon as we can.
-->
-
-### Preflight Checklist
-<!-- Please ensure you've completed the following steps by replacing [ ] with [x]-->
-
-* [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
-* [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
-* [ ] I have searched the issue tracker for a feature request that matches the one I want to file, without success.
-
-### Problem Description
-<!-- Is your feature request related to a problem? Please add a clear and concise description of what the problem is. -->
-
-### Proposed Solution
-<!-- Describe the solution you'd like in a clear and concise manner -->
-
-### Alternatives Considered
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-### Additional Information
-<!-- Add any other context about the problem here. -->
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,39 @@
+name: Feature Request
+about: Suggest an idea for Electron
+title: "[Feature Request]: "
+labels: "enhancement ✨"
+body:
+- type: textarea
+  attributes:
+    label: Preflight Checklist
+    description: Please ensure you've completed the following steps by replacing [ ] with [x]
+    value: |
+      * [ ] I have read the [Contributing Guidelines](https://github.com/electron/electron/blob/master/CONTRIBUTING.md) for this project.
+      * [ ] I agree to follow the [Code of Conduct](https://github.com/electron/electron/blob/master/CODE_OF_CONDUCT.md) that this project adheres to.
+      * [ ] I have searched the issue tracker for a feature request that matches the one I want to file, without success.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Problem Description
+    description: Please add a clear and concise description of the problem you are seeking to solve with this feature request.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Proposed Solution
+    description: Describe the solution you'd like in a clear and concise manner.
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Alternatives Considered
+    description: A clear and concise description of any alternative solutions or features you've considered. 
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: Additional Information
+    description: Add any other context about the problem here.
+  validations:
+    required: true
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -36,5 +36,6 @@ authorizedUsers:
  - loc
  - MarshallOfSound
  - miniak
+  - mlaurencin
  - nornagon
  - zcbenz
--- a/.github/semantic.yml
+++ b/.github/semantic.yml
@@ -0,0 +1,2 @@
+# Always validate the PR title, and ignore the commits
+titleOnly: true
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,7 @@ electron.d.ts
 spec/.hash

 # Eslint Cache
-.eslintcache
+.eslintcache*

 # Generated native addon files
 /spec-main/fixtures/native-addon/echo/build/
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "vendor/requests"]
-	path = vendor/requests
-	url = https://github.com/kennethreitz/requests
-[submodule "vendor/boto"]
-	path = vendor/boto
-	url = https://github.com/boto/boto.git
--- a/.markdownlint.autofix.json
+++ b/.markdownlint.autofix.json
@@ -0,0 +1,6 @@
+{
+  "default": false,
+  "no-trailing-spaces": {
+    "br_spaces": 0
+  }
+}
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -0,0 +1,26 @@
+{
+  "commands-show-output": false,
+  "first-line-h1": false,
+  "header-increment": false,
+  "line-length": {
+    "code_blocks": false,
+    "tables": false,
+    "stern": true,
+    "line_length": -1
+  },
+  "no-bare-urls": false,
+  "no-blanks-blockquote": false,
+  "no-duplicate-header": {
+    "allow_different_nesting": true
+  },
+  "no-emphasis-as-header": false,
+  "no-hard-tabs": {
+    "code_blocks": false
+  },
+  "no-space-in-emphasis": false,
+  "no-trailing-punctuation": false,
+  "no-trailing-spaces": {
+    "br_spaces": 0
+  },
+  "single-h1": false
+}
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,6 +1,7 @@
 import("//build/config/locales.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/manifest.gni")
+import("//components/os_crypt/features.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//content/public/app/mac_helpers.gni")
 import("//extensions/buildflags/buildflags.gni")
@@ -25,6 +26,8 @@ import("electron_paks.gni")
 import("filenames.auto.gni")
 import("filenames.gni")
 import("filenames.hunspell.gni")
+import("filenames.libcxx.gni")
+import("filenames.libcxxabi.gni")

 if (is_mac) {
  import("//build/config/mac/rules.gni")
@@ -290,7 +293,7 @@ templated_file("electron_version_header") {
 action("electron_fuses") {
  script = "build/fuses/build.py"

-  inputs = [ "build/fuses/fuses.json" ]
+  inputs = [ "build/fuses/fuses.json5" ]

  outputs = [
    "$target_gen_dir/fuses.h",
@@ -329,6 +332,7 @@ source_set("electron_lib") {
    "//components/network_hints/common:mojo_bindings",
    "//components/network_hints/renderer",
    "//components/network_session_configurator/common",
+    "//components/os_crypt",
    "//components/pref_registry",
    "//components/prefs",
    "//components/upload_list",
@@ -402,7 +406,10 @@ source_set("electron_lib") {
  }

  if (!is_mas_build) {
-    deps += [ "//components/crash/core/app" ]
+    deps += [
+      "//components/crash/core/app",
+      "//components/crash/core/browser",
+    ]
  }

  sources = filenames.lib_sources
@@ -440,6 +447,7 @@ source_set("electron_lib") {
  if (is_mac) {
    deps += [
      "//components/remote_cocoa/app_shim",
+      "//components/remote_cocoa/browser",
      "//content/common:mac_helpers",
      "//ui/accelerated_widget_mac",
    ]
@@ -619,6 +627,9 @@ source_set("electron_lib") {
      "//chrome/services/printing/public/mojom",
      "//components/printing/common:mojo_interfaces",
    ]
+    if (is_mac) {
+      deps += [ "//chrome/services/mac_notifications/public/mojom" ]
+    }
  }

  if (enable_electron_extensions) {
@@ -632,6 +643,7 @@ source_set("electron_lib") {
      "//components/zoom",
      "//extensions/browser",
      "//extensions/browser:core_api_provider",
+      "//extensions/browser/updater",
      "//extensions/common",
      "//extensions/common:core_api_provider",
      "//extensions/renderer",
@@ -648,7 +660,7 @@ source_set("electron_lib") {
  }
  if (enable_pdf_viewer) {
    deps += [
-      "//chrome/browser/resources/pdf:pdf_resources",
+      "//chrome/browser/resources/pdf:resources",
      "//components/pdf/browser",
      "//components/pdf/renderer",
      "//pdf:pdf_ppapi",
@@ -668,6 +680,10 @@ source_set("electron_lib") {
    ]
    libs += [ "uxtheme.lib" ]
  }
+
+  if (allow_runtime_configurable_key_storage) {
+    defines += [ "ALLOW_RUNTIME_CONFIGURABLE_KEY_STORAGE" ]
+  }
 }

 electron_paks("packed_resources") {
@@ -1284,13 +1300,18 @@ template("dist_zip") {
                             "testonly",
                           ])
    flatten = false
+    flatten_relative_to = false
    if (defined(invoker.flatten)) {
      flatten = invoker.flatten
+      if (defined(invoker.flatten_relative_to)) {
+        flatten_relative_to = invoker.flatten_relative_to
+      }
    }
    args = rebase_path(outputs + [ _runtime_deps_file ], root_build_dir) + [
             target_cpu,
             target_os,
             "$flatten",
+             "$flatten_relative_to",
           ]
  }
 }
@@ -1381,6 +1402,43 @@ dist_zip("hunspell_dictionaries_zip") {
  outputs = [ "$root_build_dir/hunspell_dictionaries.zip" ]
 }

+copy("libcxx_headers") {
+  sources = libcxx_headers + libcxx_licenses
+  outputs = [ "$target_gen_dir/electron_libcxx_include/{{source_root_relative_dir}}/{{source_file_part}}" ]
+}
+
+dist_zip("libcxx_headers_zip") {
+  data_deps = [ ":libcxx_headers" ]
+  flatten = true
+  flatten_relative_to = rebase_path(
+          "$target_gen_dir/electron_libcxx_include/buildtools/third_party/libc++/trunk",
+          "$root_out_dir")
+
+  outputs = [ "$root_build_dir/libcxx_headers.zip" ]
+}
+
+copy("libcxxabi_headers") {
+  sources = libcxxabi_headers + libcxxabi_licenses
+  outputs = [ "$target_gen_dir/electron_libcxxabi_include/{{source_root_relative_dir}}/{{source_file_part}}" ]
+}
+
+dist_zip("libcxxabi_headers_zip") {
+  data_deps = [ ":libcxxabi_headers" ]
+  flatten = true
+  flatten_relative_to = rebase_path(
+          "$target_gen_dir/electron_libcxxabi_include/buildtools/third_party/libc++abi/trunk",
+          "$root_out_dir")
+
+  outputs = [ "$root_build_dir/libcxxabi_headers.zip" ]
+}
+
+action("libcxx_objects_zip") {
+  deps = [ "//buildtools/third_party/libc++" ]
+  script = "build/zip_libcxx.py"
+  outputs = [ "$root_build_dir/libcxx_objects.zip" ]
+  args = rebase_path(outputs)
+}
+
 group("electron") {
  public_deps = [ ":electron_app" ]
 }
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -2,8 +2,8 @@

 As a member project of the OpenJS Foundation, Electron uses [Contributor Covenant v2.0](https://contributor-covenant.org/version/2/0/code_of_conduct) as their code of conduct. The full text is included [below](#contributor-covenant-code-of-conduct) in English, and translations are available from the Contributor Covenant organisation:

- [contributor-covenant.org/translations](https://www.contributor-covenant.org/translations)
- [github.com/ContributorCovenant](https://github.com/ContributorCovenant/contributor_covenant/tree/release/content/version/2/0)
+* [contributor-covenant.org/translations](https://www.contributor-covenant.org/translations)
+* [github.com/ContributorCovenant](https://github.com/ContributorCovenant/contributor_covenant/tree/release/content/version/2/0)

 ## Contributor Covenant Code of Conduct

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,14 +22,14 @@ Issues are created [here](https://github.com/electron/electron/issues/new).

 ### Issue Closure

-Bug reports will be closed if the issue has been inactive and the latest affected version no longer receives support. At the moment, Electron maintains its three latest major versions, with a new major version being released every 12 weeks. (For more information on Electron's release cadence, see [this blog post](https://electronjs.org/blog/12-week-cadence).)
+Bug reports will be closed if the issue has been inactive and the latest affected version no longer receives support. At the moment, Electron maintains its three latest major versions, with a new major version being released every 8 weeks. (For more information on Electron's release cadence, see [this blog post](https://electronjs.org/blog/8-week-cadence).)

 _If an issue has been closed and you still feel it's relevant, feel free to ping a maintainer or add a comment!_

 ### Languages

 We accept issues in *any* language.
-When an issue is posted in a language besides English, it is acceptable and encouraged to post an English-translated copy as a reply. 
+When an issue is posted in a language besides English, it is acceptable and encouraged to post an English-translated copy as a reply.
 Anyone may post the translated reply.
 In most cases, a quick pass through translation software is sufficient.
 Having the original text _as well as_ the translation can help mitigate translation errors.
@@ -66,5 +66,5 @@ See [Coding Style](https://electronjs.org/docs/development/coding-style) for inf

 ## Further Reading

-For more in-depth guides on developing Electron, see 
+For more in-depth guides on developing Electron, see
 [/docs/development](/docs/development/README.md)
--- a/43
+++ b/43
@@ -10,25 +10,24 @@ gclient_gn_args = [
  'checkout_openxr',
  'checkout_google_benchmark',
  'mac_xcode_version',
+  'generate_location_tags',
 ]

 vars = {
  'chromium_version':
-    '89.0.4389.128',
+    '91.0.4472.164',
  'node_version':
    'v14.16.0',
  'nan_version':
-    '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
+    'v2.14.2',
  'squirrel.mac_version':
-    'cdc0729c8bf8576bfef18629186e1e9ecf1b0d9f',
+    '0e5d146ba13101a1302d59ea6e6e0b3cace4ae38',

  'pyyaml_version': '3.12',
-  'requests_version': 'e4d59bedfd3c7f4f254f4f5d036587bcd8152458',

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

@@ -50,18 +49,15 @@ vars = {
  # It's only needed to parse the native tests configurations.
  'checkout_pyyaml': False,

-  # Python "requests" module is used for releases only.
-  'checkout_requests': False,
+  'use_rts': False,

  'mac_xcode_version': 'default',

+  'generate_location_tags': False,
+
  # To allow running hooks without parsing the DEPS tree
  'process_deps': True,

-  # It is always needed for normal Electron builds,
-  # but might be impossible for custom in-house builds.
-  'download_external_binaries': True,
-
  'checkout_nacl':
    False,
  'checkout_libaom':
@@ -99,10 +95,6 @@ deps = {
    'url': (Var("yaml_git")) + '/pyyaml.git@' + (Var("pyyaml_version")),
    'condition': 'checkout_pyyaml 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',
@@ -157,32 +149,13 @@ hooks = [
      'src/electron/patches/mtime-cache.json',
    ],
  },
-  {
-    'name': 'electron_external_binaries',
-    'pattern': 'src/electron/script/update-external-binaries.py',
-    'condition': 'download_external_binaries',
-    'action': [
-      'python3',
-      'src/electron/script/update-external-binaries.py',
-    ],
-  },
  {
    'name': 'electron_npm_deps',
    'pattern': 'src/electron/package.json',
    'action': [
      'python3',
      '-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_requests',
-    'pattern': 'src/electron',
-    'condition': 'checkout_requests and process_deps',
-    'action': [
-      'python3',
-      '-c',
-      'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "requests")); subprocess.check_call(["python", "setup.py", "build"]);',
+      'import os, subprocess; os.chdir(os.path.join("src", "electron")); subprocess.check_call(["python3", "script/lib/npx.py", "yarn@' + (Var("yarn_version")) + '", "install", "--frozen-lockfile"]);',
    ],
  },
 ]
--- a/2
+++ b/2
@@ -1 +1 @@
-12.2.1
+13.6.0
--- a/1
+++ b/1
@@ -1,3 +1,4 @@
+Copyright (c) Electron contributors
 Copyright (c) 2013-2020 GitHub Inc.

 Permission is hereby granted, free of charge, to any person obtaining
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 [![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org)

-
 [![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)
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -13,4 +13,5 @@ Report security bugs in third-party modules to the person or team maintaining th
 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.

 ## 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
@@ -68,9 +68,7 @@ build_script:
  - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
  - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
  - ps: >-
-      if ($env:GN_CONFIG -eq 'release') {
-        $env:GCLIENT_EXTRA_ARGS="$env:GCLIENT_EXTRA_ARGS --custom-var=checkout_requests=True"
-      } else {
+      if ($env:GN_CONFIG -ne 'release') {
        $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
      }
  - >-
@@ -99,8 +97,6 @@ build_script:
              $env:SAVE_GCLIENT_SRC="true"
            }
          } else {
-            # update external binaries
-            python src/electron/script/update-external-binaries.py
            # update angle
            cd src\third_party\angle
            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
--- a/azure-pipelines-arm.yml
+++ b/azure-pipelines-arm.yml
@@ -17,6 +17,7 @@ steps:
    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=dist.zip --dest=$ZIP_DEST
    cd $ZIP_DEST
    unzip -o dist.zip
+    xattr -cr Electron.app    
  displayName: 'Download and unzip dist files for test'
  env:
    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
@@ -48,38 +49,44 @@ steps:
   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
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/v8_context_snapshot.arm64.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'
+    export npm_config_arch=arm64
+    (cd electron && node script/yarn test --enable-logging --runners main)
+  displayName: 'Run Electron main tests'
  timeoutInMinutes: 20
  env:
    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
    IGNORE_YARN_INSTALL_ERROR: 1
    ELECTRON_TEST_RESULTS_DIR: junit

+- bash: |
+    cd src
+    export ELECTRON_OUT_DIR=Default
+    export npm_config_arch=arm64
+    (cd electron && node script/yarn test --enable-logging --runners remote)
+  displayName: 'Run Electron remote tests'
+  timeoutInMinutes: 20
+  condition: succeededOrFailed()
+  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()
+  env:
+    TARGET_ARCH: arm64

 - bash: |
    cd src
@@ -98,6 +105,16 @@ steps:

  condition: succeededOrFailed()

+- bash: killall Electron || echo "No Electron processes left running"
+  displayName: 'Kill processes left running from last test run'
+  condition: always()
+
+- bash: |
+    rm -rf ~/Library/Application\ Support/Electron*
+    rm -rf ~/Library/Application\ Support/electron*
+  displayName: 'Delete user app data directories'
+  condition: always()
+
 - task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
  displayName: 'Clean Agent Directories'

--- a/azure-pipelines-woa.yml
+++ b/azure-pipelines-woa.yml
@@ -64,7 +64,7 @@ steps:
    set npm_config_arch=arm64
    cd electron
    # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-    node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion
+    node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion --disable-gpu
  displayName: 'Run Electron tests'
  env:
    ELECTRON_OUT_DIR: Default
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]

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

 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
@@ -19,4 +19,17 @@ enable_basic_printing = true
 angle_enable_vulkan_validation_layers = false
 dawn_enable_vulkan_validation_layers = false

+# This breaks native node modules
+libcxx_abi_unstable = false
+
+# These are disabled because they cause the zip manifest to differ between
+# testing and release builds.
+# See https://chromium-review.googlesource.com/c/chromium/src/+/2774898.
+enable_pseudolocales = false
+
 is_cfi = false
+
+# Make application name configurable at runtime for cookie crypto
+allow_runtime_configurable_key_storage = true
+
+enable_cet_shadow_stack = false
--- a/build/fuses/build.py
+++ b/build/fuses/build.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3

+from collections import OrderedDict
 import json
 import os
 import sys
@@ -49,8 +50,8 @@ const volatile char kFuseWire[] = { /* sentinel */ {sentinel}, /* fuse_version *
 }
 """

-with open(os.path.join(dir_path, "fuses.json"), 'r') as f:
-  fuse_defaults = json.load(f)
+with open(os.path.join(dir_path, "fuses.json5"), 'r') as f:
+  fuse_defaults = json.loads(''.join(line for line in f.readlines() if not line.strip()[0] == "/"), object_pairs_hook=OrderedDict)

 fuse_version = fuse_defaults['_version']
 del fuse_defaults['_version']
--- a/build/fuses/fuses.json5
+++ b/build/fuses/fuses.json5
@@ -2,5 +2,6 @@
  "_comment": "Modifying the fuse schema in any breaking way should result in the _version prop being incremented.  NEVER remove a fuse or change its meaning, instead mark it as removed with 'r'",
  "_schema": "0 == off, 1 == on, r == removed fuse",
  "_version": 1,
-  "run_as_node": "1"
+  "run_as_node": "1",
+  "cookie_encryption": "0"
 }
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -1,653 +0,0 @@
-#!/bin/bash -e
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-# Script to install everything needed to build chromium (well, ideally, anyway)
-# See https://chromium.googlesource.com/chromium/src/+/master/docs/linux_build_instructions.md
-usage() {
-  echo "Usage: $0 [--options]"
-  echo "Options:"
-  echo "--[no-]syms: enable or disable installation of debugging symbols"
-  echo "--lib32: enable installation of 32-bit libraries, e.g. for V8 snapshot"
-  echo "--[no-]arm: enable or disable installation of arm cross toolchain"
-  echo "--[no-]chromeos-fonts: enable or disable installation of Chrome OS"\
-       "fonts"
-  echo "--[no-]nacl: enable or disable installation of prerequisites for"\
-       "building standalone NaCl and all its toolchains"
-  echo "--[no-]backwards-compatible: enable or disable installation of packages
-        that are no longer currently needed and have been removed from this
-        script.  Useful for bisection."
-  echo "--no-prompt: silently select standard options/defaults"
-  echo "--quick-check: quickly try to determine if dependencies are installed"
-  echo "               (this avoids interactive prompts and sudo commands,"
-  echo "               so might not be 100% accurate)"
-  echo "--unsupported: attempt installation even on unsupported systems"
-  echo "Script will prompt interactively if options not given."
-  exit 1
-}
-# Checks whether a particular package is available in the repos.
-# USAGE: $ package_exists <package name>
-package_exists() {
-  # 'apt-cache search' takes a regex string, so eg. the +'s in packages like
-  # "libstdc++" need to be escaped.
-  local escaped="$(echo $1 | sed 's/[\~\+\.\:-]/\\&/g')"
-  [ ! -z "$(apt-cache search --names-only "${escaped}" | \
-            awk '$1 == "'$1'" { print $1; }')" ]
-}
-# These default to on because (some) bots need them and it keeps things
-# simple for the bot setup if all bots just run the script in its default
-# mode.  Developers who don't want stuff they don't need installed on their
-# own workstations can pass --no-arm --no-nacl when running the script.
-do_inst_arm=1
-do_inst_nacl=1
-while [ "$1" != "" ]
-do
-  case "$1" in
-  --syms)                    do_inst_syms=1;;
-  --no-syms)                 do_inst_syms=0;;
-  --lib32)                   do_inst_lib32=1;;
-  --arm)                     do_inst_arm=1;;
-  --no-arm)                  do_inst_arm=0;;
-  --chromeos-fonts)          do_inst_chromeos_fonts=1;;
-  --no-chromeos-fonts)       do_inst_chromeos_fonts=0;;
-  --nacl)                    do_inst_nacl=1;;
-  --no-nacl)                 do_inst_nacl=0;;
-  --backwards-compatible)    do_inst_backwards_compatible=1;;
-  --no-backwards-compatible) do_inst_backwards_compatible=0;;
-  --add-cross-tool-repo)     add_cross_tool_repo=1;;
-  --no-prompt)               do_default=1
-                             do_quietly="-qq --assume-yes"
-    ;;
-  --quick-check)             do_quick_check=1;;
-  --unsupported)             do_unsupported=1;;
-  *) usage;;
-  esac
-  shift
-done
-if [ "$do_inst_arm" = "1" ]; then
-  do_inst_lib32=1
-fi
-# Check for lsb_release command in $PATH
-if ! which lsb_release > /dev/null; then
-  echo "ERROR: lsb_release not found in \$PATH" >&2
-  exit 1;
-fi
-distro_codename=$(lsb_release --codename --short)
-distro_id=$(lsb_release --id --short)
-supported_codenames="(trusty|xenial|artful|bionic)"
-supported_ids="(Debian)"
-if [ 0 -eq "${do_unsupported-0}" ] && [ 0 -eq "${do_quick_check-0}" ] ; then
-  if [[ ! $distro_codename =~ $supported_codenames &&
-        ! $distro_id =~ $supported_ids ]]; then
-    echo -e "ERROR: The only supported distros are\n" \
-      "\tUbuntu 14.04 LTS (trusty)\n" \
-      "\tUbuntu 16.04 LTS (xenial)\n" \
-      "\tUbuntu 17.10 (artful)\n" \
-      "\tUbuntu 18.04 LTS (bionic)\n" \
-      "\tDebian 8 (jessie) or later" >&2
-    exit 1
-  fi
-  if ! uname -m | egrep -q "i686|x86_64"; then
-    echo "Only x86 architectures are currently supported" >&2
-    exit
-  fi
-fi
-if [ "x$(id -u)" != x0 ] && [ 0 -eq "${do_quick_check-0}" ]; then
-  echo "Running as non-root user."
-  echo "You might have to enter your password one or more times for 'sudo'."
-  echo
-fi
-# Packages needed for chromeos only
-chromeos_dev_list="libbluetooth-dev libxkbcommon-dev"
-if package_exists realpath; then
-  chromeos_dev_list="${chromeos_dev_list} realpath"
-fi
-# Packages needed for development
-dev_list="\
-  binutils
-  bison
-  bzip2
-  cdbs
-  curl
-  dbus-x11
-  dpkg-dev
-  elfutils
-  devscripts
-  fakeroot
-  flex
-  g++
-  git-core
-  git-svn
-  gperf
-  libappindicator3-dev
-  libasound2-dev
-  libatspi2.0-dev
-  libbrlapi-dev
-  libbz2-dev
-  libcairo2-dev
-  libcap-dev
-  libcups2-dev
-  libcurl4-gnutls-dev
-  libdrm-dev
-  libelf-dev
-  libffi-dev
-  libgbm-dev
-  libglib2.0-dev
-  libglu1-mesa-dev
-  libgnome-keyring-dev
-  libgtk-3-dev
-  libkrb5-dev
-  libnspr4-dev
-  libnss3-dev
-  libpam0g-dev
-  libpci-dev
-  libpulse-dev
-  libsctp-dev
-  libspeechd-dev
-  libsqlite3-dev
-  libssl-dev
-  libudev-dev
-  libwww-perl
-  libxslt1-dev
-  libxss-dev
-  libxt-dev
-  libxtst-dev
-  locales
-  openbox
-  p7zip
-  patch
-  perl
-  pkg-config
-  python
-  python-cherrypy3
-  python-crypto
-  python-dev
-  python-numpy
-  python-opencv
-  python-openssl
-  python-psutil
-  python-yaml
-  rpm
-  ruby
-  subversion
-  uuid-dev
-  wdiff
-  x11-utils
-  xcompmgr
-  xz-utils
-  zip
-  $chromeos_dev_list
-"
-# 64-bit systems need a minimum set of 32-bit compat packages for the pre-built
-# NaCl binaries.
-if file -L /sbin/init | grep -q 'ELF 64-bit'; then
-  dev_list="${dev_list} libc6-i386 lib32gcc1 lib32stdc++6"
-fi
-# Run-time libraries required by chromeos only
-chromeos_lib_list="libpulse0 libbz2-1.0"
-# List of required run-time libraries
-common_lib_list="\
-  libappindicator3-1
-  libasound2
-  libatk1.0-0
-  libatspi2.0-0
-  libc6
-  libcairo2
-  libcap2
-  libcups2
-  libexpat1
-  libffi6
-  libfontconfig1
-  libfreetype6
-  libglib2.0-0
-  libgnome-keyring0
-  libgtk-3-0
-  libpam0g
-  libpango1.0-0
-  libpci3
-  libpcre3
-  libpixman-1-0
-  libspeechd2
-  libstdc++6
-  libsqlite3-0
-  libuuid1
-  libwayland-egl1-mesa
-  libx11-6
-  libx11-xcb1
-  libxau6
-  libxcb1
-  libxcomposite1
-  libxcursor1
-  libxdamage1
-  libxdmcp6
-  libxext6
-  libxfixes3
-  libxi6
-  libxinerama1
-  libxrandr2
-  libxrender1
-  libxtst6
-  zlib1g
-"
-# Full list of required run-time libraries
-lib_list="\
-  $common_lib_list
-  $chromeos_lib_list
-"
-# 32-bit libraries needed e.g. to compile V8 snapshot for Android or armhf
-lib32_list="linux-libc-dev:i386 libpci3:i386"
-# 32-bit libraries needed for a 32-bit build
-lib32_list="$lib32_list libx11-xcb1:i386"
-# Packages that have been removed from this script.  Regardless of configuration
-# or options passed to this script, whenever a package is removed, it should be
-# added here.
-backwards_compatible_list="\
-  7za
-  fonts-indic
-  fonts-ipafont
-  fonts-stix
-  fonts-thai-tlwg
-  fonts-tlwg-garuda
-  language-pack-da
-  language-pack-fr
-  language-pack-he
-  language-pack-zh-hant
-  libappindicator-dev
-  libappindicator1
-  libappindicator3-1:i386
-  libexif-dev
-  libexif12
-  libexif12:i386
-  libgbm-dev
-  libgl1-mesa-dev
-  libgl1-mesa-glx:i386
-  libgles2-mesa-dev
-  libgtk2.0-0
-  libgtk2.0-0:i386
-  libgtk2.0-dev
-  mesa-common-dev
-  msttcorefonts
-  ttf-dejavu-core
-  ttf-indic-fonts
-  ttf-kochi-gothic
-  ttf-kochi-mincho
-  ttf-mscorefonts-installer
-  xfonts-mathml
-"
-case $distro_codename in
-  trusty)
-    backwards_compatible_list+=" \
-      libgbm-dev-lts-trusty
-      libgl1-mesa-dev-lts-trusty
-      libgl1-mesa-glx-lts-trusty:i386
-      libgles2-mesa-dev-lts-trusty
-      mesa-common-dev-lts-trusty"
-    ;;
-  xenial)
-    backwards_compatible_list+=" \
-      libgbm-dev-lts-xenial
-      libgl1-mesa-dev-lts-xenial
-      libgl1-mesa-glx-lts-xenial:i386
-      libgles2-mesa-dev-lts-xenial
-      mesa-common-dev-lts-xenial"
-    ;;
-esac
-# arm cross toolchain packages needed to build chrome on armhf
-EM_REPO="deb http://emdebian.org/tools/debian/ jessie main"
-EM_SOURCE=$(cat <<EOF
-# Repo added by Chromium $0
-${EM_REPO}
-# deb-src http://emdebian.org/tools/debian/ jessie main
-EOF
-)
-EM_ARCHIVE_KEY_FINGER="084C6C6F39159EDB67969AA87DE089671804772E"
-GPP_ARM_PACKAGE="g++-arm-linux-gnueabihf"
-case $distro_codename in
-  jessie)
-    eval $(apt-config shell APT_SOURCESDIR 'Dir::Etc::sourceparts/d')
-    CROSSTOOLS_LIST="${APT_SOURCESDIR}/crosstools.list"
-    arm_list="libc6-dev:armhf
-              linux-libc-dev:armhf"
-    if [ "$do_inst_arm" = "1" ]; then
-      if $(dpkg-query -W ${GPP_ARM_PACKAGE} &>/dev/null); then
-        arm_list+=" ${GPP_ARM_PACKAGE}"
-      else
-        if [ "${add_cross_tool_repo}" = "1" ]; then
-          gpg --keyserver pgp.mit.edu --recv-keys ${EM_ARCHIVE_KEY_FINGER}
-          gpg -a --export ${EM_ARCHIVE_KEY_FINGER} | sudo apt-key add -
-          if ! grep "^${EM_REPO}" "${CROSSTOOLS_LIST}" &>/dev/null; then
-            echo "${EM_SOURCE}" | sudo tee -a "${CROSSTOOLS_LIST}" >/dev/null
-          fi
-          arm_list+=" ${GPP_ARM_PACKAGE}"
-        else
-          echo "The Debian Cross-toolchains repository is necessary to"
-          echo "cross-compile Chromium for arm."
-          echo "Rerun with --add-deb-cross-tool-repo to have it added for you."
-        fi
-      fi
-    fi
-    ;;
-  # All necessary ARM packages are available on the default repos on
-  # Debian 9 and later.
-  *)
-    arm_list="libc6-dev-armhf-cross
-              linux-libc-dev-armhf-cross
-              ${GPP_ARM_PACKAGE}"
-    ;;
-esac
-# Work around for dependency issue Ubuntu/Trusty: http://crbug.com/435056
-case $distro_codename in
-  trusty)
-    arm_list+=" g++-4.8-multilib-arm-linux-gnueabihf
-                gcc-4.8-multilib-arm-linux-gnueabihf"
-    ;;
-  xenial|artful|bionic)
-    arm_list+=" g++-5-multilib-arm-linux-gnueabihf
-                gcc-5-multilib-arm-linux-gnueabihf
-                gcc-arm-linux-gnueabihf"
-    ;;
-esac
-# Packages to build NaCl, its toolchains, and its ports.
-naclports_list="ant autoconf bison cmake gawk intltool xutils-dev xsltproc"
-nacl_list="\
-  g++-mingw-w64-i686
-  lib32z1-dev
-  libasound2:i386
-  libcap2:i386
-  libelf-dev:i386
-  libfontconfig1:i386
-  libglib2.0-0:i386
-  libgpm2:i386
-  libgtk-3-0:i386
-  libncurses5:i386
-  lib32ncurses5-dev
-  libnss3:i386
-  libpango1.0-0:i386
-  libssl-dev:i386
-  libtinfo-dev
-  libtinfo-dev:i386
-  libtool
-  libuuid1:i386
-  libxcomposite1:i386
-  libxcursor1:i386
-  libxdamage1:i386
-  libxi6:i386
-  libxrandr2:i386
-  libxss1:i386
-  libxtst6:i386
-  texinfo
-  xvfb
-  ${naclports_list}
-"
-if package_exists libssl1.1; then
-  nacl_list="${nacl_list} libssl1.1:i386"
-elif package_exists libssl1.0.2; then
-  nacl_list="${nacl_list} libssl1.0.2:i386"
-else
-  nacl_list="${nacl_list} libssl1.0.0:i386"
-fi
-# Some package names have changed over time
-if package_exists libpng16-16; then
-  lib_list="${lib_list} libpng16-16"
-else
-  lib_list="${lib_list} libpng12-0"
-fi
-if package_exists libnspr4; then
-  lib_list="${lib_list} libnspr4 libnss3"
-else
-  lib_list="${lib_list} libnspr4-0d libnss3-1d"
-fi
-if package_exists libjpeg-dev; then
-  dev_list="${dev_list} libjpeg-dev"
-else
-  dev_list="${dev_list} libjpeg62-dev"
-fi
-if package_exists libudev1; then
-  dev_list="${dev_list} libudev1"
-  nacl_list="${nacl_list} libudev1:i386"
-else
-  dev_list="${dev_list} libudev0"
-  nacl_list="${nacl_list} libudev0:i386"
-fi
-if package_exists libbrlapi0.6; then
-  dev_list="${dev_list} libbrlapi0.6"
-else
-  dev_list="${dev_list} libbrlapi0.5"
-fi
-if package_exists apache2.2-bin; then
-  dev_list="${dev_list} apache2.2-bin"
-else
-  dev_list="${dev_list} apache2-bin"
-fi
-if package_exists libav-tools; then
-  dev_list="${dev_list} libav-tools"
-fi
-if package_exists php7.2-cgi; then
-  dev_list="${dev_list} php7.2-cgi libapache2-mod-php7.2"
-elif package_exists php7.1-cgi; then
-  dev_list="${dev_list} php7.1-cgi libapache2-mod-php7.1"
-elif package_exists php7.0-cgi; then
-  dev_list="${dev_list} php7.0-cgi libapache2-mod-php7.0"
-else
-  dev_list="${dev_list} php5-cgi libapache2-mod-php5"
-fi
-# Some packages are only needed if the distribution actually supports
-# installing them.
-if package_exists appmenu-gtk; then
-  lib_list="$lib_list appmenu-gtk"
-fi
-# Cross-toolchain strip is needed for building the sysroots.
-if package_exists binutils-arm-linux-gnueabihf; then
-  dev_list="${dev_list} binutils-arm-linux-gnueabihf"
-fi
-if package_exists binutils-aarch64-linux-gnu; then
-  dev_list="${dev_list} binutils-aarch64-linux-gnu"
-fi
-if package_exists binutils-mipsel-linux-gnu; then
-  dev_list="${dev_list} binutils-mipsel-linux-gnu"
-fi
-if package_exists binutils-mips64el-linux-gnuabi64; then
-  dev_list="${dev_list} binutils-mips64el-linux-gnuabi64"
-fi
-# When cross building for arm/Android on 64-bit systems the host binaries
-# that are part of v8 need to be compiled with -m32 which means
-# that basic multilib support is needed.
-if file -L /sbin/init | grep -q 'ELF 64-bit'; then
-  # gcc-multilib conflicts with the arm cross compiler (at least in trusty) but
-  # g++-X.Y-multilib gives us the 32-bit support that we need. Find out the
-  # appropriate value of X and Y by seeing what version the current
-  # distribution's g++-multilib package depends on.
-  multilib_package=$(apt-cache depends g++-multilib --important | \
-      grep -E --color=never --only-matching '\bg\+\+-[0-9.]+-multilib\b')
-  lib32_list="$lib32_list $multilib_package"
-fi
-if [ "$do_inst_syms" = "1" ]; then
-  echo "Including debugging symbols."
-  # Debian is in the process of transitioning to automatic debug packages, which
-  # have the -dbgsym suffix (https://wiki.debian.org/AutomaticDebugPackages).
-  # Untransitioned packages have the -dbg suffix.  And on some systems, neither
-  # will be available, so exclude the ones that are missing.
-  dbg_package_name() {
-    if package_exists "$1-dbgsym"; then
-      echo "$1-dbgsym"
-    elif package_exists "$1-dbg"; then
-      echo "$1-dbg"
-    fi
-  }
-  for package in "${common_lib_list}"; do
-    dbg_list="$dbg_list $(dbg_package_name ${package})"
-  done
-  # Debugging symbols packages not following common naming scheme
-  if [ "$(dbg_package_name libstdc++6)" == "" ]; then
-    if package_exists libstdc++6-8-dbg; then
-      dbg_list="${dbg_list} libstdc++6-8-dbg"
-    elif package_exists libstdc++6-7-dbg; then
-      dbg_list="${dbg_list} libstdc++6-7-dbg"
-    elif package_exists libstdc++6-6-dbg; then
-      dbg_list="${dbg_list} libstdc++6-6-dbg"
-    elif package_exists libstdc++6-5-dbg; then
-      dbg_list="${dbg_list} libstdc++6-5-dbg"
-    elif package_exists libstdc++6-4.9-dbg; then
-      dbg_list="${dbg_list} libstdc++6-4.9-dbg"
-    elif package_exists libstdc++6-4.8-dbg; then
-      dbg_list="${dbg_list} libstdc++6-4.8-dbg"
-    elif package_exists libstdc++6-4.7-dbg; then
-      dbg_list="${dbg_list} libstdc++6-4.7-dbg"
-    elif package_exists libstdc++6-4.6-dbg; then
-      dbg_list="${dbg_list} libstdc++6-4.6-dbg"
-    fi
-  fi
-  if [ "$(dbg_package_name libatk1.0-0)" == "" ]; then
-    dbg_list="$dbg_list $(dbg_package_name libatk1.0)"
-  fi
-  if [ "$(dbg_package_name libpango1.0-0)" == "" ]; then
-    dbg_list="$dbg_list $(dbg_package_name libpango1.0-dev)"
-  fi
-else
-  echo "Skipping debugging symbols."
-  dbg_list=
-fi
-if [ "$do_inst_lib32" = "1" ]; then
-  echo "Including 32-bit libraries."
-else
-  echo "Skipping 32-bit libraries."
-  lib32_list=
-fi
-if [ "$do_inst_arm" = "1" ]; then
-  echo "Including ARM cross toolchain."
-else
-  echo "Skipping ARM cross toolchain."
-  arm_list=
-fi
-if [ "$do_inst_nacl" = "1" ]; then
-  echo "Including NaCl, NaCl toolchain, NaCl ports dependencies."
-else
-  echo "Skipping NaCl, NaCl toolchain, NaCl ports dependencies."
-  nacl_list=
-fi
-filtered_backwards_compatible_list=
-if [ "$do_inst_backwards_compatible" = "1" ]; then
-  echo "Including backwards compatible packages."
-  for package in ${backwards_compatible_list}; do
-    if package_exists ${package}; then
-      filtered_backwards_compatible_list+=" ${package}"
-    fi
-  done
-fi
-# The `sort -r -s -t: -k2` sorts all the :i386 packages to the front, to avoid
-# confusing dpkg-query (crbug.com/446172).
-packages="$(
-  echo "${dev_list} ${lib_list} ${dbg_list} ${lib32_list} ${arm_list}" \
-       "${nacl_list}" ${filtered_backwards_compatible_list} | tr " " "\n" | \
-       sort -u | sort -r -s -t: -k2 | tr "\n" " "
-)"
-if [ 1 -eq "${do_quick_check-0}" ] ; then
-  if ! missing_packages="$(dpkg-query -W -f ' ' ${packages} 2>&1)"; then
-    # Distinguish between packages that actually aren't available to the
-    # system (i.e. not in any repo) and packages that just aren't known to
-    # dpkg (i.e. managed by apt).
-    missing_packages="$(echo "${missing_packages}" | awk '{print $NF}')"
-    not_installed=""
-    unknown=""
-    for p in ${missing_packages}; do
-      if apt-cache show ${p} > /dev/null 2>&1; then
-        not_installed="${p}\n${not_installed}"
-      else
-        unknown="${p}\n${unknown}"
-      fi
-    done
-    if [ -n "${not_installed}" ]; then
-      echo "WARNING: The following packages are not installed:"
-      echo -e "${not_installed}" | sed -e "s/^/  /"
-    fi
-    if [ -n "${unknown}" ]; then
-      echo "WARNING: The following packages are unknown to your system"
-      echo "(maybe missing a repo or need to 'sudo apt-get update'):"
-      echo -e "${unknown}" | sed -e "s/^/  /"
-    fi
-    exit 1
-  fi
-  exit 0
-fi
-if [ "$do_inst_lib32" = "1" ] || [ "$do_inst_nacl" = "1" ]; then
-  sudo dpkg --add-architecture i386
-fi
-sudo apt-get update
-# We initially run "apt-get" with the --reinstall option and parse its output.
-# This way, we can find all the packages that need to be newly installed
-# without accidentally promoting any packages from "auto" to "manual".
-# We then re-run "apt-get" with just the list of missing packages.
-echo "Finding missing packages..."
-# Intentionally leaving $packages unquoted so it's more readable.
-echo "Packages required: " $packages
-echo
-new_list_cmd="sudo apt-get install --reinstall $(echo $packages)"
-if new_list="$(yes n | LANGUAGE=en LANG=C $new_list_cmd)"; then
-  # We probably never hit this following line.
-  echo "No missing packages, and the packages are up to date."
-elif [ $? -eq 1 ]; then
-  # We expect apt-get to have exit status of 1.
-  # This indicates that we cancelled the install with "yes n|".
-  new_list=$(echo "$new_list" |
-    sed -e '1,/The following NEW packages will be installed:/d;s/^  //;t;d')
-  new_list=$(echo "$new_list" | sed 's/ *$//')
-  if [ -z "$new_list" ] ; then
-    echo "No missing packages, and the packages are up to date."
-  else
-    echo "Installing missing packages: $new_list."
-    sudo apt-get install ${do_quietly-} ${new_list}
-  fi
-  echo
-else
-  # An apt-get exit status of 100 indicates that a real error has occurred.
-  # I am intentionally leaving out the '"'s around new_list_cmd,
-  # as this makes it easier to cut and paste the output
-  echo "The following command failed: " ${new_list_cmd}
-  echo
-  echo "It produces the following output:"
-  yes n | $new_list_cmd || true
-  echo
-  echo "You will have to install the above packages yourself."
-  echo
-  exit 100
-fi
-# Install the Chrome OS default fonts. This must go after running
-# apt-get, since install-chromeos-fonts depends on curl.
-if [ "$do_inst_chromeos_fonts" != "0" ]; then
-  echo
-  echo "Installing Chrome OS fonts."
-  dir=`echo $0 | sed -r -e 's/\/[^/]+$//'`
-  if ! sudo $dir/linux/install-chromeos-fonts.py; then
-    echo "ERROR: The installation of the Chrome OS default fonts failed."
-    if [ `stat -f -c %T $dir` == "nfs" ]; then
-      echo "The reason is that your repo is installed on a remote file system."
-    else
-      echo "This is expected if your repo is installed on a remote file system."
-    fi
-    echo "It is recommended to install your repo on a local file system."
-    echo "You can skip the installation of the Chrome OS default founts with"
-    echo "the command line option: --no-chromeos-fonts."
-    exit 1
-  fi
-else
-  echo "Skipping installation of Chrome OS fonts."
-fi
-echo "Installing locales."
-CHROMIUM_LOCALES="da_DK.UTF-8 fr_FR.UTF-8 he_IL.UTF-8 zh_TW.UTF-8"
-LOCALE_GEN=/etc/locale.gen
-if [ -e ${LOCALE_GEN} ]; then
-  OLD_LOCALE_GEN="$(cat /etc/locale.gen)"
-  for CHROMIUM_LOCALE in ${CHROMIUM_LOCALES}; do
-    sudo sed -i "s/^# ${CHROMIUM_LOCALE}/${CHROMIUM_LOCALE}/" ${LOCALE_GEN}
-  done
-  # Regenerating locales can take a while, so only do it if we need to.
-  if (echo "${OLD_LOCALE_GEN}" | cmp -s ${LOCALE_GEN}); then
-    echo "Locales already up-to-date."
-  else
-    sudo locale-gen
-  fi
-else
-  for CHROMIUM_LOCALE in ${CHROMIUM_LOCALES}; do
-    sudo locale-gen ${CHROMIUM_LOCALE}
-  done
-fi
--- a/build/mac/make_locale_dirs.py
+++ b/build/mac/make_locale_dirs.py
@@ -8,6 +8,7 @@
 # require any direct Cocoa locale support.

 import os
+import errno
 import sys


@@ -16,7 +17,7 @@ def main(args):
    try:
      os.makedirs(dirname)
    except OSError as e:
-      if e.errno == os.errno.EEXIST:
+      if e.errno == errno.EEXIST:
        # It's OK if it already exists
        pass
      else:
--- a/build/npm-run.py
+++ b/build/npm-run.py
@@ -15,12 +15,6 @@ args = [cmd, "run",
 try:
    subprocess.check_output(args, stderr=subprocess.STDOUT)
 except subprocess.CalledProcessError as e:
-    print(
-        "NPM script '"
-        + sys.argv[2]
-        + "' failed with code '"
-        + str(e.returncode)
-        + "':\n"
-        + e.output.decode('utf8')
-    )
+    error_msg = "NPM script '{}' failed with code '{}':\n".format(sys.argv[2], e.returncode)
+    print(error_msg + e.output.decode('utf8'))
    sys.exit(e.returncode)
--- a/build/zip.py
+++ b/build/zip.py
@@ -39,6 +39,7 @@ PATHS_TO_SKIP = [
  './crashpad_handler',
  # Skip because these are outputs that we don't need.
  'resources/inspector',
+  'gen/third_party/devtools-frontend/src'
 ]

 def skip_path(dep, dist_zip, target_cpu):
@@ -70,7 +71,7 @@ def execute(argv):
    raise e

 def main(argv):
-  dist_zip, runtime_deps, target_cpu, _, flatten_val = argv
+  dist_zip, runtime_deps, target_cpu, _, flatten_val, flatten_relative_to = argv
  should_flatten = flatten_val == "true"
  dist_files = set()
  with open(runtime_deps) as f:
@@ -97,11 +98,18 @@ def main(argv):
            if basename == 'chrome_sandbox'
            else dep
          )
+          name_to_write = arcname
+          if should_flatten:
+            if flatten_relative_to:
+              if name_to_write.startswith(flatten_relative_to):
+                name_to_write = name_to_write[len(flatten_relative_to):]
+              else:
+                name_to_write = os.path.basename(arcname)
+            else:
+              name_to_write = os.path.basename(arcname)
          z.write(
            dep,
-            os.path.basename(arcname)
-            if should_flatten
-            else arcname,
+            name_to_write,
          )

 if __name__ == '__main__':
--- a/build/zip_libcxx.py
+++ b/build/zip_libcxx.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+from __future__ import print_function
+import os
+import subprocess
+import sys
+import zipfile
+
+def execute(argv):
+  try:
+    output = subprocess.check_output(argv, stderr=subprocess.STDOUT)
+    return output
+  except subprocess.CalledProcessError as e:
+    print(e.output)
+    raise e
+
+def get_object_files(base_path, archive_name):
+  archive_file = os.path.join(base_path, archive_name)
+  output = execute(['nm', '-g', archive_file]).decode('ascii')
+  object_files = set()
+  lines = output.split("\n")
+  for line in lines:
+    if line.startswith(base_path):
+      object_file = line.split(":")[0]
+      object_files.add(object_file)
+    if line.startswith('nm: '):
+      object_file = line.split(":")[1].lstrip()
+      object_files.add(object_file)
+  return list(object_files) + [archive_file]
+
+def main(argv):
+  dist_zip, = argv
+  out_dir = os.path.dirname(dist_zip)
+  base_path_libcxx = os.path.join(out_dir, 'obj/buildtools/third_party/libc++')
+  base_path_libcxxabi = os.path.join(out_dir, 'obj/buildtools/third_party/libc++abi')
+  object_files_libcxx = get_object_files(base_path_libcxx, 'libc++.a')
+  object_files_libcxxabi = get_object_files(base_path_libcxxabi, 'libc++abi.a')
+  with zipfile.ZipFile(
+      dist_zip, 'w', zipfile.ZIP_DEFLATED, allowZip64=True
+    ) as z:
+      object_files_libcxx.sort()
+      for object_file in object_files_libcxx:
+        z.write(object_file, os.path.relpath(object_file, base_path_libcxx))
+      for object_file in object_files_libcxxabi:
+        z.write(object_file, os.path.relpath(object_file, base_path_libcxxabi))
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv[1:]))
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by the MIT license that can be
 # found in the LICENSE file.

+import("//build/config/ozone.gni")
 import("//build/config/ui.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//electron/buildflags/buildflags.gni")
@@ -16,8 +17,6 @@ static_library("chrome") {
    "//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",
-    "//chrome/browser/crash_upload_list/crash_upload_list_crashpad.h",
    "//chrome/browser/devtools/devtools_contents_resizing_strategy.cc",
    "//chrome/browser/devtools/devtools_contents_resizing_strategy.h",
    "//chrome/browser/devtools/devtools_embedder_message_dispatcher.cc",
@@ -46,7 +45,6 @@ static_library("chrome") {
    "//chrome/browser/predictors/resolve_host_client_impl.h",
    "//chrome/browser/ssl/security_state_tab_helper.cc",
    "//chrome/browser/ssl/security_state_tab_helper.h",
-    "//chrome/browser/ssl/tls_deprecation_config.cc",
    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.cc",
    "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.h",
    "//extensions/browser/app_window/size_constraints.cc",
@@ -68,14 +66,18 @@ static_library("chrome") {
      "//chrome/browser/extensions/global_shortcut_listener_win.cc",
      "//chrome/browser/extensions/global_shortcut_listener_win.h",
      "//chrome/browser/icon_loader_win.cc",
+      "//chrome/browser/ui/frame/window_frame_util.h",
+      "//chrome/browser/ui/view_ids.h",
      "//chrome/browser/win/chrome_process_finder.cc",
      "//chrome/browser/win/chrome_process_finder.h",
+      "//chrome/browser/win/titlebar_config.h",
      "//chrome/child/v8_crashpad_support_win.cc",
      "//chrome/child/v8_crashpad_support_win.h",
    ]
  }

  public_deps = [
+    "//chrome/browser:dev_ui_browser_resources",
    "//chrome/common",
    "//chrome/common:version_header",
    "//components/keyed_service/content",
@@ -83,6 +85,7 @@ static_library("chrome") {
    "//components/proxy_config",
    "//components/security_state/content",
    "//content/public/browser",
+    "//services/strings",
  ]

  deps = [
@@ -93,12 +96,18 @@ static_library("chrome") {

  if (is_linux) {
    sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
+    if (use_x11 || use_ozone) {
+      sources +=
+          [ "//chrome/browser/extensions/global_shortcut_listener_linux.cc" ]
+    }
    if (use_x11) {
      sources += [
        "//chrome/browser/extensions/global_shortcut_listener_x11.cc",
        "//chrome/browser/extensions/global_shortcut_listener_x11.h",
      ]
-    } else if (use_ozone) {
+    }
+    if (use_ozone) {
+      deps += [ "//ui/ozone" ]
      sources += [
        "//chrome/browser/extensions/global_shortcut_listener_ozone.cc",
        "//chrome/browser/extensions/global_shortcut_listener_ozone.h",
@@ -191,7 +200,7 @@ static_library("chrome") {
    }

    if (is_linux) {
-      sources += [ "//chrome/browser/media/webrtc/window_icon_util_x11.cc" ]
+      sources += [ "//chrome/browser/media/webrtc/window_icon_util_linux.cc" ]
    }
  }

@@ -253,8 +262,12 @@ static_library("chrome") {
      "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.h",
      "//chrome/browser/ui/views/overlay/back_to_tab_image_button.cc",
      "//chrome/browser/ui/views/overlay/back_to_tab_image_button.h",
+      "//chrome/browser/ui/views/overlay/back_to_tab_label_button.cc",
      "//chrome/browser/ui/views/overlay/close_image_button.cc",
      "//chrome/browser/ui/views/overlay/close_image_button.h",
+      "//chrome/browser/ui/views/overlay/constants.h",
+      "//chrome/browser/ui/views/overlay/hang_up_button.cc",
+      "//chrome/browser/ui/views/overlay/hang_up_button.h",
      "//chrome/browser/ui/views/overlay/overlay_window_views.cc",
      "//chrome/browser/ui/views/overlay/overlay_window_views.h",
      "//chrome/browser/ui/views/overlay/playback_image_button.cc",
@@ -263,6 +276,10 @@ static_library("chrome") {
      "//chrome/browser/ui/views/overlay/resize_handle_button.h",
      "//chrome/browser/ui/views/overlay/skip_ad_label_button.cc",
      "//chrome/browser/ui/views/overlay/skip_ad_label_button.h",
+      "//chrome/browser/ui/views/overlay/toggle_camera_button.cc",
+      "//chrome/browser/ui/views/overlay/toggle_camera_button.h",
+      "//chrome/browser/ui/views/overlay/toggle_microphone_button.cc",
+      "//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
      "//chrome/browser/ui/views/overlay/track_image_button.cc",
      "//chrome/browser/ui/views/overlay/track_image_button.h",
    ]
@@ -333,17 +350,13 @@ source_set("plugins") {
  sources += [
    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
+    "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
+    "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
  ]
  if (enable_pdf_viewer) {
-    sources += [
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.cc",
-      "//chrome/renderer/pepper/pepper_flash_font_file_host.h",
-    ]
-    if (enable_pdf_viewer) {
-      deps += [ "//components/pdf/renderer" ]
-    }
+    deps += [ "//components/pdf/renderer" ]
  }
  deps += [
    "//components/strings",
--- a/chromium_src/chrome/browser/certificate_manager_model.cc
+++ b/chromium_src/chrome/browser/certificate_manager_model.cc
@@ -90,7 +90,7 @@ CertificateManagerModel::~CertificateManagerModel() = default;
 int CertificateManagerModel::ImportFromPKCS12(
    PK11SlotInfo* slot_info,
    const std::string& data,
-    const base::string16& password,
+    const std::u16string& password,
    bool is_extractable,
    net::ScopedCERTCertificateList* imported_certs) {
  return cert_db_->ImportFromPKCS12(slot_info, data, password, is_extractable,
--- a/chromium_src/chrome/browser/certificate_manager_model.h
+++ b/chromium_src/chrome/browser/certificate_manager_model.h
@@ -12,7 +12,6 @@
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/strings/string16.h"
 #include "net/cert/nss_cert_database.h"

 namespace content {
@@ -46,7 +45,7 @@ class CertificateManagerModel {
  // Returns a net error code on failure.
  int ImportFromPKCS12(PK11SlotInfo* slot_info,
                       const std::string& data,
-                       const base::string16& password,
+                       const std::u16string& password,
                       bool is_extractable,
                       net::ScopedCERTCertificateList* imported_certs);

--- a/chromium_src/chrome/browser/process_singleton.h
+++ b/chromium_src/chrome/browser/process_singleton.h
@@ -127,10 +127,11 @@ class ProcessSingleton {
  NotificationCallback notification_callback_;  // Handler for notifications.

 #if defined(OS_WIN)
-  HWND remote_window_;               // The HWND_MESSAGE of another browser.
+  HWND remote_window_ = nullptr;     // The HWND_MESSAGE of another browser.
  base::win::MessageWindow window_;  // The message-only window.
-  bool is_virtualized_;  // Stuck inside Microsoft Softricity VM environment.
-  HANDLE lock_file_;
+  bool is_virtualized_ =
+      false;  // Stuck inside Microsoft Softricity VM environment.
+  HANDLE lock_file_ = INVALID_HANDLE_VALUE;
  base::FilePath user_data_dir_;
  ShouldKillRemoteProcessCallback should_kill_remote_process_callback_;
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
@@ -175,7 +176,7 @@ class ProcessSingleton {
  // because it posts messages between threads.
  class LinuxWatcher;
  scoped_refptr<LinuxWatcher> watcher_;
-  int sock_;
+  int sock_ = -1;
  bool listen_on_ready_ = false;
 #endif

--- a/chromium_src/chrome/browser/process_singleton_posix.cc
+++ b/chromium_src/chrome/browser/process_singleton_posix.cc
@@ -333,7 +333,7 @@ bool IsChromeProcess(pid_t pid) {
 // A helper class to hold onto a socket.
 class ScopedSocket {
 public:
-  ScopedSocket() : fd_(-1) { Reset(); }
+  ScopedSocket() { Reset(); }
  ~ScopedSocket() { Close(); }
  int fd() { return fd_; }
  void Reset() {
@@ -347,7 +347,7 @@ class ScopedSocket {
  }

 private:
-  int fd_;
+  int fd_ = -1;
 };

 // Returns a random string for uniquifying profile connections.
@@ -473,10 +473,7 @@ class ProcessSingleton::LinuxWatcher
    SocketReader(ProcessSingleton::LinuxWatcher* parent,
                 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
                 int fd)
-        : parent_(parent),
-          ui_task_runner_(ui_task_runner),
-          fd_(fd),
-          bytes_read_(0) {
+        : parent_(parent), ui_task_runner_(ui_task_runner), fd_(fd) {
      DCHECK_CURRENTLY_ON(BrowserThread::IO);
      // Wait for reads.
      fd_watch_controller_ = base::FileDescriptorWatcher::WatchReadable(
@@ -508,20 +505,20 @@ class ProcessSingleton::LinuxWatcher
        fd_watch_controller_;

    // The ProcessSingleton::LinuxWatcher that owns us.
-    ProcessSingleton::LinuxWatcher* const parent_;
+    ProcessSingleton::LinuxWatcher* const parent_ = nullptr;

    // A reference to the UI task runner.
    scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;

    // The file descriptor we're reading.
-    const int fd_;
+    const int fd_ = -1;

    // Store the message in this buffer.
    char buf_[kMaxMessageLength];

    // Tracks the number of bytes we've read in case we're getting partial
    // reads.
-    size_t bytes_read_;
+    size_t bytes_read_ = 0;

    base::OneShotTimer timer_;

--- a/chromium_src/chrome/browser/process_singleton_win.cc
+++ b/chromium_src/chrome/browser/process_singleton_win.cc
@@ -172,8 +172,6 @@ ProcessSingleton::ProcessSingleton(
    const base::FilePath& user_data_dir,
    const NotificationCallback& notification_callback)
    : notification_callback_(notification_callback),
-      is_virtualized_(false),
-      lock_file_(INVALID_HANDLE_VALUE),
      user_data_dir_(user_data_dir),
      should_kill_remote_process_callback_(
          base::BindRepeating(&TerminateAppWithError)) {
--- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
+++ b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.cc
@@ -38,8 +38,7 @@ void GlobalMenuBarRegistrarX11::OnWindowUnmapped(x11::Window window) {
  live_windows_.erase(window);
 }

-GlobalMenuBarRegistrarX11::GlobalMenuBarRegistrarX11()
-    : registrar_proxy_(nullptr) {
+GlobalMenuBarRegistrarX11::GlobalMenuBarRegistrarX11() {
  // libdbusmenu uses the gio version of dbus; I tried using the code in dbus/,
  // but it looks like that's isn't sharing the bus name with the gio version,
  // even when |connection_type| is set to SHARED.
--- a/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h
+++ b/chromium_src/chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h
@@ -48,7 +48,7 @@ class GlobalMenuBarRegistrarX11 {
                     GObject*,
                     GParamSpec*);

-  GDBusProxy* registrar_proxy_;
+  GDBusProxy* registrar_proxy_ = nullptr;

  // x11::Window which want to be registered, but haven't yet been because
  // we're waiting for the proxy to become available.
--- a/default_app/index.html
+++ b/default_app/index.html
@@ -2,6 +2,7 @@

 <head>
  <title>Electron</title>
+  <meta http-equiv="Content-Security-Policy" content="require-trusted-types-for 'script'; trusted-types electron-default-app" />
  <meta http-equiv="Content-Security-Policy" content="default-src 'none'; script-src 'sha256-6PH54BfkNq/EMMhUY7nhHf3c+AxloOwfy7hWyT01CM8='; style-src 'self'; img-src 'self'; connect-src 'self'" />
  <link href="./styles.css" type="text/css" rel="stylesheet" />
  <link href="./octicon/build.css" type="text/css" rel="stylesheet" />
--- a/default_app/preload.ts
+++ b/default_app/preload.ts
@@ -1,10 +1,15 @@
 import { ipcRenderer, contextBridge } from 'electron';

+const policy = window.trustedTypes.createPolicy('electron-default-app', {
+  // we trust the SVG contents
+  createHTML: input => input
+});
+
 async function getOcticonSvg (name: string) {
  try {
    const response = await fetch(`octicon/${name}.svg`);
    const div = document.createElement('div');
-    div.innerHTML = await response.text();
+    div.innerHTML = policy.createHTML(await response.text());
    return div;
  } catch {
    return null;
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -1193,8 +1193,8 @@ badge.

 On macOS, it shows on the dock icon. On Linux, it only works for Unity launcher.

-**Note:** Unity launcher requires the existence of a `.desktop` file to work,
-for more information please read [Desktop Environment Integration][unity-requirement].
+**Note:** Unity launcher requires a `.desktop` file to work. For more information,
+please read the [Unity integration documentation][unity-requirement].

 ### `app.getBadgeCount()` _Linux_ _macOS_

@@ -1432,8 +1432,8 @@ An `Integer` property that returns the badge count for current app. Setting the

 On macOS, setting this with any nonzero integer shows on the dock icon. On Linux, this property only works for Unity launcher.

-**Note:** Unity launcher requires the existence of a `.desktop` file to work,
-for more information please read [Desktop Environment Integration][unity-requirement].
+**Note:** Unity launcher requires a `.desktop` file to work. For more information,
+please read the [Unity integration documentation][unity-requirement].

 **Note:** On macOS, you need to ensure that your application has the permission
 to display notifications for this property to take effect.
@@ -1461,7 +1461,7 @@ A `Boolean` property that returns  `true` if the app is packaged, `false` otherw
 [LSCopyDefaultHandlerForURLScheme]: https://developer.apple.com/library/mac/documentation/Carbon/Reference/LaunchServicesReference/#//apple_ref/c/func/LSCopyDefaultHandlerForURLScheme
 [handoff]: https://developer.apple.com/library/ios/documentation/UserExperience/Conceptual/Handoff/HandoffFundamentals/HandoffFundamentals.html
 [activity-type]: https://developer.apple.com/library/ios/documentation/Foundation/Reference/NSUserActivity_Class/index.html#//apple_ref/occ/instp/NSUserActivity/activityType
-[unity-requirement]: ../tutorial/desktop-environment-integration.md#unity-launcher
+[unity-requirement]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles#Adding_shortcuts_to_a_launcher
 [mas-builds]: ../tutorial/mac-app-store-submission-guide.md
 [Squirrel-Windows]: https://github.com/Squirrel/Squirrel.Windows
 [JumpListBeginListMSDN]: https://msdn.microsoft.com/en-us/library/windows/desktop/dd378398(v=vs.85).aspx
--- a/docs/api/auto-updater.md
+++ b/docs/api/auto-updater.md
@@ -43,7 +43,7 @@ The installer generated with Squirrel will create a shortcut icon with an
 same ID for your app with `app.setAppUserModelId` API, otherwise Windows will
 not be able to pin your app properly in task bar.

-Unlike Squirrel.Mac, Windows can host updates on S3 or any other static file host.
+Like Squirrel.Mac, Windows can host updates on S3 or any other static file host.
 You can read the documents of [Squirrel.Windows][squirrel-windows] to get more details
 about how Squirrel.Windows works.

--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -187,9 +187,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
  * `parent` BrowserWindow (optional) - Specify parent window. Default is `null`.
  * `modal` Boolean (optional) - Whether this is a modal window. This only works when the
    window is a child window. Default is `false`.
-  * `acceptFirstMouse` Boolean (optional) - Whether the web view accepts a single
-    mouse-down event that simultaneously activates the window. Default is
-    `false`.
+  * `acceptFirstMouse` Boolean (optional) - Whether clicking an inactive window will also
+  click through to the web contents. Default is `false` on macOS. This option is not
+  configurable on other platforms.
  * `disableAutoHideCursor` Boolean (optional) - Whether to hide cursor when typing.
    Default is `false`.
  * `autoHideMenuBar` Boolean (optional) - Auto hide the menu bar unless the `Alt`
@@ -213,30 +213,29 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
    * `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.
+  * `titleBarStyle` String (optional) _macOS_ _Windows_ - The style of window title bar.
    Default is `default`. Possible values are:
-    * `default` - Results in the standard gray opaque Mac title
-      bar.
-    * `hidden` - Results in a hidden title bar and a full size content window, yet
-      the title bar still has the standard window controls ("traffic lights") in
-      the top left.
-    * `hiddenInset` - Results in a hidden title bar with an alternative look
+    * `default` - Results in the standard title bar for macOS or Windows respectively.
+    * `hidden` - Results in a hidden title bar and a full size content window. On macOS, the window still has the standard window controls (“traffic lights”) in the top left. On Windows, when combined with `titleBarOverlay: true` it will activate the Window Controls Overlay (see `titleBarOverlay` for more information), otherwise no window controls will be shown.
+    * `hiddenInset` - Only on macOS, results in a hidden title bar with an alternative look
      where the traffic light buttons are slightly more inset from the window edge.
-    * `customButtonsOnHover` Boolean (optional) - Draw custom close,
-      and minimize buttons on macOS frameless windows. These buttons will not display
-      unless hovered over in the top left of the window. These custom buttons prevent
-      issues with mouse events that occur with the standard window toolbar buttons.
-      **Note:** This option is currently experimental.
-  * `trafficLightPosition` [Point](structures/point.md) (optional) - Set a custom position for the traffic light buttons. Can only be used with `titleBarStyle` set to `hidden`
-  * `fullscreenWindowTitle` Boolean (optional) - Shows the title in the
-    title bar in full screen mode on macOS for all `titleBarStyle` options.
+    * `customButtonsOnHover` - Only on macOS, results in a hidden title bar and a full size
+      content window, the traffic light buttons will display when being hovered
+      over in the top left of the window.  **Note:** This option is currently
+      experimental.
+  * `trafficLightPosition` [Point](structures/point.md) (optional) - Set a
+    custom position for the traffic light buttons in frameless windows.
+  * `roundedCorners` Boolean (optional) - Whether frameless window should have
+    rounded corners on macOS. Default is `true`.
+  * `fullscreenWindowTitle` Boolean (optional) _Deprecated_ - Shows the title in
+    the title bar in full screen mode on macOS for `hiddenInset` titleBarStyle.
    Default is `false`.
  * `thickFrame` Boolean (optional) - Use `WS_THICKFRAME` style for frameless windows on
    Windows, which adds standard window frame. Setting it to `false` will remove
    window shadow and window animations. Default is `true`.
  * `vibrancy` String (optional) - Add a type of vibrancy effect to the window, only on
    macOS. Can be `appearance-based`, `light`, `dark`, `titlebar`, `selection`,
-    `menu`, `popover`, `sidebar`, `medium-light`, `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`, `tooltip`, `content`, `under-window`, or `under-page`.  Please note that using `frame: false` in combination with a vibrancy value requires that you use a non-default `titleBarStyle` as well. Also note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` have been deprecated and will be removed in an upcoming version of macOS.
+    `menu`, `popover`, `sidebar`, `medium-light`, `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`, `tooltip`, `content`, `under-window`, or `under-page`. Please note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` are deprecated and have been removed in macOS Catalina (10.15).
  * `zoomToPageWidth` Boolean (optional) - Controls the behavior on macOS when
    option-clicking the green stoplight button on the toolbar or by clicking the
    Window > Zoom menu item. If `true`, the window will grow to the preferred
@@ -401,6 +400,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      contain the layout of the document—without requiring scrolling. Enabling
      this will cause the `preferred-size-changed` event to be emitted on the
      `WebContents` when the preferred size changes. Default is `false`.
+  * `titleBarOverlay` [OverlayOptions](structures/overlay-options.md) | Boolean (optional) -  When using a frameless window in conjuction with `win.setWindowButtonVisibility(true)` on macOS or using a `titleBarStyle` so that the standard window controls ("traffic lights" on macOS) are visible, this property enables the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.  On Windows, the [OverlayOptions](structures/overlay-options.md) can be used instead of a boolean to specify colors for the overlay.

 When setting minimum or maximum window size with `minWidth`/`maxWidth`/
 `minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
@@ -722,94 +722,6 @@ Returns `BrowserWindow | null` - The window that owns the given `browserView`. I

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

-#### `BrowserWindow.addExtension(path)` _Deprecated_
-
-* `path` String
-
-Adds Chrome extension located at `path`, and returns extension's name.
-
-The method will also not return if the extension's manifest is missing or incomplete.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-**Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath-options).
-
-#### `BrowserWindow.removeExtension(name)` _Deprecated_
-
-* `name` String
-
-Remove a Chrome extension by name.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-**Note:** This method is deprecated. Instead, use
-[`ses.removeExtension(extension_id)`](session.md#sesremoveextensionextensionid).
-
-#### `BrowserWindow.getExtensions()` _Deprecated_
-
-Returns `Record<String, ExtensionInfo>` - The keys are the extension names and each value is
-an Object containing `name` and `version` properties.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-**Note:** This method is deprecated. Instead, use
-[`ses.getAllExtensions()`](session.md#sesgetallextensions).
-
-#### `BrowserWindow.addDevToolsExtension(path)` _Deprecated_
-
-* `path` String
-
-Adds DevTools extension located at `path`, and returns extension's name.
-
-The extension will be remembered so you only need to call this API once, this
-API is not for programming use. If you try to add an extension that has already
-been loaded, this method will not return and instead log a warning to the
-console.
-
-The method will also not return if the extension's manifest is missing or incomplete.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-**Note:** This method is deprecated. Instead, use
-[`ses.loadExtension(path)`](session.md#sesloadextensionpath-options).
-
-#### `BrowserWindow.removeDevToolsExtension(name)` _Deprecated_
-
-* `name` String
-
-Remove a DevTools extension by name.
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-**Note:** This method is deprecated. Instead, use
-[`ses.removeExtension(extension_id)`](session.md#sesremoveextensionextensionid).
-
-#### `BrowserWindow.getDevToolsExtensions()` _Deprecated_
-
-Returns `Record<string, ExtensionInfo>` - The keys are the extension names and each value is
-an Object containing `name` and `version` properties.
-
-To check if a DevTools extension is installed you can run the following:
-
-```javascript
-const { BrowserWindow } = require('electron')
-
-const installed = 'devtron' in BrowserWindow.getDevToolsExtensions()
-console.log(installed)
-```
-
-**Note:** This API cannot be called before the `ready` event of the `app` module
-is emitted.
-
-**Note:** This method is deprecated. Instead, use
-[`ses.getAllExtensions()`](session.md#sesgetallextensions).
-
 ### Instance Properties

 Objects created with `new BrowserWindow` have the following properties:
@@ -1071,7 +983,7 @@ the player itself we would call this function with arguments of 16/9 and
 are within the content view--only that they exist. Sum any extra width and
 height areas you have within the overall content view.

-The aspect ratio is not respected when window is resized programmingly with
+The aspect ratio is not respected when window is resized programmatically with
 APIs like `win.setSize`.

 #### `win.setBackgroundColor(backgroundColor)`
@@ -1467,7 +1379,7 @@ Captures a snapshot of the page within `rect`. Omitting `rect` will capture the
  * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer URL.
  * `userAgent` String (optional) - A user agent originating the request.
  * `extraHeaders` String (optional) - Extra headers separated by "\n"
-  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md)) (optional)
+  * `postData` ([UploadRawData](structures/upload-raw-data.md) | [UploadFile](structures/upload-file.md))[] (optional)
  * `baseURLForDataURL` String (optional) - Base URL (with trailing path separator) for files to be loaded by the data URL. This is needed only if the specified `url` is a data URL and needs to load other files.

 Returns `Promise<void>` - the promise will resolve when the page has finished loading
@@ -1685,8 +1597,6 @@ Changes window icon.

 Sets whether the window traffic light buttons should be visible.

-This cannot be called when `titleBarStyle` is set to `customButtonsOnHover`.
-
 #### `win.setAutoHideMenuBar(hide)`

 * `hide` Boolean
@@ -1715,7 +1625,14 @@ Returns `Boolean` - Whether the menu bar is visible.
 * `visible` Boolean
 * `options` Object (optional)
  * `visibleOnFullScreen` Boolean (optional) _macOS_ - Sets whether
-    the window should be visible above fullscreen windows
+    the window should be visible above fullscreen windows.
+  * `skipTransformProcessType` Boolean (optional) _macOS_ - Calling
+    setVisibleOnAllWorkspaces will by default transform the process
+    type between UIElementApplication and ForegroundApplication to
+    ensure the correct behavior. However, this will hide the window
+    and dock for a short time every time it is called. If your window
+    is already of type UIElementApplication, you can bypass this
+    transformation by passing true to skipTransformProcessType.

 Sets whether the window should be visible on all workspaces.

@@ -1829,12 +1746,12 @@ deprecated and will be removed in an upcoming version of macOS.

 * `position` [Point](structures/point.md)

-Set a custom position for the traffic light buttons. Can only be used with `titleBarStyle` set to `hidden`.
+Set a custom position for the traffic light buttons in frameless window.

 #### `win.getTrafficLightPosition()` _macOS_

-Returns `Point` - The current position for the traffic light buttons. Can only be used with `titleBarStyle`
-set to `hidden`.
+Returns `Point` - The custom position for the traffic light buttons in
+frameless window.

 #### `win.setTouchBar(touchBar)` _macOS_

@@ -1890,3 +1807,5 @@ removed in future Electron releases.
 [window-levels]: https://developer.apple.com/documentation/appkit/nswindow/level
 [chrome-content-scripts]: https://developer.chrome.com/extensions/content_scripts#execution-environment
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
+[overlay-javascript-apis]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#javascript-apis
+[overlay-css-env-vars]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#css-environment-variables
--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -65,12 +65,12 @@ Forces the maximum disk space to be used by the disk cache, in bytes.

 Enables caller stack logging for the following APIs (filtering events):

- `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
- `remote.require()` / `remote-require`
- `remote.getGlobal()` / `remote-get-builtin`
- `remote.getBuiltin()` / `remote-get-global`
- `remote.getCurrentWindow()` / `remote-get-current-window`
- `remote.getCurrentWebContents()` / `remote-get-current-web-contents`
+* `desktopCapturer.getSources()` / `desktop-capturer-get-sources`
+* `remote.require()` / `remote-require`
+* `remote.getGlobal()` / `remote-get-builtin`
+* `remote.getBuiltin()` / `remote-get-global`
+* `remote.getCurrentWindow()` / `remote-get-current-window`
+* `remote.getCurrentWebContents()` / `remote-get-current-web-contents`

 ### --enable-logging

--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -41,7 +41,7 @@ When `contextIsolation` is enabled in your `webPreferences` (this is the default

 The `contextBridge` module has the following methods:

-### `contextBridge.exposeInMainWorld(apiKey, api)` _Experimental_
+### `contextBridge.exposeInMainWorld(apiKey, api)`

 * `apiKey` String - The key to inject the API onto `window` with.  The API will be accessible on `window[apiKey]`.
 * `api` any - Your API, more information on what this API can be and how it works is available below.
@@ -50,7 +50,7 @@ The `contextBridge` module has the following methods:

 ### API

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

 `Function` values are proxied to the other context and all other values are **copied** and **frozen**. Any data / primitives sent in
@@ -106,6 +106,7 @@ has been included below for completeness:
 | `Promise` | Complex | ✅ | ✅ | Promises are only proxied if they are the return value or exact parameter.  Promises nested in arrays or objects will be dropped. |
 | `Function` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending classes or constructors will not work. |
 | [Cloneable Types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm) | Simple | ✅ | ✅ | See the linked document on cloneable types |
+| `Element` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending custom elements will not work. |
 | `Symbol` | N/A | ❌ | ❌ | Symbols cannot be copied across contexts so they are dropped |

 If the type you care about is not in the above table, it is probably not supported.
--- a/docs/api/crash-reporter.md
+++ b/docs/api/crash-reporter.md
@@ -77,7 +77,8 @@ The `crashReporter` module has the following methods:
 ### `crashReporter.start(options)`

 * `options` Object
-  * `submitURL` String - URL that crash reports will be sent to as POST.
+  * `submitURL` String (optional) - URL that crash reports will be sent to as
+    POST. Required unless `uploadToServer` is `false`.
  * `productName` String (optional) - Defaults to `app.name`.
  * `companyName` String (optional) _Deprecated_ - Deprecated alias for
    `{ globalExtra: { _companyName: ... } }`.
--- a/docs/api/environment-variables.md
+++ b/docs/api/environment-variables.md
@@ -120,6 +120,24 @@ debugging purposes.

 Prints Chrome's internal logging to the console.

+### `ELECTRON_DEBUG_DRAG_REGIONS`
+
+Adds coloration to draggable regions on [`BrowserView`](./browser-view.md)s on macOS - draggable regions will be colored
+green and non-draggable regions will be colored red to aid debugging.
+
+### `ELECTRON_DEBUG_NOTIFICATIONS`
+
+Adds extra logs to [`Notification`](./notification.md) lifecycles on macOS to aid in debugging. Extra logging will be displayed when new Notifications are created or activated. They will also be displayed when common actions are taken: a notification is shown, dismissed, its button is clicked, or it is replied to.
+
+Sample output:
+
+```sh
+Notification created (com.github.Electron:notification:EAF7B87C-A113-43D7-8E76-F88EC9D73D44)
+Notification displayed (com.github.Electron:notification:EAF7B87C-A113-43D7-8E76-F88EC9D73D44)
+Notification activated (com.github.Electron:notification:EAF7B87C-A113-43D7-8E76-F88EC9D73D44)
+Notification replied to (com.github.Electron:notification:EAF7B87C-A113-43D7-8E76-F88EC9D73D44)
+```
+
 ### `ELECTRON_LOG_ASAR_READS`

 When Electron reads from an ASAR file, log the read offset and file path to
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -18,17 +18,17 @@ const win = new BrowserWindow({ width: 800, height: 600, frame: false })
 win.show()
 ```

-### Alternatives on macOS
+### Alternatives

-There's an alternative way to specify a chromeless window.
+There's an alternative way to specify a chromeless window on macOS and Windows.
 Instead of setting `frame` to `false` which disables both the titlebar and window controls,
 you may want to have the title bar hidden and your content extend to the full window size,
-yet still preserve the window controls ("traffic lights") for standard window actions.
+yet still preserve the window controls ("traffic lights" on macOS) for standard window actions.
 You can do so by specifying the `titleBarStyle` option:

 #### `hidden`

-Results in a hidden title bar and a full size content window, yet the title bar still has the standard window controls (“traffic lights”) in the top left.
+Results in a hidden title bar and a full size content window. On macOS, the title bar still has the standard window controls (“traffic lights”) in the top left.

 ```javascript
 const { BrowserWindow } = require('electron')
@@ -36,6 +36,8 @@ const win = new BrowserWindow({ titleBarStyle: 'hidden' })
 win.show()
 ```

+### Alternatives on macOS
+
 #### `hiddenInset`

 Results in a hidden title bar with an alternative look where the traffic light buttons are slightly more inset from the window edge.
@@ -61,6 +63,35 @@ const win = new BrowserWindow({ titleBarStyle: 'customButtonsOnHover', frame: fa
 win.show()
 ```

+## Windows Control Overlay
+
+When using a frameless window in conjuction with `win.setWindowButtonVisibility(true)` on macOS, using one of the `titleBarStyle`s as described above so
+that the traffic lights are visible, or using `titleBarStyle: hidden` on Windows, you can access the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and
+[CSS Environment Variables][overlay-css-env-vars] by setting the `titleBarOverlay` option to true. Specifying `true` will result in an overlay with default system colors.
+
+On Windows, you can also specify the color of the overlay and its symbols by setting `titleBarOverlay` to an object with the options `color` and `symbolColor`. If an option is not specified, the color will default to its system color for the window control buttons:
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({
+  titleBarStyle: 'hidden',
+  titleBarOverlay: true
+})
+win.show()
+```
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow({
+  titleBarStyle: 'hidden',
+  titleBarOverlay: {
+    color: '#2f3241',
+    symbolColor: '#74b1be'
+  }
+})
+win.show()
+```
+
 ## Transparent window

 By setting the `transparent` option to `true`, you can also make the frameless
@@ -186,3 +217,5 @@ behave correctly on all platforms you should never use a custom context menu on
 draggable areas.

 [ignore-mouse-events]: browser-window.md#winsetignoremouseeventsignore-options
+[overlay-javascript-apis]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#javascript-apis
+[overlay-css-env-vars]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#css-environment-variables
--- a/docs/api/ipc-main.md
+++ b/docs/api/ipc-main.md
@@ -120,6 +120,11 @@ The `event` that is passed as the first argument to the handler is the same as
 that passed to a regular event listener. It includes information about which
 WebContents is the source of the invoke request.

+Errors thrown through `handle` in the main process are not transparent as they
+are serialized and only the `message` property from the original error is
+provided to the renderer process. Please refer to
+[#24427](https://github.com/electron/electron/issues/24427) for details.
+
 ### `ipcMain.handleOnce(channel, listener)`

 * `channel` String
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -24,8 +24,10 @@ Sets `menu` as the application menu on macOS. On Windows and Linux, the
 Also on Windows and Linux, you can use a `&` in the top-level item name to
 indicate which letter should get a generated accelerator. For example, using
 `&File` for the file menu would result in a generated `Alt-F` accelerator that
-opens the associated menu. The indicated character in the button label gets an
-underline. The `&` character is not displayed on the button label.
+opens the associated menu. The indicated character in the button label then gets an
+underline, and the `&` character is not displayed on the button label.
+
+In order to escape the `&` character in an item name, add a proceeding `&`. For example, `&&File` would result in `&File` displayed on the button label.

 Passing `null` will suppress the default menu. On Windows and Linux,
 this has the additional effect of removing the menu bar from the window.
@@ -160,7 +162,7 @@ const template = [
      { role: 'services' },
      { type: 'separator' },
      { role: 'hide' },
-      { role: 'hideothers' },
+      { role: 'hideOthers' },
      { role: 'unhide' },
      { type: 'separator' },
      { role: 'quit' }
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -12,28 +12,31 @@ It adds the following events, properties, and methods:

 In sandboxed renderers the `process` object contains only a subset of the APIs:

- `crash()`
- `hang()`
- `getCreationTime()`
- `getHeapStatistics()`
- `getBlinkMemoryInfo()`
- `getProcessMemoryInfo()`
- `getSystemMemoryInfo()`
- `getSystemVersion()`
- `getCPUUsage()`
- `getIOCounters()`
- `argv`
- `execPath`
- `env`
- `pid`
- `arch`
- `platform`
- `sandboxed`
- `type`
- `version`
- `versions`
- `mas`
- `windowsStore`
+* `crash()`
+* `hang()`
+* `getCreationTime()`
+* `getHeapStatistics()`
+* `getBlinkMemoryInfo()`
+* `getProcessMemoryInfo()`
+* `getSystemMemoryInfo()`
+* `getSystemVersion()`
+* `getCPUUsage()`
+* `getIOCounters()`
+* `uptime()`
+* `argv`
+* `execPath`
+* `env`
+* `pid`
+* `arch`
+* `platform`
+* `sandboxed`
+* `contextIsolated`
+* `type`
+* `version`
+* `versions`
+* `mas`
+* `windowsStore`
+* `contextId`

 ## Events

@@ -79,6 +82,11 @@ A `String` representing the path to the resources directory.
 A `Boolean`. When the renderer process is sandboxed, this property is `true`,
 otherwise it is `undefined`.

+### `process.contextIsolated` _Readonly_
+
+A `Boolean` that indicates whether the current renderer context has `contextIsolation` enabled.
+It is `undefined` in the main process.
+
 ### `process.throwDeprecation`

 A `Boolean` that controls whether or not deprecation warnings will be thrown as
@@ -119,6 +127,13 @@ A `String` representing Electron's version string.
 A `Boolean`. If the app is running as a Windows Store app (appx), this property is `true`,
 for otherwise it is `undefined`.

+### `process.contextId` _Readonly_
+
+A `String` (optional) representing a globally unique ID of the current JavaScript context.
+Each frame has its own JavaScript context. When contextIsolation is enabled, the isolated
+world also has a separate JavaScript context.
+This property is only available in the renderer process.
+
 ## Methods

 The `process` object has the following methods:
--- a/docs/api/remote.md
+++ b/docs/api/remote.md
@@ -36,8 +36,8 @@ you can use [webContents.executeJavaScript](web-contents.md#contentsexecutejavas

 **Note:** The remote module can be disabled for security reasons in the following contexts:

- [`BrowserWindow`](browser-window.md) - by setting the `enableRemoteModule` option to `false`.
- [`<webview>`](webview-tag.md) - by setting the `enableremotemodule` attribute to `false`.
+* [`BrowserWindow`](browser-window.md) - by setting the `enableRemoteModule` option to `false`.
+* [`<webview>`](webview-tag.md) - by setting the `enableremotemodule` attribute to `false`.

 ## Remote Objects

--- a/docs/api/screen.md
+++ b/docs/api/screen.md
@@ -92,6 +92,8 @@ Returns [`Point`](structures/point.md)

 The current absolute position of the mouse pointer.

+**Note:** The return value is a DIP point, not a screen physical point.
+
 ### `screen.getPrimaryDisplay()`

 Returns [`Display`](structures/display.md) - The primary display.
--- a/docs/api/service-workers.md
+++ b/docs/api/service-workers.md
@@ -45,6 +45,16 @@ Returns:

 Emitted when a service worker logs something to the console.

+#### Event: 'registration-completed'
+
+Returns:
+
+* `event` Event
+* `details` Object - Information about the registered service worker
+  * `scope` String - The base URL that a service worker is registered for
+
+Emitted when a service worker has been registered. Can occur after a call to [`navigator.serviceWorker.register('/sw.js')`](https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerContainer/register) successfully resolves or when a Chrome extension is loaded.
+
 ### Instance Methods

 The following methods are available on instances of `ServiceWorkers`:
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -101,8 +101,8 @@ Returns:
 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:
+* 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)).

@@ -215,15 +215,15 @@ app.whenReady().then(() => {
      enableBlinkFeatures: 'Serial'
    }
  })
-  win.webContents.session.on('select-serial-port', (event, portList, callback) => {
+  win.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {
    event.preventDefault()
    const selectedPort = portList.find((device) => {
-      return device.vendorId === 0x2341 && device.productId === 0x0043
+      return device.vendorId === '9025' && device.productId === '67'
    })
    if (!selectedPort) {
      callback('')
    } else {
-      callback(result1.portId)
+      callback(selectedPort.portId)
    }
  })
 })
@@ -501,10 +501,12 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more.
    * `fullscreen` - Request for the app to enter fullscreen mode.
    * `openExternal` - Request to open links in external applications.
+    * `unknown` - An unrecognized permission request
  * `callback` Function
    * `permissionGranted` Boolean - Allow or deny the permission.
  * `details` Object - Some properties are only available on certain permission types.
    * `externalURL` String (optional) - The url of the `openExternal` request.
+    * `securityOrigin` String (optional) - The security origin of the `media` request.
    * `mediaTypes` String[] (optional) - The types of media access being requested, elements can be `video`
      or `audio`
    * `requestingUrl` String - The last URL the requesting frame loaded
@@ -512,7 +514,9 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {

 Sets the handler which can be used to respond to permission requests for the `session`.
 Calling `callback(true)` will allow the permission and `callback(false)` will reject it.
-To clear the handler, call `setPermissionRequestHandler(null)`.
+To clear the handler, call `setPermissionRequestHandler(null)`.  Please note that
+you must also implement `setPermissionCheckHandler` to get complete permission handling.
+Most web APIs do a permission check and then make a permission request if the check is denied.

 ```javascript
 const { session } = require('electron')
@@ -528,28 +532,32 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents
 #### `ses.setPermissionCheckHandler(handler)`

 * `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.
+  * `webContents` ([WebContents](web-contents.md) | null) - WebContents checking the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.  All cross origin sub frames making permission checks will pass a `null` webContents to this handler, while certain other permission checks such as `notifications` checks will always pass `null`.  You should use `embeddingOrigin` and `requestingOrigin` to determine what origin the owning frame and the requesting frame are on respectively.
  * `permission` String - Type of permission check.  Valid values are `midiSysex`, `notifications`, `geolocation`, `media`,`mediaKeySystem`,`midi`, `pointerLock`, `fullscreen`, `openExternal`, or `serial`.
  * `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.
-    * `mediaType` String - The type of media access being requested, can be `video`,
+    * `embeddingOrigin` String (optional) - The origin of the frame embedding the frame that made the permission check.  Only set for cross-origin sub frames making permission checks.
+    * `securityOrigin` String (optional) - The security origin of the `media` check.
+    * `mediaType` String (optional) - The type of media access being requested, can be `video`,
      `audio` or `unknown`
-    * `requestingUrl` String - The last URL the requesting frame loaded
+    * `requestingUrl` String (optional) - The last URL the requesting frame loaded.  This is not provided for cross-origin sub frames making permission checks.
    * `isMainFrame` Boolean - Whether the frame making the request is the main frame

 Sets the handler which can be used to respond to permission checks for the `session`.
-Returning `true` will allow the permission and `false` will reject it.
+Returning `true` will allow the permission and `false` will reject it.  Please note that
+you must also implement `setPermissionRequestHandler` to get complete permission handling.
+Most web APIs do a permission check and then make a permission request if the check is denied.
 To clear the handler, call `setPermissionCheckHandler(null)`.

 ```javascript
 const { session } = require('electron')
-session.fromPartition('some-partition').setPermissionCheckHandler((webContents, permission) => {
-  if (webContents.getURL() === 'some-host' && permission === 'notifications') {
-    return false // denied
+const url = require('url')
+session.fromPartition('some-partition').setPermissionCheckHandler((webContents, permission, requestingOrigin) => {
+  if (new URL(requestingOrigin).hostname === 'some-host' && permission === 'notifications') {
+    return true // granted
  }

-  return true
+  return false // denied
 })
 ```

@@ -815,6 +823,11 @@ Returns `Extension[]` - A list of all loaded extensions.
 **Note:** This API cannot be called before the `ready` event of the `app` module
 is emitted.

+#### `ses.getStoragePath()`
+
+A `String | null` indicating the absolute file system path where data for this
+session is persisted on disk.  For in memory sessions this returns `null`.
+
 ### Instance Properties

 The following properties are available on instances of `Session`:
@@ -828,6 +841,11 @@ code to the `setSpellCheckerLanguages` API that isn't in this array will result

 A `Boolean` indicating whether builtin spell checker is enabled.

+#### `ses.storagePath` _Readonly_
+
+A `String | null` indicating the absolute file system path where data for this
+session is persisted on disk.  For in memory sessions this returns `null`.
+
 #### `ses.cookies` _Readonly_

 A [`Cookies`](cookies.md) object for this session.
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -45,17 +45,6 @@ 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_
-
-* `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.
--- a/docs/api/structures/desktop-capturer-source.md
+++ b/docs/api/structures/desktop-capturer-source.md
@@ -3,7 +3,10 @@
 * `id` String - The identifier of a window or screen that can be used as a
  `chromeMediaSourceId` constraint when calling
  [`navigator.webkitGetUserMedia`]. The format of the identifier will be
-  `window:XX` or `screen:XX`, where `XX` is a random generated number.
+  `window:XX:YY` or `screen:ZZ:0`. XX is the windowID/handle. YY is 1 for
+  the current process, and 0 for all others. ZZ is a sequential number
+  that represents the screen, and it does not equal to the index in the
+  source's name.
 * `name` String - A screen source will be named either `Entire Screen` or
  `Screen <index>`, while the name of a window source will match the window
  title.
--- a/docs/api/structures/overlay-options.md
+++ b/docs/api/structures/overlay-options.md
@@ -0,0 +1,4 @@
+# OverlayOptions Object
+
+* `color` String (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled. Default is the system color.
+* `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.
--- a/docs/api/structures/post-body.md
+++ b/docs/api/structures/post-body.md
@@ -1,6 +1,6 @@
 # PostBody Object

-* `data` Array<[PostData](./post-data.md)> - The post data to be sent to the
+* `data` ([UploadRawData](upload-raw-data.md) | [UploadFile](upload-file.md))[] - The post data to be sent to the
  new window.
 * `contentType` String - The `content-type` header used for the data. One of
  `application/x-www-form-urlencoded` or `multipart/form-data`. Corresponds to
--- a/docs/api/structures/post-data.md
+++ b/docs/api/structures/post-data.md
@@ -1,21 +0,0 @@
-# PostData Object
-
-* `type` String - One of the following:
-  * `rawData` - The data is available as a `Buffer`, in the `rawData` field.
-  * `file` - The object represents a file. The `filePath`, `offset`, `length`
-    and `modificationTime` fields will be used to describe the file.
-  * `blob` - The object represents a `Blob`. The `blobUUID` field will be used
-    to describe the `Blob`.
-* `bytes` String (optional) - The raw bytes of the post data in a `Buffer`.
-  Required for the `rawData` type.
-* `filePath` String (optional) - The path of the file being uploaded. Required
-  for the `file` type.
-* `blobUUID` String (optional) - The `UUID` of the `Blob` being uploaded.
-  Required for the `blob` type.
-* `offset` Integer (optional) - The offset from the beginning of the file being
-  uploaded, in bytes. Only valid for `file` types.
-* `length` Integer (optional) - The length of the file being uploaded, in bytes.
-  If set to `-1`, the whole file will be uploaded. Only valid for `file` types.
-* `modificationTime` Double (optional) - The modification time of the file
-  represented by a double, which is the number of seconds since the `UNIX Epoch`
-  (Jan 1, 1970). Only valid for `file` types.
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -435,7 +435,7 @@ It will always return `granted` for `screen` and for all media types on older ve

 Returns `Promise<Boolean>` - A promise that resolves with `true` if consent was granted and `false` if it was denied. If an invalid `mediaType` is passed, the promise will be rejected. If an access request was denied and later is changed through the System Preferences pane, a restart of the app will be required for the new permissions to take effect. If access has already been requested and denied, it _must_ be changed through the preference pane; an alert will not pop up and the promise will resolve with the existing access status.

-**Important:** In order to properly leverage this API, you [must set](https://developer.apple.com/documentation/avfoundation/cameras_and_media_capture/requesting_authorization_for_media_capture_on_macos?language=objc) the `NSMicrophoneUsageDescription` and `NSCameraUsageDescription` strings in your app's `Info.plist` file. The values for these keys will be used to populate the permission dialogs so that the user will be properly informed as to the purpose of the permission request. See [Electron Application Distribution](https://electronjs.org/docs/tutorial/application-distribution#macos) for more information about how to set these in the context of Electron.
+**Important:** In order to properly leverage this API, you [must set](https://developer.apple.com/documentation/avfoundation/cameras_and_media_capture/requesting_authorization_for_media_capture_on_macos?language=objc) the `NSMicrophoneUsageDescription` and `NSCameraUsageDescription` strings in your app's `Info.plist` file. The values for these keys will be used to populate the permission dialogs so that the user will be properly informed as to the purpose of the permission request. See [Electron Application Distribution](../tutorial/application-distribution.md#macos) for more information about how to set these in the context of Electron.

 This user consent was not required until macOS 10.14 Mojave, so this method will always return `true` if your system is running 10.13 High Sierra or lower.

--- a/docs/api/touch-bar-scrubber.md
+++ b/docs/api/touch-bar-scrubber.md
@@ -14,7 +14,7 @@ Process: [Main](../glossary.md#main-process)
    * `highlightedIndex` Integer - The index of the item the user touched.
  * `selectedStyle` String (optional) - Selected item style. Can be `background`, `outline` or `none`. Defaults to `none`.
  * `overlayStyle` String (optional) - Selected overlay item style. Can be `background`, `outline` or `none`. Defaults to `none`.
-  * `showArrowButtons` Boolean (optional) - Defaults to `false`.
+  * `showArrowButtons` Boolean (optional) - Whether to show arrow buttons. Defaults to `false` and is only shown if `items` is non-empty.
  * `mode` String (optional) - Can be `fixed` or `free`. The default is `free`.
  * `continuous` Boolean (optional) - Defaults to `true`.

--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -215,29 +215,30 @@ myBrowserWindow.webContents.on('new-window', (event, url, frameName, disposition
 #### Event: 'did-create-window'

 Returns:
+
 * `window` BrowserWindow
 * `details` Object
-    * `url` String - URL for the created window.
-    * `frameName` String - Name given to the created window in the
-      `window.open()` call.
-    * `options` BrowserWindowConstructorOptions - The options used to create the
-      BrowserWindow. They are merged in increasing precedence: options inherited
-      from the parent, parsed options from the `features` string from
-      `window.open()`, and options given by
-      [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
-      Unrecognized options are not filtered out.
-    * `additionalFeatures` String[] - The non-standard features (features not
-      handled Chromium or Electron) _Deprecated_
-    * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
-      passed to the new window. May or may not result in the `Referer` header
-      being sent, depending on the referrer policy.
-    * `postBody` [PostBody](structures/post-body.md) (optional) - The post data
-      that will be sent to the new window, along with the appropriate headers
-      that will be set. If no post data is to be sent, the value will be `null`.
-      Only defined when the window is being created by a form that set
-      `target=_blank`.
-    * `disposition` String - Can be `default`, `foreground-tab`,
-      `background-tab`, `new-window`, `save-to-disk` and `other`.
+  * `url` String - URL for the created window.
+  * `frameName` String - Name given to the created window in the
+     `window.open()` call.
+  * `options` BrowserWindowConstructorOptions - The options used to create the
+    BrowserWindow. They are merged in increasing precedence: options inherited
+    from the parent, parsed options from the `features` string from
+    `window.open()`, and options given by
+    [`webContents.setWindowOpenHandler`](web-contents.md#contentssetwindowopenhandlerhandler).
+    Unrecognized options are not filtered out.
+  * `additionalFeatures` String[] - The non-standard features (features not
+    handled Chromium or Electron) _Deprecated_
+  * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
+    passed to the new window. May or may not result in the `Referer` header
+    being sent, depending on the referrer policy.
+  * `postBody` [PostBody](structures/post-body.md) (optional) - The post data
+    that will be sent to the new window, along with the appropriate headers
+    that will be set. If no post data is to be sent, the value will be `null`.
+    Only defined when the window is being created by a form that set
+    `target=_blank`.
+  * `disposition` String - Can be `default`, `foreground-tab`,
+    `background-tab`, `new-window`, `save-to-disk` and `other`.

 Emitted _after_ successful creation of a window via `window.open` in the renderer.
 Not emitted if the creation of the window is canceled from
@@ -662,8 +663,15 @@ Returns:
  * `isEditable` Boolean - Whether the context is editable.
  * `selectionText` String - Text of the selection that the context menu was
    invoked on.
-  * `titleText` String - Title or alt text of the selection that the context
-    was invoked on.
+  * `titleText` String - Title text of the selection that the context menu was
+    invoked on.
+  * `altText` String - Alt text of the selection that the context menu was
+    invoked on.
+  * `suggestedFilename` String - Suggested filename to be used when saving file through 'Save
+    Link As' option of context menu.
+  * `selectionRect` [Rectangle](structures/rectangle.md) - Rect representing the coordinates in the document space of the selection.
+  * `selectionStartOffset` Number - Start position of the selection text.
+  * `referrerPolicy` [Referrer](structures/referrer.md) - The referrer policy of the frame on which the menu is invoked.
  * `misspelledWord` String - The misspelled word under the cursor, if any.
  * `dictionarySuggestions` String[] - An array of suggested words to show the
    user to replace the `misspelledWord`.  Only available if there is a misspelled
@@ -673,8 +681,9 @@ Returns:
  * `inputFieldType` String - If the context menu was invoked on an input
    field, the type of that field. Possible values are `none`, `plainText`,
    `password`, `other`.
+  * `spellcheckEnabled` Boolean - If the context is editable, whether or not spellchecking is enabled.
  * `menuSourceType` String - Input source that invoked the context menu.
-    Can be `none`, `mouse`, `keyboard`, `touch` or `touchMenu`.
+    Can be `none`, `mouse`, `keyboard`, `touch`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`, `adjustSelection`, or `adjustSelectionReset`.
  * `mediaFlags` Object - The flags for the media element the context menu was
    invoked on.
    * `inError` Boolean - Whether the media element has crashed.
@@ -686,16 +695,22 @@ Returns:
      visible.
    * `canToggleControls` Boolean - Whether the media element's controls are
      toggleable.
+    * `canPrint` Boolean - Whether the media element can be printed.
+    * `canSave` Boolean - Whether or not the media element can be downloaded.
+    * `canShowPictureInPicture` Boolean - Whether the media element can show picture-in-picture.
+    * `isShowingPictureInPicture` Boolean - Whether the media element is currently showing picture-in-picture.
    * `canRotate` Boolean - Whether the media element can be rotated.
+    * `canLoop` Boolean - Whether the media element can be looped.
  * `editFlags` Object - These flags indicate whether the renderer believes it
    is able to perform the corresponding action.
    * `canUndo` Boolean - Whether the renderer believes it can undo.
    * `canRedo` Boolean - Whether the renderer believes it can redo.
    * `canCut` Boolean - Whether the renderer believes it can cut.
-    * `canCopy` Boolean - Whether the renderer believes it can copy
+    * `canCopy` Boolean - Whether the renderer believes it can copy.
    * `canPaste` Boolean - Whether the renderer believes it can paste.
    * `canDelete` Boolean - Whether the renderer believes it can delete.
    * `canSelectAll` Boolean - Whether the renderer believes it can select all.
+    * `canEditRichly` Boolean - Whether the renderer believes it can edit text richly.

 Emitted when there is a new context menu that needs to be handled.

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

 Returns `Promise<void>` - the promise will resolve when the page has finished loading
@@ -1189,6 +1204,15 @@ Ignore application menu shortcuts while this web contents is focused.
    * `url` String - The _resolved_ version of the URL passed to `window.open()`. e.g. opening a window with `window.open('foo')` will yield something like `https://the-origin/the/current/path/foo`.
    * `frameName` String - Name of the window provided in `window.open()`
    * `features` String - Comma separated list of window features provided to `window.open()`.
+    * `disposition` String - Can be `default`, `foreground-tab`, `background-tab`,
+      `new-window`, `save-to-disk` or `other`.
+    * `referrer` [Referrer](structures/referrer.md) - The referrer that will be
+      passed to the new window. May or may not result in the `Referer` header being
+      sent, depending on the referrer policy.
+    * `postBody` [PostBody](structures/post-body.md) (optional) - The post data that
+      will be sent to the new window, along with the appropriate headers that will
+      be set. If no post data is to be sent, the value will be `null`. Only defined
+      when the window is being created by a form that set `target=_blank`.

  Returns `{action: 'deny'} | {action: 'allow', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions}` - `deny` cancels the creation of the new
  window. `allow` will allow the new window to be created. Specifying `overrideBrowserWindowOptions` allows customization of the created window.
@@ -1368,19 +1392,21 @@ Captures a snapshot of the page within `rect`. Omitting `rect` will capture the
 Returns `Boolean` - Whether this page is being captured. It returns true when the capturer count
 is large then 0.

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

 * `size` [Size](structures/size.md) (optional) - The preferred size for the capturer.
 * `stayHidden` Boolean (optional) -  Keep the page hidden instead of visible.
+* `stayAwake` Boolean (optional) -  Keep the system awake instead of allowing it to sleep.

 Increase the capturer count by one. The page is considered visible when its browser window is
 hidden and the capturer count is non-zero. If you would like the page to stay hidden, you should ensure that `stayHidden` is set to true.

 This also affects the Page Visibility API.

-#### `contents.decrementCapturerCount([stayHidden])`
+#### `contents.decrementCapturerCount([stayHidden, stayAwake])`

 * `stayHidden` Boolean (optional) -  Keep the page in hidden state instead of visible.
+* `stayAwake` Boolean (optional) -  Keep the system awake instead of allowing it to sleep.

 Decrease the capturer count by one. The page will be set to hidden or occluded state when its
 browser window is hidden or occluded and the capturer count reaches zero. If you want to
@@ -1487,7 +1513,7 @@ By default, an empty `options` will be regarded as:
 }
 ```

-Use `page-break-before: always; ` CSS style to force to print to a new page.
+Use `page-break-before: always;` CSS style to force to print to a new page.

 An example of `webContents.printToPDF`:

--- a/docs/api/web-frame.md
+++ b/docs/api/web-frame.md
@@ -62,6 +62,11 @@ Sets the maximum and minimum pinch-to-zoom level.
 > webFrame.setVisualZoomLevelLimits(1, 3)
 > ```

+> **NOTE**: Visual zoom only applies to pinch-to-zoom behavior. Cmd+/-/0 zoom shortcuts are
+> controlled by the 'zoomIn', 'zoomOut', and 'resetZoom' MenuItem roles in the application
+> Menu. To disable shortcuts, manually [define the Menu](./menu.md#examples) and omit zoom roles
+> from the definition.
+
 ### `webFrame.setSpellCheckProvider(language, provider)`

 * `language` String
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -151,12 +151,16 @@ browser plugins. Plugins are disabled by default.
 ### `preload`

 ```html
+<!-- from a file -->
 <webview src="https://www.github.com/" preload="./test.js"></webview>
+<!-- or if you want to load from an asar archive -->
+<webview src="https://www.github.com/" preload="./app.asar/test.js"></webview>
 ```

 A `String` that specifies a script that will be loaded before other scripts run in the guest
-page. The protocol of script's URL must be either `file:` or `asar:`, because it
-will be loaded by `require` in guest page under the hood.
+page. The protocol of script's URL must be `file:` (even when using `asar:` archives) because
+it will be loaded by Node's `require` under the hood, which treats `asar:` archives as virtual
+directories.

 When the guest page doesn't have node integration this script will still have
 access to all Node APIs, but global objects injected by Node will be deleted
@@ -274,7 +278,7 @@ webview.addEventListener('dom-ready', () => {
  * `httpReferrer` (String | [Referrer](structures/referrer.md)) (optional) - An HTTP Referrer url.
  * `userAgent` String (optional) - A user agent originating the request.
  * `extraHeaders` String (optional) - Extra headers separated by "\n"
-  * `postData` ([UploadRawData[]](structures/upload-raw-data.md) | [UploadFile[]](structures/upload-file.md)) (optional)
+  * `postData` ([UploadRawData](structures/upload-raw-data.md) | [UploadFile](structures/upload-file.md))[] (optional)
  * `baseURLForDataURL` String (optional) - Base url (with trailing path separator) for files to be loaded by the data url. This is needed only if the specified `url` is a data url and needs to load other files.

 Returns `Promise<void>` - The promise will resolve when the page has finished loading
@@ -1000,3 +1004,78 @@ Emitted when DevTools is focused / opened.

 [runtime-enabled-features]: https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/runtime_enabled_features.json5?l=70
 [chrome-webview]: https://developer.chrome.com/docs/extensions/reference/webviewTag/
+
+### Event: 'context-menu'
+
+Returns:
+
+* `params` Object
+  * `x` Integer - x coordinate.
+  * `y` Integer - y coordinate.
+  * `linkURL` String - URL of the link that encloses the node the context menu
+    was invoked on.
+  * `linkText` String - Text associated with the link. May be an empty
+    string if the contents of the link are an image.
+  * `pageURL` String - URL of the top level page that the context menu was
+    invoked on.
+  * `frameURL` String - URL of the subframe that the context menu was invoked
+    on.
+  * `srcURL` String - Source URL for the element that the context menu
+    was invoked on. Elements with source URLs are images, audio and video.
+  * `mediaType` String - Type of the node the context menu was invoked on. Can
+    be `none`, `image`, `audio`, `video`, `canvas`, `file` or `plugin`.
+  * `hasImageContents` Boolean - Whether the context menu was invoked on an image
+    which has non-empty contents.
+  * `isEditable` Boolean - Whether the context is editable.
+  * `selectionText` String - Text of the selection that the context menu was
+    invoked on.
+  * `titleText` String - Title text of the selection that the context menu was
+    invoked on.
+  * `altText` String - Alt text of the selection that the context menu was
+    invoked on.
+  * `suggestedFilename` String - Suggested filename to be used when saving file through 'Save
+    Link As' option of context menu.
+  * `selectionRect` [Rectangle](structures/rectangle.md) - Rect representing the coordinates in the document space of the selection.
+  * `selectionStartOffset` Number - Start position of the selection text.
+  * `referrerPolicy` [Referrer](structures/referrer.md) - The referrer policy of the frame on which the menu is invoked.
+  * `misspelledWord` String - The misspelled word under the cursor, if any.
+  * `dictionarySuggestions` String[] - An array of suggested words to show the
+    user to replace the `misspelledWord`.  Only available if there is a misspelled
+    word and spellchecker is enabled.
+  * `frameCharset` String - The character encoding of the frame on which the
+    menu was invoked.
+  * `inputFieldType` String - If the context menu was invoked on an input
+    field, the type of that field. Possible values are `none`, `plainText`,
+    `password`, `other`.
+  * `spellcheckEnabled` Boolean - If the context is editable, whether or not spellchecking is enabled.
+  * `menuSourceType` String - Input source that invoked the context menu.
+    Can be `none`, `mouse`, `keyboard`, `touch`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`, `adjustSelection`, or `adjustSelectionReset`.
+  * `mediaFlags` Object - The flags for the media element the context menu was
+    invoked on.
+    * `inError` Boolean - Whether the media element has crashed.
+    * `isPaused` Boolean - Whether the media element is paused.
+    * `isMuted` Boolean - Whether the media element is muted.
+    * `hasAudio` Boolean - Whether the media element has audio.
+    * `isLooping` Boolean - Whether the media element is looping.
+    * `isControlsVisible` Boolean - Whether the media element's controls are
+      visible.
+    * `canToggleControls` Boolean - Whether the media element's controls are
+      toggleable.
+    * `canPrint` Boolean - Whether the media element can be printed.
+    * `canSave` Boolean - Whether or not the media element can be downloaded.
+    * `canShowPictureInPicture` Boolean - Whether the media element can show picture-in-picture.
+    * `isShowingPictureInPicture` Boolean - Whether the media element is currently showing picture-in-picture.
+    * `canRotate` Boolean - Whether the media element can be rotated.
+    * `canLoop` Boolean - Whether the media element can be looped.
+  * `editFlags` Object - These flags indicate whether the renderer believes it
+    is able to perform the corresponding action.
+    * `canUndo` Boolean - Whether the renderer believes it can undo.
+    * `canRedo` Boolean - Whether the renderer believes it can redo.
+    * `canCut` Boolean - Whether the renderer believes it can cut.
+    * `canCopy` Boolean - Whether the renderer believes it can copy.
+    * `canPaste` Boolean - Whether the renderer believes it can paste.
+    * `canDelete` Boolean - Whether the renderer believes it can delete.
+    * `canSelectAll` Boolean - Whether the renderer believes it can select all.
+    * `canEditRichly` Boolean - Whether the renderer believes it can edit text richly.
+
+Emitted when there is a new context menu that needs to be handled.
--- a/docs/api/window-open.md
+++ b/docs/api/window-open.md
@@ -3,8 +3,8 @@
 There are several ways to control how windows are created from trusted or
 untrusted content within a renderer. Windows can be created from the renderer in two ways:

- clicking on links or submitting forms adorned with `target=_blank`
- JavaScript calling `window.open()`
+* clicking on links or submitting forms adorned with `target=_blank`
+* JavaScript calling `window.open()`

 In non-sandboxed renderers, or when `nativeWindowOpen` is false (the default), this results in the creation of a
 [`BrowserWindowProxy`](browser-window-proxy.md), a light wrapper around
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -136,6 +136,22 @@ systemPreferences.isHighContrastColorScheme()
 nativeTheme.shouldUseHighContrastColors
 ```

+### Deprecated: WebContents `new-window` event
+
+The `new-window` event of WebContents has been deprecated. It is replaced by [`webContents.setWindowOpenHandler()`](api/web-contents.md#contentssetwindowopenhandlerhandler).
+
+```js
+// Deprecated in Electron 13
+webContents.on('new-window', (event) => {
+  event.preventDefault()
+})
+
+// Replace with
+webContents.setWindowOpenHandler((details) => {
+  return { action: 'deny' }
+})
+```
+
 ## Planned Breaking API Changes (12.0)

 ### Removed: Pepper Flash support
--- a/docs/fiddles/native-ui/tray/index.html
+++ b/docs/fiddles/native-ui/tray/index.html
@@ -16,91 +16,12 @@
      <p>
        Open the
        <a href="https://electronjs.org/docs/api/tray">
-          full API documentation (opens in new window)
+          full API documentation
        </a>
        in your browser.
      </p>
    </div>
-
-    <div>
      <div>
-        <div>
-          <div>
-            <button id="put-in-tray">View Demo</button>
-            <span id="tray-countdown"></span>
-          </div>
-          <p>
-            The demo button sends a message to the main process using the
-            <code>ipc</code> module. In the main process the app is told to
-            place an icon, with a context menu, in the tray.
-          </p>
-
-          <p>
-            In this example the tray icon can be removed by clicking 'Remove' in
-            the context menu or selecting the demo button again.
-          </p>
-          <h5>Main Process</h5>
-          <pre>
-              <code>
-const path = require('path')
-const {ipcMain, app, Menu, Tray} = require('electron')
-
-let appIcon = null
-
-ipcMain.on('put-in-tray', (event) => {
-  const iconName = process.platform === 'win32' ? 'windows-icon.png' : 'iconTemplate.png'
-  const iconPath = path.join(__dirname, iconName)
-  appIcon = new Tray(iconPath)
-
-  const contextMenu = Menu.buildFromTemplate([{
-    label: 'Remove',
-    click: () => {
-      event.sender.send('tray-removed')
-    }
-  }])
-
-  appIcon.setToolTip('Electron Demo in the tray.')
-  appIcon.setContextMenu(contextMenu)
-})
-
-ipcMain.on('remove-tray', () => {
-  appIcon.destroy()
-})
-
-app.on('window-all-closed', () => {
-  if (appIcon) appIcon.destroy()
-})
-              </code>
-            </pre>
-          <h5>Renderer Process</h5>
-          <pre>
-              <code>
-const ipc = require('electron').ipcRenderer
-
-const trayBtn = document.getElementById('put-in-tray')
-let trayOn = false
-
-trayBtn.addEventListener('click', function (event) {
-  if (trayOn) {
-    trayOn = false
-    document.getElementById('tray-countdown').innerHTML = ''
-    ipc.send('remove-tray')
-  } else {
-    trayOn = true
-    const message = 'Click demo again to remove.'
-    document.getElementById('tray-countdown').innerHTML = message
-    ipc.send('put-in-tray')
-  }
-})
-// Tray removed from context menu on icon
-ipc.on('tray-removed', function () {
-  ipc.send('remove-tray')
-  trayOn = false
-  document.getElementById('tray-countdown').innerHTML = ''
-})                  
-              </code>
-            </pre>
-
          <div>
            <h2>ProTip</h2>
            <strong>Tray support in Linux.</strong>
@@ -109,7 +30,7 @@ ipc.on('tray-removed', function () {
              will need to install <code>libappindicator1</code> to make the
              tray icon work. See the
              <a href="https://electronjs.org/docs/api/tray">
-                full API documentation (opens in new window)
+                full API documentation
              </a>
              for more details about using Tray on Linux.
            </p>
--- a/docs/fiddles/native-ui/tray/main.js
+++ b/docs/fiddles/native-ui/tray/main.js
--- a/docs/fiddles/native-ui/tray/renderer.js
+++ b/docs/fiddles/native-ui/tray/renderer.js
@@ -1,35 +0,0 @@
-const { ipcRenderer, shell } = require('electron')
-
-const trayBtn = document.getElementById('put-in-tray')
-const links = document.querySelectorAll('a[href]')
-
-let trayOn = false
-
-trayBtn.addEventListener('click', function (event) {
-  if (trayOn) {
-    trayOn = false
-    document.getElementById('tray-countdown').innerHTML = ''
-    ipcRenderer.send('remove-tray')
-  } else {
-    trayOn = true
-    const message = 'Click demo again to remove.'
-    document.getElementById('tray-countdown').innerHTML = message
-    ipcRenderer.send('put-in-tray')
-  }
-})
-// Tray removed from context menu on icon
-ipcRenderer.on('tray-removed', function () {
-  ipcRenderer.send('remove-tray')
-  trayOn = false
-  document.getElementById('tray-countdown').innerHTML = ''
-})
-
-Array.prototype.forEach.call(links, (link) => {
-  const url = link.getAttribute('href')
-  if (url.indexOf('http') === 0) {
-    link.addEventListener('click', (e) => {
-      e.preventDefault()
-      shell.openExternal(url)
-    })
-  }
-})
--- a/docs/tutorial/code-signing.md
+++ b/docs/tutorial/code-signing.md
@@ -88,14 +88,15 @@ without meaning any harm:
  <dict>
    <key>com.apple.security.cs.allow-jit</key>
    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
    <key>com.apple.security.cs.debugger</key>
    <true/>
  </dict>
 </plist>
 ```

+Note that up until Electron 12, the `com.apple.security.cs.allow-unsigned-executable-memory` entitlement was required
+as well. However, it should not be used anymore if it can be avoided.
+
 To see all of this in action, check out Electron Fiddle's source code,
 [especially its `electron-forge` configuration
 file](https://github.com/electron/fiddle/blob/master/forge.config.js).
@@ -133,7 +134,7 @@ are likely using [`electron-packager`], which includes [`electron-osx-sign`] and

 If you're using Packager's API, you can pass [in configuration that both signs
 and notarizes your
-application](https://electron.github.io/electron-packager/master/interfaces/electronpackager.options.html).
+application](https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html).

 ```js
 const packager = require('electron-packager')
@@ -165,14 +166,15 @@ without meaning any harm:
  <dict>
    <key>com.apple.security.cs.allow-jit</key>
    <true/>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
-    <true/>
    <key>com.apple.security.cs.debugger</key>
    <true/>
  </dict>
 </plist>
 ```

+Up until Electron 12, the `com.apple.security.cs.allow-unsigned-executable-memory` entitlement was required
+as well. However, it should not be used anymore if it can be avoided.
+
 ## Mac App Store

 See the [Mac App Store Guide].
--- a/docs/tutorial/dark-mode.md
+++ b/docs/tutorial/dark-mode.md
@@ -200,6 +200,6 @@ Run the example using Electron Fiddle and then click the "Toggle Dark Mode" butt
 [system-wide-dark-mode]: https://developer.apple.com/design/human-interface-guidelines/macos/visual-design/dark-mode/
 [electron-forge]: https://www.electronforge.io/
 [electron-packager]: https://github.com/electron/electron-packager
-[packager-darwindarkmode-api]: https://electron.github.io/electron-packager/master/interfaces/electronpackager.options.html#darwindarkmodesupport
+[packager-darwindarkmode-api]: https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html#darwindarkmodesupport
 [prefers-color-scheme]: https://developer.mozilla.org/en-US/docs/Web/CSS/@media/prefers-color-scheme
 [event-listeners]: https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
--- a/docs/tutorial/desktop-environment-integration.md
+++ b/docs/tutorial/desktop-environment-integration.md
@@ -1,35 +0,0 @@
-# Desktop Environment Integration
-
-Different operating systems provide different features for integrating desktop
-applications into their desktop environments. For example, on Windows,
-applications can put shortcuts in the JumpList of task bar, and on Mac,
-applications can put a custom menu in the dock menu.
-
-This guide explains how to integrate your application into those desktop
-environments with Electron APIs.
-
-## Notifications
-
-See the [Notifications documentation](notifications.md).
-
-## Recent Documents
-
-See [Recent Documents documentation](recent-documents.md).
-
-## Progress Bar
-
-See the [Progress Bar documentation](progress-bar.md).
-
-## Unity Launcher
-
-See the [Unity Launcher documentation][unity-launcher].
-
-## Represented File for macOS Window
-
-See the [Represented File documentation](represented-file.md).
-
-## Dragging files out of the window
-
-See the [Native File Drag & Drop documentation](native-file-drag-drop.md).
-
-[unity-launcher]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles#Adding_shortcuts_to_a_launcher
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -1,22 +1,27 @@
 # Electron Release Timelines

+Special notes:
+
 * The `-beta.1` and `stable` dates are our solid release dates.
 * We strive for weekly beta releases, however we often release more betas than scheduled.
 * All dates are our goals but there may be reasons for adjusting the stable deadline, such as security bugs.
 * Take a look at the [5.0.0 Timeline blog post](https://electronjs.org/blog/electron-5-0-timeline) for info about publicizing our release dates.
 * Since Electron 6.0, we've been targeting every other Chromium version and releasing our stable on the same day as Chrome stable. You can reference Chromium's release schedule [here](https://chromiumdash.appspot.com/schedule). See [Electron's new release cadence blog post](https://www.electronjs.org/blog/12-week-cadence) for more details on our release schedule.
+* Electron 15.0 only will include a special Alpha release. Starting in Electron 16.0, we will release on an 8-week cadence. See [Electron's new 8-week cadence blog post](https://www.electronjs.org/blog/8-week-cadence) for more details.

-| Version | -beta.1 | Stable | Chrome | Node |
-| ------- | ------- | ------ | ------ | ---- |
-| 2.0.0 | 2018-02-21 | 2018-05-01 | M61 | v8.9 |
-| 3.0.0 | 2018-06-21 | 2018-09-18 | M66 | v10.2 |
-| 4.0.0 | 2018-10-11 | 2018-12-20 | M69 | v10.11 |
-| 5.0.0 | 2019-01-22 | 2019-04-24 | M73 | v12.0 |
-| 6.0.0 | 2019-05-01 | 2019-07-30 | M76 | v12.4 |
-| 7.0.0 | 2019-08-01 | 2019-10-22 | M78 | v12.8 |
-| 8.0.0 | 2019-10-24 | 2020-02-04 | M80 | v12.13 |
-| 9.0.0 | 2020-02-06 | 2020-05-19 | M83 | v12.14 |
-| 10.0.0 | 2020-05-21 | 2020-08-25 | M85 | v12.16 |
-| 11.0.0 | 2020-08-27 | 2020-11-17 | M87 | v12.18 |
-| 12.0.0 | 2020-11-19 | 2021-03-02 | M89 | v14.16 |
-| 13.0.0 | 2021-03-04 | 2021-05-25 | M91 | v14.x |
+| Electron | Alpha | Beta | Stable | Chrome | Node |
+| ------- | ----- | ------- | ------ | ------ | ---- |
+| 2.0.0 | -- | 2018-Feb-21 | 2018-May-01 | M61 | v8.9 |
+| 3.0.0 | -- | 2018-Jun-21 | 2018-Sep-18 | M66 | v10.2 |
+| 4.0.0 | -- | 2018-Oct-11 | 2018-Dec-20 | M69 | v10.11 |
+| 5.0.0 | -- | 2019-Jan-22 | 2019-Apr-24 | M73 | v12.0 |
+| 6.0.0 | -- | 2019-May-01 | 2019-Jul-30 | M76 | v12.4 |
+| 7.0.0 | -- | 2019-Aug-01 | 2019-Oct-22 | M78 | v12.8 |
+| 8.0.0 | -- | 2019-Oct-24 | 2020-Feb-04 | M80 | v12.13 |
+| 9.0.0 | -- | 2020-Feb-06 | 2020-May-19 | M83 | v12.14 |
+| 10.0.0 | -- | 2020-May-21 | 2020-Aug-25 | M85 | v12.16 |
+| 11.0.0 | -- | 2020-Aug-27 | 2020-Nov-17 | M87 | v12.18 |
+| 12.0.0 | -- | 2020-Nov-19 | 2021-Mar-02 | M89 | v14.16 |
+| 13.0.0 | -- | 2021-Mar-04 | 2021-May-25 | M91 | v14.16 |
+| 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | TBD |
+| 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | TBD |
--- a/docs/tutorial/fuses.md
+++ b/docs/tutorial/fuses.md
@@ -51,4 +51,4 @@ Somewhere in the Electron binary there will be a sequence of bytes that look lik

 To flip a fuse you find its position in the fuse wire and change it to "0" or "1" depending on the state you'd like.

-You can view the current schema [here](https://github.com/electron/electron/blob/master/build/fuses/fuses.json).
+You can view the current schema [here](https://github.com/electron/electron/blob/master/build/fuses/fuses.json5).
--- a/docs/tutorial/in-app-purchases.md
+++ b/docs/tutorial/in-app-purchases.md
@@ -1,4 +1,4 @@
-# In-App Purchase (macOS)
+# In-App Purchases (macOS)

 ## Preparing

--- a/docs/tutorial/installation.md
+++ b/docs/tutorial/installation.md
@@ -1,4 +1,4 @@
-# Installation
+# Advanced Installation Instructions

 To install prebuilt Electron binaries, use [`npm`][npm].
 The preferred method is to install Electron as a development dependency in your
@@ -135,14 +135,18 @@ a text file. A typical cache might look like this:

 ## Skip binary download

-When installing the `electron` NPM package, it automatically downloads the electron binary.
+Under the hood, Electron's JavaScript API binds to a binary that contains its
+implementations. Because this binary is crucial to the function of any Electron app,
+it is downloaded by default in the `postinstall` step every time you install `electron`
+from the npm registry.

-This can sometimes be unnecessary, e.g. in a CI environment, when testing another component.
+However, if you want to install your project's dependencies but don't need to use
+Electron functionality, you can set the `ELECTRON_SKIP_BINARY_DOWNLOAD` environment
+variable to prevent the binary from being downloaded. For instance, this feature can
+be useful in continuous integration environments when running unit tests that mock
+out the `electron` module.

-To prevent the binary from being downloaded when you install all npm dependencies you can set the environment variable `ELECTRON_SKIP_BINARY_DOWNLOAD`.
-E.g.:
-
-```sh
+```sh npm2yarn
 ELECTRON_SKIP_BINARY_DOWNLOAD=1 npm install
 ```

--- a/docs/tutorial/launch-app-from-url-in-another-app.md
+++ b/docs/tutorial/launch-app-from-url-in-another-app.md
@@ -127,31 +127,25 @@ can add the flag `--extend-info` with a path to the `plist` you've created. The
 ### Plist

 ```XML
-  <p>
-  <h5>macOS plist</h5>
-  <pre><code>
-    <?xml version="1.0" encoding="UTF-8"?>
-        <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-            <plist version="1.0">
-                <dict>
-                    <key>CFBundleURLTypes</key>
-                    <array>
-                        <dict>
-                            <key>CFBundleURLSchemes</key>
-                            <array>
-                                <string>electron-api-demos</string>
-                            </array>
-                            <key>CFBundleURLName</key>
-                            <string>Electron API Demos Protocol</string>
-                        </dict>
-                    </array>
-                    <key>ElectronTeamID</key>
-                    <string>VEKTX9H2N7</string>
-                </dict>
-            </plist>
-        </code>
-    </pre>
-  <p>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>CFBundleURLTypes</key>
+        <array>
+            <dict>
+                <key>CFBundleURLSchemes</key>
+                <array>
+                    <string>electron-api-demos</string>
+                </array>
+                <key>CFBundleURLName</key>
+                <string>Electron API Demos Protocol</string>
+            </dict>
+        </array>
+        <key>ElectronTeamID</key>
+        <string>VEKTX9H2N7</string>
+    </dict>
+</plist>
 ```

 ## Conclusion
--- a/docs/tutorial/linux-desktop-actions.md
+++ b/docs/tutorial/linux-desktop-actions.md
@@ -1,4 +1,4 @@
-# Custom Linux Desktop Launcher Actions
+# Desktop Launcher Actions (Linux)

 ## Overview

--- a/docs/tutorial/macos-dock.md
+++ b/docs/tutorial/macos-dock.md
@@ -1,4 +1,4 @@
-# Configuring the macOS Dock
+# Dock (macOS)

 Electron has APIs to configure the app's icon in the macOS Dock. A macOS-only
 API exists to create a custom dock menu, but Electron also uses the app dock
--- a/docs/tutorial/notifications.md
+++ b/docs/tutorial/notifications.md
@@ -1,4 +1,4 @@
-# Notifications (Windows, Linux, macOS)
+# Notifications

 ## Overview

--- a/docs/tutorial/process-model.md
+++ b/docs/tutorial/process-model.md
@@ -135,10 +135,10 @@ way to import Electron's content scripts.

 ## Preload scripts

-<!-- Note: This guide doesn't take sandboxing into account, which might fundamentally
+<!-- Note: This guide doesn't take sandboxing into account, which might fundamentally 
 change the statements here. -->
 Preload scripts contain code that executes in a renderer process before its web content
-begins loading. These scripts runs within the renderer context, but are granted more
+begins loading. These scripts run within the renderer context, but are granted more
 privileges by having access to Node.js APIs.

 A preload script can be attached to the main process in the `BrowserWindow` constructor's
@@ -148,7 +148,9 @@ A preload script can be attached to the main process in the `BrowserWindow` cons
 const { BrowserWindow } = require('electron')
 //...
 const win = new BrowserWindow({
-  preload: 'path/to/preload.js'
+  webPreferences: {
+    preload: 'path/to/preload.js'
+  }
 })
 //...
 ```
--- a/docs/tutorial/progress-bar.md
+++ b/docs/tutorial/progress-bar.md
@@ -1,4 +1,4 @@
-# Progress Bar in Taskbar (Windows, macOS, Unity)
+# Taskbar Progress Bar (Windows & macOS)

 ## Overview

--- a/docs/tutorial/represented-file.md
+++ b/docs/tutorial/represented-file.md
@@ -1,4 +1,4 @@
-# Represented File for macOS BrowserWindows
+# Representing Files in a BrowserWindow (macOS)

 ## Overview

--- a/docs/tutorial/snapcraft.md
+++ b/docs/tutorial/snapcraft.md
@@ -1,4 +1,4 @@
-# Snapcraft Guide (Ubuntu Software Center & More)
+# Snapcraft Guide (Linux)

 This guide provides information on how to package your Electron application
 for any Snapcraft environment, including the Ubuntu Software Center.
--- a/docs/tutorial/support.md
+++ b/docs/tutorial/support.md
@@ -16,7 +16,6 @@ you can interact with the community in these locations:
  * Sharing ideas with other Electron app developers
  * And more!
 * [`electron`](https://discuss.atom.io/c/electron) category on the Atom forums
-* `#atom-shell` channel on Freenode
 * `#electron` channel on [Atom's Slack](https://discuss.atom.io/t/join-us-on-slack/16638?source_topic_id=25406)
 * [`electron-ru`](https://telegram.me/electron_ru) *(Russian)*
 * [`electron-br`](https://electron-br.slack.com) *(Brazilian Portuguese)*
@@ -38,6 +37,13 @@ tools and resources.

 ## Supported Versions

+_**Note:** Beginning in September 2021 with Electron 15, the Electron team
+will temporarily support the latest **four** stable major versions. This
+extended support is intended to help Electron developers transition to
+the [new eight week release cadence](https://electronjs.org/blog/8-week-cadence), and will continue until May 2022, with
+the release of Electron 19. At that time, the Electron team will drop support
+back to the latest three stable major versions._
+
 The latest three *stable* major versions are supported by the Electron team.
 For example, if the latest release is 6.1.x, then the 5.0.x as well
 as the 4.2.x series are supported.  We only support the latest minor release
@@ -64,9 +70,9 @@ until the maintainers feel the maintenance burden is too high to continue doing

 ### Currently supported versions

+* 13.x.y
 * 12.x.y
 * 11.x.y
-* 10.x.y

 ### End-of-life

--- a/docs/tutorial/tray.md
+++ b/docs/tutorial/tray.md
@@ -0,0 +1,83 @@
+---
+title: Tray
+description: This guide will take you through the process of creating
+  a Tray icon with its own context menu to the system's notification area.
+slug: tray
+hide_title: true
+---
+
+# Tray
+
+## Overview
+
+<!-- ✍ Update this section if you want to provide more details -->
+
+This guide will take you through the process of creating a
+[Tray](https://www.electronjs.org/docs/api/tray) icon with
+its own context menu to the system's notification area.
+
+On MacOS and Ubuntu, the Tray will be located on the top
+right corner of your screen, adjacent to your battery and wifi icons.
+On Windows, the Tray will usually be located in the bottom right corner.
+
+## Example
+
+### main.js
+
+First we must import `app`, `Tray`, `Menu`, `nativeImage` from `electron`.
+
+```js
+const { app, Tray, Menu, nativeImage } = require('electron')
+```
+
+Next we will create our Tray. To do this, we will use a
+[`NativeImage`](https://www.electronjs.org/docs/api/native-image) icon,
+which can be created through any one of these
+[methods](https://www.electronjs.org/docs/api/native-image#methods).
+Note that we wrap our Tray creation code within an
+[`app.whenReady`](https://www.electronjs.org/docs/api/app#appwhenready)
+as we will need to wait for our electron app to finish initializing.
+
+```js title='main.js'
+let tray
+
+app.whenReady().then(() => {
+  const icon = nativeImage.createFromPath('path/to/asset.png')
+  tray = new Tray(icon)
+
+  // note: your contextMenu, Tooltip and Title code will go here!
+})
+```
+
+Great! Now we can start attaching a context menu to our Tray, like so:
+
+```js
+const contextMenu = Menu.buildFromTemplate([
+  { label: 'Item1', type: 'radio' },
+  { label: 'Item2', type: 'radio' },
+  { label: 'Item3', type: 'radio', checked: true },
+  { label: 'Item4', type: 'radio' }
+])
+
+tray.setContextMenu(contextMenu)
+```
+
+The code above will create 4 separate radio-type items in the context menu.
+To read more about constructing native menus, click
+[here](https://www.electronjs.org/docs/api/menu#menubuildfromtemplatetemplate).
+
+Finally, let's give our tray a tooltip and a title.
+
+```js
+tray.setToolTip('This is my application')
+tray.setTitle('This is my title')
+```
+
+## Conclusion
+
+After you start your electron app, you should see the Tray residing
+in either the top or bottom right of your screen, depending on your
+operating system.
+
+```fiddle docs/fiddles/native-ui/tray
+```
--- a/docs/tutorial/updates.md
+++ b/docs/tutorial/updates.md
@@ -49,7 +49,7 @@ update server.
 Depending on your needs, you can choose from one of these:

 - [Hazel][hazel] – Update server for private or open-source apps which can be
-deployed for free on [Now][now]. It pulls from [GitHub Releases][gh-releases]
+deployed for free on [Vercel][vercel]. It pulls from [GitHub Releases][gh-releases]
 and leverages the power of GitHub's CDN.
 - [Nuts][nuts] – Also uses [GitHub Releases][gh-releases], but caches app
 updates on disk and supports private repositories.
@@ -64,7 +64,7 @@ to minify server cost.
 Once you've deployed your update server, continue with importing the required
 modules in your code. The following code might vary for different server
 software, but it works like described when using
-[Hazel](https://github.com/zeit/hazel).
+[Hazel][hazel].

 **Important:** Please ensure that the code below will only be executed in
 your packaged app, and not in development. You can use
@@ -136,8 +136,8 @@ autoUpdater.on('error', message => {

 Because the requests made by Auto Update aren't under your direct control, you may find situations that are difficult to handle (such as if the update server is behind authentication). The `url` field does support files, which means that with some effort, you can sidestep the server-communication aspect of the process. [Here's an example of how this could work](https://github.com/electron/electron/issues/5020#issuecomment-477636990).

-[now]: https://zeit.co/now
-[hazel]: https://github.com/zeit/hazel
+[vercel]: https://vercel.com
+[hazel]: https://github.com/vercel/hazel
 [nuts]: https://github.com/GitbookIO/nuts
 [gh-releases]: https://help.github.com/articles/creating-releases/
 [electron-release-server]: https://github.com/ArekSredzki/electron-release-server
--- a/docs/tutorial/using-native-node-modules.md
+++ b/docs/tutorial/using-native-node-modules.md
@@ -1,4 +1,4 @@
-# Using Native Node Modules
+# Native Node Modules

 Native Node.js modules are supported by Electron, but since Electron has a different
 [application binary interface (ABI)][abi] from a given Node.js binary (due to
--- a/docs/tutorial/using-pepper-flash-plugin.md
+++ b/docs/tutorial/using-pepper-flash-plugin.md
@@ -1,4 +1,4 @@
-# Using Pepper Flash Plugin
+# Pepper Flash Plugin

 Electron no longer supports the Pepper Flash plugin, as Chrome has removed support.

--- a/docs/tutorial/using-selenium-and-webdriver.md
+++ b/docs/tutorial/using-selenium-and-webdriver.md
@@ -1,4 +1,4 @@
-# Using Selenium and WebDriver
+# Selenium and WebDriver

 From [ChromeDriver - WebDriver for Chrome][chrome-driver]:

--- a/docs/tutorial/web-embeds.md
+++ b/docs/tutorial/web-embeds.md
@@ -1,4 +1,4 @@
-# Web embeds
+# Web Embeds

 ## Overview

--- a/docs/tutorial/windows-arm.md
+++ b/docs/tutorial/windows-arm.md
@@ -1,4 +1,4 @@
-# Windows 10 on Arm
+# Windows on ARM

 If your app runs with Electron 6.0.8 or later, you can now build it for Windows 10 on Arm. This considerably improves performance, but requires recompilation of any native modules used in your app. It may also require small fixups to your build and packaging scripts.

--- a/docs/tutorial/windows-taskbar.md
+++ b/docs/tutorial/windows-taskbar.md
@@ -1,4 +1,4 @@
-# Windows Taskbar
+# Taskbar Customization (Windows)

 ## Overview

--- a/electron_paks.gni
+++ b/electron_paks.gni
@@ -73,7 +73,7 @@ template("electron_extra_paks") {
      "//components/resources",
      "//content:content_resources",
      "//content:dev_ui_content_resources",
-      "//content/browser/resources/media:media_internals_resources",
+      "//content/browser/resources/media:resources",
      "//content/browser/tracing:resources",
      "//content/browser/webrtc/resources",
      "//electron:resources",
@@ -98,12 +98,11 @@ template("electron_extra_paks") {
    deps += [ "//content/browser/devtools:devtools_resources" ]
    if (enable_pdf_viewer) {
      sources += [ "$root_gen_dir/chrome/pdf_resources.pak" ]
-      deps += [ "//chrome/browser/resources/pdf:pdf_resources" ]
+      deps += [ "//chrome/browser/resources/pdf:resources" ]
    }
    if (enable_print_preview) {
      sources += [ "$root_gen_dir/chrome/print_preview_resources.pak" ]
-      deps +=
-          [ "//chrome/browser/resources/print_preview:print_preview_resources" ]
+      deps += [ "//chrome/browser/resources/print_preview:resources" ]
    }
    if (enable_electron_extensions) {
      sources += [
--- a/electron_strings.grdp
+++ b/electron_strings.grdp
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <grit-part>
+  <!-- Windows Caption Buttons -->
+  <message name="IDS_APP_ACCNAME_CLOSE" desc="The accessible name for the Close button.">
+    Close
+  </message>
+  <message name="IDS_APP_ACCNAME_MINIMIZE" desc="The accessible name for the Minimize button.">
+    Minimize
+  </message>
+  <message name="IDS_APP_ACCNAME_MAXIMIZE" desc="The accessible name for the Maximize button.">
+    Maximize
+  </message>
+  <message name="IDS_APP_ACCNAME_RESTORE" desc="The accessible name for the Restore button.">
+    Restore
+  </message>
+
  <!-- Printing Service -->
  <message name="IDS_UTILITY_PROCESS_PRINTING_SERVICE_NAME" desc="The name of the utility process used for printing conversions.">
    Printing Service
@@ -51,6 +65,21 @@
  <message name="IDS_PICTURE_IN_PICTURE_SKIP_AD_CONTROL_TEXT" desc="Text label of the skip ad control button. The button appears when the user hovers over the Picture-in-Picture window.">
    Skip Ad
  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_MUTE_MICROPHONE_TEXT" desc="Text label of the mute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Mute microphone
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_UNMUTE_MICROPHONE_TEXT" desc="Text label of the unmute microphone control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Unmute microphone
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_TURN_ON_CAMERA_TEXT" desc="Text label of the turn on camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Turn on camera
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_TURN_OFF_CAMERA_TEXT" desc="Text label of the turn off camera control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Turn off camera
+  </message>
+  <message name="IDS_PICTURE_IN_PICTURE_HANG_UP_TEXT" desc="Text label of the hang up control button. The button appears when the user hovers over the Picture-in-Picture window.">
+    Hang up
+  </message>
  <message name="IDS_PICTURE_IN_PICTURE_CLOSE_CONTROL_TEXT" desc="Text label of the close control button. The button appears when the user hovers over the Picture-in-Picture window.">
    Close
  </message>
--- a/filenames.auto.gni
+++ b/filenames.auto.gni
@@ -101,9 +101,9 @@ auto_filenames = {
    "docs/api/structures/new-window-web-contents-event.md",
    "docs/api/structures/notification-action.md",
    "docs/api/structures/notification-response.md",
+    "docs/api/structures/overlay-options.md",
    "docs/api/structures/point.md",
    "docs/api/structures/post-body.md",
-    "docs/api/structures/post-data.md",
    "docs/api/structures/printer-info.md",
    "docs/api/structures/process-memory-info.md",
    "docs/api/structures/process-metric.md",
@@ -228,7 +228,6 @@ auto_filenames = {
    "lib/browser/api/web-contents-view.ts",
    "lib/browser/api/web-contents.ts",
    "lib/browser/api/web-frame-main.ts",
-    "lib/browser/chrome-extension-shim.ts",
    "lib/browser/default-menu.ts",
    "lib/browser/desktop-capturer.ts",
    "lib/browser/devtools.ts",
--- a/filenames.gni
+++ b/filenames.gni
@@ -90,6 +90,10 @@ filenames = {
    "shell/browser/ui/views/electron_views_delegate_win.cc",
    "shell/browser/ui/views/win_frame_view.cc",
    "shell/browser/ui/views/win_frame_view.h",
+    "shell/browser/ui/views/win_caption_button.cc",
+    "shell/browser/ui/views/win_caption_button.h",
+    "shell/browser/ui/views/win_caption_button_container.cc",
+    "shell/browser/ui/views/win_caption_button_container.h",
    "shell/browser/ui/win/dialog_thread.cc",
    "shell/browser/ui/win/dialog_thread.h",
    "shell/browser/ui/win/electron_desktop_native_widget_aura.cc",
@@ -180,6 +184,8 @@ filenames = {
    "shell/browser/ui/cocoa/root_view_mac.mm",
    "shell/browser/ui/cocoa/views_delegate_mac.h",
    "shell/browser/ui/cocoa/views_delegate_mac.mm",
+    "shell/browser/ui/cocoa/window_buttons_proxy.h",
+    "shell/browser/ui/cocoa/window_buttons_proxy.mm",
    "shell/browser/ui/drag_util_mac.mm",
    "shell/browser/ui/file_dialog_mac.mm",
    "shell/browser/ui/inspectable_web_contents_view_mac.h",
--- a/filenames.libcxx.gni
+++ b/filenames.libcxx.gni
@@ -0,0 +1,194 @@
+libcxx_headers = [
+  "//buildtools/third_party/libc++/trunk/include/CMakeLists.txt",
+  "//buildtools/third_party/libc++/trunk/include/__availability",
+  "//buildtools/third_party/libc++/trunk/include/__bit_reference",
+  "//buildtools/third_party/libc++/trunk/include/__bits",
+  "//buildtools/third_party/libc++/trunk/include/__bsd_locale_defaults.h",
+  "//buildtools/third_party/libc++/trunk/include/__bsd_locale_fallbacks.h",
+  "//buildtools/third_party/libc++/trunk/include/__config",
+  "//buildtools/third_party/libc++/trunk/include/__config_site.in",
+  "//buildtools/third_party/libc++/trunk/include/__debug",
+  "//buildtools/third_party/libc++/trunk/include/__errc",
+  "//buildtools/third_party/libc++/trunk/include/__functional_03",
+  "//buildtools/third_party/libc++/trunk/include/__functional_base",
+  "//buildtools/third_party/libc++/trunk/include/__functional_base_03",
+  "//buildtools/third_party/libc++/trunk/include/__hash_table",
+  "//buildtools/third_party/libc++/trunk/include/__libcpp_version",
+  "//buildtools/third_party/libc++/trunk/include/__locale",
+  "//buildtools/third_party/libc++/trunk/include/__memory/allocator_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/base.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/pointer_traits.h",
+  "//buildtools/third_party/libc++/trunk/include/__memory/utilities.h",
+  "//buildtools/third_party/libc++/trunk/include/__mutex_base",
+  "//buildtools/third_party/libc++/trunk/include/__node_handle",
+  "//buildtools/third_party/libc++/trunk/include/__nullptr",
+  "//buildtools/third_party/libc++/trunk/include/__split_buffer",
+  "//buildtools/third_party/libc++/trunk/include/__sso_allocator",
+  "//buildtools/third_party/libc++/trunk/include/__std_stream",
+  "//buildtools/third_party/libc++/trunk/include/__string",
+  "//buildtools/third_party/libc++/trunk/include/__support/android/locale_bionic.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/fuchsia/xlocale.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/ibm/limits.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/ibm/locale_mgmt_aix.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/ibm/nanosleep.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/ibm/support.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/ibm/xlocale.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/musl/xlocale.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/newlib/xlocale.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/nuttx/xlocale.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/openbsd/xlocale.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/solaris/floatingpoint.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/solaris/wchar.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/solaris/xlocale.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/win32/limits_msvc_win32.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/win32/locale_win32.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__nop_locale_mgmt.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__posix_l_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__strtonum_fallback.h",
+  "//buildtools/third_party/libc++/trunk/include/__threading_support",
+  "//buildtools/third_party/libc++/trunk/include/__tree",
+  "//buildtools/third_party/libc++/trunk/include/__tuple",
+  "//buildtools/third_party/libc++/trunk/include/__undef_macros",
+  "//buildtools/third_party/libc++/trunk/include/algorithm",
+  "//buildtools/third_party/libc++/trunk/include/any",
+  "//buildtools/third_party/libc++/trunk/include/array",
+  "//buildtools/third_party/libc++/trunk/include/atomic",
+  "//buildtools/third_party/libc++/trunk/include/barrier",
+  "//buildtools/third_party/libc++/trunk/include/bit",
+  "//buildtools/third_party/libc++/trunk/include/bitset",
+  "//buildtools/third_party/libc++/trunk/include/cassert",
+  "//buildtools/third_party/libc++/trunk/include/ccomplex",
+  "//buildtools/third_party/libc++/trunk/include/cctype",
+  "//buildtools/third_party/libc++/trunk/include/cerrno",
+  "//buildtools/third_party/libc++/trunk/include/cfenv",
+  "//buildtools/third_party/libc++/trunk/include/cfloat",
+  "//buildtools/third_party/libc++/trunk/include/charconv",
+  "//buildtools/third_party/libc++/trunk/include/chrono",
+  "//buildtools/third_party/libc++/trunk/include/cinttypes",
+  "//buildtools/third_party/libc++/trunk/include/ciso646",
+  "//buildtools/third_party/libc++/trunk/include/climits",
+  "//buildtools/third_party/libc++/trunk/include/clocale",
+  "//buildtools/third_party/libc++/trunk/include/cmath",
+  "//buildtools/third_party/libc++/trunk/include/codecvt",
+  "//buildtools/third_party/libc++/trunk/include/compare",
+  "//buildtools/third_party/libc++/trunk/include/complex",
+  "//buildtools/third_party/libc++/trunk/include/complex.h",
+  "//buildtools/third_party/libc++/trunk/include/concepts",
+  "//buildtools/third_party/libc++/trunk/include/condition_variable",
+  "//buildtools/third_party/libc++/trunk/include/csetjmp",
+  "//buildtools/third_party/libc++/trunk/include/csignal",
+  "//buildtools/third_party/libc++/trunk/include/cstdarg",
+  "//buildtools/third_party/libc++/trunk/include/cstdbool",
+  "//buildtools/third_party/libc++/trunk/include/cstddef",
+  "//buildtools/third_party/libc++/trunk/include/cstdint",
+  "//buildtools/third_party/libc++/trunk/include/cstdio",
+  "//buildtools/third_party/libc++/trunk/include/cstdlib",
+  "//buildtools/third_party/libc++/trunk/include/cstring",
+  "//buildtools/third_party/libc++/trunk/include/ctgmath",
+  "//buildtools/third_party/libc++/trunk/include/ctime",
+  "//buildtools/third_party/libc++/trunk/include/ctype.h",
+  "//buildtools/third_party/libc++/trunk/include/cwchar",
+  "//buildtools/third_party/libc++/trunk/include/cwctype",
+  "//buildtools/third_party/libc++/trunk/include/deque",
+  "//buildtools/third_party/libc++/trunk/include/errno.h",
+  "//buildtools/third_party/libc++/trunk/include/exception",
+  "//buildtools/third_party/libc++/trunk/include/execution",
+  "//buildtools/third_party/libc++/trunk/include/experimental/__config",
+  "//buildtools/third_party/libc++/trunk/include/experimental/__memory",
+  "//buildtools/third_party/libc++/trunk/include/experimental/algorithm",
+  "//buildtools/third_party/libc++/trunk/include/experimental/coroutine",
+  "//buildtools/third_party/libc++/trunk/include/experimental/deque",
+  "//buildtools/third_party/libc++/trunk/include/experimental/filesystem",
+  "//buildtools/third_party/libc++/trunk/include/experimental/forward_list",
+  "//buildtools/third_party/libc++/trunk/include/experimental/functional",
+  "//buildtools/third_party/libc++/trunk/include/experimental/iterator",
+  "//buildtools/third_party/libc++/trunk/include/experimental/list",
+  "//buildtools/third_party/libc++/trunk/include/experimental/map",
+  "//buildtools/third_party/libc++/trunk/include/experimental/memory_resource",
+  "//buildtools/third_party/libc++/trunk/include/experimental/propagate_const",
+  "//buildtools/third_party/libc++/trunk/include/experimental/regex",
+  "//buildtools/third_party/libc++/trunk/include/experimental/set",
+  "//buildtools/third_party/libc++/trunk/include/experimental/simd",
+  "//buildtools/third_party/libc++/trunk/include/experimental/string",
+  "//buildtools/third_party/libc++/trunk/include/experimental/type_traits",
+  "//buildtools/third_party/libc++/trunk/include/experimental/unordered_map",
+  "//buildtools/third_party/libc++/trunk/include/experimental/unordered_set",
+  "//buildtools/third_party/libc++/trunk/include/experimental/utility",
+  "//buildtools/third_party/libc++/trunk/include/experimental/vector",
+  "//buildtools/third_party/libc++/trunk/include/ext/__hash",
+  "//buildtools/third_party/libc++/trunk/include/ext/hash_map",
+  "//buildtools/third_party/libc++/trunk/include/ext/hash_set",
+  "//buildtools/third_party/libc++/trunk/include/fenv.h",
+  "//buildtools/third_party/libc++/trunk/include/filesystem",
+  "//buildtools/third_party/libc++/trunk/include/float.h",
+  "//buildtools/third_party/libc++/trunk/include/format",
+  "//buildtools/third_party/libc++/trunk/include/forward_list",
+  "//buildtools/third_party/libc++/trunk/include/fstream",
+  "//buildtools/third_party/libc++/trunk/include/functional",
+  "//buildtools/third_party/libc++/trunk/include/future",
+  "//buildtools/third_party/libc++/trunk/include/initializer_list",
+  "//buildtools/third_party/libc++/trunk/include/inttypes.h",
+  "//buildtools/third_party/libc++/trunk/include/iomanip",
+  "//buildtools/third_party/libc++/trunk/include/ios",
+  "//buildtools/third_party/libc++/trunk/include/iosfwd",
+  "//buildtools/third_party/libc++/trunk/include/iostream",
+  "//buildtools/third_party/libc++/trunk/include/istream",
+  "//buildtools/third_party/libc++/trunk/include/iterator",
+  "//buildtools/third_party/libc++/trunk/include/latch",
+  "//buildtools/third_party/libc++/trunk/include/limits",
+  "//buildtools/third_party/libc++/trunk/include/limits.h",
+  "//buildtools/third_party/libc++/trunk/include/list",
+  "//buildtools/third_party/libc++/trunk/include/locale",
+  "//buildtools/third_party/libc++/trunk/include/locale.h",
+  "//buildtools/third_party/libc++/trunk/include/map",
+  "//buildtools/third_party/libc++/trunk/include/math.h",
+  "//buildtools/third_party/libc++/trunk/include/memory",
+  "//buildtools/third_party/libc++/trunk/include/module.modulemap",
+  "//buildtools/third_party/libc++/trunk/include/mutex",
+  "//buildtools/third_party/libc++/trunk/include/new",
+  "//buildtools/third_party/libc++/trunk/include/numbers",
+  "//buildtools/third_party/libc++/trunk/include/numeric",
+  "//buildtools/third_party/libc++/trunk/include/optional",
+  "//buildtools/third_party/libc++/trunk/include/ostream",
+  "//buildtools/third_party/libc++/trunk/include/queue",
+  "//buildtools/third_party/libc++/trunk/include/random",
+  "//buildtools/third_party/libc++/trunk/include/ratio",
+  "//buildtools/third_party/libc++/trunk/include/regex",
+  "//buildtools/third_party/libc++/trunk/include/scoped_allocator",
+  "//buildtools/third_party/libc++/trunk/include/semaphore",
+  "//buildtools/third_party/libc++/trunk/include/set",
+  "//buildtools/third_party/libc++/trunk/include/setjmp.h",
+  "//buildtools/third_party/libc++/trunk/include/shared_mutex",
+  "//buildtools/third_party/libc++/trunk/include/span",
+  "//buildtools/third_party/libc++/trunk/include/sstream",
+  "//buildtools/third_party/libc++/trunk/include/stack",
+  "//buildtools/third_party/libc++/trunk/include/stdbool.h",
+  "//buildtools/third_party/libc++/trunk/include/stddef.h",
+  "//buildtools/third_party/libc++/trunk/include/stdexcept",
+  "//buildtools/third_party/libc++/trunk/include/stdint.h",
+  "//buildtools/third_party/libc++/trunk/include/stdio.h",
+  "//buildtools/third_party/libc++/trunk/include/stdlib.h",
+  "//buildtools/third_party/libc++/trunk/include/streambuf",
+  "//buildtools/third_party/libc++/trunk/include/string",
+  "//buildtools/third_party/libc++/trunk/include/string.h",
+  "//buildtools/third_party/libc++/trunk/include/string_view",
+  "//buildtools/third_party/libc++/trunk/include/strstream",
+  "//buildtools/third_party/libc++/trunk/include/system_error",
+  "//buildtools/third_party/libc++/trunk/include/tgmath.h",
+  "//buildtools/third_party/libc++/trunk/include/thread",
+  "//buildtools/third_party/libc++/trunk/include/tuple",
+  "//buildtools/third_party/libc++/trunk/include/type_traits",
+  "//buildtools/third_party/libc++/trunk/include/typeindex",
+  "//buildtools/third_party/libc++/trunk/include/typeinfo",
+  "//buildtools/third_party/libc++/trunk/include/unordered_map",
+  "//buildtools/third_party/libc++/trunk/include/unordered_set",
+  "//buildtools/third_party/libc++/trunk/include/utility",
+  "//buildtools/third_party/libc++/trunk/include/valarray",
+  "//buildtools/third_party/libc++/trunk/include/variant",
+  "//buildtools/third_party/libc++/trunk/include/vector",
+  "//buildtools/third_party/libc++/trunk/include/version",
+  "//buildtools/third_party/libc++/trunk/include/wchar.h",
+  "//buildtools/third_party/libc++/trunk/include/wctype.h",
+]
+
+libcxx_licenses = [ "//buildtools/third_party/libc++/trunk/LICENSE.TXT" ]
--- a/filenames.libcxxabi.gni
+++ b/filenames.libcxxabi.gni
@@ -0,0 +1,6 @@
+libcxxabi_headers = [
+  "//buildtools/third_party/libc++abi/trunk/include/__cxxabi_config.h",
+  "//buildtools/third_party/libc++abi/trunk/include/cxxabi.h",
+]
+
+libcxxabi_licenses = [ "//buildtools/third_party/libc++abi/trunk/LICENSE.TXT" ]
--- a/lib/asar/fs-wrapper.ts
+++ b/lib/asar/fs-wrapper.ts
@@ -655,8 +655,10 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {

  fs.promises.readdir = util.promisify(fs.readdir);

+  type ReaddirSyncOptions = { encoding: BufferEncoding | null; withFileTypes?: false };
+
  const { readdirSync } = fs;
-  fs.readdirSync = function (pathArgument: string, options: { encoding: BufferEncoding | null; withFileTypes?: false } | BufferEncoding | null) {
+  fs.readdirSync = function (pathArgument: string, options: ReaddirSyncOptions | BufferEncoding | null) {
    const pathInfo = splitPath(pathArgument);
    if (!pathInfo.isAsar) return readdirSync.apply(this, arguments);
    const { asarPath, filePath } = pathInfo;
@@ -671,7 +673,7 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
      throw createError(AsarError.NOT_FOUND, { asarPath, filePath });
    }

-    if (options && (options as any).withFileTypes) {
+    if (options && (options as ReaddirSyncOptions).withFileTypes) {
      const dirents = [];
      for (const file of files) {
        const childPath = path.join(filePath, file);
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .2.1
 .6.0