diff --git a/app/assets/javascripts/services/archiveManager.ts b/app/assets/javascripts/services/archiveManager.ts index f97530fbd..78d31e2f9 100644 --- a/app/assets/javascripts/services/archiveManager.ts +++ b/app/assets/javascripts/services/archiveManager.ts @@ -39,17 +39,18 @@ export class ArchiveManager { } public async downloadBackup(encrypted: boolean): Promise { - const intent = encrypted - ? EncryptionIntent.FileEncrypted - : EncryptionIntent.FileDecrypted; + const data = encrypted + ? await this.application.createEncryptedBackupFile(true) + : await this.application.createDecryptedBackupFile(); - const data = await this.application.createBackupFile(intent, true); if (!data) { return; } + const blobData = new Blob([JSON.stringify(data, null, 2)], { type: 'text/json', }); + if (encrypted) { this.downloadData( blobData, diff --git a/app/assets/javascripts/services/desktopManager.ts b/app/assets/javascripts/services/desktopManager.ts index 243c3392c..c32ae85dd 100644 --- a/app/assets/javascripts/services/desktopManager.ts +++ b/app/assets/javascripts/services/desktopManager.ts @@ -3,14 +3,14 @@ import { SNComponent, ComponentMutator, AppDataField, - EncryptionIntent, ApplicationService, ApplicationEvent, removeFromArray, DesktopManagerInterface, PayloadSource, + EncryptionIntent, + CreateIntentPayloadFromObject, } from '@standardnotes/snjs'; - import { WebAppEvent, WebApplication } from '@/ui_models/application'; import { isDesktopApplication } from '@/utils'; import { Bridge, ElectronDesktopCallbacks } from './bridge'; @@ -68,7 +68,7 @@ export class DesktopManager * Keys are not passed into ItemParams, so the result is not encrypted */ convertComponentForTransmission(component: SNComponent) { - return this.application.protocolService.payloadByEncryptingPayload( + return CreateIntentPayloadFromObject( component.payloadRepresentation(), EncryptionIntent.FileDecrypted ); @@ -158,11 +158,11 @@ export class DesktopManager } async desktop_requestBackupFile(): Promise { - const data = await this.application.createBackupFile( - this.application.hasProtectionSources() - ? EncryptionIntent.FileEncrypted - : EncryptionIntent.FileDecrypted - ); + const encrypted = this.application.hasProtectionSources(); + const data = encrypted + ? await this.application.createEncryptedBackupFile(false) + : await this.application.createDecryptedBackupFile(); + if (data) { return JSON.stringify(data, null, 2); } diff --git a/app/assets/javascripts/services/themeManager.ts b/app/assets/javascripts/services/themeManager.ts index e44372043..b598499d0 100644 --- a/app/assets/javascripts/services/themeManager.ts +++ b/app/assets/javascripts/services/themeManager.ts @@ -11,6 +11,7 @@ import { FeatureStatus, PayloadSource, PrefKey, + CreateIntentPayloadFromObject, } from '@standardnotes/snjs'; import { InternalEventBus } from '@standardnotes/services'; @@ -271,17 +272,15 @@ export class ThemeManager extends ApplicationService { const themes = this.application.items.findItems( this.activeThemes ) as SNTheme[]; - const mapped = await Promise.all( - themes.map(async (theme) => { - const payload = theme.payloadRepresentation(); - const processedPayload = - await this.application.protocolService.payloadByEncryptingPayload( - payload, - EncryptionIntent.LocalStorageDecrypted - ); - return processedPayload; - }) - ); + + const mapped = themes.map((theme) => { + const payload = theme.payloadRepresentation(); + return CreateIntentPayloadFromObject( + payload, + EncryptionIntent.LocalStorageDecrypted + ); + }); + return this.application.setValue( CACHED_THEMES_KEY, mapped, diff --git a/app/assets/javascripts/tsconfig.json b/app/assets/javascripts/tsconfig.json index 3ff463574..48edf8f14 100644 --- a/app/assets/javascripts/tsconfig.json +++ b/app/assets/javascripts/tsconfig.json @@ -15,8 +15,7 @@ "baseUrl": ".", "jsx": "react-jsx", "jsxImportSource": "preact", - "typeRoots": ["./@types"], - "types": ["@types/jest"], + "typeRoots": ["./@types", "../../../node_modules/@types"], "paths": { "%/*": ["../templates/*"], "@/*": ["./*"], diff --git a/package.json b/package.json index 53530aafa..ae404118b 100644 --- a/package.json +++ b/package.json @@ -28,9 +28,9 @@ "@babel/preset-typescript": "^7.16.7", "@reach/disclosure": "^0.16.2", "@reach/visually-hidden": "^0.16.0", - "@standardnotes/responses": "1.4.0", - "@standardnotes/services": "1.6.11", - "@standardnotes/stylekit": "5.17.0", + "@standardnotes/responses": "1.5.1", + "@standardnotes/services": "1.7.1", + "@standardnotes/stylekit": "5.20.0", "@svgr/webpack": "^6.2.1", "@types/jest": "^27.4.1", "@types/react": "^17.0.42", @@ -72,11 +72,11 @@ "@reach/listbox": "^0.16.2", "@reach/tooltip": "^0.16.2", "@standardnotes/components": "1.7.14", - "@standardnotes/features": "1.36.1", - "@standardnotes/filepicker": "1.10.3", - "@standardnotes/settings": "1.13.1", - "@standardnotes/sncrypto-web": "1.8.0", - "@standardnotes/snjs": "2.92.10", + "@standardnotes/features": "1.36.3", + "@standardnotes/filepicker": "1.10.4", + "@standardnotes/settings": "1.13.2", + "@standardnotes/sncrypto-web": "1.8.1", + "@standardnotes/snjs": "2.93.3", "@zip.js/zip.js": "^2.4.7", "mobx": "^6.5.0", "mobx-react-lite": "^3.3.0", diff --git a/yarn.lock b/yarn.lock index 30cd56c7c..771c0a0db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2388,206 +2388,148 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@standardnotes/applications@^1.2.6": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@standardnotes/applications/-/applications-1.2.6.tgz#e78dd45eb829765e5f6bf9ff99acdef88c1fd474" - integrity sha512-QozKdaItKZDsUhL2hZPLbjwTcjAExlFNuRZiug0zApfii2Z5jBkgoXB1p2Ma/o/gjdkS4CxHGFWALjth8mxN0w== +"@standardnotes/auth@^3.18.3": + version "3.18.3" + resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.18.3.tgz#2c2aa19ad56fc5f3f286dbef56bd8496d1e5380f" + integrity sha512-crdpVHJpnY574IIwBM1QcqNMULyvQ8nOnkH4DhFNcfWF7R+A+S4lMg2KxN9bR+j2gM/WWhbfcU8owJrz1+vsqA== dependencies: - "@standardnotes/common" "^1.17.0" - "@standardnotes/sncrypto-common" "^1.7.3" - -"@standardnotes/applications@^1.2.7": - version "1.2.7" - resolved "https://registry.yarnpkg.com/@standardnotes/applications/-/applications-1.2.7.tgz#77dc5c1061e28d377614f44c5ad9b6e5970cfc8d" - integrity sha512-7bPb7jDIexLZ9R5ZjfWH+dmNdATzqOv7MyR1NMjnHaEhJQCsg9DM2mmKndbulgm8O8r+klC+NN2TMSFHcm6KDw== - dependencies: - "@standardnotes/common" "^1.18.0" - "@standardnotes/sncrypto-common" "^1.7.3" - -"@standardnotes/auth@^3.18.0": - version "3.18.0" - resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.18.0.tgz#682301abe8b15d297cd3d140682e8c85bc849953" - integrity sha512-7X11Uy9DtmTRgplvk9TkUjVqCxlv2gsgigM9rxtGPZQ++cb/iypD34RfhDVQ87tPtVL8LOlqtkZ/iC8eItS/JQ== - dependencies: - "@standardnotes/common" "^1.17.0" + "@standardnotes/common" "^1.19.1" jsonwebtoken "^8.5.1" -"@standardnotes/auth@^3.18.1": - version "3.18.1" - resolved "https://registry.yarnpkg.com/@standardnotes/auth/-/auth-3.18.1.tgz#05c6e86f17cb54bb3b1fdab458da0219fcf14b99" - integrity sha512-ppQ6NOGwXXe78lpomwDyk9FyW1DkyC1eOWytV4G67kCTBhEr8NNJ9Y+8efJLsPQgDU7Cn7CMZNZvKUkp8fe2dw== - dependencies: - "@standardnotes/common" "^1.18.0" - jsonwebtoken "^8.5.1" - -"@standardnotes/common@^1.17.0": - version "1.17.0" - resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.17.0.tgz#4f862dae7599bc6541bc259f98f93cd399581175" - integrity sha512-aINO14A8pHFb6tOP6Jmv9inPrT0rWvQE7J8RAVtd5bP9Vh7Po5AmwUxTsSrZIb9wBGzkYFMs3m+vA1ZNMMfLvQ== - -"@standardnotes/common@^1.18.0": - version "1.18.0" - resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.18.0.tgz#59a92a322e0987c62bf076fabca466ef121e86d8" - integrity sha512-xL0+uEoQYhL6ZNI+Jc63smhQdQD9TsEoN+/nqLSfYs3WOoKNV1sZ/NYrQZL9SuVbgWVT238xxQeoA9FrfTfJaA== +"@standardnotes/common@^1.19.1": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@standardnotes/common/-/common-1.19.1.tgz#45f0837b40bc1c583c22552a53429fe26c5ef498" + integrity sha512-O114ZdOvur6U1mmiPfvEo/TZjKRxHWBsAAAn+XTtS70E+2VqgvCwgiYT6bG1oUcoyrIiCdRPPyiTC/UPF4gkXg== "@standardnotes/components@1.7.14": version "1.7.14" resolved "https://registry.yarnpkg.com/@standardnotes/components/-/components-1.7.14.tgz#ddd5b4d5787d3f90a4e1a88cfd95995f9267b1d1" integrity sha512-NDzP8/lmzgFBjxfmaE3OSOjPfozs3vednFfrjmjri5kCXlfClEISL6b/kh6B6wv/x9DIFveOsRj2Lrov+5IXdw== -"@standardnotes/domain-events@^2.26.4": - version "2.26.4" - resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.26.4.tgz#ecd3b1767c3a99f5e72e93e1c073cc68e3bfa34a" - integrity sha512-MBtg87x0e7ehl4Qhq4Esliz3GNbCURCRWyOsxX1fUhMLwpRCFco3FOfxNkdwO5KCdVzxqEUC2L2CLqptJF/5sw== +"@standardnotes/domain-events@^2.26.6": + version "2.26.6" + resolved "https://registry.yarnpkg.com/@standardnotes/domain-events/-/domain-events-2.26.6.tgz#6d19099b147f60dfe69a458463aa81759846507a" + integrity sha512-CiF7MlFlZgwzMbOkcHGOy8FL1iGlSff9s7eUOlgOcYoidolFOF8HHJJn+d8+iwEvwANDwMJmrrGcFf5X9f0wzA== dependencies: - "@standardnotes/auth" "^3.18.1" - "@standardnotes/features" "^1.36.1" + "@standardnotes/auth" "^3.18.3" + "@standardnotes/features" "^1.36.3" -"@standardnotes/features@1.36.1", "@standardnotes/features@^1.36.1": - version "1.36.1" - resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.36.1.tgz#73ee9535a60331950c29db429396012d3994880a" - integrity sha512-NtxONj+wRI1VXfIXfsUfFjO26eQRyV9n8x5sBjD2kD85BSAIMx28VNbJY8aWIjPz7NJC5RbJj+apR4///VKi1g== +"@standardnotes/encryption@^1.1.3": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@standardnotes/encryption/-/encryption-1.1.3.tgz#7554a6268d8f274c59bb9dd55117ba7dffefb5cd" + integrity sha512-0oelxlDMCR8I6l33R/CsdU9z25R+kCvYLt0FbypPCRaDOMTcjITR1R+VsnKznw/GbcMxcD1TTnDGRRQyLVmDmw== dependencies: - "@standardnotes/auth" "^3.18.1" - "@standardnotes/common" "^1.18.0" + "@standardnotes/models" "^1.1.1" + "@standardnotes/payloads" "^1.5.1" + "@standardnotes/responses" "^1.5.1" + "@standardnotes/services" "^1.7.1" -"@standardnotes/features@^1.35.6": - version "1.35.6" - resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.35.6.tgz#177b34cdb5dc71e13aba0a6b57e5d2ab0849d740" - integrity sha512-fiYZvlTpYyBcjnPSs1bN7pvIYWvQevZTEBTjNvOTo5ZqCtLoXu0p0hzU+17J2pYrjkh4vHZhYVxrRLXnyft3ZQ== +"@standardnotes/features@1.36.3", "@standardnotes/features@^1.36.3": + version "1.36.3" + resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.36.3.tgz#c3a2c2451fe2f036c5c94e51e86c804872028763" + integrity sha512-/38iTb22NULjtL8MitUeqsZdGwZgyP6t8p2LPc5sLFmeyU/CgZ22sh55GKAW5P/fm/oWyBqK6zjsVvtIH6AQug== dependencies: - "@standardnotes/auth" "^3.18.0" - "@standardnotes/common" "^1.17.0" + "@standardnotes/auth" "^3.18.3" + "@standardnotes/common" "^1.19.1" -"@standardnotes/filepicker@1.10.3": - version "1.10.3" - resolved "https://registry.yarnpkg.com/@standardnotes/filepicker/-/filepicker-1.10.3.tgz#7384cf40e5ee6b685ea4773cd7857530f11f9d3a" - integrity sha512-95XYq3f758jiut9L4wmd4pC8UariaWUMuGtZB1NDPWm/qgO9ig117hrL7sMN7NU5hRqdt+f6O9xpO7zOoTblrQ== +"@standardnotes/filepicker@1.10.4": + version "1.10.4" + resolved "https://registry.yarnpkg.com/@standardnotes/filepicker/-/filepicker-1.10.4.tgz#a69822381dcb7910ce7ce9040bb0466b3b950985" + integrity sha512-BnfKi+HFXX1e/fprZ2awvcrBSQkVZs1VN/hk7e9hH8qhQtbktfURKEEyOZoQnDu14BMa1tSdAVTjhXpxlbRRcA== -"@standardnotes/payloads@^1.4.20": - version "1.4.20" - resolved "https://registry.yarnpkg.com/@standardnotes/payloads/-/payloads-1.4.20.tgz#d35544e144b556b5cc2b9cf1e3561462832964b2" - integrity sha512-Lj+D0scBjEkMWXdezXQs/6gm1wAh9KTosPfD912XHKhYoJfqHiDwwLFgHuB0fxrnvGNhiopM3+GtE/OeP5ZYOw== +"@standardnotes/models@^1.1.1": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@standardnotes/models/-/models-1.1.1.tgz#1a54253ded5c759ac8eeb1cb2878da73da2bd8a3" + integrity sha512-tl6Yjv/hlPd1xARF4o8vHNPyfoV0d5V/IkdlPA0I2GQh7pLPxHirwD5E2+rRnv59HPiV4ws+XwLtnnPZaZ38bg== dependencies: - "@standardnotes/applications" "^1.2.6" - "@standardnotes/common" "^1.17.0" - "@standardnotes/features" "^1.35.6" - "@standardnotes/utils" "^1.4.3" + "@standardnotes/payloads" "^1.5.1" -"@standardnotes/payloads@^1.4.22": - version "1.4.22" - resolved "https://registry.yarnpkg.com/@standardnotes/payloads/-/payloads-1.4.22.tgz#7f10cf92cedf461f79ccfd2a6a4598def9a80546" - integrity sha512-Y8qXQCipbQo3QfFQ3/esIacFEqKxoD8WJqMHBI5QY+YHRai4hRuTcmY/l2IJKxLrm/zTZSM7Vb9Vg+e5LgznEg== +"@standardnotes/payloads@^1.5.1": + version "1.5.1" + resolved "https://registry.yarnpkg.com/@standardnotes/payloads/-/payloads-1.5.1.tgz#f0cbe309721a14811d4b11cfce9a66d6fb9c2171" + integrity sha512-wqL31WPGFAQPMXICCf5Kxh3UOiaGbMu6ZE8cYmuZsMhti2h8FgIE04rcrzAh0/dSYtufrfHUnjhMmkPXZQAV2g== dependencies: - "@standardnotes/applications" "^1.2.7" - "@standardnotes/common" "^1.18.0" - "@standardnotes/features" "^1.36.1" - "@standardnotes/utils" "^1.4.4" + "@standardnotes/common" "^1.19.1" + "@standardnotes/features" "^1.36.3" + "@standardnotes/utils" "^1.4.6" -"@standardnotes/responses@1.4.0", "@standardnotes/responses@^1.4.0": - version "1.4.0" - resolved "https://registry.yarnpkg.com/@standardnotes/responses/-/responses-1.4.0.tgz#6ce8c0e94bdf2bdf613904e330cba8708ab39a4b" - integrity sha512-eHjaJcYlZ/U49X2E3xH3etVmCVTc1BDV3XdUkSiDt5SsxavSHKKGiHu/h7QNHNYAmV/+yOU3N5YZAweBp2ZCMA== +"@standardnotes/responses@1.5.1", "@standardnotes/responses@^1.5.1": + version "1.5.1" + resolved "https://registry.yarnpkg.com/@standardnotes/responses/-/responses-1.5.1.tgz#a88171e0834ad363ce2284256f8630f8adee4ae3" + integrity sha512-8BodIxtIfSG9IEzCSQy2dmB9RR1FeoKYBwOrO4MKyX1TpvVPlr0dtGUxWtbt20kI49FSLU9QDeWeexNiXcDSrA== dependencies: - "@standardnotes/auth" "^3.18.0" - "@standardnotes/common" "^1.17.0" - "@standardnotes/features" "^1.35.6" - "@standardnotes/payloads" "^1.4.20" + "@standardnotes/auth" "^3.18.3" + "@standardnotes/common" "^1.19.1" + "@standardnotes/features" "^1.36.3" + "@standardnotes/payloads" "^1.5.1" -"@standardnotes/responses@^1.4.3": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@standardnotes/responses/-/responses-1.4.3.tgz#f3d2032d9ec072952201ea963919e3a99a430fec" - integrity sha512-bBC0pd1K/FkEZG0yGle8otYBYFZ3Zywl+4rbPCSN/kSgR1QGenhAn6za8++qggTmdLK6vQbYb2+uGS203/CDBQ== +"@standardnotes/services@1.7.1", "@standardnotes/services@^1.7.1": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.7.1.tgz#7c3f8f379478dfeeec3b9c87868a380213947533" + integrity sha512-xW5C/nqUomwxnN2zSS22t845PPRceevUNqtwFtPzodeaDNZpCMwLvHPqJhbXW6cYuPeVbPGn4ify8EnrGqu+/w== dependencies: - "@standardnotes/auth" "^3.18.1" - "@standardnotes/common" "^1.18.0" - "@standardnotes/features" "^1.36.1" - "@standardnotes/payloads" "^1.4.22" + "@standardnotes/common" "^1.19.1" + "@standardnotes/models" "^1.1.1" + "@standardnotes/responses" "^1.5.1" + "@standardnotes/utils" "^1.4.6" -"@standardnotes/services@1.6.11": - version "1.6.11" - resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.6.11.tgz#a1ac0e28128a720e1c4f85220b0e4ed122ea4573" - integrity sha512-iGVobfAavRALJOvnhF24HHcule7jaUGx4xVH9Kr8g+9a2vVWRM3Fyp3EqE4LZjlS5u8Qz1i8BADzQtzajb1VmQ== +"@standardnotes/settings@1.13.2", "@standardnotes/settings@^1.13.2": + version "1.13.2" + resolved "https://registry.yarnpkg.com/@standardnotes/settings/-/settings-1.13.2.tgz#32509823e9f1b885282d5f6e82a6fed5178e5ec2" + integrity sha512-kA2K2/xfS3dlPF//yy2GitH6bfFf4EmvNQ77OWMn1qZdLlTl4HTGps1Q5mX/BrLfC9HNutxqnLFr1N94vxdWlQ== + +"@standardnotes/sncrypto-common@^1.7.4": + version "1.7.4" + resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.7.4.tgz#970fbe84edbdc9d632c8774ec201f1e140f693d6" + integrity sha512-6O4RjyfNyCFV32sYCO7jxDt/UelPfbvaMQXYPJ3F58r5gyFdc9K/PxjWmKhzRVxTprNLr+4uWbf1FUERTdTuhg== + +"@standardnotes/sncrypto-web@1.8.1": + version "1.8.1" + resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-web/-/sncrypto-web-1.8.1.tgz#4e8192be81c2b6da2d39d4119ea95ceeb24c49a0" + integrity sha512-lTuFu8WNmUh/9+OApgBj0IU55svXEK5gQRpE9Wdn49mzPZUQx7FrrkQ8piKDBrkpxFoaeQXXgNNWk3CwGQ8WCQ== dependencies: - "@standardnotes/applications" "^1.2.6" - "@standardnotes/common" "^1.17.0" - "@standardnotes/responses" "^1.4.0" - "@standardnotes/utils" "^1.4.3" - -"@standardnotes/services@^1.6.14": - version "1.6.14" - resolved "https://registry.yarnpkg.com/@standardnotes/services/-/services-1.6.14.tgz#08ddafe3912fb1431ea9900936644848ad297775" - integrity sha512-CHPyqsSarOPfcpRW8ejk3pYtQVst77Je0OdqedU/vOVUooOt2yLLfrvKPiqLVl505GfCL4K9brAyM9rX2YQaoA== - dependencies: - "@standardnotes/applications" "^1.2.7" - "@standardnotes/common" "^1.18.0" - "@standardnotes/responses" "^1.4.3" - "@standardnotes/utils" "^1.4.4" - -"@standardnotes/settings@1.13.1", "@standardnotes/settings@^1.13.1": - version "1.13.1" - resolved "https://registry.yarnpkg.com/@standardnotes/settings/-/settings-1.13.1.tgz#c0f8558079da178667e7addd569b6953cd5e6bc2" - integrity sha512-oHTJI+R1hLafHraeDmg7Zg1rLwRIT9n0AEe8C4+Qm6iraTYGaUWG1YNJ2xuPrQJRPa2gMxO/E9qMWDl88ZizRQ== - -"@standardnotes/sncrypto-common@^1.7.3": - version "1.7.3" - resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-common/-/sncrypto-common-1.7.3.tgz#1e62a14800393be44cdb376d1d72fbc064334fc1" - integrity sha512-twwYeBL+COkNF9IUM5bWrLZ4gXjg41tRxBMR3r3JcbrkyYjcNqVHf9L+YdBcndjSV3/9xwWl2pYWK1RB3UR2Xg== - -"@standardnotes/sncrypto-web@1.8.0": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@standardnotes/sncrypto-web/-/sncrypto-web-1.8.0.tgz#8552d9793b570713adad20555651ce54eb5c0a19" - integrity sha512-5OFDan0EexHUGt9sWUKTRXAsLYsNqd/cT8Q9x0aKEIG/ZMVk6XGs/s202Af3O3h1LCsWAJhuOSwvieDgJIdEpA== - dependencies: - "@standardnotes/sncrypto-common" "^1.7.3" + "@standardnotes/sncrypto-common" "^1.7.4" buffer "^6.0.3" libsodium-wrappers "^0.7.9" -"@standardnotes/snjs@2.92.10": - version "2.92.10" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.92.10.tgz#bcadc4e917943a60264a0b4b66662facb03767c3" - integrity sha512-dDOIj7CZesHwubLoxSeCQ8M9GUpyyrCFTOefbT8IyD1VP2nGs++8Babp4qACCaut5R28dL5C0B7XnQI37lzUDA== +"@standardnotes/snjs@2.93.3": + version "2.93.3" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.93.3.tgz#528c257994b8602666af0d80930e55421d9d5946" + integrity sha512-XZS8vBDqc80lEYKndyNIiyZSPme1DU7H6XNCUBH5mt41CF8qvxv76eTFSxmi2oZNrNNujl/Ez1jb23F7oUEMrw== dependencies: - "@standardnotes/applications" "^1.2.7" - "@standardnotes/auth" "^3.18.1" - "@standardnotes/common" "^1.18.0" - "@standardnotes/domain-events" "^2.26.4" - "@standardnotes/features" "^1.36.1" - "@standardnotes/payloads" "^1.4.22" - "@standardnotes/responses" "^1.4.3" - "@standardnotes/services" "^1.6.14" - "@standardnotes/settings" "^1.13.1" - "@standardnotes/sncrypto-common" "^1.7.3" - "@standardnotes/utils" "^1.4.4" + "@standardnotes/auth" "^3.18.3" + "@standardnotes/common" "^1.19.1" + "@standardnotes/domain-events" "^2.26.6" + "@standardnotes/encryption" "^1.1.3" + "@standardnotes/features" "^1.36.3" + "@standardnotes/models" "^1.1.1" + "@standardnotes/payloads" "^1.5.1" + "@standardnotes/responses" "^1.5.1" + "@standardnotes/services" "^1.7.1" + "@standardnotes/settings" "^1.13.2" + "@standardnotes/sncrypto-common" "^1.7.4" + "@standardnotes/utils" "^1.4.6" -"@standardnotes/stylekit@5.17.0": - version "5.17.0" - resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.17.0.tgz#ef8093d036142a88780d9a39f2d33618fb017f09" - integrity sha512-C8a1WwbyaJn+Tf62INd62zhf7Zx0yEIMTDyr47dK4U1J0ppmlBTm/4JsSetPvht9djTJkBJGFUiwek4HNJDv0w== +"@standardnotes/stylekit@5.20.0": + version "5.20.0" + resolved "https://registry.yarnpkg.com/@standardnotes/stylekit/-/stylekit-5.20.0.tgz#84ad262b39cbe307a9e06ffa8eb05119db8a7adb" + integrity sha512-R926S0NlzB97wq6PyX978s1g21KSymX3CjQCmbM3tfV7KFXfNjjDdWSTVetC8exZj/BPvsudfOtNA5bVsJ8RkA== dependencies: "@nanostores/preact" "^0.1.3" "@reach/listbox" "^0.16.2" "@reach/menu-button" "^0.16.2" "@svgr/webpack" "^6.2.1" + focus-trap "^6.7.3" nanoid "^3.3.1" nanostores "^0.5.10" prop-types "^15.8.1" -"@standardnotes/utils@^1.4.3": - version "1.4.3" - resolved "https://registry.yarnpkg.com/@standardnotes/utils/-/utils-1.4.3.tgz#6bae390a2d5ef6947340e6ec03cb4b0d0ac88d48" - integrity sha512-QO/bKmex/KFnKgKg1kIpaCTSO/QjYS80enHCwx4de1yZ1NN3xYjZpzjK/HB7RarXHCzFSxDuLTmf/68eswViBA== +"@standardnotes/utils@^1.4.6": + version "1.4.6" + resolved "https://registry.yarnpkg.com/@standardnotes/utils/-/utils-1.4.6.tgz#19fadae46b594e301731989a836e1e9025ec4749" + integrity sha512-8k/ucqtfZd/tl7zBA5E988Kbo+9RiGq70ZNiXjvGhud8hX2JUfUtVqnpjTCIEChKyJhOJR3uVQZBHq9H9S0+lg== dependencies: - "@standardnotes/common" "^1.17.0" - dompurify "^2.3.6" - lodash "^4.17.21" - -"@standardnotes/utils@^1.4.4": - version "1.4.4" - resolved "https://registry.yarnpkg.com/@standardnotes/utils/-/utils-1.4.4.tgz#89f5f9cb6d6a65ce7d656ce8de12a9c4eb092bbd" - integrity sha512-JPzAF3QvN7MP6vYBjjkZBqC1e06GmijpqwvO59NQWUg62gAMJkOBb3BtBI7AVa+C3OkQRNvqf8JWb5xq7sFKTQ== - dependencies: - "@standardnotes/common" "^1.18.0" + "@standardnotes/common" "^1.19.1" dompurify "^2.3.6" lodash "^4.17.21" @@ -5394,6 +5336,13 @@ focus-lock@^0.9.1: dependencies: tslib "^2.0.3" +focus-trap@^6.7.3: + version "6.7.3" + resolved "https://registry.yarnpkg.com/focus-trap/-/focus-trap-6.7.3.tgz#b5dc195b49c90001f08a63134471d1e6dd381ddd" + integrity sha512-8xCEKndV4KrseGhFKKKmczVA14yx1/hnmFICPOjcFjToxCJYj/NHH43tPc3YE/PLnLRNZoFug0EcWkGQde/miQ== + dependencies: + tabbable "^5.2.1" + follow-redirects@^1.0.0: version "1.13.0" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" @@ -9776,6 +9725,11 @@ tabbable@^4.0.0: resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-4.0.0.tgz#5bff1d1135df1482cf0f0206434f15eadbeb9261" integrity sha512-H1XoH1URcBOa/rZZWxLxHCtOdVUEev+9vo5YdYhC9tCY4wnybX+VQrCYuy9ubkg69fCBxCONJOSLGfw0DWMffQ== +tabbable@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/tabbable/-/tabbable-5.2.1.tgz#e3fda7367ddbb172dcda9f871c0fdb36d1c4cd9c" + integrity sha512-40pEZ2mhjaZzK0BnI+QGNjJO8UYx9pP5v7BGe17SORTO0OEuuaAwQTkAp8whcZvqon44wKFOikD+Al11K3JICQ== + tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"