From edfe1cd9bfb3a49a73b2f0bef39ec643d8fe1640 Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Tue, 31 Aug 2021 13:12:08 +0400 Subject: [PATCH 01/10] feat: store web version in local storage --- app/assets/javascripts/tsconfig.json | 1 + .../javascripts/views/application/application_view.ts | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/app/assets/javascripts/tsconfig.json b/app/assets/javascripts/tsconfig.json index afff2915839..34e030b987a 100644 --- a/app/assets/javascripts/tsconfig.json +++ b/app/assets/javascripts/tsconfig.json @@ -7,6 +7,7 @@ "noEmit": true, "strict": true, "isolatedModules": false, + "resolveJsonModule": true, "esModuleInterop": true, "declaration": true, "newLine": "lf", diff --git a/app/assets/javascripts/views/application/application_view.ts b/app/assets/javascripts/views/application/application_view.ts index 4fecc6f9e30..0cc606f1144 100644 --- a/app/assets/javascripts/views/application/application_view.ts +++ b/app/assets/javascripts/views/application/application_view.ts @@ -13,6 +13,7 @@ import { } from '@/strings'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; import { alertDialog } from '@/services/alertService'; +import packageJson from '../../../../../package.json'; class ApplicationViewCtrl extends PureViewCtrl { removeFromArray(this.challenges, challenge); From 5ba80d61f5943dc03c716d987b2a58605035df16 Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Wed, 1 Sep 2021 00:49:52 +0400 Subject: [PATCH 02/10] feat: pass web app version to snjs application when creating WebApplication --- app/assets/javascripts/tsconfig.json | 1 - app/assets/javascripts/ui_models/application.ts | 7 +++++++ .../javascripts/views/application/application_view.ts | 8 -------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/tsconfig.json b/app/assets/javascripts/tsconfig.json index 34e030b987a..afff2915839 100644 --- a/app/assets/javascripts/tsconfig.json +++ b/app/assets/javascripts/tsconfig.json @@ -7,7 +7,6 @@ "noEmit": true, "strict": true, "isolatedModules": false, - "resolveJsonModule": true, "esModuleInterop": true, "declaration": true, "newLine": "lf", diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts index 2226284f96f..b2f2c1d18f3 100644 --- a/app/assets/javascripts/ui_models/application.ts +++ b/app/assets/javascripts/ui_models/application.ts @@ -25,6 +25,8 @@ import { NativeExtManager } from '@/services/nativeExtManager'; import { StatusManager } from '@/services/statusManager'; import { ThemeManager } from '@/services/themeManager'; +declare const __VERSION__: string; + type WebServices = { appState: AppState; desktopService: DesktopManager; @@ -73,6 +75,11 @@ export class WebApplication extends SNApplication { this.presentPermissionsDialog = this.presentPermissionsDialog.bind(this); } + /** @override */ + getAppVersion(): string { + return __VERSION__; + } + /** @override */ deinit(source: DeinitSource): void { for (const service of Object.values(this.webServices)) { diff --git a/app/assets/javascripts/views/application/application_view.ts b/app/assets/javascripts/views/application/application_view.ts index 0cc606f1144..4fecc6f9e30 100644 --- a/app/assets/javascripts/views/application/application_view.ts +++ b/app/assets/javascripts/views/application/application_view.ts @@ -13,7 +13,6 @@ import { } from '@/strings'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; import { alertDialog } from '@/services/alertService'; -import packageJson from '../../../../../package.json'; class ApplicationViewCtrl extends PureViewCtrl { removeFromArray(this.challenges, challenge); From cfad682ec0c85e76666912bc15de23424cc1dd2b Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Wed, 1 Sep 2021 18:40:15 +0400 Subject: [PATCH 03/10] refactor: pass version in application constructor, remove unnecessary method --- app/assets/javascripts/ui_models/application.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts index b2f2c1d18f3..7428d341033 100644 --- a/app/assets/javascripts/ui_models/application.ts +++ b/app/assets/javascripts/ui_models/application.ts @@ -65,6 +65,7 @@ export class WebApplication extends SNApplication { identifier, [], defaultSyncServerHost, + __VERSION__ ); this.$compile = $compile; this.scope = scope; @@ -75,11 +76,6 @@ export class WebApplication extends SNApplication { this.presentPermissionsDialog = this.presentPermissionsDialog.bind(this); } - /** @override */ - getAppVersion(): string { - return __VERSION__; - } - /** @override */ deinit(source: DeinitSource): void { for (const service of Object.values(this.webServices)) { From 780c35919864d8cd1c504f2e08edb263ef38bc3d Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Wed, 1 Sep 2021 21:04:43 +0400 Subject: [PATCH 04/10] refactor: move global variables declarations to separate files to avoid declaring them in all places where they are used --- app/assets/javascripts/app.ts | 4 ++-- app/assets/javascripts/globals/desktop.ts | 3 +++ app/assets/javascripts/globals/version.ts | 3 +++ app/assets/javascripts/globals/web.ts | 3 +++ app/assets/javascripts/services/errorReporting.ts | 2 +- app/assets/javascripts/ui_models/application.ts | 3 +-- app/assets/javascripts/utils.ts | 6 ++---- 7 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 app/assets/javascripts/globals/desktop.ts create mode 100644 app/assets/javascripts/globals/version.ts create mode 100644 app/assets/javascripts/globals/web.ts diff --git a/app/assets/javascripts/app.ts b/app/assets/javascripts/app.ts index b493808adbb..aae2069a74a 100644 --- a/app/assets/javascripts/app.ts +++ b/app/assets/javascripts/app.ts @@ -1,7 +1,7 @@ 'use strict'; -declare const __VERSION__: string; -declare const __WEB__: boolean; +import __VERSION__ from '@/globals/version'; +import __WEB__ from '@/globals/web'; import { SNLog } from '@standardnotes/snjs'; import angular from 'angular'; diff --git a/app/assets/javascripts/globals/desktop.ts b/app/assets/javascripts/globals/desktop.ts new file mode 100644 index 00000000000..cdad6e2ef4b --- /dev/null +++ b/app/assets/javascripts/globals/desktop.ts @@ -0,0 +1,3 @@ +declare const __DESKTOP__: boolean; + +export default __DESKTOP__; diff --git a/app/assets/javascripts/globals/version.ts b/app/assets/javascripts/globals/version.ts new file mode 100644 index 00000000000..d0b47efa512 --- /dev/null +++ b/app/assets/javascripts/globals/version.ts @@ -0,0 +1,3 @@ +declare const __VERSION__: string; + +export default __VERSION__; diff --git a/app/assets/javascripts/globals/web.ts b/app/assets/javascripts/globals/web.ts new file mode 100644 index 00000000000..e6bc845d2c8 --- /dev/null +++ b/app/assets/javascripts/globals/web.ts @@ -0,0 +1,3 @@ +declare const __WEB__: boolean; + +export default __WEB__; diff --git a/app/assets/javascripts/services/errorReporting.ts b/app/assets/javascripts/services/errorReporting.ts index c3cd66a66cb..7f79c8f0755 100644 --- a/app/assets/javascripts/services/errorReporting.ts +++ b/app/assets/javascripts/services/errorReporting.ts @@ -3,8 +3,8 @@ import { isDesktopApplication, isDev } from '@/utils'; import { storage, StorageKey } from './localStorage'; import Bugsnag from '@bugsnag/js'; import { WebCrypto } from '../crypto'; +import __VERSION__ from '@/globals/version'; -declare const __VERSION__: string; declare global { interface Window { // eslint-disable-next-line camelcase diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts index 7428d341033..9ebd4458966 100644 --- a/app/assets/javascripts/ui_models/application.ts +++ b/app/assets/javascripts/ui_models/application.ts @@ -24,8 +24,7 @@ import { IOService } from '@/services/ioService'; import { NativeExtManager } from '@/services/nativeExtManager'; import { StatusManager } from '@/services/statusManager'; import { ThemeManager } from '@/services/themeManager'; - -declare const __VERSION__: string; +import __VERSION__ from '@/globals/version'; type WebServices = { appState: AppState; diff --git a/app/assets/javascripts/utils.ts b/app/assets/javascripts/utils.ts index c5f9b6be608..0ac6778dd71 100644 --- a/app/assets/javascripts/utils.ts +++ b/app/assets/javascripts/utils.ts @@ -1,4 +1,6 @@ import { Platform, platformFromString } from '@standardnotes/snjs'; +import __DESKTOP__ from '@/globals/desktop'; +import __WEB__ from '@/globals/web'; declare const process: { env: { @@ -160,10 +162,6 @@ export async function preventRefreshing( } } -/** Platform-detection functions */ -declare const __WEB__: boolean; -declare const __DESKTOP__: boolean; - if (!__WEB__ && !__DESKTOP__) { throw Error( 'Neither __WEB__ nor __DESKTOP__ is true. Check your configuration files.' From c8a1d1f2a283fe03d7ee73882d959091391a4fd9 Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Thu, 2 Sep 2021 12:48:21 +0400 Subject: [PATCH 05/10] refactor: better way to use global variables --- app/assets/javascripts/app.ts | 8 +++----- app/assets/javascripts/globals/desktop.ts | 3 --- app/assets/javascripts/globals/version.ts | 3 --- app/assets/javascripts/globals/web.ts | 3 --- app/assets/javascripts/services/errorReporting.ts | 4 ++-- app/assets/javascripts/ui_models/application.ts | 4 ++-- app/assets/javascripts/utils.ts | 7 +++---- app/assets/javascripts/version.ts | 7 +++++++ 8 files changed, 17 insertions(+), 22 deletions(-) delete mode 100644 app/assets/javascripts/globals/desktop.ts delete mode 100644 app/assets/javascripts/globals/version.ts delete mode 100644 app/assets/javascripts/globals/web.ts create mode 100644 app/assets/javascripts/version.ts diff --git a/app/assets/javascripts/app.ts b/app/assets/javascripts/app.ts index aae2069a74a..fc956a3ef5d 100644 --- a/app/assets/javascripts/app.ts +++ b/app/assets/javascripts/app.ts @@ -1,8 +1,5 @@ 'use strict'; -import __VERSION__ from '@/globals/version'; -import __WEB__ from '@/globals/web'; - import { SNLog } from '@standardnotes/snjs'; import angular from 'angular'; import { configRoutes } from './routes'; @@ -66,6 +63,7 @@ import { NotesOptionsPanelDirective } from './components/NotesOptionsPanel'; import { IconDirective } from './components/Icon'; import { NoteTagsContainerDirective } from './components/NoteTagsContainer'; import { PreferencesDirective } from './preferences'; +import { appVersion, isWebPlatform } from '@/version'; function reloadHiddenFirefoxTab(): boolean { /** @@ -191,10 +189,10 @@ const startApplication: StartApplication = async function startApplication( }); }; -if (__WEB__) { +if (isWebPlatform) { startApplication( (window as any)._default_sync_server, - new BrowserBridge(__VERSION__), + new BrowserBridge(appVersion), (window as any)._websocket_url, ); } else { diff --git a/app/assets/javascripts/globals/desktop.ts b/app/assets/javascripts/globals/desktop.ts deleted file mode 100644 index cdad6e2ef4b..00000000000 --- a/app/assets/javascripts/globals/desktop.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare const __DESKTOP__: boolean; - -export default __DESKTOP__; diff --git a/app/assets/javascripts/globals/version.ts b/app/assets/javascripts/globals/version.ts deleted file mode 100644 index d0b47efa512..00000000000 --- a/app/assets/javascripts/globals/version.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare const __VERSION__: string; - -export default __VERSION__; diff --git a/app/assets/javascripts/globals/web.ts b/app/assets/javascripts/globals/web.ts deleted file mode 100644 index e6bc845d2c8..00000000000 --- a/app/assets/javascripts/globals/web.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare const __WEB__: boolean; - -export default __WEB__; diff --git a/app/assets/javascripts/services/errorReporting.ts b/app/assets/javascripts/services/errorReporting.ts index 7f79c8f0755..078b7de074c 100644 --- a/app/assets/javascripts/services/errorReporting.ts +++ b/app/assets/javascripts/services/errorReporting.ts @@ -3,7 +3,7 @@ import { isDesktopApplication, isDev } from '@/utils'; import { storage, StorageKey } from './localStorage'; import Bugsnag from '@bugsnag/js'; import { WebCrypto } from '../crypto'; -import __VERSION__ from '@/globals/version'; +import { appVersion } from '@/version'; declare global { interface Window { @@ -50,7 +50,7 @@ export function startErrorReporting(): void { Bugsnag.start({ apiKey: window._bugsnag_api_key, appType: isDesktopApplication() ? 'desktop' : 'web', - appVersion: __VERSION__, + appVersion, collectUserIp: false, autoTrackSessions: false, releaseStage: isDev ? 'development' : undefined, diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts index 9ebd4458966..ef568c2547d 100644 --- a/app/assets/javascripts/ui_models/application.ts +++ b/app/assets/javascripts/ui_models/application.ts @@ -24,7 +24,7 @@ import { IOService } from '@/services/ioService'; import { NativeExtManager } from '@/services/nativeExtManager'; import { StatusManager } from '@/services/statusManager'; import { ThemeManager } from '@/services/themeManager'; -import __VERSION__ from '@/globals/version'; +import { appVersion } from '@/version'; type WebServices = { appState: AppState; @@ -64,7 +64,7 @@ export class WebApplication extends SNApplication { identifier, [], defaultSyncServerHost, - __VERSION__ + appVersion ); this.$compile = $compile; this.scope = scope; diff --git a/app/assets/javascripts/utils.ts b/app/assets/javascripts/utils.ts index 0ac6778dd71..fc6b7af2e3b 100644 --- a/app/assets/javascripts/utils.ts +++ b/app/assets/javascripts/utils.ts @@ -1,6 +1,5 @@ import { Platform, platformFromString } from '@standardnotes/snjs'; -import __DESKTOP__ from '@/globals/desktop'; -import __WEB__ from '@/globals/web'; +import { isDesktopPlatform, isWebPlatform } from '@/version'; declare const process: { env: { @@ -162,12 +161,12 @@ export async function preventRefreshing( } } -if (!__WEB__ && !__DESKTOP__) { +if (!isWebPlatform && !isDesktopPlatform) { throw Error( 'Neither __WEB__ nor __DESKTOP__ is true. Check your configuration files.' ); } export function isDesktopApplication() { - return __DESKTOP__; + return isDesktopPlatform; } diff --git a/app/assets/javascripts/version.ts b/app/assets/javascripts/version.ts new file mode 100644 index 00000000000..f3f2a36b7fb --- /dev/null +++ b/app/assets/javascripts/version.ts @@ -0,0 +1,7 @@ +declare const __VERSION__: string; +declare const __DESKTOP__: boolean; +declare const __WEB__: boolean; + +export const appVersion = __VERSION__; +export const isDesktopPlatform = __DESKTOP__; +export const isWebPlatform = __WEB__; From 43951273b24ae7634ac06117f8a5cacbfd4a7804 Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Thu, 2 Sep 2021 12:50:31 +0400 Subject: [PATCH 06/10] chore: add comment --- app/assets/javascripts/version.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/version.ts b/app/assets/javascripts/version.ts index f3f2a36b7fb..132d61fce28 100644 --- a/app/assets/javascripts/version.ts +++ b/app/assets/javascripts/version.ts @@ -1,3 +1,4 @@ +/** Declared in webpack config */ declare const __VERSION__: string; declare const __DESKTOP__: boolean; declare const __WEB__: boolean; From fa0ecc4b8de9237da546462b602bc040b3965526 Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Thu, 2 Sep 2021 17:33:36 +0400 Subject: [PATCH 07/10] chore: make global constants pascal case --- app/assets/javascripts/app.ts | 6 +++--- app/assets/javascripts/services/errorReporting.ts | 4 ++-- app/assets/javascripts/ui_models/application.ts | 4 ++-- app/assets/javascripts/utils.ts | 6 +++--- app/assets/javascripts/version.ts | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/app.ts b/app/assets/javascripts/app.ts index fc956a3ef5d..aeb0c2f5f65 100644 --- a/app/assets/javascripts/app.ts +++ b/app/assets/javascripts/app.ts @@ -63,7 +63,7 @@ import { NotesOptionsPanelDirective } from './components/NotesOptionsPanel'; import { IconDirective } from './components/Icon'; import { NoteTagsContainerDirective } from './components/NoteTagsContainer'; import { PreferencesDirective } from './preferences'; -import { appVersion, isWebPlatform } from '@/version'; +import { AppVersion, IsWebPlatform } from '@/version'; function reloadHiddenFirefoxTab(): boolean { /** @@ -189,10 +189,10 @@ const startApplication: StartApplication = async function startApplication( }); }; -if (isWebPlatform) { +if (IsWebPlatform) { startApplication( (window as any)._default_sync_server, - new BrowserBridge(appVersion), + new BrowserBridge(AppVersion), (window as any)._websocket_url, ); } else { diff --git a/app/assets/javascripts/services/errorReporting.ts b/app/assets/javascripts/services/errorReporting.ts index 078b7de074c..16c70c867c5 100644 --- a/app/assets/javascripts/services/errorReporting.ts +++ b/app/assets/javascripts/services/errorReporting.ts @@ -3,7 +3,7 @@ import { isDesktopApplication, isDev } from '@/utils'; import { storage, StorageKey } from './localStorage'; import Bugsnag from '@bugsnag/js'; import { WebCrypto } from '../crypto'; -import { appVersion } from '@/version'; +import { AppVersion } from '@/version'; declare global { interface Window { @@ -50,7 +50,7 @@ export function startErrorReporting(): void { Bugsnag.start({ apiKey: window._bugsnag_api_key, appType: isDesktopApplication() ? 'desktop' : 'web', - appVersion, + appVersion: AppVersion, collectUserIp: false, autoTrackSessions: false, releaseStage: isDev ? 'development' : undefined, diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts index ef568c2547d..fba8edf08bc 100644 --- a/app/assets/javascripts/ui_models/application.ts +++ b/app/assets/javascripts/ui_models/application.ts @@ -24,7 +24,7 @@ import { IOService } from '@/services/ioService'; import { NativeExtManager } from '@/services/nativeExtManager'; import { StatusManager } from '@/services/statusManager'; import { ThemeManager } from '@/services/themeManager'; -import { appVersion } from '@/version'; +import { AppVersion } from '@/version'; type WebServices = { appState: AppState; @@ -64,7 +64,7 @@ export class WebApplication extends SNApplication { identifier, [], defaultSyncServerHost, - appVersion + AppVersion ); this.$compile = $compile; this.scope = scope; diff --git a/app/assets/javascripts/utils.ts b/app/assets/javascripts/utils.ts index fc6b7af2e3b..73d82cc2642 100644 --- a/app/assets/javascripts/utils.ts +++ b/app/assets/javascripts/utils.ts @@ -1,5 +1,5 @@ import { Platform, platformFromString } from '@standardnotes/snjs'; -import { isDesktopPlatform, isWebPlatform } from '@/version'; +import { IsDesktopPlatform, IsWebPlatform } from '@/version'; declare const process: { env: { @@ -161,12 +161,12 @@ export async function preventRefreshing( } } -if (!isWebPlatform && !isDesktopPlatform) { +if (!IsWebPlatform && !IsDesktopPlatform) { throw Error( 'Neither __WEB__ nor __DESKTOP__ is true. Check your configuration files.' ); } export function isDesktopApplication() { - return isDesktopPlatform; + return IsDesktopPlatform; } diff --git a/app/assets/javascripts/version.ts b/app/assets/javascripts/version.ts index 132d61fce28..ca108b555f5 100644 --- a/app/assets/javascripts/version.ts +++ b/app/assets/javascripts/version.ts @@ -3,6 +3,6 @@ declare const __VERSION__: string; declare const __DESKTOP__: boolean; declare const __WEB__: boolean; -export const appVersion = __VERSION__; -export const isDesktopPlatform = __DESKTOP__; -export const isWebPlatform = __WEB__; +export const AppVersion = __VERSION__; +export const IsDesktopPlatform = __DESKTOP__; +export const IsWebPlatform = __WEB__; From ddca4306f2d8a0656465a15bd2a36bb58a798823 Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Thu, 2 Sep 2021 19:05:14 +0400 Subject: [PATCH 08/10] chore: version bump for snjs --- package.json | 2 +- yarn.lock | 56 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 9e1dbcb9d56..668e07be590 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@reach/checkbox": "^0.13.2", "@reach/dialog": "^0.13.0", "@standardnotes/sncrypto-web": "1.2.10", - "@standardnotes/snjs": "2.7.23", + "@standardnotes/snjs": "2.12.0", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "preact": "^10.5.12" diff --git a/yarn.lock b/yarn.lock index 30920454c8c..4910d3422c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2016,12 +2016,43 @@ 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/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/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": + 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-common@^1.2.7", "@standardnotes/sncrypto-common@^1.2.9": +"@standardnotes/sncrypto-common@^1.2.7": 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== @@ -2034,14 +2065,17 @@ "@standardnotes/sncrypto-common" "^1.2.7" 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.12.0": + version "2.12.0" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.12.0.tgz#581bf549ae9c8b8288ee9d408459b8210642b961" + integrity sha512-Z+6ygTyFxUpBZnPQ68KZDh23eYVCqhwklLGn9IkK3V9rWLlkLRgQdXI54ZGX5Q9Zf6mEleZA6zLmTvf7RmTusQ== 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" From b7cf40af8dadcaa2b59f250e011d91f5c7f478c6 Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Fri, 3 Sep 2021 00:02:09 +0400 Subject: [PATCH 09/10] chore: yarn.lock with correct snjs version --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index 165cc288980..e491722955f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2060,10 +2060,10 @@ "@standardnotes/sncrypto-common" "^1.5.2" libsodium-wrappers "^0.7.8" -"@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== +"@standardnotes/snjs@2.12.0": + version "2.12.0" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.12.0.tgz#581bf549ae9c8b8288ee9d408459b8210642b961" + integrity sha512-Z+6ygTyFxUpBZnPQ68KZDh23eYVCqhwklLGn9IkK3V9rWLlkLRgQdXI54ZGX5Q9Zf6mEleZA6zLmTvf7RmTusQ== dependencies: "@standardnotes/auth" "3.1.1" "@standardnotes/common" "1.1.0" From d8488b3a07350e82ec38eb9306268eb684dda853 Mon Sep 17 00:00:00 2001 From: vardanhakobyan Date: Fri, 3 Sep 2021 01:26:55 +0400 Subject: [PATCH 10/10] chore: bump snjs version --- package.json | 2 +- yarn.lock | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 14360d05104..7fddaee768b 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@reach/checkbox": "^0.13.2", "@reach/dialog": "^0.13.0", "@standardnotes/sncrypto-web": "1.5.2", - "@standardnotes/snjs": "2.12.0", + "@standardnotes/snjs": "2.12.1", "mobx": "^6.3.2", "mobx-react-lite": "^3.2.0", "preact": "^10.5.12" diff --git a/yarn.lock b/yarn.lock index e491722955f..9d9d74f294c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2023,7 +2023,7 @@ dependencies: "@standardnotes/common" "^1.0.0" -"@standardnotes/common@1.1.0", "@standardnotes/common@^1.0.0": +"@standardnotes/common@1.1.0", "@standardnotes/common@^1.0.0", "@standardnotes/common@^1.1.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== @@ -2035,12 +2035,12 @@ 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== +"@standardnotes/features@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@standardnotes/features/-/features-1.6.0.tgz#91317255bbad376670fd81fa445abc2d14fd43d9" + integrity sha512-0gN1UKpX0LZxOk7HlnLxbl7N8Drvyw36zRErFn3pSetUNQpr92Pd6qTTNNflBBtY2pwzqoP4XVB/2kZRJFAo8w== dependencies: - "@standardnotes/common" "^1.0.0" + "@standardnotes/common" "^1.1.0" "@standardnotes/settings@1.2.0": version "1.2.0" @@ -2060,15 +2060,15 @@ "@standardnotes/sncrypto-common" "^1.5.2" libsodium-wrappers "^0.7.8" -"@standardnotes/snjs@2.12.0": - version "2.12.0" - resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.12.0.tgz#581bf549ae9c8b8288ee9d408459b8210642b961" - integrity sha512-Z+6ygTyFxUpBZnPQ68KZDh23eYVCqhwklLGn9IkK3V9rWLlkLRgQdXI54ZGX5Q9Zf6mEleZA6zLmTvf7RmTusQ== +"@standardnotes/snjs@2.12.1": + version "2.12.1" + resolved "https://registry.yarnpkg.com/@standardnotes/snjs/-/snjs-2.12.1.tgz#4c2cac0e9f87d55d7d24a30f0fbe90d878869c7b" + integrity sha512-4ehV9Nviko0yLs8NUToSXQvOTcQs4XlU2e1sfSkvZZ+Z+iQZo/gR/Xc9gXhr/PvJpahecJIAnbcLpPlJ/DU9MQ== dependencies: "@standardnotes/auth" "3.1.1" "@standardnotes/common" "1.1.0" "@standardnotes/domain-events" "2.0.0" - "@standardnotes/features" "1.4.0" + "@standardnotes/features" "1.6.0" "@standardnotes/settings" "1.2.0" "@standardnotes/sncrypto-common" "1.5.2"