Bump v12.0.0-beta.18

fix: add eyedropper tool functionality to browser view (#27442 )
Co-authored-by: mlaurencin <mlaurencin@electronjs.org>
2026-02-26 03:01:17 -05:00 · 2021-01-25 07:01:21 -08:00 · 2021-01-21 16:19:07 -08:00 · 2021-01-21 13:58:16 -08:00 · 2021-01-21 13:01:01 -08:00 · 2021-01-21 11:21:36 -08:00
672 changed files with 9719 additions and 10000 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -69,7 +69,7 @@ parameters:
 # Build machines configs.
 docker-image: &docker-image
  docker:
-    - image: electron.azurecr.io/build:6555a80939fb4c3ddf9343b3f140e573f40de225
+    - image: electron.azurecr.io/build:4cec2c5ab66765caa724e37bae2bffb9b29722a5

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

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

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

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

 # Build configurations options.
 env-testing-build: &env-testing-build
@@ -145,7 +141,6 @@ 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'
@@ -230,18 +225,6 @@ step-maybe-notify-slack-success: &step-maybe-notify-slack-success
      fi
    when: on_success

-step-maybe-cleanup-arm64-mac: &step-maybe-cleanup-arm64-mac
-  run:
-    name: Cleanup after testing
-    command: |
-      if  [ "$TARGET_ARCH" == "arm64" ] &&[ "`uname`" == "Darwin" ]; then
-        killall Electron || echo "No Electron processes left running"
-        killall Safari || echo "No Safari processes left running"
-        rm -rf ~/Library/Application\ Support/Electron*
-        rm -rf ~/Library/Application\ Support/electron*
-      fi
-    when: always
-
 step-checkout-electron: &step-checkout-electron
  checkout:
    path: src/electron
@@ -325,10 +308,9 @@ step-setup-goma-for-build: &step-setup-goma-for-build
      npm install
      mkdir third_party
      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-      third_party/goma/goma_ctl.py ensure_start
+      node -e "require('./src/utils/goma.js').ensure()"
      echo 'export GN_GOMA_FILE='`node -e "console.log(require('./src/utils/goma.js').gnFilePath)"` >> $BASH_ENV
      echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
-      echo 'export GOMA_FALLBACK_ON_AUTH_FAILURE=true' >> $BASH_ENV
      cd ..

 step-restore-brew-cache: &step-restore-brew-cache
@@ -465,13 +447,16 @@ step-fix-sync-on-mac: &step-fix-sync-on-mac
        # Fix Clang Install (wrong binary)
        rm -rf src/third_party/llvm-build
        python src/tools/clang/scripts/update.py
+        # Fix Framework Header Installs (symlinks not retained)
+        rm -rf src/electron/external_binaries
+        python src/electron/script/update-external-binaries.py
      fi

 step-install-signing-cert-on-mac: &step-install-signing-cert-on-mac
  run:
    name: Import and trust self-signed codesigning cert on MacOS
    command: |
-      if  [ "$TARGET_ARCH" != "arm64" ] && [ "`uname`" == "Darwin" ]; then
+      if [ "`uname`" == "Darwin" ]; then
        cd src/electron
        ./script/codesign/generate-identity.sh
      fi
@@ -684,7 +669,6 @@ step-persist-data-for-tests: &step-persist-data-for-tests
      - src/electron
      - src/third_party/electron_node
      - src/third_party/nan
-      - src/cross-arch-snapshots

 step-electron-dist-unzip: &step-electron-dist-unzip
  run:
@@ -693,34 +677,28 @@ 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.
-      # -: 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
+      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:
@@ -752,23 +730,15 @@ step-verify-mksnapshot: &step-verify-mksnapshot
  run:
    name: Verify mksnapshot
    command: |
-      if [ "$IS_ASAN" != "1" ]; then
-        cd src
-        if  [ "$TARGET_ARCH" == "arm64" ] &&[ "`uname`" == "Darwin" ]; 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
+      cd src
+      python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default

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

 step-setup-linux-for-headless-testing: &step-setup-linux-for-headless-testing
  run:
@@ -864,7 +834,7 @@ step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
  run:
    name: Generate cross arch snapshot (arm/arm64)
    command: |
-      if [ "$GENERATE_CROSS_ARCH_SNAPSHOT" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
+      if [ "$TRIGGER_ARM_TEST" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
        cd src
        if [ "$TARGET_ARCH" == "arm" ]; then
          export MKSNAPSHOT_PATH="clang_x86_v8_arm"
@@ -897,13 +867,8 @@ step-maybe-trigger-arm-test: &step-maybe-trigger-arm-test
      if [ "$TRIGGER_ARM_TEST" == "true" ] && [ -z "$CIRCLE_PR_NUMBER" ]; then
        #Trigger VSTS job, passing along CircleCI job number and branch to build
        if [ "`uname`" == "Darwin" ]; then
-          if [ x"$MAS_BUILD" == x"true" ]; then
-            export DEVOPS_BUILD="electron-mas-arm64-testing"
-          else
-            export DEVOPS_BUILD="electron-osx-arm64-testing"
-          fi
-          echo "Triggering $DEVOPS_BUILD build on Azure DevOps"
-          node electron/script/release/ci-release-build.js --job=$DEVOPS_BUILD --ci=DevOps --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
+          echo "Triggering electron-arm2-testing build on Azure DevOps"  
+          node electron/script/release/ci-release-build.js --job=electron-arm2-testing --ci=DevOps --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
        else
          echo "Triggering electron-$TARGET_ARCH-testing build on VSTS"  
          node electron/script/release/ci-release-build.js --job=electron-$TARGET_ARCH-testing --ci=VSTS --armTest --circleBuildNum=$CIRCLE_BUILD_NUM $CIRCLE_BRANCH
@@ -1031,7 +996,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/chrome
+      rm -rf src/ios
      rm -rf src/third_party/blink/web_tests
      rm -rf src/third_party/blink/perf_tests
      rm -rf src/third_party/WebKit/LayoutTests
@@ -1289,6 +1254,18 @@ 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:
@@ -1312,27 +1289,8 @@ steps-tests: &steps-tests
          ELECTRON_DISABLE_SECURITY_WARNINGS: 1
        command: |
          cd src
-          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
-            if  [ "$TARGET_ARCH" == "arm64" ] &&[ "`uname`" == "Darwin" ]; 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
+          (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec-main/*-spec.ts | circleci tests split))
+          (cd electron && node script/yarn test --runners=remote --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.js | circleci tests split))
    - run:
        name: Check test results existence
        command: |
@@ -1353,8 +1311,6 @@ steps-tests: &steps-tests

    - *step-maybe-notify-slack-failure

-    - *step-maybe-cleanup-arm64-mac
-
 steps-test-nan: &steps-test-nan
  steps:
    - attach_workspace:
@@ -1469,9 +1425,9 @@ commands:
      restore-src-cache:
        type: boolean
        default: true
-      build-nonproprietary-ffmpeg:
+      preserve-vendor-dirs:
        type: boolean
-        default: true
+        default: false
    steps:
      - when:
          condition: << parameters.attach >>
@@ -1509,11 +1465,26 @@ 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
@@ -1570,13 +1541,10 @@ commands:
            - *step-electron-chromedriver-build
            - *step-electron-chromedriver-store

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

            # hunspell
            - *step-hunspell-build
@@ -1712,7 +1680,7 @@ jobs:
    <<: *machine-linux-2xlarge
    environment:
      <<: *env-linux-2xlarge
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True --custom-var=checkout_requests=True'
    steps:
      - electron-build:
          persist: false
@@ -1720,6 +1688,7 @@ jobs:
          checkout: true
          persist-checkout: true
          restore-src-cache: false
+          preserve-vendor-dirs: true

  linux-checkout-fast:
    <<: *machine-linux-2xlarge
@@ -1770,7 +1739,7 @@ jobs:
      <<: *env-linux-2xlarge
      <<: *env-testing-build
      <<: *env-macos-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac --custom-var=checkout_requests=True'
    steps:
      - electron-build:
          persist: false
@@ -1778,6 +1747,7 @@ jobs:
          checkout: true
          persist-checkout: true
          restore-src-cache: false
+          preserve-vendor-dirs: true

  mac-checkout-fast:
    <<: *machine-linux-2xlarge
@@ -1816,22 +1786,6 @@ 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:
@@ -1870,6 +1824,7 @@ 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
@@ -1922,6 +1877,7 @@ 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
@@ -1954,7 +1910,6 @@ 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:
@@ -1983,7 +1938,7 @@ jobs:
      <<: *env-arm
      <<: *env-release-build
      <<: *env-32bit-release
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
      <<: *env-ninja-status
    steps:
@@ -2013,7 +1968,6 @@ 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:
@@ -2049,7 +2003,7 @@ jobs:
      <<: *env-linux-2xlarge-release
      <<: *env-arm64
      <<: *env-release-build
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True'
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm64=True --custom-var=checkout_requests=True'
      UPLOAD_TO_S3: << pipeline.parameters.upload-to-s3 >>
      <<: *env-ninja-status
    steps:
@@ -2111,6 +2065,7 @@ 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:
@@ -2124,6 +2079,7 @@ 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:
@@ -2165,7 +2121,6 @@ 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
@@ -2218,6 +2173,7 @@ 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:
@@ -2231,6 +2187,7 @@ 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:
@@ -2272,7 +2229,6 @@ 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
@@ -2325,17 +2281,6 @@ 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:
@@ -2437,14 +2382,6 @@ 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:
@@ -2468,14 +2405,6 @@ 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
@@ -2632,7 +2561,6 @@ 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:
@@ -2640,9 +2568,6 @@ 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
@@ -2691,14 +2616,6 @@ 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
@@ -2715,14 +2632,6 @@ 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,2 +1,3 @@
 *
 !tools/xvfb-init.sh
+!build/install-build-deps.sh
--- a/.env.example
+++ b/.env.example
@@ -4,3 +4,4 @@
 APPVEYOR_CLOUD_TOKEN=
 CIRCLE_TOKEN=
 ELECTRON_GITHUB_TOKEN=
+VSTS_TOKEN=
--- a/.github/ISSUE_TEMPLATE/Feature_request.md
+++ b/.github/ISSUE_TEMPLATE/Feature_request.md
@@ -0,0 +1,27 @@
+---
+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
@@ -1,39 +0,0 @@
-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,6 +36,5 @@ authorizedUsers:
  - loc
  - MarshallOfSound
  - miniak
-  - mlaurencin
  - nornagon
  - zcbenz
--- a/.github/semantic.yml
+++ b/.github/semantic.yml
@@ -1,2 +0,0 @@
-# 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
@@ -0,0 +1,6 @@
+[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
@@ -1,6 +0,0 @@
-{
-  "default": false,
-  "no-trailing-spaces": {
-    "br_spaces": 0
-  }
-}
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -1,26 +0,0 @@
-{
-  "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
@@ -337,6 +337,7 @@ source_set("electron_lib") {
    "//components/viz/service",
    "//content/public/browser",
    "//content/public/child",
+    "//content/public/common:service_names",
    "//content/public/gpu",
    "//content/public/renderer",
    "//content/public/utility",
@@ -402,10 +403,7 @@ source_set("electron_lib") {
  }

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

  sources = filenames.lib_sources
@@ -622,9 +620,6 @@ 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) {
@@ -638,7 +633,6 @@ 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",
@@ -655,7 +649,6 @@ source_set("electron_lib") {
  }
  if (enable_pdf_viewer) {
    deps += [
-      "//chrome/browser/resources/pdf:resources",
      "//components/pdf/browser",
      "//components/pdf/renderer",
      "//pdf:pdf_ppapi",
@@ -999,9 +992,6 @@ if (is_mac) {
    deps = [
      ":electron_app_framework_bundle_data",
      ":electron_app_resources",
-      ":electron_fuses",
-      "//base",
-      "//electron/buildflags",
    ]
    if (is_mas_build) {
      deps += [ ":electron_login_helper_app" ]
--- 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
@@ -29,7 +29,7 @@ _If an issue has been closed and you still feel it's relevant, feel free to ping
 ### 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/40
+++ b/40
@@ -14,19 +14,21 @@ gclient_gn_args = [

 vars = {
  'chromium_version':
-    '91.0.4448.0',
+    '89.0.4348.1',
  'node_version':
-    'v14.16.0',
+    'v14.15.1',
  'nan_version':
-    'v2.14.2',
+    '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
  'squirrel.mac_version':
    'cdc0729c8bf8576bfef18629186e1e9ecf1b0d9f',

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

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

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

  'mac_xcode_version': 'default',

  # 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':
@@ -92,6 +99,10 @@ 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',
@@ -146,13 +157,32 @@ 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(["python3", "script/lib/npx.py", "yarn@' + (Var("yarn_version")) + '", "install", "--frozen-lockfile"]);',
+      '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"]);',
    ],
  },
 ]
--- a/2
+++ b/2
@@ -1 +1 @@
-13.0.0-beta.15
+12.0.0-beta.18
--- a/1
+++ b/1
@@ -1,4 +1,3 @@
-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,5 +1,6 @@
 [![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)
@@ -28,13 +29,16 @@ The preferred method is to install Electron as a development dependency in your
 app:

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

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

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

 Use [`Electron Fiddle`](https://github.com/electron/fiddle)
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -13,5 +13,4 @@ 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
@@ -36,7 +36,6 @@ environment:
  ELECTRON_ENABLE_STACK_DUMPING: 1
  MOCHA_REPORTER: mocha-multi-reporters
  MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
-  GOMA_FALLBACK_ON_AUTH_FAILURE: true
 notifications:
  - provider: Webhook
    url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
@@ -68,7 +67,9 @@ 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 -ne 'release') {
+      if ($env:GN_CONFIG -eq 'release') {
+        $env:GCLIENT_EXTRA_ARGS="$env:GCLIENT_EXTRA_ARGS --custom-var=checkout_requests=True"
+      } else {
        $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
      }
  - >-
@@ -97,6 +98,8 @@ 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,7 +17,6 @@ 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)
@@ -49,44 +48,38 @@ 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.arm64.bin --dest=$CROSS_ARCH_SNAPSHOTS
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/v8_context_snapshot.bin --dest=$CROSS_ARCH_SNAPSHOTS
  displayName: 'Download cross arch snapshot files'
  env:
    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)

+- bash: |
+   export NATIVE_UNITTESTS_DEST=$PWD/src/out/Default
+   cd src/electron
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=shell_browser_ui_unittests --dest=$NATIVE_UNITTESTS_DEST
+   chmod +x $NATIVE_UNITTESTS_DEST/shell_browser_ui_unittests
+  displayName: 'Download native unittest executables'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
 - bash: |
    cd src
    export ELECTRON_OUT_DIR=Default
-    export npm_config_arch=arm64
-    (cd electron && node script/yarn test --enable-logging --runners main)
-  displayName: 'Run Electron main tests'
+    set npm_config_arch=arm64
+    (cd electron && node script/yarn test -- --enable-logging)
+  displayName: 'Run Electron tests'
  timeoutInMinutes: 20
  env:
    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
    IGNORE_YARN_INSTALL_ERROR: 1
    ELECTRON_TEST_RESULTS_DIR: junit

- bash: |
-    cd src
-    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
@@ -105,16 +98,6 @@ 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
@@ -93,6 +93,6 @@ steps:
  condition: always()

 - powershell: |
-    Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
+    Remove-Item -path $env:APPDATA/Electron* -Recurse
  displayName: 'Delete user app data directories'
  condition: always()
--- a/build/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 = 89
+node_module_version = 87

 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0
@@ -19,7 +19,4 @@ 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
-
 is_cfi = false
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -0,0 +1,653 @@
+#!/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/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -163,7 +163,7 @@ if ((globalThis.process || binding.process).argv.includes("--profile-electron-in
        setImmediate: false
      },
      optimization: {
-        minimize: env.mode === 'production',
+        minimize: true,
        minimizer: [
          new TerserPlugin({
            terserOptions: {
--- a/build/webpack/webpack.gni
+++ b/build/webpack/webpack.gni
@@ -22,11 +22,6 @@ template("webpack_build") {
               "//electron/typings/internal-electron.d.ts",
             ] + invoker.inputs

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

--- a/build/zip.py
+++ b/build/zip.py
@@ -39,7 +39,6 @@ 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):
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -16,6 +16,8 @@ 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",
@@ -44,6 +46,7 @@ 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",
@@ -73,7 +76,6 @@ static_library("chrome") {
  }

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

  deps = [
@@ -216,6 +217,8 @@ static_library("chrome") {
      "//chrome/browser/printing/print_view_manager_basic.h",
      "//chrome/browser/printing/printer_query.cc",
      "//chrome/browser/printing/printer_query.h",
+      "//chrome/browser/printing/printing_message_filter.cc",
+      "//chrome/browser/printing/printing_message_filter.h",
      "//chrome/browser/printing/printing_service.cc",
      "//chrome/browser/printing/printing_service.h",
    ]
--- 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 std::u16string& password,
+    const base::string16& 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,6 +12,7 @@
 #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 {
@@ -45,7 +46,7 @@ class CertificateManagerModel {
  // Returns a net error code on failure.
  int ImportFromPKCS12(PK11SlotInfo* slot_info,
                       const std::string& data,
-                       const std::u16string& password,
+                       const base::string16& 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,11 +127,10 @@ class ProcessSingleton {
  NotificationCallback notification_callback_;  // Handler for notifications.

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

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

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

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

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

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

    // 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_ = 0;
+    size_t bytes_read_;

    base::OneShotTimer timer_;

--- a/chromium_src/chrome/browser/process_singleton_win.cc
+++ b/chromium_src/chrome/browser/process_singleton_win.cc
@@ -172,6 +172,8 @@ 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,7 +38,8 @@ void GlobalMenuBarRegistrarX11::OnWindowUnmapped(x11::Window window) {
  live_windows_.erase(window);
 }

-GlobalMenuBarRegistrarX11::GlobalMenuBarRegistrarX11() {
+GlobalMenuBarRegistrarX11::GlobalMenuBarRegistrarX11()
+    : registrar_proxy_(nullptr) {
  // 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_ = nullptr;
+  GDBusProxy* registrar_proxy_;

  // 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,7 +2,6 @@

 <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,15 +1,10 @@
 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 = policy.createHTML(await response.text());
+    div.innerHTML = await response.text();
    return div;
  } catch {
    return null;
--- a/docs/README.md
+++ b/docs/README.md
@@ -91,6 +91,11 @@ These individual tutorials expand on topics discussed in the guide above.
 * Electron Releases & Developer Feedback
  * [Versioning Policy](tutorial/electron-versioning.md)
  * [Release Timelines](tutorial/electron-timelines.md)
+* [Packaging App Source Code with asar](tutorial/application-packaging.md)
+  * [Generating asar Archives](tutorial/application-packaging.md#generating-asar-archives)
+  * [Using asar Archives](tutorial/application-packaging.md#using-asar-archives)
+  * [Limitations](tutorial/application-packaging.md#limitations-of-the-node-api)
+  * [Adding Unpacked Files to asar Archives](tutorial/application-packaging.md#adding-unpacked-files-to-asar-archives)
 * [Testing Widevine CDM](tutorial/testing-widevine-cdm.md)

 ---
@@ -143,15 +148,15 @@ These individual tutorials expand on topics discussed in the guide above.

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

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

 ### Modules for Both Processes:

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

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

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

 Returns:

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

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

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

 Returns:

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

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

 ```javascript
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -222,23 +222,21 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      the top left.
    * `hiddenInset` - Results in a hidden title bar with an alternative look
      where the traffic light buttons are slightly more inset from the window edge.
-    * `customButtonsOnHover` - 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.
+    * `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.
    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` are deprecated and have been removed in macOS Catalina (10.15).
+    `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.
  * `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
@@ -267,7 +265,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
      be the absolute file path to the script.
      When node integration is turned off, the preload script can reintroduce
      Node global symbols back to the global scope. See example
-      [here](context-bridge.md#exposing-node-global-symbols).
+      [here](process.md#event-loaded).
    * `sandbox` Boolean (optional) - If set, this will sandbox the renderer
      associated with the window, making it compatible with the Chromium
      OS-level sandbox and disabling the Node.js engine. This is not the same as
@@ -725,6 +723,94 @@ 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).
+
+#### `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).
+
+#### `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:
@@ -1319,8 +1405,6 @@ The native type of the handle is `HWND` on Windows, `NSView*` on macOS, and

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

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

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

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

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

@@ -1600,6 +1684,8 @@ 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
@@ -1628,14 +1714,7 @@ 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.
-  * `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.
+    the window should be visible above fullscreen windows

 Sets whether the window should be visible on all workspaces.

@@ -1749,12 +1828,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 in frameless window.
+Set a custom position for the traffic light buttons. Can only be used with `titleBarStyle` set to `hidden`.

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

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

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

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

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

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

 Returns `BrowserView[]` - an array of all BrowserViews that have been attached
--- a/docs/api/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

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

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

 A comma-separated list of `rules` that control how hostnames are mapped.
--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -33,7 +33,7 @@ page you load in your renderer executes code in this world.

 ### Isolated World

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

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

 #### Event: 'changed'

-Returns:
-
 * `event` Event
 * `cookie` [Cookie](structures/cookie.md) - The cookie that was changed.
 * `cause` String - The cause of the change with one of the following values:
--- a/docs/api/crash-reporter.md
+++ b/docs/api/crash-reporter.md
@@ -77,8 +77,7 @@ The `crashReporter` module has the following methods:
 ### `crashReporter.start(options)`

 * `options` Object
-  * `submitURL` String (optional) - URL that crash reports will be sent to as
-    POST. Required unless `uploadToServer` is `false`.
+  * `submitURL` String - URL that crash reports will be sent to as POST.
  * `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,24 +120,6 @@ 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/extensions.md
+++ b/docs/api/extensions.md
@@ -15,7 +15,7 @@ extension capabilities.

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

 ```js
 const { session } = require('electron')
--- a/docs/api/frameless-window.md
+++ b/docs/api/frameless-window.md
@@ -82,11 +82,8 @@ win.show()
 * The `blur` filter only applies to the web page, so there is no way to apply
  blur effect to the content below the window (i.e. other applications open on
  the user's system).
-* The window will not be transparent when DevTools is opened.
-* On Windows operating systems,
-  * transparent windows will not work when DWM is
+* On Windows operating systems, transparent windows will not work when DWM is
  disabled.
-  * transparent windows can not be maximized using the Windows system menu or by double clicking the title bar. The reasoning behind this can be seen on [this pull request](https://github.com/electron/electron/pull/28207).
 * On Linux, users have to put `--enable-transparent-visuals --disable-gpu` in
  the command line to disable GPU and allow ARGB to make transparent window,
  this is caused by an upstream bug that [alpha channel doesn't work on some
--- a/docs/api/ipc-main.md
+++ b/docs/api/ipc-main.md
@@ -120,11 +120,6 @@ 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/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -62,9 +62,10 @@ included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

 > **NOTE:** Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
->
-> Since the main process does not have support for DOM objects such as
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.
+
+> **NOTE:** Since the main process does not have support for DOM objects such as
 > `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
 > Electron's IPC to the main process, as the main process would have no way to decode
 > them. Attempting to send such objects over IPC will result in an error.
@@ -89,10 +90,11 @@ Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will no
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

-> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
->
-> Since the main process does not have support for DOM objects such as
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.
+
+> **NOTE:** Since the main process does not have support for DOM objects such as
 > `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
 > Electron's IPC to the main process, as the main process would have no way to decode
 > them. Attempting to send such objects over IPC will result in an error.
@@ -132,10 +134,11 @@ Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will no
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

-> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
->
-> Since the main process does not have support for DOM objects such as
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.
+
+> **NOTE:** Since the main process does not have support for DOM objects such as
 > `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
 > Electron's IPC to the main process, as the main process would have no way to decode
 > them. Attempting to send such objects over IPC will result in an error.
--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -22,10 +22,8 @@ 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 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.
+opens the associated menu. The indicated character in the button label gets an
+underline. The `&` character is not 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.
--- a/docs/api/modernization/overview.md
+++ b/docs/api/modernization/overview.md
@@ -0,0 +1,10 @@
+## Modernization
+
+The Electron team is currently undergoing an initiative to modernize our API in a few concrete ways. These include: updating our modules to use idiomatic JS properties instead of separate `getPropertyX` and `setPropertyX`, converting callbacks to promises, and removing some other anti-patterns present in our APIs. The current status of the Promise initiative can be tracked in the [promisification](promisification.md) tracking file.
+
+As we work to perform these updates, we seek to create the least disruptive amount of change at any given time, so as many changes as possible will be introduced in a backward compatible manner and deprecated after enough time has passed to give users a chance to upgrade their API calls.
+
+This document and its child documents will be updated to reflect the latest status of our API changes.
+
+* [Promisification](promisification.md)
+* [Property Updates](property-updates.md)
--- a/docs/api/modernization/promisification.md
+++ b/docs/api/modernization/promisification.md
@@ -0,0 +1,42 @@
+## Promisification
+
+The Electron team recently underwent an initiative to convert callback-based APIs to Promise-based ones. See converted functions below:
+
+- [app.getFileIcon(path[, options], callback)](https://github.com/electron/electron/blob/master/docs/api/app.md#getFileIcon)
+- [contents.capturePage([rect, ]callback)](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#capturePage)
+- [contents.executeJavaScript(code[, userGesture, callback])](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#executeJavaScript)
+- [contents.printToPDF(options, callback)](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#printToPDF)
+- [contents.savePage(fullPath, saveType, callback)](https://github.com/electron/electron/blob/master/docs/api/web-contents.md#savePage)
+- [contentTracing.getCategories(callback)](https://github.com/electron/electron/blob/master/docs/api/content-tracing.md#getCategories)
+- [contentTracing.startRecording(options, callback)](https://github.com/electron/electron/blob/master/docs/api/content-tracing.md#startRecording)
+- [contentTracing.stopRecording(resultFilePath, callback)](https://github.com/electron/electron/blob/master/docs/api/content-tracing.md#stopRecording)
+- [contentTracing.getTraceBufferUsage(callback)](https://github.com/electron/electron/blob/master/docs/api/content-tracing.md#getTraceBufferUsage)
+- [cookies.flushStore(callback)](https://github.com/electron/electron/blob/master/docs/api/cookies.md#flushStore)
+- [cookies.get(filter, callback)](https://github.com/electron/electron/blob/master/docs/api/cookies.md#get)
+- [cookies.remove(url, name, callback)](https://github.com/electron/electron/blob/master/docs/api/cookies.md#remove)
+- [cookies.set(details, callback)](https://github.com/electron/electron/blob/master/docs/api/cookies.md#set)
+- [debugger.sendCommand(method[, commandParams, callback])](https://github.com/electron/electron/blob/master/docs/api/debugger.md#sendCommand)
+- [desktopCapturer.getSources(options, callback)](https://github.com/electron/electron/blob/master/docs/api/desktop-capturer.md#getSources)
+- [dialog.showOpenDialog([browserWindow, ]options[, callback])](https://github.com/electron/electron/blob/master/docs/api/dialog.md#showOpenDialog)
+- [dialog.showSaveDialog([browserWindow, ]options[, callback])](https://github.com/electron/electron/blob/master/docs/api/dialog.md#showSaveDialog)
+- [inAppPurchase.purchaseProduct(productID, quantity, callback)](https://github.com/electron/electron/blob/master/docs/api/in-app-purchase.md#purchaseProduct)
+- [inAppPurchase.getProducts(productIDs, callback)](https://github.com/electron/electron/blob/master/docs/api/in-app-purchase.md#getProducts)
+- [dialog.showMessageBox([browserWindow, ]options[, callback])](https://github.com/electron/electron/blob/master/docs/api/dialog.md#showMessageBox)
+- [dialog.showCertificateTrustDialog([browserWindow, ]options, callback)](https://github.com/electron/electron/blob/master/docs/api/dialog.md#showCertificateTrustDialog)
+- [netLog.stopLogging([callback])](https://github.com/electron/electron/blob/master/docs/api/net-log.md#stopLogging)
+- [protocol.isProtocolHandled(scheme, callback)](https://github.com/electron/electron/blob/master/docs/api/protocol.md#isProtocolHandled)
+- [ses.clearHostResolverCache([callback])](https://github.com/electron/electron/blob/master/docs/api/session.md#clearHostResolverCache)
+- [ses.clearStorageData([options, callback])](https://github.com/electron/electron/blob/master/docs/api/session.md#clearStorageData)
+- [ses.setProxy(config, callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#setProxy)
+- [ses.resolveProxy(url, callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#resolveProxy)
+- [ses.getCacheSize(callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#getCacheSize)
+- [ses.clearAuthCache(options[, callback])](https://github.com/electron/electron/blob/master/docs/api/session.md#clearAuthCache)
+- [ses.clearCache(callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#clearCache)
+- [ses.getBlobData(identifier, callback)](https://github.com/electron/electron/blob/master/docs/api/session.md#getBlobData)
+- [shell.openExternal(url[, options, callback])](https://github.com/electron/electron/blob/master/docs/api/shell.md#openExternal)
+- [webFrame.executeJavaScript(code[, userGesture, callback])](https://github.com/electron/electron/blob/master/docs/api/web-frame.md#executeJavaScript)
+- [webFrame.executeJavaScriptInIsolatedWorld(worldId, scripts[, userGesture, callback])](https://github.com/electron/electron/blob/master/docs/api/web-frame.md#executeJavaScriptInIsolatedWorld)
+- [webviewTag.capturePage([rect, ]callback)](https://github.com/electron/electron/blob/master/docs/api/webview-tag.md#capturePage)
+- [webviewTag.executeJavaScript(code[, userGesture, callback])](https://github.com/electron/electron/blob/master/docs/api/webview-tag.md#executeJavaScript)
+- [webviewTag.printToPDF(options, callback)](https://github.com/electron/electron/blob/master/docs/api/webview-tag.md#printToPDF)
+- [win.capturePage([rect, ]callback)](https://github.com/electron/electron/blob/master/docs/api/browser-window.md#capturePage)
--- a/docs/api/modernization/property-updates.md
+++ b/docs/api/modernization/property-updates.md
@@ -0,0 +1,41 @@
+## Property Updates
+
+The Electron team is currently undergoing an initiative to convert separate getter and setter functions in Electron to bespoke properties with `get` and `set` functionality. During this transition period, both the new properties and old getters and setters of these functions will work correctly and be documented.
+
+## Candidates
+
+* `BrowserWindow`
+  * `menubarVisible`
+* `crashReporter` module
+  * `uploadToServer`
+* `webFrame` modules
+  * `zoomFactor`
+  * `zoomLevel`
+  * `audioMuted`
+* `<webview>`
+  * `zoomFactor`
+  * `zoomLevel`
+  * `audioMuted`
+
+## Converted Properties
+
+* `app` module
+  * `accessibilitySupport`
+  * `applicationMenu`
+  * `badgeCount`
+  * `name`
+* `DownloadItem` class
+  * `savePath`
+* `BrowserWindow` module
+  * `autoHideMenuBar`
+  * `resizable`
+  * `maximizable`
+  * `minimizable`
+  * `fullscreenable`
+  * `movable`
+  * `closable`
+  * `backgroundThrottling`
+* `NativeImage`
+  * `isMacTemplateImage`
+* `SystemPreferences` module
+  * `appLevelAppearance`
--- a/docs/api/process.md
+++ b/docs/api/process.md
@@ -12,31 +12,28 @@ 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()`
-* `uptime()`
-* `argv`
-* `execPath`
-* `env`
-* `pid`
-* `arch`
-* `platform`
-* `sandboxed`
-* `contextIsolated`
-* `type`
-* `version`
-* `versions`
-* `mas`
-* `windowsStore`
-* `contextId`
+- `crash()`
+- `hang()`
+- `getCreationTime()`
+- `getHeapStatistics()`
+- `getBlinkMemoryInfo()`
+- `getProcessMemoryInfo()`
+- `getSystemMemoryInfo()`
+- `getSystemVersion()`
+- `getCPUUsage()`
+- `getIOCounters()`
+- `argv`
+- `execPath`
+- `env`
+- `pid`
+- `arch`
+- `platform`
+- `sandboxed`
+- `type`
+- `version`
+- `versions`
+- `mas`
+- `windowsStore`

 ## Events

@@ -45,6 +42,19 @@ In sandboxed renderers the `process` object contains only a subset of the APIs:
 Emitted when Electron has loaded its internal initialization script and is
 beginning to load the web page or the main script.

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

 ### `process.defaultApp` _Readonly_
@@ -82,11 +92,6 @@ 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
@@ -127,13 +132,6 @@ 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,8 +92,6 @@ 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,16 +45,6 @@ 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, webContents, callback) => {
+  win.webContents.session.on('select-serial-port', (event, portList, callback) => {
    event.preventDefault()
    const selectedPort = portList.find((device) => {
-      return device.vendorId === '9025' && device.productId === '67'
+      return device.vendorId === 0x2341 && device.productId === 0x0043
    })
    if (!selectedPort) {
      callback('')
    } else {
-      callback(selectedPort.portId)
+      callback(result1.portId)
    }
  })
 })
@@ -492,7 +492,6 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
  * `permission` String - The type of requested permission.
    * `clipboard-read` - Request access to read from the clipboard.
    * `media` -  Request access to media devices such as camera, microphone and speakers.
-    * `display-capture` - Request access to capture the screen.
    * `mediaKeySystem` - Request access to DRM protected content.
    * `geolocation` - Request access to user's current location.
    * `notifications` - Request notification creation and the ability to display them in the user's system tray.
@@ -501,7 +500,6 @@ 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.
@@ -513,9 +511,7 @@ 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)`.  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.
+To clear the handler, call `setPermissionRequestHandler(null)`.

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

 * `handler` Function\<Boolean> | null
-  * `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.  Cross origin sub frames making permission checks will pass a `null` webContents to this handler.  You should use `embeddingOrigin` and `requestingOrigin` to determine what origin the owning frame and the requesting frame are on respectively.
+  * `webContents` [WebContents](web-contents.md) - WebContents checking the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
  * `permission` String - Type of permission check.  Valid values are `midiSysex`, `notifications`, `geolocation`, `media`,`mediaKeySystem`,`midi`, `pointerLock`, `fullscreen`, `openExternal`, or `serial`.
  * `requestingOrigin` String - The origin URL of the permission check
  * `details` Object - Some properties are only available on certain permission types.
-    * `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`,
+    * `securityOrigin` String - The security origin of the `media` check.
+    * `mediaType` String - The type of media access being requested, can be `video`,
      `audio` or `unknown`
-    * `requestingUrl` String (optional) - The last URL the requesting frame loaded.  This is not provided for cross-origin sub frames making permission checks.
+    * `requestingUrl` String - The last URL the requesting frame loaded
    * `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.  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.
+Returning `true` will allow the permission and `false` will reject it.
 To clear the handler, call `setPermissionCheckHandler(null)`.

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

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

@@ -750,13 +742,9 @@ will not work on non-persistent (in-memory) sessions.

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

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

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

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

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

 app.on('ready', async () => {
-  await session.defaultSession.loadExtension(
-    path.join(__dirname, 'react-devtools'),
-    // allowFileAccess is required to load the devtools extension on file:// URLs.
-    { allowFileAccess: true }
-  )
+  await session.defaultSession.loadExtension(path.join(__dirname, 'react-devtools'))
  // Note that in order to use the React DevTools extension, you'll need to
  // download and unzip a copy of the extension.
 })
--- a/docs/api/shell.md
+++ b/docs/api/shell.md
@@ -45,6 +45,17 @@ 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,10 +3,7 @@
 * `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: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.
+  `window:XX` or `screen:XX`, where `XX` is a random generated number.
 * `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/display.md
+++ b/docs/api/structures/display.md
@@ -11,9 +11,9 @@
 * `colorDepth` Number - The number of bits per pixel.
 * `depthPerComponent` Number - The number of bits per color component.
 * `displayFrequency` Number - The display refresh rate.
-* `bounds` [Rectangle](rectangle.md) - the bounds of the display in DIP points.
+* `bounds` [Rectangle](rectangle.md)
 * `size` [Size](size.md)
-* `workArea` [Rectangle](rectangle.md) - the work area of the display in DIP points.
+* `workArea` [Rectangle](rectangle.md)
 * `workAreaSize` [Size](size.md)
 * `internal` Boolean - `true` for an internal display and `false` for an external display

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

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

-* `type` 'rawData' - `rawData`.
+* `type` String - `rawData`.
 * `bytes` Buffer - Data to be uploaded.
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -130,8 +130,6 @@ This is necessary for events such as `NSUserDefaultsDidChangeNotification`.
  * `userInfo` Record<String, unknown>
  * `object` String

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

@@ -435,7 +433,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](../tutorial/application-distribution.md#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](https://electronjs.org/docs/tutorial/application-distribution#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/web-contents.md
+++ b/docs/api/web-contents.md
@@ -195,30 +195,29 @@ 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
@@ -403,9 +402,6 @@ Returns:
    * `oom` - Process ran out of memory
    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed
-  * `exitCode` Integer - The exit code of the process, unless `reason` is
-    `launch-failed`, in which case `exitCode` will be a platform-specific
-    launch failure error code.

 Emitted when the renderer process unexpectedly disappears.  This is normally
 because it was crashed or killed.
@@ -643,15 +639,8 @@ Returns:
  * `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.
+  * `titleText` String - Title or alt text of the selection that the context
+    was invoked on.
  * `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
@@ -661,9 +650,8 @@ 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`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`, `adjustSelection`, or `adjustSelectionReset`.
+    Can be `none`, `mouse`, `keyboard`, `touch` or `touchMenu`.
  * `mediaFlags` Object - The flags for the media element the context menu was
    invoked on.
    * `inError` Boolean - Whether the media element has crashed.
@@ -675,22 +663,16 @@ 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.

@@ -1184,7 +1166,6 @@ Ignore application menu shortcuts while this web contents is focused.
    * `url` String - The _resolved_ version of the URL passed to `window.open()`. e.g. opening a window with `window.open('foo')` will yield something like `https://the-origin/the/current/path/foo`.
    * `frameName` String - Name of the window provided in `window.open()`
    * `features` String - Comma separated list of window features provided to `window.open()`.
-
  Returns `{action: 'deny'} | {action: 'allow', overrideBrowserWindowOptions?: BrowserWindowConstructorOptions}` - `deny` cancels the creation of the new
  window. `allow` will allow the new window to be created. Specifying `overrideBrowserWindowOptions` allows customization of the created window.
  Returning an unrecognized value such as a null, undefined, or an object
@@ -1483,7 +1464,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`:

@@ -1677,7 +1658,8 @@ included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

 > **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

 The renderer process can handle the message by listening to `channel` with the
 [`ipcRenderer`](ipc-renderer.md) module.
@@ -1725,8 +1707,9 @@ Send an asynchronous message to a specific frame in a renderer process via
 chains will not be included. Sending Functions, Promises, Symbols, WeakMaps, or
 WeakSets will throw an exception.

-> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects will throw an exception.
+> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects is deprecated, and will begin throwing an exception
+> starting with Electron 9.

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

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

 #### `contents.getFrameRate()`

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

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

 Only applicable if *offscreen rendering* is enabled.

--- a/docs/api/web-frame-main.md
+++ b/docs/api/web-frame-main.md
@@ -86,6 +86,17 @@ In the browser window some HTML APIs like `requestFullScreen` can only be
 invoked by a gesture from the user. Setting `userGesture` to `true` will remove
 this limitation.

+#### `frame.executeJavaScriptInIsolatedWorld(worldId, code[, userGesture])`
+
+* `worldId` Integer - The ID of the world to run the javascript in, `0` is the default world, `999` is the world used by Electron's `contextIsolation` feature.  You can provide any integer here.
+* `code` String
+* `userGesture` Boolean (optional) - Default is `false`.
+
+Returns `Promise<unknown>` - A promise that resolves with the result of the executed
+code or is rejected if execution throws or results in a rejected promise.
+
+Works like `executeJavaScript` but evaluates `scripts` in an isolated context.
+
 #### `frame.reload()`

 Returns `boolean` - Whether the reload was initiated successfully. Only results in `false` when the frame has no history.
--- 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
@@ -83,9 +83,9 @@ const mainWindow = new BrowserWindow()

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

 mainWindow.webContents.on('did-create-window', (childWindow) => {
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -6,52 +6,14 @@ Breaking changes will be documented here, and deprecation warnings added to JS c

 This document uses the following convention to categorize breaking changes:

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

 ## Planned Breaking API Changes (13.0)

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

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

-### Removed: `BrowserWindow` extension APIs
-
-The deprecated extension APIs have been removed:
-
-* `BrowserWindow.addExtension(path)`
-* `BrowserWindow.addDevToolsExtension(path)`
-* `BrowserWindow.removeExtension(name)`
-* `BrowserWindow.removeDevToolsExtension(name)`
-* `BrowserWindow.getExtensions()`
-* `BrowserWindow.getDevToolsExtensions()`
-
-Use the session APIs instead:
-
-* `ses.loadExtension(path)`
-* `ses.removeExtension(extension_id)`
-* `ses.getAllExtensions()`
-
-```js
-// Removed in Electron 13
-BrowserWindow.addExtension(path)
-BrowserWindow.addDevToolsExtension(path)
-// Replace with
-session.defaultSession.loadExtension(path)
-```
-
-```js
-// Removed in Electron 13
-BrowserWindow.removeExtension(name)
-BrowserWindow.removeDevToolsExtension(name)
-// Replace with
-session.defaultSession.removeExtension(extension_id)
-```
-
-```js
-// Removed in Electron 13
-BrowserWindow.getExtensions()
-BrowserWindow.getDevToolsExtensions()
-// Replace with
-session.defaultSession.getAllExtensions()
-```
-
-### Removed: methods in `systemPreferences`
-
-The following `systemPreferences` methods have been deprecated:
-
-* `systemPreferences.isDarkMode()`
-* `systemPreferences.isInvertedColorScheme()`
-* `systemPreferences.isHighContrastColorScheme()`
-
-Use the following `nativeTheme` properties instead:
-
-* `nativeTheme.shouldUseDarkColors`
-* `nativeTheme.shouldUseInvertedColorScheme`
-* `nativeTheme.shouldUseHighContrastColors`
-
-```js
-// Removed in Electron 13
-systemPreferences.isDarkMode()
-// Replace with
-nativeTheme.shouldUseDarkColors
-
-// Removed in Electron 13
-systemPreferences.isInvertedColorScheme()
-// Replace with
-nativeTheme.shouldUseInvertedColorScheme
-
-// Removed in Electron 13
-systemPreferences.isHighContrastColorScheme()
-// Replace with
-nativeTheme.shouldUseHighContrastColors
-```
-
-### 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
@@ -160,15 +34,6 @@ Chromium has removed support for Flash, and so we must follow suit. See
 Chromium's [Flash Roadmap](https://www.chromium.org/flash-roadmap) for more
 details.

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

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

 We [recommend having contextIsolation enabled](https://github.com/electron/electron/blob/master/docs/tutorial/security.md#3-enable-context-isolation-for-remote-content) for the security of your application.

-Another implication is that `require()` cannot be used in the renderer process unless
-`nodeIntegration` is `true` and `contextIsolation` is `false`.
-
 For more details see: https://github.com/electron/electron/issues/23506

 ### Removed: `crashReporter.getCrashesDirectory()`
@@ -198,12 +60,12 @@ app.getPath('crashDumps')
 The following `crashReporter` methods are no longer available in the renderer
 process:

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

 They should be called only from the main process.

@@ -254,7 +116,6 @@ shell.trashItem(path).then(/* ... */)
 ## Planned Breaking API Changes (11.0)

 ### Removed: `BrowserView.{destroy, fromId, fromWebContents, getAllViews}` and `id` property of `BrowserView`
-
 The experimental APIs `BrowserView.{destroy, fromId, fromWebContents, getAllViews}`
 have now been removed. Additionally, the `id` property of `BrowserView`
 has also been removed.
@@ -294,12 +155,12 @@ app.getPath('crashDumps')
 Calling the following `crashReporter` methods from the renderer process is
 deprecated:

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

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

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

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

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

 The APIs are now synchronous and the optional callback is no longer needed.
@@ -415,7 +266,6 @@ For more detailed information see [#18397](https://github.com/electron/electron/
 ### Deprecated: `BrowserWindow` extension APIs

 The following extension APIs have been deprecated:
-
 * `BrowserWindow.addExtension(path)`
 * `BrowserWindow.addDevToolsExtension(path)`
 * `BrowserWindow.removeExtension(name)`
@@ -424,7 +274,6 @@ The following extension APIs have been deprecated:
 * `BrowserWindow.getDevToolsExtensions()`

 Use the session APIs instead:
-
 * `ses.loadExtension(path)`
 * `ses.removeExtension(extension_id)`
 * `ses.getAllExtensions()`
@@ -505,7 +354,7 @@ Clone Algorithm][SCA], the same algorithm used to serialize messages for
 `postMessage`. This brings about a 2x performance improvement for large
 messages, but also brings some breaking changes in behavior.

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

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

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

@@ -602,7 +451,6 @@ limits are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
 ### Deprecated events in `systemPreferences`

 The following `systemPreferences` events have been deprecated:
-
 * `inverted-color-scheme-changed`
 * `high-contrast-color-scheme-changed`

@@ -620,13 +468,11 @@ nativeTheme.on('updated', () => { /* ... */ })
 ### Deprecated: methods in `systemPreferences`

 The following `systemPreferences` methods have been deprecated:
-
 * `systemPreferences.isDarkMode()`
 * `systemPreferences.isInvertedColorScheme()`
 * `systemPreferences.isHighContrastColorScheme()`

 Use the following `nativeTheme` properties instead:
-
 * `nativeTheme.shouldUseDarkColors`
 * `nativeTheme.shouldUseInvertedColorScheme`
 * `nativeTheme.shouldUseHighContrastColors`
@@ -747,55 +593,6 @@ Note that `webkitdirectory` no longer exposes the path to the selected folder.
 If you require the path to the selected folder rather than the folder contents,
 see the `dialog.showOpenDialog` API ([link](https://github.com/electron/electron/blob/master/docs/api/dialog.md#dialogshowopendialogbrowserwindow-options)).

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

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

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

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

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

 The following list includes the breaking API changes made in Electron 4.0.
--- a/docs/development/build-instructions-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -86,6 +86,8 @@ $ gclient sync -f
 ```sh
 $ cd src
 $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
+# this next line is needed only if building with sccache
+$ export GN_EXTRA_ARGS="${GN_EXTRA_ARGS} cc_wrapper=\"${PWD}/electron/external_binaries/sccache\""
 $ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EXTRA_ARGS"
 ```

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

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

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

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

 See the GN reference for allowable values of [`target_os`][target_os values]
--- a/docs/development/build-instructions-linux.md
+++ b/docs/development/build-instructions-linux.md
@@ -55,15 +55,6 @@ $ sudo dnf install clang dbus-devel gtk3-devel libnotify-devel \
                   nss-devel python-dbusmock openjdk-8-jre
 ```

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

--- a/docs/development/build-instructions-macos.md
+++ b/docs/development/build-instructions-macos.md
@@ -42,7 +42,7 @@ $ pip install pyobjc
 If you're developing Electron and don't plan to redistribute your
 custom Electron build, you may skip this section.

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

 ## Building Electron

--- a/docs/development/coding-style.md
+++ b/docs/development/coding-style.md
@@ -66,11 +66,11 @@ formatted correctly.

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

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

 When creating a new API, it is preferred to use getters and setters instead of
--- a/docs/development/issues.md
+++ b/docs/development/issues.md
@@ -33,7 +33,8 @@ contributing, and more. Please use the issue tracker for bugs only!
 To submit a bug report:

 When opening a new issue in the [`electron/electron` issue tracker](https://github.com/electron/electron/issues/new/choose), users
-will be presented with a template that should be filled in.
+will be presented with [a template](https://github.com/electron/electron/blob/master/.github/ISSUE_TEMPLATE/Bug_report.md)
+that should be filled in.

 If you believe that you have found a bug in Electron, please fill out the template
 to the best of your ability.
--- a/docs/development/pull-requests.md
+++ b/docs/development/pull-requests.md
@@ -36,9 +36,9 @@ $ git fetch upstream
 Build steps and dependencies differ slightly depending on your operating system.
 See these detailed guides on building Electron locally:

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

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

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

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

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

 Examples of commit messages with semantic prefixes:

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

 Common prefixes:

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

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

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

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

--- a/docs/fiddles/quick-start/index.html
+++ b/docs/fiddles/quick-start/index.html
@@ -8,9 +8,9 @@
 <body>
    <h1>Hello World!</h1>
    <p>
-        We are using Node.js <span id="node-version"></span>,
-        Chromium <span id="chrome-version"></span>,
-        and Electron <span id="electron-version"></span>.
+        We are using node <script>document.write(process.versions.node)</script>,
+        Chrome <script>document.write(process.versions.chrome)</script>,
+        and Electron <script>document.write(process.versions.electron)</script>.
    </p>
 </body>
 </html>
--- a/docs/fiddles/quick-start/main.js
+++ b/docs/fiddles/quick-start/main.js
@@ -1,27 +1,18 @@
 const { app, BrowserWindow } = require('electron')
-const path = require('path')

 function createWindow () {
  const win = new BrowserWindow({
    width: 800,
    height: 600,
    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      nodeIntegration: true
    }
  })

  win.loadFile('index.html')
 }

-app.whenReady().then(() => {
-  createWindow()
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) {
-      createWindow()
-    }
-  })
-})
+app.whenReady().then(createWindow)

 app.on('window-all-closed', () => {
  if (process.platform !== 'darwin') {
@@ -29,3 +20,8 @@ app.on('window-all-closed', () => {
  }
 })

+app.on('activate', () => {
+  if (BrowserWindow.getAllWindows().length === 0) {
+    createWindow()
+  }
+})
--- a/docs/fiddles/quick-start/preload.js
+++ b/docs/fiddles/quick-start/preload.js
@@ -1,11 +0,0 @@
-window.addEventListener('DOMContentLoaded', () => {
-  const replaceText = (selector, text) => {
-    const element = document.getElementById(selector)
-    if (element) element.innerText = text
-  }
-
-  for (const type of ['chrome', 'node', 'electron']) {
-    replaceText(`${type}-version`, process.versions[type])
-  }
-})
-
--- a/docs/styleguide.md
+++ b/docs/styleguide.md
@@ -49,7 +49,6 @@ For API references, there are exceptions to this rule.
 * No nesting lists more than 2 levels (due to the markdown renderer).
 * All `js` and `javascript` code blocks are linted with
 [standard-markdown](https://www.npmjs.com/package/standard-markdown).
-* For unordered lists, use asterisks instead of dashes

 ## Picking words

--- a/docs/tutorial/application-debugging.md
+++ b/docs/tutorial/application-debugging.md
@@ -43,6 +43,6 @@ If the V8 context crashes, the DevTools will display this message.

 `DevTools was disconnected from the page. Once page is reloaded, DevTools will automatically reconnect.`

-Chromium logs can be enabled via the `ELECTRON_ENABLE_LOGGING` environment variable. For more information, see the [environment variables documentation](../api/environment-variables.md#electron_enable_logging).
+Chromium logs can be enabled via the `ELECTRON_ENABLE_LOGGING` environment variable. For more information, see the [environment variables documentation](https://www.electronjs.org/docs/api/environment-variables#electron_enable_logging).

-Alternatively, the command line argument `--enable-logging` can be passed. More information is available in the [command line switches documentation](../api/command-line-switches.md#--enable-logging).
+Alternatively, the command line argument `--enable-logging` can be passed. More information is available in the [command line switches documentation](https://www.electronjs.org/docs/api/command-line-switches#--enable-logging).
--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -1,38 +1,25 @@
 # Application Distribution

-## Overview
-
-To distribute your app with Electron, you need to package and rebrand it.
-To do this, you can either use specialized tooling or manual approaches.
-
-## With tooling
-
-You can use the following tools to distribute your application:
+To distribute your app with Electron, you need to package and rebrand it. The easiest way to do this is to use one of the following third party packaging tools:

 * [electron-forge](https://github.com/electron-userland/electron-forge)
 * [electron-builder](https://github.com/electron-userland/electron-builder)
 * [electron-packager](https://github.com/electron/electron-packager)

-These tools will take care of all the steps you need to take to end up with a
-distributable Electron application, such as bundling your application,
-rebranding the executable, and setting the right icons.
-
-You can check the example of how to package your app with `electron-forge` in
-our [Quick Start Guide](quick-start.md#package-and-distribute-the-application).
+These tools will take care of all the steps you need to take to end up with a distributable Electron applications, such as packaging your application, rebranding the executable, setting the right icons and optionally creating installers.

 ## Manual distribution

-### With prebuilt binaries
+You can also choose to manually get your app ready for distribution. The steps needed to do this are outlined below.

-To distribute your app manually, you need to download Electron's [prebuilt
+To distribute your app with Electron, you need to download Electron's [prebuilt
 binaries](https://github.com/electron/electron/releases). Next, the folder
 containing your app should be named `app` and placed in Electron's resources
-directory as shown in the following examples.
+directory as shown in the following examples. Note that the location of
+Electron's prebuilt binaries is indicated with `electron/` in the examples
+below.

-> *NOTE:* the location of Electron's prebuilt binaries is indicated
-with `electron/` in the examples below.
-
-*On macOS:*
+On macOS:

 ```plaintext
 electron/Electron.app/Contents/Resources/app/
@@ -41,7 +28,7 @@ electron/Electron.app/Contents/Resources/app/
 └── index.html
 ```

-*On Windows and Linux:*
+On Windows and Linux:

 ```plaintext
 electron/resources/app
@@ -50,44 +37,47 @@ electron/resources/app
 └── index.html
 ```

-Then execute `Electron.app` on macOS, `electron` on Linux, or `electron.exe`
-on Windows, and Electron will start as your app. The `electron` directory
-will then be your distribution to deliver to users.
+Then execute `Electron.app` (or `electron` on Linux, `electron.exe` on Windows),
+and Electron will start as your app. The `electron` directory will then be
+your distribution to deliver to final users.

-### With an app source code archive
+## Packaging Your App into a File

-Instead of from shipping your app by copying all of its source files, you can
-package your app into an [asar] archive to improve the performance of reading
-files on platforms like Windows, if you are not already using a bundler such
-as Parcel or Webpack.
+Apart from shipping your app by copying all of its source files, you can also
+package your app into an [asar](https://github.com/electron/asar) archive to avoid
+exposing your app's source code to users.

 To use an `asar` archive to replace the `app` folder, you need to rename the
 archive to `app.asar`, and put it under Electron's resources directory like
 below, and Electron will then try to read the archive and start from it.

-*On macOS:*
+On macOS:

 ```plaintext
 electron/Electron.app/Contents/Resources/
 └── app.asar
 ```

-*On Windows and Linux:*
+On Windows and Linux:

 ```plaintext
 electron/resources/
 └── app.asar
 ```

-You can find more details on how to use `asar` in the
-[`electron/asar` repository][asar].
+More details can be found in [Application packaging](application-packaging.md).

-### Rebranding with downloaded binaries
+## Rebranding with Downloaded Binaries

 After bundling your app into Electron, you will want to rebrand Electron
 before distributing it to users.

-#### macOS
+### Windows
+
+You can rename `electron.exe` to any name you like, and edit its icon and other
+information with tools like [rcedit](https://github.com/electron/rcedit).
+
+### macOS

 You can rename `Electron.app` to any name you want, and you also have to rename
 the `CFBundleDisplayName`, `CFBundleIdentifier` and `CFBundleName` fields in the
@@ -114,20 +104,60 @@ MyApp.app/Contents
            └── MyApp Helper
 ```

-#### Windows
-
-You can rename `electron.exe` to any name you like, and edit its icon and other
-information with tools like [rcedit](https://github.com/electron/rcedit).
-
-#### Linux
+### Linux

 You can rename the `electron` executable to any name you like.

-### Rebranding by rebuilding Electron from source
+## Rebranding by Rebuilding Electron from Source

 It is also possible to rebrand Electron by changing the product name and
 building it from source. To do this you need to set the build argument
 corresponding to the product name (`electron_product_name = "YourProductName"`)
 in the `args.gn` file and rebuild.

-[asar]: https://github.com/electron/asar
+### Creating a Custom Electron Fork
+
+Creating a custom fork of Electron is almost certainly not something you will
+need to do in order to build your app, even for "Production Level" applications.
+Using a tool such as `electron-packager` or `electron-forge` will allow you to
+"Rebrand" Electron without having to do these steps.
+
+You need to fork Electron when you have custom C++ code that you have patched
+directly into Electron, that either cannot be upstreamed, or has been rejected
+from the official version. As maintainers of Electron, we very much would like
+to make your scenario work, so please try as hard as you can to get your changes
+into the official version of Electron, it will be much much easier on you, and
+we appreciate your help.
+
+#### Creating a Custom Release with surf-build
+
+1. Install [Surf](https://github.com/surf-build/surf), via npm:
+  `npm install -g surf-build@latest`
+
+2. Create a new S3 bucket and create the following empty directory structure:
+
+    ```sh
+    - electron/
+      - symbols/
+      - dist/
+    ```
+
+3. Set the following Environment Variables:
+
+   * `ELECTRON_GITHUB_TOKEN` - a token that can create releases on GitHub
+   * `ELECTRON_S3_ACCESS_KEY`, `ELECTRON_S3_BUCKET`, `ELECTRON_S3_SECRET_KEY` -
+     the place where you'll upload Node.js headers as well as symbols
+   * `ELECTRON_RELEASE` - Set to `true` and the upload part will run, leave unset
+     and `surf-build` will do CI-type checks, appropriate to run for every
+     pull request.
+   * `CI` - Set to `true` or else it will fail
+   * `GITHUB_TOKEN` - set it to the same as `ELECTRON_GITHUB_TOKEN`
+   * `SURF_TEMP` - set to `C:\Temp` on Windows to prevent path too long issues
+   * `TARGET_ARCH` - set to `ia32` or `x64`
+
+4. In `script/upload.py`, you _must_ set `ELECTRON_REPO` to your fork (`MYORG/electron`),
+  especially if you are a contributor to Electron proper.
+
+5. `surf-build -r https://github.com/MYORG/electron -s YOUR_COMMIT -n 'surf-PLATFORM-ARCH'`
+
+6. Wait a very, very long time for the build to complete.
--- a/docs/tutorial/application-packaging.md
+++ b/docs/tutorial/application-packaging.md
@@ -0,0 +1,194 @@
+# Application Packaging
+
+To mitigate [issues](https://github.com/joyent/node/issues/6960) around long
+path names on Windows, slightly speed up `require` and conceal your source code
+from cursory inspection, you can choose to package your app into an [asar][asar]
+archive with little changes to your source code.
+
+Most users will get this feature for free, since it's supported out of the box
+by [`electron-packager`][electron-packager], [`electron-forge`][electron-forge],
+and [`electron-builder`][electron-builder]. If you are not using any of these
+tools, read on.
+
+## Generating `asar` Archives
+
+An [asar][asar] archive is a simple tar-like format that concatenates files
+into a single file. Electron can read arbitrary files from it without unpacking
+the whole file.
+
+Steps to package your app into an `asar` archive:
+
+### 1. Install the asar Utility
+
+```sh
+$ npm install -g asar
+```
+
+### 2. Package with `asar pack`
+
+```sh
+$ asar pack your-app app.asar
+```
+
+## Using `asar` Archives
+
+In Electron there are two sets of APIs: Node APIs provided by Node.js and Web
+APIs provided by Chromium. Both APIs support reading files from `asar` archives.
+
+### Node API
+
+With special patches in Electron, Node APIs like `fs.readFile` and `require`
+treat `asar` archives as virtual directories, and the files in it as normal
+files in the filesystem.
+
+For example, suppose we have an `example.asar` archive under `/path/to`:
+
+```sh
+$ asar list /path/to/example.asar
+/app.js
+/file.txt
+/dir/module.js
+/static/index.html
+/static/main.css
+/static/jquery.min.js
+```
+
+Read a file in the `asar` archive:
+
+```javascript
+const fs = require('fs')
+fs.readFileSync('/path/to/example.asar/file.txt')
+```
+
+List all files under the root of the archive:
+
+```javascript
+const fs = require('fs')
+fs.readdirSync('/path/to/example.asar')
+```
+
+Use a module from the archive:
+
+```javascript
+require('./path/to/example.asar/dir/module.js')
+```
+
+You can also display a web page in an `asar` archive with `BrowserWindow`:
+
+```javascript
+const { BrowserWindow } = require('electron')
+const win = new BrowserWindow()
+
+win.loadURL('file:///path/to/example.asar/static/index.html')
+```
+
+### Web API
+
+In a web page, files in an archive can be requested with the `file:` protocol.
+Like the Node API, `asar` archives are treated as directories.
+
+For example, to get a file with `$.get`:
+
+```html
+<script>
+let $ = require('./jquery.min.js')
+$.get('file:///path/to/example.asar/file.txt', (data) => {
+  console.log(data)
+})
+</script>
+```
+
+### Treating an `asar` Archive as a Normal File
+
+For some cases like verifying the `asar` archive's checksum, we need to read the
+content of an `asar` archive as a file. For this purpose you can use the built-in
+`original-fs` module which provides original `fs` APIs without `asar` support:
+
+```javascript
+const originalFs = require('original-fs')
+originalFs.readFileSync('/path/to/example.asar')
+```
+
+You can also set `process.noAsar` to `true` to disable the support for `asar` in
+the `fs` module:
+
+```javascript
+const fs = require('fs')
+process.noAsar = true
+fs.readFileSync('/path/to/example.asar')
+```
+
+## Limitations of the Node API
+
+Even though we tried hard to make `asar` archives in the Node API work like
+directories as much as possible, there are still limitations due to the
+low-level nature of the Node API.
+
+### Archives Are Read-only
+
+The archives can not be modified so all Node APIs that can modify files will not
+work with `asar` archives.
+
+### Working Directory Can Not Be Set to Directories in Archive
+
+Though `asar` archives are treated as directories, there are no actual
+directories in the filesystem, so you can never set the working directory to
+directories in `asar` archives. Passing them as the `cwd` option of some APIs
+will also cause errors.
+
+### Extra Unpacking on Some APIs
+
+Most `fs` APIs can read a file or get a file's information from `asar` archives
+without unpacking, but for some APIs that rely on passing the real file path to
+underlying system calls, Electron will extract the needed file into a
+temporary file and pass the path of the temporary file to the APIs to make them
+work. This adds a little overhead for those APIs.
+
+APIs that requires extra unpacking are:
+
+* `child_process.execFile`
+* `child_process.execFileSync`
+* `fs.open`
+* `fs.openSync`
+* `process.dlopen` - Used by `require` on native modules
+
+### Fake Stat Information of `fs.stat`
+
+The `Stats` object returned by `fs.stat` and its friends on files in `asar`
+archives is generated by guessing, because those files do not exist on the
+filesystem. So you should not trust the `Stats` object except for getting file
+size and checking file type.
+
+### Executing Binaries Inside `asar` Archive
+
+There are Node APIs that can execute binaries like `child_process.exec`,
+`child_process.spawn` and `child_process.execFile`, but only `execFile` is
+supported to execute binaries inside `asar` archive.
+
+This is because `exec` and `spawn` accept `command` instead of `file` as input,
+and `command`s are executed under shell. There is no reliable way to determine
+whether a command uses a file in asar archive, and even if we do, we can not be
+sure whether we can replace the path in command without side effects.
+
+## Adding Unpacked Files to `asar` Archives
+
+As stated above, some Node APIs will unpack the file to the filesystem when
+called. Apart from the performance issues, various anti-virus scanners might
+be triggered by this behavior.
+
+As a workaround, you can leave various files unpacked using the `--unpack` option.
+In the following example, shared libraries of native Node.js modules will not be
+packed:
+
+```sh
+$ asar pack app app.asar --unpack *.node
+```
+
+After running the command, you will notice that a folder named `app.asar.unpacked`
+was created together with the `app.asar` file. It contains the unpacked files
+and should be shipped together with the `app.asar` archive.
+
+[asar]: https://github.com/electron/asar
+[electron-packager]: https://github.com/electron/electron-packager
+[electron-forge]: https://github.com/electron-userland/electron-forge
+[electron-builder]: https://github.com/electron-userland/electron-builder
--- a/docs/tutorial/code-signing.md
+++ b/docs/tutorial/code-signing.md
@@ -189,18 +189,18 @@ You can get a code signing certificate from a lot of resellers. Prices vary, so
 it may be worth your time to shop around. Popular resellers include:

 * [digicert](https://www.digicert.com/code-signing/microsoft-authenticode.htm)
-* [Sectigo](https://sectigo.com/ssl-certificates-tls/code-signing)
+* [Comodo](https://www.comodo.com/landing/ssl-certificate/authenticode-signature/)
 * [GoDaddy](https://au.godaddy.com/web-security/code-signing-certificate)
 * Amongst others, please shop around to find one that suits your needs, Google
  is your friend 😄

 There are a number of tools for signing your packaged app:

-* [`electron-winstaller`] will generate an installer for windows and sign it for
+- [`electron-winstaller`] will generate an installer for windows and sign it for
  you
-* [`electron-forge`] can sign installers it generates through the
+- [`electron-forge`] can sign installers it generates through the
  Squirrel.Windows or MSI targets.
-* [`electron-builder`] can sign some of its windows targets
+- [`electron-builder`] can sign some of its windows targets

 ## Windows Store

--- a/docs/tutorial/dark-mode.md
+++ b/docs/tutorial/dark-mode.md
@@ -19,7 +19,7 @@ the system's dark mode setting. You can do this by using the

 If you want to manually switch between light/dark modes, you can do this by
 setting the desired mode in the
-[themeSource](../api/native-theme.md#nativethemethemesource)
+[themeSource](https://www.electronjs.org/docs/api/native-theme#nativethemethemesource)
 property of the `nativeTheme` module. This property's value will be propagated
 to your Renderer process. Any CSS rules related to `prefers-color-scheme` will
 be updated accordingly.
@@ -96,7 +96,7 @@ color scheme, and update the "Current Theme Source" label to `System`.

 To add listeners and handlers, add the following lines to the `renderer.js` file:

-```javascript
+```js
 const { ipcRenderer } = require('electron')

 document.getElementById('toggle-dark-mode').addEventListener('click', async () => {
@@ -130,7 +130,7 @@ active using the `nativeTheme.shouldUseDarkColors` property, and set the
 `themeSource` to the opposite theme.
 * Upon receiving `dark-mode:system`, we reset the `themeSource` to `system`.

-```javascript
+```js
 const { app, BrowserWindow, ipcMain, nativeTheme } = require('electron')

 function createWindow () {
@@ -154,7 +154,7 @@ function createWindow () {
  })

  ipcMain.handle('dark-mode:system', () => {
-    nativeTheme.themeSource = 'system'
+    nativeTheme.themeSouce = 'system'
  })
 }

@@ -180,7 +180,7 @@ attribute. The value of `prefers-color-scheme` will follow your

 Create a `styles.css` file and add the following lines:

-```css fiddle='docs/fiddles/features/macos-dark-mode'
+```css
@media (prefers-color-scheme: dark) {
  body { background:  #333; color: white; }
 }
--- a/docs/tutorial/debugging-vscode.md
+++ b/docs/tutorial/debugging-vscode.md
@@ -35,6 +35,7 @@ $ code electron-quick-start
 }
 ```

+
 #### 3. Debugging

 Set some breakpoints in `main.js`, and start debugging in the [Debug View](https://code.visualstudio.com/docs/editor/debugging). You should be able to hit the breakpoints.
@@ -83,16 +84,16 @@ $ code electron-quick-start
  ]
 }
 ```
-
 **Configuration Notes**

-* `cppvsdbg` requires the [built-in C/C++ extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools) be enabled.
-* `${workspaceFolder}` is the full path to Chromium's `src` directory.
-* `your-executable-location` will be one of the following depending on a few items:
-  * `Testing`: If you are using the default settings of [Electron's Build-Tools](https://github.com/electron/build-tools) or the default instructions when [building from source](https://www.electronjs.org/docs/development/build-instructions-gn#building).
-  * `Release`: If you built a Release build rather than a Testing build.
-  * `your-directory-name`: If you modified this during your build process from the default, this will be whatever you specified.
-* The `args` array string `"your-electron-project-path"` should be the absolute path to either the directory or `main.js` file of the Electron project you are using for testing. In this example, it should be your path to `electron-quick-start`.
+- `cppvsdbg` requires the [built-in C/C++ extension](https://marketplace.visualstudio.com/items?itemName=ms-vscode.cpptools) be enabled.
+- `${workspaceFolder}` is the full path to Chromium's `src` directory.
+- `your-executable-location` will be one of the following depending on a few items:
+  -  `Testing`: If you are using the default settings of [Electron's Build-Tools](https://github.com/electron/build-tools) or the default instructions when [building from source](https://www.electronjs.org/docs/development/build-instructions-gn#building).
+  -  `Release`: If you built a Release build rather than a Testing build.
+  -  `your-directory-name`: If you modified this during your build process from the default, this will be whatever you specified.
+- The `args` array string `"your-electron-project-path"` should be the absolute path to either the directory or `main.js` file of the Electron project you are using for testing. In this example, it should be your path to `electron-quick-start`.
+

 #### 3. Debugging

--- a/docs/tutorial/devtools-extension.md
+++ b/docs/tutorial/devtools-extension.md
@@ -32,7 +32,6 @@ Using the [React Developer Tools][react-devtools] as an example:
   * on macOS it is `~/Library/Application Support/Google/Chrome/Default/Extensions`.
 1. Pass the location of the extension to the [`ses.loadExtension`][load-extension]
   API. For React Developer Tools `v4.9.0`, it looks something like:
-
   ```javascript
    const { app, session } = require('electron')
    const path = require('path')
@@ -97,7 +96,7 @@ of the extension is not working as expected.
 [devtools-extension]: https://developer.chrome.com/extensions/devtools
 [session]: ../api/session.md
 [react-devtools]: https://chrome.google.com/webstore/detail/react-developer-tools/fmkadmapgofadopljbjfkapdkoienihi
-[load-extension]: ../api/session.md#sesloadextensionpath-options
+[load-extension]: ../api/session.md#sesloadextensionpath
 [extension-structure]: ../api/structures/extension.md
 [remove-extension]: ../api/session.md#sesremoveextensionextensionid
 [electron-devtools-installer]: https://github.com/MarshallOfSound/electron-devtools-installer
--- a/docs/tutorial/electron-timelines.md
+++ b/docs/tutorial/electron-timelines.md
@@ -18,5 +18,4 @@
 | 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 |
+| 12.0.0 | 2020-11-19 | 2021-03-02 | M89 | v14.x |
--- a/docs/tutorial/electron-versioning.md
+++ b/docs/tutorial/electron-versioning.md
@@ -2,7 +2,7 @@

 > A detailed look at our versioning policy and implementation.

-As of version 2.0.0, Electron follows [SemVer](#semver). The following command will install the most recent stable build of Electron:
+As of version 2.0.0, Electron follows [semver](#semver). The following command will install the most recent stable build of Electron:

 ```sh
 npm install --save-dev electron
@@ -16,11 +16,11 @@ npm install --save-dev electron@latest

 ## Version 1.x

-Electron versions *< 2.0* did not conform to the [SemVer](https://semver.org) spec: major versions corresponded to end-user API changes, minor versions corresponded to Chromium major releases, and patch versions corresponded to new features and bug fixes. While convenient for developers merging features, it creates problems for developers of client-facing applications. The QA testing cycles of major apps like Slack, Stride, Teams, Skype, VS Code, Atom, and Desktop can be lengthy and stability is a highly desired outcome. There is a high risk in adopting new features while trying to absorb bug fixes.
+Electron versions *< 2.0* did not conform to the [semver](https://semver.org) spec: major versions corresponded to end-user API changes, minor versions corresponded to Chromium major releases, and patch versions corresponded to new features and bug fixes. While convenient for developers merging features, it creates problems for developers of client-facing applications. The QA testing cycles of major apps like Slack, Stride, Teams, Skype, VS Code, Atom, and Desktop can be lengthy and stability is a highly desired outcome. There is a high risk in adopting new features while trying to absorb bug fixes.

 Here is an example of the 1.x strategy:

-![1.x Versioning](../images/versioning-sketch-0.png)
+![](../images/versioning-sketch-0.png)

 An app developed with `1.8.1` cannot take the `1.8.3` bug fix without either absorbing the `1.8.2` feature, or by backporting the fix and maintaining a new release line.

@@ -28,7 +28,7 @@ An app developed with `1.8.1` cannot take the `1.8.3` bug fix without either abs

 There are several major changes from our 1.x strategy outlined below. Each change is intended to satisfy the needs and priorities of developers/maintainers and app developers.

-1. Strict use of SemVer
+1. Strict use of semver
 2. Introduction of semver-compliant `-beta` tags
 3. Introduction of [conventional commit messages](https://conventionalcommits.org/)
 4. Well-defined stabilization branches
@@ -36,11 +36,11 @@ There are several major changes from our 1.x strategy outlined below. Each chang

 We will cover in detail how git branching works, how npm tagging works, what developers should expect to see, and how one can backport changes.

-# SemVer
+# semver

-From 2.0 onward, Electron will follow SemVer.
+From 2.0 onward, Electron will follow semver.

-Below is a table explicitly mapping types of changes to their corresponding category of SemVer (e.g. Major, Minor, Patch).
+Below is a table explicitly mapping types of changes to their corresponding category of semver (e.g. Major, Minor, Patch).

 | Major Version Increments        | Minor Version Increments           | Patch Version Increments      |
 | ------------------------------- | ---------------------------------- | ----------------------------- |
@@ -54,12 +54,12 @@ Note that most Chromium updates will be considered breaking. Fixes that can be b

 Stabilization branches are branches that run parallel to master, taking in only cherry-picked commits that are related to security or stability. These branches are never merged back to master.

-![Stabilization Branches](../images/versioning-sketch-1.png)
+![](../images/versioning-sketch-1.png)

 Since Electron 8, stabilization branches are always **major** version lines, and named against the following template `$MAJOR-x-y` e.g. `8-x-y`.  Prior to that we used **minor** version lines and named them as `$MAJOR-$MINOR-x` e.g. `2-0-x`

 We allow for multiple stabilization branches to exist simultaneously, and intend to support at least two in parallel at all times, backporting security fixes as necessary.
-![Multiple Stability Branches](../images/versioning-sketch-2.png)
+![](../images/versioning-sketch-2.png)

 Older lines will not be supported by GitHub, but other groups can take ownership and backport stability and security fixes on their own. We discourage this, but recognize that it makes life easier for many app developers.

@@ -70,13 +70,13 @@ Developers want to know which releases are _safe_ to use. Even seemingly innocen
 * Use `~2.0.0` to admit only stability or security related fixes to your `2.0.0` release.
 * Use `^2.0.0` to admit non-breaking _reasonably stable_ feature work as well as security and bug fixes.

-What’s important about the second point is that apps using `^` should still be able to expect a reasonable level of stability. To accomplish this, SemVer allows for a _pre-release identifier_ to indicate a particular version is not yet _safe_ or _stable_.
+What’s important about the second point is that apps using `^` should still be able to expect a reasonable level of stability. To accomplish this, semver allows for a _pre-release identifier_ to indicate a particular version is not yet _safe_ or _stable_.

 Whatever you choose, you will periodically have to bump the version in your `package.json` as breaking changes are a fact of Chromium life.

 The process is as follows:

-1. All new major and minor releases lines begin with a beta series indicated by SemVer prerelease tags of `beta.N`, e.g. `2.0.0-beta.1`. After the first beta, subsequent beta releases must meet all of the following conditions:
+1. All new major and minor releases lines begin with a beta series indicated by semver prerelease tags of `beta.N`, e.g. `2.0.0-beta.1`. After the first beta, subsequent beta releases must meet all of the following conditions:
    1. The change is backwards API-compatible (deprecations are allowed)
    2. The risk to meeting our stability timeline must be low.
 2. If allowed changes need to be made once a release is beta, they are applied and the prerelease tag is incremented, e.g. `2.0.0-beta.2`.
@@ -86,7 +86,7 @@ e.g. `2.0.1`.

 Specifically, the above means:

-1. Admitting non-breaking-API changes before Week 3 in the beta cycle is okay, even if those changes have the potential to cause moderate side-effects.
+1. Admitting non-breaking-API changes before Week 3 in the beta cycle is okay, even if those changes have the potential to cause moderate side-effects
 2. Admitting feature-flagged changes, that do not otherwise alter existing code paths, at most points in the beta cycle is okay. Users can explicitly enable those flags in their apps.
 3. Admitting features of any sort after Week 3 in the beta cycle is 👎 without a very good reason.

@@ -104,17 +104,17 @@ For each major and minor bump, you should expect to see something like the follo
 An example lifecycle in pictures:

 * A new release branch is created that includes the latest set of features. It is published as `2.0.0-beta.1`.
-![New Release Branch](../images/versioning-sketch-3.png)
+![](../images/versioning-sketch-3.png)
 * A bug fix comes into master that can be backported to the release branch. The patch is applied, and a new beta is published as `2.0.0-beta.2`.
-![Bugfix Backport to Beta](../images/versioning-sketch-4.png)
+![](../images/versioning-sketch-4.png)
 * The beta is considered _generally stable_ and it is published again as a non-beta under `2.0.0`.
-![Beta to Stable](../images/versioning-sketch-5.png)
+![](../images/versioning-sketch-5.png)
 * Later, a zero-day exploit is revealed and a fix is applied to master. We backport the fix to the `2-0-x` line and release `2.0.1`.
-![Security Backports](../images/versioning-sketch-6.png)
+![](../images/versioning-sketch-6.png)

-A few examples of how various SemVer ranges will pick up new releases:
+A few examples of how various semver ranges will pick up new releases:

-![Semvers and Releases](../images/versioning-sketch-7.png)
+![](../images/versioning-sketch-7.png)

 # Missing Features: Alphas

@@ -136,16 +136,16 @@ Feature flags are a common practice in Chromium, and are well-established in the

 We seek to increase clarity at all levels of the update and releases process. Starting with `2.0.0` we will require pull requests adhere to the [Conventional Commits](https://conventionalcommits.org/) spec, which can be summarized as follows:

-* Commits that would result in a SemVer **major** bump must start their body with `BREAKING CHANGE:`.
-* Commits that would result in a SemVer **minor** bump must start with `feat:`.
-* Commits that would result in a SemVer **patch** bump must start with `fix:`.
+* Commits that would result in a semver **major** bump must start their body with `BREAKING CHANGE:`.
+* Commits that would result in a semver **minor** bump must start with `feat:`.
+* Commits that would result in a semver **patch** bump must start with `fix:`.

 * We allow squashing of commits, provided that the squashed message adheres to the above message format.
 * It is acceptable for some commits in a pull request to not include a semantic prefix, as long as the pull request title contains a meaningful encompassing semantic message.

 # Versioned `master`

-* The `master` branch will always contain the next major version `X.0.0-nightly.DATE` in its `package.json`
-* Release branches are never merged back to master
-* Release branches _do_ contain the correct version in their `package.json`
-* As soon as a release branch is cut for a major, master must be bumped to the next major.  I.e. `master` is always versioned as the next theoretical release branch
+- The `master` branch will always contain the next major version `X.0.0-nightly.DATE` in its `package.json`
+- Release branches are never merged back to master
+- Release branches _do_ contain the correct version in their `package.json`
+- As soon as a release branch is cut for a major, master must be bumped to the next major.  I.e. `master` is always versioned as the next theoretical release branch
--- a/docs/tutorial/keyboard-shortcuts.md
+++ b/docs/tutorial/keyboard-shortcuts.md
@@ -17,7 +17,7 @@ Starting with a working application from the
 [Quick Start Guide](quick-start.md), update the `main.js` file with the
 following lines:

-```javascript fiddle='docs/fiddles/features/keyboard-shortcuts/local'
+```js
 const { Menu, MenuItem } = require('electron')

 const menu = new Menu()
@@ -56,7 +56,7 @@ Starting with a working application from the
 [Quick Start Guide](quick-start.md), update the `main.js` file with the
 following lines:

-```javascript fiddle='docs/fiddles/features/keyboard-shortcuts/global'
+```js
 const { app, globalShortcut } = require('electron')

 app.whenReady().then(() => {
@@ -101,7 +101,7 @@ Starting with a working application from the
 [Quick Start Guide](quick-start.md), update the `main.js` file with the
 following lines:

-```javascript fiddle='docs/fiddles/features/keyboard-shortcuts/interception-from-main'
+```js
 const { app, BrowserWindow } = require('electron')

 app.whenReady().then(() => {
--- a/docs/tutorial/macos-dock.md
+++ b/docs/tutorial/macos-dock.md
@@ -24,7 +24,7 @@ Starting with a working application from the
 [Quick Start Guide](quick-start.md), update the `main.js` file with the
 following lines:

-```javascript fiddle='docs/fiddles/features/macos-dock-menu'
+```javascript
 const { app, Menu } = require('electron')

 const dockMenu = Menu.buildFromTemplate([
--- a/docs/tutorial/message-ports.md
+++ b/docs/tutorial/message-ports.md
@@ -1,325 +0,0 @@
-# MessagePorts in Electron
-
-[`MessagePort`][]s are a web feature that allow passing messages between
-different contexts. It's like `window.postMessage`, but on different channels.
-The goal of this document is to describe how Electron extends the Channel
-Messaging model, and to give some examples of how you might use MessagePorts in
-your app.
-
-Here is a very brief example of what a MessagePort is and how it works:
-
-```js
-// renderer.js ///////////////////////////////////////////////////////////////
-// MessagePorts are created in pairs. A connected pair of message ports is
-// called a channel.
-const channel = new MessageChannel()
-
-// The only difference between port1 and port2 is in how you use them. Messages
-// sent to port1 will be received by port2 and vice-versa.
-const port1 = channel.port1
-const port2 = channel.port2
-
-// It's OK to send a message on the channel before the other end has registered
-// a listener. Messages will be queued until a listener is registered.
-port2.postMessage({ answer: 42 })
-
-// Here we send the other end of the channel, port1, to the main process. It's
-// also possible to send MessagePorts to other frames, or to Web Workers, etc.
-ipcRenderer.postMessage('port', null, [port1])
-```
-
-```js
-// main.js ///////////////////////////////////////////////////////////////////
-// In the main process, we receive the port.
-ipcMain.on('port', (event) => {
-  // When we receive a MessagePort in the main process, it becomes a
-  // MessagePortMain.
-  const port = event.ports[0]
-
-  // MessagePortMain uses the Node.js-style events API, rather than the
-  // web-style events API. So .on('message', ...) instead of .onmessage = ...
-  port.on('message', (event) => {
-    // data is { answer: 42 }
-    const data = event.data
-  })
-
-  // MessagePortMain queues messages until the .start() method has been called.
-  port.start()
-})
-```
-
-The [Channel Messaging API][] documentation is a great way to learn more about
-how MessagePorts work.
-
-## MessagePorts in the main process
-
-In the renderer, the `MessagePort` class behaves exactly as it does on the web.
-The main process is not a web page, though—it has no Blink integration—and so
-it does not have the `MessagePort` or `MessageChannel` classes. In order to
-handle and interact with MessagePorts in the main process, Electron adds two
-new classes: [`MessagePortMain`][] and [`MessageChannelMain`][]. These behave
-similarly to the analogous classes in the renderer.
-
-`MessagePort` objects can be created in either the renderer or the main
-process, and passed back and forth using the [`ipcRenderer.postMessage`][] and
-[`WebContents.postMessage`][] methods. Note that the usual IPC methods like
-`send` and `invoke` cannot be used to transfer `MessagePort`s, only the
-`postMessage` methods can transfer `MessagePort`s.
-
-By passing `MessagePort`s via the main process, you can connect two pages that
-might not otherwise be able to communicate (e.g. due to same-origin
-restrictions).
-
-## Extension: `close` event
-
-Electron adds one feature to `MessagePort` that isn't present on the web, in
-order to make MessagePorts more useful. That is the `close` event, which is
-emitted when the other end of the channel is closed. Ports can also be
-implicitly closed by being garbage-collected.
-
-In the renderer, you can listen for the `close` event either by assigning to
-`port.onclose` or by calling `port.addEventListener('close', ...)`. In the main
-process, you can listen for the `close` event by calling `port.on('close',
-...)`.
-
-## Example use cases
-
-### Worker process
-
-In this example, your app has a worker process implemented as a hidden window.
-You want the app page to be able to communicate directly with the worker
-process, without the performance overhead of relaying via the main process.
-
-```js
-// main.js ///////////////////////////////////////////////////////////////////
-const { BrowserWindow, app, ipcMain, MessageChannelMain } = require('electron')
-
-app.whenReady().then(async () => {
-  // The worker process is a hidden BrowserWindow, so that it will have access
-  // to a full Blink context (including e.g. <canvas>, audio, fetch(), etc.)
-  const worker = new BrowserWindow({
-    show: false,
-    webPreferences: { nodeIntegration: true }
-  })
-  await worker.loadFile('worker.html')
-
-  // The main window will send work to the worker process and receive results
-  // over a MessagePort.
-  const mainWindow = new BrowserWindow({
-    webPreferences: { nodeIntegration: true }
-  })
-  mainWindow.loadFile('app.html')
-
-  // We can't use ipcMain.handle() here, because the reply needs to transfer a
-  // MessagePort.
-  ipcMain.on('request-worker-channel', (event) => {
-    // For security reasons, let's make sure only the frames we expect can
-    // access the worker.
-    if (event.senderFrame === mainWindow.webContents.mainFrame) {
-      // Create a new channel ...
-      const { port1, port2 } = new MessageChannelMain()
-      // ... send one end to the worker ...
-      worker.webContents.postMessage('new-client', null, [port1])
-      // ... and the other end to the main window.
-      event.senderFrame.postMessage('provide-worker-channel', null, [port2])
-      // Now the main window and the worker can communicate with each other
-      // without going through the main process!
-    }
-  })
-})
-```
-
-```html
-<!-- worker.html ------------------------------------------------------------>
-<script>
-const { ipcRenderer } = require('electron')
-
-function doWork(input) {
-  // Something cpu-intensive.
-  return input * 2
-}
-
-// We might get multiple clients, for instance if there are multiple windows,
-// or if the main window reloads.
-ipcRenderer.on('new-client', (event) => {
-  const [ port ] = event.ports
-  port.onmessage = (event) => {
-    // The event data can be any serializable object (and the event could even
-    // carry other MessagePorts with it!)
-    const result = doWork(event.data)
-    port.postMessage(result)
-  }
-})
-</script>
-```
-
-```html
-<!-- app.html --------------------------------------------------------------->
-<script>
-const { ipcRenderer } = require('electron')
-
-// We request that the main process sends us a channel we can use to
-// communicate with the worker.
-ipcRenderer.send('request-worker-channel')
-
-ipcRenderer.once('provide-worker-channel', (event) => {
-  // Once we receive the reply, we can take the port...
-  const [ port ] = event.ports
-  // ... register a handler to receive results ...
-  port.onmessage = (event) => {
-    console.log('received result:', event.data)
-  }
-  // ... and start sending it work!
-  port.postMessage(21)
-})
-</script>
-```
-
-### Reply streams
-
-Electron's built-in IPC methods only support two modes: fire-and-forget
-(e.g. `send`), or request-response (e.g. `invoke`). Using MessageChannels, you
-can implement a "response stream", where a single request responds with a
-stream of data.
-
-```js
-// renderer.js ///////////////////////////////////////////////////////////////
-
-function makeStreamingRequest (element, callback) {
-  // MessageChannels are lightweight--it's cheap to create a new one for each
-  // request.
-  const { port1, port2 } = new MessageChannel()
-
-  // We send one end of the port to the main process ...
-  ipcRenderer.postMessage(
-    'give-me-a-stream',
-    { element, count: 10 },
-    [port2]
-  )
-
-  // ... and we hang on to the other end. The main process will send messages
-  // to its end of the port, and close it when it's finished.
-  port1.onmessage = (event) => {
-    callback(event.data)
-  }
-  port1.onclose = () => {
-    console.log('stream ended')
-  }
-}
-
-makeStreamingRequest(42, (data) => {
-  console.log('got response data:', event.data)
-})
-// We will see "got response data: 42" 10 times.
-```
-
-```js
-// main.js ///////////////////////////////////////////////////////////////////
-
-ipcMain.on('give-me-a-stream', (event, msg) => {
-  // The renderer has sent us a MessagePort that it wants us to send our
-  // response over.
-  const [replyPort] = event.ports
-
-  // Here we send the messages synchronously, but we could just as easily store
-  // the port somewhere and send messages asynchronously.
-  for (let i = 0; i < msg.count; i++) {
-    replyPort.postMessage(msg.element)
-  }
-
-  // We close the port when we're done to indicate to the other end that we
-  // won't be sending any more messages. This isn't strictly necessary--if we
-  // didn't explicitly close the port, it would eventually be garbage
-  // collected, which would also trigger the 'close' event in the renderer.
-  replyPort.close()
-})
-```
-
-### Communicating directly between the main process and the main world of a context-isolated page
-
-When [context isolation][] is enabled, IPC messages from the main process to
-the renderer are delivered to the isolated world, rather than to the main
-world. Sometimes you want to deliver messages to the main world directly,
-without having to step through the isolated world.
-
-```js
-// main.js ///////////////////////////////////////////////////////////////////
-const { BrowserWindow, app, MessageChannelMain } = require('electron')
-const path = require('path')
-
-app.whenReady().then(async () => {
-  // Create a BrowserWindow with contextIsolation enabled.
-  const bw = new BrowserWindow({
-    webPreferences: {
-      contextIsolation: true,
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-  bw.loadURL('index.html')
-
-  // We'll be sending one end of this channel to the main world of the
-  // context-isolated page.
-  const { port1, port2 } = new MessageChannelMain()
-
-  // It's OK to send a message on the channel before the other end has
-  // registered a listener. Messages will be queued until a listener is
-  // registered.
-  port2.postMessage({ test: 21 })
-
-  // We can also receive messages from the main world of the renderer.
-  port2.on('message', (event) => {
-    console.log('from renderer main world:', event.data)
-  })
-  port2.start()
-
-  // The preload script will receive this IPC message and transfer the port
-  // over to the main world.
-  bw.webContents.postMessage('main-world-port', null, [port1])
-})
-```
-
-```js
-// preload.js ////////////////////////////////////////////////////////////////
-const { ipcRenderer } = require('electron')
-
-// We need to wait until the main world is ready to receive the message before
-// sending the port. We create this promise in the preload so it's guaranteed
-// to register the onload listener before the load event is fired.
-const windowLoaded = new Promise(resolve => {
-  window.onload = resolve
-})
-
-ipcRenderer.on('main-world-port', async (event) => {
-  await windowLoaded
-  // We use regular window.postMessage to transfer the port from the isolated
-  // world to the main world.
-  window.postMessage('main-world-port', '*', event.ports)
-})
-```
-
-```html
-<!-- index.html ------------------------------------------------------------->
-<script>
-window.onmessage = (event) => {
-  // event.source === window means the message is coming from the preload
-  // script, as opposed to from an <iframe> or other source.
-  if (event.source === window && event.data === 'main-world-port') {
-    const [ port ] = event.ports
-    // Once we have the port, we can communicate directly with the main
-    // process.
-    port.onmessage = (event) => {
-      console.log('from main process:', event.data)
-      port.postMessage(event.data * 2)
-    }
-  }
-}
-</script>
-```
-
-[context isolation]: context-isolation.md
-[`ipcRenderer.postMessage`]: ../api/ipc-renderer.md#ipcrendererpostmessagechannel-message-transfer
-[`WebContents.postMessage`]: ../api/web-contents.md#contentspostmessagechannel-message-transfer
-[`MessagePortMain`]: ../api/message-port-main.md
-[`MessageChannelMain`]: ../api/message-channel-main.md
-[`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
-[Channel Messaging API]: https://developer.mozilla.org/en-US/docs/Web/API/Channel_Messaging_API
--- a/docs/tutorial/native-file-drag-drop.md
+++ b/docs/tutorial/native-file-drag-drop.md
@@ -25,7 +25,7 @@ Starting with a working application from the

 and add the following lines to the `renderer.js` file:

-```javascript
+```js
 const { ipcRenderer } = require('electron')

 document.getElementById('drag').ondragstart = (event) => {
@@ -40,7 +40,7 @@ and forward the information to the Main process.
 In the Main process(`main.js` file), expand the received event with a path to the file that is
 being dragged and an icon:

-```javascript fiddle='docs/fiddles/features/drag-and-drop'
+```javascript
 const { ipcMain } = require('electron')

 ipcMain.on('ondragstart', (event, filePath) => {
@@ -52,7 +52,7 @@ ipcMain.on('ondragstart', (event, filePath) => {
 ```

 After launching the Electron application, try dragging and dropping
-the item from the BrowserWindow onto your desktop. In this guide,
+the item from the BroswerWindow onto your desktop. In this guide,
 the item is a Markdown file located in the root of the project:

 ![Drag and drop](../images/drag-and-drop.gif)
--- a/docs/tutorial/notifications.md
+++ b/docs/tutorial/notifications.md
@@ -28,7 +28,7 @@ Assuming you have a working Electron application from the

 and add the `renderer.js` file:

-```javascript fiddle='docs/fiddles/features/notifications/renderer'
+```js
 const myNotification = new Notification('Title', {
  body: 'Notification from the Renderer process'
 })
@@ -52,7 +52,7 @@ message that was generated after triggering the `onclick` event:
 Starting with a working application from the
 [Quick Start Guide](quick-start.md), update the `main.js` file with the following lines:

-```javascript fiddle='docs/fiddles/features/notifications/main'
+```js
 const { Notification } = require('electron')

 function showNotification () {
--- a/docs/tutorial/offscreen-rendering.md
+++ b/docs/tutorial/offscreen-rendering.md
@@ -1,67 +1,59 @@
 # Offscreen Rendering

-## Overview
+Offscreen rendering lets you obtain the content of a browser window in a bitmap,
+so it can be rendered anywhere, for example on a texture in a 3D scene. The
+offscreen rendering in Electron uses a similar approach than the [Chromium
+Embedded Framework](https://bitbucket.org/chromiumembedded/cef) project.

-Offscreen rendering lets you obtain the content of a `BrowserWindow` in a
-bitmap, so it can be rendered anywhere, for example, on texture in a 3D scene.
-The offscreen rendering in Electron uses a similar approach to that of the
-[Chromium Embedded Framework](https://bitbucket.org/chromiumembedded/cef)
-project.
+Two modes of rendering can be used and only the dirty area is passed in the
+`'paint'` event to be more efficient. The rendering can be stopped, continued
+and the frame rate can be set. The specified frame rate is a top limit value,
+when there is nothing happening on a webpage, no frames are generated. The
+maximum frame rate is 60, because above that there is no benefit, only
+performance loss.

-*Notes*:
+**Note:** An offscreen window is always created as a [Frameless Window](../api/frameless-window.md).

-* There are two rendering modes that can be used (see the section below) and only
-the dirty area is passed to the `paint` event to be more efficient.
-* You can stop/continue the rendering as well as set the frame rate.
-* The maximum frame rate is 240 because greater values bring only performance
-losses with no benefits.
-* When nothing is happening on a webpage, no frames are generated.
-* An offscreen window is always created as a
-[Frameless Window](../api/frameless-window.md).
+## Rendering Modes

-### Rendering Modes
-
-#### GPU accelerated
+### GPU accelerated

 GPU accelerated rendering means that the GPU is used for composition. Because of
-that, the frame has to be copied from the GPU which requires more resources,
-thus this mode is slower than the Software output device. The benefit of this
+that the frame has to be copied from the GPU which requires more performance,
+thus this mode is quite a bit slower than the other one. The benefit of this
 mode is that WebGL and 3D CSS animations are supported.

-#### Software output device
+### Software output device

 This mode uses a software output device for rendering in the CPU, so the frame
-generation is much faster. As a result, this mode is preferred over the GPU
-accelerated one.
+generation is much faster, thus this mode is preferred over the GPU accelerated
+one.

-To enable this mode, GPU acceleration has to be disabled by calling the
+To enable this mode GPU acceleration has to be disabled by calling the
 [`app.disableHardwareAcceleration()`][disablehardwareacceleration] API.

-## Example
+## Usage

-Starting with a working application from the
-[Quick Start Guide](quick-start.md), add the following lines to the
-`main.js` file:
-
-```javascript fiddle='docs/fiddles/features/offscreen-rendering'
+``` javascript
 const { app, BrowserWindow } = require('electron')
-const fs = require('fs')

 app.disableHardwareAcceleration()

 let win

 app.whenReady().then(() => {
-  win = new BrowserWindow({ webPreferences: { offscreen: true } })
-
-  win.loadURL('https://github.com')
-  win.webContents.on('paint', (event, dirty, image) => {
-    fs.writeFileSync('ex.png', image.toPNG())
+  win = new BrowserWindow({
+    webPreferences: {
+      offscreen: true
+    }
  })
-  win.webContents.setFrameRate(60)
+
+  win.loadURL('http://github.com')
+  win.webContents.on('paint', (event, dirty, image) => {
+    // updateBitmap(dirty, image.getBitmap())
+  })
+  win.webContents.setFrameRate(30)
 })
 ```

-After launching the Electron application, navigate to your application's
-working folder.
 [disablehardwareacceleration]: ../api/app.md#appdisablehardwareacceleration
--- a/docs/tutorial/online-offline-events.md
+++ b/docs/tutorial/online-offline-events.md
@@ -34,11 +34,11 @@ let onlineStatusWindow

 app.whenReady().then(() => {
  onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false })
-  onlineStatusWindow.loadURL(`file://${__dirname}/index.html`)
+  onlineStatusWindow.loadURL(`file://${__dirname}/online-status.html`)
 })
 ```

-in the `index.html` file, add the following line before the
+create the `online-status.html` file and add the following line before the
 closing `</body>` tag:

 ```html
@@ -47,7 +47,7 @@ closing `</body>` tag:

 and add the `renderer.js` file:

-```javascript fiddle='docs/fiddles/features/online-detection/renderer'
+```javascript
 const alertOnlineStatus = () => { window.alert(navigator.onLine ? 'online' : 'offline') }

 window.addEventListener('online', alertOnlineStatus)
@@ -78,7 +78,7 @@ let onlineStatusWindow

 app.whenReady().then(() => {
  onlineStatusWindow = new BrowserWindow({ width: 0, height: 0, show: false, webPreferences: { nodeIntegration: true } })
-  onlineStatusWindow.loadURL(`file://${__dirname}/index.html`)
+  onlineStatusWindow.loadURL(`file://${__dirname}/online-status.html`)
 })

 ipcMain.on('online-status-changed', (event, status) => {
@@ -86,7 +86,7 @@ ipcMain.on('online-status-changed', (event, status) => {
 })
 ```

-in the `index.html` file, add the following line before the
+create the `online-status.html` file and add the following line before the
 closing `</body>` tag:

 ```html
@@ -95,7 +95,7 @@ closing `</body>` tag:

 and add the `renderer.js` file:

-```javascript fiddle='docs/fiddles/features/online-detection/main'
+```javascript
 const { ipcRenderer } = require('electron')
 const updateOnlineStatus = () => { ipcRenderer.send('online-status-changed', navigator.onLine ? 'online' : 'offline') }

--- a/docs/tutorial/progress-bar.md
+++ b/docs/tutorial/progress-bar.md
@@ -45,7 +45,7 @@ Starting with a working application from the
 [Quick Start Guide](quick-start.md), add the following lines to the
 `main.js` file:

-```javascript fiddle='docs/fiddles/features/progress-bar'
+```javascript
 const { BrowserWindow } = require('electron')
 const win = new BrowserWindow()

--- a/docs/tutorial/quick-start.md
+++ b/docs/tutorial/quick-start.md
@@ -28,11 +28,10 @@ If both commands succeeded, you are ready to install Electron.

 From a development perspective, an Electron application is essentially a Node.js application. This means that the starting point of your Electron application will be a `package.json` file like in any other Node.js application. A minimal Electron application has the following structure:

-```plaintext
+```plain
 my-electron-app/
 ├── package.json
 ├── main.js
-├── preload.js
 └── index.html
 ```

@@ -54,55 +53,52 @@ The main script specifies the entry point of your Electron application (in our c

 The main script may look as follows:

-```javascript fiddle='docs/fiddles/quick-start'
+```js
 const { app, BrowserWindow } = require('electron')
-const path = require('path')

 function createWindow () {
  const win = new BrowserWindow({
    width: 800,
    height: 600,
    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
+      nodeIntegration: true
    }
  })

  win.loadFile('index.html')
+  win.webContents.openDevTools()
 }

-app.whenReady().then(() => {
-  createWindow()
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) {
-      createWindow()
-    }
-  })
-})
+app.whenReady().then(createWindow)

 app.on('window-all-closed', () => {
  if (process.platform !== 'darwin') {
    app.quit()
  }
 })
+
+app.on('activate', () => {
+  if (BrowserWindow.getAllWindows().length === 0) {
+    createWindow()
+  }
+})
 ```

 ##### What is going on above?

 1. Line 1: First, you import the `app` and `BrowserWindow` modules of the `electron` package to be able to manage your application's lifecycle events, as well as create and control browser windows.
-2. Line 2: Second, you import the `path` package which provides utility functions for file paths.
-3. Line 4: After that, you define a function that creates a [new browser window](../api/browser-window.md#new-browserwindowoptions) with a preload script, loads `index.html` file into this window (line 13, we will discuss the file later).
-4. Line 16: You create a new browser window by invoking the `createWindow` function once the Electron application [is initialized](../api/app.md#appwhenready).
-5. Line 18: You add a new listener that creates a new browser window only if when the application has no visible windows after being activated. For example, after launching the application for the first time, or re-launching the already running application.
-6. Line 25: You add a new listener that tries to quit the application when it no longer has any open windows. This listener is a no-op on macOS due to the operating system's [window management behavior](https://support.apple.com/en-ca/guide/mac-help/mchlp2469/mac).
+2. Line 3: After that, you define a function that creates a [new browser window](../api/browser-window.md#new-browserwindowoptions) with node integration enabled, loads `index.html` file into this window (line 12, we will discuss the file later) and opens Developer Tools (line 13).
+3. Line 16: You create a new browser window by invoking the `createWindow` function once the Electron application [is initialized](../api/app.md#appwhenready).
+4. Line 18: You add a new listener that tries to quit the application when it no longer has any open windows. This listener is a no-op on macOS due to the operating system's [window management behavior](https://support.apple.com/en-ca/guide/mac-help/mchlp2469/mac).
+5. Line 24: You add a new listener that creates a new browser window only if when the application has no visible windows after being activated. For example, after launching the application for the first time, or re-launching the already running application.

 #### Create a web page

-This is the web page you want to display once the application is initialized. This web page represents the Renderer process. You can create multiple browser windows, where each window uses its own independent Renderer. You can optionally grant access to additional Node.js APIs by exposing them from your preload script.
+This is the web page you want to display once the application is initialized. This web page represents the Renderer process. You can create multiple browser windows, where each window uses its own independent Renderer. Each window can optionally be granted with full access to Node.js API through the `nodeIntegration` preference.

 The `index.html` page looks as follows:

-```html fiddle='docs/fiddles/quick-start'
+```html
 <!DOCTYPE html>
 <html>
 <head>
@@ -112,39 +108,13 @@ The `index.html` page looks as follows:
 </head>
 <body style="background: white;">
    <h1>Hello World!</h1>
-    <p>
-        We are using Node.js <span id="node-version"></span>,
-        Chromium <span id="chrome-version"></span>,
-        and Electron <span id="electron-version"></span>.
-    </p>
+    We are using node <script>document.write(process.versions.node)</script>,
+    Chrome <script>document.write(process.versions.chrome)</script>,
+    and Electron <script>document.write(process.versions.electron)</script>.
 </body>
 </html>
 ```

-#### Define a preload script
-
-Your preload script (in our case, the `preload.js` file) acts as a bridge between Node.js and your web page. It allows you to expose specific APIs and behaviors to your web page rather than insecurely exposing the entire Node.js API. In this example we will use the preload script to read version information from the `process` object and update the web page with that info.
-
-```javascript fiddle='docs/fiddles/quick-start'
-window.addEventListener('DOMContentLoaded', () => {
-  const replaceText = (selector, text) => {
-    const element = document.getElementById(selector)
-    if (element) element.innerText = text
-  }
-
-  for (const type of ['chrome', 'node', 'electron']) {
-    replaceText(`${type}-version`, process.versions[type])
-  }
-})
-```
-
-##### What's going on above?
-
-1. On line 1: First you define an event listener that tells you when the web page has loaded
-2. On line 2: Second you define a utility function used to set the text of the placeholders in the `index.html`
-3. On line 7: Next you loop through the list of components whose version you want to display
-4. On line 8: Finally, you call `replaceText` to look up the version placeholders in `index.html` and set their text value to the values from `process.versions`
-
 #### Modify your package.json file

 Your Electron application uses the `package.json` file as the main entry point (as any other Node.js application). The main script of your application is `main.js`, so modify the `package.json` file accordingly:
@@ -153,24 +123,18 @@ Your Electron application uses the `package.json` file as the main entry point (
 {
    "name": "my-electron-app",
    "version": "0.1.0",
-    "author": "your name",
-    "description": "My Electron app",
    "main": "main.js"
 }
 ```

 > NOTE: If the `main` field is omitted, Electron will attempt to load an `index.js` file from the directory containing `package.json`.

-> NOTE: The `author` and `description` fields are required for packaging, otherwise error will occur when running `npm run make`.
-
 By default, the `npm start` command will run the main script with Node.js. To run the script with Electron, you need to change it as such:

 ```json
 {
    "name": "my-electron-app",
    "version": "0.1.0",
-    "author": "your name",
-    "description": "My Electron app",
    "main": "main.js",
    "scripts": {
        "start": "electron ."
@@ -196,8 +160,7 @@ The simplest and the fastest way to distribute your newly created app is using
 1. Import Electron Forge to your app folder:

    ```sh
-    npm install --save-dev @electron-forge/cli
-    npx electron-forge import
+    npx @electron-forge/cli import

    ✔ Checking your system
    ✔ Initializing Git Repository
@@ -312,7 +275,7 @@ ipcRenderer.invoke('perform-action', ...args)

 ##### Node.js API

-> NOTE: To access the Node.js API from the Renderer process, you need to set the `nodeIntegration` preference to `true` and the `contextIsolation` preference to `false`.  Please note that access to the Node.js API in any renderer that loads remote content is not recommended for [security reasons](../tutorial/security.md#2-do-not-enable-nodejs-integration-for-remote-content).
+> NOTE: To access the Node.js API from the Renderer process, you need to set the `nodeIntegration` preference to `true`.

 Electron exposes full access to Node.js API and its modules both in the Main and the Renderer processes. For example, you can read all the files from the root directory:

--- a/docs/tutorial/recent-documents.md
+++ b/docs/tutorial/recent-documents.md
@@ -24,7 +24,7 @@ Starting with a working application from the
 [Quick Start Guide](quick-start.md), add the following lines to the
 `main.js` file:

-```javascript fiddle='docs/fiddles/features/recent-documents'
+```javascript
 const { app } = require('electron')

 app.addRecentDocument('/Users/USERNAME/Desktop/work.type')
--- a/docs/tutorial/represented-file.md
+++ b/docs/tutorial/represented-file.md
@@ -24,7 +24,7 @@ Starting with a working application from the
 [Quick Start Guide](quick-start.md), add the following lines to the
 `main.js` file:

-```javascript fiddle='docs/fiddles/features/represented-file'
+```javascript
 const { app, BrowserWindow } = require('electron')

 app.whenReady().then(() => {
--- a/Show More
+++ b/Show More