chore: cherry-pick 38de42d2bbc3 from chromium (#37667 )

* chore: cherry-pick 38de42d2bbc3 from chromium * chore: update patches --------- Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: electron-patch-conflict-fixer[bot] <83340002+electron-patch-conflict-fixer[bot]@users.noreply.github.com>
chore: cherry-pick 546e00df97ac from v8 (#37671 )
2026-02-26 03:01:17 -05:00 · 2023-03-23 14:35:16 -04:00 · 2023-03-23 12:34:26 -04:00 · 2023-03-23 10:53:20 -04:00 · 2023-03-22 20:14:38 -04:00 · 2023-03-22 20:11:38 -04:00
782 changed files with 16386 additions and 9952 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,7 +13,7 @@ parameters:
  run-docs-only:
    type: boolean
    default: false
-
+  
  upload-to-storage:
    type: string
    default: '1'
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -4,7 +4,7 @@ parameters:
  run-docs-only:
    type: boolean
    default: false
-
+  
  upload-to-storage:
    type: string
    default: '1'
@@ -137,11 +137,10 @@ env-mas-apple-silicon: &env-mas-apple-silicon
  MAS_BUILD: 'true'
  TARGET_ARCH: arm64
  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
-  npm_config_arch: arm64

 env-send-slack-notifications: &env-send-slack-notifications
  NOTIFY_SLACK: true
-
+  
 env-global: &env-global
  ELECTRON_OUT_DIR: Default

@@ -218,7 +217,6 @@ step-maybe-cleanup-arm64-mac: &step-maybe-cleanup-arm64-mac
        security delete-generic-password -l "Chromium Safe Storage" || echo "✓ Keychain does not contain password from tests"
        security delete-generic-password -l "Electron Test Main Safe Storage" || echo "✓ Keychain does not contain password from tests"
        security delete-generic-password -a "electron-test-safe-storage" || echo "✓ Keychain does not contain password from tests"
-        security delete-generic-password -l "electron-test-safe-storage Safe Storage" || echo "✓ Keychain does not contain password from tests"
      elif [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
        XVFB=/usr/bin/Xvfb
        /sbin/start-stop-daemon --stop --exec $XVFB || echo "Xvfb not running"
@@ -557,6 +555,50 @@ step-gn-check: &step-gn-check
      node electron/script/gen-hunspell-filenames.js --check
      node electron/script/gen-libc++-filenames.js --check

+step-electron-build: &step-electron-build
+  run:
+    name: Electron build
+    no_output_timeout: 60m
+    command: |
+      # On arm platforms we generate a cross-arch ffmpeg that ninja does not seem
+      # to realize is not correct / should be rebuilt.  We delete it here so it is
+      # rebuilt
+      if [ "$TRIGGER_ARM_TEST" == "true" ]; then
+        rm -f src/out/Default/libffmpeg.so
+      fi
+      cd src
+      # Enable if things get really bad
+      # if  [ "$TARGET_ARCH" == "arm64" ] &&[ "`uname`" == "Darwin" ]; then
+      #   diskutil erasevolume HFS+ "xcode_disk" `hdiutil attach -nomount ram://12582912`
+      #   mv /Applications/Xcode-12.beta.5.app /Volumes/xcode_disk/
+      #   ln -s /Volumes/xcode_disk/Xcode-12.beta.5.app /Applications/Xcode-12.beta.5.app
+      # fi
+
+      # Lets generate a snapshot and mksnapshot and then delete all the x-compiled generated files to save space
+      if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" == "1" ]; then
+        ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
+        ninja -C out/Default tools/v8_context_snapshot -j $NUMBER_OF_NINJA_PROCESSES
+        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
+        # Remove unused args from mksnapshot_args
+        SEDOPTION="-i"
+        if [ "`uname`" == "Darwin" ]; then
+          SEDOPTION="-i ''"
+        fi
+        sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args
+        sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args
+        (cd out/Default; zip mksnapshot.zip mksnapshot_args clang_x64_v8_arm64/gen/v8/embedded.S)
+        rm -rf out/Default/clang_x64_v8_arm64/gen
+        rm -rf out/Default/clang_x64_v8_arm64/obj
+        rm -rf out/Default/clang_x64_v8_arm64/thinlto-cache
+        rm -rf out/Default/clang_x64/obj
+
+        # Regenerate because we just deleted some ninja files 
+        gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
+      fi
+      NINJA_SUMMARIZE_BUILD=1 autoninja -C out/Default electron -j $NUMBER_OF_NINJA_PROCESSES
+      cp out/Default/.ninja_log out/electron_ninja_log
+      node electron/script/check-symlinks.js
+
 step-maybe-electron-dist-strip: &step-maybe-electron-dist-strip
  run:
    name: Strip electron binaries
@@ -617,6 +659,28 @@ step-electron-publish: &step-electron-publish
        script/release/uploaders/upload.py --verbose
      fi

+step-persist-data-for-tests: &step-persist-data-for-tests
+  persist_to_workspace:
+    root: .
+    paths:
+      # Build artifacts
+      - src/out/Default/dist.zip
+      - src/out/Default/mksnapshot.zip
+      - src/out/Default/chromedriver.zip
+      - src/out/Default/gen/node_headers
+      - src/out/Default/overlapped-checker
+      - src/out/ffmpeg/ffmpeg.zip
+      - src/electron
+      - src/third_party/electron_node
+      - src/third_party/nan
+      - src/cross-arch-snapshots
+      - src/third_party/llvm-build
+      - src/build/linux
+      - src/buildtools/third_party/libc++
+      - src/buildtools/third_party/libc++abi
+      - src/out/Default/obj/buildtools/third_party
+      - src/v8/tools/builtins-pgo
+
 step-electron-dist-unzip: &step-electron-dist-unzip
  run:
    name: Unzip dist.zip
@@ -694,7 +758,7 @@ step-show-goma-stats: &step-show-goma-stats
  run:
    shell: /bin/bash
    name: Check goma stats after build
-    command: |
+    command: |      
      set +e
      set +o pipefail
      $LOCAL_GOMA_DIR/goma_ctl.py stat
@@ -768,16 +832,6 @@ step-maybe-generate-breakpad-symbols: &step-maybe-generate-breakpad-symbols
      fi

 step-maybe-zip-symbols: &step-maybe-zip-symbols
-  run:
-    name: Zip symbols
-    command: |
-      cd src
-      export BUILD_PATH="$PWD/out/Default"
-      ninja -C out/Default electron:licenses
-      ninja -C out/Default electron:electron_version_file
-      electron/script/zip-symbols.py -b $BUILD_PATH
-
-step-maybe-zip-symbols-and-clean: &step-maybe-zip-symbols-and-clean
  run:
    name: Zip symbols
    command: |
@@ -798,7 +852,7 @@ step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
        elif [ "$TARGET_ARCH" == "arm64" ]; then
          export MKSNAPSHOT_PATH="clang_x64_v8_arm64"
        fi
-        cp "out/Default/$MKSNAPSHOT_PATH/mksnapshot" out/Default
+        cp "out/Default/$MKSNAPSHOT_PATH/mksnapshot" out/Default        
        cp "out/Default/$MKSNAPSHOT_PATH/v8_context_snapshot_generator" out/Default
        if [ "`uname`" == "Linux" ]; then
          cp "out/Default/$MKSNAPSHOT_PATH/libffmpeg.so" out/Default
@@ -808,12 +862,6 @@ step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
        python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --create-snapshot-only
        mkdir cross-arch-snapshots
        cp out/Default-mksnapshot-test/*.bin cross-arch-snapshots
-        # Clean up so that ninja does not get confused
-        if [ "`uname`" == "Linux" ]; then
-          rm -f out/Default/libffmpeg.so
-        elif [ "`uname`" == "Darwin" ]; then
-          rm -f out/Default/libffmpeg.dylib
-        fi
      fi

 step-maybe-generate-typescript-defs: &step-maybe-generate-typescript-defs
@@ -912,6 +960,7 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
      rm -rf src/ios/chrome
      rm -rf src/third_party/blink/web_tests
      rm -rf src/third_party/blink/perf_tests
+      rm -rf src/third_party/WebKit/LayoutTests
      rm -rf third_party/electron_node/deps/openssl
      rm -rf third_party/electron_node/deps/v8
      rm -rf chrome/test/data/xr/webvr_info
@@ -992,6 +1041,99 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
    #Compile ts/js to verify doc change didn't break anything
    - *step-ts-compile

+steps-tests: &steps-tests
+  steps:
+    - attach_workspace:
+        at: .
+    - *step-depot-tools-add-to-path
+    - *step-electron-dist-unzip
+    - *step-mksnapshot-unzip
+    - *step-chromedriver-unzip
+    - *step-setup-linux-for-headless-testing
+    - *step-restore-brew-cache
+    - *step-fix-known-hosts-linux
+    - install-python2-mac
+    - *step-install-signing-cert-on-mac
+
+    - run:
+        name: Run Electron tests
+        environment:
+          MOCHA_REPORTER: mocha-multi-reporters
+          ELECTRON_TEST_RESULTS_DIR: junit
+          MOCHA_MULTI_REPORTERS: mocha-junit-reporter, tap
+          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/*-spec.ts | circleci tests split --split-by=timings)) 2>&1 | $ASAN_SYMBOLIZE
+          else
+            if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+              export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true
+              (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging)
+            else
+              if [ "$TARGET_ARCH" == "ia32" ]; then
+                npm_config_arch=x64 node electron/node_modules/dugite/script/download-git.js
+              fi
+              (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.ts | circleci tests split --split-by=timings))
+            fi
+          fi
+    - run:
+        name: Check test results existence
+        command: |
+          cd src
+
+          # Check if test results exist and are not empty.
+          if [ ! -s "junit/test-results-main.xml" ]; then
+            exit 1
+          fi
+    - store_test_results:
+        path: src/junit
+
+    - *step-verify-mksnapshot
+    - *step-verify-chromedriver
+
+    - *step-maybe-notify-slack-failure
+
+    - *step-maybe-cleanup-arm64-mac
+
+steps-test-nan: &steps-test-nan
+  steps:
+    - attach_workspace:
+          at: .
+    - *step-depot-tools-add-to-path
+    - *step-electron-dist-unzip
+    - *step-setup-linux-for-headless-testing
+    - *step-fix-known-hosts-linux
+    - run:
+        name: Run Nan Tests
+        command: |
+          cd src
+          node electron/script/nan-spec-runner.js
+
+steps-test-node: &steps-test-node
+  steps:
+    - attach_workspace:
+          at: .
+    - *step-depot-tools-add-to-path
+    - *step-electron-dist-unzip
+    - *step-setup-linux-for-headless-testing
+    - *step-fix-known-hosts-linux
+    - run:
+        name: Run Node Tests
+        command: |
+          cd src
+          node electron/script/node-spec-runner.js --default --jUnitDir=junit
+    - store_test_results:
+        path: src/junit
+
 # Command Aliases
 commands:
  install-python2-mac:
@@ -1012,7 +1154,7 @@ commands:
              else
                echo 'Using Python install from cache'
              fi
-              sudo installer -pkg python-downloads/python-2.7.18-macosx10.9.pkg -target /
+              sudo installer -pkg python-downloads/python-2.7.18-macosx10.9.pkg -target /        
            fi
      - save_cache:
          paths:
@@ -1050,65 +1192,17 @@ commands:
              mv /var/portal/src ./
            fi

-  build_and_save_artifacts:
-    parameters:
-      artifact-key:
-        type: string
-      build-nonproprietary-ffmpeg:
-        type: boolean
-        default: true
-    steps:
-      - *step-gn-gen-default
-      - ninja_build_electron:
-          clean-prebuilt-snapshot: false
-      - *step-maybe-electron-dist-strip
-      - step-electron-dist-build:
-          additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip
-
-      - *step-show-goma-stats
-
-      # mksnapshot
-      - *step-mksnapshot-build
-      - *step-maybe-cross-arch-snapshot
-
-      # chromedriver
-      - *step-electron-chromedriver-build
-
-      - when:
-          condition: << parameters.build-nonproprietary-ffmpeg >>
-          steps:
-            # ffmpeg
-            - *step-ffmpeg-gn-gen
-            - *step-ffmpeg-build
-
-      - *step-maybe-generate-breakpad-symbols
-      - *step-maybe-zip-symbols
-
-      - move_and_store_all_artifacts:
-          artifact-key: << parameters.artifact-key >>
-
  move_and_store_all_artifacts:
-    parameters:
-      artifact-key:
-        type: string
    steps:
      - run:
          name: Move all generated artifacts to upload folder
          command: |
-            rm -rf generated_artifacts_<< parameters.artifact-key >>
-            mkdir generated_artifacts_<< parameters.artifact-key >>
+            rm -rf generated_artifacts
+            mkdir generated_artifacts
            mv_if_exist() {
              if [ -f "$1" ] || [ -d "$1" ]; then
                echo Storing $1
-                mv $1 generated_artifacts_<< parameters.artifact-key >>
-              else
-                echo Skipping $1 - It is not present on disk
-              fi
-            }
-            cp_if_exist() {
-              if [ -f "$1" ] || [ -d "$1" ]; then
-                echo Storing $1
-                cp $1 generated_artifacts_<< parameters.artifact-key >>
+                mv $1 generated_artifacts
              else
                echo Skipping $1 - It is not present on disk
              fi
@@ -1121,43 +1215,15 @@ commands:
            mv_if_exist src/out/ffmpeg/ffmpeg.zip
            mv_if_exist src/out/Default/hunspell_dictionaries.zip
            mv_if_exist src/cross-arch-snapshots
-            cp_if_exist src/out/electron_ninja_log
-            cp_if_exist src/out/Default/.ninja_log
+            mv_if_exist src/out/electron_ninja_log
+            mv_if_exist src/out/Default/.ninja_log
          when: always
      - store_artifacts:
-          path: generated_artifacts_<< parameters.artifact-key >>
-          destination: ./<< parameters.artifact-key >>
+          path: generated_artifacts
+          destination: ./
      - store_artifacts:
-          path: generated_artifacts_<< parameters.artifact-key >>/cross-arch-snapshots
-          destination: << parameters.artifact-key >>/cross-arch-snapshots
-
-  restore_build_artifacts:
-    parameters:
-      artifact-key:
-        type: string
-    steps:
-      - attach_workspace:
-          at: .
-      - run:
-          name: Restore key specific artifacts
-          command: |
-            mv_if_exist() {
-              if [ -f "generated_artifacts_<< parameters.artifact-key >>/$1" ] || [ -d "generated_artifacts_<< parameters.artifact-key >>/$1" ]; then
-                echo Restoring $1 to $2
-                mkdir -p $2
-                mv generated_artifacts_<< parameters.artifact-key >>/$1 $2
-              else
-                echo Skipping $1 - It is not present on disk
-              fi
-            }
-            mv_if_exist dist.zip src/out/Default
-            mv_if_exist node_headers.tar.gz src/out/Default/gen
-            mv_if_exist symbols.zip src/out/Default
-            mv_if_exist mksnapshot.zip src/out/Default
-            mv_if_exist chromedriver.zip src/out/Default
-            mv_if_exist ffmpeg.zip src/out/ffmpeg
-            mv_if_exist hunspell_dictionaries.zip src/out/Default
-            mv_if_exist cross-arch-snapshots src
+          path: generated_artifacts/cross-arch-snapshots
+          destination: cross-arch-snapshots

  checkout-from-cache:
    steps:
@@ -1191,7 +1257,7 @@ commands:
          command: |
            cd src
            if [ "$SKIP_DIST_ZIP" != "1" ]; then
-              ninja -C out/Default electron:electron_dist_zip << parameters.additional-targets >> -j $NUMBER_OF_NINJA_PROCESSES
+              ninja -C out/Default electron:electron_dist_zip << parameters.additional-targets >>
              if [ "$CHECK_DIST_MANIFEST" == "1" ]; then
                if [ "`uname`" == "Darwin" ]; then
                  target_os=mac
@@ -1217,47 +1283,6 @@ commands:
              fi
            fi

-  ninja_build_electron:
-    parameters:
-      clean-prebuilt-snapshot:
-        type: boolean
-        default: true
-    steps:
-      - run:
-          name: Electron build
-          no_output_timeout: 60m
-          command: |
-            cd src
-
-            # Lets generate a snapshot and mksnapshot and then delete all the x-compiled generated files to save space
-            if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" == "1" ]; then
-              ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
-              ninja -C out/Default tools/v8_context_snapshot -j $NUMBER_OF_NINJA_PROCESSES
-              gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-              # Remove unused args from mksnapshot_args
-              SEDOPTION="-i"
-              if [ "`uname`" == "Darwin" ]; then
-                SEDOPTION="-i ''"
-              fi
-              sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args
-              sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args
-              (cd out/Default; zip mksnapshot.zip mksnapshot_args clang_x64_v8_arm64/gen/v8/embedded.S)
-              if [ "<< parameters.clean-prebuilt-snapshot >>" == "true" ]; then
-                rm -rf out/Default/clang_x64_v8_arm64/gen
-                rm -rf out/Default/clang_x64_v8_arm64/obj
-                rm -rf out/Default/clang_x64_v8_arm64/thinlto-cache
-                rm -rf out/Default/clang_x64/obj
-                # Regenerate because we just deleted some ninja files
-                gn gen out/Default --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
-              fi
-              # For x-compiles this will be built to the wrong arch after the context snapshot build
-              # so we wipe it before re-linking it below
-              rm -rf out/Default/libffmpeg.dylib
-            fi
-            NINJA_SUMMARIZE_BUILD=1 autoninja -C out/Default electron -j $NUMBER_OF_NINJA_PROCESSES
-            cp out/Default/.ninja_log out/electron_ninja_log
-            node electron/script/check-symlinks.js
-
  electron-build:
    parameters:
      attach:
@@ -1290,14 +1315,6 @@ commands:
      build-nonproprietary-ffmpeg:
        type: boolean
        default: true
-      artifact-key:
-        type: string
-      after-build-and-save:
-        type: steps
-        default: []
-      after-persist:
-        type: steps
-        default: []
    steps:
      - when:
          condition: << parameters.attach >>
@@ -1413,148 +1430,52 @@ commands:
            - *step-fix-sync
            - *step-delete-git-directories

-      - when:
-          condition: << parameters.build >>
-          steps:
-            - build_and_save_artifacts:
-                artifact-key: << parameters.artifact-key >>
-                build-nonproprietary-ffmpeg: << parameters.build-nonproprietary-ffmpeg >>
-            - steps: << parameters.after-build-and-save >>
+            # Electron app
+            - *step-gn-gen-default
+            - *step-electron-build
+            - *step-maybe-electron-dist-strip
+            - step-electron-dist-build:
+                additional-targets: shell_browser_ui_unittests third_party/electron_node:headers third_party/electron_node:overlapped-checker electron:hunspell_dictionaries_zip
+
+            - *step-show-goma-stats
+
+            # mksnapshot
+            - *step-mksnapshot-build
+            - *step-maybe-cross-arch-snapshot
+
+            # chromedriver
+            - *step-electron-chromedriver-build

-            # Save all data needed for a further tests run.
            - when:
-                condition: << parameters.persist >>
+                condition: << parameters.build-nonproprietary-ffmpeg >>
                steps:
-                  - *step-minimize-workspace-size-from-checkout
-                  - run: |
-                      rm -rf src/third_party/electron_node/deps/openssl
-                      rm -rf src/third_party/electron_node/deps/v8
-                  - persist_to_workspace:
-                      root: .
-                      paths:
-                        # Build artifacts
-                        - generated_artifacts_<< parameters.artifact-key >>
-                        - src/out/Default/gen/node_headers
-                        - src/out/Default/overlapped-checker
-                        - src/electron
-                        - src/third_party/electron_node
-                        - src/third_party/nan
-                        - src/cross-arch-snapshots
-                        - src/third_party/llvm-build
-                        - src/build/linux
-                        - src/buildtools/third_party/libc++
-                        - src/buildtools/third_party/libc++abi
-                        - src/out/Default/obj/buildtools/third_party
-                        - src/v8/tools/builtins-pgo
-                  - steps: << parameters.after-persist >>
+                  # ffmpeg
+                  - *step-ffmpeg-gn-gen
+                  - *step-ffmpeg-build
+
+      # Save all data needed for a further tests run.
+      - when:
+          condition: << parameters.persist >>
+          steps:
+            - *step-minimize-workspace-size-from-checkout
+            - run: |
+                rm -rf src/third_party/electron_node/deps/openssl
+                rm -rf src/third_party/electron_node/deps/v8
+            - *step-persist-data-for-tests

      - when:
          condition: << parameters.build >>
          steps:
+            - *step-maybe-generate-breakpad-symbols
+            - *step-maybe-zip-symbols
+
+      - when:
+          condition: << parameters.build >>
+          steps:
+            - move_and_store_all_artifacts
+
            - *step-maybe-notify-slack-failure

-  electron-tests:
-    parameters:
-      artifact-key:
-        type: string
-    steps:
-      - restore_build_artifacts:
-          artifact-key: << parameters.artifact-key >>
-      - *step-depot-tools-add-to-path
-      - *step-electron-dist-unzip
-      - *step-mksnapshot-unzip
-      - *step-chromedriver-unzip
-      - *step-setup-linux-for-headless-testing
-      - *step-restore-brew-cache
-      - *step-fix-known-hosts-linux
-      - install-python2-mac
-      - *step-install-signing-cert-on-mac
-
-      - run:
-          name: Run Electron tests
-          environment:
-            MOCHA_REPORTER: mocha-multi-reporters
-            ELECTRON_TEST_RESULTS_DIR: junit
-            MOCHA_MULTI_REPORTERS: mocha-junit-reporter, tap
-            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/*-spec.ts | circleci tests split --split-by=timings)) 2>&1 | $ASAN_SYMBOLIZE
-            else
-              if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
-                export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true
-                (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging)
-              else
-                if [ "$TARGET_ARCH" == "ia32" ]; then
-                  npm_config_arch=x64 node electron/node_modules/dugite/script/download-git.js
-                fi
-                (cd electron && node script/yarn test --runners=main --trace-uncaught --enable-logging --files $(circleci tests glob spec/*-spec.ts | circleci tests split --split-by=timings))
-              fi
-            fi
-      - run:
-          name: Check test results existence
-          command: |
-            cd src
-
-            # Check if test results exist and are not empty.
-            if [ ! -s "junit/test-results-main.xml" ]; then
-              exit 1
-            fi
-      - store_test_results:
-          path: src/junit
-
-      - *step-verify-mksnapshot
-      - *step-verify-chromedriver
-
-      - *step-maybe-notify-slack-failure
-
-      - *step-maybe-cleanup-arm64-mac
-
-  nan-tests:
-    parameters:
-      artifact-key:
-        type: string
-    steps:
-      - restore_build_artifacts:
-          artifact-key: << parameters.artifact-key >>
-      - *step-depot-tools-add-to-path
-      - *step-electron-dist-unzip
-      - *step-setup-linux-for-headless-testing
-      - *step-fix-known-hosts-linux
-      - run:
-          name: Run Nan Tests
-          command: |
-            cd src
-            node electron/script/nan-spec-runner.js
-
-  node-tests:
-    parameters:
-      artifact-key:
-        type: string
-    steps:
-      - restore_build_artifacts:
-          artifact-key: << parameters.artifact-key >>
-      - *step-depot-tools-add-to-path
-      - *step-electron-dist-unzip
-      - *step-setup-linux-for-headless-testing
-      - *step-fix-known-hosts-linux
-      - run:
-          name: Run Node Tests
-          command: |
-            cd src
-            node electron/script/node-spec-runner.js --default --jUnitDir=junit
-      - store_test_results:
-          path: src/junit
-
  electron-publish:
    parameters:
      attach:
@@ -1594,12 +1515,12 @@ commands:
      - *step-gn-gen-default

      # Electron app
-      - ninja_build_electron
+      - *step-electron-build
      - *step-show-goma-stats
      - *step-maybe-generate-breakpad-symbols
      - *step-maybe-electron-dist-strip
      - step-electron-dist-build
-      - *step-maybe-zip-symbols-and-clean
+      - *step-maybe-zip-symbols

      # mksnapshot
      - *step-mksnapshot-build
@@ -1625,8 +1546,7 @@ commands:

      # Publish
      - *step-electron-publish
-      - move_and_store_all_artifacts:
-          artifact-key: 'publish'
+      - move_and_store_all_artifacts

 # List of all jobs.
 jobs:
@@ -1656,7 +1576,6 @@ jobs:
          checkout: true
          save-git-cache: true
          checkout-to-create-src-cache: true
-          artifact-key: 'nil'

  mac-checkout:
    executor:
@@ -1674,7 +1593,6 @@ jobs:
          checkout: true
          persist-checkout: true
          restore-src-cache: false
-          artifact-key: 'nil'

  mac-make-src-cache:
    executor:
@@ -1692,7 +1610,6 @@ jobs:
          checkout: true
          save-git-cache: true
          checkout-to-create-src-cache: true
-          artifact-key: 'nil'

  # Layer 2: Builds.
  linux-x64-testing:
@@ -1709,7 +1626,6 @@ jobs:
          persist: true
          checkout: false
          checkout-and-assume-cache: true
-          artifact-key: 'linux-x64'

  linux-x64-testing-asan:
    executor:
@@ -1727,7 +1643,6 @@ jobs:
          persist: true
          checkout: true
          build-nonproprietary-ffmpeg: false
-          artifact-key: 'linux-x64-asan'

  linux-x64-testing-no-run-as-node:
    executor:
@@ -1743,7 +1658,6 @@ jobs:
      - electron-build:
          persist: false
          checkout: true
-          artifact-key: 'linux-x64-no-run-as-node'

  linux-x64-testing-gn-check:
    executor:
@@ -1794,7 +1708,6 @@ jobs:
          persist: true
          checkout: false
          checkout-and-assume-cache: true
-          artifact-key: 'linux-arm'

  linux-arm-publish:
    executor:
@@ -1837,7 +1750,6 @@ jobs:
          persist: true
          checkout: false
          checkout-and-assume-cache: true
-          artifact-key: 'linux-arm64'

  linux-arm64-testing-gn-check:
    executor:
@@ -1889,22 +1801,6 @@ jobs:
          checkout: false
          checkout-and-assume-cache: true
          attach: true
-          artifact-key: 'darwin-x64'
-          after-build-and-save:
-            - run:
-                name: Configuring MAS build
-                command: |
-                  echo 'export GN_EXTRA_ARGS="is_mas_build = true $GN_EXTRA_ARGS"' >> $BASH_ENV
-                  echo 'export MAS_BUILD="true"' >> $BASH_ENV
-                  rm -rf "src/out/Default/Electron Framework.framework"
-                  rm -rf src/out/Default/Electron*.app
-            - build_and_save_artifacts:
-                artifact-key: 'mas-x64'
-          after-persist:
-            - persist_to_workspace:
-                root: .
-                paths:
-                  - generated_artifacts_mas-x64

  osx-testing-x64-gn-check:
    executor:
@@ -1977,22 +1873,35 @@ jobs:
          checkout: false
          checkout-and-assume-cache: true
          attach: true
-          artifact-key: 'darwin-arm64'
-          after-build-and-save:
-            - run:
-                name: Configuring MAS build
-                command: |
-                  echo 'export GN_EXTRA_ARGS="is_mas_build = true $GN_EXTRA_ARGS"' >> $BASH_ENV
-                  echo 'export MAS_BUILD="true"' >> $BASH_ENV
-                  rm -rf "src/out/Default/Electron Framework.framework"
-                  rm -rf src/out/Default/Electron*.app
-            - build_and_save_artifacts:
-                artifact-key: 'mas-arm64'
-          after-persist:
-            - persist_to_workspace:
-                root: .
-                paths:
-                  - generated_artifacts_mas-arm64
+
+  mas-testing-x64:
+    executor:
+      name: macos
+      size: macos.x86.medium.gen2
+    environment:
+      <<: *env-mac-large
+      <<: *env-mas
+      <<: *env-testing-build
+      <<: *env-ninja-status
+      <<: *env-macos-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+    steps:
+      - electron-build:
+          persist: true
+          checkout: false
+          checkout-and-assume-cache: true
+          attach: true
+
+  mas-testing-x64-gn-check:
+    executor:
+      name: macos
+      size: macos.x86.medium.gen2
+    environment:
+      <<: *env-machine-mac
+      <<: *env-mas
+      <<: *env-testing-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+    <<: *steps-electron-gn-check

  mas-publish-x64:
    executor:
@@ -2037,6 +1946,25 @@ jobs:
                attach: true
                checkout: false

+  mas-testing-arm64:
+    executor:
+      name: macos
+      size: macos.x86.medium.gen2
+    environment:
+      <<: *env-mac-large
+      <<: *env-testing-build
+      <<: *env-ninja-status
+      <<: *env-macos-build
+      <<: *env-mas-apple-silicon
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
+      GENERATE_CROSS_ARCH_SNAPSHOT: true
+    steps:
+      - electron-build:
+          persist: true
+          checkout: false
+          checkout-and-assume-cache: true
+          attach: true
+
  # Layer 3: Tests.
  linux-x64-testing-tests:
    executor:
@@ -2047,9 +1975,7 @@ jobs:
      <<: *env-headless-testing
      <<: *env-stack-dumping
    parallelism: 3
-    steps:
-      - electron-tests:
-          artifact-key: linux-x64
+    <<: *steps-tests

  linux-x64-testing-asan-tests:
    executor:
@@ -2062,9 +1988,7 @@ jobs:
      IS_ASAN: '1'
      DISABLE_CRASH_REPORTER_TESTS: '1'
    parallelism: 3
-    steps:
-      - electron-tests:
-          artifact-key: linux-x64-asan
+    <<: *steps-tests

  linux-x64-testing-nan:
    executor:
@@ -2074,9 +1998,7 @@ jobs:
      <<: *env-linux-medium
      <<: *env-headless-testing
      <<: *env-stack-dumping
-    steps:
-      - nan-tests:
-          artifact-key: linux-x64
+    <<: *steps-test-nan

  linux-x64-testing-node:
    executor:
@@ -2086,9 +2008,7 @@ jobs:
      <<: *env-linux-medium
      <<: *env-headless-testing
      <<: *env-stack-dumping
-    steps:
-      - node-tests:
-          artifact-key: linux-x64
+    <<: *steps-test-node

  linux-arm-testing-tests:
    executor: linux-arm
@@ -2097,9 +2017,7 @@ jobs:
      <<: *env-global
      <<: *env-headless-testing
      <<: *env-stack-dumping
-    steps:
-      - electron-tests:
-          artifact-key: linux-arm
+    <<: *steps-tests

  linux-arm64-testing-tests:
    executor: linux-arm64
@@ -2108,11 +2026,9 @@ jobs:
      <<: *env-global
      <<: *env-headless-testing
      <<: *env-stack-dumping
-    steps:
-      - electron-tests:
-          artifact-key: linux-arm64
+    <<: *steps-tests

-  darwin-testing-x64-tests:
+  osx-testing-x64-tests:
    executor:
      name: macos
      size: macos.x86.medium.gen2
@@ -2120,20 +2036,16 @@ jobs:
      <<: *env-mac-large
      <<: *env-stack-dumping
    parallelism: 2
-    steps:
-      - electron-tests:
-          artifact-key: darwin-x64
+    <<: *steps-tests

-  darwin-testing-arm64-tests:
+  osx-testing-arm64-tests:  
    executor: apple-silicon
    environment:
      <<: *env-mac-large
      <<: *env-stack-dumping
      <<: *env-apple-silicon
      <<: *env-runner
-    steps:
-      - electron-tests:
-          artifact-key: darwin-arm64
+    <<: *steps-tests

  mas-testing-x64-tests:
    executor:
@@ -2143,9 +2055,7 @@ jobs:
      <<: *env-mac-large
      <<: *env-stack-dumping
    parallelism: 2
-    steps:
-      - electron-tests:
-          artifact-key: mas-x64
+    <<: *steps-tests

  mas-testing-arm64-tests:
    executor: apple-silicon
@@ -2154,9 +2064,7 @@ jobs:
      <<: *env-stack-dumping
      <<: *env-apple-silicon
      <<: *env-runner
-    steps:
-      - electron-tests:
-          artifact-key: mas-arm64
+    <<: *steps-tests

 # List all workflows
 workflows:
@@ -2239,9 +2147,9 @@ workflows:
          filters:
            branches:
              # Do not run this on forked pull requests
-              ignore: /pull\/[0-9]+/
+              ignore: /pull\/[0-9]+/        
          requires:
-            - linux-arm-testing
+            - linux-arm-testing      
      - linux-arm64-testing:
          requires:
            - linux-make-src-cache
@@ -2249,7 +2157,7 @@ workflows:
          filters:
            branches:
              # Do not run this on forked pull requests
-              ignore: /pull\/[0-9]+/
+              ignore: /pull\/[0-9]+/        
          requires:
            - linux-arm64-testing
      - linux-arm64-testing-gn-check:
@@ -2270,29 +2178,40 @@ workflows:
      - osx-testing-x64-gn-check:
          requires:
            - mac-make-src-cache
-      - darwin-testing-x64-tests:
+      - osx-testing-x64-tests:
          requires:
            - osx-testing-x64
      - osx-testing-arm64:
          requires:
            - mac-make-src-cache
-      - darwin-testing-arm64-tests:
+      - 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-make-src-cache
+      - mas-testing-x64-gn-check:
+          requires:
+            - mac-make-src-cache
      - mas-testing-x64-tests:
          requires:
-            - osx-testing-x64
+            - mas-testing-x64
+      - mas-testing-arm64:
+          requires:
+            - mac-make-src-cache
      - mas-testing-arm64-tests:
          filters:
            branches:
              # Do not run this on forked pull requests
              ignore: /pull\/[0-9]+/
          requires:
-            - osx-testing-arm64
+            - mas-testing-arm64
  lint:
    jobs:
      - lint
+
+# VS Code Extension Version: 1.4.0
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -4,13 +4,14 @@ Welcome to the Codespaces Electron Developer Environment.

 ## Quick Start

-Upon creation of your codespace you should have [build tools](https://github.com/electron/build-tools) installed and an initialized gclient checkout of Electron.  In order to build electron you'll need to run the following command.
+Upon creation of your codespace you should have [build tools](https://github.com/electron/build-tools) installed and an initialized gclient checkout of Electron.  In order to build electron you'll need to run the following commands.

 ```bash
+e sync -vv
 e build
 ```

-The initial build will take ~8 minutes.  Incremental builds are substantially quicker.  If you pull changes from upstream that touch either the `patches` folder or the `DEPS` folder you will have to run `e sync` in order to keep your checkout up to date.
+The initial sync will take approximately ~30 minutes and the build will take ~8 minutes.  Incremental syncs and incremental builds are substantially quicker.

 ## Directory Structure

--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,7 +2,6 @@
 	"dockerComposeFile": "docker-compose.yml",
 	"service": "buildtools",
 	"onCreateCommand": ".devcontainer/on-create-command.sh",
-	"updateContentCommand": ".devcontainer/update-content-command.sh",
 	"workspaceFolder": "/workspaces/gclient/src/electron",
 	"extensions": [
 		"joeleinbinder.mojom-language",
@@ -12,28 +11,14 @@
 		"mutantdino.resourcemonitor",
 		"dbaeumer.vscode-eslint",
 		"shakram02.bash-beautify",
-		"marshallofsound.gnls-electron",
-		"CircleCI.circleci"
+		"marshallofsound.gnls-electron"
 	],
 	"settings": {
-		"editor.tabSize": 2,
-		"bashBeautify.tabSize": 2,
-		"typescript.tsdk": "node_modules/typescript/lib",
 		"[gn]": {
 			"editor.formatOnSave": true
 		},
-		"[javascript]": {
-			"editor.codeActionsOnSave": {
-				"source.fixAll.eslint": true
-			}
-		},
-		"[typescript]": {
-			"editor.codeActionsOnSave": {
-				"source.fixAll.eslint": true
-			}
-		},
-		"javascript.preferences.quoteStyle": "single",
-		"typescript.preferences.quoteStyle": "single"
+		"editor.tabSize": 2,
+		"bashBeautify.tabSize": 2
 	},
 	"forwardPorts": [8088, 6080, 5901],
 	"portsAttributes": {
@@ -51,15 +36,8 @@
 		}
 	},
 	"hostRequirements": {
-		"storage": "128gb",
-		"cpus": 16
+		"storage": "32gb",
+		"cpus": 8
 	},
-	"remoteUser": "builduser",
-	"customizations": {
-		"codespaces": {
-			"openFiles": [
-				".devcontainer/README.md"
-			]
-		}
-	}
+	"remoteUser": "builduser"
 }
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,14 +2,14 @@ version: '3'

 services:
  buildtools:
-    image: ghcr.io/electron/devcontainer:3d8d44d0f15b05bef6149e448f9cc522111847e9
+    image: ghcr.io/electron/devcontainer:27db4a3e3512bfd2e47f58cea69922da0835f1d9

    volumes:
      - ..:/workspaces/gclient/src/electron:cached

-      - /var/run/docker.sock:/var/run/docker.sock
+      - /var/run/docker.sock:/var/run/docker.sock 

-    command: /bin/sh -c "while sleep 1000; do :; done"
+    command: /bin/sh -c "while sleep 1000; do :; done"  

    user: builduser

--- a/.devcontainer/on-create-command.sh
+++ b/.devcontainer/on-create-command.sh
@@ -10,7 +10,6 @@ export PATH="$PATH:$buildtools/src"

 # Create the persisted buildtools config folder
 mkdir -p $buildtools_configs
-mkdir -p $gclient_root/.git-cache
 rm -f $buildtools/configs
 ln -s $buildtools_configs $buildtools/configs

--- a/.devcontainer/update-content-command.sh
+++ b/.devcontainer/update-content-command.sh
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -eo pipefail
-
-buildtools=$HOME/.electron_build_tools
-
-export PATH="$PATH:$buildtools/src"
-
-# Sync latest
-e d gclient sync --with_branch_heads --with_tags
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -19,7 +19,7 @@ body:
    label: Electron Version
    description: |
      What version of Electron are you using?
-
+      
      Note: Please only report issues for [currently supported versions of Electron](https://www.electronjs.org/docs/latest/tutorial/support#currently-supported-versions).
    placeholder: 17.0.0
  validations:
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -29,7 +29,7 @@ body:
 - type: textarea
  attributes:
    label: Alternatives Considered
-    description: A clear and concise description of any alternative solutions or features you've considered.
+    description: A clear and concise description of any alternative solutions or features you've considered. 
  validations:
    required: true
 - type: textarea
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,5 +1,4 @@
 #### Description of Change
-
 <!--
 Thank you for your Pull Request. Please provide a description above and review
 the requirements below.
@@ -13,9 +12,9 @@ Contributors guide: https://github.com/electron/electron/blob/main/CONTRIBUTING.
 - [ ] PR description included and stakeholders cc'd
 - [ ] `npm test` passes
 - [ ] tests are [changed or added](https://github.com/electron/electron/blob/main/docs/development/testing.md)
- [ ] relevant documentation, tutorials, templates and examples are changed or added
- [ ] [PR release notes](https://github.com/electron/clerk/blob/main/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/main/README.md#examples).
+- [ ] relevant documentation is changed or added
+- [ ] [PR release notes](https://github.com/electron/clerk/blob/master/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/master/README.md#examples).

 #### Release Notes

-Notes: <!-- Please add a one-line description for app developers to read in the release notes, or 'none' if no notes relevant to app developers. Examples and help on special cases: https://github.com/electron/clerk/blob/main/README.md#examples -->
+Notes: <!-- Please add a one-line description for app developers to read in the release notes, or 'none' if no notes relevant to app developers. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -0,0 +1,14 @@
+daysUntilStale: 90
+daysUntilClose: 30
+exemptLabels:
+  - discussion
+  - security 🔒
+  - "enhancement :sparkles:"
+staleLabel: stale
+markComment: >
+  This issue has been automatically marked as stale. **If this issue is still affecting you, please leave any comment** (for example, "bump"), and we'll keep it open. If you have any new additional information—in particular, if this is still reproducible in the [latest version of Electron](https://www.electronjs.org/releases/stable) or in the [beta](https://www.electronjs.org/releases/beta)—please include it with your comment!
+closeComment: >
+  This issue has been closed as it was considered stale, this issue will not be
+  monitored.  If this is a bug and you can reproduce this issue on a [supported
+  version of Electron](https://www.electronjs.org/docs/latest/tutorial/electron-timelines#timeline) please open a new issue and ensure a repro is provided.
+  
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -4,16 +4,11 @@ on:
  issues:
    types: [labeled]

-permissions:  # added using https://github.com/step-security/secure-workflows
-  contents: read
-
 jobs:
  issue-labeled:
-    permissions:
-      issues: write  # for actions-cool/issues-helper to update issues
    runs-on: ubuntu-latest
    steps:
-      - name: blocked/need-repro label added
+      - name: blocked/need-repro
        if: github.event.label.name == 'blocked/need-repro'
        uses: actions-cool/issues-helper@dad28fdb88da5f082c04659b7373d85790f9b135 # v3.3.0
        with:
@@ -23,6 +18,7 @@ jobs:

            Would it be possible for you to make a standalone testcase with only the code necessary to reproduce the issue? For example, [Electron Fiddle](https://www.electronjs.org/fiddle) is a great tool for making small test cases and makes it easy to publish your test case to a [gist](https://gist.github.com) that Electron maintainers can use.

-            Stand-alone test cases make fixing issues go more smoothly: it ensure everyone's looking at the same issue, it removes all unnecessary variables from the equation, and it can also provide the basis for automated regression tests.
+            Stand-alone test cases make fixing issues go more smoothly: it ensure everyone's looking at the same issue, it removes all unnecessary variables from the equation, and it can also provide the basis for automated regression tests. 

            Now adding the `blocked/need-repro` label for this reason. After you make a test case, please link to it in a followup comment. This issue will be closed in 10 days if the above is not addressed.
+  
--- a/.github/workflows/release_dependency_versions.yml
+++ b/.github/workflows/release_dependency_versions.yml
@@ -14,7 +14,7 @@ jobs:
    - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag: v3
    - name: Trigger New chromedriver Release
      run: |
-        if [[ ${{ github.event.release.tag_name }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+        if [[ ${{ github.event.release.tag_name }} =~ ^v\d+\.\d+\.\d+$ ]]; then
          gh api /repos/:owner/chromedriver/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'
        else
          echo "Not releasing for version ${{ github.event.release.tag_name }}"
@@ -26,7 +26,7 @@ jobs:
      - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag: v3
      - name: Trigger New mksnapshot Release
        run: |
-          if [[ ${{ github.event.release.tag_name }} =~ ^v[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          if [[ ${{ github.event.release.tag_name }} =~ ^v\d+\.\d+\.\d+$ ]]; then
            gh api /repos/:owner/mksnapshot/actions/workflows/release.yml/dispatches --input - <<< '{"ref":"main","inputs":{"version":"${{ github.event.release.tag_name }}"}}'
          else
            echo "Not releasing for version ${{ github.event.release.tag_name }}"
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -1,54 +0,0 @@
-name: Scorecards supply-chain security
-on:
-  # Only the default branch is supported.
-  branch_protection_rule:
-  schedule:
-    - cron: '44 17 * * 0'
-  push:
-    branches: [ "main" ]
-
-# Declare default permissions as read only.
-permissions: read-all
-
-jobs:
-  analysis:
-    name: Scorecards analysis
-    runs-on: ubuntu-latest
-    permissions:
-      # Needed to upload the results to code-scanning dashboard.
-      security-events: write
-      # Used to receive a badge.
-      id-token: write
-
-    steps:
-      - name: "Checkout code"
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3.1.0
-        with:
-          persist-credentials: false
-
-      - name: "Run analysis"
-        uses: ossf/scorecard-action@e38b1902ae4f44df626f11ba0734b14fb91f8f86 # tag=v2.1.2
-        with:
-          results_file: results.sarif
-          results_format: sarif
-
-          # Publish the results for public repositories to enable scorecard badges. For more details, see
-          # https://github.com/ossf/scorecard-action#publishing-results.
-          # For private repositories, `publish_results` will automatically be set to `false`, regardless
-          # of the value entered here.
-          publish_results: true
-
-      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
-      # format to the repository Actions tab.
-      - name: "Upload artifact"
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # tag=v3.1.2
-        with:
-          name: SARIF file
-          path: results.sarif
-          retention-days: 5
-
-      # Upload the results to GitHub's code scanning dashboard.
-      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@959cbb7472c4d4ad70cdfe6f4976053fe48ab394 # tag=v2.1.27
-        with:
-          sarif_file: results.sarif
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: semantic-pull-request
-        uses: amannn/action-semantic-pull-request@01d5fd8a8ebb9aafe902c40c53f0f4744f7381eb # tag: v5
+        uses: amannn/action-semantic-pull-request@v4
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,40 +0,0 @@
-name: 'Close stale issues'
-on:
-  workflow_dispatch:
-  schedule:
-    # 1:30am every day
-    - cron: '30 1 * * *'
-
-permissions:
-  issues: write
-
-jobs:
-  stale:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag: v6.0.1
-        with:
-          days-before-stale: 90
-          days-before-close: 30
-          stale-issue-label: stale
-          operations-per-run: 1750
-          stale-issue-message: >
-            This issue has been automatically marked as stale. **If this issue is still affecting you, please leave any comment** (for example, "bump"), and we'll keep it open. If you have any new additional information—in particular, if this is still reproducible in the [latest version of Electron](https://www.electronjs.org/releases/stable) or in the [beta](https://www.electronjs.org/releases/beta)—please include it with your comment!
-          close-issue-message: >
-            This issue has been closed due to inactivity, and will not be monitored.  If this is a bug and you can reproduce this issue on a [supported version of Electron](https://www.electronjs.org/docs/latest/tutorial/electron-timelines#timeline) please open a new issue and include instructions for reproducing the issue.
-          exempt-issue-labels: "discussion,security \U0001F512,enhancement :sparkles:"
-          only-pr-labels: not-a-real-label
-  pending-repro:
-    runs-on: ubuntu-latest
-    if: ${{ always() }}
-    needs: stale
-    steps:
-      - uses: actions/stale@5ebf00ea0e4c1561e9b43a292ed34424fb1d4578 # tag: v6.0.1
-        with:
-          days-before-stale: -1
-          days-before-close: 10
-          stale-issue-label: blocked/need-repro
-          stale-pr-label: not-a-real-label
-          operations-per-run: 1750
-          close-issue-message: >
-            Unfortunately, without a way to reproduce this issue, we're unable to continue investigation. This issue has been closed and will not be monitored further. If you're able to provide a minimal test case that reproduces this issue on a [supported version of Electron](https://www.electronjs.org/docs/latest/tutorial/electron-timelines#timeline) please open a new issue and include instructions for reproducing the issue.
--- a/.github/workflows/update_appveyor_image.yml
+++ b/.github/workflows/update_appveyor_image.yml
@@ -2,7 +2,6 @@ name: Update AppVeyor Image

 # Run chron daily Mon-Fri
 on:
-  workflow_dispatch:
  schedule:
    - cron: '0 8 * * 1-5' # runs 8:00 every business day (see https://crontab.guru)

@@ -51,7 +50,7 @@ jobs:
      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
      uses: peter-evans/create-pull-request@2b011faafdcbc9ceb11414d64d0573f37c774b04 # v4.2.3
      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
+        token: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
        commit-message: 'build: update appveyor image to latest version'
        committer: GitHub <noreply@github.com>
        author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -23,7 +23,5 @@
    "br_spaces": 0
  },
  "single-h1": false,
-  "no-inline-html": false,
-  "emphasis-style": false,
-  "strong-style": false
+  "no-inline-html": false
 }
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -512,8 +512,6 @@ source_set("electron_lib") {
    ]
  }

-  configs += [ "//electron/build/config:mas_build" ]
-
  sources = filenames.lib_sources
  if (is_win) {
    sources += filenames.lib_sources_win
@@ -546,7 +544,7 @@ source_set("electron_lib") {
    deps += [
      "//components/remote_cocoa/app_shim",
      "//components/remote_cocoa/browser",
-      "//content/browser:mac_helpers",
+      "//content/common:mac_helpers",
      "//ui/accelerated_widget_mac",
    ]

@@ -575,6 +573,7 @@ source_set("electron_lib") {
    if (is_mas_build) {
      sources += [ "shell/browser/api/electron_api_app_mas.mm" ]
      sources -= [ "shell/browser/auto_updater_mac.mm" ]
+      defines += [ "MAS_BUILD" ]
      sources -= [
        "shell/app/electron_crash_reporter_client.cc",
        "shell/app/electron_crash_reporter_client.h",
@@ -718,7 +717,7 @@ source_set("electron_lib") {
    ]
  }

-  if (enable_printing) {
+  if (enable_basic_printing) {
    sources += [
      "shell/browser/printing/print_view_manager_electron.cc",
      "shell/browser/printing/print_view_manager_electron.h",
@@ -744,7 +743,7 @@ source_set("electron_lib") {
      "//components/update_client:update_client",
      "//components/zoom",
      "//extensions/browser",
-      "//extensions/browser/api:api_provider",
+      "//extensions/browser:core_api_provider",
      "//extensions/browser/updater",
      "//extensions/common",
      "//extensions/common:core_api_provider",
@@ -968,7 +967,6 @@ if (is_mac) {
        deps += [ "//sandbox/mac:seatbelt" ]
      }
      defines = [ "HELPER_EXECUTABLE" ]
-      extra_configs = [ "//electron/build/config:mas_build" ]
      sources = [
        "shell/app/electron_main_mac.cc",
        "shell/app/uv_stdio_fix.cc",
@@ -1139,7 +1137,6 @@ if (is_mac) {
      "-rpath",
      "@executable_path/../Frameworks",
    ]
-    extra_configs = [ "//electron/build/config:mas_build" ]
  }

  if (enable_dsyms) {
@@ -1475,7 +1472,7 @@ dist_zip("electron_ffmpeg_zip") {

 electron_chromedriver_deps = [
  ":licenses",
-  "//chrome/test/chromedriver:chromedriver_server",
+  "//chrome/test/chromedriver",
  "//electron/buildflags",
 ]

--- a/4
+++ b/4
@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'

 vars = {
  'chromium_version':
-    '111.0.5560.0',
+    '108.0.5359.215',
  'node_version':
-    'v18.14.0',
+    'v16.17.1',
  'nan_version':
    '16fa32231e2ccd89d2804b3f765319128b20c4ac',
  'squirrel.mac_version':
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ For more installation options and troubleshooting tips, see
 Each Electron release provides binaries for macOS, Windows, and Linux.

 * macOS (High Sierra and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
-* Windows (Windows 10 and up): Electron provides `ia32` (`x86`), `x64` (`amd64`), and `arm64` binaries for Windows. Windows on ARM support was added in Electron 5.0.8. Support for Windows 7, 8 and 8.1 was [removed in Electron 23, in line with Chromium's Windows deprecation policy](https://www.electronjs.org/blog/windows-7-to-8-1-deprecation-notice).
+* Windows (Windows 7 and up): Electron provides `ia32` (`x86`), `x64` (`amd64`), and `arm64` binaries for Windows. Windows on ARM support was added in Electron 5.0.8.
 * Linux: The prebuilt binaries of Electron are built on Ubuntu 20.04. They have also been verified to work on:
  * Ubuntu 14.04 and newer
  * Fedora 24 and newer
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -2,7 +2,7 @@

 The Electron team and community take security bugs in Electron seriously. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.

-To report a security issue, please use the GitHub Security Advisory ["Report a Vulnerability"](https://github.com/electron/electron/security/advisories/new) tab.
+To report a security issue, email [security@electronjs.org](mailto:security@electronjs.org) and include the word "SECURITY" in the subject line.

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

--- a/appveyor-bake.yml
+++ b/appveyor-bake.yml
@@ -63,6 +63,7 @@ build_script:
      if (-not (Test-Path -Path C:\projects\src)) {
        New-Item -Path C:\projects\src -ItemType Directory
      }
+
  - cd C:\projects\
  - git clone -q --branch=%APPVEYOR_REPO_BRANCH% https://github.com/electron/electron.git C:\projects\src\electron
  - git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
@@ -104,4 +105,4 @@ on_image_bake:
 # Uncomment these lines and set APPVEYOR_RDP_PASSWORD in project settings to enable RDP after bake is done
 # # on_finish:
 #   - ps: >-
-#        $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#        $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
--- a/appveyor-woa.yml
+++ b/appveyor-woa.yml
@@ -1,5 +1,5 @@
-# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor.yml
-# IF APPLICABLE!!!!
+# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor.yml 
+# IF APPLICABLE!!!! 
 #
 #
 # The config expects the following environment variables to be set:
@@ -12,7 +12,7 @@
 #  - "ELECTRON_RELEASE" Set it to '1' upload binaries on success.
 #  - "NPM_CONFIG_ARCH" E.g. 'x86'. Is used to build native Node.js modules.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "TARGET_ARCH" value.
-#  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64'}.
+#  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
 #      Is used in some publishing scripts, but does NOT affect the Electron binary.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
 #  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
@@ -29,7 +29,7 @@

 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-111.0.5560.0-2
+image: e-108.0.5359.215
 environment:
  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
  ELECTRON_OUT_DIR: Default
@@ -119,7 +119,7 @@ for:
            $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
          }
      - gclient config --name "src\electron" --unmanaged %GCLIENT_EXTRA_ARGS% "https://github.com/electron/electron"
-      # Patches are applied in the image bake. Check depshash to see if patches have changed.
+      # Patches are applied in the image bake. Check depshash to see if patches have changed. 
      - ps: $env:RUN_GCLIENT_SYNC="false"
      - ps: $depshash_baked = Get-Content .\src\.depshash -Raw
      - ps: cd src\electron
@@ -261,7 +261,7 @@ for:
          cd src
          New-Item .\out\Default\gen\node_headers\Release -Type directory
          Copy-Item -path .\out\Default\electron.lib -destination .\out\Default\gen\node_headers\Release\node.lib
-      - set npm_config_nodedir=%cd%\out\Default\gen\node_headers
+      - set npm_config_nodedir=%cd%\out\Default\gen\node_headers          
      - set npm_config_arch=arm64
      - cd electron
      # Explicitly set npm_config_arch because the .env doesn't persist
@@ -272,7 +272,7 @@ for:
      - echo Running main test suite & node script/yarn test  --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion
      - cd ..
      - echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
-
+    
    on_finish:
      # Uncomment these lines to enable RDP
      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
-# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor-woa.yml
-# IF APPLICABLE!!!!
+# NOTE IF CHANGING THIS FILE, ALSO APPLY THE CHANGE TO appveyor-woa.yml 
+# IF APPLICABLE!!!! 
 #
 #
 # The config expects the following environment variables to be set:
@@ -12,7 +12,7 @@
 #  - "ELECTRON_RELEASE" Set it to '1' upload binaries on success.
 #  - "NPM_CONFIG_ARCH" E.g. 'x86'. Is used to build native Node.js modules.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "TARGET_ARCH" value.
-#  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64'}.
+#  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
 #      Is used in some publishing scripts, but does NOT affect the Electron binary.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
 #  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
@@ -29,7 +29,7 @@

 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-111.0.5560.0-node18
+image: e-108.0.5359.215-node18
 environment:
  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
  ELECTRON_OUT_DIR: Default
@@ -117,7 +117,7 @@ for:
            $env:NINJA_STATUS="[%r processes, %f/%t @ %o/s : %es] "
          }
      - gclient config --name "src\electron" --unmanaged %GCLIENT_EXTRA_ARGS% "https://github.com/electron/electron"
-      # Patches are applied in the image bake. Check depshash to see if patches have changed.
+      # Patches are applied in the image bake. Check depshash to see if patches have changed. 
      - ps: $env:RUN_GCLIENT_SYNC="false"
      - ps: $depshash_baked = Get-Content .\src\.depshash -Raw
      - ps: cd src\electron
@@ -272,7 +272,7 @@ for:
      - echo "Done verifying mksnapshot"
      - echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd%
      - echo "Done verifying chromedriver"
-
+    
    on_finish:
      # Uncomment these lines to enable RDP
      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
--- 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 = 114
+node_module_version = 110

 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
@@ -10,6 +10,9 @@ v8_embedder_string = "-electron.0"
 # TODO: this breaks mksnapshot
 v8_enable_snapshot_native_code_counters = false

+# TODO(codebytere): remove when Node.js handles https://chromium-review.googlesource.com/c/v8/v8/+/3211575
+v8_scriptormodule_legacy_lifetime = true
+
 # we use this api
 v8_enable_javascript_promise_hooks = true

@@ -17,7 +20,7 @@ enable_cdm_host_verification = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"

-enable_printing = true
+enable_basic_printing = true

 # Removes DLLs from the build, which are only meant to be used for Chromium development.
 # See https://github.com/electron/electron/pull/17985
@@ -45,3 +48,5 @@ is_cfi = false

 # TODO: fix this once sysroots have been updated.
 use_qt = false
+
+v8_builtins_profiling_log_file = ""
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -1,8 +1,6 @@
 # For MAS build, we force defining "MAS_BUILD".
 config("mas_build") {
  if (is_mas_build) {
-    defines = [ "IS_MAS_BUILD()=1" ]
-  } else {
-    defines = [ "IS_MAS_BUILD()=0" ]
+    defines = [ "MAS_BUILD" ]
  }
 }
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -80,6 +80,7 @@ static_library("chrome") {
    "//chrome/browser/ui/exclusive_access/mouse_lock_controller.h",
    "//chrome/browser/ui/frame/window_frame_util.cc",
    "//chrome/browser/ui/frame/window_frame_util.h",
+    "//chrome/browser/ui/native_window_tracker.h",
    "//chrome/browser/ui/ui_features.cc",
    "//chrome/browser/ui/ui_features.h",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
@@ -88,7 +89,6 @@ static_library("chrome") {
    "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.h",
    "//extensions/browser/app_window/size_constraints.cc",
    "//extensions/browser/app_window/size_constraints.h",
-    "//ui/views/native_window_tracker.h",
  ]

  if (is_posix) {
@@ -138,9 +138,9 @@ static_library("chrome") {
  if (use_aura) {
    sources += [
      "//chrome/browser/platform_util_aura.cc",
+      "//chrome/browser/ui/aura/native_window_tracker_aura.cc",
+      "//chrome/browser/ui/aura/native_window_tracker_aura.h",
      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc",
-      "//ui/views/native_window_tracker_aura.cc",
-      "//ui/views/native_window_tracker_aura.h",
    ]
  }

@@ -212,7 +212,7 @@ static_library("chrome") {
    deps += [ "//components/cdm/renderer" ]
  }

-  if (enable_printing) {
+  if (enable_basic_printing) {
    sources += [
      "//chrome/browser/bad_message.cc",
      "//chrome/browser/bad_message.h",
@@ -228,8 +228,6 @@ static_library("chrome") {
      "//chrome/browser/printing/print_view_manager_base.h",
      "//chrome/browser/printing/printer_query.cc",
      "//chrome/browser/printing/printer_query.h",
-      "//chrome/browser/printing/printer_query_oop.cc",
-      "//chrome/browser/printing/printer_query_oop.h",
      "//chrome/browser/printing/printing_service.cc",
      "//chrome/browser/printing/printing_service.h",
      "//components/printing/browser/print_to_pdf/pdf_print_job.cc",
@@ -266,10 +264,7 @@ static_library("chrome") {
      sources += [
        "//chrome/browser/printing/pdf_to_emf_converter.cc",
        "//chrome/browser/printing/pdf_to_emf_converter.h",
-        "//chrome/browser/printing/printer_xml_parser_impl.cc",
-        "//chrome/browser/printing/printer_xml_parser_impl.h",
      ]
-      deps += [ "//printing:printing_base" ]
    }
  }

@@ -277,26 +272,32 @@ static_library("chrome") {
    sources += [
      "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc",
      "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.h",
+      "//chrome/browser/ui/views/overlay/back_to_tab_image_button.cc",
+      "//chrome/browser/ui/views/overlay/back_to_tab_image_button.h",
      "//chrome/browser/ui/views/overlay/back_to_tab_label_button.cc",
      "//chrome/browser/ui/views/overlay/close_image_button.cc",
      "//chrome/browser/ui/views/overlay/close_image_button.h",
      "//chrome/browser/ui/views/overlay/constants.h",
+      "//chrome/browser/ui/views/overlay/document_overlay_window_views.cc",
+      "//chrome/browser/ui/views/overlay/document_overlay_window_views.h",
      "//chrome/browser/ui/views/overlay/hang_up_button.cc",
      "//chrome/browser/ui/views/overlay/hang_up_button.h",
      "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
      "//chrome/browser/ui/views/overlay/overlay_window_image_button.h",
+      "//chrome/browser/ui/views/overlay/overlay_window_views.cc",
+      "//chrome/browser/ui/views/overlay/overlay_window_views.h",
      "//chrome/browser/ui/views/overlay/playback_image_button.cc",
      "//chrome/browser/ui/views/overlay/playback_image_button.h",
      "//chrome/browser/ui/views/overlay/resize_handle_button.cc",
      "//chrome/browser/ui/views/overlay/resize_handle_button.h",
-      "//chrome/browser/ui/views/overlay/simple_overlay_window_image_button.cc",
-      "//chrome/browser/ui/views/overlay/simple_overlay_window_image_button.h",
      "//chrome/browser/ui/views/overlay/skip_ad_label_button.cc",
      "//chrome/browser/ui/views/overlay/skip_ad_label_button.h",
      "//chrome/browser/ui/views/overlay/toggle_camera_button.cc",
      "//chrome/browser/ui/views/overlay/toggle_camera_button.h",
      "//chrome/browser/ui/views/overlay/toggle_microphone_button.cc",
      "//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
+      "//chrome/browser/ui/views/overlay/track_image_button.cc",
+      "//chrome/browser/ui/views/overlay/track_image_button.h",
      "//chrome/browser/ui/views/overlay/video_overlay_window_views.cc",
      "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
    ]
@@ -314,10 +315,10 @@ static_library("chrome") {
      "//chrome/browser/extensions/chrome_url_request_util.h",
      "//chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.cc",
      "//chrome/browser/plugins/plugin_response_interceptor_url_loader_throttle.h",
-      "//chrome/renderer/extensions/api/extension_hooks_delegate.cc",
-      "//chrome/renderer/extensions/api/extension_hooks_delegate.h",
-      "//chrome/renderer/extensions/api/tabs_hooks_delegate.cc",
-      "//chrome/renderer/extensions/api/tabs_hooks_delegate.h",
+      "//chrome/renderer/extensions/extension_hooks_delegate.cc",
+      "//chrome/renderer/extensions/extension_hooks_delegate.h",
+      "//chrome/renderer/extensions/tabs_hooks_delegate.cc",
+      "//chrome/renderer/extensions/tabs_hooks_delegate.h",
    ]

    if (enable_pdf_viewer) {
--- a/docs/README.md
+++ b/docs/README.md
@@ -110,7 +110,6 @@ These individual tutorials expand on topics discussed in the guide above.
 * [BrowserView](api/browser-view.md)
 * [BrowserWindow](api/browser-window.md)
 * [contentTracing](api/content-tracing.md)
-* [desktopCapturer](api/desktop-capturer.md)
 * [dialog](api/dialog.md)
 * [globalShortcut](api/global-shortcut.md)
 * [inAppPurchase](api/in-app-purchase.md)
@@ -119,22 +118,19 @@ These individual tutorials expand on topics discussed in the guide above.
 * [MenuItem](api/menu-item.md)
 * [MessageChannelMain](api/message-channel-main.md)
 * [MessagePortMain](api/message-port-main.md)
-* [nativeTheme](api/native-theme.md)
 * [net](api/net.md)
 * [netLog](api/net-log.md)
+* [nativeTheme](api/native-theme.md)
 * [Notification](api/notification.md)
 * [powerMonitor](api/power-monitor.md)
 * [powerSaveBlocker](api/power-save-blocker.md)
 * [protocol](api/protocol.md)
-* [pushNotifications](api/push-notifications.md)
-* [safeStorage](api/safe-storage.md)
 * [screen](api/screen.md)
 * [session](api/session.md)
 * [ShareMenu](api/share-menu.md)
 * [systemPreferences](api/system-preferences.md)
 * [TouchBar](api/touch-bar.md)
 * [Tray](api/tray.md)
-* [utilityProcess](api/utility-process.md)
 * [webContents](api/web-contents.md)
 * [webFrameMain](api/web-frame-main.md)

@@ -146,10 +142,11 @@ These individual tutorials expand on topics discussed in the guide above.

 ### Modules for Both Processes:

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

 ## Development

--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -128,8 +128,6 @@ Emitted when the user wants to open a URL with the application. Your application
 `Info.plist` file must define the URL scheme within the `CFBundleURLTypes` key, and
 set `NSPrincipalClass` to `AtomApplication`.

-You should call `event.preventDefault()` if you want to handle this event.
-
 As with the `open-file` event, be sure to register a listener for the `open-url`
 event early in your application startup to detect if the the application being
 is being opened to handle a URL. If you register the listener in response to a
@@ -498,10 +496,6 @@ and `workingDirectory` is its current working directory. Usually
 applications respond to this by making their primary window focused and
 non-minimized.

-**Note:** `argv` will not be exactly the same list of arguments as those passed
-to the second instance. The order might change and additional arguments might be appended.
-If you need to maintain the exact same arguments, it's advised to use `additionalData` instead.
-
 **Note:** If the second instance is started by a different user than the first, the `argv` array will not include the arguments.

 This event is guaranteed to be emitted after the `ready` event of `app`
--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -84,16 +84,16 @@ Examples of valid `color` values:
  * #ffffff (RRGGBB)
  * #ffffffff (AARRGGBB)
 * RGB
-  * rgb\((\[\d]+),\s*(\[\d]+),\s*(\[\d]+)\)
+  * rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)
    * e.g. rgb(255, 255, 255)
 * RGBA
-  * rgba\((\[\d]+),\s*(\[\d]+),\s*(\[\d]+),\s*(\[\d.]+)\)
+  * rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)
    * e.g. rgba(255, 255, 255, 1.0)
 * HSL
-  * hsl\((-?\[\d.]+),\s*(\[\d.]+)%,\s*(\[\d.]+)%\)
+  * hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)
    * e.g. hsl(200, 20%, 50%)
 * HSLA
-  * hsla\((-?\[\d.]+),\s*(\[\d.]+)%,\s*(\[\d.]+)%,\s*(\[\d.]+)\)
+  * hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)
    * e.g. hsla(200, 20%, 50%, 0.5)
 * Color name
  * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -269,7 +269,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
    zoom to the width of the screen. This will also affect the behavior when
    calling `maximize()` directly. Default is `false`.
  * `tabbingIdentifier` string (optional) _macOS_ - Tab group name, allows
-    opening the window as a native tab on macOS 10.12+. Windows with the same
+    opening the window as a native tab. Windows with the same
    tabbing identifier will be grouped together. This also adds a native new
    tab button to your window's tab bar and allows your `app` and window to
    receive the `new-window-for-tab` event.
@@ -659,9 +659,9 @@ Emitted when scroll wheel event phase has begun.

 > **Note**
 > This event is deprecated beginning in Electron 22.0.0. See [Breaking
-> Changes](../breaking-changes.md#deprecated-browserwindow-scroll-touch--events)
+> Changes](breaking-changes.md#deprecated-browserwindow-scroll-touch--events)
 > for details of how to migrate to using the [WebContents
-> `input-event`](./web-contents.md#event-input-event) event.
+> `input-event`](api/web-contents.md#event-input-event) event.

 #### Event: 'scroll-touch-end' _macOS_ _Deprecated_

@@ -669,9 +669,9 @@ Emitted when scroll wheel event phase has ended.

 > **Note**
 > This event is deprecated beginning in Electron 22.0.0. See [Breaking
-> Changes](../breaking-changes.md#deprecated-browserwindow-scroll-touch--events)
+> Changes](breaking-changes.md#deprecated-browserwindow-scroll-touch--events)
 > for details of how to migrate to using the [WebContents
-> `input-event`](./web-contents.md#event-input-event) event.
+> `input-event`](api/web-contents.md#event-input-event) event.

 #### Event: 'scroll-touch-edge' _macOS_ _Deprecated_

@@ -679,9 +679,9 @@ Emitted when scroll wheel event phase filed upon reaching the edge of element.

 > **Note**
 > This event is deprecated beginning in Electron 22.0.0. See [Breaking
-> Changes](../breaking-changes.md#deprecated-browserwindow-scroll-touch--events)
+> Changes](breaking-changes.md#deprecated-browserwindow-scroll-touch--events)
 > for details of how to migrate to using the [WebContents
-> `input-event`](./web-contents.md#event-input-event) event.
+> `input-event`](api/web-contents.md#event-input-event) event.

 #### Event: 'swipe' _macOS_

@@ -1036,8 +1036,6 @@ height areas you have within the overall content view.
 The aspect ratio is not respected when window is resized programmatically with
 APIs like `win.setSize`.

-To reset an aspect ratio, pass 0 as the `aspectRatio` value: `win.setAspectRatio(0)`.
-
 #### `win.setBackgroundColor(backgroundColor)`

 * `backgroundColor` string - Color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. The alpha channel is optional for the hex type.
@@ -1050,16 +1048,16 @@ Examples of valid `backgroundColor` values:
  * #ffffff (RGB)
  * #ffffffff (ARGB)
 * RGB
-  * rgb\((\[\d]+),\s*(\[\d]+),\s*(\[\d]+)\)
+  * rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)
    * e.g. rgb(255, 255, 255)
 * RGBA
-  * rgba\((\[\d]+),\s*(\[\d]+),\s*(\[\d]+),\s*(\[\d.]+)\)
+  * rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)
    * e.g. rgba(255, 255, 255, 1.0)
 * HSL
-  * hsl\((-?\[\d.]+),\s*(\[\d.]+)%,\s*(\[\d.]+)%\)
+  * hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)
    * e.g. hsl(200, 20%, 50%)
 * HSLA
-  * hsla\((-?\[\d.]+),\s*(\[\d.]+)%,\s*(\[\d.]+)%,\s*(\[\d.]+)\)
+  * hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)
    * e.g. hsla(200, 20%, 50%, 0.5)
 * Color name
  * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
@@ -1402,8 +1400,8 @@ The native type of the handle is `HWND` on Windows, `NSView*` on macOS, and

 * `message` Integer
 * `callback` Function
-  * `wParam` Buffer - The `wParam` provided to the WndProc
-  * `lParam` Buffer - The `lParam` provided to the WndProc
+  * `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.
@@ -1450,16 +1448,13 @@ Returns `boolean` - Whether the window's document has been edited.

 #### `win.blurWebView()`

-#### `win.capturePage([rect, opts])`
+#### `win.capturePage([rect])`

 * `rect` [Rectangle](structures/rectangle.md) (optional) - The bounds to capture
-* `opts` Object (optional)
-  * `stayHidden` boolean (optional) -  Keep the page hidden instead of visible. Default is `false`.
-  * `stayAwake` boolean (optional) -  Keep the system awake instead of allowing it to sleep. Default is `false`.

 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. The page is considered visible when its browser window is hidden and the capturer count is non-zero. If you would like the page to stay hidden, you should ensure that `stayHidden` is set to true.
+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.

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

@@ -1543,7 +1538,7 @@ Remove the window's menu bar.
 * `options` Object (optional)
  * `mode` string _Windows_ - Mode for the progress bar. Can be `none`, `normal`, `indeterminate`, `error` or `paused`.

-Sets progress value in progress bar. Valid range is \[0, 1.0].
+Sets progress value in progress bar. Valid range is [0, 1.0].

 Remove progress bar when progress < 0;
 Change to indeterminate mode when progress > 1.
@@ -1567,13 +1562,6 @@ screen readers
 Sets a 16 x 16 pixel overlay onto the current taskbar icon, usually used to
 convey some sort of application status or to passively notify the user.

-#### `win.invalidateShadow()` _macOS_
-
-Invalidates the window shadow so that it is recomputed based on the current window shape.
-
-`BrowserWindows` that are transparent can sometimes leave behind visual artifacts on macOS.
-This method can be used to clear these artifacts when, for example, performing an animation.
-
 #### `win.setHasShadow(hasShadow)`

 * `hasShadow` boolean
@@ -1589,7 +1577,7 @@ Returns `boolean` - Whether the window has a shadow.
 * `opacity` number - between 0.0 (fully transparent) and 1.0 (fully opaque)

 Sets the opacity of the window. On Linux, does nothing. Out of bound number
-values are clamped to the \[0, 1] range.
+values are clamped to the [0, 1] range.

 #### `win.getOpacity()`

@@ -1859,7 +1847,7 @@ frameless window.

 Sets the touchBar layout for the current window. Specifying `null` or
 `undefined` clears the touch bar. This method only has an effect if the
-machine has a touch bar and is running on macOS 10.12.1+.
+machine has a touch bar.

 **Note:** The TouchBar API is currently experimental and may change or be
 removed in future Electron releases.
--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -61,7 +61,7 @@ throttling in one window, you can take the hack of

 Forces the maximum disk space to be used by the disk cache, in bytes.

-### --enable-logging\[=file]
+### --enable-logging[=file]

 Prints Chromium's logging to stderr (or a log file).

@@ -241,19 +241,19 @@ Electron supports some of the [CLI flags][node-cli] supported by Node.js.

 **Note:** Passing unsupported command line switches to Electron when it is not running in `ELECTRON_RUN_AS_NODE` will have no effect.

-### --inspect-brk\[=\[host:]port]
+### --inspect-brk[=[host:]port]

 Activate inspector on host:port and break at start of user script. Default host:port is 127.0.0.1:9229.

 Aliased to `--debug-brk=[host:]port`.

-### --inspect-port=\[host:]port
+### --inspect-port=[host:]port

 Set the `host:port` to be used when the inspector is activated. Useful when activating the inspector by sending the SIGUSR1 signal. Default host is `127.0.0.1`.

 Aliased to `--debug-port=[host:]port`.

-### --inspect\[=\[host:]port]
+### --inspect[=[host:]port]

 Activate inspector on `host:port`. Default is `127.0.0.1:9229`.

@@ -271,6 +271,8 @@ By default inspector websocket url is available in stderr and under /json/list e

 [app]: app.md
 [append-switch]: command-line.md#commandlineappendswitchswitch-value
+[ready]: app.md#event-ready
+[play-silent-audio]: https://github.com/atom/atom/pull/9485/files
 [debugging-main-process]: ../tutorial/debugging-main-process.md
 [logging]: https://source.chromium.org/chromium/chromium/src/+/main:base/logging.h
 [node-cli]: https://nodejs.org/api/cli.html
--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -65,7 +65,7 @@ the API become immutable and updates on either side of the bridge do not result
 An example of a complex API is shown below:

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

 contextBridge.exposeInMainWorld(
  'electron',
--- a/docs/api/debugger.md
+++ b/docs/api/debugger.md
@@ -59,6 +59,7 @@ Returns:
 Emitted whenever the debugging target issues an instrumentation event.

 [rdp]: https://chromedevtools.github.io/devtools-protocol/
+[`webContents.findInPage`]: web-contents.md#contentsfindinpagetext-options

 ### Instance Methods

--- a/docs/api/desktop-capturer.md
+++ b/docs/api/desktop-capturer.md
@@ -1,7 +1,7 @@
 # desktopCapturer

 > Access information about media sources that can be used to capture audio and
-> video from the desktop using the [`navigator.mediaDevices.getUserMedia`][] API.
+> video from the desktop using the [`navigator.mediaDevices.getUserMedia`] API.

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

@@ -59,11 +59,11 @@ function handleError (e) {
 ```

 To capture video from a source provided by `desktopCapturer` the constraints
-passed to [`navigator.mediaDevices.getUserMedia`][] must include
+passed to [`navigator.mediaDevices.getUserMedia`] must include
 `chromeMediaSource: 'desktop'`, and `audio: false`.

 To capture both audio and video from the entire desktop the constraints passed
-to [`navigator.mediaDevices.getUserMedia`][] must include `chromeMediaSource: 'desktop'`,
+to [`navigator.mediaDevices.getUserMedia`] must include `chromeMediaSource: 'desktop'`,
 for both `audio` and `video`, but should not include a `chromeMediaSourceId` constraint.

 ```javascript
@@ -101,7 +101,7 @@ The `desktopCapturer` module has the following methods:
 Returns `Promise<DesktopCapturerSource[]>` - Resolves with an array of [`DesktopCapturerSource`](structures/desktop-capturer-source.md) objects, each `DesktopCapturerSource` represents a screen or an individual window that can be captured.

 **Note** Capturing the screen contents requires user consent on macOS 10.15 Catalina or higher,
-which can detected by [`systemPreferences.getMediaAccessStatus`][].
+which can detected by [`systemPreferences.getMediaAccessStatus`].

 [`navigator.mediaDevices.getUserMedia`]: https://developer.mozilla.org/en/docs/Web/API/MediaDevices/getUserMedia
 [`systemPreferences.getMediaAccessStatus`]: system-preferences.md#systempreferencesgetmediaaccessstatusmediatype-windows-macos
--- a/docs/api/global-shortcut.md
+++ b/docs/api/global-shortcut.md
@@ -66,7 +66,7 @@ the app has been authorized as a [trusted accessibility client](https://develope

 ### `globalShortcut.registerAll(accelerators, callback)`

-* `accelerators` [Accelerator](accelerator.md)[] - an array of [Accelerator](accelerator.md)s.
+* `accelerators` string[] - an array of [Accelerator](accelerator.md)s.
 * `callback` Function

 Registers a global shortcut of all `accelerator` items in `accelerators`. The `callback` is called when any of the registered shortcuts are pressed by the user.
--- a/docs/api/in-app-purchase.md
+++ b/docs/api/in-app-purchase.md
@@ -21,12 +21,10 @@ Returns:

 The `inAppPurchase` module has the following methods:

-### `inAppPurchase.purchaseProduct(productID[, opts])`
+### `inAppPurchase.purchaseProduct(productID[, quantity])`

-* `productID` string
-* `opts` Integer | Object (optional) - If specified as an integer, defines the quantity.
-  * `quantity` Integer (optional) - The number of items the user wants to purchase.
-  * `username` string (optional) - The string that associates the transaction with a user account on your service (applicationUsername).
+* `productID` string - The identifiers of the product to purchase. (The identifier of `com.example.app.product1` is `product1`).
+* `quantity` Integer (optional) - The number of items the user wants to purchase.

 Returns `Promise<boolean>` - Returns `true` if the product is valid and added to the payment queue.

--- a/docs/api/ipc-main.md
+++ b/docs/api/ipc-main.md
@@ -16,7 +16,7 @@ process, it handles asynchronous and synchronous messages sent from a renderer
 process (web page). Messages sent from a renderer will be emitted to this
 module.

-For usage examples, check out the [IPC tutorial][].
+For usage examples, check out the [IPC tutorial].

 ## Sending messages

--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -142,7 +142,7 @@ Returns `any` - The value sent back by the [`ipcMain`](./ipc-main.md) handler.

 Send a message to the main process via `channel` and expect a result
 synchronously. Arguments will be serialized with the [Structured Clone
-Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will not be
+Algorithm][SCA], just like [`window.postMessage`], so prototype chains will not be
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.

--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -25,7 +25,7 @@ See [`Menu`](menu.md) for examples.
  * `icon` ([NativeImage](native-image.md) | string) (optional)
  * `enabled` boolean (optional) - If false, the menu item will be greyed out and
    unclickable.
-  * `acceleratorWorksWhenHidden` boolean (optional) _macOS_ - default is `true`, and when `false` will prevent the accelerator from triggering the item if the item is not visible.
+  * `acceleratorWorksWhenHidden` boolean (optional) _macOS_ - default is `true`, and when `false` will prevent the accelerator from triggering the item if the item is not visible`.
  * `visible` boolean (optional) - If false, the menu item will be entirely hidden.
  * `checked` boolean (optional) - Should only be specified for `checkbox` or `radio` type
    menu items.
@@ -51,7 +51,7 @@ See [`Menu`](menu.md) for examples.
    the placement of their containing group after the containing group of the item
    with the specified label.

-**Note:** `acceleratorWorksWhenHidden` is specified as being macOS-only because accelerators always work when items are hidden on Windows and Linux. The option is exposed to users to give them the option to turn it off, as this is possible in native macOS development. This property is only usable on macOS High Sierra 10.13 or newer.
+**Note:** `acceleratorWorksWhenHidden` is specified as being macOS-only because accelerators always work when items are hidden on Windows and Linux. The option is exposed to users to give them the option to turn it off, as this is possible in native macOS development.

 ### Roles

--- a/docs/api/push-notifications.md
+++ b/docs/api/push-notifications.md
@@ -26,7 +26,6 @@ The `pushNotification` module emits the following events:

 Returns:

-* `event` Event
 * `userInfo` Record<String, any>

 Emitted when the app receives a remote notification while running.
--- a/docs/api/session.md
+++ b/docs/api/session.md
@@ -195,8 +195,8 @@ Emitted when a HID device needs to be selected when a call to
 `navigator.hid.requestDevice` is made. `callback` should be called with
 `deviceId` to be selected; passing no arguments to `callback` will
 cancel the request.  Additionally, permissioning on `navigator.hid` can
-be further managed by using [`ses.setPermissionCheckHandler(handler)`](#sessetpermissioncheckhandlerhandler)
-and [`ses.setDevicePermissionHandler(handler)`](#sessetdevicepermissionhandlerhandler).
+be further managed by using [ses.setPermissionCheckHandler(handler)](#sessetpermissioncheckhandlerhandler)
+and [ses.setDevicePermissionHandler(handler)`](#sessetdevicepermissionhandlerhandler).

 ```javascript
 const { app, BrowserWindow } = require('electron')
@@ -239,7 +239,7 @@ app.whenReady().then(() => {
    const selectedDevice = details.deviceList.find((device) => {
      return device.vendorId === '9025' && device.productId === '67'
    })
-    callback(selectedDevice?.deviceId)
+    callback(selectedPort?.deviceId)
  })
 })
 ```
@@ -429,118 +429,6 @@ const portConnect = async () => {
 }
 ```

-#### Event: 'select-usb-device'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `deviceList` [USBDevice[]](structures/usb-device.md)
-  * `frame` [WebFrameMain](web-frame-main.md)
-* `callback` Function
-  * `deviceId` string (optional)
-
-Emitted when a USB device needs to be selected when a call to
-`navigator.usb.requestDevice` is made. `callback` should be called with
-`deviceId` to be selected; passing no arguments to `callback` will
-cancel the request.  Additionally, permissioning on `navigator.usb` can
-be further managed by using [`ses.setPermissionCheckHandler(handler)`](#sessetpermissioncheckhandlerhandler)
-and [`ses.setDevicePermissionHandler(handler)`](#sessetdevicepermissionhandlerhandler).
-
-```javascript
-const { app, BrowserWindow } = require('electron')
-
-let win = null
-
-app.whenReady().then(() => {
-  win = new BrowserWindow()
-
-  win.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
-    if (permission === 'usb') {
-      // Add logic here to determine if permission should be given to allow USB selection
-      return true
-    }
-    return false
-  })
-
-  // Optionally, retrieve previously persisted devices from a persistent store (fetchGrantedDevices needs to be implemented by developer to fetch persisted permissions)
-  const grantedDevices = fetchGrantedDevices()
-
-  win.webContents.session.setDevicePermissionHandler((details) => {
-    if (new URL(details.origin).hostname === 'some-host' && details.deviceType === 'usb') {
-      if (details.device.vendorId === 123 && details.device.productId === 345) {
-        // Always allow this type of device (this allows skipping the call to `navigator.usb.requestDevice` first)
-        return true
-      }
-
-      // Search through the list of devices that have previously been granted permission
-      return grantedDevices.some((grantedDevice) => {
-        return grantedDevice.vendorId === details.device.vendorId &&
-              grantedDevice.productId === details.device.productId &&
-              grantedDevice.serialNumber && grantedDevice.serialNumber === details.device.serialNumber
-      })
-    }
-    return false
-  })
-
-  win.webContents.session.on('select-usb-device', (event, details, callback) => {
-    event.preventDefault()
-    const selectedDevice = details.deviceList.find((device) => {
-      return device.vendorId === '9025' && device.productId === '67'
-    })
-    if (selectedDevice) {
-      // Optionally, add this to the persisted devices (updateGrantedDevices needs to be implemented by developer to persist permissions)
-      grantedDevices.push(selectedDevice)
-      updateGrantedDevices(grantedDevices)
-    }
-    callback(selectedDevice?.deviceId)
-  })
-})
-```
-
-#### Event: 'usb-device-added'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `device` [USBDevice](structures/usb-device.md)
-  * `frame` [WebFrameMain](web-frame-main.md)
-
-Emitted after `navigator.usb.requestDevice` has been called and
-`select-usb-device` has fired if a new device becomes available before
-the callback from `select-usb-device` is called.  This event is intended for
-use when using a UI to ask users to pick a device so that the UI can be updated
-with the newly added device.
-
-#### Event: 'usb-device-removed'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `device` [USBDevice](structures/usb-device.md)
-  * `frame` [WebFrameMain](web-frame-main.md)
-
-Emitted after `navigator.usb.requestDevice` has been called and
-`select-usb-device` has fired if a device has been removed before the callback
-from `select-usb-device` is called.  This event is intended for use when using
-a UI to ask users to pick a device so that the UI can be updated to remove the
-specified device.
-
-#### Event: 'usb-device-revoked'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `device` [USBDevice[]](structures/usb-device.md)
-  * `origin` string (optional) - The origin that the device has been revoked from.
-
-Emitted after `USBDevice.forget()` has been called.  This event can be used
-to help maintain persistent storage of permissions when
-`setDevicePermissionHandler` is used.
-
 ### Instance Methods

 The following methods are available on instances of `Session`:
@@ -565,7 +453,7 @@ Clears the session’s HTTP cache.
    `shadercache`, `websql`, `serviceworkers`, `cachestorage`. If not
    specified, clear all storage types.
  * `quotas` string[] (optional) - The types of quotas to clear, can contain:
-    `temporary`, `syncable`. If not specified, clear all quotas.
+    `temporary`, `persistent`, `syncable`. If not specified, clear all quotas.

 Returns `Promise<void>` - resolves when the storage data has been cleared.

@@ -659,7 +547,7 @@ The `proxyBypassRules` is a comma separated list of rules described below:
   Match URLs which are IP address literals.

   Examples:
-     "127.0.1", "\[0:0::1]", "\[::1]", "http://\[::1]:99"
+     "127.0.1", "[0:0::1]", "[::1]", "http://[::1]:99"

 * `IP_LITERAL "/" PREFIX_LENGTH_IN_BITS`

@@ -795,7 +683,7 @@ 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. These requests always appear to originate from the main frame.
    * `fullscreen` - Request for the app to enter fullscreen mode.
    * `openExternal` - Request to open links in external applications.
-    * `window-management` - Request access to enumerate screens using the [`getScreenDetails`](https://developer.chrome.com/en/articles/multi-screen-window-placement/) API.
+    * `window-placement` - Request access to enumerate screens using the [`getScreenDetails`](https://developer.chrome.com/en/articles/multi-screen-window-placement/) API.
    * `unknown` - An unrecognized permission request
  * `callback` Function
    * `permissionGranted` boolean - Allow or deny the permission.
@@ -828,7 +716,7 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents

 * `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.  All cross origin sub frames making permission checks will pass a `null` webContents to this handler, while certain other permission checks such as `notifications` checks will always pass `null`.  You should use `embeddingOrigin` and `requestingOrigin` to determine what origin the owning frame and the requesting frame are on respectively.
-  * `permission` string - Type of permission check.  Valid values are `midiSysex`, `notifications`, `geolocation`, `media`,`mediaKeySystem`,`midi`, `pointerLock`, `fullscreen`, `openExternal`, `hid`, `serial`, or `usb`.
+  * `permission` string - Type of permission check.  Valid values are `midiSysex`, `notifications`, `geolocation`, `media`,`mediaKeySystem`,`midi`, `pointerLock`, `fullscreen`, `openExternal`, `hid`, 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.
@@ -914,7 +802,7 @@ Passing `null` instead of a function resets the handler to its default state.

 * `handler` Function\<boolean> | null
  * `details` Object
-    * `deviceType` string - The type of device that permission is being requested on, can be `hid`, `serial`, or `usb`.
+    * `deviceType` string - The type of device that permission is being requested on, can be `hid` or `serial`.
    * `origin` string - The origin URL of the device permission check.
    * `device` [HIDDevice](structures/hid-device.md) | [SerialPort](structures/serial-port.md)- the device that permission is being requested for.

@@ -942,8 +830,6 @@ app.whenReady().then(() => {
      return true
    } else if (permission === 'serial') {
      // Add logic here to determine if permission should be given to allow serial port selection
-    } else if (permission === 'usb') {
-      // Add logic here to determine if permission should be given to allow USB device selection
    }
    return false
  })
--- a/docs/api/structures/usb-device.md
+++ b/docs/api/structures/usb-device.md
@@ -1,17 +0,0 @@
-# USBDevice Object
-
-* `deviceId` string - Unique identifier for the device.
-* `vendorId` Integer - The USB vendor ID.
-* `productId` Integer - The USB product ID.
-* `productName` string (optional) - Name of the device.
-* `serialNumber` string (optional) - The USB device serial number.
-* `manufacturerName` string (optional) - The manufacturer name of the device.
-* `usbVersionMajor` Integer - The USB protocol major version supported by the device
-* `usbVersionMinor` Integer - The USB protocol minor version supported by the device
-* `usbVersionSubminor` Integer - The USB protocol subminor version supported by the device
-* `deviceClass` Integer - The device class for the communication interface supported by the device
-* `deviceSubclass` Integer - The device subclass for the communication interface supported by the device
-* `deviceProtocol` Integer - The device protocol for the communication interface supported by the device
-* `deviceVersionMajor` Integer - The major version number of the device as defined by the device manufacturer.
-* `deviceVersionMinor` Integer - The minor version number of the device as defined by the device manufacturer.
-* `deviceVersionSubminor` Integer - The subminor version number of the device as defined by the device manufacturer.
--- a/docs/api/system-preferences.md
+++ b/docs/api/system-preferences.md
@@ -187,7 +187,7 @@ Some popular `key` and `type`s are:

 * `key` string
 * `type` Type - Can be `string`, `boolean`, `integer`, `float`, `double`, `url`, `array` or `dictionary`.
-* `value` UserDefaultTypes\[Type]
+* `value` UserDefaultTypes[Type]

 Set the value of `key` in `NSUserDefaults`.

@@ -394,8 +394,6 @@ system default and override the value of `getEffectiveAppearance`.

 Returns `boolean` - whether or not this device has the ability to use Touch ID.

-**NOTE:** This API will return `false` on macOS systems older than Sierra 10.12.2.
-
 ### `systemPreferences.promptTouchID(reason)` _macOS_

 * `reason` string - The reason you are asking for Touch ID authentication
@@ -414,8 +412,6 @@ systemPreferences.promptTouchID('To get consent for a Security-Gated Thing').the

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

-**NOTE:** This API will return a rejected Promise on macOS systems older than Sierra 10.12.2.
-
 ### `systemPreferences.isTrustedAccessibilityClient(prompt)` _macOS_

 * `prompt` boolean - whether or not the user will be informed via prompt if the current process is untrusted.
@@ -428,7 +424,7 @@ Returns `boolean` - `true` if the current process is a trusted accessibility cli

 Returns `string` - Can be `not-determined`, `granted`, `denied`, `restricted` or `unknown`.

-This user consent was not required on macOS 10.13 High Sierra or lower so this method will always return `granted`.
+This user consent was not required on macOS 10.13 High Sierra so this method will always return `granted`.
 macOS 10.14 Mojave or higher requires consent for `microphone` and `camera` access.
 macOS 10.15 Catalina or higher requires consent for `screen` access.

@@ -443,7 +439,7 @@ Returns `Promise<boolean>` - A promise that resolves with `true` if consent was

 **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#rebranding-with-downloaded-binaries) 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.
+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.

 ### `systemPreferences.getAnimationSettings()`

--- a/docs/api/tray.md
+++ b/docs/api/tray.md
@@ -235,7 +235,7 @@ Sets the hover text for this tray icon.

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

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

--- a/docs/api/utility-process.md
+++ b/docs/api/utility-process.md
@@ -24,9 +24,9 @@ Process: [Main](../glossary.md#main-process)<br />
    `stderr` to either `pipe`, `inherit` or `ignore`. Configuring `stdin` is not supported; `stdin` will
    always be ignored.
    For example, the supported values will be processed as following:
-    * `pipe`: equivalent to \['ignore', 'pipe', 'pipe'] (the default)
-    * `ignore`: equivalent to \['ignore', 'ignore', 'ignore']
-    * `inherit`: equivalent to \['ignore', 'inherit', 'inherit']
+    * `pipe`: equivalent to ['ignore', 'pipe', 'pipe'] (the default)
+    * `ignore`: equivalent to 'ignore', 'ignore', 'ignore']
+    * `inherit`: equivalent to ['ignore', 'inherit', 'inherit']
  * `serviceName` string (optional) - Name of the process that will appear in `name` property of
    [`child-process-gone` event of `app`](app.md#event-child-process-gone).
    Default is `node.mojom.NodeService`.
@@ -90,7 +90,7 @@ the child process exits, then the value is `undefined` after the `exit` event is
 #### `child.stdout`

 A `NodeJS.ReadableStream | null` that represents the child process's stdout.
-If the child was spawned with options.stdio\[1] set to anything other than 'pipe', then this will be `null`.
+If the child was spawned with options.stdio[1] set to anything other than 'pipe', then this will be `null`.
 When the child process exits, then the value is `null` after the `exit` event is emitted.

 ```js
@@ -105,7 +105,7 @@ child.stdout.on('data', (data) => {
 #### `child.stderr`

 A `NodeJS.ReadableStream | null` that represents the child process's stderr.
-If the child was spawned with options.stdio\[2] set to anything other than 'pipe', then this will be `null`.
+If the child was spawned with options.stdio[2] set to anything other than 'pipe', then this will be `null`.
 When the child process exits, then the value is `null` after the `exit` event is emitted.

 ### Instance Events
--- a/docs/api/web-contents.md
+++ b/docs/api/web-contents.md
@@ -492,14 +492,6 @@ The `focus` and `blur` events of `WebContents` should only be used to detect
 focus change between different `WebContents` and `BrowserView` in the same
 window.

-#### Event: 'devtools-open-url'
-
-Returns:
-
-* `url` string - URL of the link that was clicked or selected.
-
-Emitted when a link is clicked in DevTools or 'Open in new tab' is selected for a link in its context menu.
-
 #### Event: 'devtools-opened'

 Emitted when DevTools is opened.
@@ -578,7 +570,7 @@ Returns:
  * `finalUpdate` boolean

 Emitted when a result is available for
-[`webContents.findInPage`](#contentsfindinpagetext-options) request.
+[`webContents.findInPage`] request.

 #### Event: 'media-started-playing'

@@ -1332,7 +1324,7 @@ can be obtained by subscribing to [`found-in-page`](web-contents.md#event-found-
 #### `contents.stopFindInPage(action)`

 * `action` string - Specifies the action to take place when ending
-  [`webContents.findInPage`](#contentsfindinpagetext-options) request.
+  [`webContents.findInPage`] request.
  * `clearSelection` - Clear the selection.
  * `keepSelection` - Translate the selection into a normal selection.
  * `activateSelection` - Focus and click the selection node.
@@ -1349,24 +1341,39 @@ const requestId = webContents.findInPage('api')
 console.log(requestId)
 ```

-#### `contents.capturePage([rect, opts])`
+#### `contents.capturePage([rect])`

 * `rect` [Rectangle](structures/rectangle.md) (optional) - The area of the page to be captured.
-* `opts` Object (optional)
-  * `stayHidden` boolean (optional) -  Keep the page hidden instead of visible. Default is `false`.
-  * `stayAwake` boolean (optional) -  Keep the system awake instead of allowing it to sleep. Default is `false`.

 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.
-The page is considered visible when its browser window is hidden and the capturer count is non-zero.
-If you would like the page to stay hidden, you should ensure that `stayHidden` is set to true.

 #### `contents.isBeingCaptured()`

 Returns `boolean` - Whether this page is being captured. It returns true when the capturer count
 is large then 0.

+#### `contents.incrementCapturerCount([size, stayHidden, stayAwake])`
+
+* `size` [Size](structures/size.md) (optional) - The preferred size for the capturer.
+* `stayHidden` boolean (optional) -  Keep the page hidden instead of visible.
+* `stayAwake` boolean (optional) -  Keep the system awake instead of allowing it to sleep.
+
+Increase the capturer count by one. The page is considered visible when its browser window is
+hidden and the capturer count is non-zero. If you would like the page to stay hidden, you should ensure that `stayHidden` is set to true.
+
+This also affects the Page Visibility API.
+
+#### `contents.decrementCapturerCount([stayHidden, stayAwake])`
+
+* `stayHidden` boolean (optional) -  Keep the page in hidden state instead of visible.
+* `stayAwake` boolean (optional) -  Keep the system awake instead of allowing it to sleep.
+
+Decrease the capturer count by one. The page will be set to hidden or occluded state when its
+browser window is hidden or occluded and the capturer count reaches zero. If you want to
+decrease the hidden capturer count instead you should set `stayHidden` to true.
+
 #### `contents.getPrinters()` _Deprecated_

 Get the system printer list.
@@ -1695,7 +1702,7 @@ app.whenReady().then(() => {

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

-* `frameId` Integer | \[number, number] - the ID of the frame to send to, or a
+* `frameId` Integer | [number, number] - the ID of the frame to send to, or a
  pair of `[processId, frameId]` if the frame is in a different process to the
  main frame.
 * `channel` string
--- a/docs/api/webview-tag.md
+++ b/docs/api/webview-tag.md
@@ -609,7 +609,7 @@ examples.

 ### `<webview>.sendToFrame(frameId, channel, ...args)`

-* `frameId` \[number, number] - `[processId, frameId]`
+* `frameId` [number, number] - `[processId, frameId]`
 * `channel` string
 * `...args` any[]

@@ -909,7 +909,7 @@ webview.addEventListener('close', () => {

 Returns:

-* `frameId` \[number, number] - pair of `[processId, frameId]`.
+* `frameId` [number, number] - pair of `[processId, frameId]`.
 * `channel` string
 * `args` any[]

@@ -981,14 +981,6 @@ Returns:

 Emitted when mouse moves over a link or the keyboard moves the focus to a link.

-### Event: 'devtools-open-url'
-
-Returns:
-
-* `url` string - URL of the link that was clicked or selected.
-
-Emitted when a link is clicked in DevTools or 'Open in new tab' is selected for a link in its context menu.
-
 ### Event: 'devtools-opened'

 Emitted when DevTools is opened.
--- a/docs/breaking-changes.md
+++ b/docs/breaking-changes.md
@@ -14,12 +14,6 @@ This document uses the following convention to categorize breaking changes:

 ## Planned Breaking API Changes (23.0)

-### Removed: Windows 7 / 8 / 8.1 support
-
-[Windows 7, Windows 8, and Windows 8.1 are no longer supported](https://www.electronjs.org/blog/windows-7-to-8-1-deprecation-notice). Electron follows the planned Chromium deprecation policy, which will [deprecate Windows 7 support beginning in Chromium 109](https://support.google.com/chrome/thread/185534985/sunsetting-support-for-windows-7-8-8-1-in-early-2023?hl=en).
-
-Older versions of Electron will continue to run on these operating systems, but Windows 10 or later will be required to run Electron v23.0.0 and higher.
-
 ### Removed: BrowserWindow `scroll-touch-*` events

 The deprecated `scroll-touch-begin`, `scroll-touch-end` and `scroll-touch-edge`
@@ -44,98 +38,14 @@ win.webContents.on('input-event', (_, event) => {
 })
 ```

-### Removed: `webContents.incrementCapturerCount(stayHidden, stayAwake)`
-
-The `webContents.incrementCapturerCount(stayHidden, stayAwake)` function has been removed.
-It is now automatically handled by `webContents.capturePage` when a page capture completes.
-
-```js
-const w = new BrowserWindow({ show: false })
-
-// Removed in Electron 23
-w.webContents.incrementCapturerCount()
-w.capturePage().then(image => {
-  console.log(image.toDataURL())
-  w.webContents.decrementCapturerCount()
-})
-
-// Replace with
-w.capturePage().then(image => {
-  console.log(image.toDataURL())
-})
-```
-
-### Removed: `webContents.decrementCapturerCount(stayHidden, stayAwake)`
-
-The `webContents.decrementCapturerCount(stayHidden, stayAwake)` function has been removed.
-It is now automatically handled by `webContents.capturePage` when a page capture completes.
-
-```js
-const w = new BrowserWindow({ show: false })
-
-// Removed in Electron 23
-w.webContents.incrementCapturerCount()
-w.capturePage().then(image => {
-  console.log(image.toDataURL())
-  w.webContents.decrementCapturerCount()
-})
-
-// Replace with
-w.capturePage().then(image => {
-  console.log(image.toDataURL())
-})
-```
-
 ## Planned Breaking API Changes (22.0)

-### Deprecated: `webContents.incrementCapturerCount(stayHidden, stayAwake)`
-
-`webContents.incrementCapturerCount(stayHidden, stayAwake)` has been deprecated.
-It is now automatically handled by `webContents.capturePage` when a page capture completes.
-
-```js
-const w = new BrowserWindow({ show: false })
-
-// Removed in Electron 23
-w.webContents.incrementCapturerCount()
-w.capturePage().then(image => {
-  console.log(image.toDataURL())
-  w.webContents.decrementCapturerCount()
-})
-
-// Replace with
-w.capturePage().then(image => {
-  console.log(image.toDataURL())
-})
-```
-
-### Deprecated: `webContents.decrementCapturerCount(stayHidden, stayAwake)`
-
-`webContents.decrementCapturerCount(stayHidden, stayAwake)` has been deprecated.
-It is now automatically handled by `webContents.capturePage` when a page capture completes.
-
-```js
-const w = new BrowserWindow({ show: false })
-
-// Removed in Electron 23
-w.webContents.incrementCapturerCount()
-w.capturePage().then(image => {
-  console.log(image.toDataURL())
-  w.webContents.decrementCapturerCount()
-})
-
-// Replace with
-w.capturePage().then(image => {
-  console.log(image.toDataURL())
-})
-```
-
 ### Removed: WebContents `new-window` event

 The `new-window` event of WebContents has been removed. It is replaced by [`webContents.setWindowOpenHandler()`](api/web-contents.md#contentssetwindowopenhandlerhandler).

 ```js
-// Removed in Electron 22
+// Removed in Electron 21
 webContents.on('new-window', (event) => {
  event.preventDefault()
 })
@@ -236,6 +146,13 @@ webContents.printToPDF({

 ## Planned Breaking API Changes (20.0)

+### Removed: macOS 10.11 / 10.12 support
+
+macOS 10.11 (El Capitan) and macOS 10.12 (Sierra) are no longer supported by [Chromium](https://chromium-review.googlesource.com/c/chromium/src/+/3646050).
+
+Older versions of Electron will continue to run on these operating systems, but macOS 10.13 (High Sierra)
+or later will be required to run Electron v20.0.0 and higher.
+
 ### Default Changed: renderers without `nodeIntegration: true` are sandboxed by default

 Previously, renderers that specified a preload script defaulted to being
@@ -1433,7 +1350,7 @@ When building native modules for windows, the `win_delay_load_hook` variable in
 the module's `binding.gyp` must be true (which is the default). If this hook is
 not present, then the native module will fail to load on Windows, with an error
 message like `Cannot find module`. See the [native module
-guide](./tutorial/using-native-node-modules.md) for more.
+guide](/docs/tutorial/using-native-node-modules.md) for more.

 ### Removed: IA32 Linux support

--- a/docs/development/build-instructions-gn.md
+++ b/docs/development/build-instructions-gn.md
@@ -146,7 +146,7 @@ $ ninja -C out/Release electron
 ```

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

 The built executable will be under `./out/Testing`:
--- a/docs/development/build-instructions-windows.md
+++ b/docs/development/build-instructions-windows.md
@@ -115,6 +115,10 @@ $ git config --system core.longpaths true

 This can happen during build, when Debugging Tools for Windows has been installed with Windows Driver Kit. Uninstall Windows Driver Kit and install Debugging Tools with steps described above.

+### ImportError: No module named win32file
+
+Make sure you have installed `pywin32` with `pip install pywin32`.
+
 ### Build Scripts Hang Until Keypress

 This bug is a "feature" of Windows' command prompt. It happens when clicking inside the prompt window with
--- a/docs/development/creating-api.md
+++ b/docs/development/creating-api.md
@@ -138,7 +138,7 @@ interface Process {
 At the very bottom of your `api_name.cc` file:

 ```cpp title='api_name.cc'
-NODE_LINKED_BINDING_CONTEXT_AWARE(electron_browser_{api_name},Initialize)
+NODE_LINKED_MODULE_CONTEXT_AWARE(electron_browser_{api_name},Initialize)
 ```

 In your [`shell/common/node_bindings.cc`](https://github.com/electron/electron/blob/main/shell/common/node_bindings.cc) file, add your node binding name to Electron's built-in modules.
--- a/docs/development/debugging-with-xcode.md
+++ b/docs/development/debugging-with-xcode.md
@@ -17,7 +17,7 @@ See `gn help gen` for more information on generating IDE projects with GN.

 Launch Electron app after build.
 You can now open the xcode workspace created above and attach to the Electron process
-through the Debug > Attach To Process > Electron debug menu. \[Note: If you want to debug
+through the Debug > Attach To Process > Electron debug menu. [Note: If you want to debug
 the renderer process, you need to attach to the Electron Helper as well.]

 You can now set breakpoints in any of the indexed files. However, you will not be able
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -154,6 +154,7 @@ Notice that just setting the background in the CSS does not have the desired eff

 [memory-management]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Memory_Management
 [variable-scope]: https://msdn.microsoft.com/library/bzt2dkta(v=vs.94).aspx
+[electron-module]: https://www.npmjs.com/package/electron
 [storage]: https://developer.mozilla.org/en-US/docs/Web/API/Storage
 [local-storage]: https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage
 [session-storage]: https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage
--- a/docs/fiddles/features/keyboard-shortcuts/web-apis/index.html
+++ b/docs/fiddles/features/keyboard-shortcuts/web-apis/index.html
@@ -9,7 +9,7 @@
  </head>
  <body>
    <h1>Hello World!</h1>
-
+    
    <p>Hit any key with this window focused to see it captured here.</p>
    <div><span>Last Key Pressed: </span><span id="last-keypress"></span></div>
    <script src="./renderer.js"></script>
--- a/docs/fiddles/features/keyboard-shortcuts/web-apis/main.js
+++ b/docs/fiddles/features/keyboard-shortcuts/web-apis/main.js
@@ -19,7 +19,7 @@ function createWindow () {
 // Some APIs can only be used after this event occurs.
 app.whenReady().then(() => {
  createWindow()
-
+  
  app.on('activate', function () {
    // On macOS it's common to re-create a window in the app when the
    // dock icon is clicked and there are no other windows open.
--- a/docs/fiddles/features/macos-dark-mode/index.html
+++ b/docs/fiddles/features/macos-dark-mode/index.html
--- a/docs/fiddles/features/macos-dark-mode/main.js
+++ b/docs/fiddles/features/macos-dark-mode/main.js
@@ -11,21 +11,21 @@ function createWindow () {
  })

  win.loadFile('index.html')
+
+  ipcMain.handle('dark-mode:toggle', () => {
+    if (nativeTheme.shouldUseDarkColors) {
+      nativeTheme.themeSource = 'light'
+    } else {
+      nativeTheme.themeSource = 'dark'
+    }
+    return nativeTheme.shouldUseDarkColors
+  })
+
+  ipcMain.handle('dark-mode:system', () => {
+    nativeTheme.themeSource = 'system'
+  })
 }

-ipcMain.handle('dark-mode:toggle', () => {
-  if (nativeTheme.shouldUseDarkColors) {
-    nativeTheme.themeSource = 'light'
-  } else {
-    nativeTheme.themeSource = 'dark'
-  }
-  return nativeTheme.shouldUseDarkColors
-})
-
-ipcMain.handle('dark-mode:system', () => {
-  nativeTheme.themeSource = 'system'
-})
-
 app.whenReady().then(() => {
  createWindow()

--- a/docs/fiddles/features/macos-dark-mode/preload.js
+++ b/docs/fiddles/features/macos-dark-mode/preload.js
--- a/docs/fiddles/features/macos-dark-mode/renderer.js
+++ b/docs/fiddles/features/macos-dark-mode/renderer.js
--- a/docs/fiddles/features/macos-dark-mode/styles.css
+++ b/docs/fiddles/features/macos-dark-mode/styles.css
@@ -1,7 +1,3 @@
-:root {
-  color-scheme: light dark;
-}
-
@media (prefers-color-scheme: dark) {
  body { background: #333; color: white; }
 }
--- a/docs/fiddles/features/online-detection/index.html
+++ b/docs/fiddles/features/online-detection/index.html
@@ -7,7 +7,7 @@
 </head>
 <body>
    <h1>Connection status: <strong id='status'></strong></h1>
-
+    
    <script src="renderer.js"></script>
 </body>
 </html>
--- a/docs/fiddles/features/web-bluetooth/main.js
+++ b/docs/fiddles/features/web-bluetooth/main.js
@@ -7,14 +7,14 @@ function createWindow () {
    height: 600,
    webPreferences: {
      preload: path.join(__dirname, 'preload.js')
-    }
+    }    
  })

  mainWindow.webContents.on('select-bluetooth-device', (event, deviceList, callback) => {
    event.preventDefault()
    if (deviceList && deviceList.length > 0) {
      callback(deviceList[0].deviceId)
-    }
+    } 
  })

  // Listen for a message from the renderer to get the response for the Bluetooth pairing.
@@ -27,14 +27,14 @@ function createWindow () {
    bluetoothPinCallback = callback
    // Send a message to the renderer to prompt the user to confirm the pairing.
    mainWindow.webContents.send('bluetooth-pairing-request', details)
-  })
+  })  

  mainWindow.loadFile('index.html')
 }

 app.whenReady().then(() => {
  createWindow()
-
+  
  app.on('activate', function () {
    if (BrowserWindow.getAllWindows().length === 0) createWindow()
  })
--- a/docs/fiddles/features/web-bluetooth/renderer.js
+++ b/docs/fiddles/features/web-bluetooth/renderer.js
@@ -9,7 +9,7 @@ document.getElementById('clickme').addEventListener('click',testIt)

 window.electronAPI.bluetoothPairingRequest((event, details) => {
  const response = {}
-
+  
  switch (details.pairingKind) {
    case 'confirm': {
      response.confirmed = confirm(`Do you want to connect to device ${details.deviceId}?`)
--- a/docs/fiddles/features/web-hid/index.html
+++ b/docs/fiddles/features/web-hid/index.html
@@ -12,7 +12,7 @@

    <h3>HID devices automatically granted access via <i>setDevicePermissionHandler</i></h3>
    <div id="granted-devices"></div>
-
+    
    <h3>HID devices automatically granted access via <i>select-hid-device</i></h3>
    <div id="granted-devices2"></div>

--- a/docs/fiddles/features/web-hid/main.js
+++ b/docs/fiddles/features/web-hid/main.js
@@ -6,16 +6,16 @@ function createWindow () {
    width: 800,
    height: 600
  })
-
+  
  mainWindow.webContents.session.on('select-hid-device', (event, details, callback) => {
    //Add events to handle devices being added or removed before the callback on
    //`select-hid-device` is called.
-    mainWindow.webContents.session.on('hid-device-added', (event, device) => {
+    mainWindow.webContents.session.on('hid-device-added', (event, device) => {    
      console.log('hid-device-added FIRED WITH', device)
      //Optionally update details.deviceList
    })
-
-    mainWindow.webContents.session.on('hid-device-removed', (event, device) => {
+  
+    mainWindow.webContents.session.on('hid-device-removed', (event, device) => {    
      console.log('hid-device-removed FIRED WITH', device)
      //Optionally update details.deviceList
    })
@@ -37,13 +37,13 @@ function createWindow () {
      return true
    }
  })
-
+  
  mainWindow.loadFile('index.html')
 }

 app.whenReady().then(() => {
  createWindow()
-
+  
  app.on('activate', function () {
    if (BrowserWindow.getAllWindows().length === 0) createWindow()
  })
--- a/docs/fiddles/features/web-serial/main.js
+++ b/docs/fiddles/features/web-serial/main.js
@@ -6,7 +6,7 @@ function createWindow () {
    width: 800,
    height: 600
  })
-
+  
  mainWindow.webContents.session.on('select-serial-port', (event, portList, webContents, callback) => {

    //Add listeners to handle ports being added or removed before the callback for `select-serial-port`
@@ -15,7 +15,7 @@ function createWindow () {
      console.log('serial-port-added FIRED WITH', port)
      //Optionally update portList to add the new port
    })
-
+  
    mainWindow.webContents.session.on('serial-port-removed', (event, port) => {
      console.log('serial-port-removed FIRED WITH', port)
      //Optionally update portList to remove the port
@@ -33,7 +33,7 @@ function createWindow () {
    if (permission === 'serial' && details.securityOrigin === 'file:///') {
      return true
    }
-
+    
    return false
  })

@@ -41,10 +41,10 @@ function createWindow () {
    if (details.deviceType === 'serial' && details.origin === 'file://') {
      return true
    }
-
+    
    return false
  })
-
+  
  mainWindow.loadFile('index.html')

  mainWindow.webContents.openDevTools()
@@ -52,7 +52,7 @@ function createWindow () {

 app.whenReady().then(() => {
  createWindow()
-
+  
  app.on('activate', function () {
    if (BrowserWindow.getAllWindows().length === 0) createWindow()
  })
--- a/docs/fiddles/features/web-usb/index.html
+++ b/docs/fiddles/features/web-usb/index.html
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <title>WebUSB API</title>
-  </head>
-  <body>
-    <h1>WebUSB API</h1>
-
-    <button id="clickme">Test WebUSB</button>
-
-    <h3>USB devices automatically granted access via <i>setDevicePermissionHandler</i></h3>
-    <div id="granted-devices"></div>
-
-    <h3>USB devices automatically granted access via <i>select-usb-device</i></h3>
-    <div id="granted-devices2"></div>
-
-    <script src="./renderer.js"></script>
-  </body>
-</html>
--- a/docs/fiddles/features/web-usb/main.js
+++ b/docs/fiddles/features/web-usb/main.js
@@ -1,72 +0,0 @@
-const {app, BrowserWindow} = require('electron')
-const e = require('express')
-const path = require('path')
-
-function createWindow () {
-  const mainWindow = new BrowserWindow({
-    width: 800,
-    height: 600
-  })
-
-  let grantedDeviceThroughPermHandler
-
-  mainWindow.webContents.session.on('select-usb-device', (event, details, callback) => {
-    //Add events to handle devices being added or removed before the callback on
-    //`select-usb-device` is called.
-    mainWindow.webContents.session.on('usb-device-added', (event, device) => {
-      console.log('usb-device-added FIRED WITH', device)
-      //Optionally update details.deviceList
-    })
-
-    mainWindow.webContents.session.on('usb-device-removed', (event, device) => {
-      console.log('usb-device-removed FIRED WITH', device)
-      //Optionally update details.deviceList
-    })
-
-    event.preventDefault()
-    if (details.deviceList && details.deviceList.length > 0) {
-      const deviceToReturn  = details.deviceList.find((device) => {
-        if (!grantedDeviceThroughPermHandler || (device.deviceId != grantedDeviceThroughPermHandler.deviceId)) {
-          return true
-        }
-      })
-      if (deviceToReturn) {
-        callback(deviceToReturn.deviceId)
-      } else {
-        callback()
-      }
-    }
-  })
-
-  mainWindow.webContents.session.setPermissionCheckHandler((webContents, permission, requestingOrigin, details) => {
-    if (permission === 'usb' && details.securityOrigin === 'file:///') {
-      return true
-    }
-  })
-
-
-  mainWindow.webContents.session.setDevicePermissionHandler((details) => {
-    if (details.deviceType === 'usb' && details.origin === 'file://') {
-      if (!grantedDeviceThroughPermHandler) {
-        grantedDeviceThroughPermHandler = details.device
-        return true
-      } else {
-        return false
-      }
-    }
-  })
-
-  mainWindow.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  createWindow()
-
-  app.on('activate', function () {
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
-  })
-})
-
-app.on('window-all-closed', function () {
-  if (process.platform !== 'darwin') app.quit()
-})
--- a/docs/fiddles/features/web-usb/renderer.js
+++ b/docs/fiddles/features/web-usb/renderer.js
@@ -1,33 +0,0 @@
-function getDeviceDetails(device) {
-  return grantedDevice.productName || `Unknown device ${grantedDevice.deviceId}`
-}
-
-async function testIt() {
-  const noDevicesFoundMsg = 'No devices found'
-  const grantedDevices = await navigator.usb.getDevices()
-  let grantedDeviceList = ''
-  if (grantedDevices.length > 0) {
-    grantedDevices.forEach(device => {
-      grantedDeviceList += `<hr>${getDeviceDetails(device)}</hr>`
-    })
-  } else {
-    grantedDeviceList = noDevicesFoundMsg
-  }
-  document.getElementById('granted-devices').innerHTML = grantedDeviceList
-
-  grantedDeviceList = ''
-  try {
-    const grantedDevice = await navigator.usb.requestDevice({
-      filters: []
-    })
-    grantedDeviceList += `<hr>${getDeviceDetails(device)}</hr>`
-
-  } catch (ex) {
-    if (ex.name === 'NotFoundError') {
-      grantedDeviceList = noDevicesFoundMsg
-    }
-  }
-  document.getElementById('granted-devices2').innerHTML = grantedDeviceList
-}
-
-document.getElementById('clickme').addEventListener('click',testIt)
--- a/docs/fiddles/ipc/pattern-1/main.js
+++ b/docs/fiddles/ipc/pattern-1/main.js
@@ -19,7 +19,7 @@ function createWindow () {

 app.whenReady().then(() => {
  createWindow()
-
+  
  app.on('activate', function () {
    if (BrowserWindow.getAllWindows().length === 0) createWindow()
  })
--- a/docs/fiddles/ipc/pattern-3/main.js
+++ b/docs/fiddles/ipc/pattern-3/main.js
@@ -37,7 +37,7 @@ app.whenReady().then(() => {
    console.log(value) // will print value to Node console
  })
  createWindow()
-
+  
  app.on('activate', function () {
    if (BrowserWindow.getAllWindows().length === 0) createWindow()
  })
--- a/docs/fiddles/media/screenshot/.keep
+++ b/docs/fiddles/media/screenshot/.keep
--- a/docs/fiddles/menus/customize-menus/.keep
+++ b/docs/fiddles/menus/customize-menus/.keep
--- a/docs/fiddles/menus/shortcuts/.keep
+++ b/docs/fiddles/menus/shortcuts/.keep
--- a/docs/fiddles/native-ui/dialogs/.keep
+++ b/docs/fiddles/native-ui/dialogs/.keep
--- a/docs/fiddles/native-ui/drag-and-drop/.keep
+++ b/docs/fiddles/native-ui/drag-and-drop/.keep
--- a/docs/fiddles/native-ui/external-links-file-manager/.keep
+++ b/docs/fiddles/native-ui/external-links-file-manager/.keep
--- a/docs/fiddles/native-ui/external-links-file-manager/external-links/index.html
+++ b/docs/fiddles/native-ui/external-links-file-manager/external-links/index.html
@@ -28,7 +28,7 @@
                const exLinksBtn = document.getElementById('open-ex-links')
                exLinksBtn.addEventListener('click', (event) => {
                shell.openExternal('https://electronjs.org')
-                })
+                }) 
            </code></pre>

          <div class="demo-protip">
--- a/docs/fiddles/native-ui/external-links-file-manager/index.html
+++ b/docs/fiddles/native-ui/external-links-file-manager/index.html
@@ -6,7 +6,7 @@
  </head>
  <body>
    <div>
-      <h1>
+      <h1>  
        Open external links and the file manager
      </h1>
      <h3>
--- a/docs/fiddles/native-ui/notifications/.keep
+++ b/docs/fiddles/native-ui/notifications/.keep
--- a/docs/fiddles/native-ui/notifications/index.html
+++ b/docs/fiddles/native-ui/notifications/index.html
@@ -14,7 +14,7 @@

      <p>
        Electron conveniently allows developers to send notifications with the
-        <a href="https://notifications.spec.whatwg.org/">HTML5 Notification API</a>,
+        <a href="https://notifications.spec.whatwg.org/">HTML5 Notification API</a>, 
        using the currently running operating system’s native notification
        APIs to display it.
      </p>
--- a/docs/fiddles/native-ui/tray/.keep
+++ b/docs/fiddles/native-ui/tray/.keep
--- a/docs/fiddles/system/clipboard/copy/main.js
+++ b/docs/fiddles/system/clipboard/copy/main.js
@@ -27,7 +27,7 @@ ipcMain.handle('clipboard:writeText', (event, text) => {

 app.whenReady().then(() => {
  createWindow()
-
+  
  app.on('activate', function () {
    if (BrowserWindow.getAllWindows().length === 0) createWindow()
  })
--- a/docs/fiddles/system/clipboard/paste/main.js
+++ b/docs/fiddles/system/clipboard/paste/main.js
@@ -31,7 +31,7 @@ ipcMain.handle('clipboard:writeText', (event, text) => {

 app.whenReady().then(() => {
  createWindow()
-
+  
  app.on('activate', function () {
    if (BrowserWindow.getAllWindows().length === 0) createWindow()
  })
--- a/docs/fiddles/system/protocol-handler/.keep
+++ b/docs/fiddles/system/protocol-handler/.keep
--- a/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js
+++ b/docs/fiddles/system/protocol-handler/launch-app-from-URL-in-another-app/main.js
@@ -23,7 +23,7 @@ if (!gotTheLock) {
      if (mainWindow.isMinimized()) mainWindow.restore()
      mainWindow.focus()
    }
-
+    
    dialog.showErrorBox('Welcome Back', `You arrived from: ${commandLine.pop().slice(0,-1)}`)
  })

@@ -31,7 +31,7 @@ if (!gotTheLock) {
  app.whenReady().then(() => {
    createWindow()
  })
-
+  
  app.on('open-url', (event, url) => {
    dialog.showErrorBox('Welcome Back', `You arrived from: ${url}`)
  })
--- a/docs/fiddles/system/system-app-user-information/.keep
+++ b/docs/fiddles/system/system-app-user-information/.keep
--- a/docs/fiddles/system/system-app-user-information/app-information/index.html
+++ b/docs/fiddles/system/system-app-user-information/app-information/index.html
@@ -23,4 +23,4 @@
      require('./renderer.js')
    </script>
  </body>
-</html>
+</html> 
--- a/docs/fiddles/windows/manage-windows/.keep
+++ b/docs/fiddles/windows/manage-windows/.keep
--- a/docs/fiddles/windows/manage-windows/create-frameless-window/index.html
+++ b/docs/fiddles/windows/manage-windows/create-frameless-window/index.html
@@ -10,7 +10,7 @@
        <i>Supports: Win, macOS, Linux <span>|</span> Process: Main</i>
        <div>
          <p>A frameless window is a window that has no <i>"chrome"</i>,
-            such as toolbars, title bars, status bars, borders, etc. You can make
+            such as toolbars, title bars, status bars, borders, etc. You can make 
            a browser window frameless by setting
            <code>frame</code> to <code>false</code> when creating the window.</p>
          <div>
--- a/docs/glossary.md
+++ b/docs/glossary.md
@@ -4,7 +4,7 @@ This page defines some terminology that is commonly used in Electron development

 ### ASAR

-ASAR stands for Atom Shell Archive Format. An [asar][] archive is a simple
+ASAR stands for Atom Shell Archive Format. An [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.

@@ -20,7 +20,7 @@ macOS implement their own version of code signing. As a desktop app developer,
 it's important that you sign your code if you plan on distributing it to the
 general public.

-For more information, read the [Code Signing][] tutorial.
+For more information, read the [Code Signing] tutorial.

 ### context isolation

@@ -30,7 +30,7 @@ contents in your renderer process. With context isolation enabled, the
 only way to expose APIs from your preload script is through the
 `contextBridge` API.

-For more information, read the [Context Isolation][] tutorial.
+For more information, read the [Context Isolation] tutorial.

 See also: [preload script](#preload-script), [renderer process](#renderer-process)

@@ -83,7 +83,7 @@ See also: [process](#process), [renderer process](#renderer-process)
 ### MAS

 Acronym for Apple's Mac App Store. For details on submitting your app to the
-MAS, see the [Mac App Store Submission Guide][].
+MAS, see the [Mac App Store Submission Guide].

 ### Mojo

@@ -105,7 +105,7 @@ More information can be found in [Microsoft's documentation][msi].

 ### native modules

-Native modules (also called [addons][] in
+Native modules (also called [addons] in
 Node.js) are modules written in C or C++ that can be loaded into Node.js or
 Electron using the require() function, and used as if they were an
 ordinary Node.js module. They are used primarily to provide an interface
@@ -116,7 +116,7 @@ likely to use a different V8 version from the Node binary installed in your
 system, you have to manually specify the location of Electron’s headers when
 building native modules.

-For more information, read the [Native Node Modules][] tutorial.
+For more information, read the [Native Node Modules] tutorial.

 ### notarization

@@ -132,7 +132,7 @@ OSR (offscreen rendering) can be used for loading heavy page in
 background and then displaying it after (it will be much faster).
 It allows you to render page without showing it on screen.

-For more information, read the [Offscreen Rendering][] tutorial.
+For more information, read the [Offscreen Rendering] tutorial.

 ### preload script

@@ -146,7 +146,7 @@ See also: [renderer process](#renderer-process), [context isolation](#context-is
 ### process

 A process is an instance of a computer program that is being executed. Electron
-apps that make use of the [main][] and one or many [renderer][] process are
+apps that make use of the [main] and one or many [renderer] process are
 actually running several programs simultaneously.

 In Node.js and Electron, each running process has a `process` object. This
@@ -169,14 +169,14 @@ See also: [process](#process), [main process](#main-process)
 The sandbox is a security feature inherited from Chromium that restricts
 your renderer processes to a limited set of permissions.

-For more information, read the [Process Sandboxing][] tutorial.
+For more information, read the [Process Sandboxing] tutorial.

 See also: [process](#process)

 ### Squirrel

 Squirrel is an open-source framework that enables Electron apps to update
-automatically as new versions are released. See the [autoUpdater][] API for
+automatically as new versions are released. See the [autoUpdater] API for
 info about getting started with Squirrel.

 ### userland
@@ -239,4 +239,6 @@ embedded content.
 [offscreen rendering]: tutorial/offscreen-rendering.md
 [process sandboxing]: tutorial/sandbox.md
 [renderer]: #renderer-process
+[userland]: #userland
 [UtilityProcess]: api/utility-process.md
+[v8]: #v8
--- a/docs/styleguide.md
+++ b/docs/styleguide.md
@@ -113,13 +113,13 @@ Using `autoUpdater` as an example:
 * [Instance Methods](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Classes#Prototype_methods)
  must be listed under an `### Instance Methods` chapter.
 * All methods that have a return value must start their description with
-  "Returns `[TYPE]` - \[Return description]"
+  "Returns `[TYPE]` - [Return description]"
  * If the method returns an `Object`, its structure can be specified using a colon
    followed by a newline then an unordered list of properties in the same style as
    function parameters.
 * Instance Events must be listed under an `### Instance Events` chapter.
 * Instance Properties must be listed under an `### Instance Properties` chapter.
-  * Instance Properties must start with "A \[Property Type] ..."
+  * Instance Properties must start with "A [Property Type] ..."

 Using the `Session` and `Cookies` classes as an example:

--- a/docs/tutorial/application-distribution.md
+++ b/docs/tutorial/application-distribution.md
@@ -55,7 +55,7 @@ will then be your distribution to deliver to users.
 ### With an app source code archive (asar)

 Instead of 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
+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.

--- a/docs/tutorial/automated-testing.md
+++ b/docs/tutorial/automated-testing.md
@@ -117,9 +117,9 @@ driver.quit()
 ## Using Playwright

 [Microsoft Playwright](https://playwright.dev) is an end-to-end testing framework built
-using browser-specific remote debugging protocols, similar to the [Puppeteer][] headless
+using browser-specific remote debugging protocols, similar to the [Puppeteer] headless
 Node.js API but geared towards end-to-end testing. Playwright has experimental Electron
-support via Electron's support for the [Chrome DevTools Protocol][] (CDP).
+support via Electron's support for the [Chrome DevTools Protocol] (CDP).

 ### Install dependencies

--- a/docs/tutorial/code-signing.md
+++ b/docs/tutorial/code-signing.md
@@ -40,9 +40,9 @@ your app isn't doing anything to endanger its users.
 To start the process, ensure that you fulfill the requirements for signing and
 notarizing your app:

-1. Enroll in the [Apple Developer Program][] (requires an annual fee)
-2. Download and install [Xcode][] - this requires a computer running macOS
-3. Generate, download, and install [signing certificates][]
+1. Enroll in the [Apple Developer Program] (requires an annual fee)
+2. Download and install [Xcode] - this requires a computer running macOS
+3. Generate, download, and install [signing certificates]

 Electron's ecosystem favors configuration and freedom, so there are multiple
 ways to get your application signed and notarized.
@@ -51,8 +51,8 @@ ways to get your application signed and notarized.

 If you're using Electron's favorite build tool, getting your application signed
 and notarized requires a few additions to your configuration. [Forge](https://electronforge.io) is a
-collection of the official Electron tools, using [`electron-packager`][],
-[`@electron/osx-sign`][], and [`@electron/notarize`][] under the hood.
+collection of the official Electron tools, using [`electron-packager`],
+[`@electron/osx-sign`], and [`@electron/notarize`] under the hood.

 Detailed instructions on how to configure your application can be found in the
 [Signing macOS Apps](https://www.electronforge.io/guides/code-signing/code-signing-macos) guide in
@@ -61,8 +61,8 @@ the Electron Forge docs.
 ### Using Electron Packager

 If you're not using an integrated build pipeline like Forge, you
-are likely using [`electron-packager`][], which includes [`@electron/osx-sign`][] and
-[`@electron/notarize`][].
+are likely using [`electron-packager`], which includes [`@electron/osx-sign`] and
+[`@electron/notarize`].

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

 ### Signing Mac App Store applications

-See the [Mac App Store Guide][].
+See the [Mac App Store Guide].

 ## Signing Windows builds

@@ -110,7 +110,7 @@ Electron Forge is the recommended way to sign your `Squirrel.Windows` and `WiX M

 ### Using electron-winstaller (Squirrel.Windows)

-[`electron-winstaller`][] is a package that can generate Squirrel.Windows installers for your
+[`electron-winstaller`] is a package that can generate Squirrel.Windows installers for your
 Electron app. This is the tool used under the hood by Electron Forge's
 [Squirrel.Windows Maker][maker-squirrel]. If you're not using Electron Forge and want to use
 `electron-winstaller` directly, use the `certificateFile` and `certificatePassword` configuration
@@ -135,16 +135,16 @@ try {
 }
 ```

-For full configuration options, check out the [`electron-winstaller`][] repository!
+For full configuration options, check out the [`electron-winstaller`] repository!

 ### Using electron-wix-msi (WiX MSI)

-[`electron-wix-msi`][] is a package that can generate MSI installers for your
+[`electron-wix-msi`] is a package that can generate MSI installers for your
 Electron app. This is the tool used under the hood by Electron Forge's [MSI Maker][maker-msi].

 If you're not using Electron Forge and want to use `electron-wix-msi` directly, use the
 `certificateFile` and `certificatePassword` configuration options
-or pass in parameters directly to [SignTool.exe][] with the `signWithParams` option.
+or pass in parameters directly to [SignTool.exe] with the `signWithParams` option.

 ```js {12-13}
 import { MSICreator } from 'electron-wix-msi'
@@ -177,7 +177,7 @@ supportBinaries.forEach(async (binary) => {
 await msiCreator.compile()
 ```

-For full configuration options, check out the [`electron-wix-msi`][] repository!
+For full configuration options, check out the [`electron-wix-msi`] repository!

 ### Using Electron Builder

@@ -186,9 +186,10 @@ can find [its documentation here](https://www.electron.build/code-signing).

 ### Signing Windows Store applications

-See the [Windows Store Guide][].
+See the [Windows Store Guide].

 [apple developer program]: https://developer.apple.com/programs/
+[`electron-forge`]: https://github.com/electron/forge
 [`@electron/osx-sign`]: https://github.com/electron/osx-sign
 [`electron-packager`]: https://github.com/electron/electron-packager
 [`@electron/notarize`]: https://github.com/electron/notarize
--- a/docs/tutorial/context-isolation.md
+++ b/docs/tutorial/context-isolation.md
@@ -72,7 +72,7 @@ contextBridge.exposeInMainWorld('myAPI', {

 ## Usage with TypeScript

-If you're building your Electron app with TypeScript, you'll want to add types to your APIs exposed over the context bridge. The renderer's `window` object won't have the correct typings unless you extend the types with a [declaration file][].
+If you're building your Electron app with TypeScript, you'll want to add types to your APIs exposed over the context bridge. The renderer's `window` object won't have the correct typings unless you extend the types with a [declaration file].

 For example, given this `preload.ts` script:

--- a/docs/tutorial/dark-mode.md
+++ b/docs/tutorial/dark-mode.md
@@ -13,7 +13,7 @@ from the OS.

 If your app has its own dark mode, you should toggle it on and off in sync with
 the system's dark mode setting. You can do this by using the
-[prefers-color-scheme][] CSS media query.
+[prefers-color-scheme] CSS media query.

 ### Manually update your own interfaces

@@ -50,7 +50,7 @@ of this theming, due to the use of the macOS 10.14 SDK.
 This example demonstrates an Electron application that derives its theme colors from the
 `nativeTheme`. Additionally, it provides theme toggle and reset controls using IPC channels.

-```javascript fiddle='docs/fiddles/features/dark-mode'
+```javascript fiddle='docs/fiddles/features/macos-dark-mode'

 ```

--- a/docs/tutorial/devices.md
+++ b/docs/tutorial/devices.md
@@ -115,41 +115,3 @@ when the `Test Web Serial` button is clicked.
 ```javascript fiddle='docs/fiddles/features/web-serial'

 ```
-
-## WebUSB API
-
-The [WebUSB API](https://web.dev/usb/) can be used to access USB devices.
-Electron provides several APIs for working with the WebUSB API:
-
-* The [`select-usb-device` event on the Session](../api/session.md#event-select-usb-device)
-  can be used to select a USB device when a call to
-  `navigator.usb.requestDevice` is made.  Additionally the [`usb-device-added`](../api/session.md#event-usb-device-added)
-  and [`usb-device-removed`](../api/session.md#event-usb-device-removed) events
-  on the Session can be used to handle devices being plugged in or unplugged
-  when handling the `select-usb-device` event.
-  **Note:** These two events only fire until the callback from `select-usb-device`
-  is called.  They are not intended to be used as a generic usb device listener.
-* The [`usb-device-revoked' event on the Session](../api/session.md#event-usb-device-revoked) can
-  be used to respond when [device.forget()](https://developer.chrome.com/articles/usb/#revoke-access)
-  is called on a USB device.
-* [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
-  can be used to provide default permissioning to devices without first calling
-  for permission to devices via `navigator.usb.requestDevice`.  Additionally,
-  the default behavior of Electron is to store granted device permission through
-  the lifetime of the corresponding WebContents.  If longer term storage is
-  needed, a developer can store granted device permissions (eg when handling
-  the `select-usb-device` event) and then read from that storage with
-  `setDevicePermissionHandler`.
-* [`ses.setPermissionCheckHandler(handler)`](../api/session.md#sessetpermissioncheckhandlerhandler)
-  can be used to disable USB access for specific origins.
-
-### Example
-
-This example demonstrates an Electron application that automatically selects
-USB devices (if they are attached) through [`ses.setDevicePermissionHandler(handler)`](../api/session.md#sessetdevicepermissionhandlerhandler)
-and through [`select-usb-device` event on the Session](../api/session.md#event-select-usb-device)
-when the `Test WebUSB` button is clicked.
-
-```javascript fiddle='docs/fiddles/features/web-usb'
-
-```
--- a/Show More
+++ b/Show More