From b6fd909d67d92a7ca6220d9e068aaadb233faa24 Mon Sep 17 00:00:00 2001
From: Eugene Pankov <e@ajenti.org>
Date: Sun, 12 Dec 2021 14:05:55 +0100
Subject: [PATCH] electron 14

---
 app/lib/window.ts |  4 +++-
 app/package.json  |  4 ++--
 app/yarn.lock     |  8 ++++----
 package.json      |  4 ++--
 yarn.lock         | 23 ++++++++---------------
 5 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/app/lib/window.ts b/app/lib/window.ts
index aaf535d7..44010586 100644
--- a/app/lib/window.ts
+++ b/app/lib/window.ts
@@ -3,6 +3,7 @@ import * as glasstron from 'glasstron'
 import { Subject, Observable, debounceTime } from 'rxjs'
 import { BrowserWindow, app, ipcMain, Rectangle, Menu, screen, BrowserWindowConstructorOptions, TouchBar, nativeImage } from 'electron'
 import ElectronConfig = require('electron-config')
+import { enable as enableRemote } from '@electron/remote/main'
 import * as os from 'os'
 import * as path from 'path'
 import macOSRelease from 'macos-release'
@@ -65,7 +66,6 @@ export class Window {
                 nodeIntegration: true,
                 preload: path.join(__dirname, 'sentry.js'),
                 backgroundThrottling: false,
-                enableRemoteModule: true,
                 contextIsolation: false,
             },
             maximizable: true,
@@ -126,6 +126,8 @@ export class Window {
             }
         })
 
+        enableRemote(this.window.webContents)
+
         this.window.loadURL(`file://${app.getAppPath()}/dist/index.html`, { extraHeaders: 'pragma: no-cache\n' })
 
         this.window.webContents.setVisualZoomLevelLimits(1, 1)
diff --git a/app/package.json b/app/package.json
index 96e98cf7..02925229 100644
--- a/app/package.json
+++ b/app/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@angular/cdk": "^12.2.9",
-    "@electron/remote": "1.2.0",
+    "@electron/remote": "2.0.1",
     "@tabby-gang/node-pty": "^0.11.0-beta.200",
     "any-promise": "^1.3.0",
     "electron-config": "2.0.0",
@@ -35,9 +35,9 @@
     "yargs": "^17.2.1"
   },
   "optionalDependencies": {
+    "@tabby-gang/windows-blurbehind": "^3.0.0",
     "macos-native-processlist": "^2.0.0",
     "serialport": "^10.0.0",
-    "@tabby-gang/windows-blurbehind": "^3.0.0",
     "windows-native-registry": "^3.1.0",
     "windows-process-tree": "^0.3.2"
   },
diff --git a/app/yarn.lock b/app/yarn.lock
index 73467a80..b571e44a 100644
--- a/app/yarn.lock
+++ b/app/yarn.lock
@@ -11,10 +11,10 @@
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@electron/remote@1.2.0":
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-1.2.0.tgz#772eb4c3ac17aaba5a9cf05a09092f6277f5671f"
-  integrity sha512-C774t2DFVJsa+dxU9Gc2nYzylRZoJ79I0Sxrh8T9cN69fBkntfGbyBEQiD9UfZopqL0CYLzk1anY2Ywhql6h1w==
+"@electron/remote@2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.1.tgz#810cbc595a21f0f94641eb2d7e8264063a3f84de"
+  integrity sha512-bGX4/yB2bPZwXm1DsxgoABgH0Cz7oFtXJgkerB8VrStYdTyvhGAULzNLRn9rVmeAuC3VUDXaXpZIlZAZHpsLIA==
 
 "@iarna/cli@^1.2.0":
   version "1.2.0"
diff --git a/package.json b/package.json
index 5ad40fc3..1026292a 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "cross-env": "7.0.3",
     "css-loader": "^6.5.1",
     "deep-equal": "2.0.5",
-    "electron": "13.5.1",
+    "electron": "14.2.1",
     "electron-builder": "^22.14.5",
     "electron-download": "^4.1.1",
     "electron-installer-snap": "^5.1.0",
@@ -81,7 +81,7 @@
   },
   "resolutions": {
     "lzma-native": "^8.0.0",
-    "*/node-abi": "^2.30.0",
+    "*/node-abi": "^3.5.0",
     "**/graceful-fs": "^4.2.4"
   },
   "scripts": {
diff --git a/yarn.lock b/yarn.lock
index 7408ba54..0bd04203 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2664,10 +2664,10 @@ electron-to-chromium@^1.3.723:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.736.tgz#f632d900a1f788dab22fec9c62ec5c9c8f0c4052"
   integrity sha512-DY8dA7gR51MSo66DqitEQoUMQ0Z+A2DSXFi7tK304bdTVqczCAfUuyQw6Wdg8hIoo5zIxkU1L24RQtUce1Ioig==
 
-electron@13.5.1:
-  version "13.5.1"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-13.5.1.tgz#76c02c39be228532f886a170b472cbd3d93f0d0f"
-  integrity sha512-ZyxhIhmdaeE3xiIGObf0zqEyCyuIDqZQBv9NKX8w5FNzGm87j4qR0H1+GQg6vz+cA1Nnv1x175Zvimzc0/UwEQ==
+electron@14.2.1:
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-14.2.1.tgz#ee8b9cfa8c04ad4d9456daa5bbac562c2c2517a1"
+  integrity sha512-20cLOVpmjIgYMgsDLpI36VQhv0bIy54sSBAP3rLFtrs/kVVHLu0educMVZkkMm5GJPd2vvU4mcK7f43JgVRcNg==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^14.6.2"
@@ -5335,17 +5335,10 @@ no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-abi@^2.30.0, node-abi@^3.0.0:
-  version "2.30.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b"
-  integrity sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==
-  dependencies:
-    semver "^5.4.1"
-
-node-abi@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.2.0.tgz#c8ec6874f808b4da5fbd56e9506390ce65b152a2"
-  integrity sha512-/qb92JAb2uiwEQ4aXpVphXfGJU77qdCieXACDaIofcMz+YMPBmnCo8v0OlzJBuXh5QHmMiiI/GKyiCzbjOMn2g==
+node-abi@^3.0.0, node-abi@^3.2.0, node-abi@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248"
+  integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw==
   dependencies:
     semver "^7.3.5"