From 87b2f12663acdcc820d61ffd44c379a773203134 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Thu, 18 Jul 2024 11:01:22 -0400
Subject: [PATCH] [MM-59544] Upgrade to Electron v31.2.1 (#3096)

---
 package-lock.json                             | 24 +++++++++----------
 package.json                                  |  4 ++--
 .../diagnostics/steps/step7.performance.ts    |  1 -
 src/main/permissionsManager.ts                |  7 +++++-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f68c0b08..2a9dd358 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "electron-extension-installer": "1.2.0",
         "electron-is-dev": "2.0.0",
         "electron-log": "5.1.1",
-        "electron-updater": "6.1.8",
+        "electron-updater": "6.3.0",
         "joi": "17.12.2",
         "macos-notification-state": "3.0.0",
         "pretty-bytes": "6.1.1",
@@ -55,7 +55,7 @@
         "copy-webpack-plugin": "10.2.4",
         "cross-env": "7.0.3",
         "css-loader": "6.7.1",
-        "electron": "29.3.0",
+        "electron": "31.2.1",
         "electron-builder": "24.13.3",
         "electron-connect": "0.6.3",
         "eslint": "8.57.0",
@@ -7214,9 +7214,9 @@
       }
     },
     "node_modules/electron": {
-      "version": "29.3.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-29.3.0.tgz",
-      "integrity": "sha512-ZxFKm0/v48GSoBuO3DdnMlCYXefEUKUHLMsKxyXY4nZGgzbBKpF/X8haZa2paNj23CLfsCKBOtfc2vsEQiOOsA==",
+      "version": "31.2.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-31.2.1.tgz",
+      "integrity": "sha512-g3CLKjl4yuXt6VWm/KpgEjYYhFiCl19RgUn8lOC8zV/56ZXAS3+mqV4wWzicE/7vSYXs6GRO7vkYRwrwhX3Gaw==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -7600,11 +7600,11 @@
       "dev": true
     },
     "node_modules/electron-updater": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.1.8.tgz",
-      "integrity": "sha512-hhOTfaFAd6wRHAfUaBhnAOYc+ymSGCWJLtFkw4xJqOvtpHmIdNHnXDV9m1MHC+A6q08Abx4Ykgyz/R5DGKNAMQ==",
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-6.3.0.tgz",
+      "integrity": "sha512-3Xlezhk+dKaSQrOnkQNqCGiuGSSUPO9BV9TQZ4Iig6AyTJ4FzJONE5gFFc382sY53Sh9dwJfzKsA3DxRHt2btw==",
       "dependencies": {
-        "builder-util-runtime": "9.2.3",
+        "builder-util-runtime": "9.2.5",
         "fs-extra": "^10.1.0",
         "js-yaml": "^4.1.0",
         "lazy-val": "^1.0.5",
@@ -7615,9 +7615,9 @@
       }
     },
     "node_modules/electron-updater/node_modules/builder-util-runtime": {
-      "version": "9.2.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.3.tgz",
-      "integrity": "sha512-FGhkqXdFFZ5dNC4C+yuQB9ak311rpGAw+/ASz8ZdxwODCv1GGMWgLDeofRkdi0F3VCHQEWy/aXcJQozx2nOPiw==",
+      "version": "9.2.5",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.5.tgz",
+      "integrity": "sha512-HjIDfhvqx/8B3TDN4GbABQcgpewTU4LMRTQPkVpKYV3lsuxEJoIfvg09GyWTNmfVNSUAYf+fbTN//JX4TH20pg==",
       "dependencies": {
         "debug": "^4.3.4",
         "sax": "^1.2.4"
diff --git a/package.json b/package.json
index 5237f5aa..8fcc7828 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "copy-webpack-plugin": "10.2.4",
     "cross-env": "7.0.3",
     "css-loader": "6.7.1",
-    "electron": "29.3.0",
+    "electron": "31.2.1",
     "electron-builder": "24.13.3",
     "electron-connect": "0.6.3",
     "eslint": "8.57.0",
@@ -168,7 +168,7 @@
     "electron-extension-installer": "1.2.0",
     "electron-is-dev": "2.0.0",
     "electron-log": "5.1.1",
-    "electron-updater": "6.1.8",
+    "electron-updater": "6.3.0",
     "joi": "17.12.2",
     "macos-notification-state": "3.0.0",
     "pretty-bytes": "6.1.1",
diff --git a/src/main/diagnostics/steps/step7.performance.ts b/src/main/diagnostics/steps/step7.performance.ts
index bfcb5322..b5a1ab70 100644
--- a/src/main/diagnostics/steps/step7.performance.ts
+++ b/src/main/diagnostics/steps/step7.performance.ts
@@ -31,7 +31,6 @@ const run = async (logger: MainLogger): Promise<DiagnosticStepResponse> => {
                     path: heapSnapshotFilepath,
                     success: process.takeHeapSnapshot(heapSnapshotFilepath),
                 },
-                IOCounters: process.getIOCounters(),
                 uptime: process.uptime(),
                 platform: process.platform,
                 sandboxed: process.sandboxed,
diff --git a/src/main/permissionsManager.ts b/src/main/permissionsManager.ts
index 2755c7ea..8df6e046 100644
--- a/src/main/permissionsManager.ts
+++ b/src/main/permissionsManager.ts
@@ -2,8 +2,11 @@
 // See LICENSE.txt for license information.
 
 import type {
+    FilesystemPermissionRequest,
     IpcMainInvokeEvent,
-    PermissionRequestHandlerHandlerDetails,
+    MediaAccessPermissionRequest,
+    OpenExternalPermissionRequest,
+    PermissionRequest,
     WebContents} from 'electron';
 import {
     app,
@@ -56,6 +59,8 @@ type PermissionsByOrigin = {
     [origin: string]: Permissions;
 };
 
+type PermissionRequestHandlerHandlerDetails = PermissionRequest & FilesystemPermissionRequest & MediaAccessPermissionRequest & OpenExternalPermissionRequest;
+
 export class PermissionsManager extends JsonFileManager<PermissionsByOrigin> {
     private inflightPermissionChecks: Map<string, Promise<boolean>>;