ci: automate release board creation (#38629)

* ci: refactor determining major branch

* ci: automate release board creation

.circleci/config.yml

@@ -62,12 +62,9 @@ jobs:
             cd .circleci/config
             yarn
             export CIRCLECI_BINARY="$HOME/circleci"
-            curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/master/install.sh | DESTDIR=$CIRCLECI_BINARY bash
+            curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/main/install.sh | DESTDIR=$CIRCLECI_BINARY bash
             node build.js
           name: Pack config.yml
-      - run:
-          name: Set params
-          command: node .circleci/config/params.js
       - continuation/continue:
           configuration_path: .circleci/config-staging/built.yml
           parameters: /tmp/pipeline-parameters.json

.circleci/config/base.yml

@@ -35,16 +35,6 @@ parameters:
     default: all
     enum: ["all", "osx-x64", "osx-arm64", "mas-x64", "mas-arm64"]
 
-  medium-linux-executor:
-    type: enum
-    default: electronjs/aks-linux-medium
-    enum: ["electronjs/aks-linux-medium", "medium"]
-  
-  large-linux-executor:
-    type: enum
-    default: electronjs/aks-linux-large
-    enum: ["electronjs/aks-linux-large", "2xlarge"]
-
 # Executors
 executors:
   linux-docker:
@@ -52,9 +42,7 @@ executors:
       size:
         description: "Docker executor size"
         type: enum
-        # aks-linux-large === 32 core
-        # 2xlarge should not be used directly, use the pipeline param instead
-        enum: ["medium", "electronjs/aks-linux-medium", "xlarge", "electronjs/aks-linux-large", "2xlarge"]
+        enum: ["medium", "xlarge", "2xlarge"]
     docker:
       - image: ghcr.io/electron/build:e6bebd08a51a0d78ec23e5b3fd7e7c0846412328
     resource_class: << parameters.size >>
@@ -64,7 +52,7 @@ executors:
       size:
         description: "macOS executor size"
         type: enum
-        enum: ["macos.x86.medium.gen2"]
+        enum: ["macos.x86.medium.gen2", "macos.m1.large.gen1", "macos.m1.medium.gen1"]
       version:
         description: "xcode version"
         type: enum
@@ -131,9 +119,8 @@ env-arm: &env-arm
   TARGET_ARCH: arm
 
 env-apple-silicon: &env-apple-silicon
-  GN_EXTRA_ARGS: 'target_cpu = "arm64" use_prebuilt_v8_context_snapshot = true'
+  GN_EXTRA_ARGS: 'target_cpu = "arm64"'
   TARGET_ARCH: arm64
-  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
   npm_config_arch: arm64
 
 env-runner: &env-runner
@@ -150,10 +137,9 @@ env-mas: &env-mas
   MAS_BUILD: 'true'
 
 env-mas-apple-silicon: &env-mas-apple-silicon
-  GN_EXTRA_ARGS: 'target_cpu = "arm64" is_mas_build = true use_prebuilt_v8_context_snapshot = true'
+  GN_EXTRA_ARGS: 'target_cpu = "arm64" is_mas_build = true'
   MAS_BUILD: 'true'
   TARGET_ARCH: arm64
-  USE_PREBUILT_V8_CONTEXT_SNAPSHOT: 1
   npm_config_arch: arm64
 
 env-send-slack-notifications: &env-send-slack-notifications
@@ -189,9 +175,6 @@ env-mac-large-release: &env-mac-large-release
 env-ninja-status: &env-ninja-status
   NINJA_STATUS: "[%r processes, %f/%t @ %o/s : %es] "
 
-env-disable-run-as-node: &env-disable-run-as-node
-  GN_BUILDFLAG_ARGS: 'enable_run_as_node = false'
-
 env-32bit-release: &env-32bit-release
   # Set symbol level to 1 for 32 bit releases because of https://crbug.com/648948
   GN_BUILDFLAG_ARGS: 'symbol_level = 1'
@@ -264,19 +247,19 @@ step-depot-tools-get: &step-depot-tools-get
         cd depot_tools
         cat > gclient.diff \<< 'EOF'
       diff --git a/gclient.py b/gclient.py
-      index c305c248..e6e0fbdc 100755
+      index 3a9c5c6..f222043 100755
       --- a/gclient.py
       +++ b/gclient.py
-      @@ -735,7 +735,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
- 
-                   if dep_type == 'cipd':
-                       cipd_root = self.GetCipdRoot()
-      -                for package in dep_value.get('packages', []):
-      +                packages = dep_value.get('packages', [])
-      +                for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')):
-                           deps_to_add.append(
-                               CipdDependency(parent=self,
-                                              name=name,
+      @@ -712,7 +712,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
+
+             if dep_type == 'cipd':
+               cipd_root = self.GetCipdRoot()
+      -        for package in dep_value.get('packages', []):
+      +        packages = dep_value.get('packages', [])
+      +        for package in (x for x in packages if "infra/3pp/tools/swift-format" not in x.get('package')):
+                 deps_to_add.append(
+                     CipdDependency(
+                         parent=self,
       EOF
         git apply --3way gclient.diff
       fi
@@ -364,7 +347,7 @@ step-setup-goma-for-build: &step-setup-goma-for-build
         exit 1
       fi
       echo 'export GN_GOMA_FILE='`node -e "console.log(require('./src/utils/goma.js').gnFilePath)"` >> $BASH_ENV
-      echo 'export GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
+      echo 'export LOCAL_GOMA_DIR='`node -e "console.log(require('./src/utils/goma.js').dir)"` >> $BASH_ENV
       echo 'export GOMA_FALLBACK_ON_AUTH_FAILURE=true' >> $BASH_ENV
       cd ..
       touch "${TMPDIR:=/tmp}"/.goma-ready
@@ -410,18 +393,24 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
           fi
         }
 
-        strip_arm_deep() {
+        strip_universal_deep() {
           opwd=$(pwd)
           cd $1
           f=$(find . -perm +111 -type f)
           for fp in $f
           do
             if [[ $(file "$fp") == *"universal binary"* ]]; then
-              if [[ $(file "$fp") == *"arm64e)"* ]]; then
-                sudo lipo -remove arm64e "$fp" -o "$fp" || true
-              fi
-              if [[ $(file "$fp") == *"arm64)"* ]]; then
-                sudo lipo -remove arm64 "$fp" -o "$fp" || true
+              if [ "`arch`" == "arm64" ]; then
+                if [[ $(file "$fp") == *"x86_64"* ]]; then
+                  sudo lipo -remove x86_64 "$fp" -o "$fp" || true
+                fi
+              else
+                if [[ $(file "$fp") == *"arm64e)"* ]]; then
+                  sudo lipo -remove arm64e "$fp" -o "$fp" || true
+                fi
+                if [[ $(file "$fp") == *"arm64)"* ]]; then
+                  sudo lipo -remove arm64 "$fp" -o "$fp" || true
+                fi
               fi
             fi
           done
@@ -477,12 +466,12 @@ step-get-more-space-on-mac: &step-get-more-space-on-mac
         sudo rm -rf ~/project/src/third_party/angle/third_party/VK-GL-CTS
 
         # lipo off some huge binaries arm64 versions to save space
-        strip_arm_deep $(xcode-select -p)/../SharedFrameworks
+        strip_universal_deep $(xcode-select -p)/../SharedFrameworks
         # strip_arm_deep /System/Volumes/Data/Library/Developer/CommandLineTools/usr
       fi
     background: true
 
-# On macOS delete all .git directories under src/ expect for
+# On macOS delete all .git directories under src/ except for
 # third_party/angle/ and third_party/dawn/ because of build time generation of files
 # gen/angle/commit.h depends on third_party/angle/.git/HEAD
 # https://chromium-review.googlesource.com/c/angle/angle/+/2074924
@@ -536,6 +525,20 @@ step-fix-sync: &step-fix-sync
         # Remove extra output from calling gclient getdep which always calls update_depot_tools
         sed -i '' "s/Updating depot_tools... //g" esbuild_ensure_file
         cipd ensure --root src/third_party/devtools-frontend/src/third_party/esbuild -ensure-file esbuild_ensure_file
+
+        # Fix gn (wrong binary)
+        echo 'gn/gn/mac-${arch}' `gclient getdep --deps-file=src/DEPS -r 'src/buildtools/mac:gn/gn/mac-${arch}'` > gn_ensure_file
+        # Remove extra output from calling gclient getdep which always calls update_depot_tools
+        sed -i '' "s/Updating depot_tools... //g" gn_ensure_file
+        cipd ensure --root src/buildtools/mac -ensure-file gn_ensure_file
+
+        # Fix dsymutil (wrong binary)
+        if  [ "$TARGET_ARCH" == "arm64" ]; then
+          export DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.arm64.sha1
+        else
+          export DSYM_SHA_FILE=src/tools/clang/dsymutil/bin/dsymutil.x64.sha1
+        fi
+        python3 src/third_party/depot_tools/download_from_google_storage.py --no_resume --no_auth --bucket chromium-browser-clang -s $DSYM_SHA_FILE -o src/tools/clang/dsymutil/bin/dsymutil
       fi
 
       # Make sure we are using the right ninja
@@ -616,7 +619,7 @@ step-electron-chromedriver-build: &step-electron-chromedriver-build
     name: Build chromedriver.zip
     command: |
       cd src
-      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+      if [ "`uname`" != "Darwin" ] && ([ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]); then
         gn gen out/chromedriver --args="import(\"$GN_CONFIG\") import(\"$GN_GOMA_FILE\") is_component_ffmpeg=false proprietary_codecs=false $GN_EXTRA_ARGS $GN_BUILDFLAG_ARGS"
         export CHROMEDRIVER_DIR="out/chromedriver"
       else
@@ -627,7 +630,7 @@ step-electron-chromedriver-build: &step-electron-chromedriver-build
         electron/script/strip-binaries.py --target-cpu="$TARGET_ARCH" --file $PWD/$CHROMEDRIVER_DIR/chromedriver
       fi
       ninja -C $CHROMEDRIVER_DIR electron:electron_chromedriver_zip
-      if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+      if [ "`uname`" != "Darwin" ] && ([ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]); then
         cp out/chromedriver/chromedriver.zip out/Default
       fi
 
@@ -704,7 +707,7 @@ step-verify-mksnapshot: &step-verify-mksnapshot
     command: |
       if [ "$IS_ASAN" != "1" ]; then
         cd src
-        if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
+        if [ "`uname`" != "Darwin" ] && ([ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]); then
           python3 electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/cross-arch-snapshots
         else
           python3 electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default
@@ -735,8 +738,8 @@ step-show-goma-stats: &step-show-goma-stats
     command: |
       set +e
       set +o pipefail
-      $GOMA_DIR/goma_ctl.py stat
-      $GOMA_DIR/diagnose_goma_log.py
+      $LOCAL_GOMA_DIR/goma_ctl.py stat
+      $LOCAL_GOMA_DIR/diagnose_goma_log.py
       true
     when: always
     background: true
@@ -747,17 +750,15 @@ step-mksnapshot-build: &step-mksnapshot-build
     no_output_timeout: 30m
     command: |
       cd src
-      if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ]; then
-        ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
-        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
-        # 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
+      ninja -C out/Default electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
+      gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
+      # 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
       if [ "`uname`" != "Darwin" ]; then
         if [ "$TARGET_ARCH" == "arm" ]; then
           electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot
@@ -770,7 +771,7 @@ step-mksnapshot-build: &step-mksnapshot-build
           electron/script/strip-binaries.py --file $PWD/out/Default/v8_context_snapshot_generator
         fi
       fi
-      if [ "$USE_PREBUILT_V8_CONTEXT_SNAPSHOT" != "1" ] && [ "$SKIP_DIST_ZIP" != "1" ]; then
+      if [ "$SKIP_DIST_ZIP" != "1" ]; then
         ninja -C out/Default electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
         (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
       fi
@@ -888,26 +889,14 @@ step-touch-sync-done: &step-touch-sync-done
 step-maybe-restore-src-cache: &step-maybe-restore-src-cache
   restore_cache:
     keys:
-      - v17-src-cache-{{ checksum "src/electron/.depshash" }}
+      - v16-src-cache-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache
 step-maybe-restore-src-cache-marker: &step-maybe-restore-src-cache-marker
   restore_cache:
     keys:
-      - v17-src-cache-marker-{{ checksum "src/electron/.depshash" }}
+      - v16-src-cache-marker-{{ checksum "src/electron/.depshash" }}
     name: Restoring src cache marker
 
-step-maybe-restore-src-cache-aks: &step-maybe-restore-src-cache-aks
-  restore_cache_aks:
-    step-name: Restoring src cache
-    cache_key: v17-src-cache-$(shasum src/electron/.depshash | cut -f1 -d' ')
-    cache_path: /var/portal
-
-step-maybe-restore-src-cache-marker-aks: &step-maybe-restore-src-cache-marker-aks
-  restore_cache_aks:
-    step-name: Restoring src cache marker
-    cache_key: v17-src-cache-marker-$(shasum src/electron/.depshash | cut -f1 -d' ')
-    cache_path: "."
-
 # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
 # If the src cache was restored above then this will match an empty cache
 # If the src cache was not restored above then this will match a close git cache
@@ -920,12 +909,6 @@ step-maybe-restore-git-cache: &step-maybe-restore-git-cache
       - v1-git-cache-{{ checksum "src/electron/.circle-sync-done" }}
     name: Conditionally restoring git cache
 
-step-maybe-restore-git-cache-aks: &step-maybe-restore-git-cache-aks
-  restore_cache_aks:
-    step-name: Conditionally restoring git cache (aks)
-    cache_key: v1-git-cache-$(shasum src/electron/.circle-sync-done | cut -f1 -d' ')-$(shasum src/electron/DEPS | cut -f1 -d' ') v1-git-cache-$(shasum src/electron/.circle-sync-done | cut -f1 -d' ')
-    cache_path: git-cache
-
 step-set-git-cache-path: &step-set-git-cache-path
   run:
     name: Set GIT_CACHE_PATH to make gclient to use the cache
@@ -943,12 +926,6 @@ step-save-git-cache: &step-save-git-cache
     key: v1-git-cache-{{ checksum "src/electron/.circle-sync-done" }}-{{ checksum "src/electron/DEPS" }}
     name: Persisting git cache
 
-step-save-git-cache-aks: &step-save-git-cache-aks
-  save_cache_aks:
-    step-name: Persisting git cache (AKS)
-    cache_key: v1-git-cache-$(shasum src/electron/.circle-sync-done | cut -f1 -d' ')-$(shasum src/electron/DEPS | cut -f1 -d' ')
-    cache_path: git-cache
-
 step-run-electron-only-hooks: &step-run-electron-only-hooks
   run:
     name: Run Electron Only Hooks
@@ -986,7 +963,7 @@ step-save-src-cache: &step-save-src-cache
   save_cache:
     paths:
       - /var/portal
-    key: v17-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v16-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
     name: Persisting src cache
 step-make-src-cache-marker: &step-make-src-cache-marker
   run:
@@ -996,17 +973,7 @@ step-save-src-cache-marker: &step-save-src-cache-marker
   save_cache:
     paths:
       - .src-cache-marker
-    key: v17-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
-step-save-src-cache-aks: &step-save-src-cache-aks
-  save_cache_aks:
-    step-name: Persisting src cache (aks)
-    cache_key: v17-src-cache-$(shasum /var/portal/src/electron/.depshash | cut -f1 -d' ')
-    cache_path: /var/portal
-step-save-src-cache-marker-aks: &step-save-src-cache-marker-aks
-  save_cache_aks:
-    step-name: Persisting src cache marker (aks)
-    cache_key: v17-src-cache-marker-$(shasum /var/portal/src/electron/.depshash | cut -f1 -d' ')
-    cache_path: .src-cache-marker
+    key: v16-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
 
 step-maybe-early-exit-no-doc-change: &step-maybe-early-exit-no-doc-change
   run:
@@ -1032,6 +999,15 @@ step-ts-compile: &step-ts-compile
       done
 
 # List of all steps.
+steps-electron-gn-check: &steps-electron-gn-check
+  steps:
+    - *step-setup-goma-for-build
+    - checkout-from-cache
+    - *step-setup-env-for-build
+    - *step-wait-for-goma
+    - *step-gn-gen-default
+    - *step-gn-check
+
 steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-change
   steps:
     # Checkout - Copied from steps-checkout
@@ -1043,92 +1019,11 @@ steps-electron-ts-compile-for-doc-change: &steps-electron-ts-compile-for-doc-cha
 
 # Command Aliases
 commands:
-  aks-specific-step:
-    parameters:
-      circle:
-        type: steps
-      aks:
-        type: steps
-      could-be-aks:
-        type: boolean
-        description: Only set this to true on linux hosts
-    steps:
-      - when:
-          condition:
-            or:
-              - equal: [<< parameters.could-be-aks >>, false]
-              - equal: [<< pipeline.parameters.large-linux-executor >>, xlarge]
-          steps: << parameters.circle >>
-      - when:
-          condition:
-            and:
-              - equal: [<< parameters.could-be-aks >>, true]
-              - equal: [<< pipeline.parameters.large-linux-executor >>, electronjs/aks-linux-large]
-          steps: << parameters.aks >>
-  save_cache_aks:
-    parameters:
-      step-name:
-        type: string
-      cache_key:
-        type: string
-      cache_path:
-        type: string
-    steps:
-      - run:
-          name: << parameters.step-name >>
-          command: |
-            cache_key="<< parameters.cache_key >>"
-            final_cache_path=/mnt/cross-instance-cache/${cache_key}.tar
-            echo "Using cache key: $cache_key"
-            echo "Checking path: $final_cache_path"
-            if [ ! -f "$final_cache_path" ]; then
-              echo "Cache key not founding, storing tarball"
-              tmp_container=/mnt/cross-instance-cache/tmp/$CIRCLE_WORKFLOW_JOB_ID
-              tmp_cache_path=$tmp_container/${cache_key}.tar
-              mkdir -p $tmp_container
-              if [ -f "<< parameters.cache_path >>" ]; then
-                tar -cf $tmp_cache_path -C $(dirname << parameters.cache_path >>) ./$(basename << parameters.cache_path >>)
-              else
-                tar -cf $tmp_cache_path -C << parameters.cache_path >>/ ./
-              fi
-              mv -vn $tmp_cache_path $final_cache_path
-              rm -rf $tmp_container
-            else
-              echo "Cache key already exists, skipping.."
-            fi
-  restore_cache_aks:
-    parameters:
-      step-name:
-        type: string
-      cache_key:
-        type: string
-      cache_path:
-        type: string
-    steps:
-      - run:
-          name: << parameters.step-name >>
-          command: |
-            df -h
-            for cache_key in << parameters.cache_key >>; do
-              cache_path=/mnt/cross-instance-cache/${cache_key}.tar
-              echo "Using cache key: $cache_key"
-              echo "Checking path: $cache_path"
-              if [ ! -f "$cache_path" ]; then
-                echo "Cache key not found, nothing to restore..."
-              else
-                echo "Cache key found, restoring to path..."
-                mkdir -p << parameters.cache_path >>/
-                tar -xf /mnt/cross-instance-cache/${cache_key}.tar -C << parameters.cache_path >>/
-                exit 0
-              fi
-            done
   maybe-restore-portaled-src-cache:
     parameters:
       halt-if-successful:
         type: boolean
         default: false
-      could-be-aks:
-        type: boolean
     steps:
       - run:
           name: Prepare for cross-OS sync restore
@@ -1138,50 +1033,29 @@ commands:
       - when:
           condition: << parameters.halt-if-successful >>
           steps:
-            - aks-specific-step:
-                circle:
-                  - *step-maybe-restore-src-cache-marker
-                aks:
-                  - *step-maybe-restore-src-cache-marker-aks
-                could-be-aks: << parameters.could-be-aks >>
+            - *step-maybe-restore-src-cache-marker
             - run:
                 name: Halt the job early if the src cache exists
                 command: |
                   if [ -f ".src-cache-marker" ]; then
                     circleci-agent step halt
                   fi
-      - aks-specific-step:
-          circle:
-            - *step-maybe-restore-src-cache
-          aks:
-            - *step-maybe-restore-src-cache-aks
-          could-be-aks: << parameters.could-be-aks >>
+      - *step-maybe-restore-src-cache
       - run:
-          name: Fix the src cache restore point
+          name: Fix the src cache restore point on macOS
           command: |
             if [ -d "/var/portal/src" ]; then
               echo Relocating Cache
               rm -rf src
               mv /var/portal/src ./
             fi
-  run-gn-check:
-    parameters:
-      could-be-aks:
-        type: boolean
-    steps:
-      - *step-setup-goma-for-build
-      - checkout-from-cache:
-          could-be-aks: << parameters.could-be-aks >>
-      - *step-setup-env-for-build
-      - *step-wait-for-goma
-      - *step-gn-gen-default
-      - *step-gn-check
+
   build_and_save_artifacts:
     parameters:
       artifact-key:
         type: string
       build-type:
-        type: string      
+        type: string
       build-nonproprietary-ffmpeg:
         type: boolean
         default: true
@@ -1289,16 +1163,12 @@ commands:
             mv_if_exist cross-arch-snapshots src
 
   checkout-from-cache:
-    parameters:
-      could-be-aks:
-        type: boolean
     steps:
       - *step-checkout-electron
       - *step-depot-tools-get
       - *step-depot-tools-add-to-path
       - *step-generate-deps-hash
-      - maybe-restore-portaled-src-cache:
-          could-be-aks: << parameters.could-be-aks >>
+      - maybe-restore-portaled-src-cache
       - run:
           name: Ensure src checkout worked
           command: |
@@ -1364,32 +1234,6 @@ commands:
           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
@@ -1429,15 +1273,13 @@ commands:
       artifact-key:
         type: string
       build-type:
-        type: string        
+        type: string
       after-build-and-save:
         type: steps
         default: []
       after-persist:
         type: steps
         default: []
-      could-be-aks:
-        type: boolean
     steps:
       - when:
           condition: << parameters.attach >>
@@ -1455,8 +1297,7 @@ commands:
       - when:
           condition: << parameters.checkout-and-assume-cache >>
           steps:
-            - checkout-from-cache:
-                could-be-aks: << parameters.could-be-aks >>
+            - checkout-from-cache
       - when:
           condition: << parameters.checkout >>
           steps:
@@ -1472,15 +1313,8 @@ commands:
                 steps:
                   - maybe-restore-portaled-src-cache:
                       halt-if-successful: << parameters.checkout-to-create-src-cache >>
-                      could-be-aks: << parameters.could-be-aks >>
-            - aks-specific-step:
-                circle:
-                  - *step-maybe-restore-git-cache
-                aks:
-                  - *step-maybe-restore-git-cache-aks
-                could-be-aks: << parameters.could-be-aks >>
+            - *step-maybe-restore-git-cache
             - *step-set-git-cache-path
-            - *step-fix-known-hosts-linux
             # This sync call only runs if .circle-sync-done is an EMPTY file
             - *step-gclient-sync
             - store_artifacts:
@@ -1496,12 +1330,7 @@ commands:
             - when:
                 condition: << parameters.save-git-cache >>
                 steps:
-                  - aks-specific-step:
-                      circle:
-                        - *step-save-git-cache
-                      aks:
-                        - *step-save-git-cache-aks
-                      could-be-aks: << parameters.could-be-aks >>
+                  - *step-save-git-cache
             # Mark sync as done _after_ saving the git cache so that it is uploaded
             # only when the src cache was not present
             # Their are theoretically two cases for this cache key
@@ -1551,19 +1380,9 @@ commands:
                         sudo mkdir -p /var/portal
                         sudo chown -R $(id -u):$(id -g) /var/portal
                         mv ./src /var/portal
-                  - aks-specific-step:
-                      circle:
-                        - *step-save-src-cache
-                      aks:
-                        - *step-save-src-cache-aks
-                      could-be-aks: << parameters.could-be-aks >>
+                  - *step-save-src-cache
                   - *step-make-src-cache-marker
-                  - aks-specific-step:
-                      circle:
-                        - *step-save-src-cache-marker
-                      aks:
-                        - *step-save-src-cache-marker-aks
-                      could-be-aks: << parameters.could-be-aks >>
+                  - *step-save-src-cache-marker
 
       - when:
           condition: << parameters.build >>
@@ -1615,18 +1434,6 @@ commands:
           condition: << parameters.build >>
           steps:
             - *step-maybe-notify-slack-failure
-      - when:
-          condition: << parameters.could-be-aks >>
-          steps:
-            - run:
-                name: Wait for active debug sessions
-                command: |
-                  while [ -f /var/.ssh-lock ]
-                  do
-                    sleep 60
-                  done
-                no_output_timeout: 2h
-                when: always
 
   electron-tests:
     parameters:
@@ -1662,7 +1469,7 @@ commands:
               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
+              (cd electron && (circleci tests glob "spec/*-spec.ts" | circleci tests run --command="xargs node script/yarn test --runners=main --trace-uncaught --enable-logging --files" --split-by=timings 2>&1)) | $ASAN_SYMBOLIZE
             else
               if [ "$TARGET_ARCH" == "arm" ] || [ "$TARGET_ARCH" == "arm64" ]; then
                 export ELECTRON_SKIP_NATIVE_MODULE_TESTS=true
@@ -1671,18 +1478,9 @@ commands:
                 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))
+                (cd electron && (circleci tests glob "spec/*-spec.ts" | circleci tests run --command="xargs node script/yarn test --runners=main --trace-uncaught --enable-logging --files" --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
 
@@ -1764,7 +1562,6 @@ commands:
             - *step-minimize-workspace-size-from-checkout
       - *step-fix-sync
       - *step-setup-env-for-build
-      - *step-fix-known-hosts-linux
       - *step-setup-goma-for-build
       - *step-wait-for-goma
       - *step-gn-gen-default
@@ -1822,7 +1619,7 @@ jobs:
   linux-make-src-cache:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: xlarge
     environment:
       <<: *env-linux-2xlarge
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
@@ -1835,7 +1632,6 @@ jobs:
           checkout-to-create-src-cache: true
           artifact-key: 'nil'
           build-type: 'nil'
-          could-be-aks: true
 
   mac-checkout:
     executor:
@@ -1855,9 +1651,8 @@ jobs:
           restore-src-cache: false
           artifact-key: 'nil'
           build-type: 'nil'
-          could-be-aks: false
 
-  mac-make-src-cache:
+  mac-make-src-cache-x64:
     executor:
       name: linux-docker
       size: xlarge
@@ -1875,13 +1670,31 @@ jobs:
           checkout-to-create-src-cache: true
           artifact-key: 'nil'
           build-type: 'nil'
-          could-be-aks: false
+
+  mac-make-src-cache-arm64:
+    executor:
+      name: linux-docker
+      size: xlarge
+    environment:
+      <<: *env-linux-2xlarge
+      <<: *env-testing-build
+      <<: *env-macos-build
+      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac --custom-var=host_cpu=arm64'
+    steps:
+      - electron-build:
+          persist: false
+          build: false
+          checkout: true
+          save-git-cache: true
+          checkout-to-create-src-cache: true
+          artifact-key: 'nil'
+          build-type: 'nil'
 
   # Layer 2: Builds.
   linux-x64-testing:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: xlarge
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1894,12 +1707,11 @@ jobs:
           checkout-and-assume-cache: true
           artifact-key: 'linux-x64'
           build-type: 'Linux'
-          could-be-aks: true
 
   linux-x64-testing-asan:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-global
       <<: *env-testing-build
@@ -1914,42 +1726,21 @@ jobs:
           build-nonproprietary-ffmpeg: false
           artifact-key: 'linux-x64-asan'
           build-type: 'Linux'
-          could-be-aks: true
-
-  linux-x64-testing-no-run-as-node:
-    executor:
-      name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
-    environment:
-      <<: *env-linux-2xlarge
-      <<: *env-testing-build
-      <<: *env-ninja-status
-      <<: *env-disable-run-as-node
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - electron-build:
-          persist: false
-          checkout: true
-          artifact-key: 'linux-x64-no-run-as-node'
-          build-type: 'Linux'
-          could-be-aks: true
 
   linux-x64-testing-gn-check:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.medium-linux-executor >>
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-testing-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - run-gn-check:
-          could-be-aks: true
+    <<: *steps-electron-gn-check
 
   linux-x64-publish:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-release-build
@@ -1972,7 +1763,7 @@ jobs:
   linux-arm-testing:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-global
       <<: *env-arm
@@ -1988,12 +1779,11 @@ jobs:
           checkout-and-assume-cache: true
           artifact-key: 'linux-arm'
           build-type: 'Linux ARM'
-          could-be-aks: true
 
   linux-arm-publish:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm
@@ -2018,7 +1808,7 @@ jobs:
   linux-arm64-testing:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-global
       <<: *env-arm64
@@ -2034,25 +1824,22 @@ jobs:
           checkout-and-assume-cache: true
           artifact-key: 'linux-arm64'
           build-type: 'Linux ARM64'
-          could-be-aks: true
 
   linux-arm64-testing-gn-check:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.medium-linux-executor >>
+      size: medium
     environment:
       <<: *env-linux-medium
       <<: *env-arm64
       <<: *env-testing-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-    steps:
-      - run-gn-check:
-          could-be-aks: true
+    <<: *steps-electron-gn-check
 
   linux-arm64-publish:
     executor:
       name: linux-docker
-      size: << pipeline.parameters.large-linux-executor >>
+      size: 2xlarge
     environment:
       <<: *env-linux-2xlarge-release
       <<: *env-arm64
@@ -2107,7 +1894,6 @@ jobs:
                 root: .
                 paths:
                   - generated_artifacts_mas-x64
-          could-be-aks: false
 
   osx-testing-x64-gn-check:
     executor:
@@ -2117,9 +1903,7 @@ jobs:
       <<: *env-machine-mac
       <<: *env-testing-build
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-    steps:
-      - run-gn-check:
-          could-be-aks: false
+    <<: *steps-electron-gn-check
 
   osx-publish-x64:
     executor:
@@ -2146,7 +1930,7 @@ jobs:
   osx-publish-arm64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      size: macos.m1.large.gen1
     environment:
       <<: *env-mac-large-release
       <<: *env-release-build
@@ -2169,7 +1953,7 @@ jobs:
   osx-testing-arm64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      size: macos.m1.medium.gen1
     environment:
       <<: *env-mac-large
       <<: *env-testing-build
@@ -2177,7 +1961,6 @@ jobs:
       <<: *env-macos-build
       <<: *env-apple-silicon
       GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
-      GENERATE_CROSS_ARCH_SNAPSHOT: true
     steps:
       - electron-build:
           persist: true
@@ -2202,7 +1985,6 @@ jobs:
                 root: .
                 paths:
                   - generated_artifacts_mas-arm64
-          could-be-aks: false
 
   mas-publish-x64:
     executor:
@@ -2229,7 +2011,7 @@ jobs:
   mas-publish-arm64:
     executor:
       name: macos
-      size: macos.x86.medium.gen2
+      size: macos.m1.large.gen1
     environment:
       <<: *env-mac-large-release
       <<: *env-mas-apple-silicon
@@ -2428,9 +2210,6 @@ workflows:
       - linux-x64-testing-asan:
           requires:
             - linux-make-src-cache
-      - linux-x64-testing-no-run-as-node:
-          requires:
-            - linux-make-src-cache
       - linux-x64-testing-gn-check:
           requires:
             - linux-make-src-cache
@@ -2477,19 +2256,20 @@ workflows:
         - equal: [false, << pipeline.parameters.run-linux-publish >>]
         - equal: [true, << pipeline.parameters.run-build-mac >>]
     jobs:
-      - mac-make-src-cache
+      - mac-make-src-cache-x64
+      - mac-make-src-cache-arm64
       - osx-testing-x64:
           requires:
-            - mac-make-src-cache
+            - mac-make-src-cache-x64
       - osx-testing-x64-gn-check:
           requires:
-            - mac-make-src-cache
+            - mac-make-src-cache-x64
       - darwin-testing-x64-tests:
           requires:
             - osx-testing-x64
       - osx-testing-arm64:
           requires:
-            - mac-make-src-cache
+            - mac-make-src-cache-arm64
       - darwin-testing-arm64-tests:
           filters:
             branches:

.circleci/config/params.js

@@ -1,12 +0,0 @@
-const fs = require('fs');
-
-const PARAMS_PATH = '/tmp/pipeline-parameters.json';
-
-const content = JSON.parse(fs.readFileSync(PARAMS_PATH, 'utf-8'));
-
-// Choose resource class for linux hosts
-const currentBranch = process.env.CIRCLE_BRANCH || '';
-content['large-linux-executor'] = /^pull\/[0-9-]+$/.test(currentBranch) ? '2xlarge' : 'electronjs/aks-linux-large';
-content['medium-linux-executor'] = /^pull\/[0-9-]+$/.test(currentBranch) ? 'medium' : 'electronjs/aks-linux-medium';
-
-fs.writeFileSync(PARAMS_PATH, JSON.stringify(content));

.circleci/fix-known-hosts.sh

@@ -3,6 +3,5 @@
 set -e
 
 mkdir -p ~/.ssh
-echo "github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
-github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-github.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=" >> ~/.ssh/known_hosts
+echo "|1|B3r+7aO0/x90IdefihIjxIoJrrk=|OJddGDfhbuLFc1bUyy84hhIw57M= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+|1|rGlEvW55DtzNZp+pzw9gvyOyKi4=|LLWr+7qlkAlw3YGGVfLHHxB/kR0= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==" >> ~/.ssh/known_hosts

.clang-tidy

@@ -0,0 +1,4 @@
+---
+Checks: '-modernize-use-nullptr'
+InheritParentConfig: true
+...

.devcontainer/devcontainer.json

@@ -4,6 +4,37 @@
 	"onCreateCommand": ".devcontainer/on-create-command.sh",
 	"updateContentCommand": ".devcontainer/update-content-command.sh",
 	"workspaceFolder": "/workspaces/gclient/src/electron",
+	"extensions": [
+		"joeleinbinder.mojom-language",
+		"rafaelmaiolla.diff",
+		"surajbarkale.ninja",
+		"ms-vscode.cpptools",
+		"mutantdino.resourcemonitor",
+		"dbaeumer.vscode-eslint",
+		"shakram02.bash-beautify",
+		"marshallofsound.gnls-electron",
+		"CircleCI.circleci"
+	],
+	"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"
+	},
 	"forwardPorts": [8088, 6080, 5901],
 	"portsAttributes": {
 		"8088": {
@@ -29,38 +60,6 @@
 			"openFiles": [
 				".devcontainer/README.md"
 			]
-		},
-		"vscode": {
-			"extensions": ["joeleinbinder.mojom-language",
-				"rafaelmaiolla.diff",
-				"surajbarkale.ninja",
-				"ms-vscode.cpptools",
-				"mutantdino.resourcemonitor",
-				"dbaeumer.vscode-eslint",
-				"shakram02.bash-beautify",
-				"marshallofsound.gnls-electron",
-				"CircleCI.circleci"
-			],
-			"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"
-			}
 		}
 	}
 }

.devcontainer/on-create-command.sh

@@ -16,8 +16,6 @@ ln -s $buildtools_configs $buildtools/configs
 
 # Write the gclient config if it does not already exist
 if [ ! -f $gclient_root/.gclient ]; then
-  echo "Creating gclient config"
-
   echo "solutions = [
       { \"name\"        : \"src/electron\",
           \"url\"         : \"https://github.com/electron/electron\",
@@ -34,8 +32,6 @@ fi
 # Write the default buildtools config file if it does
 # not already exist
 if [ ! -f $buildtools/configs/evm.testing.json ]; then
-  echo "Creating build-tools testing config"
-
   write_config() {
     echo "
         {
@@ -45,7 +41,7 @@ if [ ! -f $buildtools/configs/evm.testing.json ]; then
                 \"electron\": {
                     \"origin\": \"https://github.com/electron/electron.git\"
                 }
-            }
+            },
             \"gen\": {
                 \"args\": [
                     \"import(\\\"//electron/build/args/testing.gn\\\")\",
@@ -57,7 +53,7 @@ if [ ! -f $buildtools/configs/evm.testing.json ]; then
                 \"CHROMIUM_BUILDTOOLS_PATH\": \"/workspaces/gclient/src/buildtools\",
                 \"GIT_CACHE_PATH\": \"/workspaces/gclient/.git-cache\"
             },
-            \"\$schema\": \"file:///home/builduser/.electron_build_tools/evm-config.schema.json\"
+            \"$schema\": \"file:///home/builduser/.electron_build_tools/evm-config.schema.json\"
         }
     " >$buildtools/configs/evm.testing.json
   }
@@ -71,12 +67,10 @@ if [ ! -f $buildtools/configs/evm.testing.json ]; then
   # if it works we can use the goma cluster
   export NOTGOMA_CODESPACES_TOKEN=$GITHUB_TOKEN
   if e d goma_auth login; then
-    echo "$GITHUB_USER has GOMA access - switching to cluster mode"
     write_config cluster
   fi
 else
-  echo "build-tools testing config already exists"
-
-  # Re-auth with the goma cluster regardless.
+  # Even if the config file existed we still need to re-auth with the goma
+  # cluster
   NOTGOMA_CODESPACES_TOKEN=$GITHUB_TOKEN e d goma_auth login || true
 fi

.eslintrc.json

@@ -10,7 +10,6 @@
     "semi": ["error", "always"],
     "no-var": "error",
     "no-unused-vars": "off",
-    "no-global-assign": "off",
     "guard-for-in": "error",
     "@typescript-eslint/no-unused-vars": ["error", {
       "vars": "all",
@@ -20,20 +19,13 @@
     "prefer-const": ["error", {
       "destructuring": "all"
     }],
-    "standard/no-callback-literal": "off",
-    "node/no-deprecated-api": "off"
+    "standard/no-callback-literal": "off"
   },
   "parserOptions": {
     "ecmaVersion": 6,
     "sourceType": "module"
   },
   "overrides": [
-    {
-      "files": "*.js",
-      "rules": {
-        "@typescript-eslint/no-unused-vars": "off"
-      }
-    },
     {
       "files": "*.ts",
       "rules": {

.gitattributes

@@ -4,12 +4,27 @@
 patches/**/.patches merge=union
 
 # Source code and markdown files should always use LF as line ending.
+*.c text eol=lf
 *.cc text eol=lf
-*.mm text eol=lf
+*.cpp text eol=lf
+*.csv text eol=lf
+*.grd   text eol=lf
+*.grdp   text eol=lf
+*.gn text eol=lf
+*.gni text eol=lf
 *.h text eol=lf
-*.js text eol=lf
-*.ts text eol=lf
+*.html   text eol=lf
+*.idl text eol=lf
+*.in   text eol=lf
+*.js   text eol=lf
+*.json   text eol=lf
+*.json5 text eol=lf
+*.md text eol=lf
+*.mm text eol=lf
+*.mojom text eol=lf
+*.proto text eol=lf
 *.py text eol=lf
 *.ps1 text eol=lf
-*.html text eol=lf
-*.md text eol=lf
+*.sh text eol=lf
+*.ts text eol=lf
+*.txt   text eol=lf

.github/CODEOWNERS

@@ -15,6 +15,5 @@ DEPS                                    @electron/wg-upgrades
 # Security WG
 /lib/browser/devtools.ts                @electron/wg-security
 /lib/browser/guest-view-manager.ts      @electron/wg-security
-/lib/browser/guest-window-proxy.ts      @electron/wg-security
 /lib/browser/rpc-server.ts              @electron/wg-security
 /lib/renderer/security-warnings.ts      @electron/wg-security

.github/workflows/branch-created.yml

@@ -0,0 +1,209 @@
+name: Branch Created
+
+on:
+  create:
+
+permissions: {}
+
+jobs:
+  release-branch-created:
+    name: Release Branch Created
+    if: ${{ github.event.ref_type == 'branch' && endsWith(github.event.ref, '-x-y') }}
+    permissions:
+      contents: read
+      pull-requests: write
+      repository-projects: write  # Required for labels
+    runs-on: ubuntu-latest
+    steps:
+      - name: Determine Major Version
+        id: check-major-version
+        run: |
+          if [[ ${{ github.event.ref }} =~ ^([0-9]+)-x-y$ ]]; then
+            echo "MAJOR=${BASH_REMATCH[1]}" >> "$GITHUB_OUTPUT"
+          else
+            echo "Not a release branch: ${{ github.event.ref }}"
+          fi
+      - name: New Release Branch Tasks
+        if: ${{ steps.check-major-version.outputs.MAJOR }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: electron/electron
+          MAJOR: ${{ steps.check-major-version.outputs.MAJOR }}
+          NUM_SUPPORTED_VERSIONS: 3
+        run: |
+          PREVIOUS_MAJOR=$((MAJOR - 1))
+          UNSUPPORTED_MAJOR=$((MAJOR - NUM_SUPPORTED_VERSIONS - 1))
+
+          # Create new labels
+          gh label create $MAJOR-x-y --color 8d9ee8 || true
+          gh label create target/$MAJOR-x-y --color ad244f --description "PR should also be added to the \"${MAJOR}-x-y\" branch." || true
+          gh label create merged/$MAJOR-x-y --color 61a3c6 --description "PR was merged to the \"${MAJOR}-x-y\" branch." || true
+          gh label create in-flight/$MAJOR-x-y --color db69a6 || true
+          gh label create needs-manual-bp/$MAJOR-x-y --color 8b5dba || true
+
+          # Change color of old labels
+          gh label edit $UNSUPPORTED_MAJOR-x-y --color ededed || true
+          gh label edit target/$UNSUPPORTED_MAJOR-x-y --color ededed || true
+          gh label edit merged/$UNSUPPORTED_MAJOR-x-y --color ededed || true
+          gh label edit in-flight/$UNSUPPORTED_MAJOR-x-y --color ededed || true
+          gh label edit needs-manual-bp/$UNSUPPORTED_MAJOR-x-y --color ededed || true
+
+          # Add the new target label to any PRs which:
+          #   * target the previous major
+          #   * are in-flight for the previous major
+          #   * need manual backport for the previous major
+          for PREVIOUS_MAJOR_LABEL in target/$PREVIOUS_MAJOR-x-y in-flight/$PREVIOUS_MAJOR-x-y needs-manual-bp/$PREVIOUS_MAJOR-x-y; do
+            PULL_REQUESTS=$(gh pr list --label $PREVIOUS_MAJOR_LABEL --jq .[].number --json number --limit 500)
+            if [[ $PULL_REQUESTS ]]; then
+              echo $PULL_REQUESTS | xargs -n 1 gh pr edit --add-label target/$MAJOR-x-y || true
+            fi
+          done
+      - name: Generate GitHub App token
+        if: ${{ steps.check-major-version.outputs.MAJOR }}
+        id: generate-token
+        env:
+          RELEASE_BOARD_GH_APP_CREDS: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
+        run: |
+          TOKEN=$(npx @electron/github-app-auth --creds=$RELEASE_BOARD_GH_APP_CREDS --org electron)
+          echo "TOKEN=$TOKEN" >> "$GITHUB_OUTPUT"
+      - name: Create Release Project Board
+        if: ${{ steps.check-major-version.outputs.MAJOR }}
+        env:
+          GITHUB_TOKEN: ${{ steps.generate-token.outputs.TOKEN }}
+          MAJOR: ${{ steps.check-major-version.outputs.MAJOR }}
+          ELECTRON_ORG_ID: "O_kgDOAMybxg"
+          ELECTRON_REPO_ID: "R_kgDOAI8xSw"
+          TEMPLATE_PROJECT_ID: "PVT_kwDOAMybxs4AQvib"
+        run: |
+          # Copy template to create new project board
+          PROJECT_ID=$(gh api graphql -f query='mutation ($ownerId: ID!, $projectId: ID!, $title: String!) {  
+            copyProjectV2(input: {
+              includeDraftIssues: true,
+              ownerId: $ownerId,
+              projectId: $projectId,
+              title: $title
+            }) {
+              projectV2 {
+                id
+              }
+            }
+          }' -f ownerId=$ELECTRON_ORG_ID -f projectId=$TEMPLATE_PROJECT_ID -f title="${MAJOR}-x-y" | jq -r '.data.copyProjectV2.projectV2.id')
+
+          # Make the new project public
+          gh api graphql -f query='mutation ($projectId: ID!) {                                                                                             
+            updateProjectV2(input: {
+              projectId: $projectId,
+              public: true,
+            }) {
+              projectV2 {
+                id
+              }
+            }
+          }' -f projectId=$PROJECT_ID
+
+          # Link the new project to the Electron repository
+          gh api graphql -f query='mutation ($projectId: ID!, $repositoryId: ID!) {                                                                                             
+            linkProjectV2ToRepository(input: {
+              projectId: $projectId,
+              repositoryId: $repositoryId
+            }) {
+              clientMutationId
+            }
+          }' -f projectId=$PROJECT_ID -f repositoryId=$ELECTRON_REPO_ID
+
+          # Get all draft issues on the new project board
+          gh api graphql -f query='query ($id: ID!) {
+            node(id: $id) {
+              ... on ProjectV2 {
+                items(first: 100) {
+                  nodes {
+                    ... on ProjectV2Item {
+                      id
+                      content {
+                        ... on DraftIssue { id title
+                          body
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }' -f id=$PROJECT_ID > issues.json
+          PROJECT_ITEMS=$(jq '.data.node.items.nodes[] | select(.content.id != null) | .id' issues.json)
+
+          # TODO(dsanders11): remove the following "Stable Prep Items" sections once
+          # GitHub extends project template copying to retain the status field value
+          # of draft issues in the template.
+          #
+          # Refs https://github.com/orgs/community/discussions/54576#discussioncomment-6096892
+
+          # Get field ID and option value for "Stable Prep Items"
+          gh api graphql -f query='query ($id: ID!) {
+            node(id: $id) {
+              ... on ProjectV2 {
+                field(name: "Status") {
+                  ... on ProjectV2SingleSelectField {
+                    id
+                    options {
+                      ... on ProjectV2SingleSelectFieldOption {
+                        id
+                        name
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }' -f id=$PROJECT_ID > status_field.json
+          FIELD_ID=$(jq -r '.data.node.field.id' status_field.json)
+          FIELD_OPTION_ID=$(jq -r '.data.node.field.options[] | select(.name == "Stable Prep Items") | .id' status_field.json)
+
+          # Move draft issues to "Stable Prep" column
+          echo "$PROJECT_ITEMS" | xargs -I ITEM_ID -n 1 gh api graphql -f query='mutation ($projectId: ID!, $fieldId: ID!, $itemId: ID!, $value: String!) {                                                                                             
+            updateProjectV2ItemFieldValue(input: {
+              projectId: $projectId,
+              fieldId: $fieldId,
+              itemId: $itemId,
+              value: {
+                singleSelectOptionId: $value
+              }
+            }) {
+              projectV2Item {
+                id
+              }
+            }
+          }' -f projectId=$PROJECT_ID -f fieldId=$FIELD_ID -f itemId=ITEM_ID -f value=$FIELD_OPTION_ID
+
+          #
+          # Do template replacement for draft issues
+          #
+          echo "{\"major\": $MAJOR, \"next-major\": $((MAJOR + 1))}" > variables.json
+
+          # npx mustache is annoyingly slow, so install mustache directly
+          yarn add -D mustache
+
+          for PROJECT_ITEM_ID in $PROJECT_ITEMS; do
+            # These are done with the raw output flag and sent to file to better retain formatting
+            jq -r ".data.node.items.nodes[] | select(.id == $PROJECT_ITEM_ID) | .content.title" issues.json > title.txt
+            jq -r ".data.node.items.nodes[] | select(.id == $PROJECT_ITEM_ID) | .content.body" issues.json > body.txt
+
+            ./node_modules/.bin/mustache variables.json title.txt new_title.txt
+            ./node_modules/.bin/mustache variables.json body.txt new_body.txt
+
+            # Only update draft issues which had content change when interpolated
+            if ! cmp --silent -- new_title.txt title.txt || ! cmp --silent -- new_body.txt body.txt; then
+              DRAFT_ISSUE_ID=$(jq ".data.node.items.nodes[] | select(.id == $PROJECT_ITEM_ID) | .content.id" issues.json)
+              gh api graphql -f query='mutation ($draftIssueId: ID!, $title: String!, $body: String!) {                                                                                             
+                updateProjectV2DraftIssue(input: {
+                  draftIssueId: $draftIssueId,
+                  title: $title,
+                  body: $body
+                }) {
+                  draftIssue {
+                    id
+                  }
+                }
+              }' -f draftIssueId=$DRAFT_ISSUE_ID -f title="$(cat new_title.txt)" -f body="$(cat new_body.txt)"
+            fi
+          done

.github/workflows/issue-commented.yml

@@ -0,0 +1,24 @@
+name: Issue Commented
+
+on:
+  issue_comment:
+    types:
+      - created
+
+permissions:
+  contents: read
+
+jobs:
+  issue-commented:
+    name: Remove blocked/need-repro on comment
+    if: ${{ contains(github.event.issue.labels.*.name, 'blocked/need-repro') && !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) }}
+    permissions:
+      issues: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Remove label
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ISSUE_URL: ${{ github.event.issue.html_url }}
+        run: |
+          gh issue edit $ISSUE_URL --remove-label 'blocked/need-repro'

.github/workflows/issue-labeled.yml

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

.github/workflows/release_dependency_versions.yml

@@ -1,33 +0,0 @@
-name: Trigger Major Release Dependency Updates
-
-on:
-  release:
-    types: [published]
-
-env:
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-jobs:
-  trigger_chromedriver:
-    runs-on: ubuntu-latest
-    steps:
-    - 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
-          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 }}"
-        fi
-
-  trigger_mksnapshot:
-    runs-on: ubuntu-latest
-    steps:
-      - 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
-            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 }}"
-          fi

.github/workflows/stale.yml

@@ -33,6 +33,7 @@ jobs:
         with:
           days-before-stale: -1
           days-before-close: 10
+          remove-stale-when-updated: false
           stale-issue-label: blocked/need-repro
           stale-pr-label: not-a-real-label
           operations-per-run: 1750

.github/workflows/update_appveyor_image.yml

@@ -66,7 +66,9 @@ jobs:
         signoff: false
         branch: bump-appveyor-image
         delete-branch: true
+        reviewers: electron/wg-releases
         title: 'build: update appveyor image to latest version'
+        labels: semver/none,no-backport
         body: |
           This PR updates appveyor.yml to the latest baked image, ${{ env.APPVEYOR_IMAGE_VERSION }}.
-          Notes: none
+          Notes: none

BUILD.gn

@@ -37,7 +37,7 @@ if (is_mac) {
   import("build/rules.gni")
 
   assert(
-      mac_deployment_target == "10.13",
+      mac_deployment_target == "10.15",
       "Chromium has updated the mac_deployment_target, please update this assert, update the supported versions documentation (docs/tutorial/support.md) and flag this as a breaking change")
 }
 
@@ -99,10 +99,6 @@ if (is_linux) {
   }
 }
 
-declare_args() {
-  use_prebuilt_v8_context_snapshot = false
-}
-
 branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
@@ -461,6 +457,7 @@ source_set("electron_lib") {
     "//services/proxy_resolver:lib",
     "//services/video_capture/public/mojom:constants",
     "//services/viz/privileged/mojom/compositing",
+    "//services/viz/public/mojom",
     "//skia",
     "//third_party/blink/public:blink",
     "//third_party/blink/public:blink_devtools_inspector_resources",
@@ -474,6 +471,7 @@ source_set("electron_lib") {
     "//third_party/widevine/cdm:headers",
     "//third_party/zlib/google:zip",
     "//ui/base/idle",
+    "//ui/compositor",
     "//ui/events:dom_keycode_converter",
     "//ui/gl",
     "//ui/native_theme",
@@ -544,6 +542,7 @@ source_set("electron_lib") {
 
   if (is_mac) {
     deps += [
+      ":electron_lib_arc",
       "//components/remote_cocoa/app_shim",
       "//components/remote_cocoa/browser",
       "//content/browser:mac_helpers",
@@ -555,6 +554,7 @@ source_set("electron_lib") {
     }
 
     frameworks = [
+      "AuthenticationServices.framework",
       "AVFoundation.framework",
       "Carbon.framework",
       "LocalAuthentication.framework",
@@ -671,46 +671,6 @@ source_set("electron_lib") {
     ]
   }
 
-  if (enable_run_as_node) {
-    sources += [
-      "shell/app/node_main.cc",
-      "shell/app/node_main.h",
-    ]
-  }
-
-  if (enable_osr) {
-    sources += [
-      "shell/browser/osr/osr_host_display_client.cc",
-      "shell/browser/osr/osr_host_display_client.h",
-      "shell/browser/osr/osr_render_widget_host_view.cc",
-      "shell/browser/osr/osr_render_widget_host_view.h",
-      "shell/browser/osr/osr_video_consumer.cc",
-      "shell/browser/osr/osr_video_consumer.h",
-      "shell/browser/osr/osr_view_proxy.cc",
-      "shell/browser/osr/osr_view_proxy.h",
-      "shell/browser/osr/osr_web_contents_view.cc",
-      "shell/browser/osr/osr_web_contents_view.h",
-    ]
-    if (is_mac) {
-      sources += [
-        "shell/browser/osr/osr_host_display_client_mac.mm",
-        "shell/browser/osr/osr_web_contents_view_mac.mm",
-      ]
-    }
-    deps += [
-      "//components/viz/service",
-      "//services/viz/public/mojom",
-      "//ui/compositor",
-    ]
-  }
-
-  if (enable_desktop_capturer) {
-    sources += [
-      "shell/browser/api/electron_api_desktop_capturer.cc",
-      "shell/browser/api/electron_api_desktop_capturer.h",
-    ]
-  }
-
   if (enable_views_api) {
     sources += [
       "shell/browser/api/views/electron_api_image_view.cc",
@@ -784,6 +744,27 @@ source_set("electron_lib") {
   }
 }
 
+if (is_mac) {
+  source_set("electron_lib_arc") {
+    include_dirs = [ "." ]
+    sources = [
+      "shell/browser/mac/dict_util.h",
+      "shell/browser/mac/dict_util.mm",
+      "shell/browser/mac/electron_application_delegate.h",
+      "shell/browser/mac/electron_application_delegate.mm",
+    ]
+
+    deps = [
+      "//base",
+      "//skia",
+      "//third_party/electron_node:node_lib",
+      "//v8",
+    ]
+
+    configs += [ "//build/config/compiler:enable_arc" ]
+  }
+}
+
 electron_paks("packed_resources") {
   if (is_mac) {
     output_dir = "$root_gen_dir/electron_repack"
@@ -803,15 +784,6 @@ if (is_mac) {
     sources = [ "shell/common/resources/mac/MainMenu.xib" ]
   }
 
-  action("fake_v8_context_snapshot_generator") {
-    script = "build/fake_v8_context_snapshot_generator.py"
-    args = [
-      rebase_path("$root_out_dir/$v8_context_snapshot_filename"),
-      rebase_path("$root_out_dir/fake/$v8_context_snapshot_filename"),
-    ]
-    outputs = [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
-  }
-
   bundle_data("electron_framework_resources") {
     public_deps = [ ":packed_resources" ]
     sources = []
@@ -822,13 +794,8 @@ if (is_mac) {
     if (v8_use_external_startup_data) {
       public_deps += [ "//v8" ]
       if (use_v8_context_snapshot) {
-        if (use_prebuilt_v8_context_snapshot) {
-          sources += [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
-          public_deps += [ ":fake_v8_context_snapshot_generator" ]
-        } else {
-          sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
-          public_deps += [ "//tools/v8_context_snapshot" ]
-        }
+        sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
+        public_deps += [ "//tools/v8_context_snapshot" ]
       } else {
         sources += [ "$root_out_dir/snapshot_blob.bin" ]
       }
@@ -928,11 +895,7 @@ if (is_mac) {
 
     include_dirs = [ "." ]
     sources = filenames.framework_sources
-    frameworks = []
-
-    if (enable_osr) {
-      frameworks += [ "IOSurface.framework" ]
-    }
+    frameworks = [ "IOSurface.framework" ]
 
     ldflags = [
       "-Wl,-install_name,@rpath/$output_name.framework/$output_name",

DEPS

@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '114.0.5735.289',
+    '117.0.5852.0',
   'node_version':
-    'v18.15.0',
+    'v18.16.1',
   'nan_version':
     '16fa32231e2ccd89d2804b3f765319128b20c4ac',
   'squirrel.mac_version':

appveyor-woa.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-114.0.5735.16-bust-cache
+image: e-116.0.5845.0
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -49,11 +49,6 @@ environment:
       APPVEYOR_BUILD_WORKER_IMAGE: base-woa
       APPVEYOR_BUILD_WORKER_CLOUD: electronhq-woa
 
-clone_script:
-- ps: git clone -q $("--branch=" + $Env:APPVEYOR_REPO_BRANCH) $("https://github.com/" + $Env:APPVEYOR_REPO_NAME + ".git") $Env:APPVEYOR_BUILD_FOLDER
-- ps: if (!$Env:APPVEYOR_PULL_REQUEST_NUMBER) {$("git checkout -qf " + $Env:APPVEYOR_REPO_COMMIT)}
-- ps: if ($Env:APPVEYOR_PULL_REQUEST_NUMBER) {git fetch -q origin +refs/pull/$($Env:APPVEYOR_PULL_REQUEST_NUMBER)/head; git checkout -qf FETCH_HEAD}
-
 clone_folder: C:\projects\src\electron
 
 skip_branch_with_pr: true
@@ -72,10 +67,8 @@ for:
       - ps: |
           node script/yarn.js install --frozen-lockfile
           node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER
-          $env:SHOULD_SKIP_ARTIFACT_VALIDATION = "false"
           if ($LASTEXITCODE -eq 0) {
-            Write-warning "Skipping build for doc-only change"
-            $env:SHOULD_SKIP_ARTIFACT_VALIDATION = "true"
+            Write-warning "Skipping build for doc only change"
             Exit-AppveyorBuild
           } else {
             $global:LASTEXITCODE = 0
@@ -92,8 +85,6 @@ for:
             Remove-Item -Recurse -Force $pwd\build-tools
           }
       - git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-      - ps: New-Item -Name depot_tools\.disable_auto_update -ItemType File
-      - depot_tools\bootstrap\win_tools.bat
       - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
       - ps: >-
           if (Test-Path -Path "$pwd\src\electron") {
@@ -116,7 +107,7 @@ for:
       - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
       - ps: >-
           if (Test-Path 'env:RAW_GOMA_AUTH') {
-            $goma_login = python3 $env:LOCAL_GOMA_DIR\goma_auth.py info
+            $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
             if ($goma_login -eq 'Login as Fermi Planck') {
               Write-warning "Goma authentication is correct";
             } else {
@@ -166,7 +157,7 @@ for:
       - ninja -C out/Default electron:hunspell_dictionaries_zip
       - ninja -C out/Default electron:electron_chromedriver_zip
       - ninja -C out/Default third_party/electron_node:headers
-      - python3 %LOCAL_GOMA_DIR%\goma_ctl.py stat
+      - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
       - ps: >-
           Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
       - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
@@ -187,30 +178,6 @@ for:
             7z a pdb.zip out\Default\*.pdb
           }
       - python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
-      - ps: |
-          cd C:\projects\src
-          $missing_artifacts = $false
-          if ($env:SHOULD_SKIP_ARTIFACT_VALIDATION -eq 'true') {
-            Write-warning "Skipping artifact validation for doc-only PR"
-          } else {
-            $artifacts_to_validate = 'dist.zip','windows_toolchain_profile.json','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib','hunspell_dictionaries.zip'
-            foreach($artifact_name in $artifacts_to_validate) {
-              if ($artifact_name -eq 'ffmpeg.zip') {
-                $artifact_file = "out\ffmpeg\ffmpeg.zip"
-              } elseif ($artifact_name -eq 'node_headers.zip') {
-                $artifact_file = $artifact_name
-              } else {
-                $artifact_file = "out\Default\$artifact_name"
-              }
-              if (-not(Test-Path $artifact_file)) {
-                Write-warning "$artifact_name is missing and cannot be added to artifacts"
-                $missing_artifacts = $true
-              }
-            }
-          }
-          if ($missing_artifacts) {
-            throw "Build failed due to missing artifacts"
-          }
 
     deploy_script:
       - cd electron
@@ -236,7 +203,7 @@ for:
       - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
       - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
       - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
-      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)        
+      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
       - ps: >-
           if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
             appveyor-retry appveyor PushArtifact pdb.zip
@@ -269,7 +236,7 @@ for:
           # Download build artifacts
           $apiUrl = 'https://ci.appveyor.com/api'
           $build_info = Invoke-RestMethod -Method Get -Uri "$apiUrl/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/builds/$env:APPVEYOR_BUILD_ID"
-          $artifacts_to_download = @('dist.zip','ffmpeg.zip','node_headers.zip','electron.lib')
+          $artifacts_to_download = @('dist.zip','ffmpeg.zip','node_headers.zip','pdb.zip','electron.lib')
           foreach ($job in $build_info.build.jobs) {
             if ($job.name -eq "Build Arm on X64 Windows") {
               $jobId = $job.jobId
@@ -281,13 +248,10 @@ for:
                 }
                 Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
               }
-              # Uncomment the following lines to download the pdb.zip to show real stacktraces when crashes happen during testing
-              # Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
-              # 7z x -y -osrc pdb.zip
             }
           }
       - ps: |
-          $out_default_zips = @('dist.zip')
+          $out_default_zips = @('dist.zip','pdb.zip')
           foreach($zip_name in $out_default_zips) {
             7z x -y -osrc\out\Default $zip_name
           }

appveyor.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-114.0.5735.16-bust-cache
+image: e-116.0.5845.0
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -47,11 +47,6 @@ environment:
     - job_name: Test
       job_depends_on: Build
 
-clone_script:
-- ps: git clone -q $("--branch=" + $Env:APPVEYOR_REPO_BRANCH) $("https://github.com/" + $Env:APPVEYOR_REPO_NAME + ".git") $Env:APPVEYOR_BUILD_FOLDER
-- ps: if (!$Env:APPVEYOR_PULL_REQUEST_NUMBER) {$("git checkout -qf " + $Env:APPVEYOR_REPO_COMMIT)}
-- ps: if ($Env:APPVEYOR_PULL_REQUEST_NUMBER) {git fetch -q origin +refs/pull/$($Env:APPVEYOR_PULL_REQUEST_NUMBER)/head; git checkout -qf FETCH_HEAD}
-
 clone_folder: C:\projects\src\electron
 
 skip_branch_with_pr: true
@@ -70,10 +65,8 @@ for:
       - ps: |
           node script/yarn.js install --frozen-lockfile
           node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER
-          $env:SHOULD_SKIP_ARTIFACT_VALIDATION = "false"
           if ($LASTEXITCODE -eq 0) {
-            Write-warning "Skipping build for doc-only change"
-            $env:SHOULD_SKIP_ARTIFACT_VALIDATION = "true"
+            Write-warning "Skipping build for doc only change"
             Exit-AppveyorBuild
           } else {
             $global:LASTEXITCODE = 0
@@ -90,8 +83,6 @@ for:
             Remove-Item -Recurse -Force $pwd\build-tools
           }
       - git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-      - ps: New-Item -Name depot_tools\.disable_auto_update -ItemType File
-      - depot_tools\bootstrap\win_tools.bat
       - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
       - ps: >-
           if (Test-Path -Path "$pwd\src\electron") {
@@ -114,7 +105,7 @@ for:
       - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
       - ps: >-
           if (Test-Path 'env:RAW_GOMA_AUTH') {
-            $goma_login = python3 $env:LOCAL_GOMA_DIR\goma_auth.py info
+            $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
             if ($goma_login -eq 'Login as Fermi Planck') {
               Write-warning "Goma authentication is correct";
             } else {
@@ -164,7 +155,7 @@ for:
       - ninja -C out/Default electron:hunspell_dictionaries_zip
       - ninja -C out/Default electron:electron_chromedriver_zip
       - ninja -C out/Default third_party/electron_node:headers
-      - python3 %LOCAL_GOMA_DIR%\goma_ctl.py stat
+      - python %LOCAL_GOMA_DIR%\goma_ctl.py stat
       - ps: >-
           Get-CimInstance -Namespace root\cimv2 -Class Win32_product | Select vendor, description, @{l='install_location';e='InstallLocation'}, @{l='install_date';e='InstallDate'}, @{l='install_date_2';e='InstallDate2'}, caption, version, name, @{l='sku_number';e='SKUNumber'} | ConvertTo-Json | Out-File -Encoding utf8 -FilePath .\installed_software.json
       - python3 electron/build/profile_toolchain.py --output-json=out/Default/windows_toolchain_profile.json
@@ -185,30 +176,6 @@ for:
             7z a pdb.zip out\Default\*.pdb
           }
       - python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
-      - ps: |
-          cd C:\projects\src
-          $missing_artifacts = $false
-          if ($env:SHOULD_SKIP_ARTIFACT_VALIDATION -eq 'true') {
-            Write-warning "Skipping artifact validation for doc-only PR"
-          } else {
-            $artifacts_to_validate = 'dist.zip','windows_toolchain_profile.json','shell_browser_ui_unittests.exe','chromedriver.zip','ffmpeg.zip','node_headers.zip','mksnapshot.zip','electron.lib','hunspell_dictionaries.zip'
-            foreach($artifact_name in $artifacts_to_validate) {
-              if ($artifact_name -eq 'ffmpeg.zip') {
-                $artifact_file = "out\ffmpeg\ffmpeg.zip"
-              } elseif ($artifact_name -eq 'node_headers.zip') {
-                $artifact_file = $artifact_name
-              } else {
-                $artifact_file = "out\Default\$artifact_name"
-              }
-              if (-not(Test-Path $artifact_file)) {
-                Write-warning "$artifact_name is missing and cannot be added to artifacts"
-                $missing_artifacts = $true
-              }
-            }
-          }
-          if ($missing_artifacts) {
-            throw "Build failed due to missing artifacts"
-          }
 
     deploy_script:
       - cd electron
@@ -234,7 +201,7 @@ for:
       - if exist node_headers.zip (appveyor-retry appveyor PushArtifact node_headers.zip)
       - if exist out\Default\mksnapshot.zip (appveyor-retry appveyor PushArtifact out\Default\mksnapshot.zip)
       - if exist out\Default\hunspell_dictionaries.zip (appveyor-retry appveyor PushArtifact out\Default\hunspell_dictionaries.zip)
-      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)        
+      - if exist out\Default\electron.lib (appveyor-retry appveyor PushArtifact out\Default\electron.lib)
       - ps: >-
           if ((Test-Path "pdb.zip") -And ($env:GN_CONFIG -ne 'release')) {
             appveyor-retry appveyor PushArtifact pdb.zip
@@ -277,9 +244,6 @@ for:
                 }
                 Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/$artifact_name" -OutFile $outfile
               }
-              # Uncomment the following lines to download the pdb.zip to show real stacktraces when crashes happen during testing
-              # Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
-              # 7z x -y -osrc pdb.zip
             }
           }
       - ps: |

build/.eslintrc.json

@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    "unicorn"
+  ],
+  "rules": {
+    "unicorn/prefer-node-protocol": "error"
+  }
+}

build/args/all.gn

@@ -50,8 +50,5 @@ use_qt = false
 # TODO(codebytere): fix perfetto incompatibility with Node.js.
 use_perfetto_client_library = false
 
-# Ref: https://chromium-review.googlesource.com/c/chromium/src/+/4402277
-enable_check_raw_ptr_fields = false
-
 # Disables the builtins PGO for V8
 v8_builtins_profiling_log_file = ""

build/fake_v8_context_snapshot_generator.py

@@ -1,8 +0,0 @@
-import os
-import shutil
-import sys
-
-if os.path.exists(sys.argv[2]):
-  os.remove(sys.argv[2])
-
-shutil.copy(sys.argv[1], sys.argv[2])

build/generate_node_defines.py

@@ -4,7 +4,7 @@ import sys
 
 DEFINE_EXTRACT_REGEX = re.compile('^ *# *define (\w*)', re.MULTILINE)
 
-def main(outDir, headers):
+def main(out_dir, headers):
   defines = []
   for filename in headers:
     with open(filename, 'r') as f:
@@ -15,13 +15,13 @@ def main(outDir, headers):
   for define in defines:
     push_and_undef += '#pragma push_macro("%s")\n' % define
     push_and_undef += '#undef %s\n' % define
-  with open(os.path.join(outDir, 'push_and_undef_node_defines.h'), 'w') as o:
+  with open(os.path.join(out_dir, 'push_and_undef_node_defines.h'), 'w') as o:
     o.write(push_and_undef)
 
   pop = ''
   for define in defines:
     pop += '#pragma pop_macro("%s")\n' % define
-  with open(os.path.join(outDir, 'pop_node_defines.h'), 'w') as o:
+  with open(os.path.join(out_dir, 'pop_node_defines.h'), 'w') as o:
     o.write(pop)
 
 def read_defines(content):

build/webpack/webpack.config.base.js

@@ -1,5 +1,5 @@
-const fs = require('fs');
-const path = require('path');
+const fs = require('node:fs');
+const path = require('node:path');
 const webpack = require('webpack');
 const TerserPlugin = require('terser-webpack-plugin');
 const WrapperPlugin = require('wrapper-webpack-plugin');
@@ -53,14 +53,6 @@ module.exports = ({
 
     const ignoredModules = [];
 
-    if (defines.ENABLE_DESKTOP_CAPTURER === 'false') {
-      ignoredModules.push(
-        '@electron/internal/browser/desktop-capturer',
-        '@electron/internal/browser/api/desktop-capturer',
-        '@electron/internal/renderer/api/desktop-capturer'
-      );
-    }
-
     if (defines.ENABLE_VIEWS_API === 'false') {
       ignoredModules.push(
         '@electron/internal/browser/api/views/image-view.js'

buildflags/BUILD.gn

@@ -9,16 +9,10 @@ buildflag_header("buildflags") {
   header = "buildflags.h"
 
   flags = [
-    "ENABLE_DESKTOP_CAPTURER=$enable_desktop_capturer",
-    "ENABLE_RUN_AS_NODE=$enable_run_as_node",
-    "ENABLE_OSR=$enable_osr",
     "ENABLE_VIEWS_API=$enable_views_api",
     "ENABLE_PDF_VIEWER=$enable_pdf_viewer",
-    "ENABLE_TTS=$enable_tts",
-    "ENABLE_COLOR_CHOOSER=$enable_color_chooser",
     "ENABLE_ELECTRON_EXTENSIONS=$enable_electron_extensions",
     "ENABLE_BUILTIN_SPELLCHECKER=$enable_builtin_spellchecker",
-    "ENABLE_PICTURE_IN_PICTURE=$enable_picture_in_picture",
     "OVERRIDE_LOCATION_PROVIDER=$enable_fake_location_provider",
   ]
 }

buildflags/buildflags.gni

@@ -3,23 +3,10 @@
 # found in the LICENSE file.
 
 declare_args() {
-  enable_desktop_capturer = true
-
-  # Allow running Electron as a node binary.
-  enable_run_as_node = true
-
-  enable_osr = true
-
   enable_views_api = true
 
   enable_pdf_viewer = true
 
-  enable_tts = true
-
-  enable_color_chooser = true
-
-  enable_picture_in_picture = true
-
   # Provide a fake location provider for mocking
   # the geolocation responses. Disable it if you
   # need to test with chromium's location provider.

chromium_src/BUILD.gn

@@ -37,12 +37,22 @@ static_library("chrome") {
     "//chrome/browser/icon_loader.h",
     "//chrome/browser/icon_manager.cc",
     "//chrome/browser/icon_manager.h",
+    "//chrome/browser/media/webrtc/desktop_media_list.cc",
+    "//chrome/browser/media/webrtc/desktop_media_list.h",
+    "//chrome/browser/media/webrtc/desktop_media_list_base.cc",
+    "//chrome/browser/media/webrtc/desktop_media_list_base.h",
+    "//chrome/browser/media/webrtc/desktop_media_list_observer.h",
+    "//chrome/browser/media/webrtc/native_desktop_media_list.cc",
+    "//chrome/browser/media/webrtc/native_desktop_media_list.h",
+    "//chrome/browser/media/webrtc/window_icon_util.h",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
     "//chrome/browser/net/proxy_config_monitor.cc",
     "//chrome/browser/net/proxy_config_monitor.h",
     "//chrome/browser/net/proxy_service_factory.cc",
     "//chrome/browser/net/proxy_service_factory.h",
+    "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.cc",
+    "//chrome/browser/picture_in_picture/picture_in_picture_window_manager.h",
     "//chrome/browser/platform_util.cc",
     "//chrome/browser/platform_util.h",
     "//chrome/browser/predictors/preconnect_manager.cc",
@@ -86,6 +96,28 @@ static_library("chrome") {
     "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc",
     "//chrome/browser/ui/views/eye_dropper/eye_dropper_view.h",
+    "//chrome/browser/ui/views/overlay/back_to_tab_label_button.cc",
+    "//chrome/browser/ui/views/overlay/close_image_button.cc",
+    "//chrome/browser/ui/views/overlay/close_image_button.h",
+    "//chrome/browser/ui/views/overlay/constants.h",
+    "//chrome/browser/ui/views/overlay/hang_up_button.cc",
+    "//chrome/browser/ui/views/overlay/hang_up_button.h",
+    "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
+    "//chrome/browser/ui/views/overlay/overlay_window_image_button.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/video_overlay_window_views.cc",
+    "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
     "//extensions/browser/app_window/size_constraints.cc",
     "//extensions/browser/app_window/size_constraints.h",
     "//ui/views/native_window_tracker.h",
@@ -95,23 +127,6 @@ static_library("chrome") {
     sources += [ "//chrome/browser/process_singleton_posix.cc" ]
   }
 
-  if (is_mac) {
-    sources += [
-      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
-      "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
-      "//chrome/browser/icon_loader_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
-      "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
-      "//chrome/browser/platform_util_mac.mm",
-      "//chrome/browser/process_singleton_mac.mm",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
-      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
-    ]
-  }
-
   if (is_win) {
     sources += [
       "//chrome/browser/extensions/global_shortcut_listener_win.cc",
@@ -146,6 +161,7 @@ static_library("chrome") {
 
   public_deps = [
     "//chrome/browser:dev_ui_browser_resources",
+    "//chrome/browser/resources/accessibility:resources",
     "//chrome/browser/ui/color:mixers",
     "//chrome/common",
     "//chrome/common:version_header",
@@ -157,7 +173,14 @@ static_library("chrome") {
     "//services/strings",
   ]
 
-  deps = [ "//chrome/browser:resource_prefetch_predictor_proto" ]
+  deps = [
+    "//chrome/app/vector_icons",
+    "//chrome/browser:resource_prefetch_predictor_proto",
+    "//chrome/browser/resource_coordinator:mojo_bindings",
+    "//components/vector_icons:vector_icons",
+    "//ui/snapshot",
+    "//ui/views/controls/webview",
+  ]
 
   if (is_linux) {
     sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
@@ -188,18 +211,8 @@ static_library("chrome") {
     public_deps += [ "//chrome/services/util_win:lib" ]
   }
 
-  if (enable_desktop_capturer) {
-    sources += [
-      "//chrome/browser/media/webrtc/desktop_media_list.cc",
-      "//chrome/browser/media/webrtc/desktop_media_list.h",
-      "//chrome/browser/media/webrtc/desktop_media_list_base.cc",
-      "//chrome/browser/media/webrtc/desktop_media_list_base.h",
-      "//chrome/browser/media/webrtc/desktop_media_list_observer.h",
-      "//chrome/browser/media/webrtc/native_desktop_media_list.cc",
-      "//chrome/browser/media/webrtc/native_desktop_media_list.h",
-      "//chrome/browser/media/webrtc/window_icon_util.h",
-    ]
-    deps += [ "//ui/snapshot" ]
+  if (is_mac) {
+    public_deps += [ ":chrome_lib_arc" ]
   }
 
   if (enable_widevine) {
@@ -273,41 +286,6 @@ static_library("chrome") {
     }
   }
 
-  if (enable_picture_in_picture) {
-    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_label_button.cc",
-      "//chrome/browser/ui/views/overlay/close_image_button.cc",
-      "//chrome/browser/ui/views/overlay/close_image_button.h",
-      "//chrome/browser/ui/views/overlay/constants.h",
-      "//chrome/browser/ui/views/overlay/hang_up_button.cc",
-      "//chrome/browser/ui/views/overlay/hang_up_button.h",
-      "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
-      "//chrome/browser/ui/views/overlay/overlay_window_image_button.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/video_overlay_window_views.cc",
-      "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
-    ]
-
-    deps += [
-      "//chrome/app/vector_icons",
-      "//components/vector_icons:vector_icons",
-      "//ui/views/controls/webview",
-    ]
-  }
-
   if (enable_electron_extensions) {
     sources += [
       "//chrome/browser/extensions/chrome_url_request_util.cc",
@@ -350,6 +328,36 @@ static_library("chrome") {
   }
 }
 
+if (is_mac) {
+  source_set("chrome_lib_arc") {
+    include_dirs = [ "." ]
+    sources = [
+      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
+      "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
+      "//chrome/browser/icon_loader_mac.mm",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.h",
+      "//chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm",
+      "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
+      "//chrome/browser/platform_util_mac.mm",
+      "//chrome/browser/process_singleton_mac.mm",
+      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
+      "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
+    ]
+
+    deps = [
+      "//base",
+      "//skia",
+      "//third_party/electron_node:node_lib",
+      "//third_party/webrtc_overrides:webrtc_component",
+      "//v8",
+    ]
+
+    configs += [ "//build/config/compiler:enable_arc" ]
+  }
+}
+
 source_set("plugins") {
   sources = []
   deps = []

default_app/.eslintrc.json

@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    "unicorn"
+  ],
+  "rules": {
+    "unicorn/prefer-node-protocol": "error"
+  }
+}

default_app/default_app.ts

@@ -1,7 +1,7 @@
 import { shell } from 'electron/common';
 import { app, dialog, BrowserWindow, ipcMain } from 'electron/main';
-import * as path from 'path';
-import * as url from 'url';
+import * as path from 'node:path';
+import * as url from 'node:url';
 
 let mainWindow: BrowserWindow | null = null;
 

default_app/main.ts

@@ -1,8 +1,8 @@
 import * as electron from 'electron/main';
 
-import * as fs from 'fs';
-import * as path from 'path';
-import * as url from 'url';
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as url from 'node:url';
 const { app, dialog } = electron;
 
 type DefaultAppOptions = {
@@ -15,7 +15,7 @@ type DefaultAppOptions = {
   modules: string[];
 }
 
-const Module = require('module');
+const Module = require('node:module');
 
 // Parse command line options.
 const argv = process.argv.slice(1);
@@ -112,7 +112,7 @@ function loadApplicationPackage (packagePath: string) {
       // Set v8 flags, deliberately lazy load so that apps that do not use this
       // feature do not pay the price
       if (packageJson.v8Flags) {
-        require('v8').setFlagsFromString(packageJson.v8Flags);
+        require('node:v8').setFlagsFromString(packageJson.v8Flags);
       }
       appPath = packagePath;
     }
@@ -171,7 +171,7 @@ function startRepl () {
     Using: Node.js ${nodeVersion} and Electron.js ${electronVersion}
   `);
 
-  const { REPLServer } = require('repl');
+  const { REPLServer } = require('node:repl');
   const repl = new REPLServer({
     prompt: '> '
   }).on('exit', () => {

docs/api/app.md

@@ -413,7 +413,18 @@ Returns:
 
 * `event` Event
 * `webContents` [WebContents](web-contents.md)
-* `details` [RenderProcessGoneDetails](structures/render-process-gone-details.md)
+* `details` Object
+  * `reason` string - The reason the render process is gone.  Possible values:
+    * `clean-exit` - Process exited with an exit code of zero
+    * `abnormal-exit` - Process exited with a non-zero exit code
+    * `killed` - Process was sent a SIGTERM or otherwise killed externally
+    * `crashed` - Process crashed
+    * `oom` - Process ran out of memory
+    * `launch-failed` - Process never successfully launched
+    * `integrity-failure` - Windows code integrity checks failed
+  * `exitCode` Integer - The exit code of the process, unless `reason` is
+    `launch-failed`, in which case `exitCode` will be a platform-specific
+    launch failure error code.
 
 Emitted when the renderer process unexpectedly disappears.  This is normally
 because it was crashed or killed.
@@ -1265,6 +1276,9 @@ On macOS, it shows on the dock icon. On Linux, it only works for Unity launcher.
 **Note:** Unity launcher requires a `.desktop` file to work. For more information,
 please read the [Unity integration documentation][unity-requirement].
 
+**Note:** On macOS, you need to ensure that your application has the permission
+to display notifications for this method to work.
+
 ### `app.getBadgeCount()` _Linux_ _macOS_
 
 Returns `Integer` - The current value displayed in the counter badge.
@@ -1424,7 +1438,7 @@ Start accessing a security scoped resource. With this method Electron applicatio
 
 ### `app.enableSandbox()`
 
-Enables full sandbox mode on the app. This means that all renderers will be launched sandboxed, regardless of the value of the `sandbox` flag in WebPreferences.
+Enables full sandbox mode on the app. This means that all renderers will be launched sandboxed, regardless of the value of the `sandbox` flag in [`WebPreferences`](structures/web-preferences.md).
 
 This method can only be called before app is ready.
 

docs/api/browser-view.md

@@ -33,7 +33,7 @@ app.whenReady().then(() => {
 ### `new BrowserView([options])` _Experimental_
 
 * `options` Object (optional)
-  * `webPreferences` Object (optional) - See [BrowserWindow](browser-window.md).
+  * `webPreferences` [WebPreferences](structures/web-preferences.md?inline) (optional) - Settings of web page's features.
 
 ### Instance Properties
 

docs/api/browser-window.md

@@ -152,297 +152,7 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
 
 ### `new BrowserWindow([options])`
 
-* `options` Object (optional)
-  * `width` Integer (optional) - Window's width in pixels. Default is `800`.
-  * `height` Integer (optional) - Window's height in pixels. Default is `600`.
-  * `x` Integer (optional) - (**required** if y is used) Window's left offset from screen.
-    Default is to center the window.
-  * `y` Integer (optional) - (**required** if x is used) Window's top offset from screen.
-    Default is to center the window.
-  * `useContentSize` boolean (optional) - The `width` and `height` would be used as web
-    page's size, which means the actual window's size will include window
-    frame's size and be slightly larger. Default is `false`.
-  * `center` boolean (optional) - Show window in the center of the screen. Default is `false`.
-  * `minWidth` Integer (optional) - Window's minimum width. Default is `0`.
-  * `minHeight` Integer (optional) - Window's minimum height. Default is `0`.
-  * `maxWidth` Integer (optional) - Window's maximum width. Default is no limit.
-  * `maxHeight` Integer (optional) - Window's maximum height. Default is no limit.
-  * `resizable` boolean (optional) - Whether window is resizable. Default is `true`.
-  * `movable` boolean (optional) _macOS_ _Windows_ - Whether window is
-    movable. This is not implemented on Linux. Default is `true`.
-  * `minimizable` boolean (optional) _macOS_ _Windows_ - Whether window is
-    minimizable. This is not implemented on Linux. Default is `true`.
-  * `maximizable` boolean (optional) _macOS_ _Windows_ - Whether window is
-    maximizable. This is not implemented on Linux. Default is `true`.
-  * `closable` boolean (optional) _macOS_ _Windows_ - Whether window is
-    closable. This is not implemented on Linux. Default is `true`.
-  * `focusable` boolean (optional) - Whether the window can be focused. Default is
-    `true`. On Windows setting `focusable: false` also implies setting
-    `skipTaskbar: true`. On Linux setting `focusable: false` makes the window
-    stop interacting with wm, so the window will always stay on top in all
-    workspaces.
-  * `alwaysOnTop` boolean (optional) - Whether the window should always stay on top of
-    other windows. Default is `false`.
-  * `fullscreen` boolean (optional) - Whether the window should show in fullscreen. When
-    explicitly set to `false` the fullscreen button will be hidden or disabled
-    on macOS. Default is `false`.
-  * `fullscreenable` boolean (optional) - Whether the window can be put into fullscreen
-    mode. On macOS, also whether the maximize/zoom button should toggle full
-    screen mode or maximize window. Default is `true`.
-  * `simpleFullscreen` boolean (optional) _macOS_ - Use pre-Lion fullscreen on
-    macOS. Default is `false`.
-  * `skipTaskbar` boolean (optional) _macOS_ _Windows_ - Whether to show the window in taskbar.
-    Default is `false`.
-  * `hiddenInMissionControl` boolean (optional) _macOS_ - Whether window should be hidden when the user toggles into mission control.
-  * `kiosk` boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
-  * `title` string (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
-  * `icon` ([NativeImage](native-image.md) | string) (optional) - The window icon. On Windows it is
-    recommended to use `ICO` icons to get best visual effects, you can also
-    leave it undefined so the executable's icon will be used.
-  * `show` boolean (optional) - Whether window should be shown when created. Default is
-    `true`.
-  * `paintWhenInitiallyHidden` boolean (optional) - Whether the renderer should be active when `show` is `false` and it has just been created.  In order for `document.visibilityState` to work correctly on first load with `show: false` you should set this to `false`.  Setting this to `false` will cause the `ready-to-show` event to not fire.  Default is `true`.
-  * `frame` boolean (optional) - Specify `false` to create a
-    [frameless window](../tutorial/window-customization.md#create-frameless-windows). Default is `true`.
-  * `parent` BrowserWindow (optional) - Specify parent window. Default is `null`.
-  * `modal` boolean (optional) - Whether this is a modal window. This only works when the
-    window is a child window. Default is `false`.
-  * `acceptFirstMouse` boolean (optional) _macOS_ - Whether clicking an
-    inactive window will also click through to the web contents. Default is
-    `false` on macOS. This option is not configurable on other platforms.
-  * `disableAutoHideCursor` boolean (optional) - Whether to hide cursor when typing.
-    Default is `false`.
-  * `autoHideMenuBar` boolean (optional) - Auto hide the menu bar unless the `Alt`
-    key is pressed. Default is `false`.
-  * `enableLargerThanScreen` boolean (optional) _macOS_ - Enable the window to
-    be resized larger than screen. Only relevant for macOS, as other OSes
-    allow larger-than-screen windows by default. Default is `false`.
-  * `backgroundColor` string (optional) - The window's background color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. Alpha in #AARRGGBB format is supported if `transparent` is set to `true`. Default is `#FFF` (white). See [win.setBackgroundColor](browser-window.md#winsetbackgroundcolorbackgroundcolor) for more information.
-  * `hasShadow` boolean (optional) - Whether window should have a shadow. Default is `true`.
-  * `opacity` number (optional) _macOS_ _Windows_ - Set the initial opacity of
-    the window, between 0.0 (fully transparent) and 1.0 (fully opaque). This
-    is only implemented on Windows and macOS.
-  * `darkTheme` boolean (optional) - Forces using dark theme for the window, only works on
-    some GTK+3 desktop environments. Default is `false`.
-  * `transparent` boolean (optional) - Makes the window [transparent](../tutorial/window-customization.md#create-transparent-windows).
-    Default is `false`. On Windows, does not work unless the window is frameless.
-  * `type` string (optional) - The type of window, default is normal window. See more about
-    this below.
-  * `visualEffectState` string (optional) _macOS_ - Specify how the material
-    appearance should reflect window activity state on macOS. Must be used
-    with the `vibrancy` property. Possible values are:
-    * `followWindow` - The backdrop should automatically appear active when the window is active, and inactive when it is not. This is the default.
-    * `active` - The backdrop should always appear active.
-    * `inactive` - The backdrop should always appear inactive.
-  * `titleBarStyle` string (optional) _macOS_ _Windows_ - The style of window title bar.
-    Default is `default`. Possible values are:
-    * `default` - Results in the standard title bar for macOS or Windows respectively.
-    * `hidden` - Results in a hidden title bar and a full size content window. On macOS, the window still has the standard window controls (“traffic lights”) in the top left. On Windows, when combined with `titleBarOverlay: true` it will activate the Window Controls Overlay (see `titleBarOverlay` for more information), otherwise no window controls will be shown.
-    * `hiddenInset` _macOS_ - Only on macOS, results in a hidden title bar
-      with an alternative look where the traffic light buttons are slightly
-      more inset from the window edge.
-    * `customButtonsOnHover` _macOS_ - Only on macOS, results in a hidden
-      title bar and a full size content window, the traffic light buttons will
-      display when being hovered over in the top left of the window.
-      **Note:** This option is currently experimental.
-  * `trafficLightPosition` [Point](structures/point.md) (optional) _macOS_ -
-    Set a custom position for the traffic light buttons in frameless windows.
-  * `roundedCorners` boolean (optional) _macOS_ - Whether frameless window
-    should have rounded corners on macOS. Default is `true`. Setting this property
-    to `false` will prevent the window from being fullscreenable.
-  * `fullscreenWindowTitle` boolean (optional) _macOS_ _Deprecated_ - Shows
-    the title in the title bar in full screen mode on macOS for `hiddenInset`
-    titleBarStyle. Default is `false`.
-  * `thickFrame` boolean (optional) - Use `WS_THICKFRAME` style for frameless windows on
-    Windows, which adds standard window frame. Setting it to `false` will remove
-    window shadow and window animations. Default is `true`.
-  * `vibrancy` string (optional) _macOS_ - Add a type of vibrancy effect to
-    the window, only on macOS. Can be `appearance-based`, `light`, `dark`,
-    `titlebar`, `selection`, `menu`, `popover`, `sidebar`, `medium-light`,
-    `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`,
-    `tooltip`, `content`, `under-window`, or `under-page`. Please note that
-    `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` are
-    deprecated and have been removed in macOS Catalina (10.15).
-  * `backgroundMaterial` string (optional) _Windows_ - Set the window's
-    system-drawn background material, including behind the non-client area.
-    Can be `auto`, `none`, `mica`, `acrylic` or `tabbed`. See [win.setBackgroundMaterial](#winsetbackgroundmaterialmaterial-windows) for more information.
-  * `zoomToPageWidth` boolean (optional) _macOS_ - Controls the behavior on
-    macOS when option-clicking the green stoplight button on the toolbar or by
-    clicking the Window > Zoom menu item. If `true`, the window will grow to
-    the preferred width of the web page when zoomed, `false` will cause it to
-    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. 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.
-  * `webPreferences` Object (optional) - Settings of web page's features.
-    * `devTools` boolean (optional) - Whether to enable DevTools. If it is set to `false`, can not use `BrowserWindow.webContents.openDevTools()` to open DevTools. Default is `true`.
-    * `nodeIntegration` boolean (optional) - Whether node integration is enabled.
-      Default is `false`.
-    * `nodeIntegrationInWorker` boolean (optional) - Whether node integration is
-      enabled in web workers. Default is `false`. More about this can be found
-      in [Multithreading](../tutorial/multithreading.md).
-    * `nodeIntegrationInSubFrames` boolean (optional) - Experimental option for
-      enabling Node.js support in sub-frames such as iframes and child windows. All your preloads will load for
-      every iframe, you can use `process.isMainFrame` to determine if you are
-      in the main frame or not.
-    * `preload` string (optional) - Specifies a script that will be loaded before other
-      scripts run in the page. This script will always have access to node APIs
-      no matter whether node integration is turned on or off. The value should
-      be the absolute file path to the script.
-      When node integration is turned off, the preload script can reintroduce
-      Node global symbols back to the global scope. See example
-      [here](context-bridge.md#exposing-node-global-symbols).
-    * `sandbox` boolean (optional) - If set, this will sandbox the renderer
-      associated with the window, making it compatible with the Chromium
-      OS-level sandbox and disabling the Node.js engine. This is not the same as
-      the `nodeIntegration` option and the APIs available to the preload script
-      are more limited. Read more about the option [here](../tutorial/sandbox.md).
-    * `session` [Session](session.md#class-session) (optional) - Sets the session used by the
-      page. Instead of passing the Session object directly, you can also choose to
-      use the `partition` option instead, which accepts a partition string. When
-      both `session` and `partition` are provided, `session` will be preferred.
-      Default is the default session.
-    * `partition` string (optional) - Sets the session used by the page according to the
-      session's partition string. If `partition` starts with `persist:`, the page
-      will use a persistent session available to all pages in the app with the
-      same `partition`. If there is no `persist:` prefix, the page will use an
-      in-memory session. By assigning the same `partition`, multiple pages can share
-      the same session. Default is the default session.
-    * `zoomFactor` number (optional) - The default zoom factor of the page, `3.0` represents
-      `300%`. Default is `1.0`.
-    * `javascript` boolean (optional) - Enables JavaScript support. Default is `true`.
-    * `webSecurity` boolean (optional) - When `false`, it will disable the
-      same-origin policy (usually using testing websites by people), and set
-      `allowRunningInsecureContent` to `true` if this options has not been set
-      by user. Default is `true`.
-    * `allowRunningInsecureContent` boolean (optional) - Allow an https page to run
-      JavaScript, CSS or plugins from http URLs. Default is `false`.
-    * `images` boolean (optional) - Enables image support. Default is `true`.
-    * `imageAnimationPolicy` string (optional) - Specifies how to run image animations (E.g. GIFs).  Can be `animate`, `animateOnce` or `noAnimation`.  Default is `animate`.
-    * `textAreasAreResizable` boolean (optional) - Make TextArea elements resizable. Default
-      is `true`.
-    * `webgl` boolean (optional) - Enables WebGL support. Default is `true`.
-    * `plugins` boolean (optional) - Whether plugins should be enabled. Default is `false`.
-    * `experimentalFeatures` boolean (optional) - Enables Chromium's experimental features.
-      Default is `false`.
-    * `scrollBounce` boolean (optional) _macOS_ - Enables scroll bounce
-      (rubber banding) effect on macOS. Default is `false`.
-    * `enableBlinkFeatures` string (optional) - A list of feature strings separated by `,`, like
-      `CSSVariables,KeyboardEventKey` to enable. The full list of supported feature
-      strings can be found in the [RuntimeEnabledFeatures.json5][runtime-enabled-features]
-      file.
-    * `disableBlinkFeatures` string (optional) - A list of feature strings separated by `,`,
-      like `CSSVariables,KeyboardEventKey` to disable. The full list of supported
-      feature strings can be found in the
-      [RuntimeEnabledFeatures.json5][runtime-enabled-features] file.
-    * `defaultFontFamily` Object (optional) - Sets the default font for the font-family.
-      * `standard` string (optional) - Defaults to `Times New Roman`.
-      * `serif` string (optional) - Defaults to `Times New Roman`.
-      * `sansSerif` string (optional) - Defaults to `Arial`.
-      * `monospace` string (optional) - Defaults to `Courier New`.
-      * `cursive` string (optional) - Defaults to `Script`.
-      * `fantasy` string (optional) - Defaults to `Impact`.
-    * `defaultFontSize` Integer (optional) - Defaults to `16`.
-    * `defaultMonospaceFontSize` Integer (optional) - Defaults to `13`.
-    * `minimumFontSize` Integer (optional) - Defaults to `0`.
-    * `defaultEncoding` string (optional) - Defaults to `ISO-8859-1`.
-    * `backgroundThrottling` boolean (optional) - Whether to throttle animations and timers
-      when the page becomes background. This also affects the
-      [Page Visibility API](#page-visibility). Defaults to `true`.
-    * `offscreen` boolean (optional) - Whether to enable offscreen rendering for the browser
-      window. Defaults to `false`. See the
-      [offscreen rendering tutorial](../tutorial/offscreen-rendering.md) for
-      more details.
-    * `contextIsolation` boolean (optional) - Whether to run Electron APIs and
-      the specified `preload` script in a separate JavaScript context. Defaults
-      to `true`. The context that the `preload` script runs in will only have
-      access to its own dedicated `document` and `window` globals, as well as
-      its own set of JavaScript builtins (`Array`, `Object`, `JSON`, etc.),
-      which are all invisible to the loaded content. The Electron API will only
-      be available in the `preload` script and not the loaded page. This option
-      should be used when loading potentially untrusted remote content to ensure
-      the loaded content cannot tamper with the `preload` script and any
-      Electron APIs being used.  This option uses the same technique used by
-      [Chrome Content Scripts][chrome-content-scripts].  You can access this
-      context in the dev tools by selecting the 'Electron Isolated Context'
-      entry in the combo box at the top of the Console tab.
-    * `webviewTag` boolean (optional) - Whether to enable the [`<webview>` tag](webview-tag.md).
-      Defaults to `false`. **Note:** The
-      `preload` script configured for the `<webview>` will have node integration
-      enabled when it is executed so you should ensure remote/untrusted content
-      is not able to create a `<webview>` tag with a possibly malicious `preload`
-      script. You can use the `will-attach-webview` event on [webContents](web-contents.md)
-      to strip away the `preload` script and to validate or alter the
-      `<webview>`'s initial settings.
-    * `additionalArguments` string[] (optional) - A list of strings that will be appended
-      to `process.argv` in the renderer process of this app.  Useful for passing small
-      bits of data down to renderer process preload scripts.
-    * `safeDialogs` boolean (optional) - Whether to enable browser style
-      consecutive dialog protection. Default is `false`.
-    * `safeDialogsMessage` string (optional) - The message to display when
-      consecutive dialog protection is triggered. If not defined the default
-      message would be used, note that currently the default message is in
-      English and not localized.
-    * `disableDialogs` boolean (optional) - Whether to disable dialogs
-      completely. Overrides `safeDialogs`. Default is `false`.
-    * `navigateOnDragDrop` boolean (optional) - Whether dragging and dropping a
-      file or link onto the page causes a navigation. Default is `false`.
-    * `autoplayPolicy` string (optional) - Autoplay policy to apply to
-      content in the window, can be `no-user-gesture-required`,
-      `user-gesture-required`, `document-user-activation-required`. Defaults to
-      `no-user-gesture-required`.
-    * `disableHtmlFullscreenWindowResize` boolean (optional) - Whether to
-      prevent the window from resizing when entering HTML Fullscreen. Default
-      is `false`.
-    * `accessibleTitle` string (optional) - An alternative title string provided only
-      to accessibility tools such as screen readers. This string is not directly
-      visible to users.
-    * `spellcheck` boolean (optional) - Whether to enable the builtin spellchecker.
-      Default is `true`.
-    * `enableWebSQL` boolean (optional) - Whether to enable the [WebSQL api](https://www.w3.org/TR/webdatabase/).
-      Default is `true`.
-    * `v8CacheOptions` string (optional) - Enforces the v8 code caching policy
-      used by blink. Accepted values are
-      * `none` - Disables code caching
-      * `code` - Heuristic based code caching
-      * `bypassHeatCheck` - Bypass code caching heuristics but with lazy compilation
-      * `bypassHeatCheckAndEagerCompile` - Same as above except compilation is eager.
-      Default policy is `code`.
-    * `enablePreferredSizeMode` boolean (optional) - Whether to enable
-      preferred size mode. The preferred size is the minimum size needed to
-      contain the layout of the document—without requiring scrolling. Enabling
-      this will cause the `preferred-size-changed` event to be emitted on the
-      `WebContents` when the preferred size changes. Default is `false`.
-  * `titleBarOverlay` Object | Boolean (optional) -  When using a frameless window in conjunction with `win.setWindowButtonVisibility(true)` on macOS or using a `titleBarStyle` so that the standard window controls ("traffic lights" on macOS) are visible, this property enables the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.
-    * `color` String (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled. Default is the system color.
-    * `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.
-    * `height` Integer (optional) _macOS_ _Windows_ - The height of the title bar and Window Controls Overlay in pixels. Default is system height.
-
-When setting minimum or maximum window size with `minWidth`/`maxWidth`/
-`minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
-passing a size that does not follow size constraints to `setBounds`/`setSize` or
-to the constructor of `BrowserWindow`.
-
-The possible values and behaviors of the `type` option are platform dependent.
-Possible values are:
-
-* On Linux, possible types are `desktop`, `dock`, `toolbar`, `splash`,
-  `notification`.
-* On macOS, possible types are `desktop`, `textured`, `panel`.
-  * The `textured` type adds metal gradient appearance
-    (`NSWindowStyleMaskTexturedBackground`).
-  * The `desktop` type places the window at the desktop background window level
-    (`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
-    focus, keyboard or mouse events, but you can use `globalShortcut` to receive
-    input sparingly.
-  * The `panel` type enables the window to float on top of full-screened apps
-    by adding the `NSWindowStyleMaskNonactivatingPanel` style mask,normally
-    reserved for NSPanel, at runtime. Also, the window will appear on all
-    spaces (desktops).
-* On Windows, possible type is `toolbar`.
+* `options` [BrowserWindowConstructorOptions](structures/browser-window-options.md?inline) (optional)
 
 ### Instance Events
 
@@ -1110,14 +820,10 @@ win.setBounds({ width: 100 })
 console.log(win.getBounds())
 ```
 
-**Note:** On macOS, the y-coordinate value cannot be smaller than the [Tray](tray.md) height. The tray height has changed over time and depends on the operating system, but is between 20-40px. Passing a value lower than the tray height will result in a window that is flush to the tray.
-
 #### `win.getBounds()`
 
 Returns [`Rectangle`](structures/rectangle.md) - The `bounds` of the window as `Object`.
 
-**Note:** On macOS, the y-coordinate value returned will be at minimum the [Tray](tray.md) height. For example, calling `win.setBounds({ x: 25, y: 20, width: 800, height: 600 })` with a tray height of 38 means that `win.getBounds()` will return `{ x: 25, y: 38, width: 800, height: 600 }`.
-
 #### `win.getBackgroundColor()`
 
 Returns `string` - Gets the background color of the window in Hex (`#RRGGBB`) format.
@@ -1848,16 +1554,12 @@ Adds a window as a tab on this window, after the tab for the window instance.
 
 #### `win.setVibrancy(type)` _macOS_
 
-* `type` string | null - Can be `appearance-based`, `light`, `dark`, `titlebar`,
-  `selection`, `menu`, `popover`, `sidebar`, `medium-light`, `ultra-dark`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`, `tooltip`, `content`, `under-window`, or `under-page`. See
+* `type` string | null - Can be `titlebar`, `selection`, `menu`, `popover`, `sidebar`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`, `tooltip`, `content`, `under-window`, or `under-page`. See
   the [macOS documentation][vibrancy-docs] for more details.
 
 Adds a vibrancy effect to the browser window. Passing `null` or an empty string
 will remove the vibrancy effect on the window.
 
-Note that `appearance-based`, `light`, `dark`, `medium-light`, and `ultra-dark` have been
-deprecated and will be removed in an upcoming version of macOS.
-
 #### `win.setBackgroundMaterial(material)` _Windows_
 
 * `material` string
@@ -1961,12 +1663,8 @@ removed in future Electron releases.
 On a Window with Window Controls Overlay already enabled, this method updates
 the style of the title bar overlay.
 
-[runtime-enabled-features]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/runtime_enabled_features.json5
 [page-visibility-api]: https://developer.mozilla.org/en-US/docs/Web/API/Page_Visibility_API
 [quick-look]: https://en.wikipedia.org/wiki/Quick_Look
 [vibrancy-docs]: https://developer.apple.com/documentation/appkit/nsvisualeffectview?preferredLanguage=objc
 [window-levels]: https://developer.apple.com/documentation/appkit/nswindow/level
-[chrome-content-scripts]: https://developer.chrome.com/extensions/content_scripts#execution-environment
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
-[overlay-javascript-apis]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#javascript-apis
-[overlay-css-env-vars]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#css-environment-variables

docs/api/command-line-switches.md

@@ -116,20 +116,14 @@ Ignore the connections limit for `domains` list separated by `,`.
 
 ### --js-flags=`flags`
 
-Specifies the flags passed to the [V8 engine](https://v8.dev). In order to enable the `flags` in the main process,
-this switch must be passed on startup.
+Specifies the flags passed to the Node.js engine. It has to be passed when starting
+Electron if you want to enable the `flags` in the main process.
 
 ```sh
 $ electron --js-flags="--harmony_proxies --harmony_collections" your-app
 ```
 
-Run `node --v8-options` or `electron --js-flags="--help"` in your terminal for the list of available flags.  These can be used to enable early-stage JavaScript features, or log and manipulate garbage collection, among other things.
-
-For example, to trace V8 optimization and deoptimization:
-
-```sh
-$ electron --js-flags="--trace-opt --trace-deopt" your-app
-```
+See the [Node.js documentation][node-cli] or run `node --help` in your terminal for a list of available flags. Additionally, run `node --v8-options` to see a list of flags that specifically refer to Node.js's V8 JavaScript engine.
 
 ### --lang
 
@@ -247,25 +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-brk-node[=[host:]port]`
-
-Activate inspector on `host:port` and break at start of the first internal
-JavaScript script executed when the inspector is available.
-Default `host:port` is `127.0.0.1:9229`.
-
-### `--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`.
 
@@ -275,37 +263,12 @@ See the [Debugging the Main Process][debugging-main-process] guide for more deta
 
 Aliased to `--debug[=[host:]port`.
 
-### `--inspect-publish-uid=stderr,http`
+### --inspect-publish-uid=stderr,http
 
 Specify ways of the inspector web socket url exposure.
 
 By default inspector websocket url is available in stderr and under /json/list endpoint on http://host:port/json/list.
 
-### `--no-deprecation`
-
-Silence deprecation warnings.
-
-### `--throw-deprecation`
-
-Throw errors for deprecations.
-
-### `--trace-deprecation`
-
-Print stack traces for deprecations.
-
-### `--trace-warnings`
-
-Print stack traces for process warnings (including deprecations).
-
-### `--dns-result-order=order`
-
-Set the default value of the `verbatim` parameter in the Node.js [`dns.lookup()`](https://nodejs.org/api/dns.html#dnslookuphostname-options-callback) and [`dnsPromises.lookup()`](https://nodejs.org/api/dns.html#dnspromiseslookuphostname-options) functions. The value could be:
-
-* `ipv4first`: sets default `verbatim` `false`.
-* `verbatim`: sets default `verbatim` `true`.
-
-The default is `verbatim` and `dns.setDefaultResultOrder()` have higher priority than `--dns-result-order`.
-
 [app]: app.md
 [append-switch]: command-line.md#commandlineappendswitchswitch-value
 [debugging-main-process]: ../tutorial/debugging-main-process.md

docs/api/extensions.md

@@ -91,9 +91,8 @@ The following events of `chrome.runtime` are supported:
 
 ### `chrome.storage`
 
-The following methods of `chrome.storage` are supported:
-
-- `chrome.storage.local`
+Only `chrome.storage.local` is supported; `chrome.storage.sync` and
+`chrome.storage.managed` are not.
 
 ### `chrome.tabs`
 
@@ -102,8 +101,6 @@ The following methods of `chrome.tabs` are supported:
 - `chrome.tabs.sendMessage`
 - `chrome.tabs.reload`
 - `chrome.tabs.executeScript`
-- `chrome.tabs.query` (partial support)
-  - supported properties: `url`, `title`, `audible`, `active`, `muted`.
 - `chrome.tabs.update` (partial support)
   - supported properties: `url`, `muted`.
 
@@ -120,9 +117,6 @@ The following methods of `chrome.management` are supported:
 - `chrome.management.getSelf`
 - `chrome.management.getPermissionWarningsById`
 - `chrome.management.getPermissionWarningsByManifest`
-
-The following events of `chrome.management` are supported:
-
 - `chrome.management.onEnabled`
 - `chrome.management.onDisabled`
 

docs/api/ipc-main.md

@@ -72,7 +72,7 @@ Removes listeners of the specified `channel`.
 ### `ipcMain.handle(channel, listener)`
 
 * `channel` string
-* `listener` Function<Promise\<any&#62; | any&#62;
+* `listener` Function<Promise\<void&#62; | any&#62;
   * `event` [IpcMainInvokeEvent][ipc-main-invoke-event]
   * `...args` any[]
 
@@ -109,8 +109,8 @@ provided to the renderer process. Please refer to
 ### `ipcMain.handleOnce(channel, listener)`
 
 * `channel` string
-* `listener` Function<Promise\<any&#62; | any&#62;
-  * `event` [IpcMainInvokeEvent][ipc-main-invoke-event]
+* `listener` Function<Promise\<void&#62; | any&#62;
+  * `event` IpcMainInvokeEvent
   * `...args` any[]
 
 Handles a single `invoke`able IPC message, then removes the listener. See
@@ -122,6 +122,17 @@ Handles a single `invoke`able IPC message, then removes the listener. See
 
 Removes any handler for `channel`, if present.
 
+## IpcMainEvent object
+
+The documentation for the `event` object passed to the `callback` can be found
+in the [`ipc-main-event`][ipc-main-event] structure docs.
+
+## IpcMainInvokeEvent object
+
+The documentation for the `event` object passed to `handle` callbacks can be
+found in the [`ipc-main-invoke-event`][ipc-main-invoke-event]
+structure docs.
+
 [IPC tutorial]: ../tutorial/ipc.md
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [web-contents-send]: ../api/web-contents.md#contentssendchannel-args

docs/api/ipc-renderer.md

@@ -26,7 +26,7 @@ The `ipcRenderer` module has the following method to listen for events and send
 
 * `channel` string
 * `listener` Function
-  * `event` [IpcRendererEvent][ipc-renderer-event]
+  * `event` IpcRendererEvent
   * `...args` any[]
 
 Listens to `channel`, when a new message arrives `listener` would be called with
@@ -36,7 +36,7 @@ Listens to `channel`, when a new message arrives `listener` would be called with
 
 * `channel` string
 * `listener` Function
-  * `event` [IpcRendererEvent][ipc-renderer-event]
+  * `event` IpcRendererEvent
   * `...args` any[]
 
 Adds a one time `listener` function for the event. This `listener` is invoked
@@ -208,8 +208,12 @@ Sends a message to a window with `webContentsId` via `channel`.
 Like `ipcRenderer.send` but the event will be sent to the `<webview>` element in
 the host page instead of the main process.
 
+## Event object
+
+The documentation for the `event` object passed to the `callback` can be found
+in the [`ipc-renderer-event`](./structures/ipc-renderer-event.md) structure docs.
+
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [SCA]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
 [`window.postMessage`]: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage
 [`MessagePort`]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
-[ipc-renderer-event]: ./structures/ipc-renderer-event.md

docs/api/menu.md

@@ -80,6 +80,10 @@ The `menu` object has the following instance methods:
   * `positioningItem` number (optional) _macOS_ - The index of the menu item to
     be positioned under the mouse cursor at the specified coordinates. Default
     is -1.
+  * `sourceType` string (optional) _Windows_ _Linux_ - This should map to the `menuSourceType`
+    provided by the `context-menu` event. It is not recommended to set this value manually,
+    only provide values you receive from other APIs or leave it `undefined`.
+    Can be `none`, `mouse`, `keyboard`, `touch`, `touchMenu`, `longPress`, `longTap`, `touchHandle`, `stylus`, `adjustSelection`, or `adjustSelectionReset`.
   * `callback` Function (optional) - Called when menu is closed.
 
 Pops up this menu as a context menu in the [`BrowserWindow`](browser-window.md).

docs/api/power-save-blocker.md

@@ -49,8 +49,6 @@ is used.
 
 Stops the specified power save blocker.
 
-Returns `boolean` - Whether the specified `powerSaveBlocker` has been stopped.
-
 ### `powerSaveBlocker.isStarted(id)`
 
 * `id` Integer - The power save blocker id returned by `powerSaveBlocker.start`.

docs/api/safe-storage.md

@@ -38,31 +38,3 @@ Returns `string` - the decrypted string. Decrypts the encrypted buffer
 obtained  with `safeStorage.encryptString` back into a string.
 
 This function will throw an error if decryption fails.
-
-### `safeStorage.setUsePlainTextEncryption(usePlainText)`
-
-* `usePlainText` boolean
-
-This function on Linux will force the module to use an in memory password for creating
-symmetric key that is used for encrypt/decrypt functions when a valid OS password
-manager cannot be determined for the current active desktop environment. This function
-is a no-op on Windows and MacOS.
-
-### `safeStorage.getSelectedStorageBackend()` _Linux_
-
-Returns `string` - User friendly name of the password manager selected on Linux.
-
-This function will return one of the following values:
-
-* `basic_text` - When the desktop environment is not recognised or if the following
-command line flag is provided `--password-store="basic"`.
-* `gnome_any` - When the desktop environment is `X-Cinnamon`, `Deepin`, `GNOME`, `Pantheon`, `XFCE`, `UKUI`, `unity` or if the following command line flag is provided `--password-store="gnome"`. When this value is present the application
-will first try to use `libsecret` backend and if it fails will attempt to use `libgnome_keyring`.
-* `gnome_libsecret` - When the following command line flag is provided `--password-store="gnome-libsecret"`.
-* `gnome_keyring` - When the following command line flag is provided `--password-store="gnome-keyring"`.
-* `kwallet` - When the desktop session is `kde4` or if the following command line flag
-is provided `--password-store="kwallet"`.
-* `kwallet5` - When the desktop session is `kde5` or if the following command line flag
-is provided `--password-store="kwallet5"`.
-* `kwallet6` - When the desktop session is `kde6`.
-* `unknown` - When the function is called before app has emitted the `ready` event.

docs/api/session.md

@@ -891,19 +891,18 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
   * `permission` string - The type of requested permission.
     * `clipboard-read` - Request access to read from the clipboard.
     * `clipboard-sanitized-write` - Request access to write to the clipboard.
-    * `display-capture` - Request access to capture the screen via the [Screen Capture API](https://developer.mozilla.org/en-US/docs/Web/API/Screen_Capture_API).
-    * `fullscreen` - Request control of the app's fullscreen state via the [Fullscreen API](https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API).
-    * `geolocation` - Request access to the user's location via the [Geolocation API](https://developer.mozilla.org/en-US/docs/Web/API/Geolocation_API)
-    * `idle-detection` - Request access to the user's idle state via the [IdleDetector API](https://developer.mozilla.org/en-US/docs/Web/API/IdleDetector).
     * `media` -  Request access to media devices such as camera, microphone and speakers.
+    * `display-capture` - Request access to capture the screen.
     * `mediaKeySystem` - Request access to DRM protected content.
-    * `midi` - Request MIDI access in the [Web MIDI API](https://developer.mozilla.org/en-US/docs/Web/API/Web_MIDI_API).
-    * `midiSysex` - Request the use of system exclusive messages in the [Web MIDI API](https://developer.mozilla.org/en-US/docs/Web/API/Web_MIDI_API).
-    * `notifications` - Request notification creation and the ability to display them in the user's system tray using the [Notifications API](https://developer.mozilla.org/en-US/docs/Web/API/notification)
-    * `pointerLock` - Request to directly interpret mouse movements as an input method via the [Pointer Lock API](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API). These requests always appear to originate from the main frame.
+    * `geolocation` - Request access to user's current location.
+    * `notifications` - Request notification creation and the ability to display them in the user's system tray.
+    * `midi` - Request MIDI access in the `webmidi` API.
+    * `midiSysex` - Request the use of system exclusive messages in the `webmidi` API.
+    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more. 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.
-    * `unknown` - An unrecognized permission request.
+    * `unknown` - An unrecognized permission request
   * `callback` Function
     * `permissionGranted` boolean - Allow or deny the permission.
   * `details` Object - Some properties are only available on certain permission types.
@@ -935,22 +934,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.
-    * `clipboard-read` - Request access to read from the clipboard.
-    * `clipboard-sanitized-write` - Request access to write to the clipboard.
-    * `geolocation` - Access the user's geolocation data via the [Geolocation API](https://developer.mozilla.org/en-US/docs/Web/API/Geolocation_API)
-    * `fullscreen` - Control of the app's fullscreen state via the [Fullscreen API](https://developer.mozilla.org/en-US/docs/Web/API/Fullscreen_API).
-    * `hid` - Access the HID protocol to manipulate HID devices via the [WebHID API](https://developer.mozilla.org/en-US/docs/Web/API/WebHID_API).
-    * `idle-detection` - Access the user's idle state via the [IdleDetector API](https://developer.mozilla.org/en-US/docs/Web/API/IdleDetector).
-    * `media` - Access to media devices such as camera, microphone and speakers.
-    * `mediaKeySystem` - Access to DRM protected content.
-    * `midi` - Enable MIDI access in the [Web MIDI API](https://developer.mozilla.org/en-US/docs/Web/API/Web_MIDI_API).
-    * `midiSysex` - Use system exclusive messages in the [Web MIDI API](https://developer.mozilla.org/en-US/docs/Web/API/Web_MIDI_API).
-    * `notifications` - Configure and display desktop notifications to the user with the [Notifications API](https://developer.mozilla.org/en-US/docs/Web/API/notification).
-    * `openExternal` - Open links in external applications.
-    * `pointerLock` - Directly interpret mouse movements as an input method via the [Pointer Lock API](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API). These requests always appear to originate from the main frame.
-    * `serial` - Read from and write to serial devices with the [Web Serial API](https://developer.mozilla.org/en-US/docs/Web/API/Web_Serial_API).
-    * `usb` - Expose non-standard Universal Serial Bus (USB) compatible devices services to the web with the [WebUSB API](https://developer.mozilla.org/en-US/docs/Web/API/WebUSB_API).
+  * `permission` string - Type of permission check.  Valid values are `midiSysex`, `notifications`, `geolocation`, `media`,`mediaKeySystem`,`midi`, `pointerLock`, `fullscreen`, `openExternal`, `hid`, `serial`, or `usb`.
   * `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.
@@ -1311,7 +1295,7 @@ The API will generate a [DownloadItem](download-item.md) that can be accessed
 with the [will-download](#event-will-download) event.
 
 **Note:** This does not perform any security checks that relate to a page's origin,
-unlike [`webContents.downloadURL`](web-contents.md#contentsdownloadurlurl-options).
+unlike [`webContents.downloadURL`](web-contents.md#contentsdownloadurlurl).
 
 #### `ses.createInterruptedDownload(options)`
 
@@ -1459,7 +1443,7 @@ extension to be loaded.
 const { app, session } = require('electron')
 const path = require('path')
 
-app.on('ready', async () => {
+app.whenReady().then(async () => {
   await session.defaultSession.loadExtension(
     path.join(__dirname, 'react-devtools'),
     // allowFileAccess is required to load the devtools extension on file:// URLs.

docs/api/structures/browser-window-options.md

@@ -0,0 +1,154 @@
+# BrowserWindowConstructorOptions Object
+
+* `width` Integer (optional) - Window's width in pixels. Default is `800`.
+* `height` Integer (optional) - Window's height in pixels. Default is `600`.
+* `x` Integer (optional) - (**required** if y is used) Window's left offset from screen.
+  Default is to center the window.
+* `y` Integer (optional) - (**required** if x is used) Window's top offset from screen.
+  Default is to center the window.
+* `useContentSize` boolean (optional) - The `width` and `height` would be used as web
+  page's size, which means the actual window's size will include window
+  frame's size and be slightly larger. Default is `false`.
+* `center` boolean (optional) - Show window in the center of the screen. Default is `false`.
+* `minWidth` Integer (optional) - Window's minimum width. Default is `0`.
+* `minHeight` Integer (optional) - Window's minimum height. Default is `0`.
+* `maxWidth` Integer (optional) - Window's maximum width. Default is no limit.
+* `maxHeight` Integer (optional) - Window's maximum height. Default is no limit.
+* `resizable` boolean (optional) - Whether window is resizable. Default is `true`.
+* `movable` boolean (optional) _macOS_ _Windows_ - Whether window is
+  movable. This is not implemented on Linux. Default is `true`.
+* `minimizable` boolean (optional) _macOS_ _Windows_ - Whether window is
+  minimizable. This is not implemented on Linux. Default is `true`.
+* `maximizable` boolean (optional) _macOS_ _Windows_ - Whether window is
+  maximizable. This is not implemented on Linux. Default is `true`.
+* `closable` boolean (optional) _macOS_ _Windows_ - Whether window is
+  closable. This is not implemented on Linux. Default is `true`.
+* `focusable` boolean (optional) - Whether the window can be focused. Default is
+  `true`. On Windows setting `focusable: false` also implies setting
+  `skipTaskbar: true`. On Linux setting `focusable: false` makes the window
+  stop interacting with wm, so the window will always stay on top in all
+  workspaces.
+* `alwaysOnTop` boolean (optional) - Whether the window should always stay on top of
+  other windows. Default is `false`.
+* `fullscreen` boolean (optional) - Whether the window should show in fullscreen. When
+  explicitly set to `false` the fullscreen button will be hidden or disabled
+  on macOS. Default is `false`.
+* `fullscreenable` boolean (optional) - Whether the window can be put into fullscreen
+  mode. On macOS, also whether the maximize/zoom button should toggle full
+  screen mode or maximize window. Default is `true`.
+* `simpleFullscreen` boolean (optional) _macOS_ - Use pre-Lion fullscreen on
+  macOS. Default is `false`.
+* `skipTaskbar` boolean (optional) _macOS_ _Windows_ - Whether to show the window in taskbar.
+  Default is `false`.
+* `hiddenInMissionControl` boolean (optional) _macOS_ - Whether window should be hidden when the user toggles into mission control.
+* `kiosk` boolean (optional) - Whether the window is in kiosk mode. Default is `false`.
+* `title` string (optional) - Default window title. Default is `"Electron"`. If the HTML tag `<title>` is defined in the HTML file loaded by `loadURL()`, this property will be ignored.
+* `icon` ([NativeImage](../native-image.md) | string) (optional) - The window icon. On Windows it is
+  recommended to use `ICO` icons to get best visual effects, you can also
+  leave it undefined so the executable's icon will be used.
+* `show` boolean (optional) - Whether window should be shown when created. Default is
+  `true`.
+* `paintWhenInitiallyHidden` boolean (optional) - Whether the renderer should be active when `show` is `false` and it has just been created.  In order for `document.visibilityState` to work correctly on first load with `show: false` you should set this to `false`.  Setting this to `false` will cause the `ready-to-show` event to not fire.  Default is `true`.
+* `frame` boolean (optional) - Specify `false` to create a
+  [frameless window](../../tutorial/window-customization.md#create-frameless-windows). Default is `true`.
+* `parent` BrowserWindow (optional) - Specify parent window. Default is `null`.
+* `modal` boolean (optional) - Whether this is a modal window. This only works when the
+  window is a child window. Default is `false`.
+* `acceptFirstMouse` boolean (optional) _macOS_ - Whether clicking an
+  inactive window will also click through to the web contents. Default is
+  `false` on macOS. This option is not configurable on other platforms.
+* `disableAutoHideCursor` boolean (optional) - Whether to hide cursor when typing.
+  Default is `false`.
+* `autoHideMenuBar` boolean (optional) - Auto hide the menu bar unless the `Alt`
+  key is pressed. Default is `false`.
+* `enableLargerThanScreen` boolean (optional) _macOS_ - Enable the window to
+  be resized larger than screen. Only relevant for macOS, as other OSes
+  allow larger-than-screen windows by default. Default is `false`.
+* `backgroundColor` string (optional) - The window's background color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. Alpha in #AARRGGBB format is supported if `transparent` is set to `true`. Default is `#FFF` (white). See [win.setBackgroundColor](../browser-window.md#winsetbackgroundcolorbackgroundcolor) for more information.
+* `hasShadow` boolean (optional) - Whether window should have a shadow. Default is `true`.
+* `opacity` number (optional) _macOS_ _Windows_ - Set the initial opacity of
+  the window, between 0.0 (fully transparent) and 1.0 (fully opaque). This
+  is only implemented on Windows and macOS.
+* `darkTheme` boolean (optional) - Forces using dark theme for the window, only works on
+  some GTK+3 desktop environments. Default is `false`.
+* `transparent` boolean (optional) - Makes the window [transparent](../../tutorial/window-customization.md#create-transparent-windows).
+  Default is `false`. On Windows, does not work unless the window is frameless.
+* `type` string (optional) - The type of window, default is normal window. See more about
+  this below.
+* `visualEffectState` string (optional) _macOS_ - Specify how the material
+  appearance should reflect window activity state on macOS. Must be used
+  with the `vibrancy` property. Possible values are:
+  * `followWindow` - The backdrop should automatically appear active when the window is active, and inactive when it is not. This is the default.
+  * `active` - The backdrop should always appear active.
+  * `inactive` - The backdrop should always appear inactive.
+* `titleBarStyle` string (optional) _macOS_ _Windows_ - The style of window title bar.
+  Default is `default`. Possible values are:
+  * `default` - Results in the standard title bar for macOS or Windows respectively.
+  * `hidden` - Results in a hidden title bar and a full size content window. On macOS, the window still has the standard window controls (“traffic lights”) in the top left. On Windows, when combined with `titleBarOverlay: true` it will activate the Window Controls Overlay (see `titleBarOverlay` for more information), otherwise no window controls will be shown.
+  * `hiddenInset` _macOS_ - Only on macOS, results in a hidden title bar
+    with an alternative look where the traffic light buttons are slightly
+    more inset from the window edge.
+  * `customButtonsOnHover` _macOS_ - Only on macOS, results in a hidden
+    title bar and a full size content window, the traffic light buttons will
+    display when being hovered over in the top left of the window.
+    **Note:** This option is currently experimental.
+* `trafficLightPosition` [Point](point.md) (optional) _macOS_ -
+  Set a custom position for the traffic light buttons in frameless windows.
+* `roundedCorners` boolean (optional) _macOS_ - Whether frameless window
+  should have rounded corners on macOS. Default is `true`. Setting this property
+  to `false` will prevent the window from being fullscreenable.
+* `fullscreenWindowTitle` boolean (optional) _macOS_ _Deprecated_ - Shows
+  the title in the title bar in full screen mode on macOS for `hiddenInset`
+  titleBarStyle. Default is `false`.
+* `thickFrame` boolean (optional) - Use `WS_THICKFRAME` style for frameless windows on
+  Windows, which adds standard window frame. Setting it to `false` will remove
+  window shadow and window animations. Default is `true`.
+* `vibrancy` string (optional) _macOS_ - Add a type of vibrancy effect to
+  the window, only on macOS. Can be `appearance-based`, `titlebar`, `selection`,
+  `menu`, `popover`, `sidebar`, `header`, `sheet`, `window`, `hud`, `fullscreen-ui`,
+  `tooltip`, `content`, `under-window`, or `under-page`.
+* `backgroundMaterial` string (optional) _Windows_ - Set the window's
+  system-drawn background material, including behind the non-client area.
+  Can be `auto`, `none`, `mica`, `acrylic` or `tabbed`. See [win.setBackgroundMaterial](../browser-window.md#winsetbackgroundmaterialmaterial-windows) for more information.
+* `zoomToPageWidth` boolean (optional) _macOS_ - Controls the behavior on
+  macOS when option-clicking the green stoplight button on the toolbar or by
+  clicking the Window > Zoom menu item. If `true`, the window will grow to
+  the preferred width of the web page when zoomed, `false` will cause it to
+  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. 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.
+* `webPreferences` [WebPreferences](web-preferences.md?inline) (optional) - Settings of web page's features.
+* `titleBarOverlay` Object | Boolean (optional) -  When using a frameless window in conjunction with `win.setWindowButtonVisibility(true)` on macOS or using a `titleBarStyle` so that the standard window controls ("traffic lights" on macOS) are visible, this property enables the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.
+  * `color` String (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled. Default is the system color.
+  * `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.
+  * `height` Integer (optional) _macOS_ _Windows_ - The height of the title bar and Window Controls Overlay in pixels. Default is system height.
+
+When setting minimum or maximum window size with `minWidth`/`maxWidth`/
+`minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
+passing a size that does not follow size constraints to `setBounds`/`setSize` or
+to the constructor of `BrowserWindow`.
+
+The possible values and behaviors of the `type` option are platform dependent.
+Possible values are:
+
+* On Linux, possible types are `desktop`, `dock`, `toolbar`, `splash`,
+  `notification`.
+* On macOS, possible types are `desktop`, `textured`, `panel`.
+  * The `textured` type adds metal gradient appearance
+    (`NSWindowStyleMaskTexturedBackground`).
+  * The `desktop` type places the window at the desktop background window level
+    (`kCGDesktopWindowLevel - 1`). Note that desktop window will not receive
+    focus, keyboard or mouse events, but you can use `globalShortcut` to receive
+    input sparingly.
+  * The `panel` type enables the window to float on top of full-screened apps
+    by adding the `NSWindowStyleMaskNonactivatingPanel` style mask,normally
+    reserved for NSPanel, at runtime. Also, the window will appear on all
+    spaces (desktops).
+* On Windows, possible type is `toolbar`.
+
+[overlay-css-env-vars]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#css-environment-variables
+[overlay-javascript-apis]: https://github.com/WICG/window-controls-overlay/blob/main/explainer.md#javascript-apis

docs/api/structures/ipc-renderer-event.md

@@ -2,7 +2,6 @@
 
 * `sender` [IpcRenderer](../ipc-renderer.md) - The `IpcRenderer` instance that emitted the event originally
 * `senderId` Integer - The `webContents.id` that sent the message, you can call `event.sender.sendTo(event.senderId, ...)` to reply to the message, see [ipcRenderer.sendTo][ipc-renderer-sendto] for more information. This only applies to messages sent from a different renderer. Messages sent directly from the main process set `event.senderId` to `0`.
-* `senderIsMainFrame` boolean (optional) - Whether the message sent via [ipcRenderer.sendTo][ipc-renderer-sendto] was sent by the main frame. This is relevant when `nodeIntegrationInSubFrames` is enabled in the originating `webContents`.
 * `ports` [MessagePort][][] - A list of MessagePorts that were transferred with this message
 
 [ipc-renderer-sendto]: ../ipc-renderer.md#ipcrenderersendtowebcontentsid-channel-args

docs/api/structures/product.md

@@ -3,8 +3,6 @@
 * `productIdentifier` string - The string that identifies the product to the Apple App Store.
 * `localizedDescription` string - A description of the product.
 * `localizedTitle` string - The name of the product.
-* `contentVersion` string - A string that identifies the version of the content.
-* `contentLengths` number[] - The total size of the content, in bytes.
 * `price` number - The cost of the product in the local currency.
 * `formattedPrice` string - The locale formatted price of the product.
 * `currencyCode` string - 3 character code presenting a product's currency based on the ISO 4217 standard.

docs/api/structures/render-process-gone-details.md

@@ -1,13 +0,0 @@
-# RenderProcessGoneDetails Object
-
-* `reason` string - The reason the render process is gone.  Possible values:
-  * `clean-exit` - Process exited with an exit code of zero
-  * `abnormal-exit` - Process exited with a non-zero exit code
-  * `killed` - Process was sent a SIGTERM or otherwise killed externally
-  * `crashed` - Process crashed
-  * `oom` - Process ran out of memory
-  * `launch-failed` - Process never successfully launched
-  * `integrity-failure` - Windows code integrity checks failed
-* `exitCode` Integer - The exit code of the process, unless `reason` is
-  `launch-failed`, in which case `exitCode` will be a platform-specific
-  launch failure error code.

docs/api/structures/web-preferences.md

@@ -0,0 +1,144 @@
+# WebPreferences Object
+
+* `devTools` boolean (optional) - Whether to enable DevTools. If it is set to `false`, can not use `BrowserWindow.webContents.openDevTools()` to open DevTools. Default is `true`.
+* `nodeIntegration` boolean (optional) - Whether node integration is enabled.
+  Default is `false`.
+* `nodeIntegrationInWorker` boolean (optional) - Whether node integration is
+  enabled in web workers. Default is `false`. More about this can be found
+  in [Multithreading](../../tutorial/multithreading.md).
+* `nodeIntegrationInSubFrames` boolean (optional) - Experimental option for
+  enabling Node.js support in sub-frames such as iframes and child windows. All your preloads will load for
+  every iframe, you can use `process.isMainFrame` to determine if you are
+  in the main frame or not.
+* `preload` string (optional) - Specifies a script that will be loaded before other
+  scripts run in the page. This script will always have access to node APIs
+  no matter whether node integration is turned on or off. The value should
+  be the absolute file path to the script.
+  When node integration is turned off, the preload script can reintroduce
+  Node global symbols back to the global scope. See example
+  [here](../context-bridge.md#exposing-node-global-symbols).
+* `sandbox` boolean (optional) - If set, this will sandbox the renderer
+  associated with the window, making it compatible with the Chromium
+  OS-level sandbox and disabling the Node.js engine. This is not the same as
+  the `nodeIntegration` option and the APIs available to the preload script
+  are more limited. Read more about the option [here](../../tutorial/sandbox.md).
+* `session` [Session](../session.md#class-session) (optional) - Sets the session used by the
+  page. Instead of passing the Session object directly, you can also choose to
+  use the `partition` option instead, which accepts a partition string. When
+  both `session` and `partition` are provided, `session` will be preferred.
+  Default is the default session.
+* `partition` string (optional) - Sets the session used by the page according to the
+  session's partition string. If `partition` starts with `persist:`, the page
+  will use a persistent session available to all pages in the app with the
+  same `partition`. If there is no `persist:` prefix, the page will use an
+  in-memory session. By assigning the same `partition`, multiple pages can share
+  the same session. Default is the default session.
+* `zoomFactor` number (optional) - The default zoom factor of the page, `3.0` represents
+  `300%`. Default is `1.0`.
+* `javascript` boolean (optional) - Enables JavaScript support. Default is `true`.
+* `webSecurity` boolean (optional) - When `false`, it will disable the
+  same-origin policy (usually using testing websites by people), and set
+  `allowRunningInsecureContent` to `true` if this options has not been set
+  by user. Default is `true`.
+* `allowRunningInsecureContent` boolean (optional) - Allow an https page to run
+  JavaScript, CSS or plugins from http URLs. Default is `false`.
+* `images` boolean (optional) - Enables image support. Default is `true`.
+* `imageAnimationPolicy` string (optional) - Specifies how to run image animations (E.g. GIFs).  Can be `animate`, `animateOnce` or `noAnimation`.  Default is `animate`.
+* `textAreasAreResizable` boolean (optional) - Make TextArea elements resizable. Default
+  is `true`.
+* `webgl` boolean (optional) - Enables WebGL support. Default is `true`.
+* `plugins` boolean (optional) - Whether plugins should be enabled. Default is `false`.
+* `experimentalFeatures` boolean (optional) - Enables Chromium's experimental features.
+  Default is `false`.
+* `scrollBounce` boolean (optional) _macOS_ - Enables scroll bounce
+  (rubber banding) effect on macOS. Default is `false`.
+* `enableBlinkFeatures` string (optional) - A list of feature strings separated by `,`, like
+  `CSSVariables,KeyboardEventKey` to enable. The full list of supported feature
+  strings can be found in the [RuntimeEnabledFeatures.json5][runtime-enabled-features]
+  file.
+* `disableBlinkFeatures` string (optional) - A list of feature strings separated by `,`,
+  like `CSSVariables,KeyboardEventKey` to disable. The full list of supported
+  feature strings can be found in the
+  [RuntimeEnabledFeatures.json5][runtime-enabled-features] file.
+* `defaultFontFamily` Object (optional) - Sets the default font for the font-family.
+  * `standard` string (optional) - Defaults to `Times New Roman`.
+  * `serif` string (optional) - Defaults to `Times New Roman`.
+  * `sansSerif` string (optional) - Defaults to `Arial`.
+  * `monospace` string (optional) - Defaults to `Courier New`.
+  * `cursive` string (optional) - Defaults to `Script`.
+  * `fantasy` string (optional) - Defaults to `Impact`.
+  * `math` string (optional) - Defaults to `Latin Modern Math`.
+* `defaultFontSize` Integer (optional) - Defaults to `16`.
+* `defaultMonospaceFontSize` Integer (optional) - Defaults to `13`.
+* `minimumFontSize` Integer (optional) - Defaults to `0`.
+* `defaultEncoding` string (optional) - Defaults to `ISO-8859-1`.
+* `backgroundThrottling` boolean (optional) - Whether to throttle animations and timers
+  when the page becomes background. This also affects the
+  [Page Visibility API](../browser-window.md#page-visibility). Defaults to `true`.
+* `offscreen` boolean (optional) - Whether to enable offscreen rendering for the browser
+  window. Defaults to `false`. See the
+  [offscreen rendering tutorial](../../tutorial/offscreen-rendering.md) for
+  more details.
+* `contextIsolation` boolean (optional) - Whether to run Electron APIs and
+  the specified `preload` script in a separate JavaScript context. Defaults
+  to `true`. The context that the `preload` script runs in will only have
+  access to its own dedicated `document` and `window` globals, as well as
+  its own set of JavaScript builtins (`Array`, `Object`, `JSON`, etc.),
+  which are all invisible to the loaded content. The Electron API will only
+  be available in the `preload` script and not the loaded page. This option
+  should be used when loading potentially untrusted remote content to ensure
+  the loaded content cannot tamper with the `preload` script and any
+  Electron APIs being used.  This option uses the same technique used by
+  [Chrome Content Scripts][chrome-content-scripts].  You can access this
+  context in the dev tools by selecting the 'Electron Isolated Context'
+  entry in the combo box at the top of the Console tab.
+* `webviewTag` boolean (optional) - Whether to enable the [`<webview>` tag](../webview-tag.md).
+  Defaults to `false`. **Note:** The
+  `preload` script configured for the `<webview>` will have node integration
+  enabled when it is executed so you should ensure remote/untrusted content
+  is not able to create a `<webview>` tag with a possibly malicious `preload`
+  script. You can use the `will-attach-webview` event on [webContents](../web-contents.md)
+  to strip away the `preload` script and to validate or alter the
+  `<webview>`'s initial settings.
+* `additionalArguments` string[] (optional) - A list of strings that will be appended
+  to `process.argv` in the renderer process of this app.  Useful for passing small
+  bits of data down to renderer process preload scripts.
+* `safeDialogs` boolean (optional) - Whether to enable browser style
+  consecutive dialog protection. Default is `false`.
+* `safeDialogsMessage` string (optional) - The message to display when
+  consecutive dialog protection is triggered. If not defined the default
+  message would be used, note that currently the default message is in
+  English and not localized.
+* `disableDialogs` boolean (optional) - Whether to disable dialogs
+  completely. Overrides `safeDialogs`. Default is `false`.
+* `navigateOnDragDrop` boolean (optional) - Whether dragging and dropping a
+  file or link onto the page causes a navigation. Default is `false`.
+* `autoplayPolicy` string (optional) - Autoplay policy to apply to
+  content in the window, can be `no-user-gesture-required`,
+  `user-gesture-required`, `document-user-activation-required`. Defaults to
+  `no-user-gesture-required`.
+* `disableHtmlFullscreenWindowResize` boolean (optional) - Whether to
+  prevent the window from resizing when entering HTML Fullscreen. Default
+  is `false`.
+* `accessibleTitle` string (optional) - An alternative title string provided only
+  to accessibility tools such as screen readers. This string is not directly
+  visible to users.
+* `spellcheck` boolean (optional) - Whether to enable the builtin spellchecker.
+  Default is `true`.
+* `enableWebSQL` boolean (optional) - Whether to enable the [WebSQL api](https://www.w3.org/TR/webdatabase/).
+  Default is `true`.
+* `v8CacheOptions` string (optional) - Enforces the v8 code caching policy
+  used by blink. Accepted values are
+  * `none` - Disables code caching
+  * `code` - Heuristic based code caching
+  * `bypassHeatCheck` - Bypass code caching heuristics but with lazy compilation
+  * `bypassHeatCheckAndEagerCompile` - Same as above except compilation is eager.
+  Default policy is `code`.
+* `enablePreferredSizeMode` boolean (optional) - Whether to enable
+  preferred size mode. The preferred size is the minimum size needed to
+  contain the layout of the document—without requiring scrolling. Enabling
+  this will cause the `preferred-size-changed` event to be emitted on the
+  `WebContents` when the preferred size changes. Default is `false`.
+
+[chrome-content-scripts]: https://developer.chrome.com/extensions/content_scripts#execution-environment
+[runtime-enabled-features]: https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/renderer/platform/runtime_enabled_features.json5

docs/api/system-preferences.md

@@ -6,7 +6,7 @@ Process: [Main](../glossary.md#main-process)
 
 ```javascript
 const { systemPreferences } = require('electron')
-console.log(systemPreferences.isAeroGlassEnabled())
+console.log(systemPreferences.isDarkMode())
 ```
 
 ## Events
@@ -47,6 +47,12 @@ Returns:
 
 ## Methods
 
+### `systemPreferences.isDarkMode()` _macOS_ _Windows_ _Deprecated_
+
+Returns `boolean` - Whether the system is in Dark Mode.
+
+**Deprecated:** Should use the new [`nativeTheme.shouldUseDarkColors`](native-theme.md#nativethemeshouldusedarkcolors-readonly) API.
+
 ### `systemPreferences.isSwipeTrackingFromScrollEventsEnabled()` _macOS_
 
 Returns `boolean` - Whether the Swipe between pages setting is on.
@@ -291,7 +297,7 @@ This API is only available on macOS 10.14 Mojave or newer.
     * `window-frame` - Window frame.
     * `window-text` - Text in windows.
   * On **macOS**
-    * `alternate-selected-control-text` - The text on a selected surface in a list or table. _Deprecated_
+    * `alternate-selected-control-text` - The text on a selected surface in a list or table. _deprecated_
     * `control-background` - The background of a large interface element, such as a browser or table.
     * `control` - The surface of a control.
     * `control-text` -The text of a control that isn’t disabled.
@@ -350,6 +356,18 @@ Returns `string` - The standard system color formatted as `#RRGGBBAA`.
 
 Returns one of several standard system colors that automatically adapt to vibrancy and changes in accessibility settings like 'Increase contrast' and 'Reduce transparency'. See [Apple Documentation](https://developer.apple.com/design/human-interface-guidelines/macos/visual-design/color#system-colors) for  more details.
 
+### `systemPreferences.isInvertedColorScheme()` _Windows_ _Deprecated_
+
+Returns `boolean` - `true` if an inverted color scheme (a high contrast color scheme with light text and dark backgrounds) is active, `false` otherwise.
+
+**Deprecated:** Should use the new [`nativeTheme.shouldUseInvertedColorScheme`](native-theme.md#nativethemeshoulduseinvertedcolorscheme-macos-windows-readonly) API.
+
+### `systemPreferences.isHighContrastColorScheme()` _macOS_ _Windows_ _Deprecated_
+
+Returns `boolean` - `true` if a high contrast theme is active, `false` otherwise.
+
+**Deprecated:** Should use the new [`nativeTheme.shouldUseHighContrastColors`](native-theme.md#nativethemeshouldusehighcontrastcolors-macos-windows-readonly) API.
+
 ### `systemPreferences.getEffectiveAppearance()` _macOS_
 
 Returns `string` - Can be `dark`, `light` or `unknown`.

docs/api/web-contents.md

@@ -210,7 +210,7 @@ Returns:
   * `url` string - URL for the created window.
   * `frameName` string - Name given to the created window in the
      `window.open()` call.
-  * `options` BrowserWindowConstructorOptions - The options used to create the
+  * `options` [BrowserWindowConstructorOptions](structures/browser-window-options.md) - The options used to create the
     BrowserWindow. They are merged in increasing precedence: parsed options
     from the `features` string from `window.open()`, security-related
     webPreferences inherited from the parent, and options given by
@@ -239,9 +239,8 @@ Returns:
 
 * `details` Event<>
   * `url` string - The URL the frame is navigating to.
-  * `isSameDocument` boolean - Whether the navigation happened without changing
-    document. Examples of same document navigations are reference fragment
-    navigations, pushState/replaceState, and same page history navigation.
+  * `isSameDocument` boolean - This event does not fire for same document navigations using window.history api and reference fragment navigations.
+    This property is always set to `false` for this event.
   * `isMainFrame` boolean - True if the navigation is taking place in a main frame.
   * `frame` WebFrameMain - The frame to be navigated.
   * `initiator` WebFrameMain (optional) - The frame which initiated the
@@ -273,6 +272,8 @@ Returns:
 
 * `details` Event<>
   * `url` string - The URL the frame is navigating to.
+  * `isSameDocument` boolean - This event does not fire for same document navigations using window.history api and reference fragment navigations.
+    This property is always set to `false` for this event.
   * `isMainFrame` boolean - True if the navigation is taking place in a main frame.
   * `frame` WebFrameMain - The frame to be navigated.
   * `initiator` WebFrameMain (optional) - The frame which initiated the
@@ -478,7 +479,18 @@ checking `reason === 'killed'` when you switch to that event.
 Returns:
 
 * `event` Event
-* `details` [RenderProcessGoneDetails](structures/render-process-gone-details.md)
+* `details` Object
+  * `reason` string - The reason the render process is gone.  Possible values:
+    * `clean-exit` - Process exited with an exit code of zero
+    * `abnormal-exit` - Process exited with a non-zero exit code
+    * `killed` - Process was sent a SIGTERM or otherwise killed externally
+    * `crashed` - Process crashed
+    * `oom` - Process ran out of memory
+    * `launch-failed` - Process never successfully launched
+    * `integrity-failure` - Windows code integrity checks failed
+  * `exitCode` Integer - The exit code of the process, unless `reason` is
+    `launch-failed`, in which case `exitCode` will be a platform-specific
+    launch failure error code.
 
 Emitted when the renderer process unexpectedly disappears.  This is normally
 because it was crashed or killed.
@@ -895,7 +907,7 @@ Emitted when the devtools window instructs the webContents to reload
 Returns:
 
 * `event` Event
-* `webPreferences` WebPreferences - The web preferences that will be used by the guest
+* `webPreferences` [WebPreferences](structures/web-preferences.md) - The web preferences that will be used by the guest
   page. This object can be modified to adjust the preferences for the guest
   page.
 * `params` Record<string, string> - The other `<webview>` parameters such as the `src` URL.
@@ -1045,11 +1057,9 @@ const win = new BrowserWindow()
 win.loadFile('src/index.html')
 ```
 
-#### `contents.downloadURL(url[, options])`
+#### `contents.downloadURL(url)`
 
 * `url` string
-* `options` Object (optional)
-  * `headers` Record<string, string> (optional) - HTTP request headers.
 
 Initiates a download of the resource at `url` without navigating. The
 `will-download` event of `session` will be triggered.

docs/api/webview-tag.md

@@ -280,11 +280,9 @@ if the page fails to load (see
 Loads the `url` in the webview, the `url` must contain the protocol prefix,
 e.g. the `http://` or `file://`.
 
-### `<webview>.downloadURL(url[, options])`
+### `<webview>.downloadURL(url)`
 
 * `url` string
-* `options` Object (optional)
-  * `headers` Record<string, string> (optional) - HTTP request headers.
 
 Initiates a download of the resource at `url` without navigating.
 
@@ -985,22 +983,9 @@ ipcRenderer.on('ping', () => {
 })
 ```
 
-### Event: 'crashed' _Deprecated_
+### Event: 'crashed'
 
-Fired when the renderer process crashes or is killed.
-
-**Deprecated:** This event is superceded by the `render-process-gone` event
-which contains more information about why the render process disappeared. It
-isn't always because it crashed.
-
-### Event: 'render-process-gone'
-
-Returns:
-
-* `details` [RenderProcessGoneDetails](structures/render-process-gone-details.md)
-
-Fired when the renderer process unexpectedly disappears. This is normally
-because it was crashed or killed.
+Fired when the renderer process is crashed.
 
 ### Event: 'plugin-crashed'
 

docs/api/window-open.md

@@ -33,12 +33,12 @@ because it is invoked in the main process.
 Returns [`Window`](https://developer.mozilla.org/en-US/docs/Web/API/Window) | null
 
 `features` is a comma-separated key-value list, following the standard format of
-the browser. Electron will parse `BrowserWindowConstructorOptions` out of this
+the browser. Electron will parse [`BrowserWindowConstructorOptions`](structures/browser-window-options.md) out of this
 list where possible, for convenience. For full control and better ergonomics,
 consider using `webContents.setWindowOpenHandler` to customize the
 BrowserWindow creation.
 
-A subset of `WebPreferences` can be set directly,
+A subset of [`WebPreferences`](structures/web-preferences.md) can be set directly,
 unnested, from the features string: `zoomFactor`, `nodeIntegration`, `preload`,
 `javascript`, `contextIsolation`, and `webviewTag`.
 
@@ -59,8 +59,8 @@ window.open('https://github.com', '_blank', 'top=500,left=200,frame=false,nodeIn
 * Non-standard features (that are not handled by Chromium or Electron) given in
   `features` will be passed to any registered `webContents`'s
   `did-create-window` event handler in the `options` argument.
-* `frameName` follows the specification of `target` located in the [native documentation](https://developer.mozilla.org/en-US/docs/Web/API/Window/open#parameters).
-* When opening `about:blank`, the child window's `WebPreferences` will be copied
+* `frameName` follows the specification of `windowName` located in the [native documentation](https://developer.mozilla.org/en-US/docs/Web/API/Window/open#parameters).
+* When opening `about:blank`, the child window's [`WebPreferences`](structures/web-preferences.md) will be copied
   from the parent window, and there is no way to override it because Chromium
   skips browser side navigation in this case.
 
@@ -68,7 +68,7 @@ To customize or cancel the creation of the window, you can optionally set an
 override handler with `webContents.setWindowOpenHandler()` from the main
 process. Returning `{ action: 'deny' }` cancels the window. Returning `{
 action: 'allow', overrideBrowserWindowOptions: { ... } }` will allow opening
-the window and setting the `BrowserWindowConstructorOptions` to be used when
+the window and setting the [`BrowserWindowConstructorOptions`](structures/browser-window-options.md) to be used when
 creating the window. Note that this is more powerful than passing options
 through the feature string, as the renderer has more limited privileges in
 deciding security preferences than the main process.

docs/tutorial/asar-integrity.md

@@ -41,9 +41,7 @@ Valid `algorithm` values are currently `SHA256` only.  The `hash` is a hash of t
 ASAR integrity checking is currently disabled by default and can be enabled by toggling a fuse. See [Electron Fuses](fuses.md) for more information on what Electron Fuses are and how they work.  When enabling this fuse you typically also want to enable the `onlyLoadAppFromAsar` fuse otherwise the validity checking can be bypassed via the Electron app code search path.
 
 ```js @ts-nocheck
-const { flipFuses, FuseVersion, FuseV1Options } = require('@electron/fuses')
-
-flipFuses(
+require('@electron/fuses').flipFuses(
   // E.g. /a/b/Foo.app
   pathToPackagedApp,
   {

docs/tutorial/electron-timelines.md

@@ -9,10 +9,10 @@ check out our [Electron Versioning](./electron-versioning.md) doc.
 
 | Electron | Alpha | Beta | Stable | EOL | Chrome | Node | Supported |
 | ------- | ----- | ------- | ------ | ------ | ---- | ---- | ---- |
-| 26.0.0 | 2023-Jun-01 | 2023-Jun-27 | 2023-Aug-15 | TBD | M116 | TBD | ✅ |
-| 25.0.0 | 2023-Apr-10 | 2023-May-02 | 2023-May-30 | 2024-Jan-02 | M114 | v18.15 | ✅ |
-| 24.0.0 | 2022-Feb-09 | 2023-Mar-07 | 2023-Apr-04 | 2023-Oct-10 | M112 | v18.14 | ✅ |
-| 23.0.0 | 2022-Dec-01 | 2023-Jan-10 | 2023-Feb-07 | 2023-Aug-15 | M110 | v18.12 | ✅ |
+| 26.0.0 | 2023-Jun-01 | 2023-Jun-27 | 2023-Aug-08 | TBD | M116 | TBD | ✅ |
+| 25.0.0 | 2023-Apr-10 | 2023-May-02 | 2023-May-30 | 2023-Dec-05 | M114 | TBD | ✅ |
+| 24.0.0 | 2022-Feb-09 | 2023-Mar-07 | 2023-Apr-04 | 2023-Oct-03 | M112 | v18.14 | ✅ |
+| 23.0.0 | 2022-Dec-01 | 2023-Jan-10 | 2023-Feb-07 | 2023-Aug-08 | M110 | v18.12 | ✅ |
 | 22.0.0 | 2022-Sep-29 | 2022-Oct-25 | 2022-Nov-29 | 2023-Oct-10 | M108 | v16.17 | ✅ |
 | 21.0.0 | 2022-Aug-04 | 2022-Aug-30 | 2022-Sep-27 | 2023-Apr-04 | M106 | v16.16 | 🚫 |
 | 20.0.0 | 2022-May-26 | 2022-Jun-21 | 2022-Aug-02 | 2023-Feb-07 | M104 | v16.15 | 🚫 |

docs/tutorial/fuses.md

@@ -68,9 +68,7 @@ The loadBrowserProcessSpecificV8Snapshot fuse changes which V8 snapshot file is
 We've made a handy module, [`@electron/fuses`](https://npmjs.com/package/@electron/fuses), to make flipping these fuses easy.  Check out the README of that module for more details on usage and potential error cases.
 
 ```js @ts-nocheck
-const { flipFuses, FuseVersion, FuseV1Options } = require('@electron/fuses')
-
-flipFuses(
+require('@electron/fuses').flipFuses(
   // Path to electron
   require('electron'),
   // Fuses to flip
@@ -84,7 +82,7 @@ flipFuses(
 You can validate the fuses have been flipped or check the fuse status of an arbitrary Electron app using the fuses CLI.
 
 ```bash
-npx @electron/fuses read --app /Applications/Foo.app
+ npx @electron/fuses read --app /Applications/Foo.app
 ```
 
 ### The hard way

docs/tutorial/message-ports.md

@@ -150,7 +150,7 @@ renderer.
 
 ```js title='renderer.js (Renderer Process)' @ts-nocheck
 // elsewhere in your code to send a message to the other renderers message handler
-window.electronMessagePort.postMessage('ping')
+window.electronMessagePort.postmessage('ping')
 ```
 
 ### Worker process

docs/tutorial/performance.md

@@ -54,7 +54,7 @@ at once, consider the [Chrome Tracing](https://www.chromium.org/developers/how-t
 
 ### Recommended Reading
 
-* [Get Started With Analyzing Runtime Performance][chrome-devtools-tutorial]
+* [Analyze runtime performance][chrome-devtools-tutorial]
 * [Talk: "Visual Studio Code - The First Second"][vscode-first-second]
 
 ## Checklist: Performance recommendations
@@ -69,6 +69,7 @@ resource-hungry if you attempt these steps.
 5. [Unnecessary polyfills](#5-unnecessary-polyfills)
 6. [Unnecessary or blocking network requests](#6-unnecessary-or-blocking-network-requests)
 7. [Bundle your code](#7-bundle-your-code)
+8. [Call `Menu.setApplicationMenu(null)` when you do not need a default menu](#8-call-menusetapplicationmenunull-when-you-do-not-need-a-default-menu)
 
 ### 1. Carelessly including modules
 
@@ -432,7 +433,7 @@ If you build your own menu or use a frameless window without native menu, you sh
 Call `Menu.setApplicationMenu(null)` before `app.on("ready")`. This will prevent Electron from setting a default menu. See also https://github.com/electron/electron/issues/35512 for a related discussion.
 
 [security]: ./security.md
-[chrome-devtools-tutorial]: https://developers.google.com/web/tools/chrome-devtools/evaluate-performance/
+[chrome-devtools-tutorial]: https://developer.chrome.com/docs/devtools/performance/
 [worker-threads]: https://nodejs.org/api/worker_threads.html
 [web-workers]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers
 [request-idle-callback]: https://developer.mozilla.org/en-US/docs/Web/API/Window/requestIdleCallback

electron_paks.gni

@@ -52,6 +52,7 @@ template("electron_extra_paks") {
                            ])
     output = "${invoker.output_dir}/resources.pak"
     sources = [
+      "$root_gen_dir/chrome/accessibility_resources.pak",
       "$root_gen_dir/chrome/browser_resources.pak",
       "$root_gen_dir/chrome/common_resources.pak",
       "$root_gen_dir/chrome/dev_ui_browser_resources.pak",
@@ -60,8 +61,6 @@ template("electron_extra_paks") {
       "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
       "$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
       "$root_gen_dir/content/content_resources.pak",
-      "$root_gen_dir/content/dev_ui_content_resources.pak",
-      "$root_gen_dir/content/gpu_resources.pak",
       "$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
       "$root_gen_dir/net/net_resources.pak",
       "$root_gen_dir/third_party/blink/public/resources/blink_resources.pak",
@@ -71,11 +70,10 @@ template("electron_extra_paks") {
     deps = [
       "//chrome/browser:dev_ui_browser_resources",
       "//chrome/browser:resources",
+      "//chrome/browser/resources/accessibility:resources",
       "//chrome/common:resources",
       "//components/resources",
       "//content:content_resources",
-      "//content:dev_ui_content_resources",
-      "//content/browser/resources/gpu:resources",
       "//content/browser/resources/media:resources",
       "//content/browser/tracing:resources",
       "//content/browser/webrtc/resources",

filenames.auto.gni

@@ -70,6 +70,7 @@ auto_filenames = {
     "docs/api/webview-tag.md",
     "docs/api/window-open.md",
     "docs/api/structures/bluetooth-device.md",
+    "docs/api/structures/browser-window-options.md",
     "docs/api/structures/certificate-principal.md",
     "docs/api/structures/certificate.md",
     "docs/api/structures/cookie.md",
@@ -114,7 +115,6 @@ auto_filenames = {
     "docs/api/structures/protocol-response.md",
     "docs/api/structures/rectangle.md",
     "docs/api/structures/referrer.md",
-    "docs/api/structures/render-process-gone-details.md",
     "docs/api/structures/resolved-endpoint.md",
     "docs/api/structures/resolved-host.md",
     "docs/api/structures/scrubber-item.md",
@@ -135,6 +135,7 @@ auto_filenames = {
     "docs/api/structures/upload-raw-data.md",
     "docs/api/structures/usb-device.md",
     "docs/api/structures/user-default-types.md",
+    "docs/api/structures/web-preferences.md",
     "docs/api/structures/web-request-filter.md",
     "docs/api/structures/web-source.md",
   ]
@@ -195,6 +196,7 @@ auto_filenames = {
     "lib/browser/api/base-window.ts",
     "lib/browser/api/browser-view.ts",
     "lib/browser/api/browser-window.ts",
+    "lib/browser/api/clipboard.ts",
     "lib/browser/api/content-tracing.ts",
     "lib/browser/api/crash-reporter.ts",
     "lib/browser/api/desktop-capturer.ts",
@@ -244,7 +246,6 @@ auto_filenames = {
     "lib/browser/parse-features-string.ts",
     "lib/browser/rpc-server.ts",
     "lib/browser/web-view-events.ts",
-    "lib/common/api/clipboard.ts",
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.ts",
     "lib/common/api/shell.ts",
@@ -255,8 +256,6 @@ auto_filenames = {
     "lib/common/reset-search-paths.ts",
     "lib/common/web-view-methods.ts",
     "lib/common/webpack-globals-provider.ts",
-    "lib/renderer/ipc-renderer-internal-utils.ts",
-    "lib/renderer/ipc-renderer-internal.ts",
     "package.json",
     "tsconfig.electron.json",
     "tsconfig.json",
@@ -265,7 +264,6 @@ auto_filenames = {
   ]
 
   renderer_bundle_deps = [
-    "lib/common/api/clipboard.ts",
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.ts",
     "lib/common/api/shell.ts",
@@ -275,6 +273,7 @@ auto_filenames = {
     "lib/common/reset-search-paths.ts",
     "lib/common/web-view-methods.ts",
     "lib/common/webpack-provider.ts",
+    "lib/renderer/api/clipboard.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
     "lib/renderer/api/exports/electron.ts",
@@ -303,7 +302,6 @@ auto_filenames = {
   ]
 
   worker_bundle_deps = [
-    "lib/common/api/clipboard.ts",
     "lib/common/api/module-list.ts",
     "lib/common/api/native-image.ts",
     "lib/common/api/shell.ts",
@@ -312,6 +310,7 @@ auto_filenames = {
     "lib/common/ipc-messages.ts",
     "lib/common/reset-search-paths.ts",
     "lib/common/webpack-provider.ts",
+    "lib/renderer/api/clipboard.ts",
     "lib/renderer/api/context-bridge.ts",
     "lib/renderer/api/crash-reporter.ts",
     "lib/renderer/api/exports/electron.ts",

filenames.gni

@@ -129,10 +129,6 @@ filenames = {
     "shell/browser/auto_updater_mac.mm",
     "shell/browser/browser_mac.mm",
     "shell/browser/electron_browser_main_parts_mac.mm",
-    "shell/browser/mac/dict_util.h",
-    "shell/browser/mac/dict_util.mm",
-    "shell/browser/mac/electron_application_delegate.h",
-    "shell/browser/mac/electron_application_delegate.mm",
     "shell/browser/mac/electron_application.h",
     "shell/browser/mac/electron_application.mm",
     "shell/browser/mac/in_app_purchase_observer.h",
@@ -151,6 +147,8 @@ filenames = {
     "shell/browser/notifications/mac/notification_center_delegate.mm",
     "shell/browser/notifications/mac/notification_presenter_mac.h",
     "shell/browser/notifications/mac/notification_presenter_mac.mm",
+    "shell/browser/osr/osr_host_display_client_mac.mm",
+    "shell/browser/osr/osr_web_contents_view_mac.mm",
     "shell/browser/relauncher_mac.cc",
     "shell/browser/ui/certificate_trust_mac.mm",
     "shell/browser/ui/cocoa/delayed_native_view_host.mm",
@@ -241,6 +239,8 @@ filenames = {
     "shell/app/electron_crash_reporter_client.h",
     "shell/app/electron_main_delegate.cc",
     "shell/app/electron_main_delegate.h",
+    "shell/app/node_main.cc",
+    "shell/app/node_main.h",
     "shell/app/uv_task_runner.cc",
     "shell/app/uv_task_runner.h",
     "shell/browser/api/electron_api_app.cc",
@@ -262,6 +262,8 @@ filenames = {
     "shell/browser/api/electron_api_data_pipe_holder.h",
     "shell/browser/api/electron_api_debugger.cc",
     "shell/browser/api/electron_api_debugger.h",
+    "shell/browser/api/electron_api_desktop_capturer.cc",
+    "shell/browser/api/electron_api_desktop_capturer.h",
     "shell/browser/api/electron_api_dialog.cc",
     "shell/browser/api/electron_api_download_item.cc",
     "shell/browser/api/electron_api_download_item.h",
@@ -451,6 +453,16 @@ filenames = {
     "shell/browser/notifications/notification_presenter.h",
     "shell/browser/notifications/platform_notification_service.cc",
     "shell/browser/notifications/platform_notification_service.h",
+    "shell/browser/osr/osr_host_display_client.cc",
+    "shell/browser/osr/osr_host_display_client.h",
+    "shell/browser/osr/osr_render_widget_host_view.cc",
+    "shell/browser/osr/osr_render_widget_host_view.h",
+    "shell/browser/osr/osr_video_consumer.cc",
+    "shell/browser/osr/osr_video_consumer.h",
+    "shell/browser/osr/osr_view_proxy.cc",
+    "shell/browser/osr/osr_view_proxy.h",
+    "shell/browser/osr/osr_web_contents_view.cc",
+    "shell/browser/osr/osr_web_contents_view.h",
     "shell/browser/plugins/plugin_utils.cc",
     "shell/browser/plugins/plugin_utils.h",
     "shell/browser/protocol_registry.cc",

filenames.libcxx.gni

@@ -25,6 +25,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/find_if_not.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each_n.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/for_each_segment.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/generate.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/generate_n.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/half_positive.h",
@@ -70,6 +71,31 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/partition_point.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/pop_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/prev_permutation.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_any_all_none_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backend.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backend.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/any_of.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/backend.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/fill.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/find_if.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/for_each.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/merge.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/serial.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/stable_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/thread.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/transform.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_backends/cpu_backends/transform_reduce.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_copy.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_count.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_fill.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_find.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_for_each.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_frontend_dispatch.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_generate.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_merge.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_replace.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_stable_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/pstl_transform.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/push_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_adjacent_find.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_all_of.h",
@@ -152,6 +178,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_sort_heap.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_stable_partition.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_stable_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_starts_with.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_swap_ranges.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_transform.h",
   "//buildtools/third_party/libc++/trunk/include/__algorithm/ranges_unique.h",
@@ -223,8 +250,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__bit/popcount.h",
   "//buildtools/third_party/libc++/trunk/include/__bit/rotate.h",
   "//buildtools/third_party/libc++/trunk/include/__bit_reference",
-  "//buildtools/third_party/libc++/trunk/include/__bsd_locale_defaults.h",
-  "//buildtools/third_party/libc++/trunk/include/__bsd_locale_fallbacks.h",
   "//buildtools/third_party/libc++/trunk/include/__charconv/chars_format.h",
   "//buildtools/third_party/libc++/trunk/include/__charconv/from_chars_integral.h",
   "//buildtools/third_party/libc++/trunk/include/__charconv/from_chars_result.h",
@@ -304,6 +329,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__coroutine/trivial_awaitables.h",
   "//buildtools/third_party/libc++/trunk/include/__debug",
   "//buildtools/third_party/libc++/trunk/include/__debug_utils/randomize_range.h",
+  "//buildtools/third_party/libc++/trunk/include/__debug_utils/strict_weak_ordering_check.h",
   "//buildtools/third_party/libc++/trunk/include/__exception/exception.h",
   "//buildtools/third_party/libc++/trunk/include/__exception/exception_ptr.h",
   "//buildtools/third_party/libc++/trunk/include/__exception/nested_exception.h",
@@ -359,6 +385,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__format/range_default_formatter.h",
   "//buildtools/third_party/libc++/trunk/include/__format/range_formatter.h",
   "//buildtools/third_party/libc++/trunk/include/__format/unicode.h",
+  "//buildtools/third_party/libc++/trunk/include/__format/width_estimation_table.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binary_function.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/binary_negate.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/bind.h",
@@ -385,14 +412,19 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__functional/reference_wrapper.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/unary_function.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/unary_negate.h",
-  "//buildtools/third_party/libc++/trunk/include/__functional/unwrap_ref.h",
   "//buildtools/third_party/libc++/trunk/include/__functional/weak_result_type.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/array.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/fstream.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/get.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/hash.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/ios.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/istream.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/memory_resource.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/ostream.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/pair.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/span.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/sstream.h",
+  "//buildtools/third_party/libc++/trunk/include/__fwd/streambuf.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/string.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/string_view.h",
   "//buildtools/third_party/libc++/trunk/include/__fwd/subrange.h",
@@ -406,6 +438,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__iterator/common_iterator.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/concepts.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/counted_iterator.h",
+  "//buildtools/third_party/libc++/trunk/include/__iterator/cpp17_iterator_concepts.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/data.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/default_sentinel.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/distance.h",
@@ -440,7 +473,11 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__iterator/unreachable_sentinel.h",
   "//buildtools/third_party/libc++/trunk/include/__iterator/wrap_iter.h",
   "//buildtools/third_party/libc++/trunk/include/__locale",
+  "//buildtools/third_party/libc++/trunk/include/__locale_dir/locale_base_api/bsd_locale_defaults.h",
+  "//buildtools/third_party/libc++/trunk/include/__locale_dir/locale_base_api/bsd_locale_fallbacks.h",
+  "//buildtools/third_party/libc++/trunk/include/__locale_dir/locale_base_api/locale_guard.h",
   "//buildtools/third_party/libc++/trunk/include/__mbstate_t.h",
+  "//buildtools/third_party/libc++/trunk/include/__mdspan/extents.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/addressof.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/align.h",
   "//buildtools/third_party/libc++/trunk/include/__memory/aligned_alloc.h",
@@ -490,10 +527,47 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__numeric/iota.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/midpoint.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/partial_sum.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/pstl_reduce.h",
+  "//buildtools/third_party/libc++/trunk/include/__numeric/pstl_transform_reduce.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/reduce.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/transform_exclusive_scan.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/transform_inclusive_scan.h",
   "//buildtools/third_party/libc++/trunk/include/__numeric/transform_reduce.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/algorithm_fwd.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/algorithm_impl.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/execution_defs.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/execution_impl.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/glue_algorithm_defs.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/glue_algorithm_impl.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/glue_memory_defs.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/glue_memory_impl.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/glue_numeric_defs.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/glue_numeric_impl.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/memory_impl.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/numeric_fwd.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/numeric_impl.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_for.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_for_each.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_invoke.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_merge.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_reduce.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_stable_partial_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_stable_sort.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_transform_reduce.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/parallel_transform_scan.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/omp/util.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/parallel_backend.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/parallel_backend_omp.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/parallel_backend_serial.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/parallel_backend_tbb.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/parallel_backend_utils.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/unseq_backend_simd.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl/internal/utils.h",
+  "//buildtools/third_party/libc++/trunk/include/__pstl_algorithm",
+  "//buildtools/third_party/libc++/trunk/include/__pstl_config_site.in",
+  "//buildtools/third_party/libc++/trunk/include/__pstl_memory",
+  "//buildtools/third_party/libc++/trunk/include/__pstl_numeric",
   "//buildtools/third_party/libc++/trunk/include/__random/bernoulli_distribution.h",
   "//buildtools/third_party/libc++/trunk/include/__random/binomial_distribution.h",
   "//buildtools/third_party/libc++/trunk/include/__random/cauchy_distribution.h",
@@ -536,6 +610,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/as_rvalue_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/common_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/concepts.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/container_compatible_range.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/copyable_box.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/counted.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/dangling.h",
@@ -548,6 +623,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/enable_borrowed_range.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/enable_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/filter_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__ranges/from_range.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/iota_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/istream_view.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/join_view.h",
@@ -570,6 +646,14 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__ranges/views.h",
   "//buildtools/third_party/libc++/trunk/include/__ranges/zip_view.h",
   "//buildtools/third_party/libc++/trunk/include/__split_buffer",
+  "//buildtools/third_party/libc++/trunk/include/__std_mbstate_t.h",
+  "//buildtools/third_party/libc++/trunk/include/__stop_token/atomic_unique_lock.h",
+  "//buildtools/third_party/libc++/trunk/include/__stop_token/intrusive_list_view.h",
+  "//buildtools/third_party/libc++/trunk/include/__stop_token/intrusive_shared_ptr.h",
+  "//buildtools/third_party/libc++/trunk/include/__stop_token/stop_callback.h",
+  "//buildtools/third_party/libc++/trunk/include/__stop_token/stop_source.h",
+  "//buildtools/third_party/libc++/trunk/include/__stop_token/stop_state.h",
+  "//buildtools/third_party/libc++/trunk/include/__stop_token/stop_token.h",
   "//buildtools/third_party/libc++/trunk/include/__string/char_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__string/constexpr_c_functions.h",
   "//buildtools/third_party/libc++/trunk/include/__string/extern_template_lists.h",
@@ -582,9 +666,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__support/musl/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/newlib/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/openbsd/xlocale.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/solaris/floatingpoint.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/solaris/wchar.h",
-  "//buildtools/third_party/libc++/trunk/include/__support/solaris/xlocale.h",
   "//buildtools/third_party/libc++/trunk/include/__support/win32/locale_win32.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__nop_locale_mgmt.h",
   "//buildtools/third_party/libc++/trunk/include/__support/xlocale/__posix_l_fallback.h",
@@ -598,7 +679,6 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__thread/timed_backoff_policy.h",
   "//buildtools/third_party/libc++/trunk/include/__threading_support",
   "//buildtools/third_party/libc++/trunk/include/__tree",
-  "//buildtools/third_party/libc++/trunk/include/__tuple/apply_cv.h",
   "//buildtools/third_party/libc++/trunk/include/__tuple/make_tuple_types.h",
   "//buildtools/third_party/libc++/trunk/include/__tuple/pair_like.h",
   "//buildtools/third_party/libc++/trunk/include/__tuple/sfinae_helpers.h",
@@ -633,6 +713,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/has_unique_object_representation.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/has_virtual_destructor.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/integral_constant.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/invoke.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_abstract.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_aggregate.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_allocator.h",
@@ -658,6 +739,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_empty.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_enum.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_equality_comparable.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_execution_policy.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_final.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_floating_point.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_function.h",
@@ -704,6 +786,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_copyable.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_default_constructible.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_destructible.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_lexicographically_comparable.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_move_assignable.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_trivially_move_constructible.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/is_unbounded_array.h",
@@ -722,6 +805,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/nat.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/negation.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/noexcept_move_assign_container.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/operation_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/predicate_traits.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/promote.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/rank.h",
@@ -739,6 +823,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__type_traits/type_identity.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/type_list.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/underlying_type.h",
+  "//buildtools/third_party/libc++/trunk/include/__type_traits/unwrap_ref.h",
   "//buildtools/third_party/libc++/trunk/include/__type_traits/void_t.h",
   "//buildtools/third_party/libc++/trunk/include/__undef_macros",
   "//buildtools/third_party/libc++/trunk/include/__utility/as_const.h",
@@ -752,12 +837,14 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/__utility/forward_like.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/in_place.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/integer_sequence.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/is_pointer_in_range.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/move.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/pair.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/piecewise_construct.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/priority_tag.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/rel_ops.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/swap.h",
+  "//buildtools/third_party/libc++/trunk/include/__utility/terminate_on_exception.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/to_underlying.h",
   "//buildtools/third_party/libc++/trunk/include/__utility/unreachable.h",
   "//buildtools/third_party/libc++/trunk/include/__variant/monostate.h",
@@ -855,6 +942,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/locale.h",
   "//buildtools/third_party/libc++/trunk/include/map",
   "//buildtools/third_party/libc++/trunk/include/math.h",
+  "//buildtools/third_party/libc++/trunk/include/mdspan",
   "//buildtools/third_party/libc++/trunk/include/memory",
   "//buildtools/third_party/libc++/trunk/include/memory_resource",
   "//buildtools/third_party/libc++/trunk/include/module.modulemap.in",
@@ -885,6 +973,7 @@ libcxx_headers = [
   "//buildtools/third_party/libc++/trunk/include/stdint.h",
   "//buildtools/third_party/libc++/trunk/include/stdio.h",
   "//buildtools/third_party/libc++/trunk/include/stdlib.h",
+  "//buildtools/third_party/libc++/trunk/include/stop_token",
   "//buildtools/third_party/libc++/trunk/include/streambuf",
   "//buildtools/third_party/libc++/trunk/include/string",
   "//buildtools/third_party/libc++/trunk/include/string.h",

lib/asar/fs-wrapper.ts

@@ -27,7 +27,7 @@ const cachedArchives = new Map<string, NodeJS.AsarArchive>();
 const getOrCreateArchive = (archivePath: string) => {
   const isCached = cachedArchives.has(archivePath);
   if (isCached) {
-    return cachedArchives.get(archivePath)!;
+    return cachedArchives.get(archivePath);
   }
 
   try {
@@ -39,8 +39,6 @@ const getOrCreateArchive = (archivePath: string) => {
   }
 };
 
-process._getOrCreateArchive = getOrCreateArchive;
-
 const asarRe = /\.asar/i;
 
 // Separate asar package's path from full path.
@@ -576,7 +574,6 @@ export const wrapFsWithAsar = (fs: Record<string, any>) => {
   };
 
   const { readFile: readFilePromise } = fs.promises;
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   fs.promises.readFile = function (pathArgument: string, options: any) {
     const pathInfo = splitPath(pathArgument);
     if (!pathInfo.isAsar) {

lib/browser/api/auto-updater/squirrel-update-win.ts

@@ -24,8 +24,6 @@ const spawnUpdate = function (args: string[], detached: boolean, callback: Funct
     // Process spawned, different args:   Return with error
     // No process spawned:                Spawn new process
     if (spawnedProcess && !isSameArgs(args)) {
-      // Disabled for backwards compatibility:
-      // eslint-disable-next-line standard/no-callback-literal
       return callback(`AutoUpdater process with arguments ${args} is already running`);
     } else if (!spawnedProcess) {
       spawnedProcess = spawn(updateExe, args, {
@@ -66,8 +64,6 @@ const spawnUpdate = function (args: string[], detached: boolean, callback: Funct
 
     // Process terminated with error.
     if (code !== 0) {
-      // Disabled for backwards compatibility:
-      // eslint-disable-next-line standard/no-callback-literal
       return callback(`Command failed: ${signal ?? code}\n${stderr}`);
     }
 
@@ -93,8 +89,6 @@ export function checkForUpdate (updateURL: string, callback: (error: Error | nul
       const json = stdout.trim().split('\n').pop();
       update = (ref = JSON.parse(json!)) != null ? (ref1 = ref.releasesToApply) != null ? typeof ref1.pop === 'function' ? ref1.pop() : undefined : undefined : undefined;
     } catch {
-      // Disabled for backwards compatibility:
-      // eslint-disable-next-line standard/no-callback-literal
       return callback(new Error(`Invalid result:\n${stdout}`));
     }
     return callback(null, update);

lib/browser/api/clipboard.ts

@@ -0,0 +1,3 @@
+const clipboard = process._linkedBinding('electron_common_clipboard');
+
+export default clipboard;

lib/browser/api/dialog.ts

@@ -59,7 +59,7 @@ const checkAppInitialized = function () {
 const setupOpenDialogProperties = (properties: (keyof typeof OpenFileDialogProperties)[]): number => {
   let dialogProperties = 0;
   for (const property of properties) {
-    if (Object.prototype.hasOwnProperty.call(OpenFileDialogProperties, property)) { dialogProperties |= OpenFileDialogProperties[property]; }
+    if (Object.hasOwn(OpenFileDialogProperties, property)) { dialogProperties |= OpenFileDialogProperties[property]; }
   }
   return dialogProperties;
 };
@@ -67,7 +67,7 @@ const setupOpenDialogProperties = (properties: (keyof typeof OpenFileDialogPrope
 const setupSaveDialogProperties = (properties: (keyof typeof SaveFileDialogProperties)[]): number => {
   let dialogProperties = 0;
   for (const property of properties) {
-    if (Object.prototype.hasOwnProperty.call(SaveFileDialogProperties, property)) { dialogProperties |= SaveFileDialogProperties[property]; }
+    if (Object.hasOwn(SaveFileDialogProperties, property)) { dialogProperties |= SaveFileDialogProperties[property]; }
   }
   return dialogProperties;
 };
@@ -237,8 +237,6 @@ const messageBox = (sync: boolean, window: BrowserWindow | null, options?: Messa
   }
 };
 
-// eat dirt, eslint
-/* eslint-disable import/export */
 export function showOpenDialog(window: BrowserWindow, options: OpenDialogOptions): OpenDialogReturnValue;
 export function showOpenDialog(options: OpenDialogOptions): OpenDialogReturnValue;
 export function showOpenDialog (windowOrOptions: BrowserWindow | OpenDialogOptions, maybeOptions?: OpenDialogOptions): OpenDialogReturnValue {

lib/browser/api/menu-item-roles.ts

@@ -311,7 +311,7 @@ export const roleList: Record<RoleId, Role> = {
 };
 
 const hasRole = (role: keyof typeof roleList) => {
-  return Object.prototype.hasOwnProperty.call(roleList, role);
+  return Object.hasOwn(roleList, role);
 };
 
 const canExecuteRole = (role: keyof typeof roleList) => {
@@ -336,7 +336,7 @@ export function getCheckStatus (role: RoleId) {
 }
 
 export function shouldOverrideCheckStatus (role: RoleId) {
-  return hasRole(role) && Object.prototype.hasOwnProperty.call(roleList[role], 'checked');
+  return hasRole(role) && Object.hasOwn(roleList[role], 'checked');
 }
 
 export function getDefaultAccelerator (role: RoleId) {

lib/browser/api/menu.ts

@@ -69,7 +69,7 @@ Menu.prototype.popup = function (options = {}) {
   if (options == null || typeof options !== 'object') {
     throw new TypeError('Options must be an object');
   }
-  let { window, x, y, positioningItem, callback } = options;
+  let { window, x, y, positioningItem, sourceType, callback } = options;
 
   // no callback passed
   if (!callback || typeof callback !== 'function') callback = () => {};
@@ -78,6 +78,7 @@ Menu.prototype.popup = function (options = {}) {
   if (typeof x !== 'number') x = -1;
   if (typeof y !== 'number') y = -1;
   if (typeof positioningItem !== 'number') positioningItem = -1;
+  if (typeof sourceType !== 'string' || !sourceType) sourceType = 'mouse';
 
   // find which window to use
   const wins = BaseWindow.getAllWindows();
@@ -91,7 +92,7 @@ Menu.prototype.popup = function (options = {}) {
     }
   }
 
-  this.popupAt(window as unknown as BaseWindow, x, y, positioningItem, callback);
+  this.popupAt(window as unknown as BaseWindow, x, y, positioningItem, sourceType, callback);
   return { browserWindow: window, x, y, position: positioningItem };
 };
 
@@ -213,9 +214,7 @@ function areValidTemplateItems (template: (MenuItemConstructorOptions | MenuItem
   return template.every(item =>
     item != null &&
     typeof item === 'object' &&
-    (Object.prototype.hasOwnProperty.call(item, 'label') ||
-     Object.prototype.hasOwnProperty.call(item, 'role') ||
-     item.type === 'separator'));
+    (Object.hasOwn(item, 'label') || Object.hasOwn(item, 'role') || item.type === 'separator'));
 }
 
 function sortTemplate (template: (MenuItemConstructorOptions | MenuItem)[]) {

lib/browser/api/module-list.ts

@@ -7,8 +7,10 @@ export const browserModuleList: ElectronInternal.ModuleEntry[] = [
   { name: 'BaseWindow', loader: () => require('./base-window') },
   { name: 'BrowserView', loader: () => require('./browser-view') },
   { name: 'BrowserWindow', loader: () => require('./browser-window') },
+  { name: 'clipboard', loader: () => require('./clipboard') },
   { name: 'contentTracing', loader: () => require('./content-tracing') },
   { name: 'crashReporter', loader: () => require('./crash-reporter') },
+  { name: 'desktopCapturer', loader: () => require('./desktop-capturer') },
   { name: 'dialog', loader: () => require('./dialog') },
   { name: 'globalShortcut', loader: () => require('./global-shortcut') },
   { name: 'ipcMain', loader: () => require('./ipc-main') },
@@ -38,12 +40,6 @@ export const browserModuleList: ElectronInternal.ModuleEntry[] = [
   { name: 'webFrameMain', loader: () => require('./web-frame-main') }
 ];
 
-if (BUILDFLAG(ENABLE_DESKTOP_CAPTURER)) {
-  browserModuleList.push(
-    { name: 'desktopCapturer', loader: () => require('./desktop-capturer') }
-  );
-}
-
 if (BUILDFLAG(ENABLE_VIEWS_API)) {
   browserModuleList.push(
     { name: 'ImageView', loader: () => require('./views/image-view') }

lib/browser/api/net-client-request.ts

@@ -209,6 +209,7 @@ type ExtraURLLoaderOptions = {
    allowNonHttpProtocols: boolean;
 }
 function parseOptions (optionsIn: ClientRequestConstructorOptions | string): NodeJS.CreateURLLoaderOptions & ExtraURLLoaderOptions {
+  // eslint-disable-next-line node/no-deprecated-api
   const options: any = typeof optionsIn === 'string' ? url.parse(optionsIn) : { ...optionsIn };
 
   let urlStr: string = options.url;
@@ -241,6 +242,7 @@ function parseOptions (optionsIn: ClientRequestConstructorOptions | string): Nod
       // an invalid request.
       throw new TypeError('Request path contains unescaped characters');
     }
+    // eslint-disable-next-line node/no-deprecated-api
     const pathObj = url.parse(options.path || '/');
     urlObj.pathname = pathObj.pathname;
     urlObj.search = pathObj.search;
@@ -268,7 +270,7 @@ function parseOptions (optionsIn: ClientRequestConstructorOptions | string): Nod
     origin: options.origin,
     referrerPolicy: options.referrerPolicy,
     cache: options.cache,
-    allowNonHttpProtocols: Object.prototype.hasOwnProperty.call(options, kAllowNonHttpProtocols)
+    allowNonHttpProtocols: Object.hasOwn(options, kAllowNonHttpProtocols)
   };
   const headers: Record<string, string | string[]> = options.headers || {};
   for (const [name, value] of Object.entries(headers)) {

lib/browser/api/power-monitor.ts

@@ -1,5 +1,4 @@
 import { EventEmitter } from 'events';
-import { app } from 'electron/main';
 
 const {
   createPowerMonitor,
@@ -15,28 +14,26 @@ class PowerMonitor extends EventEmitter {
     // Don't start the event source until both a) the app is ready and b)
     // there's a listener registered for a powerMonitor event.
     this.once('newListener', () => {
-      app.whenReady().then(() => {
-        const pm = createPowerMonitor();
-        pm.emit = this.emit.bind(this);
+      const pm = createPowerMonitor();
+      pm.emit = this.emit.bind(this);
 
-        if (process.platform === 'linux') {
-          // On Linux, we inhibit shutdown in order to give the app a chance to
-          // decide whether or not it wants to prevent the shutdown. We don't
-          // inhibit the shutdown event unless there's a listener for it. This
-          // keeps the C++ code informed about whether there are any listeners.
-          pm.setListeningForShutdown(this.listenerCount('shutdown') > 0);
-          this.on('newListener', (event) => {
-            if (event === 'shutdown') {
-              pm.setListeningForShutdown(this.listenerCount('shutdown') + 1 > 0);
-            }
-          });
-          this.on('removeListener', (event) => {
-            if (event === 'shutdown') {
-              pm.setListeningForShutdown(this.listenerCount('shutdown') > 0);
-            }
-          });
-        }
-      });
+      if (process.platform === 'linux') {
+        // On Linux, we inhibit shutdown in order to give the app a chance to
+        // decide whether or not it wants to prevent the shutdown. We don't
+        // inhibit the shutdown event unless there's a listener for it. This
+        // keeps the C++ code informed about whether there are any listeners.
+        pm.setListeningForShutdown(this.listenerCount('shutdown') > 0);
+        this.on('newListener', (event) => {
+          if (event === 'shutdown') {
+            pm.setListeningForShutdown(this.listenerCount('shutdown') + 1 > 0);
+          }
+        });
+        this.on('removeListener', (event) => {
+          if (event === 'shutdown') {
+            pm.setListeningForShutdown(this.listenerCount('shutdown') > 0);
+          }
+        });
+      }
     });
   }
 

lib/browser/api/protocol.ts

@@ -9,7 +9,7 @@ const { registerSchemesAsPrivileged, getStandardSchemes, Protocol } = process._l
 const ERR_FAILED = -2;
 const ERR_UNEXPECTED = -9;
 
-const isBuiltInScheme = (scheme: string) => ['http', 'https', 'file'].includes(scheme);
+const isBuiltInScheme = (scheme: string) => scheme === 'http' || scheme === 'https';
 
 function makeStreamFromPipe (pipe: any): ReadableStream {
   const buf = new Uint8Array(1024 * 1024 /* 1 MB */);
@@ -66,7 +66,7 @@ function validateResponse (res: Response) {
 
   if (res.type === 'error') return true;
 
-  const exists = (key: string) => Object.prototype.hasOwnProperty.call(res, key);
+  const exists = (key: string) => Object.hasOwn(res, key);
 
   if (exists('status') && typeof res.status !== 'number') return false;
   if (exists('statusText') && typeof res.statusText !== 'string') return false;

lib/browser/api/touch-bar.ts

@@ -83,50 +83,50 @@ abstract class TouchBarItem<ConfigType> extends EventEmitter {
 
 class TouchBarButton extends TouchBarItem<Electron.TouchBarButtonConstructorOptions> implements Electron.TouchBarButton {
   @ImmutableProperty(() => 'button')
-  type!: string;
+    type!: string;
 
   @LiveProperty<TouchBarButton>(config => config.label)
-  label!: string;
+    label!: string;
 
   @LiveProperty<TouchBarButton>(config => config.accessibilityLabel)
-  accessibilityLabel!: string;
+    accessibilityLabel!: string;
 
   @LiveProperty<TouchBarButton>(config => config.backgroundColor)
-  backgroundColor!: string;
+    backgroundColor!: string;
 
   @LiveProperty<TouchBarButton>(config => config.icon)
-  icon!: Electron.NativeImage;
+    icon!: Electron.NativeImage;
 
   @LiveProperty<TouchBarButton>(config => config.iconPosition)
-  iconPosition!: Electron.TouchBarButton['iconPosition'];
+    iconPosition!: Electron.TouchBarButton['iconPosition'];
 
   @LiveProperty<TouchBarButton>(config => typeof config.enabled !== 'boolean' ? true : config.enabled)
-  enabled!: boolean;
+    enabled!: boolean;
 
   @ImmutableProperty<TouchBarButton>(({ click: onClick }) => typeof onClick === 'function' ? () => onClick() : null)
-  onInteraction!: Function | null;
+    onInteraction!: Function | null;
 }
 
 class TouchBarColorPicker extends TouchBarItem<Electron.TouchBarColorPickerConstructorOptions> implements Electron.TouchBarColorPicker {
   @ImmutableProperty(() => 'colorpicker')
-  type!: string;
+    type!: string;
 
   @LiveProperty<TouchBarColorPicker>(config => config.availableColors)
-  availableColors!: string[];
+    availableColors!: string[];
 
   @LiveProperty<TouchBarColorPicker>(config => config.selectedColor)
-  selectedColor!: string;
+    selectedColor!: string;
 
   @ImmutableProperty<TouchBarColorPicker>(({ change: onChange }, setInternalProp) => typeof onChange === 'function' ? (details: { color: string }) => {
     setInternalProp('selectedColor', details.color);
     onChange(details.color);
   } : null)
-  onInteraction!: Function | null;
+    onInteraction!: Function | null;
 }
 
 class TouchBarGroup extends TouchBarItem<Electron.TouchBarGroupConstructorOptions> implements Electron.TouchBarGroup {
   @ImmutableProperty(() => 'group')
-  type!: string;
+    type!: string;
 
   @LiveProperty<TouchBarGroup>(config => config.items instanceof TouchBar ? config.items : new TouchBar(config.items), (self, newChild: TouchBar) => {
     if (self.child) {
@@ -138,39 +138,39 @@ class TouchBarGroup extends TouchBarItem<Electron.TouchBarGroupConstructorOption
       item._addParent(self);
     }
   })
-  child!: TouchBar;
+    child!: TouchBar;
 
   onInteraction = null;
 }
 
 class TouchBarLabel extends TouchBarItem<Electron.TouchBarLabelConstructorOptions> implements Electron.TouchBarLabel {
   @ImmutableProperty(() => 'label')
-  type!: string;
+    type!: string;
 
   @LiveProperty<TouchBarLabel>(config => config.label)
-  label!: string;
+    label!: string;
 
   @LiveProperty<TouchBarLabel>(config => config.accessibilityLabel)
-  accessibilityLabel!: string;
+    accessibilityLabel!: string;
 
   @LiveProperty<TouchBarLabel>(config => config.textColor)
-  textColor!: string;
+    textColor!: string;
 
   onInteraction = null;
 }
 
 class TouchBarPopover extends TouchBarItem<Electron.TouchBarPopoverConstructorOptions> implements Electron.TouchBarPopover {
   @ImmutableProperty(() => 'popover')
-  type!: string;
+    type!: string;
 
   @LiveProperty<TouchBarPopover>(config => config.label)
-  label!: string;
+    label!: string;
 
   @LiveProperty<TouchBarPopover>(config => config.icon)
-  icon!: Electron.NativeImage;
+    icon!: Electron.NativeImage;
 
   @LiveProperty<TouchBarPopover>(config => config.showCloseButton)
-  showCloseButton!: boolean;
+    showCloseButton!: boolean;
 
   @LiveProperty<TouchBarPopover>(config => config.items instanceof TouchBar ? config.items : new TouchBar(config.items), (self, newChild: TouchBar) => {
     if (self.child) {
@@ -182,88 +182,88 @@ class TouchBarPopover extends TouchBarItem<Electron.TouchBarPopoverConstructorOp
       item._addParent(self);
     }
   })
-  child!: TouchBar;
+    child!: TouchBar;
 
   onInteraction = null;
 }
 
 class TouchBarSlider extends TouchBarItem<Electron.TouchBarSliderConstructorOptions> implements Electron.TouchBarSlider {
   @ImmutableProperty(() => 'slider')
-  type!: string;
+    type!: string;
 
   @LiveProperty<TouchBarSlider>(config => config.label)
-  label!: string;
+    label!: string;
 
   @LiveProperty<TouchBarSlider>(config => config.minValue)
-  minValue!: number;
+    minValue!: number;
 
   @LiveProperty<TouchBarSlider>(config => config.maxValue)
-  maxValue!: number;
+    maxValue!: number;
 
   @LiveProperty<TouchBarSlider>(config => config.value)
-  value!: number;
+    value!: number;
 
   @ImmutableProperty<TouchBarSlider>(({ change: onChange }, setInternalProp) => typeof onChange === 'function' ? (details: { value: number }) => {
     setInternalProp('value', details.value);
     onChange(details.value);
   } : null)
-  onInteraction!: Function | null;
+    onInteraction!: Function | null;
 }
 
 class TouchBarSpacer extends TouchBarItem<Electron.TouchBarSpacerConstructorOptions> implements Electron.TouchBarSpacer {
   @ImmutableProperty(() => 'spacer')
-  type!: string;
+    type!: string;
 
   @ImmutableProperty<TouchBarSpacer>(config => config.size)
-  size!: Electron.TouchBarSpacer['size'];
+    size!: Electron.TouchBarSpacer['size'];
 
   onInteraction = null;
 }
 
 class TouchBarSegmentedControl extends TouchBarItem<Electron.TouchBarSegmentedControlConstructorOptions> implements Electron.TouchBarSegmentedControl {
   @ImmutableProperty(() => 'segmented_control')
-  type!: string;
+    type!: string;
 
   @LiveProperty<TouchBarSegmentedControl>(config => config.segmentStyle)
-  segmentStyle!: Electron.TouchBarSegmentedControl['segmentStyle'];
+    segmentStyle!: Electron.TouchBarSegmentedControl['segmentStyle'];
 
   @LiveProperty<TouchBarSegmentedControl>(config => config.segments || [])
-  segments!: Electron.SegmentedControlSegment[];
+    segments!: Electron.SegmentedControlSegment[];
 
   @LiveProperty<TouchBarSegmentedControl>(config => config.selectedIndex)
-  selectedIndex!: number;
+    selectedIndex!: number;
 
   @LiveProperty<TouchBarSegmentedControl>(config => config.mode)
-  mode!: Electron.TouchBarSegmentedControl['mode'];
+    mode!: Electron.TouchBarSegmentedControl['mode'];
 
   @ImmutableProperty<TouchBarSegmentedControl>(({ change: onChange }, setInternalProp) => typeof onChange === 'function' ? (details: { selectedIndex: number, isSelected: boolean }) => {
     setInternalProp('selectedIndex', details.selectedIndex);
     onChange(details.selectedIndex, details.isSelected);
   } : null)
-  onInteraction!: Function | null;
+    onInteraction!: Function | null;
 }
 
 class TouchBarScrubber extends TouchBarItem<Electron.TouchBarScrubberConstructorOptions> implements Electron.TouchBarScrubber {
   @ImmutableProperty(() => 'scrubber')
-  type!: string;
+    type!: string;
 
   @LiveProperty<TouchBarScrubber>(config => config.items)
-  items!: Electron.ScrubberItem[];
+    items!: Electron.ScrubberItem[];
 
   @LiveProperty<TouchBarScrubber>(config => config.selectedStyle || null)
-  selectedStyle!: Electron.TouchBarScrubber['selectedStyle'];
+    selectedStyle!: Electron.TouchBarScrubber['selectedStyle'];
 
   @LiveProperty<TouchBarScrubber>(config => config.overlayStyle || null)
-  overlayStyle!: Electron.TouchBarScrubber['overlayStyle'];
+    overlayStyle!: Electron.TouchBarScrubber['overlayStyle'];
 
   @LiveProperty<TouchBarScrubber>(config => config.showArrowButtons || false)
-  showArrowButtons!: boolean;
+    showArrowButtons!: boolean;
 
   @LiveProperty<TouchBarScrubber>(config => config.mode || 'free')
-  mode!: Electron.TouchBarScrubber['mode'];
+    mode!: Electron.TouchBarScrubber['mode'];
 
   @LiveProperty<TouchBarScrubber>(config => typeof config.continuous === 'undefined' ? true : config.continuous)
-  continuous!: boolean;
+    continuous!: boolean;
 
   @ImmutableProperty<TouchBarScrubber>(({ select: onSelect, highlight: onHighlight }) => typeof onSelect === 'function' || typeof onHighlight === 'function' ? (details: { type: 'select'; selectedIndex: number } | { type: 'highlight'; highlightedIndex: number }) => {
     if (details.type === 'select') {
@@ -272,7 +272,7 @@ class TouchBarScrubber extends TouchBarItem<Electron.TouchBarScrubberConstructor
       if (onHighlight) onHighlight(details.highlightedIndex);
     }
   } : null)
-  onInteraction!: Function | null;
+    onInteraction!: Function | null;
 }
 
 class TouchBarOtherItemsProxy extends TouchBarItem<null> implements Electron.TouchBarOtherItemsProxy {

lib/browser/api/web-contents.ts

@@ -14,8 +14,8 @@ import * as deprecate from '@electron/internal/common/deprecate';
 
 // session is not used here, the purpose is to make sure session is initialized
 // before the webContents module.
-// eslint-disable-next-line
-session
+// eslint-disable-next-line no-unused-expressions
+session;
 
 const webFrameMainBinding = process._linkedBinding('electron_browser_web_frame_main');
 
@@ -447,7 +447,6 @@ WebContents.prototype.loadURL = function (url, options) {
     };
 
     let navigationStarted = false;
-    let browserInitiatedInPageNavigation = false;
     const navigationListener = (event: Electron.Event, url: string, isSameDocument: boolean, isMainFrame: boolean) => {
       if (isMainFrame) {
         if (navigationStarted && !isSameDocument) {
@@ -462,7 +461,6 @@ WebContents.prototype.loadURL = function (url, options) {
           // as the routing does not leave the document
           return rejectAndCleanup(-3, 'ERR_ABORTED', url);
         }
-        browserInitiatedInPageNavigation = navigationStarted && isSameDocument;
         navigationStarted = true;
       }
     };
@@ -477,22 +475,17 @@ WebContents.prototype.loadURL = function (url, options) {
       // would be more appropriate.
       rejectAndCleanup(-2, 'ERR_FAILED', url);
     };
-    const finishListenerWhenUserInitiatedNavigation = () => {
-      if (!browserInitiatedInPageNavigation) {
-        finishListener();
-      }
-    };
     const removeListeners = () => {
       this.removeListener('did-finish-load', finishListener);
       this.removeListener('did-fail-load', failListener);
-      this.removeListener('did-navigate-in-page', finishListenerWhenUserInitiatedNavigation);
+      this.removeListener('did-navigate-in-page', finishListener);
       this.removeListener('did-start-navigation', navigationListener);
       this.removeListener('did-stop-loading', stopLoadingListener);
       this.removeListener('destroyed', stopLoadingListener);
     };
     this.on('did-finish-load', finishListener);
     this.on('did-fail-load', failListener);
-    this.on('did-navigate-in-page', finishListenerWhenUserInitiatedNavigation);
+    this.on('did-navigate-in-page', finishListener);
     this.on('did-start-navigation', navigationListener);
     this.on('did-stop-loading', stopLoadingListener);
     this.on('destroyed', stopLoadingListener);

lib/browser/devtools.ts

@@ -1,6 +1,5 @@
 import { dialog, Menu } from 'electron/main';
 import * as fs from 'fs';
-import * as url from 'url';
 
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
@@ -49,7 +48,7 @@ const getEditMenuItems = function (): Electron.MenuItemConstructorOptions[] {
 };
 
 const isChromeDevTools = function (pageURL: string) {
-  const { protocol } = url.parse(pageURL);
+  const { protocol } = new URL(pageURL);
   return protocol === 'devtools:';
 };
 

lib/browser/guest-view-manager.ts

@@ -8,7 +8,7 @@ import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 interface GuestInstance {
   elementInstanceId: number;
-  visibilityState?: VisibilityState;
+  visibilityState?: DocumentVisibilityState;
   embedder: Electron.WebContents;
   guest: Electron.WebContents;
 }
@@ -96,7 +96,6 @@ const createGuest = function (embedder: Electron.WebContents, embedderFrameId: n
     return -1;
   }
 
-  // eslint-disable-next-line no-undef
   const guest = (webContents as typeof ElectronInternal.WebContents).create({
     ...webPreferences,
     type: 'webview',
@@ -230,7 +229,7 @@ const watchEmbedder = function (embedder: Electron.WebContents) {
   watchedEmbedders.add(embedder);
 
   // Forward embedder window visibility change events to guest
-  const onVisibilityChange = function (visibilityState: VisibilityState) {
+  const onVisibilityChange = function (visibilityState: DocumentVisibilityState) {
     for (const guestInstance of guestInstances.values()) {
       guestInstance.visibilityState = visibilityState;
       if (guestInstance.embedder === embedder) {

lib/browser/init.ts

@@ -84,20 +84,11 @@ const v8Util = process._linkedBinding('electron_common_v8_util');
 let packagePath = null;
 let packageJson = null;
 const searchPaths: string[] = v8Util.getHiddenValue(global, 'appSearchPaths');
-const searchPathsOnlyLoadASAR: boolean = v8Util.getHiddenValue(global, 'appSearchPathsOnlyLoadASAR');
-// Borrow the _getOrCreateArchive asar helper
-const getOrCreateArchive = process._getOrCreateArchive;
-delete process._getOrCreateArchive;
 
 if (process.resourcesPath) {
   for (packagePath of searchPaths) {
     try {
       packagePath = path.join(process.resourcesPath, packagePath);
-      if (searchPathsOnlyLoadASAR) {
-        if (!getOrCreateArchive?.(packagePath)) {
-          continue;
-        }
-      }
       packageJson = Module._load(path.join(packagePath, 'package.json'));
       break;
     } catch {

lib/browser/ipc-main-impl.ts

@@ -19,14 +19,14 @@ export class IpcMainImpl extends EventEmitter {
       throw new Error(`Expected handler to be a function, but found type '${typeof fn}'`);
     }
     this._invokeHandlers.set(method, fn);
-  }
+  };
 
   handleOnce: Electron.IpcMain['handleOnce'] = (method, fn) => {
     this.handle(method, (e, ...args) => {
       this.removeHandler(method);
       return fn(e, ...args);
     });
-  }
+  };
 
   removeHandler (method: string) {
     this._invokeHandlers.delete(method);

lib/browser/message-port-main.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'events';
 
 export class MessagePortMain extends EventEmitter {
-  _internalPort: any
+  _internalPort: any;
   constructor (internalPort: any) {
     super();
     this._internalPort = internalPort;

lib/common/api/clipboard.ts

@@ -1,27 +0,0 @@
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-
-// eslint-disable-next-line no-restricted-imports
-import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
-
-const clipboard = process._linkedBinding('electron_common_clipboard');
-
-if (process.type === 'renderer') {
-  const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils') as typeof ipcRendererUtilsModule;
-
-  const makeRemoteMethod = function (method: keyof Electron.Clipboard): any {
-    return (...args: any[]) => ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, method, ...args);
-  };
-
-  if (process.platform === 'linux') {
-    // On Linux we could not access clipboard in renderer process.
-    for (const method of Object.keys(clipboard) as (keyof Electron.Clipboard)[]) {
-      clipboard[method] = makeRemoteMethod(method);
-    }
-  } else if (process.platform === 'darwin') {
-    // Read/write to find pasteboard over IPC since only main process is notified of changes
-    clipboard.readFindText = makeRemoteMethod('readFindText');
-    clipboard.writeFindText = makeRemoteMethod('writeFindText');
-  }
-}
-
-export default clipboard;

lib/common/api/module-list.ts

@@ -1,6 +1,5 @@
 // Common modules, please sort alphabetically
 export const commonModuleList: ElectronInternal.ModuleEntry[] = [
-  { name: 'clipboard', loader: () => require('./clipboard') },
   { name: 'nativeImage', loader: () => require('./native-image') },
   { name: 'shell', loader: () => require('./shell') }
 ];

lib/common/deprecate.ts

@@ -81,7 +81,8 @@ export function event (emitter: NodeJS.EventEmitter, oldName: string, newName: s
 // remove a property with no replacement
 export function removeProperty<T, K extends (keyof T & string)>(object: T, removedName: K, onlyForValues?: any[]): T {
   // if the property's already been removed, warn about it
-  const info = Object.getOwnPropertyDescriptor((object as any).__proto__, removedName) // eslint-disable-line
+  // eslint-disable-next-line no-proto
+  const info = Object.getOwnPropertyDescriptor((object as any).__proto__, removedName);
   if (!info) {
     log(`Unable to remove property '${removedName}' from an object that lacks it.`);
     return object;
@@ -109,7 +110,7 @@ export function removeProperty<T, K extends (keyof T & string)>(object: T, remov
 }
 
 // change the name of a property
-export function renameProperty<T, K extends (keyof T & string)>(object: T, oldName: string, newName: K): T {
+export function renameProperty<T extends Object, K extends (keyof T & string)>(object: T, oldName: string, newName: K): T {
   const warn = warnOnce(oldName, newName);
 
   // if the new property isn't there yet,

lib/isolated_renderer/init.ts

@@ -1,6 +1,7 @@
-/* global isolatedApi */
-
 import type * as webViewElementModule from '@electron/internal/renderer/web-view/web-view-element';
+import type { WebViewImplHooks } from '@electron/internal/renderer/web-view/web-view-impl';
+
+declare const isolatedApi: WebViewImplHooks;
 
 if (isolatedApi.guestViewInternal) {
   // Must setup the WebView element in main world.

lib/renderer/api/clipboard.ts

@@ -0,0 +1,21 @@
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
+import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
+
+const clipboard = process._linkedBinding('electron_common_clipboard');
+
+const makeRemoteMethod = function (method: keyof Electron.Clipboard): any {
+  return (...args: any[]) => ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_CLIPBOARD_SYNC, method, ...args);
+};
+
+if (process.platform === 'linux') {
+  // On Linux we could not access clipboard in renderer process.
+  for (const method of Object.keys(clipboard) as (keyof Electron.Clipboard)[]) {
+    clipboard[method] = makeRemoteMethod(method);
+  }
+} else if (process.platform === 'darwin') {
+  // Read/write to find pasteboard over IPC since only main process is notified of changes
+  clipboard.readFindText = makeRemoteMethod('readFindText');
+  clipboard.writeFindText = makeRemoteMethod('writeFindText');
+}
+
+export default clipboard;

lib/renderer/api/module-list.ts

@@ -1,5 +1,6 @@
 // Renderer side modules, please sort alphabetically.
 export const rendererModuleList: ElectronInternal.ModuleEntry[] = [
+  { name: 'clipboard', loader: () => require('./clipboard') },
   { name: 'contextBridge', loader: () => require('./context-bridge') },
   { name: 'crashReporter', loader: () => require('./crash-reporter') },
   { name: 'ipcRenderer', loader: () => require('./ipc-renderer') },

lib/renderer/common-init.ts

@@ -17,13 +17,13 @@ const isWebView = mainFrame.getWebPreference('isWebView');
 // ElectronApiServiceImpl will look for the "ipcNative" hidden object when
 // invoking the 'onMessage' callback.
 v8Util.setHiddenValue(global, 'ipcNative', {
-  onMessage (internal: boolean, channel: string, ports: MessagePort[], args: any[], senderId: number, senderIsMainFrame: boolean) {
+  onMessage (internal: boolean, channel: string, ports: MessagePort[], args: any[], senderId: number) {
     if (internal && senderId !== 0) {
       console.error(`Message ${channel} sent by unexpected WebContents (${senderId})`);
       return;
     }
     const sender = internal ? ipcRendererInternal : ipcRenderer;
-    sender.emit(channel, { sender, senderId, ...(senderId ? { senderIsMainFrame } : {}), ports }, ...args);
+    sender.emit(channel, { sender, senderId, ports }, ...args);
   }
 });
 

lib/renderer/init.ts

@@ -57,7 +57,7 @@ require('@electron/internal/renderer/common-init');
 
 if (nodeIntegration) {
   // Export node bindings to global.
-  const { makeRequireFunction } = __non_webpack_require__('internal/modules/cjs/helpers') // eslint-disable-line
+  const { makeRequireFunction } = __non_webpack_require__('internal/modules/cjs/helpers');
   global.module = new Module('electron/js2c/renderer_init');
   global.require = makeRequireFunction(global.module);
 
@@ -122,7 +122,10 @@ if (nodeIntegration) {
   }
 }
 
-const { preloadPaths } = ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_NONSANDBOX_LOAD);
+const { preloadPaths } = ipcRendererUtils.invokeSync<{
+  preloadPaths: string[]
+}>(IPC_MESSAGES.BROWSER_NONSANDBOX_LOAD);
+
 // Load the preload scripts.
 for (const preloadScript of preloadPaths) {
   try {

lib/renderer/security-warnings.ts

@@ -219,7 +219,7 @@ const warnAboutExperimentalFeatures = function (webPreferences?: Electron.WebPre
  */
 const warnAboutEnableBlinkFeatures = function (webPreferences?: Electron.WebPreferences) {
   if (!webPreferences ||
-    !Object.prototype.hasOwnProperty.call(webPreferences, 'enableBlinkFeatures') ||
+    !Object.hasOwn(webPreferences, 'enableBlinkFeatures') ||
     (webPreferences.enableBlinkFeatures != null && webPreferences.enableBlinkFeatures.length === 0)) {
     return;
   }

lib/renderer/web-view/web-view-attributes.ts

@@ -53,7 +53,7 @@ export class WebViewAttribute implements MutationHandler {
   }
 
   // Called when the attribute's value changes.
-  public handleMutation: MutationHandler['handleMutation'] = () => undefined
+  public handleMutation: MutationHandler['handleMutation'] = () => undefined;
 }
 
 // An attribute that is treated as a Boolean.
@@ -73,7 +73,7 @@ class BooleanAttribute extends WebViewAttribute {
 
 // Attribute representing the state of the storage partition.
 export class PartitionAttribute extends WebViewAttribute {
-  public validPartitionId = true
+  public validPartitionId = true;
 
   constructor (public webViewImpl: WebViewImpl) {
     super(WEB_VIEW_ATTRIBUTES.PARTITION, webViewImpl);
@@ -92,7 +92,7 @@ export class PartitionAttribute extends WebViewAttribute {
       this.validPartitionId = false;
       console.error(WEB_VIEW_ERROR_MESSAGES.INVALID_PARTITION_ATTRIBUTE);
     }
-  }
+  };
 }
 
 // Attribute that handles the location and navigation of the webview.
@@ -134,7 +134,7 @@ export class SrcAttribute extends WebViewAttribute {
       return;
     }
     this.parse();
-  }
+  };
 
   // The purpose of this mutation observer is to catch assignment to the src
   // attribute without any changes to its value. This is useful in the case

lib/renderer/web-view/web-view-element.ts

@@ -86,9 +86,7 @@ const defineWebViewElement = (hooks: WebViewImplHooks) => {
 
 // Register <webview> custom element.
 const registerWebViewElement = (hooks: WebViewImplHooks) => {
-  // I wish eslint wasn't so stupid, but it is
-  // eslint-disable-next-line
-  const WebViewElement = defineWebViewElement(hooks) as unknown as typeof ElectronInternal.WebViewElement
+  const WebViewElement = defineWebViewElement(hooks) as unknown as typeof ElectronInternal.WebViewElement;
 
   setupMethods(WebViewElement, hooks);
 

lib/renderer/web-view/web-view-impl.ts

@@ -19,16 +19,16 @@ export interface WebViewImplHooks {
 
 // Represents the internal state of the WebView node.
 export class WebViewImpl {
-  public beforeFirstNavigation = true
-  public elementAttached = false
-  public guestInstanceId?: number
-  public hasFocus = false
+  public beforeFirstNavigation = true;
+  public elementAttached = false;
+  public guestInstanceId?: number;
+  public hasFocus = false;
   public internalInstanceId?: number;
-  public viewInstanceId: number
+  public viewInstanceId: number;
 
   // on* Event handlers.
-  public on: Record<string, any> = {}
-  public internalElement: HTMLIFrameElement
+  public on: Record<string, any> = {};
+  public internalElement: HTMLIFrameElement;
 
   public attributes: Map<string, WebViewAttribute>;
 
@@ -197,8 +197,6 @@ export class WebViewImpl {
   }
 }
 
-// I wish eslint wasn't so stupid, but it is
-// eslint-disable-next-line
 export const setupMethods = (WebViewElement: typeof ElectronInternal.WebViewElement, hooks: WebViewImplHooks) => {
   // Focusing the webview should move page focus to the underlying iframe.
   WebViewElement.prototype.focus = function () {

lib/renderer/window-setup.ts

@@ -30,7 +30,7 @@ export const windowSetup = (isWebView: boolean, isHiddenPage: boolean) => {
     let cachedVisibilityState = isHiddenPage ? 'hidden' : 'visible';
 
     // Subscribe to visibilityState changes.
-    ipcRendererInternal.on(IPC_MESSAGES.GUEST_INSTANCE_VISIBILITY_CHANGE, function (_event, visibilityState: VisibilityState) {
+    ipcRendererInternal.on(IPC_MESSAGES.GUEST_INSTANCE_VISIBILITY_CHANGE, function (_event, visibilityState: DocumentVisibilityState) {
       if (cachedVisibilityState !== visibilityState) {
         cachedVisibilityState = visibilityState;
         document.dispatchEvent(new Event('visibilitychange'));

lib/sandboxed_renderer/init.ts

@@ -1,10 +1,15 @@
-/* global binding */
 import * as events from 'events';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
 import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
 
+declare const binding: {
+  get: (name: string) => any;
+  process: NodeJS.Process;
+  createPreloadScript: (src: string) => Function
+};
+
 const { EventEmitter } = events;
 
 process._linkedBinding = binding.get;
@@ -16,7 +21,7 @@ v8Util.setHiddenValue(global, 'Buffer', Buffer);
 // The process object created by webpack is not an event emitter, fix it so
 // the API is more compatible with non-sandboxed renderers.
 for (const prop of Object.keys(EventEmitter.prototype) as (keyof typeof process)[]) {
-  if (Object.prototype.hasOwnProperty.call(process, prop)) {
+  if (Object.hasOwn(process, prop)) {
     delete process[prop];
   }
 }
@@ -25,7 +30,17 @@ Object.setPrototypeOf(process, EventEmitter.prototype);
 const { ipcRendererInternal } = require('@electron/internal/renderer/ipc-renderer-internal') as typeof ipcRendererInternalModule;
 const ipcRendererUtils = require('@electron/internal/renderer/ipc-renderer-internal-utils') as typeof ipcRendererUtilsModule;
 
-const { preloadScripts, process: processProps } = ipcRendererUtils.invokeSync(IPC_MESSAGES.BROWSER_SANDBOX_LOAD);
+const {
+  preloadScripts,
+  process: processProps
+} = ipcRendererUtils.invokeSync<{
+  preloadScripts: {
+    preloadPath: string;
+    preloadSrc: string | null;
+    preloadError: null | Error;
+  }[];
+  process: NodeJS.Process;
+}>(IPC_MESSAGES.BROWSER_SANDBOX_LOAD);
 
 const electron = require('electron');
 

lib/utility/parent-port.ts

@@ -3,7 +3,7 @@ import { MessagePortMain } from '@electron/internal/browser/message-port-main';
 const { createParentPort } = process._linkedBinding('electron_utility_parent_port');
 
 export class ParentPort extends EventEmitter {
-  #port: ParentPort
+  #port: ParentPort;
   constructor () {
     super();
     this.#port = createParentPort();

lib/worker/init.ts

@@ -16,7 +16,7 @@ require('@electron/internal/common/init');
 const { hasSwitch, getSwitchValue } = process._linkedBinding('electron_common_command_line');
 
 // Export node bindings to global.
-const { makeRequireFunction } = __non_webpack_require__('internal/modules/cjs/helpers') // eslint-disable-line
+const { makeRequireFunction } = __non_webpack_require__('internal/modules/cjs/helpers');
 global.module = new Module('electron/js2c/worker_init');
 global.require = makeRequireFunction(global.module);
 

package.json

@@ -6,11 +6,11 @@
   "devDependencies": {
     "@azure/storage-blob": "^12.9.0",
     "@electron/asar": "^3.2.1",
-    "@electron/docs-parser": "^1.1.0",
+    "@electron/docs-parser": "^1.1.1",
     "@electron/fiddle-core": "^1.0.4",
     "@electron/github-app-auth": "^2.0.0",
     "@electron/lint-roller": "^1.5.0",
-    "@electron/typescript-definitions": "^8.14.0",
+    "@electron/typescript-definitions": "^8.14.5",
     "@octokit/rest": "^19.0.7",
     "@primer/octicons": "^10.0.0",
     "@types/basic-auth": "^1.1.3",
@@ -33,22 +33,21 @@
     "@types/w3c-web-serial": "^1.0.3",
     "@types/webpack": "^5.28.0",
     "@types/webpack-env": "^1.17.0",
-    "@typescript-eslint/eslint-plugin": "^4.4.1",
-    "@typescript-eslint/parser": "^4.4.1",
-    "aws-sdk": "^2.814.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.7",
+    "@typescript-eslint/parser": "^5.59.7",
     "buffer": "^6.0.3",
     "check-for-leaks": "^1.2.1",
     "colors": "1.4.0",
     "dotenv-safe": "^4.0.4",
     "dugite": "^2.3.0",
-    "eslint": "^7.4.0",
+    "eslint": "^8.41.0",
     "eslint-config-standard": "^14.1.1",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-mocha": "^7.0.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
-    "eslint-plugin-typescript": "^0.14.0",
+    "eslint-plugin-unicorn": "^46.0.1",
     "events": "^3.2.0",
     "express": "^4.16.4",
     "folder-hash": "^2.1.1",
@@ -64,7 +63,7 @@
     "process": "^0.11.10",
     "remark-cli": "^10.0.0",
     "remark-preset-lint-markdown-style-guide": "^4.0.0",
-    "semver": "^5.6.0",
+    "semver": "^7.5.2",
     "shx": "^0.3.2",
     "stream-json": "^1.7.1",
     "tap-xunit": "^2.4.1",
@@ -72,7 +71,8 @@
     "timers-browserify": "1.4.2",
     "ts-loader": "^8.0.2",
     "ts-node": "6.2.0",
-    "typescript": "^4.5.5",
+    "typescript": "^5.1.2",
+    "url": "^0.11.0",
     "webpack": "^5.76.0",
     "webpack-cli": "^4.10.0",
     "wrapper-webpack-plugin": "^2.2.0"
@@ -103,6 +103,7 @@
     "gn-format": "python3 script/run-gn-format.py",
     "precommit": "lint-staged",
     "preinstall": "node -e 'process.exit(0)'",
+    "pretest": "npm run create-typescript-definitions",
     "prepack": "check-for-leaks",
     "prepare": "husky install",
     "repl": "node ./script/start.js --interactive",

patches/angle/.patches

@@ -1,6 +0,0 @@
-cherry-pick-d0ee0197ddff.patch
-cherry-pick-285c7712c506.patch
-cherry-pick-2bf945775fe6.patch
-cherry-pick-cafe56b591ed.patch
-cherry-pick-5486190be556.patch
-cherry-pick-e4669a74888d.patch

patches/angle/cherry-pick-285c7712c506.patch

@@ -1,153 +0,0 @@
-From 285c7712c50654e3d7238b059c4631bc91285514 Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Thu, 13 Jul 2023 15:23:49 -0400
-Subject: [PATCH] M116: Translator: Unconditionally limit variable sizes
-
-... instead of just for WebGL.  This is to avoid hitting driver bugs
-that were prevented with this check for WebGL on a compromised renderer
-that can create non-WebGL contexts.
-
-Bug: chromium:1464682
-Change-Id: I2b1c5a8c51f06225f5f850109d30778d97e574c7
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4717371
-Reviewed-by: Roman Lavrov <romanl@google.com>
----
-
-diff --git a/src/compiler/translator/Compiler.cpp b/src/compiler/translator/Compiler.cpp
-index 7b1ac4e..383feeb 100644
---- a/src/compiler/translator/Compiler.cpp
-+++ b/src/compiler/translator/Compiler.cpp
-@@ -397,9 +397,10 @@
- 
- bool TCompiler::shouldLimitTypeSizes() const
- {
--    // WebGL shaders limit the size of variables' types in shaders,
--    // including arrays, structs and interface blocks.
--    return IsWebGLBasedSpec(mShaderSpec);
-+    // Prevent unrealistically large variable sizes in shaders.  This works around driver bugs
-+    // around int-size limits (such as 2GB).  The limits are generously large enough that no real
-+    // shader should ever hit it.
-+    return true;
- }
- 
- bool TCompiler::Init(const ShBuiltInResources &resources)
-diff --git a/src/compiler/translator/ValidateTypeSizeLimitations.cpp b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-index 2a033ad..19a4821 100644
---- a/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-+++ b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-@@ -23,10 +23,10 @@
- // Arbitrarily enforce that all types declared with a size in bytes of over 2 GB will cause
- // compilation failure.
- //
--// For local and global variables, the limit is much lower (1MB) as that much memory won't fit in
-+// For local and global variables, the limit is much lower (16MB) as that much memory won't fit in
- // the GPU registers anyway.
- constexpr size_t kMaxVariableSizeInBytes        = static_cast<size_t>(2) * 1024 * 1024 * 1024;
--constexpr size_t kMaxPrivateVariableSizeInBytes = static_cast<size_t>(1) * 1024 * 1024;
-+constexpr size_t kMaxPrivateVariableSizeInBytes = static_cast<size_t>(16) * 1024 * 1024;
- 
- // Traverses intermediate tree to ensure that the shader does not
- // exceed certain implementation-defined limits on the sizes of types.
-diff --git a/src/compiler/translator/util.cpp b/src/compiler/translator/util.cpp
-index a91f8b0..a866b25 100644
---- a/src/compiler/translator/util.cpp
-+++ b/src/compiler/translator/util.cpp
-@@ -282,6 +282,9 @@
- 
-             return kBoolGLType[type.getNominalSize() - 1];
- 
-+        case EbtYuvCscStandardEXT:
-+            return GL_UNSIGNED_INT;
-+
-         case EbtSampler2D:
-             return GL_SAMPLER_2D;
-         case EbtSampler3D:
-diff --git a/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-index 9ae56f5..a8d2ce4 100644
---- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-@@ -5284,8 +5284,8 @@
- 
-     constexpr char kVSArrayTooLarge[] =
-         R"(varying vec4 color;
--// 1 MB / 32 aligned bytes per mat2 = 32768
--const int array_size = 32769;
-+// 16 MB / 32 aligned bytes per mat2 = 524288
-+const int array_size = 524289;
- void main()
- {
-     mat2 array[array_size];
-@@ -5297,7 +5297,7 @@
- 
-     constexpr char kVSArrayMuchTooLarge[] =
-         R"(varying vec4 color;
--const int array_size = 55600;
-+const int array_size = 757000;
- void main()
- {
-     mat2 array[array_size];
-@@ -5361,9 +5361,9 @@
-     constexpr char kTooLargeGlobalMemory1[] =
-         R"(precision mediump float;
- 
--// 1 MB / 16 bytes per vec4 = 65536
--vec4 array[32768];
--vec4 array2[32769];
-+// 16 MB / 16 bytes per vec4 = 1048576
-+vec4 array[524288];
-+vec4 array2[524289];
- 
- void main()
- {
-@@ -5376,9 +5376,9 @@
-     constexpr char kTooLargeGlobalMemory2[] =
-         R"(precision mediump float;
- 
--// 1 MB / 16 bytes per vec4 = 65536
--vec4 array[32767];
--vec4 array2[32767];
-+// 16 MB / 16 bytes per vec4 = 1048576
-+vec4 array[524287];
-+vec4 array2[524287];
- vec4 x, y, z;
- 
- void main()
-@@ -5392,12 +5392,12 @@
-     constexpr char kTooLargeGlobalAndLocalMemory1[] =
-         R"(precision mediump float;
- 
--// 1 MB / 16 bytes per vec4 = 65536
--vec4 array[32768];
-+// 16 MB / 16 bytes per vec4 = 1048576
-+vec4 array[524288];
- 
- void main()
- {
--    vec4 array2[32769];
-+    vec4 array2[524289];
-     if (array[0].x + array[1].x == 2.0)
-         gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
-     else
-@@ -5408,18 +5408,18 @@
-     constexpr char kTooLargeGlobalAndLocalMemory2[] =
-         R"(precision mediump float;
- 
--// 1 MB / 16 bytes per vec4 = 65536
--vec4 array[32768];
-+// 16 MB / 16 bytes per vec4 = 1048576
-+vec4 array[524288];
- 
- float f()
- {
--    vec4 array2[16384];
-+    vec4 array2[524288];
-     return array2[0].x;
- }
- 
- float g()
- {
--    vec4 array3[16383];
-+    vec4 array3[524287];
-     return array3[0].x;
- }
- 

patches/angle/cherry-pick-2bf945775fe6.patch

@@ -1,197 +0,0 @@
-From 2bf945775fe634eb9e420c2263dae6043bbb5ece Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Fri, 14 Jul 2023 12:30:15 -0400
-Subject: [PATCH] M116: Translator: Limit variable sizes vs uint overflow
-
-Bug: chromium:1464680
-Change-Id: Iee41a2da7a7a330e6cc4d6da59a6e9836ee9dd36
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4717372
-Reviewed-by: Roman Lavrov <romanl@google.com>
----
-
-diff --git a/src/compiler/translator/ValidateTypeSizeLimitations.cpp b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-index 19a4821..f0ff9cb 100644
---- a/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-+++ b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-@@ -7,6 +7,7 @@
- #include "compiler/translator/ValidateTypeSizeLimitations.h"
- 
- #include "angle_gl.h"
-+#include "common/mathutil.h"
- #include "compiler/translator/Diagnostics.h"
- #include "compiler/translator/Symbol.h"
- #include "compiler/translator/SymbolTable.h"
-@@ -113,7 +114,8 @@
- 
-     void validateTotalPrivateVariableSize()
-     {
--        if (mTotalPrivateVariablesSize > kMaxPrivateVariableSizeInBytes)
-+        if (mTotalPrivateVariablesSize.ValueOrDefault(std::numeric_limits<size_t>::max()) >
-+            kMaxPrivateVariableSizeInBytes)
-         {
-             mDiagnostics->error(
-                 TSourceLoc{},
-@@ -231,7 +233,7 @@
-     TDiagnostics *mDiagnostics;
-     std::vector<int> mLoopSymbolIds;
- 
--    size_t mTotalPrivateVariablesSize;
-+    angle::base::CheckedNumeric<size_t> mTotalPrivateVariablesSize;
- };
- 
- }  // namespace
-diff --git a/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-index a8d2ce4..542d49f 100644
---- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-@@ -5426,7 +5426,7 @@
- float h()
- {
-     vec4 value;
--    float value2
-+    float value2;
-     return value.x + value2;
- }
- 
-@@ -5438,6 +5438,131 @@
-         gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
- })";
- 
-+    constexpr char kTooLargeGlobalMemoryOverflow[] =
-+        R"(precision mediump float;
-+
-+// 16 MB / 16 bytes per vec4 = 1048576
-+// Create 256 arrays so each is small, but the total overflows a 32-bit number
-+vec4 array[1048576], array2[1048576], array3[1048576], array4[1048576], array5[1048576];
-+vec4 array6[1048576], array7[1048576], array8[1048576], array9[1048576], array10[1048576];
-+vec4 array11[1048576], array12[1048576], array13[1048576], array14[1048576], array15[1048576];
-+vec4 array16[1048576], array17[1048576], array18[1048576], array19[1048576], array20[1048576];
-+vec4 array21[1048576], array22[1048576], array23[1048576], array24[1048576], array25[1048576];
-+vec4 array26[1048576], array27[1048576], array28[1048576], array29[1048576], array30[1048576];
-+vec4 array31[1048576], array32[1048576], array33[1048576], array34[1048576], array35[1048576];
-+vec4 array36[1048576], array37[1048576], array38[1048576], array39[1048576], array40[1048576];
-+vec4 array41[1048576], array42[1048576], array43[1048576], array44[1048576], array45[1048576];
-+vec4 array46[1048576], array47[1048576], array48[1048576], array49[1048576], array50[1048576];
-+vec4 array51[1048576], array52[1048576], array53[1048576], array54[1048576], array55[1048576];
-+vec4 array56[1048576], array57[1048576], array58[1048576], array59[1048576], array60[1048576];
-+vec4 array61[1048576], array62[1048576], array63[1048576], array64[1048576], array65[1048576];
-+vec4 array66[1048576], array67[1048576], array68[1048576], array69[1048576], array70[1048576];
-+vec4 array71[1048576], array72[1048576], array73[1048576], array74[1048576], array75[1048576];
-+vec4 array76[1048576], array77[1048576], array78[1048576], array79[1048576], array80[1048576];
-+vec4 array81[1048576], array82[1048576], array83[1048576], array84[1048576], array85[1048576];
-+vec4 array86[1048576], array87[1048576], array88[1048576], array89[1048576], array90[1048576];
-+vec4 array91[1048576], array92[1048576], array93[1048576], array94[1048576], array95[1048576];
-+vec4 array96[1048576], array97[1048576], array98[1048576], array99[1048576], array100[1048576];
-+vec4 array101[1048576], array102[1048576], array103[1048576], array104[1048576], array105[1048576];
-+vec4 array106[1048576], array107[1048576], array108[1048576], array109[1048576], array110[1048576];
-+vec4 array111[1048576], array112[1048576], array113[1048576], array114[1048576], array115[1048576];
-+vec4 array116[1048576], array117[1048576], array118[1048576], array119[1048576], array120[1048576];
-+vec4 array121[1048576], array122[1048576], array123[1048576], array124[1048576], array125[1048576];
-+vec4 array126[1048576], array127[1048576], array128[1048576], array129[1048576], array130[1048576];
-+vec4 array131[1048576], array132[1048576], array133[1048576], array134[1048576], array135[1048576];
-+vec4 array136[1048576], array137[1048576], array138[1048576], array139[1048576], array140[1048576];
-+vec4 array141[1048576], array142[1048576], array143[1048576], array144[1048576], array145[1048576];
-+vec4 array146[1048576], array147[1048576], array148[1048576], array149[1048576], array150[1048576];
-+vec4 array151[1048576], array152[1048576], array153[1048576], array154[1048576], array155[1048576];
-+vec4 array156[1048576], array157[1048576], array158[1048576], array159[1048576], array160[1048576];
-+vec4 array161[1048576], array162[1048576], array163[1048576], array164[1048576], array165[1048576];
-+vec4 array166[1048576], array167[1048576], array168[1048576], array169[1048576], array170[1048576];
-+vec4 array171[1048576], array172[1048576], array173[1048576], array174[1048576], array175[1048576];
-+vec4 array176[1048576], array177[1048576], array178[1048576], array179[1048576], array180[1048576];
-+vec4 array181[1048576], array182[1048576], array183[1048576], array184[1048576], array185[1048576];
-+vec4 array186[1048576], array187[1048576], array188[1048576], array189[1048576], array190[1048576];
-+vec4 array191[1048576], array192[1048576], array193[1048576], array194[1048576], array195[1048576];
-+vec4 array196[1048576], array197[1048576], array198[1048576], array199[1048576], array200[1048576];
-+vec4 array201[1048576], array202[1048576], array203[1048576], array204[1048576], array205[1048576];
-+vec4 array206[1048576], array207[1048576], array208[1048576], array209[1048576], array210[1048576];
-+vec4 array211[1048576], array212[1048576], array213[1048576], array214[1048576], array215[1048576];
-+vec4 array216[1048576], array217[1048576], array218[1048576], array219[1048576], array220[1048576];
-+vec4 array221[1048576], array222[1048576], array223[1048576], array224[1048576], array225[1048576];
-+vec4 array226[1048576], array227[1048576], array228[1048576], array229[1048576], array230[1048576];
-+vec4 array231[1048576], array232[1048576], array233[1048576], array234[1048576], array235[1048576];
-+vec4 array236[1048576], array237[1048576], array238[1048576], array239[1048576], array240[1048576];
-+vec4 array241[1048576], array242[1048576], array243[1048576], array244[1048576], array245[1048576];
-+vec4 array246[1048576], array247[1048576], array248[1048576], array249[1048576], array250[1048576];
-+vec4 array251[1048576], array252[1048576], array253[1048576], array254[1048576], array255[1048576];
-+vec4 array256[1048576];
-+
-+void main()
-+{
-+    float f = array[0].x; f += array2[0].x; f += array3[0].x; f += array4[0].x; f += array5[0].x;
-+    f += array6[0].x; f += array7[0].x; f += array8[0].x; f += array9[0].x; f += array10[0].x;
-+    f += array11[0].x; f += array12[0].x; f += array13[0].x; f += array14[0].x; f += array15[0].x;
-+    f += array16[0].x; f += array17[0].x; f += array18[0].x; f += array19[0].x; f += array20[0].x;
-+    f += array21[0].x; f += array22[0].x; f += array23[0].x; f += array24[0].x; f += array25[0].x;
-+    f += array26[0].x; f += array27[0].x; f += array28[0].x; f += array29[0].x; f += array30[0].x;
-+    f += array31[0].x; f += array32[0].x; f += array33[0].x; f += array34[0].x; f += array35[0].x;
-+    f += array36[0].x; f += array37[0].x; f += array38[0].x; f += array39[0].x; f += array40[0].x;
-+    f += array41[0].x; f += array42[0].x; f += array43[0].x; f += array44[0].x; f += array45[0].x;
-+    f += array46[0].x; f += array47[0].x; f += array48[0].x; f += array49[0].x; f += array50[0].x;
-+    f += array51[0].x; f += array52[0].x; f += array53[0].x; f += array54[0].x; f += array55[0].x;
-+    f += array56[0].x; f += array57[0].x; f += array58[0].x; f += array59[0].x; f += array60[0].x;
-+    f += array61[0].x; f += array62[0].x; f += array63[0].x; f += array64[0].x; f += array65[0].x;
-+    f += array66[0].x; f += array67[0].x; f += array68[0].x; f += array69[0].x; f += array70[0].x;
-+    f += array71[0].x; f += array72[0].x; f += array73[0].x; f += array74[0].x; f += array75[0].x;
-+    f += array76[0].x; f += array77[0].x; f += array78[0].x; f += array79[0].x; f += array80[0].x;
-+    f += array81[0].x; f += array82[0].x; f += array83[0].x; f += array84[0].x; f += array85[0].x;
-+    f += array86[0].x; f += array87[0].x; f += array88[0].x; f += array89[0].x; f += array90[0].x;
-+    f += array91[0].x; f += array92[0].x; f += array93[0].x; f += array94[0].x; f += array95[0].x;
-+    f += array96[0].x; f += array97[0].x; f += array98[0].x; f += array99[0].x; f += array100[0].x;
-+    f += array101[0].x; f += array102[0].x; f += array103[0].x; f += array104[0].x;
-+    f += array105[0].x; f += array106[0].x; f += array107[0].x; f += array108[0].x;
-+    f += array109[0].x; f += array110[0].x; f += array111[0].x; f += array112[0].x;
-+    f += array113[0].x; f += array114[0].x; f += array115[0].x; f += array116[0].x;
-+    f += array117[0].x; f += array118[0].x; f += array119[0].x; f += array120[0].x;
-+    f += array121[0].x; f += array122[0].x; f += array123[0].x; f += array124[0].x;
-+    f += array125[0].x; f += array126[0].x; f += array127[0].x; f += array128[0].x;
-+    f += array129[0].x; f += array130[0].x; f += array131[0].x; f += array132[0].x;
-+    f += array133[0].x; f += array134[0].x; f += array135[0].x; f += array136[0].x;
-+    f += array137[0].x; f += array138[0].x; f += array139[0].x; f += array140[0].x;
-+    f += array141[0].x; f += array142[0].x; f += array143[0].x; f += array144[0].x;
-+    f += array145[0].x; f += array146[0].x; f += array147[0].x; f += array148[0].x;
-+    f += array149[0].x; f += array150[0].x; f += array151[0].x; f += array152[0].x;
-+    f += array153[0].x; f += array154[0].x; f += array155[0].x; f += array156[0].x;
-+    f += array157[0].x; f += array158[0].x; f += array159[0].x; f += array160[0].x;
-+    f += array161[0].x; f += array162[0].x; f += array163[0].x; f += array164[0].x;
-+    f += array165[0].x; f += array166[0].x; f += array167[0].x; f += array168[0].x;
-+    f += array169[0].x; f += array170[0].x; f += array171[0].x; f += array172[0].x;
-+    f += array173[0].x; f += array174[0].x; f += array175[0].x; f += array176[0].x;
-+    f += array177[0].x; f += array178[0].x; f += array179[0].x; f += array180[0].x;
-+    f += array181[0].x; f += array182[0].x; f += array183[0].x; f += array184[0].x;
-+    f += array185[0].x; f += array186[0].x; f += array187[0].x; f += array188[0].x;
-+    f += array189[0].x; f += array190[0].x; f += array191[0].x; f += array192[0].x;
-+    f += array193[0].x; f += array194[0].x; f += array195[0].x; f += array196[0].x;
-+    f += array197[0].x; f += array198[0].x; f += array199[0].x; f += array200[0].x;
-+    f += array201[0].x; f += array202[0].x; f += array203[0].x; f += array204[0].x;
-+    f += array205[0].x; f += array206[0].x; f += array207[0].x; f += array208[0].x;
-+    f += array209[0].x; f += array210[0].x; f += array211[0].x; f += array212[0].x;
-+    f += array213[0].x; f += array214[0].x; f += array215[0].x; f += array216[0].x;
-+    f += array217[0].x; f += array218[0].x; f += array219[0].x; f += array220[0].x;
-+    f += array221[0].x; f += array222[0].x; f += array223[0].x; f += array224[0].x;
-+    f += array225[0].x; f += array226[0].x; f += array227[0].x; f += array228[0].x;
-+    f += array229[0].x; f += array230[0].x; f += array231[0].x; f += array232[0].x;
-+    f += array233[0].x; f += array234[0].x; f += array235[0].x; f += array236[0].x;
-+    f += array237[0].x; f += array238[0].x; f += array239[0].x; f += array240[0].x;
-+    f += array241[0].x; f += array242[0].x; f += array243[0].x; f += array244[0].x;
-+    f += array245[0].x; f += array246[0].x; f += array247[0].x; f += array248[0].x;
-+    f += array249[0].x; f += array250[0].x; f += array251[0].x; f += array252[0].x;
-+    f += array253[0].x; f += array254[0].x; f += array255[0].x; f += array256[0].x;
-+    if (f == 2.0)
-+        gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
-+    else
-+        gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
-+})";
-+
-     GLuint program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalMemory1);
-     EXPECT_EQ(0u, program);
- 
-@@ -5449,6 +5574,9 @@
- 
-     program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalAndLocalMemory2);
-     EXPECT_EQ(0u, program);
-+
-+    program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalMemoryOverflow);
-+    EXPECT_EQ(0u, program);
- }
- 
- // Linking should fail when corresponding vertex/fragment uniform blocks have different precision

patches/angle/cherry-pick-5486190be556.patch

@@ -1,42 +0,0 @@
-From 5486190be5565f9b5567fbd252a10425af3d59ee Mon Sep 17 00:00:00 2001
-From: Geoff Lang <geofflang@chromium.org>
-Date: Fri, 21 Jul 2023 13:45:52 -0400
-Subject: [PATCH] [M114-LTS] Fix read size validation for RGBX formats.
-
-GL_RGBX8_ANGLE is the only format where the upload format is 3-channel
-RGB, whilethe download format is 4-channel RGBX.  As such, the internal
-format corresponding to format+type expects 3-byte input/output.  The
-format is fixed here for readPixels to output 4 bytes per pixel.
-
-Bug: chromium:1458046
-Change-Id: Iec737ed64bade003cfab50dc5f595eb4875e81e4
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4706957
-Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
-(cherry picked from commit 430a4f559cbc2bcd5d026e8b36ee46ddd80e9651)
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4765136
-Commit-Queue: Daniel Yip <danielyip@google.com>
-Auto-Submit: Daniel Yip <danielyip@google.com>
-(cherry picked from commit 4a372ad49ceddea6c13f79adb212a777ec770a66)
----
-
-diff --git a/src/libANGLE/formatutils.cpp b/src/libANGLE/formatutils.cpp
-index f2845dc..bb1389aaa 100644
---- a/src/libANGLE/formatutils.cpp
-+++ b/src/libANGLE/formatutils.cpp
-@@ -1702,7 +1702,15 @@
- GLuint InternalFormat::computePixelBytes(GLenum formatType) const
- {
-     const auto &typeInfo = GetTypeInfo(formatType);
--    GLuint components    = typeInfo.specialInterpretation ? 1u : componentCount;
-+    GLuint components    = componentCount;
-+    if (sizedInternalFormat == GL_RGBX8_ANGLE)
-+    {
-+        components = 4;
-+    }
-+    else if (typeInfo.specialInterpretation)
-+    {
-+        components = 1;
-+    }
-     return components * typeInfo.bytes;
- }
- 

patches/angle/cherry-pick-cafe56b591ed.patch

@@ -1,286 +0,0 @@
-From cafe56b591edb77f041be70b58cac3a61565644a Mon Sep 17 00:00:00 2001
-From: Geoff Lang <geofflang@chromium.org>
-Date: Fri, 23 Jun 2023 14:46:28 -0400
-Subject: [PATCH] M116: GL: Ensure all instanced attributes have a buffer with data
-
-Apple OpenGL drivers sometimes crash when given an instanced draw with
-a buffer that has never been given data.
-
-It's not efficient to check if the attribute is both zero-sized and
-instanced so just ensure that every time a zero-sized buffer is bound
-to an attribute, it gets initialized with some data.
-
-Bug: chromium:1456243
-Change-Id: I66b7c7017843153db2df3bc50010cba765d03c5f
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4642048
-Commit-Queue: Geoff Lang <geofflang@chromium.org>
-Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
-(cherry picked from commit 4e6124dae892690204f8e5996aeaad14f45e0a97)
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4727452
----
-
-diff --git a/include/platform/FeaturesGL_autogen.h b/include/platform/FeaturesGL_autogen.h
-index aa0565c..2f6e094 100644
---- a/include/platform/FeaturesGL_autogen.h
-+++ b/include/platform/FeaturesGL_autogen.h
-@@ -501,6 +501,12 @@
-         "supportsShaderPixelLocalStorageEXT", FeatureCategory::OpenGLFeatures,
-         "Backend GL context supports EXT_shader_pixel_local_storage extension", &members,
-         "http://anglebug.com/7279"};
-+
-+    FeatureInfo ensureNonEmptyBufferIsBoundForDraw = {
-+        "ensureNonEmptyBufferIsBoundForDraw", FeatureCategory::OpenGLFeatures,
-+        "Apple OpenGL drivers crash when drawing with a zero-sized buffer bound using a non-zero "
-+        "divisor.",
-+        &members, "http://crbug.com/1456243"};
- };
- 
- inline FeaturesGL::FeaturesGL()  = default;
-diff --git a/include/platform/gl_features.json b/include/platform/gl_features.json
-index 032f29a..b358cea 100644
---- a/include/platform/gl_features.json
-+++ b/include/platform/gl_features.json
-@@ -699,6 +699,14 @@
-                 "Backend GL context supports EXT_shader_pixel_local_storage extension"
-             ],
-             "issue": "http://anglebug.com/7279"
-+        },
-+        {
-+            "name": "ensure_non_empty_buffer_is_bound_for_draw",
-+            "category": "Features",
-+            "description": [
-+                "Apple OpenGL drivers crash when drawing with a zero-sized buffer bound using a non-zero divisor."
-+            ],
-+            "issue": "http://crbug.com/1456243"
-         }
-     ]
- }
-diff --git a/scripts/code_generation_hashes/ANGLE_features.json b/scripts/code_generation_hashes/ANGLE_features.json
-index d4576c2..503001c 100644
---- a/scripts/code_generation_hashes/ANGLE_features.json
-+++ b/scripts/code_generation_hashes/ANGLE_features.json
-@@ -2,7 +2,7 @@
-   "include/platform/FeaturesD3D_autogen.h":
-     "9923fb44d0a6f31948d0c8f46ee1d9e2",
-   "include/platform/FeaturesGL_autogen.h":
--    "a795a806d71b0e6d1f9e6d95c6e11971",
-+    "fef16ab3946346a2a7d5b76bb39471a4",
-   "include/platform/FeaturesMtl_autogen.h":
-     "407426c8874de9295482ace9c94bd812",
-   "include/platform/FeaturesVk_autogen.h":
-@@ -16,13 +16,13 @@
-   "include/platform/gen_features.py":
-     "062989f7a8f3ff3b383f98fc8908dc33",
-   "include/platform/gl_features.json":
--    "3335055a70e35ebb7bf74c6d7c58897b",
-+    "c9aead89696e7fd0c8bfe5c5ca85ca63",
-   "include/platform/mtl_features.json":
-     "c66d170e7a8eb3448030f4c423ed0133",
-   "include/platform/vk_features.json":
-     "416bbb28b9fa1a3c4ef141f243c0a9e6",
-   "util/angle_features_autogen.cpp":
--    "73169f63c755192c3b4bd27d6f4096ca",
-+    "288daaec490eb816883d744f108d74c9",
-   "util/angle_features_autogen.h":
--    "7aa8120eb8f8fd335946b8c27074745d"
-+    "daf25d3e4ffea143d1c082416513f7e7"
- }
-\ No newline at end of file
-diff --git a/src/libANGLE/renderer/gl/BufferGL.cpp b/src/libANGLE/renderer/gl/BufferGL.cpp
-index c99fd5d..9651838 100644
---- a/src/libANGLE/renderer/gl/BufferGL.cpp
-+++ b/src/libANGLE/renderer/gl/BufferGL.cpp
-@@ -296,6 +296,11 @@
-     return angle::Result::Continue;
- }
- 
-+size_t BufferGL::getBufferSize() const
-+{
-+    return mBufferSize;
-+}
-+
- GLuint BufferGL::getBufferID() const
- {
-     return mBufferID;
-diff --git a/src/libANGLE/renderer/gl/BufferGL.h b/src/libANGLE/renderer/gl/BufferGL.h
-index 7b57594..fe9138e 100644
---- a/src/libANGLE/renderer/gl/BufferGL.h
-+++ b/src/libANGLE/renderer/gl/BufferGL.h
-@@ -56,6 +56,7 @@
-                                 bool primitiveRestartEnabled,
-                                 gl::IndexRange *outRange) override;
- 
-+    size_t getBufferSize() const;
-     GLuint getBufferID() const;
- 
-   private:
-diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
-index dc981de..fda9099 100644
---- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
-+++ b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
-@@ -646,6 +646,7 @@
- 
- angle::Result VertexArrayGL::updateAttribPointer(const gl::Context *context, size_t attribIndex)
- {
-+    const angle::FeaturesGL &features = GetFeaturesGL(context);
- 
-     const VertexAttribute &attrib = mState.getVertexAttribute(attribIndex);
- 
-@@ -687,8 +688,16 @@
-     // is not NULL.
- 
-     StateManagerGL *stateManager = GetStateManagerGL(context);
--    GLuint bufferId              = GetNativeBufferID(arrayBuffer);
-+    BufferGL *bufferGL           = GetImplAs<BufferGL>(arrayBuffer);
-+    GLuint bufferId              = bufferGL->getBufferID();
-     stateManager->bindBuffer(gl::BufferBinding::Array, bufferId);
-+    if (features.ensureNonEmptyBufferIsBoundForDraw.enabled && bufferGL->getBufferSize() == 0)
-+    {
-+        constexpr uint32_t data = 0;
-+        ANGLE_TRY(bufferGL->setData(context, gl::BufferBinding::Array, &data, sizeof(data),
-+                                    gl::BufferUsage::StaticDraw));
-+        ASSERT(bufferGL->getBufferSize() > 0);
-+    }
-     ANGLE_TRY(callVertexAttribPointer(context, static_cast<GLuint>(attribIndex), attrib,
-                                       binding.getStride(), binding.getOffset()));
- 
-diff --git a/src/libANGLE/renderer/gl/renderergl_utils.cpp b/src/libANGLE/renderer/gl/renderergl_utils.cpp
-index 6911247..ab2a608 100644
---- a/src/libANGLE/renderer/gl/renderergl_utils.cpp
-+++ b/src/libANGLE/renderer/gl/renderergl_utils.cpp
-@@ -2465,6 +2465,9 @@
-     // EXT_shader_pixel_local_storage
-     ANGLE_FEATURE_CONDITION(features, supportsShaderPixelLocalStorageEXT,
-                             functions->hasGLESExtension("GL_EXT_shader_pixel_local_storage"));
-+
-+    // http://crbug.com/1456243
-+    ANGLE_FEATURE_CONDITION(features, ensureNonEmptyBufferIsBoundForDraw, IsApple() || IsAndroid());
- }
- 
- void InitializeFrontendFeatures(const FunctionsGL *functions, angle::FrontendFeatures *features)
-diff --git a/src/tests/angle_end2end_tests_expectations.txt b/src/tests/angle_end2end_tests_expectations.txt
-index 59ec7c2..44ff3e4 100644
---- a/src/tests/angle_end2end_tests_expectations.txt
-+++ b/src/tests/angle_end2end_tests_expectations.txt
-@@ -380,6 +380,7 @@
- 7294 WIN D3D11 : StateChangeTestES3.StencilWriteMask/* = SKIP
- 7316 WIN D3D11 : StateChangeTestES3.StencilTestAndFunc/* = SKIP
- 7329 WIN D3D11 : StateChangeTestES3.PrimitiveRestart/* = SKIP
-+1456243 WIN D3D11 : WebGL2CompatibilityTest.DrawWithZeroSizedBuffer/* = SKIP
- 
- // Android
- 6095 ANDROID GLES : GLSLTest_ES3.InitGlobalComplexConstant/* = SKIP
-diff --git a/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-index 7dc56cd..bd7ecd1 100644
---- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-@@ -1632,10 +1632,10 @@
- 
-     constexpr GLuint kMaxIntAsGLuint = static_cast<GLuint>(std::numeric_limits<GLint>::max());
-     constexpr GLuint kIndexData[]    = {
--           kMaxIntAsGLuint,
--           kMaxIntAsGLuint + 1,
--           kMaxIntAsGLuint + 2,
--           kMaxIntAsGLuint + 3,
-+        kMaxIntAsGLuint,
-+        kMaxIntAsGLuint + 1,
-+        kMaxIntAsGLuint + 2,
-+        kMaxIntAsGLuint + 3,
-     };
- 
-     GLBuffer indexBuffer;
-@@ -3687,8 +3687,8 @@
- 
-     constexpr float readPixelsData[] = {-5000.0f, 0.0f, 0.0f, 1.0f};
-     const GLushort textureData[]     = {
--            gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
--            gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
-+        gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
-+        gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
- 
-     for (auto extension : FloatingPointTextureExtensions)
-     {
-@@ -3748,8 +3748,8 @@
- 
-     constexpr float readPixelsData[] = {7108.0f, -10.0f, 0.0f, 1.0f};
-     const GLushort textureData[]     = {
--            gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
--            gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
-+        gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
-+        gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
- 
-     for (auto extension : FloatingPointTextureExtensions)
-     {
-@@ -3811,8 +3811,8 @@
- 
-     constexpr float readPixelsData[] = {7000.0f, 100.0f, 33.0f, 1.0f};
-     const GLushort textureData[]     = {
--            gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
--            gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
-+        gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
-+        gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
- 
-     for (auto extension : FloatingPointTextureExtensions)
-     {
-@@ -3874,8 +3874,8 @@
- 
-     constexpr float readPixelsData[] = {7000.0f, 100.0f, 33.0f, -1.0f};
-     const GLushort textureData[]     = {
--            gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
--            gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
-+        gl::float32ToFloat16(readPixelsData[0]), gl::float32ToFloat16(readPixelsData[1]),
-+        gl::float32ToFloat16(readPixelsData[2]), gl::float32ToFloat16(readPixelsData[3])};
- 
-     for (auto extension : FloatingPointTextureExtensions)
-     {
-@@ -5803,6 +5803,26 @@
-     }
- }
- 
-+// Test for a mishandling of instanced vertex attributes with zero-sized buffers bound on Apple
-+// OpenGL drivers.
-+TEST_P(WebGL2CompatibilityTest, DrawWithZeroSizedBuffer)
-+{
-+    ANGLE_GL_PROGRAM(program, essl3_shaders::vs::Simple(), essl3_shaders::fs::Red());
-+    glUseProgram(program);
-+
-+    GLBuffer buffer;
-+    glBindBuffer(GL_ARRAY_BUFFER, buffer);
-+
-+    GLint posLocation = glGetAttribLocation(program, essl3_shaders::PositionAttrib());
-+    glEnableVertexAttribArray(posLocation);
-+
-+    glVertexAttribDivisor(posLocation, 1);
-+    glVertexAttribPointer(posLocation, 1, GL_UNSIGNED_BYTE, GL_FALSE, 9,
-+                          reinterpret_cast<void *>(0x41424344));
-+
-+    glDrawArrays(GL_TRIANGLES, 0, 6);
-+}
-+
- ANGLE_INSTANTIATE_TEST_ES2_AND_ES3(WebGLCompatibilityTest);
- 
- GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(WebGL2CompatibilityTest);
-diff --git a/util/angle_features_autogen.cpp b/util/angle_features_autogen.cpp
-index adb9610..a060dd2 100644
---- a/util/angle_features_autogen.cpp
-+++ b/util/angle_features_autogen.cpp
-@@ -118,6 +118,7 @@
-     {Feature::EnablePrecisionQualifiers, "enablePrecisionQualifiers"},
-     {Feature::EnablePreRotateSurfaces, "enablePreRotateSurfaces"},
-     {Feature::EnableProgramBinaryForCapture, "enableProgramBinaryForCapture"},
-+    {Feature::EnsureNonEmptyBufferIsBoundForDraw, "ensureNonEmptyBufferIsBoundForDraw"},
-     {Feature::ExpandIntegerPowExpressions, "expandIntegerPowExpressions"},
-     {Feature::ExplicitlyEnablePerSampleShading, "explicitlyEnablePerSampleShading"},
-     {Feature::ExposeNonConformantExtensionsAndVersions, "exposeNonConformantExtensionsAndVersions"},
-diff --git a/util/angle_features_autogen.h b/util/angle_features_autogen.h
-index 3d8c47f..4064425 100644
---- a/util/angle_features_autogen.h
-+++ b/util/angle_features_autogen.h
-@@ -112,6 +112,7 @@
-     EnablePrecisionQualifiers,
-     EnablePreRotateSurfaces,
-     EnableProgramBinaryForCapture,
-+    EnsureNonEmptyBufferIsBoundForDraw,
-     ExpandIntegerPowExpressions,
-     ExplicitlyEnablePerSampleShading,
-     ExposeNonConformantExtensionsAndVersions,

patches/angle/cherry-pick-d0ee0197ddff.patch

@@ -1,208 +0,0 @@
-From d0ee0197ddff25fe1a9876511c07542ac483702d Mon Sep 17 00:00:00 2001
-From: Shahbaz Youssefi <syoussefi@chromium.org>
-Date: Wed, 03 May 2023 13:41:36 -0400
-Subject: [PATCH] WebGL: Limit total size of private data
-
-... not just individual arrays.
-
-Bug: chromium:1431761
-Change-Id: I721e29aeceeaf12c3f6a67b668abffb8dfbc89b0
-Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4503753
-Reviewed-by: Kenneth Russell <kbr@chromium.org>
-Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
----
-
-diff --git a/src/compiler/translator/ValidateTypeSizeLimitations.cpp b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-index 6097b6d..2a033ad 100644
---- a/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-+++ b/src/compiler/translator/ValidateTypeSizeLimitations.cpp
-@@ -35,7 +35,9 @@
- {
-   public:
-     ValidateTypeSizeLimitationsTraverser(TSymbolTable *symbolTable, TDiagnostics *diagnostics)
--        : TIntermTraverser(true, false, false, symbolTable), mDiagnostics(diagnostics)
-+        : TIntermTraverser(true, false, false, symbolTable),
-+          mDiagnostics(diagnostics),
-+          mTotalPrivateVariablesSize(0)
-     {
-         ASSERT(diagnostics);
-     }
-@@ -93,18 +95,33 @@
-             const bool isPrivate = variableType.getQualifier() == EvqTemporary ||
-                                    variableType.getQualifier() == EvqGlobal ||
-                                    variableType.getQualifier() == EvqConst;
--            if (layoutEncoder.getCurrentOffset() > kMaxPrivateVariableSizeInBytes && isPrivate)
-+            if (isPrivate)
-             {
--                error(asSymbol->getLine(),
--                      "Size of declared private variable exceeds implementation-defined limit",
--                      asSymbol->getName());
--                return false;
-+                if (layoutEncoder.getCurrentOffset() > kMaxPrivateVariableSizeInBytes)
-+                {
-+                    error(asSymbol->getLine(),
-+                          "Size of declared private variable exceeds implementation-defined limit",
-+                          asSymbol->getName());
-+                    return false;
-+                }
-+                mTotalPrivateVariablesSize += layoutEncoder.getCurrentOffset();
-             }
-         }
- 
-         return true;
-     }
- 
-+    void validateTotalPrivateVariableSize()
-+    {
-+        if (mTotalPrivateVariablesSize > kMaxPrivateVariableSizeInBytes)
-+        {
-+            mDiagnostics->error(
-+                TSourceLoc{},
-+                "Total size of declared private variables exceeds implementation-defined limit",
-+                "");
-+        }
-+    }
-+
-   private:
-     void error(TSourceLoc loc, const char *reason, const ImmutableString &token)
-     {
-@@ -213,6 +230,8 @@
- 
-     TDiagnostics *mDiagnostics;
-     std::vector<int> mLoopSymbolIds;
-+
-+    size_t mTotalPrivateVariablesSize;
- };
- 
- }  // namespace
-@@ -223,6 +242,7 @@
- {
-     ValidateTypeSizeLimitationsTraverser validate(symbolTable, diagnostics);
-     root->traverse(&validate);
-+    validate.validateTotalPrivateVariableSize();
-     return diagnostics->numErrors() == 0;
- }
- 
-diff --git a/src/tests/gl_tests/WebGLCompatibilityTest.cpp b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-index e62c8fb..996bad1 100644
---- a/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-+++ b/src/tests/gl_tests/WebGLCompatibilityTest.cpp
-@@ -5271,11 +5271,12 @@
-     // fairly small array.
-     constexpr char kVSArrayOK[] =
-         R"(varying vec4 color;
--const int array_size = 1000;
-+const int array_size = 500;
- void main()
- {
-     mat2 array[array_size];
--    if (array[0][0][0] == 2.0)
-+    mat2 array2[array_size];
-+    if (array[0][0][0] + array2[0][0][0] == 2.0)
-         color = vec4(0.0, 1.0, 0.0, 1.0);
-     else
-         color = vec4(1.0, 0.0, 0.0, 1.0);
-@@ -5353,6 +5354,103 @@
-     EXPECT_EQ(0u, program);
- }
- 
-+// Reject attempts to allocate too much private memory.
-+// This is an implementation-defined limit - crbug.com/1431761.
-+TEST_P(WebGLCompatibilityTest, ValidateTotalPrivateSize)
-+{
-+    constexpr char kTooLargeGlobalMemory1[] =
-+        R"(precision mediump float;
-+
-+// 1 MB / 16 bytes per vec4 = 65536
-+vec4 array[32768];
-+vec4 array2[32769];
-+
-+void main()
-+{
-+    if (array[0].x + array[1].x == 0.)
-+        gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
-+    else
-+        gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
-+})";
-+
-+    constexpr char kTooLargeGlobalMemory2[] =
-+        R"(precision mediump float;
-+
-+// 1 MB / 16 bytes per vec4 = 65536
-+vec4 array[32767];
-+vec4 array2[32767];
-+vec4 x, y, z;
-+
-+void main()
-+{
-+    if (array[0].x + array[1].x == x.w + y.w + z.w)
-+        gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
-+    else
-+        gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
-+})";
-+
-+    constexpr char kTooLargeGlobalAndLocalMemory1[] =
-+        R"(precision mediump float;
-+
-+// 1 MB / 16 bytes per vec4 = 65536
-+vec4 array[32768];
-+
-+void main()
-+{
-+    vec4 array2[32769];
-+    if (array[0].x + array[1].x == 2.0)
-+        gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
-+    else
-+        gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
-+})";
-+
-+    // Note: The call stack is not taken into account for the purposes of total memory calculation.
-+    constexpr char kTooLargeGlobalAndLocalMemory2[] =
-+        R"(precision mediump float;
-+
-+// 1 MB / 16 bytes per vec4 = 65536
-+vec4 array[32768];
-+
-+float f()
-+{
-+    vec4 array2[16384];
-+    return array2[0].x;
-+}
-+
-+float g()
-+{
-+    vec4 array3[16383];
-+    return array3[0].x;
-+}
-+
-+float h()
-+{
-+    vec4 value;
-+    float value2
-+    return value.x + value2;
-+}
-+
-+void main()
-+{
-+    if (array[0].x + f() + g() + h() == 2.0)
-+        gl_FragColor = vec4(0.0, 1.0, 0.0, 1.0);
-+    else
-+        gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);
-+})";
-+
-+    GLuint program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalMemory1);
-+    EXPECT_EQ(0u, program);
-+
-+    program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalMemory2);
-+    EXPECT_EQ(0u, program);
-+
-+    program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalAndLocalMemory1);
-+    EXPECT_EQ(0u, program);
-+
-+    program = CompileProgram(essl1_shaders::vs::Simple(), kTooLargeGlobalAndLocalMemory2);
-+    EXPECT_EQ(0u, program);
-+}
-+
- // Linking should fail when corresponding vertex/fragment uniform blocks have different precision
- // qualifiers.
- TEST_P(WebGL2CompatibilityTest, UniformBlockPrecisionMismatch)