Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch to shiftkey/node-keytar as it has NAPI 10 updates #2172

Merged
merged 12 commits into from
Mar 3, 2025
Merged

Switch to shiftkey/node-keytar as it has NAPI 10 updates #2172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6ae0971
Test keytar-forked
t3chguy Feb 28, 2025
08b61a7
Iterate
t3chguy Feb 28, 2025
fde278d
Leverage electron-builder to build keytar rather than hak
t3chguy Feb 28, 2025
5ee122c
Add logging
t3chguy Feb 28, 2025
36446c1
Merge branch 'develop' into t3chguy/keytar-forked
t3chguy Feb 28, 2025
e4dac2a
Iterate
t3chguy Feb 28, 2025
2219ca9
Merge branch 'develop' into t3chguy/keytar-no-hak
t3chguy Feb 28, 2025
be9214f
Merge branch 't3chguy/keytar-no-hak' of https://github.com/vector-im/…
t3chguy Feb 28, 2025
3e7b108
Merge remote-tracking branch 'origin/t3chguy/keytar-forked' into t3ch…
t3chguy Feb 28, 2025
02c23e8
Update imports
t3chguy Feb 28, 2025
1663d40
Update knip.ts
t3chguy Feb 28, 2025
d8ca487
Merge branch 'develop' of https://github.com/vector-im/element-deskto…
t3chguy Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .node-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v22.13.1
v22.14.0
1 change: 0 additions & 1 deletion knip.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ export default {
project: ["**/*.{js,ts}"],
ignoreDependencies: [
// Brought in via hak scripts
"keytar",
"matrix-seshat",
// Required for `action-validator`
"@action-validator/*",
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/ipc.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/seshat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
22 changes: 11 additions & 11 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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[email protected].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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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==
Expand Down
Loading