diff --git a/.node-version b/.node-version index 437793775..c5ddcef4e 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -v22.13.1 \ No newline at end of file +v22.14.0 \ No newline at end of file diff --git a/knip.ts b/knip.ts index a2b795498..e6ddebdf2 100644 --- a/knip.ts +++ b/knip.ts @@ -5,7 +5,6 @@ export default { project: ["**/*.{js,ts}"], ignoreDependencies: [ // Brought in via hak scripts - "keytar", "matrix-seshat", // Required for `action-validator` "@action-validator/*", diff --git a/package.json b/package.json index 026bc0933..ba4ef9bd3 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "type": "module", "files": [], "engines": { - "node": ">=18.0.0 <=22.13.1" + "node": ">=18.0.0" }, "scripts": { "i18n": "matrix-gen-i18n && yarn i18n:sort && yarn i18n:lint", @@ -63,7 +63,7 @@ "counterpart": "^0.18.6", "electron-store": "^10.0.0", "electron-window-state": "^5.0.3", - "keytar": "^7.9.0", + "keytar-forked": "7.10.0", "minimist": "^1.2.6", "png-to-ico": "^2.1.1", "uuid": "^11.0.0" diff --git a/src/ipc.ts b/src/ipc.ts index 9bbeb4e94..c2f6371dd 100644 --- a/src/ipc.ts +++ b/src/ipc.ts @@ -7,7 +7,7 @@ Please see LICENSE files in the repository root for full details. import { app, autoUpdater, desktopCapturer, ipcMain, powerSaveBlocker, TouchBar, nativeImage } from "electron"; import { relaunchApp } from "@standardnotes/electron-clear-data"; -import keytar from "keytar"; +import keytar from "keytar-forked"; import IpcMainEvent = Electron.IpcMainEvent; import { recordSSOSession } from "./protocol.js"; diff --git a/src/seshat.ts b/src/seshat.ts index ac467cd63..93f2e0b1b 100644 --- a/src/seshat.ts +++ b/src/seshat.ts @@ -8,7 +8,7 @@ Please see LICENSE files in the repository root for full details. import { app, ipcMain } from "electron"; import { promises as afs } from "node:fs"; import path from "node:path"; -import keytar from "keytar"; +import keytar from "keytar-forked"; import type { Seshat as SeshatType, diff --git a/yarn.lock b/yarn.lock index 0f1547118..5febb57d1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5123,13 +5123,13 @@ jszip@^3.1.0: readable-stream "~2.3.6" setimmediate "^1.0.5" -keytar@^7.9.0: - version "7.9.0" - resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb" - integrity sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ== +keytar-forked@7.10.0: + version "7.10.0" + resolved "https://registry.yarnpkg.com/keytar-forked/-/keytar-forked-7.10.0.tgz#dbb78e16b18a40fc61df58124228855a7e8c912d" + integrity sha512-MrH3Id3Bjf4av3zGihBK62NucgBOVbTzchnSRPtA14sWRj9xu7roFa9NddlxC6Nt98EdrQpu04MZXnuusV+b5w== dependencies: - node-addon-api "^4.3.0" - prebuild-install "^7.0.1" + node-addon-api "^8.3.0" + prebuild-install "^7.1.3" keyv@^4.0.0, keyv@^4.5.3: version "4.5.4" @@ -5643,10 +5643,10 @@ node-addon-api@^1.6.3: resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== -node-addon-api@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f" - integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ== +node-addon-api@^8.3.0: + version "8.3.1" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-8.3.1.tgz#53bc8a4f8dbde3de787b9828059da94ba9fd4eed" + integrity sha512-lytcDEdxKjGJPTLEfW4mYMigRezMlyJY8W4wxJK8zE533Jlb8L8dRuObJFWg2P+AuOIxoCgKF+2Oq4d4Zd0OUA== node-api-version@^0.2.0: version "0.2.0" @@ -6253,7 +6253,7 @@ postject@^1.0.0-alpha.6: dependencies: commander "^9.4.0" -prebuild-install@^7.0.1: +prebuild-install@^7.1.3: version "7.1.3" resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.3.tgz#d630abad2b147443f20a212917beae68b8092eec" integrity sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==