build: fix release, add newVersion for tagging (#42843 )

refactor: run Windows SelectFileDialog out of process (#42825 )
refactor: run Windows SelectFileDialog out of process
2026-04-10 03:01:51 -04:00 · 2024-07-09 11:08:59 -07:00 · 2024-07-09 19:03:13 +02:00 · 2024-07-09 11:03:45 +02:00 · 2024-07-08 13:49:23 -04:00 · 2024-07-08 13:48:47 -04:00
1290 changed files with 21876 additions and 30114 deletions
--- a/.autofix.markdownlint-cli2.jsonc
+++ b/.autofix.markdownlint-cli2.jsonc
@@ -1,8 +0,0 @@
-{
-  "config": {
-    "default": false,
-    "no-trailing-spaces": {
-      "br_spaces": 0
-    }
-  }
-}
--- a/.circleci/.gitignore
+++ b/.circleci/.gitignore
@@ -0,0 +1 @@
+config-staging
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -0,0 +1,79 @@
+version: 2.1
+
+# Required for dynamic configuration
+setup: true
+
+# Orbs
+orbs:
+  path-filtering: circleci/path-filtering@0.1.0
+  continuation: circleci/continuation@0.2.0
+
+# All input parameters to pass to build config
+parameters:
+  run-docs-only:
+    type: boolean
+    default: false
+
+  upload-to-storage:
+    type: string
+    default: '1'
+
+  run-build-linux:
+    type: boolean
+    default: false
+
+  run-build-mac:
+    type: boolean
+    default: false
+
+  run-linux-publish:
+    type: boolean
+    default: false
+
+  linux-publish-arch-limit:
+    type: enum
+    default: all
+    enum: ["all", "arm", "arm64", "x64", "ia32"]
+
+  run-macos-publish:
+    type: boolean
+    default: false
+
+  macos-publish-arch-limit:
+    type: enum
+    default: all
+    enum: ["all", "osx-x64", "osx-arm64", "mas-x64", "mas-arm64"]
+
+jobs:
+  generate-config:
+    docker:
+      - image: cimg/node:16.14
+    steps:
+      - checkout
+      - path-filtering/set-parameters:
+          base-revision: main
+          mapping: |
+            ^((?!docs/).)*$ run-build-mac true
+            ^((?!docs/).)*$ run-build-linux true
+            docs/.* run-docs-only true
+            ^((?!docs/).)*$ run-docs-only false
+      - run:
+          command: |
+            cd .circleci/config
+            yarn
+            export CIRCLECI_BINARY="$HOME/circleci"
+            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
+
+# Initial setup workflow
+workflows:
+  setup:
+    jobs:
+      - generate-config
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
--- a/.circleci/config/build.js
+++ b/.circleci/config/build.js
@@ -0,0 +1,34 @@
+const cp = require('child_process');
+const fs = require('fs-extra');
+const path = require('path');
+const yaml = require('js-yaml');
+
+const STAGING_DIR = path.resolve(__dirname, '..', 'config-staging');
+
+function copyAndExpand(dir = './') {
+    const absDir = path.resolve(__dirname, dir);
+    const targetDir = path.resolve(STAGING_DIR, dir);
+
+    if (!fs.existsSync(targetDir)) {
+        fs.mkdirSync(targetDir);
+    }
+
+    for (const file of fs.readdirSync(absDir)) {
+        if (!file.endsWith('.yml')) {
+            if (fs.statSync(path.resolve(absDir, file)).isDirectory()) {
+                copyAndExpand(path.join(dir, file));
+            }
+            continue;
+        }
+
+        fs.writeFileSync(path.resolve(targetDir, file), yaml.dump(yaml.load(fs.readFileSync(path.resolve(absDir, file), 'utf8')), {
+            noRefs: true,
+        }));
+    }
+}
+
+if (fs.pathExists(STAGING_DIR)) fs.removeSync(STAGING_DIR);
+copyAndExpand();
+
+const output = cp.spawnSync(process.env.CIRCLECI_BINARY || 'circleci', ['config', 'pack', STAGING_DIR]);
+fs.writeFileSync(path.resolve(STAGING_DIR, 'built.yml'), output.stdout.toString());
--- a/.circleci/config/jobs/lint.yml
+++ b/.circleci/config/jobs/lint.yml
@@ -0,0 +1,51 @@
+executor:
+  name: linux-docker
+  size: medium
+steps:
+  - checkout:
+      path: src/electron
+  - run:
+      name: Setup third_party Depot Tools
+      command: |
+        # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
+        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
+        echo 'export PATH="$PATH:'"$PWD"'/src/third_party/depot_tools"' >> $BASH_ENV
+  - run:
+      name: Download GN Binary
+      command: |
+        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
+        gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
+
+        cipd ensure -ensure-file - -root . \<<-CIPD
+        \$ServiceURL https://chrome-infra-packages.appspot.com/
+        @Subdir src/buildtools/linux64
+        gn/gn/linux-amd64 $gn_version
+        CIPD
+
+        echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
+  - run:
+      name: Download clang-format Binary
+      command: |
+        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
+
+        sha1_path='buildtools/linux64/clang-format.sha1'
+        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"
+
+        download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
+  - run:
+      name: Run Lint
+      command: |
+        # gn.py tries to find a gclient root folder starting from the current dir.
+        # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
+        touch .gclient
+        # Another option would be to checkout "buildtools" inside the Electron checkout,
+        # but then we would lint its contents (at least gn format), and it doesn't pass it.
+
+        cd src/electron
+        node script/yarn install --frozen-lockfile
+        node script/yarn lint
+  - run:
+      name: Run Script Typechecker
+      command: |
+        cd src/electron
+        node script/yarn tsc -p tsconfig.script.json
--- a/.circleci/config/package.json
+++ b/.circleci/config/package.json
@@ -0,0 +1,10 @@
+{
+  "name": "@electron/circleci-config",
+  "version": "0.0.0",
+  "private": true,
+  "license": "MIT",
+  "dependencies": {
+    "fs-extra": "^10.1.0",
+    "js-yaml": "^4.1.0"
+  }
+}
--- a/.circleci/config/params.js
+++ b/.circleci/config/params.js
@@ -0,0 +1,12 @@
+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));
--- a/.circleci/config/yarn.lock
+++ b/.circleci/config/yarn.lock
@@ -0,0 +1,43 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+fs-extra@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
+  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^6.0.1"
+    universalify "^2.0.0"
+
+graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+  version "4.2.10"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
+  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
+
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+jsonfile@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
+  dependencies:
+    universalify "^2.0.0"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+universalify@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
--- a/.circleci/fix-known-hosts.sh
+++ b/.circleci/fix-known-hosts.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+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
--- a/.devcontainer/README.md
+++ b/.devcontainer/README.md
@@ -25,19 +25,9 @@ Codespaces doesn't lean very well into gclient based checkouts, the directory st
 /workspaces/electron
 ```

-## Reclient
+## Goma

-If you are a maintainer [with Reclient access](../docs/development/reclient.md) you'll need to ensure you're authenticated when you spin up a new codespaces instance.  You can validate this by checking `e d rbe info` - your build-tools configuration should have `Access` type `Cache & Execute`:
-
-```console
-Authentication Status: Authenticated
-Since:     2024-05-28 10:29:33 +0200 CEST
-Expires:   2024-08-26 10:29:33 +0200 CEST
-...
-Access:    Cache & Execute
-```
-
-To authenticate if you're not logged in, run `e d rbe login` and follow the link to authenticate.
+If you are a maintainer [with Goma access](../docs/development/goma.md) it should be automatically configured and authenticated when you spin up a new codespaces instance.  You can validate this by checking `e d goma_auth info` or by checking that your build-tools configuration has a goma mode of `cluster`.

 ## Running Electron

--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -36,6 +36,7 @@
 				"dbaeumer.vscode-eslint",
 				"shakram02.bash-beautify",
 				"marshallofsound.gnls-electron",
+				"CircleCI.circleci"
 			],
 			"settings": {
 				"editor.tabSize": 2,
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'

 services:
  buildtools:
-    image: ghcr.io/electron/devcontainer:77262e58c37631ab082482f42c33cdf68c6c394b
+    image: ghcr.io/electron/devcontainer:9a43c14f5c19be0359843299f79e736521373adc

    volumes:
      - ..:/workspaces/gclient/src/electron:cached
--- a/.devcontainer/on-create-command.sh
+++ b/.devcontainer/on-create-command.sh
@@ -59,6 +59,7 @@ if [ ! -f $buildtools/configs/evm.testing.json ]; then
            \"\$schema\": \"file:///home/builduser/.electron_build_tools/evm-config.schema.json\",
            \"configValidationLevel\": \"strict\",
            \"reclient\": \"$1\",
+            \"goma\": \"none\",
            \"preserveXcode\": 5
        }
    " >$buildtools/configs/evm.testing.json
--- a/.env.example
+++ b/.env.example
@@ -2,4 +2,5 @@
 # See docs/development/releasing.md

 APPVEYOR_CLOUD_TOKEN=
+CIRCLE_TOKEN=
 ELECTRON_GITHUB_TOKEN=
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -19,40 +19,7 @@
    "prefer-const": ["error", {
      "destructuring": "all"
    }],
-    "n/no-callback-literal": "off",
-    "import/newline-after-import": "error",
-    "import/order": ["error", {
-      "alphabetize": {
-        "order": "asc"
-      },
-      "newlines-between": "always",
-      "pathGroups": [
-        {
-          "pattern": "@electron/internal/**",
-          "group": "external",
-          "position": "before"
-        },
-        {
-          "pattern": "@electron/**",
-          "group": "external",
-          "position": "before"
-        },
-        {
-          "pattern": "{electron,electron/**}",
-          "group": "external",
-          "position": "before"
-        }
-      ],
-      "pathGroupsExcludedImportTypes": [],
-      "distinctGroup": true,
-      "groups": [
-        "external",
-        "builtin",
-        ["sibling", "parent"],
-        "index",
-        "type"
-      ]
-    }]
+    "standard/no-callback-literal": "off"
  },
  "parserOptions": {
    "ecmaVersion": 6,
--- a/.gitattributes
+++ b/.gitattributes
@@ -22,7 +22,6 @@ patches/**/.patches merge=union
 *.md text eol=lf
 *.mm text eol=lf
 *.mojom text eol=lf
-*.patches text eol=lf
 *.proto text eol=lf
 *.py text eol=lf
 *.ps1 text eol=lf
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -8,7 +8,6 @@
 DEPS                                    @electron/wg-upgrades

 # Releases WG
-/.github/workflows/update_appveyor_image.yml @electron/wg-releases
 /docs/breaking-changes.md               @electron/wg-releases
 /npm/                                   @electron/wg-releases
 /script/release                         @electron/wg-releases
@@ -21,9 +20,3 @@ appveyor-woa.yml                        @electron/wg-releases
 /lib/browser/guest-view-manager.ts      @electron/wg-security
 /lib/browser/rpc-server.ts              @electron/wg-security
 /lib/renderer/security-warnings.ts      @electron/wg-security
-
-# Infra WG
-/.github/actions/                       @electron/wg-infra
-/.github/workflows/*-publish.yml        @electron/wg-infra
-/.github/workflows/build.yml            @electron/wg-infra
-/.github/workflows/pipeline-*.yml       @electron/wg-infra
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,6 @@
 name: Bug Report
-description: Report a bug in Electron
-type: 'bug'
+description: Report an Electron bug
+title: "[Bug]: "
 labels: "bug :beetle:"
 body:
 - type: checkboxes
@@ -20,14 +20,13 @@ body:
    description: |
      What version of Electron are you using?

-      Note: Please only report issues for [currently supported versions of Electron](https://www.electronjs.org/docs/latest/tutorial/electron-timelines#timeline).
-    placeholder: 32.0.0
+      Note: Please only report issues for [currently supported versions of Electron](https://www.electronjs.org/docs/latest/tutorial/support#currently-supported-versions).
+    placeholder: 17.0.0
  validations:
    required: true
 - type: dropdown
  attributes:
-    label: What operating system(s) are you using?
-    multiple: true
+    label: What operating system are you using?
    options:
      - Windows
      - macOS
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -1,6 +1,6 @@
 name: Feature Request
 description: Suggest an idea for Electron
-type: 'enhancement'
+title: "[Feature Request]: "
 labels: "enhancement :sparkles:"
 body:
 - type: checkboxes
--- a/.github/actions/build-electron/action.yml
+++ b/.github/actions/build-electron/action.yml
@@ -36,7 +36,7 @@ runs:
      shell: bash
      if: ${{ inputs.target-arch == 'x64' && inputs.target-platform == 'macos' }}
      run: |
-        GN_APPENDED_ARGS="$GN_EXTRA_ARGS target_cpu=\"x64\" v8_snapshot_toolchain=\"//build/toolchain/mac:clang_x64\""
+        GN_APPENDED_ARGS="$GN_EXTRA_ARGS v8_snapshot_toolchain=\"//build/toolchain/mac:clang_x64\""
        echo "GN_EXTRA_ARGS=$GN_APPENDED_ARGS" >> $GITHUB_ENV
    - name: Build Electron ${{ inputs.step-suffix }}
      shell: bash
@@ -63,13 +63,13 @@ runs:
      run: |
        cd src
        electron/script/copy-debug-symbols.py --target-cpu="${{ inputs.target-arch }}" --out-dir=out/Default/debug --compress
-        electron/script/strip-binaries.py --target-cpu="${{ inputs.target-arch }}" --verbose
+        electron/script/strip-binaries.py --target-cpu="${{ inputs.target-arch }}"
        electron/script/add-debug-link.py --target-cpu="${{ inputs.target-arch }}" --debug-dir=out/Default/debug
    - name: Build Electron dist.zip ${{ inputs.step-suffix }}
      shell: bash
      run: |
        cd src
-        e build --target electron:electron_dist_zip -j $NUMBER_OF_NINJA_PROCESSES
+        e build electron:electron_dist_zip -j $NUMBER_OF_NINJA_PROCESSES
        if [ "${{ inputs.is-asan }}" != "true" ]; then
          target_os=${{ inputs.target-platform == 'linux' && 'linux' || 'mac'}}
          if [ "${{ inputs.artifact-platform }}" = "mas" ]; then
@@ -81,7 +81,7 @@ runs:
      shell: bash
      run: |
        cd src
-        e build --target electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
+        e build 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"
@@ -90,6 +90,7 @@ runs:
        fi
        sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args
        sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args
+        sed $SEDOPTION '/The gn arg use_goma=true .*/d' out/Default/mksnapshot_args

        if [ "`uname`" = "Linux" ]; then
          if [ "${{ inputs.target-arch }}" = "arm" ]; then
@@ -104,7 +105,7 @@ runs:
          fi
        fi

-        e build --target electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
+        e build electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
        (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
    - name: Generate Cross-Arch Snapshot (arm/arm64)  ${{ inputs.step-suffix }}
      shell: bash
@@ -130,24 +131,24 @@ runs:
      shell: bash
      run: |
        cd src
-        e build --target electron:electron_chromedriver -j $NUMBER_OF_NINJA_PROCESSES
-        e build --target electron:electron_chromedriver_zip
+        e build electron:electron_chromedriver -j $NUMBER_OF_NINJA_PROCESSES
+        e build electron:electron_chromedriver_zip
    - name: Build Node.js headers ${{ inputs.step-suffix }}
      shell: bash
      run: |
        cd src
-        e build --target electron:node_headers
+        e build electron:node_headers
    - name: Generate & Zip Symbols ${{ inputs.step-suffix }}
      shell: bash
      run: |
        # Generate breakpad symbols on release builds
        if [ "${{ inputs.generate-symbols }}" = "true" ]; then
-          e build --target electron:electron_symbols
+          e build electron:electron_symbols
        fi
        cd src
        export BUILD_PATH="$(pwd)/out/Default"
-        e build --target electron:licenses
-        e build --target electron:electron_version_file
+        e build electron:licenses
+        e build electron:electron_version_file
        if [ "${{ inputs.is-release }}" = "true" ]; then
          DELETE_DSYMS_AFTER_ZIP=1 electron/script/zip-symbols.py -b $BUILD_PATH
        else
@@ -159,19 +160,21 @@ runs:
      run: |
        cd src
        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true $GN_EXTRA_ARGS"
-        e build --target electron:electron_ffmpeg_zip -C ../../out/ffmpeg -j $NUMBER_OF_NINJA_PROCESSES
+        autoninja -C out/ffmpeg electron:electron_ffmpeg_zip -j $NUMBER_OF_NINJA_PROCESSES
    - name: Generate Hunspell Dictionaries ${{ inputs.step-suffix }}
      shell: bash
      if: ${{ inputs.is-release == 'true' && inputs.target-platform == 'linux' }}
      run: |
-        e build --target electron:hunspell_dictionaries_zip -j $NUMBER_OF_NINJA_PROCESSES
+        cd src
+        autoninja -C out/Default electron:hunspell_dictionaries_zip -j $NUMBER_OF_NINJA_PROCESSES
    - name: Generate Libcxx ${{ inputs.step-suffix }}
      shell: bash
      if: ${{ inputs.is-release == 'true' && inputs.target-platform == 'linux' }}
      run: |
-        e build --target electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
-        e build --target electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
-        e build --target electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
+        cd src
+        autoninja -C out/Default electron:libcxx_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
+        autoninja -C out/Default electron:libcxxabi_headers_zip -j $NUMBER_OF_NINJA_PROCESSES
+        autoninja -C out/Default electron:libcxx_objects_zip -j $NUMBER_OF_NINJA_PROCESSES
    - name: Generate TypeScript Definitions ${{ inputs.step-suffix }}
      if: ${{ inputs.is-release == 'true' }}
      shell: bash
@@ -214,4 +217,4 @@ runs:
      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808
      with:
        name: src_artifacts_${{ env.ARTIFACT_KEY }}
-        path: ./src_artifacts_${{ inputs.artifact-platform }}_${{ inputs.target-arch }}
+        path: ./src_artifacts_${{ inputs.artifact-platform }}_${{ inputs.target-arch }}
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -57,25 +57,12 @@ runs:
      cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
      echo "Using cache key: $DEPSHASH"
      echo "Checking for cache in: $cache_path"
-      if [ ! -f "$cache_path" ] || [ `du $cache_path | cut -f1` = "0" ]; then
+      if [ ! -f "$cache_path" ]; then
        echo "cache_exists=false" >> $GITHUB_OUTPUT
        echo "Cache Does Not Exist for $DEPSHASH"
      else
-        echo "cache_exists=true" >> $GITHUB_OUTPUT
-        echo "Cache Already Exists for $DEPSHASH, Skipping.."
-      fi
-  - name: Check cross instance cache disk space
-    if: steps.check-cache.outputs.cache_exists == 'false'
-    shell: bash
-    run: |    
-      # if there is less than 20 GB free space then creating the cache might fail so exit early
-      freespace=`df -m /mnt/cross-instance-cache | grep -w /mnt/cross-instance-cache | awk '{print $4}'`
-      freespace_human=`df -h /mnt/cross-instance-cache | grep -w /mnt/cross-instance-cache | awk '{print $4}'`
-      if [ $freespace -le 20000 ]; then
-        echo "The cross mount cache has $freespace_human free space which is not enough - exiting"
-        exit 1
-      else
-        echo "The cross mount cache has $freespace_human free space - continuing"
+        echo "cache_exists=false" >> $GITHUB_OUTPUT
+        echo "Cache Already Exists for $DEPSHASH, Busting cache.."
      fi
  - name: Gclient Sync
    if: steps.check-cache.outputs.cache_exists == 'false'
@@ -88,7 +75,7 @@ runs:
        "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"

      ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags -vvvvv
-      if [ "${{ inputs.is-release }}" != "true" && -n "${{ env.PATCH_UP_APP_CREDS }}" ]; then
+      if [ "${{ inputs.is-release }}" != "true" ]; then
        # Re-export all the patches to check if there were changes.
        python3 src/electron/script/export_all_patches.py src/electron/patches/config.json
        cd src/electron
@@ -100,7 +87,7 @@ runs:
          # Export it
          mkdir -p ../../patches
          git format-patch -1 --stdout --keep-subject --no-stat --full-index > ../../patches/update-patches.patch
-          if node ./script/push-patch.js; then
+          if (node ./script/push-patch.js 2> /dev/null > /dev/null); then
            echo
            echo "======================================================================"
            echo "Changes to the patches when applying, we have auto-pushed the diff to the current branch"
@@ -113,8 +100,6 @@ runs:
            echo "There were changes to the patches when applying."
            echo "Check the CI artifacts for a patch you can apply to fix it."
            echo "======================================================================"
-            echo
-            cat ../../patches/update-patches.patch
            exit 1
          fi
        fi
@@ -166,4 +151,4 @@ runs:
        exit 1
      else
        echo "Cache key persisted in $final_cache_path"
-      fi
+      fi
--- a/.github/actions/fix-sync-macos/action.yml
+++ b/.github/actions/fix-sync-macos/action.yml
@@ -58,4 +58,4 @@ runs:
        cp .git/config .git/config.backup
        git remote remove origin
        mv .git/config.backup .git/config
-        git fetch
+        git fetch
--- a/.github/actions/generate-types/action.yml
+++ b/.github/actions/generate-types/action.yml
@@ -1,24 +0,0 @@
-name: 'Generate Types for Archaeologist Dig'
-description: 'Generate Types for Archaeologist Dig'
-inputs:
-  sha-file:
-    description: 'File containing sha'
-    required: true
-  filename:
-    description: 'Filename to write types to'
-    required: true
-runs:
-  using: "composite"
-  steps:
-  - name: Generating Types for SHA in ${{ inputs.sha-file }}
-    shell: bash
-    run: |
-      git checkout $(cat ${{ inputs.sha-file }})
-      rm -rf node_modules
-      yarn install --frozen-lockfile --ignore-scripts
-      echo "#!/usr/bin/env node\nglobal.x=1" > node_modules/typescript/bin/tsc
-      node node_modules/.bin/electron-docs-parser --dir=./ --outDir=./ --moduleVersion=0.0.0-development
-      node node_modules/.bin/electron-typescript-definitions --api=electron-api.json --outDir=artifacts
-      mv artifacts/electron.d.ts artifacts/${{ inputs.filename }}
-      git checkout .
-    working-directory: ./electron
--- a/.github/actions/install-build-tools/action.yml
+++ b/.github/actions/install-build-tools/action.yml
@@ -6,6 +6,6 @@ runs:
  - name: Install Build Tools
    shell: bash
    run: |
-      export BUILD_TOOLS_SHA=eeb1a11392e4cec08fd926c93b31ab556dc0c23b
+      export BUILD_TOOLS_SHA=ff3e40a9a2ebb735c18b6450ecd5ddaa8bb364a9
      npm i -g @electron/build-tools
-      e auto-update disable
+      e auto-update disable
--- a/.github/actions/restore-cache-aks/action.yml
+++ b/.github/actions/restore-cache-aks/action.yml
@@ -17,11 +17,6 @@ runs:
      fi

      echo "Persisted cache is $(du -sh $cache_path | cut -f1)"
-      if [ `du  $cache_path | cut -f1` = "0" ]; then
-        echo "Cache is empty - exiting"
-        exit 1
-      fi
-
      mkdir temp-cache
      tar -xf $cache_path -C temp-cache
      echo "Unzipped cache is $(du -sh temp-cache/src | cut -f1)"
@@ -38,4 +33,4 @@ runs:
      fi

      echo "Wiping Electron Directory"
-      rm -rf src/electron
+      rm -rf src/electron
--- a/.github/actions/restore-cache-azcopy/action.yml
+++ b/.github/actions/restore-cache-azcopy/action.yml
@@ -23,7 +23,7 @@ runs:
    # or it was uploaded in the checkout job for a previous commit.
    uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3.0.0
    with:
-      timeout_minutes: 30
+      timeout_minutes: 20
      max_attempts: 3
      retry_on: error
      command: |
@@ -32,11 +32,8 @@ runs:
          echo "SAS Token not found; exiting src cache download early..."
          exit 1
        fi
-        azcopy copy --log-level=ERROR \
+        azcopy copy \
          "https://${{ env.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}.file.core.windows.net/${{ env.AZURE_AKS_CACHE_SHARE_NAME }}/${{ env.CACHE_PATH }}?$sas_token" $DEPSHASH.tar
-    env:
-      AZURE_AKS_CACHE_STORAGE_ACCOUNT: f723719aa87a34622b5f7f3
-      AZURE_AKS_CACHE_SHARE_NAME: pvc-f6a4089f-b082-4bee-a3f9-c3e1c0c02d8f
  - name: Clean SAS Key
    shell: bash
    run: rm -f sas-token
@@ -44,11 +41,6 @@ runs:
    shell: bash
    run: |
      echo "Downloaded cache is $(du -sh $DEPSHASH.tar | cut -f1)"
-      if [ `du $DEPSHASH.tar | cut -f1` = "0" ]; then
-        echo "Cache is empty - exiting"
-        exit 1
-      fi
-      
      mkdir temp-cache
      tar -xf $DEPSHASH.tar -C temp-cache
      echo "Unzipped cache is $(du -sh temp-cache/src | cut -f1)"
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -2,8 +2,6 @@
 newPRWelcomeComment: |
  💖 Thanks for opening this pull request! 💖

-  ### Semantic PR titles
-
  We use [semantic commit messages](https://github.com/electron/electron/blob/main/docs/development/pull-requests.md#commit-message-guidelines) to streamline the release process. Before your pull request can be merged, you should **update your pull request title** to start with a semantic prefix.

  Examples of commit messages with semantic prefixes:
@@ -12,13 +10,6 @@ newPRWelcomeComment: |
  - `feat: add app.isPackaged() method`
  - `docs: app.isDefaultProtocolClient is now available on Linux`

-  ### Commit signing
-
-  This repo enforces [commit signatures](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) for all incoming PRs.
-  To sign your commits, see GitHub's documentation on [Telling Git about your signing key](https://docs.github.com/en/authentication/managing-commit-signature-verification/telling-git-about-your-signing-key).
-  
-  ### PR tips
-
  Things that will help get your PR across the finish line:

  - Follow the JavaScript, C++, and Python [coding style](https://github.com/electron/electron/blob/main/docs/development/coding-style.md).
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,68 +0,0 @@
-# Keep GitHub Actions up to date with GitHub's Dependabot...
-# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
-# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
-version: 2
-updates:
-  - package-ecosystem: github-actions
-    directory: /
-    schedule:
-      interval: weekly
-    labels:
-      - "no-backport"
-      - "semver/none"
-    target-branch: main
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "no-backport"
-    open-pull-requests-limit: 2
-    target-branch: main
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "backport-check-skip"
-    open-pull-requests-limit: 0
-    target-branch: 33-x-y
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "backport-check-skip"
-    open-pull-requests-limit: 0
-    target-branch: 32-x-y
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "backport-check-skip"
-    open-pull-requests-limit: 0
-    target-branch: 31-x-y
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "backport-check-skip"
-    open-pull-requests-limit: 0
-    target-branch: 30-x-y
--- a/.github/workflows/archaeologist-dig.yml
+++ b/.github/workflows/archaeologist-dig.yml
@@ -1,65 +0,0 @@
-name: Archaeologist
-
-on:
-  pull_request:
-
-jobs:
-   archaeologist-dig:
-    name: Archaeologist Dig
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Electron
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.0.2
-        with:
-          fetch-depth: 0
-      - name: Setup Node.js/npm
-        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
-        with:
-          node-version: 20.11.x
-      - name: Setting Up Dig Site
-        run: |
-          echo "remote: ${{ github.event.pull_request.head.repo.clone_url }}"
-          echo "sha ${{ github.event.pull_request.head.sha }}"
-          echo "base ref ${{ github.event.pull_request.base.ref }}"
-          git clone https://github.com/electron/electron.git electron          
-          cd electron
-          mkdir -p artifacts
-          git remote add fork ${{ github.event.pull_request.head.repo.clone_url }} && git fetch fork
-          git checkout  ${{ github.event.pull_request.head.sha }}
-          git merge-base origin/${{ github.event.pull_request.base.ref }} HEAD > .dig-old
-          echo  ${{ github.event.pull_request.head.sha }} > .dig-new
-          cp .dig-old artifacts
-
-      - name: Generating Types for SHA in .dig-new
-        uses: ./.github/actions/generate-types
-        with:
-          sha-file: .dig-new
-          filename: electron.new.d.ts
-      - name: Generating Types for SHA in .dig-old
-        uses: ./.github/actions/generate-types
-        with:
-          sha-file: .dig-old
-          filename: electron.old.d.ts
-      - name: Upload artifacts
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 #v4.4.3
-        with:
-          name: artifacts
-          path: electron/artifacts
-          include-hidden-files: true
-      - name: Set job output
-        run: |
-          git diff --no-index electron.old.d.ts electron.new.d.ts > patchfile || true
-          if [ -s patchfile ]; then
-            echo "Changes Detected"
-            echo "## Changes Detected" > $GITHUB_STEP_SUMMARY
-            echo "Looks like the \`electron.d.ts\` file changed." >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "\`\`\`\`\`\`diff" >> $GITHUB_STEP_SUMMARY
-            cat patchfile >> $GITHUB_STEP_SUMMARY
-            echo "\`\`\`\`\`\`" >> $GITHUB_STEP_SUMMARY    
-          else
-            echo "No Changes Detected"
-            echo "## No Changes" > $GITHUB_STEP_SUMMARY
-            echo "We couldn't see any changes in the \`electron.d.ts\` artifact" >> $GITHUB_STEP_SUMMARY
-          fi
-        working-directory: ./electron/artifacts
--- a/.github/workflows/branch-created.yml
+++ b/.github/workflows/branch-created.yml
@@ -23,13 +23,11 @@ jobs:
    steps:
      - name: Determine Major Version
        id: check-major-version
-        env:
-          BRANCH_NAME: ${{ github.event.inputs.branch-name || github.event.ref }}
        run: |
-          if [[ "$BRANCH_NAME" =~ ^([0-9]+)-x-y$ ]]; then
+          if [[ ${{ github.event.inputs.branch-name || github.event.ref }} =~ ^([0-9]+)-x-y$ ]]; then
            echo "MAJOR=${BASH_REMATCH[1]}" >> "$GITHUB_OUTPUT"
          else
-            echo "Not a release branch: $BRANCH_NAME"
+            echo "Not a release branch: ${{ github.event.inputs.branch-name || github.event.ref }}"
          fi
      - name: New Release Branch Tasks
        if: ${{ steps.check-major-version.outputs.MAJOR }}
@@ -94,7 +92,7 @@ jobs:
            }))
      - name: Create Release Project Board
        if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/copy-project@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
+        uses: dsanders11/project-actions/copy-project@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        id: create-release-board
        with:
          drafts: true
@@ -114,14 +112,14 @@ jobs:
          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
      - name: Find Previous Release Project Board
        if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/find-project@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
+        uses: dsanders11/project-actions/find-project@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        id: find-prev-release-board
        with:
          title: ${{ steps.generate-project-metadata.outputs.prev-prev-major }}-x-y
          token: ${{ steps.generate-token.outputs.token }}
      - name: Close Previous Release Project Board
        if: ${{ steps.check-major-version.outputs.MAJOR }}
-        uses: dsanders11/project-actions/close-project@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
+        uses: dsanders11/project-actions/close-project@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          project-number: ${{ steps.find-prev-release-board.outputs.number }}
          token: ${{ steps.generate-token.outputs.token }}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,7 +6,7 @@ on:
      build-image-sha:
        type: string
        description: 'SHA for electron/build image'
-        default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1'
+        default: 'cf814a4d2501e8e843caea071a6b70a48e78b855'
        required: true
      skip-macos:
        type: boolean
@@ -40,7 +40,7 @@ jobs:
        build-image-sha: ${{ steps.set-output.outputs.build-image-sha }}
        docs-only: ${{ steps.set-output.outputs.docs-only }}
    steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.0.2
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.0.2
    - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
      id: filter
      with:
@@ -53,7 +53,7 @@ jobs:
      id: set-output
      run: |
        if [ -z "${{ inputs.build-image-sha }}" ]; then
-          echo "build-image-sha=bc2f48b2415a670de18d13605b1cf0eb5fdbaae1" >> "$GITHUB_OUTPUT"
+          echo "build-image-sha=cf814a4d2501e8e843caea071a6b70a48e78b855" >> "$GITHUB_OUTPUT"
        else
          echo "build-image-sha=${{ inputs.build-image-sha }}" >> "$GITHUB_OUTPUT"
        fi
@@ -81,7 +81,7 @@ jobs:
  checkout-macos:
    needs: setup
    if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-macos}}
-    runs-on: electron-arc-linux-amd64-32core
+    runs-on: aks-linux-large
    container:
      image: ghcr.io/electron/build:${{ needs.setup.outputs.build-image-sha }}
      options: --user root
@@ -94,7 +94,7 @@ jobs:
      build-image-sha: ${{ needs.setup.outputs.build-image-sha }}
    steps:
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -106,7 +106,7 @@ jobs:
  checkout-linux:
    needs: setup
    if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-linux}}
-    runs-on: electron-arc-linux-amd64-32core
+    runs-on: aks-linux-large
    container:
      image: ghcr.io/electron/build:${{ needs.setup.outputs.build-image-sha }}
      options: --user root
@@ -115,12 +115,11 @@ jobs:
        - /var/run/sas:/var/run/sas
    env:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
-      PATCH_UP_APP_CREDS: ${{ secrets.PATCH_UP_APP_CREDS }}
    outputs:
      build-image-sha: ${{ needs.setup.outputs.build-image-sha}}
    steps:
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -137,7 +136,6 @@ jobs:
    needs: checkout-macos
    with:
      build-runs-on: macos-14-xlarge
-      check-runs-on: macos-14
      test-runs-on: macos-13
      target-platform: macos
      target-arch: x64
@@ -156,7 +154,6 @@ jobs:
    needs: checkout-macos
    with:
      build-runs-on: macos-14-xlarge
-      check-runs-on: macos-14
      test-runs-on: macos-14
      target-platform: macos
      target-arch: arm64
@@ -174,9 +171,8 @@ jobs:
    uses: ./.github/workflows/pipeline-electron-build-and-test-and-nan.yml
    needs: checkout-linux
    with:
-      build-runs-on: electron-arc-linux-amd64-32core
-      check-runs-on: electron-arc-linux-amd64-8core
-      test-runs-on: electron-arc-linux-amd64-4core
+      build-runs-on: aks-linux-large
+      test-runs-on: aks-linux-medium
      build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
      test-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
      target-platform: linux
@@ -195,9 +191,8 @@ jobs:
    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
    needs: checkout-linux
    with:
-      build-runs-on: electron-arc-linux-amd64-32core
-      check-runs-on: electron-arc-linux-amd64-8core
-      test-runs-on: electron-arc-linux-amd64-4core
+      build-runs-on: aks-linux-large
+      test-runs-on: aks-linux-medium
      build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
      test-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
      target-platform: linux
@@ -217,9 +212,8 @@ jobs:
    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
    needs: checkout-linux
    with:
-      build-runs-on: electron-arc-linux-amd64-32core
-      check-runs-on: electron-arc-linux-amd64-8core
-      test-runs-on: electron-arc-linux-arm64-4core
+      build-runs-on: aks-linux-large
+      test-runs-on: aks-linux-arm-medium
      build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
      test-container: '{"image":"ghcr.io/electron/test:arm32v7-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init","volumes":["/home/runner/externals:/mnt/runner-externals"]}'
      target-platform: linux
@@ -238,9 +232,8 @@ jobs:
    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
    needs: checkout-linux
    with:
-      build-runs-on: electron-arc-linux-amd64-32core
-      check-runs-on: electron-arc-linux-amd64-8core
-      test-runs-on: electron-arc-linux-arm64-4core
+      build-runs-on: aks-linux-large
+      test-runs-on: aks-linux-arm-medium
      build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
      test-container: '{"image":"ghcr.io/electron/test:arm64v8-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
      target-platform: linux
@@ -249,14 +242,4 @@ jobs:
      gn-build-type: testing
      generate-symbols: false
      upload-to-storage: '0'
-    secrets: inherit
-
-  gha-done:
-    name: GitHub Actions Completed
-    runs-on: ubuntu-latest
-    needs: [docs-only, macos-x64, macos-arm64, linux-x64, linux-x64-asan, linux-arm, linux-arm64]
-    if: always() && !contains(needs.*.result, 'failure')
-    steps: 
-    - name: GitHub Actions Jobs Done
-      run: |
-        echo "All GitHub Actions Jobs are done"
+    secrets: inherit
--- a/.github/workflows/clean-src-cache.yml
+++ b/.github/workflows/clean-src-cache.yml
@@ -1,21 +0,0 @@
-name: Clean Source Cache
-
-on:
-  schedule:
-    - cron: "0 0 * * SUN"  # Run at midnight every Sunday
-
-jobs:
-  clean-src-cache:
-    runs-on: electron-arc-linux-amd64-32core
-    container:
-      image: ghcr.io/electron/build:bc2f48b2415a670de18d13605b1cf0eb5fdbaae1
-      options: --user root
-      volumes:
-        - /mnt/cross-instance-cache:/mnt/cross-instance-cache
-    steps:
-    - name: Cleanup Source Cache
-      shell: bash
-      run: |
-        df -h /mnt/cross-instance-cache
-        find /mnt/cross-instance-cache -type f -mtime +30 -delete
-        df -h /mnt/cross-instance-cache
--- a/.github/workflows/issue-commented.yml
+++ b/.github/workflows/issue-commented.yml
@@ -9,8 +9,8 @@ permissions: {}

 jobs:
  issue-commented:
-    name: Remove blocked/{need-info,need-repro} on comment
-    if: ${{ (contains(github.event.issue.labels.*.name, 'blocked/need-repro') || contains(github.event.issue.labels.*.name, 'blocked/need-info ❌')) && !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.comment.author_association) && github.event.comment.user.type != 'Bot' }}
+    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) && github.event.comment.user.type != 'Bot' }}
    runs-on: ubuntu-latest
    steps:
      - name: Generate GitHub App token
@@ -23,4 +23,4 @@ jobs:
          GITHUB_TOKEN: ${{ steps.generate-token.outputs.token }}
          ISSUE_URL: ${{ github.event.issue.html_url }}
        run: |
-          gh issue edit $ISSUE_URL --remove-label 'blocked/need-repro','blocked/need-info ❌'
+          gh issue edit $ISSUE_URL --remove-label 'blocked/need-repro'
--- a/.github/workflows/issue-labeled.yml
+++ b/.github/workflows/issue-labeled.yml
@@ -20,7 +20,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
      - name: Set status
-        uses: dsanders11/project-actions/edit-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
@@ -38,7 +38,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
      - name: Set status
-        uses: dsanders11/project-actions/edit-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
@@ -70,7 +70,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
      - name: Create comment
        if: ${{ steps.check-for-comment.outputs.SHOULD_COMMENT }}
-        uses: actions-cool/issues-helper@a610082f8ac0cf03e357eb8dd0d5e2ba075e017e # v3.6.0
+        uses: actions-cool/issues-helper@275328970dbc3bfc3bc43f5fe741bf3638300c0a # v3.3.3
        with:
          actions: 'create-comment'
          token: ${{ steps.generate-token.outputs.token }}
--- a/.github/workflows/issue-opened.yml
+++ b/.github/workflows/issue-opened.yml
@@ -19,7 +19,7 @@ jobs:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
      - name: Add to Issue Triage
-        uses: dsanders11/project-actions/add-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
+        uses: dsanders11/project-actions/add-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          field: Reporter
          field-value: ${{ github.event.issue.user.login }}
@@ -35,10 +35,9 @@ jobs:
        with:
          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
          org: electron
-      - run: npm install @electron/fiddle-core@1.3.3 mdast-util-from-markdown@2.0.0 unist-util-select@5.1.0 semver@7.6.0
+      - run: npm install mdast-util-from-markdown@2.0.0 unist-util-select@5.1.0
      - name: Add labels
        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        id: add-labels
        env:
          ISSUE_BODY: ${{ github.event.issue.body }}
        with:
@@ -46,7 +45,6 @@ jobs:
          script: |
            const { fromMarkdown } = await import('${{ github.workspace }}/node_modules/mdast-util-from-markdown/index.js');
            const { select } = await import('${{ github.workspace }}/node_modules/unist-util-select/index.js');
-            const semver = await import('${{ github.workspace }}/node_modules/semver/index.js');

            const [ owner, repo ] = '${{ github.repository }}'.split('/');
            const issue_number = ${{ github.event.issue.number }};
@@ -55,67 +53,6 @@ jobs:

            const labels = [];

-            const electronVersion = select('heading:has(> text[value="Electron Version"]) + paragraph > text', tree)?.value.trim();
-            if (electronVersion !== undefined) {
-              // It's possible for multiple versions to be listed -
-              // for now check for comma or space separated version.
-              const versions = electronVersion.split(/, | /);
-              for (const version of versions) {
-                const major = semver.parse(version)?.major;
-                if (major) {
-                  const versionLabel = `${major}-x-y`;
-                  let labelExists = false;
-
-                  try {
-                    await github.rest.issues.getLabel({
-                      owner,
-                      repo,
-                      name: versionLabel,
-                    });
-                    labelExists = true;
-                  } catch {}
-
-                  if (labelExists) {
-                    // Check if it's an unsupported major
-                    const { ElectronVersions } = await import('${{ github.workspace }}/node_modules/@electron/fiddle-core/dist/index.js');
-                    const versions = await ElectronVersions.create(undefined, { ignoreCache: true });
-
-                    const validVersions = [...versions.supportedMajors, ...versions.prereleaseMajors];
-                    if (validVersions.includes(major)) {
-                      labels.push(versionLabel);
-                    }
-                  }
-                }
-              }
-              if (labels.length === 0) {
-                core.setOutput('unsupportedMajor', true);
-                labels.push('blocked/need-info ❌');
-              }
-            }
-
-            const operatingSystems = select('heading:has(> text[value="What operating system(s) are you using?"]) + paragraph > text', tree)?.value.trim().split(', ');
-            const platformLabels = new Set();
-            for (const operatingSystem of (operatingSystems ?? [])) {
-              switch (operatingSystem) {
-                case 'Windows':
-                  platformLabels.add('platform/windows');
-                  break;
-                case 'macOS':
-                  platformLabels.add('platform/macOS');
-                  break;
-                case 'Ubuntu':
-                case 'Other Linux':
-                  platformLabels.add('platform/linux');
-                  break;
-              }
-            }
-
-            if (platformLabels.size === 3) {
-              labels.push('platform/all');
-            } else {
-              labels.push(...platformLabels);
-            }
-
            const gistUrl = select('heading:has(> text[value="Testcase Gist URL"]) + paragraph > text', tree)?.value.trim();
            if (gistUrl !== undefined && gistUrl.startsWith('https://gist.github.com/')) {
              labels.push('has-repro-gist');
@@ -129,17 +66,3 @@ jobs:
                labels,
              });
            }
-      - name: Create unsupported major comment
-        if: ${{ steps.add-labels.outputs.unsupportedMajor }}
-        uses: actions-cool/issues-helper@a610082f8ac0cf03e357eb8dd0d5e2ba075e017e # v3.6.0
-        with:
-          actions: 'create-comment'
-          token: ${{ steps.generate-token.outputs.token }}
-          body: |
-            <!-- end-of-life -->
-
-            Hello @${{ github.event.issue.user.login }}. Thanks for reporting this and helping to make Electron better!
-            
-            The version of Electron reported in this issue has reached end-of-life and is [no longer supported](https://www.electronjs.org/docs/latest/tutorial/electron-timelines#timeline). If you're still experiencing this issue on a [supported version](https://www.electronjs.org/releases/stable) of Electron, please update this issue to reflect that version of Electron.
-
-            Now adding the https://github.com/electron/electron/labels/blocked%2Fneed-info%20%E2%9D%8C label for this reason. This issue will be closed in 10 days if the above is not addressed.
--- a/.github/workflows/issue-transferred.yml
+++ b/.github/workflows/issue-transferred.yml
@@ -1,24 +0,0 @@
-name: Issue Transferred
-
-on:
-  issues:
-    types: [transferred]
-
-permissions: {}
-
-jobs:
-  issue-transferred:
-    name: Issue Transferred
-    runs-on: ubuntu-latest
-    steps:
-      - name: Generate GitHub App token
-        uses: electron/github-app-auth-action@384fd19694fe7b6dcc9a684746c6976ad78228ae # v1.1.1
-        id: generate-token
-        with:
-          creds: ${{ secrets.ISSUE_TRIAGE_GH_APP_CREDS }}
-          org: electron
-      - name: Remove from issue triage
-        uses: dsanders11/project-actions/delete-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
-        with:
-          token: ${{ steps.generate-token.outputs.token }}
-          project-number: 90
--- a/.github/workflows/issue-unlabeled.yml
+++ b/.github/workflows/issue-unlabeled.yml
@@ -30,7 +30,7 @@ jobs:
          org: electron
      - name: Set status
        if: ${{ steps.check-for-blocked-labels.outputs.NOT_BLOCKED }}
-        uses: dsanders11/project-actions/edit-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 90
--- a/.github/workflows/linux-publish.yml
+++ b/.github/workflows/linux-publish.yml
@@ -6,7 +6,7 @@ on:
      build-image-sha:
        type: string
        description: 'SHA for electron/build image'
-        default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1'
+        default: 'cf814a4d2501e8e843caea071a6b70a48e78b855'
      upload-to-storage:
        description: 'Uploads to Azure storage'
        required: false
@@ -19,7 +19,7 @@ on:

 jobs:
  checkout-linux:
-    runs-on: electron-arc-linux-amd64-32core
+    runs-on: aks-linux-large
    container:
      image: ghcr.io/electron/build:${{ inputs.build-image-sha }}
      options: --user root
@@ -30,7 +30,7 @@ jobs:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True'
    steps:
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -42,7 +42,7 @@ jobs:
    needs: checkout-linux
    with:
      environment: production-release
-      build-runs-on: electron-arc-linux-amd64-32core
+      build-runs-on: aks-linux-large
      build-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
      target-platform: linux
      target-arch: x64
@@ -58,7 +58,7 @@ jobs:
    needs: checkout-linux
    with:
      environment: production-release
-      build-runs-on: electron-arc-linux-amd64-32core
+      build-runs-on: aks-linux-large
      build-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
      target-platform: linux
      target-arch: arm
@@ -74,7 +74,7 @@ jobs:
    needs: checkout-linux
    with:
      environment: production-release
-      build-runs-on: electron-arc-linux-amd64-32core
+      build-runs-on: aks-linux-large
      build-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
      target-platform: linux
      target-arch: arm64
@@ -83,4 +83,4 @@ jobs:
      generate-symbols: true
      strip-binaries: true
      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
+    secrets: inherit
--- a/.github/workflows/macos-publish.yml
+++ b/.github/workflows/macos-publish.yml
@@ -6,7 +6,7 @@ on:
      build-image-sha:
        type: string
        description: 'SHA for electron/build image'
-        default: 'bc2f48b2415a670de18d13605b1cf0eb5fdbaae1'
+        default: 'cf814a4d2501e8e843caea071a6b70a48e78b855'
        required: true
      upload-to-storage:
        description: 'Uploads to Azure storage'
@@ -20,7 +20,7 @@ on:

 jobs:
  checkout-macos:
-    runs-on: electron-arc-linux-amd64-32core
+    runs-on: aks-linux-large
    container:
      image: ghcr.io/electron/build:${{ inputs.build-image-sha }}
      options: --user root
@@ -31,7 +31,7 @@ jobs:
      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_mac=True --custom-var=host_os=mac'
    steps:
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -40,7 +40,7 @@ jobs:
      with:
        generate-sas-token: 'true'

-  publish-x64-darwin:
+  publish-x64:
    uses: ./.github/workflows/pipeline-segment-electron-build.yml
    needs: checkout-macos
    with:
@@ -48,29 +48,13 @@ jobs:
      build-runs-on: macos-14-xlarge
      target-platform: macos
      target-arch: x64
-      target-variant: darwin
      is-release: true
      gn-build-type: release
      generate-symbols: true
      upload-to-storage: ${{ inputs.upload-to-storage }}
    secrets: inherit

-  publish-x64-mas:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    needs: checkout-macos
-    with:
-      environment: production-release
-      build-runs-on: macos-14-xlarge
-      target-platform: macos
-      target-arch: x64
-      target-variant: mas
-      is-release: true
-      gn-build-type: release
-      generate-symbols: true
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
-
-  publish-arm64-darwin:
+  publish-arm64:
    uses: ./.github/workflows/pipeline-segment-electron-build.yml
    needs: checkout-macos
    with:
@@ -78,24 +62,8 @@ jobs:
      build-runs-on: macos-14-xlarge
      target-platform: macos
      target-arch: arm64
-      target-variant: darwin
      is-release: true
      gn-build-type: release
      generate-symbols: true
      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
-
-  publish-arm64-mas:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    needs: checkout-macos
-    with:
-      environment: production-release
-      build-runs-on: macos-14-xlarge
-      target-platform: macos
-      target-arch: arm64
-      target-variant: mas
-      is-release: true
-      gn-build-type: release
-      generate-symbols: true
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
+    secrets: inherit
--- a/.github/workflows/non-maintainer-dependency-change.yml
+++ b/.github/workflows/non-maintainer-dependency-change.yml
@@ -1,37 +0,0 @@
-name: Check for Non-Maintainer Dependency Change
-
-on:
-  pull_request_target:
-    paths:
-      - 'yarn.lock'
-      - 'spec/yarn.lock'
-
-permissions: {}
-
-jobs:
-  check-for-non-maintainer-dependency-change:
-    name: Check for non-maintainer dependency change
-    if: ${{ !contains(fromJSON('["MEMBER", "OWNER"]'), github.event.pull_request.author_association) && github.event.pull_request.user.type != 'Bot' && !github.event.pull_request.draft }}
-    permissions:
-      contents: read
-      pull-requests: write
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check for existing review
-        id: check-for-review
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_URL: ${{ github.event.pull_request.html_url }}
-        run: |
-          set -eo pipefail
-          REVIEW_COUNT=$(gh pr view $PR_URL --json reviews | jq '[ .reviews[] | select(.author.login == "github-actions") | select(.body | startswith("<!-- no-dependency-change -->")) ] | length')
-          if [[ $REVIEW_COUNT -eq 0 ]]; then
-            echo "SHOULD_REVIEW=1" >> "$GITHUB_OUTPUT"
-          fi
-      - name: Request changes
-        if: ${{ steps.check-for-review.outputs.SHOULD_REVIEW }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_URL: ${{ github.event.pull_request.html_url }}
-        run: |
-          printf "<!-- no-dependency-change -->\n\nHello @${{ github.event.pull_request.user.login }}! It looks like this pull request touches one of our dependency files, and per [our contribution policy](https://github.com/electron/electron/blob/main/CONTRIBUTING.md#dependencies-upgrades-policy) we do not accept these types of changes in PRs." | gh pr review $PR_URL -r --body-file=-
--- a/.github/workflows/pipeline-electron-build-and-test-and-nan.yml
+++ b/.github/workflows/pipeline-electron-build-and-test-and-nan.yml
@@ -15,10 +15,6 @@ on:
        type: string
        description: 'What host to run the build'
        required: true
-      check-runs-on:
-        type: string
-        description: 'What host to run the gn-check'
-        required: true
      test-runs-on:
        type: string
        description: 'What host to run the tests on'
@@ -81,7 +77,7 @@ jobs:
    with:
      target-platform: ${{ inputs.target-platform }}
      target-arch: ${{ inputs.target-arch }}
-      check-runs-on: ${{ inputs.check-runs-on }}
+      check-runs-on: ${{ inputs.build-runs-on }}
      check-container: ${{ inputs.build-container }}
      gn-build-type: ${{ inputs.gn-build-type }}
      is-asan: ${{ inputs.is-asan }}
@@ -104,4 +100,4 @@ jobs:
      test-runs-on: ${{ inputs.test-runs-on }}
      test-container: ${{ inputs.test-container }}
      gn-build-type: ${{ inputs.gn-build-type }}
-    secrets: inherit
+    secrets: inherit
--- a/.github/workflows/pipeline-electron-build-and-test.yml
+++ b/.github/workflows/pipeline-electron-build-and-test.yml
@@ -15,10 +15,6 @@ on:
        type: string
        description: 'What host to run the build'
        required: true
-      check-runs-on:
-        type: string
-        description: 'What host to run the gn-check'
-        required: true
      test-runs-on:
        type: string
        description: 'What host to run the tests on'
@@ -87,7 +83,7 @@ jobs:
    with:
      target-platform: ${{ inputs.target-platform }}
      target-arch: ${{ inputs.target-arch }}
-      check-runs-on: ${{ inputs.check-runs-on }}
+      check-runs-on: ${{ inputs.build-runs-on }}
      check-container: ${{ inputs.build-container }}
      gn-build-type: ${{ inputs.gn-build-type }}
      is-asan: ${{ inputs.is-asan }}
@@ -101,4 +97,4 @@ jobs:
      test-runs-on: ${{ inputs.test-runs-on }}
      test-container: ${{ inputs.test-container }}
      is-asan: ${{ inputs.is-asan}}
-    secrets: inherit
+    secrets: inherit
--- a/.github/workflows/pipeline-electron-docs-only.yml
+++ b/.github/workflows/pipeline-electron-docs-only.yml
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  docs-only:
    name: Docs Only Compile
-    runs-on: electron-arc-linux-amd64-4core
+    runs-on: aks-linux-medium
    timeout-minutes: 20
    container: ${{ fromJSON(inputs.container) }}
    steps:
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -40,4 +40,4 @@ jobs:
            if [ "$out" != "base.js" ]; then
            node script/yarn webpack --config $f --output-filename=$out --output-path=./.tmp --env mode=development
            fi
-        done
+        done
--- a/.github/workflows/pipeline-electron-lint.yml
+++ b/.github/workflows/pipeline-electron-lint.yml
@@ -15,12 +15,12 @@ concurrency:
 jobs:
  lint:
    name: Lint
-    runs-on: electron-arc-linux-amd64-4core
+    runs-on: aks-linux-medium
    timeout-minutes: 20
    container: ${{ fromJSON(inputs.container) }}
    steps:
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -32,7 +32,7 @@ jobs:
      shell: bash
      run: |
        # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
+        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
        echo "$(pwd)/src/third_party/depot_tools" >> $GITHUB_PATH
    - name: Download GN Binary
      shell: bash
@@ -53,10 +53,10 @@ jobs:
      run: |
        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"

-        mkdir -p src/buildtools
-        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/buildtools/DEPS?format=TEXT" | base64 -d > src/buildtools/DEPS
+        sha1_path='buildtools/linux64/clang-format.sha1'
+        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"

-        gclient sync --spec="solutions=[{'name':'src/buildtools','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':True},'managed':False}]"
+        download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
    - name: Run Lint
      shell: bash
      run: |
@@ -74,4 +74,4 @@ jobs:
      run: |
        cd src/electron
        node script/yarn tsc -p tsconfig.script.json
-    
+    
--- a/.github/workflows/pipeline-segment-electron-build.yml
+++ b/.github/workflows/pipeline-segment-electron-build.yml
@@ -15,10 +15,6 @@ on:
        type: string
        description: 'Arch to build for, can be x64, arm64 or arm'
        required: true
-      target-variant:
-        type: string
-        description: 'Variant to build for, no effect on non-macOS target platforms. Can be darwin, mas or all.'
-        default: all
      build-runs-on:
        type: string
        description: 'What host to run the build'
@@ -61,14 +57,15 @@ on:


 concurrency:
-  group: electron-build-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ inputs.target-variant }}-${{ inputs.is-asan }}-${{ github.ref }}
+  group: electron-build-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ inputs.is-asan }}-${{ github.ref }}
  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }}

 env:
+  AZURE_AKS_CACHE_STORAGE_ACCOUNT: ${{ secrets.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}
+  AZURE_AKS_CACHE_SHARE_NAME: ${{ secrets.AZURE_AKS_CACHE_SHARE_NAME }}
  ELECTRON_ARTIFACTS_BLOB_STORAGE: ${{ secrets.ELECTRON_ARTIFACTS_BLOB_STORAGE }}
  ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
-  SUDOWOODO_EXCHANGE_URL: ${{ secrets.SUDOWOODO_EXCHANGE_URL }}
-  SUDOWOODO_EXCHANGE_TOKEN: ${{ secrets.SUDOWOODO_EXCHANGE_TOKEN }}
+  ELECTRON_GITHUB_TOKEN: ${{ secrets.ELECTRON_GITHUB_TOKEN }}
  GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' }}
  ELECTRON_OUT_DIR: Default

@@ -83,19 +80,13 @@ jobs:
    - name: Create src dir
      run: mkdir src
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
-    - name: Free up space (macOS)
-      if: ${{ inputs.target-platform == 'macos' }}
-      uses: ./src/electron/.github/actions/free-space-macos
-    - name: Check disk space after freeing up space
-      if: ${{ inputs.target-platform == 'macos' }}
-      run: df -h
    - name: Setup Node.js/npm
      if: ${{ inputs.target-platform == 'macos' }}
-      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af
+      uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
      with:
        node-version: 20.11.x
        cache: yarn
@@ -125,7 +116,7 @@ jobs:
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git

        SEDOPTION="-i"
        if [ "`uname`" = "Darwin" ]; then
@@ -156,7 +147,7 @@ jobs:
      if: ${{ inputs.target-platform == 'linux' }}
      uses: ./src/electron/.github/actions/restore-cache-aks
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -164,7 +155,7 @@ jobs:
      uses: ./src/electron/.github/actions/install-build-tools
    - name: Init Build Tools
      run: |
-        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }}
+        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --only-sdk
    - name: Run Electron Only Hooks
      run: |
        gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
@@ -177,14 +168,22 @@ jobs:
    - name: Fix Sync (macOS)
      if: ${{ inputs.target-platform == 'macos' }}
      uses: ./src/electron/.github/actions/fix-sync-macos
-    - name: Setup Number of Ninja Processes
+    - name: Install build-tools & Setup RBE
      run: |
        echo "NUMBER_OF_NINJA_PROCESSES=${{ inputs.target-platform == 'linux' && '300' || '200' }}" >> $GITHUB_ENV
+        cd ~/.electron_build_tools
+        npx yarn --ignore-engines
+        # Pull down credential helper and print status
+        node -e "require('./src/utils/reclient.js').downloadAndPrepare({})"
+        HELPER=$(node -p "require('./src/utils/reclient.js').helperPath({})")
+        $HELPER login
+        echo 'RBE_service='`node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"` >> $GITHUB_ENV
+        echo 'RBE_experimental_credentials_helper='`node -e "console.log(require('./src/utils/reclient.js').helperPath({}))"` >> $GITHUB_ENV
+        echo 'RBE_experimental_credentials_helper_args=print' >> $GITHUB_ENV
    - name: Free up space (macOS)
      if: ${{ inputs.target-platform == 'macos' }}
      uses: ./src/electron/.github/actions/free-space-macos
    - name: Build Electron
-      if: ${{ inputs.target-platform != 'macos' || (inputs.target-variant == 'all' || inputs.target-variant == 'darwin') }}
      uses: ./src/electron/.github/actions/build-electron
      with:
        target-arch: ${{ inputs.target-arch }}
@@ -196,13 +195,13 @@ jobs:
        upload-to-storage: '${{ inputs.upload-to-storage }}'
        is-asan: '${{ inputs.is-asan }}'
    - name: Set GN_EXTRA_ARGS for MAS Build
-      if: ${{ inputs.target-platform == 'macos' && (inputs.target-variant == 'all' || inputs.target-variant == 'mas') }}
+      if: ${{ inputs.target-platform == 'macos' }}
      run: |
        echo "MAS_BUILD=true" >> $GITHUB_ENV
        GN_EXTRA_ARGS='is_mas_build=true'
        echo "GN_EXTRA_ARGS=$GN_EXTRA_ARGS" >> $GITHUB_ENV
    - name: Build Electron (MAS)
-      if: ${{ inputs.target-platform == 'macos' && (inputs.target-variant == 'all' || inputs.target-variant == 'mas') }}
+      if: ${{ inputs.target-platform == 'macos' }}
      uses: ./src/electron/.github/actions/build-electron
      with:
        target-arch: ${{ inputs.target-arch }}
@@ -211,4 +210,4 @@ jobs:
        is-release: '${{ inputs.is-release }}'
        generate-symbols: '${{ inputs.generate-symbols }}'
        upload-to-storage: '${{ inputs.upload-to-storage }}'
-        step-suffix: '(mas)'
+        step-suffix: '(mas)'
--- a/.github/workflows/pipeline-segment-electron-gn-check.yml
+++ b/.github/workflows/pipeline-segment-electron-gn-check.yml
@@ -36,6 +36,8 @@ concurrency:
  cancel-in-progress: true

 env:
+  AZURE_AKS_CACHE_STORAGE_ACCOUNT: ${{ secrets.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}
+  AZURE_AKS_CACHE_SHARE_NAME: ${{ secrets.AZURE_AKS_CACHE_SHARE_NAME }}
  ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
  GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' }}
  ELECTRON_OUT_DIR: Default
@@ -50,36 +52,19 @@ jobs:
      TARGET_ARCH: ${{ inputs.target-arch }}
    steps:
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
-    - name: Cleanup disk space on macOS
-      if: ${{ inputs.target-platform == 'macos' }}
-      shell: bash
-      run: |   
-        sudo mkdir -p $TMPDIR/del-target
-
-        tmpify() {
-          if [ -d "$1" ]; then
-            sudo mv "$1" $TMPDIR/del-target/$(echo $1|shasum -a 256|head -n1|cut -d " " -f1)
-          fi
-        }   
-        tmpify /Library/Developer/CoreSimulator
-        tmpify ~/Library/Developer/CoreSimulator
-        sudo rm -rf $TMPDIR/del-target
-    - name: Check disk space after freeing up space
-      if: ${{ inputs.target-platform == 'macos' }}
-      run: df -h        
    - name: Install Build Tools
      uses: ./src/electron/.github/actions/install-build-tools
    - name: Init Build Tools
      run: |
-        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }}
+        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --only-sdk
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git

        SEDOPTION="-i"
        if [ "`uname`" = "Darwin" ]; then
@@ -128,14 +113,10 @@ jobs:
    - name: Add CHROMIUM_BUILDTOOLS_PATH to env
      run: echo "CHROMIUM_BUILDTOOLS_PATH=$(pwd)/src/buildtools" >> $GITHUB_ENV
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
-    - name: Install Dependencies
-      run: |
-        cd src/electron
-        node script/yarn install --frozen-lockfile
    - name: Default GN gen
      run: |
        cd src/electron
@@ -148,8 +129,7 @@ jobs:
        cd src
        gn check out/Default //electron:electron_lib
        gn check out/Default //electron:electron_app
-        gn check out/Default //electron/shell/common:mojo
-        gn check out/Default //electron/shell/common:plugin
+        gn check out/Default //electron/shell/common/api:mojo

        # Check the hunspell filenames
        node electron/script/gen-hunspell-filenames.js --check
@@ -160,4 +140,4 @@ jobs:
        while [ -f /var/.ssh-lock ]
        do
          sleep 60
-        done
+        done
--- a/.github/workflows/pipeline-segment-electron-test.yml
+++ b/.github/workflows/pipeline-segment-electron-test.yml
@@ -38,6 +38,7 @@ permissions:
 env:
  ELECTRON_OUT_DIR: Default
  ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
+  ELECTRON_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

 jobs:
  test:
@@ -91,7 +92,7 @@ jobs:
          fi
        done
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -102,17 +103,18 @@ jobs:
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
-        # Ensure depot_tools does not update.
-        test -d depot_tools && cd depot_tools
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
        if [ "`uname`" = "Darwin" ]; then
          # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
-          sed -i '' '/ninjalog_uploader_wrapper.py/d' ./autoninja
+          sed -i '' '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
        else
-          sed -i '/ninjalog_uploader_wrapper.py/d' ./autoninja
+          sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
          # Remove swift-format dep from cipd on macOS until we send a patch upstream.
+          cd depot_tools
          git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        fi
+        # Ensure depot_tools does not update.
+        test -d depot_tools && cd depot_tools
        touch .disable_auto_update
    - name: Add Depot Tools to PATH
      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
@@ -123,12 +125,12 @@ jobs:
        echo "DISABLE_CRASH_REPORTER_TESTS=true" >> $GITHUB_ENV
        echo "IS_ASAN=true" >> $GITHUB_ENV
    - name: Download Generated Artifacts
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
      with:
        name: generated_artifacts_${{ env.ARTIFACT_KEY }}
        path: ./generated_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
    - name: Download Src Artifacts
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
      with:
        name: src_artifacts_${{ env.ARTIFACT_KEY }}
        path: ./src_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
@@ -146,21 +148,17 @@ jobs:
        sudo security authorizationdb write com.apple.trust-settings.admin allow
        cd src/electron
        ./script/codesign/generate-identity.sh
-    - name: Install Datadog CLI
-      run: |
-        cd src/electron
-        node script/yarn global add @datadog/datadog-ci
    - name: Run Electron Tests
      shell: bash
      env:
        MOCHA_REPORTER: mocha-multi-reporters
+        ELECTRON_TEST_RESULTS_DIR: junit
        MOCHA_MULTI_REPORTERS: mocha-junit-reporter, tap
        ELECTRON_DISABLE_SECURITY_WARNINGS: 1
        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
        DISPLAY: ':99.0'
      run: |
        cd src/electron
-        export ELECTRON_TEST_RESULTS_DIR=`pwd`/junit
        # Get which tests are on this shard
        tests_files=$(node script/split-tests ${{ matrix.shard }} ${{ inputs.target-platform == 'macos' && 2 || 3 }})

@@ -189,29 +187,10 @@ jobs:
            runuser -u builduser -- xvfb-run script/actions/run-tests.sh script/yarn test --runners=main --trace-uncaught --enable-logging --files $tests_files
          fi
        fi
-    - name: Upload Test results to Datadog
-      env:
-        DD_ENV: ci
-        DD_SERVICE: electron
-        DD_API_KEY: ${{ secrets.DD_API_KEY }}
-        DD_CIVISIBILITY_LOGS_ENABLED: true
-        DD_TAGS: "os.architecture:${{ inputs.target-arch }},os.family:${{ inputs.target-platform }},os.platform:${{ inputs.target-platform }},asan:${{ inputs.is-asan }}"
-      run: |
-        if ! [ -z $DD_API_KEY ]; then
-          datadog-ci junit upload src/electron/junit/test-results-main.xml
-        fi          
-      if: always() && !cancelled()
-    - name: Upload Test Artifacts
-      if: always() && !cancelled()
-      uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
-      with:
-        name: test_artifacts_${{ env.ARTIFACT_KEY }}
-        path: src/electron/spec/artifacts
-        if-no-files-found: ignore
    - name: Wait for active SSH sessions
      if: always() && !cancelled()
      run: |
        while [ -f /var/.ssh-lock ]
        do
          sleep 60
-        done
+        done
--- a/.github/workflows/pipeline-segment-node-nan-test.yml
+++ b/.github/workflows/pipeline-segment-node-nan-test.yml
@@ -37,7 +37,7 @@ env:
 jobs:
  node-tests:
    name: Run Node.js Tests
-    runs-on: electron-arc-linux-amd64-8core
+    runs-on: aks-linux-medium-plus
    timeout-minutes: 20
    env: 
      TARGET_ARCH: ${{ inputs.target-arch }}
@@ -45,7 +45,7 @@ jobs:
    container: ${{ fromJSON(inputs.test-container) }}
    steps:
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -61,21 +61,22 @@ jobs:
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
        sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
+        cd depot_tools
+        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        # Ensure depot_tools does not update.
        test -d depot_tools && cd depot_tools
-        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        touch .disable_auto_update
    - name: Add Depot Tools to PATH
      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
    - name: Download Generated Artifacts
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
      with:
        name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
        path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
    - name: Download Src Artifacts
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
      with:
        name: src_artifacts_linux_${{ env.TARGET_ARCH }}
        path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}
@@ -100,7 +101,7 @@ jobs:
        done
  nan-tests:
    name: Run Nan Tests
-    runs-on: electron-arc-linux-amd64-4core
+    runs-on: aks-linux-medium
    timeout-minutes: 20
    env: 
      TARGET_ARCH: ${{ inputs.target-arch }}
@@ -108,7 +109,7 @@ jobs:
    container: ${{ fromJSON(inputs.test-container) }}
    steps:
    - name: Checkout Electron
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
      with:
        path: src/electron
        fetch-depth: 0
@@ -124,21 +125,22 @@ jobs:
    - name: Get Depot Tools
      timeout-minutes: 5
      run: |
-        git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
        sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
+        cd depot_tools
+        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        # Ensure depot_tools does not update.
        test -d depot_tools && cd depot_tools
-        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
        touch .disable_auto_update
    - name: Add Depot Tools to PATH
      run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
    - name: Download Generated Artifacts
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
      with:
        name: generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
        path: ./generated_artifacts_${{ env.BUILD_TYPE }}_${{ env.TARGET_ARCH }}
    - name: Download Src Artifacts
-      uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e
      with:
        name: src_artifacts_linux_${{ env.TARGET_ARCH }}
        path: ./src_artifacts_linux_${{ env.TARGET_ARCH }}
@@ -150,7 +152,7 @@ jobs:
        unzip -:o dist.zip
    - name: Setup Linux for Headless Testing
      run: sh -e /etc/init.d/xvfb start
-    - name: Run Nan Tests
+    - name: Run Node.js Tests
      run: |
        cd src
        node electron/script/nan-spec-runner.js
@@ -160,4 +162,4 @@ jobs:
        while [ -f /var/.ssh-lock ]
        do
          sleep 60
-        done
+        done
--- a/.github/workflows/pull-request-labeled.yml
+++ b/.github/workflows/pull-request-labeled.yml
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Trigger Slack workflow
-        uses: slackapi/slack-github-action@485a9d42d3a73031f12ec201c457e2162c45d02d # v2.0.0
+        uses: slackapi/slack-github-action@6c661ce58804a1a20f6dc5fbee7f0381b469e001 # v1.25.0
        with:
          payload: |
            {
@@ -33,7 +33,7 @@ jobs:
          creds: ${{ secrets.RELEASE_BOARD_GH_APP_CREDS }}
          org: electron
      - name: Set status
-        uses: dsanders11/project-actions/edit-item@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
+        uses: dsanders11/project-actions/edit-item@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          token: ${{ steps.generate-token.outputs.token }}
          project-number: 94
--- a/.github/workflows/scorecards.yml
+++ b/.github/workflows/scorecards.yml
@@ -22,13 +22,13 @@ jobs:

    steps:
      - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
        with:
          persist-credentials: false

      # This is a pre-submit / pre-release.
      - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
        with:
          results_file: results.sarif
          results_format: sarif
@@ -42,7 +42,7 @@ jobs:
      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
      # format to the repository Actions tab.
      - name: "Upload artifact"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
        with:
          name: SARIF file
          path: results.sarif
@@ -50,6 +50,6 @@ jobs:

      # Upload the results to GitHub's code scanning dashboard.
      - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
        with:
          sarif_file: results.sarif
--- a/.github/workflows/semantic.yml
+++ b/.github/workflows/semantic.yml
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: semantic-pull-request
-        uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
+        uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f # v5.4.0
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
--- a/.github/workflows/stable-prep-items.yml
+++ b/.github/workflows/stable-prep-items.yml
@@ -27,7 +27,7 @@ jobs:
          PROJECT_NUMBER=$(gh project list --owner electron --format json | jq -r '.projects | map(select(.title | test("^[0-9]+-x-y$"))) | max_by(.number) | .number')
          echo "PROJECT_NUMBER=$PROJECT_NUMBER" >> "$GITHUB_OUTPUT"
      - name: Update Completed Stable Prep Items
-        uses: dsanders11/project-actions/completed-by@438b25e007c2f4efec324497fadc6402e7cc61a6 # v1.4.0
+        uses: dsanders11/project-actions/completed-by@82e99438bd44a14ad18d92d036dbc25cbfb9a8c4 # v1.2.0
        with:
          field: Prep Status
          field-value: ✅ Complete
--- a/.github/workflows/update_appveyor_image.yml
+++ b/.github/workflows/update_appveyor_image.yml
@@ -19,14 +19,10 @@ jobs:
      with:
        creds: ${{ secrets.APPVEYOR_UPDATER_GH_APP_CREDS }}
    - name: Checkout
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
      with:
        fetch-depth: 0
        token: ${{ steps.generate-token.outputs.token }}
-    - name: Setup Node.js
-      uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
-      with:
-        node-version: 20.11.x
    - name: Yarn install
      run: |
        node script/yarn.js install --frozen-lockfile
@@ -43,7 +39,7 @@ jobs:
        fi
    - name: (Optionally) Update Appveyor Image
      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: mikefarah/yq@bc5b54cb1d1f720db16c9f75c5b45384d00e5cbf # v4.44.5
+      uses: mikefarah/yq@bb66c9c872a7a4cf3d6846c2ff6d182c66ec3f77 # v4.40.7
      with:
        cmd: |
          yq '.image = "${{ env.APPVEYOR_IMAGE_VERSION }}"' "appveyor.yml" > "appveyor2.yml"
@@ -64,7 +60,7 @@ jobs:
        git add appveyor-woa.yml
    - name: (Optionally) Commit to Branch
      if: ${{ env.APPVEYOR_IMAGE_VERSION }}
-      uses: dsanders11/github-app-commit-action@43de6da2f4d927e997c0784c7a0b61bd19ad6aac # v1.5.0
+      uses: dsanders11/github-app-commit-action@1dd0a2d22c564461d3f598b6858856e8842d7a16 # v1.1.0
      with:
        message: 'build: update appveyor image to latest version'
        ref: bump-appveyor-image
--- a/.lint-roller.json
+++ b/.lint-roller.json
@@ -1,13 +0,0 @@
-{
-  "markdown-ts-check": {
-    "defaultImports": [
-      "import * as childProcess from 'node:child_process'",
-      "import * as fs from 'node:fs'",
-      "import * as path from 'node:path'",
-      "import { app, autoUpdater, contextBridge, crashReporter, dialog, BrowserWindow, ipcMain, ipcRenderer, Menu, MessageChannelMain, nativeImage, net, protocol, session, systemPreferences, Tray, utilityProcess, webFrame, webFrameMain } from 'electron'"
-    ],
-    "typings": [
-      "../electron.d.ts"
-    ]
-  }
-}
--- a/.markdownlint-cli2.jsonc
+++ b/.markdownlint-cli2.jsonc
@@ -1,31 +0,0 @@
-{
-  "config": {
-    "extends": "@electron/lint-roller/configs/markdownlint.json",
-    "link-image-style": {
-      "autolink": false,
-      "shortcut": false
-    },
-    "MD049": {
-      "style": "underscore"
-    },
-    "no-angle-brackets": true,
-    "no-curly-braces": true,
-    "no-inline-html": {
-      "allowed_elements": [
-        "br",
-        "details",
-        "img",
-        "li",
-        "summary",
-        "ul",
-        "unknown",
-        "Tabs",
-        "TabItem"
-      ]
-    },
-    "no-newline-in-links": true
-  },
-  "customRules": [
-    "@electron/lint-roller/markdownlint-rules/"
-  ]
-}
--- a/.markdownlint.autofix.json
+++ b/.markdownlint.autofix.json
@@ -0,0 +1,6 @@
+{
+  "default": false,
+  "no-trailing-spaces": {
+    "br_spaces": 0
+  }
+}
--- a/.markdownlint.json
+++ b/.markdownlint.json
@@ -0,0 +1,17 @@
+{
+  "extends": "@electron/lint-roller/configs/markdownlint.json",
+  "no-angle-brackets": true,
+  "no-inline-html": {
+    "allowed_elements": [
+      "br",
+      "details",
+      "img",
+      "li",
+      "summary",
+      "ul",
+      "unknown",
+      "Tabs",
+      "TabItem",
+    ]
+  }
+}
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-20
+16
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -9,7 +9,7 @@ import("//pdf/features.gni")
 import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//testing/test.gni")
-import("//third_party/electron_node/node.gni")
+import("//third_party/electron_node/electron_node.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
 import("//tools/generate_library_loader/generate_library_loader.gni")
 import("//tools/grit/grit_rule.gni")
@@ -34,11 +34,12 @@ import("js2c_toolchain.gni")
 if (is_mac) {
  import("//build/config/mac/rules.gni")
  import("//third_party/icu/config.gni")
+  import("//ui/gl/features.gni")
  import("//v8/gni/v8.gni")
  import("build/rules.gni")

  assert(
-      mac_deployment_target == "11.0",
+      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")
 }

@@ -74,7 +75,7 @@ if (is_linux) {
      "notify_notification_set_image_from_pixbuf",
      "notify_notification_set_timeout",
      "notify_notification_set_urgency",
-      "notify_notification_set_hint",
+      "notify_notification_set_hint_string",
      "notify_notification_show",
      "notify_notification_close",
    ]
@@ -84,10 +85,7 @@ if (is_linux) {
  # from the gtk library. Function signatures for which stubs are
  # required should be declared in the sig files.
  generate_stubs("electron_gtk_stubs") {
-    sigs = [
-      "shell/browser/ui/electron_gdk.sigs",
-      "shell/browser/ui/electron_gdk_pixbuf.sigs",
-    ]
+    sigs = [ "shell/browser/ui/electron_gdk_pixbuf.sigs" ]
    extra_header = "shell/browser/ui/electron_gtk.fragment"
    output_name = "electron_gtk_stubs"
    public_deps = [ "//ui/gtk:gtk_config" ]
@@ -411,7 +409,7 @@ action("electron_generate_node_defines") {
 source_set("electron_lib") {
  configs += [
    "//v8:external_startup_data",
-    "//third_party/electron_node:node_external_config",
+    "//third_party/electron_node:node_internals",
  ]

  public_configs = [
@@ -428,8 +426,7 @@ source_set("electron_lib") {
    "buildflags",
    "chromium_src:chrome",
    "chromium_src:chrome_spellchecker",
-    "shell/common:mojo",
-    "shell/common:plugin",
+    "shell/common/api:mojo",
    "shell/services/node/public/mojom",
    "//base:base_static",
    "//base/allocator:buildflags",
@@ -440,7 +437,6 @@ source_set("electron_lib") {
    "//components/certificate_transparency",
    "//components/compose:buildflags",
    "//components/embedder_support:browser_util",
-    "//components/input:input",
    "//components/language/core/browser",
    "//components/net_log",
    "//components/network_hints/browser",
@@ -469,7 +465,6 @@ source_set("electron_lib") {
    "//gin",
    "//media/capture/mojom:video_capture",
    "//media/mojo/mojom",
-    "//media/mojo/mojom:web_speech_recognition",
    "//net:extras",
    "//net:net_resources",
    "//printing/buildflags",
@@ -486,7 +481,7 @@ source_set("electron_lib") {
    "//third_party/blink/public:blink_devtools_inspector_resources",
    "//third_party/blink/public/platform/media",
    "//third_party/boringssl",
-    "//third_party/electron_node:libnode",
+    "//third_party/electron_node:node_lib",
    "//third_party/inspector_protocol:crdtp",
    "//third_party/leveldatabase",
    "//third_party/libyuv",
@@ -521,10 +516,7 @@ source_set("electron_lib") {
    "//third_party/blink/renderer",
  ]

-  defines = [
-    "BLINK_MOJO_IMPL=1",
-    "V8_DEPRECATION_WARNINGS",
-  ]
+  defines = [ "V8_DEPRECATION_WARNINGS" ]
  libs = []

  if (is_linux) {
@@ -538,7 +530,7 @@ source_set("electron_lib") {
    ]
  }

-  deps += [ "//electron/build/config:generate_mas_config" ]
+  configs += [ "//electron/build/config:mas_build" ]

  sources = filenames.lib_sources
  if (is_win) {
@@ -679,11 +671,22 @@ source_set("electron_lib") {
  }

  if (enable_plugins) {
+    deps += [ "chromium_src:plugins" ]
    sources += [
-      "shell/browser/electron_plugin_info_host_impl.cc",
-      "shell/browser/electron_plugin_info_host_impl.h",
      "shell/common/plugin_info.cc",
      "shell/common/plugin_info.h",
+      "shell/renderer/electron_renderer_pepper_host_factory.cc",
+      "shell/renderer/electron_renderer_pepper_host_factory.h",
+      "shell/renderer/pepper_helper.cc",
+      "shell/renderer/pepper_helper.h",
+    ]
+  }
+
+  if (enable_ppapi) {
+    deps += [
+      "//ppapi/host",
+      "//ppapi/proxy",
+      "//ppapi/shared_impl",
    ]
  }

@@ -741,7 +744,6 @@ source_set("electron_lib") {
      "//components/pdf/common:util",
      "//components/pdf/renderer",
      "//pdf",
-      "//pdf:content_restriction",
    ]
    sources += [
      "shell/browser/electron_pdf_document_helper_client.cc",
@@ -808,33 +810,37 @@ if (is_mac) {
    group("electron_framework_libraries") {
    }
  }
+  if (use_egl) {
+    # Add the ANGLE .dylibs in the Libraries directory of the Framework.
+    bundle_data("electron_angle_binaries") {
+      sources = [
+        "$root_out_dir/egl_intermediates/libEGL.dylib",
+        "$root_out_dir/egl_intermediates/libGLESv2.dylib",
+      ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
+      public_deps = [ "//ui/gl:angle_library_copy" ]
+    }

-  # Add the ANGLE .dylibs in the Libraries directory of the Framework.
-  bundle_data("electron_angle_binaries") {
-    sources = [
-      "$root_out_dir/egl_intermediates/libEGL.dylib",
-      "$root_out_dir/egl_intermediates/libGLESv2.dylib",
-    ]
-    outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
-    public_deps = [ "//ui/gl:angle_library_copy" ]
+    # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
+    bundle_data("electron_swiftshader_binaries") {
+      sources = [
+        "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
+        "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
+      ]
+      outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
+      public_deps = [ "//ui/gl:swiftshader_vk_library_copy" ]
+    }
  }
-
-  # Add the SwiftShader .dylibs in the Libraries directory of the Framework.
-  bundle_data("electron_swiftshader_binaries") {
-    sources = [
-      "$root_out_dir/vk_intermediates/libvk_swiftshader.dylib",
-      "$root_out_dir/vk_intermediates/vk_swiftshader_icd.json",
-    ]
-    outputs = [ "{{bundle_contents_dir}}/Libraries/{{source_file_part}}" ]
-    public_deps = [ "//ui/gl:swiftshader_vk_library_copy" ]
-  }
-
  group("electron_angle_library") {
-    deps = [ ":electron_angle_binaries" ]
+    if (use_egl) {
+      deps = [ ":electron_angle_binaries" ]
+    }
  }

  group("electron_swiftshader_library") {
-    deps = [ ":electron_swiftshader_binaries" ]
+    if (use_egl) {
+      deps = [ ":electron_swiftshader_binaries" ]
+    }
  }

  bundle_data("electron_crashpad_helper") {
@@ -871,7 +877,6 @@ if (is_mac) {
      ":electron_framework_resources",
      ":electron_swiftshader_library",
      ":electron_xibs",
-      "//third_party/electron_node:libnode",
    ]
    if (!is_mas_build) {
      deps += [ ":electron_crashpad_helper" ]
@@ -915,18 +920,17 @@ if (is_mac) {
      assert(defined(invoker.helper_name_suffix))

      output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [
-        ":electron_framework+link",
-        "//electron/build/config:generate_mas_config",
-      ]
+      deps = [ ":electron_framework+link" ]
      if (!is_mas_build) {
        deps += [ "//sandbox/mac:seatbelt" ]
      }
      defines = [ "HELPER_EXECUTABLE" ]
+      configs += [ "//electron/build/config:mas_build" ]
      sources = [
        "shell/app/electron_main_mac.cc",
        "shell/app/uv_stdio_fix.cc",
        "shell/app/uv_stdio_fix.h",
+        "shell/common/electron_constants.cc",
      ]
      include_dirs = [ "." ]
      info_plist = "shell/renderer/resources/mac/Info.plist"
@@ -1077,7 +1081,6 @@ if (is_mac) {
      ":electron_app_plist",
      ":electron_app_resources",
      ":electron_fuses",
-      "//electron/build/config:generate_mas_config",
      "//electron/buildflags",
    ]
    if (is_mas_build) {
@@ -1092,6 +1095,7 @@ if (is_mac) {
      "-rpath",
      "@executable_path/../Frameworks",
    ]
+    configs += [ "//electron/build/config:mas_build" ]
  }

  if (enable_dsyms) {
@@ -1195,7 +1199,6 @@ if (is_mac) {
      "//components/crash/core/app",
      "//content:sandbox_helper_win",
      "//electron/buildflags",
-      "//third_party/electron_node:libnode",
      "//ui/strings",
    ]

@@ -1507,8 +1510,21 @@ group("electron") {
 ##### node_headers

 node_dir = "../third_party/electron_node"
+node_files = read_file("$node_dir/filenames.json", "json")
 node_headers_dir = "$root_gen_dir/node_headers"

+header_group_index = 0
+header_groups = []
+foreach(header_group, node_files.headers) {
+  copy("node_headers_${header_group_index}") {
+    sources = rebase_path(header_group.files, ".", node_dir)
+    outputs =
+        [ "$node_headers_dir/${header_group.dest_dir}/{{source_file_part}}" ]
+  }
+  header_groups += [ ":node_headers_${header_group_index}" ]
+  header_group_index += 1
+}
+
 copy("zlib_headers") {
  sources = [
    "$node_dir/deps/zlib/zconf.h",
@@ -1529,19 +1545,13 @@ copy("node_gypi_headers") {
 action("node_version_header") {
  inputs = [ "$node_dir/src/node_version.h" ]
  outputs = [ "$node_headers_dir/include/node/node_version.h" ]
-  script = "script/node/generate_node_version_header.py"
+  script = "script/generate_node_version_header.py"
  args = rebase_path(inputs) + rebase_path(outputs)
  if (node_module_version != "") {
    args += [ "$node_module_version" ]
  }
 }

-action("generate_node_headers") {
-  deps = [ ":generate_config_gypi" ]
-  script = "script/node/generate_node_headers.py"
-  outputs = [ "$root_gen_dir/node_headers.json" ]
-}
-
 action("tar_node_headers") {
  deps = [ ":copy_node_headers" ]
  outputs = [ "$root_gen_dir/node_headers.tar.gz" ]
@@ -1553,12 +1563,11 @@ action("tar_node_headers") {
 }

 group("copy_node_headers") {
-  public_deps = [
-    ":generate_node_headers",
-    ":node_gypi_headers",
-    ":node_version_header",
-    ":zlib_headers",
-  ]
+  public_deps = header_groups + [
+                  ":node_gypi_headers",
+                  ":node_version_header",
+                  ":zlib_headers",
+                ]
 }

 group("node_headers") {
--- a/4
+++ b/4
@@ -2,9 +2,9 @@ gclient_gn_args_from = 'src'

 vars = {
  'chromium_version':
-    '133.0.6846.0',
+    '126.0.6478.127',
  'node_version':
-    'v22.9.0',
+    'v20.15.0',
  'nan_version':
    'e14bdcd1f72d62bca1d541b66da43130384ec213',
  'squirrel.mac_version':
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 [![Electron Logo](https://electronjs.org/images/electron-logo.svg)](https://electronjs.org)

-[![GitHub Actions Build Status](https://github.com/electron/electron/actions/workflows/build.yml/badge.svg)](https://github.com/electron/electron/actions/workflows/build.yml)
+[![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/main.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/main)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/4lggi9dpjc1qob7k/branch/main?svg=true)](https://ci.appveyor.com/project/electron-bot/electron-ljo26/branch/main)
 [![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.gg/electronjs)

@@ -38,7 +38,7 @@ For more installation options and troubleshooting tips, see

 Each Electron release provides binaries for macOS, Windows, and Linux.

-* macOS (Big Sur and up): Electron provides 64-bit Intel and Apple Silicon / ARM binaries for macOS.
+* macOS (Catalina and up): Electron provides 64-bit Intel and ARM binaries for macOS. Apple Silicon support was added in Electron 11.
 * Windows (Windows 10 and up): Electron provides `ia32` (`x86`), `x64` (`amd64`), and `arm64` binaries for Windows. Windows on ARM support was added in Electron 5.0.8. Support for Windows 7, 8 and 8.1 was [removed in Electron 23, in line with Chromium's Windows deprecation policy](https://www.electronjs.org/blog/windows-7-to-8-1-deprecation-notice).
 * Linux: The prebuilt binaries of Electron are built on Ubuntu 20.04. They have also been verified to work on:
  * Ubuntu 18.04 and newer
--- a/appveyor-bake.yml
+++ b/appveyor-bake.yml
@@ -68,7 +68,7 @@ build_script:
  - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
  - update_depot_tools.bat
  # Uncomment the following line if windows deps change
-  - src\electron\script\setup-win-for-dev.bat
+  # - src\electron\script\setup-win-for-dev.bat
  - >-
      gclient config
      --name "src\electron"
--- a/appveyor-woa.yml
+++ b/appveyor-woa.yml
@@ -29,32 +29,26 @@

 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-133.0.6846.0
+image: e-126.0.6445.0
 environment:
  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
  ELECTRON_OUT_DIR: Default
  ELECTRON_ENABLE_STACK_DUMPING: 1
  ELECTRON_ALSO_LOG_TO_STDERR: 1
  MOCHA_REPORTER: mocha-multi-reporters
-  MOCHA_MULTI_REPORTERS: "@marshallofsound/mocha-appveyor-reporter, mocha-junit-reporter, tap"
+  MOCHA_MULTI_REPORTERS: "@marshallofsound/mocha-appveyor-reporter, tap"
  DEPOT_TOOLS_WIN_TOOLCHAIN: 1
-  DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: "https://dev-cdn.electronjs.org/windows-toolchains/_"  
+  DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: "https://dev-cdn.electronjs.org/windows-toolchains/_"
  GYP_MSVS_HASH_7393122652: 3ba76c5c20
  PYTHONIOENCODING: UTF-8

  matrix:

    - job_name: Build Arm on X64 Windows
-    - job_name: Test On Windows On Arm Hardware 1
+    - job_name: Test On Windows On Arm Hardware
      job_depends_on: Build Arm on X64 Windows
      APPVEYOR_BUILD_WORKER_IMAGE: base-woa
      APPVEYOR_BUILD_WORKER_CLOUD: electronhq-woa
-      shard: 1
-    - job_name: Test On Windows On Arm Hardware 2
-      job_depends_on: Build Arm on X64 Windows
-      APPVEYOR_BUILD_WORKER_IMAGE: base-woa
-      APPVEYOR_BUILD_WORKER_CLOUD: electronhq-woa
-      shard: 2

 clone_script:
 - ps: git clone -q $("--branch=" + $Env:APPVEYOR_REPO_BRANCH) $("https://github.com/" + $Env:APPVEYOR_REPO_NAME + ".git") $Env:APPVEYOR_BUILD_FOLDER
@@ -76,9 +70,8 @@ for:
        - job_name: Build Arm on X64 Windows

    build_script:
-      # TODO: Remove --ignore-engines once WOA image is up to node 20
      - ps: |
-          node script/yarn.js install --frozen-lockfile --ignore-engines
+          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) {
@@ -102,8 +95,6 @@ for:
      - 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: |
-          Set-Content -Path $pwd\depot_tools\build_telemetry.cfg -Value '{"user": "info@electronjs.org", "status": "opt-out", "countdown": 10, "version": 1}'
      - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
      - ps: >-
          if (Test-Path -Path "$pwd\src\electron") {
@@ -121,14 +112,9 @@ for:
      - ps: >-
          $env:RBE_service = node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"
      - ps: >-
-          $env:RBE_credentials_helper = $env:RECLIENT_HELPER
+          $env:RBE_experimental_credentials_helper = $env:RECLIENT_HELPER
      - ps: >-
-          $env:RBE_credentials_helper_args = "print"
-      - ps: >-
-          if ($env:ELECTRON_RBE_JWT -eq '') {
-            $env:RBE_fail_early_min_action_count = "0"
-            $env:RBE_fail_early_min_fallback_ratio = "0"
-          }
+          $env:RBE_experimental_credentials_helper_args = "print"
      - cd ..\..
      - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
      - ps: >-
@@ -154,9 +140,8 @@ for:
      - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") use_remoteexec=true %GN_EXTRA_ARGS% "
      - gn check out/Default //electron:electron_lib
      - gn check out/Default //electron:electron_app
-      - gn check out/Default //electron/shell/common:mojo
-      - gn check out/Default //electron/shell/common:plugin
-      - autoninja -j 300 -C out/Default electron:electron_app
+      - gn check out/Default //electron/shell/common/api:mojo
+      - if DEFINED ELECTRON_RBE_JWT (autoninja -j 300 -C out/Default electron:electron_app) else (autoninja -C out/Default electron:electron_app)
      - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
      - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true %GN_EXTRA_ARGS%"
      - autoninja -C out/ffmpeg electron:electron_ffmpeg_zip
@@ -164,7 +149,7 @@ for:
      - gn desc out/Default v8:run_mksnapshot_default args > out/Default/default_mksnapshot_args
      # Remove unused args from mksnapshot_args
      - ps: >-
-          Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') } | Set-Content out/Default/mksnapshot_args
+          Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') -And -not $_.Contains('The gn arg use_goma=true') } | Set-Content out/Default/mksnapshot_args
      - autoninja -C out/Default electron:electron_mksnapshot_zip
      - cd out\Default
      - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
@@ -181,8 +166,8 @@ for:
          if ($env:GN_CONFIG -eq 'release') {
            # Needed for msdia140.dll on 64-bit windows
            $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
+            autoninja -C out/Default electron:electron_symbols
          }
-      - if "%GN_CONFIG%"=="release" ( autoninja -C out/Default electron:electron_symbols )
      - ps: >-
          if ($env:GN_CONFIG -eq 'release') {
            python3 electron\script\zip-symbols.py
@@ -258,23 +243,18 @@ for:
          }
  - matrix:
      only:
-        - job_name: Test On Windows On Arm Hardware 1
-        - job_name: Test On Windows On Arm Hardware 2
+        - job_name: Test On Windows On Arm Hardware

    environment:
        IGNORE_YARN_INSTALL_ERROR: 1
-        ELECTRON_TEST_RESULTS_DIR: C:\projects\src\electron\junit
-        MOCHA_MULTI_REPORTERS: "@marshallofsound/mocha-appveyor-reporter, mocha-junit-reporter, tap"
+        ELECTRON_TEST_RESULTS_DIR: junit
+        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
        MOCHA_REPORTER: mocha-multi-reporters
        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
-        DD_ENV: ci
-        DD_SERVICE: electron
-        DD_CIVISIBILITY_LOGS_ENABLED: true
-        DD_GIT_REPOSITORY_URL: "https://github.com/electron/electron.git"

    build_script:
      - ps: |
-          node script/yarn.js install --frozen-lockfile --ignore-engines
+          node script/yarn.js install --frozen-lockfile
          node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER
          if ($LASTEXITCODE -eq 0) {
            Write-warning "Skipping build for doc only change"
@@ -282,7 +262,6 @@ for:
          } else {
            $global:LASTEXITCODE = 0
          }
-      - ps: Invoke-WebRequest -Uri "https://github.com/DataDog/datadog-ci/releases/latest/download/datadog-ci_win-x64" -OutFile "C:\projects\src\electron\datadog-ci.exe"
      - cd ..
      - mkdir out\Default
      - cd ..
@@ -303,8 +282,8 @@ 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
+              # Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
+              # 7z x -y -osrc pdb.zip
            }
          }
      - ps: |
@@ -331,22 +310,11 @@ for:
          if ($env:TARGET_ARCH -eq 'ia32') {
            $env:npm_config_arch = "ia32"
          }
-      - ps: $env:tests_files=node script\split-tests $env:shard 2
-      - echo "Running shard %shard% specs %tests_files%"
-      - echo Running main test suite & node script/yarn test  --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion --files %tests_files%
+      - echo Running main test suite & node script/yarn test  --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion
      - cd ..
      - echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg

    on_finish:
      # Uncomment these lines to enable RDP
      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - if exist electron\junit\test-results-main.xml ( appveyor-retry appveyor PushArtifact electron\junit\test-results-main.xml )
-      - ps: |
-          if ($env:DD_API_KEY) {
-            $env:DD_GIT_COMMIT_SHA = $env:APPVEYOR_REPO_COMMIT
-            $env:DD_GIT_BRANCH = $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH
-            $env:DD_TAGS = "os.architecture:$env:TARGET_ARCH,os.family:windows,os.platform:win32"
-            if (Test-Path -Path "C:\projects\src\electron\junit\test-results-main.xml") {
-              C:\projects\src\electron\datadog-ci.exe junit upload --verbose C:\projects\src\electron\junit\test-results-main.xml
-            }
-          }
+      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,14 +29,14 @@

 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-133.0.6846.0
+image: e-126.0.6445.0
 environment:
  GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
  ELECTRON_OUT_DIR: Default
  ELECTRON_ENABLE_STACK_DUMPING: 1
  ELECTRON_ALSO_LOG_TO_STDERR: 1
  MOCHA_REPORTER: mocha-multi-reporters
-  MOCHA_MULTI_REPORTERS: "@marshallofsound/mocha-appveyor-reporter, mocha-junit-reporter, tap"
+  MOCHA_MULTI_REPORTERS: "@marshallofsound/mocha-appveyor-reporter, tap"
  DEPOT_TOOLS_WIN_TOOLCHAIN: 1
  DEPOT_TOOLS_WIN_TOOLCHAIN_BASE_URL: "https://dev-cdn.electronjs.org/windows-toolchains/_"
  GYP_MSVS_HASH_7393122652: 3ba76c5c20
@@ -45,12 +45,8 @@ environment:
  matrix:

    - job_name: Build
-    - job_name: Test 1
+    - job_name: Test
      job_depends_on: Build
-      shard: 1
-    - job_name: Test 2
-      job_depends_on: Build
-      shard: 2

 clone_script:
 - ps: git clone -q $("--branch=" + $Env:APPVEYOR_REPO_BRANCH) $("https://github.com/" + $Env:APPVEYOR_REPO_NAME + ".git") $Env:APPVEYOR_BUILD_FOLDER
@@ -97,8 +93,6 @@ for:
      - 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: |
-          Set-Content -Path $pwd\depot_tools\build_telemetry.cfg -Value '{"user": "info@electronjs.org", "status": "opt-out", "countdown": 10, "version": 1}'
      - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
      - ps: >-
          if (Test-Path -Path "$pwd\src\electron") {
@@ -116,14 +110,9 @@ for:
      - ps: >-
          $env:RBE_service = node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"
      - ps: >-
-          $env:RBE_credentials_helper = $env:RECLIENT_HELPER
+          $env:RBE_experimental_credentials_helper = $env:RECLIENT_HELPER
      - ps: >-
-          $env:RBE_credentials_helper_args = "print"
-      - ps: >-
-          if ($env:ELECTRON_RBE_JWT -eq '') {
-            $env:RBE_fail_early_min_action_count = "0"
-            $env:RBE_fail_early_min_fallback_ratio = "0"
-          }
+          $env:RBE_experimental_credentials_helper_args = "print"
      - cd ..\..
      - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
      - ps: >-
@@ -149,9 +138,8 @@ for:
      - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") use_remoteexec=true %GN_EXTRA_ARGS% "
      - gn check out/Default //electron:electron_lib
      - gn check out/Default //electron:electron_app
-      - gn check out/Default //electron/shell/common:mojo
-      - gn check out/Default //electron/shell/common:plugin
-      - autoninja -j 300 -C out/Default electron:electron_app
+      - gn check out/Default //electron/shell/common/api:mojo
+      - if DEFINED ELECTRON_RBE_JWT (autoninja -j 300 -C out/Default electron:electron_app) else (autoninja -C out/Default electron:electron_app)
      - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default )
      - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true %GN_EXTRA_ARGS%"
      - autoninja -C out/ffmpeg electron:electron_ffmpeg_zip
@@ -159,7 +147,7 @@ for:
      - gn desc out/Default v8:run_mksnapshot_default args > out/Default/default_mksnapshot_args
      # Remove unused args from mksnapshot_args
      - ps: >-
-          Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') } | Set-Content out/Default/mksnapshot_args
+          Get-Content out/Default/default_mksnapshot_args | Where-Object { -not $_.Contains('--turbo-profiling-input') -And -not $_.Contains('builtins-pgo') -And -not $_.Contains('The gn arg use_goma=true') } | Set-Content out/Default/mksnapshot_args
      - autoninja -C out/Default electron:electron_mksnapshot_zip
      - cd out\Default
      - 7z a mksnapshot.zip mksnapshot_args gen\v8\embedded.S
@@ -175,8 +163,8 @@ for:
          if ($env:GN_CONFIG -eq 'release') {
            # Needed for msdia140.dll on 64-bit windows
            $env:Path += ";$pwd\third_party\llvm-build\Release+Asserts\bin"
+            autoninja -C out/Default electron:electron_symbols
          }
-      - if "%GN_CONFIG%"=="release" ( autoninja -C out/Default electron:electron_symbols )
      - ps: >-
          if ($env:GN_CONFIG -eq 'release') {
            python3 electron\script\zip-symbols.py
@@ -248,15 +236,7 @@ for:
          }
  - matrix:
      only:
-        - job_name: Test 1
-        - job_name: Test 2
-
-    environment:
-        DD_ENV: ci
-        DD_SERVICE: electron
-        DD_CIVISIBILITY_LOGS_ENABLED: true
-        DD_GIT_REPOSITORY_URL: "https://github.com/electron/electron.git"
-        ELECTRON_TEST_RESULTS_DIR: C:\projects\src\electron\junit
+        - job_name: Test

    init:
      - ps: |
@@ -273,7 +253,6 @@ for:
          } else {
            $global:LASTEXITCODE = 0
          }
-      - npm install -g @datadog/datadog-ci
      - cd ..
      - mkdir out\Default
      - cd ..
@@ -294,8 +273,8 @@ 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
+              # Invoke-RestMethod -Method Get -Uri "$apiUrl/buildjobs/$jobId/artifacts/pdb.zip" -OutFile pdb.zip
+              # 7z x -y -osrc pdb.zip
            }
          }
      - ps: |
@@ -319,9 +298,7 @@ for:
          if ($env:TARGET_ARCH -eq 'ia32') {
            $env:npm_config_arch = "ia32"
          }
-      - ps: $env:tests_files=node script\split-tests $env:shard 2
-      - echo "Running shard %shard% specs %tests_files%"
-      - echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging --files %tests_files%
+      - echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log
      - cd ..
      - echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
      - echo "About to verify mksnapshot"
@@ -333,13 +310,4 @@ for:
    on_finish:
      # Uncomment these lines to enable RDP
      # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
-      - if exist electron\junit\test-results-main.xml ( appveyor-retry appveyor PushArtifact electron\junit\test-results-main.xml )
-      - ps: |
-          if ($env:RUN_TESTS -eq 'true' -And $env:DD_API_KEY) {
-            $env:DD_GIT_COMMIT_SHA = $env:APPVEYOR_REPO_COMMIT
-            $env:DD_GIT_BRANCH = $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH
-            $env:DD_TAGS = "os.architecture:$env:TARGET_ARCH,os.family:windows,os.platform:win32"
-            if (Test-Path -Path "C:\projects\src\electron\junit\test-results-main.xml") {
-              C:\Users\appveyor\AppData\Roaming\npm\datadog-ci.ps1 junit upload --verbose C:\projects\src\electron\junit\test-results-main.xml
-            }
-          }
+      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )
--- a/build/args/all.gn
+++ b/build/args/all.gn
@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]

 # Registry of NMVs --> https://github.com/nodejs/node/blob/main/doc/abi_version_registry.json
-node_module_version = 132
+node_module_version = 125

 v8_promise_internal_field_count = 1
 v8_embedder_string = "-electron.0"
@@ -73,10 +73,3 @@ clang_unsafe_buffers_paths = ""
 # Disable snapshotting a page when printing for its content to be analyzed for
 # sensitive content by enterprise users.
 enterprise_cloud_content_analysis = false
-
-# TODO: remove dependency on legacy ipc
-# https://issues.chromium.org/issues/40943039
-content_enable_legacy_ipc = true
-
-# Electron has its own unsafe-buffers enforcement directories.
-clang_unsafe_buffers_paths = "//electron/electron_unsafe_buffers_paths.txt"
--- a/build/config/BUILD.gn
+++ b/build/config/BUILD.gn
@@ -1,11 +1,8 @@
-action("generate_mas_config") {
-  outputs = [ "$target_gen_dir/../../mas.h" ]
-  script = "../../script/generate-mas-config.py"
+# For MAS build, we force defining "MAS_BUILD".
+config("mas_build") {
  if (is_mas_build) {
-    args = [ "true" ]
+    defines = [ "IS_MAS_BUILD()=1" ]
  } else {
-    args = [ "false" ]
+    defines = [ "IS_MAS_BUILD()=0" ]
  }
-
-  args += rebase_path(outputs)
 }
--- a/build/extract_symbols.gni
+++ b/build/extract_symbols.gni
@@ -24,8 +24,11 @@ template("extract_symbols") {
    assert(defined(invoker.binary), "Need binary to dump")
    assert(defined(invoker.symbol_dir), "Need directory for symbol output")

-    dump_syms_label =
-        "//third_party/breakpad:dump_syms($host_system_allocator_toolchain)"
+    if (host_os == "win" && target_cpu == "x86") {
+      dump_syms_label = "//third_party/breakpad:dump_syms(//build/toolchain/win:win_clang_x64)"
+    } else {
+      dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
+    }
    dump_syms_binary = get_label_info(dump_syms_label, "root_out_dir") +
                       "/dump_syms$_host_executable_suffix"

--- a/build/fuses/build.py
+++ b/build/fuses/build.py
@@ -36,6 +36,7 @@ TEMPLATE_CC = """

 #if DCHECK_IS_ON()
 #include "base/command_line.h"
+#include "base/strings/string_util.h"
 #include <string>
 #endif

--- a/build/generate_node_defines.py
+++ b/build/generate_node_defines.py
@@ -2,7 +2,7 @@ import os
 import re
 import sys

-DEFINE_EXTRACT_REGEX = re.compile(r'^ *# *define (\w*)', re.MULTILINE)
+DEFINE_EXTRACT_REGEX = re.compile('^ *# *define (\w*)', re.MULTILINE)

 def main(out_dir, headers):
  defines = []
--- a/build/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -1,9 +1,8 @@
-const TerserPlugin = require('terser-webpack-plugin');
-const webpack = require('webpack');
-const WrapperPlugin = require('wrapper-webpack-plugin');
-
 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');

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

--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/ozone.gni")
 import("//build/config/ui.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
 import("//electron/buildflags/buildflags.gni")
+import("//ppapi/buildflags/buildflags.gni")
 import("//printing/buildflags/buildflags.gni")
 import("//third_party/widevine/cdm/widevine.gni")

@@ -13,8 +14,6 @@ import("//third_party/widevine/cdm/widevine.gni")
 static_library("chrome") {
  visibility = [ "//electron:electron_lib" ]
  sources = [
-    "//ash/style/rounded_rect_cutout_path_builder.cc",
-    "//ash/style/rounded_rect_cutout_path_builder.h",
    "//chrome/browser/app_mode/app_mode_utils.cc",
    "//chrome/browser/app_mode/app_mode_utils.h",
    "//chrome/browser/browser_features.cc",
@@ -30,8 +29,6 @@ static_library("chrome") {
    "//chrome/browser/devtools/devtools_file_system_indexer.cc",
    "//chrome/browser/devtools/devtools_file_system_indexer.h",
    "//chrome/browser/devtools/devtools_settings.h",
-    "//chrome/browser/devtools/features.cc",
-    "//chrome/browser/devtools/features.h",
    "//chrome/browser/devtools/visual_logging.cc",
    "//chrome/browser/devtools/visual_logging.h",
    "//chrome/browser/extensions/global_shortcut_listener.cc",
@@ -42,8 +39,6 @@ static_library("chrome") {
    "//chrome/browser/icon_loader.h",
    "//chrome/browser/icon_manager.cc",
    "//chrome/browser/icon_manager.h",
-    "//chrome/browser/media/webrtc/delegated_source_list_capturer.cc",
-    "//chrome/browser/media/webrtc/delegated_source_list_capturer.h",
    "//chrome/browser/media/webrtc/desktop_capturer_wrapper.cc",
    "//chrome/browser/media/webrtc/desktop_capturer_wrapper.h",
    "//chrome/browser/media/webrtc/desktop_media_list.cc",
@@ -116,16 +111,12 @@ static_library("chrome") {
    "//chrome/browser/ui/view_ids.h",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper.cc",
    "//chrome/browser/ui/views/eye_dropper/eye_dropper.h",
-    "//chrome/browser/ui/views/overlay/back_to_tab_button.cc",
-    "//chrome/browser/ui/views/overlay/back_to_tab_button.h",
    "//chrome/browser/ui/views/overlay/back_to_tab_label_button.cc",
    "//chrome/browser/ui/views/overlay/close_image_button.cc",
    "//chrome/browser/ui/views/overlay/close_image_button.h",
    "//chrome/browser/ui/views/overlay/constants.h",
    "//chrome/browser/ui/views/overlay/hang_up_button.cc",
    "//chrome/browser/ui/views/overlay/hang_up_button.h",
-    "//chrome/browser/ui/views/overlay/minimize_button.cc",
-    "//chrome/browser/ui/views/overlay/minimize_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",
@@ -160,12 +151,14 @@ static_library("chrome") {
      "//chrome/browser/icon_loader_win.cc",
      "//chrome/browser/media/webrtc/window_icon_util_win.cc",
      "//chrome/browser/process_singleton_win.cc",
+      "//chrome/browser/ui/frame/window_frame_util.h",
      "//chrome/browser/win/chrome_process_finder.cc",
      "//chrome/browser/win/chrome_process_finder.h",
      "//chrome/browser/win/chrome_select_file_dialog_factory.cc",
      "//chrome/browser/win/chrome_select_file_dialog_factory.h",
      "//chrome/browser/win/titlebar_config.cc",
      "//chrome/browser/win/titlebar_config.h",
+      "//chrome/browser/win/titlebar_config.h",
      "//chrome/browser/win/util_win_service.cc",
      "//chrome/browser/win/util_win_service.h",
      "//chrome/child/v8_crashpad_support_win.cc",
@@ -180,14 +173,13 @@ static_library("chrome") {
  public_deps = [
    "//chrome/browser:dev_ui_browser_resources",
    "//chrome/browser/resources/accessibility:resources",
-    "//chrome/browser/ui/color:color_headers",
    "//chrome/browser/ui/color:mixers",
    "//chrome/common",
    "//chrome/common:version_header",
-    "//components/global_media_controls",
    "//components/keyed_service/content",
    "//components/paint_preview/buildflags",
    "//components/proxy_config",
+    "//components/services/language_detection/public/mojom",
    "//content/public/browser",
    "//services/strings",
  ]
@@ -196,12 +188,9 @@ static_library("chrome") {
    "//chrome/app/vector_icons",
    "//chrome/browser:resource_prefetch_predictor_proto",
    "//chrome/browser/resource_coordinator:mojo_bindings",
-    "//chrome/browser/task_manager/common:impl",
-    "//chrome/browser/ui/webui/tab_search:mojo_bindings",
    "//chrome/browser/web_applications/mojom:mojom_web_apps_enum",
    "//components/enterprise/buildflags",
    "//components/enterprise/common/proto:connectors_proto",
-    "//components/enterprise/obfuscation/core:enterprise_obfuscation",
    "//components/safe_browsing/core/browser/db:safebrowsing_proto",
    "//components/vector_icons:vector_icons",
    "//ui/snapshot",
@@ -255,7 +244,6 @@ static_library("chrome") {
    ]
    deps += [
      "//chrome/services/util_win/public/mojom",
-      "//components/compose/core/browser:mojo_bindings",
      "//components/segmentation_platform/public/proto",
    ]
  }
@@ -272,13 +260,11 @@ static_library("chrome") {
      "//chrome/browser/media/webrtc/thumbnail_capturer_mac.h",
      "//chrome/browser/media/webrtc/thumbnail_capturer_mac.mm",
      "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
-      "//chrome/browser/permissions/system/media_authorization_wrapper_mac.h",
      "//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 += [ ":system_media_capture_permissions_mac_conflict" ]
  }

  if (enable_widevine) {
@@ -430,6 +416,46 @@ static_library("chrome") {
  }
 }

+source_set("plugins") {
+  sources = []
+  deps = []
+  frameworks = []
+
+  # browser side
+  sources += [
+    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc",
+    "//chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h",
+    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
+    "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
+  ]
+
+  # renderer side
+  sources += [
+    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc",
+    "//chrome/renderer/pepper/chrome_renderer_pepper_host_factory.h",
+    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
+    "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
+  ]
+
+  deps += [
+    "//components/strings",
+    "//media:media_buildflags",
+    "//services/device/public/mojom",
+    "//skia",
+    "//storage/browser",
+  ]
+
+  if (enable_ppapi) {
+    deps += [
+      "//ppapi/buildflags",
+      "//ppapi/host",
+      "//ppapi/proxy",
+      "//ppapi/proxy:ipc",
+      "//ppapi/shared_impl",
+    ]
+  }
+}
+
 # This source set is just so we don't have to depend on all of //chrome/browser
 # You may have to add new files here during the upgrade if //chrome/browser/spellchecker
 # gets more files
@@ -498,16 +524,3 @@ source_set("chrome_spellchecker") {
    "//components/spellcheck/renderer",
  ]
 }
-
-# These sources create an object file conflict with one in |:chrome|, so they
-# must live in a separate target.
-# Conflicting sources:
-#   //chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm
-#   //chrome/browser/permissions/system/system_media_capture_permissions_mac.mm
-source_set("system_media_capture_permissions_mac_conflict") {
-  sources = [
-    "//chrome/browser/permissions/system/system_media_capture_permissions_mac.h",
-    "//chrome/browser/permissions/system/system_media_capture_permissions_mac.mm",
-  ]
-  deps = [ "//chrome/common" ]
-}
--- a/default_app/default_app.ts
+++ b/default_app/default_app.ts
@@ -1,6 +1,5 @@
 import { shell } from 'electron/common';
 import { app, dialog, BrowserWindow, ipcMain } from 'electron/main';
-
 import * as path from 'node:path';
 import * as url from 'node:url';

--- a/default_app/main.ts
+++ b/default_app/main.ts
@@ -4,7 +4,6 @@ import * as fs from 'node:fs';
 import { Module } from 'node:module';
 import * as path from 'node:path';
 import * as url from 'node:url';
-
 const { app, dialog } = electron;

 type DefaultAppOptions = {
@@ -93,7 +92,9 @@ async function loadApplicationPackage (packagePath: string) {
      try {
        process.emitWarning = () => {};
        packageJson = (await import(url.pathToFileURL(packageJsonPath).toString(), {
-          with: { type: 'json' }
+          assert: {
+            type: 'json'
+          }
        })).default;
      } catch (e) {
        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${(e as Error).message}`);
@@ -254,7 +255,6 @@ async function startRepl () {
 // start the default app.
 if (option.file && !option.webdriver) {
  const file = option.file;
-  // eslint-disable-next-line n/no-deprecated-api
  const protocol = url.parse(file).protocol;
  const extension = path.extname(file);
  if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:' || protocol === 'chrome:') {
--- a/docs/README.md
+++ b/docs/README.md
@@ -37,7 +37,6 @@ an issue:
  * [Offline/Online Detection](tutorial/online-offline-events.md)
  * [Represented File for macOS BrowserWindows](tutorial/represented-file.md)
  * [Native File Drag & Drop](tutorial/native-file-drag-drop.md)
-  * [Navigation History](tutorial/navigation-history.md)
  * [Offscreen Rendering](tutorial/offscreen-rendering.md)
  * [Dark Mode](tutorial/dark-mode.md)
  * [Web embeds in Electron](tutorial/web-embeds.md)
@@ -99,6 +98,7 @@ These individual tutorials expand on topics discussed in the guide above.

 ### Custom DOM Elements:

+* [`File` Object](api/file-object.md)
 * [`<webview>` Tag](api/webview-tag.md)
 * [`window.open` Function](api/window-open.md)

--- a/docs/api-history.schema.json
+++ b/docs/api-history.schema.json
@@ -1,47 +0,0 @@
-{
-  "title": "JSON schema for API history blocks in Electron documentation",
-  "$schema": "http://json-schema.org/draft-07/schema#",
-  "$comment": "If you change this schema, remember to edit the TypeScript interfaces in the linting script.",
-  "definitions": {
-    "baseChangeSchema": {
-      "type": "object",
-      "properties": {
-        "pr-url": {
-          "description": "URL to the 'main' GitHub Pull Request for the change (i.e. not a backport PR)",
-          "type": "string", "pattern": "^https://github.com/electron/electron/pull/\\d+$",
-          "examples": [ "https://github.com/electron/electron/pull/26789" ]
-        },
-        "breaking-changes-header": {
-          "description": "Heading ID for the change in `electron/docs/breaking-changes.md`",
-          "type": "string", "minLength": 3,
-          "examples": [ "deprecated-browserwindowsettrafficlightpositionposition" ]
-        },
-        "description": {
-          "description": "Short description of the change",
-          "type": "string", "minLength": 3, "maxLength": 120,
-          "examples": [ "Made `trafficLightPosition` option work for `customButtonOnHover`." ]
-        }
-      },
-      "required": [ "pr-url" ],
-      "additionalProperties": false
-    },
-    "addedChangeSchema": {
-      "allOf": [ { "$ref": "#/definitions/baseChangeSchema" } ]
-    },
-    "deprecatedChangeSchema": {
-      "$comment": "TODO: Make 'breaking-changes-header' required in the future.",
-      "allOf": [ { "$ref": "#/definitions/baseChangeSchema" } ]
-    },
-    "changesChangeSchema": {
-      "$comment": "Unlike RFC, added `'type': 'object'` to appease AJV strict mode",
-      "allOf": [ { "$ref": "#/definitions/baseChangeSchema" }, { "type": "object", "required": [ "description" ] } ]
-    }
-  },
-  "type": "object",
-  "properties": {
-    "added": { "type": "array", "minItems": 1, "maxItems": 1, "items": { "$ref": "#/definitions/addedChangeSchema" } },
-    "deprecated": { "type": "array", "minItems": 1, "maxItems": 1, "items": { "$ref": "#/definitions/deprecatedChangeSchema" } },
-    "changes": { "type": "array", "minItems": 1, "items": { "$ref": "#/definitions/changesChangeSchema" } }
-  },
-  "additionalProperties": false
-}
--- a/docs/api/app.md
+++ b/docs/api/app.md
@@ -345,10 +345,9 @@ app.on('select-client-certificate', (event, webContents, url, list, callback) =>
 Returns:

 * `event` Event
-* `webContents` [WebContents](web-contents.md) (optional)
+* `webContents` [WebContents](web-contents.md)
 * `authenticationResponseDetails` Object
  * `url` URL
-  * `pid` number
 * `authInfo` Object
  * `isProxy` boolean
  * `scheme` string
@@ -359,7 +358,7 @@ Returns:
  * `username` string (optional)
  * `password` string (optional)

-Emitted when `webContents` or [Utility process](../glossary.md#utility-process) wants to do basic auth.
+Emitted when `webContents` wants to do basic auth.

 The default behavior is to cancel all authentications. To override this you
 should prevent the default behavior with `event.preventDefault()` and call
@@ -416,7 +415,7 @@ Returns:
    * `launch-failed` - Process never successfully launched
    * `integrity-failure` - Windows code integrity checks failed
  * `exitCode` number - The exit code for the process
-      (e.g. status from waitpid if on POSIX, from GetExitCodeProcess on Windows).
+      (e.g. status from waitpid if on posix, from GetExitCodeProcess on Windows).
  * `serviceName` string (optional) - The non-localized name of the process.
  * `name` string (optional) - The name of the process.
    Examples for utility: `Audio Service`, `Content Decryption Module Service`, `Network Service`, `Video Capture`, etc.
@@ -1302,24 +1301,23 @@ Returns `Object`:
 Set the app's login item settings.

 To work with Electron's `autoUpdater` on Windows, which uses [Squirrel][Squirrel-Windows],
-you'll want to set the launch path to your executable's name but a directory up, which is
-a stub application automatically generated by Squirrel which will automatically launch the
-latest version.
+you'll want to set the launch path to Update.exe, and pass arguments that specify your
+application name. For example:

 ``` js
 const { app } = require('electron')
 const path = require('node:path')

 const appFolder = path.dirname(process.execPath)
-const ourExeName = path.basename(process.execPath)
-const stubLauncher = path.resolve(appFolder, '..', ourExeName)
+const updateExe = path.resolve(appFolder, '..', 'Update.exe')
+const exeName = path.basename(process.execPath)

 app.setLoginItemSettings({
  openAtLogin: true,
-  path: stubLauncher,
+  path: updateExe,
  args: [
-    // You might want to pass a parameter here indicating that this
-    // app was launched via login, but you don't have to
+    '--processStart', `"${exeName}"`,
+    '--process-start-args', '"--hidden"'
  ]
 })
 ```
@@ -1359,7 +1357,7 @@ Show the app's about panel options. These options can be overridden with `app.se
  * `credits` string (optional) _macOS_ _Windows_ - Credit information.
  * `authors` string[] (optional) _Linux_ - List of app authors.
  * `website` string (optional) _Linux_ - The app's website.
-  * `iconPath` string (optional) _Linux_ _Windows_ - Path to the app's icon in a JPEG or PNG file format. On Linux, will be shown as 64x64 pixels while retaining aspect ratio. On Windows, a 48x48 PNG will result in the best visual quality.
+  * `iconPath` string (optional) _Linux_ _Windows_ - Path to the app's icon in a JPEG or PNG file format. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.

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

@@ -1491,38 +1489,6 @@ This method can only be called after app is ready.

 Returns `Promise<string>` - Resolves with the proxy information for `url` that will be used when attempting to make requests using [Net](net.md) in the [utility process](../glossary.md#utility-process).

-### `app.setClientCertRequestPasswordHandler(handler)`  _Linux_
-
-* `handler` Function\<Promise\<string\>\>
-  * `clientCertRequestParams` Object
-    * `hostname` string - the hostname of the site requiring a client certificate
-    * `tokenName` string - the token (or slot) name of the cryptographic device
-    * `isRetry` boolean - whether there have been previous failed attempts at prompting the password
-
-  Returns `Promise<string>` - Resolves with the password
-
-The handler is called when a password is needed to unlock a client certificate for
-`hostname`.
-
-```js
-const { app } = require('electron')
-
-async function passwordPromptUI (text) {
-  return new Promise((resolve, reject) => {
-    // display UI to prompt user for password
-    // ...
-    // ...
-    resolve('the password')
-  })
-}
-
-app.setClientCertRequestPasswordHandler(async ({ hostname, tokenName, isRetry }) => {
-  const text = `Please sign in to ${tokenName} to authenticate to ${hostname} with your certificate`
-  const password = await passwordPromptUI(text)
-  return password
-})
-```
-
 ## Properties

 ### `app.accessibilitySupportEnabled` _macOS_ _Windows_
--- a/docs/api/auto-updater.md
+++ b/docs/api/auto-updater.md
@@ -32,28 +32,22 @@ This is a requirement of `Squirrel.Mac`.
 ### Windows

 On Windows, you have to install your app into a user's machine before you can
-use the `autoUpdater`, so it is recommended that you use
-[electron-winstaller][installer-lib] or [Electron Forge's Squirrel.Windows maker][electron-forge-lib] to generate a Windows installer.
+use the `autoUpdater`, so it is recommended that you use the
+[electron-winstaller][installer-lib], [Electron Forge][electron-forge-lib] or the [grunt-electron-installer][installer] package to generate a Windows installer.

-Apps built with Squirrel.Windows will trigger [custom launch events](https://github.com/Squirrel/Squirrel.Windows/blob/51f5e2cb01add79280a53d51e8d0cfa20f8c9f9f/docs/using/custom-squirrel-events-non-cs.md#application-startup-commands)
-that must be handled by your Electron application to ensure proper setup and teardown.
+When using [electron-winstaller][installer-lib] or [Electron Forge][electron-forge-lib] make sure you do not try to update your app [the first time it runs](https://github.com/electron/windows-installer#handling-squirrel-events) (Also see [this issue for more info](https://github.com/electron/electron/issues/7155)). It's also recommended to use [electron-squirrel-startup](https://github.com/mongodb-js/electron-squirrel-startup) to get desktop shortcuts for your app.

-Squirrel.Windows apps will launch with the `--squirrel-firstrun` argument immediately
-after installation. During this time, Squirrel.Windows will obtain a file lock on
-your app, and `autoUpdater` requests will fail until the lock is released. In practice,
-this means that you won't be able to check for updates on first launch for the first
-few seconds. You can work around this by not checking for updates when `process.argv`
-contains the `--squirrel-firstrun` flag or by setting a 10-second timeout on your
-update checks (see [electron/electron#7155](https://github.com/electron/electron/issues/7155)
-for more information).
-
-The installer generated with Squirrel.Windows will create a shortcut icon with an
+The installer generated with Squirrel will create a shortcut icon with an
 [Application User Model ID][app-user-model-id] in the format of
 `com.squirrel.PACKAGE_ID.YOUR_EXE_WITHOUT_DOT_EXE`, examples are
 `com.squirrel.slack.Slack` and `com.squirrel.code.Code`. You have to use the
 same ID for your app with `app.setAppUserModelId` API, otherwise Windows will
 not be able to pin your app properly in task bar.

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

 The `autoUpdater` object emits the following events:
@@ -143,7 +137,9 @@ application starts.

 [squirrel-mac]: https://github.com/Squirrel/Squirrel.Mac
 [server-support]: https://github.com/Squirrel/Squirrel.Mac#server-support
+[squirrel-windows]: https://github.com/Squirrel/Squirrel.Windows
+[installer]: https://github.com/electron-archive/grunt-electron-installer
 [installer-lib]: https://github.com/electron/windows-installer
-[electron-forge-lib]: https://www.electronforge.io/config/makers/squirrel.windows
+[electron-forge-lib]: https://github.com/electron/forge
 [app-user-model-id]: https://learn.microsoft.com/en-us/windows/win32/shell/appids
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
--- a/docs/api/base-window.md
+++ b/docs/api/base-window.md
@@ -64,31 +64,6 @@ const child = new BaseWindow({ parent, modal: true })
 * On Linux the type of modal windows will be changed to `dialog`.
 * On Linux many desktop environments do not support hiding a modal window.

-## Resource management
-
-When you add a [`WebContentsView`](web-contents-view.md) to a `BaseWindow` and the `BaseWindow`
-is closed, the [`webContents`](web-contents.md) of the `WebContentsView` are not destroyed
-automatically.
-
-It is your responsibility to close the `webContents` when you no longer need them, e.g. when
-the `BaseWindow` is closed:
-
-```js
-const { BaseWindow, WebContentsView } = require('electron')
-
-const win = new BaseWindow({ width: 800, height: 600 })
-
-const view = new WebContentsView()
-win.contentView.addChildView(view)
-
-win.on('closed', () => {
-  view.webContents.close()
-})
-```
-
-Unlike with a [`BrowserWindow`](browser-window.md), if you don't explicitly close the
-`webContents`, you'll encounter memory leaks.
-
 ## Class: BaseWindow

 > Create and control windows.
@@ -151,18 +126,10 @@ or session log off.

 #### Event: 'blur'

-Returns:
-
-* `event` Event
-
 Emitted when the window loses focus.

 #### Event: 'focus'

-Returns:
-
-* `event` Event
-
 Emitted when the window gains focus.

 #### Event: 'show'
@@ -512,7 +479,7 @@ Sets the content view of the window.

 #### `win.getContentView()`

-Returns [`View`](view.md) - The content view of the window.
+Returns [View](view.md) - The content view of the window.

 #### `win.destroy()`

@@ -959,17 +926,6 @@ win.setSheetOffset(toolbarRect.height)

 #### `win.flashFrame(flag)`

-<!--
-```YAML history
-added:
-  - pr-url: https://github.com/electron/electron/pull/35658
-changes:
-  - pr-url: https://github.com/electron/electron/pull/41391
-    description: "`window.flashFrame(bool)` will flash dock icon continuously on macOS"
-    breaking-changes-header: behavior-changed-windowflashframebool-will-flash-dock-icon-continuously-on-macos
-```
-->
-
 * `flag` boolean

 Starts or stops flashing the window to attract user's attention.
--- a/docs/api/browser-view.md
+++ b/docs/api/browser-view.md
@@ -1,13 +1,5 @@
 # BrowserView

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/35658
-    breaking-changes-header: deprecated-browserview
-```
-->
-
 > **Note**
 > The `BrowserView` class is deprecated, and replaced by the new
 > [`WebContentsView`](web-contents-view.md) class.
@@ -19,14 +11,6 @@ relative to its owning window. It is meant to be an alternative to the

 ## Class: BrowserView

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/35658
-    breaking-changes-header: deprecated-browserview
-```
-->
-
 > Create and control views.

 > **Note**
@@ -56,14 +40,6 @@ app.whenReady().then(() => {

 ### `new BrowserView([options])` _Experimental_ _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/35658
-    breaking-changes-header: deprecated-browserview
-```
-->
-
 * `options` Object (optional)
  * `webPreferences` [WebPreferences](structures/web-preferences.md?inline) (optional) - Settings of web page's features.

@@ -73,14 +49,6 @@ Objects created with `new BrowserView` have the following properties:

 #### `view.webContents` _Experimental_ _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/35658
-    breaking-changes-header: deprecated-browserview
-```
-->
-
 A [`WebContents`](web-contents.md) object owned by this view.

 ### Instance Methods
@@ -89,18 +57,6 @@ Objects created with `new BrowserView` have the following instance methods:

 #### `view.setAutoResize(options)` _Experimental_ _Deprecated_

-<!--
-```YAML history
-changes:
-  - pr-url: https://github.com/electron/electron/pull/35658
-    description: "Standardized auto-resizing behavior across all platforms"
-    breaking-changes-header: behavior-changed-browserviewsetautoresize-behavior-on-macos
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/35658
-    breaking-changes-header: deprecated-browserview
-```
-->
-
 * `options` Object
  * `width` boolean (optional) - If `true`, the view's width will grow and shrink together
    with the window. `false` by default.
@@ -113,42 +69,18 @@ deprecated:

 #### `view.setBounds(bounds)` _Experimental_ _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/35658
-    breaking-changes-header: deprecated-browserview
-```
-->
-
 * `bounds` [Rectangle](structures/rectangle.md)

 Resizes and moves the view to the supplied bounds relative to the window.

 #### `view.getBounds()` _Experimental_ _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/35658
-    breaking-changes-header: deprecated-browserview
-```
-->
-
 Returns [`Rectangle`](structures/rectangle.md)

 The `bounds` of this BrowserView instance as `Object`.

 #### `view.setBackgroundColor(color)` _Experimental_ _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/35658
-    breaking-changes-header: deprecated-browserview
-```
-->
-
 * `color` string - Color in Hex, RGB, ARGB, HSL, HSLA or named CSS color format. The alpha channel is
  optional for the hex type.

--- a/docs/api/browser-window.md
+++ b/docs/api/browser-window.md
@@ -690,8 +690,6 @@ Sets whether the window should be in fullscreen mode.

 Returns `boolean` - Whether the window is in fullscreen mode.

-**Note:** On macOS, fullscreen transitions take place asynchronously. When querying for a BrowserWindow's fullscreen status, you should ensure that either the ['enter-full-screen'](browser-window.md#event-enter-full-screen) or ['leave-full-screen'](browser-window.md#event-leave-full-screen) events have been emitted.
-
 #### `win.setSimpleFullScreen(flag)` _macOS_

 * `flag` boolean
@@ -1051,15 +1049,6 @@ win.setSheetOffset(toolbarRect.height)

 #### `win.flashFrame(flag)`

-<!--
-```YAML history
-changes:
-  - pr-url: https://github.com/electron/electron/pull/41391
-    description: "`window.flashFrame(bool)` will flash dock icon continuously on macOS"
-    breaking-changes-header: behavior-changed-windowflashframebool-will-flash-dock-icon-continuously-on-macos
-```
-->
-
 * `flag` boolean

 Starts or stops flashing the window to attract user's attention.
@@ -1549,17 +1538,13 @@ there is only one tab in the current window.

 Adds a window as a tab on this window, after the tab for the window instance.

-#### `win.setVibrancy(type[, options])` _macOS_
+#### `win.setVibrancy(type)` _macOS_

 * `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.
-* `options` Object (optional)
-  * `animationDuration` number (optional) - if greater than zero, the change to vibrancy will be animated over the given duration (in milliseconds).

 Adds a vibrancy effect to the browser window. Passing `null` or an empty string
-will remove the vibrancy effect on the window. The `animationDuration` parameter only
- animates fading in or fading out the vibrancy effect. Animating between
- different types of vibrancy is not supported.
+will remove the vibrancy effect on the window.

 #### `win.setBackgroundMaterial(material)` _Windows_

--- a/docs/api/client-request.md
+++ b/docs/api/client-request.md
@@ -53,7 +53,7 @@ following properties:
    [`request.followRedirect`](#requestfollowredirect) is invoked synchronously
    during the [`redirect`](#event-redirect) event.  Defaults to `follow`.
  * `origin` string (optional) - The origin URL of the request.
-  * `referrerPolicy` string (optional) - can be "", `no-referrer`,
+  * `referrerPolicy` string (optional) - can be `""`, `no-referrer`,
    `no-referrer-when-downgrade`, `origin`, `origin-when-cross-origin`,
    `unsafe-url`, `same-origin`, `strict-origin`, or
    `strict-origin-when-cross-origin`. Defaults to
--- a/docs/api/command-line-switches.md
+++ b/docs/api/command-line-switches.md
@@ -38,7 +38,7 @@ Without `*` prefix the URL has to match exactly.

 ### --disable-ntlm-v2

-Disables NTLM v2 for POSIX platforms, no effect elsewhere.
+Disables NTLM v2 for posix platforms, no effect elsewhere.

 ### --disable-http-cache

@@ -241,13 +241,6 @@ Force using discrete GPU when there are multiple GPUs available.

 Force using integrated GPU when there are multiple GPUs available.

-### --xdg-portal-required-version=`version`
-
-Sets the minimum required version of XDG portal implementation to `version`
-in order to use the portal backend for file dialogs on linux. File dialogs
-will fallback to using gtk or kde depending on the desktop environment when
-the required version is unavailable. Current default is set to `3`.
-
 ## Node.js Flags

 Electron supports some of the [CLI flags][node-cli] supported by Node.js.
--- a/docs/api/context-bridge.md
+++ b/docs/api/context-bridge.md
@@ -1,14 +1,5 @@
 # contextBridge

-<!--
-```YAML history
-changes:
-  - pr-url: https://github.com/electron/electron/pull/40330
-    description: "`ipcRenderer` can no longer be sent over the `contextBridge`"
-    breaking-changes-header: behavior-changed-ipcrenderer-can-no-longer-be-sent-over-the-contextbridge
-```
-->
-
 > Create a safe, bi-directional, synchronous bridge across isolated contexts

 Process: [Renderer](../glossary.md#renderer-process)
@@ -138,7 +129,7 @@ has been included below for completeness:
 | `Object` | Complex | ✅ | ✅ | Keys must be supported using only "Simple" types in this table.  Values must be supported in this table.  Prototype modifications are dropped.  Sending custom classes will copy values but not the prototype. |
 | `Array` | Complex | ✅ | ✅ | Same limitations as the `Object` type |
 | `Error` | Complex | ✅ | ✅ | Errors that are thrown are also copied, this can result in the message and stack trace of the error changing slightly due to being thrown in a different context, and any custom properties on the Error object [will be lost](https://github.com/electron/electron/issues/25596) |
-| `Promise` | Complex | ✅ | ✅ | N/A |
+| `Promise` | Complex | ✅ | ✅ | N/A
 | `Function` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending classes or constructors will not work. |
 | [Cloneable Types](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm) | Simple | ✅ | ✅ | See the linked document on cloneable types |
 | `Element` | Complex | ✅ | ✅ | Prototype modifications are dropped.  Sending custom elements will not work. |
@@ -147,25 +138,6 @@ has been included below for completeness:

 If the type you care about is not in the above table, it is probably not supported.

-### Exposing ipcRenderer
-
-Attempting to send the entire `ipcRenderer` module as an object over the `contextBridge` will result in
-an empty object on the receiving side of the bridge. Sending over `ipcRenderer` in full can let any
-code send any message, which is a security footgun. To interact through `ipcRenderer`, provide a safe wrapper
-like below:
-
-```js
-// Preload (Isolated World)
-contextBridge.exposeInMainWorld('electron', {
-  onMyEventName: (callback) => ipcRenderer.on('MyEventName', (e, ...args) => callback(args))
-})
-```
-
-```js @ts-nocheck
-// Renderer (Main World)
-window.electron.onMyEventName(data => { /* ... */ })
-```
-
 ### Exposing Node Global Symbols

 The `contextBridge` can be used by the preload script to give your renderer access to Node APIs.
--- a/docs/api/desktop-capturer.md
+++ b/docs/api/desktop-capturer.md
@@ -9,70 +9,80 @@ The following example shows how to capture video from a desktop window whose
 title is `Electron`:

 ```js
-// main.js
-const { app, BrowserWindow, desktopCapturer, session } = require('electron')
+// In the main process.
+const { BrowserWindow, desktopCapturer } = require('electron')

-app.whenReady().then(() => {
-  const mainWindow = new BrowserWindow()
+const mainWindow = new BrowserWindow()

-  session.defaultSession.setDisplayMediaRequestHandler((request, callback) => {
-    desktopCapturer.getSources({ types: ['screen'] }).then((sources) => {
-      // Grant access to the first screen found.
-      callback({ video: sources[0], audio: 'loopback' })
-    })
-    // If true, use the system picker if available.
-    // Note: this is currently experimental. If the system picker
-    // is available, it will be used and the media request handler
-    // will not be invoked.
-  }, { useSystemPicker: true })
-
-  mainWindow.loadFile('index.html')
+desktopCapturer.getSources({ types: ['window', 'screen'] }).then(async sources => {
+  for (const source of sources) {
+    if (source.name === 'Electron') {
+      mainWindow.webContents.send('SET_SOURCE', source.id)
+      return
+    }
+  }
 })
 ```

+```js @ts-nocheck
+// In the preload script.
+const { ipcRenderer } = require('electron')
+
+ipcRenderer.on('SET_SOURCE', async (event, sourceId) => {
+  try {
+    const stream = await navigator.mediaDevices.getUserMedia({
+      audio: false,
+      video: {
+        mandatory: {
+          chromeMediaSource: 'desktop',
+          chromeMediaSourceId: sourceId,
+          minWidth: 1280,
+          maxWidth: 1280,
+          minHeight: 720,
+          maxHeight: 720
+        }
+      }
+    })
+    handleStream(stream)
+  } catch (e) {
+    handleError(e)
+  }
+})
+
+function handleStream (stream) {
+  const video = document.querySelector('video')
+  video.srcObject = stream
+  video.onloadedmetadata = (e) => video.play()
+}
+
+function handleError (e) {
+  console.log(e)
+}
+```
+
+To capture video from a source provided by `desktopCapturer` the constraints
+passed to [`navigator.mediaDevices.getUserMedia`][] must include
+`chromeMediaSource: 'desktop'`, and `audio: false`.
+
+To capture both audio and video from the entire desktop the constraints passed
+to [`navigator.mediaDevices.getUserMedia`][] must include `chromeMediaSource: 'desktop'`,
+for both `audio` and `video`, but should not include a `chromeMediaSourceId` constraint.
+
 ```js
-// renderer.js
-const startButton = document.getElementById('startButton')
-const stopButton = document.getElementById('stopButton')
-const video = document.querySelector('video')
-
-startButton.addEventListener('click', () => {
-  navigator.mediaDevices.getDisplayMedia({
-    audio: true,
-    video: {
-      width: 320,
-      height: 240,
-      frameRate: 30
+const constraints = {
+  audio: {
+    mandatory: {
+      chromeMediaSource: 'desktop'
    }
-  }).then(stream => {
-    video.srcObject = stream
-    video.onloadedmetadata = (e) => video.play()
-  }).catch(e => console.log(e))
-})
-
-stopButton.addEventListener('click', () => {
-  video.pause()
-})
+  },
+  video: {
+    mandatory: {
+      chromeMediaSource: 'desktop'
+    }
+  }
+}
 ```

-```html
-<!-- index.html -->
-<html>
-<meta http-equiv="content-security-policy" content="script-src 'self' 'unsafe-inline'" />
-  <body>
-    <button id="startButton" class="button">Start</button>
-    <button id="stopButton" class="button">Stop</button>
-    <video width="320" height="240" autoplay></video>
-    <script src="renderer.js"></script>
-  </body>
-</html>
-```
-
-See [`navigator.mediaDevices.getDisplayMedia`](https://developer.mozilla.org/en-US/docs/Web/API/MediaDevices/getDisplayMedia) for more information.
-
-**Note:** `navigator.mediaDevices.getDisplayMedia` does not permit the use of `deviceId` for
-selection of a source - see [specification](https://w3c.github.io/mediacapture-screen-share/#constraints).
-
 ## Methods

 The `desktopCapturer` module has the following methods:
--- a/docs/api/dialog.md
+++ b/docs/api/dialog.md
@@ -15,9 +15,9 @@ console.log(dialog.showOpenDialog({ properties: ['openFile', 'multiSelections']

 The `dialog` module has the following methods:

-### `dialog.showOpenDialogSync([window, ]options)`
+### `dialog.showOpenDialogSync([browserWindow, ]options)`

-* `window` [BaseWindow](base-window.md) (optional)
+* `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
  * `title` string (optional)
  * `defaultPath` string (optional)
@@ -47,7 +47,7 @@ The `dialog` module has the following methods:

 Returns `string[] | undefined`, the file paths chosen by the user; if the dialog is cancelled it returns `undefined`.

-The `window` argument allows the dialog to attach itself to a parent window, making it modal.
+The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.

 The `filters` specifies an array of file types that can be displayed or
 selected when you want to limit the user to a specific type. For example:
@@ -72,20 +72,15 @@ and a directory selector, so if you set `properties` to
 `['openFile', 'openDirectory']` on these platforms, a directory selector will be
 shown.

-```js @ts-type={mainWindow:Electron.BaseWindow}
+```js @ts-type={mainWindow:Electron.BrowserWindow}
 dialog.showOpenDialogSync(mainWindow, {
  properties: ['openFile', 'openDirectory']
 })
 ```

-**Note:** On Linux `defaultPath` is not supported when using portal file chooser
-dialogs unless the portal backend is version 4 or higher. You can use `--xdg-portal-required-version`
-[command-line switch](./command-line-switches.md#--xdg-portal-required-versionversion)
-to force gtk or kde dialogs.
+### `dialog.showOpenDialog([browserWindow, ]options)`

-### `dialog.showOpenDialog([window, ]options)`
-
-* `window` [BaseWindow](base-window.md) (optional)
+* `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
  * `title` string (optional)
  * `defaultPath` string (optional)
@@ -119,7 +114,7 @@ Returns `Promise<Object>` - Resolve with an object containing the following:
 * `filePaths` string[] - An array of file paths chosen by the user. If the dialog is cancelled this will be an empty array.
 * `bookmarks` string[]&#32;(optional) _macOS_ _mas_ - An array matching the `filePaths` array of base64 encoded strings which contains security scoped bookmark data. `securityScopedBookmarks` must be enabled for this to be populated. (For return values, see [table here](#bookmarks-array).)

-The `window` argument allows the dialog to attach itself to a parent window, making it modal.
+The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.

 The `filters` specifies an array of file types that can be displayed or
 selected when you want to limit the user to a specific type. For example:
@@ -144,7 +139,7 @@ and a directory selector, so if you set `properties` to
 `['openFile', 'openDirectory']` on these platforms, a directory selector will be
 shown.

-```js @ts-type={mainWindow:Electron.BaseWindow}
+```js @ts-type={mainWindow:Electron.BrowserWindow}
 dialog.showOpenDialog(mainWindow, {
  properties: ['openFile', 'openDirectory']
 }).then(result => {
@@ -155,14 +150,9 @@ dialog.showOpenDialog(mainWindow, {
 })
 ```

-**Note:** On Linux `defaultPath` is not supported when using portal file chooser
-dialogs unless the portal backend is version 4 or higher. You can use `--xdg-portal-required-version`
-[command-line switch](./command-line-switches.md#--xdg-portal-required-versionversion)
-to force gtk or kde dialogs.
+### `dialog.showSaveDialogSync([browserWindow, ]options)`

-### `dialog.showSaveDialogSync([window, ]options)`
-
-* `window` [BaseWindow](base-window.md) (optional)
+* `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
  * `title` string (optional) - The dialog title. Cannot be displayed on some _Linux_ desktop environments.
  * `defaultPath` string (optional) - Absolute directory path, absolute file
@@ -186,14 +176,14 @@ to force gtk or kde dialogs.

 Returns `string`, the path of the file chosen by the user; if the dialog is cancelled it returns an empty string.

-The `window` argument allows the dialog to attach itself to a parent window, making it modal.
+The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.

 The `filters` specifies an array of file types that can be displayed, see
 `dialog.showOpenDialog` for an example.

-### `dialog.showSaveDialog([window, ]options)`
+### `dialog.showSaveDialog([browserWindow, ]options)`

-* `window` [BaseWindow](base-window.md) (optional)
+* `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
  * `title` string (optional) - The dialog title. Cannot be displayed on some _Linux_ desktop environments.
  * `defaultPath` string (optional) - Absolute directory path, absolute file
@@ -220,7 +210,7 @@ Returns `Promise<Object>` - Resolve with an object containing the following:
 * `filePath` string - If the dialog is canceled, this will be an empty string.
 * `bookmark` string (optional) _macOS_ _mas_ - Base64 encoded string which contains the security scoped bookmark data for the saved file. `securityScopedBookmarks` must be enabled for this to be present. (For return values, see [table here](#bookmarks-array).)

-The `window` argument allows the dialog to attach itself to a parent window, making it modal.
+The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.

 The `filters` specifies an array of file types that can be displayed, see
 `dialog.showOpenDialog` for an example.
@@ -228,9 +218,9 @@ The `filters` specifies an array of file types that can be displayed, see
 **Note:** On macOS, using the asynchronous version is recommended to avoid issues when
 expanding and collapsing the dialog.

-### `dialog.showMessageBoxSync([wndow, ]options)`
+### `dialog.showMessageBoxSync([browserWindow, ]options)`

-* `window` [BaseWindow](base-window.md) (optional)
+* `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
  * `message` string - Content of the message box.
  * `type` string (optional) - Can be `none`, `info`, `error`, `question` or
@@ -268,12 +258,12 @@ Returns `Integer` - the index of the clicked button.
 Shows a message box, it will block the process until the message box is closed.
 It returns the index of the clicked button.

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

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

-* `window` [BaseWindow](base-window.md) (optional)
+* `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
  * `message` string - Content of the message box.
  * `type` string (optional) - Can be `none`, `info`, `error`, `question` or
@@ -323,7 +313,7 @@ Returns `Promise<Object>` - resolves with a promise containing the following pro

 Shows a message box.

-The `window` argument allows the dialog to attach itself to a parent window, making it modal.
+The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.

 ### `dialog.showErrorBox(title, content)`

@@ -337,9 +327,9 @@ it is usually used to report errors in early stage of startup. If called
 before the app `ready`event on Linux, the message will be emitted to stderr,
 and no GUI dialog will appear.

-### `dialog.showCertificateTrustDialog([window, ]options)` _macOS_ _Windows_
+### `dialog.showCertificateTrustDialog([browserWindow, ]options)` _macOS_ _Windows_

-* `window` [BaseWindow](base-window.md) (optional)
+* `browserWindow` [BrowserWindow](browser-window.md) (optional)
 * `options` Object
  * `certificate` [Certificate](structures/certificate.md) - The certificate to trust/import.
  * `message` string - The message to display to the user.
@@ -348,14 +338,14 @@ Returns `Promise<void>` - resolves when the certificate trust dialog is shown.

 On macOS, this displays a modal dialog that shows a message and certificate
 information, and gives the user the option of trusting/importing the
-certificate. If you provide a `window` argument the dialog will be
+certificate. If you provide a `browserWindow` argument the dialog will be
 attached to the parent window, making it modal.

 On Windows the options are more limited, due to the Win32 APIs used:

 * The `message` argument is not used, as the OS provides its own confirmation
   dialog.
-* The `window` argument is ignored since it is not possible to make
+* The `browserWindow` argument is ignored since it is not possible to make
   this confirmation dialog modal.

 ## Bookmarks array
@@ -372,10 +362,10 @@ On Windows the options are more limited, due to the Win32 APIs used:
 ## Sheets

 On macOS, dialogs are presented as sheets attached to a window if you provide
-a [`BaseWindow`](base-window.md) reference in the `window` parameter, or modals if no
+a [`BrowserWindow`](browser-window.md) reference in the `browserWindow` parameter, or modals if no
 window is provided.

-You can call `BaseWindow.getCurrentWindow().setSheetOffset(offset)` to change
+You can call `BrowserWindow.getCurrentWindow().setSheetOffset(offset)` to change
 the offset from the window frame where sheets are attached.

 [AbortSignal]: https://nodejs.org/api/globals.html#globals_class_abortsignal
--- a/docs/api/dock.md
+++ b/docs/api/dock.md
@@ -80,4 +80,4 @@ Returns `Menu | null` - The application's [dock menu][dock-menu].

 Sets the `image` associated with this dock icon.

-[dock-menu]: https://developer.apple.com/design/human-interface-guidelines/dock-menus
+[dock-menu]: https://developer.apple.com/macos/human-interface-guidelines/menus/dock-menus/
--- a/docs/api/download-item.md
+++ b/docs/api/download-item.md
@@ -145,10 +145,6 @@ Returns `string` - The file name of the download item.
 disk. If user changes the file name in a prompted download saving dialog, the
 actual name of saved file will be different.

-#### `downloadItem.getCurrentBytesPerSecond()`
-
-Returns `Integer` - The current download speed in bytes per second.
-
 #### `downloadItem.getTotalBytes()`

 Returns `Integer` - The total size in bytes of the download item.
@@ -159,10 +155,6 @@ If the size is unknown, it returns 0.

 Returns `Integer` - The received bytes of the download item.

-#### `downloadItem.getPercentComplete()`
-
-Returns `Integer` - The download completion in percent.
-
 #### `downloadItem.getContentDisposition()`

 Returns `string` - The Content-Disposition field from the response
@@ -192,10 +184,6 @@ Returns `string` - ETag header value.
 Returns `Double` - Number of seconds since the UNIX epoch when the download was
 started.

-#### `downloadItem.getEndTime()`
-
-Returns `Double` - Number of seconds since the UNIX epoch when the download ended.
-
 ### Instance Properties

 #### `downloadItem.savePath`
--- a/docs/api/file-object.md
+++ b/docs/api/file-object.md
@@ -0,0 +1,36 @@
+# `File` Object
+
+> Use the HTML5 `File` API to work natively with files on the filesystem.
+
+> **Warning**
+> The `path` property that Electron adds to the `File` interface is deprecated
+> and **will** be removed in a future Electron release.  We recommend you
+> use `webUtils.getPathForFile` instead.
+
+The DOM's File interface provides abstraction around native files in order to
+let users work on native files directly with the HTML5 file API. Electron has
+added a `path` attribute to the `File` interface which exposes the file's real
+path on filesystem.
+
+Example of getting a real path from a dragged-onto-the-app file:
+
+```html
+<div id="holder">
+  Drag your file here
+</div>
+
+<script>
+  document.addEventListener('drop', (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    for (const f of e.dataTransfer.files) {
+      console.log('File(s) you dragged here: ', f.path)
+    }
+  });
+  document.addEventListener('dragover', (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+  });
+</script>
+```
--- a/docs/api/incoming-message.md
+++ b/docs/api/incoming-message.md
@@ -31,7 +31,7 @@ Emitted when a request has been canceled during an ongoing HTTP transaction.

 Returns:

-* `error` Error - Typically holds an error string identifying failure root cause.
+`error` Error - Typically holds an error string identifying failure root cause.

 Emitted when an error was encountered while streaming response data events. For
 instance, if the server closes the underlying while the response is still
--- a/docs/api/ipc-main.md
+++ b/docs/api/ipc-main.md
@@ -32,7 +32,7 @@ process, see [webContents.send][web-contents-send] for more information.

 ## Methods

-The `ipcMain` module has the following methods to listen for events:
+The `ipcMain` module has the following method to listen for events:

 ### `ipcMain.on(channel, listener)`

@@ -44,16 +44,6 @@ The `ipcMain` module has the following methods to listen for events:
 Listens to `channel`, when a new message arrives `listener` would be called with
 `listener(event, args...)`.

-### `ipcMain.off(channel, listener)`
-
-* `channel` string
-* `listener` Function
-  * `event` [IpcMainEvent][ipc-main-event]
-  * `...args` any[]
-
-Removes the specified `listener` from the listener array for the specified
-`channel`.
-
 ### `ipcMain.once(channel, listener)`

 * `channel` string
@@ -64,28 +54,20 @@ Removes the specified `listener` from the listener array for the specified
 Adds a one time `listener` function for the event. This `listener` is invoked
 only the next time a message is sent to `channel`, after which it is removed.

-### `ipcMain.addListener(channel, listener)`
-
-* `channel` string
-* `listener` Function
-  * `event` [IpcMainEvent][ipc-main-event]
-  * `...args` any[]
-
-Alias for [`ipcMain.on`](#ipcmainonchannel-listener).
-
 ### `ipcMain.removeListener(channel, listener)`

 * `channel` string
 * `listener` Function
  * `...args` any[]

-Alias for [`ipcMain.off`](#ipcmainoffchannel-listener).
+Removes the specified `listener` from the listener array for the specified
+`channel`.

 ### `ipcMain.removeAllListeners([channel])`

 * `channel` string (optional)

-Removes all listeners from the specified `channel`. Removes all listeners from all channels if no channel is specified.
+Removes listeners of the specified `channel`.

 ### `ipcMain.handle(channel, listener)`

--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -7,15 +7,6 @@ hide_title: false

 # ipcRenderer

-<!--
-```YAML history
-changes:
-  - pr-url: https://github.com/electron/electron/pull/40330
-    description: "`ipcRenderer` can no longer be sent over the `contextBridge`"
-    breaking-changes-header: behavior-changed-ipcrenderer-can-no-longer-be-sent-over-the-contextbridge
-```
-->
-
 > Communicate asynchronously from a renderer process to the main process.

 Process: [Renderer](../glossary.md#renderer-process)
@@ -48,8 +39,7 @@ Listens to `channel`, when a new message arrives `listener` would be called with
  * `event` [IpcRendererEvent][ipc-renderer-event]
  * `...args` any[]

-Removes the specified `listener` from the listener array for the specified
-`channel`.
+Alias for [`ipcRenderer.removeListener`](#ipcrendererremovelistenerchannel-listener).

 ### `ipcRenderer.once(channel, listener)`

@@ -77,13 +67,14 @@ Alias for [`ipcRenderer.on`](#ipcrendereronchannel-listener).
  * `event` [IpcRendererEvent][ipc-renderer-event]
  * `...args` any[]

-Alias for [`ipcRenderer.off`](#ipcrendereroffchannel-listener).
+Removes the specified `listener` from the listener array for the specified
+`channel`.

-### `ipcRenderer.removeAllListeners([channel])`
+### `ipcRenderer.removeAllListeners(channel)`

-* `channel` string (optional)
+* `channel` string

-Removes all listeners from the specified `channel`. Removes all listeners from all channels if no channel is specified.
+Removes all listeners, or those of the specified `channel`.

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

--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -10,9 +10,9 @@ See [`Menu`](menu.md) for examples.

 * `options` Object
  * `click` Function (optional) - Will be called with
-    `click(menuItem, window, event)` when the menu item is clicked.
+    `click(menuItem, browserWindow, event)` when the menu item is clicked.
    * `menuItem` MenuItem
-    * `window` [BaseWindow](base-window.md) | undefined - This will not be defined if no window is open.
+    * `browserWindow` [BrowserWindow](browser-window.md) | undefined - This will not be defined if no window is open.
    * `event` [KeyboardEvent](structures/keyboard-event.md)
  * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `showSubstitutions`, `toggleSmartQuotes`, `toggleSmartDashes`, `toggleTextReplacement`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `showAllTabs`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
    `click` property will be ignored. See [roles](#roles).
@@ -146,7 +146,7 @@ A `Function` that is fired when the MenuItem receives a click event.
 It can be called with `menuItem.click(event, focusedWindow, focusedWebContents)`.

 * `event` [KeyboardEvent](structures/keyboard-event.md)
-* `focusedWindow` [BaseWindow](browser-window.md)
+* `focusedWindow` [BrowserWindow](browser-window.md)
 * `focusedWebContents` [WebContents](web-contents.md)

 #### `menuItem.submenu`
--- a/docs/api/native-image.md
+++ b/docs/api/native-image.md
@@ -257,15 +257,6 @@ data.

 #### `image.toDataURL([options])`

-<!--
-```YAML history
-changes:
-  - pr-url: https://github.com/electron/electron/pull/41752
-    description: "`nativeImage.toDataURL` will preserve PNG colorspace"
-    breaking-changes-header: behavior-changed-nativeimagetodataurl-will-preserve-png-colorspace
-```
-->
-
 * `options` Object (optional)
  * `scaleFactor` Number (optional) - Defaults to 1.0.

--- a/docs/api/native-theme.md
+++ b/docs/api/native-theme.md
@@ -72,7 +72,3 @@ or is being instructed to use an inverted color scheme.

 A `boolean` indicating whether Chromium is in forced colors mode, controlled by system accessibility settings.
 Currently, Windows high contrast is the only system setting that triggers forced colors mode.
-
-### `nativeTheme.prefersReducedTransparency` _Readonly_
-
-A `boolean` that indicates the whether the user has chosen via system accessibility settings to reduce transparency at the OS level.
--- a/docs/api/navigation-history.md
+++ b/docs/api/navigation-history.md
@@ -9,24 +9,6 @@ Each navigation entry corresponds to a specific page. The indexing system follow

 ### Instance Methods

-#### `navigationHistory.canGoBack()`
-
-Returns `boolean` - Whether the browser can go back to previous web page.
-
-#### `navigationHistory.canGoForward()`
-
-Returns `boolean` - Whether the browser can go forward to next web page.
-
-#### `navigationHistory.canGoToOffset(offset)`
-
-* `offset` Integer
-
-Returns `boolean` - Whether the web page can go to the specified `offset` from the current entry.
-
-#### `navigationHistory.clear()`
-
-Clears the navigation history.
-
 #### `navigationHistory.getActiveIndex()`

 Returns `Integer` - The index of the current page, from which we would go back/forward or reload.
@@ -35,42 +17,13 @@ Returns `Integer` - The index of the current page, from which we would go back/f

 * `index` Integer

-Returns [`NavigationEntry`](structures/navigation-entry.md) - Navigation entry at the given index.
+Returns `Object`:
+
+* `url` string - The URL of the navigation entry at the given index.
+* `title` string - The page title of the navigation entry at the given index.

 If index is out of bounds (greater than history length or less than 0), null will be returned.

-#### `navigationHistory.goBack()`
-
-Makes the browser go back a web page.
-
-#### `navigationHistory.goForward()`
-
-Makes the browser go forward a web page.
-
-#### `navigationHistory.goToIndex(index)`
-
-* `index` Integer
-
-Navigates browser to the specified absolute web page index.
-
-#### `navigationHistory.goToOffset(offset)`
-
-* `offset` Integer
-
-Navigates to the specified offset from the current entry.
-
 #### `navigationHistory.length()`

 Returns `Integer` - History length.
-
-#### `navigationHistory.removeEntryAtIndex(index)`
-
-* `index` Integer
-
-Removes the navigation entry at the given index. Can't remove entry at the "current active index".
-
-Returns `boolean` - Whether the navigation entry was removed from the webContents history.
-
-#### `navigationHistory.getAllEntries()`
-
-Returns [`NavigationEntry[]`](structures/navigation-entry.md) - WebContents complete history.
--- a/docs/api/net.md
+++ b/docs/api/net.md
@@ -130,7 +130,7 @@ won't be able to connect to remote sites. However, a return value of
 whether a particular connection attempt to a particular remote site
 will be successful.

-### `net.resolveHost(host, [options])`
+#### `net.resolveHost(host, [options])`

 * `host` string - Hostname to resolve.
 * `options` Object (optional)
--- a/docs/api/notification.md
+++ b/docs/api/notification.md
@@ -36,7 +36,7 @@ Returns `boolean` - Whether or not desktop notifications are supported on the cu
  * `subtitle` string (optional) _macOS_ - A subtitle for the notification, which will be displayed below the title.
  * `body` string (optional) - The body text of the notification, which will be displayed below the title or subtitle.
  * `silent` boolean (optional) - Whether or not to suppress the OS notification noise when showing the notification.
-  * `icon` (string | [NativeImage](native-image.md)) (optional) - An icon to use in the notification. If a string is passed, it must be a valid path to a local icon file.
+  * `icon` (string | [NativeImage](native-image.md)) (optional) - An icon to use in the notification.
  * `hasReply` boolean (optional) _macOS_ - Whether or not to add an inline reply option to the notification.
  * `timeoutType` string (optional) _Linux_ _Windows_ - The timeout duration of the notification. Can be 'default' or 'never'.
  * `replyPlaceholder` string (optional) _macOS_ - The placeholder to write in the inline reply input field.
--- a/docs/api/power-monitor.md
+++ b/docs/api/power-monitor.md
@@ -42,8 +42,6 @@ See https://developer.apple.com/library/archive/documentation/Performance/Concep

 ### Event: 'speed-limit-change' _macOS_ _Windows_

-Returns:
-
 * `limit` number - The operating system's advertised speed limit for CPUs, in percent.

 Notification of a change in the operating system's advertised speed limit for
--- a/docs/api/protocol.md
+++ b/docs/api/protocol.md
@@ -189,15 +189,6 @@ Returns `boolean` - Whether `scheme` is already handled.

 ### `protocol.registerFileProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -219,15 +210,6 @@ from protocols that follow the "generic URI syntax" like `file:`.

 ### `protocol.registerBufferProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -252,15 +234,6 @@ protocol.registerBufferProtocol('atom', (request, callback) => {

 ### `protocol.registerStringProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -277,15 +250,6 @@ property.

 ### `protocol.registerHttpProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -301,15 +265,6 @@ should be called with an object that has the `url` property.

 ### `protocol.registerStreamProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -359,15 +314,6 @@ protocol.registerStreamProtocol('atom', (request, callback) => {

 ### `protocol.unregisterProtocol(scheme)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string

 Returns `boolean` - Whether the protocol was successfully unregistered
@@ -376,30 +322,12 @@ Unregisters the custom protocol of `scheme`.

 ### `protocol.isProtocolRegistered(scheme)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string

 Returns `boolean` - Whether `scheme` is already registered.

 ### `protocol.interceptFileProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -413,15 +341,6 @@ which sends a file as a response.

 ### `protocol.interceptStringProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -435,15 +354,6 @@ which sends a `string` as a response.

 ### `protocol.interceptBufferProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -457,15 +367,6 @@ which sends a `Buffer` as a response.

 ### `protocol.interceptHttpProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -479,15 +380,6 @@ which sends a new HTTP request as a response.

 ### `protocol.interceptStreamProtocol(scheme, handler)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string
 * `handler` Function
  * `request` [ProtocolRequest](structures/protocol-request.md)
@@ -501,15 +393,6 @@ protocol handler.

 ### `protocol.uninterceptProtocol(scheme)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string

 Returns `boolean` - Whether the protocol was successfully unintercepted
@@ -518,15 +401,6 @@ Remove the interceptor installed for `scheme` and restore its original handler.

 ### `protocol.isProtocolIntercepted(scheme)` _Deprecated_

-<!--
-```YAML history
-deprecated:
-  - pr-url: https://github.com/electron/electron/pull/36674
-    description: "`protocol.register*Protocol` and `protocol.intercept*Protocol` methods have been replaced with `protocol.handle`"
-    breaking-changes-header: deprecated-protocolunregisterinterceptbufferstringstreamfilehttpprotocol-and-protocolisprotocolregisteredintercepted
-```
-->
-
 * `scheme` string

 Returns `boolean` - Whether `scheme` is already intercepted.
--- a/Show More
+++ b/Show More