From 3fb802e563c7ecd26c25a8663a5d30c51508d837 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Jul 2021 15:27:49 +0100
Subject: [PATCH 1/2] Update to electron 13

and to seshat 2.3.0 which supports it.
---
 hak/matrix-seshat/build.js | 3 +++
 package.json               | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hak/matrix-seshat/build.js b/hak/matrix-seshat/build.js
index a2bcec5..0468d47 100644
--- a/hak/matrix-seshat/build.js
+++ b/hak/matrix-seshat/build.js
@@ -258,6 +258,9 @@ async function buildSqlCipherUnix(hakEnv, moduleInfo) {
 }
 
 async function buildMatrixSeshat(hakEnv, moduleInfo) {
+    // seshat now uses n-api so we shouldn't need to specify a node version to
+    // build against, but it does seems to still need something in here, so leaving
+    // it for now: we should confirm how much of this it still actually needs.
     const env = hakEnv.makeGypEnv();
 
     if (!hakEnv.isLinux()) {
diff --git a/package.json b/package.json
index af097e6..2247b7b 100644
--- a/package.json
+++ b/package.json
@@ -77,12 +77,12 @@
     "typescript": "^4.1.3"
   },
   "hakDependencies": {
-    "matrix-seshat": "^2.2.3",
+    "matrix-seshat": "^2.3.0",
     "keytar": "^5.6.0"
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "12.0.14",
+    "electronVersion": "13.1.6",
     "files": [
       "package.json",
       {

From 6aef1fc203d7362b479379b074c7da013ce565d9 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 21 Jul 2021 15:34:12 +0100
Subject: [PATCH 2/2] Update electron devDependency too

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 2247b7b..71cfe67 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "@typescript-eslint/parser": "^4.17.0",
     "asar": "^2.0.1",
     "chokidar": "^3.5.2",
-    "electron": "12.0.11",
+    "electron": "^13.1.7",
     "electron-builder": "22.11.4",
     "electron-builder-squirrel-windows": "22.11.4",
     "electron-devtools-installer": "^3.1.1",
diff --git a/yarn.lock b/yarn.lock
index 388fed2..39a0ccd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1844,10 +1844,10 @@ electron-window-state@^5.0.3:
     jsonfile "^4.0.0"
     mkdirp "^0.5.1"
 
-electron@12.0.11:
-  version "12.0.11"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-12.0.11.tgz#555dc1cf663e320f2f2cbdf89319352b08fc59f2"
-  integrity sha512-6gPjcce3QCeAWZ8UVAqVy6os+86D5BcxgkIzlROxX89u+du/i7WpZXF5F1vgv419rspds9OHejP3JrJnoUGh6w==
+electron@^13:
+  version "13.1.7"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-13.1.7.tgz#7e17f5c93a8d182a2a486884fed3dc34ab101be9"
+  integrity sha512-sVfpP/0s6a82FK32LMuEe9L+aWZw15u3uYn9xUJArPjy4OZHteE6yM5871YCNXNiDnoCLQ5eqQWipiVgHsf8nQ==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^14.6.2"