chore: update lockfile

build: typecheck the Electron lib tree with tsgo during ninja
Adds a GN typescript_check template that runs tsgo --noEmit over a tsconfig and writes a stamp file on success, wired into BUILD.gn as electron_lib_typecheck. electron_js2c depends on it so a broken type in lib/ fails 'e build'. tsgo (@typescript/native-preview, the Go-based TypeScript compiler preview) runs the full lib/ typecheck in ~400ms, about 6x faster than tsc 6.0.2 (~2.3s). ts-loader previously typechecked implicitly inside webpack and was removed in the esbuild migration, so this restores typecheck coverage that was briefly absent on the bundle build path. Because tsgo has no 'ignoreDiagnostics' option like ts-loader's, the previously-silenced TS6059 and TS1111 errors needed to be fixed properly: - tsconfig.electron.json drops 'rootDir: "lib"'. It was only meaningful for emit, and the TS 6 implicit rootDir inference plus the @node/* path alias was pulling Node's internal .js files (specifically internal/url.js with its #searchParams brand check) into the program. - tsconfig.json drops the @node/* path alias entirely. Every call site that used 'as typeof import("@node/lib/...")' is replaced with narrow structural types declared once in an ambient NodeInternalModules interface in typings/internal-ambient.d.ts. __non_webpack_require__ becomes an overloaded function that picks the right return type from a string-literal id argument, so call sites no longer need 'as' casts. - tsconfig.default_app.json: moduleResolution 'node' -> 'bundler' (TS 6 deprecates 'node'). - typings/internal-ambient.d.ts: 'declare module NodeJS { }' -> 'declare namespace NodeJS { }' (TS 6 rejects the module keyword for non-external declarations). spec/ts-smoke/runner.js now invokes tsgo's bin instead of resolving the 'typescript' package. The 'tsc' npm script is repointed from 'tsc' to 'tsgo' so the existing CI step 'node script/yarn.js tsc -p tsconfig.script.json' continues to run. A small script/typecheck.js wrapper runs tsgo and writes the stamp file for GN; the typescript_check template invokes it via a new 'tsc-check' npm script.
2026-04-10 03:01:51 -04:00 · 2026-04-05 05:46:21 +00:00 · 2026-04-05 05:46:21 +00:00 · 2026-04-05 05:46:21 +00:00 · 2026-04-05 05:46:19 +00:00
242 changed files with 5291 additions and 4130 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -35,7 +35,7 @@
 				"ms-vscode.cpptools",
 				"mutantdino.resourcemonitor",
 				"dsanders11.vscode-electron-build-tools",
-				"oxc.oxc-vscode",
+				"dbaeumer.vscode-eslint",
 				"shakram02.bash-beautify",
 				"marshallofsound.gnls-electron"
 			],
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -0,0 +1,79 @@
+{
+  "root": true,
+  "extends": "standard",
+  "parser": "@typescript-eslint/parser",
+  "plugins": ["@typescript-eslint"],
+  "env": {
+    "browser": true
+  },
+  "rules": {
+    "semi": ["error", "always"],
+    "no-var": "error",
+    "no-unused-vars": "off",
+    "guard-for-in": "error",
+    "@typescript-eslint/no-unused-vars": ["error", {
+      "vars": "all",
+      "args": "after-used",
+      "ignoreRestSiblings": true
+    }],
+    "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"
+      ]
+    }]
+  },
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "overrides": [
+    {
+      "files": "*.ts",
+      "rules": {
+        "no-undef": "off",
+        "no-redeclare": "off",
+        "@typescript-eslint/no-redeclare": ["error"],
+        "no-use-before-define": "off"
+      }
+    },
+    {
+      "files": "*.d.ts",
+      "rules": {
+        "no-useless-constructor": "off",
+        "@typescript-eslint/no-unused-vars": "off"
+      }
+    }
+  ]
+}
--- a/.github/actions/build-electron/action.yml
+++ b/.github/actions/build-electron/action.yml
@@ -228,17 +228,7 @@ runs:
      if: ${{ inputs.is-release == 'true' }}
      run: |
        cd src
-        # Reuse the hermetic mac_sdk_path that `e build` wrote for out/Default so
-        # out/ffmpeg builds against the same SDK instead of the runner's system Xcode.
-        # The path has to live under root_build_dir, so copy the symlink tree and
-        # rewrite Default -> ffmpeg.
-        MAC_SDK_ARG=""
-        if [ "$(uname)" = "Darwin" ]; then
-          mkdir -p out/ffmpeg
-          cp -a out/Default/xcode_links out/ffmpeg/
-          MAC_SDK_ARG=$(sed -n 's|^\(mac_sdk_path = "//out/\)Default/|\1ffmpeg/|p' out/Default/args.gn)
-        fi
-        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true use_siso=true $MAC_SDK_ARG $GN_EXTRA_ARGS"
+        gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true use_siso=true $GN_EXTRA_ARGS"
        e build --target electron:electron_ffmpeg_zip -C ../../out/ffmpeg
    - name: Remove Clang problem matcher
      shell: bash
--- a/.github/actions/checkout/action.yml
+++ b/.github/actions/checkout/action.yml
@@ -28,7 +28,7 @@ runs:
    shell: bash
    run: |
      node src/electron/script/generate-deps-hash.js
-      DEPSHASH="v2-src-cache-$(cat src/electron/.depshash)"
+      DEPSHASH="v1-src-cache-$(cat src/electron/.depshash)"
      echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
      echo "CACHE_FILE=$DEPSHASH.tar" >> $GITHUB_ENV
      if [ "${{ inputs.target-platform }}" = "win" ]; then
@@ -109,7 +109,7 @@ runs:
        echo "target_os=['$TARGET_OS']" >> ./.gclient
      fi

-      ELECTRON_DEPOT_TOOLS_WIN_TOOLCHAIN=0 DEPOT_TOOLS_WIN_TOOLCHAIN=0 ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 e d gclient sync --with_branch_heads --with_tags
+      ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 e d gclient sync --with_branch_heads --with_tags -vv
      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
@@ -187,35 +187,21 @@ runs:
    shell: bash
    run: |
      echo "Uncompressed src size: $(du -sh src | cut -f1 -d' ')"
-      # Named .tar but zstd-compressed; the sas-sidecar's filename allowlist
-      # only permits .tar/.tgz so we keep the extension and decode on restore.
-      tar -cf - src | zstd -T0 --long=30 -f -o $CACHE_FILE
+      tar -cf $CACHE_FILE src
      echo "Compressed src to $(du -sh $CACHE_FILE | cut -f1 -d' ')"
+      cp ./$CACHE_FILE $CACHE_DRIVE/
  - name: Persist Src Cache
    if: ${{ steps.check-cache.outputs.cache_exists == 'false' && inputs.use-cache == 'true' }}
    shell: bash
    run: |
      final_cache_path=$CACHE_DRIVE/$CACHE_FILE
-      # Upload to a run-unique temp name first so concurrent readers never
-      # observe a partially-written file, and an interrupted copy can't leave
-      # a truncated file at the final path. Orphaned temp files get swept by
-      # the clean-orphaned-cache-uploads workflow.
-      tmp_cache_path=$final_cache_path.upload-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}
-      echo "Uploading to temp path: $tmp_cache_path"
-      cp ./$CACHE_FILE $tmp_cache_path
-
      echo "Using cache key: $DEPSHASH"
-      if [ -f "$final_cache_path" ]; then
-        echo "Cache already persisted at $final_cache_path by a concurrent run; discarding ours"
-        rm -f $tmp_cache_path
-      else
-        mv -f $tmp_cache_path $final_cache_path
-        echo "Cache key persisted in $final_cache_path"
-      fi
-
+      echo "Checking path: $final_cache_path"
      if [ ! -f "$final_cache_path" ]; then
        echo "Cache key not found"
        exit 1
+      else
+        echo "Cache key persisted in $final_cache_path"
      fi
  - name: Wait for active SSH sessions
    shell: bash
--- a/.github/actions/fix-sync/action.yml
+++ b/.github/actions/fix-sync/action.yml
@@ -27,7 +27,6 @@ runs:
        python3 src/tools/clang/scripts/update.py
        # Refs https://chromium-review.googlesource.com/c/chromium/src/+/6667681
        python3 src/tools/clang/scripts/update.py --package objdump
-        python3 src/tools/clang/scripts/update.py --package clang-tidy
    - name: Fix esbuild
      if: ${{ inputs.target-platform != 'linux' }}
      uses: ./src/electron/.github/actions/cipd-install
--- a/.github/actions/install-build-tools/action.yml
+++ b/.github/actions/install-build-tools/action.yml
@@ -15,7 +15,7 @@ runs:
        git config --global core.preloadindex true
        git config --global core.longpaths true
      fi
-      export BUILD_TOOLS_SHA=1b7bd25dae4a780bb3170fff56c9327b53aaf7eb
+      export BUILD_TOOLS_SHA=a0cc95a1884a631559bcca0c948465b725d9295a
      npm i -g @electron/build-tools
      # Update depot_tools to ensure python
      e d update_depot_tools
@@ -29,4 +29,4 @@ runs:
      else
        echo "$HOME/.electron_build_tools/third_party/depot_tools" >> $GITHUB_PATH
        echo "$HOME/.electron_build_tools/third_party/depot_tools/python-bin" >> $GITHUB_PATH
-      fi
+      fi
--- a/.github/actions/restore-cache-aks/action.yml
+++ b/.github/actions/restore-cache-aks/action.yml
@@ -31,7 +31,7 @@ runs:
      fi

      mkdir temp-cache
-      zstd -d --long=30 -c $cache_path | tar -xf - -C temp-cache
+      tar -xf $cache_path -C temp-cache
      echo "Unzipped cache is $(du -sh temp-cache/src | cut -f1)"

      if [ -d "temp-cache/src" ]; then
--- a/.github/actions/restore-cache-azcopy/action.yml
+++ b/.github/actions/restore-cache-azcopy/action.yml
@@ -61,9 +61,9 @@ runs:
        echo "Cache is empty - exiting"
        exit 1
      fi
-
+      
      mkdir temp-cache
-      zstd -d --long=30 -c $DEPSHASH.tar | tar -xf - -C temp-cache
+      tar -xf $DEPSHASH.tar -C temp-cache
      echo "Unzipped cache is $(du -sh temp-cache/src | cut -f1)"

      if [ -d "temp-cache/src" ]; then
@@ -85,17 +85,19 @@ runs:

  - name: Unzip and Ensure Src Cache (Windows)
    if: ${{ inputs.target-platform == 'win' }}
-    shell: bash
+    shell: powershell
    run: |
-      echo "Downloaded cache is $(du -sh $DEPSHASH.tar | cut -f1)"
-      if [ `du $DEPSHASH.tar | cut -f1` = "0" ]; then
-        echo "Cache is empty - exiting"
+      $src_cache = "$env:DEPSHASH.tar"
+      $cache_size = $(Get-Item $src_cache).length
+      Write-Host "Downloaded cache is $cache_size"
+      if ($cache_size -eq 0) {
+        Write-Host "Cache is empty - exiting"
        exit 1
-      fi
+      }

-      mkdir temp-cache
-      zstd -d --long=30 -c $DEPSHASH.tar | tar -xf - -C temp-cache
-      rm -f $DEPSHASH.tar
+      $TEMP_DIR=New-Item -ItemType Directory -Path temp-cache
+      $TEMP_DIR_PATH = $TEMP_DIR.FullName
+      C:\ProgramData\Chocolatey\bin\7z.exe -y -snld20 x $src_cache -o"$TEMP_DIR_PATH"

  - name: Move Src Cache (Windows)
    if: ${{ inputs.target-platform == 'win' }}
@@ -110,6 +112,9 @@ runs:
          Write-Host "Relocating Cache"
          Remove-Item -Recurse -Force src
          Move-Item temp-cache\src src
+
+          Write-Host "Deleting zip file"
+          Remove-Item -Force $src_cache
        }
        if (-Not (Test-Path "src\third_party\blink")) {
          Write-Host "Cache was not correctly restored - exiting"
--- a/.github/problem-matchers/eslint-stylish.json
+++ b/.github/problem-matchers/eslint-stylish.json
@@ -0,0 +1,22 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "eslint-stylish",
+      "pattern": [
+        {
+          "regexp": "^\\s*([^\\s].*)$",
+          "file": 1
+        },
+        {
+          "regexp": "^\\s+(\\d+):(\\d+)\\s+(error|warning|info)\\s+(.*)\\s\\s+(.*)$",
+          "line": 1,
+          "column": 2,
+          "severity": 3,
+          "message": 4,
+          "code": 5,
+          "loop": true
+        }
+      ]
+    }
+  ]
+}
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -442,7 +442,34 @@ jobs:
      contents: read
    needs: [docs-only, macos-x64, macos-arm64, linux-x64, linux-x64-asan, linux-arm, linux-arm64, windows-x64, windows-x86, windows-arm64]
    if: always() && github.repository == 'electron/electron' && !contains(needs.*.result, 'failure')
-    steps:
+    steps: 
    - name: GitHub Actions Jobs Done
      run: |
        echo "All GitHub Actions Jobs are done"
+
+  check-signed-commits:
+    name: Check signed commits in green PR
+    needs: gha-done
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'needs-signed-commits')}}
+    runs-on: ubuntu-slim
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Check signed commits in PR
+        uses: 1Password/check-signed-commits-action@ed2885f3ed2577a4f5d3c3fe895432a557d23d52 # v1
+        with:
+          comment: |
+            ⚠️ This PR contains unsigned commits. This repository enforces [commit signatures](https://docs.github.com/en/authentication/managing-commit-signature-verification) 
+            for all incoming PRs. To get your PR merged, please sign those commits 
+            (`git rebase --exec 'git commit -S --amend --no-edit -n' @{upstream}`) and force push them to this branch 
+            (`git push --force-with-lease`)
+
+            For more information on signing 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).
+
+      - name: Remove needs-signed-commits label
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR_URL: ${{ github.event.pull_request.html_url }}
+        run: |
+          gh pr edit $PR_URL --remove-label needs-signed-commits
--- a/.github/workflows/clean-orphaned-cache-uploads.yml
+++ b/.github/workflows/clean-orphaned-cache-uploads.yml
@@ -1,32 +0,0 @@
-name: Clean Orphaned Cache Uploads
-
-# Description:
-# Sweeps orphaned in-flight upload temp files left on the src-cache volumes
-# by checkout/action.yml when its cp-to-share step dies before the rename.
-# A successful upload finishes in minutes, so anything older than 4h is dead.
-
-on:
-  schedule:
-    - cron: "0 */4 * * *"
-  workflow_dispatch:
-
-permissions: {}
-
-jobs:
-  clean-orphaned-uploads:
-    if: github.repository == 'electron/electron'
-    runs-on: electron-arc-centralus-linux-amd64-32core
-    permissions:
-      contents: read
-    container:
-      image: ghcr.io/electron/build:bc2f48b2415a670de18d13605b1cf0eb5fdbaae1
-      options: --user root
-      volumes:
-        - /mnt/cross-instance-cache:/mnt/cross-instance-cache
-        - /mnt/win-cache:/mnt/win-cache
-    steps:
-    - name: Remove Orphaned Upload Temp Files
-      shell: bash
-      run: |
-        find /mnt/cross-instance-cache -maxdepth 1 -type f -name '*.tar.upload-*' -mmin +240 -print -delete
-        find /mnt/win-cache -maxdepth 1 -type f -name '*.tar.upload-*' -mmin +240 -print -delete
--- a/.github/workflows/pipeline-electron-docs-only.yml
+++ b/.github/workflows/pipeline-electron-docs-only.yml
@@ -35,7 +35,7 @@ jobs:
    - name: Generate DEPS Hash
      run: |
        node src/electron/script/generate-deps-hash.js
-        DEPSHASH=v2-src-cache-$(cat src/electron/.depshash)
+        DEPSHASH=v1-src-cache-$(cat src/electron/.depshash)
        echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
        echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
    - name: Restore src cache via AKS
--- a/.github/workflows/pipeline-electron-lint.yml
+++ b/.github/workflows/pipeline-electron-lint.yml
@@ -50,7 +50,7 @@ jobs:
          echo "::error::Invalid chromium_revision: $chromium_revision"
          exit 1
        fi
-        gn_version="$(curl -sL "https://raw.githubusercontent.com/chromium/chromium/refs/tags/${chromium_revision}/DEPS" | grep gn_version | head -n1 | cut -d\' -f4)"
+        gn_version="$(curl -sL -b ~/.gitcookies "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/
@@ -70,12 +70,13 @@ jobs:
        fi

        mkdir -p src/buildtools
-        curl -sL "https://raw.githubusercontent.com/chromium/chromium/refs/tags/${chromium_revision}/buildtools/DEPS" > src/buildtools/DEPS
+        curl -sL -b ~/.gitcookies "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/buildtools/DEPS?format=TEXT" | base64 -d > src/buildtools/DEPS

        gclient sync --spec="solutions=[{'name':'src/buildtools','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':True},'managed':False}]"
    - name: Add problem matchers
      shell: bash
      run: |
+        echo "::add-matcher::src/electron/.github/problem-matchers/eslint-stylish.json"
        echo "::add-matcher::src/electron/.github/problem-matchers/markdownlint.json"
    - name: Run Lint
      shell: bash
--- a/.github/workflows/pipeline-segment-electron-build.yml
+++ b/.github/workflows/pipeline-segment-electron-build.yml
@@ -156,7 +156,7 @@ jobs:
    - name: Generate DEPS Hash
      run: |
        node src/electron/script/generate-deps-hash.js
-        DEPSHASH=v2-src-cache-$(cat src/electron/.depshash)
+        DEPSHASH=v1-src-cache-$(cat src/electron/.depshash)
        echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
        echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
    - name: Restore src cache via AZCopy
--- a/.github/workflows/pipeline-segment-electron-clang-tidy.yml
+++ b/.github/workflows/pipeline-segment-electron-clang-tidy.yml
@@ -80,7 +80,7 @@ jobs:
    - name: Generate DEPS Hash
      run: |
        node src/electron/script/generate-deps-hash.js
-        DEPSHASH=v2-src-cache-$(cat src/electron/.depshash)
+        DEPSHASH=v1-src-cache-$(cat src/electron/.depshash)
        echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
        echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
    - name: Restore src cache via AZCopy
--- a/.github/workflows/pipeline-segment-electron-gn-check.yml
+++ b/.github/workflows/pipeline-segment-electron-gn-check.yml
@@ -81,7 +81,7 @@ jobs:
    - name: Generate DEPS Hash
      run: |
        node src/electron/script/generate-deps-hash.js
-        DEPSHASH=v2-src-cache-$(cat src/electron/.depshash)
+        DEPSHASH=v1-src-cache-$(cat src/electron/.depshash)
        echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
        echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
    - name: Restore src cache via AZCopy
--- a/.github/workflows/pipeline-segment-electron-publish.yml
+++ b/.github/workflows/pipeline-segment-electron-publish.yml
@@ -165,7 +165,7 @@ jobs:
      - name: Generate DEPS Hash
        run: |
          node src/electron/script/generate-deps-hash.js
-          DEPSHASH=v2-src-cache-$(cat src/electron/.depshash)
+          DEPSHASH=v1-src-cache-$(cat src/electron/.depshash)
          echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
          echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
      - name: Restore src cache via AZCopy
--- a/.github/workflows/pr-triage-automation.yml
+++ b/.github/workflows/pr-triage-automation.yml
@@ -17,13 +17,11 @@ jobs:
    name: Set status to Needs Review
    if: >-
      (github.event_name == 'pull_request_target'
-        && github.event.pull_request.state == 'open'
        && github.event.pull_request.draft != true
        && !contains(github.event.pull_request.labels.*.name, 'wip ⚒')
        && (github.event.action == 'synchronize' || github.event.action == 'review_requested'))
      || (github.event_name == 'issue_comment'
          && github.event.issue.pull_request
-          && github.event.issue.state == 'open'
          && !contains(github.event.issue.labels.*.name, 'wip ⚒')
          && github.event.comment.user.login == github.event.issue.user.login)
    runs-on: ubuntu-slim
--- a/.github/workflows/pull-request-labeled.yml
+++ b/.github/workflows/pull-request-labeled.yml
@@ -50,7 +50,7 @@ jobs:
          field-value: ✅ Reviewed
  pull-request-labeled-ai-pr:
    name: ai-pr label added
-    if: github.event.label.name == 'ai-pr' && github.event.pull_request.state != 'closed'
+    if: github.event.label.name == 'ai-pr'
    runs-on: ubuntu-latest
    permissions: {}
    steps:
--- a/.github/workflows/pull-request-opened-synchronized.yml
+++ b/.github/workflows/pull-request-opened-synchronized.yml
@@ -13,6 +13,7 @@ permissions: {}
 jobs:
  check-signed-commits:
    name: Check signed commits in PR
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'needs-signed-commits')}}
    runs-on: ubuntu-slim
    permissions:
      contents: read
@@ -22,9 +23,9 @@ jobs:
        uses: 1Password/check-signed-commits-action@ed2885f3ed2577a4f5d3c3fe895432a557d23d52 # v1
        with:
          comment: |
-            ⚠️ This PR contains unsigned commits. This repository enforces [commit signatures](https://docs.github.com/en/authentication/managing-commit-signature-verification)
-            for all incoming PRs. To get your PR merged, please sign those commits
-            (`git rebase --exec 'git commit -S --amend --no-edit -n' @{upstream}`) and force push them to this branch
+            ⚠️ This PR contains unsigned commits. This repository enforces [commit signatures](https://docs.github.com/en/authentication/managing-commit-signature-verification) 
+            for all incoming PRs. To get your PR merged, please sign those commits 
+            (`git rebase --exec 'git commit -S --amend --no-edit -n' @{upstream}`) and force push them to this branch 
            (`git push --force-with-lease`)

            For more information on signing 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).
@@ -36,11 +37,3 @@ jobs:
          PR_URL: ${{ github.event.pull_request.html_url }}
        run: |
          gh pr edit $PR_URL --add-label needs-signed-commits
-
-      - name: Remove needs-signed-commits label
-        if: ${{ success() && contains(github.event.pull_request.labels.*.name, 'needs-signed-commits') }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_URL: ${{ github.event.pull_request.html_url }}
-        run: |
-          gh pr edit $PR_URL --remove-label needs-signed-commits
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -1,329 +0,0 @@
-{
-  "$schema": "./node_modules/oxlint/configuration_schema.json",
-  "plugins": [
-    "typescript",
-    "import",
-    "node",
-    "promise",
-    "unicorn"
-  ],
-  "jsPlugins": [
-    {
-      "name": "no-only-tests",
-      "specifier": "./script/lint-plugins/no-only-tests.mjs"
-    }
-  ],
-  "categories": {
-    "correctness": "off"
-  },
-  "options": {
-    "typeAware": false
-  },
-  "env": {
-    "builtin": true,
-    "browser": true
-  },
-  "ignorePatterns": [
-    ".github/workflows/node_modules",
-    "spec/node_modules",
-    "spec/fixtures/native-addon",
-    "shell/browser/resources/win/resource.h",
-    "shell/common/node_includes.h",
-    "spec/fixtures/pages/jquery-3.6.0.min.js"
-  ],
-  "rules": {
-    "no-var": "error",
-    "accessor-pairs": [
-      "error",
-      {
-        "setWithoutGet": true,
-        "enforceForClassMembers": true
-      }
-    ],
-    "array-callback-return": [
-      "error",
-      {
-        "allowImplicit": false,
-        "checkForEach": false
-      }
-    ],
-    "constructor-super": "error",
-    "curly": [
-      "error",
-      "multi-line"
-    ],
-    "default-case-last": "error",
-    "eqeqeq": [
-      "error",
-      "always",
-      {
-        "null": "ignore"
-      }
-    ],
-    "new-cap": [
-      "error",
-      {
-        "newIsCap": true,
-        "capIsNew": false,
-        "properties": true
-      }
-    ],
-    "no-array-constructor": "error",
-    "no-async-promise-executor": "error",
-    "no-caller": "error",
-    "no-case-declarations": "error",
-    "no-class-assign": "error",
-    "no-compare-neg-zero": "error",
-    "no-cond-assign": "error",
-    "no-const-assign": "error",
-    "no-constant-condition": [
-      "error",
-      {
-        "checkLoops": false
-      }
-    ],
-    "no-control-regex": "error",
-    "no-debugger": "error",
-    "no-delete-var": "error",
-    "no-dupe-class-members": "error",
-    "no-dupe-keys": "error",
-    "no-duplicate-case": "error",
-    "no-useless-backreference": "error",
-    "no-empty": [
-      "error",
-      {
-        "allowEmptyCatch": true
-      }
-    ],
-    "no-empty-character-class": "error",
-    "no-empty-pattern": "error",
-    "no-eval": "error",
-    "no-ex-assign": "error",
-    "no-extend-native": "error",
-    "no-extra-bind": "error",
-    "no-extra-boolean-cast": "error",
-    "no-fallthrough": "error",
-    "no-func-assign": "error",
-    "no-global-assign": "error",
-    "no-import-assign": "error",
-    "no-invalid-regexp": "error",
-    "no-irregular-whitespace": "error",
-    "no-iterator": "error",
-    "no-labels": [
-      "error",
-      {
-        "allowLoop": false,
-        "allowSwitch": false
-      }
-    ],
-    "no-lone-blocks": "error",
-    "no-loss-of-precision": "error",
-    "no-misleading-character-class": "error",
-    "no-prototype-builtins": "error",
-    "no-useless-catch": "error",
-    "no-useless-constructor": "error",
-    "no-use-before-define": [
-      "error",
-      {
-        "functions": false,
-        "classes": false,
-        "variables": false
-      }
-    ],
-    "no-multi-str": "error",
-    "no-new": "error",
-    "no-new-func": "error",
-    "no-new-wrappers": "error",
-    "no-obj-calls": "error",
-    "no-proto": "error",
-    "no-redeclare": [
-      "error"
-    ],
-    "no-regex-spaces": "error",
-    "no-return-assign": [
-      "error",
-      "except-parens"
-    ],
-    "no-self-assign": [
-      "error",
-      {
-        "props": true
-      }
-    ],
-    "no-self-compare": "error",
-    "no-sequences": "error",
-    "no-shadow-restricted-names": "error",
-    "no-sparse-arrays": "error",
-    "no-template-curly-in-string": "error",
-    "no-this-before-super": "error",
-    "no-throw-literal": "error",
-    "no-unexpected-multiline": "error",
-    "no-unmodified-loop-condition": "error",
-    "no-unneeded-ternary": [
-      "error",
-      {
-        "defaultAssignment": false
-      }
-    ],
-    "no-unreachable": "error",
-    "no-unsafe-finally": "error",
-    "no-unsafe-negation": "error",
-    "no-unused-vars": [
-      "error",
-      {
-        "vars": "all",
-        "args": "after-used",
-        "argsIgnorePattern": "^_",
-        "ignoreRestSiblings": true
-      }
-    ],
-    "no-useless-call": "error",
-    "no-useless-computed-key": "error",
-    "no-useless-escape": "error",
-    "no-useless-rename": "error",
-    "no-useless-return": "error",
-    "no-void": "error",
-    "no-with": "error",
-    "prefer-const": [
-      "error",
-      {
-        "destructuring": "all"
-      }
-    ],
-    "prefer-promise-reject-errors": "error",
-    "symbol-description": "error",
-    "unicode-bom": [
-      "error",
-      "never"
-    ],
-    "use-isnan": [
-      "error",
-      {
-        "enforceForSwitchCase": true,
-        "enforceForIndexOf": true
-      }
-    ],
-    "valid-typeof": [
-      "error",
-      {
-        "requireStringLiterals": true
-      }
-    ],
-    "yoda": [
-      "error",
-      "never"
-    ],
-    "import/export": "error",
-    "import/first": "error",
-    "import/no-absolute-path": [
-      "error",
-      {
-        "esmodule": true,
-        "commonjs": true,
-        "amd": false
-      }
-    ],
-    "import/no-duplicates": "error",
-    "import/no-named-default": "error",
-    "import/no-webpack-loader-syntax": "error",
-    "promise/param-names": "error",
-    "guard-for-in": "error",
-    "node/handle-callback-err": [
-      "error",
-      "^(err|error)$"
-    ],
-    "node/no-exports-assign": "error",
-    "node/no-new-require": "error",
-    "node/no-path-concat": "error"
-  },
-  "overrides": [
-    {
-      "files": ["**/*.ts", "**/*.tsx", "**/*.mts", "**/*.cts"],
-      "rules": {
-        "no-use-before-define": "off"
-      }
-    },
-    {
-      "files": ["lib/browser/**", "lib/utility/**"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": ["electron", "electron/renderer"],
-            "patterns": [
-              "./*",
-              "../*",
-              "@electron/internal/isolated_renderer/*",
-              "@electron/internal/renderer/*",
-              "@electron/internal/sandboxed_worker/*",
-              "@electron/internal/worker/*"
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "files": [
-        "lib/renderer/**",
-        "lib/worker/**",
-        "lib/preload_realm/**",
-        "lib/sandboxed_renderer/**",
-        "lib/isolated_renderer/**"
-      ],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": ["electron", "electron/main"],
-            "patterns": ["./*", "../*", "@electron/internal/browser/*"]
-          }
-        ]
-      }
-    },
-    {
-      "files": ["lib/common/**"],
-      "rules": {
-        "no-restricted-imports": [
-          "error",
-          {
-            "paths": ["electron", "electron/main", "electron/renderer"],
-            "patterns": [
-              "./*",
-              "../*",
-              "@electron/internal/browser/*",
-              "@electron/internal/isolated_renderer/*",
-              "@electron/internal/renderer/*",
-              "@electron/internal/sandboxed_worker/*",
-              "@electron/internal/worker/*"
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "files": [
-        "build/**",
-        "script/**",
-        "docs/**",
-        "default_app/**",
-        "spec/**"
-      ],
-      "rules": {
-        "unicorn/prefer-node-protocol": "error"
-      }
-    },
-    {
-      "files": ["spec/**/*.ts", "spec/**/*.js", "spec/**/*.mjs"],
-      "rules": {
-        "no-only-tests/no-only-tests": "error"
-      }
-    },
-    {
-      "files": ["**/*.d.ts"],
-      "rules": {
-        "no-useless-constructor": "off",
-        "no-unused-vars": "off"
-      }
-    }
-  ]
-}
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -18,12 +18,12 @@ import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
 import("//v8/gni/snapshot_toolchain.gni")
 import("build/asar.gni")
 import("build/electron_paks.gni")
+import("build/esbuild/esbuild.gni")
 import("build/extract_symbols.gni")
 import("build/js2c_toolchain.gni")
 import("build/npm.gni")
 import("build/templated_file.gni")
 import("build/tsc.gni")
-import("build/webpack/webpack.gni")
 import("buildflags/buildflags.gni")
 import("filenames.auto.gni")
 import("filenames.gni")
@@ -162,75 +162,81 @@ npm_action("build_electron_definitions") {
  outputs = [ "$target_gen_dir/tsc/typings/electron.d.ts" ]
 }

-webpack_build("electron_browser_bundle") {
+typescript_check("electron_lib_typecheck") {
+  deps = [ ":build_electron_definitions" ]
+  tsconfig = "//electron/tsconfig.electron.json"
+  sources = auto_filenames.typecheck_sources
+}
+
+esbuild_build("electron_browser_bundle") {
  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.browser_bundle_deps

-  config_file = "//electron/build/webpack/webpack.config.browser.js"
+  config_file = "//electron/build/esbuild/configs/browser.js"
  out_file = "$target_gen_dir/js2c/browser_init.js"
 }

-webpack_build("electron_renderer_bundle") {
+esbuild_build("electron_renderer_bundle") {
  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.renderer_bundle_deps

-  config_file = "//electron/build/webpack/webpack.config.renderer.js"
+  config_file = "//electron/build/esbuild/configs/renderer.js"
  out_file = "$target_gen_dir/js2c/renderer_init.js"
 }

-webpack_build("electron_worker_bundle") {
+esbuild_build("electron_worker_bundle") {
  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.worker_bundle_deps

-  config_file = "//electron/build/webpack/webpack.config.worker.js"
+  config_file = "//electron/build/esbuild/configs/worker.js"
  out_file = "$target_gen_dir/js2c/worker_init.js"
 }

-webpack_build("electron_sandboxed_renderer_bundle") {
+esbuild_build("electron_sandboxed_renderer_bundle") {
  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.sandbox_bundle_deps

-  config_file = "//electron/build/webpack/webpack.config.sandboxed_renderer.js"
+  config_file = "//electron/build/esbuild/configs/sandboxed_renderer.js"
  out_file = "$target_gen_dir/js2c/sandbox_bundle.js"
 }

-webpack_build("electron_isolated_renderer_bundle") {
+esbuild_build("electron_isolated_renderer_bundle") {
  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.isolated_bundle_deps

-  config_file = "//electron/build/webpack/webpack.config.isolated_renderer.js"
+  config_file = "//electron/build/esbuild/configs/isolated_renderer.js"
  out_file = "$target_gen_dir/js2c/isolated_bundle.js"
 }

-webpack_build("electron_node_bundle") {
+esbuild_build("electron_node_bundle") {
  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.node_bundle_deps

-  config_file = "//electron/build/webpack/webpack.config.node.js"
+  config_file = "//electron/build/esbuild/configs/node.js"
  out_file = "$target_gen_dir/js2c/node_init.js"
 }

-webpack_build("electron_utility_bundle") {
+esbuild_build("electron_utility_bundle") {
  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.utility_bundle_deps

-  config_file = "//electron/build/webpack/webpack.config.utility.js"
+  config_file = "//electron/build/esbuild/configs/utility.js"
  out_file = "$target_gen_dir/js2c/utility_init.js"
 }

-webpack_build("electron_preload_realm_bundle") {
+esbuild_build("electron_preload_realm_bundle") {
  deps = [ ":build_electron_definitions" ]

  inputs = auto_filenames.preload_realm_bundle_deps

-  config_file = "//electron/build/webpack/webpack.config.preload_realm.js"
+  config_file = "//electron/build/esbuild/configs/preload_realm.js"
  out_file = "$target_gen_dir/js2c/preload_realm_bundle.js"
 }

@@ -238,6 +244,7 @@ action("electron_js2c") {
  deps = [
    ":electron_browser_bundle",
    ":electron_isolated_renderer_bundle",
+    ":electron_lib_typecheck",
    ":electron_node_bundle",
    ":electron_preload_realm_bundle",
    ":electron_renderer_bundle",
@@ -775,7 +782,6 @@ source_set("electron_lib") {
      "//components/zoom",
      "//extensions/browser",
      "//extensions/browser/api:api_provider",
-      "//extensions/browser/mime_handler:stream_info",
      "//extensions/browser/updater",
      "//extensions/common",
      "//extensions/common:core_api_provider",
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -1,14 +1,5 @@
 # Electron Development Guide

-## Running node_modules binaries
-
-**Never use `npx`.** It is considered dangerous because it can silently fetch and execute arbitrary packages from the registry. Always run binaries through one of these safer mechanisms instead:
-
-1. **Preferred** — spawn the executable directly from `node_modules/.bin/<tool>` (or the platform equivalent on Windows). This is what `script/lint.js` does for `oxlint`.
-2. **Acceptable** — invoke via `yarn <tool>` or `yarn run <tool>`, which resolves to the locally installed version without the registry fallback that `npx` performs.
-
-This rule applies to shell commands you run yourself and to any scripts you author or modify in this repo.
-
 ## Project Overview

 Electron is a framework for building cross-platform desktop applications using web technologies. It embeds Chromium for rendering and Node.js for backend functionality.
@@ -210,13 +201,12 @@ gh label list --repo electron/electron --search target/ --json name,color --jq '
 ## Code Style

 **C++:** Follows Chromium style, enforced by clang-format
-**TypeScript/JavaScript:** [oxlint](https://oxc.rs/docs/guide/usage/linter) configuration in `.oxlintrc.json`
+**TypeScript/JavaScript:** ESLint configuration in `.eslintrc.json`

 **Linting:**

 ```bash
 npm run lint              # Run all linters
-npm run lint:js           # Run oxlint over all JS/TS/MJS sources
 npm run lint:clang-format # C++ formatting
 npm run lint:api-history  # Validate API history YAML blocks in docs
 ```
--- a/2
+++ b/2
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

 vars = {
  'chromium_version':
-    '148.0.7778.0',
+    '148.0.7763.0',
  'node_version':
    'v24.14.1',
  'nan_version':
--- a/build/.eslintrc.json
+++ b/build/.eslintrc.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    "import"
+  ],
+  "rules": {
+    "import/enforce-node-protocol-usage": ["error", "always"]
+  }
+}
--- a/build/esbuild/bundle.js
+++ b/build/esbuild/bundle.js
@@ -0,0 +1,326 @@
+#!/usr/bin/env node
+// Driver script that replaces webpack for building Electron's internal
+// JS bundles. Each bundle is a single esbuild invocation parameterized by
+// the per-target configuration files under build/esbuild/configs.
+//
+// Invoked by the GN `esbuild_build` template via `npm run bundle -- …`.
+
+'use strict';
+
+const esbuild = require('esbuild');
+
+const fs = require('node:fs');
+const path = require('node:path');
+
+const electronRoot = path.resolve(__dirname, '../..');
+
+function parseArgs (argv) {
+  const args = {};
+  for (let i = 0; i < argv.length; i++) {
+    const a = argv[i];
+    if (a.startsWith('--')) {
+      const key = a.slice(2);
+      const next = argv[i + 1];
+      if (next === undefined || next.startsWith('--')) {
+        args[key] = true;
+      } else {
+        args[key] = next;
+        i++;
+      }
+    }
+  }
+  return args;
+}
+
+// Parse $target_gen_dir/buildflags/buildflags.h (a C++ header containing
+// `#define BUILDFLAG_INTERNAL_NAME() (0|1)` lines) into a map of flag name
+// to boolean. Used to seed the `define` table so that `BUILDFLAG(NAME)` call
+// sites can be statically folded to `true`/`false` at build time.
+function parseBuildflags (buildflagsPath) {
+  const flags = {};
+  if (!buildflagsPath) return flags;
+  const source = fs.readFileSync(buildflagsPath, 'utf8');
+  const re = /#define BUILDFLAG_INTERNAL_(.+?)\(\) \(([01])\)/g;
+  let match;
+  while ((match = re.exec(source)) !== null) {
+    const [, name, value] = match;
+    flags[name] = value === '1';
+  }
+  return flags;
+}
+
+// Return the list of esbuild `alias` entries used by every bundle. esbuild's
+// alias matches the full module specifier (no `$` suffix trickery like
+// webpack), so the bare `electron` alias also matches `electron/main`, etc.,
+// because esbuild matches the leftmost segment first.
+function buildAliases (electronAPIFile, { aliasTimers }) {
+  const aliases = {
+    electron: electronAPIFile,
+    'electron/main': electronAPIFile,
+    'electron/renderer': electronAPIFile,
+    'electron/common': electronAPIFile,
+    'electron/utility': electronAPIFile
+  };
+  // Only browser-platform bundles (sandboxed_renderer, isolated_renderer,
+  // preload_realm) need the timers shim — Node's `timers` builtin is not
+  // available there. For node-platform bundles (browser, renderer, worker,
+  // utility, node) the alias MUST NOT apply: lib/common/init.ts wraps the
+  // real Node timers and then assigns the wrappers onto globalThis. If
+  // those bundles saw the shim, the wrappers would recursively call back
+  // into globalThis.setTimeout and blow the stack.
+  if (aliasTimers) {
+    aliases.timers = path.resolve(electronRoot, 'lib', 'common', 'timers-shim.ts');
+  }
+  return aliases;
+}
+
+// esbuild's `alias` does not support wildcard prefixes like `@electron/internal/*`.
+// We instead install a tiny resolve plugin that rewrites any import starting
+// with that prefix to an absolute path under `lib/`. The plugin must also
+// replicate esbuild's extension/index resolution because returning a path
+// from onResolve bypasses the default resolver.
+function internalAliasPlugin () {
+  const candidates = (base) => [
+    base,
+    `${base}.ts`,
+    `${base}.js`,
+    path.join(base, 'index.ts'),
+    path.join(base, 'index.js')
+  ];
+  return {
+    name: 'electron-internal-alias',
+    setup (build) {
+      build.onResolve({ filter: /^@electron\/internal(\/|$)/ }, (args) => {
+        // Tolerate stray double slashes in import paths (webpack was lenient).
+        const rel = args.path.replace(/^@electron\/internal\/?/, '').replace(/^\/+/, '');
+        const base = path.resolve(electronRoot, 'lib', rel);
+        for (const c of candidates(base)) {
+          try {
+            if (fs.statSync(c).isFile()) return { path: c };
+          } catch { /* keep looking */ }
+        }
+        return { errors: [{ text: `Cannot resolve @electron/internal path: ${args.path}` }] };
+      });
+    }
+  };
+}
+
+// Rewrites `BUILDFLAG(NAME)` call-sites to `(true)` or `(false)` at load
+// time, equivalent to the combination of webpack's DefinePlugin substitution
+// (BUILDFLAG -> "" and NAME -> "true"/"false") that the old config used.
+// Doing it in a single regex pass keeps the semantics identical and avoids
+// fighting with esbuild's AST-level `define` quoting rules.
+function buildflagPlugin (buildflags, { allowUnknown = false } = {}) {
+  return {
+    name: 'electron-buildflag',
+    setup (build) {
+      build.onLoad({ filter: /\.(ts|js)$/ }, async (args) => {
+        const source = await fs.promises.readFile(args.path, 'utf8');
+        if (!source.includes('BUILDFLAG(')) {
+          return { contents: source, loader: args.path.endsWith('.ts') ? 'ts' : 'js' };
+        }
+        const rewritten = source.replace(/BUILDFLAG\(([A-Z0-9_]+)\)/g, (_, name) => {
+          if (!Object.prototype.hasOwnProperty.call(buildflags, name)) {
+            if (allowUnknown) return '(false)';
+            throw new Error(`Unknown BUILDFLAG: ${name} (in ${args.path})`);
+          }
+          return `(${buildflags[name]})`;
+        });
+        return { contents: rewritten, loader: args.path.endsWith('.ts') ? 'ts' : 'js' };
+      });
+    }
+  };
+}
+
+// TODO(MarshallOfSound): drop this patch once evanw/esbuild#4441 lands and
+// we bump esbuild — that PR adds a `__toCommonJSCached` helper for the
+// inline-require path so identity is preserved upstream. Tracked at
+// https://github.com/evanw/esbuild/issues/4440.
+//
+// esbuild's runtime emits `__toCommonJS = (mod) => __copyProps(__defProp({},
+// "__esModule", { value: true }), mod)`, which allocates a fresh wrapper
+// object every time `require()` resolves to a bundled ESM module. That
+// breaks identity expectations our code relies on (e.g. sandboxed preloads
+// expecting `require('timers') === require('node:timers')`, and the
+// defineProperties getters in lib/common/define-properties.ts expecting
+// stable namespaces). A cached WeakMap-backed version of __toCommonJS
+// existed in older esbuild releases (see evanw/esbuild#2126) but was
+// removed in evanw/esbuild@f4ff26d3 (0.14.27). Substitute a memoized
+// variant in post-processing so every call site returns the same wrapper
+// for the same underlying namespace, matching webpack's
+// `__webpack_require__` cache semantics.
+const ESBUILD_TO_COMMONJS_PATTERN =
+  /var __toCommonJS = \(mod\) => __copyProps\(__defProp\(\{\}, "__esModule", \{ value: true \}\), mod\);/;
+const ESBUILD_TO_COMMONJS_REPLACEMENT =
+  'var __toCommonJS = /* @__PURE__ */ ((cache) => (mod) => {\n' +
+  '    var cached = cache.get(mod);\n' +
+  '    if (cached) return cached;\n' +
+  '    var result = __copyProps(__defProp({}, "__esModule", { value: true }), mod);\n' +
+  '    cache.set(mod, result);\n' +
+  '    return result;\n' +
+  '  })(new WeakMap());';
+
+function patchToCommonJS (source) {
+  // Once evanw/esbuild#4441 lands, esbuild will emit `__toCommonJSCached`
+  // for inline require() — when we see that helper in the output, the
+  // upstream fix is active and this whole patch is a no-op (and should be
+  // deleted on the next esbuild bump).
+  if (source.includes('__toCommonJSCached')) {
+    return source;
+  }
+  if (!ESBUILD_TO_COMMONJS_PATTERN.test(source)) {
+    // Some bundles may not contain any ESM-shaped modules, in which case
+    // esbuild omits the helper entirely and there is nothing to patch.
+    if (source.includes('__toCommonJS')) {
+      throw new Error(
+        'esbuild bundle contains __toCommonJS but did not match the ' +
+        'expected pattern; the runtime helper has likely changed upstream. ' +
+        'Update ESBUILD_TO_COMMONJS_PATTERN in build/esbuild/bundle.js, or ' +
+        'delete patchToCommonJS entirely if evanw/esbuild#4441 has landed.'
+      );
+    }
+    return source;
+  }
+  return source.replace(ESBUILD_TO_COMMONJS_PATTERN, ESBUILD_TO_COMMONJS_REPLACEMENT);
+}
+
+// Wrap bundle source text in the same header/footer pairs webpack's
+// wrapper-webpack-plugin used. The try/catch wrapper is load-bearing:
+// shell/common/node_util.cc's CompileAndCall relies on it to prevent
+// exceptions from tearing down bootstrap.
+function applyWrappers (source, opts, outputFilename) {
+  let wrapped = patchToCommonJS(source);
+  if (opts.wrapInitWithProfilingTimeout) {
+    const header = 'function ___electron_webpack_init__() {';
+    const footer = '\n};\nif ((globalThis.process || binding.process).argv.includes("--profile-electron-init")) {\n  setTimeout(___electron_webpack_init__, 0);\n} else {\n  ___electron_webpack_init__();\n}';
+    wrapped = header + wrapped + footer;
+  }
+  if (opts.wrapInitWithTryCatch) {
+    const header = 'try {';
+    const footer = `\n} catch (err) {\n  console.error('Electron ${outputFilename} script failed to run');\n  console.error(err);\n}`;
+    wrapped = header + wrapped + footer;
+  }
+  return wrapped;
+}
+
+async function buildBundle (opts, cliArgs) {
+  const {
+    target,
+    alwaysHasNode,
+    loadElectronFromAlternateTarget,
+    wrapInitWithProfilingTimeout,
+    wrapInitWithTryCatch
+  } = opts;
+
+  const outputFilename = cliArgs['output-filename'] || `${target}.bundle.js`;
+  const outputPath = cliArgs['output-path'] || path.resolve(electronRoot, 'out');
+  const mode = cliArgs.mode || 'development';
+  const minify = mode === 'production';
+  const printGraph = !!cliArgs['print-graph'];
+
+  let entry = path.resolve(electronRoot, 'lib', target, 'init.ts');
+  if (!fs.existsSync(entry)) {
+    entry = path.resolve(electronRoot, 'lib', target, 'init.js');
+  }
+
+  const electronAPIFile = path.resolve(
+    electronRoot,
+    'lib',
+    loadElectronFromAlternateTarget || target,
+    'api',
+    'exports',
+    'electron.ts'
+  );
+
+  const buildflags = parseBuildflags(cliArgs.buildflags);
+
+  // Shims that stand in for webpack ProvidePlugin. Each target gets the
+  // minimum set of globals it needs; the capture files mirror the originals
+  // under lib/common so the behavior (grab globals before user code can
+  // delete them) is preserved exactly.
+  const inject = [];
+  if (opts.targetDeletesNodeGlobals) {
+    inject.push(path.resolve(__dirname, 'shims', 'node-globals-shim.js'));
+  }
+  if (!alwaysHasNode) {
+    inject.push(path.resolve(__dirname, 'shims', 'browser-globals-shim.js'));
+  }
+  inject.push(path.resolve(__dirname, 'shims', 'promise-shim.js'));
+
+  const result = await esbuild.build({
+    entryPoints: [entry],
+    bundle: true,
+    format: 'iife',
+    platform: alwaysHasNode ? 'node' : 'browser',
+    target: 'es2022',
+    minify,
+    // Preserve class/function names in both development and production so
+    // gin_helper-surfaced constructor names and stack traces stay readable.
+    // (Under webpack this only mattered when terser ran in is_official_build;
+    // esbuild applies the same rename pressure in dev too, so keep it on
+    // unconditionally for consistency.)
+    keepNames: true,
+    sourcemap: false,
+    logLevel: 'warning',
+    metafile: true,
+    write: false,
+    resolveExtensions: ['.ts', '.js'],
+    alias: buildAliases(electronAPIFile, { aliasTimers: !alwaysHasNode }),
+    inject,
+    define: {
+      __non_webpack_require__: 'require'
+    },
+    // Node internal modules we pull through __non_webpack_require__ at runtime.
+    // These must not be bundled — esbuild should leave the literal require()
+    // call alone so the outer Node scope resolves them.
+    external: [
+      'internal/modules/helpers',
+      'internal/modules/run_main',
+      'internal/fs/utils',
+      'internal/util',
+      'internal/validators',
+      'internal/url'
+    ],
+    plugins: [
+      internalAliasPlugin(),
+      buildflagPlugin(buildflags, { allowUnknown: printGraph })
+    ]
+  });
+
+  if (printGraph) {
+    const inputs = Object.keys(result.metafile.inputs)
+      .filter((p) => !p.includes('node_modules') && !p.startsWith('..'))
+      .map((p) => path.relative(electronRoot, path.resolve(electronRoot, p)));
+    process.stdout.write(JSON.stringify(inputs) + '\n');
+    return;
+  }
+
+  if (result.outputFiles.length !== 1) {
+    throw new Error(`Expected exactly one output file, got ${result.outputFiles.length}`);
+  }
+
+  const wrapped = applyWrappers(
+    result.outputFiles[0].text,
+    { wrapInitWithProfilingTimeout, wrapInitWithTryCatch },
+    outputFilename
+  );
+
+  await fs.promises.mkdir(outputPath, { recursive: true });
+  await fs.promises.writeFile(path.join(outputPath, outputFilename), wrapped);
+}
+
+async function main () {
+  const cliArgs = parseArgs(process.argv.slice(2));
+  if (!cliArgs.config) {
+    console.error('Usage: bundle.js --config <path> [--output-filename X] [--output-path Y] [--mode development|production] [--buildflags path/to/buildflags.h] [--print-graph]');
+    process.exit(1);
+  }
+  const configPath = path.resolve(cliArgs.config);
+  const opts = require(configPath);
+  await buildBundle(opts, cliArgs);
+}
+
+main().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});
--- a/build/esbuild/configs/browser.js
+++ b/build/esbuild/configs/browser.js
@@ -0,0 +1,4 @@
+module.exports = {
+  target: 'browser',
+  alwaysHasNode: true
+};
--- a/build/webpack/webpack.config.isolated_renderer.js
+++ b/build/webpack/webpack.config.isolated_renderer.js
@@ -1,5 +1,5 @@
-module.exports = require('./webpack.config.base')({
+module.exports = {
  target: 'isolated_renderer',
  alwaysHasNode: false,
  wrapInitWithTryCatch: true
-});
+};
--- a/build/esbuild/configs/node.js
+++ b/build/esbuild/configs/node.js
@@ -0,0 +1,4 @@
+module.exports = {
+  target: 'node',
+  alwaysHasNode: true
+};
--- a/build/webpack/webpack.config.preload_realm.js
+++ b/build/webpack/webpack.config.preload_realm.js
@@ -1,6 +1,6 @@
-module.exports = require('./webpack.config.base')({
+module.exports = {
  target: 'preload_realm',
  alwaysHasNode: false,
  wrapInitWithProfilingTimeout: true,
  wrapInitWithTryCatch: true
-});
+};
--- a/build/webpack/webpack.config.renderer.js
+++ b/build/webpack/webpack.config.renderer.js
@@ -1,7 +1,7 @@
-module.exports = require('./webpack.config.base')({
+module.exports = {
  target: 'renderer',
  alwaysHasNode: true,
  targetDeletesNodeGlobals: true,
  wrapInitWithProfilingTimeout: true,
  wrapInitWithTryCatch: true
-});
+};
--- a/build/webpack/webpack.config.sandboxed_renderer.js
+++ b/build/webpack/webpack.config.sandboxed_renderer.js
@@ -1,6 +1,6 @@
-module.exports = require('./webpack.config.base')({
+module.exports = {
  target: 'sandboxed_renderer',
  alwaysHasNode: false,
  wrapInitWithProfilingTimeout: true,
  wrapInitWithTryCatch: true
-});
+};
--- a/build/esbuild/configs/utility.js
+++ b/build/esbuild/configs/utility.js
@@ -0,0 +1,4 @@
+module.exports = {
+  target: 'utility',
+  alwaysHasNode: true
+};
--- a/build/webpack/webpack.config.worker.js
+++ b/build/webpack/webpack.config.worker.js
@@ -1,7 +1,7 @@
-module.exports = require('./webpack.config.base')({
+module.exports = {
  target: 'worker',
  loadElectronFromAlternateTarget: 'renderer',
  alwaysHasNode: true,
  targetDeletesNodeGlobals: true,
  wrapInitWithTryCatch: true
-});
+};
--- a/build/esbuild/esbuild.gni
+++ b/build/esbuild/esbuild.gni
@@ -1,9 +1,9 @@
 import("../npm.gni")

-template("webpack_build") {
-  assert(defined(invoker.config_file), "Need webpack config file to run")
+template("esbuild_build") {
+  assert(defined(invoker.config_file), "Need esbuild config file to run")
  assert(defined(invoker.out_file), "Need output file to run")
-  assert(defined(invoker.inputs), "Need webpack inputs to run")
+  assert(defined(invoker.inputs), "Need esbuild inputs to run")

  npm_action(target_name) {
    forward_variables_from(invoker,
@@ -11,11 +11,14 @@ template("webpack_build") {
                             "deps",
                             "public_deps",
                           ])
-    script = "webpack"
+    script = "bundle"

    inputs = [
               invoker.config_file,
-               "//electron/build/webpack/webpack.config.base.js",
+               "//electron/build/esbuild/bundle.js",
+               "//electron/build/esbuild/shims/node-globals-shim.js",
+               "//electron/build/esbuild/shims/browser-globals-shim.js",
+               "//electron/build/esbuild/shims/promise-shim.js",
               "//electron/tsconfig.json",
               "//electron/yarn.lock",
               "//electron/typings/internal-ambient.d.ts",
@@ -34,10 +37,10 @@ template("webpack_build") {
      get_path_info(invoker.out_file, "file"),
      "--output-path",
      rebase_path(get_path_info(invoker.out_file, "dir")),
-      "--env",
-      "buildflags=" + rebase_path("$target_gen_dir/buildflags/buildflags.h"),
-      "--env",
-      "mode=" + mode,
+      "--buildflags",
+      rebase_path("$target_gen_dir/buildflags/buildflags.h"),
+      "--mode",
+      mode,
    ]
    deps += [ "//electron/buildflags" ]

--- a/build/esbuild/shims/browser-globals-shim.js
+++ b/build/esbuild/shims/browser-globals-shim.js
@@ -0,0 +1,18 @@
+// Injected into browser-platform bundles (sandboxed_renderer, isolated_renderer,
+// preload_realm) where Node globals are not implicitly available. Supplies
+// `Buffer`, `process`, and `global` — replacing webpack's ProvidePlugin
+// polyfill injection plus webpack 5's built-in `global -> globalThis` rewrite
+// that `target: 'web'` performed automatically.
+//
+// The `buffer` and `process/browser` imports below intentionally use the
+// npm polyfill packages, not Node's built-in `node:buffer` / `node:process`
+// modules, because these shims ship into browser-platform bundles that do
+// not have Node globals available at runtime.
+
+/* eslint-disable import/order, import/enforce-node-protocol-usage */
+import { Buffer as _Buffer } from 'buffer';
+import _process from 'process/browser';
+
+const _global = globalThis;
+
+export { _Buffer as Buffer, _process as process, _global as global };
--- a/build/esbuild/shims/node-globals-shim.js
+++ b/build/esbuild/shims/node-globals-shim.js
@@ -0,0 +1,14 @@
+// Injected into renderer/worker bundles to replace webpack's ProvidePlugin
+// that captured `Buffer`, `global`, and `process` before user code could
+// delete them from the global scope. The Module.wrapper override in
+// lib/renderer/init.ts re-injects these into user preload scripts later.
+
+// Rip globals off of globalThis/self/window so they are captured in this
+// module's closure and retained even if the caller later deletes them.
+const _global = typeof globalThis !== 'undefined'
+  ? globalThis.global
+  : (self || window).global;
+const _process = _global.process;
+const _Buffer = _global.Buffer;
+
+export { _global as global, _process as process, _Buffer as Buffer };
--- a/build/esbuild/shims/promise-shim.js
+++ b/build/esbuild/shims/promise-shim.js
@@ -0,0 +1,7 @@
+// Captures the original `Promise` constructor so that userland mutations of
+// `global.Promise.resolve` do not affect Electron's internal code. Mirrors
+// webpack's ProvidePlugin reference to lib/common/webpack-globals-provider.
+
+const _Promise = globalThis.Promise;
+
+export { _Promise as Promise };
--- a/build/tsc.gni
+++ b/build/tsc.gni
@@ -1,5 +1,42 @@
 import("npm.gni")

+# Runs `tsgo --noEmit` over a tsconfig via the `tsc-check` npm script (which
+# wraps script/typecheck.js) and writes a stamp on success. Use this to gate
+# downstream targets on a successful typecheck without emitting JS.
+template("typescript_check") {
+  assert(defined(invoker.tsconfig), "Need tsconfig name to run")
+  assert(defined(invoker.sources), "Need tsc sources to run")
+
+  npm_action(target_name) {
+    forward_variables_from(invoker,
+                           [
+                             "deps",
+                             "public_deps",
+                           ])
+    script = "tsc-check"
+
+    sources = invoker.sources
+    inputs = [
+      invoker.tsconfig,
+      "//electron/tsconfig.json",
+      "//electron/yarn.lock",
+      "//electron/script/typecheck.js",
+      "//electron/typings/internal-ambient.d.ts",
+      "//electron/typings/internal-electron.d.ts",
+    ]
+
+    stamp_file = "$target_gen_dir/$target_name.stamp"
+    outputs = [ stamp_file ]
+
+    args = [
+      "--tsconfig",
+      rebase_path(invoker.tsconfig),
+      "--stamp",
+      rebase_path(stamp_file),
+    ]
+  }
+}
+
 template("typescript_build") {
  assert(defined(invoker.tsconfig), "Need tsconfig name to run")
  assert(defined(invoker.sources), "Need tsc sources to run")
--- a/build/webpack/webpack.config.base.js
+++ b/build/webpack/webpack.config.base.js
@@ -1,172 +0,0 @@
-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 electronRoot = path.resolve(__dirname, '../..');
-
-class AccessDependenciesPlugin {
-  apply (compiler) {
-    compiler.hooks.compilation.tap('AccessDependenciesPlugin', compilation => {
-      compilation.hooks.finishModules.tap('AccessDependenciesPlugin', modules => {
-        const filePaths = modules.map(m => m.resource).filter(p => p).map(p => path.relative(electronRoot, p));
-        console.info(JSON.stringify(filePaths));
-      });
-    });
-  }
-}
-
-module.exports = ({
-  alwaysHasNode,
-  loadElectronFromAlternateTarget,
-  targetDeletesNodeGlobals,
-  target,
-  wrapInitWithProfilingTimeout,
-  wrapInitWithTryCatch
-}) => {
-  let entry = path.resolve(electronRoot, 'lib', target, 'init.ts');
-  if (!fs.existsSync(entry)) {
-    entry = path.resolve(electronRoot, 'lib', target, 'init.js');
-  }
-
-  const electronAPIFile = path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.ts');
-
-  return (env = {}, argv = {}) => {
-    const onlyPrintingGraph = !!env.PRINT_WEBPACK_GRAPH;
-    const outputFilename = argv['output-filename'] || `${target}.bundle.js`;
-
-    const defines = {
-      BUILDFLAG: onlyPrintingGraph ? '(a => a)' : ''
-    };
-
-    if (env.buildflags) {
-      const flagFile = fs.readFileSync(env.buildflags, 'utf8');
-      for (const line of flagFile.split(/(\r\n|\r|\n)/g)) {
-        const flagMatch = line.match(/#define BUILDFLAG_INTERNAL_(.+?)\(\) \(([01])\)/);
-        if (flagMatch) {
-          const [, flagName, flagValue] = flagMatch;
-          defines[flagName] = JSON.stringify(Boolean(parseInt(flagValue, 10)));
-        }
-      }
-    }
-
-    const ignoredModules = [];
-
-    const plugins = [];
-
-    if (onlyPrintingGraph) {
-      plugins.push(new AccessDependenciesPlugin());
-    }
-
-    if (targetDeletesNodeGlobals) {
-      plugins.push(new webpack.ProvidePlugin({
-        Buffer: ['@electron/internal/common/webpack-provider', 'Buffer'],
-        global: ['@electron/internal/common/webpack-provider', '_global'],
-        process: ['@electron/internal/common/webpack-provider', 'process']
-      }));
-    }
-
-    // Webpack 5 no longer polyfills process or Buffer.
-    if (!alwaysHasNode) {
-      plugins.push(new webpack.ProvidePlugin({
-        Buffer: ['buffer', 'Buffer'],
-        process: 'process/browser'
-      }));
-    }
-
-    plugins.push(new webpack.ProvidePlugin({
-      Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise']
-    }));
-
-    plugins.push(new webpack.DefinePlugin(defines));
-
-    if (wrapInitWithProfilingTimeout) {
-      plugins.push(new WrapperPlugin({
-        header: 'function ___electron_webpack_init__() {',
-        footer: `
-};
-if ((globalThis.process || binding.process).argv.includes("--profile-electron-init")) {
-  setTimeout(___electron_webpack_init__, 0);
-} else {
-  ___electron_webpack_init__();
-}`
-      }));
-    }
-
-    if (wrapInitWithTryCatch) {
-      plugins.push(new WrapperPlugin({
-        header: 'try {',
-        footer: `
-} catch (err) {
-  console.error('Electron ${outputFilename} script failed to run');
-  console.error(err);
-}`
-      }));
-    }
-
-    return {
-      mode: 'development',
-      devtool: false,
-      entry,
-      target: alwaysHasNode ? 'node' : 'web',
-      output: {
-        filename: outputFilename
-      },
-      resolve: {
-        alias: {
-          '@electron/internal': path.resolve(electronRoot, 'lib'),
-          electron$: electronAPIFile,
-          'electron/main$': electronAPIFile,
-          'electron/renderer$': electronAPIFile,
-          'electron/common$': electronAPIFile,
-          'electron/utility$': electronAPIFile,
-          // Force timers to resolve to our own shim that doesn't use window.postMessage
-          timers: path.resolve(electronRoot, 'lib', 'common', 'timers-shim.ts')
-        },
-        extensions: ['.ts', '.js'],
-        fallback: {
-          // We provide our own "timers" import above, any usage of setImmediate inside
-          // one of our renderer bundles should import it from the 'timers' package
-          setImmediate: false
-        }
-      },
-      module: {
-        rules: [{
-          test: (moduleName) => !onlyPrintingGraph && ignoredModules.includes(moduleName),
-          loader: 'null-loader'
-        }, {
-          test: /\.ts$/,
-          loader: 'ts-loader',
-          options: {
-            configFile: path.resolve(electronRoot, 'tsconfig.electron.json'),
-            transpileOnly: onlyPrintingGraph,
-            ignoreDiagnostics: [
-              // File '{0}' is not under 'rootDir' '{1}'.
-              6059,
-              // Private field '{0}' must be declared in an enclosing class.
-              1111
-            ]
-          }
-        }]
-      },
-      node: {
-        __dirname: false,
-        __filename: false
-      },
-      optimization: {
-        minimize: env.mode === 'production',
-        minimizer: [
-          new TerserPlugin({
-            terserOptions: {
-              keep_classnames: true,
-              keep_fnames: true
-            }
-          })
-        ]
-      },
-      plugins
-    };
-  };
-};
--- a/build/webpack/webpack.config.browser.js
+++ b/build/webpack/webpack.config.browser.js
@@ -1,4 +0,0 @@
-module.exports = require('./webpack.config.base')({
-  target: 'browser',
-  alwaysHasNode: true
-});
--- a/build/webpack/webpack.config.node.js
+++ b/build/webpack/webpack.config.node.js
@@ -1,4 +0,0 @@
-module.exports = require('./webpack.config.base')({
-  target: 'node',
-  alwaysHasNode: true
-});
--- a/build/webpack/webpack.config.utility.js
+++ b/build/webpack/webpack.config.utility.js
@@ -1,4 +0,0 @@
-module.exports = require('./webpack.config.base')({
-  target: 'utility',
-  alwaysHasNode: true
-});
--- a/chromium_src/BUILD.gn
+++ b/chromium_src/BUILD.gn
@@ -144,8 +144,6 @@ static_library("chrome") {
    "//chrome/browser/ui/views/overlay/toggle_camera_button.h",
    "//chrome/browser/ui/views/overlay/toggle_microphone_button.cc",
    "//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
-    "//chrome/browser/ui/views/overlay/toggle_mute_button.cc",
-    "//chrome/browser/ui/views/overlay/toggle_mute_button.h",
    "//chrome/browser/ui/views/overlay/video_overlay_window_views.cc",
    "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
    "//chrome/browser/ui/views/picture_in_picture/picture_in_picture_bounds_change_animation.cc",
--- a/default_app/.eslintrc.json
+++ b/default_app/.eslintrc.json
@@ -0,0 +1,8 @@
+{
+  "plugins": [
+    "import"
+  ],
+  "rules": {
+    "import/enforce-node-protocol-usage": ["error", "always"]
+  }
+}
--- a/default_app/default_app.ts
+++ b/default_app/default_app.ts
@@ -1,5 +1,5 @@
 import { shell } from 'electron/common';
-import { app, dialog, BrowserWindow, ipcMain, Menu } from 'electron/main';
+import { app, dialog, BrowserWindow, ipcMain } from 'electron/main';

 import * as path from 'node:path';
 import * as url from 'node:url';
@@ -11,53 +11,6 @@ app.on('window-all-closed', () => {
  app.quit();
 });

-const isMac = process.platform === 'darwin';
-
-app.whenReady().then(() => {
-  const helpMenu: Electron.MenuItemConstructorOptions = {
-    role: 'help',
-    submenu: [
-      {
-        label: 'Learn More',
-        click: async () => {
-          await shell.openExternal('https://electronjs.org');
-        }
-      },
-      {
-        label: 'Documentation',
-        click: async () => {
-          const version = process.versions.electron;
-          await shell.openExternal(`https://github.com/electron/electron/tree/v${version}/docs#readme`);
-        }
-      },
-      {
-        label: 'Community Discussions',
-        click: async () => {
-          await shell.openExternal('https://discord.gg/electronjs');
-        }
-      },
-      {
-        label: 'Search Issues',
-        click: async () => {
-          await shell.openExternal('https://github.com/electron/electron/issues');
-        }
-      }
-    ]
-  };
-
-  const macAppMenu: Electron.MenuItemConstructorOptions = { role: 'appMenu' };
-  const template: Electron.MenuItemConstructorOptions[] = [
-    ...(isMac ? [macAppMenu] : []),
-    { role: 'fileMenu' },
-    { role: 'editMenu' },
-    { role: 'viewMenu' },
-    { role: 'windowMenu' },
-    helpMenu
-  ];
-
-  Menu.setApplicationMenu(Menu.buildFromTemplate(template));
-});
-
 function decorateURL (url: string) {
  // safely add `?utm_source=default_app
  const parsedUrl = new URL(url);
--- a/docs/.eslintrc.json
+++ b/docs/.eslintrc.json
@@ -0,0 +1,35 @@
+{
+  "extends": "standard",
+  "plugins": [
+    "import",
+    "markdown"
+  ],
+  "overrides": [
+    {
+      "files": ["*.md", "**/*.md"],
+      "processor": "markdown/markdown"
+    }
+  ],
+  "rules": {
+    "@typescript-eslint/no-unused-vars": "off",
+    "import/order": ["error", {
+      "alphabetize": {
+        "order": "asc"
+      },
+      "newlines-between": "always",
+      "pathGroups": [
+        {
+          "pattern": "{electron,electron/**}",
+          "group": "builtin",
+          "position": "before"
+        }
+      ],
+      "pathGroupsExcludedImportTypes": []
+    }],
+    "n/no-callback-literal": "off",
+    "no-undef": "off",
+    "no-unused-expressions": "off",
+    "no-unused-vars": "off",
+    "import/enforce-node-protocol-usage": ["error", "always"]
+  }
+}
--- a/docs/api/global-shortcut.md
+++ b/docs/api/global-shortcut.md
@@ -148,34 +148,3 @@ added:
 -->

 Unregisters all of the global shortcuts.
-
-### `globalShortcut.setSuspended(suspended)`
-
-<!--
-```YAML history
-added:
-  - pr-url: https://github.com/electron/electron/pull/50425
-```
-->
-
-* `suspended` boolean - Whether global shortcut handling should be suspended.
-
-Suspends or resumes global shortcut handling. When suspended, all registered
-global shortcuts will stop listening for key presses. When resumed, all
-previously registered shortcuts will begin listening again. New shortcut
-registrations will fail while handling is suspended.
-
-This can be useful when you want to temporarily allow the user to press key
-combinations without your application intercepting them, for example while
-displaying a UI to rebind shortcuts.
-
-### `globalShortcut.isSuspended()`
-
-<!--
-```YAML history
-added:
-  - pr-url: https://github.com/electron/electron/pull/50425
-```
-->
-
-Returns `boolean` - Whether global shortcut handling is currently suspended.
--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -44,8 +44,8 @@ See [`Menu`](menu.md) for examples.
    menu items.
  * `registerAccelerator` boolean (optional) _Linux_ _Windows_ - If false, the accelerator won't be registered
    with the system, but it will still be displayed. Defaults to true.
-  * `sharingItem` [SharingItem](structures/sharing-item.md) (optional) _macOS_ - The item to share when the `role` is `shareMenu`.
-  * `submenu` ([MenuItemConstructorOptions](#new-menuitemoptions)[] | [Menu](menu.md)) (optional) - Should be specified
+  * `sharingItem` SharingItem (optional) _macOS_ - The item to share when the `role` is `shareMenu`.
+  * `submenu` (MenuItemConstructorOptions[] | [Menu](menu.md)) (optional) - Should be specified
    for `submenu` type menu items. If `submenu` is specified, the `type: 'submenu'` can be omitted.
    If the value is not a [`Menu`](menu.md) then it will be automatically converted to one using
    `Menu.buildFromTemplate`.
@@ -89,7 +89,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](base-window.md)
+* `focusedWindow` [BaseWindow](browser-window.md)
 * `focusedWebContents` [WebContents](web-contents.md)

 #### `menuItem.submenu`
@@ -110,11 +110,11 @@ A `string` (optional) indicating the item's role, if set. Can be `undo`, `redo`,

 #### `menuItem.accelerator`

-An [`Accelerator | null`](../tutorial/keyboard-shortcuts.md#accelerators) indicating the item's accelerator, if set.
+An `Accelerator | null` indicating the item's accelerator, if set.

 #### `menuItem.userAccelerator` _Readonly_ _macOS_

-An [`Accelerator | null`](../tutorial/keyboard-shortcuts.md#accelerators) indicating the item's [user-assigned accelerator](https://developer.apple.com/documentation/appkit/nsmenuitem/1514850-userkeyequivalent?language=objc) for the menu item.
+An `Accelerator | null` indicating the item's [user-assigned accelerator](https://developer.apple.com/documentation/appkit/nsmenuitem/1514850-userkeyequivalent?language=objc) for the menu item.

 > [!NOTE]
 > This property is only initialized after the `MenuItem` has been added to a `Menu`. Either via `Menu.buildFromTemplate` or via `Menu.append()/insert()`.  Accessing before initialization will just return `null`.
@@ -170,7 +170,7 @@ This property can be dynamically changed.

 #### `menuItem.sharingItem` _macOS_

-A [`SharingItem`](structures/sharing-item.md) indicating the item to share when the `role` is `shareMenu`.
+A `SharingItem` indicating the item to share when the `role` is `shareMenu`.

 This property can be dynamically changed.

--- a/docs/api/menu.md
+++ b/docs/api/menu.md
@@ -46,7 +46,7 @@ this has the additional effect of removing the menu bar from the window.

 > [!NOTE]
 > The default menu will be created automatically if the app does not set one.
-> It contains standard items such as `File`, `Edit`, `View`, and `Window`.
+> It contains standard items such as `File`, `Edit`, `View`, `Window` and `Help`.

 #### `Menu.getApplicationMenu()`

@@ -70,7 +70,7 @@ for more information on macOS' native actions.

 #### `Menu.buildFromTemplate(template)`

- `template` ([MenuItemConstructorOptions](menu-item.md#new-menuitemoptions) | [MenuItem](menu-item.md))[]
+- `template` (MenuItemConstructorOptions | [MenuItem](menu-item.md))[]

 Returns [`Menu`](menu.md)

@@ -162,7 +162,7 @@ Emitted when a popup is closed either manually or with `menu.closePopup()`.

 #### `menu.items`

-A [`MenuItem[]`](menu-item.md) array containing the menu's items.
+A `MenuItem[]` array containing the menu's items.

 Each `Menu` consists of multiple [`MenuItem`](menu-item.md) instances and each `MenuItem`
 can nest a `Menu` into its `submenu` property.
--- a/docs/development/coding-style.md
+++ b/docs/development/coding-style.md
@@ -3,7 +3,7 @@
 These are the style guidelines for coding in Electron.

 You can run `npm run lint` to show any style issues detected by `cpplint` and
-`oxlint`.
+`eslint`.

 ## General Code

--- a/docs/development/patches.md
+++ b/docs/development/patches.md
@@ -79,7 +79,7 @@ $ ../../electron/script/git-import-patches ../../electron/patches/node
 $ ../../electron/script/git-export-patches -o ../../electron/patches/node
 ```

-Note that `git-import-patches` will mark the commit that was `HEAD` when it was run as `refs/patches/upstream-head` (and a checkout-specific `refs/patches/upstream-head-<hash>` so that gclient worktrees sharing a `.git/refs` directory don't clobber each other). This lets you keep track of which commits are from Electron patches (those that come after `refs/patches/upstream-head`) and which commits are in upstream (those before `refs/patches/upstream-head`).
+Note that `git-import-patches` will mark the commit that was `HEAD` when it was run as `refs/patches/upstream-head`. This lets you keep track of which commits are from Electron patches (those that come after `refs/patches/upstream-head`) and which commits are in upstream (those before `refs/patches/upstream-head`).

 #### Resolving conflicts

--- a/filenames.auto.gni
+++ b/filenames.auto.gni
@@ -174,62 +174,10 @@ auto_filenames = {
    "docs/api/structures/window-session-end-event.md",
  ]

-  sandbox_bundle_deps = [
-    "lib/common/api/native-image.ts",
-    "lib/common/define-properties.ts",
-    "lib/common/deprecate.ts",
-    "lib/common/ipc-messages.ts",
-    "lib/common/timers-shim.ts",
-    "lib/common/web-view-methods.ts",
-    "lib/common/webpack-globals-provider.ts",
-    "lib/renderer/api/context-bridge.ts",
-    "lib/renderer/api/crash-reporter.ts",
-    "lib/renderer/api/ipc-renderer.ts",
-    "lib/renderer/api/shared-texture.ts",
-    "lib/renderer/api/web-frame.ts",
-    "lib/renderer/api/web-utils.ts",
-    "lib/renderer/common-init.ts",
-    "lib/renderer/inspector.ts",
-    "lib/renderer/ipc-native-setup.ts",
-    "lib/renderer/ipc-renderer-bindings.ts",
-    "lib/renderer/ipc-renderer-internal-utils.ts",
-    "lib/renderer/ipc-renderer-internal.ts",
-    "lib/renderer/security-warnings.ts",
-    "lib/renderer/web-frame-init.ts",
-    "lib/renderer/web-view/guest-view-internal.ts",
-    "lib/renderer/web-view/web-view-attributes.ts",
-    "lib/renderer/web-view/web-view-constants.ts",
-    "lib/renderer/web-view/web-view-element.ts",
-    "lib/renderer/web-view/web-view-impl.ts",
-    "lib/renderer/web-view/web-view-init.ts",
-    "lib/renderer/window-setup.ts",
-    "lib/sandboxed_renderer/api/exports/electron.ts",
-    "lib/sandboxed_renderer/api/module-list.ts",
-    "lib/sandboxed_renderer/init.ts",
-    "lib/sandboxed_renderer/pre-init.ts",
-    "lib/sandboxed_renderer/preload.ts",
-    "package.json",
-    "tsconfig.electron.json",
-    "tsconfig.json",
-    "typings/internal-ambient.d.ts",
-    "typings/internal-electron.d.ts",
-  ]
-
-  isolated_bundle_deps = [
-    "lib/common/web-view-methods.ts",
-    "lib/isolated_renderer/init.ts",
-    "lib/renderer/web-view/web-view-attributes.ts",
-    "lib/renderer/web-view/web-view-constants.ts",
-    "lib/renderer/web-view/web-view-element.ts",
-    "lib/renderer/web-view/web-view-impl.ts",
-    "package.json",
-    "tsconfig.electron.json",
-    "tsconfig.json",
-    "typings/internal-ambient.d.ts",
-    "typings/internal-electron.d.ts",
-  ]
-
-  browser_bundle_deps = [
+  typecheck_sources = [
+    "build/esbuild/shims/browser-globals-shim.js",
+    "build/esbuild/shims/node-globals-shim.js",
+    "build/esbuild/shims/promise-shim.js",
    "lib/browser/api/app.ts",
    "lib/browser/api/auto-updater.ts",
    "lib/browser/api/auto-updater/auto-updater-msix.ts",
@@ -300,8 +248,189 @@ auto_filenames = {
    "lib/common/deprecate.ts",
    "lib/common/init.ts",
    "lib/common/ipc-messages.ts",
+    "lib/common/timers-shim.ts",
+    "lib/common/web-view-methods.ts",
+    "lib/isolated_renderer/init.ts",
+    "lib/node/asar-fs-wrapper.ts",
+    "lib/node/init.ts",
+    "lib/preload_realm/api/exports/electron.ts",
+    "lib/preload_realm/api/module-list.ts",
+    "lib/preload_realm/init.ts",
+    "lib/renderer/api/clipboard.ts",
+    "lib/renderer/api/context-bridge.ts",
+    "lib/renderer/api/crash-reporter.ts",
+    "lib/renderer/api/exports/electron.ts",
+    "lib/renderer/api/ipc-renderer.ts",
+    "lib/renderer/api/module-list.ts",
+    "lib/renderer/api/shared-texture.ts",
+    "lib/renderer/api/web-frame.ts",
+    "lib/renderer/api/web-utils.ts",
+    "lib/renderer/common-init.ts",
+    "lib/renderer/init.ts",
+    "lib/renderer/inspector.ts",
+    "lib/renderer/ipc-native-setup.ts",
+    "lib/renderer/ipc-renderer-bindings.ts",
+    "lib/renderer/ipc-renderer-internal-utils.ts",
+    "lib/renderer/ipc-renderer-internal.ts",
+    "lib/renderer/security-warnings.ts",
+    "lib/renderer/web-frame-init.ts",
+    "lib/renderer/web-view/guest-view-internal.ts",
+    "lib/renderer/web-view/web-view-attributes.ts",
+    "lib/renderer/web-view/web-view-constants.ts",
+    "lib/renderer/web-view/web-view-element.ts",
+    "lib/renderer/web-view/web-view-impl.ts",
+    "lib/renderer/web-view/web-view-init.ts",
+    "lib/renderer/window-setup.ts",
+    "lib/sandboxed_renderer/api/exports/electron.ts",
+    "lib/sandboxed_renderer/api/module-list.ts",
+    "lib/sandboxed_renderer/init.ts",
+    "lib/sandboxed_renderer/pre-init.ts",
+    "lib/sandboxed_renderer/preload.ts",
+    "lib/utility/api/exports/electron.ts",
+    "lib/utility/api/module-list.ts",
+    "lib/utility/api/net.ts",
+    "lib/utility/init.ts",
+    "lib/utility/parent-port.ts",
+    "lib/worker/init.ts",
+    "package.json",
+    "tsconfig.electron.json",
+    "tsconfig.json",
+    "typings/internal-ambient.d.ts",
+    "typings/internal-electron.d.ts",
+  ]
+
+  sandbox_bundle_deps = [
+    "build/esbuild/shims/browser-globals-shim.js",
+    "build/esbuild/shims/promise-shim.js",
+    "lib/common/api/native-image.ts",
+    "lib/common/define-properties.ts",
+    "lib/common/deprecate.ts",
+    "lib/common/ipc-messages.ts",
+    "lib/common/timers-shim.ts",
+    "lib/common/web-view-methods.ts",
+    "lib/renderer/api/context-bridge.ts",
+    "lib/renderer/api/crash-reporter.ts",
+    "lib/renderer/api/ipc-renderer.ts",
+    "lib/renderer/api/shared-texture.ts",
+    "lib/renderer/api/web-frame.ts",
+    "lib/renderer/api/web-utils.ts",
+    "lib/renderer/common-init.ts",
+    "lib/renderer/inspector.ts",
+    "lib/renderer/ipc-native-setup.ts",
+    "lib/renderer/ipc-renderer-bindings.ts",
+    "lib/renderer/ipc-renderer-internal-utils.ts",
+    "lib/renderer/ipc-renderer-internal.ts",
+    "lib/renderer/security-warnings.ts",
+    "lib/renderer/web-frame-init.ts",
+    "lib/renderer/web-view/guest-view-internal.ts",
+    "lib/renderer/web-view/web-view-attributes.ts",
+    "lib/renderer/web-view/web-view-constants.ts",
+    "lib/renderer/web-view/web-view-element.ts",
+    "lib/renderer/web-view/web-view-impl.ts",
+    "lib/renderer/web-view/web-view-init.ts",
+    "lib/renderer/window-setup.ts",
+    "lib/sandboxed_renderer/api/exports/electron.ts",
+    "lib/sandboxed_renderer/api/module-list.ts",
+    "lib/sandboxed_renderer/init.ts",
+    "lib/sandboxed_renderer/pre-init.ts",
+    "lib/sandboxed_renderer/preload.ts",
+    "package.json",
+    "tsconfig.electron.json",
+    "tsconfig.json",
+    "typings/internal-ambient.d.ts",
+    "typings/internal-electron.d.ts",
+  ]
+
+  isolated_bundle_deps = [
+    "build/esbuild/shims/browser-globals-shim.js",
+    "build/esbuild/shims/promise-shim.js",
+    "lib/common/web-view-methods.ts",
+    "lib/isolated_renderer/init.ts",
+    "lib/renderer/web-view/web-view-attributes.ts",
+    "lib/renderer/web-view/web-view-constants.ts",
+    "lib/renderer/web-view/web-view-element.ts",
+    "lib/renderer/web-view/web-view-impl.ts",
+    "package.json",
+    "tsconfig.electron.json",
+    "tsconfig.json",
+    "typings/internal-ambient.d.ts",
+    "typings/internal-electron.d.ts",
+  ]
+
+  browser_bundle_deps = [
+    "build/esbuild/shims/promise-shim.js",
+    "lib/browser/api/app.ts",
+    "lib/browser/api/auto-updater.ts",
+    "lib/browser/api/auto-updater/auto-updater-msix.ts",
+    "lib/browser/api/auto-updater/auto-updater-native.ts",
+    "lib/browser/api/auto-updater/auto-updater-win.ts",
+    "lib/browser/api/auto-updater/msix-update-win.ts",
+    "lib/browser/api/auto-updater/squirrel-update-win.ts",
+    "lib/browser/api/base-window.ts",
+    "lib/browser/api/browser-view.ts",
+    "lib/browser/api/browser-window.ts",
+    "lib/browser/api/clipboard.ts",
+    "lib/browser/api/content-tracing.ts",
+    "lib/browser/api/crash-reporter.ts",
+    "lib/browser/api/desktop-capturer.ts",
+    "lib/browser/api/dialog.ts",
+    "lib/browser/api/exports/electron.ts",
+    "lib/browser/api/global-shortcut.ts",
+    "lib/browser/api/in-app-purchase.ts",
+    "lib/browser/api/ipc-main.ts",
+    "lib/browser/api/menu-item-roles.ts",
+    "lib/browser/api/menu-item.ts",
+    "lib/browser/api/menu-utils.ts",
+    "lib/browser/api/menu.ts",
+    "lib/browser/api/message-channel.ts",
+    "lib/browser/api/module-list.ts",
+    "lib/browser/api/native-theme.ts",
+    "lib/browser/api/net-fetch.ts",
+    "lib/browser/api/net-log.ts",
+    "lib/browser/api/net.ts",
+    "lib/browser/api/notification.ts",
+    "lib/browser/api/power-monitor.ts",
+    "lib/browser/api/power-save-blocker.ts",
+    "lib/browser/api/protocol.ts",
+    "lib/browser/api/push-notifications.ts",
+    "lib/browser/api/safe-storage.ts",
+    "lib/browser/api/screen.ts",
+    "lib/browser/api/service-worker-main.ts",
+    "lib/browser/api/session.ts",
+    "lib/browser/api/share-menu.ts",
+    "lib/browser/api/shared-texture.ts",
+    "lib/browser/api/system-preferences.ts",
+    "lib/browser/api/touch-bar.ts",
+    "lib/browser/api/tray.ts",
+    "lib/browser/api/utility-process.ts",
+    "lib/browser/api/view.ts",
+    "lib/browser/api/views/image-view.ts",
+    "lib/browser/api/web-contents-view.ts",
+    "lib/browser/api/web-contents.ts",
+    "lib/browser/api/web-frame-main.ts",
+    "lib/browser/default-menu.ts",
+    "lib/browser/devtools.ts",
+    "lib/browser/guest-view-manager.ts",
+    "lib/browser/guest-window-manager.ts",
+    "lib/browser/init.ts",
+    "lib/browser/ipc-dispatch.ts",
+    "lib/browser/ipc-main-impl.ts",
+    "lib/browser/ipc-main-internal-utils.ts",
+    "lib/browser/ipc-main-internal.ts",
+    "lib/browser/message-port-main.ts",
+    "lib/browser/parse-features-string.ts",
+    "lib/browser/rpc-server.ts",
+    "lib/browser/web-view-events.ts",
+    "lib/common/api/module-list.ts",
+    "lib/common/api/native-image.ts",
+    "lib/common/api/net-client-request.ts",
+    "lib/common/api/shell.ts",
+    "lib/common/define-properties.ts",
+    "lib/common/deprecate.ts",
+    "lib/common/init.ts",
+    "lib/common/ipc-messages.ts",
+    "lib/common/timers-shim.ts",
    "lib/common/web-view-methods.ts",
-    "lib/common/webpack-globals-provider.ts",
    "package.json",
    "tsconfig.electron.json",
    "tsconfig.json",
@@ -310,6 +439,8 @@ auto_filenames = {
  ]

  renderer_bundle_deps = [
+    "build/esbuild/shims/node-globals-shim.js",
+    "build/esbuild/shims/promise-shim.js",
    "lib/common/api/module-list.ts",
    "lib/common/api/native-image.ts",
    "lib/common/api/shell.ts",
@@ -317,8 +448,8 @@ auto_filenames = {
    "lib/common/deprecate.ts",
    "lib/common/init.ts",
    "lib/common/ipc-messages.ts",
+    "lib/common/timers-shim.ts",
    "lib/common/web-view-methods.ts",
-    "lib/common/webpack-provider.ts",
    "lib/renderer/api/clipboard.ts",
    "lib/renderer/api/context-bridge.ts",
    "lib/renderer/api/crash-reporter.ts",
@@ -352,6 +483,8 @@ auto_filenames = {
  ]

  worker_bundle_deps = [
+    "build/esbuild/shims/node-globals-shim.js",
+    "build/esbuild/shims/promise-shim.js",
    "lib/common/api/module-list.ts",
    "lib/common/api/native-image.ts",
    "lib/common/api/shell.ts",
@@ -359,7 +492,7 @@ auto_filenames = {
    "lib/common/deprecate.ts",
    "lib/common/init.ts",
    "lib/common/ipc-messages.ts",
-    "lib/common/webpack-provider.ts",
+    "lib/common/timers-shim.ts",
    "lib/renderer/api/clipboard.ts",
    "lib/renderer/api/context-bridge.ts",
    "lib/renderer/api/crash-reporter.ts",
@@ -381,6 +514,7 @@ auto_filenames = {
  ]

  node_bundle_deps = [
+    "build/esbuild/shims/promise-shim.js",
    "lib/node/asar-fs-wrapper.ts",
    "lib/node/init.ts",
    "package.json",
@@ -391,6 +525,7 @@ auto_filenames = {
  ]

  utility_bundle_deps = [
+    "build/esbuild/shims/promise-shim.js",
    "lib/browser/api/net-fetch.ts",
    "lib/browser/api/system-preferences.ts",
    "lib/browser/message-port-main.ts",
@@ -398,7 +533,7 @@ auto_filenames = {
    "lib/common/define-properties.ts",
    "lib/common/deprecate.ts",
    "lib/common/init.ts",
-    "lib/common/webpack-globals-provider.ts",
+    "lib/common/timers-shim.ts",
    "lib/utility/api/exports/electron.ts",
    "lib/utility/api/module-list.ts",
    "lib/utility/api/net.ts",
@@ -412,10 +547,11 @@ auto_filenames = {
  ]

  preload_realm_bundle_deps = [
+    "build/esbuild/shims/browser-globals-shim.js",
+    "build/esbuild/shims/promise-shim.js",
    "lib/common/api/native-image.ts",
    "lib/common/define-properties.ts",
    "lib/common/ipc-messages.ts",
-    "lib/common/webpack-globals-provider.ts",
    "lib/preload_realm/api/exports/electron.ts",
    "lib/preload_realm/api/module-list.ts",
    "lib/preload_realm/init.ts",
--- a/lib/browser/.eslintrc.json
+++ b/lib/browser/.eslintrc.json
@@ -0,0 +1,21 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/renderer"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/isolated_renderer/*",
+          "@electron/internal/renderer/*",
+          "@electron/internal/sandboxed_worker/*",
+          "@electron/internal/worker/*"
+        ]
+      }
+    ]
+  }
+}
--- a/lib/browser/api/desktop-capturer.ts
+++ b/lib/browser/api/desktop-capturer.ts
@@ -73,7 +73,6 @@ export async function getSources (args: Electron.SourcesOptions) {

    capturer._onerror = (error: string) => {
      stopRunning();
-      // eslint-disable-next-line prefer-promise-reject-errors
      reject(error);
    };

--- a/lib/browser/api/net.ts
+++ b/lib/browser/api/net.ts
@@ -5,23 +5,27 @@ import type { ClientRequestConstructorOptions } from 'electron/main';

 const { isOnline } = process._linkedBinding('electron_common_net');

-export function request (options: ClientRequestConstructorOptions | string, callback?: (message: IncomingMessage) => void) {
+function request (options: ClientRequestConstructorOptions | string, callback?: (message: IncomingMessage) => void) {
  if (!app.isReady()) {
    throw new Error('net module can only be used after app is ready');
  }
  return new ClientRequest(options, callback);
 }

-export function fetch (input: RequestInfo, init?: RequestInit): Promise<Response> {
+function fetch (input: RequestInfo, init?: RequestInit): Promise<Response> {
  return session.defaultSession.fetch(input, init);
 }

-export function resolveHost (host: string, options?: Electron.ResolveHostOptions): Promise<Electron.ResolvedHost> {
+function resolveHost (host: string, options?: Electron.ResolveHostOptions): Promise<Electron.ResolvedHost> {
  return session.defaultSession.resolveHost(host, options);
 }

-exports.isOnline = isOnline;
-
-Object.defineProperty(exports, 'online', {
-  get: () => isOnline()
-});
+module.exports = {
+  request,
+  fetch,
+  resolveHost,
+  isOnline,
+  get online () {
+    return isOnline();
+  }
+};
--- a/lib/browser/default-menu.ts
+++ b/lib/browser/default-menu.ts
@@ -1,4 +1,5 @@
-import { Menu } from 'electron/main';
+import { shell } from 'electron/common';
+import { app, Menu } from 'electron/main';

 const isMac = process.platform === 'darwin';

@@ -11,13 +12,47 @@ export const setApplicationMenuWasSet = () => {
 export const setDefaultApplicationMenu = () => {
  if (applicationMenuWasSet) return;

+  const helpMenu: Electron.MenuItemConstructorOptions = {
+    role: 'help',
+    submenu: app.isPackaged
+      ? []
+      : [
+          {
+            label: 'Learn More',
+            click: async () => {
+              await shell.openExternal('https://electronjs.org');
+            }
+          },
+          {
+            label: 'Documentation',
+            click: async () => {
+              const version = process.versions.electron;
+              await shell.openExternal(`https://github.com/electron/electron/tree/v${version}/docs#readme`);
+            }
+          },
+          {
+            label: 'Community Discussions',
+            click: async () => {
+              await shell.openExternal('https://discord.gg/electronjs');
+            }
+          },
+          {
+            label: 'Search Issues',
+            click: async () => {
+              await shell.openExternal('https://github.com/electron/electron/issues');
+            }
+          }
+        ]
+  };
+
  const macAppMenu: Electron.MenuItemConstructorOptions = { role: 'appMenu' };
  const template: Electron.MenuItemConstructorOptions[] = [
    ...(isMac ? [macAppMenu] : []),
    { role: 'fileMenu' },
    { role: 'editMenu' },
    { role: 'viewMenu' },
-    { role: 'windowMenu' }
+    { role: 'windowMenu' },
+    helpMenu
  ];

  const menu = Menu.buildFromTemplate(template);
--- a/lib/browser/init.ts
+++ b/lib/browser/init.ts
@@ -181,7 +181,7 @@ delete process.appCodeLoaded;
 if (packagePath) {
  // Finally load app's main.js and transfer control to C++.
  if ((packageJson.type === 'module' && !mainStartupScript.endsWith('.cjs')) || mainStartupScript.endsWith('.mjs')) {
-    const { runEntryPointWithESMLoader } = __non_webpack_require__('internal/modules/run_main') as typeof import('@node/lib/internal/modules/run_main');
+    const { runEntryPointWithESMLoader } = __non_webpack_require__('internal/modules/run_main');
    const main = (require('url') as typeof url).pathToFileURL(path.join(packagePath, mainStartupScript));
    runEntryPointWithESMLoader(async (cascadedLoader: any) => {
      try {
--- a/lib/common/.eslintrc.json
+++ b/lib/common/.eslintrc.json
@@ -0,0 +1,23 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main",
+          "electron/renderer"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*",
+          "@electron/internal/isolated_renderer/*",
+          "@electron/internal/renderer/*",
+          "@electron/internal/sandboxed_worker/*",
+          "@electron/internal/worker/*"
+        ]
+      }
+    ]
+  }
+}
--- a/lib/common/init.ts
+++ b/lib/common/init.ts
@@ -1,4 +1,4 @@
-import timers = require('timers');
+import * as timers from 'timers';
 import * as util from 'util';

 import type * as stream from 'stream';
@@ -41,15 +41,15 @@ function wrap <T extends AnyFn> (func: T, wrapper: (fn: AnyFn) => T) {
 // initiatively activate the uv loop once process.nextTick and setImmediate is
 // called.
 process.nextTick = wrapWithActivateUvLoop(process.nextTick);
-global.setImmediate = timers.setImmediate = wrapWithActivateUvLoop(timers.setImmediate);
+global.setImmediate = wrapWithActivateUvLoop(timers.setImmediate);
 global.clearImmediate = timers.clearImmediate;

 // setTimeout needs to update the polling timeout of the event loop, when
 // called under Chromium's event loop the node's event loop won't get a chance
 // to update the timeout, so we have to force the node's event loop to
 // recalculate the timeout in the process.
-timers.setTimeout = wrapWithActivateUvLoop(timers.setTimeout);
-timers.setInterval = wrapWithActivateUvLoop(timers.setInterval);
+const wrappedSetTimeout = wrapWithActivateUvLoop(timers.setTimeout);
+const wrappedSetInterval = wrapWithActivateUvLoop(timers.setInterval);

 // Update the global version of the timer apis to use the above wrapper
 // only in the process that runs node event loop alongside chromium
@@ -57,8 +57,8 @@ timers.setInterval = wrapWithActivateUvLoop(timers.setInterval);
 // are deleted in these processes, see renderer/init.js for reference.
 if (process.type === 'browser' ||
    process.type === 'utility') {
-  global.setTimeout = timers.setTimeout;
-  global.setInterval = timers.setInterval;
+  global.setTimeout = wrappedSetTimeout;
+  global.setInterval = wrappedSetInterval;
 }

 if (process.platform === 'win32') {
--- a/lib/common/timers-shim.ts
+++ b/lib/common/timers-shim.ts
@@ -1,5 +1,5 @@
 // Drop-in replacement for timers-browserify@1.4.2.
-// Provides the Node.js 'timers' API surface for renderer/web webpack bundles
+// Provides the Node.js 'timers' API surface for renderer/web bundles
 // without relying on window.postMessage (which the newer timers-browserify 2.x
 // polyfill uses and can interfere with Electron IPC).

--- a/lib/common/webpack-globals-provider.ts
+++ b/lib/common/webpack-globals-provider.ts
@@ -1,8 +0,0 @@
-// Captures original globals into a scope to ensure that userland modifications do
-// not impact Electron.  Note that users doing:
-//
-// global.Promise.resolve = myFn
-//
-// Will mutate this captured one as well and that is OK.
-
-export const Promise = global.Promise;
--- a/lib/common/webpack-provider.ts
+++ b/lib/common/webpack-provider.ts
@@ -1,18 +0,0 @@
-// This file provides the global, process and Buffer variables to internal
-// Electron code once they have been deleted from the global scope.
-//
-// It does this through the ProvidePlugin in the webpack.config.base.js file
-// Check out the Module.wrapper override in renderer/init.ts for more
-// information on how this works and why we need it
-
-// Rip global off of window (which is also global) so that webpack doesn't
-// auto replace it with a looped reference to this file
-const _global = typeof globalThis !== 'undefined' ? globalThis.global : (self || window).global;
-const process = _global.process;
-const Buffer = _global.Buffer;
-
-export {
-  _global,
-  process,
-  Buffer
-};
--- a/lib/isolated_renderer/.eslintrc.json
+++ b/lib/isolated_renderer/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*"
+        ]
+      }
+    ]
+  }
+}
--- a/lib/node/asar-fs-wrapper.ts
+++ b/lib/node/asar-fs-wrapper.ts
@@ -52,20 +52,20 @@ const {
  getValidatedPath,
  getOptions,
  getDirent
-} = __non_webpack_require__('internal/fs/utils') as typeof import('@node/lib/internal/fs/utils');
+} = __non_webpack_require__('internal/fs/utils');

 const {
  assignFunctionName
-} = __non_webpack_require__('internal/util') as typeof import('@node/lib/internal/util');
+} = __non_webpack_require__('internal/util');

 const {
  validateBoolean,
  validateFunction
-} = __non_webpack_require__('internal/validators') as typeof import('@node/lib/internal/validators');
+} = __non_webpack_require__('internal/validators');

 // In the renderer node internals use the node global URL but we do not set that to be
-// the global URL instance.  We need to do instanceof checks against the internal URL impl
-const { URL: NodeURL } = __non_webpack_require__('internal/url') as typeof import('@node/lib/internal/url');
+// the global URL instance.  We need to do instanceof checks against the internal URL impl.
+const { URL: NodeURL } = __non_webpack_require__('internal/url');

 // Separate asar package's path from full path.
 const splitPath = (archivePathOrBuffer: string | Buffer | URL) => {
--- a/lib/preload_realm/.eslintrc.json
+++ b/lib/preload_realm/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*"
+        ]
+      }
+    ]
+  }
+}
--- a/lib/renderer/.eslintrc.json
+++ b/lib/renderer/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*"
+        ]
+      }
+    ]
+  }
+}
--- a/lib/renderer/init.ts
+++ b/lib/renderer/init.ts
@@ -29,8 +29,9 @@ Module._load = function (request: string) {
 // code with JavaScript.
 //
 // Note 3: We provide the equivalent extra variables internally through the
-// webpack ProvidePlugin in webpack.config.base.js.  If you add any extra
-// variables to this wrapper please ensure to update that plugin as well.
+// esbuild inject shim in build/esbuild/shims/node-globals-shim.js.  If you
+// add any extra variables to this wrapper please ensure to update that shim
+// as well.
 Module.wrapper = [
  '(function (exports, require, module, __filename, __dirname, process, global, Buffer) { ' +
  // By running the code in a new closure, it would be possible for the module
@@ -65,9 +66,9 @@ require('@electron/internal/renderer/common-init');

 if (nodeIntegration) {
  // Export node bindings to global.
-  const { makeRequireFunction } = __non_webpack_require__('internal/modules/helpers') as typeof import('@node/lib/internal/modules/helpers');
+  const { makeRequireFunction } = __non_webpack_require__('internal/modules/helpers');
  global.module = new Module('electron/js2c/renderer_init');
-  global.require = makeRequireFunction(global.module) as NodeRequire;
+  global.require = makeRequireFunction(global.module);

  // Set the __filename to the path of html file if it is file: protocol.
  if (window.location.protocol === 'file:') {
@@ -152,7 +153,7 @@ if (cjsPreloads.length) {
  }
 }
 if (esmPreloads.length) {
-  const { runEntryPointWithESMLoader } = __non_webpack_require__('internal/modules/run_main') as typeof import('@node/lib/internal/modules/run_main');
+  const { runEntryPointWithESMLoader } = __non_webpack_require__('internal/modules/run_main');

  runEntryPointWithESMLoader(async (cascadedLoader: any) => {
    // Load the preload scripts.
--- a/lib/sandboxed_renderer/.eslintrc.json
+++ b/lib/sandboxed_renderer/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*"
+        ]
+      }
+    ]
+  }
+}
--- a/lib/sandboxed_renderer/preload.ts
+++ b/lib/sandboxed_renderer/preload.ts
@@ -90,7 +90,6 @@ export function executeSandboxedPreloadScripts (context: PreloadContext, preload
      if (contents) {
        runPreloadScript(context, contents);
      } else if (error) {
-        // eslint-disable-next-line no-throw-literal
        throw error;
      }
    } catch (error) {
--- a/lib/utility/.eslintrc.json
+++ b/lib/utility/.eslintrc.json
@@ -0,0 +1,21 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/renderer"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/isolated_renderer/*",
+          "@electron/internal/renderer/*",
+          "@electron/internal/sandboxed_worker/*",
+          "@electron/internal/worker/*"
+        ]
+      }
+    ]
+  }
+}
--- a/lib/utility/api/net.ts
+++ b/lib/utility/api/net.ts
@@ -5,18 +5,20 @@ import type { ClientRequestConstructorOptions, IncomingMessage } from 'electron/

 const { isOnline, resolveHost } = process._linkedBinding('electron_common_net');

-export function request (options: ClientRequestConstructorOptions | string, callback?: (message: IncomingMessage) => void) {
+function request (options: ClientRequestConstructorOptions | string, callback?: (message: IncomingMessage) => void) {
  return new ClientRequest(options, callback);
 }

-export function fetch (input: RequestInfo, init?: RequestInit): Promise<Response> {
+function fetch (input: RequestInfo, init?: RequestInit): Promise<Response> {
  return fetchWithSession(input, init, undefined, request);
 }

-exports.resolveHost = resolveHost;
-
-exports.isOnline = isOnline;
-
-Object.defineProperty(exports, 'online', {
-  get: () => isOnline()
-});
+module.exports = {
+  request,
+  fetch,
+  resolveHost,
+  isOnline,
+  get online () {
+    return isOnline();
+  }
+};
--- a/lib/utility/init.ts
+++ b/lib/utility/init.ts
@@ -36,7 +36,7 @@ parentPort.on('removeListener', (name: string) => {
 });

 // Finally load entry script.
-const { runEntryPointWithESMLoader } = __non_webpack_require__('internal/modules/run_main') as typeof import('@node/lib/internal/modules/run_main');
+const { runEntryPointWithESMLoader } = __non_webpack_require__('internal/modules/run_main');
 const mainEntry = pathToFileURL(entryScript);

 runEntryPointWithESMLoader(async (cascadedLoader: any) => {
--- a/lib/worker/.eslintrc.json
+++ b/lib/worker/.eslintrc.json
@@ -0,0 +1,18 @@
+{
+  "rules": {
+    "no-restricted-imports": [
+      "error",
+      {
+        "paths": [
+          "electron",
+          "electron/main"
+        ],
+        "patterns": [
+          "./*",
+          "../*",
+          "@electron/internal/browser/*"
+        ]
+      }
+    ]
+  }
+}
--- a/lib/worker/init.ts
+++ b/lib/worker/init.ts
@@ -13,9 +13,9 @@ require('@electron/internal/common/init');
 const { hasSwitch, getSwitchValue } = process._linkedBinding('electron_common_command_line');

 // Export node bindings to global.
-const { makeRequireFunction } = __non_webpack_require__('internal/modules/helpers') as typeof import('@node/lib/internal/modules/helpers');
+const { makeRequireFunction } = __non_webpack_require__('internal/modules/helpers');
 global.module = new Module('electron/js2c/worker_init');
-global.require = makeRequireFunction(global.module) as NodeRequire;
+global.require = makeRequireFunction(global.module);

 // See WebWorkerObserver::WorkerScriptReadyForEvaluation.
 if ((globalThis as any).blinkfetch) {
--- a/npm/package.json
+++ b/npm/package.json
@@ -6,7 +6,7 @@
    "install-electron": "install.js"
  },
  "dependencies": {
-    "@electron/get": "^4.0.3",
+    "@electron/get": "^2.0.0",
    "@types/node": "^24.9.0",
    "extract-zip": "^2.0.1"
  },
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
    "@electron/lint-roller": "^3.2.0",
    "@electron/typescript-definitions": "^9.1.5",
    "@hurdlegroup/robotjs": "^0.12.3",
-    "@octokit/rest": "^22.0.1",
+    "@octokit/rest": "^20.1.2",
    "@primer/octicons": "^10.0.0",
    "@sentry/cli": "1.72.0",
    "@types/minimist": "^1.2.5",
@@ -21,10 +21,22 @@
    "@types/semver": "^7.5.8",
    "@types/stream-json": "^1.7.8",
    "@types/temp": "^0.9.4",
-    "@xmldom/xmldom": "^0.8.12",
+    "@typescript-eslint/eslint-plugin": "^8.32.1",
+    "@typescript-eslint/parser": "^8.7.0",
+    "@typescript/native-preview": "^7.0.0-dev.20260324.1",
+    "@xmldom/xmldom": "^0.8.11",
    "buffer": "^6.0.3",
    "chalk": "^4.1.0",
    "check-for-leaks": "^1.2.1",
+    "esbuild": "^0.25.0",
+    "eslint": "^8.57.1",
+    "eslint-config-standard": "^17.1.0",
+    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-markdown": "^5.1.0",
+    "eslint-plugin-mocha": "^10.5.0",
+    "eslint-plugin-n": "^17.24.0",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-promise": "^6.6.0",
    "events": "^3.2.0",
    "folder-hash": "^4.1.2",
    "got": "^11.8.5",
@@ -33,21 +45,15 @@
    "markdownlint-cli2": "^0.18.0",
    "minimist": "^1.2.8",
    "node-gyp": "^11.4.2",
-    "null-loader": "^4.0.1",
-    "oxlint": "^1.57.0",
    "pre-flight": "^2.0.0",
    "process": "^0.11.10",
    "semver": "^7.6.3",
    "stream-json": "^1.9.1",
    "tap-xunit": "^2.4.1",
    "temp": "^0.9.4",
-    "ts-loader": "^8.0.2",
    "ts-node": "6.2.0",
    "typescript": "^5.8.3",
    "url": "^0.11.4",
-    "webpack": "^5.104.1",
-    "webpack-cli": "^6.0.1",
-    "wrapper-webpack-plugin": "^2.2.0",
    "yaml": "^2.8.1"
  },
  "private": true,
@@ -84,8 +90,9 @@
    "repl": "node ./script/start.js --interactive",
    "start": "node ./script/start.js",
    "test": "node ./script/spec-runner.js",
-    "tsc": "tsc",
-    "webpack": "webpack"
+    "tsc": "tsgo",
+    "tsc-check": "node script/typecheck.js",
+    "bundle": "node build/esbuild/bundle.js"
  },
  "license": "MIT",
  "author": "Electron Community",
--- a/patches/boringssl/expose_ripemd160.patch
+++ b/patches/boringssl/expose_ripemd160.patch
@@ -10,10 +10,10 @@ this patch is required to provide ripemd160 support in the nodejs crypto
 module.

 diff --git a/crypto/digest/digest_extra.cc b/crypto/digest/digest_extra.cc
-index d38e0c1132da60ec96c3a5c2416ff07589f03b80..cd60baaf22a8d5dc20544d861d36b7d74d986e7b 100644
+index 17961ba6bd9de78b5b1b1008eb1f73babd49d0e7..6a870dce37df8f49106c24b183308a2c7a03fd7d 100644
 --- a/crypto/digest/digest_extra.cc
 +++ b/crypto/digest/digest_extra.cc
-@@ -48,6 +48,7 @@ static const struct nid_to_digest nid_to_digest_mapping[] = {
+@@ -47,6 +47,7 @@ static const struct nid_to_digest nid_to_digest_mapping[] = {
     {NID_sha512, EVP_sha512, SN_sha512, LN_sha512},
     {NID_sha512_256, EVP_sha512_256, SN_sha512_256, LN_sha512_256},
     {NID_md5_sha1, EVP_md5_sha1, SN_md5_sha1, LN_md5_sha1},
@@ -62,10 +62,10 @@ index a246a51103701e0ac8a0722324350a462f95bcc9..ddf0a90337d4e40de09bc345cf959dff
 +
 #undef CHECK
 diff --git a/decrepit/evp/evp_do_all.cc b/decrepit/evp/evp_do_all.cc
-index 584b1390a841cc1b1dcb69e16d8242a88e4bb9cb..637aeccb8de8d793eabc38e32bef6834ac0e6ad3 100644
+index feaf17c72cecb8099bc11ac10747fbad719ddca9..891a73f229e3f0838cb2fa99b8fb24fdeac1962b 100644
 --- a/decrepit/evp/evp_do_all.cc
 +++ b/decrepit/evp/evp_do_all.cc
-@@ -82,6 +82,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *md,
+@@ -79,6 +79,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher,
   callback(EVP_sha384(), "SHA384", nullptr, arg);
   callback(EVP_sha512(), "SHA512", nullptr, arg);
   callback(EVP_sha512_256(), "SHA512-256", nullptr, arg);
@@ -73,16 +73,16 @@ index 584b1390a841cc1b1dcb69e16d8242a88e4bb9cb..637aeccb8de8d793eabc38e32bef6834
 
   callback(EVP_md4(), "md4", nullptr, arg);
   callback(EVP_md5(), "md5", nullptr, arg);
-@@ -91,6 +92,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *md,
+@@ -88,6 +89,7 @@ void EVP_MD_do_all_sorted(void (*callback)(const EVP_MD *cipher,
   callback(EVP_sha384(), "sha384", nullptr, arg);
   callback(EVP_sha512(), "sha512", nullptr, arg);
   callback(EVP_sha512_256(), "sha512-256", nullptr, arg);
 +  callback(EVP_ripemd160(), "ripemd160", nullptr, arg);
 }
 
- void EVP_MD_do_all(void (*callback)(const EVP_MD *md, const char *name,
+ void EVP_MD_do_all(void (*callback)(const EVP_MD *cipher, const char *name,
 diff --git a/include/openssl/digest.h b/include/openssl/digest.h
-index 62ad57368cb3059ee25df08bb07876fef499de2e..322daef194b3c7b73011419bb74bccb311eb03a5 100644
+index 40670234682ac00dec268dea43f0ee1e39e8684f..293fbc9faf01ea0ca4e58b0a65b14597fe4916a6 100644
 --- a/include/openssl/digest.h
 +++ b/include/openssl/digest.h
@@ -48,6 +48,9 @@ OPENSSL_EXPORT const EVP_MD *EVP_blake2b256(void);
--- a/patches/boringssl/feat_expose_several_extra_cipher_functions.patch
+++ b/patches/boringssl/feat_expose_several_extra_cipher_functions.patch
@@ -64,10 +64,10 @@ index dabc54aa13745600a62e57ecbb427e48a4565282..ce213e00573102ce9405a794d3c140d9
 
 const EVP_CIPHER *EVP_get_cipherbynid(int nid) {
 diff --git a/decrepit/evp/evp_do_all.cc b/decrepit/evp/evp_do_all.cc
-index 637aeccb8de8d793eabc38e32bef6834ac0e6ad3..c5dd0b18d7338457e47ae47088d9822472b24212 100644
+index 891a73f229e3f0838cb2fa99b8fb24fdeac1962b..f7d0c5dc66f016eb9338c15e7f5ef59e6de2969d 100644
 --- a/decrepit/evp/evp_do_all.cc
 +++ b/decrepit/evp/evp_do_all.cc
-@@ -23,8 +23,10 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
+@@ -20,8 +20,10 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
                                                const char *unused, void *arg),
                               void *arg) {
   callback(EVP_aes_128_cbc(), "AES-128-CBC", nullptr, arg);
@@ -78,7 +78,7 @@ index 637aeccb8de8d793eabc38e32bef6834ac0e6ad3..c5dd0b18d7338457e47ae47088d98224
   callback(EVP_aes_128_ctr(), "AES-128-CTR", nullptr, arg);
   callback(EVP_aes_192_ctr(), "AES-192-CTR", nullptr, arg);
   callback(EVP_aes_256_ctr(), "AES-256-CTR", nullptr, arg);
-@@ -37,9 +39,13 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
+@@ -34,9 +36,13 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
   callback(EVP_aes_128_gcm(), "AES-128-GCM", nullptr, arg);
   callback(EVP_aes_192_gcm(), "AES-192-GCM", nullptr, arg);
   callback(EVP_aes_256_gcm(), "AES-256-GCM", nullptr, arg);
@@ -92,7 +92,7 @@ index 637aeccb8de8d793eabc38e32bef6834ac0e6ad3..c5dd0b18d7338457e47ae47088d98224
   callback(EVP_des_ede_cbc(), "DES-EDE-CBC", nullptr, arg);
   callback(EVP_des_ede3_cbc(), "DES-EDE3-CBC", nullptr, arg);
   callback(EVP_rc2_cbc(), "RC2-CBC", nullptr, arg);
-@@ -47,8 +53,10 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
+@@ -44,8 +50,10 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
 
   // OpenSSL returns everything twice, the second time in lower case.
   callback(EVP_aes_128_cbc(), "aes-128-cbc", nullptr, arg);
@@ -103,7 +103,7 @@ index 637aeccb8de8d793eabc38e32bef6834ac0e6ad3..c5dd0b18d7338457e47ae47088d98224
   callback(EVP_aes_128_ctr(), "aes-128-ctr", nullptr, arg);
   callback(EVP_aes_192_ctr(), "aes-192-ctr", nullptr, arg);
   callback(EVP_aes_256_ctr(), "aes-256-ctr", nullptr, arg);
-@@ -61,9 +69,13 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
+@@ -58,9 +66,13 @@ void EVP_CIPHER_do_all_sorted(void (*callback)(const EVP_CIPHER *cipher,
   callback(EVP_aes_128_gcm(), "aes-128-gcm", nullptr, arg);
   callback(EVP_aes_192_gcm(), "aes-192-gcm", nullptr, arg);
   callback(EVP_aes_256_gcm(), "aes-256-gcm", nullptr, arg);
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -125,6 +125,7 @@ feat_separate_content_settings_callback_for_sync_and_async_clipboard.patch
 fix_win32_synchronous_spellcheck.patch
 chore_grandfather_in_electron_views_and_delegates.patch
 refactor_patch_electron_permissiontypes_into_blink.patch
+revert_views_remove_desktopwindowtreehostwin_window_enlargement.patch
 fix_add_macos_memory_query_fallback_to_avoid_crash.patch
 fix_resolve_dynamic_background_material_update_issue_on_windows_11.patch
 feat_add_support_for_embedder_snapshot_validation.patch
@@ -149,4 +150,3 @@ fix_use_fresh_lazynow_for_onendworkitemimpl_after_didruntask.patch
 fix_pulseaudio_stream_and_icon_names.patch
 fix_fire_menu_popup_start_for_dynamically_created_aria_menus.patch
 feat_allow_enabling_extensions_on_custom_protocols.patch
-fix_initialize_com_on_desktopmedialistcapturethread_on_windows.patch
--- a/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
+++ b/patches/chromium/add_contentgpuclient_precreatemessageloop_callback.patch
@@ -33,7 +33,7 @@ index 26619daf25f3cc455d2dba7b5f16c9449e6103c1..387fca1b54b818a5af435e96bf8f435e
     client->PostSandboxInitialized();
   }
 diff --git a/content/public/gpu/content_gpu_client.h b/content/public/gpu/content_gpu_client.h
-index ad511f0966c29e46a1e4c07e09c3172b38c7c906..ca3a35d213147c6fcb9fbbbe118c15a3075875fa 100644
+index e5389b44df98ab1a5c976524a66a26c763e5c436..4a183b4959fae18e6875440e6570b8ada6823d81 100644
 --- a/content/public/gpu/content_gpu_client.h
 +++ b/content/public/gpu/content_gpu_client.h
@@ -36,6 +36,10 @@ class CONTENT_EXPORT ContentGpuClient {
--- a/patches/chromium/add_didinstallconditionalfeatures.patch
+++ b/patches/chromium/add_didinstallconditionalfeatures.patch
@@ -23,10 +23,10 @@ index 3f8cf4edc7448e6b584adae8fcbb872d27377126..1d03dc809d4c18f24314d94811e0bf52
                                         int32_t world_id) {}
   virtual void DidClearWindowObject() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index ab959e66f8841d7367863bb13d6c7a0854d0df23..5279ba15f45bd7634b5f24553ad64c0069318cc0 100644
+index 0e64b0a0ac8387ab15b201a9fc0f0fd36cd5ab29..f28214d369138eb854a556165f0a946c07cfdb9c 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4733,6 +4733,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
+@@ -4731,6 +4731,12 @@ void RenderFrameImpl::DidCreateScriptContext(v8::Local<v8::Context> context,
     observer.DidCreateScriptContext(context, world_id);
 }
 
--- a/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
+++ b/patches/chromium/allow_disabling_blink_scheduler_throttling_per_renderview.patch
@@ -6,7 +6,7 @@ Subject: allow disabling blink scheduler throttling per RenderView
 This allows us to disable throttling for hidden windows.

 diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
-index f5a6ffc61f6cdff3897a97003b74838aac27e2a1..9b10aeb457a010db0ab89211610ea97b1a364453 100644
+index 29d5b174e122cbd140554687548106ead8f8e8d9..da74da96c3fe35a0f3838f04bca08846f7b41abe 100644
 --- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc
 +++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
@@ -168,6 +168,12 @@ class MockPageBroadcast : public blink::mojom::PageBroadcast {
@@ -51,7 +51,7 @@ index 89fed16c112d55c13a9f23695e2898d630f7d815..b7f486337f46daac015644525c9870f5
   void SendRendererPreferencesToRenderer(
       const blink::RendererPreferences& preferences);
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index 53ec5cd693539d74424c683f78e953e85c13c098..ccfe78580c2acb9a3afa43d246e1a83cc0e28598 100644
+index 79bd8d43a71731e5076196877448462656a04d48..b5d7f50817f503956f19fcea687b5b0751268b44 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -655,8 +655,8 @@ void RenderWidgetHostViewAura::ShowImpl(PageVisibilityState page_visibility) {
@@ -116,7 +116,7 @@ index 932658273154ef2e022358e493a8e7c00c86e732..57bbfb5cde62c9496c351c861880a189
   // Visibility -----------------------------------------------------------
 
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index b5a7e1b177f031837f670c26bff7394315eb6ea5..ed63aa041733e2fb09d77a219c93c322985cc81e 100644
+index 611ecffa47703196dc40550b1e920afc4c1be716..be26284387dcfa4e72592862f313a2c7e9a81d1b 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -2471,6 +2471,10 @@ void WebViewImpl::SetPageLifecycleStateInternal(
@@ -130,7 +130,7 @@ index b5a7e1b177f031837f670c26bff7394315eb6ea5..ed63aa041733e2fb09d77a219c93c322
   bool storing_in_bfcache = new_state->is_in_back_forward_cache &&
                             !old_state->is_in_back_forward_cache;
   bool restoring_from_bfcache = !new_state->is_in_back_forward_cache &&
-@@ -4170,10 +4174,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
+@@ -4163,10 +4167,23 @@ PageScheduler* WebViewImpl::Scheduler() const {
   return GetPage()->GetPageScheduler();
 }
 
@@ -155,7 +155,7 @@ index b5a7e1b177f031837f670c26bff7394315eb6ea5..ed63aa041733e2fb09d77a219c93c322
   // Do not throttle if the page should be painting.
   bool is_visible =
 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.h b/third_party/blink/renderer/core/exported/web_view_impl.h
-index b2ad789e53146b06e0e416f2dcf384cf7e9c17ae..838c67ac5b02c427858febbfbddf25fb03632b37 100644
+index 8d5c7349c360726778e37976fc54d660d7424f1f..96ee25c8ae4b50ab265bd698517efe15e2f1f44d 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.h
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.h
@@ -446,6 +446,7 @@ class CORE_EXPORT WebViewImpl final : public WebView,
--- a/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
+++ b/patches/chromium/allow_in-process_windows_to_have_different_web_prefs.patch
@@ -8,10 +8,10 @@ WebPreferences of in-process child windows, rather than relying on
 process-level command line switches, as before.

 diff --git a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-index 9ab1b47509c8b72b7844e83f1d69499d13e26837..8fe07713a01123cc21d2649f8a3e9347a49a2bb8 100644
+index c6552b25ffba3bf8d806d8bf2410a89533c9bef1..9920c3146c6cf700414a679e80087c469395eee9 100644
 --- a/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
 +++ b/third_party/blink/common/web_preferences/web_preferences_mojom_traits.cc
-@@ -149,6 +149,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
+@@ -150,6 +150,19 @@ bool StructTraits<blink::mojom::WebPreferencesDataView,
   out->v8_cache_options = data.v8_cache_options();
   out->record_whole_document = data.record_whole_document();
   out->stylus_handwriting_enabled = data.stylus_handwriting_enabled();
@@ -32,7 +32,7 @@ index 9ab1b47509c8b72b7844e83f1d69499d13e26837..8fe07713a01123cc21d2649f8a3e9347
   out->accelerated_video_decode_enabled =
       data.accelerated_video_decode_enabled();
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences.h b/third_party/blink/public/common/web_preferences/web_preferences.h
-index efcb7d9457045c2d58ecec4b68d7c4547cb5d08a..e37fa2e8cb0896e61ef11259df13d97b8fbff548 100644
+index 1188e60da33c292febf45be4cd6055671c21b4aa..43a1e777536ce2079d81deb5c7f440a1ba9b43d9 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences.h
@@ -10,6 +10,7 @@
@@ -64,7 +64,7 @@ index efcb7d9457045c2d58ecec4b68d7c4547cb5d08a..e37fa2e8cb0896e61ef11259df13d97b
   // chrome, except for the cases where it would require lots of extra work for
   // the embedder to use the same default value.
 diff --git a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
-index fade1dd1310d8339fff45b9ae74ebff4673eec37..ea3f8f3e30f76ebf71ed470f43e4f61995829932 100644
+index ac91e8bad952dad5fc6ff673ffd19b0edd30bdb2..0f1715711056c83bb53e03dd8b675cb40a0c42cc 100644
 --- a/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
 +++ b/third_party/blink/public/common/web_preferences/web_preferences_mojom_traits.h
@@ -8,6 +8,7 @@
@@ -129,7 +129,7 @@ index fade1dd1310d8339fff45b9ae74ebff4673eec37..ea3f8f3e30f76ebf71ed470f43e4f619
     return r.cookie_enabled;
   }
 diff --git a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
-index c637783517d250b7aa6f34af11fd3ca804a2a705..0268d33da3150a37ca8206695a5f324d8fde22e6 100644
+index 0ed21e64a0b43580feb99166953babfb633d5af6..f06db564760e8f7e785bb3d6d4b80270a8783a23 100644
 --- a/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
 +++ b/third_party/blink/public/mojom/webpreferences/web_preferences.mojom
@@ -4,6 +4,7 @@
--- a/patches/chromium/blink_local_frame.patch
+++ b/patches/chromium/blink_local_frame.patch
@@ -15,7 +15,7 @@ Refs changes in:
 This patch reverts the changes to fix associated crashes in Electron.

 diff --git a/third_party/blink/renderer/core/frame/frame.cc b/third_party/blink/renderer/core/frame/frame.cc
-index 9827a89c56141596fde57b78f9c9894f273db83e..cedb4bd8217a0ad3ab07d85421e1850bc4d910f5 100644
+index 901b727ed898cdd840df5ff7e2380fbee5d7fde2..1caacaeed9ddf1162cfa393fe4a7c86ac27f674a 100644
 --- a/third_party/blink/renderer/core/frame/frame.cc
 +++ b/third_party/blink/renderer/core/frame/frame.cc
@@ -135,14 +135,6 @@ bool Frame::Detach(FrameDetachType type) {
@@ -49,7 +49,7 @@ index 9827a89c56141596fde57b78f9c9894f273db83e..cedb4bd8217a0ad3ab07d85421e1850b
   // its owning reference back to our owning LocalFrame.
   client_->Detached(type);
 diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
-index 4c38cd881b5a81b7939f61688f05949be799f008..8970537416e171d513bc9c015706fb18a574eab6 100644
+index 802c876dd85d8100fc3d6e634ad4e390fd48747f..abe5b3c6e5eadf30f3e00013fceddaa0ead36cb1 100644
 --- a/third_party/blink/renderer/core/frame/local_frame.cc
 +++ b/third_party/blink/renderer/core/frame/local_frame.cc
@@ -758,10 +758,6 @@ bool LocalFrame::DetachImpl(FrameDetachType type) {
--- a/patches/chromium/build_add_electron_tracing_category.patch
+++ b/patches/chromium/build_add_electron_tracing_category.patch
@@ -8,7 +8,7 @@ categories in use are known / declared.  This patch is required for us
 to introduce a new Electron category for Electron-specific tracing.

 diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h
-index 440349df6c5767fe3f93b51f78b33bf9d3bb5c1a..85c6f973788938b6a48a7a89e9fa803dc1030580 100644
+index 39168e90fd6ea68e562f0a2c6d8ba1162bc29e71..1b2b58497541b06857bc8f0d79172e8106003845 100644
 --- a/base/trace_event/builtin_categories.h
 +++ b/base/trace_event/builtin_categories.h
@@ -133,6 +133,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS(
--- a/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
+++ b/patches/chromium/build_do_not_depend_on_packed_resource_integrity.patch
@@ -11,10 +11,10 @@ if we ever align our .pak file generation with Chrome we can remove this
 patch.

 diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
-index 0af4d4b75d0519fabcb5d48bd9d5bd465bc80e92..eb6b23655afaa268f25d99301a0853aaecd23652 100644
+index 9a5b03af14d68c0c64380f84901aaeef11757ccb..933c03f197a8510c168775d5f8d19ebf375389d2 100644
 --- a/chrome/BUILD.gn
 +++ b/chrome/BUILD.gn
-@@ -201,6 +201,12 @@ if (!is_android && !is_mac) {
+@@ -201,11 +201,16 @@ if (!is_android && !is_mac) {
         "common/crash_keys.h",
       ]
 
@@ -27,11 +27,29 @@ index 0af4d4b75d0519fabcb5d48bd9d5bd465bc80e92..eb6b23655afaa268f25d99301a0853aa
       deps += [
         ":chrome_dll",
         ":chrome_exe_version",
+         ":copy_first_run",
+-        ":packed_resources_integrity_header",
+         ":visual_elements_resources",
+         "//base",
+         "//build:branding_buildflags",
+diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
+index 5768066ed65810d14d8ad4b6839c6c632af6bb57..d8d4e66f1c96f630e60001425d16fc4d6e22212b 100644
+--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
+@@ -4455,7 +4455,7 @@ static_library("browser") {
+       ]
+     }
+ 
+-    if (!is_win) {
+    if (!is_win && !is_electron_build) {
+       # On Windows, the hashes are embedded in //chrome:chrome_initial rather
+       # than here in :chrome_dll.
+       deps += [ "//chrome:packed_resources_integrity_header" ]
 diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
-index e91f97276866bd500720962c74acaca2c22fff7c..22867153821d2b1e83feb1a2a7a6b8c26ba776eb 100644
+index 98ce26437751543c5c93574bc9561409e214d8a8..853eda4503954de04d50caba63f55fd74f390069 100644
 --- a/chrome/test/BUILD.gn
 +++ b/chrome/test/BUILD.gn
-@@ -7737,6 +7737,10 @@ test("unit_tests") {
+@@ -7718,9 +7718,12 @@ test("unit_tests") {
       "//chrome/notification_helper",
     ]
 
@@ -41,8 +59,11 @@ index e91f97276866bd500720962c74acaca2c22fff7c..22867153821d2b1e83feb1a2a7a6b8c2
 +
     deps += [
       "//chrome:other_version",
+-      "//chrome:packed_resources_integrity_header",
       "//chrome//services/util_win:unit_tests",
-@@ -8711,6 +8715,10 @@ test("unit_tests") {
+       "//chrome/app:chrome_dll_resources",
+       "//chrome/app:win_unit_tests",
+@@ -8723,6 +8726,10 @@ test("unit_tests") {
       "../browser/performance_manager/policies/background_tab_loading_policy_unittest.cc",
     ]
 
@@ -53,12 +74,11 @@ index e91f97276866bd500720962c74acaca2c22fff7c..22867153821d2b1e83feb1a2a7a6b8c2
     sources += [
       # The importer code is not used on Android.
       "../common/importer/firefox_importer_utils_unittest.cc",
-@@ -8767,7 +8775,7 @@ test("unit_tests") {
+@@ -8779,7 +8786,6 @@ test("unit_tests") {
     # TODO(crbug.com/417513088): Maybe merge with the non-android `deps` declaration above?
     deps += [
       "../browser/screen_ai:screen_ai_install_state",
-      "//chrome:packed_resources",
-+
+-      "//chrome:packed_resources_integrity_header",
       "//chrome/browser/apps:icon_standardizer",
       "//chrome/browser/apps/app_service",
       "//chrome/browser/apps/app_service:app_registry_cache_waiter",
--- a/patches/chromium/can_create_window.patch
+++ b/patches/chromium/can_create_window.patch
@@ -9,10 +9,10 @@ potentially prevent a window from being created.
 TODO(loc): this patch is currently broken.

 diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
-index ac474e220d411dec278c40448f038b25e6788d2a..e4ff8f11bed9e53f3134068492ac94b4c9bb4df2 100644
+index 914b06175825f79c03d34e0bdb1c3749a934bfdb..89f4af078c151adc1d9d471056bacab5dace0833 100644
 --- a/content/browser/renderer_host/render_frame_host_impl.cc
 +++ b/content/browser/renderer_host/render_frame_host_impl.cc
-@@ -10228,6 +10228,7 @@ void RenderFrameHostImpl::CreateNewWindow(
+@@ -10170,6 +10170,7 @@ void RenderFrameHostImpl::CreateNewWindow(
           last_committed_origin_, params->window_container_type,
           params->target_url, params->referrer.To<Referrer>(),
           params->frame_name, params->disposition, *params->features,
@@ -21,10 +21,10 @@ index ac474e220d411dec278c40448f038b25e6788d2a..e4ff8f11bed9e53f3134068492ac94b4
           &no_javascript_access);
 
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index 3e0c8bd308d8a947a2bd295a2d83e385e53853fb..4e91b3aeb5630476c660e8814e2fd9d92c5a9ca1 100644
+index 299324868f7bf88c7105015c1925881b06ec40a6..d40eb3c0670a9b3053db7773cef229adae8ecbec 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -5501,6 +5501,10 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5497,6 +5497,10 @@ FrameTree* WebContentsImpl::CreateNewWindow(
   create_params.initially_hidden = renderer_started_hidden;
   create_params.initial_popup_url = params.target_url;
 
@@ -35,7 +35,7 @@ index 3e0c8bd308d8a947a2bd295a2d83e385e53853fb..4e91b3aeb5630476c660e8814e2fd9d9
   // Even though all codepaths leading here are in response to a renderer
   // trying to open a new window, if the new window ends up in a different
   // browsing instance, then the RenderViewHost, RenderWidgetHost,
-@@ -5555,6 +5559,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5551,6 +5555,12 @@ FrameTree* WebContentsImpl::CreateNewWindow(
   // Sets the newly created WebContents WindowOpenDisposition.
   new_contents_impl->original_window_open_disposition_ = params.disposition;
 
@@ -48,7 +48,7 @@ index 3e0c8bd308d8a947a2bd295a2d83e385e53853fb..4e91b3aeb5630476c660e8814e2fd9d9
   // If the new frame has a name, make sure any SiteInstances that can find
   // this named frame have proxies for it.  Must be called after
   // SetSessionStorageNamespace, since this calls CreateRenderView, which uses
-@@ -5596,12 +5606,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5592,12 +5602,6 @@ FrameTree* WebContentsImpl::CreateNewWindow(
     AddWebContentsDestructionObserver(new_contents_impl);
   }
 
@@ -77,10 +77,10 @@ index 444fa7009d0db33470cac9ab9cfdc23ceacec942..ab9aeb852e5ea89583284386d9a78a3e
 
 // Operation result when the renderer asks the browser to create a new window.
 diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc
-index e806de04ca92cb8351e9a242a5241c0d4286da97..d0b3e4bc348921df7e6446dbc1f14860b8a84d87 100644
+index 836d27b82b0798be4a17484903284810d86e4ff9..b06cd802b7e9bedf038a0b84fd1f242c1664a6ed 100644
 --- a/content/public/browser/content_browser_client.cc
 +++ b/content/public/browser/content_browser_client.cc
-@@ -854,6 +854,8 @@ bool ContentBrowserClient::CanCreateWindow(
+@@ -874,6 +874,8 @@ bool ContentBrowserClient::CanCreateWindow(
     const std::string& frame_name,
     WindowOpenDisposition disposition,
     const blink::mojom::WindowFeatures& features,
@@ -90,7 +90,7 @@ index e806de04ca92cb8351e9a242a5241c0d4286da97..d0b3e4bc348921df7e6446dbc1f14860
     bool opener_suppressed,
     bool* no_javascript_access) {
 diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
-index 70588ccd619ac7969918771bccf5c054320e4f6f..eb684232648424fab4ba73b1fc813b0b3f8b809b 100644
+index 7032139f91aadab0e854182d95eb97422a4182b3..f6ceaf652707d355780d8009339a42bbc271bd07 100644
 --- a/content/public/browser/content_browser_client.h
 +++ b/content/public/browser/content_browser_client.h
@@ -205,6 +205,7 @@ class NetworkService;
@@ -101,7 +101,7 @@ index 70588ccd619ac7969918771bccf5c054320e4f6f..eb684232648424fab4ba73b1fc813b0b
 }  // namespace network
 
 namespace sandbox {
-@@ -1406,6 +1407,8 @@ class CONTENT_EXPORT ContentBrowserClient {
+@@ -1457,6 +1458,8 @@ class CONTENT_EXPORT ContentBrowserClient {
       const std::string& frame_name,
       WindowOpenDisposition disposition,
       const blink::mojom::WindowFeatures& features,
@@ -170,10 +170,10 @@ index 0650197909d484b8a0f48ab61b22471c71bce0e8..29c380d7845aab1a7b3417e0d3940ea0
   // typically happens when popups are created.
   virtual void WebContentsCreated(WebContents* source_contents,
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 5936c5eaa081abde7f7c26cc990a122622e46908..ab959e66f8841d7367863bb13d6c7a0854d0df23 100644
+index 017007ee611e3cbb718085096b38c60677c0863c..0e64b0a0ac8387ab15b201a9fc0f0fd36cd5ab29 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -6845,6 +6845,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
+@@ -6842,6 +6842,10 @@ WebView* RenderFrameImpl::CreateNewWindow(
   params->started_by_ad =
       GetWebFrame()->IsAdFrame() || GetWebFrame()->IsAdScriptInStack();
 
@@ -185,10 +185,10 @@ index 5936c5eaa081abde7f7c26cc990a122622e46908..ab959e66f8841d7367863bb13d6c7a08
   // moved on send.
   bool is_background_tab =
 diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc
-index 9453418ab164904cb9d75930d649abe21b94bb03..b2acd05882e8dfb04e5a75b249705c1a15209056 100644
+index 7a57cb3a1414a77704c42ae01a9dc89fae4ad4a3..769601c2749f0781317f668cf806042db626c348 100644
 --- a/content/web_test/browser/web_test_content_browser_client.cc
 +++ b/content/web_test/browser/web_test_content_browser_client.cc
-@@ -540,6 +540,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
+@@ -539,6 +539,8 @@ bool WebTestContentBrowserClient::CanCreateWindow(
     const std::string& frame_name,
     WindowOpenDisposition disposition,
     const blink::mojom::WindowFeatures& features,
@@ -224,10 +224,10 @@ index d92bab531c12c62a5321a23f4a0cb89691668127..2060e04795ba8e7a923fd0fe3485b8c5
 
 }  // namespace blink
 diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc
-index 51f03729c2d40a225dbcfc42091d44f78f77d971..780ee21199701b01a97932cd4a59aeb5db98017b 100644
+index 87856b74d5e0a323b8527d783316d1aab1cf9b1e..9f0d95954ed3d7c7e3ac4825f31ee55255e0c46f 100644
 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc
 +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc
-@@ -2342,6 +2342,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
+@@ -2366,6 +2366,8 @@ DOMWindow* LocalDOMWindow::open(v8::Isolate* isolate,
   WebWindowFeatures window_features =
       GetWindowFeaturesFromString(features, entered_window);
 
--- a/patches/chromium/chore_add_electron_objects_to_wrappablepointertag.patch
+++ b/patches/chromium/chore_add_electron_objects_to_wrappablepointertag.patch
@@ -8,10 +8,10 @@ electron objects that extend gin::Wrappable and gets
 allocated on the cpp heap

 diff --git a/gin/public/wrappable_pointer_tags.h b/gin/public/wrappable_pointer_tags.h
-index fee622ebde42211de6f702b754cfa38595df5a1c..9f7e1b1b8d871721891255c1f21de825d0df1e30 100644
+index fee622ebde42211de6f702b754cfa38595df5a1c..6b524632ebb405e473cf4fe8e253bd13bf7b67e5 100644
 --- a/gin/public/wrappable_pointer_tags.h
 +++ b/gin/public/wrappable_pointer_tags.h
-@@ -77,7 +77,21 @@ enum WrappablePointerTag : uint16_t {
+@@ -77,7 +77,20 @@ enum WrappablePointerTag : uint16_t {
   kWebAXObjectProxy,             // content::WebAXObjectProxy
   kWrappedExceptionHandler,      // extensions::WrappedExceptionHandler
   kIndigoContext,                // indigo::IndigoContext
@@ -24,7 +24,6 @@ index fee622ebde42211de6f702b754cfa38595df5a1c..9f7e1b1b8d871721891255c1f21de825
 +  kElectronNetLog,                      // electron::api::NetLog
 +  kElectronPowerMonitor,                // electron::api::PowerMonitor
 +  kElectronPowerSaveBlocker,            // electron::api::PowerSaveBlocker
-+  kElectronProtocol,                    // electron::api::Protocol
 +  kElectronReplyChannel,                // gin_helper::internal::ReplyChannel
 +  kElectronScreen,                      // electron::api::Screen
 +  kElectronSession,                     // electron::api::Session
--- a/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch
+++ b/patches/chromium/chore_expose_isolate_parameter_in_script_lifecycle_observers.patch
@@ -34,10 +34,10 @@ index 1d03dc809d4c18f24314d94811e0bf527aa7b5b4..16030bcecb2e39b8870144ce7c3d11dd
   virtual void DidClearWindowObject() {}
   virtual void DidChangeScrollOffset() {}
 diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
-index 5279ba15f45bd7634b5f24553ad64c0069318cc0..2840f22e2b8b4aae09a06774a70f2ec7340536d9 100644
+index f28214d369138eb854a556165f0a946c07cfdb9c..7fb428cfdda42d1aac6922f2ed6f37369d4979e2 100644
 --- a/content/renderer/render_frame_impl.cc
 +++ b/content/renderer/render_frame_impl.cc
-@@ -4739,10 +4739,11 @@ void RenderFrameImpl::DidInstallConditionalFeatures(
+@@ -4737,10 +4737,11 @@ void RenderFrameImpl::DidInstallConditionalFeatures(
     observer.DidInstallConditionalFeatures(context, world_id);
 }
 
@@ -103,7 +103,7 @@ index 8482d7fab12634e6b9a8d5f9bab6c7e428bb99ee..4f131fbfc9350352bce4430f92b9f2cf
   void WillInitializeWorkerContext() override;
   void WillDestroyWorkerContext(v8::Local<v8::Context> context) override;
 diff --git a/extensions/renderer/dispatcher.cc b/extensions/renderer/dispatcher.cc
-index fd3960fce4c61c5c530c817bd12e1ba1698b8db6..48a159d7d5ea57b4533fdaf38fe79a74c490207a 100644
+index df4634ffecb4b58885374199a863092bfdecf681..33e0ed7a7beae556328ec8bff5e8101acc4b3d26 100644
 --- a/extensions/renderer/dispatcher.cc
 +++ b/extensions/renderer/dispatcher.cc
@@ -530,6 +530,7 @@ void Dispatcher::DidInitializeServiceWorkerContextOnWorkerThread(
@@ -259,10 +259,10 @@ index 5a0f42b4b7e5eb67d476c948caa201ee6fc7b3ca..1a0562ad9ccfd414d6295b597b9d8094
   bool AllowScriptExtensions() override { return false; }
 
 diff --git a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope_proxy.cc b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope_proxy.cc
-index abbabcb7e2767ddef7e5bcda7812471282474260..e9e4864dbb1433d70344c58c4aeac6a906c50e02 100644
+index f8bcd6fada82f9f0d473fa02799d0218c0e53b0b..765f10c71c50f2d89f8cdaf06d07ce4a53ef298c 100644
 --- a/third_party/blink/renderer/modules/service_worker/service_worker_global_scope_proxy.cc
 +++ b/third_party/blink/renderer/modules/service_worker/service_worker_global_scope_proxy.cc
-@@ -181,6 +181,7 @@ void ServiceWorkerGlobalScopeProxy::WillEvaluateScript() {
+@@ -182,6 +182,7 @@ void ServiceWorkerGlobalScopeProxy::WillEvaluateScript() {
   ScriptState::Scope scope(
       WorkerGlobalScope()->ScriptController()->GetScriptState());
   Client().WillEvaluateScript(
--- a/patches/chromium/chore_introduce_blocking_api_for_electron.patch
+++ b/patches/chromium/chore_introduce_blocking_api_for_electron.patch
@@ -7,7 +7,7 @@ This patch comes after Chromium removed the ScopedAllowIO API in favor
 of explicitly adding ScopedAllowBlocking calls as friends.

 diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h
-index a1bb1a46029020d26d7bb88d314c5c5e5a967063..66c325724421c5315e89c0a02c19459f1dcb239d 100644
+index b53745dd0a4011fb15ab16d61f9a6effd5c03598..185520358c4839834d34b584de0e60d34afe01fc 100644
 --- a/base/threading/thread_restrictions.h
 +++ b/base/threading/thread_restrictions.h
@@ -133,6 +133,7 @@ class KeyStorageLinux;
@@ -28,7 +28,7 @@ index a1bb1a46029020d26d7bb88d314c5c5e5a967063..66c325724421c5315e89c0a02c19459f
 namespace enterprise_connectors {
 class LinuxKeyRotationCommand;
 }  // namespace enterprise_connectors
-@@ -585,6 +589,7 @@ class BASE_EXPORT ScopedAllowBlocking {
+@@ -583,6 +587,7 @@ class BASE_EXPORT ScopedAllowBlocking {
   friend class ::DesktopNotificationBalloon;
   friend class ::FirefoxProfileLock;
   friend class ::GaiaConfig;
@@ -36,7 +36,7 @@ index a1bb1a46029020d26d7bb88d314c5c5e5a967063..66c325724421c5315e89c0a02c19459f
   friend class ::ProfileImpl;
   friend class ::ScopedAllowBlockingForProfile;
 #if BUILDFLAG(IS_WIN)
-@@ -630,6 +635,7 @@ class BASE_EXPORT ScopedAllowBlocking {
+@@ -628,6 +633,7 @@ class BASE_EXPORT ScopedAllowBlocking {
   friend class cronet::CronetPrefsManager;
   friend class crypto::ScopedAllowBlockingForNSS;  // http://crbug.com/59847
   friend class drive::FakeDriveService;
--- a/patches/chromium/chore_partial_revert_of.patch
+++ b/patches/chromium/chore_partial_revert_of.patch
@@ -14,10 +14,10 @@ track down the source of this problem & figure out if we can fix it
 by changing something in Electron.

 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index aaa2b2229dac8c5e8cf590300b436082f6c3773b..e12758010f5c243d2fb9c733b74bcb0eea89f5da 100644
+index 97af9d9d374b9145e0e8a05cd5e48a621e2b0e87..a10a56827e0d277dfcc5bc8e72f90f7539ed50fd 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -5472,7 +5472,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5468,7 +5468,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
           : IsGuest();
   // While some guest types do not have a guest SiteInstance, the ones that
   // don't all override WebContents creation above.
--- a/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
+++ b/patches/chromium/chore_provide_iswebcontentscreationoverridden_with_full_params.patch
@@ -80,10 +80,10 @@ index 39fa45f0a0f9076bd7ac0be6f455dd540a276512..3d0381d463eed73470b28085830f2a23
       content::WebContents* source,
       const content::OpenURLParams& params,
 diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
-index 8f8852b2af1acfa4ec985fd1c8b50563b991b12a..c2f2903545b191c5ab13462bf330efce37d7d08c 100644
+index e7fe85a1eae545b1bdcfd81d23ec607a42f3941a..d33125fb7e76b15d68d3c88be319f5ca93f82163 100644
 --- a/chrome/browser/ui/browser.cc
 +++ b/chrome/browser/ui/browser.cc
-@@ -2310,7 +2310,8 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -2292,7 +2292,8 @@ bool Browser::IsWebContentsCreationOverridden(
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
     const std::string& frame_name,
@@ -93,7 +93,7 @@ index 8f8852b2af1acfa4ec985fd1c8b50563b991b12a..c2f2903545b191c5ab13462bf330efce
   if (HasActorTaskPreventingNewWebContents(profile(), opener)) {
     // If an ExecutionEngine is acting on the opener, prevent it from creating a
     // new WebContents. We'll instead force the navigation to happen in the same
-@@ -2323,7 +2324,7 @@ bool Browser::IsWebContentsCreationOverridden(
+@@ -2305,7 +2306,7 @@ bool Browser::IsWebContentsCreationOverridden(
   return (window_container_type ==
               content::mojom::WindowContainerType::BACKGROUND &&
           ShouldCreateBackgroundContents(source_site_instance, opener_url,
@@ -103,10 +103,10 @@ index 8f8852b2af1acfa4ec985fd1c8b50563b991b12a..c2f2903545b191c5ab13462bf330efce
 
 WebContents* Browser::CreateCustomWebContents(
 diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
-index acdb28d61badaf549c47e107f4795e1e2adc37c9..b6aca0bf802f2146d09d2a872ff9e091e659f95f 100644
+index b78f6ff36aaf1f541fedb8e2cb652f69227c506e..a8c426b0c1099822e9f2396981bf347d9318c451 100644
 --- a/chrome/browser/ui/browser.h
 +++ b/chrome/browser/ui/browser.h
-@@ -915,8 +915,7 @@ class Browser : public TabStripModelObserver,
+@@ -917,8 +917,7 @@ class Browser : public TabStripModelObserver,
       content::SiteInstance* source_site_instance,
       content::mojom::WindowContainerType window_container_type,
       const GURL& opener_url,
@@ -223,10 +223,10 @@ index b969f1d97b7e3396119b579cfbe61e19ff7d2dd4..b8d6169652da28266a514938b45b39c5
   content::WebContents* AddNewContents(
       content::WebContents* source,
 diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
-index d43e75c20aca09080f4223d339c88381f030c504..8cd59445bae73ff0193e4512d7c36740cbad847f 100644
+index e70e2ecc3d0c5563a47f7b8a38a4face1d78d6d5..3b3f3ec690311d2f6e20fee8cf280c26bef77e76 100644
 --- a/content/browser/web_contents/web_contents_impl.cc
 +++ b/content/browser/web_contents/web_contents_impl.cc
-@@ -5436,8 +5436,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
+@@ -5432,8 +5432,7 @@ FrameTree* WebContentsImpl::CreateNewWindow(
   if (delegate_ &&
       delegate_->IsWebContentsCreationOverridden(
           opener, source_site_instance, params.window_container_type,
@@ -357,7 +357,7 @@ index f459dddeb3f8f3a33ffead0e96fba791d18a0108..f7a229b186774ca3a01f2d747eab139a
       content::RenderFrameHost* opener,
       content::SiteInstance* source_site_instance,
 diff --git a/fuchsia_web/webengine/browser/frame_impl.cc b/fuchsia_web/webengine/browser/frame_impl.cc
-index 9c1fb0b2ed4f013ef6108a9844b22f6bfe697621..ef4991adc766d53b03d280395630b83ced38c2e8 100644
+index 3b50b6b3616ead57de44d309a306db09dce82c65..c709f13b7c0bac9f41cac745678aaee04c1caf46 100644
 --- a/fuchsia_web/webengine/browser/frame_impl.cc
 +++ b/fuchsia_web/webengine/browser/frame_impl.cc
@@ -585,8 +585,7 @@ bool FrameImpl::IsWebContentsCreationOverridden(
@@ -399,10 +399,10 @@ index ae616fa9c352413e23fb509b3e12e0e4fab5a094..0efa65f7d4346cfe78d2f27ba55a0526
         ->options()
         ->block_new_web_contents();
 diff --git a/ui/views/controls/webview/web_dialog_view.cc b/ui/views/controls/webview/web_dialog_view.cc
-index a7d370220136f2c31afd70644ada26f1768b2e0d..e08dd61b20c68398b0532f5ae74e0ffd5968c19b 100644
+index 20555af0857f1e8ea8227d71245fb95c5e95679a..a6df69bc877046214bf693ceff3c60036e8767ed 100644
 --- a/ui/views/controls/webview/web_dialog_view.cc
 +++ b/ui/views/controls/webview/web_dialog_view.cc
-@@ -490,8 +490,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
+@@ -489,8 +489,7 @@ bool WebDialogView::IsWebContentsCreationOverridden(
     content::SiteInstance* source_site_instance,
     content::mojom::WindowContainerType window_container_type,
     const GURL& opener_url,
--- a/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
+++ b/patches/chromium/create_browser_v8_snapshot_file_name_fuse.patch
@@ -7,12 +7,12 @@ By default, chromium sets up one v8 snapshot to be used in all v8 contexts. This
 to have a dedicated browser process v8 snapshot defined by the file `browser_v8_context_snapshot.bin`.

 diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc
-index e795339c000cf695ca05c6d3c736678fa47df21e..bbcad80a8efdac88c26ececeaf4023152631b662 100644
+index b795a9dbf898570a7cd8469ee386c4edf4bfa275..449940fe1b6969576f1b2c21d7719620e578e8a8 100644
 --- a/content/app/content_main_runner_impl.cc
 +++ b/content/app/content_main_runner_impl.cc
-@@ -261,8 +261,13 @@ std::string GetSnapshotDataDescriptor(const base::CommandLine& command_line) {
- 
- #endif
+@@ -277,8 +277,13 @@ void AsanProcessInfoCB(const char* reason,
+ }
+ #endif  // defined(ADDRESS_SANITIZER)
 
 -void LoadV8SnapshotFile(const base::CommandLine& command_line) {
 +void LoadV8SnapshotFile(const raw_ptr<ContentMainDelegate> delegate, const base::CommandLine& command_line) {
@@ -79,10 +79,10 @@ index 8c318a31454c57b0e8db3770a36c45be427f053c..6f809c9672448ed9797e3c9da492ad2c
   friend class ContentClientCreator;
   friend class ContentClientInitializer;
 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index cd1f308815685d28c506b5c9eb87b24107fa220b..58b708b0f7716f0d12ad1135ba65125cab1303a4 100644
+index 136e728c4c7981c9180304a43d75b2f003161664..aef4af8ce2a3352535a1ea2f4777e839c4811817 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -630,8 +630,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
+@@ -634,8 +634,7 @@ void V8Initializer::GetV8ExternalSnapshotData(const char** snapshot_data_out,
 
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA)
 
@@ -92,7 +92,7 @@ index cd1f308815685d28c506b5c9eb87b24107fa220b..58b708b0f7716f0d12ad1135ba65125c
   if (g_mapped_snapshot) {
     // TODO(crbug.com/40558459): Confirm not loading different type of snapshot
     // files in a process.
-@@ -640,10 +639,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
+@@ -644,10 +643,17 @@ void V8Initializer::LoadV8Snapshot(V8SnapshotFileType snapshot_file_type) {
 
   base::MemoryMappedFile::Region file_region;
   base::File file =
--- a/patches/chromium/disable_compositor_recycling.patch
+++ b/patches/chromium/disable_compositor_recycling.patch
@@ -6,10 +6,10 @@ Subject: fix: disabling compositor recycling
 Compositor recycling is useful for Chrome because there can be many tabs and spinning up a compositor for each one would be costly. In practice, Chrome uses the parent compositor code path of browser_compositor_view_mac.mm; the NSView of each tab is detached when it's hidden and attached when it's shown. For Electron, there is no parent compositor, so we're forced into the "own compositor" code path, which seems to be non-optimal and pretty ruthless in terms of the release of resources. Electron has no real concept of multiple tabs per window, so it should be okay to disable this ruthless recycling altogether in Electron.

 diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
-index 886b3e87e9041931d3cb59ef775b5012e8e2f908..9287bde2d8c0eaa00c29fca974111b3f32b6e813 100644
+index 0747a20b283151a75c524dc0fa74c7b799725e54..7541f191cc20c10a6bb85a7bd5f3eaa71051a519 100644
 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
 +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
-@@ -597,7 +597,11 @@
+@@ -592,7 +592,11 @@
   }
 
   host()->WasHidden();
--- a/patches/chromium/disable_hidden.patch
+++ b/patches/chromium/disable_hidden.patch
@@ -6,10 +6,10 @@ Subject: disable_hidden.patch
 Electron uses this to disable background throttling for hidden windows.

 diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc
-index fe46ebe4e5bcda2eff543aa5b5a2310628a3ea5a..8df679251dc314a94079fcc9d4edd7fab12873d4 100644
+index be97442111503ac8ca75171f2d195a0a18f9d7eb..5e7d992ba2144d32f8eb1c6fa5233c68954318e1 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.cc
 +++ b/content/browser/renderer_host/render_widget_host_impl.cc
-@@ -818,6 +818,10 @@ void RenderWidgetHostImpl::WasHidden() {
+@@ -810,6 +810,10 @@ void RenderWidgetHostImpl::WasHidden() {
     return;
   }
 
@@ -21,10 +21,10 @@ index fe46ebe4e5bcda2eff543aa5b5a2310628a3ea5a..8df679251dc314a94079fcc9d4edd7fa
   // Prompts should remain open and functional across tab switches.
   if (!delegate_ || !delegate_->IsWaitingForPointerLockPrompt(this)) {
 diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
-index 37b2ca1000ead76ec7e403bf1e2dc647bcee74ce..1312c87909729ac59ea661321c10862f34072f95 100644
+index 8fc7d892a54e0890e86b01713f0cf6b75aa14ab0..d60b540934b290e9303b1dacfa990e85ce47b4e0 100644
 --- a/content/browser/renderer_host/render_widget_host_impl.h
 +++ b/content/browser/renderer_host/render_widget_host_impl.h
-@@ -1059,6 +1059,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl
+@@ -1042,6 +1042,8 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 
   base::TimeDelta GetHungRendererDelayForTesting();
 
@@ -34,10 +34,10 @@ index 37b2ca1000ead76ec7e403bf1e2dc647bcee74ce..1312c87909729ac59ea661321c10862f
   // |routing_id| must not be IPC::mojom::kRoutingIdNone.
   // If this object outlives |delegate|, DetachDelegate() must be called when
 diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc
-index 550a2090d11ea151d8003610cb39a8035c5d299c..53ec5cd693539d74424c683f78e953e85c13c098 100644
+index 95f75a24fa3e799dc4227e6438b1d0cc316ba4b9..79bd8d43a71731e5076196877448462656a04d48 100644
 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc
 +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -712,7 +712,7 @@ void RenderWidgetHostViewAura::HideImpl() {
+@@ -719,7 +719,7 @@ void RenderWidgetHostViewAura::HideImpl() {
   CHECK(visibility_ == Visibility::HIDDEN ||
         visibility_ == Visibility::OCCLUDED);
 
--- a/patches/chromium/expose_setuseragent_on_networkcontext.patch
+++ b/patches/chromium/expose_setuseragent_on_networkcontext.patch
@@ -33,10 +33,10 @@ index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d4
 
 }  // namespace net
 diff --git a/services/network/network_context.cc b/services/network/network_context.cc
-index cf1001557f2f59747ceb394ab2c93b4bf379dafb..2e16a8d19e1ccfbfc838ed33ecac3375f1e81b17 100644
+index 4efd5407479b9e5ee6af84a4cd6d26895d8b19f7..498c877f3f159729eae4857b5210b913eec962d0 100644
 --- a/services/network/network_context.cc
 +++ b/services/network/network_context.cc
-@@ -1994,6 +1994,13 @@ void NetworkContext::SetNetworkConditions(
+@@ -1965,6 +1965,13 @@ void NetworkContext::SetNetworkConditions(
                                       std::move(network_conditions));
 }
 
@@ -51,10 +51,10 @@ index cf1001557f2f59747ceb394ab2c93b4bf379dafb..2e16a8d19e1ccfbfc838ed33ecac3375
   // This may only be called on NetworkContexts created with the constructor
   // that calls MakeURLRequestContext().
 diff --git a/services/network/network_context.h b/services/network/network_context.h
-index 04e6e884dccbb680a39f2b9c8a54de162e056a30..672dd48040586190b761e2db554ba0767d254f62 100644
+index 912e4d60647f6376dfef62d18998b556bc7efa32..53082e9f0bfb98c1267fc034fa34e157b4c04d9b 100644
 --- a/services/network/network_context.h
 +++ b/services/network/network_context.h
-@@ -332,6 +332,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
+@@ -331,6 +331,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
   void SetNetworkConditions(
       const base::UnguessableToken& throttling_profile_id,
       std::vector<mojom::MatchedNetworkConditionsPtr> conditions) override;
@@ -63,10 +63,10 @@ index 04e6e884dccbb680a39f2b9c8a54de162e056a30..672dd48040586190b761e2db554ba076
   void SetEnableReferrers(bool enable_referrers) override;
 #if BUILDFLAG(IS_CT_SUPPORTED)
 diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
-index 6c43c2985123525793dd6b60c9d7d7c1db7fdf04..7493bd8dd37b36a3e7a96b1373619fee0b6a9d8e 100644
+index 63d410dd356594a5928ed2f84b05b403bf3367f0..ca47c9cb58d5d69faade9f85d1e63683d79cb5e3 100644
 --- a/services/network/public/mojom/network_context.mojom
 +++ b/services/network/public/mojom/network_context.mojom
-@@ -1299,6 +1299,9 @@ interface NetworkContext {
+@@ -1291,6 +1291,9 @@ interface NetworkContext {
   SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id,
                        array<MatchedNetworkConditions> conditions);
 
@@ -77,7 +77,7 @@ index 6c43c2985123525793dd6b60c9d7d7c1db7fdf04..7493bd8dd37b36a3e7a96b1373619fee
   SetAcceptLanguage(string new_accept_language);
 
 diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
-index b472be0acdc0cd4971e6e0a9e623bc1c84d07a02..f328a3aa2df9f5c6163a5023a5df157350d3707f 100644
+index bc26f449109b3be84490fbb3569e36aa4aca8c4b..d273faec6c235cb7d29f0f7fb90affdca7240e51 100644
 --- a/services/network/test/test_network_context.h
 +++ b/services/network/test/test_network_context.h
@@ -156,6 +156,7 @@ class TestNetworkContext : public mojom::NetworkContext {
--- a/patches/chromium/extend_apply_webpreferences.patch
+++ b/patches/chromium/extend_apply_webpreferences.patch
@@ -15,7 +15,7 @@ Ideally we could add an embedder observer pattern here but that can be
 done in future work.

 diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
-index ed63aa041733e2fb09d77a219c93c322985cc81e..ea23d47128d4e974353ea5a976a72d4fa0600e2b 100644
+index be26284387dcfa4e72592862f313a2c7e9a81d1b..efe1cbfcb6f39f4bf744dd830281bf528ebd1659 100644
 --- a/third_party/blink/renderer/core/exported/web_view_impl.cc
 +++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -1855,6 +1855,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
--- a/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
+++ b/patches/chromium/feat_add_streaming-protocol_registry_to_multibuffer_data_source.patch
@@ -17,11 +17,11 @@ which removed range-requests-supported on non-http protocols. See https://issues
 for more information.

 diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
-index 0af2ad19954bd868f6b92616da869b350f088103..efc53247962f166f2b441f76c7a2c94d8ceb979a 100644
+index f697f85d7e3e9eeeab249a6d4e8ef8383c5c0d72..a5f35e7782c047b147458e569924de0fd30db7ce 100644
 --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
 +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.cc
-@@ -12,8 +12,10 @@
- #include "base/functional/callback_helpers.h"
+@@ -11,8 +11,10 @@
+ #include "base/containers/adapters.h"
 #include "base/location.h"
 #include "base/memory/raw_span.h"
 +#include "base/no_destructor.h"
@@ -31,7 +31,7 @@ index 0af2ad19954bd868f6b92616da869b350f088103..efc53247962f166f2b441f76c7a2c94d
 #include "media/base/media_log.h"
 #include "net/base/net_errors.h"
 #include "third_party/blink/renderer/platform/media/buffered_data_source_host_impl.h"
-@@ -70,6 +72,10 @@ constexpr base::TimeDelta kSeekDelay = base::Milliseconds(20);
+@@ -69,6 +71,10 @@ constexpr base::TimeDelta kSeekDelay = base::Milliseconds(20);
 
 }  // namespace
 
@@ -42,7 +42,7 @@ index 0af2ad19954bd868f6b92616da869b350f088103..efc53247962f166f2b441f76c7a2c94d
 class MultiBufferDataSource::ReadOperation {
  public:
   ReadOperation() = delete;
-@@ -137,13 +143,29 @@ MultiBufferDataSource::~MultiBufferDataSource() {
+@@ -136,13 +142,29 @@ MultiBufferDataSource::~MultiBufferDataSource() {
   DCHECK(render_task_runner_->BelongsToCurrentThread());
 }
 
@@ -74,18 +74,18 @@ index 0af2ad19954bd868f6b92616da869b350f088103..efc53247962f166f2b441f76c7a2c94d
 
 void MultiBufferDataSource::SetReader(
 diff --git a/third_party/blink/renderer/platform/media/multi_buffer_data_source.h b/third_party/blink/renderer/platform/media/multi_buffer_data_source.h
-index 470b6015dad4063375175324f49afb3548cdf0dd..61b633d65eaa76f98fd0d858d490b12077646ad2 100644
+index 5100bd21163f9ceadb728ed5306dcf8320e528a8..c2ee03ca6a75a2fef1ce778e663a74bda608acb4 100644
 --- a/third_party/blink/renderer/platform/media/multi_buffer_data_source.h
 +++ b/third_party/blink/renderer/platform/media/multi_buffer_data_source.h
-@@ -19,6 +19,7 @@
+@@ -18,6 +18,7 @@
 #include "media/base/data_source.h"
 #include "media/base/ranges.h"
 #include "media/base/tuneable.h"
 +#include "third_party/blink/public/platform/web_common.h"
- #include "third_party/blink/renderer/platform/media/buffered_data_source_host_impl.h"
 #include "third_party/blink/renderer/platform/media/url_index.h"
 #include "third_party/blink/renderer/platform/platform_export.h"
-@@ -37,6 +38,8 @@ namespace blink {
+ #include "third_party/blink/renderer/platform/wtf/vector.h"
+@@ -35,6 +36,8 @@ namespace blink {
 class BufferedDataSourceHost;
 class MultiBufferReader;
 
@@ -94,7 +94,7 @@ index 470b6015dad4063375175324f49afb3548cdf0dd..61b633d65eaa76f98fd0d858d490b120
 // A data source capable of loading URLs and buffering the data using an
 // in-memory sliding window.
 //
-@@ -94,6 +97,8 @@ class PLATFORM_EXPORT MultiBufferDataSource
+@@ -64,6 +67,8 @@ class PLATFORM_EXPORT MultiBufferDataSource
     return url_data_->mime_type();
   }
 
--- a/patches/chromium/feat_add_support_for_embedder_snapshot_validation.patch
+++ b/patches/chromium/feat_add_support_for_embedder_snapshot_validation.patch
@@ -6,10 +6,10 @@ Subject: feat: add support for embedder snapshot validation
 IsValid is not exposed despite being commented as for embedders, this exposes something that works for us.

 diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc
-index 58b708b0f7716f0d12ad1135ba65125cab1303a4..eefaec3dac8de00ec89f4310cbc3fc91e84b3961 100644
+index aef4af8ce2a3352535a1ea2f4777e839c4811817..d5d861292c399a18ec0af66e2d726619c939875e 100644
 --- a/gin/v8_initializer.cc
 +++ b/gin/v8_initializer.cc
-@@ -75,11 +75,23 @@ bool GenerateEntropy(unsigned char* buffer, size_t amount) {
+@@ -76,11 +76,23 @@ bool GenerateEntropy(unsigned char* buffer, size_t amount) {
   return true;
 }
 
@@ -33,7 +33,7 @@ index 58b708b0f7716f0d12ad1135ba65125cab1303a4..eefaec3dac8de00ec89f4310cbc3fc91
   } else {
     data->data = nullptr;
     data->raw_size = 0;
-@@ -225,6 +237,10 @@ constexpr std::string_view kV8FlagParam = "V8FlagParam";
+@@ -226,6 +238,10 @@ constexpr std::string_view kV8FlagParam = "V8FlagParam";
 
 }  // namespace
 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sam Attard	225fc5aa08	chore: update lockfile	2026-04-05 05:46:21 +00:00
Sam Attard	43d61d4cd0	build: typecheck the Electron lib tree with tsgo during ninja Adds a GN typescript_check template that runs tsgo --noEmit over a tsconfig and writes a stamp file on success, wired into BUILD.gn as electron_lib_typecheck. electron_js2c depends on it so a broken type in lib/ fails 'e build'. tsgo (@typescript/native-preview, the Go-based TypeScript compiler preview) runs the full lib/ typecheck in ~400ms, about 6x faster than tsc 6.0.2 (~2.3s). ts-loader previously typechecked implicitly inside webpack and was removed in the esbuild migration, so this restores typecheck coverage that was briefly absent on the bundle build path. Because tsgo has no 'ignoreDiagnostics' option like ts-loader's, the previously-silenced TS6059 and TS1111 errors needed to be fixed properly: - tsconfig.electron.json drops 'rootDir: "lib"'. It was only meaningful for emit, and the TS 6 implicit rootDir inference plus the @node/* path alias was pulling Node's internal .js files (specifically internal/url.js with its #searchParams brand check) into the program. - tsconfig.json drops the @node/* path alias entirely. Every call site that used 'as typeof import("@node/lib/...")' is replaced with narrow structural types declared once in an ambient NodeInternalModules interface in typings/internal-ambient.d.ts. __non_webpack_require__ becomes an overloaded function that picks the right return type from a string-literal id argument, so call sites no longer need 'as' casts. - tsconfig.default_app.json: moduleResolution 'node' -> 'bundler' (TS 6 deprecates 'node'). - typings/internal-ambient.d.ts: 'declare module NodeJS { }' -> 'declare namespace NodeJS { }' (TS 6 rejects the module keyword for non-external declarations). spec/ts-smoke/runner.js now invokes tsgo's bin instead of resolving the 'typescript' package. The 'tsc' npm script is repointed from 'tsc' to 'tsgo' so the existing CI step 'node script/yarn.js tsc -p tsconfig.script.json' continues to run. A small script/typecheck.js wrapper runs tsgo and writes the stamp file for GN; the typescript_check template invokes it via a new 'tsc-check' npm script.	2026-04-05 05:46:21 +00:00
Sam Attard	646dfd24f7	build: replace webpack with esbuild for internal JS bundles Replaces the webpack+ts-loader based bundler for Electron's 8 internal init bundles (browser, renderer, worker, sandboxed_renderer, isolated_renderer, node, utility, preload_realm) with a plain esbuild driver under build/esbuild/. GN template now lives at build/esbuild/esbuild.gni and is invoked via a new 'bundle' npm script. Per-target configs move from build/webpack/webpack.config.<target>.js to small data-only files under build/esbuild/configs/. ProvidePlugin's global/Buffer/process/Promise capture moves to inject-shims under build/esbuild/shims/. The wrapper-webpack-plugin try/catch and ___electron_webpack_init__ wrappers are applied as textual pre/postamble inside the driver so shell/common/node_util.cc's CompileAndCall error handling still works. The old BUILDFLAG DefinePlugin pass is replaced with a small onLoad regex that rewrites BUILDFLAG(NAME) to (true\|false) using the GN-generated buildflags.h. AccessDependenciesPlugin (used by gen-filenames.ts to populate filenames.auto.gni) is replaced with esbuild's built-in metafile via a new '--print-graph' flag. A few source files needed small fixes to work under esbuild's stricter CJS/ESM interop: - lib/browser/api/net.ts and lib/utility/api/net.ts mixed ESM 'export function' with 'exports.x = ...' assignments, which esbuild treats as an ambiguous module. Switched to a single 'module.exports = {}' with a getter for the dynamic 'online' property. - lib/common/timers-shim.ts is untouched; lib/common/init.ts no longer mutates the imported timers namespace (timers.setImmediate = wrap(...)). Under webpack the mutation applied to the bundled shim and was invisible to user apps; the refactor stores the wrapped values in local consts instead. Drops webpack, webpack-cli, ts-loader, null-loader, and wrapper-webpack-plugin from devDependencies. Adds esbuild. Sequential build time for the 8 bundles drops from ~22s (webpack) to ~480ms (esbuild).	2026-04-05 05:46:21 +00:00
Sam Attard	f89c8efc9d	fix: defer Wrappable destruction in SecondWeakCallback to a posted task V8's second-pass weak callbacks run inside a DisallowJavascriptExecutionScope: they may touch the V8 API but must not invoke JS, directly or indirectly. Several Electron Wrappables (WebContents in particular) emit JS events from their destructors, so deleting synchronously inside SecondWeakCallback can crash with "Invoke in DisallowJavascriptExecutionScope" when GC happens to collect the JS wrapper during a foreground GC task — typically during shutdown's uv_run drain after a leaked WebContentsView. This was previously latent and timing-dependent (electron/electron#47420, electron/electron#45416, podman-desktop/podman-desktop#12409). The esbuild migration's keepNames option (which wraps every function/class with an Object.defineProperty call) shifted heap layout enough to make the spec/fixtures/crash-cases/webcontentsview-create-leak-exit case reliably reproduce it on every run, giving a clean signal for the fix. Both WrappableBase and DeprecatedWrappableBase SecondWeakCallback now post the deletion via base::SequencedTaskRunner::GetCurrentDefault() so the destructor (and any Emit it does) runs once V8 has left the GC scope. Falls back to synchronous deletion if no task runner is available (early/late process lifetime). Fixes electron/electron#47420.	2026-04-05 05:46:19 +00:00