Skip to content

Commit 47e78b6

Browse files
authored
Merge pull request #93 from pol-rivero/test-keytar-rebuild
Rebuild keytar for x86 macOS
2 parents 2c8523d + c39be71 commit 47e78b6

3 files changed

Lines changed: 14 additions & 8 deletions

File tree

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"focus-trap-react": "^8.1.0",
4444
"fs-admin-forked": "^0.23.0",
4545
"fuzzaldrin-plus": "^0.6.0",
46-
"keytar-forked-forked": "^7.10.3",
46+
"keytar": "^7.8.0",
4747
"lodash": "^4.17.23",
4848
"marked": "^4.0.10",
4949
"mem": "^4.3.0",

app/src/lib/stores/token-store.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as keytar from 'keytar-forked-forked'
1+
import * as keytar from 'keytar'
22

33
function setItem(key: string, login: string, value: string) {
44
return keytar.setPassword(key, login, value)

app/yarn.lock

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -682,12 +682,13 @@ jszip@^3.1.0:
682682
readable-stream "~2.3.6"
683683
setimmediate "^1.0.5"
684684

685-
keytar-forked-forked@^7.10.3:
686-
version "7.10.3"
687-
resolved "https://registry.yarnpkg.com/keytar-forked-forked/-/keytar-forked-forked-7.10.3.tgz#154e57f5c102e2bfe626a630a7eb17bdb1257c2e"
688-
integrity sha512-ipErTUO1NPXmngYhnMrda0yOIOPSNbVJ2BRjk3kNozLx3UmGICnzCfEDemuLY6HgP+rV0c9F+Opt+89+Ydbw6w==
685+
keytar@^7.8.0:
686+
version "7.9.0"
687+
resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.9.0.tgz#4c6225708f51b50cbf77c5aae81721964c2918cb"
688+
integrity sha512-VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==
689689
dependencies:
690-
node-addon-api "^8.3.0"
690+
node-addon-api "^4.3.0"
691+
prebuild-install "^7.0.1"
691692

692693
kuler@^2.0.0:
693694
version "2.0.0"
@@ -845,6 +846,11 @@ node-addon-api@^3.1.0:
845846
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
846847
integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
847848

849+
node-addon-api@^4.3.0:
850+
version "4.3.0"
851+
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
852+
integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==
853+
848854
node-addon-api@^7.0.0:
849855
version "7.1.1"
850856
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.1.tgz#1aba6693b0f255258a049d621329329322aad558"
@@ -967,7 +973,7 @@ prebuild-install@^5.3.5:
967973
tunnel-agent "^0.6.0"
968974
which-pm-runs "^1.0.0"
969975

970-
prebuild-install@^7.1.3:
976+
prebuild-install@^7.0.1, prebuild-install@^7.1.3:
971977
version "7.1.3"
972978
resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.3.tgz#d630abad2b147443f20a212917beae68b8092eec"
973979
integrity sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==

0 commit comments

Comments
 (0)