Bump v10.4.7

* Backports of security fixes in Chromium release M90-3
https://chromereleases.googleblog.com/2021/05/stable-channel-update-for-desktop.html

Includes backports for the following Chromium issues:
https://crbug.com/1204071
https://crbug.com/1203590 (CVE-2021-30518)
https://crbug.com/1201446 (CVE-2021-30516)
https://crbug.com/1201073 (CVE-2021-30515)
https://crbug.com/1200490 (CVE-2021-30513)
https://crbug.com/1200019 (CVE-2021-30512)
https://crbug.com/1197436 (CVE-2021-30510)
https://crbug.com/1195340 (CVE-2021-30508)
https://crbug.com/1180126
https://crbug.com/1203667

* chore: update patches

Co-authored-by: Andrey Belenko <anbelen@microsoft.com>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>

.env.example

@@ -4,4 +4,3 @@
 APPVEYOR_CLOUD_TOKEN=
 CIRCLE_TOKEN=
 ELECTRON_GITHUB_TOKEN=
-VSTS_TOKEN=

.eslintrc.json

@@ -28,7 +28,6 @@
   },
   "globals": {
     "standardScheme": "readonly",
-    "globalThis": "readonly",
     "BUILDFLAG": "readonly",
     "ENABLE_DESKTOP_CAPTURER": "readonly",
     "ENABLE_REMOTE_MODULE": "readonly",

.github/PULL_REQUEST_TEMPLATE.md

@@ -15,7 +15,6 @@ Contributors guide: https://github.com/electron/electron/blob/master/CONTRIBUTIN
 - [ ] relevant documentation is changed or added
 - [ ] PR title follows semantic [commit guidelines](https://github.com/electron/electron/blob/master/docs/development/pull-requests.md#commit-message-guidelines)
 - [ ] [PR release notes](https://github.com/electron/clerk/blob/master/README.md) describe the change in a way relevant to app developers, and are [capitalized, punctuated, and past tense](https://github.com/electron/clerk/blob/master/README.md#examples).
-- [ ] This is **NOT A BREAKING CHANGE**. Breaking changes may not be merged to master until 11-x-y is branched.
 
 #### Release Notes
 

BUILD.gn

@@ -49,10 +49,6 @@ if (is_linux) {
   }
 }
 
-declare_args() {
-  use_prebuilt_v8_context_snapshot = false
-}
-
 branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
@@ -98,15 +94,6 @@ npm_action("build_electron_definitions") {
   outputs = [ "$target_gen_dir/tsc/typings/electron.d.ts" ]
 }
 
-webpack_build("electron_asar_bundle") {
-  deps = [ ":build_electron_definitions" ]
-
-  inputs = auto_filenames.asar_bundle_deps
-
-  config_file = "//electron/build/webpack/webpack.config.asar.js"
-  out_file = "$target_gen_dir/js2c/asar_bundle.js"
-}
-
 webpack_build("electron_browser_bundle") {
   deps = [ ":build_electron_definitions" ]
 
@@ -152,18 +139,25 @@ webpack_build("electron_isolated_renderer_bundle") {
   out_file = "$target_gen_dir/js2c/isolated_bundle.js"
 }
 
+copy("electron_js2c_copy") {
+  sources = [
+    "lib/common/asar.js",
+    "lib/common/asar_init.js",
+  ]
+  outputs = [ "$target_gen_dir/js2c/{{source_file_part}}" ]
+}
+
 action("electron_js2c") {
   deps = [
-    ":electron_asar_bundle",
     ":electron_browser_bundle",
     ":electron_isolated_renderer_bundle",
+    ":electron_js2c_copy",
     ":electron_renderer_bundle",
     ":electron_sandboxed_renderer_bundle",
     ":electron_worker_bundle",
   ]
 
-  sources = [
-    "$target_gen_dir/js2c/asar_bundle.js",
+  webpack_sources = [
     "$target_gen_dir/js2c/browser_init.js",
     "$target_gen_dir/js2c/isolated_bundle.js",
     "$target_gen_dir/js2c/renderer_init.js",
@@ -171,10 +165,15 @@ action("electron_js2c") {
     "$target_gen_dir/js2c/worker_init.js",
   ]
 
+  sources = webpack_sources + [
+              "$target_gen_dir/js2c/asar.js",
+              "$target_gen_dir/js2c/asar_init.js",
+            ]
+
   inputs = sources + [ "//third_party/electron_node/tools/js2c.py" ]
   outputs = [ "$root_gen_dir/electron_natives.cc" ]
 
-  script = "build/js2c.py"
+  script = "tools/js2c.py"
   args = [ rebase_path("//third_party/electron_node") ] +
          rebase_path(outputs, root_build_dir) +
          rebase_path(sources, root_build_dir)
@@ -325,6 +324,7 @@ source_set("electron_lib") {
     "//base/allocator:buildflags",
     "//chrome/app:command_ids",
     "//chrome/app/resources:platform_locale_settings",
+    "//chrome/services/printing/public/mojom",
     "//components/certificate_transparency",
     "//components/language/core/browser",
     "//components/net_log",
@@ -347,7 +347,6 @@ source_set("electron_lib") {
     "//device/bluetooth",
     "//device/bluetooth/public/cpp",
     "//gin",
-    "//media/blink:blink",
     "//media/capture/mojom:video_capture",
     "//media/mojo/mojom",
     "//net:extras",
@@ -405,26 +404,44 @@ source_set("electron_lib") {
     defines += [ "GDK_DISABLE_DEPRECATION_WARNINGS" ]
   }
 
+  extra_source_filters = []
+  if (!is_linux) {
+    extra_source_filters += [
+      "*\bx/*",
+      "*_x11.h",
+      "*_x11.cc",
+      "*_gtk.h",
+      "*_gtk.cc",
+      "*\blibrary_loaders/*",
+    ]
+  }
+  if (!is_win) {
+    extra_source_filters += [
+      "*\bwin_*.h",
+      "*\bwin_*.cc",
+    ]
+  }
+  if (!is_posix) {
+    extra_source_filters += [
+      "*_posix.cc",
+      "*_posix.h",
+    ]
+  }
+  if (is_mac) {
+    extra_source_filters += [
+      "*_views.cc",
+      "*_views.h",
+      "*\bviews/*",
+    ]
+  }
   if (!is_mas_build) {
     deps += [ "//components/crash/core/app" ]
   }
 
+  set_sources_assignment_filter(
+      sources_assignment_filter + extra_source_filters)
   sources = filenames.lib_sources
-  if (is_win) {
-    sources += filenames.lib_sources_win
-  }
-  if (is_mac) {
-    sources += filenames.lib_sources_mac
-  }
-  if (is_posix) {
-    sources += filenames.lib_sources_posix
-  }
-  if (is_linux) {
-    sources += filenames.lib_sources_linux
-  }
-  if (!is_mac) {
-    sources += filenames.lib_sources_views
-  }
+  set_sources_assignment_filter(sources_assignment_filter)
 
   if (is_component_build) {
     defines += [ "NODE_SHARED_MODE" ]
@@ -452,7 +469,7 @@ source_set("electron_lib") {
       deps += [ "//third_party/crashpad/crashpad/client" ]
     }
 
-    frameworks = [
+    libs = [
       "AVFoundation.framework",
       "Carbon.framework",
       "LocalAuthentication.framework",
@@ -479,19 +496,18 @@ source_set("electron_lib") {
         "shell/common/crash_keys.h",
       ]
     } else {
-      frameworks += [
+      libs += [
         "Squirrel.framework",
-        "ReactiveObjC.framework",
+        "ReactiveCocoa.framework",
         "Mantle.framework",
       ]
-
-      deps += [
-        "//third_party/squirrel.mac:reactiveobjc_framework+link",
-        "//third_party/squirrel.mac:squirrel_framework+link",
+      cflags_objcc = [
+        "-F",
+        rebase_path("external_binaries", root_build_dir),
       ]
 
-      # ReactiveObjC which is used by Squirrel requires using __weak.
-      cflags_objcc = [ "-fobjc-weak" ]
+      # ReactiveCocoa which is used by Squirrel requires using __weak.
+      cflags_objcc += [ "-fobjc-weak" ]
     }
   }
   if (is_linux) {
@@ -513,9 +529,7 @@ source_set("electron_lib") {
       ]
     }
     configs += [ ":gio_unix" ]
-    if (use_x11) {
-      deps += [ "//ui/gfx/x" ]
-    }
+    configs += [ "//build/config/linux:x11" ]
     defines += [
       # Disable warnings for g_settings_list_schemas.
       "GLIB_DISABLE_DEPRECATION_WARNINGS",
@@ -571,6 +585,7 @@ source_set("electron_lib") {
     sources += [
       "shell/browser/osr/osr_host_display_client.cc",
       "shell/browser/osr/osr_host_display_client.h",
+      "shell/browser/osr/osr_host_display_client_mac.mm",
       "shell/browser/osr/osr_render_widget_host_view.cc",
       "shell/browser/osr/osr_render_widget_host_view.h",
       "shell/browser/osr/osr_video_consumer.cc",
@@ -579,13 +594,8 @@ source_set("electron_lib") {
       "shell/browser/osr/osr_view_proxy.h",
       "shell/browser/osr/osr_web_contents_view.cc",
       "shell/browser/osr/osr_web_contents_view.h",
+      "shell/browser/osr/osr_web_contents_view_mac.mm",
     ]
-    if (is_mac) {
-      sources += [
-        "shell/browser/osr/osr_host_display_client_mac.mm",
-        "shell/browser/osr/osr_web_contents_view_mac.mm",
-      ]
-    }
     deps += [
       "//components/viz/service",
       "//services/viz/public/mojom",
@@ -593,6 +603,15 @@ source_set("electron_lib") {
     ]
   }
 
+  if (enable_remote_module) {
+    sources += [
+      "shell/common/api/remote/remote_callback_freer.cc",
+      "shell/common/api/remote/remote_callback_freer.h",
+      "shell/common/api/remote/remote_object_freer.cc",
+      "shell/common/api/remote/remote_object_freer.h",
+    ]
+  }
+
   if (enable_desktop_capturer) {
     if (is_component_build && !is_linux) {
       # On windows the implementation relies on unexported
@@ -620,10 +639,7 @@ source_set("electron_lib") {
       "shell/renderer/printing/print_render_frame_helper_delegate.cc",
       "shell/renderer/printing/print_render_frame_helper_delegate.h",
     ]
-    deps += [
-      "//chrome/services/printing/public/mojom",
-      "//components/printing/common:mojo_interfaces",
-    ]
+    deps += [ "//components/printing/common:mojo_interfaces" ]
   }
 
   if (enable_electron_extensions) {
@@ -654,7 +670,6 @@ source_set("electron_lib") {
     deps += [
       "//components/pdf/browser",
       "//components/pdf/renderer",
-      "//pdf:pdf_ppapi",
     ]
     sources += [
       "shell/browser/electron_pdf_web_contents_helper_client.cc",
@@ -691,15 +706,6 @@ if (is_mac) {
     sources = [ "shell/common/resources/mac/MainMenu.xib" ]
   }
 
-  action("fake_v8_context_snapshot_generator") {
-    script = "build/fake_v8_context_snapshot_generator.py"
-    args = [
-      rebase_path("$root_out_dir/$v8_context_snapshot_filename"),
-      rebase_path("$root_out_dir/fake/$v8_context_snapshot_filename"),
-    ]
-    outputs = [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
-  }
-
   bundle_data("electron_framework_resources") {
     public_deps = [ ":packed_resources" ]
     sources = []
@@ -710,13 +716,8 @@ if (is_mac) {
     if (v8_use_external_startup_data) {
       public_deps += [ "//v8" ]
       if (use_v8_context_snapshot) {
-        if (use_prebuilt_v8_context_snapshot) {
-          sources += [ "$root_out_dir/fake/$v8_context_snapshot_filename" ]
-          public_deps += [ ":fake_v8_context_snapshot_generator" ]
-        } else {
-          sources += [ "$root_out_dir/$v8_context_snapshot_filename" ]
-          public_deps += [ "//tools/v8_context_snapshot" ]
-        }
+        sources += [ "$root_out_dir/v8_context_snapshot.bin" ]
+        public_deps += [ "//tools/v8_context_snapshot" ]
       } else {
         sources += [ "$root_out_dir/snapshot_blob.bin" ]
       }
@@ -821,19 +822,18 @@ if (is_mac) {
 
     include_dirs = [ "." ]
     sources = filenames.framework_sources
-    frameworks = []
+    libs = []
 
     if (enable_osr) {
-      frameworks += [ "IOSurface.framework" ]
+      libs += [ "IOSurface.framework" ]
     }
 
     ldflags = [
+      "-F",
+      rebase_path("external_binaries", root_build_dir),
       "-Wl,-install_name,@rpath/$output_name.framework/$output_name",
       "-rpath",
       "@loader_path/Libraries",
-
-      # Required for exporting all symbols of libuv.
-      "-Wl,-force_load,obj/third_party/electron_node/deps/uv/libuv.a",
     ]
     if (is_component_build) {
       ldflags += [
@@ -881,49 +881,17 @@ if (is_mac) {
     }
   }
 
-  template("stripped_framework") {
-    action(target_name) {
-      assert(defined(invoker.framework))
-
-      script = "//electron/build/strip_framework.py"
-
-      forward_variables_from(invoker, [ "deps" ])
-      inputs = [ "$root_out_dir/" + invoker.framework ]
-      outputs = [ "$target_out_dir/stripped_frameworks/" + invoker.framework ]
-
-      args = rebase_path(inputs) + rebase_path(outputs)
-    }
-  }
-
-  stripped_framework("stripped_mantle_framework") {
-    framework = "Mantle.framework"
-    deps = [ "//third_party/squirrel.mac:mantle_framework" ]
-  }
-
-  stripped_framework("stripped_reactiveobjc_framework") {
-    framework = "ReactiveObjC.framework"
-    deps = [ "//third_party/squirrel.mac:reactiveobjc_framework" ]
-  }
-
-  stripped_framework("stripped_squirrel_framework") {
-    framework = "Squirrel.framework"
-    deps = [ "//third_party/squirrel.mac:squirrel_framework" ]
-  }
-
   bundle_data("electron_app_framework_bundle_data") {
     sources = [ "$root_out_dir/$electron_framework_name.framework" ]
     if (!is_mas_build) {
-      sources += get_target_outputs(":stripped_mantle_framework") +
-                 get_target_outputs(":stripped_reactiveobjc_framework") +
-                 get_target_outputs(":stripped_squirrel_framework")
+      sources += [
+        "external_binaries/Mantle.framework",
+        "external_binaries/ReactiveCocoa.framework",
+        "external_binaries/Squirrel.framework",
+      ]
     }
     outputs = [ "{{bundle_contents_dir}}/Frameworks/{{source_file_part}}" ]
-    public_deps = [
-      ":electron_framework+link",
-      ":stripped_mantle_framework",
-      ":stripped_reactiveobjc_framework",
-      ":stripped_squirrel_framework",
-    ]
+    public_deps = [ ":electron_framework+link" ]
 
     foreach(helper_params, content_mac_helpers) {
       sources +=
@@ -936,7 +904,7 @@ if (is_mac) {
     output_name = electron_login_helper_name
     sources = filenames.login_helper_sources
     include_dirs = [ "." ]
-    frameworks = [ "AppKit.framework" ]
+    libs = [ "AppKit.framework" ]
     info_plist = "shell/app/resources/mac/loginhelper-Info.plist"
     extra_substitutions =
         [ "ELECTRON_BUNDLE_ID=$electron_mac_bundle_id.loginhelper" ]
@@ -1121,9 +1089,7 @@ if (is_mac) {
       data += [ "$root_out_dir/resources/default_app.asar" ]
     }
 
-    if (use_v8_context_snapshot) {
-      public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
-    }
+    public_deps = [ "//tools/v8_context_snapshot:v8_context_snapshot" ]
 
     if (is_win) {
       sources += [
@@ -1150,9 +1116,17 @@ if (is_mac) {
         "//build/config/win:delayloads",
       ]
 
-      if (target_cpu == "arm64") {
-        configs -= [ "//build/config/win:cfi_linker" ]
-        ldflags += [ "/guard:cf,nolongjmp" ]
+      if (current_cpu == "x86") {
+        # Set the initial stack size to 0.5MiB, instead of the 1.5MiB needed by
+        # Chrome's main thread. This saves significant memory on threads (like
+        # those in the Windows thread pool, and others) whose stack size we can
+        # only control through this setting. Because Chrome's main thread needs
+        # a minimum 1.5 MiB stack, the main thread (in 32-bit builds only) uses
+        # fibers to switch to a 1.5 MiB stack before running any other code.
+        ldflags += [ "/STACK:0x80000" ]
+      } else {
+        # Increase the initial stack size. The default is 1MB, this is 8MB.
+        ldflags += [ "/STACK:0x800000" ]
       }
 
       # This is to support renaming of electron.exe. node-gyp has hard-coded
@@ -1167,14 +1141,7 @@ if (is_mac) {
       ]
     }
     if (is_linux) {
-      ldflags = [
-        "-pie",
-
-        # Required for exporting all symbols of libuv.
-        "-Wl,--whole-archive",
-        "obj/third_party/electron_node/deps/uv/libuv.a",
-        "-Wl,--no-whole-archive",
-      ]
+      ldflags = [ "-pie" ]
 
       if (!is_component_build && is_component_ffmpeg) {
         configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
@@ -1240,6 +1207,18 @@ test("shell_browser_ui_unittests") {
     "//ui/base",
     "//ui/strings",
   ]
+
+  if (is_mac) {
+    # Resolve paths owing to different test executable locations
+    ldflags = [
+      "-F",
+      rebase_path("external_binaries", root_build_dir),
+      "-rpath",
+      "@loader_path",
+      "-rpath",
+      "@executable_path/" + rebase_path("external_binaries", root_build_dir),
+    ]
+  }
 }
 
 template("dist_zip") {
@@ -1337,13 +1316,10 @@ dist_zip("electron_chromedriver_zip") {
 
 mksnapshot_deps = [
   ":licenses",
+  "//tools/v8_context_snapshot:v8_context_snapshot_generator($v8_snapshot_toolchain)",
   "//v8:mksnapshot($v8_snapshot_toolchain)",
 ]
 
-if (use_v8_context_snapshot) {
-  mksnapshot_deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_generator($v8_snapshot_toolchain)" ]
-}
-
 group("electron_mksnapshot") {
   public_deps = mksnapshot_deps
 }

CONTRIBUTING.md

@@ -47,17 +47,17 @@ dependencies, and tools contained in the `electron/electron` repository.
   * [Step 1: Fork](https://electronjs.org/docs/development/pull-requests#step-1-fork)
   * [Step 2: Build](https://electronjs.org/docs/development/pull-requests#step-2-build)
   * [Step 3: Branch](https://electronjs.org/docs/development/pull-requests#step-3-branch)
-* [Making Changes](https://electronjs.org/docs/development/pull-requests#making-changes)
+* [The Process of Making Changes](https://electronjs.org/docs/development/pull-requests#the-process-of-making-changes)
   * [Step 4: Code](https://electronjs.org/docs/development/pull-requests#step-4-code)
   * [Step 5: Commit](https://electronjs.org/docs/development/pull-requests#step-5-commit)
     * [Commit message guidelines](https://electronjs.org/docs/development/pull-requests#commit-message-guidelines)
   * [Step 6: Rebase](https://electronjs.org/docs/development/pull-requests#step-6-rebase)
   * [Step 7: Test](https://electronjs.org/docs/development/pull-requests#step-7-test)
   * [Step 8: Push](https://electronjs.org/docs/development/pull-requests#step-8-push)
-  * [Step 9: Opening the Pull Request](https://electronjs.org/docs/development/pull-requests#step-9-opening-the-pull-request)
-  * [Step 10: Discuss and Update](https://electronjs.org/docs/development/pull-requests#step-10-discuss-and-update)
+  * [Step 8: Opening the Pull Request](https://electronjs.org/docs/development/pull-requests#step-8-opening-the-pull-request)
+  * [Step 9: Discuss and Update](#step-9-discuss-and-update)
     * [Approval and Request Changes Workflow](https://electronjs.org/docs/development/pull-requests#approval-and-request-changes-workflow)
-  * [Step 11: Landing](https://electronjs.org/docs/development/pull-requests#step-11-landing)
+  * [Step 10: Landing](https://electronjs.org/docs/development/pull-requests#step-10-landing)
   * [Continuous Integration Testing](https://electronjs.org/docs/development/pull-requests#continuous-integration-testing)
 
 ## Style Guides

DEPS

@@ -14,13 +14,11 @@ gclient_gn_args = [
 
 vars = {
   'chromium_version':
-    '87.0.4280.67',
+    '85.0.4183.121',
   'node_version':
-    'v12.18.3',
+    'v12.16.3',
   'nan_version':
     '2c4ee8a32a299eada3cd6e468bbd0a473bfea96d',
-  'squirrel.mac_version':
-    'a3a5b3f03b824441c014893b18f99a103b2603e9',
 
   'boto_version': 'f7574aa6cc2c819430c1f05e9a1a1a666ef8169b',
   'pyyaml_version': '3.12',
@@ -32,7 +30,6 @@ vars = {
   'nodejs_git': 'https://github.com/nodejs',
   'requests_git': 'https://github.com/kennethreitz',
   'yaml_git': 'https://github.com/yaml',
-  'squirrel_git': 'https://github.com/Squirrel',
 
   # KEEP IN SYNC WITH utils.js FILE
   'yarn_version': '1.15.2',
@@ -107,18 +104,6 @@ deps = {
     'url': Var('requests_git') + '/requests.git' + '@' +  Var('requests_version'),
     'condition': 'checkout_requests and process_deps',
   },
-  'src/third_party/squirrel.mac': {
-    'url': Var("squirrel_git") + '/Squirrel.Mac.git@' + Var("squirrel.mac_version"),
-    'condition': 'process_deps',
-  },
-  'src/third_party/squirrel.mac/vendor/ReactiveObjC': {
-    'url': 'https://github.com/ReactiveCocoa/ReactiveObjC.git@74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76',
-    'condition': 'process_deps'
-  },
-  'src/third_party/squirrel.mac/vendor/Mantle': {
-    'url': 'https://github.com/Mantle/Mantle.git@78d3966b3c331292ea29ec38661b25df0a245948',
-    'condition': 'process_deps',
-  }
 }
 
 hooks = [
@@ -127,7 +112,7 @@ hooks = [
     'condition': '(checkout_chromium and apply_patches) and process_deps',
     'pattern': 'src/electron',
     'action': [
-      'python3',
+      'python',
       'src/electron/script/apply_all_patches.py',
       'src/electron/patches/config.json',
     ],
@@ -145,7 +130,7 @@ hooks = [
     'name': 'electron_npm_deps',
     'pattern': 'src/electron/package.json',
     'action': [
-      'python3',
+      'python',
       '-c',
       'import os, subprocess; os.chdir(os.path.join("src", "electron")); subprocess.check_call(["python", "script/lib/npx.py", "yarn@' + (Var("yarn_version")) + '", "install", "--frozen-lockfile"]);',
     ],
@@ -155,7 +140,7 @@ hooks = [
     'pattern': 'src/electron',
     'condition': 'checkout_boto and process_deps',
     'action': [
-      'python3',
+      'python',
       '-c',
       'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "boto")); subprocess.check_call(["python", "setup.py", "build"]);',
     ],
@@ -165,7 +150,7 @@ hooks = [
     'pattern': 'src/electron',
     'condition': 'checkout_requests and process_deps',
     'action': [
-      'python3',
+      'python',
       '-c',
       'import os, subprocess; os.chdir(os.path.join("src", "electron", "vendor", "requests")); subprocess.check_call(["python", "setup.py", "build"]);',
     ],
@@ -174,5 +159,4 @@ hooks = [
 
 recursedeps = [
   'src',
-  'src/third_party/squirrel.mac',
 ]

ELECTRON_VERSION

@@ -1 +1 @@
-11.0.4
+10.4.7

README.md

@@ -28,15 +28,12 @@ The preferred method is to install Electron as a development dependency in your
 app:
 
 ```sh
-npm install electron --save-dev [--save-exact]
+npm install electron --save-dev
 ```
 
-The `--save-exact` flag is recommended for Electron prior to version 2, as it does not follow semantic
-versioning. As of version 2.0.0, Electron follows semver, so you don't need `--save-exact` flag. For info on how to manage Electron versions in your apps, see
-[Electron versioning](docs/tutorial/electron-versioning.md).
-
 For more installation options and troubleshooting tips, see
-[installation](docs/tutorial/installation.md).
+[installation](docs/tutorial/installation.md). For info on how to manage Electron versions in your apps, see
+[Electron versioning](docs/tutorial/electron-versioning.md).
 
 ## Quick start & Electron Fiddle
 

SECURITY.md

@@ -6,11 +6,7 @@ To report a security issue, email [security@electronjs.org](mailto:security@elec
 
 The Electron team will send a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.
 
-Report security bugs in third-party modules to the person or team maintaining the module. You can also report a vulnerability through the [npm contact form](https://www.npmjs.com/support) by selecting "I'm reporting a security vulnerability".
-
-## The Electron Security Notification Process
-
-For context on Electron's security notification process, please see the [Notifications](https://github.com/electron/governance/blob/master/wg-security/membership-and-notifications.md#notifications) section of the Security WG's [Membership and Notifications](https://github.com/electron/governance/blob/master/wg-security/membership-and-notifications.md) Governance document.
+Report security bugs in third-party modules to the person or team maintaining the module. You can also report a vulnerability through the [Node Security Project](https://nodesecurity.io/report).
 
 ## Learning More About Security
 To learn more about securing an Electron application, please see the [security tutorial](docs/tutorial/security.md).

appveyor.yml

@@ -36,6 +36,7 @@ environment:
   ELECTRON_ENABLE_STACK_DUMPING: 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
@@ -63,7 +64,6 @@ build_script:
   - git config --global core.longpaths true
   - cd ..
   - mkdir src
-  - update_depot_tools.bat
   - ps: Move-Item $env:APPVEYOR_BUILD_FOLDER -Destination src\electron
   - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools"
   - ps: $env:SCCACHE_PATH="$pwd\src\electron\external_binaries\sccache.exe"
@@ -101,11 +101,6 @@ build_script:
           } else {
             # update external binaries
             python src/electron/script/update-external-binaries.py
-            # update angle
-            cd src\third_party\angle
-            git remote set-url origin  https://chromium.googlesource.com/angle/angle.git
-            git fetch
-            cd ..\..\..
           }
         } else {    
           # file does not exist, gclient sync, then zip
@@ -121,16 +116,14 @@ build_script:
       if ($env:SAVE_GCLIENT_SRC -eq 'true') {
         # archive current source for future use 
         # only run on x64/woa to avoid contention saving
-        $(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30)
-        if ($LASTEXITCODE -ne 0) {
+        if ($(7z a $zipfile src -xr!android_webview -xr!electron -xr'!*\.git' -xr!third_party\WebKit\LayoutTests! -xr!third_party\blink\web_tests -xr!third_party\blink\perf_tests -slp -t7z -mmt=30;$LASTEXITCODE -ne 0)) {
           Write-warning "Could not save source to shared drive; continuing anyway"
         }
-        # build time generation of file gen/angle/angle_commit.h depends on
-        # third_party/angle/.git
+        # build time generation of file gen/angle/commit.h depends on
+        # third_party/angle/.git/HEAD.
         # https://chromium-review.googlesource.com/c/angle/angle/+/2074924
-        $(7z a $zipfile src\third_party\angle\.git)
-        if ($LASTEXITCODE -ne 0) {
-          Write-warning "Failed to add third_party\angle\.git; continuing anyway"
+        if ($(7z a $zipfile src\third_party\angle\.git\HEAD;$LASTEXITCODE -ne 0)) {
+          Write-warning "Failed to add third_party\angle\.git\HEAD; continuing anyway"
         }
       }
   - ps: >-
@@ -214,8 +207,7 @@ test_script:
         echo "Skipping tests for $env:GN_CONFIG build"
       }
   - cd electron
-  # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging --disable-features=CalculateNativeWinOcclusion )
+  - if "%RUN_TESTS%"=="true" ( echo Running test suite & node script/yarn test -- --trace-uncaught --enable-logging)
   - 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"

azure-pipelines-arm.yml

@@ -1,104 +0,0 @@
-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
-  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.bin --dest=$CROSS_ARCH_SNAPSHOTS
-  displayName: 'Download cross arch snapshot files'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-   export NATIVE_UNITTESTS_DEST=$PWD/src/out/Default
-   cd src/electron
-   node script/download-circleci-artifacts.js --buildNum=$CIRCLE_BUILD_NUM --name=shell_browser_ui_unittests --dest=$NATIVE_UNITTESTS_DEST
-   chmod +x $NATIVE_UNITTESTS_DEST/shell_browser_ui_unittests
-  displayName: 'Download native unittest executables'
-  env:
-    CIRCLE_TOKEN: $(CIRCLECI_TOKEN)
-
-- bash: |
-    cd src
-    export ELECTRON_OUT_DIR=Default
-    set npm_config_arch=arm64
-    (cd electron && node script/yarn test -- --enable-logging)
-  displayName: 'Run Electron tests'
-  timeoutInMinutes: 20
-  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()
-
-- 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()
-
-- task: mspremier.PostBuildCleanup.PostBuildCleanup-task.PostBuildCleanup@3
-  displayName: 'Clean Agent Directories'
-
-  condition: always()

azure-pipelines-woa.yml

@@ -63,8 +63,7 @@ steps:
     set npm_config_nodedir=%cd%\out\Default\gen\node_headers
     set npm_config_arch=arm64
     cd electron
-    # CalculateNativeWinOcclusion is disabled due to https://bugs.chromium.org/p/chromium/issues/detail?id=1139022
-    node script/yarn test -- --enable-logging --verbose --disable-features=CalculateNativeWinOcclusion
+    node script/yarn test -- --enable-logging --verbose
   displayName: 'Run Electron tests'
   env:
     ELECTRON_OUT_DIR: Default
@@ -93,6 +92,6 @@ steps:
   condition: always()
 
 - powershell: |
-    Remove-Item -path $env:APPDATA/Electron* -Recurse
+    Remove-Item -path $env:APPDATA/Electron* -Recurse -Force -ErrorAction Ignore
   displayName: 'Delete user app data directories'
   condition: always()

build/args/all.gn

@@ -2,7 +2,7 @@ is_electron_build = true
 root_extra_deps = [ "//electron" ]
 
 # Registry of NMVs --> https://github.com/nodejs/node/blob/master/doc/abi_version_registry.json
-node_module_version = 85
+node_module_version = 82
 
 v8_promise_internal_field_count = 1
 v8_typed_array_max_size_in_heap = 0

build/fake_v8_context_snapshot_generator.py

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

build/strip_framework.py

@@ -1,16 +0,0 @@
-#!/usr/bin/env python
-import os
-import subprocess
-import sys
-
-source = sys.argv[1]
-dest = sys.argv[2]
-
-# Ensure any existing framework is removed
-subprocess.check_output(["rm", "-rf", dest])
-
-subprocess.check_output(["cp", "-a", source, dest])
-
-# Strip headers, we do not need to ship them
-subprocess.check_output(["rm", "-r", os.path.join(dest, 'Headers')])
-subprocess.check_output(["rm", "-r", os.path.join(dest, 'Versions', 'Current', 'Headers')])

build/webpack/get-outputs.js

@@ -1,2 +1,2 @@
-process.env.PRINT_WEBPACK_GRAPH = true;
-require('./run-compiler');
+process.env.PRINT_WEBPACK_GRAPH = true
+require('./run-compiler')

build/webpack/run-compiler.js

@@ -1,24 +1,24 @@
 const fs = require('fs');
-const path = require('path');
-const webpack = require('webpack');
+const path = require('path')
+const webpack = require('webpack')
 
-const configPath = process.argv[2];
-const outPath = path.resolve(process.argv[3]);
-const config = require(configPath);
+const configPath = process.argv[2]
+const outPath = path.resolve(process.argv[3])
+const config = require(configPath)
 config.output = {
   path: path.dirname(outPath),
   filename: path.basename(outPath)
-};
+}
 
 const { wrapInitWithProfilingTimeout, wrapInitWithTryCatch, ...webpackConfig } = config;
 
 webpack(webpackConfig, (err, stats) => {
   if (err) {
-    console.error(err);
-    process.exit(1);
+    console.error(err)
+    process.exit(1)
   } else if (stats.hasErrors()) {
-    console.error(stats.toString('normal'));
-    process.exit(1);
+    console.error(stats.toString('normal'))
+    process.exit(1)
   } else {
     let contents = fs.readFileSync(outPath, 'utf8');
     if (wrapInitWithTryCatch) {
@@ -39,7 +39,7 @@ if ((globalThis.process || binding.process).argv.includes("--profile-electron-in
   ___electron_webpack_init__();
 }`;
     }
-    fs.writeFileSync(outPath, contents);
-    process.exit(0);
+    fs.writeFileSync(outPath, contents)
+    process.exit(0)
   }
-});
+})

build/webpack/webpack.config.asar.js

@@ -1,5 +0,0 @@
-module.exports = require('./webpack.config.base')({
-  target: 'asar',
-  alwaysHasNode: true,
-  targetDeletesNodeGlobals: true
-});

build/webpack/webpack.config.base.js

@@ -1,39 +1,39 @@
-const fs = require('fs');
-const path = require('path');
-const webpack = require('webpack');
+const fs = require('fs')
+const path = require('path')
+const webpack = require('webpack')
 const TerserPlugin = require('terser-webpack-plugin');
 
-const electronRoot = path.resolve(__dirname, '../..');
+const electronRoot = path.resolve(__dirname, '../..')
 
-const onlyPrintingGraph = !!process.env.PRINT_WEBPACK_GRAPH;
+const onlyPrintingGraph = !!process.env.PRINT_WEBPACK_GRAPH
 
 class AccessDependenciesPlugin {
-  apply (compiler) {
+  apply(compiler) {
     // Only hook into webpack when we are printing the dependency graph
-    if (!onlyPrintingGraph) return;
+    if (!onlyPrintingGraph) return
 
     compiler.hooks.compilation.tap('AccessDependenciesPlugin', compilation => {
       compilation.hooks.finishModules.tap('AccessDependenciesPlugin', modules => {
-        const filePaths = modules.map(m => m.resource).filter(p => p).map(p => path.relative(electronRoot, p));
-        console.info(JSON.stringify(filePaths));
-      });
-    });
+        const filePaths = modules.map(m => m.resource).filter(p => p).map(p => path.relative(electronRoot, p))
+        console.info(JSON.stringify(filePaths))
+      })
+    })
   }
 }
 
 const defines = {
   BUILDFLAG: onlyPrintingGraph ? '(a => a)' : ''
-};
+}
 
-const buildFlagsPrefix = '--buildflags=';
+const buildFlagsPrefix = '--buildflags='
 const buildFlagArg = process.argv.find(arg => arg.startsWith(buildFlagsPrefix));
 
 if (buildFlagArg) {
-  const buildFlagPath = buildFlagArg.substr(buildFlagsPrefix.length);
+  const buildFlagPath = buildFlagArg.substr(buildFlagsPrefix.length)
 
-  const flagFile = fs.readFileSync(buildFlagPath, 'utf8');
+  const flagFile = fs.readFileSync(buildFlagPath, 'utf8')
   for (const line of flagFile.split(/(\r\n|\r|\n)/g)) {
-    const flagMatch = line.match(/#define BUILDFLAG_INTERNAL_(.+?)\(\) \(([01])\)/);
+    const flagMatch = line.match(/#define BUILDFLAG_INTERNAL_(.+?)\(\) \(([01])\)/)
     if (flagMatch) {
       const [, flagName, flagValue] = flagMatch;
       defines[flagName] = JSON.stringify(Boolean(parseInt(flagValue, 10)));
@@ -41,27 +41,27 @@ if (buildFlagArg) {
   }
 }
 
-const ignoredModules = [];
+const ignoredModules = []
 
-if (defines.ENABLE_DESKTOP_CAPTURER === 'false') {
+if (defines['ENABLE_DESKTOP_CAPTURER'] === 'false') {
   ignoredModules.push(
     '@electron/internal/browser/desktop-capturer',
     '@electron/internal/browser/api/desktop-capturer',
     '@electron/internal/renderer/api/desktop-capturer'
-  );
+  )
 }
 
-if (defines.ENABLE_REMOTE_MODULE === 'false') {
+if (defines['ENABLE_REMOTE_MODULE'] === 'false') {
   ignoredModules.push(
     '@electron/internal/browser/remote/server',
     '@electron/internal/renderer/api/remote'
-  );
+  )
 }
 
-if (defines.ENABLE_VIEWS_API === 'false') {
+if (defines['ENABLE_VIEWS_API'] === 'false') {
   ignoredModules.push(
     '@electron/internal/browser/api/views/image-view.js'
-  );
+  )
 }
 
 module.exports = ({
@@ -72,13 +72,11 @@ module.exports = ({
   wrapInitWithProfilingTimeout,
   wrapInitWithTryCatch
 }) => {
-  let entry = path.resolve(electronRoot, 'lib', target, 'init.ts');
+  let entry = path.resolve(electronRoot, 'lib', target, 'init.ts')
   if (!fs.existsSync(entry)) {
-    entry = path.resolve(electronRoot, 'lib', target, 'init.js');
+    entry = path.resolve(electronRoot, 'lib', target, 'init.js')
   }
 
-  const electronAPIFile = path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.ts');
-
   return ({
     mode: 'development',
     devtool: false,
@@ -92,19 +90,16 @@ module.exports = ({
     resolve: {
       alias: {
         '@electron/internal': path.resolve(electronRoot, 'lib'),
-        electron$: electronAPIFile,
-        'electron/main$': electronAPIFile,
-        'electron/renderer$': electronAPIFile,
-        'electron/common$': electronAPIFile,
+        'electron': path.resolve(electronRoot, 'lib', loadElectronFromAlternateTarget || target, 'api', 'exports', 'electron.ts'),
         // Force timers to resolve to our dependency that doesn't use window.postMessage
-        timers: path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
+        'timers': path.resolve(electronRoot, 'node_modules', 'timers-browserify', 'main.js')
       },
       extensions: ['.ts', '.js']
     },
     module: {
       rules: [{
         test: (moduleName) => !onlyPrintingGraph && ignoredModules.includes(moduleName),
-        loader: 'null-loader'
+        loader: 'null-loader',
       }, {
         test: /\.ts$/,
         loader: 'ts-loader',
@@ -113,7 +108,7 @@ module.exports = ({
           transpileOnly: onlyPrintingGraph,
           ignoreDiagnostics: [
             // File '{0}' is not under 'rootDir' '{1}'.
-            6059
+            6059,
           ]
         }
       }]
@@ -123,7 +118,7 @@ module.exports = ({
       __filename: false,
       // We provide our own "timers" import above, any usage of setImmediate inside
       // one of our renderer bundles should import it from the 'timers' package
-      setImmediate: false
+      setImmediate: false,
     },
     optimization: {
       minimize: true,
@@ -131,24 +126,24 @@ module.exports = ({
         new TerserPlugin({
           terserOptions: {
             keep_classnames: true,
-            keep_fnames: true
-          }
-        })
-      ]
+            keep_fnames: true,
+          },
+        }),
+      ],
     },
     plugins: [
       new AccessDependenciesPlugin(),
       ...(targetDeletesNodeGlobals ? [
         new webpack.ProvidePlugin({
-          process: ['@electron/internal/common/webpack-provider', 'process'],
-          global: ['@electron/internal/common/webpack-provider', '_global'],
-          Buffer: ['@electron/internal/common/webpack-provider', 'Buffer']
+          process: ['@electron/internal/renderer/webpack-provider', 'process'],
+          global: ['@electron/internal/renderer/webpack-provider', '_global'],
+          Buffer: ['@electron/internal/renderer/webpack-provider', 'Buffer'],
         })
       ] : []),
       new webpack.ProvidePlugin({
-        Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise']
+        Promise: ['@electron/internal/common/webpack-globals-provider', 'Promise'],
       }),
-      new webpack.DefinePlugin(defines)
+      new webpack.DefinePlugin(defines),
     ]
-  });
-};
+  })
+}

build/webpack/webpack.config.browser.js

@@ -1,4 +1,4 @@
 module.exports = require('./webpack.config.base')({
   target: 'browser',
   alwaysHasNode: true
-});
+})

build/webpack/webpack.config.isolated_renderer.js

@@ -2,4 +2,4 @@ module.exports = require('./webpack.config.base')({
   target: 'isolated_renderer',
   alwaysHasNode: false,
   wrapInitWithTryCatch: true
-});
+})

build/webpack/webpack.config.renderer.js

@@ -4,4 +4,4 @@ module.exports = require('./webpack.config.base')({
   targetDeletesNodeGlobals: true,
   wrapInitWithProfilingTimeout: true,
   wrapInitWithTryCatch: true
-});
+})

build/webpack/webpack.config.sandboxed_renderer.js

@@ -3,4 +3,4 @@ module.exports = require('./webpack.config.base')({
   alwaysHasNode: false,
   wrapInitWithProfilingTimeout: true,
   wrapInitWithTryCatch: true
-});
+})

build/webpack/webpack.config.worker.js

@@ -4,4 +4,4 @@ module.exports = require('./webpack.config.base')({
   alwaysHasNode: true,
   targetDeletesNodeGlobals: true,
   wrapInitWithTryCatch: true
-});
+})

build/zip.py

@@ -13,30 +13,25 @@ EXTENSIONS_TO_SKIP = [
 ]
 
 PATHS_TO_SKIP = [
-  # Skip because it is an output of //ui/gl that we don't need.
-  'angledata',
-  # Skip because these are outputs that we don't need.
-  './libVkICD_mock_',
-  # Skip because these are outputs that we don't need.
-  './VkICD_mock_',
-  # Skip because its an output of create_bundle from //build/config/mac/rules.gni
+  'angledata', #Skipping because it is an output of //ui/gl that we don't need
+  './libVkICD_mock_', #Skipping because these are outputs that we don't need
+  './VkICD_mock_', #Skipping because these are outputs that we don't need
+
+  # Skipping because its an output of create_bundle from //build/config/mac/rules.gni
   # that we don't need
   'Electron.dSYM',
-  # Refs https://chromium-review.googlesource.com/c/angle/angle/+/2425197.
-  # Remove this when Angle themselves remove the file: https://issuetracker.google.com/issues/168736059
-  'gen/angle/angle_commit.h',
+
   # //chrome/browser:resources depends on this via
   # //chrome/browser/resources/ssl/ssl_error_assistant, but we don't need to
   # ship it.
   'pyproto',
+
   # On Windows, this binary doesn't exist (the crashpad handler is built-in).
   # On MacOS, the binary is called 'chrome_crashpad_handler' and is inside the
   # app bundle.
   # On Linux, we don't use crashpad, but this binary is still built for some
   # reason. Exclude it from the zip.
   './crashpad_handler',
-  # Skip because these are outputs that we don't need.
-  'resources/inspector',
 ]
 
 def skip_path(dep, dist_zip, target_cpu):

chromium_src/BUILD.gn

@@ -12,8 +12,6 @@ import("//third_party/widevine/cdm/widevine.gni")
 static_library("chrome") {
   visibility = [ "//electron:electron_lib" ]
   sources = [
-    "//chrome/browser/accessibility/accessibility_ui.cc",
-    "//chrome/browser/accessibility/accessibility_ui.h",
     "//chrome/browser/browser_process.cc",
     "//chrome/browser/browser_process.h",
     "//chrome/browser/crash_upload_list/crash_upload_list_crashpad.cc",
@@ -26,10 +24,18 @@ static_library("chrome") {
     "//chrome/browser/devtools/devtools_file_system_indexer.h",
     "//chrome/browser/extensions/global_shortcut_listener.cc",
     "//chrome/browser/extensions/global_shortcut_listener.h",
+    "//chrome/browser/extensions/global_shortcut_listener_mac.h",
+    "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
+    "//chrome/browser/extensions/global_shortcut_listener_win.cc",
+    "//chrome/browser/extensions/global_shortcut_listener_win.h",
     "//chrome/browser/icon_loader.cc",
     "//chrome/browser/icon_loader.h",
+    "//chrome/browser/icon_loader_mac.mm",
+    "//chrome/browser/icon_loader_win.cc",
     "//chrome/browser/icon_manager.cc",
     "//chrome/browser/icon_manager.h",
+    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
+    "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.cc",
     "//chrome/browser/net/chrome_mojo_proxy_resolver_factory.h",
     "//chrome/browser/net/proxy_config_monitor.cc",
@@ -49,45 +55,25 @@ static_library("chrome") {
     "//chrome/browser/ssl/tls_deprecation_config.cc",
     "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.cc",
     "//chrome/browser/ui/views/autofill/autofill_popup_view_utils.h",
+    "//chrome/browser/win/chrome_process_finder.cc",
+    "//chrome/browser/win/chrome_process_finder.h",
+    "//chrome/child/v8_crashpad_support_win.cc",
+    "//chrome/child/v8_crashpad_support_win.h",
     "//extensions/browser/app_window/size_constraints.cc",
     "//extensions/browser/app_window/size_constraints.h",
   ]
-
-  if (is_mac) {
-    sources += [
-      "//chrome/browser/extensions/global_shortcut_listener_mac.h",
-      "//chrome/browser/extensions/global_shortcut_listener_mac.mm",
-      "//chrome/browser/icon_loader_mac.mm",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.h",
-      "//chrome/browser/media/webrtc/system_media_capture_permissions_mac.mm",
-    ]
-  }
-
-  if (is_win) {
-    sources += [
-      "//chrome/browser/extensions/global_shortcut_listener_win.cc",
-      "//chrome/browser/extensions/global_shortcut_listener_win.h",
-      "//chrome/browser/icon_loader_win.cc",
-      "//chrome/browser/win/chrome_process_finder.cc",
-      "//chrome/browser/win/chrome_process_finder.h",
-      "//chrome/child/v8_crashpad_support_win.cc",
-      "//chrome/child/v8_crashpad_support_win.h",
-    ]
-  }
-
   public_deps = [
     "//chrome/common",
     "//chrome/common:version_header",
     "//components/keyed_service/content",
-    "//components/paint_preview/buildflags",
     "//components/proxy_config",
     "//components/security_state/content",
     "//content/public/browser",
   ]
-
   deps = [
     "//chrome/browser:resource_prefetch_predictor_proto",
     "//chrome/services/speech:buildflags",
+    "//components/feature_engagement:buildflags",
     "//components/optimization_guide/proto:optimization_guide_proto",
   ]
 
@@ -276,23 +262,12 @@ static_library("chrome") {
       ]
     }
   }
-
-  if (!is_mas_build) {
-    sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.h" ]
-    if (is_mac) {
-      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_mac.cc" ]
-    } else if (is_win) {
-      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump_win.cc" ]
-    } else {
-      sources += [ "//chrome/browser/hang_monitor/hang_crash_dump.cc" ]
-    }
-  }
 }
 
 source_set("plugins") {
   sources = []
   deps = []
-  frameworks = []
+  libs = []
 
   # browser side
   sources += [
@@ -326,7 +301,7 @@ source_set("plugins") {
         "//chrome/browser/renderer_host/pepper/monitor_finder_mac.h",
         "//chrome/browser/renderer_host/pepper/monitor_finder_mac.mm",
       ]
-      frameworks += [ "CoreGraphics.framework" ]
+      libs += [ "CoreGraphics.framework" ]
     }
     if (is_linux) {
       deps += [ "//components/services/font/public/cpp" ]
@@ -390,8 +365,8 @@ source_set("chrome_spellchecker") {
       "//chrome/browser/spellchecker/spellcheck_factory.h",
       "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc",
       "//chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h",
-      "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.cc",
-      "//chrome/browser/spellchecker/spellcheck_language_blocklist_policy_handler.h",
+      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.cc",
+      "//chrome/browser/spellchecker/spellcheck_language_blacklist_policy_handler.h",
       "//chrome/browser/spellchecker/spellcheck_language_policy_handler.cc",
       "//chrome/browser/spellchecker/spellcheck_language_policy_handler.h",
       "//chrome/browser/spellchecker/spellcheck_service.cc",

chromium_src/chrome/browser/process_singleton_posix.cc

@@ -360,7 +360,7 @@ bool CheckCookie(const base::FilePath& path, const base::FilePath& cookie) {
 }
 
 bool IsAppSandboxed() {
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
   // NB: There is no sane API for this, we have to just guess by
   // reading tea leaves
   base::FilePath home_dir;
@@ -371,7 +371,7 @@ bool IsAppSandboxed() {
   return home_dir.value().find("Library/Containers") != std::string::npos;
 #else
   return false;
-#endif  // defined(OS_MAC)
+#endif  // defined(OS_MACOSX)
 }
 
 bool ConnectSocket(ScopedSocket* socket,
@@ -421,7 +421,7 @@ bool ConnectSocket(ScopedSocket* socket,
   }
 }
 
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
 bool ReplaceOldSingletonLock(const base::FilePath& symlink_content,
                              const base::FilePath& lock_path) {
   // Try taking an flock(2) on the file. Failure means the lock is taken so we
@@ -447,14 +447,14 @@ bool ReplaceOldSingletonLock(const base::FilePath& symlink_content,
   // lock. We never flock() the lock file from now on. I.e. we assume that an
   // old version of Chrome will not run with the same user data dir after this
   // version has run.
-  if (!base::DeleteFile(lock_path)) {
+  if (!base::DeleteFile(lock_path, false)) {
     PLOG(ERROR) << "Could not delete old singleton lock.";
     return false;
   }
 
   return SymlinkPath(symlink_content, lock_path);
 }
-#endif  // defined(OS_MAC)
+#endif  // defined(OS_MACOSX)
 
 }  // namespace
 
@@ -969,7 +969,7 @@ bool ProcessSingleton::Create() {
   if (!SymlinkPath(symlink_content, lock_path_)) {
     // TODO(jackhou): Remove this case once this code is stable on Mac.
     // http://crbug.com/367612
-#if defined(OS_MAC)
+#if defined(OS_MACOSX)
     // On Mac, an existing non-symlink lock file means the lock could be held by
     // the old process singleton code. If we can successfully replace the lock,
     // continue as normal.

default_app/default_app.ts

@@ -41,14 +41,14 @@ ipcMain.handle('bootstrap', (event) => {
   return isTrustedSender(event.sender) ? electronPath : null;
 });
 
-async function createWindow () {
+async function createWindow (backgroundColor?: string) {
   await app.whenReady();
 
   const options: Electron.BrowserWindowConstructorOptions = {
     width: 960,
     height: 620,
     autoHideMenuBar: true,
-    backgroundColor: '#2f3241',
+    backgroundColor,
     webPreferences: {
       preload: path.resolve(__dirname, 'preload.js'),
       contextIsolation: true,
@@ -96,7 +96,7 @@ export const loadURL = async (appUrl: string) => {
 };
 
 export const loadFile = async (appPath: string) => {
-  mainWindow = await createWindow();
+  mainWindow = await createWindow(appPath === 'index.html' ? '#2f3241' : undefined);
   mainWindow.loadFile(appPath);
   mainWindow.focus();
 };

default_app/index.html

@@ -53,31 +53,31 @@
     <nav>
       <div class="linkcol">
         <a class="hero-link" target="_blank" href="https://electronjs.org/blog">
-          <span class="octicon hero-octicon octicon-code-square-24" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-gist" aria-hidden="true"></span>
           <h4>Blog</h4>
         </a>
       </div>
       <div class="linkcol">
         <a class="hero-link" target="_blank" href="https://github.com/electron/electron">
-          <span class="octicon hero-octicon octicon-mark-github-16" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-mark-github" aria-hidden="true"></span>
           <h4>Repository</h4>
         </a>
       </div>
       <div class="linkcol">
         <a class="hero-link" target="_blank" href="https://electronjs.org/docs">
-          <span class="octicon hero-octicon octicon-book-24" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-gear" aria-hidden="true"></span>
           <h4>Docs</h4>
         </a>
       </div>
       <div class="linkcol">
         <a class="hero-link" target="_blank" href="https://github.com/electron/electron-api-demos">
-          <span class="octicon hero-octicon octicon-star-fill-24" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-star" aria-hidden="true"></span>
           <h4>API Demos</h4>
         </a>
       </div>
       <div class="linkcol">
         <a class="hero-link" target="_blank" href="https://electronforge.io">
-          <span class="octicon hero-octicon octicon-gift-24" aria-hidden="true"></span>
+          <span class="octicon hero-octicon octicon-gift" aria-hidden="true"></span>
           <h4>Forge</h4>
         </a>
       </div>

default_app/main.ts

@@ -1,9 +1,8 @@
-import * as electron from 'electron';
+import { app, dialog } from 'electron';
 
 import * as fs from 'fs';
 import * as path from 'path';
 import * as url from 'url';
-const { app, dialog } = electron;
 
 type DefaultAppOptions = {
   file: null | string;
@@ -146,90 +145,13 @@ function startRepl () {
     process.exit(1);
   }
 
-  // Prevent quitting.
+  // prevent quitting
   app.on('window-all-closed', () => {});
 
-  const GREEN = '32';
-  const colorize = (color: string, s: string) => `\x1b[${color}m${s}\x1b[0m`;
-  const electronVersion = colorize(GREEN, `v${process.versions.electron}`);
-  const nodeVersion = colorize(GREEN, `v${process.versions.node}`);
-
-  console.info(`
-    Welcome to the Electron.js REPL \\[._.]/
-
-    You can access all Electron.js modules here as well as Node.js modules.
-    Using: Node.js ${nodeVersion} and Electron.js ${electronVersion}
-  `);
-
-  const { REPLServer } = require('repl');
-  const repl = new REPLServer({
-    prompt: '> '
-  }).on('exit', () => {
+  const repl = require('repl');
+  repl.start('> ').on('exit', () => {
     process.exit(0);
   });
-
-  function defineBuiltin (context: any, name: string, getter: Function) {
-    const setReal = (val: any) => {
-      // Deleting the property before re-assigning it disables the
-      // getter/setter mechanism.
-      delete context[name];
-      context[name] = val;
-    };
-
-    Object.defineProperty(context, name, {
-      get: () => {
-        const lib = getter();
-
-        delete context[name];
-        Object.defineProperty(context, name, {
-          get: () => lib,
-          set: setReal,
-          configurable: true,
-          enumerable: false
-        });
-
-        return lib;
-      },
-      set: setReal,
-      configurable: true,
-      enumerable: false
-    });
-  }
-
-  defineBuiltin(repl.context, 'electron', () => electron);
-  for (const api of Object.keys(electron) as (keyof typeof electron)[]) {
-    defineBuiltin(repl.context, api, () => electron[api]);
-  }
-
-  // Copied from node/lib/repl.js. For better DX, we don't want to
-  // show e.g 'contentTracing' at a higher priority than 'const', so
-  // we only trigger custom tab-completion when no common words are
-  // potentially matches.
-  const commonWords = [
-    'async', 'await', 'break', 'case', 'catch', 'const', 'continue',
-    'debugger', 'default', 'delete', 'do', 'else', 'export', 'false',
-    'finally', 'for', 'function', 'if', 'import', 'in', 'instanceof', 'let',
-    'new', 'null', 'return', 'switch', 'this', 'throw', 'true', 'try',
-    'typeof', 'var', 'void', 'while', 'with', 'yield'
-  ];
-
-  const electronBuiltins = [...Object.keys(electron), 'original-fs', 'electron'];
-
-  const defaultComplete = repl.completer;
-  repl.completer = (line: string, callback: Function) => {
-    const lastSpace = line.lastIndexOf(' ');
-    const currentSymbol = line.substring(lastSpace + 1, repl.cursor);
-
-    const filterFn = (c: string) => c.startsWith(currentSymbol);
-    const ignores = commonWords.filter(filterFn);
-    const hits = electronBuiltins.filter(filterFn);
-
-    if (!ignores.length && hits.length) {
-      callback(null, [hits, currentSymbol]);
-    } else {
-      defaultComplete.apply(repl, [line, callback]);
-    }
-  };
 }
 
 // Start the specified app if there is one specified in command line, otherwise

docs/README.md

@@ -92,6 +92,7 @@ These individual tutorials expand on topics discussed in the guide above.
 * Electron Releases & Developer Feedback
   * [Versioning Policy](tutorial/electron-versioning.md)
   * [Release Timelines](tutorial/electron-timelines.md)
+  * [App Feedback Program](tutorial/app-feedback-program.md)
 * [Packaging App Source Code with asar](tutorial/application-packaging.md)
   * [Generating asar Archives](tutorial/application-packaging.md#generating-asar-archives)
   * [Using asar Archives](tutorial/application-packaging.md#using-asar-archives)

docs/api/app.md

@@ -141,16 +141,6 @@ this event, such as launching the application for the first time, attempting
 to re-launch the application when it's already running, or clicking on the
 application's dock or taskbar icon.
 
-### Event: 'did-become-active' _macOS_
-
-Returns:
-
-* `event` Event
-
-Emitted when mac application become active. Difference from `activate` event is
-that `did-become-active` is emitted every time the app becomes active, not only
-when Dock icon is clicked or application is re-launched.
-
 ### Event: 'continue-activity' _macOS_
 
 Returns:
@@ -361,7 +351,7 @@ page.
 
 Emitted whenever there is a GPU info update.
 
-### Event: 'gpu-process-crashed' _Deprecated_
+### Event: 'gpu-process-crashed'
 
 Returns:
 
@@ -370,11 +360,6 @@ Returns:
 
 Emitted when the GPU process crashes or is killed.
 
-**Deprecated:** This event is superceded by the `child-process-gone` event
-which contains more information about why the child process disappeared. It
-isn't always because it crashed. The `killed` boolean can be replaced by
-checking `reason === 'killed'` when you switch to that event.
-
 ### Event: 'renderer-process-crashed' _Deprecated_
 
 Returns:
@@ -386,7 +371,7 @@ Returns:
 Emitted when the renderer process of `webContents` crashes or is killed.
 
 **Deprecated:** This event is superceded by the `render-process-gone` event
-which contains more information about why the render process disappeared. It
+which contains more information about why the render process dissapeared. It
 isn't always because it crashed.  The `killed` boolean can be replaced by
 checking `reason === 'killed'` when you switch to that event.
 
@@ -406,39 +391,9 @@ Returns:
     * `launch-failed` - Process never successfully launched
     * `integrity-failure` - Windows code integrity checks failed
 
-Emitted when the renderer process unexpectedly disappears.  This is normally
+Emitted when the renderer process unexpectedly dissapears.  This is normally
 because it was crashed or killed.
 
-#### Event: 'child-process-gone'
-
-Returns:
-
-* `event` Event
-* `details` Object
-  * `type` String - Process type. One of the following values:
-    * `Utility`
-    * `Zygote`
-    * `Sandbox helper`
-    * `GPU`
-    * `Pepper Plugin`
-    * `Pepper Plugin Broker`
-    * `Unknown`
-  * `reason` String - The reason the child process is gone. Possible values:
-    * `clean-exit` - Process exited with an exit code of zero
-    * `abnormal-exit` - Process exited with a non-zero exit code
-    * `killed` - Process was sent a SIGTERM or otherwise killed externally
-    * `crashed` - Process crashed
-    * `oom` - Process ran out of memory
-    * `launch-failed` - Process never successfully launched
-    * `integrity-failure` - Windows code integrity checks failed
-  * `exitCode` Number - The exit code for the process
-      (e.g. status from waitpid if on posix, from GetExitCodeProcess on Windows).
-  * `name` String (optional) - The name of the process. i.e. for plugins it might be Flash.
-    Examples for utility: `Audio Service`, `Content Decryption Module Service`, `Network Service`, `Video Capture`, etc.
-
-Emitted when the child process unexpectedly disappears. This is normally
-because it was crashed or killed. It does not include renderer processes.
-
 ### Event: 'accessibility-support-changed' _macOS_ _Windows_
 
 Returns:
@@ -851,20 +806,6 @@ Returns `String` - Name of the application handling the protocol, or an empty
 This method returns the application name of the default handler for the protocol
 (aka URI scheme) of a URL.
 
-### `app.getApplicationInfoForProtocol(url)` _macOS_ _Windows_
-
-* `url` String - a URL with the protocol name to check. Unlike the other
-  methods in this family, this accepts an entire URL, including `://` at a
-  minimum (e.g. `https://`).
-
-Returns `Promise<Object>` - Resolve with an object containing the following:
-  * `icon` NativeImage - the display icon of the app handling the protocol.
-  * `path` String  - installation path of the app handling the protocol.
-  * `name` String - display name of the app handling the protocol.
-
-This method returns a promise that contains the application name, icon and path of the default handler for the protocol
-(aka URI scheme) of a URL.
-
 ### `app.setUserTasks(tasks)` _Windows_
 
 * `tasks` [Task[]](structures/task.md) - Array of `Task` objects
@@ -1026,7 +967,6 @@ if (!gotTheLock) {
 
   // Create myWindow, load the rest of the app, etc...
   app.whenReady().then(() => {
-    myWindow = createWindow()
   })
 }
 ```
@@ -1142,10 +1082,8 @@ For `infoType` equal to `complete`:
 For `infoType` equal to `basic`:
   Promise is fulfilled with `Object` containing fewer attributes than when requested with `complete`. Here's an example of basic response:
 ```js
-{
-  auxAttributes:
-   {
-     amdSwitchable: true,
+{ auxAttributes:
+   { amdSwitchable: true,
      canSupportThreadedTextureMailbox: false,
      directComposition: false,
      directRendering: true,
@@ -1158,14 +1096,12 @@ For `infoType` equal to `basic`:
      sandboxed: false,
      softwareRendering: false,
      supportsOverlays: false,
-     videoDecodeAcceleratorFlags: 0
-   },
-  gpuDevice:
-   [{ active: true, deviceId: 26657, vendorId: 4098 },
-     { active: false, deviceId: 3366, vendorId: 32902 }],
-  machineModelName: 'MacBookPro',
-  machineModelVersion: '11.5'
-}
+     videoDecodeAcceleratorFlags: 0 },
+gpuDevice:
+   [ { active: true, deviceId: 26657, vendorId: 4098 },
+     { active: false, deviceId: 3366, vendorId: 32902 } ],
+machineModelName: 'MacBookPro',
+machineModelVersion: '11.5' }
 ```
 
 Using `basic` should be preferred if only basic information like `vendorId` or `driverId` is needed.
@@ -1217,13 +1153,6 @@ Returns `Object`:
   should restore the state from the previous session. This indicates that the
   app should restore the windows that were open the last time the app was
   closed. This setting is not available on [MAS builds][mas-builds].
-* `executableWillLaunchAtLogin` Boolean _Windows_ - `true` if app is set to open at login and its run key is not deactivated. This differs from `openAtLogin` as it ignores the `args` option, this property will be true if the given executable would be launched at login with **any** arguments.
-* `launchItems` Object[] _Windows_
-  * `name` String _Windows_ - name value of a registry entry.
-  * `path` String _Windows_ - The executable to an app that corresponds to a registry entry.
-  * `args` String[] _Windows_ - the command-line arguments to pass to the executable.
-  * `scope` String _Windows_ - one of `user` or `machine`. Indicates whether the registry entry is under `HKEY_CURRENT USER` or `HKEY_LOCAL_MACHINE`.
-  * `enabled` Boolean _Windows_ - `true` if the app registry key is startup approved and therefore shows as `enabled` in Task Manager and Windows settings.
 
 ### `app.setLoginItemSettings(settings)` _macOS_ _Windows_
 
@@ -1239,9 +1168,7 @@ Returns `Object`:
   * `args` String[] (optional) _Windows_ - The command-line arguments to pass to
     the executable. Defaults to an empty array. Take care to wrap paths in
     quotes.
-  * `enabled` Boolean (optional) _Windows_ - `true` will change the startup approved registry key and `enable / disable` the App in Task Manager and Windows Settings.
-    Defaults to `true`.
-  * `name` String (optional) _Windows_ - value name to write into registry. Defaults to the app's AppUserModelId().
+
 Set the app's login item settings.
 
 To work with Electron's `autoUpdater` on Windows, which uses [Squirrel][Squirrel-Windows],
@@ -1296,7 +1223,7 @@ Show the app's about panel options. These options can be overridden with `app.se
   * `credits` String (optional) _macOS_ _Windows_ - Credit information.
   * `authors` String[] (optional) _Linux_ - List of app authors.
   * `website` String (optional) _Linux_ - The app's website.
-  * `iconPath` String (optional) _Linux_ _Windows_ - Path to the app's icon in a JPEG or PNG file format. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.
+  * `iconPath` String (optional) _Linux_ _Windows_ - Path to the app's icon. On Linux, will be shown as 64x64 pixels while retaining aspect ratio.
 
 Set the about panel options. This will override the values defined in the app's `.plist` file on macOS. See the [Apple docs][about-panel-options] for more details. On Linux, values must be set in order to be shown; there are no defaults.
 
@@ -1357,7 +1284,7 @@ method returns false. If we fail to perform the copy, then this method will
 throw an error. The message in the error should be informative and tell
 you exactly what went wrong.
 
-By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the pre-existing running app will assume focus and the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.
+By default, if an app of the same name as the one being moved exists in the Applications directory and is _not_ running, the existing app will be trashed and the active app moved into its place. If it _is_ running, the pre-existing running app will assume focus and the the previously active app will quit itself. This behavior can be changed by providing the optional conflict handler, where the boolean returned by the handler determines whether or not the move conflict is resolved with default behavior.  i.e. returning `false` will ensure no further action is taken, returning `true` will result in the default behavior and the method continuing.
 
 For example:
 
@@ -1485,12 +1412,3 @@ which native modules you can use in the renderer process.  For more information
 on the direction Electron is going with renderer process restarts and usage of
 native modules in the renderer process please check out this
 [Tracking Issue](https://github.com/electron/electron/issues/18397).
-
-### `app.runningUnderRosettaTranslation` _macOS_ _Readonly_
-
-A `Boolean` which when `true` indicates that the app is currently running
-under the [Rosetta Translator Environment](https://en.wikipedia.org/wiki/Rosetta_(software)).
-
-You can use this property to prompt users to download the arm64 version of
-your application when they are running the x64 version under Rosetta
-incorrectly.

docs/api/auto-updater.md

@@ -104,7 +104,7 @@ The `autoUpdater` object has the following methods:
 * `options` Object
   * `url` String
   * `headers` Record<String, String> (optional) _macOS_ - HTTP request headers.
-  * `serverType` String (optional) _macOS_ - Can be `json` or `default`, see the [Squirrel.Mac][squirrel-mac]
+  * `serverType` String (optional) _macOS_ - Either `json` or `default`, see the [Squirrel.Mac][squirrel-mac]
     README for more information.
 
 Sets the `url` and initialize the auto updater.

docs/api/browser-view.md

@@ -28,6 +28,25 @@ view.webContents.loadURL('https://electronjs.org')
 * `options` Object (optional)
   * `webPreferences` Object (optional) - See [BrowserWindow](browser-window.md).
 
+### Static Methods
+
+#### `BrowserView.getAllViews()`
+
+Returns `BrowserView[]` - An array of all opened BrowserViews.
+
+#### `BrowserView.fromWebContents(webContents)`
+
+* `webContents` [WebContents](web-contents.md)
+
+Returns `BrowserView | null` - The BrowserView that owns the given `webContents`
+or `null` if the contents are not owned by a BrowserView.
+
+#### `BrowserView.fromId(id)`
+
+* `id` Integer
+
+Returns `BrowserView` - The view with the given `id`.
+
 ### Instance Properties
 
 Objects created with `new BrowserView` have the following properties:
@@ -36,10 +55,24 @@ Objects created with `new BrowserView` have the following properties:
 
 A [`WebContents`](web-contents.md) object owned by this view.
 
+#### `view.id` _Experimental_
+
+A `Integer` representing the unique ID of the view.
+
 ### Instance Methods
 
 Objects created with `new BrowserView` have the following instance methods:
 
+#### `view.destroy()`
+
+Force closing the view, the `unload` and `beforeunload` events won't be emitted
+for the web page. After you're done with a view, call this function in order to
+free memory and other resources as soon as possible.
+
+#### `view.isDestroyed()`
+
+Returns `Boolean` - Whether the view is destroyed.
+
 #### `view.setAutoResize(options)` _Experimental_
 
 * `options` Object

docs/api/browser-window.md

@@ -38,7 +38,7 @@ the window after this event will have no visual flash:
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ show: false })
+let win = new BrowserWindow({ show: false })
 win.once('ready-to-show', () => {
   win.show()
 })
@@ -60,7 +60,7 @@ immediately, and use a `backgroundColor` close to your app's background:
 ```javascript
 const { BrowserWindow } = require('electron')
 
-const win = new BrowserWindow({ backgroundColor: '#2e2c29' })
+let win = new BrowserWindow({ backgroundColor: '#2e2c29' })
 win.loadURL('https://github.com')
 ```
 
@@ -74,8 +74,8 @@ By using `parent` option, you can create child windows:
 ```javascript
 const { BrowserWindow } = require('electron')
 
-const top = new BrowserWindow()
-const child = new BrowserWindow({ parent: top })
+let top = new BrowserWindow()
+let child = new BrowserWindow({ parent: top })
 child.show()
 top.show()
 ```
@@ -90,7 +90,7 @@ window, you have to set both `parent` and `modal` options:
 ```javascript
 const { BrowserWindow } = require('electron')
 
-const child = new BrowserWindow({ parent: top, modal: true, show: false })
+let child = new BrowserWindow({ parent: top, modal: true, show: false })
 child.loadURL('https://github.com')
 child.once('ready-to-show', () => {
   child.show()
@@ -541,12 +541,6 @@ Note that this is only emitted when the window is being resized manually. Resizi
 
 Emitted after the window has been resized.
 
-#### Event: 'resized' _macOS_ _Windows_
-
-Emitted once when the window has finished being resized.
-
-This is usually emitted when the window has been resized manually. On macOS, resizing the window with `setBounds`/`setSize` and setting the `animate` parameter to `true` will also emit this event once resizing has finished.
-
 #### Event: 'will-move' _macOS_ _Windows_
 
 Returns:
@@ -562,12 +556,12 @@ Note that this is only emitted when the window is being resized manually. Resizi
 
 Emitted when the window is being moved to a new position.
 
-#### Event: 'moved' _macOS_ _Windows_
+__Note__: On macOS this event is an alias of `moved`.
+
+#### Event: 'moved' _macOS_
 
 Emitted once when the window is moved to a new position.
 
-__Note__: On macOS this event is an alias of `move`.
-
 #### Event: 'enter-full-screen'
 
 Emitted when the window enters a full-screen state.
@@ -610,7 +604,7 @@ e.g. `APPCOMMAND_BROWSER_BACKWARD` is emitted as `browser-backward`.
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 win.on('app-command', (e, cmd) => {
   // Navigate the window back when the user hits their mouse back button
   if (cmd === 'browser-backward' && win.webContents.canGoBack()) {
@@ -676,20 +670,6 @@ Emitted when the window has closed a sheet.
 
 Emitted when the native new tab button is clicked.
 
-#### Event: 'system-context-menu' _Windows_
-
-Returns:
-
-* `event` Event
-* `point` [Point](structures/point.md) - The screen coordinates the context menu was triggered at
-
-Emitted when the system context menu is triggered on the window, this is
-normally only triggered when the user right clicks on the non-client area
-of your window.  This is the window titlebar or any area you have declared
-as `-webkit-app-region: drag` in a frameless window.
-
-Calling `event.preventDefault()` will prevent the menu from being displayed.
-
 ### Static Methods
 
 The `BrowserWindow` class has the following static methods:
@@ -719,7 +699,7 @@ Returns `BrowserWindow | null` - The window that owns the given `browserView`. I
 
 * `id` Integer
 
-Returns `BrowserWindow | null` - The window with the given `id`.
+Returns `BrowserWindow` - The window with the given `id`.
 
 #### `BrowserWindow.addExtension(path)` _Deprecated_
 
@@ -799,7 +779,7 @@ To check if a DevTools extension is installed you can run the following:
 ```javascript
 const { BrowserWindow } = require('electron')
 
-const installed = 'devtron' in BrowserWindow.getDevToolsExtensions()
+let installed = BrowserWindow.getDevToolsExtensions().hasOwnProperty('devtron')
 console.log(installed)
 ```
 
@@ -816,7 +796,7 @@ Objects created with `new BrowserWindow` have the following properties:
 ```javascript
 const { BrowserWindow } = require('electron')
 // In this example `win` is our instance
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('https://github.com')
 ```
 
@@ -1341,9 +1321,9 @@ a HTML-rendered toolbar. For example:
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 
-const toolbarRect = document.getElementById('toolbar').getBoundingClientRect()
+let toolbarRect = document.getElementById('toolbar').getBoundingClientRect()
 win.setSheetOffset(toolbarRect.height)
 ```
 
@@ -1467,7 +1447,7 @@ Node's [`url.format`](https://nodejs.org/api/url.html#url_url_format_urlobject)
 method:
 
 ```javascript
-const url = require('url').format({
+let url = require('url').format({
   protocol: 'file',
   slashes: true,
   pathname: require('path').join(__dirname, 'index.html')
@@ -1849,6 +1829,13 @@ Replacement API for setBrowserView supporting work with multi browser views.
 
 * `browserView` [BrowserView](browser-view.md)
 
+#### `win.setTopBrowserView(browserView)` _Experimental_
+
+* `browserView` [BrowserView](browser-view.md)
+
+Raises `browserView` above other `BrowserView`s attached to `win`.
+Throws an error if `browserView` is not attached to `win`.
+
 #### `win.getBrowserViews()` _Experimental_
 
 Returns `BrowserView[]` - an array of all BrowserViews that have been attached

docs/api/client-request.md

@@ -171,20 +171,6 @@ lowercasing. It can be called only before first write. Calling this method after
 the first write will throw an error. If the passed value is not a `String`, its
 `toString()` method will be called to obtain the final value.
 
-Certain headers are restricted from being set by apps. These headers are
-listed below. More information on restricted headers can be found in
-[Chromium's header utils](https://source.chromium.org/chromium/chromium/src/+/master:services/network/public/cpp/header_util.cc;drc=1562cab3f1eda927938f8f4a5a91991fefde66d3;bpv=1;bpt=1;l=22).
-
-* `Content-Length`
-* `Host`
-* `Trailer` or `Te`
-* `Upgrade`
-* `Cookie2`
-* `Keep-Alive`
-* `Transfer-Encoding`
-
-Additionally, setting the `Connection` header to the value `upgrade` is also disallowed.
-
 #### `request.getHeader(name)`
 
 * `name` String - Specify an extra header name.

docs/api/content-tracing.md

@@ -16,7 +16,7 @@ const { app, contentTracing } = require('electron')
 app.whenReady().then(() => {
   (async () => {
     await contentTracing.startRecording({
-      included_categories: ['*']
+      include_categories: ['*']
     })
     console.log('Tracing started')
     await new Promise(resolve => setTimeout(resolve, 5000))
@@ -83,4 +83,4 @@ Returns `Promise<Object>` - Resolves with an object containing the `value` and `
 Get the maximum usage across processes of trace buffer as a percentage of the
 full state.
 
-[trace viewer]: https://chromium.googlesource.com/catapult/+/HEAD/tracing/README.md
+[trace viewer]: https://github.com/catapult-project/catapult/blob/master/tracing

docs/api/crash-reporter.md

@@ -170,7 +170,7 @@ your crash reporting backend you should stitch together keys in this format.
 
 * `key` String - Parameter key, must be no longer than 39 bytes.
 
-Remove an extra parameter from the current set of parameters. Future crashes
+Remove a extra parameter from the current set of parameters. Future crashes
 will not include this parameter.
 
 ### `crashReporter.getParameters()`

docs/api/debugger.md

@@ -9,7 +9,7 @@ runtime that allows interacting with pages and instrumenting them.
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 
 try {
   win.webContents.debugger.attach('1.1')

docs/api/dialog.md

@@ -269,7 +269,7 @@ Shows a message box, it will block the process until the message box is closed.
 It returns the index of the clicked button.
 
 The `browserWindow` argument allows the dialog to attach itself to a parent window, making it modal.
-If `browserWindow` is not shown dialog will not be attached to it. In such case it will be displayed as an independent window.
+If `browserWindow` is not shown dialog will not be attached to it. In such case It will be displayed as independed window.
 
 ### `dialog.showMessageBox([browserWindow, ]options)`
 

docs/api/download-item.md

@@ -11,7 +11,7 @@ control the download item.
 ```javascript
 // In the main process.
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 win.webContents.session.on('will-download', (event, item, webContents) => {
   // Set the save path, making Electron not to prompt a save dialog.
   item.setSavePath('/tmp/save.pdf')

docs/api/extensions.md

@@ -114,3 +114,9 @@ The following methods of `chrome.management` are supported:
 - `chrome.management.getPermissionWarningsByManifest`
 - `chrome.management.onEnabled`
 - `chrome.management.onDisabled`
+
+### `chrome.webRequest`
+
+All features of this API are supported.
+
+> **NOTE:** Electron's [`webRequest`](web-request.md) module takes precedence over `chrome.webRequest` if there are conflicting handlers.

docs/api/frameless-window.md

@@ -15,7 +15,7 @@ To create a frameless window, you need to set `frame` to `false` in
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ width: 800, height: 600, frame: false })
+let win = new BrowserWindow({ width: 800, height: 600, frame: false })
 win.show()
 ```
 
@@ -33,7 +33,7 @@ Results in a hidden title bar and a full size content window, yet the title bar
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ titleBarStyle: 'hidden' })
+let win = new BrowserWindow({ titleBarStyle: 'hidden' })
 win.show()
 ```
 
@@ -43,7 +43,7 @@ Results in a hidden title bar with an alternative look where the traffic light b
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ titleBarStyle: 'hiddenInset' })
+let win = new BrowserWindow({ titleBarStyle: 'hiddenInset' })
 win.show()
 ```
 
@@ -58,7 +58,7 @@ This option is only applicable for frameless windows.
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ titleBarStyle: 'customButtonsOnHover', frame: false })
+let win = new BrowserWindow({ titleBarStyle: 'customButtonsOnHover', frame: false })
 win.show()
 ```
 
@@ -69,7 +69,7 @@ window transparent:
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ transparent: true, frame: false })
+let win = new BrowserWindow({ transparent: true, frame: false })
 win.show()
 ```
 
@@ -100,7 +100,7 @@ API:
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 win.setIgnoreMouseEvents(true)
 ```
 
@@ -112,8 +112,8 @@ optional parameter can be used to forward mouse move messages to the web page,
 allowing events such as `mouseleave` to be emitted:
 
 ```javascript
-const win = require('electron').remote.getCurrentWindow()
-const el = document.getElementById('clickThroughElement')
+let win = require('electron').remote.getCurrentWindow()
+let el = document.getElementById('clickThroughElement')
 el.addEventListener('mouseenter', () => {
   win.setIgnoreMouseEvents(true, { forward: true })
 })

docs/api/global-shortcut.md

@@ -9,7 +9,7 @@ with the operating system so that you can customize the operations for various
 shortcuts.
 
 **Note:** The shortcut is global; it will work even if the app does
-not have the keyboard focus. You should not use this module until the `ready`
+not have the keyboard focus. This module cannot be used before the `ready`
 event of the app module is emitted.
 
 ```javascript

docs/api/ipc-main.md

@@ -148,4 +148,4 @@ found in the [`ipc-main-invoke-event`](structures/ipc-main-invoke-event.md)
 structure docs.
 
 [event-emitter]: https://nodejs.org/api/events.html#events_class_eventemitter
-[web-contents-send]: web-contents.md#contentssendchannel-args
+[web-contents-send]: web-contents.md#contentssendchannel-arg1-arg2-

docs/api/ipc-renderer.md

@@ -61,9 +61,13 @@ Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will no
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
-> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects will throw an exception.
+>
+> Since the main process does not have support for DOM objects such as
+> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
+> Electron's IPC to the main process, as the main process would have no way to decode
+> them. Attempting to send such objects over IPC will result in an error.
 
 The main process handles it by listening for `channel` with the
 [`ipcMain`](ipc-main.md) module.
@@ -85,9 +89,13 @@ Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will no
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
-> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects will throw an exception.
+>
+> Since the main process does not have support for DOM objects such as
+> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
+> Electron's IPC to the main process, as the main process would have no way to decode
+> them. Attempting to send such objects over IPC will result in an error.
 
 The main process should listen for `channel` with
 [`ipcMain.handle()`](ipc-main.md#ipcmainhandlechannel-listener).
@@ -108,7 +116,7 @@ ipcMain.handle('some-name', async (event, someArgument) => {
 
 If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRenderer.postMessage`](#ipcrendererpostmessagechannel-message-transfer).
 
-If you do not need a response to the message, consider using [`ipcRenderer.send`](#ipcrenderersendchannel-args).
+If you do not need a respons to the message, consider using [`ipcRenderer.send`](#ipcrenderersendchannel-args).
 
 ### `ipcRenderer.sendSync(channel, ...args)`
 
@@ -123,9 +131,13 @@ Algorithm][SCA], just like [`window.postMessage`][], so prototype chains will no
 included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
-> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects will throw an exception.
+>
+> Since the main process does not have support for DOM objects such as
+> `ImageBitmap`, `File`, `DOMMatrix` and so on, such objects cannot be sent over
+> Electron's IPC to the main process, as the main process would have no way to decode
+> them. Attempting to send such objects over IPC will result in an error.
 
 The main process handles it by listening for `channel` with [`ipcMain`](ipc-main.md) module,
 and replies by setting `event.returnValue`.

docs/api/menu.md

@@ -22,8 +22,10 @@ Sets `menu` as the application menu on macOS. On Windows and Linux, the
 Also on Windows and Linux, you can use a `&` in the top-level item name to
 indicate which letter should get a generated accelerator. For example, using
 `&File` for the file menu would result in a generated `Alt-F` accelerator that
-opens the associated menu. The indicated character in the button label gets an
-underline. The `&` character is not displayed on the button label.
+opens the associated menu. The indicated character in the button label then gets an
+underline, and the `&` character is not displayed on the button label.
+
+In order to escape the `&` character in an item name, add a proceeding `&`. For example, `&&File` would result in `&File` displayed on the button label.
 
 Passing `null` will suppress the default menu. On Windows and Linux,
 this has the additional effect of removing the menu bar from the window.
@@ -96,7 +98,7 @@ Appends the `menuItem` to the menu.
 
 * `id` String
 
-Returns `MenuItem | null` the item with the specified `id`
+Returns `MenuItem` the item with the specified `id`
 
 #### `menu.insert(pos, menuItem)`
 
@@ -195,8 +197,8 @@ const template = [
         {
           label: 'Speech',
           submenu: [
-            { role: 'startSpeaking' },
-            { role: 'stopSpeaking' }
+            { role: 'startspeaking' },
+            { role: 'stopspeaking' }
           ]
         }
       ] : [
@@ -211,12 +213,12 @@ const template = [
     label: 'View',
     submenu: [
       { role: 'reload' },
-      { role: 'forceReload' },
-      { role: 'toggleDevTools' },
+      { role: 'forcereload' },
+      { role: 'toggledevtools' },
       { type: 'separator' },
-      { role: 'resetZoom' },
-      { role: 'zoomIn' },
-      { role: 'zoomOut' },
+      { role: 'resetzoom' },
+      { role: 'zoomin' },
+      { role: 'zoomout' },
       { type: 'separator' },
       { role: 'togglefullscreen' }
     ]

docs/api/modernization/overview.md

@@ -1,6 +1,6 @@
 ## Modernization
 
-The Electron team is currently undergoing an initiative to modernize our API in a few concrete ways. These include: updating our modules to use idiomatic JS properties instead of separate `getPropertyX` and `setpropertyX`, converting callbacks to promises, and removing some other anti-patterns present in our APIs. The current status of the Promise initiative can be tracked in the [promisification](promisification.md) tracking file.
+The Electron team is currently undergoing an initiative to modernize our API in a few concrete ways. These include: updating our modules to use idiomatic JS properties instead of separate `getPropertyX` and `setpropertyX`, converting callbacks to promises, and removing some other anti-patterns present in our APIs. The current status of the Promise intiative can be tracked in the [promisification](promisification.md) tracking file.
 
 As we work to perform these updates, we seek to create the least disruptive amount of change at any given time, so as many changes as possible will be introduced in a backward compatible manner and deprecated after enough time has passed to give users a chance to upgrade their API calls.
 

docs/api/native-theme.md

@@ -58,7 +58,7 @@ Your application should then always use `shouldUseDarkColors` to determine what
 ### `nativeTheme.shouldUseHighContrastColors` _macOS_ _Windows_ _Readonly_
 
 A `Boolean` for if the OS / Chromium currently has high-contrast mode enabled
-or is being instructed to show a high-contrast UI.
+or is being instructed to show a high-constrast UI.
 
 ### `nativeTheme.shouldUseInvertedColorScheme` _macOS_ _Windows_ _Readonly_
 

docs/api/protocol.md

@@ -63,8 +63,8 @@ The `protocol` module has the following methods:
 module gets emitted and can be called only once.
 
 Registers the `scheme` as standard, secure, bypasses content security policy for
-resources, allows registering ServiceWorker, supports fetch API, and streaming
-video/audio. Specify a privilege with the value of `true` to enable the capability.
+resources, allows registering ServiceWorker and supports fetch API. Specify a
+privilege with the value of `true` to enable the capability.
 
 An example of registering a privileged scheme, that bypasses Content Security
 Policy:
@@ -103,11 +103,6 @@ cookies) are disabled for non standard schemes. So in general if you want to
 register a custom protocol to replace the `http` protocol, you have to register
 it as a standard scheme.
 
-Protocols that use streams (http and stream protocols) should set `stream: true`.
-The `<video>` and `<audio>` HTML elements expect protocols to buffer their
-responses by default. The `stream` flag configures those elements to correctly
-expect streaming responses.
-
 ### `protocol.registerFileProtocol(scheme, handler)`
 
 * `scheme` String

docs/api/remote.md

@@ -17,7 +17,7 @@ renderer process:
 
 ```javascript
 const { BrowserWindow } = require('electron').remote
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('https://github.com')
 ```
 

docs/api/screen.md

@@ -33,8 +33,8 @@ const { app, BrowserWindow, screen } = require('electron')
 let win
 
 app.whenReady().then(() => {
-  const displays = screen.getAllDisplays()
-  const externalDisplay = displays.find((display) => {
+  let displays = screen.getAllDisplays()
+  let externalDisplay = displays.find((display) => {
     return display.bounds.x !== 0 || display.bounds.y !== 0
   })
 

docs/api/service-workers.md

@@ -39,7 +39,7 @@ Returns:
   * `message` String - The actual console message
   * `versionId` Number - The version ID of the service worker that sent the log message
   * `source` String - The type of source for this message.  Can be `javascript`, `xml`, `network`, `console-api`, `storage`, `app-cache`, `rendering`, `security`, `deprecation`, `worker`, `violation`, `intervention`, `recommendation` or `other`.
-  * `level` Number - The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and `error`.
+  * `level` Number - The log level, from 0 to 3.  In order it matches `verbose`, `info`, `warning` and `error`.
   * `sourceUrl` String - The URL the message came from
   * `lineNumber` Number - The line number of the source that triggered this console message
 

docs/api/session.md

@@ -12,7 +12,7 @@ property of [`WebContents`](web-contents.md), or from the `session` module.
 ```javascript
 const { BrowserWindow } = require('electron')
 
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('http://github.com')
 
 const ses = win.webContents.session
@@ -332,7 +332,7 @@ verify proc.
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 
 win.webContents.session.setCertificateVerifyProc((request, callback) => {
   const { hostname } = request
@@ -348,17 +348,8 @@ win.webContents.session.setCertificateVerifyProc((request, callback) => {
 
 * `handler` Function | null
   * `webContents` [WebContents](web-contents.md) - WebContents requesting the permission.  Please note that if the request comes from a subframe you should use `requestingUrl` to check the request origin.
-  * `permission` String - The type of requested permission.
-    * `clipboard-read` - Request access to read from the clipboard.
-    * `media` -  Request access to media devices such as camera, microphone and speakers.
-    * `mediaKeySystem` - Request access to DRM protected content.
-    * `geolocation` - Request access to user's current location.
-    * `notifications` - Request notification creation and the ability to display them in the user's system tray.
-    * `midi` - Request MIDI access in the `webmidi` API.
-    * `midiSysex` - Request the use of system exclusive messages in the `webmidi` API.
-    * `pointerLock` - Request to directly interpret mouse movements as an input method. Click [here](https://developer.mozilla.org/en-US/docs/Web/API/Pointer_Lock_API) to know more.
-    * `fullscreen` - Request for the app to enter fullscreen mode.
-    * `openExternal` - Request to open links in external applications.
+  * `permission` String - Enum of 'media', 'geolocation', 'notifications', 'midiSysex',
+    'pointerLock', 'fullscreen', 'openExternal'.
   * `callback` Function
     * `permissionGranted` Boolean - Allow or deny the permission.
   * `details` Object - Some properties are only available on certain permission types.
@@ -390,7 +381,7 @@ session.fromPartition('some-partition').setPermissionRequestHandler((webContents
   * `permission` String - Enum of 'media'.
   * `requestingOrigin` String - The origin URL of the permission check
   * `details` Object - Some properties are only available on certain permission types.
-    * `securityOrigin` String - The security origin of the `media` check.
+    * `securityOrigin` String - The security orign of the `media` check.
     * `mediaType` String - The type of media access being requested, can be `video`,
       `audio` or `unknown`
     * `requestingUrl` String - The last URL the requesting frame loaded
@@ -527,7 +518,7 @@ Returns `String[]` - An array of language codes the spellchecker is enabled for.
 will fallback to using `en-US`.  By default on launch if this setting is an empty list Electron will try to populate this
 setting with the current OS locale.  This setting is persisted across restarts.
 
-**Note:** On macOS the OS spellchecker is used and has its own list of languages.  This API is a no-op on macOS.
+**Note:** On macOS the OS spellchecker is used and has it's own list of languages.  This API is a no-op on macOS.
 
 #### `ses.setSpellCheckerDictionaryDownloadURL(url)`
 
@@ -664,7 +655,7 @@ const path = require('path')
 app.whenReady().then(() => {
   const protocol = session.fromPartition('some-partition').protocol
   protocol.registerFileProtocol('atom', (request, callback) => {
-    const url = request.url.substr(7)
+    let url = request.url.substr(7)
     callback({ path: path.normalize(`${__dirname}/${url}`) })
   }, (error) => {
     if (error) console.error('Failed to register protocol')

docs/api/shell.md

@@ -30,7 +30,7 @@ Show the given file in a file manager. If possible, select the file.
 
 * `path` String
 
-Returns `Promise<String>` - Resolves with a string containing the error message corresponding to the failure if a failure occurred, otherwise "".
+Returns `Promise<String>` - Resolves with an string containing the error message corresponding to the failure if a failure occurred, otherwise "".
 
 Open the given file in the desktop's default manner.
 

docs/api/structures/custom-scheme.md

@@ -8,4 +8,3 @@
   * `allowServiceWorkers` Boolean (optional) - Default false.
   * `supportFetchAPI` Boolean (optional) - Default false.
   * `corsEnabled` Boolean (optional) - Default false.
-  * `stream` Boolean (optional) - Default false.

docs/api/structures/desktop-capturer-source.md

@@ -19,5 +19,5 @@
   available.
 * `appIcon` [NativeImage](../native-image.md) - An icon image of the
   application that owns the window or null if the source has a type screen.
-  The size of the icon is not known in advance and depends on what
+  The size of the icon is not known in advance and depends on what the
   the application provides.

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

@@ -1,5 +1,6 @@
 # IpcMainEvent Object extends `Event`
 
+* `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `returnValue` any - Set this to the value to be returned in a synchronous message
 * `sender` WebContents - Returns the `webContents` that sent the message

docs/api/structures/ipc-main-invoke-event.md

@@ -1,4 +1,5 @@
 # IpcMainInvokeEvent Object extends `Event`
 
+* `processId` Integer - The internal ID of the renderer process that sent this message
 * `frameId` Integer - The ID of the renderer frame that sent this message
 * `sender` WebContents - Returns the `webContents` that sent the message

docs/api/structures/keyboard-event.md

@@ -1,4 +1,4 @@
-# KeyboardEvent Object
+# KeyboardEvent Object extends `Event`
 
 * `ctrlKey` Boolean (optional) - whether the Control key was used in an accelerator to trigger the Event
 * `metaKey` Boolean (optional) - whether a meta key was used in an accelerator to trigger the Event

docs/api/structures/printer-info.md

@@ -7,7 +7,7 @@
 * `isDefault` Boolean - whether or not a given printer is set as the default printer on the OS.
 * `options` Object - an object containing a variable number of platform-specific printer information.
 
-The number represented by `status` means different things on different platforms: on Windows its potential values can be found [here](https://docs.microsoft.com/en-us/windows/win32/printdocs/printer-info-2), and on Linux and macOS they can be found [here](https://www.cups.org/doc/cupspm.html).
+The number represented by `status` means different things on different platforms: on Windows it's potential values can be found [here](https://docs.microsoft.com/en-us/windows/win32/printdocs/printer-info-2), and on Linux and macOS they can be found [here](https://www.cups.org/doc/cupspm.html).
 
 ## Example
 

docs/api/structures/process-metric.md

@@ -11,8 +11,6 @@
   * `Pepper Plugin`
   * `Pepper Plugin Broker`
   * `Unknown`
-* `name` String (optional) - The name of the process. i.e. for plugins it might be Flash.
-    Examples for utility: `Audio Service`, `Content Decryption Module Service`, `Network Service`, `Video Capture`, etc.
 * `cpu` [CPUUsage](cpu-usage.md) - CPU usage of the process.
 * `creationTime` Number - Creation time for this process.
     The time is represented as number of milliseconds since epoch.

docs/api/structures/trace-config.md

@@ -6,7 +6,7 @@
 * `trace_buffer_size_in_events` number (optional) - maximum size of the trace
   recording buffer in events.
 * `enable_argument_filter` boolean (optional) - if true, filter event data
-  according to a specific list of events that have been manually vetted to not
+  according to a whitelist of events that have been manually vetted to not
   include any PII. See [the implementation in
   Chromium][trace_event_args_whitelist.cc] for specifics.
 * `included_categories` String[] (optional) - a list of tracing categories to
@@ -41,7 +41,7 @@ An example TraceConfig that roughly matches what Chrome DevTools records:
     'disabled-by-default-v8.cpu_profiler',
     'disabled-by-default-v8.cpu_profiler.hires'
   ],
-  excluded_categories: ['*']
+  excluded_categories: [ '*' ]
 }
 ```
 

docs/api/system-preferences.md

@@ -132,6 +132,8 @@ This is necessary for events such as `NSUserDefaultsDidChangeNotification`.
   * `userInfo` Record<String, unknown>
   * `object` String
 
+Returns `Number` - The ID of this subscription
+
 Same as `subscribeNotification`, but uses `NSWorkspace.sharedWorkspace.notificationCenter`.
 This is necessary for events such as `NSWorkspaceDidActivateApplicationNotification`.
 
@@ -209,7 +211,7 @@ not (transparent windows won't work correctly when DWM composition is disabled):
 
 ```javascript
 const { BrowserWindow, systemPreferences } = require('electron')
-const browserOptions = { width: 1000, height: 800 }
+let browserOptions = { width: 1000, height: 800 }
 
 // Make the window transparent only if the platform supports it.
 if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
@@ -218,7 +220,7 @@ if (process.platform !== 'win32' || systemPreferences.isAeroGlassEnabled()) {
 }
 
 // Create the window.
-const win = new BrowserWindow(browserOptions)
+let win = new BrowserWindow(browserOptions)
 
 // Navigate.
 if (browserOptions.transparent) {
@@ -406,7 +408,7 @@ systemPreferences.promptTouchID('To get consent for a Security-Gated Thing').the
 })
 ```
 
-This API itself will not protect your user data; rather, it is a mechanism to allow you to do so. Native apps will need to set [Access Control Constants](https://developer.apple.com/documentation/security/secaccesscontrolcreateflags?language=objc) like [`kSecAccessControlUserPresence`](https://developer.apple.com/documentation/security/secaccesscontrolcreateflags/ksecaccesscontroluserpresence?language=objc) on their keychain entry so that reading it would auto-prompt for Touch ID biometric consent. This could be done with [`node-keytar`](https://github.com/atom/node-keytar), such that one would store an encryption key with `node-keytar` and only fetch it if `promptTouchID()` resolves.
+This API itself will not protect your user data; rather, it is a mechanism to allow you to do so. Native apps will need to set [Access Control Constants](https://developer.apple.com/documentation/security/secaccesscontrolcreateflags?language=objc) like [`kSecAccessControlUserPresence`](https://developer.apple.com/documentation/security/secaccesscontrolcreateflags/ksecaccesscontroluserpresence?language=objc) on the their keychain entry so that reading it would auto-prompt for Touch ID biometric consent. This could be done with [`node-keytar`](https://github.com/atom/node-keytar), such that one would store an encryption key with `node-keytar` and only fetch it if `promptTouchID()` resolves.
 
 **NOTE:** This API will return a rejected Promise on macOS systems older than Sierra 10.12.2.
 

docs/api/touch-bar-button.md

@@ -41,10 +41,6 @@ the button in the touch bar.
 A `NativeImage` representing the button's current icon. Changing this value immediately updates the button
 in the touch bar.
 
-#### `touchBarButton.iconPosition`
-
-A `String` - Can be `left`, `right` or `overlay`.  Defaults to `overlay`.
-
 #### `touchBarButton.enabled`
 
 A `Boolean` representing whether the button is in an enabled state.

docs/api/touch-bar-segmented-control.md

@@ -49,7 +49,3 @@ updates the control in the touch bar. Updating deep properties inside this array
 
 An `Integer` representing the currently selected segment. Changing this value immediately updates the control
 in the touch bar. User interaction with the touch bar will update this value automatically.
-
-#### `touchBarSegmentedControl.mode`
-
-A `String` representing the current selection mode of the control.  Can be `single`, `multiple` or `buttons`.

docs/api/touch-bar-spacer.md

@@ -11,11 +11,3 @@ Process: [Main](../tutorial/application-architecture.md#main-and-renderer-proces
     * `small` - Small space between items. Maps to `NSTouchBarItemIdentifierFixedSpaceSmall`. This is the default.
     * `large` - Large space between items. Maps to `NSTouchBarItemIdentifierFixedSpaceLarge`.
     * `flexible` - Take up all available space. Maps to `NSTouchBarItemIdentifierFlexibleSpace`.
-
-### Instance Properties
-
-The following properties are available on instances of `TouchBarSpacer`:
-
-#### `touchBarSpacer.size`
-
-A `String` representing the size of the spacer.  Can be `small`, `large` or `flexible`.

docs/api/tray.md

@@ -217,11 +217,9 @@ Sets the `image` associated with this tray icon when pressed on macOS.
 
 Sets the hover text for this tray icon.
 
-#### `tray.setTitle(title[, options])` _macOS_
+#### `tray.setTitle(title)` _macOS_
 
 * `title` String
-* `options` Object (optional)
-  * `fontType` String (optional) - The font family variant to display, can be `monospaced` or `monospacedDigit`. `monospaced` is available in macOS 10.15+ and `monospacedDigit` is available in macOS 10.11+.  When left blank, the title uses the default system font.
 
 Sets the title displayed next to the tray icon in the status bar (Support ANSI colors).
 

docs/api/web-contents.md

@@ -12,10 +12,10 @@ the [`BrowserWindow`](browser-window.md) object. An example of accessing the
 ```javascript
 const { BrowserWindow } = require('electron')
 
-const win = new BrowserWindow({ width: 800, height: 1500 })
+let win = new BrowserWindow({ width: 800, height: 1500 })
 win.loadURL('http://github.com')
 
-const contents = win.webContents
+let contents = win.webContents
 console.log(contents)
 ```
 
@@ -42,8 +42,7 @@ returns `null`.
 
 * `id` Integer
 
-Returns `WebContents` | undefined - A WebContents instance with the given ID, or
-`undefined` if there is no WebContents associated with the given ID.
+Returns `WebContents` - A WebContents instance with the given ID.
 
 ## Class: WebContents
 
@@ -257,7 +256,7 @@ Returns:
 Emitted after a server side redirect occurs during navigation.  For example a 302
 redirect.
 
-This event cannot be prevented, if you want to prevent redirects you should
+This event can not be prevented, if you want to prevent redirects you should
 checkout out the `will-redirect` event above.
 
 #### Event: 'did-navigate'
@@ -349,7 +348,7 @@ Returns:
 Emitted when the renderer process crashes or is killed.
 
 **Deprecated:** This event is superceded by the `render-process-gone` event
-which contains more information about why the render process disappeared. It
+which contains more information about why the render process dissapeared. It
 isn't always because it crashed.  The `killed` boolean can be replaced by
 checking `reason === 'killed'` when you switch to that event.
 
@@ -368,7 +367,7 @@ Returns:
     * `launch-failed` - Process never successfully launched
     * `integrity-failure` - Windows code integrity checks failed
 
-Emitted when the renderer process unexpectedly disappears.  This is normally
+Emitted when the renderer process unexpectedly dissapears.  This is normally
 because it was crashed or killed.
 
 #### Event: 'unresponsive'
@@ -419,7 +418,7 @@ To only prevent the menu shortcuts, use
 ```javascript
 const { BrowserWindow } = require('electron')
 
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 
 win.webContents.on('before-input-event', (event, input) => {
   // For example, only enable application menu keyboard shortcuts when
@@ -666,7 +665,7 @@ app.whenReady().then(() => {
   win = new BrowserWindow({ width: 800, height: 600 })
   win.webContents.on('select-bluetooth-device', (event, deviceList, callback) => {
     event.preventDefault()
-    const result = deviceList.find((device) => {
+    let result = deviceList.find((device) => {
       return device.deviceName === 'test'
     })
     if (!result) {
@@ -692,7 +691,7 @@ buffer.
 ```javascript
 const { BrowserWindow } = require('electron')
 
-const win = new BrowserWindow({ webPreferences: { offscreen: true } })
+let win = new BrowserWindow({ webPreferences: { offscreen: true } })
 win.webContents.on('paint', (event, dirty, image) => {
   // updateBitmap(dirty, image.getBitmap())
 })
@@ -721,7 +720,7 @@ This event can be used to configure `webPreferences` for the `webContents`
 of a `<webview>` before it's loaded, and provides the ability to set settings
 that can't be set via `<webview>` attributes.
 
-**Note:** The specified `preload` script option will appear as `preloadURL`
+**Note:** The specified `preload` script option will be appear as `preloadURL`
 (not `preload`) in the `webPreferences` object emitted with this event.
 
 #### Event: 'did-attach-webview'
@@ -739,9 +738,9 @@ Emitted when a `<webview>` has been attached to this web contents.
 Returns:
 
 * `event` Event
-* `level` Integer - The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and `error`.
-* `message` String - The actual console message
-* `line` Integer - The line number of the source that triggered this console message
+* `level` Integer
+* `message` String
+* `line` Integer
 * `sourceId` String
 
 Emitted when the associated window logs a console message.
@@ -908,7 +907,7 @@ Returns `String` - The URL of the current web page.
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('http://github.com').then(() => {
   const currentURL = win.webContents.getURL()
   console.log(currentURL)
@@ -999,34 +998,6 @@ Navigates to the specified offset from the "current entry".
 
 Returns `Boolean` - Whether the renderer process has crashed.
 
-#### `contents.forcefullyCrashRenderer()`
-
-Forcefully terminates the renderer process that is currently hosting this
-`webContents`. This will cause the `render-process-gone` event to be emitted
-with the `reason=killed || reason=crashed`. Please note that some webContents share renderer
-processes and therefore calling this method may also crash the host process
-for other webContents as well.
-
-Calling `reload()` immediately after calling this
-method will force the reload to occur in a new process. This should be used
-when this process is unstable or unusable, for instance in order to recover
-from the `unresponsive` event.
-
-```js
-contents.on('unresponsive', async () => {
-  const { response } = await dialog.showMessageBox({
-    message: 'App X has become unresponsive',
-    title: 'Do you want to try forcefully reloading the app?',
-    buttons: ['OK', 'Cancel'],
-    cancelId: 1
-  })
-  if (response === 0) {
-    contents.forcefullyCrashRenderer()
-    contents.reload()
-  }
-})
-```
-
 #### `contents.setUserAgent(userAgent)`
 
 * `userAgent` String
@@ -1284,7 +1255,7 @@ is large then 0.
 
 #### `contents.incrementCapturerCount([size, stayHidden])`
 
-* `size` [Size](structures/size.md) (optional) - The preferred size for the capturer.
+* `size` [Size](structures/size.md) (optional) - The perferred size for the capturer.
 * `stayHidden` Boolean (optional) -  Keep the page hidden instead of visible.
 
 Increase the capturer count by one. The page is considered visible when its browser window is
@@ -1340,7 +1311,7 @@ Returns [`PrinterInfo[]`](structures/printer-info.md)
   * `success` Boolean - Indicates success of the print call.
   * `failureReason` String - Error description called back if the print fails.
 
-When a custom `pageSize` is passed, Chromium attempts to validate platform specific minimum values for `width_microns` and `height_microns`. Width and height must both be minimum 353 microns but may be higher on some operating systems.
+When a custom `pageSize` is passed, Chromium attempts to validate platform specific minumum values for `width_microns` and `height_microns`. Width and height must both be minimum 353 microns but may be higher on some operating systems.
 
 Prints window's web page. When `silent` is set to `true`, Electron will pick
 the system's default printer if `deviceName` is empty and the default settings for printing.
@@ -1350,14 +1321,7 @@ Use `page-break-before: always;` CSS style to force to print to a new page.
 Example usage:
 
 ```js
-const options = {
-  silent: true,
-  deviceName: 'My-Printer',
-  pageRanges: [{
-    from: 0,
-    to: 1
-  }]
-}
+const options = { silent: true, deviceName: 'My-Printer' }
 win.webContents.print(options, (success, errorType) => {
   if (!success) console.log(errorType)
 })
@@ -1411,7 +1375,7 @@ const fs = require('fs')
 const path = require('path')
 const os = require('os')
 
-const win = new BrowserWindow({ width: 800, height: 600 })
+let win = new BrowserWindow({ width: 800, height: 600 })
 win.loadURL('http://github.com')
 
 win.webContents.on('did-finish-load', () => {
@@ -1437,7 +1401,7 @@ creation:
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 win.webContents.on('devtools-opened', () => {
   win.webContents.addWorkSpace(__dirname)
 })
@@ -1585,8 +1549,7 @@ included. Sending Functions, Promises, Symbols, WeakMaps, or WeakSets will
 throw an exception.
 
 > **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> special Electron objects will throw an exception.
 
 The renderer process can handle the message by listening to `channel` with the
 [`ipcRenderer`](ipc-renderer.md) module.
@@ -1622,7 +1585,9 @@ app.whenReady().then(() => {
 
 #### `contents.sendToFrame(frameId, channel, ...args)`
 
-* `frameId` Integer
+* `frameId` Integer | [number, number] - the ID of the frame to send to, or a
+  pair of `[processId, frameId]` if the frame is in a different process to the
+  main frame.
 * `channel` String
 * `...args` any[]
 
@@ -1632,9 +1597,8 @@ Send an asynchronous message to a specific frame in a renderer process via
 chains will not be included. Sending Functions, Promises, Symbols, WeakMaps, or
 WeakSets will throw an exception.
 
-> **NOTE**: Sending non-standard JavaScript types such as DOM objects or
-> special Electron objects is deprecated, and will begin throwing an exception
-> starting with Electron 9.
+> **NOTE:** Sending non-standard JavaScript types such as DOM objects or
+> special Electron objects will throw an exception.
 
 The renderer process can handle the message by listening to `channel` with the
 [`ipcRenderer`](ipc-renderer.md) module.
@@ -1758,7 +1722,7 @@ Returns `Promise<void>` - resolves if the page is saved.
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow()
+let win = new BrowserWindow()
 
 win.loadURL('https://github.com')
 
@@ -1796,7 +1760,7 @@ Returns `Boolean` - If *offscreen rendering* is enabled returns whether it is cu
 * `fps` Integer
 
 If *offscreen rendering* is enabled sets the frame rate to the specified number.
-Only values between 1 and 60 are accepted.
+Only values between 1 and 240 are accepted.
 
 #### `contents.getFrameRate()`
 
@@ -1894,7 +1858,7 @@ The zoom factor is the zoom percent divided by 100, so 300% = 3.0.
 #### `contents.frameRate`
 
 An `Integer` property that sets the frame rate of the web contents to the specified number.
-Only values between 1 and 60 are accepted.
+Only values between 1 and 240 are accepted.
 
 Only applicable if *offscreen rendering* is enabled.
 

docs/api/webview-tag.md

@@ -560,7 +560,7 @@ Stops any `findInPage` request for the `webview` with the provided `action`.
   * `pagesPerSheet` Number (optional) - The number of pages to print per page sheet.
   * `collate` Boolean (optional) - Whether the web page should be collated.
   * `copies` Number (optional) - The number of copies of the web page to print.
-  * `pageRanges` Object[] (optional) - The page range to print.
+  * `pageRanges` Object[] (optional) - The page range to print. On macOS, only the first range is honored.
     * `from` Number - Index of the first page to print (0-based).
     * `to` Number - Index of the last page to print (inclusive) (0-based).
   * `duplexMode` String (optional) - Set the duplex mode of the printed web page. Can be `simplex`, `shortEdge`, or `longEdge`.
@@ -755,9 +755,9 @@ Fired when page leaves fullscreen triggered by HTML API.
 
 Returns:
 
-* `level` Integer - The log level, from 0 to 3. In order it matches `verbose`, `info`, `warning` and `error`.
-* `message` String - The actual console message
-* `line` Integer - The line number of the source that triggered this console message
+* `level` Integer
+* `message` String
+* `line` Integer
 * `sourceId` String
 
 Fired when the guest window logs a console message.
@@ -816,7 +816,7 @@ const { shell } = require('electron')
 const webview = document.querySelector('webview')
 
 webview.addEventListener('new-window', async (e) => {
-  const protocol = (new URL(e.url)).protocol
+  const protocol = require('url').parse(e.url).protocol
   if (protocol === 'http:' || protocol === 'https:') {
     await shell.openExternal(e.url)
   }

docs/api/window-open.md

@@ -94,6 +94,6 @@ mainWindow.webContents.on('new-window', (event, url, frameName, disposition, opt
 
 ```javascript
 // renderer process (mainWindow)
-const modal = window.open('', 'modal')
+let modal = window.open('', 'modal')
 modal.document.write('<h1>Hello</h1>')
 ```

docs/breaking-changes.md

@@ -14,15 +14,6 @@ This document uses the following convention to categorize breaking changes:
 
 ## Planned Breaking API Changes (12.0)
 
-### Default Changed: `contextIsolation` defaults to `true`
-
-In Electron 12, `contextIsolation` will be enabled by default.  To restore
-the previous behavior, `contextIsolation: false` must be specified in WebPreferences.
-
-We [recommend having contextIsolation enabled](https://github.com/electron/electron/blob/master/docs/tutorial/security.md#3-enable-context-isolation-for-remote-content) for the security of your application.
-
-For more details see: https://github.com/electron/electron/issues/23506
-
 ### Removed: `crashReporter` methods in the renderer process
 
 The following `crashReporter` methods are no longer available in the renderer
@@ -353,7 +344,7 @@ const getGuestForWebContents = (webContentsId, contents) => {
     throw new Error(`Invalid webContentsId: ${webContentsId}`)
   }
   if (guest.hostWebContents !== contents) {
-    throw new Error('Access denied to webContents')
+    throw new Error(`Access denied to webContents`)
   }
   return guest
 }
@@ -377,6 +368,52 @@ in Electron 8.x, and cease to exist in Electron 9.x. The layout zoom level
 limits are now fixed at a minimum of 0.25 and a maximum of 5.0, as defined
 [here](https://chromium.googlesource.com/chromium/src/+/938b37a6d2886bf8335fc7db792f1eb46c65b2ae/third_party/blink/common/page/page_zoom.cc#11).
 
+### Deprecated events in `systemPreferences`
+
+The following `systemPreferences` events have been deprecated:
+* `inverted-color-scheme-changed`
+* `high-contrast-color-scheme-changed`
+
+Use the new `updated` event on the `nativeTheme` module instead.
+
+```js
+// Deprecated
+systemPreferences.on('inverted-color-scheme-changed', () => { /* ... */ })
+systemPreferences.on('high-contrast-color-scheme-changed', () => { /* ... */ })
+
+// Replace with
+nativeTheme.on('updated', () => { /* ... */ })
+```
+
+### Deprecated: methods in `systemPreferences`
+
+The following `systemPreferences` methods have been deprecated:
+* `systemPreferences.isDarkMode()`
+* `systemPreferences.isInvertedColorScheme()`
+* `systemPreferences.isHighContrastColorScheme()`
+
+Use the following `nativeTheme` properties instead:
+* `nativeTheme.shouldUseDarkColors`
+* `nativeTheme.shouldUseInvertedColorScheme`
+* `nativeTheme.shouldUseHighContrastColors`
+
+```js
+// Deprecated
+systemPreferences.isDarkMode()
+// Replace with
+nativeTheme.shouldUseDarkColors
+
+// Deprecated
+systemPreferences.isInvertedColorScheme()
+// Replace with
+nativeTheme.shouldUseInvertedColorScheme
+
+// Deprecated
+systemPreferences.isHighContrastColorScheme()
+// Replace with
+nativeTheme.shouldUseHighContrastColors
+```
+
 ## Planned Breaking API Changes (7.0)
 
 ### Deprecated: Atom.io Node Headers URL
@@ -409,7 +446,7 @@ powerMonitor.querySystemIdleState(threshold, callback)
 const idleState = powerMonitor.getSystemIdleState(threshold)
 ```
 
-### API Changed: `powerMonitor.querySystemIdleTime` is now `powerMonitor.getSystemIdleTime`
+### API Changed: `powerMonitor.querySystemIdleTime` is now `powerMonitor.getSystemIdleState`
 
 ```js
 // Removed in Electron 7.0
@@ -697,11 +734,11 @@ const { memory } = metrics[0] // Deprecated property
 
 ```js
 // Deprecated
-const optionsA = { webPreferences: { blinkFeatures: '' } }
-const windowA = new BrowserWindow(optionsA)
+let optionsA = { webPreferences: { blinkFeatures: '' } }
+let windowA = new BrowserWindow(optionsA)
 // Replace with
-const optionsB = { webPreferences: { enableBlinkFeatures: '' } }
-const windowB = new BrowserWindow(optionsB)
+let optionsB = { webPreferences: { enableBlinkFeatures: '' } }
+let windowB = new BrowserWindow(optionsB)
 
 // Deprecated
 window.on('app-command', (e, cmd) => {
@@ -872,11 +909,11 @@ The following list includes the breaking API changes made in Electron 2.0.
 
 ```js
 // Deprecated
-const optionsA = { titleBarStyle: 'hidden-inset' }
-const windowA = new BrowserWindow(optionsA)
+let optionsA = { titleBarStyle: 'hidden-inset' }
+let windowA = new BrowserWindow(optionsA)
 // Replace with
-const optionsB = { titleBarStyle: 'hiddenInset' }
-const windowB = new BrowserWindow(optionsB)
+let optionsB = { titleBarStyle: 'hiddenInset' }
+let windowB = new BrowserWindow(optionsB)
 ```
 
 ### `menu`

docs/development/README.md

@@ -23,3 +23,4 @@ For guides on Electron app development, see
 * [Debugging on macOS](debugging-instructions-macos.md)
 * [Setting Up Symbol Server in Debugger](setting-up-symbol-server.md)
 * [Patches](patches.md)
+* [Upgrading Node](upgrading-node.md)

docs/development/build-instructions-gn.md

@@ -10,10 +10,6 @@ Check the build prerequisites for your platform before proceeding
   * [Linux](build-instructions-linux.md#prerequisites)
   * [Windows](build-instructions-windows.md#prerequisites)
 
-## Build Tools
-
-[Electron's Build Tools](https://github.com/electron/build-tools) automate much of the setup for compiling Electron from source with different configurations and build targets. If you wish to set up the environment manually, the instructions are listed below.
-
 ## GN prerequisites
 
 You'll need to install [`depot_tools`][depot-tools], the toolset

docs/development/build-instructions-macos.md

@@ -42,7 +42,7 @@ $ pip install pyobjc
 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 9.4.1](http://adcdownload.apple.com/Developer_Tools/Xcode_9.4.1/Xcode_9.4.1.xip), and the macOS 10.13 SDK.  Building with a newer SDK works too, but the releases currently use the 10.13 SDK.
+Official Electron builds are built with [Xcode 11.1](https://download.developer.apple.com/Developer_Tools/Xcode_11.1/Xcode_11.1.xip), and the macOS 10.15 SDK. Building with a newer SDK works too, but the releases currently use the 10.15 SDK.
 
 ## Building Electron
 

docs/development/pull-requests.md

@@ -233,7 +233,7 @@ Try not to be discouraged. If you feel that a review is unfair, say so or seek
 the input of another project contributor. Often such comments are the result of
 a reviewer having taken insufficient time to review and are not ill-intended.
 Such difficulties can often be resolved with a bit of patience. That said,
-reviewers should be expected to provide helpful feedback.
+reviewers should be expected to provide helpful feeback.
 
 ### Step 11: Landing
 

docs/development/setting-up-symbol-server.md

@@ -15,7 +15,7 @@ calls, and other compiler optimizations. The only workaround is to build an
 unoptimized local build.
 
 The official symbol server URL for Electron is
-https://symbols.electronjs.org.
+https://electron-symbols.githubapp.com.
 You cannot visit this URL directly, you must add it to the symbol path of your
 debugging tool. In the examples below, a local cache directory is used to avoid
 repeatedly fetching the PDB from the server. Replace `c:\code\symbols` with an
@@ -30,7 +30,7 @@ directory on your computer, if you'd prefer a different location for downloaded
 symbols):
 
 ```powershell
-SRV*c:\code\symbols\*https://symbols.electronjs.org
+SRV*c:\code\symbols\*https://electron-symbols.githubapp.com
 ```
 
 Set this string as `_NT_SYMBOL_PATH` in the environment, using the Windbg menus,
@@ -38,7 +38,7 @@ or by typing the `.sympath` command. If you would like to get symbols from
 Microsoft's symbol server as well, you should list that first:
 
 ```powershell
-SRV*c:\code\symbols\*https://msdl.microsoft.com/download/symbols;SRV*c:\code\symbols\*https://symbols.electronjs.org
+SRV*c:\code\symbols\*https://msdl.microsoft.com/download/symbols;SRV*c:\code\symbols\*https://electron-symbols.githubapp.com
 ```
 
 ## Using the symbol server in Visual Studio

docs/development/upgrading-node.md

@@ -0,0 +1,121 @@
+# Upgrading Node
+
+## Discussion
+
+Chromium and Node.js both depend on V8, and Electron contains
+only a single copy of V8, so it's important to ensure that the
+version of V8 chosen is compatible with the build's version of
+Node.js and Chromium.
+
+Upgrading Node is much easier than upgrading Chromium, so fewer
+conflicts arise if one upgrades Chromium first, then chooses the
+upstream Node release whose version of V8 is closest to the one
+Chromium contains.
+
+Electron has its own [Node fork](https://github.com/electron/node)
+with modifications for the V8 build details mentioned above
+and for exposing API needed by Electron. Once an upstream Node
+release is chosen, it's placed in a branch in Electron's Node fork
+and any Electron Node patches are applied there.
+
+Another factor is that the Node project patches its version of V8.
+As mentioned above, Electron builds everything with a single copy
+of V8, so Node's V8 patches must be ported to that copy.
+
+Once all of Electron's dependencies are building and using the same
+copy of V8, the next step is to fix any Electron code issues caused
+by the Node upgrade.
+
+[FIXME] something about a Node debugger in Atom that we (e.g. deepak)
+use and need to confirm doesn't break with the Node upgrade?
+
+So in short, the primary steps are:
+
+1. Update Electron's Node fork to the desired version
+2. Backport Node's V8 patches to our copy of V8
+3. Update the GN build files, porting changes from node's GYP files
+4. Update Electron's DEPS to use new version of Node
+
+## Updating Electron's Node [fork](https://github.com/electron/node)
+
+1. Ensure that `master` on `electron/node` has updated release tags from `nodejs/node`
+2. Create a branch in https://github.com/electron/node: `electron-node-vX.X.X` where the base that you're branching from is the tag for the desired update
+  - `vX.X.X` Must use a version of Node compatible with our current version of Chromium
+3. Re-apply our commits from the previous version of Node we were using (`vY.Y.Y`) to `v.X.X.X`
+  - Check release tag and select the range of commits we need to re-apply
+  - Cherry-pick commit range:
+    1. Checkout both `vY.Y.Y` & `v.X.X.X`
+    2. `git cherry-pick FIRST_COMMIT_HASH..LAST_COMMIT_HASH`
+  - Resolve merge conflicts in each file encountered, then:
+    1. `git add <conflict-file>`
+    2. `git cherry-pick --continue`
+    3. Repeat until finished
+
+
+## Updating [V8](https://github.com/electron/node/src/V8) Patches
+
+We need to generate a patch file from each patch that Node
+applies to V8.
+
+```sh
+$ cd third_party/electron_node
+$ CURRENT_NODE_VERSION=vX.Y.Z
+# Find the last commit with the message "deps: update V8 to <some version>"
+# This commit corresponds to Node resetting V8 to its pristine upstream
+# state at the stated version.
+$ LAST_V8_UPDATE="$(git log --grep='^deps: update V8' --format='%H' -1 deps/v8)"
+# This creates a patch file containing all changes in deps/v8 from
+# $LAST_V8_UPDATE up to the current Node version, formatted in a way that
+# it will apply cleanly to the V8 repository (i.e. with `deps/v8`
+# stripped off the path and excluding the v8/gypfiles directory, which
+# isn't present in V8.
+$ git format-patch \
+    --relative=deps/v8 \
+    $LAST_V8_UPDATE..$CURRENT_NODE_VERSION \
+    deps/v8 \
+    ':(exclude)deps/v8/gypfiles' \
+    --stdout \
+    > ../../electron/common/patches/v8/node_v8_patches.patch
+```
+
+This list of patches will probably include one that claims to
+make the V8 API backwards-compatible with a previous version of
+V8. Unfortunately, those patches almost always change the V8 API
+in a way that is incompatible with Chromium.
+
+It's usually easier to update Node to work without the
+compatibility patch than to update Chromium to work with the
+compatibility patch, so it's recommended to revert the
+compatibility patch and fix any errors that arise when compiling
+Node.
+
+## Update Electron's `DEPS` file
+
+Update the `DEPS` file in the root of
+[electron/electron](https://github.com/electron/electron) to
+point to the git hash of the updated Node.
+
+## Notes
+
+- Node maintains its own fork of V8
+  - They backport a small amount of things as needed
+  - Documentation in Node about how [they work with V8](https://nodejs.org/api/v8.html)
+- We update code such that we only use one copy of V8 across all of Electron
+  - E.g Electron, Chromium, and Node.js
+- We don’t track upstream closely due to logistics:
+   - Upstream uses multiple repos and so merging into a single repo
+   would result in lost history. So we only update when we’re planning
+   a Node version bump in Electron.
+- Chromium is large and time-consuming to update, so we typically
+  choose the Node version based on which of its releases has a version
+  of V8 that’s closest to the version in Chromium that we’re using.
+  - We sometimes have to wait for the next periodic Node release
+   because it will sync more closely with the version of V8 in the new Chromium
+ - Electron keeps all its patches in the repo because it’s simpler than
+   maintaining different repos for patches for each upstream project.
+   - Crashpad, Node.js, Chromium, Skia etc. patches are all kept in the same place
+ - Building Node:
+   - We maintain our own GN build files for Node.js to make it easier to ensure
+     that eevrything is built with the same compiler flags.
+     This means that every time we upgrade Node.js we have to do a modest amount of
+     work to synchronize the GN files with the upstream GYP files.

docs/faq.md

@@ -43,14 +43,26 @@ use HTML5 APIs which are already available in browsers. Good candidates are
 [Storage API][storage], [`localStorage`][local-storage],
 [`sessionStorage`][session-storage], and [IndexedDB][indexed-db].
 
-Alternatively, you can use the IPC primitives that are provided by Electron. To
-share data between the main and renderer processes, you can use the
-[`ipcMain`](api/ipc-main.md) and [`ipcRenderer`](api/ipc-renderer.md) modules.
-To communicate directly between web pages, you can send a
-[`MessagePort`][message-port] from one to the other, possibly via the main process
-using [`ipcRenderer.postMessage()`](api/ipc-renderer.md#ipcrendererpostmessagechannel-message-transfer).
-Subsequent communication over message ports is direct and does not detour through
-the main process.
+Or you can use the IPC system, which is specific to Electron, to store objects
+in the main process as a global variable, and then to access them from the
+renderers through the `remote` property of `electron` module:
+
+```javascript
+// In the main process.
+global.sharedObject = {
+  someProperty: 'default value'
+}
+```
+
+```javascript
+// In page 1.
+require('electron').remote.getGlobal('sharedObject').someProperty = 'new value'
+```
+
+```javascript
+// In page 2.
+console.log(require('electron').remote.getGlobal('sharedObject').someProperty)
+```
 
 ## My app's tray disappeared after a few minutes.
 
@@ -95,7 +107,7 @@ To solve this, you can turn off node integration in Electron:
 ```javascript
 // In the main process.
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({
+let win = new BrowserWindow({
   webPreferences: {
     nodeIntegration: false
   }
@@ -143,7 +155,7 @@ To achieve this goal, set the background in the constructor for [BrowserWindow][
 
 ```javascript
 const { BrowserWindow } = require('electron')
-const win = new BrowserWindow({
+let win = new BrowserWindow({
   backgroundColor: '#fff'
 })
 ```
@@ -159,6 +171,5 @@ Notice that just setting the background in the CSS does not have the desired eff
 [local-storage]: https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage
 [session-storage]: https://developer.mozilla.org/en-US/docs/Web/API/Window/sessionStorage
 [indexed-db]: https://developer.mozilla.org/en-US/docs/Web/API/IndexedDB_API
-[message-port]: https://developer.mozilla.org/en-US/docs/Web/API/MessagePort
 [browser-window]: api/browser-window.md
 [subpixel rendering example]: images/subpixel-rendering-screenshot.gif

docs/fiddles/features/drag-and-drop/index.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-    <a href="#" id="drag">Drag me</a>
-    <script src="renderer.js"></script>
-</body>
-</html>

docs/fiddles/features/drag-and-drop/main.js

@@ -1,41 +0,0 @@
-const { app, BrowserWindow, ipcMain, nativeImage, NativeImage } = require('electron')
-const fs = require('fs');
-const http = require('http');
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-const iconName = 'iconForDragAndDrop.png';
-const icon = fs.createWriteStream(`${process.cwd()}/${iconName}`);
-http.get('http://img.icons8.com/ios/452/drag-and-drop.png', (response) => {
-  response.pipe(icon);
-});
-
-app.whenReady().then(createWindow)
-
-ipcMain.on('ondragstart', (event, filePath) => {
-  event.sender.startDrag({
-    file: filePath,
-    icon: `${process.cwd()}/${iconName}`
-  })
-})
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})

docs/fiddles/features/drag-and-drop/renderer.js

@@ -1,9 +0,0 @@
-const { ipcRenderer } = require('electron')
-const fs = require('fs')
-
-document.getElementById('drag').ondragstart = (event) => {
-  const fileName = 'drag-and-drop.md'
-  fs.writeFileSync(fileName, '# Test drag and drop');
-  event.preventDefault()
-  ipcRenderer.send('ondragstart', process.cwd() + `/${fileName}`)
-}

docs/fiddles/features/keyboard-shortcuts/global/index.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>

docs/fiddles/features/keyboard-shortcuts/global/main.js

@@ -1,31 +0,0 @@
-const { app, BrowserWindow, globalShortcut } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-app.whenReady().then(() => {
-  globalShortcut.register('Alt+CommandOrControl+I', () => {
-    console.log('Electron loves global shortcuts!')
-  })
-}).then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})

docs/fiddles/features/keyboard-shortcuts/interception-from-main/index.html

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    We are using node <script>document.write(process.versions.node)</script>,
-    Chrome <script>document.write(process.versions.chrome)</script>,
-    and Electron <script>document.write(process.versions.electron)</script>.
-</body>
-</html>

docs/fiddles/features/keyboard-shortcuts/interception-from-main/main.js

@@ -1,13 +0,0 @@
-const { app, BrowserWindow } = require('electron')
-
-app.whenReady().then(() => {
-  const win = new BrowserWindow({ width: 800, height: 600, webPreferences: { nodeIntegration: true } })
-
-  win.loadFile('index.html')
-  win.webContents.on('before-input-event', (event, input) => {
-    if (input.control && input.key.toLowerCase() === 'i') {
-      console.log('Pressed Control+I')
-      event.preventDefault()
-    }
-  })
-})

docs/fiddles/features/keyboard-shortcuts/local/index.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>

docs/fiddles/features/keyboard-shortcuts/local/main.js

@@ -1,39 +0,0 @@
-const { app, BrowserWindow, Menu, MenuItem } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-const menu = new Menu()
-menu.append(new MenuItem({
-  label: 'Electron',
-  submenu: [{
-    role: 'help',
-    accelerator: process.platform === 'darwin' ? 'Alt+Cmd+I' : 'Alt+Shift+I',
-    click: () => { console.log('Electron rocks!') }
-  }]
-}))
-
-Menu.setApplicationMenu(menu)
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})

docs/fiddles/features/macos-dark-mode/index.html

@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-    <link rel="stylesheet" type="text/css" href="./styles.css">
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>Current theme source: <strong id="theme-source">System</strong></p>
-
-    <button id="toggle-dark-mode">Toggle Dark Mode</button>
-    <button id="reset-to-system">Reset to System Theme</button>
-
-    <script src="renderer.js"></script>
-  </body>
-</body>
-</html>

docs/fiddles/features/macos-dark-mode/main.js

@@ -1,40 +0,0 @@
-const { app, BrowserWindow, ipcMain, nativeTheme } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-
-  ipcMain.handle('dark-mode:toggle', () => {
-    if (nativeTheme.shouldUseDarkColors) {
-      nativeTheme.themeSource = 'light'
-    } else {
-      nativeTheme.themeSource = 'dark'
-    }
-    return nativeTheme.shouldUseDarkColors
-  })
-
-  ipcMain.handle('dark-mode:system', () => {
-    nativeTheme.themeSouce = 'system'
-  })
-}
-
-app.whenReady().then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})

docs/fiddles/features/macos-dark-mode/renderer.js

@@ -1,11 +0,0 @@
-const { ipcRenderer } = require('electron')
-
-document.getElementById('toggle-dark-mode').addEventListener('click', async () => {
-  const isDarkMode = await ipcRenderer.invoke('dark-mode:toggle')
-  document.getElementById('theme-source').innerHTML = isDarkMode ? 'Dark' : 'Light'
-})
-
-document.getElementById('reset-to-system').addEventListener('click', async () => {
-  await ipcRenderer.invoke('dark-mode:system')
-  document.getElementById('theme-source').innerHTML = 'System'
-})

docs/fiddles/features/macos-dark-mode/styles.css

@@ -1,7 +0,0 @@
-@media (prefers-color-scheme: dark) {
-  body { background: #333; color: white; }
-}
-
-@media (prefers-color-scheme: light) {
-  body { background: #ddd; color: black; }
-}

docs/fiddles/features/macos-dock-menu/index.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>

docs/fiddles/features/macos-dock-menu/main.js

@@ -1,43 +0,0 @@
-const { app, BrowserWindow, Menu } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-const dockMenu = Menu.buildFromTemplate([
-  {
-    label: 'New Window',
-    click () { console.log('New Window') }
-  }, {
-    label: 'New Window with Settings',
-    submenu: [
-      { label: 'Basic' },
-      { label: 'Pro' }
-    ]
-  },
-  { label: 'New Command...' }
-])
-
-app.whenReady().then(() => {
-  app.dock.setMenu(dockMenu)
-}).then(createWindow)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})

docs/fiddles/features/notifications/main/index.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-</body>
-</html>

docs/fiddles/features/notifications/main/main.js

@@ -1,35 +0,0 @@
-const { app, BrowserWindow, Notification } = require('electron')
-
-function createWindow () {
-  const win = new BrowserWindow({
-    width: 800,
-    height: 600,
-    webPreferences: {
-      nodeIntegration: true
-    }
-  })
-
-  win.loadFile('index.html')
-}
-
-function showNotification () {
-  const notification = {
-    title: 'Basic Notification',
-    body: 'Notification from the Main process'
-  }
-  new Notification(notification).show()
-}
-
-app.whenReady().then(createWindow).then(showNotification)
-
-app.on('window-all-closed', () => {
-  if (process.platform !== 'darwin') {
-    app.quit()
-  }
-})
-
-app.on('activate', () => {
-  if (BrowserWindow.getAllWindows().length === 0) {
-    createWindow()
-  }
-})

docs/fiddles/features/notifications/renderer/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="UTF-8">
-    <title>Hello World!</title>
-    <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
-</head>
-<body>
-    <h1>Hello World!</h1>
-    <p>
-        We are using node <script>document.write(process.versions.node)</script>,
-        Chrome <script>document.write(process.versions.chrome)</script>,
-        and Electron <script>document.write(process.versions.electron)</script>.
-    </p>
-    <script src="renderer.js"></script>
-</body>
-</html>

docs/fiddles/features/notifications/renderer/main.js

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

docs/fiddles/features/notifications/renderer/renderer.js

@@ -1,7 +0,0 @@
-const myNotification = new Notification('Title', {
-  body: 'Notification from the Renderer process'
-})
-
-myNotification.onclick = () => {
-  console.log('Notification clicked')
-}