refactor: Allow PostDelayedTasks() to be called from another thread

refactor: Add UvTaskRunner::Shutdown()

.eslintrc.json

@@ -19,40 +19,7 @@
     "prefer-const": ["error", {
       "destructuring": "all"
     }],
-    "n/no-callback-literal": "off",
-    "import/newline-after-import": "error",
-    "import/order": ["error", {
-      "alphabetize": {
-        "order": "asc"
-      },
-      "newlines-between": "always",
-      "pathGroups": [
-        {
-          "pattern": "@electron/internal/**",
-          "group": "external",
-          "position": "before"
-        },
-        {
-          "pattern": "@electron/**",
-          "group": "external",
-          "position": "before"
-        },
-        {
-          "pattern": "{electron,electron/**}",
-          "group": "external",
-          "position": "before"
-        }
-      ],
-      "pathGroupsExcludedImportTypes": [],
-      "distinctGroup": true,
-      "groups": [
-        "external",
-        "builtin",
-        ["sibling", "parent"],
-        "index",
-        "type"
-      ]
-    }]
+    "standard/no-callback-literal": "off"
   },
   "parserOptions": {
     "ecmaVersion": 6,

.gitattributes

@@ -1,9 +1,6 @@
 # `git apply` and friends don't understand CRLF, even on windows. Force those
 # files to be checked out with LF endings even if core.autocrlf is true.
 *.patch text eol=lf
-DEPS text eol=lf
-yarn.lock text eol=lf
-script/zip_manifests/*.manifest text eol=lf
 patches/**/.patches merge=union
 
 # Source code and markdown files should always use LF as line ending.

.github/actions/build-electron/action.yml

@@ -8,7 +8,7 @@ inputs:
     description: 'Target platform'
     required: true
   artifact-platform:
-    description: 'Artifact platform, should be linux, windows, darwin or mas'
+    description: 'Artifact platform, should be linux, darwin or mas'
     required: true
   step-suffix:
     description: 'Suffix for build steps'
@@ -71,22 +71,18 @@ runs:
         cd src
         e build --target electron:electron_dist_zip -j $NUMBER_OF_NINJA_PROCESSES
         if [ "${{ inputs.is-asan }}" != "true" ]; then
-          target_os=${{ inputs.target-platform == 'linux' && 'linux' || (inputs.target-platform == 'windows' && 'win' || 'mac') }}
+          target_os=${{ inputs.target-platform == 'linux' && 'linux' || 'mac'}}
           if [ "${{ inputs.artifact-platform }}" = "mas" ]; then
             target_os="${target_os}_mas"
           fi
-          target_arch=${{ inputs.target-arch }}
-          if [ "${{ inputs.target-arch }}" = "x86" ]; then
-            target_arch="ia32"
-          fi
-          electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.$target_os.$target_arch.manifest
+          electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.$target_os.${{ inputs.target-arch }}.manifest
         fi
     - name: Build Mksnapshot ${{ inputs.step-suffix }}
       shell: bash
       run: |
         cd src
         e build --target electron:electron_mksnapshot -j $NUMBER_OF_NINJA_PROCESSES
-        ELECTRON_DEPOT_TOOLS_DISABLE_LOG=1 e d gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
+        gn desc out/Default v8:run_mksnapshot_default args > out/Default/mksnapshot_args
         # Remove unused args from mksnapshot_args
         SEDOPTION="-i"
         if [ "`uname`" = "Darwin" ]; then
@@ -95,7 +91,7 @@ runs:
         sed $SEDOPTION '/.*builtins-pgo/d' out/Default/mksnapshot_args
         sed $SEDOPTION '/--turbo-profiling-input/d' out/Default/mksnapshot_args
 
-        if [ "${{ inputs.target-platform }}" = "linux" ]; then
+        if [ "`uname`" = "Linux" ]; then
           if [ "${{ inputs.target-arch }}" = "arm" ]; then
             electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/mksnapshot
             electron/script/strip-binaries.py --file $PWD/out/Default/clang_x86_v8_arm/v8_context_snapshot_generator
@@ -109,13 +105,7 @@ runs:
         fi
 
         e build --target electron:electron_mksnapshot_zip -j $NUMBER_OF_NINJA_PROCESSES
-        if [ "${{ inputs.target-platform }}" = "windows" ]; then
-          cd out/Default
-          powershell Compress-Archive -update mksnapshot_args mksnapshot.zip
-          powershell Compress-Archive -update gen/v8/embedded.S mksnapshot.zip
-        else
-          (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
-        fi
+        (cd out/Default; zip mksnapshot.zip mksnapshot_args gen/v8/embedded.S)
     - name: Generate Cross-Arch Snapshot (arm/arm64)  ${{ inputs.step-suffix }}
       shell: bash
       if: ${{ (inputs.target-arch == 'arm' || inputs.target-arch == 'arm64') && inputs.target-platform == 'linux' }}

.github/actions/checkout/action.yml

@@ -5,10 +5,6 @@ inputs:
     description: 'Whether to generate and persist a SAS token for the item in the cache'
     required: false
     default: 'false'
-  use-cache:
-    description: 'Whether to persist the cache to the shared drive'
-    required: false
-    default: 'true'
 runs:
   using: "composite"
   steps:
@@ -21,31 +17,27 @@ runs:
     run: |
       cd src/electron
       node script/yarn install --frozen-lockfile
-  - name: Install Build Tools
-    uses: ./src/electron/.github/actions/install-build-tools
   - name: Get Depot Tools
     shell: bash
     run: |
-      if [[ ! -d depot_tools ]]; then
-        git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
+      git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git
 
-        sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
-        # Remove swift-format dep from cipd on macOS until we send a patch upstream.
-        cd depot_tools
-        git apply --3way ../src/electron/.github/workflows/config/gclient.diff
+      sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja
+      # Remove swift-format dep from cipd on macOS until we send a patch upstream.
+      cd depot_tools
+      git apply --3way ../src/electron/.github/workflows/config/gclient.diff
 
-        # Ensure depot_tools does not update.
-        test -d depot_tools && cd depot_tools
-        touch .disable_auto_update
-      fi
+      # Ensure depot_tools does not update.
+      test -d depot_tools && cd depot_tools
+      touch .disable_auto_update
   - name: Add Depot Tools to PATH
     shell: bash
     run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
   - name: Generate DEPS Hash
     shell: bash
     run: |
-      node src/electron/script/generate-deps-hash.js
-      echo "DEPSHASH=v1-src-cache-$(cat src/electron/.depshash)" >> $GITHUB_ENV
+      node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
+      echo "DEPSHASH=v1-src-cache-$(shasum src/electron/.depshash | cut -f1 -d' ')" >> $GITHUB_ENV
   - name: Generate SAS Key
     if: ${{ inputs.generate-sas-token == 'true' }}
     shell: bash
@@ -62,36 +54,27 @@ runs:
     id: check-cache
     shell: bash
     run: |
-      if [[ "${{ inputs.use-cache }}" == "false" ]]; then
-        echo "Not using cache this time..."
+      cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
+      echo "Using cache key: $DEPSHASH"
+      echo "Checking for cache in: $cache_path"
+      if [ ! -f "$cache_path" ]; then
         echo "cache_exists=false" >> $GITHUB_OUTPUT
+        echo "Cache Does Not Exist for $DEPSHASH"
       else
-        cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar
-        echo "Using cache key: $DEPSHASH"
-        echo "Checking for cache in: $cache_path"
-        if [ ! -f "$cache_path" ]; then
-          echo "cache_exists=false" >> $GITHUB_OUTPUT
-          echo "Cache Does Not Exist for $DEPSHASH"
-        else
-          echo "cache_exists=true" >> $GITHUB_OUTPUT
-          echo "Cache Already Exists for $DEPSHASH, Skipping.."
-        fi
+        echo "cache_exists=true" >> $GITHUB_OUTPUT
+        echo "Cache Already Exists for $DEPSHASH, Skipping.."
       fi
   - name: Gclient Sync
     if: steps.check-cache.outputs.cache_exists == 'false'
     shell: bash
     run: |
-      e d gclient config \
+      gclient config \
         --name "src/electron" \
         --unmanaged \
         ${GCLIENT_EXTRA_ARGS} \
         "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY"
 
-      if [ "$TARGET_OS" != "" ]; then
-        echo "target_os=['$TARGET_OS']" >> ./.gclient
-      fi
-
-      ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 e d gclient sync --with_branch_heads --with_tags -vv
+      ELECTRON_USE_THREE_WAY_MERGE_FOR_PATCHES=1 gclient sync --with_branch_heads --with_tags -vvvvv
       if [ "${{ inputs.is-release }}" != "true" && -n "${{ env.PATCH_UP_APP_CREDS }}" ]; then
         # Re-export all the patches to check if there were changes.
         python3 src/electron/script/export_all_patches.py src/electron/patches/config.json
@@ -132,13 +115,13 @@ runs:
   # https://dawn-review.googlesource.com/c/dawn/+/83901
   # TODO: maybe better to always leave out */.git/HEAD file for all targets ?
   - name: Delete .git directories under src to free space
-    if: ${{ steps.check-cache.outputs.cache_exists == 'false' && inputs.use-cache == 'true' }}
+    if: steps.check-cache.outputs.cache_exists == 'false'
     shell: bash
     run: |
       cd src
       ( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" -not -path "./electron/*" ) | xargs rm -rf
   - name: Minimize Cache Size for Upload
-    if: ${{ steps.check-cache.outputs.cache_exists == 'false' && inputs.use-cache == 'true' }}
+    if: steps.check-cache.outputs.cache_exists == 'false'
     shell: bash
     run: |
       rm -rf src/android_webview
@@ -149,12 +132,9 @@ runs:
       rm -rf src/third_party/angle/third_party/VK-GL-CTS/src
       rm -rf src/third_party/swift-toolchain
       rm -rf src/third_party/swiftshader/tests/regres/testlists
-      cp src/electron/.github/actions/checkout/action.yml ./
       rm -rf src/electron
-      mkdir -p src/electron/.github/actions/checkout
-      mv action.yml src/electron/.github/actions/checkout
   - name: Compress Src Directory
-    if: ${{ steps.check-cache.outputs.cache_exists == 'false' && inputs.use-cache == 'true' }}
+    if: steps.check-cache.outputs.cache_exists == 'false'
     shell: bash
     run: |
       echo "Uncompressed src size: $(du -sh src | cut -f1 -d' ')"
@@ -162,7 +142,7 @@ runs:
       echo "Compressed src to $(du -sh $DEPSHASH.tar | cut -f1 -d' ')"
       cp ./$DEPSHASH.tar /mnt/cross-instance-cache/
   - name: Persist Src Cache
-    if: ${{ steps.check-cache.outputs.cache_exists == 'false' && inputs.use-cache == 'true' }}
+    if: steps.check-cache.outputs.cache_exists == 'false'
     shell: bash
     run: |
       final_cache_path=/mnt/cross-instance-cache/$DEPSHASH.tar

.github/actions/generate-types/action.yml

@@ -1,24 +0,0 @@
-name: 'Generate Types for Archaeologist Dig'
-description: 'Generate Types for Archaeologist Dig'
-inputs:
-  sha-file:
-    description: 'File containing sha'
-    required: true
-  filename:
-    description: 'Filename to write types to'
-    required: true
-runs:
-  using: "composite"
-  steps:
-  - name: Generating Types for SHA in ${{ inputs.sha-file }}
-    shell: bash
-    run: |
-      git checkout $(cat ${{ inputs.sha-file }})
-      rm -rf node_modules
-      yarn install --frozen-lockfile --ignore-scripts
-      echo "#!/usr/bin/env node\nglobal.x=1" > node_modules/typescript/bin/tsc
-      node node_modules/.bin/electron-docs-parser --dir=./ --outDir=./ --moduleVersion=0.0.0-development
-      node node_modules/.bin/electron-typescript-definitions --api=electron-api.json --outDir=artifacts
-      mv artifacts/electron.d.ts artifacts/${{ inputs.filename }}
-      git checkout .
-    working-directory: ./electron

.github/actions/install-build-tools/action.yml

@@ -6,15 +6,6 @@ runs:
   - name: Install Build Tools
     shell: bash
     run: |
-      if [ "$(expr substr $(uname -s) 1 10)" == "MSYS_NT-10" ]; then
-        git config --global core.filemode false
-        git config --global core.autocrlf false
-        git config --global branch.autosetuprebase always
-      fi
-      export BUILD_TOOLS_SHA=c3e81edd054e26ec95167b6d87fe5add11dc79e6
+      export BUILD_TOOLS_SHA=d5b87591842be19058e8d75d2c5b7f1fabe9f450
       npm i -g @electron/build-tools
       e auto-update disable
-      if [ "$(expr substr $(uname -s) 1 10)" == "MSYS_NT-10" ]; then
-        e d cipd.bat --version
-        cp "C:\Python37\python.exe" "C:\Python37\python3.exe"
-      fi

.github/dependabot.yml

@@ -10,59 +10,3 @@ updates:
     labels:
       - "no-backport"
       - "semver/none"
-    target-branch: main
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "no-backport"
-    open-pull-requests-limit: 2
-    target-branch: main
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "backport-check-skip"
-    open-pull-requests-limit: 0
-    target-branch: 33-x-y
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "backport-check-skip"
-    open-pull-requests-limit: 0
-    target-branch: 32-x-y
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "backport-check-skip"
-    open-pull-requests-limit: 0
-    target-branch: 31-x-y
-  - package-ecosystem: npm
-    directories:
-      - /
-      - /spec
-      - /npm
-    schedule:
-      interval: daily
-    labels:
-      - "backport-check-skip"
-    open-pull-requests-limit: 0
-    target-branch: 30-x-y

.github/workflows/archaeologist-dig.yml

@@ -1,61 +0,0 @@
-name: Archaeologist
-
-on:
-  pull_request:
-
-jobs:
-   archaeologist-dig:
-    name: Archaeologist Dig
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Electron
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 #v4.0.2
-        with:
-          fetch-depth: 0
-      - name: Setting Up Dig Site
-        run: |
-          echo "remote: ${{ github.event.pull_request.head.repo.clone_url }}"
-          echo "sha ${{ github.event.pull_request.head.sha }}"
-          echo "base ref ${{ github.event.pull_request.base.ref }}"
-          git clone https://github.com/electron/electron.git electron          
-          cd electron
-          mkdir -p artifacts
-          git remote add fork ${{ github.event.pull_request.head.repo.clone_url }} && git fetch fork
-          git checkout  ${{ github.event.pull_request.head.sha }}
-          git merge-base origin/${{ github.event.pull_request.base.ref }} HEAD > .dig-old
-          echo  ${{ github.event.pull_request.head.sha }} > .dig-new
-          cp .dig-old artifacts
-
-      - name: Generating Types for SHA in .dig-new
-        uses: ./.github/actions/generate-types
-        with:
-          sha-file: .dig-new
-          filename: electron.new.d.ts
-      - name: Generating Types for SHA in .dig-old
-        uses: ./.github/actions/generate-types
-        with:
-          sha-file: .dig-old
-          filename: electron.old.d.ts
-      - name: Upload artifacts
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 #v4.4.0
-        with:
-          name: artifacts
-          path: electron/artifacts
-          include-hidden-files: true
-      - name: Set job output
-        run: |
-          git diff --no-index electron.old.d.ts electron.new.d.ts > patchfile || true
-          if [ -s patchfile ]; then
-            echo "Changes Detected"
-            echo "## Changes Detected" > $GITHUB_STEP_SUMMARY
-            echo "Looks like the \`electron.d.ts\` file changed." >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "\`\`\`\`\`\`diff" >> $GITHUB_STEP_SUMMARY
-            cat patchfile >> $GITHUB_STEP_SUMMARY
-            echo "\`\`\`\`\`\`" >> $GITHUB_STEP_SUMMARY    
-          else
-            echo "No Changes Detected"
-            echo "## No Changes" > $GITHUB_STEP_SUMMARY
-            echo "We couldn't see any changes in the \`electron.d.ts\` artifact" >> $GITHUB_STEP_SUMMARY
-          fi
-        working-directory: ./electron/artifacts

.github/workflows/build.yml

@@ -18,11 +18,6 @@ on:
         description: 'Skip Linux builds'
         default: false
         required: false
-      skip-windows:
-        type: boolean
-        description: 'Skip Windows builds'
-        default: false
-        required: false
       skip-lint:
         type: boolean
         description: 'Skip lint check'
@@ -33,11 +28,7 @@ on:
       - main
       - '[1-9][0-9]-x-y'
   pull_request:
-
-defaults:
-  run:
-    shell: bash
-
+      
 jobs:
   setup:
     runs-on: ubuntu-latest
@@ -136,61 +127,6 @@ jobs:
     - name: Checkout & Sync & Save
       uses: ./src/electron/.github/actions/checkout
 
-  checkout-windows:
-    needs: setup
-    if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }}
-    runs-on: electron-arc-linux-amd64-32core
-    container:
-      image: ghcr.io/electron/build:${{ needs.setup.outputs.build-image-sha }}
-      options: --user root --device /dev/fuse --cap-add SYS_ADMIN
-      volumes:
-        - /mnt/cross-instance-cache:/mnt/cross-instance-cache
-    env:
-      GCLIENT_EXTRA_ARGS: '--custom-var=checkout_win=True'
-      TARGET_OS: 'win'
-      ELECTRON_DEPOT_TOOLS_WIN_TOOLCHAIN: '1'
-    steps:
-    - name: Checkout Electron
-      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29
-      with:
-        path: src/electron
-        fetch-depth: 0
-    - name: Checkout & Sync & Save
-      uses: ./src/electron/.github/actions/checkout
-
-  # GN Check Jobs
-  macos-gn-check:
-    uses: ./.github/workflows/pipeline-segment-electron-gn-check.yml
-    needs: checkout-macos
-    with:
-      target-platform: macos
-      target-archs: x64 arm64
-      check-runs-on: macos-14
-      gn-build-type: testing
-    secrets: inherit
-
-  linux-gn-check:
-    uses: ./.github/workflows/pipeline-segment-electron-gn-check.yml
-    needs: checkout-linux
-    with:
-      target-platform: linux
-      target-archs: x64 arm arm64
-      check-runs-on: electron-arc-linux-amd64-8core
-      check-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
-      gn-build-type: testing
-    secrets: inherit
-
-  windows-gn-check:
-    uses: ./.github/workflows/pipeline-segment-electron-gn-check.yml
-    needs: checkout-windows
-    with:
-      target-platform: windows
-      target-archs: x64 x86 arm64
-      check-runs-on: electron-arc-linux-amd64-8core
-      check-container: '{"image":"ghcr.io/electron/build:${{ inputs.build-image-sha }}","options":"--user root --device /dev/fuse --cap-add SYS_ADMIN","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
-      gn-build-type: testing
-    secrets: inherit
-
   # Build Jobs - These cascade into testing jobs
   macos-x64:
     permissions:
@@ -201,6 +137,7 @@ jobs:
     needs: checkout-macos
     with:
       build-runs-on: macos-14-xlarge
+      check-runs-on: macos-14
       test-runs-on: macos-13
       target-platform: macos
       target-arch: x64
@@ -219,6 +156,7 @@ jobs:
     needs: checkout-macos
     with:
       build-runs-on: macos-14-xlarge
+      check-runs-on: macos-14
       test-runs-on: macos-14
       target-platform: macos
       target-arch: arm64
@@ -237,6 +175,7 @@ jobs:
     needs: checkout-linux
     with:
       build-runs-on: electron-arc-linux-amd64-32core
+      check-runs-on: electron-arc-linux-amd64-8core
       test-runs-on: electron-arc-linux-amd64-4core
       build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
       test-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
@@ -257,6 +196,7 @@ jobs:
     needs: checkout-linux
     with:
       build-runs-on: electron-arc-linux-amd64-32core
+      check-runs-on: electron-arc-linux-amd64-8core
       test-runs-on: electron-arc-linux-amd64-4core
       build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
       test-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
@@ -278,6 +218,7 @@ jobs:
     needs: checkout-linux
     with:
       build-runs-on: electron-arc-linux-amd64-32core
+      check-runs-on: electron-arc-linux-amd64-8core
       test-runs-on: electron-arc-linux-arm64-4core
       build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
       test-container: '{"image":"ghcr.io/electron/test:arm32v7-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init","volumes":["/home/runner/externals:/mnt/runner-externals"]}'
@@ -298,6 +239,7 @@ jobs:
     needs: checkout-linux
     with:
       build-runs-on: electron-arc-linux-amd64-32core
+      check-runs-on: electron-arc-linux-amd64-8core
       test-runs-on: electron-arc-linux-arm64-4core
       build-container: '{"image":"ghcr.io/electron/build:${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root","volumes":["/mnt/cross-instance-cache:/mnt/cross-instance-cache"]}'
       test-container: '{"image":"ghcr.io/electron/test:arm64v8-${{ needs.checkout-linux.outputs.build-image-sha }}","options":"--user root --privileged --init"}'
@@ -308,60 +250,3 @@ jobs:
       generate-symbols: false
       upload-to-storage: '0'
     secrets: inherit
-
-  windows-x64:
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: read
-    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: setup
-    if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }}
-    with:
-      build-runs-on: electron-arc-windows-amd64-16core
-      test-runs-on: windows-latest
-      target-platform: windows
-      target-arch: x64
-      is-release: false
-      gn-build-type: testing
-      generate-symbols: false
-      upload-to-storage: '0'
-    secrets: inherit
-
-  windows-x86:
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: read
-    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: setup
-    if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }}
-    with:
-      build-runs-on: electron-arc-windows-amd64-16core
-      test-runs-on: windows-latest
-      target-platform: windows
-      target-arch: x86
-      is-release: false
-      gn-build-type: testing
-      generate-symbols: false
-      upload-to-storage: '0'
-    secrets: inherit
-
-  windows-arm64:
-    permissions:
-      contents: read
-      issues: read
-      pull-requests: read
-    uses: ./.github/workflows/pipeline-electron-build-and-test.yml
-    needs: setup
-    if: ${{ needs.setup.outputs.src == 'true' && !inputs.skip-windows }}
-    with:
-      build-runs-on: electron-arc-windows-amd64-16core
-      test-runs-on: electron-hosted-windows-arm64-4core
-      target-platform: windows
-      target-arch: arm64
-      is-release: false
-      gn-build-type: testing
-      generate-symbols: false
-      upload-to-storage: '0'
-    secrets: inherit

.github/workflows/macos-publish.yml

@@ -40,7 +40,7 @@ jobs:
       with:
         generate-sas-token: 'true'
 
-  publish-x64-darwin:
+  publish-x64:
     uses: ./.github/workflows/pipeline-segment-electron-build.yml
     needs: checkout-macos
     with:
@@ -48,29 +48,13 @@ jobs:
       build-runs-on: macos-14-xlarge
       target-platform: macos
       target-arch: x64
-      target-variant: darwin
       is-release: true
       gn-build-type: release
       generate-symbols: true
       upload-to-storage: ${{ inputs.upload-to-storage }}
     secrets: inherit
 
-  publish-x64-mas:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    needs: checkout-macos
-    with:
-      environment: production-release
-      build-runs-on: macos-14-xlarge
-      target-platform: macos
-      target-arch: x64
-      target-variant: mas
-      is-release: true
-      gn-build-type: release
-      generate-symbols: true
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
-
-  publish-arm64-darwin:
+  publish-arm64:
     uses: ./.github/workflows/pipeline-segment-electron-build.yml
     needs: checkout-macos
     with:
@@ -78,22 +62,6 @@ jobs:
       build-runs-on: macos-14-xlarge
       target-platform: macos
       target-arch: arm64
-      target-variant: darwin
-      is-release: true
-      gn-build-type: release
-      generate-symbols: true
-      upload-to-storage: ${{ inputs.upload-to-storage }}
-    secrets: inherit
-
-  publish-arm64-mas:
-    uses: ./.github/workflows/pipeline-segment-electron-build.yml
-    needs: checkout-macos
-    with:
-      environment: production-release
-      build-runs-on: macos-14-xlarge
-      target-platform: macos
-      target-arch: arm64
-      target-variant: mas
       is-release: true
       gn-build-type: release
       generate-symbols: true

.github/workflows/pipeline-electron-build-and-test-and-nan.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       target-platform:
         type: string
-        description: 'Platform to run on, can be macos, windows or linux.'
+        description: 'Platform to run on, can be macos or linux'
         required: true
       target-arch:
         type: string
@@ -15,6 +15,10 @@ on:
         type: string
         description: 'What host to run the build'
         required: true
+      check-runs-on:
+        type: string
+        description: 'What host to run the gn-check'
+        required: true
       test-runs-on:
         type: string
         description: 'What host to run the tests on'
@@ -72,6 +76,16 @@ jobs:
       generate-symbols: ${{ inputs.generate-symbols }}
       upload-to-storage: ${{ inputs.upload-to-storage }}
     secrets: inherit
+  gn-check:
+    uses: ./.github/workflows/pipeline-segment-electron-gn-check.yml
+    with:
+      target-platform: ${{ inputs.target-platform }}
+      target-arch: ${{ inputs.target-arch }}
+      check-runs-on: ${{ inputs.check-runs-on }}
+      check-container: ${{ inputs.build-container }}
+      gn-build-type: ${{ inputs.gn-build-type }}
+      is-asan: ${{ inputs.is-asan }}
+    secrets: inherit
   test:
     uses: ./.github/workflows/pipeline-segment-electron-test.yml
     needs: build

.github/workflows/pipeline-electron-build-and-test.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       target-platform:
         type: string
-        description: 'Platform to run on, can be macos, windows or linux'
+        description: 'Platform to run on, can be macos or linux'
         required: true
       target-arch:
         type: string
@@ -15,6 +15,10 @@ on:
         type: string
         description: 'What host to run the build'
         required: true
+      check-runs-on:
+        type: string
+        description: 'What host to run the gn-check'
+        required: true
       test-runs-on:
         type: string
         description: 'What host to run the tests on'
@@ -78,6 +82,16 @@ jobs:
       upload-to-storage: ${{ inputs.upload-to-storage }}
       is-asan: ${{ inputs.is-asan}}
     secrets: inherit
+  gn-check:
+    uses: ./.github/workflows/pipeline-segment-electron-gn-check.yml
+    with:
+      target-platform: ${{ inputs.target-platform }}
+      target-arch: ${{ inputs.target-arch }}
+      check-runs-on: ${{ inputs.check-runs-on }}
+      check-container: ${{ inputs.build-container }}
+      gn-build-type: ${{ inputs.gn-build-type }}
+      is-asan: ${{ inputs.is-asan }}
+    secrets: inherit
   test:
     uses: ./.github/workflows/pipeline-segment-electron-test.yml
     needs: build

.github/workflows/pipeline-segment-electron-build.yml

@@ -9,16 +9,12 @@ on:
         type: string
       target-platform:
         type: string
-        description: 'Platform to run on, can be macos, windows or linux'
+        description: 'Platform to run on, can be macos or linux'
         required: true
       target-arch:
         type: string
         description: 'Arch to build for, can be x64, arm64 or arm'
         required: true
-      target-variant:
-        type: string
-        description: 'Variant to build for, no effect on non-macOS target platforms. Can be darwin, mas or all.'
-        default: all
       build-runs-on:
         type: string
         description: 'What host to run the build'
@@ -61,22 +57,18 @@ on:
 
 
 concurrency:
-  group: electron-build-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ inputs.target-variant }}-${{ inputs.is-asan }}-${{ github.ref }}
+  group: electron-build-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ inputs.is-asan }}-${{ github.ref }}
   cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }}
 
 env:
   ELECTRON_ARTIFACTS_BLOB_STORAGE: ${{ secrets.ELECTRON_ARTIFACTS_BLOB_STORAGE }}
   ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
-  SUDOWOODO_EXCHANGE_URL: ${{ secrets.SUDOWOODO_EXCHANGE_URL }}
-  SUDOWOODO_EXCHANGE_TOKEN: ${{ secrets.SUDOWOODO_EXCHANGE_TOKEN }}
-  GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || inputs.target-platform == 'windows' && '--custom-var=checkout_win=True' || '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' }}
+  ELECTRON_GITHUB_TOKEN: ${{ secrets.ELECTRON_GITHUB_TOKEN }}
+  GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' }}
   ELECTRON_OUT_DIR: Default
 
 jobs:
   build:
-    defaults:
-      run:
-        shell: bash
     runs-on: ${{ inputs.build-runs-on }}
     container: ${{ fromJSON(inputs.build-container) }}
     environment: ${{ inputs.environment }}
@@ -84,8 +76,7 @@ jobs:
       TARGET_ARCH: ${{ inputs.target-arch }}
     steps:
     - name: Create src dir
-      run: |
-        mkdir src
+      run: mkdir src
     - name: Checkout Electron
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       with:
@@ -99,7 +90,7 @@ jobs:
       run: df -h
     - name: Setup Node.js/npm
       if: ${{ inputs.target-platform == 'macos' }}
-      uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6
+      uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b
       with:
         node-version: 20.11.x
         cache: yarn
@@ -149,8 +140,8 @@ jobs:
       run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
     - name: Generate DEPS Hash
       run: |
-        node src/electron/script/generate-deps-hash.js
-        DEPSHASH=v1-src-cache-$(cat src/electron/.depshash)
+        node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
+        DEPSHASH=v1-src-cache-$(shasum src/electron/.depshash | cut -f1 -d' ')
         echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
         echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
     - name: Restore src cache via AZCopy
@@ -159,11 +150,6 @@ jobs:
     - name: Restore src cache via AKS
       if: ${{ inputs.target-platform == 'linux' }}
       uses: ./src/electron/.github/actions/restore-cache-aks
-    - name: Checkout the whole damm thing
-      if: ${{ inputs.target-platform == 'windows' }}
-      uses: ./src/electron/.github/actions/checkout
-      with:
-        use-cache: 'false'
     - name: Checkout Electron
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       with:
@@ -176,11 +162,11 @@ jobs:
         e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --only-sdk
     - name: Run Electron Only Hooks
       run: |
-        e d gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
+        gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
     - name: Regenerate DEPS Hash
       run: |
-        (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js
-        echo "DEPSHASH=$(cat src/electron/.depshash)" >> $GITHUB_ENV
+        (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
+        echo "DEPSHASH=$(shasum src/electron/.depshash | cut -f1 -d' ')" >> $GITHUB_ENV
     - name: Add CHROMIUM_BUILDTOOLS_PATH to env
       run: echo "CHROMIUM_BUILDTOOLS_PATH=$(pwd)/src/buildtools" >> $GITHUB_ENV
     - name: Fix Sync (macOS)
@@ -188,12 +174,8 @@ jobs:
       uses: ./src/electron/.github/actions/fix-sync-macos
     - name: Install build-tools & Setup RBE
       run: |
-        echo "NUMBER_OF_NINJA_PROCESSES=${{ inputs.target-platform != 'macos' && '300' || '200' }}" >> $GITHUB_ENV
-        if [ "${{ inputs.target-platform }}" = "windows" ]; then
-          cd $(cygpath -u "$(e show depotdir)")/../..
-        else
-          cd "$(e show depotdir)/../.."
-        fi
+        echo "NUMBER_OF_NINJA_PROCESSES=${{ inputs.target-platform == 'linux' && '300' || '200' }}" >> $GITHUB_ENV
+        cd ~/.electron_build_tools
         npx yarn --ignore-engines
         # Pull down credential helper and print status
         node -e "require('./src/utils/reclient.js').downloadAndPrepare({})"
@@ -206,25 +188,24 @@ jobs:
       if: ${{ inputs.target-platform == 'macos' }}
       uses: ./src/electron/.github/actions/free-space-macos
     - name: Build Electron
-      if: ${{ inputs.target-platform != 'macos' || (inputs.target-variant == 'all' || inputs.target-variant == 'darwin') }}
       uses: ./src/electron/.github/actions/build-electron
       with:
         target-arch: ${{ inputs.target-arch }}
         target-platform: ${{ inputs.target-platform }}
-        artifact-platform: ${{ inputs.target-platform == 'macos' && 'darwin' || inputs.target-platform }}
+        artifact-platform: ${{ inputs.target-platform == 'linux' && 'linux' || 'darwin' }}
         is-release: '${{ inputs.is-release }}'
         generate-symbols: '${{ inputs.generate-symbols }}'
         strip-binaries: '${{ inputs.strip-binaries }}'
         upload-to-storage: '${{ inputs.upload-to-storage }}'
         is-asan: '${{ inputs.is-asan }}'
     - name: Set GN_EXTRA_ARGS for MAS Build
-      if: ${{ inputs.target-platform == 'macos' && (inputs.target-variant == 'all' || inputs.target-variant == 'mas') }}
+      if: ${{ inputs.target-platform == 'macos' }}
       run: |
         echo "MAS_BUILD=true" >> $GITHUB_ENV
         GN_EXTRA_ARGS='is_mas_build=true'
         echo "GN_EXTRA_ARGS=$GN_EXTRA_ARGS" >> $GITHUB_ENV
     - name: Build Electron (MAS)
-      if: ${{ inputs.target-platform == 'macos' && (inputs.target-variant == 'all' || inputs.target-variant == 'mas') }}
+      if: ${{ inputs.target-platform == 'macos' }}
       uses: ./src/electron/.github/actions/build-electron
       with:
         target-arch: ${{ inputs.target-arch }}

.github/workflows/pipeline-segment-electron-gn-check.yml

@@ -5,11 +5,11 @@ on:
     inputs:
       target-platform:
         type: string
-        description: 'Platform to run on, can be macos, windows or linux'
+        description: 'Platform to run on, can be macos or linux'
         required: true
-      target-archs:
+      target-arch:
         type: string
-        description: 'Archs to check for, can be x64, x86, arm64 or arm space separated'
+        description: 'Arch to build for, can be x64, arm64 or arm'
         required: true
       check-runs-on:
         type: string
@@ -25,23 +25,29 @@ on:
         required: true
         type: string
         default: testing
+      is-asan: 
+        description: 'Building the Address Sanitizer (ASan) Linux build'
+        required: false
+        type: boolean
+        default: false
 
 concurrency:
-  group: electron-gn-check-${{ inputs.target-platform }}-${{ github.ref }}
+  group: electron-gn-check-${{ inputs.target-platform }}-${{ inputs.target-arch }}-${{ inputs.is-asan }}-${{ github.ref }}
   cancel-in-progress: true
 
 env:
   ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
-  GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || (inputs.target-platform == 'linux' && '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' || '--custom-var=checkout_win=True') }}
+  GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' }}
   ELECTRON_OUT_DIR: Default
+  TARGET_ARCH: ${{ inputs.target-arch }}
 
 jobs:
   gn-check:
-    defaults:
-      run:
-        shell: bash
+    # TODO(codebytere): Change this to medium VM
     runs-on: ${{ inputs.check-runs-on }}
     container: ${{ fromJSON(inputs.check-container) }}
+    env:
+      TARGET_ARCH: ${{ inputs.target-arch }}
     steps:
     - name: Checkout Electron
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
@@ -69,7 +75,7 @@ jobs:
       uses: ./src/electron/.github/actions/install-build-tools
     - name: Init Build Tools
       run: |
-        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --only-sdk
+        e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --only-sdk
     - name: Get Depot Tools
       timeout-minutes: 5
       run: |
@@ -91,40 +97,34 @@ jobs:
         touch .disable_auto_update
     - name: Add Depot Tools to PATH
       run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
-    - name: Enable windows toolchain
-      if: ${{ inputs.target-platform == 'windows' }}
+    - name: Set GN_EXTRA_ARGS for Linux
+      if: ${{ inputs.target-platform == 'linux' }}
       run: |
-        echo "ELECTRON_DEPOT_TOOLS_WIN_TOOLCHAIN=1" >> $GITHUB_ENV
+        if [ "${{ inputs.target-arch  }}" = "arm" ]; then
+          GN_EXTRA_ARGS='build_tflite_with_xnnpack=false'
+        elif [ "${{ inputs.target-arch }}" = "arm64" ]; then
+          GN_EXTRA_ARGS='fatal_linker_warnings=false enable_linux_installer=false'
+        fi
+        echo "GN_EXTRA_ARGS=$GN_EXTRA_ARGS" >> $GITHUB_ENV
     - name: Generate DEPS Hash
       run: |
-        node src/electron/script/generate-deps-hash.js
-        DEPSHASH=v1-src-cache-$(cat src/electron/.depshash)
+        node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
+        DEPSHASH=v1-src-cache-$(shasum src/electron/.depshash | cut -f1 -d' ')
         echo "DEPSHASH=$DEPSHASH" >> $GITHUB_ENV
         echo "CACHE_PATH=$DEPSHASH.tar" >> $GITHUB_ENV
     - name: Restore src cache via AZCopy
       if: ${{ inputs.target-platform == 'macos' }}
       uses: ./src/electron/.github/actions/restore-cache-azcopy
     - name: Restore src cache via AKS
-      if: ${{ inputs.target-platform == 'linux' || inputs.target-platform == 'windows' }}
+      if: ${{ inputs.target-platform == 'linux' }}
       uses: ./src/electron/.github/actions/restore-cache-aks
     - name: Run Electron Only Hooks
       run: |
-        echo "solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]" > tmpgclient
-        if [ "${{ inputs.target-platform }}" = "windows" ]; then
-          echo "solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False,'install_sysroot':False,'checkout_win':True},'managed':False}]" > tmpgclient
-          echo "target_os=['win']" >> tmpgclient
-        fi
-        e d gclient runhooks --gclientfile=tmpgclient
-
-        # Fix VS Toolchain
-        if [ "${{ inputs.target-platform }}" = "windows" ]; then
-          rm -rf src/third_party/depot_tools/win_toolchain/vs_files
-          e d python3 src/build/vs_toolchain.py update --force
-        fi
+        gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]"
     - name: Regenerate DEPS Hash
       run: |
-        (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js
-        echo "DEPSHASH=$(cat src/electron/.depshash)" >> $GITHUB_ENV
+        (cd src/electron && git checkout .) && node src/electron/script/generate-deps-hash.js && cat src/electron/.depshash-target
+        echo "DEPSHASH=$(shasum src/electron/.depshash | cut -f1 -d' ')" >> $GITHUB_ENV
     - name: Add CHROMIUM_BUILDTOOLS_PATH to env
       run: echo "CHROMIUM_BUILDTOOLS_PATH=$(pwd)/src/buildtools" >> $GITHUB_ENV
     - name: Checkout Electron
@@ -136,38 +136,22 @@ jobs:
       run: |
         cd src/electron
         git pack-refs
-    - name: Run GN Check for ${{ inputs.target-archs }}
+        cd ..
+
+        e build --only-gen
+    - name: Run GN Check
       run: |
         cd src
+        gn check out/Default //electron:electron_lib
+        gn check out/Default //electron:electron_app
+        gn check out/Default //electron/shell/common:mojo
+        gn check out/Default //electron/shell/common:plugin
 
-        for target_cpu in ${{ inputs.target-archs }}
-        do
-          export GN_EXTRA_ARGS="target_cpu=\"$target_cpu\""
-          if [ "${{ inputs.target-platform }}" = "linux" ]; then
-            if [ "$target_cpu" = "arm" ]; then
-              export GN_EXTRA_ARGS="$GN_EXTRA_ARGS build_tflite_with_xnnpack=false"
-            elif [ "$target_cpu" = "arm64" ]; then
-              export GN_EXTRA_ARGS="$GN_EXTRA_ARGS fatal_linker_warnings=false enable_linux_installer=false"
-            fi
-          fi
-          if [ "${{ inputs.target-platform }}" = "windows" ]; then
-            export GN_EXTRA_ARGS="$GN_EXTRA_ARGS use_v8_context_snapshot=true target_os=\"win\""
-          fi
-
-          e build --only-gen
-
-          e d gn check out/Default //electron:electron_lib
-          e d gn check out/Default //electron:electron_app
-          e d gn check out/Default //electron/shell/common:mojo
-          e d gn check out/Default //electron/shell/common:plugin
-
-          # Check the hunspell filenames
-          node electron/script/gen-hunspell-filenames.js --check
-          node electron/script/gen-libc++-filenames.js --check
-        done
+        # Check the hunspell filenames
+        node electron/script/gen-hunspell-filenames.js --check
+        node electron/script/gen-libc++-filenames.js --check
     - name: Wait for active SSH sessions
       if: always() && !cancelled()
-      shell: bash
       run: |
         while [ -f /var/.ssh-lock ]
         do

.github/workflows/pipeline-segment-electron-test.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       target-platform:
         type: string
-        description: 'Platform to run on, can be macos, windows or linux'
+        description: 'Platform to run on, can be macos or linux'
         required: true
       target-arch:
         type: string
@@ -38,47 +38,26 @@ permissions:
 env:
   ELECTRON_OUT_DIR: Default
   ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }}
+  ELECTRON_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   test:
-    defaults:
-      run:
-        shell: bash
     runs-on: ${{ inputs.test-runs-on }}
     container: ${{ fromJSON(inputs.test-container) }}
     strategy:
       fail-fast: false
       matrix:
-        build-type: ${{ inputs.target-platform == 'macos' && fromJSON('["darwin","mas"]') || (inputs.target-platform == 'windows' && fromJSON('["windows"]') || fromJSON('["linux"]')) }}
-        shard: ${{ inputs.target-platform == 'linux' && fromJSON('[1, 2, 3]') || fromJSON('[1, 2]') }}
+        build-type: ${{ inputs.target-platform == 'macos' && fromJSON('["darwin","mas"]') || fromJSON('["linux"]') }}
+        shard: ${{ inputs.target-platform == 'macos' && fromJSON('[1, 2]') || fromJSON('[1, 2, 3]') }}
     env:
       BUILD_TYPE: ${{ matrix.build-type }}
       TARGET_ARCH: ${{ inputs.target-arch }}
       ARTIFACT_KEY: ${{ matrix.build-type }}_${{ inputs.target-arch }}
     steps:
     - name: Fix node20 on arm32 runners
-      if: ${{ inputs.target-arch == 'arm' && inputs.target-platform == 'linux' }}
+      if: ${{ inputs.target-arch == 'arm' }}
       run: |
         cp $(which node) /mnt/runner-externals/node20/bin/
-    - name: Install Git on Windows arm64 runners
-      if: ${{ inputs.target-arch == 'arm64' && inputs.target-platform == 'windows' }}
-      shell: powershell
-      run: |
-        Set-ExecutionPolicy Bypass -Scope Process -Force
-        [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
-        iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
-        choco install -y --no-progress git.install --params "'/GitAndUnixToolsOnPath'"
-        choco install -y --no-progress git
-        choco install -y --no-progress python --version 3.7.9
-        choco install -y --no-progress visualstudio2022buildtools --params '--quiet --wait --norestart --nocache  --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.140 --add Microsoft.VisualStudio.Component.Windows11SDK.22000'
-        echo "C:\Program Files\Git\cmd" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        echo "C:\Program Files\Git\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-        echo "C:\Python37" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-    - name: Setup Node.js/npm
-      if: ${{ inputs.target-platform == 'windows' }}
-      uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6
-      with:
-        node-version: 20.11.x
     - name: Add TCC permissions on macOS
       if: ${{ inputs.target-platform == 'macos' }}
       run: |
@@ -124,12 +103,17 @@ jobs:
     - name: Get Depot Tools
       timeout-minutes: 5
       run: |
-        git config --global core.filemode false
-        git config --global core.autocrlf false
-        git config --global branch.autosetuprebase always
         git clone --filter=tree:0 https://chromium.googlesource.com/chromium/tools/depot_tools.git
         # Ensure depot_tools does not update.
         test -d depot_tools && cd depot_tools
+        if [ "`uname`" = "Darwin" ]; then
+          # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems
+          sed -i '' '/ninjalog_uploader_wrapper.py/d' ./autoninja
+        else
+          sed -i '/ninjalog_uploader_wrapper.py/d' ./autoninja
+          # Remove swift-format dep from cipd on macOS until we send a patch upstream.
+          git apply --3way ../src/electron/.github/workflows/config/gclient.diff
+        fi
         touch .disable_auto_update
     - name: Add Depot Tools to PATH
       run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH
@@ -151,17 +135,7 @@ jobs:
         path: ./src_artifacts_${{ matrix.build-type }}_${{ inputs.target-arch }}
     - name: Restore Generated Artifacts
       run: ./src/electron/script/actions/restore-artifacts.sh
-    - name: Unzip Dist, Mksnapshot & Chromedriver (win)
-      if: ${{ inputs.target-platform == 'windows' }}
-      shell: powershell
-      run: |
-        Set-ExecutionPolicy Bypass -Scope Process -Force
-        cd src/out/Default
-        Expand-Archive -Force dist.zip -DestinationPath ./
-        Expand-Archive -Force chromedriver.zip -DestinationPath ./
-        Expand-Archive -Force mksnapshot.zip -DestinationPath ./
-    - name: Unzip Dist, Mksnapshot & Chromedriver (unix)
-      if: ${{ inputs.target-platform != 'windows' }}
+    - name: Unzip Dist, Mksnapshot & Chromedriver
       run: |
         cd src/out/Default
         unzip -:o dist.zip
@@ -182,19 +156,14 @@ jobs:
         ELECTRON_DISABLE_SECURITY_WARNINGS: 1
         ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
         DISPLAY: ':99.0'
-        NPM_CONFIG_MSVS_VERSION: '2022'
-        ELECTRON_ENABLE_LOGGING: '1'
       run: |
         cd src/electron
         # Get which tests are on this shard
-        tests_files=$(node script/split-tests ${{ matrix.shard }} ${{ inputs.target-platform == 'linux' && 3 || 2 }})
+        tests_files=$(node script/split-tests ${{ matrix.shard }} ${{ inputs.target-platform == 'macos' && 2 || 3 }})
 
         # Run tests
-        if [ "${{ inputs.target-platform }}" != "linux" ]; then
+        if [ "`uname`" = "Darwin" ]; then
           echo "About to start tests"
-          if [ "${{ inputs.target-platform }}" = "windows" ] && [ "${{ inputs.target-arch }}" = "x86" ]; then
-            export npm_config_arch="ia32"
-          fi
           node script/yarn test --runners=main --trace-uncaught --enable-logging --files $tests_files
         else
           chown :builduser .. && chmod g+w ..
@@ -226,7 +195,6 @@ jobs:
         if-no-files-found: ignore
     - name: Wait for active SSH sessions
       if: always() && !cancelled()
-      shell: bash
       run: |
         while [ -f /var/.ssh-lock ]
         do

.github/workflows/pipeline-segment-node-nan-test.yml

@@ -5,7 +5,7 @@ on:
     inputs:
       target-platform:
         type: string
-        description: 'Platform to run on, can be macos, windows or linux'
+        description: 'Platform to run on, can be macos or linux'
         required: true
       target-arch:
         type: string
@@ -93,7 +93,6 @@ jobs:
         node electron/script/node-spec-runner.js --default --jUnitDir=junit
     - name: Wait for active SSH sessions
       if: always() && !cancelled()
-      shell: bash
       run: |
         while [ -f /var/.ssh-lock ]
         do
@@ -156,7 +155,6 @@ jobs:
         cd src
         node electron/script/nan-spec-runner.js
     - name: Wait for active SSH sessions
-      shell: bash
       if: always() && !cancelled()
       run: |
         while [ -f /var/.ssh-lock ]

.github/workflows/scorecards.yml

@@ -50,6 +50,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
         with:
           sarif_file: results.sarif

.gitignore

@@ -48,6 +48,7 @@ ts-gen
 
 # Used to accelerate CI builds
 .depshash
+.depshash-target
 
 # Used to accelerate builds after sync
 patches/mtime-cache.json

BUILD.gn

@@ -74,7 +74,7 @@ if (is_linux) {
       "notify_notification_set_image_from_pixbuf",
       "notify_notification_set_timeout",
       "notify_notification_set_urgency",
-      "notify_notification_set_hint",
+      "notify_notification_set_hint_string",
       "notify_notification_show",
       "notify_notification_close",
     ]
@@ -532,7 +532,7 @@ source_set("electron_lib") {
     ]
   }
 
-  deps += [ "//electron/build/config:generate_mas_config" ]
+  configs += [ "//electron/build/config:mas_build" ]
 
   sources = filenames.lib_sources
   if (is_win) {
@@ -674,8 +674,6 @@ source_set("electron_lib") {
 
   if (enable_plugins) {
     sources += [
-      "shell/browser/electron_plugin_info_host_impl.cc",
-      "shell/browser/electron_plugin_info_host_impl.h",
       "shell/common/plugin_info.cc",
       "shell/common/plugin_info.h",
     ]
@@ -908,14 +906,12 @@ if (is_mac) {
       assert(defined(invoker.helper_name_suffix))
 
       output_name = electron_helper_name + invoker.helper_name_suffix
-      deps = [
-        ":electron_framework+link",
-        "//electron/build/config:generate_mas_config",
-      ]
+      deps = [ ":electron_framework+link" ]
       if (!is_mas_build) {
         deps += [ "//sandbox/mac:seatbelt" ]
       }
       defines = [ "HELPER_EXECUTABLE" ]
+      configs += [ "//electron/build/config:mas_build" ]
       sources = [
         "shell/app/electron_main_mac.cc",
         "shell/app/uv_stdio_fix.cc",
@@ -1071,7 +1067,6 @@ if (is_mac) {
       ":electron_app_plist",
       ":electron_app_resources",
       ":electron_fuses",
-      "//electron/build/config:generate_mas_config",
       "//electron/buildflags",
     ]
     if (is_mas_build) {
@@ -1086,6 +1081,7 @@ if (is_mac) {
       "-rpath",
       "@executable_path/../Frameworks",
     ]
+    configs += [ "//electron/build/config:mas_build" ]
   }
 
   if (enable_dsyms) {

DEPS

@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'
 
 vars = {
   'chromium_version':
-    '131.0.6752.0',
+    '130.0.6672.0',
   'node_version':
     'v20.17.0',
   'nan_version':

appveyor-bake.yml

@@ -68,7 +68,7 @@ build_script:
   - ps: $env:PATH="$pwd\depot_tools;$env:PATH"
   - update_depot_tools.bat
   # Uncomment the following line if windows deps change
-  - src\electron\script\setup-win-for-dev.bat
+  # - src\electron\script\setup-win-for-dev.bat
   - >-
       gclient config
       --name "src\electron"

appveyor-woa.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-131.0.6734.0-node-20.17-0
+image: e-130.0.6672.0
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -70,9 +70,8 @@ for:
         - job_name: Build Arm on X64 Windows
 
     build_script:
-      # TODO: Remove --ignore-engines once WOA image is up to node 20
       - ps: |
-          node script/yarn.js install --frozen-lockfile --ignore-engines
+          node script/yarn.js install --frozen-lockfile
           node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER
           $env:SHOULD_SKIP_ARTIFACT_VALIDATION = "false"
           if ($LASTEXITCODE -eq 0) {
@@ -265,7 +264,7 @@ for:
 
     build_script:
       - ps: |
-          node script/yarn.js install --frozen-lockfile --ignore-engines
+          node script/yarn.js install --frozen-lockfile
           node script/doc-only-change.js --prNumber=$env:APPVEYOR_PULL_REQUEST_NUMBER
           if ($LASTEXITCODE -eq 0) {
             Write-warning "Skipping build for doc only change"
@@ -328,3 +327,4 @@ for:
     on_finish:
       # Uncomment these lines to enable RDP
       # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )

appveyor.yml

@@ -29,7 +29,7 @@
 
 version: 1.0.{build}
 build_cloud: electronhq-16-core
-image: e-131.0.6734.0-node-20.17-0
+image: e-130.0.6672.0
 environment:
   GIT_CACHE_PATH: C:\Users\appveyor\libcc_cache
   ELECTRON_OUT_DIR: Default
@@ -308,7 +308,7 @@ for:
           if ($env:TARGET_ARCH -eq 'ia32') {
             $env:npm_config_arch = "ia32"
           }
-      - echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging
+      - echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log
       - cd ..
       - echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
       - echo "About to verify mksnapshot"
@@ -320,3 +320,4 @@ for:
     on_finish:
       # Uncomment these lines to enable RDP
       # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+      - if exist electron\electron.log ( appveyor-retry appveyor PushArtifact electron\electron.log )

build/config/BUILD.gn

@@ -1,11 +1,8 @@
-action("generate_mas_config") {
-  outputs = [ "$target_gen_dir/../../mas.h" ]
-  script = "../../script/generate-mas-config.py"
+# For MAS build, we force defining "MAS_BUILD".
+config("mas_build") {
   if (is_mas_build) {
-    args = [ "true" ]
+    defines = [ "IS_MAS_BUILD()=1" ]
   } else {
-    args = [ "false" ]
+    defines = [ "IS_MAS_BUILD()=0" ]
   }
-
-  args += rebase_path(outputs)
 }

build/webpack/webpack.config.base.js

@@ -1,9 +1,8 @@
-const TerserPlugin = require('terser-webpack-plugin');
-const webpack = require('webpack');
-const WrapperPlugin = require('wrapper-webpack-plugin');
-
 const fs = require('node:fs');
 const path = require('node:path');
+const webpack = require('webpack');
+const TerserPlugin = require('terser-webpack-plugin');
+const WrapperPlugin = require('wrapper-webpack-plugin');
 
 const electronRoot = path.resolve(__dirname, '../..');
 

build/zip.py

@@ -59,7 +59,7 @@ def skip_path(dep, dist_zip, target_cpu):
       and dep == "snapshot_blob.bin"
     )
   )
-  if should_skip and os.environ.get('ELECTRON_DEBUG_ZIP_SKIP') == '1':
+  if should_skip:
     print("Skipping {}".format(dep))
   return should_skip
 

chromium_src/BUILD.gn

@@ -195,11 +195,9 @@ static_library("chrome") {
     "//chrome/app/vector_icons",
     "//chrome/browser:resource_prefetch_predictor_proto",
     "//chrome/browser/resource_coordinator:mojo_bindings",
-    "//chrome/browser/ui/webui/tab_search:mojo_bindings",
     "//chrome/browser/web_applications/mojom:mojom_web_apps_enum",
     "//components/enterprise/buildflags",
     "//components/enterprise/common/proto:connectors_proto",
-    "//components/enterprise/obfuscation/core:enterprise_obfuscation",
     "//components/safe_browsing/core/browser/db:safebrowsing_proto",
     "//components/vector_icons:vector_icons",
     "//ui/snapshot",
@@ -270,13 +268,11 @@ static_library("chrome") {
       "//chrome/browser/media/webrtc/thumbnail_capturer_mac.h",
       "//chrome/browser/media/webrtc/thumbnail_capturer_mac.mm",
       "//chrome/browser/media/webrtc/window_icon_util_mac.mm",
-      "//chrome/browser/permissions/system/media_authorization_wrapper_mac.h",
       "//chrome/browser/platform_util_mac.mm",
       "//chrome/browser/process_singleton_mac.mm",
       "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.h",
       "//chrome/browser/ui/views/eye_dropper/eye_dropper_view_mac.mm",
     ]
-    deps += [ ":system_media_capture_permissions_mac_conflict" ]
   }
 
   if (enable_widevine) {
@@ -496,16 +492,3 @@ source_set("chrome_spellchecker") {
     "//components/spellcheck/renderer",
   ]
 }
-
-# These sources create an object file conflict with one in |:chrome|, so they
-# must live in a separate target.
-# Conflicting sources:
-#   //chrome/browser/media/webrtc/system_media_capture_permissions_stats_mac.mm
-#   //chrome/browser/permissions/system/system_media_capture_permissions_mac.mm
-source_set("system_media_capture_permissions_mac_conflict") {
-  sources = [
-    "//chrome/browser/permissions/system/system_media_capture_permissions_mac.h",
-    "//chrome/browser/permissions/system/system_media_capture_permissions_mac.mm",
-  ]
-  deps = [ "//chrome/common" ]
-}

default_app/default_app.ts

@@ -1,6 +1,5 @@
 import { shell } from 'electron/common';
 import { app, dialog, BrowserWindow, ipcMain } from 'electron/main';
-
 import * as path from 'node:path';
 import * as url from 'node:url';
 

default_app/main.ts

@@ -4,7 +4,6 @@ import * as fs from 'node:fs';
 import { Module } from 'node:module';
 import * as path from 'node:path';
 import * as url from 'node:url';
-
 const { app, dialog } = electron;
 
 type DefaultAppOptions = {
@@ -256,7 +255,6 @@ async function startRepl () {
 // start the default app.
 if (option.file && !option.webdriver) {
   const file = option.file;
-  // eslint-disable-next-line n/no-deprecated-api
   const protocol = url.parse(file).protocol;
   const extension = path.extname(file);
   if (protocol === 'http:' || protocol === 'https:' || protocol === 'file:' || protocol === 'chrome:') {

docs/README.md

@@ -37,7 +37,6 @@ an issue:
   * [Offline/Online Detection](tutorial/online-offline-events.md)
   * [Represented File for macOS BrowserWindows](tutorial/represented-file.md)
   * [Native File Drag & Drop](tutorial/native-file-drag-drop.md)
-  * [Navigation History](tutorial/navigation-history.md)
   * [Offscreen Rendering](tutorial/offscreen-rendering.md)
   * [Dark Mode](tutorial/dark-mode.md)
   * [Web embeds in Electron](tutorial/web-embeds.md)

docs/api/auto-updater.md

@@ -32,28 +32,22 @@ This is a requirement of `Squirrel.Mac`.
 ### Windows
 
 On Windows, you have to install your app into a user's machine before you can
-use the `autoUpdater`, so it is recommended that you use
-[electron-winstaller][installer-lib] or [Electron Forge's Squirrel.Windows maker][electron-forge-lib] to generate a Windows installer.
+use the `autoUpdater`, so it is recommended that you use the
+[electron-winstaller][installer-lib], [Electron Forge][electron-forge-lib] or the [grunt-electron-installer][installer] package to generate a Windows installer.
 
-Apps built with Squirrel.Windows will trigger [custom launch events](https://github.com/Squirrel/Squirrel.Windows/blob/51f5e2cb01add79280a53d51e8d0cfa20f8c9f9f/docs/using/custom-squirrel-events-non-cs.md#application-startup-commands)
-that must be handled by your Electron application to ensure proper setup and teardown.
+When using [electron-winstaller][installer-lib] or [Electron Forge][electron-forge-lib] make sure you do not try to update your app [the first time it runs](https://github.com/electron/windows-installer#handling-squirrel-events) (Also see [this issue for more info](https://github.com/electron/electron/issues/7155)). It's also recommended to use [electron-squirrel-startup](https://github.com/mongodb-js/electron-squirrel-startup) to get desktop shortcuts for your app.
 
-Squirrel.Windows apps will launch with the `--squirrel-firstrun` argument immediately
-after installation. During this time, Squirrel.Windows will obtain a file lock on
-your app, and `autoUpdater` requests will fail until the lock is released. In practice,
-this means that you won't be able to check for updates on first launch for the first
-few seconds. You can work around this by not checking for updates when `process.argv`
-contains the `--squirrel-firstrun` flag or by setting a 10-second timeout on your
-update checks (see [electron/electron#7155](https://github.com/electron/electron/issues/7155)
-for more information).
-
-The installer generated with Squirrel.Windows will create a shortcut icon with an
+The installer generated with Squirrel will create a shortcut icon with an
 [Application User Model ID][app-user-model-id] in the format of
 `com.squirrel.PACKAGE_ID.YOUR_EXE_WITHOUT_DOT_EXE`, examples are
 `com.squirrel.slack.Slack` and `com.squirrel.code.Code`. You have to use the
 same ID for your app with `app.setAppUserModelId` API, otherwise Windows will
 not be able to pin your app properly in task bar.
 
+Like Squirrel.Mac, Windows can host updates on S3 or any other static file host.
+You can read the documents of [Squirrel.Windows][squirrel-windows] to get more details
+about how Squirrel.Windows works.
+
 ## Events
 
 The `autoUpdater` object emits the following events:
@@ -143,7 +137,9 @@ application starts.
 
 [squirrel-mac]: https://github.com/Squirrel/Squirrel.Mac
 [server-support]: https://github.com/Squirrel/Squirrel.Mac#server-support
+[squirrel-windows]: https://github.com/Squirrel/Squirrel.Windows
+[installer]: https://github.com/electron-archive/grunt-electron-installer
 [installer-lib]: https://github.com/electron/windows-installer
-[electron-forge-lib]: https://www.electronforge.io/config/makers/squirrel.windows
+[electron-forge-lib]: https://github.com/electron/forge
 [app-user-model-id]: https://learn.microsoft.com/en-us/windows/win32/shell/appids
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter

docs/api/base-window.md

@@ -126,18 +126,10 @@ or session log off.
 
 #### Event: 'blur'
 
-Returns:
-
-* `event` Event
-
 Emitted when the window loses focus.
 
 #### Event: 'focus'
 
-Returns:
-
-* `event` Event
-
 Emitted when the window gains focus.
 
 #### Event: 'show'

docs/api/client-request.md

@@ -53,7 +53,7 @@ following properties:
     [`request.followRedirect`](#requestfollowredirect) is invoked synchronously
     during the [`redirect`](#event-redirect) event.  Defaults to `follow`.
   * `origin` string (optional) - The origin URL of the request.
-  * `referrerPolicy` string (optional) - can be "", `no-referrer`,
+  * `referrerPolicy` string (optional) - can be `""`, `no-referrer`,
     `no-referrer-when-downgrade`, `origin`, `origin-when-cross-origin`,
     `unsafe-url`, `same-origin`, `strict-origin`, or
     `strict-origin-when-cross-origin`. Defaults to

docs/api/incoming-message.md

@@ -31,7 +31,7 @@ Emitted when a request has been canceled during an ongoing HTTP transaction.
 
 Returns:
 
-* `error` Error - Typically holds an error string identifying failure root cause.
+`error` Error - Typically holds an error string identifying failure root cause.
 
 Emitted when an error was encountered while streaming response data events. For
 instance, if the server closes the underlying while the response is still

docs/api/session.md

@@ -495,7 +495,7 @@ app.whenReady().then(() => {
 })
 ```
 
-```js @ts-nocheck
+```js
 // Renderer Process
 
 const portConnect = async () => {

docs/api/utility-process.md

@@ -116,17 +116,6 @@ When the child process exits, then the value is `null` after the `exit` event is
 
 Emitted once the child process has spawned successfully.
 
-#### Event: 'error' _Experimental_
-
-Returns:
-
-* `type` string - Type of error. One of the following values:
-  * `FatalError`
-* `location` string - Source location from where the error originated.
-* `report` string - [`Node.js diagnostic report`][].
-
-Emitted when the child process needs to terminate due to non continuable error from V8.
-
 #### Event: 'exit'
 
 Returns:
@@ -149,4 +138,3 @@ Emitted when the child process sends a message using [`process.parentPort.postMe
 [stdio]: https://nodejs.org/dist/latest/docs/api/child_process.html#optionsstdio
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
 [`MessagePortMain`]: message-port-main.md
-[`Node.js diagnostic report`]: https://nodejs.org/docs/latest/api/report.html#diagnostic-report

docs/api/view.md

@@ -55,8 +55,6 @@ it becomes the topmost view.
 
 * `view` View - Child view to remove.
 
-If the view passed as a parameter is not a child of this view, this method is a no-op.
-
 #### `view.setBounds(bounds)`
 
 * `bounds` [Rectangle](structures/rectangle.md) - New bounds of the View.

docs/breaking-changes.md

@@ -14,37 +14,6 @@ This document uses the following convention to categorize breaking changes:
 
 ## Planned Breaking API Changes (33.0)
 
-### Behavior Changed: custom protocol URL handling on Windows
-
-Due to changes made in Chromium to support [Non-Special Scheme URLs](http://bit.ly/url-non-special), custom protocol URLs that use Windows file paths will no longer work correctly with the deprecated `protocol.registerFileProtocol` and the `baseURLForDataURL` property on `BrowserWindow.loadURL`, `WebContents.loadURL`, and `<webview>.loadURL`.  `protocol.handle` will also not work with these types of URLs but this is not a change since it has always worked that way.
-
-```js
-// No longer works
-protocol.registerFileProtocol('other', () => {
-  callback({ filePath: '/path/to/my/file' })
-})
-
-const mainWindow = new BrowserWindow()
-mainWindow.loadURL('data:text/html,<script src="loaded-from-dataurl.js"></script>', { baseURLForDataURL: 'other://C:\\myapp' })
-mainWindow.loadURL('other://C:\\myapp\\index.html')
-
-// Replace with
-const path = require('node:path')
-const nodeUrl = require('node:url')
-protocol.handle(other, (req) => {
-  const srcPath = 'C:\\myapp\\'
-  const reqURL = new URL(req.url)
-  return net.fetch(nodeUrl.pathToFileURL(path.join(srcPath, reqURL.pathname)).toString())
-})
-
-mainWindow.loadURL('data:text/html,<script src="loaded-from-dataurl.js"></script>', { baseURLForDataURL: 'other://' })
-mainWindow.loadURL('other://index.html')
-```
-
-### Behavior Changed: menu bar will be hidden during fullscreen on Windows
-
-This brings the behavior to parity with Linux. Prior behavior: Menu bar is still visible during fullscreen on Windows. New behavior: Menu bar is hidden during fullscreen on Windows.
-
 ### Behavior Changed: `webContents` property on `login` on `app`
 
 The `webContents` property in the `login` event from `app` will be `null`

docs/development/patches.md

@@ -65,8 +65,6 @@ $ git rebase --autosquash -i [COMMIT_SHA]^
 $ ../electron/script/git-export-patches -o ../electron/patches/v8
 ```
 
-Note that the `^` symbol [can cause trouble on Windows](https://stackoverflow.com/questions/14203952/git-reset-asks-more/14204318#14204318). The workaround is to either quote it `"[COMMIT_SHA]^"` or avoid it `[COMMIT_SHA]~1`.
-
 #### Removing a patch
 
 ```bash

docs/fiddles/features/navigation-history/index.html

@@ -1,32 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <title>Enhanced Browser with Navigation History</title>
-    <link href="styles.css" rel="stylesheet" />
-</head>
-
-<body>
-
-    <div id="controls">
-        <button id="backBtn" title="Go back">Back</button>
-        <button id="forwardBtn" title="Go forward">Forward</button>
-        <button id="backHistoryBtn" title="Show back history">Back History</button>
-        <button id="forwardHistoryBtn" title="Show forward history">Forward History</button>
-        <input id="urlInput" type="text" placeholder="Enter URL">
-        <button id="goBtn" title="Navigate to URL">Go</button>
-    </div>
-
-    <div id="historyPanel" class="history-panel"></div>
-
-    <div id="description">
-        <h2>Navigation History Demo</h2>
-        <p>This demo showcases Electron's NavigationHistory API functionality.</p>
-        <p><strong>Back/Forward:</strong> Navigate through your browsing history.</p>
-        <p><strong>Back History/Forward History:</strong> View and select from your browsing history.</p>
-        <p><strong>URL Bar:</strong> Enter a URL and click 'Go' or press Enter to navigate.</p>
-    </div>
-    <script src="renderer.js"></script>
-</body>
-
-</html>

docs/fiddles/features/navigation-history/main.js

@@ -1,58 +0,0 @@
-const { app, BrowserWindow, BrowserView, ipcMain } = require('electron')
-const path = require('path')
-
-function createWindow () {
-  const mainWindow = new BrowserWindow({
-    width: 1000,
-    height: 800,
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js'),
-      nodeIntegration: false,
-      contextIsolation: true
-    }
-  })
-
-  mainWindow.loadFile('index.html')
-
-  const view = new BrowserView()
-  mainWindow.setBrowserView(view)
-  view.setBounds({ x: 0, y: 100, width: 1000, height: 800 })
-  view.setAutoResize({ width: true, height: true })
-
-  const navigationHistory = view.webContents.navigationHistory
-  ipcMain.handle('nav:back', () =>
-    navigationHistory.goBack()
-  )
-
-  ipcMain.handle('nav:forward', () => {
-    navigationHistory.goForward()
-  })
-
-  ipcMain.handle('nav:canGoBack', () => navigationHistory.canGoBack())
-  ipcMain.handle('nav:canGoForward', () => navigationHistory.canGoForward())
-  ipcMain.handle('nav:loadURL', (_, url) =>
-    view.webContents.loadURL(url)
-  )
-  ipcMain.handle('nav:getCurrentURL', () => view.webContents.getURL())
-  ipcMain.handle('nav:getHistory', () => {
-    return navigationHistory.getAllEntries()
-  })
-
-  view.webContents.on('did-navigate', () => {
-    mainWindow.webContents.send('nav:updated')
-  })
-
-  view.webContents.on('did-navigate-in-page', () => {
-    mainWindow.webContents.send('nav:updated')
-  })
-}
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') app.quit()
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) createWindow()
-})

docs/fiddles/features/navigation-history/preload.js

@@ -1,12 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  goBack: () => ipcRenderer.invoke('nav:back'),
-  goForward: () => ipcRenderer.invoke('nav:forward'),
-  canGoBack: () => ipcRenderer.invoke('nav:canGoBack'),
-  canGoForward: () => ipcRenderer.invoke('nav:canGoForward'),
-  loadURL: (url) => ipcRenderer.invoke('nav:loadURL', url),
-  getCurrentURL: () => ipcRenderer.invoke('nav:getCurrentURL'),
-  getHistory: () => ipcRenderer.invoke('nav:getHistory'),
-  onNavigationUpdate: (callback) => ipcRenderer.on('nav:updated', callback)
-})

docs/fiddles/features/navigation-history/renderer.js

@@ -1,84 +0,0 @@
-const backBtn = document.getElementById('backBtn')
-const forwardBtn = document.getElementById('forwardBtn')
-const backHistoryBtn = document.getElementById('backHistoryBtn')
-const forwardHistoryBtn = document.getElementById('forwardHistoryBtn')
-const urlInput = document.getElementById('urlInput')
-const goBtn = document.getElementById('goBtn')
-const historyPanel = document.getElementById('historyPanel')
-
-async function updateButtons () {
-  const canGoBack = await window.electronAPI.canGoBack()
-  const canGoForward = await window.electronAPI.canGoForward()
-  backBtn.disabled = !canGoBack
-  backHistoryBtn.disabled = !canGoBack
-
-  forwardBtn.disabled = !canGoForward
-  forwardHistoryBtn.disabled = !canGoForward
-}
-
-async function updateURL () {
-  urlInput.value = await window.electronAPI.getCurrentURL()
-}
-
-function transformURL (url) {
-  if (!url.startsWith('http://') && !url.startsWith('https://')) {
-    const updatedUrl = 'https://' + url
-    return updatedUrl
-  }
-  return url
-}
-
-async function navigate (url) {
-  const urlInput = transformURL(url)
-
-  await window.electronAPI.loadURL(urlInput)
-}
-
-async function showHistory (forward = false) {
-  const history = await window.electronAPI.getHistory()
-  const currentIndex = history.findIndex(entry => entry.url === transformURL(urlInput.value))
-
-  if (!currentIndex) {
-    return
-  }
-
-  const relevantHistory = forward
-    ? history.slice(currentIndex + 1)
-    : history.slice(0, currentIndex).reverse()
-
-  historyPanel.innerHTML = ''
-  relevantHistory.forEach(entry => {
-    const div = document.createElement('div')
-    div.textContent = `Title: ${entry.title}, URL: ${entry.url}`
-    div.onclick = () => navigate(entry.url)
-    historyPanel.appendChild(div)
-  })
-
-  historyPanel.style.display = 'block'
-}
-
-backBtn.addEventListener('click', () => window.electronAPI.goBack())
-forwardBtn.addEventListener('click', () => window.electronAPI.goForward())
-backHistoryBtn.addEventListener('click', () => showHistory(false))
-forwardHistoryBtn.addEventListener('click', () => showHistory(true))
-goBtn.addEventListener('click', () => navigate(urlInput.value))
-
-urlInput.addEventListener('keypress', (e) => {
-  if (e.key === 'Enter') {
-    navigate(urlInput.value)
-  }
-})
-
-document.addEventListener('click', (e) => {
-  if (e.target !== historyPanel && !historyPanel.contains(e.target) &&
-    e.target !== backHistoryBtn && e.target !== forwardHistoryBtn) {
-    historyPanel.style.display = 'none'
-  }
-})
-
-window.electronAPI.onNavigationUpdate(() => {
-  updateButtons()
-  updateURL()
-})
-
-updateButtons()

docs/fiddles/features/navigation-history/style.css

@@ -1,58 +0,0 @@
-body {
-    margin: 0;
-    font-family: Arial, sans-serif;
-    background-color: #f0f0f0;
-}
-#controls {
-    display: flex;
-    align-items: center;
-    padding: 10px;
-    background-color: #ffffff;
-    border-bottom: 1px solid #ccc;
-}
-button {
-    margin-right: 10px;
-    padding: 8px 12px;
-    font-size: 14px;
-    background-color: #4CAF50;
-    color: white;
-    border: none;
-    cursor: pointer;
-    transition: background-color 0.3s;
-}
-button:hover {
-    background-color: #45a049;
-}
-button:disabled {
-    background-color: #cccccc;
-    cursor: not-allowed;
-}
-#urlInput {
-    flex-grow: 1;
-    margin: 0 10px;
-    padding: 8px;
-    font-size: 14px;
-}
-
-#historyPanel {
-    display: none;
-    position: absolute;
-    top: 60px;
-    left: 10px;
-    background: white;
-    border: 1px solid #ccc;
-    padding: 10px;
-    max-height: 300px;
-    overflow-y: auto;
-    z-index: 1000;
-}
-  #historyPanel div {
-    cursor: pointer;
-    padding: 5px;
-}
-
-#description {
-    background-color: #f0f0f0;
-    padding: 10px;
-    margin-top: 150px;
-}

docs/tutorial/navigation-history.md

@@ -1,76 +0,0 @@
----
-title: "Navigation History"
-description: "The NavigationHistory API allows you to manage and interact with the browsing history of your Electron application."
-slug: navigation-history
-hide_title: false
----
-
-# Navigation History
-
-## Overview
-
-The [NavigationHistory](../api/navigation-history.md) class allows you to manage and interact with the browsing history of your Electron application. This powerful feature enables you to create intuitive navigation experiences for your users.
-
-## Accessing NavigationHistory
-
-Navigation history is stored per [`WebContents`](../api/web-contents.md) instance. To access a specific instance of the NavigationHistory class, use the WebContents class's [`contents.navigationHistory` instance property](https://www.electronjs.org/docs/latest/api/web-contents#contentsnavigationhistory-readonly).
-
-```js
-const { BrowserWindow } = require('electron')
-
-const mainWindow = new BrowserWindow()
-const { navigationHistory } = mainWindow.webContents
-```
-
-## Navigating through history
-
-Easily implement back and forward navigation:
-
-```js @ts-type={navigationHistory:Electron.NavigationHistory}
-// Go back
-if (navigationHistory.canGoBack()) {
-  navigationHistory.goBack()
-}
-
-// Go forward
-if (navigationHistory.canGoForward()) {
-  navigationHistory.goForward()
-}
-```
-
-## Accessing history entries
-
-Retrieve and display the user's browsing history:
-
-```js @ts-type={navigationHistory:Electron.NavigationHistory}
-const entries = navigationHistory.getAllEntries()
-
-entries.forEach((entry) => {
-  console.log(`${entry.title}: ${entry.url}`)
-})
-```
-
-Each navigation entry corresponds to a specific page. The indexing system follows a sequential order:
-
-- Index 0: Represents the earliest visited page.
-- Index N: Represents the most recent page visited.
-
-## Navigating to specific entries
-
-Allow users to jump to any point in their browsing history:
-
-```js @ts-type={navigationHistory:Electron.NavigationHistory}
-// Navigate to the 5th entry in the history, if the index is valid
-navigationHistory.goToIndex(4)
-
-// Navigate to the 2nd entry forward from the current position
-if (navigationHistory.canGoToOffset(2)) {
-  navigationHistory.goToOffset(2)
-}
-```
-
-Here's a full example that you can open with Electron Fiddle:
-
-```fiddle docs/fiddles/features/navigation-history
-
-```

docs/tutorial/updates.md

@@ -261,59 +261,7 @@ server-communication aspect of the process by loading your update from a local d
 
 ## Update server specification
 
-For advanced deployment needs, you can also roll out your own Squirrel-compatible update server.
-For example, you may want to have percentage-based rollouts, distribute your app through separate
-release channels, or put your update server behind an authentication check.
-
-Squirrel.Windows and Squirrel.Mac clients require different response formats,
-but you can use a single server for both platforms by sending requests to
-different endpoints depending on the value of `process.platform`.
-
-```js title='main.js'
-const { app, autoUpdater } = require('electron')
-
-const server = 'https://your-deployment-url.com'
-// e.g. for Windows and app version 1.2.3
-// https://your-deployment-url.com/update/win32/1.2.3
-const url = `${server}/update/${process.platform}/${app.getVersion()}`
-
-autoUpdater.setFeedURL({ url })
-```
-
-### Windows
-
-A Squirrel.Windows client expects the update server to return the `RELEASES` artifact
-of the latest available build at the `/RELEASES` subpath of your endpoint.
-
-For example, if your feed URL is `https://your-deployment-url.com/update/win32/1.2.3`,
-then the `https://your-deployment-url.com/update/win32/1.2.3/RELEASES` endpoint
-should return the contents of the `RELEASES` artifact of the version you want to serve.
-
-```plaintext title='https://your-deployment-url.com/update/win32/1.2.3/RELEASES'
-B0892F3C7AC91D72A6271FF36905FEF8FE993520 https://your-static.storage/your-app-1.2.3-full.nupkg 103298365
-```
-
-Squirrel.Windows does the comparison check to see if the current app should update to
-the version returned in `RELEASES`, so you should return a response even when no update
-is available.
-
-### macOS
-
-When an update is available, the Squirrel.Mac client expects a JSON response at the feed URL's endpoint.
-This object has a mandatory `url` property that maps to a ZIP archive of the
-app update. All other properties in the object are optional.
-
-```json title='https://your-deployment-url.com/update/darwin/0.31.0'
-{
-    "url": "https://your-static.storage/your-app-1.2.3-darwin.zip",
-    "name": "1.2.3",
-    "notes": "Theses are some release notes innit",
-    "pub_date": "2024-09-18T12:29:53+01:00"
-}
-```
-
-If no update is available, the server should return a [`204 No Content`](https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/204)
-HTTP response.
+A Squirrel-compatible update server has different
 
 [vercel]: https://vercel.com
 [hazel]: https://github.com/vercel/hazel

filenames.gni

@@ -379,6 +379,8 @@ filenames = {
     "shell/browser/electron_navigation_throttle.h",
     "shell/browser/electron_permission_manager.cc",
     "shell/browser/electron_permission_manager.h",
+    "shell/browser/electron_plugin_info_host_impl.cc",
+    "shell/browser/electron_plugin_info_host_impl.h",
     "shell/browser/electron_speech_recognition_manager_delegate.cc",
     "shell/browser/electron_speech_recognition_manager_delegate.h",
     "shell/browser/electron_web_contents_utility_handler_impl.cc",

filenames.libcxx.gni

@@ -326,11 +326,6 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__coroutine/coroutine_traits.h",
   "//third_party/libc++/src/include/__coroutine/noop_coroutine_handle.h",
   "//third_party/libc++/src/include/__coroutine/trivial_awaitables.h",
-  "//third_party/libc++/src/include/__cstddef/byte.h",
-  "//third_party/libc++/src/include/__cstddef/max_align_t.h",
-  "//third_party/libc++/src/include/__cstddef/nullptr_t.h",
-  "//third_party/libc++/src/include/__cstddef/ptrdiff_t.h",
-  "//third_party/libc++/src/include/__cstddef/size_t.h",
   "//third_party/libc++/src/include/__debug_utils/randomize_range.h",
   "//third_party/libc++/src/include/__debug_utils/sanitizers.h",
   "//third_party/libc++/src/include/__debug_utils/strict_weak_ordering_check.h",
@@ -420,13 +415,11 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__functional/weak_result_type.h",
   "//third_party/libc++/src/include/__fwd/array.h",
   "//third_party/libc++/src/include/__fwd/bit_reference.h",
-  "//third_party/libc++/src/include/__fwd/byte.h",
   "//third_party/libc++/src/include/__fwd/complex.h",
   "//third_party/libc++/src/include/__fwd/deque.h",
   "//third_party/libc++/src/include/__fwd/format.h",
   "//third_party/libc++/src/include/__fwd/fstream.h",
   "//third_party/libc++/src/include/__fwd/functional.h",
-  "//third_party/libc++/src/include/__fwd/get.h",
   "//third_party/libc++/src/include/__fwd/ios.h",
   "//third_party/libc++/src/include/__fwd/istream.h",
   "//third_party/libc++/src/include/__fwd/mdspan.h",
@@ -443,7 +436,6 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__fwd/string_view.h",
   "//third_party/libc++/src/include/__fwd/subrange.h",
   "//third_party/libc++/src/include/__fwd/tuple.h",
-  "//third_party/libc++/src/include/__fwd/variant.h",
   "//third_party/libc++/src/include/__fwd/vector.h",
   "//third_party/libc++/src/include/__hash_table",
   "//third_party/libc++/src/include/__ios/fpos.h",
@@ -546,7 +538,6 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__memory/construct_at.h",
   "//third_party/libc++/src/include/__memory/destruct_n.h",
   "//third_party/libc++/src/include/__memory/inout_ptr.h",
-  "//third_party/libc++/src/include/__memory/noexcept_move_assign_container.h",
   "//third_party/libc++/src/include/__memory/out_ptr.h",
   "//third_party/libc++/src/include/__memory/pointer_traits.h",
   "//third_party/libc++/src/include/__memory/ranges_construct_at.h",
@@ -558,7 +549,6 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__memory/temporary_buffer.h",
   "//third_party/libc++/src/include/__memory/uninitialized_algorithms.h",
   "//third_party/libc++/src/include/__memory/unique_ptr.h",
-  "//third_party/libc++/src/include/__memory/unique_temporary_buffer.h",
   "//third_party/libc++/src/include/__memory/uses_allocator.h",
   "//third_party/libc++/src/include/__memory/uses_allocator_construction.h",
   "//third_party/libc++/src/include/__memory/voidify.h",
@@ -836,6 +826,7 @@ libcxx_headers = [
   "//third_party/libc++/src/include/__type_traits/maybe_const.h",
   "//third_party/libc++/src/include/__type_traits/nat.h",
   "//third_party/libc++/src/include/__type_traits/negation.h",
+  "//third_party/libc++/src/include/__type_traits/noexcept_move_assign_container.h",
   "//third_party/libc++/src/include/__type_traits/promote.h",
   "//third_party/libc++/src/include/__type_traits/rank.h",
   "//third_party/libc++/src/include/__type_traits/remove_all_extents.h",
@@ -930,6 +921,7 @@ libcxx_headers = [
   "//third_party/libc++/src/include/exception",
   "//third_party/libc++/src/include/execution",
   "//third_party/libc++/src/include/expected",
+  "//third_party/libc++/src/include/experimental/__config",
   "//third_party/libc++/src/include/experimental/__simd/aligned_tag.h",
   "//third_party/libc++/src/include/experimental/__simd/declaration.h",
   "//third_party/libc++/src/include/experimental/__simd/reference.h",

lib/browser/api/app.ts

@@ -1,7 +1,7 @@
-import { Menu } from 'electron/main';
-
 import * as fs from 'fs';
 
+import { Menu } from 'electron/main';
+
 const bindings = process._linkedBinding('electron_browser_app');
 const commandLine = process._linkedBinding('electron_common_command_line');
 const { app } = bindings;

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

@@ -1,8 +1,6 @@
-import * as squirrelUpdate from '@electron/internal/browser/api/auto-updater/squirrel-update-win';
-
 import { app } from 'electron/main';
-
 import { EventEmitter } from 'events';
+import * as squirrelUpdate from '@electron/internal/browser/api/auto-updater/squirrel-update-win';
 
 class AutoUpdater extends EventEmitter implements Electron.AutoUpdater {
   updateAvailable: boolean = false;

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

@@ -1,6 +1,6 @@
-import { spawn, ChildProcessWithoutNullStreams } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
+import { spawn, ChildProcessWithoutNullStreams } from 'child_process';
 
 // i.e. my-app/app-0.1.13/
 const appFolder = path.dirname(process.execPath);

lib/browser/api/base-window.ts

@@ -1,7 +1,6 @@
-import { TouchBar } from 'electron/main';
-import type { BaseWindow as TLWT } from 'electron/main';
-
 import { EventEmitter } from 'events';
+import type { BaseWindow as TLWT } from 'electron/main';
+import { TouchBar } from 'electron/main';
 
 const { BaseWindow } = process._linkedBinding('electron_browser_base_window') as { BaseWindow: typeof TLWT };
 

lib/browser/api/browser-view.ts

@@ -68,7 +68,10 @@ export default class BrowserView {
   // a webContents can be closed by the user while the BrowserView
   // remains alive and attached to a BrowserWindow.
   set ownerWindow (w: BrowserWindow | null) {
-    this.#removeResizeListener();
+    if (this.#ownerWindow && this.#resizeListener) {
+      this.#ownerWindow.off('resize', this.#resizeListener);
+      this.#resizeListener = null;
+    }
 
     if (this.webContents && !this.webContents.isDestroyed()) {
       this.webContents._setOwnerWindow(w);
@@ -79,7 +82,6 @@ export default class BrowserView {
       this.#lastWindowSize = w.getBounds();
       w.on('resize', this.#resizeListener = this.#autoResize.bind(this));
       w.on('closed', () => {
-        this.#removeResizeListener();
         this.#ownerWindow = null;
         this.#destroyListener = null;
       });
@@ -92,13 +94,6 @@ export default class BrowserView {
     this.#ownerWindow?.contentView.removeChildView(this.webContentsView);
   }
 
-  #removeResizeListener () {
-    if (this.#ownerWindow && this.#resizeListener) {
-      this.#ownerWindow.off('resize', this.#resizeListener);
-      this.#resizeListener = null;
-    }
-  }
-
   #autoHorizontalProportion: {width: number, left: number} | null = null;
   #autoVerticalProportion: {height: number, top: number} | null = null;
   #autoResize () {

lib/browser/api/browser-window.ts

@@ -1,6 +1,5 @@
 import { BaseWindow, WebContents, BrowserView } from 'electron/main';
 import type { BrowserWindow as BWT } from 'electron/main';
-
 const { BrowserWindow } = process._linkedBinding('electron_browser_window') as { BrowserWindow: typeof BWT };
 
 Object.setPrototypeOf(BrowserWindow.prototype, BaseWindow.prototype);

lib/browser/api/crash-reporter.ts

@@ -1,6 +1,5 @@
-import * as deprecate from '@electron/internal/common/deprecate';
-
 import { app } from 'electron/main';
+import * as deprecate from '@electron/internal/common/deprecate';
 
 const binding = process._linkedBinding('electron_browser_crash_reporter');
 

lib/browser/api/desktop-capturer.ts

@@ -1,5 +1,4 @@
 import { BrowserWindow } from 'electron/main';
-
 const { createDesktopCapturer, isDisplayMediaSystemPickerAvailable } = process._linkedBinding('electron_browser_desktop_capturer');
 
 const deepEqual = (a: ElectronInternal.GetSourcesOptions, b: ElectronInternal.GetSourcesOptions) => JSON.stringify(a) === JSON.stringify(b);

lib/browser/api/dialog.ts

@@ -1,6 +1,5 @@
 import { app, BaseWindow } from 'electron/main';
 import type { OpenDialogOptions, OpenDialogReturnValue, MessageBoxOptions, SaveDialogOptions, SaveDialogReturnValue, MessageBoxReturnValue, CertificateTrustDialogOptions } from 'electron/main';
-
 const dialogBinding = process._linkedBinding('electron_browser_dialog');
 
 enum SaveFileDialogProperties {

lib/browser/api/exports/electron.ts

@@ -1,6 +1,6 @@
-import { browserModuleList } from '@electron/internal/browser/api/module-list';
-import { commonModuleList } from '@electron/internal/common/api/module-list';
 import { defineProperties } from '@electron/internal/common/define-properties';
+import { commonModuleList } from '@electron/internal/common/api/module-list';
+import { browserModuleList } from '@electron/internal/browser/api/module-list';
 
 module.exports = {};
 

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

@@ -251,35 +251,33 @@ export const roleList: Record<RoleId, Role> = {
       { role: 'cut' },
       { role: 'copy' },
       { role: 'paste' },
-      ...(isMac
-        ? [
-          { role: 'pasteAndMatchStyle' },
-          { role: 'delete' },
-          { role: 'selectAll' },
-          { type: 'separator' },
-          {
-            label: 'Substitutions',
-            submenu: [
-              { role: 'showSubstitutions' },
-              { type: 'separator' },
-              { role: 'toggleSmartQuotes' },
-              { role: 'toggleSmartDashes' },
-              { role: 'toggleTextReplacement' }
-            ]
-          },
-          {
-            label: 'Speech',
-            submenu: [
-              { role: 'startSpeaking' },
-              { role: 'stopSpeaking' }
-            ]
-          }
-        ] as MenuItemConstructorOptions[]
-        : [
-          { role: 'delete' },
-          { type: 'separator' },
-          { role: 'selectAll' }
-        ] as MenuItemConstructorOptions[])
+      ...(isMac ? [
+        { role: 'pasteAndMatchStyle' },
+        { role: 'delete' },
+        { role: 'selectAll' },
+        { type: 'separator' },
+        {
+          label: 'Substitutions',
+          submenu: [
+            { role: 'showSubstitutions' },
+            { type: 'separator' },
+            { role: 'toggleSmartQuotes' },
+            { role: 'toggleSmartDashes' },
+            { role: 'toggleTextReplacement' }
+          ]
+        },
+        {
+          label: 'Speech',
+          submenu: [
+            { role: 'startSpeaking' },
+            { role: 'stopSpeaking' }
+          ]
+        }
+      ] as MenuItemConstructorOptions[] : [
+        { role: 'delete' },
+        { type: 'separator' },
+        { role: 'selectAll' }
+      ] as MenuItemConstructorOptions[])
     ]
   },
   // View submenu
@@ -303,14 +301,12 @@ export const roleList: Record<RoleId, Role> = {
     submenu: [
       { role: 'minimize' },
       { role: 'zoom' },
-      ...(isMac
-        ? [
-          { type: 'separator' },
-          { role: 'front' }
-        ] as MenuItemConstructorOptions[]
-        : [
-          { role: 'close' }
-        ] as MenuItemConstructorOptions[])
+      ...(isMac ? [
+        { type: 'separator' },
+        { role: 'front' }
+      ] as MenuItemConstructorOptions[] : [
+        { role: 'close' }
+      ] as MenuItemConstructorOptions[])
     ]
   },
   // Share submenu

lib/browser/api/menu-item.ts

@@ -1,5 +1,4 @@
 import * as roles from '@electron/internal/browser/api/menu-item-roles';
-
 import { Menu, BaseWindow, WebContents, KeyboardEvent } from 'electron/main';
 
 let nextCommandId = 0;

lib/browser/api/menu.ts

@@ -1,8 +1,7 @@
+import { BaseWindow, MenuItem, webContents, Menu as MenuType, MenuItemConstructorOptions } from 'electron/main';
 import { sortMenuItems } from '@electron/internal/browser/api/menu-utils';
 import { setApplicationMenuWasSet } from '@electron/internal/browser/default-menu';
 
-import { BaseWindow, MenuItem, webContents, Menu as MenuType, MenuItemConstructorOptions } from 'electron/main';
-
 const bindings = process._linkedBinding('electron_browser_menu');
 
 const { Menu } = bindings as { Menu: typeof MenuType };

lib/browser/api/message-channel.ts

@@ -1,7 +1,5 @@
 import { MessagePortMain } from '@electron/internal/browser/message-port-main';
-
 import { EventEmitter } from 'events';
-
 const { createPair } = process._linkedBinding('electron_browser_message_port');
 
 export default class MessageChannelMain extends EventEmitter implements Electron.MessageChannelMain {

lib/browser/api/net-fetch.ts

@@ -1,8 +1,6 @@
-import { allowAnyProtocol } from '@electron/internal/common/api/net-client-request';
-
 import { ClientRequestConstructorOptions, ClientRequest, IncomingMessage, Session as SessionT } from 'electron/main';
-
 import { Readable, Writable, isReadable } from 'stream';
+import { allowAnyProtocol } from '@electron/internal/common/api/net-client-request';
 
 function createDeferredPromise<T, E extends Error = Error> (): { promise: Promise<T>; resolve: (x: T) => void; reject: (e: E) => void; } {
   let res: (x: T) => void;

lib/browser/api/net.ts

@@ -1,7 +1,6 @@
-import { ClientRequest } from '@electron/internal/common/api/net-client-request';
-
 import { app, IncomingMessage, session } from 'electron/main';
 import type { ClientRequestConstructorOptions } from 'electron/main';
+import { ClientRequest } from '@electron/internal/common/api/net-client-request';
 
 const { isOnline } = process._linkedBinding('electron_common_net');
 

lib/browser/api/protocol.ts

@@ -1,5 +1,4 @@
 import { ProtocolRequest, session } from 'electron/main';
-
 import { createReadStream } from 'fs';
 import { Readable } from 'stream';
 import { ReadableStream } from 'stream/web';

lib/browser/api/session.ts

@@ -1,20 +1,16 @@
 import { fetchWithSession } from '@electron/internal/browser/api/net-fetch';
-
 import { net } from 'electron/main';
-
 const { fromPartition, fromPath, Session } = process._linkedBinding('electron_browser_session');
 const { isDisplayMediaSystemPickerAvailable } = process._linkedBinding('electron_browser_desktop_capturer');
 
-// Fake video window that activates the native system picker
+// Fake video source that activates the native system picker
 // This is used to get around the need for a screen/window
 // id in Chrome's desktopCapturer.
-let fakeVideoWindowId = -1;
-// See content/public/browser/desktop_media_id.h
-const kMacOsNativePickerId = -4;
+let fakeVideoSourceId = -1;
 const systemPickerVideoSource = Object.create(null);
 Object.defineProperty(systemPickerVideoSource, 'id', {
   get () {
-    return `window:${kMacOsNativePickerId}:${fakeVideoWindowId--}`;
+    return `window:${fakeVideoSourceId--}:0`;
   }
 });
 systemPickerVideoSource.name = '';

lib/browser/api/share-menu.ts

@@ -1,5 +1,4 @@
 import { BrowserWindow, Menu, SharingItem, PopupOptions } from 'electron/main';
-
 import { EventEmitter } from 'events';
 
 class ShareMenu extends EventEmitter implements Electron.ShareMenu {

lib/browser/api/system-preferences.ts

@@ -1,5 +1,4 @@
 import * as deprecate from '@electron/internal/common/deprecate';
-
 const { systemPreferences } = process._linkedBinding('electron_browser_system_preferences');
 
 if ('getEffectiveAppearance' in systemPreferences) {

lib/browser/api/touch-bar.ts

@@ -117,12 +117,10 @@ class TouchBarColorPicker extends TouchBarItem<Electron.TouchBarColorPickerConst
   @LiveProperty<TouchBarColorPicker>(config => config.selectedColor)
     selectedColor!: string;
 
-  @ImmutableProperty<TouchBarColorPicker>(({ change: onChange }, setInternalProp) => typeof onChange === 'function'
-    ? (details: { color: string }) => {
-        setInternalProp('selectedColor', details.color);
-        onChange(details.color);
-      }
-    : null)
+  @ImmutableProperty<TouchBarColorPicker>(({ change: onChange }, setInternalProp) => typeof onChange === 'function' ? (details: { color: string }) => {
+    setInternalProp('selectedColor', details.color);
+    onChange(details.color);
+  } : null)
     onInteraction!: Function | null;
 }
 
@@ -205,12 +203,10 @@ class TouchBarSlider extends TouchBarItem<Electron.TouchBarSliderConstructorOpti
   @LiveProperty<TouchBarSlider>(config => config.value)
     value!: number;
 
-  @ImmutableProperty<TouchBarSlider>(({ change: onChange }, setInternalProp) => typeof onChange === 'function'
-    ? (details: { value: number }) => {
-        setInternalProp('value', details.value);
-        onChange(details.value);
-      }
-    : null)
+  @ImmutableProperty<TouchBarSlider>(({ change: onChange }, setInternalProp) => typeof onChange === 'function' ? (details: { value: number }) => {
+    setInternalProp('value', details.value);
+    onChange(details.value);
+  } : null)
     onInteraction!: Function | null;
 }
 
@@ -240,12 +236,10 @@ class TouchBarSegmentedControl extends TouchBarItem<Electron.TouchBarSegmentedCo
   @LiveProperty<TouchBarSegmentedControl>(config => config.mode)
     mode!: Electron.TouchBarSegmentedControl['mode'];
 
-  @ImmutableProperty<TouchBarSegmentedControl>(({ change: onChange }, setInternalProp) => typeof onChange === 'function'
-    ? (details: { selectedIndex: number, isSelected: boolean }) => {
-        setInternalProp('selectedIndex', details.selectedIndex);
-        onChange(details.selectedIndex, details.isSelected);
-      }
-    : null)
+  @ImmutableProperty<TouchBarSegmentedControl>(({ change: onChange }, setInternalProp) => typeof onChange === 'function' ? (details: { selectedIndex: number, isSelected: boolean }) => {
+    setInternalProp('selectedIndex', details.selectedIndex);
+    onChange(details.selectedIndex, details.isSelected);
+  } : null)
     onInteraction!: Function | null;
 }
 
@@ -271,15 +265,13 @@ class TouchBarScrubber extends TouchBarItem<Electron.TouchBarScrubberConstructor
   @LiveProperty<TouchBarScrubber>(config => typeof config.continuous === 'undefined' ? true : config.continuous)
     continuous!: boolean;
 
-  @ImmutableProperty<TouchBarScrubber>(({ select: onSelect, highlight: onHighlight }) => typeof onSelect === 'function' || typeof onHighlight === 'function'
-    ? (details: { type: 'select'; selectedIndex: number } | { type: 'highlight'; highlightedIndex: number }) => {
-        if (details.type === 'select') {
-          if (onSelect) onSelect(details.selectedIndex);
-        } else {
-          if (onHighlight) onHighlight(details.highlightedIndex);
-        }
-      }
-    : null)
+  @ImmutableProperty<TouchBarScrubber>(({ select: onSelect, highlight: onHighlight }) => typeof onSelect === 'function' || typeof onHighlight === 'function' ? (details: { type: 'select'; selectedIndex: number } | { type: 'highlight'; highlightedIndex: number }) => {
+    if (details.type === 'select') {
+      if (onSelect) onSelect(details.selectedIndex);
+    } else {
+      if (onHighlight) onHighlight(details.highlightedIndex);
+    }
+  } : null)
     onInteraction!: Function | null;
 }
 

lib/browser/api/utility-process.ts

@@ -1,9 +1,7 @@
-import { MessagePortMain } from '@electron/internal/browser/message-port-main';
-
 import { EventEmitter } from 'events';
-import { Socket } from 'net';
 import { Duplex, PassThrough } from 'stream';
-
+import { Socket } from 'net';
+import { MessagePortMain } from '@electron/internal/browser/message-port-main';
 const { _fork } = process._linkedBinding('electron_browser_utility_process');
 
 class ForkUtilityProcess extends EventEmitter implements Electron.UtilityProcess {

lib/browser/api/view.ts

@@ -1,5 +1,4 @@
 import { EventEmitter } from 'events';
-
 const { View } = process._linkedBinding('electron_browser_view');
 
 Object.setPrototypeOf((View as any).prototype, EventEmitter.prototype);

lib/browser/api/web-contents.ts

@@ -1,17 +1,16 @@
+import { app, ipcMain, session, webFrameMain, dialog } from 'electron/main';
+import type { BrowserWindowConstructorOptions, LoadURLOptions, MessageBoxOptions, WebFrameMain } from 'electron/main';
+
+import * as url from 'url';
+import * as path from 'path';
 import { openGuestWindow, makeWebPreferences, parseContentTypeFormat } from '@electron/internal/browser/guest-window-manager';
-import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
+import { parseFeatures } from '@electron/internal/browser/parse-features-string';
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
 import { MessagePortMain } from '@electron/internal/browser/message-port-main';
-import { parseFeatures } from '@electron/internal/browser/parse-features-string';
-import * as deprecate from '@electron/internal/common/deprecate';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-
-import { app, ipcMain, session, webFrameMain, dialog } from 'electron/main';
-import type { BrowserWindowConstructorOptions, MessageBoxOptions } from 'electron/main';
-
-import * as path from 'path';
-import * as url from 'url';
+import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
+import * as deprecate from '@electron/internal/common/deprecate';
 
 // session is not used here, the purpose is to make sure session is initialized
 // before the webContents module.
@@ -25,6 +24,8 @@ const getNextId = function () {
   return ++nextId;
 };
 
+type PostData = LoadURLOptions['postData']
+
 // Stock page sizes
 const PDFPageSizes: Record<string, ElectronInternal.MediaSize> = {
   Letter: {
@@ -402,7 +403,7 @@ WebContents.prototype.loadURL = function (url, options) {
       // the only one is with a bad scheme, perhaps ERR_INVALID_ARGUMENT
       // would be more appropriate.
       if (!error) {
-        error = { errorCode: -2, errorDescription: 'ERR_FAILED', url };
+        error = { errorCode: -2, errorDescription: 'ERR_FAILED', url: url };
       }
       finishListener();
     };
@@ -603,7 +604,7 @@ WebContents.prototype._init = function () {
   });
 
   // Dispatch IPC messages to the ipc module.
-  this.on('-ipc-message', function (this: Electron.WebContents, event, internal, channel, args) {
+  this.on('-ipc-message' as any, function (this: Electron.WebContents, event: Electron.IpcMainEvent, internal: boolean, channel: string, args: any[]) {
     addSenderToEvent(event, this);
     if (internal) {
       ipcMainInternal.emit(channel, event, ...args);
@@ -617,7 +618,7 @@ WebContents.prototype._init = function () {
     }
   });
 
-  this.on('-ipc-invoke', async function (this: Electron.WebContents, event, internal, channel, args) {
+  this.on('-ipc-invoke' as any, async function (this: Electron.WebContents, event: Electron.IpcMainInvokeEvent, internal: boolean, channel: string, args: any[]) {
     addSenderToEvent(event, this);
     const replyWithResult = (result: any) => event._replyChannel.sendReply({ result });
     const replyWithError = (error: Error) => {
@@ -639,7 +640,7 @@ WebContents.prototype._init = function () {
     }
   });
 
-  this.on('-ipc-message-sync', function (this: Electron.WebContents, event, internal, channel, args) {
+  this.on('-ipc-message-sync' as any, function (this: Electron.WebContents, event: Electron.IpcMainEvent, internal: boolean, channel: string, args: any[]) {
     addSenderToEvent(event, this);
     addReturnValueToEvent(event);
     if (internal) {
@@ -657,7 +658,7 @@ WebContents.prototype._init = function () {
     }
   });
 
-  this.on('-ipc-ports', function (this: Electron.WebContents, event: Electron.IpcMainEvent, internal: boolean, channel: string, message: any, ports: any[]) {
+  this.on('-ipc-ports' as any, function (this: Electron.WebContents, event: Electron.IpcMainEvent, internal: boolean, channel: string, message: any, ports: any[]) {
     addSenderToEvent(event, this);
     event.ports = ports.map(p => new MessagePortMain(p));
     const maybeWebFrame = getWebFrameForEvent(event);
@@ -675,7 +676,7 @@ WebContents.prototype._init = function () {
     }
   });
 
-  this.on('-before-unload-fired', function (this: Electron.WebContents, event, proceed) {
+  this.on('-before-unload-fired' as any, function (this: Electron.WebContents, event: Electron.Event, proceed: boolean) {
     const type = this.getType();
     // These are the "interactive" types, i.e. ones a user might be looking at.
     // All other types should ignore the "proceed" signal and unload
@@ -692,13 +693,12 @@ WebContents.prototype._init = function () {
 
   if (this.getType() !== 'remote') {
     // Make new windows requested by links behave like "window.open".
-    this.on('-new-window', (event, url, frameName, disposition, rawFeatures, referrer, postData) => {
-      const postBody = postData
-        ? {
-            data: postData,
-            ...parseContentTypeFormat(postData)
-          }
-        : undefined;
+    this.on('-new-window' as any, (event: Electron.Event, url: string, frameName: string, disposition: Electron.HandlerDetails['disposition'],
+      rawFeatures: string, referrer: Electron.Referrer, postData: PostData) => {
+      const postBody = postData ? {
+        data: postData,
+        ...parseContentTypeFormat(postData)
+      } : undefined;
       const details: Electron.HandlerDetails = {
         url,
         frameName,
@@ -735,13 +735,11 @@ WebContents.prototype._init = function () {
     let windowOpenOutlivesOpenerOption: boolean = false;
     let createWindow: Electron.CreateWindowFunction | undefined;
 
-    this.on('-will-add-new-contents', (event, url, frameName, rawFeatures, disposition, referrer, postData) => {
-      const postBody = postData
-        ? {
-            data: postData,
-            ...parseContentTypeFormat(postData)
-          }
-        : undefined;
+    this.on('-will-add-new-contents' as any, (event: Electron.Event, url: string, frameName: string, rawFeatures: string, disposition: Electron.HandlerDetails['disposition'], referrer: Electron.Referrer, postData: PostData) => {
+      const postBody = postData ? {
+        data: postData,
+        ...parseContentTypeFormat(postData)
+      } : undefined;
       const details: Electron.HandlerDetails = {
         url,
         frameName,
@@ -763,16 +761,14 @@ WebContents.prototype._init = function () {
       windowOpenOverriddenOptions = result.browserWindowConstructorOptions;
       createWindow = result.createWindow;
       if (!event.defaultPrevented) {
-        const secureOverrideWebPreferences = windowOpenOverriddenOptions
-          ? {
-              // Allow setting of backgroundColor as a webPreference even though
-            // it's technically a BrowserWindowConstructorOptions option because
-            // we need to access it in the renderer at init time.
-              backgroundColor: windowOpenOverriddenOptions.backgroundColor,
-              transparent: windowOpenOverriddenOptions.transparent,
-              ...windowOpenOverriddenOptions.webPreferences
-            }
-          : undefined;
+        const secureOverrideWebPreferences = windowOpenOverriddenOptions ? {
+          // Allow setting of backgroundColor as a webPreference even though
+          // it's technically a BrowserWindowConstructorOptions option because
+          // we need to access it in the renderer at init time.
+          backgroundColor: windowOpenOverriddenOptions.backgroundColor,
+          transparent: windowOpenOverriddenOptions.transparent,
+          ...windowOpenOverriddenOptions.webPreferences
+        } : undefined;
         const { webPreferences: parsedWebPreferences } = parseFeatures(rawFeatures);
         const webPreferences = makeWebPreferences({
           embedder: this,
@@ -788,7 +784,9 @@ WebContents.prototype._init = function () {
     });
 
     // Create a new browser window for "window.open"
-    this.on('-add-new-contents', (event, webContents, disposition, _userGesture, _left, _top, _width, _height, url, frameName, referrer, rawFeatures, postData) => {
+    this.on('-add-new-contents' as any, (event: Electron.Event, webContents: Electron.WebContents, disposition: string,
+      _userGesture: boolean, _left: number, _top: number, _width: number, _height: number, url: string, frameName: string,
+      referrer: Electron.Referrer, rawFeatures: string, postData: PostData) => {
       const overriddenOptions = windowOpenOverriddenOptions || undefined;
       const outlivesOpener = windowOpenOutlivesOpenerOption;
       const windowOpenFunction = createWindow;
@@ -826,7 +824,7 @@ WebContents.prototype._init = function () {
     app.emit('login', event, this, ...args);
   });
 
-  this.on('ready-to-show', () => {
+  this.on('ready-to-show' as any, () => {
     const owner = this.getOwnerBrowserWindow();
     if (owner && !owner.isDestroyed()) {
       process.nextTick(() => {
@@ -845,7 +843,7 @@ WebContents.prototype._init = function () {
 
   const originCounts = new Map<string, number>();
   const openDialogs = new Set<AbortController>();
-  this.on('-run-dialog', async (info, callback) => {
+  this.on('-run-dialog' as any, async (info: {frame: WebFrameMain, dialogType: 'prompt' | 'confirm' | 'alert', messageText: string, defaultPromptText: string}, callback: (success: boolean, user_input: string) => void) => {
     const originUrl = new URL(info.frame.url);
     const origin = originUrl.protocol === 'file:' ? originUrl.href : originUrl.origin;
     if ((originCounts.get(origin) ?? 0) < 0) return callback(false, '');
@@ -866,17 +864,15 @@ WebContents.prototype._init = function () {
       message: info.messageText,
       checkboxLabel: checkbox,
       signal: abortController.signal,
-      ...(info.dialogType === 'confirm')
-        ? {
-            buttons: ['OK', 'Cancel'],
-            defaultId: 0,
-            cancelId: 1
-          }
-        : {
-            buttons: ['OK'],
-            defaultId: -1, // No default button
-            cancelId: 0
-          }
+      ...(info.dialogType === 'confirm') ? {
+        buttons: ['OK', 'Cancel'],
+        defaultId: 0,
+        cancelId: 1
+      } : {
+        buttons: ['OK'],
+        defaultId: -1, // No default button
+        cancelId: 0
+      }
     };
     openDialogs.add(abortController);
     const promise = parent && !prefs.offscreen ? dialog.showMessageBox(parent, options) : dialog.showMessageBox(options);
@@ -890,7 +886,7 @@ WebContents.prototype._init = function () {
     }
   });
 
-  this.on('-cancel-dialogs', () => {
+  this.on('-cancel-dialogs' as any, () => {
     for (const controller of openDialogs) { controller.abort(); }
     openDialogs.clear();
   });

lib/browser/api/web-frame-main.ts

@@ -1,5 +1,5 @@
-import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
 import { MessagePortMain } from '@electron/internal/browser/message-port-main';
+import { IpcMainImpl } from '@electron/internal/browser/ipc-main-impl';
 
 const { WebFrameMain, fromId } = process._linkedBinding('electron_browser_web_frame_main');
 

lib/browser/default-menu.ts

@@ -1,5 +1,5 @@
-import { shell } from 'electron/common';
 import { app, Menu } from 'electron/main';
+import { shell } from 'electron/common';
 
 const isMac = process.platform === 'darwin';
 
@@ -14,35 +14,33 @@ export const setDefaultApplicationMenu = () => {
 
   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');
-            }
-          }
-        ]
+    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' };

lib/browser/devtools.ts

@@ -1,36 +1,29 @@
-import { IPC_MESSAGES } from '@electron/internal//common/ipc-messages';
+import { dialog, Menu } from 'electron/main';
+import * as fs from 'fs';
+
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
-
-import { dialog, Menu } from 'electron/main';
-
-import * as fs from 'fs';
+import { IPC_MESSAGES } from '@electron/internal//common/ipc-messages';
 
 const convertToMenuTemplate = function (items: ContextMenuItem[], handler: (id: number) => void) {
   return items.map(function (item) {
-    const transformed: Electron.MenuItemConstructorOptions = item.type === 'subMenu'
-      ? {
-          type: 'submenu',
-          label: item.label,
-          enabled: item.enabled,
-          submenu: convertToMenuTemplate(item.subItems, handler)
-        }
-      : item.type === 'separator'
-        ? {
-            type: 'separator'
-          }
-        : item.type === 'checkbox'
-          ? {
-              type: 'checkbox',
-              label: item.label,
-              enabled: item.enabled,
-              checked: item.checked
-            }
-          : {
-              type: 'normal',
-              label: item.label,
-              enabled: item.enabled
-            };
+    const transformed: Electron.MenuItemConstructorOptions = item.type === 'subMenu' ? {
+      type: 'submenu',
+      label: item.label,
+      enabled: item.enabled,
+      submenu: convertToMenuTemplate(item.subItems, handler)
+    } : item.type === 'separator' ? {
+      type: 'separator'
+    } : item.type === 'checkbox' ? {
+      type: 'checkbox',
+      label: item.label,
+      enabled: item.enabled,
+      checked: item.checked
+    } : {
+      type: 'normal',
+      label: item.label,
+      enabled: item.enabled
+    };
 
     if (item.id != null) {
       transformed.click = () => handler(item.id);

lib/browser/guest-view-manager.ts

@@ -1,11 +1,10 @@
+import { webContents } from 'electron/main';
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
 import { parseWebViewWebPreferences } from '@electron/internal/browser/parse-features-string';
+import { syncMethods, asyncMethods, properties, navigationHistorySyncMethods } from '@electron/internal/common/web-view-methods';
 import { webViewEvents } from '@electron/internal/browser/web-view-events';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-import { syncMethods, asyncMethods, properties, navigationHistorySyncMethods } from '@electron/internal/common/web-view-methods';
-
-import { webContents } from 'electron/main';
 
 interface GuestInstance {
   elementInstanceId: number;
@@ -238,7 +237,7 @@ const watchEmbedder = function (embedder: Electron.WebContents) {
       }
     }
   };
-  embedder.on('-window-visibility-change', onVisibilityChange);
+  embedder.on('-window-visibility-change' as any, onVisibilityChange);
 
   embedder.once('will-destroy' as any, () => {
     // Usually the guestInstances is cleared when guest is destroyed, but it
@@ -250,7 +249,7 @@ const watchEmbedder = function (embedder: Electron.WebContents) {
       }
     }
     // Clear the listeners.
-    embedder.removeListener('-window-visibility-change', onVisibilityChange);
+    embedder.removeListener('-window-visibility-change' as any, onVisibilityChange);
     watchedEmbedders.delete(embedder);
   });
 };

lib/browser/guest-window-manager.ts

@@ -5,10 +5,9 @@
  * out-of-process (cross-origin) are created here. "Embedder" roughly means
  * "parent."
  */
-import { parseFeatures } from '@electron/internal/browser/parse-features-string';
-
 import { BrowserWindow } from 'electron/main';
 import type { BrowserWindowConstructorOptions, Referrer, WebContents, LoadURLOptions } from 'electron/main';
+import { parseFeatures } from '@electron/internal/browser/parse-features-string';
 
 type PostData = LoadURLOptions['postData']
 export type WindowOpenArgs = {
@@ -72,6 +71,14 @@ export function openGuestWindow ({ embedder, guest, referrer, disposition, postD
         throw new Error('Invalid webContents. Created window should be connected to webContents passed with options object.');
       }
 
+      webContents.loadURL(url, {
+        httpReferrer: referrer,
+        ...(postData && {
+          postData,
+          extraHeaders: formatPostDataHeaders(postData as Electron.UploadRawData[])
+        })
+      });
+
       handleWindowLifecycleEvents({ embedder, frameName, guest, outlivesOpener });
     }
 

lib/browser/init.ts

@@ -1,9 +1,8 @@
-import type * as defaultMenuModule from '@electron/internal/browser/default-menu';
-
 import { EventEmitter } from 'events';
 import * as fs from 'fs';
 import * as path from 'path';
 
+import type * as defaultMenuModule from '@electron/internal/browser/default-menu';
 import type * as url from 'url';
 import type * as v8 from 'v8';
 

lib/browser/ipc-main-impl.ts

@@ -1,6 +1,5 @@
-import { IpcMainInvokeEvent } from 'electron/main';
-
 import { EventEmitter } from 'events';
+import { IpcMainInvokeEvent } from 'electron/main';
 
 export class IpcMainImpl extends EventEmitter implements Electron.IpcMain {
   private _invokeHandlers: Map<string, (e: IpcMainInvokeEvent, ...args: any[]) => void> = new Map();

lib/browser/rpc-server.ts

@@ -1,11 +1,9 @@
+import { clipboard } from 'electron/common';
+import * as fs from 'fs';
 import { ipcMainInternal } from '@electron/internal/browser/ipc-main-internal';
 import * as ipcMainUtils from '@electron/internal/browser/ipc-main-internal-utils';
 import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
-import { clipboard } from 'electron/common';
-
-import * as fs from 'fs';
-
 // Implements window.close()
 ipcMainInternal.on(IPC_MESSAGES.BROWSER_WINDOW_CLOSE, function (event) {
   const window = event.sender.getOwnerBrowserWindow();

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

@@ -1,11 +1,10 @@
+import * as url from 'url';
+import { Readable, Writable } from 'stream';
 import type {
   ClientRequestConstructorOptions,
   UploadProgress
 } from 'electron/common';
 
-import { Readable, Writable } from 'stream';
-import * as url from 'url';
-
 const {
   isValidHeaderName,
   isValidHeaderValue,
@@ -227,7 +226,7 @@ function validateHeader (name: any, value: any): void {
 }
 
 function parseOptions (optionsIn: ClientRequestConstructorOptions | string): NodeJS.CreateURLLoaderOptions & ExtraURLLoaderOptions {
-  // eslint-disable-next-line n/no-deprecated-api
+  // eslint-disable-next-line node/no-deprecated-api
   const options: any = typeof optionsIn === 'string' ? url.parse(optionsIn) : { ...optionsIn };
 
   let urlStr: string = options.url;
@@ -260,7 +259,7 @@ function parseOptions (optionsIn: ClientRequestConstructorOptions | string): Nod
       // an invalid request.
       throw new TypeError('Request path contains unescaped characters');
     }
-    // eslint-disable-next-line n/no-deprecated-api
+    // eslint-disable-next-line node/no-deprecated-api
     const pathObj = url.parse(options.path || '/');
     urlObj.pathname = pathObj.pathname;
     urlObj.search = pathObj.search;

lib/common/init.ts

@@ -1,8 +1,8 @@
-import timers = require('timers');
 import * as util from 'util';
-
 import type * as stream from 'stream';
 
+import timers = require('timers');
+
 type AnyFn = (...args: any[]) => any
 
 // setImmediate and process.nextTick makes use of uv_check and uv_prepare to

lib/node/init.ts

@@ -1,5 +1,3 @@
-/* eslint-disable import/newline-after-import */
-/* eslint-disable import/order */
 // Initialize ASAR support in fs module.
 import { wrapFsWithAsar } from './asar-fs-wrapper';
 wrapFsWithAsar(require('fs'));

lib/renderer/api/exports/electron.ts

@@ -1,5 +1,5 @@
-import { commonModuleList } from '@electron/internal/common/api/module-list';
 import { defineProperties } from '@electron/internal/common/define-properties';
+import { commonModuleList } from '@electron/internal/common/api/module-list';
 import { rendererModuleList } from '@electron/internal/renderer/api/module-list';
 
 module.exports = {};

lib/renderer/common-init.ts

@@ -1,10 +1,10 @@
+import { ipcRenderer } from 'electron/renderer';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
-import type * as securityWarningsModule from '@electron/internal/renderer/security-warnings';
-import type * as webFrameInitModule from '@electron/internal/renderer/web-frame-init';
+
 import type * as webViewInitModule from '@electron/internal/renderer/web-view/web-view-init';
 import type * as windowSetupModule from '@electron/internal/renderer/window-setup';
-
-import { ipcRenderer } from 'electron/renderer';
+import type * as webFrameInitModule from '@electron/internal/renderer/web-frame-init';
+import type * as securityWarningsModule from '@electron/internal/renderer/security-warnings';
 
 const { mainFrame } = process._linkedBinding('electron_renderer_web_frame');
 const v8Util = process._linkedBinding('electron_common_v8_util');
@@ -49,7 +49,6 @@ if (process.isMainFrame) {
 }
 
 const { webFrameInit } = require('@electron/internal/renderer/web-frame-init') as typeof webFrameInitModule;
-
 webFrameInit();
 
 // Warn about security issues

lib/renderer/init.ts

@@ -1,9 +1,9 @@
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
-import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
-
 import * as path from 'path';
 import { pathToFileURL } from 'url';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
+
+import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
+import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
 
 const Module = require('module') as NodeJS.ModuleInternal;
 

lib/renderer/inspector.ts

@@ -1,9 +1,8 @@
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 import { internalContextBridge } from '@electron/internal/renderer/api/context-bridge';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
-
 import { webFrame } from 'electron/renderer';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 const { contextIsolationEnabled } = internalContextBridge;
 

lib/renderer/security-warnings.ts

@@ -1,5 +1,5 @@
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 const { mainFrame: webFrame } = process._linkedBinding('electron_renderer_web_frame');
 

lib/renderer/web-frame-init.ts

@@ -1,7 +1,6 @@
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
-
 import { webFrame, WebFrame } from 'electron/renderer';
+import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 // All keys of WebFrame that extend Function
 type WebFrameMethod = {

lib/renderer/web-view/guest-view-internal.ts

@@ -1,6 +1,6 @@
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
 import * as ipcRendererUtils from '@electron/internal/renderer/ipc-renderer-internal-utils';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 const { mainFrame: webFrame } = process._linkedBinding('electron_renderer_web_frame');
 

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

@@ -1,5 +1,5 @@
-import { WEB_VIEW_ATTRIBUTES, WEB_VIEW_ERROR_MESSAGES } from '@electron/internal/renderer/web-view/web-view-constants';
 import type { WebViewImpl } from '@electron/internal/renderer/web-view/web-view-impl';
+import { WEB_VIEW_ATTRIBUTES, WEB_VIEW_ERROR_MESSAGES } from '@electron/internal/renderer/web-view/web-view-constants';
 
 const resolveURL = function (url?: string | null) {
   return url ? new URL(url, location.href).href : '';

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

@@ -8,9 +8,9 @@
 // which runs in browserify environment instead of Node environment, all native
 // modules must be passed from outside, all included files must be plain JS.
 
-import type { SrcAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
 import { WEB_VIEW_ATTRIBUTES, WEB_VIEW_ERROR_MESSAGES } from '@electron/internal/renderer/web-view/web-view-constants';
 import { WebViewImpl, WebViewImplHooks, setupMethods } from '@electron/internal/renderer/web-view/web-view-impl';
+import type { SrcAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
 
 const internals = new WeakMap<HTMLElement, WebViewImpl>();
 

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

@@ -1,8 +1,8 @@
-import { syncMethods, asyncMethods, properties } from '@electron/internal/common/web-view-methods';
 import type * as guestViewInternalModule from '@electron/internal/renderer/web-view/guest-view-internal';
+import { WEB_VIEW_ATTRIBUTES } from '@electron/internal/renderer/web-view/web-view-constants';
+import { syncMethods, asyncMethods, properties } from '@electron/internal/common/web-view-methods';
 import type { WebViewAttribute, PartitionAttribute } from '@electron/internal/renderer/web-view/web-view-attributes';
 import { setupWebViewAttributes } from '@electron/internal/renderer/web-view/web-view-attributes';
-import { WEB_VIEW_ATTRIBUTES } from '@electron/internal/renderer/web-view/web-view-constants';
 
 // ID generator.
 let nextId = 0;

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

@@ -1,7 +1,8 @@
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
-import type * as guestViewInternalModule from '@electron/internal/renderer/web-view/guest-view-internal';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
+
 import type * as webViewElementModule from '@electron/internal/renderer/web-view/web-view-element';
+import type * as guestViewInternalModule from '@electron/internal/renderer/web-view/guest-view-internal';
 
 const v8Util = process._linkedBinding('electron_common_v8_util');
 const { mainFrame: webFrame } = process._linkedBinding('electron_renderer_web_frame');

lib/renderer/window-setup.ts

@@ -1,6 +1,6 @@
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-import { internalContextBridge } from '@electron/internal/renderer/api/context-bridge';
 import { ipcRendererInternal } from '@electron/internal/renderer/ipc-renderer-internal';
+import { internalContextBridge } from '@electron/internal/renderer/api/context-bridge';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
 
 const { contextIsolationEnabled } = internalContextBridge;
 

lib/sandboxed_renderer/init.ts

@@ -1,9 +1,9 @@
-import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
-import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
-import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
-
 import * as events from 'events';
 import { setImmediate, clearImmediate } from 'timers';
+import { IPC_MESSAGES } from '@electron/internal/common/ipc-messages';
+
+import type * as ipcRendererUtilsModule from '@electron/internal/renderer/ipc-renderer-internal-utils';
+import type * as ipcRendererInternalModule from '@electron/internal/renderer/ipc-renderer-internal';
 
 declare const binding: {
   get: (name: string) => any;

lib/utility/api/net.ts

@@ -1,8 +1,7 @@
-import { fetchWithSession } from '@electron/internal/browser/api/net-fetch';
-import { ClientRequest } from '@electron/internal/common/api/net-client-request';
-
 import { IncomingMessage } from 'electron/utility';
 import type { ClientRequestConstructorOptions } from 'electron/utility';
+import { ClientRequest } from '@electron/internal/common/api/net-client-request';
+import { fetchWithSession } from '@electron/internal/browser/api/net-fetch';
 
 const { isOnline, resolveHost } = process._linkedBinding('electron_common_net');
 

lib/utility/init.ts

@@ -1,8 +1,8 @@
-import { ParentPort } from '@electron/internal/utility/parent-port';
-
 import { EventEmitter } from 'events';
 import { pathToFileURL } from 'url';
 
+import { ParentPort } from '@electron/internal/utility/parent-port';
+
 const v8Util = process._linkedBinding('electron_common_v8_util');
 
 const entryScript: string = v8Util.getHiddenValue(process, '_serviceStartupScript');

lib/utility/parent-port.ts

@@ -1,7 +1,5 @@
-import { MessagePortMain } from '@electron/internal/browser/message-port-main';
-
 import { EventEmitter } from 'events';
-
+import { MessagePortMain } from '@electron/internal/browser/message-port-main';
 const { createParentPort } = process._linkedBinding('electron_utility_parent_port');
 
 export class ParentPort extends EventEmitter implements Electron.ParentPort {

npm/cli.js

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
-const proc = require('child_process');
-
 const electron = require('./');
 
+const proc = require('child_process');
+
 const child = proc.spawn(electron, process.argv.slice(2), { stdio: 'inherit', windowsHide: false });
 child.on('close', function (code, signal) {
   if (code === null) {