Bump v17.0.0-beta.7

Co-authored-by: Jeremy Rose <nornagon@nornagon.net>

.circleci/.gitignore

@@ -1 +0,0 @@
-config-staging

.circleci/config.yml

@@ -6,7 +6,6 @@ setup: true
 # Orbs
 orbs:
   path-filtering: circleci/path-filtering@0.1.0
-  continuation: circleci/continuation@0.2.0
 
 # All input parameters to pass to build config
 parameters:
@@ -14,7 +13,7 @@ parameters:
     type: boolean
     default: false
   
-  upload-to-storage:
+  upload-to-s3:
     type: string
     default: '1'
 
@@ -44,33 +43,103 @@ parameters:
     default: all
     enum: ["all", "osx-x64", "osx-arm64", "mas-x64", "mas-arm64"]
 
-jobs:
-  generate-config:
+# Envs
+env-global: &env-global
+  ELECTRON_OUT_DIR: Default
+
+env-linux-medium: &env-linux-medium
+  <<: *env-global
+  NUMBER_OF_NINJA_PROCESSES: 3
+
+# Executors
+executors:
+  linux-docker:
+    parameters:
+      size:
+        description: "Docker executor size"
+        default: 2xlarge+
+        type: enum
+        enum: ["medium", "xlarge", "2xlarge+"]
     docker:
-      - image: cimg/node:16.14
-    steps:
-      - checkout
-      - path-filtering/set-parameters:
+      - image: ghcr.io/electron/build:27db4a3e3512bfd2e47f58cea69922da0835f1d9
+    resource_class: << parameters.size >>
+
+# List of always run steps
+step-checkout-electron: &step-checkout-electron
+  checkout:
+    path: src/electron
+
+steps-lint: &steps-lint
+  steps:
+    - *step-checkout-electron
+    - run:
+        name: Setup third_party Depot Tools
+        command: |
+          # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
+          git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
+          echo 'export PATH="$PATH:'"$PWD"'/src/third_party/depot_tools"' >> $BASH_ENV
+    - run:
+        name: Download GN Binary
+        command: |
+          chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
+          gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
+
+          cipd ensure -ensure-file - -root . \<<-CIPD
+          \$ServiceURL https://chrome-infra-packages.appspot.com/
+          @Subdir src/buildtools/linux64
+          gn/gn/linux-amd64 $gn_version
+          CIPD
+
+          echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
+    - run:
+        name: Download clang-format Binary
+        command: |
+          chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
+
+          sha1_path='buildtools/linux64/clang-format.sha1'
+          curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"
+
+          download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
+    - run:
+        name: Run Lint
+        command: |
+          # gn.py tries to find a gclient root folder starting from the current dir.
+          # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
+          touch .gclient
+          # Another option would be to checkout "buildtools" inside the Electron checkout,
+          # but then we would lint its contents (at least gn format), and it doesn't pass it.
+
+          cd src/electron
+          node script/yarn install --frozen-lockfile
+          node script/yarn lint
+    - run:
+        name: Run Script Typechecker
+        command: |
+          cd src/electron
+          node script/yarn tsc -p tsconfig.script.json
+
+# List of always run jobs.
+jobs:
+  lint:
+    executor:
+      name: linux-docker
+      size: medium
+    environment:
+      <<: *env-linux-medium
+    <<: *steps-lint
+
+# Initial setup workflow
+workflows:
+  lint:
+    jobs:
+      # Job inherited from path-filtering orb
+      - path-filtering/filter:
           base-revision: main
+          # Params for mapping; `path-to-test parameter-to-set value-for-parameter` for each row
           mapping: |
             ^((?!docs/).)*$ run-build-mac true
             ^((?!docs/).)*$ run-build-linux true
             docs/.* run-docs-only true
             ^((?!docs/).)*$ run-docs-only false
-      - run:
-          command: |
-            cd .circleci/config
-            yarn
-            export CIRCLECI_BINARY="$HOME/circleci"
-            curl -fLSs https://raw.githubusercontent.com/CircleCI-Public/circleci-cli/master/install.sh | DESTDIR=$CIRCLECI_BINARY bash
-            node build.js
-          name: Pack config.yml
-      - continuation/continue:
-          configuration_path: .circleci/config-staging/built.yml
-          parameters: /tmp/pipeline-parameters.json
-
-# Initial setup workflow
-workflows:
-  setup:
-    jobs:
-      - generate-config
+          config-path: .circleci/build_config.yml
+      - lint

.circleci/config/build.js

@@ -1,34 +0,0 @@
-const cp = require('child_process');
-const fs = require('fs-extra');
-const path = require('path');
-const yaml = require('js-yaml');
-
-const STAGING_DIR = path.resolve(__dirname, '..', 'config-staging');
-
-function copyAndExpand(dir = './') {
-    const absDir = path.resolve(__dirname, dir);
-    const targetDir = path.resolve(STAGING_DIR, dir);
-
-    if (!fs.existsSync(targetDir)) {
-        fs.mkdirSync(targetDir);
-    }
-
-    for (const file of fs.readdirSync(absDir)) {
-        if (!file.endsWith('.yml')) {
-            if (fs.statSync(path.resolve(absDir, file)).isDirectory()) {
-                copyAndExpand(path.join(dir, file));
-            }
-            continue;
-        }
-
-        fs.writeFileSync(path.resolve(targetDir, file), yaml.dump(yaml.load(fs.readFileSync(path.resolve(absDir, file), 'utf8')), {
-            noRefs: true,
-        }));
-    }
-}
-
-if (fs.pathExists(STAGING_DIR)) fs.removeSync(STAGING_DIR);
-copyAndExpand();
-
-const output = cp.spawnSync(process.env.CIRCLECI_BINARY || 'circleci', ['config', 'pack', STAGING_DIR]);
-fs.writeFileSync(path.resolve(STAGING_DIR, 'built.yml'), output.stdout.toString());

.circleci/config/jobs/lint.yml

@@ -1,51 +0,0 @@
-executor:
-  name: linux-docker
-  size: medium
-steps:
-  - checkout:
-      path: src/electron
-  - run:
-      name: Setup third_party Depot Tools
-      command: |
-        # "depot_tools" has to be checkout into "//third_party/depot_tools" so pylint.py can a "pylintrc" file.
-        git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git src/third_party/depot_tools
-        echo 'export PATH="$PATH:'"$PWD"'/src/third_party/depot_tools"' >> $BASH_ENV
-  - run:
-      name: Download GN Binary
-      command: |
-        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
-        gn_version="$(curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/DEPS?format=TEXT" | base64 -d | grep gn_version | head -n1 | cut -d\' -f4)"
-
-        cipd ensure -ensure-file - -root . \<<-CIPD
-        \$ServiceURL https://chrome-infra-packages.appspot.com/
-        @Subdir src/buildtools/linux64
-        gn/gn/linux-amd64 $gn_version
-        CIPD
-
-        echo 'export CHROMIUM_BUILDTOOLS_PATH="'"$PWD"'/src/buildtools"' >> $BASH_ENV
-  - run:
-      name: Download clang-format Binary
-      command: |
-        chromium_revision="$(grep -A1 chromium_version src/electron/DEPS | tr -d '\n' | cut -d\' -f4)"
-
-        sha1_path='buildtools/linux64/clang-format.sha1'
-        curl -sL "https://chromium.googlesource.com/chromium/src/+/${chromium_revision}/${sha1_path}?format=TEXT" | base64 -d > "src/${sha1_path}"
-
-        download_from_google_storage.py --no_resume --no_auth --bucket chromium-clang-format -s "src/${sha1_path}"
-  - run:
-      name: Run Lint
-      command: |
-        # gn.py tries to find a gclient root folder starting from the current dir.
-        # When it fails and returns "None" path, the whole script fails. Let's "fix" it.
-        touch .gclient
-        # Another option would be to checkout "buildtools" inside the Electron checkout,
-        # but then we would lint its contents (at least gn format), and it doesn't pass it.
-
-        cd src/electron
-        node script/yarn install --frozen-lockfile
-        node script/yarn lint
-  - run:
-      name: Run Script Typechecker
-      command: |
-        cd src/electron
-        node script/yarn tsc -p tsconfig.script.json

.circleci/config/package.json

@@ -1,10 +0,0 @@
-{
-  "name": "@electron/circleci-config",
-  "version": "0.0.0",
-  "private": true,
-  "license": "MIT",
-  "dependencies": {
-    "fs-extra": "^10.1.0",
-    "js-yaml": "^4.1.0"
-  }
-}

.circleci/config/yarn.lock

@@ -1,43 +0,0 @@
-# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-# yarn lockfile v1
-
-
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
-fs-extra@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.1.0.tgz#02873cfbc4084dde127eaa5f9905eef2325d1abf"
-  integrity sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
-
-graceful-fs@^4.1.6, graceful-fs@^4.2.0:
-  version "4.2.10"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.10.tgz#147d3a006da4ca3ce14728c7aefc287c367d7a6c"
-  integrity sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==
-
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
-jsonfile@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
-  integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
-  dependencies:
-    universalify "^2.0.0"
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
-universalify@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
-  integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==

.github/CODEOWNERS

@@ -4,7 +4,7 @@
 # https://git-scm.com/docs/gitignore
 
 # Upgrades WG
-/patches/                               @electron/wg-upgrades @electron/wg-security
+/patches/                               @electron/wg-upgrades
 DEPS                                    @electron/wg-upgrades
 
 # Releases WG

.github/workflows/electron_woa_testing.yml

@@ -1,178 +0,0 @@
-name: Electron WOA Testing
-
-on:
-  push:    
-    branches: '**'
-  workflow_dispatch:
-    inputs:
-      appveyor_job_id:
-        description: 'Job Id of Appveyor WOA job to test'
-        type: text
-        required: true
-
-jobs:
-  electron-woa-init:
-    if: ${{ github.event_name == 'push' && github.repository == 'electron/electron' }}
-    runs-on: ubuntu-latest
-    steps:
-        - name: Dummy step for push event
-          run: |
-            echo "This job is a needed initialization step for Electron WOA testing.  Another test result will appear once the electron-woa-testing build is done."
-
-  electron-woa-testing:    
-    if: ${{ github.event_name == 'workflow_dispatch' && github.repository == 'electron/electron' }}    
-    runs-on: [self-hosted, woa]  
-    permissions:
-      checks: write
-      pull-requests: write
-    steps:
-    - uses: LouisBrunner/checks-action@v1.1.1
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        name: electron-woa-testing
-        status: in_progress
-        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}    
-        output: |
-          {"summary":"Test In Progress","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}        
-    - name: Clean Workspace
-      run: |
-        Remove-Item * -Recurse -Force
-      shell: powershell
-    - name: Checkout
-      uses: actions/checkout@v3
-      with:
-        path: src\electron
-        fetch-depth: 0
-    - name: Yarn install
-      run: |
-        cd src\electron
-        node script/yarn.js install --frozen-lockfile
-    - name: Download and extract dist.zip for test
-      run: |
-        $localArtifactPath = "$pwd\dist.zip"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/dist.zip"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\Default -y $localArtifactPath
-      shell: powershell
-    - name: Download and extract native test executables for test
-      run: |
-        $localArtifactPath = "src\out\Default\shell_browser_ui_unittests.exe"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/shell_browser_ui_unittests.exe"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-      shell: powershell
-    - name: Download and extract ffmpeg.zip for test
-      run: |
-        $localArtifactPath = "$pwd\ffmpeg.zip"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/ffmpeg.zip"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\ffmpeg $localArtifactPath
-      shell: powershell
-    - name: Download node headers for test
-      run: |
-        $localArtifactPath = "src\node_headers.zip"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/node_headers.zip"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-        cd src
-        & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
-      shell: powershell
-    - name: Download electron.lib for test
-      run: |
-        $localArtifactPath = "src\out\Default\electron.lib"
-        $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/electron.lib"
-        Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-      shell: powershell
-    # Uncomment the following block if pdb files are needed to debug issues
-    # - name: Download pdb files for detailed stacktraces
-    #   if: ${{ github.event_name == 'workflow_dispatch' }}
-    #   run: |
-    #     try {
-    #       $localArtifactPath = "src\pdb.zip"
-    #       $serverArtifactPath = "https://ci.appveyor.com/api/buildjobs/${{ inputs.appveyor_job_id }}/artifacts/pdb.zip"
-    #       Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer ${{ secrets.APPVEYOR_TOKEN }}" }
-    #       cd src
-    #       & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y pdb.zip
-    #     } catch {
-    #       Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
-    #     } finally {
-    #       $global:LASTEXITCODE = 0
-    #     }
-    #   shell: powershell
-    - name: Setup node headers
-      run: |
-        New-Item src\out\Default\gen\node_headers\Release -Type directory
-        Copy-Item -path src\out\Default\electron.lib -destination src\out\Default\gen\node_headers\Release\node.lib
-      shell: powershell
-    - name: Run Electron Main process tests
-      run: |
-        cd src
-        set npm_config_nodedir=%cd%\out\Default\gen\node_headers
-        set npm_config_arch=arm64
-        cd electron
-        node script/yarn test --runners=main --enable-logging --disable-features=CalculateNativeWinOcclusion  
-      env:
-        ELECTRON_ENABLE_STACK_DUMPING: true
-        ELECTRON_OUT_DIR: Default
-        IGNORE_YARN_INSTALL_ERROR: 1
-        ELECTRON_TEST_RESULTS_DIR: junit
-        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
-        MOCHA_REPORTER: mocha-multi-reporters
-        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
-    - name: Run Electron Remote based tests
-      if: ${{ success() || failure() }}
-      run: |
-        cd src
-        set npm_config_nodedir=%cd%\out\Default\gen\node_headers
-        set npm_config_arch=arm64
-        cd electron
-        node script/yarn test --runners=remote --enable-logging --disable-features=CalculateNativeWinOcclusion
-      env:
-        ELECTRON_OUT_DIR: Default
-        IGNORE_YARN_INSTALL_ERROR: 1
-        ELECTRON_TEST_RESULTS_DIR: junit
-        MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
-        MOCHA_REPORTER: mocha-multi-reporters
-        ELECTRON_SKIP_NATIVE_MODULE_TESTS: true
-    - name: Verify ffmpeg
-      run: |
-        cd src
-        echo "Verifying non proprietary ffmpeg"
-        python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
-      shell: cmd
-    - name: Kill processes left running from last test run
-      if: ${{ always() }}
-      run: |
-        Get-Process | Where Name -Like "electron*" | Stop-Process
-        Get-Process | Where Name -Like "msedge*" | Stop-Process
-      shell: powershell
-    - name: Delete user app data directories
-      if: ${{ always() }}
-      run: |
-        Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
-      shell: powershell
-    - uses: LouisBrunner/checks-action@v1.1.1
-      if: ${{ success() }}
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        name: electron-woa-testing
-        conclusion: "${{ job.status }}"
-        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        output: |
-          {"summary":"${{ job.status }}","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}
-    - uses: LouisBrunner/checks-action@v1.1.1
-      if: ${{ success() }}
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        name: electron-woa-testing
-        conclusion: "${{ job.status }}"
-        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        output: |
-          {"summary":"Job Succeeded","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}          
-    - uses: LouisBrunner/checks-action@v1.1.1
-      if: ${{ ! success() }}
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        name: electron-woa-testing
-        conclusion: "${{ job.status }}"
-        details_url: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
-        output: |
-          {"summary":"Job Failed","text_description":"See job details here: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"}                    

.github/workflows/semantic.yml

@@ -1,20 +0,0 @@
-name: "Check Semantic Commit"
-
-on:
-  pull_request_target:
-    types:
-      - opened
-      - edited
-      - synchronize
-
-jobs:
-  main:
-    name: Validate PR Title
-    runs-on: ubuntu-latest
-    steps:
-      - name: semantic-pull-request
-        uses: amannn/action-semantic-pull-request@v4
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          validateSingleCommit: false

.markdownlint.json

@@ -23,5 +23,7 @@
     "br_spaces": 0
   },
   "single-h1": false,
-  "no-inline-html": false
+  "no-inline-html": {
+    "allowed_elements": ["br"]
+  }
 }

BUILD.gn

@@ -43,7 +43,6 @@ if (is_mac) {
 
 if (is_linux) {
   import("//build/config/linux/pkg_config.gni")
-  import("//tools/generate_stubs/rules.gni")
 
   pkg_config("gio_unix") {
     packages = [ "gio-unix-2.0" ]
@@ -55,41 +54,6 @@ if (is_linux) {
       "gdk-pixbuf-2.0",
     ]
   }
-
-  generate_library_loader("libnotify_loader") {
-    name = "LibNotifyLoader"
-    output_h = "libnotify_loader.h"
-    output_cc = "libnotify_loader.cc"
-    header = "<libnotify/notify.h>"
-    config = ":libnotify_config"
-
-    functions = [
-      "notify_is_initted",
-      "notify_init",
-      "notify_get_server_caps",
-      "notify_get_server_info",
-      "notify_notification_new",
-      "notify_notification_add_action",
-      "notify_notification_set_image_from_pixbuf",
-      "notify_notification_set_timeout",
-      "notify_notification_set_urgency",
-      "notify_notification_set_hint_string",
-      "notify_notification_show",
-      "notify_notification_close",
-    ]
-  }
-
-  generate_stubs("electron_gtk_stubs") {
-    sigs = [
-      "shell/browser/ui/electron_gdk_pixbuf.sigs",
-      "shell/browser/ui/electron_gtk.sigs",
-    ]
-    extra_header = "shell/browser/ui/electron_gtk.fragment"
-    output_name = "electron_gtk_stubs"
-    public_deps = [ "//ui/gtk:gtk_config" ]
-    logging_function = "LogNoop()"
-    logging_include = "ui/gtk/log_noop.h"
-  }
 }
 
 declare_args() {
@@ -289,6 +253,31 @@ copy("copy_shell_devtools_discovery_page") {
   outputs = [ "$target_gen_dir/shell_devtools_discovery_page.html" ]
 }
 
+if (is_linux) {
+  generate_library_loader("libnotify_loader") {
+    name = "LibNotifyLoader"
+    output_h = "libnotify_loader.h"
+    output_cc = "libnotify_loader.cc"
+    header = "<libnotify/notify.h>"
+    config = ":libnotify_config"
+
+    functions = [
+      "notify_is_initted",
+      "notify_init",
+      "notify_get_server_caps",
+      "notify_get_server_info",
+      "notify_notification_new",
+      "notify_notification_add_action",
+      "notify_notification_set_image_from_pixbuf",
+      "notify_notification_set_timeout",
+      "notify_notification_set_urgency",
+      "notify_notification_set_hint_string",
+      "notify_notification_show",
+      "notify_notification_close",
+    ]
+  }
+}
+
 npm_action("electron_version_args") {
   script = "generate-version-json"
 
@@ -366,14 +355,12 @@ source_set("electron_lib") {
     "//chrome/app/resources:platform_locale_settings",
     "//components/autofill/core/common:features",
     "//components/certificate_transparency",
-    "//components/embedder_support:browser_util",
     "//components/language/core/browser",
     "//components/net_log",
     "//components/network_hints/browser",
     "//components/network_hints/common:mojo_bindings",
     "//components/network_hints/renderer",
     "//components/network_session_configurator/common",
-    "//components/omnibox/browser:buildflags",
     "//components/os_crypt",
     "//components/pref_registry",
     "//components/prefs",
@@ -485,8 +472,8 @@ source_set("electron_lib") {
 
   if (is_linux) {
     deps += [
+      "//build/config/linux/gtk:gtkprint",
       "//components/crash/content/browser",
-      "//ui/gtk:gtk_config",
     ]
   }
 
@@ -547,7 +534,6 @@ source_set("electron_lib") {
   if (is_linux) {
     libs = [ "xshmfence" ]
     deps += [
-      ":electron_gtk_stubs",
       ":libnotify_loader",
       "//build/config/linux/gtk",
       "//dbus",
@@ -563,13 +549,14 @@ source_set("electron_lib") {
       sources += filenames.lib_sources_linux_x11
       public_deps += [
         "//ui/base/x",
-        "//ui/ozone/platform/x11",
+        "//ui/platform_window/x11",
       ]
     }
     configs += [ ":gio_unix" ]
     defines += [
       # Disable warnings for g_settings_list_schemas.
       "GLIB_DISABLE_DEPRECATION_WARNINGS",
+      "USE_X11=1",
     ]
 
     sources += [
@@ -707,8 +694,6 @@ source_set("electron_lib") {
     deps += [
       "//chrome/browser/resources/pdf:resources",
       "//components/pdf/browser",
-      "//components/pdf/browser:interceptors",
-      "//components/pdf/common",
       "//components/pdf/renderer",
       "//pdf:pdf_ppapi",
     ]
@@ -915,12 +900,8 @@ if (is_mac) {
         deps += [ "//sandbox/mac:seatbelt" ]
       }
       defines = [ "HELPER_EXECUTABLE" ]
-      sources = [
-        "shell/app/electron_main_mac.cc",
-        "shell/app/uv_stdio_fix.cc",
-        "shell/app/uv_stdio_fix.h",
-        "shell/common/electron_constants.cc",
-      ]
+      sources = filenames.app_sources
+      sources += [ "shell/common/electron_constants.cc" ]
       include_dirs = [ "." ]
       info_plist = "shell/renderer/resources/mac/Info.plist"
       extra_substitutions =
@@ -1059,17 +1040,15 @@ if (is_mac) {
 
   mac_app_bundle("electron_app") {
     output_name = electron_product_name
-    sources = [
-      "shell/app/electron_main_mac.cc",
-      "shell/app/uv_stdio_fix.cc",
-      "shell/app/uv_stdio_fix.h",
-    ]
+    sources = filenames.app_sources
+    sources += [ "shell/common/electron_constants.cc" ]
     include_dirs = [ "." ]
     deps = [
       ":electron_app_framework_bundle_data",
       ":electron_app_plist",
       ":electron_app_resources",
       ":electron_fuses",
+      "//base",
       "//electron/buildflags",
     ]
     if (is_mas_build) {
@@ -1171,15 +1150,7 @@ if (is_mac) {
 
   executable("electron_app") {
     output_name = electron_project_name
-    if (is_win) {
-      sources = [ "shell/app/electron_main_win.cc" ]
-    } else if (is_linux) {
-      sources = [
-        "shell/app/electron_main_linux.cc",
-        "shell/app/uv_stdio_fix.cc",
-        "shell/app/uv_stdio_fix.h",
-      ]
-    }
+    sources = filenames.app_sources
     include_dirs = [ "." ]
     deps = [
       ":default_app_asar",
@@ -1200,7 +1171,7 @@ if (is_mac) {
     if (enable_hidpi) {
       data += [ "$root_out_dir/chrome_200_percent.pak" ]
     }
-    foreach(locale, platform_pak_locales) {
+    foreach(locale, locales) {
       data += [ "$root_out_dir/locales/$locale.pak" ]
     }
 
@@ -1279,10 +1250,6 @@ if (is_mac) {
       if (!is_component_build && is_component_ffmpeg) {
         configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
       }
-
-      if (is_linux) {
-        deps += [ "//sandbox/linux:chrome_sandbox" ]
-      }
     }
   }
 
@@ -1419,13 +1386,11 @@ dist_zip("electron_dist_zip") {
   if (is_linux) {
     data_deps += [ "//sandbox/linux:chrome_sandbox" ]
   }
-  deps = data_deps
   outputs = [ "$root_build_dir/dist.zip" ]
 }
 
 dist_zip("electron_ffmpeg_zip") {
   data_deps = [ "//third_party/ffmpeg" ]
-  deps = data_deps
   outputs = [ "$root_build_dir/ffmpeg.zip" ]
 }
 
@@ -1443,7 +1408,6 @@ group("electron_chromedriver") {
 dist_zip("electron_chromedriver_zip") {
   testonly = true
   data_deps = electron_chromedriver_deps
-  deps = data_deps
   outputs = [ "$root_build_dir/chromedriver.zip" ]
 }
 
@@ -1462,7 +1426,6 @@ group("electron_mksnapshot") {
 
 dist_zip("electron_mksnapshot_zip") {
   data_deps = mksnapshot_deps
-  deps = data_deps
   outputs = [ "$root_build_dir/mksnapshot.zip" ]
 }
 
@@ -1473,7 +1436,6 @@ copy("hunspell_dictionaries") {
 
 dist_zip("hunspell_dictionaries_zip") {
   data_deps = [ ":hunspell_dictionaries" ]
-  deps = data_deps
   flatten = true
 
   outputs = [ "$root_build_dir/hunspell_dictionaries.zip" ]
@@ -1487,7 +1449,6 @@ copy("libcxx_headers") {
 
 dist_zip("libcxx_headers_zip") {
   data_deps = [ ":libcxx_headers" ]
-  deps = data_deps
   flatten = true
   flatten_relative_to = rebase_path(
           "$target_gen_dir/electron_libcxx_include/buildtools/third_party/libc++/trunk",
@@ -1503,7 +1464,6 @@ copy("libcxxabi_headers") {
 
 dist_zip("libcxxabi_headers_zip") {
   data_deps = [ ":libcxxabi_headers" ]
-  deps = data_deps
   flatten = true
   flatten_relative_to = rebase_path(
           "$target_gen_dir/electron_libcxxabi_include/buildtools/third_party/libc++abi/trunk",

DEPS

@@ -15,9 +15,9 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '100.0.4896.160',
+    '98.0.4758.11',
   'node_version':
-    'v16.13.2',
+    'v16.13.0',
   'nan_version':
     # The following commit hash of NAN is v2.14.2 with *only* changes to the
     # test suite. This should be updated to a specific tag when one becomes

ELECTRON_VERSION

@@ -1 +1 @@
-18.3.9
+17.0.0-beta.7

README.md

@@ -2,7 +2,7 @@
 
 [![CircleCI Build Status](https://circleci.com/gh/electron/electron/tree/main.svg?style=shield)](https://circleci.com/gh/electron/electron/tree/main)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/4lggi9dpjc1qob7k/branch/main?svg=true)](https://ci.appveyor.com/project/electron-bot/electron-ljo26/branch/main)
-[![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.com/invite/APGC3k5yaH)
+[![Electron Discord Invite](https://img.shields.io/discord/745037351163527189?color=%237289DA&label=chat&logo=discord&logoColor=white)](https://discord.com/invite/electron)
 
 :memo: Available Translations: 🇨🇳 🇧🇷 🇪🇸 🇯🇵 🇷🇺 🇫🇷 🇺🇸 🇩🇪.
 View these docs in other languages at [electron/i18n](https://github.com/electron/i18n/tree/master/content/).
@@ -80,7 +80,7 @@ const child = proc.spawn(electron)
 
 ### Mirrors
 
-- [China](https://npmmirror.com/mirrors/electron)
+- [China](https://npm.taobao.org/mirrors/electron)
 
 ## Documentation Translations
 

appveyor.yml

@@ -11,7 +11,7 @@
 #  - "TARGET_ARCH" Choose from {'ia32', 'x64', 'arm', 'arm64', 'mips64el'}.
 #      Is used in some publishing scripts, but does NOT affect the Electron binary.
 #      Must match 'target_cpu' passed to "GN_EXTRA_ARGS" and "NPM_CONFIG_ARCH" value.
-#  - "UPLOAD_TO_STORAGE" Set it to '1' upload a release to the Azure bucket.
+#  - "UPLOAD_TO_S3" Set it to '1' upload a release to the S3 bucket.
 #      Otherwise the release will be uploaded to the Github Releases.
 #      (The value is only checked if "ELECTRON_RELEASE" is defined.)
 #
@@ -34,10 +34,19 @@ environment:
   GIT_CACHE_PATH: C:\Users\electron\libcc_cache
   ELECTRON_OUT_DIR: Default
   ELECTRON_ENABLE_STACK_DUMPING: 1
-  ELECTRON_ALSO_LOG_TO_STDERR: 1
   MOCHA_REPORTER: mocha-multi-reporters
   MOCHA_MULTI_REPORTERS: mocha-appveyor-reporter, tap
   GOMA_FALLBACK_ON_AUTH_FAILURE: true
+notifications:
+  - provider: Webhook
+    url: https://electron-mission-control.herokuapp.com/rest/appveyor-hook
+    method: POST
+    headers:
+      x-mission-control-secret:
+        secure: 90BLVPcqhJPG7d24v0q/RRray6W3wDQ8uVQlQjOHaBWkw1i8FoA1lsjr2C/v1dVok+tS2Pi6KxDctPUkwIb4T27u4RhvmcPzQhVpfwVJAG9oNtq+yKN7vzHfg7k/pojEzVdJpQLzeJGcSrZu7VY39Q==
+    on_build_success: false
+    on_build_failure: true
+    on_build_status_changed: false
 build_script:
   - ps: >-
       if(($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_NAME -split "/")[0] -eq ($env:APPVEYOR_REPO_NAME -split "/")[0]) {
@@ -57,31 +66,6 @@ build_script:
   - mkdir src
   - update_depot_tools.bat
   - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
-  - ps: >-
-      if (Test-Path 'env:RAW_GOMA_AUTH') {
-        $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
-        $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
-      }
-  - git clone https://github.com/electron/build-tools.git
-  - cd build-tools
-  - npm install
-  - mkdir third_party
-  - ps: >-
-      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
-  - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
-  - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
-  - cd ..
-  - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
-  - ps: >-
-      if (Test-Path 'env:RAW_GOMA_AUTH') {
-        $goma_login = python $env:LOCAL_GOMA_DIR\goma_auth.py info
-        if ($goma_login -eq 'Login as Fermi Planck') {
-          Write-warning "Goma authentication is correct";
-        } else {
-          Write-warning "WARNING!!!!!! Goma authentication is incorrect; please update Goma auth token.";
-          $host.SetShouldExit(1)
-        }
-      }
   - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
   - ps: >-
       if ($env:GN_CONFIG -ne 'release') {
@@ -145,6 +129,21 @@ build_script:
           Write-warning "Failed to add third_party\angle\.git; continuing anyway"
         }
       }
+  - ps: >-
+      if (Test-Path 'env:RAW_GOMA_AUTH') {
+        $env:GOMA_OAUTH2_CONFIG_FILE = "$pwd\.goma_oauth2_config"
+        $env:RAW_GOMA_AUTH | Set-Content $env:GOMA_OAUTH2_CONFIG_FILE
+      }
+  - git clone https://github.com/electron/build-tools.git
+  - cd build-tools
+  - npm install
+  - mkdir third_party
+  - ps: >-
+      node -e "require('./src/utils/goma.js').downloadAndPrepare({ gomaOneForAll: true })"
+  - ps: $env:GN_GOMA_FILE = node -e "console.log(require('./src/utils/goma.js').gnFilePath)"
+  - ps: $env:LOCAL_GOMA_DIR = node -e "console.log(require('./src/utils/goma.js').dir)"
+  - cd ..
+  - ps: .\src\electron\script\start-goma.ps1 -gomaDir $env:LOCAL_GOMA_DIR
   - cd src
   - set BUILD_CONFIG_PATH=//electron/build/args/%GN_CONFIG%.gn 
   - gn gen out/Default "--args=import(\"%BUILD_CONFIG_PATH%\") import(\"%GN_GOMA_FILE%\") %GN_EXTRA_ARGS% "
@@ -210,9 +209,7 @@ test_script:
       }
   - cd electron
   # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-  - if "%RUN_TESTS%"=="true" ( echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
-  - if "%RUN_TESTS%"=="true" ( echo Running remote test suite & node script/yarn test -- --trace-uncaught --runners=remote --runTestFilesSeperately --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )
-  - if "%RUN_TESTS%"=="true" ( echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log --disable-features=CalculateNativeWinOcclusion )  
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging --disable-features=CalculateNativeWinOcclusion )
   - cd ..
   - if "%RUN_TESTS%"=="true" ( 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"
@@ -220,20 +217,17 @@ test_script:
   - echo "Done verifying mksnapshot"
   - if "%RUN_TESTS%"=="true" ( echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd% )
   - echo "Done verifying chromedriver"
-  - if exist %cd%\electron.log ( appveyor-retry appveyor PushArtifact %cd%\electron.log )
 deploy_script:
   - cd electron
   - ps: >-
       if (Test-Path Env:\ELECTRON_RELEASE) {
-        if (Test-Path Env:\UPLOAD_TO_STORAGE) {
-          Write-Output "Uploading Electron release distribution to azure"
-          & python script\release\uploaders\upload.py --verbose --upload_to_storage
+        if (Test-Path Env:\UPLOAD_TO_S3) {
+          Write-Output "Uploading Electron release distribution to s3"
+          & python script\release\uploaders\upload.py --verbose --upload_to_s3
         } else {
           Write-Output "Uploading Electron release distribution to github releases"
           & python script\release\uploaders\upload.py --verbose
         }
       } elseif (Test-Path Env:\TEST_WOA) {
-        node script/release/ci-release-build.js --job=electron-woa-testing --ci=GHA --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
+        node script/release/ci-release-build.js --job=electron-woa-testing --ci=VSTS --armTest --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
       }
-on_finish:
-  - if exist src\electron\electron.log ( appveyor-retry appveyor PushArtifact src\electron\electron.log )

azure-pipelines-arm.yml

@@ -0,0 +1,121 @@
+steps:
+- task: CopyFiles@2
+  displayName: 'Copy Files to: src/electron'
+  inputs:
+    TargetFolder: src/electron
+
+- bash: |
+    cd src/electron
+    node script/yarn.js install --frozen-lockfile
+  displayName: 'Yarn install'
+
+- bash: |
+    export ZIP_DEST=$PWD/src/out/Default
+    echo "##vso[task.setvariable variable=ZIP_DEST]$ZIP_DEST"
+    mkdir -p $ZIP_DEST
+    cd src/electron
+    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=dist.zip --dest=$ZIP_DEST
+    cd $ZIP_DEST
+    unzip -o dist.zip
+    xattr -cr Electron.app    
+  displayName: 'Download and unzip dist files for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+    export FFMPEG_ZIP_DEST=$PWD/src/out/ffmpeg
+    mkdir -p $FFMPEG_ZIP_DEST
+    cd src/electron
+    node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=ffmpeg.zip --dest=$FFMPEG_ZIP_DEST
+    cd $FFMPEG_ZIP_DEST
+    unzip -o ffmpeg.zip
+  displayName: 'Download and unzip ffmpeg for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+   export NODE_HEADERS_DEST=$PWD/src/out/Default/gen
+   mkdir -p $NODE_HEADERS_DEST
+   cd src/electron
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=node_headers.tar.gz --dest=$NODE_HEADERS_DEST
+   cd $NODE_HEADERS_DEST
+   tar xzf node_headers.tar.gz
+  displayName: 'Download and untar node header files for test'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+   export CROSS_ARCH_SNAPSHOTS=$PWD/src/out/Default/cross-arch-snapshots
+   mkdir -p $CROSS_ARCH_SNAPSHOTS
+   cd src/electron
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/snapshot_blob.bin --dest=$CROSS_ARCH_SNAPSHOTS
+   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=cross-arch-snapshots/v8_context_snapshot.arm64.bin --dest=$CROSS_ARCH_SNAPSHOTS
+  displayName: 'Download cross arch snapshot files'
+  env:
+    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
+
+- bash: |
+    cd src
+    export ELECTRON_OUT_DIR=Default
+    export npm_config_arch=arm64
+    (cd electron && node script/yarn test --enable-logging --runners main)
+  displayName: 'Run Electron main tests'
+  timeoutInMinutes: 20
+  env:
+    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+
+- bash: |
+    cd src
+    export ELECTRON_OUT_DIR=Default
+    export npm_config_arch=arm64
+    (cd electron && node script/yarn test --enable-logging --runners remote)
+  displayName: 'Run Electron remote tests'
+  timeoutInMinutes: 20
+  condition: succeededOrFailed()
+  env:
+    ELECTRON_DISABLE_SECURITY_WARNINGS: 1
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+
+- bash: |
+    cd src
+    python electron/script/verify-ffmpeg.py --source-root "$PWD" --build-dir out/Default --ffmpeg-path out/ffmpeg
+  displayName: Verify non proprietary ffmpeg
+  timeoutInMinutes: 5
+  condition: succeededOrFailed()
+  env:
+    TARGET_ARCH: arm64
+
+- bash: |
+    cd src
+    echo Verify cross arch snapshot
+    python electron/script/verify-mksnapshot.py --source-root "$PWD" --build-dir out/Default --snapshot-files-dir $PWD/out/Default/cross-arch-snapshots
+  displayName: Verify cross arch snapshot
+  timeoutInMinutes: 5
+  condition: succeededOrFailed()
+
+- task: PublishTestResults@2
+  displayName: 'Publish Test Results'
+  inputs:
+    testResultsFiles: '*.xml'
+
+    searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
+
+  condition: succeededOrFailed()
+
+- bash: killall Electron || echo "No Electron processes left running"
+  displayName: 'Kill processes left running from last test run'
+  condition: always()
+
+- bash: |
+    rm -rf ~/Library/Application\ Support/Electron*
+    rm -rf ~/Library/Application\ Support/electron*
+  displayName: 'Delete user app data directories'
+  condition: always()
+
+- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
+  displayName: 'Clean Agent Directories'
+
+  condition: always()

azure-pipelines-woa.yml

@@ -0,0 +1,129 @@
+steps:
+- task: CopyFiles@2
+  displayName: 'Copy Files to: src\electron'
+  inputs:
+    TargetFolder: src\electron
+
+- script: |
+    cd src\electron
+    node script/yarn.js install --frozen-lockfile
+  displayName: 'Yarn install'
+
+- powershell: |
+    $localArtifactPath = "$pwd\dist.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/dist.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\Default -y $localArtifactPath
+  displayName: 'Download and extract dist.zip for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$pwd\src\out\Default\shell_browser_ui_unittests.exe"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/shell_browser_ui_unittests.exe"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+  displayName: 'Download and extract native test executables for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$pwd\ffmpeg.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/ffmpeg.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -osrc\out\ffmpeg $localArtifactPath
+  displayName: 'Download and extract ffmpeg.zip for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$pwd\src\node_headers.zip"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/node_headers.zip"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+    cd src
+    & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y node_headers.zip
+  displayName: 'Download node headers for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    $localArtifactPath = "$pwd\src\out\Default\electron.lib"
+    $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/electron.lib"
+    Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+  displayName: 'Download electron.lib for test'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    try {
+      $localArtifactPath = "$pwd\src\pdb.zip"
+      $serverArtifactPath = "$env:APPVEYOR_URL/buildjobs/$env:APPVEYOR_JOB_ID/artifacts/pdb.zip"
+      Invoke-RestMethod -Method Get -Uri $serverArtifactPath -OutFile $localArtifactPath -Headers @{ "Authorization" = "Bearer $env:APPVEYOR_TOKEN" }
+      cd src
+      & "${env:ProgramFiles(x86)}\7-Zip\7z.exe" x -y pdb.zip
+    } catch {
+      Write-Host "There was an exception encountered while downloading pdb files:" $_.Exception.Message
+    } finally {
+      $global:LASTEXITCODE = 0
+    }
+  displayName: 'Download pdb files for detailed stacktraces'
+  env:
+    APPVEYOR_TOKEN: $(APPVEYOR_TOKEN)
+
+- powershell: |
+    New-Item src\out\Default\gen\node_headers\Release -Type directory
+    Copy-Item -path src\out\Default\electron.lib -destination src\out\Default\gen\node_headers\Release\node.lib
+  displayName: 'Setup node headers'
+
+- script: |
+    cd src
+    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
+    set npm_config_arch=arm64
+    cd electron
+    node script/yarn test --runners=main --runTestFilesSeperately --enable-logging --disable-features=CalculateNativeWinOcclusion
+  displayName: 'Run Electron Main process tests'
+  env:
+    ELECTRON_ENABLE_STACK_DUMPING: true
+    ELECTRON_OUT_DIR: Default
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+    MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
+    MOCHA_REPORTER: mocha-multi-reporters
+
+- script: |
+    cd src
+    set npm_config_nodedir=%cd%\out\Default\gen\node_headers
+    set npm_config_arch=arm64
+    cd electron
+    node script/yarn test --runners=remote --enable-logging --disable-features=CalculateNativeWinOcclusion
+  displayName: 'Run Electron Remote based tests'
+  env:
+    ELECTRON_OUT_DIR: Default
+    IGNORE_YARN_INSTALL_ERROR: 1
+    ELECTRON_TEST_RESULTS_DIR: junit
+    MOCHA_MULTI_REPORTERS: 'mocha-junit-reporter, tap'
+    MOCHA_REPORTER: mocha-multi-reporters
+  condition: always()    
+
+- task: PublishTestResults@2
+  displayName: 'Publish Test Results'
+  inputs:
+    testResultsFiles: '*.xml'
+    searchFolder: '$(System.DefaultWorkingDirectory)/src/junit/'
+  condition: always()
+
+- script: |
+    cd src
+    echo "Verifying non proprietary ffmpeg"
+    python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
+  displayName: 'Verify ffmpeg'
+
+- powershell: |
+    Get-Process | Where Name –Like "electron*" | Stop-Process
+    Get-Process | Where Name –Like "msedge*" | Stop-Process
+  displayName: 'Kill processes left running from last test run'
+  condition: always()
+
+- powershell: |
+    Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
+  displayName: 'Delete user app data directories'
+  condition: always()

build/args/all.gn

@@ -2,9 +2,10 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 103
+node_module_version = 101
 
 v8_promise_internal_field_count = 1
+v8_typed_array_max_size_in_heap = 0
 v8_embedder_string = "-electron.0"
 
 # TODO: this breaks mksnapshot
@@ -13,17 +14,11 @@ v8_enable_snapshot_native_code_counters = false
 # TODO(codebytere): remove when Node.js handles https://chromium-review.googlesource.com/c/v8/v8/+/3211575
 v8_scriptormodule_legacy_lifetime = true
 
-# we use this api
-v8_enable_javascript_promise_hooks = true
-
 enable_cdm_host_verification = false
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
 
 enable_basic_printing = true
-
-# Removes DLLs from the build, which are only meant to be used for Chromium development.
-# See https://github.com/electron/electron/pull/17985
 angle_enable_vulkan_validation_layers = false
 dawn_enable_vulkan_validation_layers = false
 

build/extract_symbols.gni

@@ -24,11 +24,7 @@ template("extract_symbols") {
     assert(defined(invoker.binary), "Need binary to dump")
     assert(defined(invoker.symbol_dir), "Need directory for symbol output")
 
-    if (host_os == "win" && target_cpu == "x86") {
-      dump_syms_label = "//third_party/breakpad:dump_syms(//build/toolchain/win:win_clang_x64)"
-    } else {
-      dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
-    }
+    dump_syms_label = "//third_party/breakpad:dump_syms($host_toolchain)"
     dump_syms_binary = get_label_info(dump_syms_label, "root_out_dir") +
                        "/dump_syms$_host_executable_suffix"
 

build/js2c.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 import os
 import subprocess

build/npm-run.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import print_function
 import os
 import subprocess

build/profile_toolchain.py

@@ -1,12 +1,9 @@
-from __future__ import unicode_literals
-
+from __future__ import with_statement
 import contextlib
 import sys
 import os
 import optparse
 import json
-import re
-import subprocess
 
 sys.path.append("%s/../../build" % os.path.dirname(os.path.realpath(__file__)))
 
@@ -36,56 +33,36 @@ def calculate_hash(root):
         return CalculateHash('.', None)
 
 def windows_installed_software():
-    powershell_command = [
-        "Get-CimInstance",
-        "-Namespace",
-        "root\cimv2",
-        "-Class",
-        "Win32_product",
-        "|",
-        "Select",
-        "vendor,",
-        "description,",
-        "@{l='install_location';e='InstallLocation'},",
-        "@{l='install_date';e='InstallDate'},",
-        "@{l='install_date_2';e='InstallDate2'},",
-        "caption,",
-        "version,",
-        "name,",
-        "@{l='sku_number';e='SKUNumber'}",
-        "|",
-        "ConvertTo-Json",
-    ]
+    import win32com.client
+    strComputer = "."
+    objWMIService = win32com.client.Dispatch("WbemScripting.SWbemLocator")
+    objSWbemServices = objWMIService.ConnectServer(strComputer, "root\cimv2")
+    colItems = objSWbemServices.ExecQuery("Select * from Win32_Product")
+    items = []
 
-    proc = subprocess.Popen(
-        ["powershell.exe", "-Command", "-"],
-        stdin=subprocess.PIPE,
-        stdout=subprocess.PIPE,
-    )
+    for objItem in colItems:
+        item = {}
+        if objItem.Caption:
+            item['caption'] = objItem.Caption
+        if objItem.Caption:
+            item['description'] = objItem.Description
+        if objItem.InstallDate:
+            item['install_date'] = objItem.InstallDate
+        if objItem.InstallDate2:
+            item['install_date_2'] = objItem.InstallDate2
+        if objItem.InstallLocation:
+            item['install_location'] = objItem.InstallLocation
+        if objItem.Name:
+            item['name'] = objItem.Name
+        if objItem.SKUNumber:
+            item['sku_number'] = objItem.SKUNumber
+        if objItem.Vendor:
+            item['vendor'] = objItem.Vendor
+        if objItem.Version:
+            item['version'] = objItem.Version
+        items.append(item)
 
-    stdout, _ = proc.communicate(" ".join(powershell_command).encode("utf-8"))
-
-    if proc.returncode != 0:
-        raise RuntimeError("Failed to get list of installed software")
-
-    # On AppVeyor there's other output related to PSReadline,
-    # so grab only the JSON output and ignore everything else
-    json_match = re.match(
-        r".*(\[.*{.*}.*\]).*", stdout.decode("utf-8"), re.DOTALL
-    )
-
-    if not json_match:
-        raise RuntimeError(
-            "Couldn't find JSON output for list of installed software"
-        )
-
-    # Filter out missing keys
-    return list(
-        map(
-            lambda info: {k: info[k] for k in info if info[k]},
-            json.loads(json_match.group(1)),
-        )
-    )
+    return items
 
 
 def windows_profile():
@@ -112,7 +89,7 @@ def windows_profile():
 
 def main(options):
     if sys.platform == 'win32':
-        with open(options.output_json, 'w') as f:
+        with open(options.output_json, 'wb') as f:
             json.dump(windows_profile(), f)
     else:
         raise OSError("Unsupported OS")

build/strip_framework.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 import os
 import subprocess
 import sys

build/zip.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import print_function
 import os
 import subprocess

build/zip_libcxx.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 from __future__ import print_function
 import os
 import subprocess

chromium_src/BUILD.gn

@@ -53,8 +53,8 @@ static_library("chrome") {
     "//chrome/browser/predictors/resolve_host_client_impl.cc",
     "//chrome/browser/predictors/resolve_host_client_impl.h",
     "//chrome/browser/process_singleton.h",
-    "//chrome/browser/process_singleton_internal.cc",
-    "//chrome/browser/process_singleton_internal.h",
+    "//chrome/browser/ui/browser_dialogs.cc",
+    "//chrome/browser/ui/browser_dialogs.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.cc",
     "//chrome/browser/ui/exclusive_access/exclusive_access_bubble_type.h",
     "//chrome/browser/ui/exclusive_access/exclusive_access_controller_base.cc",
@@ -140,6 +140,10 @@ static_library("chrome") {
     "//components/optimization_guide/proto:optimization_guide_proto",
   ]
 
+  if (enable_basic_printing && is_win) {
+    deps += [ "//chrome/common:cloud_print_utility_mojom" ]
+  }
+
   if (is_linux) {
     sources += [ "//chrome/browser/icon_loader_auralinux.cc" ]
     if (use_ozone) {
@@ -239,6 +243,8 @@ static_library("chrome") {
       sources += [
         "//chrome/browser/printing/pdf_to_emf_converter.cc",
         "//chrome/browser/printing/pdf_to_emf_converter.h",
+        "//chrome/utility/printing_handler.cc",
+        "//chrome/utility/printing_handler.h",
       ]
     }
   }
@@ -253,12 +259,8 @@ static_library("chrome") {
       "//chrome/browser/ui/views/overlay/close_image_button.cc",
       "//chrome/browser/ui/views/overlay/close_image_button.h",
       "//chrome/browser/ui/views/overlay/constants.h",
-      "//chrome/browser/ui/views/overlay/document_overlay_window_views.cc",
-      "//chrome/browser/ui/views/overlay/document_overlay_window_views.h",
       "//chrome/browser/ui/views/overlay/hang_up_button.cc",
       "//chrome/browser/ui/views/overlay/hang_up_button.h",
-      "//chrome/browser/ui/views/overlay/overlay_window_image_button.cc",
-      "//chrome/browser/ui/views/overlay/overlay_window_image_button.h",
       "//chrome/browser/ui/views/overlay/overlay_window_views.cc",
       "//chrome/browser/ui/views/overlay/overlay_window_views.h",
       "//chrome/browser/ui/views/overlay/playback_image_button.cc",
@@ -273,14 +275,11 @@ static_library("chrome") {
       "//chrome/browser/ui/views/overlay/toggle_microphone_button.h",
       "//chrome/browser/ui/views/overlay/track_image_button.cc",
       "//chrome/browser/ui/views/overlay/track_image_button.h",
-      "//chrome/browser/ui/views/overlay/video_overlay_window_views.cc",
-      "//chrome/browser/ui/views/overlay/video_overlay_window_views.h",
     ]
 
     deps += [
       "//chrome/app/vector_icons",
       "//components/vector_icons:vector_icons",
-      "//ui/views/controls/webview",
     ]
   }
 
@@ -298,21 +297,11 @@ static_library("chrome") {
 
     if (enable_pdf_viewer) {
       sources += [
-        "//chrome/browser/pdf/chrome_pdf_stream_delegate.cc",
-        "//chrome/browser/pdf/chrome_pdf_stream_delegate.h",
         "//chrome/browser/pdf/pdf_extension_util.cc",
         "//chrome/browser/pdf/pdf_extension_util.h",
-        "//chrome/browser/pdf/pdf_frame_util.cc",
-        "//chrome/browser/pdf/pdf_frame_util.h",
-        "//chrome/browser/plugins/pdf_iframe_navigation_throttle.cc",
-        "//chrome/browser/plugins/pdf_iframe_navigation_throttle.h",
         "//chrome/renderer/pepper/chrome_pdf_print_client.cc",
         "//chrome/renderer/pepper/chrome_pdf_print_client.h",
       ]
-      deps += [
-        "//components/pdf/browser",
-        "//components/pdf/renderer",
-      ]
     }
   }
 
@@ -340,6 +329,15 @@ source_set("plugins") {
     "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.cc",
     "//chrome/browser/renderer_host/pepper/pepper_isolated_file_system_message_filter.h",
   ]
+  deps += [
+    "//media:media_buildflags",
+    "//ppapi/buildflags",
+    "//ppapi/proxy:ipc",
+    "//services/device/public/mojom",
+  ]
+  if (enable_pdf_viewer) {
+    deps += [ "//components/pdf/browser" ]
+  }
 
   # renderer side
   sources += [
@@ -350,18 +348,17 @@ source_set("plugins") {
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.cc",
     "//chrome/renderer/pepper/pepper_shared_memory_message_filter.h",
   ]
-
+  if (enable_pdf_viewer) {
+    deps += [ "//components/pdf/renderer" ]
+  }
   deps += [
     "//components/strings",
     "//media:media_buildflags",
-    "//ppapi/buildflags",
     "//ppapi/host",
     "//ppapi/proxy",
     "//ppapi/proxy:ipc",
     "//ppapi/shared_impl",
-    "//services/device/public/mojom",
     "//skia",
-    "//storage/browser",
   ]
 }
 

default_app/default_app.ts

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

default_app/main.ts

@@ -1,4 +1,4 @@
-import * as electron from 'electron/main';
+import * as electron from 'electron';
 
 import * as fs from 'fs';
 import * as path from 'path';
@@ -92,7 +92,7 @@ function loadApplicationPackage (packagePath: string) {
       try {
         packageJson = require(packageJsonPath);
       } catch (e) {
-        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${(e as Error).message}`);
+        showErrorMessage(`Unable to parse ${packageJsonPath}\n\n${e.message}`);
         return;
       }
 
@@ -111,7 +111,7 @@ function loadApplicationPackage (packagePath: string) {
       const filePath = Module._resolveFilename(packagePath, module, true);
       app.setAppPath(appPath || path.dirname(filePath));
     } catch (e) {
-      showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${(e as Error).message}`);
+      showErrorMessage(`Unable to find Electron app at ${packagePath}\n\n${e.message}`);
       return;
     }
 
@@ -119,7 +119,7 @@ function loadApplicationPackage (packagePath: string) {
     Module._load(packagePath, module, true);
   } catch (e) {
     console.error('App threw an error during load');
-    console.error((e as Error).stack || e);
+    console.error(e.stack || e);
     throw e;
   }
 }

default_app/preload.ts

@@ -1,4 +1,4 @@
-import { ipcRenderer, contextBridge } from 'electron/renderer';
+import { ipcRenderer, contextBridge } from 'electron';
 
 const policy = window.trustedTypes.createPolicy('electron-default-app', {
   // we trust the SVG contents

docs/README.md

@@ -70,6 +70,9 @@ an issue:
   * [Windows Store](tutorial/windows-store-guide.md)
   * [Snapcraft](tutorial/snapcraft.md)
 * [Updates](tutorial/updates.md)
+  * [Deploying an Update Server](tutorial/updates.md#deploying-an-update-server)
+  * [Implementing Updates in Your App](tutorial/updates.md#implementing-updates-in-your-app)
+  * [Applying Updates](tutorial/updates.md#applying-updates)
 * [Getting Support](tutorial/support.md)
 
 ## Detailed Tutorials
@@ -103,6 +106,7 @@ These individual tutorials expand on topics discussed in the guide above.
 * [`File` Object](api/file-object.md)
 * [`<webview>` Tag](api/webview-tag.md)
 * [`window.open` Function](api/window-open.md)
+* [`BrowserWindowProxy` Object](api/browser-window-proxy.md)
 
 ### Modules for the Main Process:
 

docs/api/app.md

@@ -837,8 +837,6 @@ Returns `Object`:
 
 * `categories` [JumpListCategory[]](structures/jump-list-category.md) | `null` - Array of `JumpListCategory` objects.
 
-Returns `string`
-
 Sets or removes a custom Jump List for the application, and returns one of the
 following strings:
 
@@ -932,9 +930,9 @@ app.setJumpList([
 ])
 ```
 
-### `app.requestSingleInstanceLock([additionalData])`
+### `app.requestSingleInstanceLock()`
 
-* `additionalData` Record<any, any> (optional) - A JSON object containing additional data to send to the first instance.
+* `additionalData` unknown (optional) - A JSON object containing additional data to send to the first instance.
 
 Returns `boolean`
 

docs/api/browser-view.md

@@ -70,31 +70,5 @@ The `bounds` of this BrowserView instance as `Object`.
 
 #### `view.setBackgroundColor(color)` _Experimental_
 
-* `color` string - Color in Hex, RGB, ARGB, HSL, HSLA or named CSS color format. The alpha channel is
-  optional for the hex type.
-
-Examples of valid `color` values:
-
-* Hex
-  * #fff (RGB)
-  * #ffff (ARGB)
-  * #ffffff (RRGGBB)
-  * #ffffffff (AARRGGBB)
-* RGB
-  * rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)
-    * e.g. rgb(255, 255, 255)
-* RGBA
-  * rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)
-    * e.g. rgba(255, 255, 255, 1.0)
-* HSL
-  * hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)
-    * e.g. hsl(200, 20%, 50%)
-* HSLA
-  * hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)
-    * e.g. hsla(200, 20%, 50%, 0.5)
-* Color name
-  * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
-  * Similar to CSS Color Module Level 3 keywords, but case-sensitive.
-    * e.g. `blueviolet` or `red`
-
-**Note:** Hex format with alpha takes `AARRGGBB` or `ARGB`, _not_ `RRGGBBA` or `RGA`.
+* `color` string - Color in `#aarrggbb` or `#argb` form. The alpha channel is
+  optional.

docs/api/browser-window-proxy.md

@@ -0,0 +1,54 @@
+## Class: BrowserWindowProxy
+
+> Manipulate the child browser window
+
+Process: [Renderer](../glossary.md#renderer-process)<br />
+_This class is not exported from the `'electron'` module. It is only available as a return value of other methods in the Electron API._
+
+The `BrowserWindowProxy` object is returned from `window.open` and provides
+limited functionality with the child window.
+
+### Instance Methods
+
+The `BrowserWindowProxy` object has the following instance methods:
+
+#### `win.blur()`
+
+Removes focus from the child window.
+
+#### `win.close()`
+
+Forcefully closes the child window without calling its unload event.
+
+#### `win.eval(code)`
+
+* `code` string
+
+Evaluates the code in the child window.
+
+#### `win.focus()`
+
+Focuses the child window (brings the window to front).
+
+#### `win.print()`
+
+Invokes the print dialog on the child window.
+
+#### `win.postMessage(message, targetOrigin)`
+
+* `message` any
+* `targetOrigin` string
+
+Sends a message to the child window with the specified origin or `*` for no
+origin preference.
+
+In addition to these methods, the child window implements `window.opener` object
+with no properties and a single method.
+
+### Instance Properties
+
+The `BrowserWindowProxy` object has the following instance properties:
+
+#### `win.closed`
+
+A `boolean` that is set to true after the child window gets closed.

docs/api/browser-window.md

@@ -66,18 +66,6 @@ win.loadURL('https://github.com')
 Note that even for apps that use `ready-to-show` event, it is still recommended
 to set `backgroundColor` to make app feel more native.
 
-Some examples of valid `backgroundColor` values include:
-
-```js
-const win = new BrowserWindow()
-win.setBackgroundColor('hsl(230, 100%, 50%)')
-win.setBackgroundColor('rgb(255, 145, 145)')
-win.setBackgroundColor('#ff00a3')
-win.setBackgroundColor('blueviolet')
-```
-
-For more information about these color types see valid options in [win.setBackgroundColor](browser-window.md#winsetbackgroundcolorbackgroundcolor).
-
 ## Parent and child windows
 
 By using `parent` option, you can create child windows:
@@ -211,7 +199,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
   * `enableLargerThanScreen` boolean (optional) - Enable the window to be resized larger
     than screen. Only relevant for macOS, as other OSes allow
     larger-than-screen windows by default. Default is `false`.
-  * `backgroundColor` string (optional) - The window's background color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. Alpha in #AARRGGBB format is supported if `transparent` is set to `true`. Default is `#FFF` (white). See [win.setBackgroundColor](browser-window.md#winsetbackgroundcolorbackgroundcolor) for more information.
+  * `backgroundColor` string (optional) - Window's background color as a hexadecimal value,
+    like `#66CD00` or `#FFF` or `#80FFFFFF` (alpha in #AARRGGBB format is supported if
+    `transparent` is set to `true`). Default is `#FFF` (white).
   * `hasShadow` boolean (optional) - Whether window should have a shadow. Default is `true`.
   * `opacity` number (optional) - Set the initial opacity of the window, between 0.0 (fully
     transparent) and 1.0 (fully opaque). This is only implemented on Windows and macOS.
@@ -351,6 +341,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       [Chrome Content Scripts][chrome-content-scripts].  You can access this
       context in the dev tools by selecting the 'Electron Isolated Context'
       entry in the combo box at the top of the Console tab.
+    * `nativeWindowOpen` boolean (optional) - Whether to use native
+      `window.open()`. Defaults to `true`. Child windows will always have node
+      integration disabled unless `nodeIntegrationInSubFrames` is true.
     * `webviewTag` boolean (optional) - Whether to enable the [`<webview>` tag](webview-tag.md).
       Defaults to `false`. **Note:** The
       `preload` script configured for the `<webview>` will have node integration
@@ -398,10 +391,9 @@ It creates a new `BrowserWindow` with native properties as set by the `options`.
       contain the layout of the document—without requiring scrolling. Enabling
       this will cause the `preferred-size-changed` event to be emitted on the
       `WebContents` when the preferred size changes. Default is `false`.
-  * `titleBarOverlay` Object | Boolean (optional) -  When using a frameless window in conjunction with `win.setWindowButtonVisibility(true)` on macOS or using a `titleBarStyle` so that the standard window controls ("traffic lights" on macOS) are visible, this property enables the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.
-    * `color` String (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled. Default is the system color.
-    * `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.
-    * `height` Integer (optional) _macOS_ _Windows_ - The height of the title bar and Window Controls Overlay in pixels. Default is system height.
+  * `titleBarOverlay` Object | boolean (optional) -  When using a frameless window in conjuction with `win.setWindowButtonVisibility(true)` on macOS or using a `titleBarStyle` so that the standard window controls ("traffic lights" on macOS) are visible, this property enables the Window Controls Overlay [JavaScript APIs][overlay-javascript-apis] and [CSS Environment Variables][overlay-css-env-vars]. Specifying `true` will result in an overlay with default system colors. Default is `false`.
+    * `color` string (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled. Default is the system color.
+    * `symbolColor` string (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled. Default is the system color.
 
 When setting minimum or maximum window size with `minWidth`/`maxWidth`/
 `minHeight`/`maxHeight`, it only constrains the users. It won't prevent you from
@@ -464,7 +456,7 @@ window.onbeforeunload = (e) => {
   // a non-void value will silently cancel the close.
   // It is recommended to use the dialog API to let the user confirm closing the
   // application.
-  e.returnValue = false
+  e.returnValue = false // equivalent to `return false` but not recommended
 }
 ```
 
@@ -1002,33 +994,12 @@ APIs like `win.setSize`.
 
 #### `win.setBackgroundColor(backgroundColor)`
 
-* `backgroundColor` string - Color in Hex, RGB, RGBA, HSL, HSLA or named CSS color format. The alpha channel is optional for the hex type.
+* `backgroundColor` string - Window's background color as a hexadecimal value,
+  like `#66CD00` or `#FFF` or `#80FFFFFF` (alpha is supported if `transparent`
+  is `true`). Default is `#FFF` (white).
 
-Examples of valid `backgroundColor` values:
-
-* Hex
-  * #fff (shorthand RGB)
-  * #ffff (shorthand ARGB)
-  * #ffffff (RGB)
-  * #ffffffff (ARGB)
-* RGB
-  * rgb\(([\d]+),\s*([\d]+),\s*([\d]+)\)
-    * e.g. rgb(255, 255, 255)
-* RGBA
-  * rgba\(([\d]+),\s*([\d]+),\s*([\d]+),\s*([\d.]+)\)
-    * e.g. rgba(255, 255, 255, 1.0)
-* HSL
-  * hsl\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%\)
-    * e.g. hsl(200, 20%, 50%)
-* HSLA
-  * hsla\((-?[\d.]+),\s*([\d.]+)%,\s*([\d.]+)%,\s*([\d.]+)\)
-    * e.g. hsla(200, 20%, 50%, 0.5)
-* Color name
-  * Options are listed in [SkParseColor.cpp](https://source.chromium.org/chromium/chromium/src/+/main:third_party/skia/src/utils/SkParseColor.cpp;l=11-152;drc=eea4bf52cb0d55e2a39c828b017c80a5ee054148)
-  * Similar to CSS Color Module Level 3 keywords, but case-sensitive.
-    * e.g. `blueviolet` or `red`
-
-Sets the background color of the window. See [Setting `backgroundColor`](#setting-the-backgroundcolor-property).
+Sets the background color of the window. See [Setting
+`backgroundColor`](#setting-the-backgroundcolor-property).
 
 #### `win.previewFile(path[, displayName])` _macOS_
 
@@ -1072,11 +1043,8 @@ Returns [`Rectangle`](structures/rectangle.md) - The `bounds` of the window as `
 
 #### `win.getBackgroundColor()`
 
-Returns `string` - Gets the background color of the window in Hex (`#RRGGBB`) format.
-
-See [Setting `backgroundColor`](#setting-the-backgroundcolor-property).
-
-**Note:** The alpha value is _not_ returned alongside the red, green, and blue values.
+Returns `string` - Gets the background color of the window. See [Setting
+`backgroundColor`](#setting-the-backgroundcolor-property).
 
 #### `win.setContentBounds(bounds[, animate])`
 
@@ -1842,16 +1810,6 @@ with `addBrowserView` or `setBrowserView`.
 **Note:** The BrowserView API is currently experimental and may change or be
 removed in future Electron releases.
 
-#### `win.setTitleBarOverlay(options)` _Windows_
-
-* `options` Object
-  * `color` String (optional) _Windows_ - The CSS color of the Window Controls Overlay when enabled.
-  * `symbolColor` String (optional) _Windows_ - The CSS color of the symbols on the Window Controls Overlay when enabled.
-  * `height` Integer (optional) _Windows_ - The height of the title bar and Window Controls Overlay in pixels.
-
-On a Window with Window Controls Overlay already enabled, this method updates
-the style of the title bar overlay.
-
 [runtime-enabled-features]: https://cs.chromium.org/chromium/src/third_party/blink/renderer/platform/runtime_enabled_features.json5?l=70
 [page-visibility-api]: https://developer.mozilla.org/en-US/docs/Web/API/Page_Visibility_API
 [quick-look]: https://en.wikipedia.org/wiki/Quick_Look

docs/api/clipboard.md

@@ -76,7 +76,7 @@ Writes `markup` to the clipboard.
 ```js
 const { clipboard } = require('electron')
 
-clipboard.writeHTML('<b>Hi</b>')
+clipboard.writeHTML('<b>Hi</b')
 ```
 
 ### `clipboard.readImage([type])`

docs/api/context-bridge.md

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

docs/api/crash-reporter.md

@@ -27,7 +27,6 @@ Or use a 3rd party hosted solution:
 * [Backtrace](https://backtrace.io/electron/)
 * [Sentry](https://docs.sentry.io/clients/electron)
 * [BugSplat](https://www.bugsplat.com/docs/platforms/electron)
-* [Bugsnag](https://docs.bugsnag.com/platforms/electron/)
 
 Crash reports are stored temporarily before being uploaded in a directory
 underneath the app's user data directory, called 'Crashpad'. You can override

docs/api/dock.md

@@ -28,7 +28,7 @@ When `informational` is passed, the dock icon will bounce for one second.
 However, the request remains active until either the application becomes active
 or the request is canceled.
 
-**Note:** This method can only be used while the app is not focused; when the app is focused it will return -1.
+**Nota Bene:** This method can only be used while the app is not focused; when the app is focused it will return -1.
 
 #### `dock.cancelBounce(id)` _macOS_
 

docs/api/extensions.md

@@ -99,7 +99,6 @@ Only `chrome.storage.local` is supported; `chrome.storage.sync` and
 The following methods of `chrome.tabs` are supported:
 
 - `chrome.tabs.sendMessage`
-- `chrome.tabs.reload`
 - `chrome.tabs.executeScript`
 - `chrome.tabs.update` (partial support)
   - supported properties: `url`, `muted`.

docs/api/incoming-message.md

@@ -80,25 +80,3 @@ An `Integer` indicating the HTTP protocol major version number.
 An `Integer` indicating the HTTP protocol minor version number.
 
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
-
-#### `response.rawHeaders`
-
-A `string[]` containing the raw HTTP response headers exactly as they were
-received. The keys and values are in the same list. It is not a list of
-tuples. So, the even-numbered offsets are key values, and the odd-numbered
-offsets are the associated values. Header names are not lowercased, and
-duplicates are not merged.
-
-```javascript
-// Prints something like:
-//
-// [ 'user-agent',
-//   'this is invalid because there can be only one',
-//   'User-Agent',
-//   'curl/7.22.0',
-//   'Host',
-//   '127.0.0.1:8000',
-//   'ACCEPT',
-//   '*/*' ]
-console.log(request.rawHeaders)
-```

docs/api/menu-item.md

@@ -14,7 +14,7 @@ See [`Menu`](menu.md) for examples.
     * `menuItem` MenuItem
     * `browserWindow` [BrowserWindow](browser-window.md) | undefined - This will not be defined if no window is open.
     * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, 'showSubstitutions', 'toggleSmartQuotes', 'toggleSmartDashes', 'toggleTextReplacement', `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
     `click` property will be ignored. See [roles](#roles).
   * `type` string (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
     `radio`.
@@ -100,10 +100,6 @@ The following additional roles are available on _macOS_:
 * `hide` - Map to the `hide` action.
 * `hideOthers` - Map to the `hideOtherApplications` action.
 * `unhide` - Map to the `unhideAllApplications` action.
-* `showSubstitutions` - Map to the `orderFrontSubstitutionsPanel` action.
-* `toggleSmartQuotes` - Map to the `toggleAutomaticQuoteSubstitution` action.
-* `toggleSmartDashes` - Map to the `toggleAutomaticDashSubstitution` action.
-* `toggleTextReplacement` - Map to the `toggleAutomaticTextReplacement` action.
 * `startSpeaking` - Map to the `startSpeaking` action.
 * `stopSpeaking` - Map to the `stopSpeaking` action.
 * `front` - Map to the `arrangeInFront` action.
@@ -124,7 +120,7 @@ When specifying a `role` on macOS, `label` and `accelerator` are the only
 options that will affect the menu item. All other options will be ignored.
 Lowercase `role`, e.g. `toggledevtools`, is still supported.
 
-**Note:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on macOS.
+**Nota Bene:** The `enabled` and `visibility` properties are not available for top-level menu items in the tray on macOS.
 
 ### Instance Properties
 

docs/api/native-theme.md

@@ -67,8 +67,3 @@ or is being instructed to show a high-contrast UI.
 
 A `boolean` for if the OS / Chromium currently has an inverted color scheme
 or is being instructed to use an inverted color scheme.
-
-### `nativeTheme.inForcedColorsMode` _Windows_ _Readonly_
-
-A `boolean` indicating whether Chromium is in forced colors mode, controlled by system accessibility settings.
-Currently, Windows high contrast is the only system setting that triggers forced colors mode.

docs/api/process.md

@@ -178,6 +178,7 @@ Returns an object with V8 heap statistics. Note that all statistics are reported
 Returns `Object`:
 
 * `allocated` Integer - Size of all allocated objects in Kilobytes.
+* `marked` Integer - Size of all marked objects in Kilobytes.
 * `total` Integer - Total allocated space in Kilobytes.
 
 Returns an object with Blink memory information.

docs/api/safe-storage.md

@@ -18,9 +18,9 @@ The `safeStorage` module has the following methods:
 
 Returns `boolean` - Whether encryption is available.
 
-On Linux, returns true if the app has emitted the `ready` event and the secret key is available.
-On MacOS, returns true if Keychain is available.
-On Windows, returns true once the app has emitted the `ready` event.
+On Linux, returns true if the secret key is
+available. On MacOS, returns true if Keychain is available.
+On Windows, returns true with no other preconditions.
 
 ### `safeStorage.encryptString(plainText)`
 

docs/api/session.md

@@ -868,20 +868,6 @@ this session just before normal `preload` scripts run.
 Returns `string[]` an array of paths to preload scripts that have been
 registered.
 
-#### `ses.setCodeCachePath(path)`
-
-* `path` String - Absolute path to store the v8 generated JS code cache from the renderer.
-
-Sets the directory to store the generated JS [code cache](https://v8.dev/blog/code-caching-for-devs) for this session. The directory is not required to be created by the user before this call, the runtime will create if it does not exist otherwise will use the existing directory. If directory cannot be created, then code cache will not be used and all operations related to code cache will fail silently inside the runtime. By default, the directory will be `Code Cache` under the
-respective user data folder.
-
-#### `ses.clearCodeCaches(options)`
-
-* `options` Object
-  * `urls` String[] (optional) - An array of url corresponding to the resource whose generated code cache needs to be removed. If the list is empty then all entries in the cache directory will be removed.
-
-Returns `Promise<void>` - resolves when the code cache clear operation is complete.
-
 #### `ses.setSpellCheckerEnabled(enable)`
 
 * `enable` boolean

docs/api/structures/payment-discount.md

@@ -1,7 +0,0 @@
-# PaymentDiscount Object
-
-* `identifier` string - A string used to uniquely identify a discount offer for a product.
-* `keyIdentifier` string - A string that identifies the key used to generate the signature.
-* `nonce` string - A universally unique ID (UUID) value that you define.
-* `signature` string - A UTF-8 string representing the properties of a specific discount offer, cryptographically signed.
-* `timestamp` number - The date and time of the signature's creation in milliseconds, formatted in Unix epoch time.

docs/api/structures/post-body.md

@@ -7,3 +7,17 @@
   the `enctype` attribute of the submitted HTML form.
 * `boundary` string (optional) - The boundary used to separate multiple parts of
   the message. Only valid when `contentType` is `multipart/form-data`.
+
+Note that keys starting with `--` are not currently supported. For example, this will errantly submit as `multipart/form-data` when `nativeWindowOpen` is set to `false` in webPreferences:
+
+```html
+<form
+  target="_blank"
+  method="POST"
+  enctype="application/x-www-form-urlencoded"
+  action="https://postman-echo.com/post"
+>
+  <input type="text" name="--theKey">
+  <input type="submit">
+</form>
+```

docs/api/structures/product-discount.md

@@ -1,9 +0,0 @@
-# ProductDiscount Object
-
-* `identifier` string - A string used to uniquely identify a discount offer for a product.
-* `type` number - The type of discount offer.
-* `price` number - The discount price of the product in the local currency.
-* `priceLocale` string - The locale used to format the discount price of the product.
-* `paymentMode` string - The payment mode for this product discount. Can be `payAsYouGo`, `payUpFront`, or `freeTrial`.
-* `numberOfPeriods` number - An integer that indicates the number of periods the product discount is available.
-* `subscriptionPeriod` [ProductSubscriptionPeriod](product-subscription-period.md) (optional) - An object that defines the period for the product discount.

docs/api/structures/product-subscription-period.md

@@ -1,4 +0,0 @@
-# ProductSubscriptionPeriod Object
-
-* `numberOfUnits` number - The number of units per subscription period.
-* `unit` string - The increment of time that a subscription period is specified in. Can be `day`, `week`, `month`, `year`.

docs/api/structures/product.md

@@ -8,11 +8,4 @@
 * `price` number - The cost of the product in the local currency.
 * `formattedPrice` string - The locale formatted price of the product.
 * `currencyCode` string - 3 character code presenting a product's currency based on the ISO 4217 standard.
-* `introductoryPrice` [ProductDiscount](product-discount.md) (optional) - The object containing introductory price information for the product.
-available for the product.
-* `discounts` [ProductDiscount](product-discount.md)[] - An array of discount offers
-* `subscriptionGroupIdentifier` string - The identifier of the subscription group to which the subscription belongs.
-* `subscriptionPeriod` [ProductSubscriptionPeriod](product-subscription-period.md) (optional) - The period details for products that are subscriptions.
 * `isDownloadable` boolean - A boolean value that indicates whether the App Store has downloadable content for this product. `true` if at least one file has been associated with the product.
-* `downloadContentVersion` string - A string that identifies the version of the content.
-* `downloadContentLengths` number[] - The total size of the content, in bytes.

docs/api/structures/transaction.md

@@ -9,5 +9,3 @@
 * `payment` Object
   * `productIdentifier` string - The identifier of the purchased product.
   * `quantity` Integer  - The quantity purchased.
-  * `applicationUsername` string - An opaque identifier for the user’s account on your system.
-  * `paymentDiscount` [PaymentDiscount](payment-discount.md) (optional) - The details of the discount offer to apply to the payment.

docs/api/system-preferences.md

@@ -84,7 +84,7 @@ that contains the user information dictionary sent along with the notification.
 
 ### `systemPreferences.subscribeNotification(event, callback)` _macOS_
 
-* `event` string | null
+* `event` string
 * `callback` Function
   * `event` string
   * `userInfo` Record<string, unknown>
@@ -109,11 +109,9 @@ example values of `event` are:
 * `AppleColorPreferencesChangedNotification`
 * `AppleShowScrollBarsSettingChanged`
 
-If `event` is null, the `NSDistributedNotificationCenter` doesn’t use it as criteria for delivery to the observer. See [docs](https://developer.apple.com/documentation/foundation/nsnotificationcenter/1411723-addobserverforname?language=objc)  for more information.
-
 ### `systemPreferences.subscribeLocalNotification(event, callback)` _macOS_
 
-* `event` string | null
+* `event` string
 * `callback` Function
   * `event` string
   * `userInfo` Record<string, unknown>
@@ -124,11 +122,9 @@ Returns `number` - The ID of this subscription
 Same as `subscribeNotification`, but uses `NSNotificationCenter` for local defaults.
 This is necessary for events such as `NSUserDefaultsDidChangeNotification`.
 
-If `event` is null, the `NSNotificationCenter` doesn’t use it as criteria for delivery to the observer. See [docs](https://developer.apple.com/documentation/foundation/nsnotificationcenter/1411723-addobserverforname?language=objc) for more information.
-
 ### `systemPreferences.subscribeWorkspaceNotification(event, callback)` _macOS_
 
-* `event` string | null
+* `event` string
 * `callback` Function
   * `event` string
   * `userInfo` Record<string, unknown>
@@ -139,8 +135,6 @@ Returns `number` - The ID of this subscription
 Same as `subscribeNotification`, but uses `NSWorkspace.sharedWorkspace.notificationCenter`.
 This is necessary for events such as `NSWorkspaceDidActivateApplicationNotification`.
 
-If `event` is null, the `NSWorkspaceNotificationCenter` doesn’t use it as criteria for delivery to the observer. See [docs](https://developer.apple.com/documentation/foundation/nsnotificationcenter/1411723-addobserverforname?language=objc) for more information.
-
 ### `systemPreferences.unsubscribeNotification(id)` _macOS_
 
 * `id` Integer

docs/api/web-contents.md

@@ -290,7 +290,7 @@ Returns:
 * `frameProcessId` Integer
 * `frameRoutingId` Integer
 
-Emitted when a server side redirect occurs during navigation.  For example a 302
+Emitted as a server side redirect occurs during navigation.  For example a 302
 redirect.
 
 This event will be emitted after `did-start-navigation` and always before the
@@ -508,23 +508,6 @@ Returns:
 
 Emitted when the user is requesting to change the zoom level using the mouse wheel.
 
-#### Event: 'blur'
-
-Emitted when the `WebContents` loses focus.
-
-#### Event: 'focus'
-
-Emitted when the `WebContents` gains focus.
-
-Note that on macOS, having focus means the `WebContents` is the first responder
-of window, so switching focus between windows would not trigger the `focus` and
-`blur` events of `WebContents`, as the first responder of each window is not
-changed.
-
-The `focus` and `blur` events of `WebContents` should only be used to detect
-focus change between different `WebContents` and `BrowserView` in the same
-window.
-
 #### Event: 'devtools-opened'
 
 Emitted when DevTools is opened.
@@ -1101,7 +1084,7 @@ Returns `string` - The user agent for this web page.
 
 * `css` string
 * `options` Object (optional)
-  * `cssOrigin` string (optional) - Can be either 'user' or 'author'. Sets the [cascade origin](https://www.w3.org/TR/css3-cascade/#cascade-origin) of the inserted stylesheet. Default is 'author'.
+  * `cssOrigin` string (optional) - Can be either 'user' or 'author'; Specifying 'user' enables you to prevent websites from overriding the CSS you insert. Default is 'author'.
 
 Returns `Promise<string>` - A promise that resolves with a key for the inserted CSS that can later be used to remove the CSS via `contents.removeInsertedCSS(key)`.
 
@@ -1638,8 +1621,6 @@ Opens the devtools.
 When `contents` is a `<webview>` tag, the `mode` would be `detach` by default,
 explicitly passing an empty `mode` can force using last used dock state.
 
-On Windows, if Windows Control Overlay is enabled, Devtools will be opened with `mode: 'detach'`.
-
 #### `contents.closeDevTools()`
 
 Closes the devtools.
@@ -1858,7 +1839,7 @@ the cursor when dragging.
 
 #### `contents.savePage(fullPath, saveType)`
 
-* `fullPath` string - The absolute file path.
+* `fullPath` string - The full file path.
 * `saveType` string - Specify the save type.
   * `HTMLOnly` - Save only the HTML of the page.
   * `HTMLComplete` - Save complete-html page.

docs/api/web-frame-main.md

@@ -16,7 +16,7 @@ win.loadURL('https://twitter.com')
 
 win.webContents.on(
   'did-frame-navigate',
-  (event, url, httpResponseCode, httpStatusText, isMainFrame, frameProcessId, frameRoutingId) => {
+  (event, url, isMainFrame, frameProcessId, frameRoutingId) => {
     const frame = webFrameMain.fromId(frameProcessId, frameRoutingId)
     if (frame) {
       const code = 'document.body.innerHTML = document.body.innerHTML.replaceAll("heck", "h*ck")'

docs/api/web-frame.md

@@ -110,11 +110,9 @@ webFrame.setSpellCheckProvider('en-US', {
 })
 ```
 
-#### `webFrame.insertCSS(css[, options])`
+### `webFrame.insertCSS(css)`
 
-* `css` string
-* `options` Object (optional)
-  * `cssOrigin` string (optional) - Can be either 'user' or 'author'. Sets the [cascade origin](https://www.w3.org/TR/css3-cascade/#cascade-origin) of the inserted stylesheet. Default is 'author'.
+* `css` string - CSS source code.
 
 Returns `string` - A key for the inserted CSS that can later be used to remove
 the CSS via `webFrame.removeInsertedCSS(key)`.

docs/api/web-request.md

@@ -98,7 +98,6 @@ Some examples of valid `urls`:
     * `resourceType` string - Can be `mainFrame`, `subFrame`, `stylesheet`, `script`, `image`, `font`, `object`, `xhr`, `ping`, `cspReport`, `media`, `webSocket` or `other`.
     * `referrer` string
     * `timestamp` Double
-    * `uploadData` [UploadData[]](structures/upload-data.md) (optional)
     * `requestHeaders` Record<string, string>
   * `callback` Function
     * `beforeSendResponse` Object

docs/api/window-open.md

@@ -12,6 +12,10 @@ useful for app sub-windows that act as preference panels, or similar, as the
 parent can render to the sub-window directly, as if it were a `div` in the
 parent. This is the same behavior as in the browser.
 
+When `nativeWindowOpen` is set to false, `window.open` instead results in the
+creation of a [`BrowserWindowProxy`](browser-window-proxy.md), a light wrapper
+around `BrowserWindow`.
+
 Electron pairs this native Chrome `Window` with a BrowserWindow under the hood.
 You can take advantage of all the customization available when creating a
 BrowserWindow in the main process by using `webContents.setWindowOpenHandler()`
@@ -30,7 +34,7 @@ because it is invoked in the main process.
 * `frameName` string (optional)
 * `features` string (optional)
 
-Returns [`Window`](https://developer.mozilla.org/en-US/docs/Web/API/Window) | null
+Returns [`BrowserWindowProxy`](browser-window-proxy.md) | [`Window`](https://developer.mozilla.org/en-US/docs/Web/API/Window)
 
 `features` is a comma-separated key-value list, following the standard format of
 the browser. Electron will parse `BrowserWindowConstructorOptions` out of this
@@ -104,3 +108,33 @@ mainWindow.webContents.setWindowOpenHandler(({ url }) => {
 const childWindow = window.open('', 'modal')
 childWindow.document.write('<h1>Hello</h1>')
 ```
+
+### `BrowserWindowProxy` example
+
+```javascript
+
+// main.js
+const mainWindow = new BrowserWindow({
+  webPreferences: { nativeWindowOpen: false }
+})
+
+mainWindow.webContents.setWindowOpenHandler(({ url }) => {
+  if (url.startsWith('https://github.com/')) {
+    return { action: 'allow' }
+  }
+  return { action: 'deny' }
+})
+
+mainWindow.webContents.on('did-create-window', (childWindow) => {
+  // For example...
+  childWindow.webContents.on('will-navigate', (e) => {
+    e.preventDefault()
+  })
+})
+```
+
+```javascript
+// renderer.js
+const windowProxy = window.open('https://github.com/', null, 'minimizable=false')
+windowProxy.postMessage('hi', '*')
+```

docs/breaking-changes.md

@@ -12,44 +12,6 @@ This document uses the following convention to categorize breaking changes:
 * **Deprecated:** An API was marked as deprecated. The API will continue to function, but will emit a deprecation warning, and will be removed in a future release.
 * **Removed:** An API or feature was removed, and is no longer supported by Electron.
 
-## Planned Breaking API Changes (20.0)
-
-### Default Changed: renderers without `nodeIntegration: true` are sandboxed by default
-
-Previously, renderers that specified a preload script defaulted to being
-unsandboxed. This meant that by default, preload scripts had access to Node.js.
-In Electron 20, this default has changed. Beginning in Electron 20, renderers
-will be sandboxed by default, unless `nodeIntegration: true` or `sandbox: false`
-is specified.
-
-If your preload scripts do not depend on Node, no action is needed. If your
-preload scripts _do_ depend on Node, either refactor them to remove Node usage
-from the renderer, or explicitly specify `sandbox: false` for the relevant
-renderers.
-
-### Removed: `skipTaskbar` on Linux
-
-On X11, `skipTaskbar` sends a `_NET_WM_STATE_SKIP_TASKBAR` message to the X11
-window manager. There is not a direct equivalent for Wayland, and the known
-workarounds have unacceptable tradeoffs (e.g. Window.is_skip_taskbar in GNOME
-requires unsafe mode), so Electron is unable to support this feature on Linux.
-
-## Planned Breaking API Changes (19.0)
-
-*None (yet)*
-
-## Planned Breaking API Changes (18.0)
-
-### Removed: `nativeWindowOpen`
-
-Prior to Electron 15, `window.open` was by default shimmed to use
-`BrowserWindowProxy`. This meant that `window.open('about:blank')` did not work
-to open synchronously scriptable child windows, among other incompatibilities.
-Since Electron 15, `nativeWindowOpen` has been enabled by default.
-
-See the documentation for [window.open in Electron](api/window-open.md)
-for more details.
-
 ## Planned Breaking API Changes (17.0)
 
 ### Removed: `desktopCapturer.getSources` in the renderer

docs/development/build-instructions-gn.md

@@ -98,40 +98,45 @@ $ gclient sync -f
 
 ## Building
 
-**Set the environment variable for chromium build tools**
-
-On Linux & MacOS
-
 ```sh
 $ cd src
 $ export CHROMIUM_BUILDTOOLS_PATH=`pwd`/buildtools
+$ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EXTRA_ARGS"
 ```
 
-On Windows:
+Or on Windows (without the optional argument):
 
 ```sh
 $ cd src
 $ set CHROMIUM_BUILDTOOLS_PATH=%cd%\buildtools
-```
-
-**To generate Testing build config of Electron:**
-
-```sh
 $ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\")"
 ```
 
-**To generate Release build config of Electron:**
+This will generate a build directory `out/Testing` under `src/` with
+the testing build configuration. You can replace `Testing` with another name,
+but it should be a subdirectory of `out`.
+Also you shouldn't have to run `gn gen` again—if you want to change the
+build arguments, you can run `gn args out/Testing` to bring up an editor.
+
+To see the list of available build configuration options, run `gn args
+out/Testing --list`.
+
+**For generating Testing build config of
+Electron:**
 
 ```sh
-$ gn gen out/Release --args="import(\"//electron/build/args/release.gn\")"
+$ gn gen out/Testing --args="import(\"//electron/build/args/testing.gn\") $GN_EXTRA_ARGS"
 ```
 
-**Note:** This will generate a `out/Testing` or `out/Release` build directory under `src/` with the testing or release build depending upon the configuration passed above. You can replace `Testing|Release` with another names, but it should be a subdirectory of `out`.
+**For generating Release (aka "non-component" or "static") build config of
+Electron:**
 
-Also you shouldn't have to run `gn gen` again—if you want to change the build arguments, you can run `gn args out/Testing` to bring up an editor. To see the list of available build configuration options, run `gn args out/Testing --list`.
+```sh
+$ gn gen out/Release --args="import(\"//electron/build/args/release.gn\") $GN_EXTRA_ARGS"
+```
 
 **To build, run `ninja` with the `electron` target:**
-Note: This will also take a while and probably heat up your lap.
+Nota Bene: This will also take a while and probably heat up your lap.
 
 For the testing configuration:
 
@@ -164,13 +169,13 @@ $ ./out/Testing/electron
 On linux, first strip the debugging and symbol information:
 
 ```sh
-$ electron/script/strip-binaries.py -d out/Release
+electron/script/strip-binaries.py -d out/Release
 ```
 
 To package the electron build as a distributable zip file:
 
 ```sh
-$ ninja -C out/Release electron:electron_dist_zip
+ninja -C out/Release electron:electron_dist_zip
 ```
 
 ### Cross-compiling

docs/development/build-instructions-linux.md

@@ -7,7 +7,21 @@ Follow the guidelines below for building **Electron itself** on Linux, for the p
 ## Prerequisites
 
 * At least 25GB disk space and 8GB RAM.
-* Python >= 3.7.
+* Python 2.7.x. Some distributions like CentOS 6.x still use Python 2.6.x
+  so you may need to check your Python version with `python -V`.
+
+  Please also ensure that your system and Python version support at least TLS 1.2.
+  For a quick test, run the following script:
+
+  ```sh
+  $ npx @electron/check-python-tls
+  ```
+
+  If the script returns that your configuration is using an outdated security
+  protocol, use your system's package manager to update Python to the latest
+  version in the 2.7.x branch. Alternatively, visit https://www.python.org/downloads/
+  for detailed instructions.
+
 * Node.js. There are various ways to install Node. You can download
   source code from [nodejs.org](https://nodejs.org) and compile it.
   Doing so permits installing Node on your own home directory as a standard user.
@@ -15,17 +29,7 @@ Follow the guidelines below for building **Electron itself** on Linux, for the p
 * [clang](https://clang.llvm.org/get_started.html) 3.4 or later.
 * Development headers of GTK 3 and libnotify.
 
-On Ubuntu >= 20.04, install the following libraries:
-
-```sh
-$ sudo apt-get install build-essential clang libdbus-1-dev libgtk-3-dev \
-                       libnotify-dev libasound2-dev libcap-dev \
-                       libcups2-dev libxtst-dev \
-                       libxss1 libnss3-dev gcc-multilib g++-multilib curl \
-                       gperf bison python3-dbusmock openjdk-8-jre
-```
-
-On Ubuntu < 20.04, install the following libraries:
+On Ubuntu, install the following libraries:
 
 ```sh
 $ sudo apt-get install build-essential clang libdbus-1-dev libgtk-3-dev \

docs/development/build-instructions-macos.md

@@ -6,12 +6,45 @@ Follow the guidelines below for building **Electron itself** on macOS, for the p
 
 ## Prerequisites
 
-* macOS >= 11.6.0
-* [Xcode](https://developer.apple.com/technologies/tools/). The exact version
-  needed depends on what branch you are building, but the latest version of
-  Xcode is generally a good bet for building `main`.
+* macOS >= 10.11.6
+* [Xcode](https://developer.apple.com/technologies/tools/) >= 9.0.0
 * [node.js](https://nodejs.org) (external)
-* Python >= 3.7
+* Python 2.7 with support for TLS 1.2
+
+## Python
+
+Please also ensure that your system and Python version support at least TLS 1.2.
+This depends on both your version of macOS and Python. For a quick test, run:
+
+```sh
+$ npx @electron/check-python-tls
+```
+
+If the script returns that your configuration is using an outdated security
+protocol, you can either update macOS to High Sierra or install a new version
+of Python 2.7.x. To upgrade Python, use [Homebrew](https://brew.sh/):
+
+```sh
+$ brew install python@2 && brew link python@2 --force
+```
+
+If you are using Python as provided by Homebrew, you also need to install
+the following Python modules:
+
+* [pyobjc](https://pypi.org/project/pyobjc/#description)
+
+You can use `pip` to install it:
+
+```sh
+$ pip install pyobjc
+```
+
+## macOS SDK
+
+If you're developing Electron and don't plan to redistribute your
+custom Electron build, you may skip this section.
+
+Official Electron builds are built with [Xcode 12.2](https://download.developer.apple.com/Developer_Tools/Xcode_12.2/Xcode_12.2.xip), and the macOS 11.0 SDK. Building with a newer SDK works too, but the releases currently use the 11.0 SDK.
 
 ## Building Electron
 

docs/development/coding-style.md

@@ -28,7 +28,7 @@ For C++ and Python, we follow Chromium's [Coding
 Style](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/styleguide/styleguide.md).
 There is also a script `script/cpplint.py` to check whether all files conform.
 
-The Python version we are using now is Python 3.9.
+The Python version we are using now is Python 2.7.
 
 The C++ code uses a lot of Chromium's abstractions and types, so it's
 recommended to get acquainted with them. A good place to start is

docs/development/debugging.md

@@ -35,28 +35,6 @@ base::debug::StackTrace().Print();
 
 This will allow you to observe call chains and identify potential issue areas.
 
-## Breakpoint Debugging
-
-> Note that this will increase the size of the build significantly, taking up around 50G of disk space
-
-Write the following file to `electron/.git/info/exclude/debug.gn`
-
-```gn
-import("//electron/build/args/testing.gn")
-is_debug = true
-symbol_level = 2
-forbid_non_component_debug_builds = false
-```
-
-Then execute:
-
-```sh
-$ gn gen out/Debug --args="import(\"//electron/.git/info/exclude/debug.gn\") $GN_EXTRA_ARGS"
-$ ninja -C out/Debug electron
-```
-
-Now you can use `LLDB` for breakpoint debugging.
-
 ## Platform-Specific Debugging
 <!-- TODO(@codebytere): add debugging file for Linux-->
 

docs/development/pull-requests.md

@@ -180,7 +180,7 @@ $ git push origin my-branch
 ### Step 9: Opening the Pull Request
 
 From within GitHub, opening a new pull request will present you with a template
-that should be filled out. It can be found [here](https://github.com/electron/electron/blob/main/.github/PULL_REQUEST_TEMPLATE.md).
+that should be filled out. It can be found [here](../../.github/PULL_REQUEST_TEMPLATE.md).
 
 If you do not adequately complete this template, your PR may be delayed in being merged as maintainers
 seek more information or clarify ambiguities.

docs/fiddles/ipc/pattern-1/index.html

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <title>Hello World!</title>
-  </head>
-  <body>
-    Title: <input id="title"/>
-    <button id="btn" type="button">Set</button>
-    <script src="./renderer.js"></script>
-  </body>
-</html>

docs/fiddles/ipc/pattern-1/main.js

@@ -1,30 +0,0 @@
-const {app, BrowserWindow, ipcMain} = require('electron')
-const path = require('path')
-
-function createWindow () {
-  const mainWindow = new BrowserWindow({
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-
-  ipcMain.on('set-title', (event, title) => {
-    const webContents = event.sender
-    const win = BrowserWindow.fromWebContents(webContents)
-    win.setTitle(title)
-  })
-
-  mainWindow.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  createWindow()
-  
-  app.on('activate', function () {
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
-  })
-})
-
-app.on('window-all-closed', function () {
-  if (process.platform !== 'darwin') app.quit()
-})

docs/fiddles/ipc/pattern-1/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-    setTitle: (title) => ipcRenderer.send('set-title', title)
-})

docs/fiddles/ipc/pattern-1/renderer.js

@@ -1,6 +0,0 @@
-const setButton = document.getElementById('btn')
-const titleInput = document.getElementById('title')
-setButton.addEventListener('click', () => {
-    const title = titleInput.value
-    window.electronAPI.setTitle(title)
-});

docs/fiddles/ipc/pattern-2/index.html

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <title>Dialog</title>
-  </head>
-  <body>
-    <button type="button" id="btn">Open a File</button>
-    File path: <strong id="filePath"></strong>
-    <script src='./renderer.js'></script>
-  </body>
-</html>

docs/fiddles/ipc/pattern-2/main.js

@@ -1,32 +0,0 @@
-const {app, BrowserWindow, ipcMain, dialog} = require('electron')
-const path = require('path')
-
-async function handleFileOpen() {
-  const { canceled, filePaths } = await dialog.showOpenDialog()
-  if (canceled) {
-    return
-  } else {
-    return filePaths[0]
-  }
-}
-
-function createWindow () {
-  const mainWindow = new BrowserWindow({
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-  mainWindow.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  ipcMain.handle('dialog:openFile', handleFileOpen)
-  createWindow()
-  app.on('activate', function () {
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
-  })
-})
-
-app.on('window-all-closed', function () {
-  if (process.platform !== 'darwin') app.quit()
-})

docs/fiddles/ipc/pattern-2/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld('electronAPI',{
-  openFile: () => ipcRenderer.invoke('dialog:openFile')
-})

docs/fiddles/ipc/pattern-2/renderer.js

@@ -1,7 +0,0 @@
-const btn = document.getElementById('btn')
-const filePathElement = document.getElementById('filePath')
-
-btn.addEventListener('click', async () => {
-  const filePath = await window.electronAPI.openFile()
-  filePathElement.innerText = filePath
-})

docs/fiddles/ipc/pattern-3/index.html

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <title>Menu Counter</title>
-  </head>
-  <body>
-    Current value: <strong id="counter">0</strong>
-    <script src="./renderer.js"></script>
-  </body>
-</html>

docs/fiddles/ipc/pattern-3/main.js

@@ -1,48 +0,0 @@
-const {app, BrowserWindow, Menu, ipcMain} = require('electron')
-const path = require('path')
-
-function createWindow () {
-  const mainWindow = new BrowserWindow({
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-
-  const menu = Menu.buildFromTemplate([
-    {
-      label: app.name,
-      submenu: [
-      {
-        click: () => mainWindow.webContents.send('update-counter', 1),
-        label: 'Increment',
-      },
-      {
-        click: () => mainWindow.webContents.send('update-counter', -1),
-        label: 'Decrement',
-      }
-      ]
-    }
-
-  ])
-
-  Menu.setApplicationMenu(menu)
-  mainWindow.loadFile('index.html')
-
-  // Open the DevTools.
-  mainWindow.webContents.openDevTools()
-}
-
-app.whenReady().then(() => {
-  ipcMain.on('counter-value', (_event, value) => {
-    console.log(value) // will print value to Node console
-  })
-  createWindow()
-  
-  app.on('activate', function () {
-    if (BrowserWindow.getAllWindows().length === 0) createWindow()
-  })
-})
-
-app.on('window-all-closed', function () {
-  if (process.platform !== 'darwin') app.quit()
-})

docs/fiddles/ipc/pattern-3/preload.js

@@ -1,5 +0,0 @@
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  handleCounter: (callback) => ipcRenderer.on('update-counter', callback)
-})

docs/fiddles/ipc/pattern-3/renderer.js

@@ -1,8 +0,0 @@
-const counter = document.getElementById('counter')
-
-window.electronAPI.handleCounter((event, value) => {
-    const oldValue = Number(counter.innerText)
-    const newValue = oldValue + value
-    counter.innerText = newValue
-    event.sender.send('counter-value', newValue)
-})

docs/fiddles/tutorial-first-app/index.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <meta
-      http-equiv="X-Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <title>Hello from Electron renderer!</title>
-  </head>
-  <body>
-    <h1>Hello from Electron renderer!</h1>
-    <p>👋</p>
-    <p id="info"></p>
-  </body>
-  <script src="./renderer.js"></script>
-</html>

docs/fiddles/tutorial-first-app/main.js

@@ -1,26 +0,0 @@
-const { app, BrowserWindow } = require('electron');
-
-const createWindow = () => {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-  });
-
-  win.loadFile('index.html');
-};
-
-app.whenReady().then(() => {
-  createWindow();
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) {
-      createWindow();
-    }
-  });
-});
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
-});

docs/fiddles/tutorial-preload/index.html

@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8" />
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <meta
-      http-equiv="X-Content-Security-Policy"
-      content="default-src 'self'; script-src 'self'"
-    />
-    <title>Hello from Electron renderer!</title>
-  </head>
-  <body>
-    <h1>Hello from Electron renderer!</h1>
-    <p>👋</p>
-    <p id="info"></p>
-  </body>
-  <script src="./renderer.js"></script>
-</html>

docs/fiddles/tutorial-preload/main.js

@@ -1,30 +0,0 @@
-const { app, BrowserWindow } = require('electron');
-const path = require('path');
-
-const createWindow = () => {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js'),
-    },
-  });
-
-  win.loadFile('index.html');
-};
-
-app.whenReady().then(() => {
-  createWindow();
-
-  app.on('activate', () => {
-    if (BrowserWindow.getAllWindows().length === 0) {
-      createWindow();
-    }
-  });
-});
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit();
-  }
-});

docs/fiddles/tutorial-preload/preload.js

@@ -1,7 +0,0 @@
-const { contextBridge } = require('electron');
-
-contextBridge.exposeInMainWorld('versions', {
-  node: () => process.versions.node,
-  chrome: () => process.versions.chrome,
-  electron: () => process.versions.electron,
-});

docs/fiddles/tutorial-preload/renderer.js

@@ -1,2 +0,0 @@
-const information = document.getElementById('info');
-information.innerText = `This app is using Chrome (v${versions.chrome()}), Node.js (v${versions.node()}), and Electron (v${versions.electron()})`;

docs/tutorial/application-distribution.md

@@ -1,26 +1,26 @@
----
-title: 'Application Packaging'
-description: 'To distribute your app with Electron, you need to package and rebrand it. To do this, you can either use specialized tooling or manual approaches.'
-slug: application-distribution
-hide_title: false
----
+# Application Distribution
 
-To distribute your app with Electron, you need to package and rebrand it. To do this, you
-can either use specialized tooling or manual approaches.
+## Overview
+
+To distribute your app with Electron, you need to package and rebrand it.
+To do this, you can either use specialized tooling or manual approaches.
 
 ## With tooling
 
-There are a couple tools out there that exist to package and distribute your Electron app.
-We recommend using [Electron Forge](https://www.electronforge.io). You can check out
-its documentation directly, or refer to the [Packaging and Distribution](./tutorial-5-packaging.md)
-part of the Electron tutorial.
+You can use the following tools to distribute your application:
 
-## Manual packaging
+* [electron-forge](https://github.com/electron-userland/electron-forge)
+* [electron-builder](https://github.com/electron-userland/electron-builder)
+* [electron-packager](https://github.com/electron/electron-packager)
 
-If you prefer the manual approach, there are 2 ways to distribute your application:
+These tools will take care of all the steps you need to take to end up with a
+distributable Electron application, such as bundling your application,
+rebranding the executable, and setting the right icons.
 
-- With prebuilt binaries
-- With an app source code archive
+You can check the example of how to package your app with `electron-forge` in
+the [Quick Start guide](quick-start.md#package-and-distribute-your-application).
+
+## Manual distribution
 
 ### With prebuilt binaries
 
@@ -29,19 +29,21 @@ binaries](https://github.com/electron/electron/releases). Next, the folder
 containing your app should be named `app` and placed in Electron's resources
 directory as shown in the following examples.
 
-:::note
-The location of Electron's prebuilt binaries is indicated
+> *NOTE:* the location of Electron's prebuilt binaries is indicated
 with `electron/` in the examples below.
-:::
 
-```plain title='macOS'
+*On macOS:*
+
+```plaintext
 electron/Electron.app/Contents/Resources/app/
 ├── package.json
 ├── main.js
 └── index.html
 ```
 
-```plain title='Windows and Linux'
+*On Windows and Linux:*
+
+```plaintext
 electron/resources/app
 ├── package.json
 ├── main.js
@@ -52,7 +54,7 @@ Then execute `Electron.app` on macOS, `electron` on Linux, or `electron.exe`
 on Windows, and Electron will start as your app. The `electron` directory
 will then be your distribution to deliver to users.
 
-### With an app source code archive (asar)
+### With an app source code archive
 
 Instead of shipping your app by copying all of its source files, you can
 package your app into an [asar] archive to improve the performance of reading
@@ -63,12 +65,16 @@ To use an `asar` archive to replace the `app` folder, you need to rename the
 archive to `app.asar`, and put it under Electron's resources directory like
 below, and Electron will then try to read the archive and start from it.
 
-```plain title='macOS'
+*On macOS:*
+
+```plaintext
 electron/Electron.app/Contents/Resources/
 └── app.asar
 ```
 
-```plain title='Windows'
+*On Windows and Linux:*
+
+```plaintext
 electron/resources/
 └── app.asar
 ```
@@ -81,44 +87,47 @@ You can find more details on how to use `asar` in the
 After bundling your app into Electron, you will want to rebrand Electron
 before distributing it to users.
 
-- **Windows:** You can rename `electron.exe` to any name you like, and edit
-  its icon and other information with tools like [rcedit](https://github.com/electron/rcedit).
-- **Linux:** You can rename the `electron` executable to any name you like.
-- **macOS:** You can rename `Electron.app` to any name you want, and you also have to rename
-  the `CFBundleDisplayName`, `CFBundleIdentifier` and `CFBundleName` fields in the
-  following files:
+#### macOS
 
-  - `Electron.app/Contents/Info.plist`
-  - `Electron.app/Contents/Frameworks/Electron Helper.app/Contents/Info.plist`
+You can rename `Electron.app` to any name you want, and you also have to rename
+the `CFBundleDisplayName`, `CFBundleIdentifier` and `CFBundleName` fields in the
+following files:
 
-  You can also rename the helper app to avoid showing `Electron Helper` in the
-  Activity Monitor, but make sure you have renamed the helper app's executable
-  file's name.
+* `Electron.app/Contents/Info.plist`
+* `Electron.app/Contents/Frameworks/Electron Helper.app/Contents/Info.plist`
 
-  The structure of a renamed app would be like:
+You can also rename the helper app to avoid showing `Electron Helper` in the
+Activity Monitor, but make sure you have renamed the helper app's executable
+file's name.
 
-```plain
+The structure of a renamed app would be like:
+
+```plaintext
 MyApp.app/Contents
 ├── Info.plist
 ├── MacOS/
-│   └── MyApp
+│   └── MyApp
 └── Frameworks/
     └── MyApp Helper.app
         ├── Info.plist
         └── MacOS/
-            └── MyApp Helper
+            └── MyApp Helper
 ```
 
-:::note
+#### Windows
 
-it is also possible to rebrand Electron by changing the product name and
+You can rename `electron.exe` to any name you like, and edit its icon and other
+information with tools like [rcedit](https://github.com/electron/rcedit).
+
+#### Linux
+
+You can rename the `electron` executable to any name you like.
+
+### Rebranding by rebuilding Electron from source
+
+It is also possible to rebrand Electron by changing the product name and
 building it from source. To do this you need to set the build argument
 corresponding to the product name (`electron_product_name = "YourProductName"`)
 in the `args.gn` file and rebuild.
 
-Keep in mind this is not recommended as setting up the environment to compile
-from source is not trivial and takes significant time.
-
-:::
-
 [asar]: https://github.com/electron/asar

docs/tutorial/code-signing.md

@@ -1,20 +1,14 @@
----
-title: 'Code Signing'
-description: 'Code signing is a security technology that you use to certify that an app was created by you.'
-slug: code-signing
-hide_title: false
----
+# Code Signing
 
 Code signing is a security technology that you use to certify that an app was
-created by you. You should sign your application so it does not trigger any
-operating system security checks.
+created by you.
 
-On macOS, the system can detect any change to the app, whether the change is
+On macOS the system can detect any change to the app, whether the change is
 introduced accidentally or by malicious code.
 
 On Windows, the system assigns a trust level to your code signing certificate
 which if you don't have, or if your trust level is low, will cause security
-dialogs to appear when users start using your application. Trust level builds
+dialogs to appear when users start using your application.  Trust level builds
 over time so it's better to start code signing as early as possible.
 
 While it is possible to distribute unsigned apps, it is not recommended. Both
@@ -22,19 +16,20 @@ Windows and macOS will, by default, prevent either the download or the execution
 of unsigned applications. Starting with macOS Catalina (version 10.15), users
 have to go through multiple manual steps to open unsigned applications.
 
-![macOS Catalina Gatekeeper warning: The app cannot be opened because the developer cannot be verified](../images/gatekeeper.png)
+![macOS Catalina Gatekeeper warning: The app cannot be opened because the
+developer cannot be verified](../images/gatekeeper.png)
 
 As you can see, users get two options: Move the app straight to the trash or
 cancel running it. You don't want your users to see that dialog.
 
 If you are building an Electron app that you intend to package and distribute,
-it should be code signed.
+it should be code-signed.
 
-## Signing & notarizing macOS builds
+# Signing & notarizing macOS builds
 
-Properly preparing macOS applications for release requires two steps. First, the
-app needs to be code signed. Then, the app needs to be uploaded to Apple for a
-process called **notarization**, where automated systems will further verify that
+Properly preparing macOS applications for release requires two steps: First, the
+app needs to be code-signed. Then, the app needs to be uploaded to Apple for a
+process called "notarization", where automated systems will further verify that
 your app isn't doing anything to endanger its users.
 
 To start the process, ensure that you fulfill the requirements for signing and
@@ -47,18 +42,18 @@ notarizing your app:
 Electron's ecosystem favors configuration and freedom, so there are multiple
 ways to get your application signed and notarized.
 
-### Using Electron Forge
+## `electron-forge`
 
 If you're using Electron's favorite build tool, getting your application signed
 and notarized requires a few additions to your configuration. [Forge](https://electronforge.io) is a
 collection of the official Electron tools, using [`electron-packager`],
 [`electron-osx-sign`], and [`electron-notarize`] under the hood.
 
-Let's take a look at an example `package.json` configuration with all required fields. Not all of them are
-required: the tools will be clever enough to automatically find a suitable `identity`, for instance,
-but we recommend that you are explicit.
+Let's take a look at an example configuration with all required fields. Not all
+of them are required: the tools will be clever enough to automatically find a
+suitable `identity`, for instance, but we recommend that you are explicit.
 
-```json title="package.json" {7}
+```json
 {
   "name": "my-app",
   "version": "0.0.1",
@@ -74,7 +69,7 @@ but we recommend that you are explicit.
         },
         "osxNotarize": {
           "appleId": "felix@felix.fun",
-          "appleIdPassword": "my-apple-id-password"
+          "appleIdPassword": "my-apple-id-password",
         }
       }
     }
@@ -82,11 +77,11 @@ but we recommend that you are explicit.
 }
 ```
 
-The `entitlements.plist` file referenced here needs the following macOS-specific entitlements
+The `plist` file referenced here needs the following macOS-specific entitlements
 to assure the Apple security mechanisms that your app is doing these things
 without meaning any harm:
 
-```xml title="entitlements.plist"
+```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -109,7 +104,7 @@ file](https://github.com/electron/fiddle/blob/master/forge.config.js).
 If you plan to access the microphone or camera within your app using Electron's APIs, you'll also
 need to add the following entitlements:
 
-```xml title="entitlements.plist"
+```xml
 <key>com.apple.security.device.audio-input</key>
 <true/>
 <key>com.apple.security.device.camera</key>
@@ -118,26 +113,28 @@ need to add the following entitlements:
 
 If these are not present in your app's entitlements when you invoke, for example:
 
-```js title="main.js"
+```js
 const { systemPreferences } = require('electron')
+
 const microphone = systemPreferences.askForMediaAccess('microphone')
 ```
 
 Your app may crash. See the Resource Access section in [Hardened Runtime](https://developer.apple.com/documentation/security/hardened_runtime) for more information and entitlements you may need.
 
-### Using Electron Builder
+## `electron-builder`
 
 Electron Builder comes with a custom solution for signing your application. You
 can find [its documentation here](https://www.electron.build/code-signing).
 
-### Using Electron Packager
+## `electron-packager`
 
 If you're not using an integrated build pipeline like Forge or Builder, you
 are likely using [`electron-packager`], which includes [`electron-osx-sign`] and
 [`electron-notarize`].
 
 If you're using Packager's API, you can pass [in configuration that both signs
-and notarizes your application](https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html).
+and notarizes your
+application](https://electron.github.io/electron-packager/main/interfaces/electronpackager.options.html).
 
 ```js
 const packager = require('electron-packager')
@@ -158,11 +155,11 @@ packager({
 })
 ```
 
-The `entitlements.plist` file referenced here needs the following macOS-specific entitlements
+The `plist` file referenced here needs the following macOS-specific entitlements
 to assure the Apple security mechanisms that your app is doing these things
 without meaning any harm:
 
-```xml title="entitlements.plist"
+```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -178,11 +175,11 @@ without meaning any harm:
 Up until Electron 12, the `com.apple.security.cs.allow-unsigned-executable-memory` entitlement was required
 as well. However, it should not be used anymore if it can be avoided.
 
-### Signing Mac App Store applications
+## Mac App Store
 
 See the [Mac App Store Guide].
 
-## Signing Windows builds
+# Signing Windows builds
 
 Before signing Windows builds, you must do the following:
 
@@ -193,140 +190,31 @@ Before signing Windows builds, you must do the following:
 You can get a code signing certificate from a lot of resellers. Prices vary, so
 it may be worth your time to shop around. Popular resellers include:
 
-- [digicert](https://www.digicert.com/code-signing/microsoft-authenticode.htm)
-- [Sectigo](https://sectigo.com/ssl-certificates-tls/code-signing)
-- Amongst others, please shop around to find one that suits your needs! 😄
+* [digicert](https://www.digicert.com/code-signing/microsoft-authenticode.htm)
+* [Sectigo](https://sectigo.com/ssl-certificates-tls/code-signing)
+* Amongst others, please shop around to find one that suits your needs, Google
+  is your friend 😄
 
-:::caution Keep your certificate password private
-Your certificate password should be a **secret**. Do not share it publicly or
-commit it to your source code.
-:::
+There are a number of tools for signing your packaged app:
 
-### Using Electron Forge
+* [`electron-winstaller`] will generate an installer for windows and sign it for
+  you
+* [`electron-forge`] can sign installers it generates through the
+  Squirrel.Windows or MSI targets.
+* [`electron-builder`] can sign some of its windows targets
 
-Once you have a code signing certificate file (`.pfx`), you can sign
-[Squirrel.Windows][maker-squirrel] and [MSI][maker-msi] installers in Electron Forge
-with the `certificateFile` and `certificatePassword` fields in their respective
-configuration objects.
-
-For example, if you keep your Forge config in your `package.json` file and are
-creating a Squirrel.Windows installer:
-
-```json {9-15} title='package.json'
-{
-  "name": "my-app",
-  "version": "0.0.1",
-  //...
-  "config": {
-    "forge": {
-      "packagerConfig": {},
-      "makers": [
-        {
-          "name": "@electron-forge/maker-squirrel",
-          "config": {
-            "certificateFile": "./cert.pfx",
-            "certificatePassword": "this-is-a-secret"
-          }
-        }
-      ]
-    }
-  }
-  //...
-}
-```
-
-### Using electron-winstaller (Squirrel.Windows)
-
-[`electron-winstaller`] is a package that can generate Squirrel.Windows installers for your
-Electron app. This is the tool used under the hood by Electron Forge's
-[Squirrel.Windows Maker][maker-squirrel]. If you're not using Electron Forge and want to use
-`electron-winstaller` directly, use the `certificateFile` and `certificatePassword` configuration
-options when creating your installer.
-
-```js {10-11}
-const electronInstaller = require('electron-winstaller')
-// NB: Use this syntax within an async function, Node does not have support for
-//     top-level await as of Node 12.
-try {
-  await electronInstaller.createWindowsInstaller({
-    appDirectory: '/tmp/build/my-app-64',
-    outputDirectory: '/tmp/build/installer64',
-    authors: 'My App Inc.',
-    exe: 'myapp.exe',
-    certificateFile: './cert.pfx',
-    certificatePassword: 'this-is-a-secret',
-  })
-  console.log('It worked!')
-} catch (e) {
-  console.log(`No dice: ${e.message}`)
-}
-```
-
-For full configuration options, check out the [`electron-winstaller`] repository!
-
-### Using electron-wix-msi (WiX MSI)
-
-[`electron-wix-msi`] is a package that can generate MSI installers for your
-Electron app. This is the tool used under the hood by Electron Forge's [MSI Maker][maker-msi].
-
-If you're not using Electron Forge and want to use `electron-wix-msi` directly, use the
-`certificateFile` and `certificatePassword` configuration options
-or pass in parameters directly to [SignTool.exe] with the `signWithParams` option.
-
-```js {12-13}
-import { MSICreator } from 'electron-wix-msi'
-
-// Step 1: Instantiate the MSICreator
-const msiCreator = new MSICreator({
-  appDirectory: '/path/to/built/app',
-  description: 'My amazing Kitten simulator',
-  exe: 'kittens',
-  name: 'Kittens',
-  manufacturer: 'Kitten Technologies',
-  version: '1.1.2',
-  outputDirectory: '/path/to/output/folder',
-  certificateFile: './cert.pfx',
-  certificatePassword: 'this-is-a-secret',
-})
-
-// Step 2: Create a .wxs template file
-const supportBinaries = await msiCreator.create()
-
-// 🆕 Step 2a: optionally sign support binaries if you
-// sign you binaries as part of of your packaging script
-supportBinaries.forEach(async (binary) => {
-  // Binaries are the new stub executable and optionally
-  // the Squirrel auto updater.
-  await signFile(binary)
-})
-
-// Step 3: Compile the template to a .msi file
-await msiCreator.compile()
-```
-
-For full configuration options, check out the [`electron-wix-msi`] repository!
-
-### Using Electron Builder
-
-Electron Builder comes with a custom solution for signing your application. You
-can find [its documentation here](https://www.electron.build/code-signing).
-
-### Signing Windows Store applications
+## Windows Store
 
 See the [Windows Store Guide].
 
-[apple developer program]: https://developer.apple.com/programs/
+[Apple Developer Program]: https://developer.apple.com/programs/
 [`electron-builder`]: https://github.com/electron-userland/electron-builder
 [`electron-forge`]: https://github.com/electron-userland/electron-forge
 [`electron-osx-sign`]: https://github.com/electron-userland/electron-osx-sign
 [`electron-packager`]: https://github.com/electron/electron-packager
 [`electron-notarize`]: https://github.com/electron/electron-notarize
 [`electron-winstaller`]: https://github.com/electron/windows-installer
-[`electron-wix-msi`]: https://github.com/felixrieseberg/electron-wix-msi
-[xcode]: https://developer.apple.com/xcode
+[Xcode]: https://developer.apple.com/xcode
 [signing certificates]: https://github.com/electron/electron-osx-sign/wiki/1.-Getting-Started#certificates
-[mac app store guide]: ./mac-app-store-submission-guide.md
-[windows store guide]: ./windows-store-guide.md
-[maker-squirrel]: https://www.electronforge.io/config/makers/squirrel.windows
-[maker-msi]: https://www.electronforge.io/config/makers/wix-msi
-[signtool.exe]: https://docs.microsoft.com/en-us/dotnet/framework/tools/signtool-exe
+[Mac App Store Guide]: mac-app-store-submission-guide.md
+[Windows Store Guide]: windows-store-guide.md

docs/tutorial/distribution-overview.md

@@ -1,54 +0,0 @@
----
-title: 'Distribution Overview'
-description: 'To distribute your app with Electron, you need to package and rebrand it. To do this, you can either use specialized tooling or manual approaches.'
-slug: distribution-overview
-hide_title: false
----
-
-Once your app is ready for production, there are a couple steps you need to take before
-you can deliver it to your users.
-
-## Packaging
-
-To distribute your app with Electron, you need to package all your resources and assets
-into an executable and rebrand it. To do this, you can either use specialized tooling
-or do it manually. See the [Application Packaging][application-packaging] tutorial
-for more information.
-
-## Code signing
-
-Code signing is a security technology that you use to certify that an app was
-created by you. You should sign your application so it does not trigger the
-security checks of your user's operating system.
-
-To get started with each operating system's code signing process, please read the
-[Code Signing][code-signing] docs.
-
-## Publishing
-
-Once your app is packaged and signed, you can freely distribute your app directly
-to users by uploading your installers online.
-
-To reach more users, you can also choose to upload your app to each operating system's
-digital distribution platform (i.e. app store). These require another build step aside
-from your direct download app. For more information, check out each individual app store guide:
-
-- [Mac App Store][mac-app]
-- [Windows Store][windows-store]
-- [Snapcraft (Linux)][snapcraft]
-
-## Updating
-
-Electron's auto-updater allows you to deliver application updates to users
-without forcing them to manually download new versions of your application.
-Check out the [Updating Applications][updates] guide for details on implementing automatic updates
-with Electron.
-
-<!-- Link labels -->
-
-[application-packaging]: ./application-distribution.md
-[code-signing]: ./code-signing.md
-[mac-app]: ./mac-app-store-submission-guide.md
-[windows-store]: ./windows-store-guide.md
-[snapcraft]: ./snapcraft.md
-[updates]: ./updates.md

docs/tutorial/electron-timelines.md

@@ -26,5 +26,4 @@ Special notes:
 | 14.0.0 | -- | 2021-May-27 | 2021-Aug-31 | M93 | v14.17 |
 | 15.0.0 | 2021-Jul-20 | 2021-Sep-01 | 2021-Sep-21 | M94 | v16.5 |
 | 16.0.0 | 2021-Sep-23 | 2021-Oct-20 | 2021-Nov-16 | M96 | v16.9 |
-| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | v16.13 |
-| 18.0.0 | 2022-Feb-03 | 2022-Mar-03 | 2022-Mar-29 | M100 | TBD |
+| 17.0.0 | 2021-Nov-18 | 2022-Jan-06 | 2022-Feb-01 | M98 | TBD |

docs/tutorial/examples.md

@@ -1,56 +0,0 @@
----
-title: 'Examples Overview'
-description: 'A set of examples for common Electron features'
-slug: examples
-hide_title: false
----
-
-# Examples Overview
-
-In this section, we have collected a set of guides for common features
-that you may want to implement in your Electron application. Each guide
-contains a practical example in a minimal, self-contained example app.
-The easiest way to run these examples is by downloading [Electron Fiddle][fiddle].
-
-Once Fiddle is installed, you can press on the "Open in Fiddle" button that you
-will find below code samples like the following one:
-
-```fiddle docs/fiddles/quick-start
-window.addEventListener('DOMContentLoaded', () => {
-  const replaceText = (selector, text) => {
-    const element = document.getElementById(selector)
-    if (element) element.innerText = text
-  }
-
-  for (const type of ['chrome', 'node', 'electron']) {
-    replaceText(`${type}-version`, process.versions[type])
-  }
-})
-```
-
-If there is still something that you do not know how to do, please take a look at the [API][app]
-as there is a chance it might be documented just there (and also open an issue requesting the
-guide!).
-
-<!-- guide-table-start -->
-
-| Guide                 | Description                                                                                                         |
-| :-------------------- | ------------------------------------------------------------------------------------------------------------------- |
-| [Message ports]       | This guide provides some examples of how you might use MessagePorts in your app to communicate different processes. |
-| [Device access]       | Learn how to access the device hardware (Bluetooth, USB, Serial).                                                   |
-| [Keyboard shortcuts]  | Configure local and global keyboard shortcuts for your Electron application.                                        |
-| [Multithreading]      | With Web Workers, it is possible to run JavaScript in OS-level threads                                              |
-| [Offscreen rendering] | Offscreen rendering lets you obtain the content of a BrowserWindow in a bitmap, so it can be rendered anywhere.     |
-| [Spellchecker]        | Learn how to use the built-in spellchecker, set languages, etc.                                                     |
-| [Web embeds]          | Discover the different ways to embed third-party web content in your application.                                   |
-
-<!-- guide-table-end -->
-
-## How to...?
-
-You can find the full list of "How to?" in the sidebar. If there is
-something that you would like to do that is not documented, please join
-our [Discord server][] and let us know!
-
-[discord server]: https://discord.com/invite/electron
-[fiddle]: https://www.electronjs.org/fiddle

docs/tutorial/in-app-purchases.md

@@ -1,11 +1,4 @@
----
-title: In-App Purchases
-description: Add in-app purchases to your Mac App Store (MAS) application
-slug: in-app-purchases
-hide_title: true
----
-
-# In-App Purchases
+# In-App Purchases (macOS)
 
 ## Preparing
 

docs/tutorial/installation.md

@@ -73,7 +73,7 @@ url = ELECTRON_MIRROR + ELECTRON_CUSTOM_DIR + '/' + ELECTRON_CUSTOM_FILENAME
 For instance, to use the China CDN mirror:
 
 ```shell
-ELECTRON_MIRROR="https://npmmirror.com/mirrors/electron/"
+ELECTRON_MIRROR="https://cdn.npm.taobao.org/dist/electron/"
 ```
 
 By default, `ELECTRON_CUSTOM_DIR` is set to `v$VERSION`. To change the format,
@@ -83,12 +83,12 @@ resolves to `version-5.0.0`, `{{ version }}` resolves to `5.0.0`, and
 use the China non-CDN mirror:
 
 ```shell
-ELECTRON_MIRROR="https://npmmirror.com/mirrors/electron/"
+ELECTRON_MIRROR="https://npm.taobao.org/mirrors/electron/"
 ELECTRON_CUSTOM_DIR="{{ version }}"
 ```
 
 The above configuration will download from URLs such as
-`https://npmmirror.com/mirrors/electron/8.0.0/electron-v8.0.0-linux-x64.zip`.
+`https://npm.taobao.org/mirrors/electron/8.0.0/electron-v8.0.0-linux-x64.zip`.
 
 If your mirror serves artifacts with different checksums to the official
 Electron release you may have to set `electron_use_remote_checksums=1` to

docs/tutorial/introduction.md

@@ -1,11 +1,10 @@
----
-title: 'Introduction'
-description: 'Welcome to the Electron documentation! If this is your first time developing an Electron app, read through this Getting Started section to get familiar with the basics. Otherwise, feel free to explore our guides and API documentation!'
-slug: /latest/
-hide_title: false
----
+# Introduction
 
-# What is Electron?
+Welcome to the Electron documentation! If this is your first time developing
+an Electron app, read through this Getting Started section to get familiar with the
+basics. Otherwise, feel free to explore our guides and API documentation!
+
+## What is Electron?
 
 Electron is a framework for building desktop applications using JavaScript,
 HTML, and CSS. By embedding [Chromium][chromium] and [Node.js][node] into its
@@ -13,12 +12,20 @@ binary, Electron allows you to maintain one JavaScript codebase and create
 cross-platform apps that work on Windows, macOS, and Linux — no native development
 experience required.
 
-## Getting started
+## Prerequisites
 
-We recommend you to start with the [tutorial], which guides you through the
-process of developing an Electron app and distributing it to users.
-The [examples] and [API documentation] are also good places to browse around
-and discover new things.
+These docs operate under the assumption that the reader is familiar with both
+Node.js and general web development. If you need to get more comfortable with
+either of these areas, we recommend the following resources:
+
+* [Getting started with the Web (MDN)][mdn-guide]
+* [Introduction to Node.js][node-guide]
+
+Moreover, you'll have a better time understanding how Electron works if you get
+acquainted with Chromium's process model. You can get a brief overview of
+Chrome architecture with the [Chrome comic][comic], which was released alongside
+Chrome's launch back in 2008. Although it's been over a decade since then, the
+core principles introduced in the comic remain helpful to understand Electron.
 
 ## Running examples with Electron Fiddle
 
@@ -32,44 +39,21 @@ a code block. If you have Fiddle installed, this button will open a
 `fiddle.electronjs.org` link that will automatically load the example into Fiddle,
 no copy-pasting required.
 
-```fiddle docs/fiddles/quick-start
-```
-
-## What is in the docs?
-
-All the official documentation is available from the sidebar. These
-are the different categories and what you can expect on each one:
-
-- **Tutorial**: An end-to-end guide on how to create and publish your first Electron
-  application.
-- **Processes in Electron**: In-depth reference on Electron processes and how to work with them.
-- **Best Practices**: Important checklists to keep in mind when developing an Electron app.
-- **How-To Examples**: Quick references to add features to your Electron app.
-- **Development**: Miscellaneous development guides.
-- **Distribution**: Learn how to distribute your app to end users.
-- **Testing and debugging**: How to debug JavaScript, write tests, and other tools used
-  to create quality Electron applications.
-- **Resources**: Useful links to better understand how the Electron project works
-  and is organized.
-- **Contributing to Electron**: Compiling Electron and making contributions can be daunting.
-  We try to make it easier in this section.
-
 ## Getting help
 
 Are you getting stuck anywhere? Here are a few links to places to look:
 
-- If you need help with developing your app, our [community Discord server][discord]
-  is a great place to get advice from other Electron app developers.
-- If you suspect you're running into a bug with the `electron` package, please check
-  the [GitHub issue tracker][issue-tracker] to see if any existing issues match your
-  problem. If not, feel free to fill out our bug report template and submit a new issue.
+* If you need help with developing your app, our [community Discord server][discord]
+is a great place to get advice from other Electron app developers.
+* If you suspect you're running into a bug with the `electron` package, please check
+the [GitHub issue tracker][issue-tracker] to see if any existing issues match your
+problem. If not, feel free to fill out our bug report template and submit a new issue.
 
-<!-- Links -->
-
-[api documentation]: ../api/app.md
 [chromium]: https://www.chromium.org/
-[discord]: https://discord.com/invite/APGC3k5yaH
-[examples]: examples.md
+[node]: https://nodejs.org/
+[mdn-guide]: https://developer.mozilla.org/en-US/docs/Learn/Getting_started_with_the_web
+[node-guide]: https://nodejs.dev/learn
+[comic]: https://www.google.com/googlebooks/chrome/
 [fiddle]: https://electronjs.org/fiddle
 [issue-tracker]: https://github.com/electron/electron/issues
-[node]: https://nodejs.org/
+[discord]: https://discord.gg/electronjs

docs/tutorial/ipc.md

@@ -1,571 +0,0 @@
----
-title: Inter-Process Communication
-description: Use the ipcMain and ipcRenderer modules to communicate between Electron processes
-slug: ipc
-hide_title: false
----
-
-# Inter-Process Communication
-
-Inter-process communication (IPC) is a key part of building feature-rich desktop applications
-in Electron. Because the main and renderer processes have different responsibilities in
-Electron's process model, IPC is the only way to perform many common tasks, such as calling a
-native API from your UI or triggering changes in your web contents from native menus.
-
-## IPC channels
-
-In Electron, processes communicate by passing messages through developer-defined "channels"
-with the [`ipcMain`] and [`ipcRenderer`] modules. These channels are
-**arbitrary** (you can name them anything you want) and **bidirectional** (you can use the
-same channel name for both modules).
-
-In this guide, we'll be going over some fundamental IPC patterns with concrete examples that
-you can use as a reference for your app code.
-
-## Understanding context-isolated processes
-
-Before proceeding to implementation details, you should be familiar with the idea of using a
-[preload script] to import Node.js and Electron modules in a context-isolated renderer process.
-
-* For a full overview of Electron's process model, you can read the [process model docs].
-* For a primer into exposing APIs from your preload script using the `contextBridge` module, check
-out the [context isolation tutorial].
-
-## Pattern 1: Renderer to main (one-way)
-
-To fire a one-way IPC message from a renderer process to the main process, you can use the
-[`ipcRenderer.send`] API to send a message that is then received by the [`ipcMain.on`] API.
-
-You usually use this pattern to call a main process API from your web contents. We'll demonstrate
-this pattern by creating a simple app that can programmatically change its window title.
-
-For this demo, you'll need to add code to your main process, your renderer process, and a preload
-script. The full code is below, but we'll be explaining each file individually in the following
-sections.
-
-```fiddle docs/fiddles/ipc/pattern-1
-```
-
-### 1. Listen for events with `ipcMain.on`
-
-In the main process, set an IPC listener on the `set-title` channel with the `ipcMain.on` API:
-
-```javascript {6-10,22} title='main.js (Main Process)'
-const {app, BrowserWindow, ipcMain} = require('electron')
-const path = require('path')
-
-//...
-
-function handleSetTitle (event, title) {
-  const webContents = event.sender
-  const win = BrowserWindow.fromWebContents(webContents)
-  win.setTitle(title)
-}
-
-function createWindow () {
-  const mainWindow = new BrowserWindow({
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-  mainWindow.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  ipcMain.on('set-title', handleSetTitle)
-  createWindow()
-}
-//...
-```
-
-The above `handleSetTitle` callback has two parameters: an [IpcMainEvent] structure and a
-`title` string. Whenever a message comes through the `set-title` channel, this function will
-find the BrowserWindow instance attached to the message sender and use the `win.setTitle`
-API on it.
-
-:::info
-Make sure you're loading the `index.html` and `preload.js` entry points for the following steps!
-:::
-
-### 2. Expose `ipcRenderer.send` via preload
-
-To send messages to the listener created above, you can use the `ipcRenderer.send` API.
-By default, the renderer process has no Node.js or Electron module access. As an app developer,
-you need to choose which APIs to expose from your preload script using the `contextBridge` API.
-
-In your preload script, add the following code, which will expose a global `window.electronAPI`
-variable to your renderer process.
-
-```javascript title='preload.js (Preload Script)'
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-    setTitle: (title) => ipcRenderer.send('set-title', title)
-})
-```
-
-At this point, you'll be able to use the `window.electronAPI.setTitle()` function in the renderer
-process.
-
-:::caution Security warning
-We don't directly expose the whole `ipcRenderer.send` API for [security reasons]. Make sure to
-limit the renderer's access to Electron APIs as much as possible.
-:::
-
-### 3. Build the renderer process UI
-
-In our BrowserWindow's loaded HTML file, add a basic user interface consisting of a text input
-and a button:
-
-```html {11-12} title='index.html'
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <title>Hello World!</title>
-  </head>
-  <body>
-    Title: <input id="title"/>
-    <button id="btn" type="button">Set</button>
-    <script src="./renderer.js"></script>
-  </body>
-</html>
-```
-
-To make these elements interactive, we'll be adding a few lines of code in the imported
-`renderer.js` file that leverages the `window.electronAPI` functionality exposed from the preload
-script:
-
-```javascript title='renderer.js (Renderer Process)'
-const setButton = document.getElementById('btn')
-const titleInput = document.getElementById('title')
-setButton.addEventListener('click', () => {
-    const title = titleInput.value
-    window.electronAPI.setTitle(title)
-});
-```
-
-At this point, your demo should be fully functional. Try using the input field and see what happens
-to your BrowserWindow title!
-
-## Pattern 2: Renderer to main (two-way)
-
-A common application for two-way IPC is calling a main process module from your renderer process
-code and waiting for a result. This can be done by using [`ipcRenderer.invoke`] paired with
-[`ipcMain.handle`].
-
-In the following example, we'll be opening a native file dialog from the renderer process and
-returning the selected file's path.
-
-For this demo, you'll need to add code to your main process, your renderer process, and a preload
-script. The full code is below, but we'll be explaining each file individually in the following
-sections.
-
-```fiddle docs/fiddles/ipc/pattern-2
-```
-
-### 1. Listen for events with `ipcMain.handle`
-
-In the main process, we'll be creating a `handleFileOpen()` function that calls
-`dialog.showOpenDialog` and returns the value of the file path selected by the user. This function
-is used as a callback whenever an `ipcRender.invoke` message is sent through the `dialog:openFile`
-channel from the renderer process. The return value is then returned as a Promise to the original
-`invoke` call.
-
-:::caution A word on error handling
-Errors thrown through `handle` in the main process are not transparent as they
-are serialized and only the `message` property from the original error is
-provided to the renderer process. Please refer to
-[#24427](https://github.com/electron/electron/issues/24427) for details.
-:::
-
-```javascript {6-13,25} title='main.js (Main Process)'
-const { BrowserWindow, dialog, ipcMain } = require('electron')
-const path = require('path')
-
-//...
-
-async function handleFileOpen() {
-  const { canceled, filePaths } = await dialog.showOpenDialog()
-  if (canceled) {
-    return
-  } else {
-    return filePaths[0]
-  }
-}
-
-function createWindow () {
-  const mainWindow = new BrowserWindow({
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-  mainWindow.loadFile('index.html')
-}
-
-app.whenReady(() => {
-  ipcMain.handle('dialog:openFile', handleFileOpen)
-  createWindow()
-})
-//...
-```
-
-:::tip on channel names
-The `dialog:` prefix on the IPC channel name has no effect on the code. It only serves
-as a namespace that helps with code readability.
-:::
-
-:::info
-Make sure you're loading the `index.html` and `preload.js` entry points for the following steps!
-:::
-
-### 2. Expose `ipcRenderer.invoke` via preload
-
-In the preload script, we expose a one-line `openFile` function that calls and returns the value of
-`ipcRenderer.invoke('dialog:openFile')`. We'll be using this API in the next step to call the
-native dialog from our renderer's user interface.
-
-```javascript title='preload.js (Preload Script)'
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-  openFile: () => ipcRenderer.invoke('dialog:openFile')
-})
-```
-
-:::caution Security warning
-We don't directly expose the whole `ipcRenderer.invoke` API for [security reasons]. Make sure to
-limit the renderer's access to Electron APIs as much as possible.
-:::
-
-### 3. Build the renderer process UI
-
-Finally, let's build the HTML file that we load into our BrowserWindow.
-
-```html {10-11} title='index.html'
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <title>Dialog</title>
-  </head>
-  <body>
-    <button type="button" id="btn">Open a File</button>
-    File path: <strong id="filePath"></strong>
-    <script src='./renderer.js'></script>
-  </body>
-</html>
-```
-
-The UI consists of a single `#btn` button element that will be used to trigger our preload API, and
-a `#filePath` element that will be used to display the path of the selected file. Making these
-pieces work will take a few lines of code in the renderer process script:
-
-```javascript title='renderer.js (Renderer Process)'
-const btn = document.getElementById('btn')
-const filePathElement = document.getElementById('filePath')
-
-btn.addEventListener('click', async () => {
-  const filePath = await window.electronAPI.openFile()
-  filePathElement.innerText = filePath
-})
-```
-
-In the above snippet, we listen for clicks on the `#btn` button, and call our
-`window.electronAPI.openFile()` API to activate the native Open File dialog. We then display the
-selected file path in the `#filePath` element.
-
-### Note: legacy approaches
-
-The `ipcRenderer.invoke` API was added in Electron 7 as a developer-friendly way to tackle two-way
-IPC from the renderer process. However, there exist a couple alternative approaches to this IPC
-pattern.
-
-:::warning Avoid legacy approaches if possible
-We recommend using `ipcRenderer.invoke` whenever possible. The following two-way renderer-to-main
-patterns are documented for historical purposes.
-:::
-
-:::info
-For the following examples, we're calling `ipcRenderer` directly from the preload script to keep
-the code samples small.
-:::
-
-#### Using `ipcRenderer.send`
-
-The `ipcRenderer.send` API that we used for single-way communication can also be leveraged to
-perform two-way communication. This was the recommended way for asynchronous two-way communication
-via IPC prior to Electron 7.
-
-```javascript title='preload.js (Preload Script)'
-// You can also put expose this code to the renderer
-// process with the `contextBridge` API
-const { ipcRenderer } = require('electron')
-
-ipcRenderer.on('asynchronous-reply', (_event, arg) => {
-  console.log(arg) // prints "pong" in the DevTools console
-})
-ipcRenderer.send('asynchronous-message', 'ping')
-```
-
-```javascript title='main.js (Main Process)'
-ipcMain.on('asynchronous-message', (event, arg) => {
-  console.log(arg) // prints "ping" in the Node console
-  // works like `send`, but returning a message back
-  // to the renderer that sent the original message
-  event.reply('asynchronous-reply', 'pong')
-})
-```
-
-There are a couple downsides to this approach:
-
-* You need to set up a second `ipcRenderer.on` listener to handle the response in the renderer
-process. With `invoke`, you get the response value returned as a Promise to the original API call.
-* There's no obvious way to pair the `asynchronous-reply` message to the original
-`asynchronous-message` one. If you have very frequent messages going back and forth through these
-channels, you would need to add additional app code to track each call and response individually.
-
-#### Using `ipcRenderer.sendSync`
-
-The `ipcRenderer.sendSync` API sends a message to the main process and waits _synchronously_ for a
-response.
-
-```javascript title='main.js (Main Process)'
-const { ipcMain } = require('electron')
-ipcMain.on('synchronous-message', (event, arg) => {
-  console.log(arg) // prints "ping" in the Node console
-  event.returnValue = 'pong'
-})
-```
-
-```javascript title='preload.js (Preload Script)'
-// You can also put expose this code to the renderer
-// process with the `contextBridge` API
-const { ipcRenderer } = require('electron')
-
-const result = ipcRenderer.sendSync('synchronous-message', 'ping')
-console.log(result) // prints "pong" in the DevTools console
-```
-
-The structure of this code is very similar to the `invoke` model, but we recommend
-**avoiding this API** for performance reasons. Its synchronous nature means that it'll block the
-renderer process until a reply is received.
-
-## Pattern 3: Main to renderer
-
-When sending a message from the main process to a renderer process, you need to specify which
-renderer is receiving the message. Messages need to be sent to a renderer process
-via its [`WebContents`] instance. This WebContents instance contains a [`send`][webcontents-send] method
-that can be used in the same way as `ipcRenderer.send`.
-
-To demonstrate this pattern, we'll be building a number counter controlled by the native operating
-system menu.
-
-For this demo, you'll need to add code to your main process, your renderer process, and a preload
-script. The full code is below, but we'll be explaining each file individually in the following
-sections.
-
-```fiddle docs/fiddles/ipc/pattern-3
-```
-
-### 1. Send messages with the `webContents` module
-
-For this demo, we'll need to first build a custom menu in the main process using Electron's `Menu`
-module that uses the `webContents.send` API to send an IPC message from the main process to the
-target renderer.
-
-```javascript {11-26} title='main.js (Main Process)'
-const {app, BrowserWindow, Menu, ipcMain} = require('electron')
-const path = require('path')
-
-function createWindow () {
-  const mainWindow = new BrowserWindow({
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js')
-    }
-  })
-
-  const menu = Menu.buildFromTemplate([
-    {
-      label: app.name,
-      submenu: [
-        {
-          click: () => mainWindow.webContents.send('update-counter', 1),
-          label: 'Increment',
-        },
-        {
-          click: () => mainWindow.webContents.send('update-counter', -1),
-          label: 'Decrement',
-        }
-      ]
-    }
-  ])
-  Menu.setApplicationMenu(menu)
-
-  mainWindow.loadFile('index.html')
-}
-//...
-
-```
-
-For the purposes of the tutorial, it's important to note that the `click` handler
-sends a message (either `1` or `-1`) to the renderer process through the `update-counter` channel.
-
-```javascript
-click: () => mainWindow.webContents.send('update-counter', -1)
-```
-
-:::info
-Make sure you're loading the `index.html` and `preload.js` entry points for the following steps!
-:::
-
-### 2. Expose `ipcRenderer.on` via preload
-
-Like in the previous renderer-to-main example, we use the `contextBridge` and `ipcRenderer`
-modules in the preload script to expose IPC functionality to the renderer process:
-
-```javascript title='preload.js (Preload Script)'
-const { contextBridge, ipcRenderer } = require('electron')
-
-contextBridge.exposeInMainWorld('electronAPI', {
-    onUpdateCounter: (callback) => ipcRenderer.on('update-counter', callback)
-})
-```
-
-After loading the preload script, your renderer process should have access to the
-`window.electronAPI.onUpdateCounter()` listener function.
-
-:::caution Security warning
-We don't directly expose the whole `ipcRenderer.on` API for [security reasons]. Make sure to
-limit the renderer's access to Electron APIs as much as possible.
-:::
-
-:::info
-In the case of this minimal example, you can call `ipcRenderer.on` directly in the preload script
-rather than exposing it over the context bridge.
-
-```javascript title='preload.js (Preload Script)'
-const { ipcRenderer } = require('electron')
-
-window.addEventListener('DOMContentLoaded', () => {
-    const counter = document.getElementById('counter')
-    ipcRenderer.on('update-counter', (_event, value) => {
-        const oldValue = Number(counter.innerText)
-        const newValue = oldValue + value
-        counter.innerText = newValue
-    })
-})
-```
-
-However, this approach has limited flexibility compared to exposing your preload APIs
-over the context bridge, since your listener can't directly interact with your renderer code.
-:::
-
-### 3. Build the renderer process UI
-
-To tie it all together, we'll create an interface in the loaded HTML file that contains a
-`#counter` element that we'll use to display the values:
-
-```html {10} title='index.html'
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="UTF-8">
-    <!-- https://developer.mozilla.org/en-US/docs/Web/HTTP/CSP -->
-    <meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self'">
-    <title>Menu Counter</title>
-  </head>
-  <body>
-    Current value: <strong id="counter">0</strong>
-    <script src="./renderer.js"></script>
-  </body>
-</html>
-```
-
-Finally, to make the values update in the HTML document, we'll add a few lines of DOM manipulation
-so that the value of the `#counter` element is updated whenever we fire an `update-counter` event.
-
-```javascript title='renderer.js (Renderer Process)'
-const counter = document.getElementById('counter')
-
-window.electronAPI.onUpdateCounter((_event, value) => {
-    const oldValue = Number(counter.innerText)
-    const newValue = oldValue + value
-    counter.innerText = newValue
-})
-```
-
-In the above code, we're passing in a callback to the `window.electronAPI.onUpdateCounter` function
-exposed from our preload script. The second `value` parameter corresponds to the `1` or `-1` we
-were passing in from the `webContents.send` call from the native menu.
-
-### Optional: returning a reply
-
-There's no equivalent for `ipcRenderer.invoke` for main-to-renderer IPC. Instead, you can
-send a reply back to the main process from within the `ipcRenderer.on` callback.
-
-We can demonstrate this with slight modifications to the code from the previous example. In the
-renderer process, use the `event` parameter to send a reply back to the main process through the
-`counter-value` channel.
-
-```javascript title='renderer.js (Renderer Process)'
-const counter = document.getElementById('counter')
-
-window.electronAPI.onUpdateCounter((event, value) => {
-  const oldValue = Number(counter.innerText)
-  const newValue = oldValue + value
-  counter.innerText = newValue
-  event.sender.send('counter-value', newValue)
-})
-```
-
-In the main process, listen for `counter-value` events and handle them appropriately.
-
-```javascript title='main.js (Main Process)'
-//...
-ipcMain.on('counter-value', (_event, value) => {
-  console.log(value) // will print value to Node console
-})
-//...
-```
-
-## Pattern 4: Renderer to renderer
-
-There's no direct way to send messages between renderer processes in Electron using the `ipcMain`
-and `ipcRenderer` modules. To achieve this, you have two options:
-
-* Use the main process as a message broker between renderers. This would involve sending a message
-from one renderer to the main process, which would forward the message to the other renderer.
-* Pass a [MessagePort] from the main process to both renderers. This will allow direct communication
-between renderers after the initial setup.
-
-## Object serialization
-
-Electron's IPC implementation uses the HTML standard
-[Structured Clone Algorithm][sca] to serialize objects passed between processes, meaning that
-only certain types of objects can be passed through IPC channels.
-
-In particular, DOM objects (e.g. `Element`, `Location` and `DOMMatrix`), Node.js objects
-backed by C++ classes (e.g. `process.env`, some members of `Stream`), and Electron objects
-backed by C++ classes (e.g. `WebContents`, `BrowserWindow` and `WebFrame`) are not serializable
-with Structured Clone.
-
-[context isolation tutorial]: context-isolation.md
-[security reasons]: ./context-isolation.md#security-considerations
-[`ipcMain`]: ../api/ipc-main.md
-[`ipcMain.handle`]: ../api/ipc-main.md#ipcmainhandlechannel-listener
-[`ipcMain.on`]: ../api/ipc-main.md
-[IpcMainEvent]: ../api/structures/ipc-main-event.md
-[`ipcRenderer`]: ../api/ipc-renderer.md
-[`ipcRenderer.invoke`]: ../api/ipc-renderer.md#ipcrendererinvokechannel-args
-[`ipcRenderer.send`]: ../api/ipc-renderer.md
-[MessagePort]: ./message-ports.md
-[preload script]: process-model.md#preload-scripts
-[process model docs]: process-model.md
-[sca]: https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
-[`WebContents`]: ../api/web-contents.md
-[webcontents-send]: ../api/web-contents.md#contentssendchannel-args

docs/tutorial/launch-app-from-url-in-another-app.md

@@ -1,11 +1,11 @@
 ---
-title: Deep Links
-description: Set your Electron app as the default handler for a specific protocol.
+title: Launching Your Electron App From a URL In Another App
+description: This guide will take you through the process of setting your electron app as the default handler for a specific protocol.
 slug: launch-app-from-url-in-another-app
 hide_title: true
 ---
 
-# Deep Links
+# Launching Your Electron App From A URL In Another App
 
 ## Overview
 

docs/tutorial/linux-desktop-actions.md

@@ -1,11 +1,4 @@
----
-title: Desktop Launcher Actions
-description: Add actions to the system launcher on Linux environments.
-slug: linux-desktop-actions
-hide_title: true
----
-
-# Desktop Launcher Actions
+# Desktop Launcher Actions (Linux)
 
 ## Overview
 
@@ -49,4 +42,4 @@ parameters. You can find them in your application in the global variable
 
 [unity-launcher]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles#Adding_shortcuts_to_a_launcher
 [audacious-launcher]: https://help.ubuntu.com/community/UnityLaunchersAndDesktopFiles?action=AttachFile&do=get&target=shortcuts.png
-[spec]: https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html
+[spec]: https://specifications.freedesktop.org/desktop-entry-spec/1.1/ar01s11.html

docs/tutorial/macos-dock.md

@@ -1,11 +1,4 @@
----
-title: Dock
-description: Configure your application's Dock presence on macOS.
-slug: macos-dock
-hide_title: true
----
-
-# Dock
+# Dock (macOS)
 
 Electron has APIs to configure the app's icon in the macOS Dock. A macOS-only
 API exists to create a custom dock menu, but Electron also uses the app dock
@@ -23,6 +16,12 @@ To set your custom dock menu, you need to use the
 [`app.dock.setMenu`](../api/dock.md#docksetmenumenu-macos) API,
 which is only available on macOS.
 
+## Example
+
+Starting with a working application from the
+ [Quick Start Guide](quick-start.md), update the `main.js` file with the
+ following lines:
+
 ```javascript fiddle='docs/fiddles/features/macos-dock-menu'
 const { app, BrowserWindow, Menu } = require('electron')