build: determine electron version from tags not files (#36135 )

* build: determine electron version from tags not files (#36106) * build: determine electron version from tags not files * build: make electron_version dependent on packed-refs and git HEAD * build: do not delete electron/.git * build: do not revert a commit we didn't make * build: gen version file instead of just writing it * build: update cache and ninja targets * build: copy resource.h to generated electron.rc * build: electron_win32_resources should be public deps * build: also copy the icon Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org> * chore: fixup patches * chore: update patches * build: ensure get-version runs in the electron git checkout (#36128) * build: strip v in the getElectronVersion helper * build: use npm@7 for npm view command Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: Samuel Attard <sattard@salesforce.com>
build: prefix version in uploader script (#36173 )
2026-02-19 03:14:51 -05:00 · 2022-10-28 13:13:03 -07:00 · 2022-10-27 17:47:26 -07:00 · 2022-10-27 16:47:54 -04:00 · 2022-10-27 16:19:44 -04:00 · 2022-10-27 14:25:43 -04:00
39 changed files with 241 additions and 317 deletions
--- a/.circleci/config/base.yml
+++ b/.circleci/config/base.yml
@@ -454,7 +454,7 @@ step-delete-git-directories: &step-delete-git-directories
    command: |
      if [ "`uname`" == "Darwin" ]; then
        cd src
-        ( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" ) | xargs rm -rf
+        ( find . -type d -name ".git" -not -path "./third_party/angle/*" -not -path "./third_party/dawn/*" -not -path "./electron/*" ) | xargs rm -rf
      fi

 # On macOS the yarn install command during gclient sync was run on a linux
@@ -813,7 +813,7 @@ step-maybe-zip-symbols: &step-maybe-zip-symbols
      cd src
      export BUILD_PATH="$PWD/out/Default"
      ninja -C out/Default electron:licenses
-      ninja -C out/Default electron:electron_version
+      ninja -C out/Default electron:electron_version_file
      DELETE_DSYMS_AFTER_ZIP=1 electron/script/zip-symbols.py -b $BUILD_PATH

 step-maybe-cross-arch-snapshot: &step-maybe-cross-arch-snapshot
@@ -873,12 +873,12 @@ step-touch-sync-done: &step-touch-sync-done
 step-maybe-restore-src-cache: &step-maybe-restore-src-cache
  restore_cache:
    keys:
-      - v14-src-cache-{{ checksum "src/electron/.depshash" }}
+      - v15-src-cache-{{ checksum "src/electron/.depshash" }}
    name: Restoring src cache
 step-maybe-restore-src-cache-marker: &step-maybe-restore-src-cache-marker
  restore_cache:
    keys:
-      - v14-src-cache-marker-{{ checksum "src/electron/.depshash" }}
+      - v15-src-cache-marker-{{ checksum "src/electron/.depshash" }}
    name: Restoring src cache marker

 # Restore exact or closest git cache based on the hash of DEPS and .circle-sync-done
@@ -954,13 +954,14 @@ step-minimize-workspace-size-from-checkout: &step-minimize-workspace-size-from-c
      rm -rf third_party/electron_node/deps/openssl
      rm -rf third_party/electron_node/deps/v8
      rm -rf chrome/test/data/xr/webvr_info
+      rm -rf src/third_party/angle/third_party/VK-GL-CTS/src

 # Save the src cache based on the deps hash
 step-save-src-cache: &step-save-src-cache
  save_cache:
    paths:
      - /var/portal
-    key: v14-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v15-src-cache-{{ checksum "/var/portal/src/electron/.depshash" }}
    name: Persisting src cache
 step-make-src-cache-marker: &step-make-src-cache-marker
  run:
@@ -970,7 +971,7 @@ step-save-src-cache-marker: &step-save-src-cache-marker
  save_cache:
    paths:
      - .src-cache-marker
-    key: v14-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}
+    key: v15-src-cache-marker-{{ checksum "/var/portal/src/electron/.depshash" }}

 step-maybe-early-exit-no-doc-change: &step-maybe-early-exit-no-doc-change
  run:
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -107,6 +107,14 @@ branding = read_file("shell/app/BRANDING.json", "json")
 electron_project_name = branding.project_name
 electron_product_name = branding.product_name
 electron_mac_bundle_id = branding.mac_bundle_id
+electron_version = exec_script("script/print-version.py",
+                               [],
+                               "trim string",
+                               [
+                                 ".git/packed-refs",
+                                 ".git/HEAD",
+                                 "script/lib/get-version.js",
+                               ])

 if (is_mas_build) {
  assert(is_mac,
@@ -302,12 +310,9 @@ npm_action("electron_version_args") {

  outputs = [ "$target_gen_dir/electron_version.args" ]

-  args = rebase_path(outputs)
+  args = rebase_path(outputs) + [ "$electron_version" ]

-  inputs = [
-    "ELECTRON_VERSION",
-    "script/generate-version-json.js",
-  ]
+  inputs = [ "script/generate-version-json.js" ]
 }

 templated_file("electron_version_header") {
@@ -319,6 +324,39 @@ templated_file("electron_version_header") {
  args_files = get_target_outputs(":electron_version_args")
 }

+templated_file("electron_win_rc") {
+  deps = [ ":electron_version_args" ]
+
+  template = "build/templates/electron_rc.tmpl"
+  output = "$target_gen_dir/win-resources/electron.rc"
+
+  args_files = get_target_outputs(":electron_version_args")
+}
+
+copy("electron_win_resource_files") {
+  sources = [
+    "shell/browser/resources/win/electron.ico",
+    "shell/browser/resources/win/resource.h",
+  ]
+  outputs = [ "$target_gen_dir/win-resources/{{source_file_part}}" ]
+}
+
+templated_file("electron_version_file") {
+  deps = [ ":electron_version_args" ]
+
+  template = "build/templates/version_string.tmpl"
+  output = "$root_build_dir/version"
+
+  args_files = get_target_outputs(":electron_version_args")
+}
+
+group("electron_win32_resources") {
+  public_deps = [
+    ":electron_win_rc",
+    ":electron_win_resource_files",
+  ]
+}
+
 action("electron_fuses") {
  script = "build/fuses/build.py"

@@ -755,7 +793,6 @@ if (is_mac) {
  electron_helper_name = "$electron_product_name Helper"
  electron_login_helper_name = "$electron_product_name Login Helper"
  electron_framework_version = "A"
-  electron_version = read_file("ELECTRON_VERSION", "trim string")

  mac_xib_bundle_data("electron_xibs") {
    sources = [ "shell/common/resources/mac/MainMenu.xib" ]
@@ -1196,6 +1233,7 @@ if (is_mac) {
      ":default_app_asar",
      ":electron_app_manifest",
      ":electron_lib",
+      ":electron_win32_resources",
      ":packed_resources",
      "//components/crash/core/app",
      "//content:sandbox_helper_win",
@@ -1229,8 +1267,7 @@ if (is_mac) {

    if (is_win) {
      sources += [
-        # TODO: we should be generating our .rc files more like how chrome does
-        "shell/browser/resources/win/electron.rc",
+        "$target_gen_dir/win-resources/electron.rc",
        "shell/browser/resources/win/resource.h",
      ]

@@ -1412,15 +1449,10 @@ group("licenses") {
  ]
 }

-copy("electron_version") {
-  sources = [ "ELECTRON_VERSION" ]
-  outputs = [ "$root_build_dir/version" ]
-}
-
 dist_zip("electron_dist_zip") {
  data_deps = [
    ":electron_app",
-    ":electron_version",
+    ":electron_version_file",
    ":licenses",
  ]
  if (is_linux) {
--- a/2
+++ b/2
@@ -2,7 +2,7 @@ gclient_gn_args_from = 'src'

 vars = {
  'chromium_version':
-    '106.0.5249.119',
+    '106.0.5249.165',
  'node_version':
    'v16.16.0',
  'nan_version':
--- a/1
+++ b/1
@@ -1 +0,0 @@
-21.2.0
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -199,14 +199,14 @@ for:
        }
    - ps: >-
        if ($env:GN_CONFIG -eq 'release') {
-          python electron\script\zip-symbols.py
+          python3 electron\script\zip-symbols.py
          appveyor-retry appveyor PushArtifact out/Default/symbols.zip
        } else {
          # It's useful to have pdb files when debugging testing builds that are
          # built on CI.
          7z a pdb.zip out\Default\*.pdb
        }
-    - python electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
+    - python3 electron/script/zip_manifests/check-zip-manifest.py out/Default/dist.zip electron/script/zip_manifests/dist_zip.win.%TARGET_ARCH%.manifest
   
    deploy_script:
      - cd electron
@@ -214,10 +214,10 @@ for:
          if (Test-Path Env:\ELECTRON_RELEASE) {
            if (Test-Path Env:\UPLOAD_TO_STORAGE) {
              Write-Output "Uploading Electron release distribution to azure"
-              & python script\release\uploaders\upload.py --verbose --upload_to_storage
+              & python3 script\release\uploaders\upload.py --verbose --upload_to_storage
            } else {
              Write-Output "Uploading Electron release distribution to github releases"
-              & python script\release\uploaders\upload.py --verbose
+              & python3 script\release\uploaders\upload.py --verbose
            }
          } elseif (Test-Path Env:\TEST_WOA) {
            node script/release/ci-release-build.js --job=electron-woa-testing --ci=GHA --appveyorJobId=$env:APPVEYOR_JOB_ID $env:APPVEYOR_REPO_BRANCH
@@ -303,11 +303,11 @@ for:
      - echo Running main test suite & node script/yarn test -- --trace-uncaught --runners=main --enable-logging=file --log-file=%cd%\electron.log
      - echo Running native test suite & node script/yarn test -- --trace-uncaught --runners=native --enable-logging=file --log-file=%cd%\electron.log
      - cd ..
-      - echo Verifying non proprietary ffmpeg & python electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
+      - echo Verifying non proprietary ffmpeg & python3 electron\script\verify-ffmpeg.py --build-dir out\Default --source-root %cd% --ffmpeg-path out\ffmpeg
      - echo "About to verify mksnapshot"
-      - echo Verifying mksnapshot & python electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd%
+      - echo Verifying mksnapshot & python3 electron\script\verify-mksnapshot.py --build-dir out\Default --source-root %cd%
      - echo "Done verifying mksnapshot"
-      - echo Verifying chromedriver & python electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd%
+      - echo Verifying chromedriver & python3 electron\script\verify-chromedriver.py --build-dir out\Default --source-root %cd%
      - echo "Done verifying chromedriver"
    
    on_finish:
--- a/shell/browser/resources/win/electron.rc
+++ b/shell/browser/resources/win/electron.rc
@@ -50,8 +50,8 @@ END
 //

 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 21,2,0,0
- PRODUCTVERSION 21,2,0,0
+ FILEVERSION $major,$minor,$patch,$prerelease_number
+ PRODUCTVERSION $major,$minor,$patch,$prerelease_number
 FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -68,12 +68,12 @@ BEGIN
        BEGIN
            VALUE "CompanyName", "GitHub, Inc."
            VALUE "FileDescription", "Electron"
-            VALUE "FileVersion", "21.2.0"
+            VALUE "FileVersion", "$major.$minor.$patch"
            VALUE "InternalName", "electron.exe"
            VALUE "LegalCopyright", "Copyright (C) 2015 GitHub, Inc. All rights reserved."
            VALUE "OriginalFilename", "electron.exe"
            VALUE "ProductName", "Electron"
-            VALUE "ProductVersion", "21.2.0"
+            VALUE "ProductVersion", "$major.$minor.$patch"
            VALUE "SquirrelAwareVersion", "1"
        END
    END
--- a/build/templates/version_string.tmpl
+++ b/build/templates/version_string.tmpl
@@ -0,0 +1 @@
+$full_version
--- a/docs/api/ipc-renderer.md
+++ b/docs/api/ipc-renderer.md
@@ -96,14 +96,6 @@ 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 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).

@@ -126,6 +118,21 @@ If you need to transfer a [`MessagePort`][] to the main process, use [`ipcRender

 If you do not need a response to the message, consider using [`ipcRenderer.send`](#ipcrenderersendchannel-args).

+> **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.
+
+> **Note**
+> If the handler in the main process throws an error,
+> the promise returned by `invoke` will reject.
+> However, the `Error` object in the renderer process
+> will not be the same as the one thrown in the main process.
+
 ### `ipcRenderer.sendSync(channel, ...args)`

 * `channel` string
--- a/docs/api/menu-item.md
+++ b/docs/api/menu-item.md
@@ -14,7 +14,7 @@ See [`Menu`](menu.md) for examples.
    * `menuItem` MenuItem
    * `browserWindow` [BrowserWindow](browser-window.md) | undefined - This will not be defined if no window is open.
    * `event` [KeyboardEvent](structures/keyboard-event.md)
-  * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, 'showSubstitutions', 'toggleSmartQuotes', 'toggleSmartDashes', 'toggleTextReplacement', `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
+  * `role` string (optional) - Can be `undo`, `redo`, `cut`, `copy`, `paste`, `pasteAndMatchStyle`, `delete`, `selectAll`, `reload`, `forceReload`, `toggleDevTools`, `resetZoom`, `zoomIn`, `zoomOut`, `toggleSpellChecker`, `togglefullscreen`, `window`, `minimize`, `close`, `help`, `about`, `services`, `hide`, `hideOthers`, `unhide`, `quit`, `showSubstitutions`, `toggleSmartQuotes`, `toggleSmartDashes`, `toggleTextReplacement`, `startSpeaking`, `stopSpeaking`, `zoom`, `front`, `appMenu`, `fileMenu`, `editMenu`, `viewMenu`, `shareMenu`, `recentDocuments`, `toggleTabBar`, `selectNextTab`, `selectPreviousTab`, `mergeAllWindows`, `clearRecentDocuments`, `moveTabToNewWindow` or `windowMenu` - Define the action of the menu item, when specified the
    `click` property will be ignored. See [roles](#roles).
  * `type` string (optional) - Can be `normal`, `separator`, `submenu`, `checkbox` or
    `radio`.
--- a/docs/api/web-request.md
+++ b/docs/api/web-request.md
@@ -28,7 +28,7 @@ const { session } = require('electron')

 // Modify the user agent for all requests to the following urls.
 const filter = {
-  urls: ['https://*.github.com/*', '*://electron.github.io']
+  urls: ['https://*.github.com/*', '*://electron.github.io/*']
 }

 session.defaultSession.webRequest.onBeforeSendHeaders(filter, (details, callback) => {
--- a/lib/browser/api/web-contents.ts
+++ b/lib/browser/api/web-contents.ts
@@ -176,10 +176,10 @@ WebContents.prototype.printToPDF = async function (options) {
    scale: 1.0,
    paperWidth: 8.5,
    paperHeight: 11.0,
-    marginTop: 0.0,
-    marginBottom: 0.0,
-    marginLeft: 0.0,
-    marginRight: 0.0,
+    marginTop: 0.4,
+    marginBottom: 0.4,
+    marginLeft: 0.4,
+    marginRight: 0.4,
    pageRanges: '',
    preferCSSPageSize: false
  };
@@ -449,12 +449,14 @@ WebContents.prototype.loadURL = function (url, options) {
    const removeListeners = () => {
      this.removeListener('did-finish-load', finishListener);
      this.removeListener('did-fail-load', failListener);
+      this.removeListener('did-navigate-in-page', finishListener);
      this.removeListener('did-start-navigation', navigationListener);
      this.removeListener('did-stop-loading', stopLoadingListener);
      this.removeListener('destroyed', stopLoadingListener);
    };
    this.on('did-finish-load', finishListener);
    this.on('did-fail-load', failListener);
+    this.on('did-navigate-in-page', finishListener);
    this.on('did-start-navigation', navigationListener);
    this.on('did-stop-loading', stopLoadingListener);
    this.on('destroyed', stopLoadingListener);
--- a/lib/renderer/web-view/web-view-attributes.ts
+++ b/lib/renderer/web-view/web-view-attributes.ts
@@ -186,7 +186,10 @@ export class SrcAttribute extends WebViewAttribute {
      opts.userAgent = useragent;
    }

-    (this.webViewImpl.webviewNode as Electron.WebviewTag).loadURL(this.getValue(), opts);
+    (this.webViewImpl.webviewNode as Electron.WebviewTag).loadURL(this.getValue(), opts)
+      .catch(err => {
+        console.error('Unexpected error while loading URL', err);
+      });
  }
 }

--- a/package.json
+++ b/package.json
@@ -1,10 +1,11 @@
 {
  "name": "electron",
-  "version": "21.2.0",
+  "version": "0.0.0-development",
  "repository": "https://github.com/electron/electron",
  "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
  "devDependencies": {
    "@azure/storage-blob": "^12.9.0",
+    "@electron/asar": "^3.2.1",
    "@electron/docs-parser": "^0.12.4",
    "@electron/typescript-definitions": "^8.9.5",
    "@octokit/auth-app": "^2.10.0",
@@ -31,7 +32,6 @@
    "@types/webpack-env": "^1.16.3",
    "@typescript-eslint/eslint-plugin": "^4.4.1",
    "@typescript-eslint/parser": "^4.4.1",
-    "asar": "^3.1.0",
    "aws-sdk": "^2.814.0",
    "check-for-leaks": "^1.2.1",
    "colors": "1.4.0",
@@ -146,4 +146,4 @@
  "resolutions": {
    "nan": "nodejs/nan#16fa32231e2ccd89d2804b3f765319128b20c4ac"
  }
-}
+}
--- a/patches/chromium/.patches
+++ b/patches/chromium/.patches
@@ -125,3 +125,4 @@ fix_crash_loading_non-standard_schemes_in_iframes.patch
 create_browser_v8_snapshot_file_name_fuse.patch
 cherry-pick-c83640db21b5.patch
 fix_on-screen-keyboard_hides_on_input_blur_in_webview.patch
+build_allow_electron_to_use_exec_script.patch
--- a/patches/chromium/build_allow_electron_to_use_exec_script.patch
+++ b/patches/chromium/build_allow_electron_to_use_exec_script.patch
@@ -0,0 +1,18 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Samuel Attard <sattard@salesforce.com>
+Date: Fri, 21 Oct 2022 16:29:06 -0700
+Subject: build: allow electron to use exec_script
+
+This is similar to the //build usecase so we're OK adding ourselves here
+
+diff --git a/.gn b/.gn
+index 7b9768eb315ef8a4d8d61bcf07d43c70f3ea9582..0857ee17a35dabc19c2a04f6a5dd7d631e4b7ee8 100644
+--- a/.gn
+++ b/.gn
+@@ -169,4 +169,6 @@ exec_script_whitelist =
+ 
+       "//tools/grit/grit_rule.gni",
+       "//tools/gritsettings/BUILD.gn",
+
+      "//electron/BUILD.gn"
+     ]
--- a/patches/v8/build_gn.patch
+++ b/patches/v8/build_gn.patch
@@ -9,7 +9,7 @@ necessary for native modules to load.
 Also, some fixes relating to mksnapshot on ARM.

 diff --git a/BUILD.gn b/BUILD.gn
-index 83082271b8b76179b41e943190303e31fa639a95..0a23171a391606bb3408dcf8a488d075a148443a 100644
+index 7b41a7500e55a5dbbef512dd8bfcc7dbc65e982c..8039c91f8800b516a64b84a1d7a9701932decae2 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
@@ -663,7 +663,7 @@ config("internal_config") {
@@ -21,7 +21,7 @@ index 83082271b8b76179b41e943190303e31fa639a95..0a23171a391606bb3408dcf8a488d075
     defines += [ "BUILDING_V8_SHARED" ]
   }
 
-@@ -6166,7 +6166,7 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -6169,7 +6169,7 @@ if (current_toolchain == v8_generator_toolchain) {
       "src/interpreter/bytecodes.h",
     ]
 
--- a/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
+++ b/patches/v8/do_not_export_private_v8_symbols_on_windows.patch
@@ -12,7 +12,7 @@ This patch can be safely removed if, when it is removed, `node.lib` does not
 contain any standard C++ library exports (e.g. `std::ostringstream`).

 diff --git a/BUILD.gn b/BUILD.gn
-index b0c6d08bf50a3443e2589f09b6f1f5b7734c000c..7728123805054064d5acecacf6cbf8d1fe4a56c1 100644
+index 8b98f871341fed2186d0bc2de42912e76bbc04e1..6d3b542d781ad1a71c4b966aa05d5f51b1b3d45e 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
@@ -663,6 +663,10 @@ config("internal_config") {
--- a/patches/v8/expose_mksnapshot.patch
+++ b/patches/v8/expose_mksnapshot.patch
@@ -6,10 +6,10 @@ Subject: expose_mksnapshot.patch
 Needed in order to target mksnapshot for mksnapshot zip.

 diff --git a/BUILD.gn b/BUILD.gn
-index 0a23171a391606bb3408dcf8a488d075a148443a..b0c6d08bf50a3443e2589f09b6f1f5b7734c000c 100644
+index 8039c91f8800b516a64b84a1d7a9701932decae2..8b98f871341fed2186d0bc2de42912e76bbc04e1 100644
 --- a/BUILD.gn
 +++ b/BUILD.gn
-@@ -6178,7 +6178,6 @@ if (current_toolchain == v8_generator_toolchain) {
+@@ -6181,7 +6181,6 @@ if (current_toolchain == v8_generator_toolchain) {
 
 if (current_toolchain == v8_snapshot_toolchain) {
   v8_executable("mksnapshot") {
--- a/script/generate-version-json.js
+++ b/script/generate-version-json.js
@@ -3,8 +3,7 @@ const path = require('path');
 const semver = require('semver');

 const outputPath = process.argv[2];
-
-const currentVersion = fs.readFileSync(path.resolve(__dirname, '../ELECTRON_VERSION'), 'utf8').trim();
+const currentVersion = process.argv[3];

 const parsed = semver.parse(currentVersion);

@@ -20,9 +19,11 @@ const {
 } = parsed;

 fs.writeFileSync(outputPath, JSON.stringify({
+  full_version: currentVersion,
  major,
  minor,
  patch,
  prerelease,
+  prerelease_number: prerelease ? parsed.prerelease[parsed.prerelease.length - 1] : '0',
  has_prerelease: prerelease === '' ? 0 : 1
 }, null, 2));
--- a/script/gn-asar-hash.js
+++ b/script/gn-asar-hash.js
@@ -1,4 +1,4 @@
-const asar = require('asar');
+const asar = require('@electron/asar');
 const crypto = require('crypto');
 const fs = require('fs');

--- a/script/gn-asar.js
+++ b/script/gn-asar.js
@@ -1,4 +1,4 @@
-const asar = require('asar');
+const asar = require('@electron/asar');
 const assert = require('assert');
 const fs = require('fs-extra');
 const os = require('os');
--- a/script/lib/get-version.js
+++ b/script/lib/get-version.js
@@ -0,0 +1,22 @@
+const { spawnSync } = require('child_process');
+const path = require('path');
+
+module.exports.getElectronVersion = () => {
+  // Find the nearest tag to the current HEAD
+  // This is equivilant to our old logic of "use a value in package.json" for the following reasons
+  //
+  // 1. Whenever we updated the package.json we ALSO pushed a tag with the same version
+  // 2. Whenever we _reverted_ a bump all we actually did was push a commit that deleted the tag and changed the version number back
+  //
+  // The only difference in the "git describe" technique is that technically a commit can "change" it's version
+  // number if a tag is created / removed retroactively.  i.e. the first time a commit is pushed it will be 1.2.3
+  // and after the tag is made rebuilding the same commit will result in it being 1.2.4
+  const output = spawnSync('git', ['describe', '--tags', '--abbrev=0'], {
+    cwd: path.resolve(__dirname, '..', '..')
+  });
+  if (output.status !== 0) {
+    console.error(output.stderr);
+    throw new Error('Failed to get current electron version');
+  }
+  return output.stdout.toString().trim().replace(/^v/g, '');
+};
--- a/script/lib/util.py
+++ b/script/lib/util.py
@@ -15,7 +15,9 @@ except ImportError:
  from urllib2 import urlopen
 import zipfile

-from lib.config import is_verbose_mode
+# from lib.config import is_verbose_mode
+def is_verbose_mode():
+  return False

 ELECTRON_DIR = os.path.abspath(
  os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
@@ -149,11 +151,17 @@ def get_electron_branding():
  with open(branding_file_path) as f:
    return json.load(f)

+
+cached_electron_version = None
 def get_electron_version():
-  SOURCE_ROOT = os.path.abspath(os.path.join(__file__, '..', '..', '..'))
-  version_file = os.path.join(SOURCE_ROOT, 'ELECTRON_VERSION')
-  with open(version_file) as f:
-    return 'v' + f.read().strip()
+  global cached_electron_version
+  if cached_electron_version is None:
+    cached_electron_version = str.strip(execute([
+      'node',
+      '-p',
+      'require("./script/lib/get-version").getElectronVersion()'
+    ], cwd=ELECTRON_DIR).decode())
+  return cached_electron_version

 def store_artifact(prefix, key_prefix, files):
  # Azure Storage
--- a/script/node-spec-runner.js
+++ b/script/node-spec-runner.js
@@ -67,6 +67,8 @@ async function main () {
      console.error(`Found ${missing.length} missing disabled specs: \n${missing.join('\n')}`);
      process.exit(1);
    }
+
+    process.exit(0);
  }

  const options = args.default ? defaultOptions : getCustomOptions();
--- a/script/print-version.py
+++ b/script/print-version.py
@@ -0,0 +1,3 @@
+from lib.util import get_electron_version
+
+print(get_electron_version())
--- a/script/release/publish-to-npm.js
+++ b/script/release/publish-to-npm.js
@@ -6,6 +6,7 @@ const got = require('got');
 const semver = require('semver');

 const { getCurrentBranch, ELECTRON_DIR } = require('../lib/utils');
+const { getElectronVersion } = require('../lib/get-version');
 const rootPackageJson = require('../../package.json');

 const { Octokit } = require('@octokit/rest');
@@ -34,7 +35,6 @@ const files = [

 const jsonFields = [
  'name',
-  'version',
  'repository',
  'description',
  'license',
@@ -44,6 +44,9 @@ const jsonFields = [

 let npmTag = '';

+const currentElectronVersion = getElectronVersion();
+const isNightlyElectronVersion = currentElectronVersion.includes('nightly');
+
 new Promise((resolve, reject) => {
  temp.mkdir('electron-npm', (err, dirPath) => {
    if (err) {
@@ -68,6 +71,7 @@ new Promise((resolve, reject) => {
    jsonFields.forEach((fieldName) => {
      packageJson[fieldName] = rootPackageJson[fieldName];
    });
+    packageJson.version = currentElectronVersion;
    fs.writeFileSync(
      path.join(tempDir, 'package.json'),
      JSON.stringify(packageJson, null, 2)
@@ -75,27 +79,27 @@ new Promise((resolve, reject) => {

    return octokit.repos.listReleases({
      owner: 'electron',
-      repo: rootPackageJson.version.indexOf('nightly') > 0 ? 'nightlies' : 'electron'
+      repo: isNightlyElectronVersion ? 'nightlies' : 'electron'
    });
  })
  .then((releases) => {
  // download electron.d.ts from release
    const release = releases.data.find(
-      (release) => release.tag_name === `v${rootPackageJson.version}`
+      (release) => release.tag_name === `v${currentElectronVersion}`
    );
    if (!release) {
-      throw new Error(`cannot find release with tag v${rootPackageJson.version}`);
+      throw new Error(`cannot find release with tag v${currentElectronVersion}`);
    }
    return release;
  })
  .then(async (release) => {
    const tsdAsset = release.assets.find((asset) => asset.name === 'electron.d.ts');
    if (!tsdAsset) {
-      throw new Error(`cannot find electron.d.ts from v${rootPackageJson.version} release assets`);
+      throw new Error(`cannot find electron.d.ts from v${currentElectronVersion} release assets`);
    }

    const typingsContent = await getAssetContents(
-      rootPackageJson.version.indexOf('nightly') > 0 ? 'nightlies' : 'electron',
+      isNightlyElectronVersion ? 'nightlies' : 'electron',
      tsdAsset.id
    );

@@ -106,11 +110,11 @@ new Promise((resolve, reject) => {
  .then(async (release) => {
    const checksumsAsset = release.assets.find((asset) => asset.name === 'SHASUMS256.txt');
    if (!checksumsAsset) {
-      throw new Error(`cannot find SHASUMS256.txt from v${rootPackageJson.version} release assets`);
+      throw new Error(`cannot find SHASUMS256.txt from v${currentElectronVersion} release assets`);
    }

    const checksumsContent = await getAssetContents(
-      rootPackageJson.version.indexOf('nightly') > 0 ? 'nightlies' : 'electron',
+      isNightlyElectronVersion ? 'nightlies' : 'electron',
      checksumsAsset.id
    );

@@ -127,7 +131,7 @@ new Promise((resolve, reject) => {
  .then(async (release) => {
    const currentBranch = await getCurrentBranch();

-    if (release.tag_name.indexOf('nightly') > 0) {
+    if (isNightlyElectronVersion) {
      // TODO(main-migration): Simplify once main branch is renamed.
      if (currentBranch === 'master' || currentBranch === 'main') {
        // Nightlies get published to their own module, so they should be tagged as latest
@@ -164,7 +168,7 @@ new Promise((resolve, reject) => {
  .then(() => childProcess.execSync('npm pack', { cwd: tempDir }))
  .then(() => {
  // test that the package can install electron prebuilt from github release
-    const tarballPath = path.join(tempDir, `${rootPackageJson.name}-${rootPackageJson.version}.tgz`);
+    const tarballPath = path.join(tempDir, `${rootPackageJson.name}-${currentElectronVersion}.tgz`);
    return new Promise((resolve, reject) => {
      const result = childProcess.spawnSync('npm', ['install', tarballPath, '--force', '--silent'], {
        env: { ...process.env, electron_config_cache: tempDir },
@@ -190,7 +194,7 @@ new Promise((resolve, reject) => {
    });
  })
  .then((tarballPath) => {
-    const existingVersionJSON = childProcess.execSync(`npm view electron@${rootPackageJson.version} --json`).toString('utf-8');
+    const existingVersionJSON = childProcess.execSync(`npx npm@7 view ${rootPackageJson.name}@${currentElectronVersion} --json`).toString('utf-8');
    // It's possible this is a re-run and we already have published the package, if not we just publish like normal
    if (!existingVersionJSON) {
      childProcess.execSync(`npm publish ${tarballPath} --tag ${npmTag} --otp=${process.env.ELECTRON_NPM_OTP}`);
@@ -198,22 +202,21 @@ new Promise((resolve, reject) => {
  })
  .then(() => {
    const currentTags = JSON.parse(childProcess.execSync('npm show electron dist-tags --json').toString());
-    const localVersion = rootPackageJson.version;
-    const parsedLocalVersion = semver.parse(localVersion);
+    const parsedLocalVersion = semver.parse(currentElectronVersion);
    if (rootPackageJson.name === 'electron') {
      // We should only customly add dist tags for non-nightly releases where the package name is still
      // "electron"
      if (parsedLocalVersion.prerelease.length === 0 &&
-            semver.gt(localVersion, currentTags.latest)) {
-        childProcess.execSync(`npm dist-tag add electron@${localVersion} latest --otp=${process.env.ELECTRON_NPM_OTP}`);
+            semver.gt(currentElectronVersion, currentTags.latest)) {
+        childProcess.execSync(`npm dist-tag add electron@${currentElectronVersion} latest --otp=${process.env.ELECTRON_NPM_OTP}`);
      }
      if (parsedLocalVersion.prerelease[0] === 'beta' &&
-            semver.gt(localVersion, currentTags.beta)) {
-        childProcess.execSync(`npm dist-tag add electron@${localVersion} beta --otp=${process.env.ELECTRON_NPM_OTP}`);
+            semver.gt(currentElectronVersion, currentTags.beta)) {
+        childProcess.execSync(`npm dist-tag add electron@${currentElectronVersion} beta --otp=${process.env.ELECTRON_NPM_OTP}`);
      }
      if (parsedLocalVersion.prerelease[0] === 'alpha' &&
-            semver.gt(localVersion, currentTags.alpha)) {
-        childProcess.execSync(`npm dist-tag add electron@${localVersion} alpha --otp=${process.env.ELECTRON_NPM_OTP}`);
+            semver.gt(currentElectronVersion, currentTags.alpha)) {
+        childProcess.execSync(`npm dist-tag add electron@${currentElectronVersion} alpha --otp=${process.env.ELECTRON_NPM_OTP}`);
      }
    }
  })
--- a/script/release/release-artifact-cleanup.js
+++ b/script/release/release-artifact-cleanup.js
@@ -18,26 +18,6 @@ require('colors');
 const pass = '✓'.green;
 const fail = '✗'.red;

-function getLastBumpCommit (tag) {
-  const data = execSync(`git log -n1 --grep "Bump ${tag}" --format='format:{"hash": "%H", "message": "%s"}'`).toString();
-  return JSON.parse(data);
-}
-
-async function revertBumpCommit (tag) {
-  const branch = await getCurrentBranch();
-  const commitToRevert = getLastBumpCommit(tag).hash;
-  await GitProcess.exec(['pull', '--rebase']);
-  await GitProcess.exec(['revert', commitToRevert], ELECTRON_DIR);
-  const pushDetails = await GitProcess.exec(['push', 'origin', `HEAD:${branch}`, '--follow-tags'], ELECTRON_DIR);
-  if (pushDetails.exitCode === 0) {
-    console.log(`${pass} successfully reverted release commit.`);
-  } else {
-    const error = GitProcess.parseError(pushDetails.stderr);
-    console.error(`${fail} could not push release commit: `, error);
-    process.exit(1);
-  }
-}
-
 async function deleteDraft (releaseId, targetRepo) {
  try {
    const result = await octokit.repos.getRelease({
@@ -80,9 +60,6 @@ async function cleanReleaseArtifacts () {
  const releaseId = args.releaseID.length > 0 ? args.releaseID : null;
  const isNightly = args.tag.includes('nightly');

-  // try to revert commit regardless of tag and draft deletion status
-  await revertBumpCommit(args.tag);
-
  if (releaseId) {
    if (isNightly) {
      await deleteDraft(releaseId, 'nightlies');
--- a/script/release/release.js
+++ b/script/release/release.js
@@ -12,8 +12,6 @@ const args = require('minimist')(process.argv.slice(2), {
 const fs = require('fs');
 const { execSync } = require('child_process');
 const got = require('got');
-const pkg = require('../../package.json');
-const pkgVersion = `v${pkg.version}`;
 const path = require('path');
 const temp = require('temp').track();
 const { URL } = require('url');
@@ -25,8 +23,11 @@ const pass = '✓'.green;
 const fail = '✗'.red;

 const { ELECTRON_DIR } = require('../lib/utils');
+const { getElectronVersion } = require('../lib/get-version');
 const getUrlHash = require('./get-url-hash');

+const pkgVersion = `v${getElectronVersion()}`;
+
 const octokit = new Octokit({
  auth: process.env.ELECTRON_GITHUB_TOKEN
 });
--- a/script/release/uploaders/upload.py
+++ b/script/release/uploaders/upload.py
@@ -23,7 +23,7 @@ from lib.util import get_electron_branding, execute, get_electron_version, \
                     SRC_DIR, ELECTRON_DIR, TS_NODE


-ELECTRON_VERSION = get_electron_version()
+ELECTRON_VERSION = 'v' + get_electron_version()

 PROJECT_NAME = get_electron_branding()['project_name']
 PRODUCT_NAME = get_electron_branding()['product_name']
--- a/script/release/version-bumper.js
+++ b/script/release/version-bumper.js
@@ -1,17 +1,10 @@
 #!/usr/bin/env node

-const { GitProcess } = require('dugite');
-const { promises: fs } = require('fs');
 const semver = require('semver');
-const path = require('path');
 const minimist = require('minimist');

-const { ELECTRON_DIR } = require('../lib/utils');
+const { getElectronVersion } = require('../lib/get-version');
 const versionUtils = require('./version-utils');
-const supported = path.resolve(ELECTRON_DIR, 'docs', 'tutorial', 'support.md');
-
-const writeFile = fs.writeFile;
-const readFile = fs.readFile;

 function parseCommandLine () {
  let help;
@@ -37,7 +30,7 @@ function parseCommandLine () {
 // run the script
 async function main () {
  const opts = parseCommandLine();
-  const currentVersion = await versionUtils.getElectronVersion();
+  const currentVersion = getElectronVersion();
  const version = await nextVersion(opts.bump, currentVersion);

  const parsed = semver.parse(version);
@@ -54,20 +47,6 @@ async function main () {
    return 0;
  }

-  if (shouldUpdateSupported(opts.bump, currentVersion, version)) {
-    await updateSupported(version, supported);
-  }
-
-  // update all version-related files
-  await Promise.all([
-    updateVersion(version),
-    updatePackageJSON(version),
-    updateWinRC(components)
-  ]);
-
-  // commit all updated version-related files
-  await commitVersionBump(version);
-
  console.log(`Bumped to version: ${version}`);
 }

@@ -118,10 +97,6 @@ async function nextVersion (bumpType, version) {
  return version;
 }

-function shouldUpdateSupported (bump, current, version) {
-  return isMajorStable(bump, current) || isMajorNightly(version, current);
-}
-
 function isMajorStable (bump, currentVersion) {
  if (versionUtils.isBeta(currentVersion) && (bump === 'stable')) return true;
  return false;
@@ -134,59 +109,6 @@ function isMajorNightly (version, currentVersion) {
  return false;
 }

-// update VERSION file with latest release info
-async function updateVersion (version) {
-  const versionPath = path.resolve(ELECTRON_DIR, 'ELECTRON_VERSION');
-  await writeFile(versionPath, version, 'utf8');
-}
-
-// update package metadata files with new version
-async function updatePackageJSON (version) {
-  const filePath = path.resolve(ELECTRON_DIR, 'package.json');
-  const file = require(filePath);
-  file.version = version;
-  await writeFile(filePath, JSON.stringify(file, null, 2));
-}
-
-// push bump commit to release branch
-async function commitVersionBump (version) {
-  const gitArgs = ['commit', '-a', '-m', `Bump v${version}`, '-n'];
-  await GitProcess.exec(gitArgs, ELECTRON_DIR);
-}
-
-// updates electron.rc file with new semver values
-async function updateWinRC (components) {
-  const filePath = path.resolve(ELECTRON_DIR, 'shell', 'browser', 'resources', 'win', 'electron.rc');
-  const data = await readFile(filePath, 'utf8');
-  const arr = data.split('\n');
-  arr.forEach((line, idx) => {
-    if (line.includes('FILEVERSION')) {
-      arr[idx] = ` FILEVERSION ${versionUtils.makeVersion(components, ',', versionUtils.preType.PARTIAL)}`;
-      arr[idx + 1] = ` PRODUCTVERSION ${versionUtils.makeVersion(components, ',', versionUtils.preType.PARTIAL)}`;
-    } else if (line.includes('FileVersion')) {
-      arr[idx] = `            VALUE "FileVersion", "${versionUtils.makeVersion(components, '.')}"`;
-      arr[idx + 5] = `            VALUE "ProductVersion", "${versionUtils.makeVersion(components, '.')}"`;
-    }
-  });
-  await writeFile(filePath, arr.join('\n'));
-}
-
-// updates support.md file with new semver values (stable only)
-async function updateSupported (version, filePath) {
-  const v = parseInt(version);
-  const newVersions = [`* ${v}.x.y`, `* ${v - 1}.x.y`, `* ${v - 2}.x.y`, `* ${v - 3}.x.y`];
-  const contents = await readFile(filePath, 'utf8');
-  const previousVersions = contents.split('\n').filter((elem) => {
-    return (/[^\n]*\.x\.y[^\n]*/).test(elem);
-  }, []);
-
-  const newContents = previousVersions.reduce((contents, current, i) => {
-    return contents.replace(current, newVersions[i]);
-  }, contents);
-
-  await writeFile(filePath, newContents, 'utf8');
-}
-
 if (process.mainModule === module) {
  main().catch((error) => {
    console.error(error);
@@ -194,4 +116,4 @@ if (process.mainModule === module) {
  });
 }

-module.exports = { nextVersion, shouldUpdateSupported, updateSupported };
+module.exports = { nextVersion };
--- a/script/release/version-utils.js
+++ b/script/release/version-utils.js
@@ -68,12 +68,6 @@ async function nextBeta (v) {
  return tags.length === 0 ? `${next}-beta.1` : semver.inc(tags.pop(), 'prerelease');
 }

-async function getElectronVersion () {
-  const versionPath = path.resolve(ELECTRON_DIR, 'ELECTRON_VERSION');
-  const version = await readFile(versionPath, 'utf8');
-  return version.trim();
-}
-
 async function nextNightly (v) {
  let next = semver.valid(semver.coerce(v));
  const pre = `nightly.${getCurrentDate()}`;
@@ -114,7 +108,6 @@ module.exports = {
  nextAlpha,
  nextBeta,
  makeVersion,
-  getElectronVersion,
  nextNightly,
  preType
 };
--- a/shell/browser/printing/print_view_manager_electron.cc
+++ b/shell/browser/printing/print_view_manager_electron.cc
@@ -124,6 +124,7 @@ void PrintViewManagerElectron::PrintToPdf(

  printing_rfh_ = rfh;
  print_pages_params->pages = absl::get<printing::PageRanges>(parsed_ranges);
+  headless_jobs_.emplace_back(print_pages_params->params->document_cookie);
  callback_ = std::move(callback);

  // There is no need for a weak pointer here since the mojo proxy is held
@@ -147,7 +148,9 @@ void PrintViewManagerElectron::OnDidPrintWithParams(
    }
  }

-  auto& content = *result->get_params()->content;
+  printing::mojom::DidPrintDocumentParamsPtr& params = result->get_params();
+
+  auto& content = *params->content;
  if (!content.metafile_data_region.IsValid()) {
    FailJob(kInvalidMemoryHandle);
    return;
@@ -163,7 +166,7 @@ void PrintViewManagerElectron::OnDidPrintWithParams(
      std::string(static_cast<const char*>(map.memory()), map.size());
  std::move(callback_).Run(kPrintSuccess,
                           base::RefCountedString::TakeString(&data));
-
+  base::Erase(headless_jobs_, params->document_cookie);
  Reset();
 }

--- a/spec-main/api-browser-window-spec.ts
+++ b/spec-main/api-browser-window-spec.ts
@@ -567,6 +567,10 @@ describe('BrowserWindow module', () => {
            targetId: iframeTarget.targetId,
            flatten: true
          });
+          let willNavigateEmitted = false;
+          w.webContents.on('will-navigate', () => {
+            willNavigateEmitted = true;
+          });
          await w.webContents.debugger.sendCommand('Input.dispatchMouseEvent', {
            type: 'mousePressed',
            x: 10,
@@ -581,10 +585,6 @@ describe('BrowserWindow module', () => {
            clickCount: 1,
            button: 'left'
          }, sessionId);
-          let willNavigateEmitted = false;
-          w.webContents.on('will-navigate', () => {
-            willNavigateEmitted = true;
-          });
          await emittedOnce(w.webContents, 'did-navigate');
          expect(willNavigateEmitted).to.be.true();
        });
--- a/spec-main/api-web-contents-spec.ts
+++ b/spec-main/api-web-contents-spec.ts
@@ -362,6 +362,12 @@ describe('webContents module', () => {
      await expect(w.loadFile(path.join(fixturesPath, 'pages', 'base-page.html'))).to.eventually.be.fulfilled();
    });

+    it('resolves when navigating within the page', async () => {
+      await w.loadFile(path.join(fixturesPath, 'pages', 'base-page.html'));
+      await new Promise(resolve => setTimeout(resolve));
+      await expect(w.loadURL(w.getURL() + '#foo')).to.eventually.be.fulfilled();
+    });
+
    it('rejects when failing to load a file URL', async () => {
      await expect(w.loadURL('file:non-existent')).to.eventually.be.rejected()
        .and.have.property('code', 'ERR_FILE_NOT_FOUND');
--- a/spec-main/chromium-spec.ts
+++ b/spec-main/chromium-spec.ts
@@ -2323,9 +2323,7 @@ describe('navigator.hid', () => {
    } else {
      expect(device).to.equal('');
    }
-    if (process.arch === 'arm64' || process.arch === 'arm') {
-      // arm CI returns HID devices - this block may need to change if CI hardware changes.
-      expect(haveDevices).to.be.true();
+    if (haveDevices) {
      // Verify that navigation will clear device permissions
      const grantedDevices = await w.webContents.executeJavaScript('navigator.hid.getDevices()');
      expect(grantedDevices).to.not.be.empty();
--- a/spec-main/crash-spec.ts
+++ b/spec-main/crash-spec.ts
@@ -31,6 +31,22 @@ const runFixtureAndEnsureCleanExit = (args: string[]) => {
  });
 };

+const shouldRunCase = (crashCase: string) => {
+  switch (crashCase) {
+    // TODO(jkleinsc) fix this flaky test on Windows 32-bit
+    case 'quit-on-crashed-event': {
+      return (process.platform !== 'win32' || process.arch !== 'ia32');
+    }
+    // TODO(jkleinsc) fix this test on Linux on arm/arm64
+    case 'js-execute-iframe': {
+      return (process.platform !== 'linux' || (process.arch !== 'arm64' && process.arch !== 'arm'));
+    }
+    default: {
+      return true;
+    }
+  }
+};
+
 describe('crash cases', () => {
  afterEach(() => {
    for (const child of children) {
@@ -42,8 +58,7 @@ describe('crash cases', () => {
  const cases = fs.readdirSync(fixturePath);

  for (const crashCase of cases) {
-    // TODO(jkleinsc) fix this flaky test on Windows 32-bit
-    ifit(process.platform !== 'win32' || process.arch !== 'ia32' || crashCase !== 'quit-on-crashed-event')(`the "${crashCase}" case should not crash`, () => {
+    ifit(shouldRunCase(crashCase))(`the "${crashCase}" case should not crash`, () => {
      const fixture = path.resolve(fixturePath, crashCase);
      const argsFile = path.resolve(fixture, 'electron.args');
      const args = [fixture];
--- a/spec-main/version-bump-spec.ts
+++ b/spec-main/version-bump-spec.ts
@@ -1,15 +1,9 @@
 import { expect } from 'chai';
 import { GitProcess, IGitExecutionOptions, IGitResult } from 'dugite';
-import { nextVersion, shouldUpdateSupported, updateSupported } from '../script/release/version-bumper';
+import { nextVersion } from '../script/release/version-bumper';
 import * as utils from '../script/release/version-utils';
 import * as sinon from 'sinon';
 import { ifdescribe } from './spec-helpers';
-const { promises: fs } = require('fs');
-const path = require('path');
-
-const fixtureDir = path.resolve(__dirname, 'fixtures', 'version-bumper', 'fixture_support.md');
-const readFile = fs.readFile;
-const writeFile = fs.writeFile;

 class GitFake {
  branches: {
@@ -96,94 +90,6 @@ describe('version-bumper', () => {
    });
  });

-  describe('updateSupported', () => {
-    let restore: any;
-    before(async () => {
-      restore = await readFile(fixtureDir, 'utf8');
-    });
-
-    afterEach(async () => {
-      await writeFile(fixtureDir, restore, 'utf8');
-    });
-
-    it('updates correctly when a new stable version is promoted from beta', async () => {
-      const version = '4.0.0';
-      const currentVersion = '4.0.0-beta.29';
-      if (shouldUpdateSupported('stable', currentVersion, version)) {
-        await updateSupported(version, fixtureDir);
-      }
-      const contents = await readFile(fixtureDir, 'utf8');
-
-      expect(contents).to.contain('4.x.y\n* 3.x.y\n* 2.x.y');
-    });
-
-    it('should not update when a new stable patch version is promoted', async () => {
-      const version = '3.0.1';
-      const currentVersion = '3.0.0';
-      if (shouldUpdateSupported('stable', currentVersion, version)) {
-        await updateSupported(version, fixtureDir);
-      }
-      const contents = await readFile(fixtureDir, 'utf8');
-
-      expect(contents).to.contain('3.x.y\n* 2.x.y\n* 1.x.y');
-    });
-
-    it('should not update when a new stable minor version is promoted', async () => {
-      const version = '3.1.0';
-      const currentVersion = '3.0.0';
-      if (shouldUpdateSupported('minor', currentVersion, version)) {
-        await updateSupported(version, fixtureDir);
-      }
-      const contents = await readFile(fixtureDir, 'utf8');
-
-      expect(contents).to.contain('3.x.y\n* 2.x.y\n* 1.x.y');
-    });
-
-    it('should not update when a new beta.1 version is promoted', async () => {
-      const version = '5.0.0-beta.1';
-      const currentVersion = '4.0.0-beta.29';
-      if (shouldUpdateSupported('beta', currentVersion, version)) {
-        await updateSupported(version, fixtureDir);
-      }
-      const contents = await readFile(fixtureDir, 'utf8');
-
-      expect(contents).to.contain('3.x.y\n* 2.x.y\n* 1.x.y');
-    });
-
-    it('should not update when a new beta.12 version is promoted', async () => {
-      const version = '4.0.0-beta.12';
-      const currentVersion = '4.0.0-beta.11';
-      if (shouldUpdateSupported('beta', currentVersion, version)) {
-        await updateSupported(version, fixtureDir);
-      }
-      const contents = await readFile(fixtureDir, 'utf8');
-
-      expect(contents).to.contain('3.x.y\n* 2.x.y\n* 1.x.y');
-    });
-
-    it('should update when a new major nightly version is promoted', async () => {
-      const version = '4.0.0-nightly.19950901';
-      const currentVersion = '3.0.0-nightly.19950828';
-      if (shouldUpdateSupported('nightly', currentVersion, version)) {
-        await updateSupported(version, fixtureDir);
-      }
-      const contents = await readFile(fixtureDir, 'utf8');
-
-      expect(contents).to.contain('4.x.y\n* 3.x.y\n* 2.x.y');
-    });
-
-    it('should not update when a new nightly version is promoted', async () => {
-      const version = '3.0.0-nightly.19950901';
-      const currentVersion = '3.0.0-nightly.19950828';
-      if (shouldUpdateSupported('nightly', currentVersion, version)) {
-        await updateSupported(version, fixtureDir);
-      }
-      const contents = await readFile(fixtureDir, 'utf8');
-
-      expect(contents).to.contain('3.x.y\n* 2.x.y\n* 1.x.y');
-    });
-  });
-
  // On macOS Circle CI we don't have a real git environment due to running
  // gclient sync on a linux machine. These tests therefore don't run as expected.
  ifdescribe(!(process.platform === 'linux' && process.arch.indexOf('arm') === 0) && process.platform !== 'darwin')('nextVersion', () => {
--- a/spec/fixtures/test.asar/repack.js
+++ b/spec/fixtures/test.asar/repack.js
@@ -1,7 +1,7 @@
 // Use this script to regenerate these fixture files
 // using a new version of the asar package

-const asar = require('asar');
+const asar = require('@electron/asar');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
--- a/yarn.lock
+++ b/yarn.lock
@@ -106,6 +106,18 @@
    esutils "^2.0.2"
    js-tokens "^4.0.0"

+"@electron/asar@^3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@electron/asar/-/asar-3.2.1.tgz#c4143896f3dd43b59a80a9c9068d76f77efb62ea"
+  integrity sha512-hE2cQMZ5+4o7+6T2lUaVbxIzrOjZZfX7dB02xuapyYFJZEAiWTelq6J3mMoxzd0iONDvYLPVKecB5tyjIoVDVA==
+  dependencies:
+    chromium-pickle-js "^0.2.0"
+    commander "^5.0.0"
+    glob "^7.1.6"
+    minimatch "^3.0.4"
+  optionalDependencies:
+    "@types/glob" "^7.1.1"
+
 "@electron/docs-parser@^0.12.4":
  version "0.12.4"
  resolved "https://registry.yarnpkg.com/@electron/docs-parser/-/docs-parser-0.12.4.tgz#cca403c8c2200181339c3115cdd25f3fbfc7dea3"
@@ -1208,18 +1220,6 @@ arrify@^1.0.0:
  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=

-asar@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/asar/-/asar-3.1.0.tgz#70b0509449fe3daccc63beb4d3c7d2e24d3c6473"
-  integrity sha512-vyxPxP5arcAqN4F/ebHd/HhwnAiZtwhglvdmc7BR2f0ywbVNTOpSeyhLDbGXtE/y58hv1oC75TaNIXutnsOZsQ==
-  dependencies:
-    chromium-pickle-js "^0.2.0"
-    commander "^5.0.0"
-    glob "^7.1.6"
-    minimatch "^3.0.4"
-  optionalDependencies:
-    "@types/glob" "^7.1.1"
-
 asn1.js@^4.0.0:
  version "4.10.1"
  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
Author	SHA1	Message	Date
Keeley Hammond	019c05b924	build: determine electron version from tags not files (#36135 ) * build: determine electron version from tags not files (#36106) * build: determine electron version from tags not files * build: make electron_version dependent on packed-refs and git HEAD * build: do not delete electron/.git * build: do not revert a commit we didn't make * build: gen version file instead of just writing it * build: update cache and ninja targets * build: copy resource.h to generated electron.rc * build: electron_win32_resources should be public deps * build: also copy the icon Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org> * chore: fixup patches * chore: update patches * build: ensure get-version runs in the electron git checkout (#36128) * build: strip v in the getElectronVersion helper * build: use npm@7 for npm view command Co-authored-by: MarshallOfSound <marshallofsound@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: Samuel Attard <sattard@salesforce.com>	2022-10-28 13:13:03 -07:00
trop[bot]	0fe2a73f83	build: prefix version in uploader script (#36173 ) build: prefix v in uploader script Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com>	2022-10-27 17:47:26 -07:00
trop[bot]	69cb9c1581	test: fixup HID test for ARM CI (#36172 ) (cherry picked from commit `caf28066d6`) Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>	2022-10-27 16:47:54 -04:00
trop[bot]	b176c95226	fix: resolve loadURL properly for in-page navigations (#36150 ) Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>	2022-10-27 16:19:44 -04:00
trop[bot]	fa9ffa77b8	refactor: handle uncaught promise error (#36158 ) Co-authored-by: daief <1437931235@qq.com> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: daief <1437931235@qq.com>	2022-10-27 14:25:43 -04:00
electron-roller[bot]	9870a31225	chore: bump chromium to 106.0.5249.165 (21-x-y) (#36162 ) * chore: bump chromium in DEPS to 106.0.5249.165 * chore: update patches Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>	2022-10-27 14:20:54 -04:00
trop[bot]	0ee70e9431	docs: correcting main example in WebRequest documentation (#36160 ) docs: correcting main example in WebRequest documentation (#36113) Correcting main example The entry `://electron.github.io` is invalid and produces an exception. i.e. > UnhandledPromiseRejectionWarning: TypeError: Invalid url pattern ://electron.github.io: Empty path. Setting a valid path to resolve this issue Co-authored-by: Shane Gannon <sgannon200@gmail.com> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shane Gannon <sgannon200@gmail.com>	2022-10-27 14:17:15 -04:00
trop[bot]	47bc841d6c	test: fix flake in will-navigate test (#36166 ) Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>	2022-10-27 14:07:07 -04:00
trop[bot]	a75e369e9c	docs: document that when `invoke` rejects, it gives a different Error (#36147 ) Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>	2022-10-26 17:28:19 -07:00
electron-roller[bot]	bec207c931	chore: bump chromium to 106.0.5249.120 (21-x-y) (#36145 ) chore: bump chromium in DEPS to 106.0.5249.120 Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>	2022-10-26 15:24:02 -04:00
trop[bot]	28b9856094	build: use python3 for appveyor commands (#36132 ) Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@salesforce.com>	2022-10-25 20:28:32 -07:00
trop[bot]	ed999f5456	docs: fixed MenuItem documentation to use the same formatting for all role options (#36119 ) docs: fixed MenuItem documentation to use the same formatting for all role options (#36112) Fixed MenuItem documentation Some of the items in the list of possible roles were formatted differently, which made it harder to read. Sorry if this was intended, but I found it easier to read with them all formatted the same. Co-authored-by: flynow10 <37031514+flynow10@users.noreply.github.com> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: flynow10 <37031514+flynow10@users.noreply.github.com>	2022-10-25 20:45:26 +09:00
trop[bot]	67363441a5	test: exit properly when `node-spec-runner` validates specs (#36103 ) test: exit properly when node spec runner validates specs Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>	2022-10-24 16:29:01 +02:00
George Xu	47dd47d8c4	refactor: migrate from asar to @electron/asar (#36070 ) (#36087 ) * refactor: migrate from asar to @electron/asar (#36070) * refactor: migrate from asar to @electron/asar * fix: update asar require calls * kick ci Co-authored-by: Samuel Attard <sam@electronjs.org>	2022-10-21 11:14:36 +02:00
trop[bot]	0a34be3e55	test: disable flaky linux arm/arm64 crash test case (#36098 ) test: disable failing linux arm/arm64 crash test case Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>	2022-10-21 11:13:32 +02:00
trop[bot]	72eea879e7	fix: printToPDF default margins (#36072 ) fix: printToPDF default margins (#36060) printToPDF default margins The document printToPDF has a 1cm margin and this default value has been added in the code. Co-authored-by: Yusoo <Yusoo@users.noreply.github.com> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Yusoo <Yusoo@users.noreply.github.com>	2022-10-20 16:34:16 -04:00
trop[bot]	bcfafc4386	fix: headless job tracking in printToPDF (#36064 ) Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>	2022-10-20 14:28:21 -04:00