From b7d10810a5ee19cd6fe68f8252c54aaf750e518c Mon Sep 17 00:00:00 2001 From: Gorjan Petrovski Date: Thu, 2 Sep 2021 15:59:43 +0200 Subject: [PATCH] chore: update snjs, sncrypto-web and fix tsc complaints (#624) Co-authored-by: Mo Bitar Co-authored-by: Mo Bitar --- .../directives/views/componentView.ts | 2 +- .../javascripts/views/footer/footer_view.ts | 10 +-- package.json | 4 +- yarn.lock | 71 +++++++++++++------ 4 files changed, 59 insertions(+), 28 deletions(-) diff --git a/app/assets/javascripts/directives/views/componentView.ts b/app/assets/javascripts/directives/views/componentView.ts index 5df917399..67392b335 100644 --- a/app/assets/javascripts/directives/views/componentView.ts +++ b/app/assets/javascripts/directives/views/componentView.ts @@ -34,7 +34,7 @@ class ComponentViewCtrl implements ComponentViewScope { private unregisterDesktopObserver!: () => void private issueLoading = false private isDeprecated = false - private deprecationMessage = '' + private deprecationMessage: string | undefined = undefined private deprecationMessageDismissed = false public reloading = false private expired = false diff --git a/app/assets/javascripts/views/footer/footer_view.ts b/app/assets/javascripts/views/footer/footer_view.ts index 9764d3c2a..33d0f9da6 100644 --- a/app/assets/javascripts/views/footer/footer_view.ts +++ b/app/assets/javascripts/views/footer/footer_view.ts @@ -301,7 +301,7 @@ class FooterViewCtrl extends PureViewCtrl< CollectionSort.Title, 'asc', (theme: SNTheme) => { - return theme.package_info && theme.package_info.dock_icon; + return theme.package_info && theme.package_info.dock_icon != undefined; } ); @@ -540,9 +540,11 @@ class FooterViewCtrl extends PureViewCtrl< const id = 'dock-svg-' + shortcut.component.uuid; const element = document.getElementById(id)!; const parser = new DOMParser(); - const svg = shortcut.component.package_info.dock_icon.source; - const doc = parser.parseFromString(svg, 'image/svg+xml'); - element.appendChild(doc.documentElement); + const svg = shortcut.component.package_info.dock_icon?.source; + if (svg != undefined) { + const doc = parser.parseFromString(svg, 'image/svg+xml'); + element.appendChild(doc.documentElement); + } } selectShortcut(shortcut: DockShortcut) { diff --git a/package.json b/package.json index bf01da617..65963cf74 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ "@reach/alert-dialog": "^0.13.0", "@reach/checkbox": "^0.13.2", "@reach/dialog": "^0.13.0", - "@standardnotes/sncrypto-web": "1.2.10", - "@standardnotes/snjs": "2.7.23", + "@standardnotes/sncrypto-web": "1.5.2", + "@standardnotes/snjs": "2.11.2", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "preact": "^10.5.12" diff --git a/yarn.lock b/yarn.lock index 30920454c..165cc2889 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2016,32 +2016,61 @@ resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.1.1.tgz#834701c2e14d31eb204bff90457fa05e9183464a" integrity sha512-E9zDYZ1gJkVZBEzd7a1L2haQ4GYeH1lUrY87UmDH1AMYUHW+c0SqZ71af1fBNqGzrx3EZSXk+Qzr7RyOa6N1Mw== -"@standardnotes/features@1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.0.0.tgz#906af029b6e58241689ca37436982c37a888a418" - integrity sha512-PEQyP/p/TQLVcNYcbu9jEIWNRqBrFFG1Qyy8QIcvNUt5o4lpLZGEY1T+PJUsPSisnuKKNpQrgVLc9LjhUKpuYw== - -"@standardnotes/sncrypto-common@^1.2.7", "@standardnotes/sncrypto-common@^1.2.9": - version "1.2.9" - resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.2.9.tgz#5212a959e4ec563584e42480bfd39ef129c3cbdf" - integrity sha512-xJ5IUGOZztjSgNP/6XL+Ut5+q9UgSTv6xMtKkcQC5aJxCOkJy9u6RamPLdF00WQgwibxx2tu0e43bKUjTgzMig== - -"@standardnotes/sncrypto-web@1.2.10": - version "1.2.10" - resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-web/-/sncrypto-web-1.2.10.tgz#ddda0c8ec92754c1334d9a83be7b320433c55b79" - integrity sha512-mmHlXFFovBqOdctpMkyXTpK0zI/k4NuXoV5LRGLKIXUktT9/cZg1pgNNfGPFUP+g4C5M2qxeFmZKFh581ipolQ== +"@standardnotes/auth@^3.2.0": + version "3.7.0" + resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.7.0.tgz#1193f0521bd3b1c3655685c27aff894b98c7f582" + integrity sha512-lHMRyVOxF9g11MH04wcbhpErPysL721Hgrzbi6slRDqIuA+2VpECIkbAhI5WpgP5K8RjO/kZB4l0tzcRI1Mg/g== dependencies: - "@standardnotes/sncrypto-common" "^1.2.7" + "@standardnotes/common" "^1.0.0" + +"@standardnotes/common@1.1.0", "@standardnotes/common@^1.0.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.1.0.tgz#5ffb0a50f9947471e236bb66d097f153ad9a148f" + integrity sha512-Nm2IFWbMSfZDD7cnKtN+Gjic0f+PhPq/da/o4eOoUKg21VeOaQkTn+jlQKraKIs6Lmf+w9mmPNAgMc5o4hj7Lg== + +"@standardnotes/domain-events@2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.0.0.tgz#6e537485054c6b32cb1d9408fab9cd132ed0fb65" + integrity sha512-4rMCGw2Gy1CLfi6SkpsH7QzbT/80g5gVGeicEHhHvLhMolAEsHXCGOjpw5/nA3YKl8B/U8s6wvaee2vIDejFLA== + dependencies: + "@standardnotes/auth" "^3.2.0" + +"@standardnotes/features@1.4.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.4.0.tgz#64f0149eb94bee8cb7e748ad2dc2f94f5c2932f3" + integrity sha512-PQEjDdFjJ+hvGz6rD6LATtlICxNr2YKKwht69qGlDqMPSXQaljrq9bocAdGKuy+YOu+aKFvrmRbezsBK9rRIdw== + dependencies: + "@standardnotes/common" "^1.0.0" + +"@standardnotes/settings@1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@standardnotes/settings/-/settings-1.2.0.tgz#d7936c788138265b0720085ca9e63358d3092459" + integrity sha512-7ikL9BfgXPcLsTJKgCNuRCJN/rFeWreXNxC8M/rxGY+Yk0694WXYyM6jFY8Ry6yV9vLaVukS7Ov6acf+D4wrFg== + +"@standardnotes/sncrypto-common@1.5.2", "@standardnotes/sncrypto-common@^1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.5.2.tgz#be9404689d94f953c68302609a4f76751eaa82cd" + integrity sha512-+OQ6gajTcVSHruw33T52MHyBDKL1vRCfQBXQn4tt4+bCfBAe+PFLkEQMHp35bg5twCfg9+wUf2KhmNNSNyBBZw== + +"@standardnotes/sncrypto-web@1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-web/-/sncrypto-web-1.5.2.tgz#b213063149b563a4f57f0144f3c9fe62ad0458c0" + integrity sha512-ltfc0EqeCAGvd0+q7iGOcIVNgbPLJHRw5RQaAGdFtAe98VEH3GcyUm9PxEnUN+Q1gk+HJ083gU6q2tJbo5L+3Q== + dependencies: + "@standardnotes/sncrypto-common" "^1.5.2" libsodium-wrappers "^0.7.8" -"@standardnotes/snjs@2.7.23": - version "2.7.23" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.7.23.tgz#fedc9c025301dbe20ed2d598fb378e36f90ff64e" - integrity sha512-eoEwKlV2PZcJXFbCt6bgovu9nldVoT7DPoterTBo/NZ4odRILOwxLA1SAgL5H5FYPb9NHkwaaCt9uTdIqdNYhA== +"@standardnotes/snjs@2.11.2": + version "2.11.2" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.11.2.tgz#2ae172950316ee3aa7ad95d4fec4dc85d7ac1269" + integrity sha512-49NPflKrBcAkVcs7nGf7D/oatcPRPZz7+TKyi4s9Xsxf69EmHIQhVu9u+sCUCaUTq2j1sjQt9tyCacjche7p4w== dependencies: "@standardnotes/auth" "3.1.1" - "@standardnotes/features" "1.0.0" - "@standardnotes/sncrypto-common" "^1.2.9" + "@standardnotes/common" "1.1.0" + "@standardnotes/domain-events" "2.0.0" + "@standardnotes/features" "1.4.0" + "@standardnotes/settings" "1.2.0" + "@standardnotes/sncrypto-common" "1.5.2" "@svgr/babel-plugin-add-jsx-attribute@^5.4.0": version "5.4.0"