From 856a7e35007743b559dc0b50dea555cec9ebe46c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Thu, 19 Jan 2023 16:17:59 +0100 Subject: [PATCH 01/19] refactor: remove Uuid and RoleName from @standardnotes/common in favour of @standardnotes/domain-core value objects (#2167) --- ...ommon-npm-1.46.3-a99a2b97e2-0fa509e304.zip | Bin 0 -> 39911 bytes ...core-npm-1.11.1-c16df67772-98af016a83.zip} | Bin 44686 -> 45421 bytes packages/api/package.json | 4 +- .../Subscription/SubscriptionApiService.ts | 3 +- .../SubscriptionApiServiceInterface.ts | 6 +- .../Client/User/UserApiServiceInterface.ts | 4 +- .../Client/Workspace/WorkspaceApiService.ts | 4 +- .../Workspace/WorkspaceApiServiceInterface.ts | 14 +-- .../Domain/Client/Workspace/WorkspaceUser.ts | 8 +- .../api/src/Domain/Http/HttpResponseMeta.ts | 3 +- .../SubscriptionInviteAcceptRequestParams.ts | 4 +- .../SubscriptionInviteCancelRequestParams.ts | 4 +- .../SubscriptionInviteDeclineRequestParams.ts | 4 +- .../Request/User/UserDeletionRequestParams.ts | 4 +- .../UserRequest/UserRequestRequestParams.ts | 4 +- ...rkspaceInvitationAcceptingRequestParams.ts | 6 +- .../WorkspaceInvitationRequestParams.ts | 4 +- ...orkspaceKeyshareInitiatingRequestParams.ts | 6 +- .../WorkspaceUserListRequestParams.ts | 4 +- .../SubscriptionInviteResponseBody.ts | 4 +- .../User/UserRegistrationResponseBody.ts | 3 +- .../src/Domain/Server/Subscription/Paths.ts | 8 +- packages/api/src/Domain/Server/User/Paths.ts | 4 +- .../src/Domain/Server/UserRequest/Paths.ts | 4 +- .../api/src/Domain/Server/Workspace/Paths.ts | 10 +- packages/encryption/package.json | 2 +- .../src/Domain/Split/EncryptionSplit.ts | 5 +- .../src/Domain/Types/ItemAuthenticatedData.ts | 4 +- packages/features/package.json | 3 +- .../src/Domain/Feature/FeatureDescription.ts | 6 +- .../src/Domain/Lists/ClientFeatures.ts | 5 +- .../src/Domain/Permission/Permission.ts | 4 +- packages/filepicker/package.json | 2 +- packages/files/package.json | 2 +- .../files/src/Domain/Cache/FileMemoryCache.ts | 11 +- .../src/Domain/Device/FileBackupsDevice.ts | 3 +- .../src/Domain/Device/FileBackupsMapping.ts | 3 +- packages/models/package.json | 2 +- .../Domain/Abstract/Component/MessageData.ts | 4 +- .../Domain/Abstract/Content/ItemContent.ts | 3 +- .../BackupFileDecryptedContextualPayload.ts | 3 +- .../BackupFileEncryptedContextualPayload.ts | 3 +- .../Abstract/Contextual/LocalStorage.ts | 7 +- .../Abstract/Contextual/OfflineSyncPush.ts | 3 +- .../Abstract/Contextual/ServerSyncPush.ts | 3 +- .../Item/Implementations/DecryptedItem.ts | 3 +- .../Item/Implementations/GenericItem.ts | 4 +- .../Abstract/Item/Interfaces/DecryptedItem.ts | 5 +- .../Abstract/Item/Interfaces/ItemInterface.ts | 8 +- .../Item/Mutator/DecryptedItemMutator.ts | 3 +- .../Item/Mutator/TransactionalMutation.ts | 4 +- .../Implementations/DecryptedPayload.ts | 3 +- .../Payload/Interfaces/DecryptedPayload.ts | 3 +- .../Payload/Interfaces/PayloadInterface.ts | 6 +- .../Interfaces/TransferPayload.ts | 6 +- .../Domain/Runtime/Collection/Collection.ts | 32 +++--- .../Runtime/Collection/CollectionSort.ts | 4 +- .../Runtime/Collection/Item/ItemCollection.ts | 8 +- .../Runtime/Collection/Item/TagItemsIndex.ts | 14 +-- .../Domain/Runtime/Deltas/RemoteRetrieved.ts | 4 +- .../src/Domain/Runtime/Display/Types.ts | 3 +- .../src/Domain/Runtime/History/HistoryMap.ts | 3 +- .../Domain/Syncable/Component/Component.ts | 6 +- .../Syncable/Component/ComponentContent.ts | 3 +- .../Syncable/Component/ComponentMutator.ts | 9 +- .../models/src/Domain/Syncable/Tag/Tag.ts | 4 +- .../src/Domain/Utilities/Item/FindItem.ts | 5 +- .../Domain/Utilities/Payload/FindPayload.ts | 5 +- ...sByUpdatingReferencingPayloadReferences.ts | 3 +- packages/responses/package.json | 2 +- .../responses/src/Domain/Http/ResponseMeta.ts | 3 +- .../src/Domain/Item/IntegrityPayload.ts | 4 +- .../src/Domain/Item/ServerItemResponse.ts | 4 +- packages/services/package.json | 4 +- .../src/Domain/Api/ApiServiceInterface.ts | 4 +- .../src/Domain/Backups/BackupService.ts | 4 +- .../Component/ComponentManagerInterface.ts | 3 +- .../src/Domain/Device/DatabaseLoadSorter.ts | 4 +- .../Domain/Feature/FeaturesClientInterface.ts | 3 +- .../src/Domain/Item/ItemsClientInterface.ts | 8 +- .../src/Domain/Item/ItemsServerInterface.ts | 3 +- .../SubscriptionClientInterface.ts | 5 +- .../Subscription/SubscriptionManager.ts | 3 +- .../Workspace/WorkspaceClientInterface.ts | 14 +-- .../src/Domain/Workspace/WorkspaceManager.ts | 4 +- packages/snjs/lib/Services/Api/ApiService.ts | 4 +- packages/snjs/lib/Services/Api/Paths.ts | 15 ++- .../Services/Features/FeaturesService.spec.ts | 95 +++++++++--------- .../lib/Services/Features/FeaturesService.ts | 27 ++--- .../snjs/lib/Services/Items/ItemManager.ts | 4 +- .../KeyRecovery/KeyRecoveryService.ts | 4 +- .../Services/Listed/ListedClientInterface.ts | 3 +- .../lib/Services/Payloads/PayloadManager.ts | 8 +- .../lib/Services/Session/Sessions/Types.ts | 4 +- .../Services/Storage/DiskStorageService.ts | 4 +- packages/snjs/lib/index.ts | 1 + packages/snjs/package.json | 4 +- packages/ui-services/package.json | 2 +- .../Route/Params/SubscriptionInviteParams.ts | 4 +- packages/ui-services/src/Route/RouteParser.ts | 4 +- .../ui-services/src/Theme/ThemeManager.ts | 4 +- packages/utils/package.json | 2 +- packages/utils/src/Domain/Uuid/UuidMap.ts | 25 +++-- .../SubscriptionSharing/InvitationsList.tsx | 4 +- .../RemoteHistoryList.tsx | 4 +- .../NoteHistory/NoteHistoryController.ts | 3 +- .../Subscription/SubscriptionController.ts | 3 +- yarn.lock | 48 +++++---- 108 files changed, 319 insertions(+), 374 deletions(-) create mode 100644 .yarn/cache/@standardnotes-common-npm-1.46.3-a99a2b97e2-0fa509e304.zip rename .yarn/cache/{@standardnotes-domain-core-npm-1.11.0-f473ba8bc0-cf4c9b7534.zip => @standardnotes-domain-core-npm-1.11.1-c16df67772-98af016a83.zip} (82%) diff --git a/.yarn/cache/@standardnotes-common-npm-1.46.3-a99a2b97e2-0fa509e304.zip b/.yarn/cache/@standardnotes-common-npm-1.46.3-a99a2b97e2-0fa509e304.zip new file mode 100644 index 0000000000000000000000000000000000000000..9bf1e154e37273d8a995f5ba687747e20313aa52 GIT binary patch literal 39911 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 diff --git a/packages/api/package.json b/packages/api/package.json index b02a9abdf..51aabd492 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -36,8 +36,8 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.45.0", - "@standardnotes/domain-core": "^1.11.0", + "@standardnotes/common": "^1.46.3", + "@standardnotes/domain-core": "^1.11.1", "@standardnotes/encryption": "workspace:*", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", diff --git a/packages/api/src/Domain/Client/Subscription/SubscriptionApiService.ts b/packages/api/src/Domain/Client/Subscription/SubscriptionApiService.ts index 2ab8d6edb..81e754643 100644 --- a/packages/api/src/Domain/Client/Subscription/SubscriptionApiService.ts +++ b/packages/api/src/Domain/Client/Subscription/SubscriptionApiService.ts @@ -10,7 +10,6 @@ import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/Su import { SubscriptionApiServiceInterface } from './SubscriptionApiServiceInterface' import { SubscriptionApiOperations } from './SubscriptionApiOperations' -import { Uuid } from '@standardnotes/common' import { AppleIAPConfirmResponse } from './../../Response/Subscription/AppleIAPConfirmResponse' import { AppleIAPConfirmRequestParams } from '../../Request' @@ -83,7 +82,7 @@ export class SubscriptionApiService implements SubscriptionApiServiceInterface { } } - async acceptInvite(inviteUuid: Uuid): Promise { + async acceptInvite(inviteUuid: string): Promise { if (this.operationsInProgress.get(SubscriptionApiOperations.AcceptingInvite)) { throw new ApiCallError(ErrorMessage.GenericInProgress) } diff --git a/packages/api/src/Domain/Client/Subscription/SubscriptionApiServiceInterface.ts b/packages/api/src/Domain/Client/Subscription/SubscriptionApiServiceInterface.ts index bfb76bea1..1f5df672d 100644 --- a/packages/api/src/Domain/Client/Subscription/SubscriptionApiServiceInterface.ts +++ b/packages/api/src/Domain/Client/Subscription/SubscriptionApiServiceInterface.ts @@ -1,5 +1,3 @@ -import { Uuid } from '@standardnotes/common' - import { AppleIAPConfirmResponse } from './../../Response/Subscription/AppleIAPConfirmResponse' import { AppleIAPConfirmRequestParams } from '../../Request' import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse' @@ -10,7 +8,7 @@ import { SubscriptionInviteResponse } from '../../Response/Subscription/Subscrip export interface SubscriptionApiServiceInterface { invite(inviteeEmail: string): Promise listInvites(): Promise - cancelInvite(inviteUuid: Uuid): Promise - acceptInvite(inviteUuid: Uuid): Promise + cancelInvite(inviteUuid: string): Promise + acceptInvite(inviteUuid: string): Promise confirmAppleIAP(params: AppleIAPConfirmRequestParams): Promise } diff --git a/packages/api/src/Domain/Client/User/UserApiServiceInterface.ts b/packages/api/src/Domain/Client/User/UserApiServiceInterface.ts index 81d4d2d19..fc8c17d46 100644 --- a/packages/api/src/Domain/Client/User/UserApiServiceInterface.ts +++ b/packages/api/src/Domain/Client/User/UserApiServiceInterface.ts @@ -1,4 +1,4 @@ -import { UserRequestType, Uuid } from '@standardnotes/common' +import { UserRequestType } from '@standardnotes/common' import { type RootKeyParamsInterface } from '@standardnotes/models' import { UserDeletionResponse } from '../../Response/User/UserDeletionResponse' @@ -12,6 +12,6 @@ export interface UserApiServiceInterface { keyParams: RootKeyParamsInterface ephemeral: boolean }): Promise - submitUserRequest(dto: { userUuid: Uuid; requestType: UserRequestType }): Promise + submitUserRequest(dto: { userUuid: string; requestType: UserRequestType }): Promise deleteAccount(userUuid: string): Promise } diff --git a/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts b/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts index 92f9f02cd..af43c91e2 100644 --- a/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts +++ b/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts @@ -1,4 +1,4 @@ -import { Uuid, WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common' +import { WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common' import { ErrorMessage } from '../../Error/ErrorMessage' import { ApiCallError } from '../../Error/ApiCallError' @@ -96,7 +96,7 @@ export class WorkspaceApiService implements WorkspaceApiServiceInterface { async inviteToWorkspace(dto: { inviteeEmail: string - workspaceUuid: Uuid + workspaceUuid: string accessLevel: WorkspaceAccessLevel }): Promise { this.lockOperation(WorkspaceApiOperations.Inviting) diff --git a/packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts b/packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts index fed57f388..95be52d42 100644 --- a/packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts +++ b/packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts @@ -1,4 +1,4 @@ -import { Uuid, WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common' +import { WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common' import { WorkspaceKeyshareInitiatingResponse } from '../../Response/Workspace/WorkspaceKeyshareInitiatingResponse' import { WorkspaceCreationResponse } from '../../Response/Workspace/WorkspaceCreationResponse' @@ -17,20 +17,20 @@ export interface WorkspaceApiServiceInterface { }): Promise inviteToWorkspace(dto: { inviteeEmail: string - workspaceUuid: Uuid + workspaceUuid: string accessLevel: WorkspaceAccessLevel }): Promise acceptInvite(dto: { - inviteUuid: Uuid - userUuid: Uuid + inviteUuid: string + userUuid: string publicKey: string encryptedPrivateKey: string }): Promise listWorkspaces(): Promise - listWorkspaceUsers(dto: { workspaceUuid: Uuid }): Promise + listWorkspaceUsers(dto: { workspaceUuid: string }): Promise initiateKeyshare(dto: { - workspaceUuid: Uuid - userUuid: Uuid + workspaceUuid: string + userUuid: string encryptedWorkspaceKey: string }): Promise } diff --git a/packages/api/src/Domain/Client/Workspace/WorkspaceUser.ts b/packages/api/src/Domain/Client/Workspace/WorkspaceUser.ts index 16fcb8e5d..bcad3c4e2 100644 --- a/packages/api/src/Domain/Client/Workspace/WorkspaceUser.ts +++ b/packages/api/src/Domain/Client/Workspace/WorkspaceUser.ts @@ -1,11 +1,11 @@ -import { Uuid, WorkspaceAccessLevel, WorkspaceUserStatus } from '@standardnotes/common' +import { WorkspaceAccessLevel, WorkspaceUserStatus } from '@standardnotes/common' export type WorkspaceUser = { - uuid: Uuid + uuid: string accessLevel: WorkspaceAccessLevel - userUuid: Uuid + userUuid: string userDisplayName: string | null - workspaceUuid: Uuid + workspaceUuid: string encryptedWorkspaceKey: string | null publicKey: string | null encryptedPrivateKey: string | null diff --git a/packages/api/src/Domain/Http/HttpResponseMeta.ts b/packages/api/src/Domain/Http/HttpResponseMeta.ts index baebf9db6..4850c108e 100644 --- a/packages/api/src/Domain/Http/HttpResponseMeta.ts +++ b/packages/api/src/Domain/Http/HttpResponseMeta.ts @@ -1,9 +1,8 @@ import { Role } from '@standardnotes/security' -import { Uuid } from '@standardnotes/common' export type HttpResponseMeta = { auth: { - userUuid?: Uuid + userUuid?: string roles?: Role[] } server: { diff --git a/packages/api/src/Domain/Request/Subscription/SubscriptionInviteAcceptRequestParams.ts b/packages/api/src/Domain/Request/Subscription/SubscriptionInviteAcceptRequestParams.ts index c72da5b6b..2b4707b90 100644 --- a/packages/api/src/Domain/Request/Subscription/SubscriptionInviteAcceptRequestParams.ts +++ b/packages/api/src/Domain/Request/Subscription/SubscriptionInviteAcceptRequestParams.ts @@ -1,6 +1,4 @@ -import { Uuid } from '@standardnotes/common' - export type SubscriptionInviteAcceptRequestParams = { - inviteUuid: Uuid + inviteUuid: string [additionalParam: string]: unknown } diff --git a/packages/api/src/Domain/Request/Subscription/SubscriptionInviteCancelRequestParams.ts b/packages/api/src/Domain/Request/Subscription/SubscriptionInviteCancelRequestParams.ts index f00b6912c..b68f1b420 100644 --- a/packages/api/src/Domain/Request/Subscription/SubscriptionInviteCancelRequestParams.ts +++ b/packages/api/src/Domain/Request/Subscription/SubscriptionInviteCancelRequestParams.ts @@ -1,10 +1,8 @@ -import { Uuid } from '@standardnotes/common' - import { ApiEndpointParam } from '../ApiEndpointParam' import { ApiVersion } from '../../Api/ApiVersion' export type SubscriptionInviteCancelRequestParams = { [ApiEndpointParam.ApiVersion]: ApiVersion.v0 - inviteUuid: Uuid + inviteUuid: string [additionalParam: string]: unknown } diff --git a/packages/api/src/Domain/Request/Subscription/SubscriptionInviteDeclineRequestParams.ts b/packages/api/src/Domain/Request/Subscription/SubscriptionInviteDeclineRequestParams.ts index bd771f304..67968c404 100644 --- a/packages/api/src/Domain/Request/Subscription/SubscriptionInviteDeclineRequestParams.ts +++ b/packages/api/src/Domain/Request/Subscription/SubscriptionInviteDeclineRequestParams.ts @@ -1,10 +1,8 @@ -import { Uuid } from '@standardnotes/common' - import { ApiEndpointParam } from '../ApiEndpointParam' import { ApiVersion } from '../../Api/ApiVersion' export type SubscriptionInviteDeclineRequestParams = { [ApiEndpointParam.ApiVersion]: ApiVersion.v0 - inviteUuid: Uuid + inviteUuid: string [additionalParam: string]: unknown } diff --git a/packages/api/src/Domain/Request/User/UserDeletionRequestParams.ts b/packages/api/src/Domain/Request/User/UserDeletionRequestParams.ts index 4b82aeb68..21b77caca 100644 --- a/packages/api/src/Domain/Request/User/UserDeletionRequestParams.ts +++ b/packages/api/src/Domain/Request/User/UserDeletionRequestParams.ts @@ -1,6 +1,4 @@ -import { Uuid } from '@standardnotes/common' - export type UserDeletionRequestParams = { - userUuid: Uuid + userUuid: string [additionalParam: string]: unknown } diff --git a/packages/api/src/Domain/Request/UserRequest/UserRequestRequestParams.ts b/packages/api/src/Domain/Request/UserRequest/UserRequestRequestParams.ts index 9a7cda719..02214ba7b 100644 --- a/packages/api/src/Domain/Request/UserRequest/UserRequestRequestParams.ts +++ b/packages/api/src/Domain/Request/UserRequest/UserRequestRequestParams.ts @@ -1,7 +1,7 @@ -import { UserRequestType, Uuid } from '@standardnotes/common' +import { UserRequestType } from '@standardnotes/common' export type UserRequestRequestParams = { - userUuid: Uuid + userUuid: string requestType: UserRequestType [additionalParam: string]: unknown } diff --git a/packages/api/src/Domain/Request/Workspace/WorkspaceInvitationAcceptingRequestParams.ts b/packages/api/src/Domain/Request/Workspace/WorkspaceInvitationAcceptingRequestParams.ts index 4349e6708..8a7e89a8c 100644 --- a/packages/api/src/Domain/Request/Workspace/WorkspaceInvitationAcceptingRequestParams.ts +++ b/packages/api/src/Domain/Request/Workspace/WorkspaceInvitationAcceptingRequestParams.ts @@ -1,8 +1,6 @@ -import { Uuid } from '@standardnotes/common' - export type WorkspaceInvitationAcceptingRequestParams = { - inviteUuid: Uuid - userUuid: Uuid + inviteUuid: string + userUuid: string publicKey: string encryptedPrivateKey: string [additionalParam: string]: unknown diff --git a/packages/api/src/Domain/Request/Workspace/WorkspaceInvitationRequestParams.ts b/packages/api/src/Domain/Request/Workspace/WorkspaceInvitationRequestParams.ts index 3f9cdced3..327a8d820 100644 --- a/packages/api/src/Domain/Request/Workspace/WorkspaceInvitationRequestParams.ts +++ b/packages/api/src/Domain/Request/Workspace/WorkspaceInvitationRequestParams.ts @@ -1,7 +1,7 @@ -import { Uuid, WorkspaceAccessLevel } from '@standardnotes/common' +import { WorkspaceAccessLevel } from '@standardnotes/common' export type WorkspaceInvitationRequestParams = { - workspaceUuid: Uuid + workspaceUuid: string inviteeEmail: string accessLevel: WorkspaceAccessLevel [additionalParam: string]: unknown diff --git a/packages/api/src/Domain/Request/Workspace/WorkspaceKeyshareInitiatingRequestParams.ts b/packages/api/src/Domain/Request/Workspace/WorkspaceKeyshareInitiatingRequestParams.ts index 786c43203..ae3a64160 100644 --- a/packages/api/src/Domain/Request/Workspace/WorkspaceKeyshareInitiatingRequestParams.ts +++ b/packages/api/src/Domain/Request/Workspace/WorkspaceKeyshareInitiatingRequestParams.ts @@ -1,8 +1,6 @@ -import { Uuid } from '@standardnotes/common' - export type WorkspaceKeyshareInitiatingRequestParams = { - userUuid: Uuid - workspaceUuid: Uuid + userUuid: string + workspaceUuid: string encryptedWorkspaceKey: string [additionalParam: string]: unknown } diff --git a/packages/api/src/Domain/Request/Workspace/WorkspaceUserListRequestParams.ts b/packages/api/src/Domain/Request/Workspace/WorkspaceUserListRequestParams.ts index cef93740d..2381ca407 100644 --- a/packages/api/src/Domain/Request/Workspace/WorkspaceUserListRequestParams.ts +++ b/packages/api/src/Domain/Request/Workspace/WorkspaceUserListRequestParams.ts @@ -1,6 +1,4 @@ -import { Uuid } from '@standardnotes/common' - export type WorkspaceUserListRequestParams = { - workspaceUuid: Uuid + workspaceUuid: string [additionalParam: string]: unknown } diff --git a/packages/api/src/Domain/Response/Subscription/SubscriptionInviteResponseBody.ts b/packages/api/src/Domain/Response/Subscription/SubscriptionInviteResponseBody.ts index 7c78bf3fb..3035233d0 100644 --- a/packages/api/src/Domain/Response/Subscription/SubscriptionInviteResponseBody.ts +++ b/packages/api/src/Domain/Response/Subscription/SubscriptionInviteResponseBody.ts @@ -1,9 +1,7 @@ -import { Uuid } from '@standardnotes/common' - export type SubscriptionInviteResponseBody = | { success: true - sharedSubscriptionInvitationUuid: Uuid + sharedSubscriptionInvitationUuid: string } | { success: false diff --git a/packages/api/src/Domain/Response/User/UserRegistrationResponseBody.ts b/packages/api/src/Domain/Response/User/UserRegistrationResponseBody.ts index 57cbd340f..0e99172be 100644 --- a/packages/api/src/Domain/Response/User/UserRegistrationResponseBody.ts +++ b/packages/api/src/Domain/Response/User/UserRegistrationResponseBody.ts @@ -1,11 +1,10 @@ -import { Uuid } from '@standardnotes/common' import { KeyParamsData, SessionBody } from '@standardnotes/responses' export type UserRegistrationResponseBody = { session: SessionBody key_params: KeyParamsData user: { - uuid: Uuid + uuid: string email: string } } diff --git a/packages/api/src/Domain/Server/Subscription/Paths.ts b/packages/api/src/Domain/Server/Subscription/Paths.ts index 73cbca6cf..60783541e 100644 --- a/packages/api/src/Domain/Server/Subscription/Paths.ts +++ b/packages/api/src/Domain/Server/Subscription/Paths.ts @@ -1,10 +1,8 @@ -import { Uuid } from '@standardnotes/common' - const SharingPaths = { invite: '/v1/subscription-invites', - acceptInvite: (inviteUuid: Uuid) => `/v1/subscription-invites/${inviteUuid}/accept`, - declineInvite: (inviteUuid: Uuid) => `/v1/subscription-invites/${inviteUuid}/decline`, - cancelInvite: (inviteUuid: Uuid) => `/v1/subscription-invites/${inviteUuid}`, + acceptInvite: (inviteUuid: string) => `/v1/subscription-invites/${inviteUuid}/accept`, + declineInvite: (inviteUuid: string) => `/v1/subscription-invites/${inviteUuid}/decline`, + cancelInvite: (inviteUuid: string) => `/v1/subscription-invites/${inviteUuid}`, listInvites: '/v1/subscription-invites', } diff --git a/packages/api/src/Domain/Server/User/Paths.ts b/packages/api/src/Domain/Server/User/Paths.ts index 00e735241..9c9252775 100644 --- a/packages/api/src/Domain/Server/User/Paths.ts +++ b/packages/api/src/Domain/Server/User/Paths.ts @@ -1,8 +1,6 @@ -import { Uuid } from '@standardnotes/common' - const UserPaths = { register: '/v1/users', - deleteAccount: (userUuid: Uuid) => `/v1/users/${userUuid}`, + deleteAccount: (userUuid: string) => `/v1/users/${userUuid}`, } export const Paths = { diff --git a/packages/api/src/Domain/Server/UserRequest/Paths.ts b/packages/api/src/Domain/Server/UserRequest/Paths.ts index dde538580..c807713cd 100644 --- a/packages/api/src/Domain/Server/UserRequest/Paths.ts +++ b/packages/api/src/Domain/Server/UserRequest/Paths.ts @@ -1,7 +1,5 @@ -import { Uuid } from '@standardnotes/common' - const UserRequestPaths = { - submitUserRequest: (userUuid: Uuid) => `/v1/users/${userUuid}/requests`, + submitUserRequest: (userUuid: string) => `/v1/users/${userUuid}/requests`, } export const Paths = { diff --git a/packages/api/src/Domain/Server/Workspace/Paths.ts b/packages/api/src/Domain/Server/Workspace/Paths.ts index d9495e22f..7f766f941 100644 --- a/packages/api/src/Domain/Server/Workspace/Paths.ts +++ b/packages/api/src/Domain/Server/Workspace/Paths.ts @@ -1,13 +1,11 @@ -import { Uuid } from '@standardnotes/common' - const WorkspacePaths = { createWorkspace: '/v1/workspaces', listWorkspaces: '/v1/workspaces', - listWorkspaceUsers: (uuid: Uuid) => `/v1/workspaces/${uuid}/users`, - initiateKeyshare: (worksapceUuid: Uuid, userUuid: Uuid) => + listWorkspaceUsers: (uuid: string) => `/v1/workspaces/${uuid}/users`, + initiateKeyshare: (worksapceUuid: string, userUuid: string) => `/v1/workspaces/${worksapceUuid}/users/${userUuid}/keyshare`, - inviteToWorkspace: (uuid: Uuid) => `/v1/workspaces/${uuid}/invites`, - acceptInvite: (uuid: Uuid) => `/v1/invites/${uuid}/accept`, + inviteToWorkspace: (uuid: string) => `/v1/workspaces/${uuid}/invites`, + acceptInvite: (uuid: string) => `/v1/invites/${uuid}/accept`, } export const Paths = { diff --git a/packages/encryption/package.json b/packages/encryption/package.json index fb15cbc9d..242a0cb0f 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -35,7 +35,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.45.0", + "@standardnotes/common": "^1.46.3", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", "@standardnotes/sncrypto-common": "workspace:*", diff --git a/packages/encryption/src/Domain/Split/EncryptionSplit.ts b/packages/encryption/src/Domain/Split/EncryptionSplit.ts index c3094844a..3736a15c0 100644 --- a/packages/encryption/src/Domain/Split/EncryptionSplit.ts +++ b/packages/encryption/src/Domain/Split/EncryptionSplit.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { DecryptedPayloadInterface, EncryptedPayloadInterface, PayloadInterface } from '@standardnotes/models' import { EncryptionTypeSplit } from './EncryptionTypeSplit' import { KeyedDecryptionSplit } from './KeyedDecryptionSplit' @@ -36,7 +35,7 @@ export function CreateDecryptionSplitWithKeyLookup( return result } -export function FindPayloadInEncryptionSplit(uuid: Uuid, split: KeyedEncryptionSplit): DecryptedPayloadInterface { +export function FindPayloadInEncryptionSplit(uuid: string, split: KeyedEncryptionSplit): DecryptedPayloadInterface { const inUsesItemsKey = split.usesItemsKey?.items.find((item: PayloadInterface) => item.uuid === uuid) if (inUsesItemsKey) { return inUsesItemsKey @@ -60,7 +59,7 @@ export function FindPayloadInEncryptionSplit(uuid: Uuid, split: KeyedEncryptionS throw Error('Cannot find payload in encryption split') } -export function FindPayloadInDecryptionSplit(uuid: Uuid, split: KeyedDecryptionSplit): EncryptedPayloadInterface { +export function FindPayloadInDecryptionSplit(uuid: string, split: KeyedDecryptionSplit): EncryptedPayloadInterface { const inUsesItemsKey = split.usesItemsKey?.items.find((item: PayloadInterface) => item.uuid === uuid) if (inUsesItemsKey) { return inUsesItemsKey diff --git a/packages/encryption/src/Domain/Types/ItemAuthenticatedData.ts b/packages/encryption/src/Domain/Types/ItemAuthenticatedData.ts index 2b75da608..92fc43079 100644 --- a/packages/encryption/src/Domain/Types/ItemAuthenticatedData.ts +++ b/packages/encryption/src/Domain/Types/ItemAuthenticatedData.ts @@ -1,6 +1,6 @@ -import { ProtocolVersion, Uuid } from '@standardnotes/common' +import { ProtocolVersion } from '@standardnotes/common' export type ItemAuthenticatedData = { - u: Uuid + u: string v: ProtocolVersion } diff --git a/packages/features/package.json b/packages/features/package.json index c05f303db..fb533e2f0 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -26,7 +26,8 @@ }, "dependencies": { "@standardnotes/auth": "^3.19.4", - "@standardnotes/common": "^1.45.0", + "@standardnotes/common": "^1.46.3", + "@standardnotes/domain-core": "^1.11.1", "@standardnotes/security": "^1.7.0", "reflect-metadata": "^0.1.13" }, diff --git a/packages/features/src/Domain/Feature/FeatureDescription.ts b/packages/features/src/Domain/Feature/FeatureDescription.ts index 5d30abdd8..adafc6b05 100644 --- a/packages/features/src/Domain/Feature/FeatureDescription.ts +++ b/packages/features/src/Domain/Feature/FeatureDescription.ts @@ -1,5 +1,5 @@ import { ComponentPermission } from '../Component/ComponentPermission' -import { ContentType, RoleName, SubscriptionName } from '@standardnotes/common' +import { ContentType, SubscriptionName } from '@standardnotes/common' import { ComponentArea } from '../Component/ComponentArea' import { PermissionName } from '../Permission/PermissionName' import { FeatureIdentifier } from './FeatureIdentifier' @@ -9,11 +9,11 @@ import { ThemeDockIcon } from '../Component/ThemeDockIcon' type RoleFields = { /** Server populated */ - role_name?: RoleName + role_name?: string /** Statically populated. Non-influencing; used as a reference by other static consumers (such as email service) */ availableInSubscriptions: SubscriptionName[] - availableInRoles?: RoleName[] + availableInRoles?: string[] } export type BaseFeatureDescription = RoleFields & { diff --git a/packages/features/src/Domain/Lists/ClientFeatures.ts b/packages/features/src/Domain/Lists/ClientFeatures.ts index ff404c96b..2a67eabd0 100644 --- a/packages/features/src/Domain/Lists/ClientFeatures.ts +++ b/packages/features/src/Domain/Lists/ClientFeatures.ts @@ -1,7 +1,8 @@ import { ClientFeatureDescription } from '../Feature/FeatureDescription' import { PermissionName } from '../Permission/PermissionName' import { FeatureIdentifier } from '../Feature/FeatureIdentifier' -import { RoleName, SubscriptionName } from '@standardnotes/common' +import { SubscriptionName } from '@standardnotes/common' +import { RoleName } from '@standardnotes/domain-core' export function clientFeatures(): ClientFeatureDescription[] { return [ @@ -19,7 +20,7 @@ export function clientFeatures(): ClientFeatureDescription[] { permission_name: PermissionName.SuperEditor, description: 'Type / to bring up the block selection menu, or @ to embed images or link other tags and notes. Type - then space to start a list, or [] then space to start a checklist. Drag and drop an image or file to embed it in your note.', - availableInRoles: [RoleName.PlusUser, RoleName.ProUser], + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }, { availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], diff --git a/packages/features/src/Domain/Permission/Permission.ts b/packages/features/src/Domain/Permission/Permission.ts index 47b43d7ad..e7549c200 100644 --- a/packages/features/src/Domain/Permission/Permission.ts +++ b/packages/features/src/Domain/Permission/Permission.ts @@ -1,8 +1,6 @@ -import { Uuid } from '@standardnotes/common' - import { PermissionName } from './PermissionName' export type Permission = { - uuid: Uuid + uuid: string name: PermissionName } diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index 1b379c20a..5d65e64f5 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -26,7 +26,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.45.0", + "@standardnotes/common": "^1.46.3", "@standardnotes/files": "workspace:*", "@standardnotes/utils": "workspace:*", "@types/wicg-file-system-access": "^2020.9.5", diff --git a/packages/files/package.json b/packages/files/package.json index cff26b623..4aa4ab17f 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -28,7 +28,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.45.0", + "@standardnotes/common": "^1.46.3", "@standardnotes/encryption": "workspace:*", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", diff --git a/packages/files/src/Domain/Cache/FileMemoryCache.ts b/packages/files/src/Domain/Cache/FileMemoryCache.ts index c809992e2..153f689b7 100644 --- a/packages/files/src/Domain/Cache/FileMemoryCache.ts +++ b/packages/files/src/Domain/Cache/FileMemoryCache.ts @@ -1,15 +1,14 @@ import { removeFromArray } from '@standardnotes/utils' -import { Uuid } from '@standardnotes/common' import { EncryptedBytes } from '../Types/EncryptedBytes' export class FileMemoryCache { - private cache: Record = {} - private orderedQueue: Uuid[] = [] + private cache: Record = {} + private orderedQueue: string[] = [] constructor(public readonly maxSize: number) {} - add(uuid: Uuid, data: EncryptedBytes): boolean { + add(uuid: string, data: EncryptedBytes): boolean { if (data.encryptedBytes.length > this.maxSize) { return false } @@ -31,11 +30,11 @@ export class FileMemoryCache { .reduce((total, fileLength) => total + fileLength, 0) } - get(uuid: Uuid): EncryptedBytes | undefined { + get(uuid: string): EncryptedBytes | undefined { return this.cache[uuid] } - remove(uuid: Uuid): void { + remove(uuid: string): void { delete this.cache[uuid] removeFromArray(this.orderedQueue, uuid) diff --git a/packages/files/src/Domain/Device/FileBackupsDevice.ts b/packages/files/src/Domain/Device/FileBackupsDevice.ts index b192d60cc..d0a9bb208 100644 --- a/packages/files/src/Domain/Device/FileBackupsDevice.ts +++ b/packages/files/src/Domain/Device/FileBackupsDevice.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { FileDownloadProgress } from '../Types/FileDownloadProgress' import { FileBackupRecord, FileBackupsMapping } from './FileBackupsMapping' @@ -8,7 +7,7 @@ export type FileBackupReadChunkResponse = { chunk: Uint8Array; isLast: boolean; export interface FileBackupsDevice { getFilesBackupsMappingFile(): Promise saveFilesBackupsFile( - uuid: Uuid, + uuid: string, metaFile: string, downloadRequest: { chunkSizes: number[] diff --git a/packages/files/src/Domain/Device/FileBackupsMapping.ts b/packages/files/src/Domain/Device/FileBackupsMapping.ts index 4af25e323..a2b7ff1ec 100644 --- a/packages/files/src/Domain/Device/FileBackupsMapping.ts +++ b/packages/files/src/Domain/Device/FileBackupsMapping.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { FileBackupsConstantsV1 } from './FileBackupsConstantsV1' export type FileBackupRecord = { @@ -12,5 +11,5 @@ export type FileBackupRecord = { export interface FileBackupsMapping { version: typeof FileBackupsConstantsV1.Version - files: Record + files: Record } diff --git a/packages/models/package.json b/packages/models/package.json index 2049fef86..42b11a081 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -22,7 +22,7 @@ "test": "jest" }, "devDependencies": { - "@standardnotes/common": "^1.45.0", + "@standardnotes/common": "^1.46.3", "@standardnotes/features": "workspace:*", "@standardnotes/responses": "workspace:*", "@standardnotes/utils": "workspace:*", diff --git a/packages/models/src/Domain/Abstract/Component/MessageData.ts b/packages/models/src/Domain/Abstract/Component/MessageData.ts index e18ef5782..02a970c51 100644 --- a/packages/models/src/Domain/Abstract/Component/MessageData.ts +++ b/packages/models/src/Domain/Abstract/Component/MessageData.ts @@ -1,4 +1,4 @@ -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { ComponentPermission } from '@standardnotes/features' import { IncomingComponentItemPayload } from './IncomingComponentItemPayload' @@ -14,7 +14,7 @@ export type MessageData = Partial<{ permissions?: ComponentPermission[] /** Related to the component-registered action */ componentData?: Record - uuid?: Uuid + uuid?: string environment?: string platform?: string activeThemeUrls?: string[] diff --git a/packages/models/src/Domain/Abstract/Content/ItemContent.ts b/packages/models/src/Domain/Abstract/Content/ItemContent.ts index 06a45bda7..ffb07bacb 100644 --- a/packages/models/src/Domain/Abstract/Content/ItemContent.ts +++ b/packages/models/src/Domain/Abstract/Content/ItemContent.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { AppData, DefaultAppDomain } from '../Item/Types/DefaultAppDomain' import { ContentReference } from '../Reference/ContentReference' import { AppDataField } from '../Item/Types/AppDataField' @@ -8,7 +7,7 @@ export interface SpecializedContent {} export interface ItemContent { references: ContentReference[] - conflict_of?: Uuid + conflict_of?: string protected?: boolean trashed?: boolean pinned?: boolean diff --git a/packages/models/src/Domain/Abstract/Contextual/BackupFileDecryptedContextualPayload.ts b/packages/models/src/Domain/Abstract/Contextual/BackupFileDecryptedContextualPayload.ts index 9de4eadde..b3dd4d587 100644 --- a/packages/models/src/Domain/Abstract/Contextual/BackupFileDecryptedContextualPayload.ts +++ b/packages/models/src/Domain/Abstract/Contextual/BackupFileDecryptedContextualPayload.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { ItemContent } from '../Content/ItemContent' import { ContextPayload } from './ContextPayload' @@ -6,7 +5,7 @@ export interface BackupFileDecryptedContextualPayload extends GenericItem> implements DecryptedItemInterface { - public readonly conflictOf?: Uuid + public readonly conflictOf?: string public readonly protected: boolean = false public readonly trashed: boolean = false public readonly pinned: boolean = false diff --git a/packages/models/src/Domain/Abstract/Item/Implementations/GenericItem.ts b/packages/models/src/Domain/Abstract/Item/Implementations/GenericItem.ts index 42a1c7b72..327478860 100644 --- a/packages/models/src/Domain/Abstract/Item/Implementations/GenericItem.ts +++ b/packages/models/src/Domain/Abstract/Item/Implementations/GenericItem.ts @@ -1,4 +1,4 @@ -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { dateToLocalizedString, deepFreeze } from '@standardnotes/utils' import { TransferPayload } from './../../TransferPayload/Interfaces/TransferPayload' import { ItemContentsDiffer } from '../../../Utilities/Item/ItemContentsDiffer' @@ -13,7 +13,7 @@ import { isDecryptedItem, isDeletedItem, isEncryptedErroredItem } from '../Inter export abstract class GenericItem

implements ItemInterface

{ payload: P - public readonly duplicateOf?: Uuid + public readonly duplicateOf?: string public readonly createdAtString?: string public updatedAtString?: string public userModifiedDate: Date diff --git a/packages/models/src/Domain/Abstract/Item/Interfaces/DecryptedItem.ts b/packages/models/src/Domain/Abstract/Item/Interfaces/DecryptedItem.ts index 79e13c136..68ed08d10 100644 --- a/packages/models/src/Domain/Abstract/Item/Interfaces/DecryptedItem.ts +++ b/packages/models/src/Domain/Abstract/Item/Interfaces/DecryptedItem.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { AppDataField } from '../Types/AppDataField' import { ComponentDataDomain, DefaultAppDomain } from '../Types/DefaultAppDomain' import { ContentReference } from '../../Reference/ContentReference' @@ -15,8 +14,8 @@ export interface DecryptedItemInterface SortableItem, SearchableItem { readonly content: C - readonly conflictOf?: Uuid - readonly duplicateOf?: Uuid + readonly conflictOf?: string + readonly duplicateOf?: string readonly protected: boolean readonly trashed: boolean readonly pinned: boolean diff --git a/packages/models/src/Domain/Abstract/Item/Interfaces/ItemInterface.ts b/packages/models/src/Domain/Abstract/Item/Interfaces/ItemInterface.ts index d6087b83c..393cf7ac5 100644 --- a/packages/models/src/Domain/Abstract/Item/Interfaces/ItemInterface.ts +++ b/packages/models/src/Domain/Abstract/Item/Interfaces/ItemInterface.ts @@ -1,4 +1,4 @@ -import { Uuid, ContentType } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { TransferPayload } from './../../TransferPayload/Interfaces/TransferPayload' import { PayloadInterface } from '../../Payload/Interfaces/PayloadInterface' import { PredicateInterface } from '../../../Runtime/Predicate/Interface' @@ -8,12 +8,12 @@ import { SingletonStrategy } from '../Types/SingletonStrategy' export interface ItemInterface

{ payload: P - readonly conflictOf?: Uuid - readonly duplicateOf?: Uuid + readonly conflictOf?: string + readonly duplicateOf?: string readonly createdAtString?: string readonly updatedAtString?: string - uuid: Uuid + uuid: string content_type: ContentType created_at: Date diff --git a/packages/models/src/Domain/Abstract/Item/Mutator/DecryptedItemMutator.ts b/packages/models/src/Domain/Abstract/Item/Mutator/DecryptedItemMutator.ts index ce136a686..deb44e969 100644 --- a/packages/models/src/Domain/Abstract/Item/Mutator/DecryptedItemMutator.ts +++ b/packages/models/src/Domain/Abstract/Item/Mutator/DecryptedItemMutator.ts @@ -2,7 +2,6 @@ import { DecryptedItemInterface } from './../Interfaces/DecryptedItem' import { Copy } from '@standardnotes/utils' import { MutationType } from '../Types/MutationType' import { PrefKey } from '../../../Syncable/UserPrefs/PrefKey' -import { Uuid } from '@standardnotes/common' import { ItemContent } from '../../Content/ItemContent' import { AppDataField } from '../Types/AppDataField' import { DefaultAppDomain, DomainDataValueType, ItemDomainKey } from '../Types/DefaultAppDomain' @@ -66,7 +65,7 @@ export class DecryptedItemMutator extends I this.setAppDataItem(AppDataField.UserModifiedDate, date) } - public set conflictOf(conflictOf: Uuid | undefined) { + public set conflictOf(conflictOf: string | undefined) { this.mutableContent.conflict_of = conflictOf } diff --git a/packages/models/src/Domain/Abstract/Item/Mutator/TransactionalMutation.ts b/packages/models/src/Domain/Abstract/Item/Mutator/TransactionalMutation.ts index c484fb0bd..c6c649dc8 100644 --- a/packages/models/src/Domain/Abstract/Item/Mutator/TransactionalMutation.ts +++ b/packages/models/src/Domain/Abstract/Item/Mutator/TransactionalMutation.ts @@ -1,11 +1,9 @@ -import { Uuid } from '@standardnotes/common' - import { MutationType } from '../Types/MutationType' import { ItemMutator } from './ItemMutator' export type TransactionalMutation = { - itemUuid: Uuid + itemUuid: string mutate: (mutator: ItemMutator) => void mutationType?: MutationType } diff --git a/packages/models/src/Domain/Abstract/Payload/Implementations/DecryptedPayload.ts b/packages/models/src/Domain/Abstract/Payload/Implementations/DecryptedPayload.ts index da52b7e96..b74acee89 100644 --- a/packages/models/src/Domain/Abstract/Payload/Implementations/DecryptedPayload.ts +++ b/packages/models/src/Domain/Abstract/Payload/Implementations/DecryptedPayload.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { Copy } from '@standardnotes/utils' import { SyncResolvedParams, SyncResolvedPayload } from '../../../Runtime/Deltas/Utilities/SyncResolvedPayload' import { FillItemContent, ItemContent } from '../../Content/ItemContent' @@ -29,7 +28,7 @@ export class DecryptedPayload< return this.content.references || [] } - public getReference(uuid: Uuid): ContentReference { + public getReference(uuid: string): ContentReference { const result = this.references.find((ref) => ref.uuid === uuid) if (!result) { diff --git a/packages/models/src/Domain/Abstract/Payload/Interfaces/DecryptedPayload.ts b/packages/models/src/Domain/Abstract/Payload/Interfaces/DecryptedPayload.ts index 28bde92c7..0ce47b371 100644 --- a/packages/models/src/Domain/Abstract/Payload/Interfaces/DecryptedPayload.ts +++ b/packages/models/src/Domain/Abstract/Payload/Interfaces/DecryptedPayload.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { DecryptedTransferPayload } from './../../TransferPayload/Interfaces/DecryptedTransferPayload' import { ItemContent } from '../../Content/ItemContent' import { ContentReference } from '../../Reference/ContentReference' @@ -11,5 +10,5 @@ export interface DecryptedPayloadInterface ejected(): DecryptedTransferPayload get references(): ContentReference[] - getReference(uuid: Uuid): ContentReference + getReference(uuid: string): ContentReference } diff --git a/packages/models/src/Domain/Abstract/Payload/Interfaces/PayloadInterface.ts b/packages/models/src/Domain/Abstract/Payload/Interfaces/PayloadInterface.ts index 73bf6a4d0..42d65a0be 100644 --- a/packages/models/src/Domain/Abstract/Payload/Interfaces/PayloadInterface.ts +++ b/packages/models/src/Domain/Abstract/Payload/Interfaces/PayloadInterface.ts @@ -1,12 +1,12 @@ import { SyncResolvedParams, SyncResolvedPayload } from './../../../Runtime/Deltas/Utilities/SyncResolvedPayload' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { ItemContent } from '../../Content/ItemContent' import { TransferPayload } from '../../TransferPayload/Interfaces/TransferPayload' import { PayloadSource } from '../Types/PayloadSource' export interface PayloadInterface { readonly source: PayloadSource - readonly uuid: Uuid + readonly uuid: string readonly content_type: ContentType content: C | string | undefined deleted: boolean @@ -26,7 +26,7 @@ export interface PayloadInterface { - uuid: Uuid + uuid: string content_type: ContentType content: C | string | undefined deleted?: boolean @@ -19,5 +19,5 @@ export interface TransferPayload { lastSyncBegan?: Date lastSyncEnd?: Date - duplicate_of?: Uuid + duplicate_of?: string } diff --git a/packages/models/src/Domain/Runtime/Collection/Collection.ts b/packages/models/src/Domain/Runtime/Collection/Collection.ts index 5ab28a1a5..7b1afd1da 100644 --- a/packages/models/src/Domain/Runtime/Collection/Collection.ts +++ b/packages/models/src/Domain/Runtime/Collection/Collection.ts @@ -1,11 +1,11 @@ import { extendArray, isObject, isString, UuidMap } from '@standardnotes/utils' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { remove } from 'lodash' import { ItemContent } from '../../Abstract/Content/ItemContent' import { ContentReference } from '../../Abstract/Item' export interface CollectionElement { - uuid: Uuid + uuid: string content_type: ContentType dirty?: boolean deleted?: boolean @@ -32,17 +32,17 @@ export abstract class Collection< Encrypted extends EncryptedCollectionElement, Deleted extends DeletedCollectionElement, > { - readonly map: Partial> = {} + readonly map: Partial> = {} readonly typedMap: Partial> = {} /** An array of uuids of items that are dirty */ - dirtyIndex: Set = new Set() + dirtyIndex: Set = new Set() /** An array of uuids of items that are not marked as deleted */ - nondeletedIndex: Set = new Set() + nondeletedIndex: Set = new Set() /** An array of uuids of items that are errorDecrypting or waitingForKey */ - invalidsIndex: Set = new Set() + invalidsIndex: Set = new Set() readonly referenceMap: UuidMap @@ -73,7 +73,7 @@ export abstract class Collection< constructor( copy = false, - mapCopy?: Partial>, + mapCopy?: Partial>, typedMapCopy?: Partial>, referenceMapCopy?: UuidMap, conflictMapCopy?: UuidMap, @@ -89,7 +89,7 @@ export abstract class Collection< } } - public uuids(): Uuid[] { + public uuids(): string[] { return Object.keys(this.map) } @@ -105,7 +105,7 @@ export abstract class Collection< return this.typedMap[contentType]?.slice() || [] } } else { - return Object.keys(this.map).map((uuid: Uuid) => { + return Object.keys(this.map).map((uuid: string) => { return this.map[uuid] }) as Element[] } @@ -129,7 +129,7 @@ export abstract class Collection< return this.findAll(uuids) } - public findAll(uuids: Uuid[]): Element[] { + public findAll(uuids: string[]): Element[] { const results: Element[] = [] for (const id of uuids) { @@ -142,11 +142,11 @@ export abstract class Collection< return results } - public find(uuid: Uuid): Element | undefined { + public find(uuid: string): Element | undefined { return this.map[uuid] } - public has(uuid: Uuid): boolean { + public has(uuid: string): boolean { return this.find(uuid) != undefined } @@ -154,7 +154,7 @@ export abstract class Collection< * If an item is not found, an `undefined` element * will be inserted into the array. */ - public findAllIncludingBlanks(uuids: Uuid[]): (E | Deleted | undefined)[] { + public findAllIncludingBlanks(uuids: string[]): (E | Deleted | undefined)[] { const results: (E | Deleted | undefined)[] = [] for (const id of uuids) { @@ -219,11 +219,11 @@ export abstract class Collection< } } - public uuidReferencesForUuid(uuid: Uuid): Uuid[] { + public uuidReferencesForUuid(uuid: string): string[] { return this.referenceMap.getDirectRelationships(uuid) } - public uuidsThatReferenceUuid(uuid: Uuid): Uuid[] { + public uuidsThatReferenceUuid(uuid: string): string[] { return this.referenceMap.getInverseRelationships(uuid) } @@ -232,7 +232,7 @@ export abstract class Collection< return this.findAll(uuids) } - public conflictsOf(uuid: Uuid): Element[] { + public conflictsOf(uuid: string): Element[] { const uuids = this.conflictMap.getDirectRelationships(uuid) return this.findAll(uuids) } diff --git a/packages/models/src/Domain/Runtime/Collection/CollectionSort.ts b/packages/models/src/Domain/Runtime/Collection/CollectionSort.ts index 517475e01..d409f40b6 100644 --- a/packages/models/src/Domain/Runtime/Collection/CollectionSort.ts +++ b/packages/models/src/Domain/Runtime/Collection/CollectionSort.ts @@ -1,7 +1,7 @@ -import { Uuid, ContentType } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' export interface SortableItem { - uuid: Uuid + uuid: string content_type: ContentType created_at: Date userModifiedDate: Date diff --git a/packages/models/src/Domain/Runtime/Collection/Item/ItemCollection.ts b/packages/models/src/Domain/Runtime/Collection/Item/ItemCollection.ts index 8a553d3d4..ee5868afc 100644 --- a/packages/models/src/Domain/Runtime/Collection/Item/ItemCollection.ts +++ b/packages/models/src/Domain/Runtime/Collection/Item/ItemCollection.ts @@ -1,6 +1,6 @@ import { ItemContent } from './../../../Abstract/Content/ItemContent' import { EncryptedItemInterface } from './../../../Abstract/Item/Interfaces/EncryptedItem' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { SNIndex } from '../../Index/SNIndex' import { isDecryptedItem } from '../../../Abstract/Item/Interfaces/TypeCheck' import { DecryptedItemInterface } from '../../../Abstract/Item/Interfaces/DecryptedItem' @@ -24,7 +24,7 @@ export class ItemCollection this.discard(delta.discarded) } - public findDecrypted(uuid: Uuid): T | undefined { + public findDecrypted(uuid: string): T | undefined { const result = this.find(uuid) if (!result) { @@ -34,12 +34,12 @@ export class ItemCollection return isDecryptedItem(result) ? (result as T) : undefined } - public findAllDecrypted(uuids: Uuid[]): T[] { + public findAllDecrypted(uuids: string[]): T[] { return this.findAll(uuids).filter(isDecryptedItem) as T[] } public findAllDecryptedWithBlanks( - uuids: Uuid[], + uuids: string[], ): (DecryptedItemInterface | undefined)[] { const results = this.findAllIncludingBlanks(uuids) const mapped = results.map((i) => { diff --git a/packages/models/src/Domain/Runtime/Collection/Item/TagItemsIndex.ts b/packages/models/src/Domain/Runtime/Collection/Item/TagItemsIndex.ts index 81bbabe9c..2662b493b 100644 --- a/packages/models/src/Domain/Runtime/Collection/Item/TagItemsIndex.ts +++ b/packages/models/src/Domain/Runtime/Collection/Item/TagItemsIndex.ts @@ -1,5 +1,5 @@ import { removeFromArray } from '@standardnotes/utils' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { isTag, SNTag } from '../../../Syncable/Tag/Tag' import { SNIndex } from '../../Index/SNIndex' import { ItemCollection } from './ItemCollection' @@ -7,12 +7,12 @@ import { ItemDelta } from '../../Index/ItemDelta' import { isDecryptedItem, ItemInterface } from '../../../Abstract/Item' type AllNotesUuidSignifier = undefined -export type TagItemCountChangeObserver = (tagUuid: Uuid | AllNotesUuidSignifier) => void +export type TagItemCountChangeObserver = (tagUuid: string | AllNotesUuidSignifier) => void export class TagItemsIndex implements SNIndex { - private tagToItemsMap: Partial>> = {} - private allCountableItems = new Set() - private countableItemsByType = new Map>() + private tagToItemsMap: Partial>> = {} + private allCountableItems = new Set() + private countableItemsByType = new Map>() constructor(private collection: ItemCollection, public observers: TagItemCountChangeObserver[] = []) {} @@ -32,7 +32,7 @@ export class TagItemsIndex implements SNIndex { } } - private notifyObservers(tagUuid: Uuid | undefined) { + private notifyObservers(tagUuid: string | undefined) { for (const observer of this.observers) { observer(tagUuid) } @@ -119,7 +119,7 @@ export class TagItemsIndex implements SNIndex { } } - private setForTag(uuid: Uuid): Set { + private setForTag(uuid: string): Set { let set = this.tagToItemsMap[uuid] if (!set) { set = new Set() diff --git a/packages/models/src/Domain/Runtime/Deltas/RemoteRetrieved.ts b/packages/models/src/Domain/Runtime/Deltas/RemoteRetrieved.ts index 571098a9c..273b15cfc 100644 --- a/packages/models/src/Domain/Runtime/Deltas/RemoteRetrieved.ts +++ b/packages/models/src/Domain/Runtime/Deltas/RemoteRetrieved.ts @@ -2,7 +2,7 @@ import { ImmutablePayloadCollection } from './../Collection/Payload/ImmutablePay import { ConflictDelta } from './Conflict' import { isErrorDecryptingPayload, isDecryptedPayload } from '../../Abstract/Payload/Interfaces/TypeCheck' import { FullyFormedPayloadInterface, PayloadEmitSource } from '../../Abstract/Payload' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { HistoryMap } from '../History' import { ServerSyncPushContextualPayload } from '../../Abstract/Contextual/ServerSyncPush' import { payloadByFinalizingSyncState } from './Utilities/ApplyDirtyState' @@ -18,7 +18,7 @@ export class DeltaRemoteRetrieved implements SyncDeltaInterface { readonly historyMap: HistoryMap, ) {} - private isUuidOfPayloadCurrentlySavingOrSaved(uuid: Uuid): boolean { + private isUuidOfPayloadCurrentlySavingOrSaved(uuid: string): boolean { return this.itemsSavedOrSaving.find((i) => i.uuid === uuid) != undefined } diff --git a/packages/models/src/Domain/Runtime/Display/Types.ts b/packages/models/src/Domain/Runtime/Display/Types.ts index feb607fc7..9727c4561 100644 --- a/packages/models/src/Domain/Runtime/Display/Types.ts +++ b/packages/models/src/Domain/Runtime/Display/Types.ts @@ -1,10 +1,9 @@ -import { Uuid } from '@standardnotes/common' import { DecryptedItemInterface } from '../../Abstract/Item' import { SortableItem } from '../Collection/CollectionSort' import { ItemCollection } from '../Collection/Item/ItemCollection' export type DisplayControllerCustomFilter = (element: DisplayItem) => boolean -export type UuidToSortedPositionMap = Record +export type UuidToSortedPositionMap = Record export type DisplayItem = SortableItem & DecryptedItemInterface export interface ReadonlyItemCollection { diff --git a/packages/models/src/Domain/Runtime/History/HistoryMap.ts b/packages/models/src/Domain/Runtime/History/HistoryMap.ts index 826415f80..dcfc808d1 100644 --- a/packages/models/src/Domain/Runtime/History/HistoryMap.ts +++ b/packages/models/src/Domain/Runtime/History/HistoryMap.ts @@ -1,7 +1,6 @@ -import { Uuid } from '@standardnotes/common' import { HistoryEntry } from './HistoryEntry' -export type HistoryMap = Record +export type HistoryMap = Record export const historyMapFunctions = { getNewestRevision: (history: HistoryEntry[]): HistoryEntry | undefined => { diff --git a/packages/models/src/Domain/Syncable/Component/Component.ts b/packages/models/src/Domain/Syncable/Component/Component.ts index 7383e2c55..509f28bc9 100644 --- a/packages/models/src/Domain/Syncable/Component/Component.ts +++ b/packages/models/src/Domain/Syncable/Component/Component.ts @@ -1,5 +1,5 @@ import { isValidUrl } from '@standardnotes/utils' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { FeatureIdentifier, ThirdPartyFeatureDescription, @@ -159,11 +159,11 @@ export class SNComponent extends DecryptedItem implements Comp return SNComponent.associativeAreas().includes(this.area) } - public isExplicitlyEnabledForItem(uuid: Uuid): boolean { + public isExplicitlyEnabledForItem(uuid: string): boolean { return this.associatedItemIds.indexOf(uuid) !== -1 } - public isExplicitlyDisabledForItem(uuid: Uuid): boolean { + public isExplicitlyDisabledForItem(uuid: string): boolean { return this.disassociatedItemIds.indexOf(uuid) !== -1 } diff --git a/packages/models/src/Domain/Syncable/Component/ComponentContent.ts b/packages/models/src/Domain/Syncable/Component/ComponentContent.ts index 9e6787e42..5d7ee4bba 100644 --- a/packages/models/src/Domain/Syncable/Component/ComponentContent.ts +++ b/packages/models/src/Domain/Syncable/Component/ComponentContent.ts @@ -1,5 +1,4 @@ import { ComponentArea, ComponentPermission } from '@standardnotes/features' -import { Uuid } from '@standardnotes/common' import { ItemContent } from '../../Abstract/Content/ItemContent' import { ComponentPackageInfo } from './PackageInfo' @@ -30,7 +29,7 @@ export interface ComponentInterface { legacy_url?: string isMobileDefault: boolean isDeprecated: boolean - isExplicitlyEnabledForItem(uuid: Uuid): boolean + isExplicitlyEnabledForItem(uuid: string): boolean } export type ComponentContent = ComponentInterface & ItemContent diff --git a/packages/models/src/Domain/Syncable/Component/ComponentMutator.ts b/packages/models/src/Domain/Syncable/Component/ComponentMutator.ts index 2a0e6f050..f4a5a34b6 100644 --- a/packages/models/src/Domain/Syncable/Component/ComponentMutator.ts +++ b/packages/models/src/Domain/Syncable/Component/ComponentMutator.ts @@ -1,5 +1,4 @@ import { addIfUnique, removeFromArray } from '@standardnotes/utils' -import { Uuid } from '@standardnotes/common' import { ComponentPermission, FeatureDescription } from '@standardnotes/features' import { AppDataField } from '../../Abstract/Item/Types/AppDataField' import { ComponentContent } from './ComponentContent' @@ -46,23 +45,23 @@ export class ComponentMutator extends DecryptedItemMutator { this.mutableContent.offlineOnly = offlineOnly } - public associateWithItem(uuid: Uuid): void { + public associateWithItem(uuid: string): void { const associated = this.mutableContent.associatedItemIds || [] addIfUnique(associated, uuid) this.mutableContent.associatedItemIds = associated } - public disassociateWithItem(uuid: Uuid): void { + public disassociateWithItem(uuid: string): void { const disassociated = this.mutableContent.disassociatedItemIds || [] addIfUnique(disassociated, uuid) this.mutableContent.disassociatedItemIds = disassociated } - public removeAssociatedItemId(uuid: Uuid): void { + public removeAssociatedItemId(uuid: string): void { removeFromArray(this.mutableContent.associatedItemIds || [], uuid) } - public removeDisassociatedItemId(uuid: Uuid): void { + public removeDisassociatedItemId(uuid: string): void { removeFromArray(this.mutableContent.disassociatedItemIds || [], uuid) } diff --git a/packages/models/src/Domain/Syncable/Tag/Tag.ts b/packages/models/src/Domain/Syncable/Tag/Tag.ts index 4c6c693a3..380280cbc 100644 --- a/packages/models/src/Domain/Syncable/Tag/Tag.ts +++ b/packages/models/src/Domain/Syncable/Tag/Tag.ts @@ -1,5 +1,5 @@ import { VectorIconNameOrEmoji, IconType } from './../../Utilities/Icon/IconType' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { DecryptedItem } from '../../Abstract/Item/Implementations/DecryptedItem' import { ItemInterface } from '../../Abstract/Item/Interfaces/ItemInterface' import { ContentReference } from '../../Abstract/Reference/ContentReference' @@ -41,7 +41,7 @@ export class SNTag extends DecryptedItem implements TagContentSpecia return this.noteReferences.length } - public get parentId(): Uuid | undefined { + public get parentId(): string | undefined { const reference = this.references.find(isTagToParentTagReference) return reference?.uuid } diff --git a/packages/models/src/Domain/Utilities/Item/FindItem.ts b/packages/models/src/Domain/Utilities/Item/FindItem.ts index 13092e2ca..6364eb768 100644 --- a/packages/models/src/Domain/Utilities/Item/FindItem.ts +++ b/packages/models/src/Domain/Utilities/Item/FindItem.ts @@ -1,10 +1,9 @@ -import { Uuid } from '@standardnotes/common' import { ItemInterface } from '../../Abstract/Item/Interfaces/ItemInterface' -export function FindItem(items: I[], uuid: Uuid): I | undefined { +export function FindItem(items: I[], uuid: string): I | undefined { return items.find((item) => item.uuid === uuid) } -export function SureFindItem(items: I[], uuid: Uuid): I { +export function SureFindItem(items: I[], uuid: string): I { return FindItem(items, uuid) as I } diff --git a/packages/models/src/Domain/Utilities/Payload/FindPayload.ts b/packages/models/src/Domain/Utilities/Payload/FindPayload.ts index edce5103f..025180138 100644 --- a/packages/models/src/Domain/Utilities/Payload/FindPayload.ts +++ b/packages/models/src/Domain/Utilities/Payload/FindPayload.ts @@ -1,10 +1,9 @@ -import { Uuid } from '@standardnotes/common' import { PayloadInterface } from '../../Abstract/Payload/Interfaces/PayloadInterface' -export function FindPayload

(payloads: P[], uuid: Uuid): P | undefined { +export function FindPayload

(payloads: P[], uuid: string): P | undefined { return payloads.find((payload) => payload.uuid === uuid) } -export function SureFindPayload

(payloads: P[], uuid: Uuid): P { +export function SureFindPayload

(payloads: P[], uuid: string): P { return FindPayload(payloads, uuid) as P } diff --git a/packages/models/src/Domain/Utilities/Payload/PayloadsByUpdatingReferencingPayloadReferences.ts b/packages/models/src/Domain/Utilities/Payload/PayloadsByUpdatingReferencingPayloadReferences.ts index 0c06d83d7..ca45fc34c 100644 --- a/packages/models/src/Domain/Utilities/Payload/PayloadsByUpdatingReferencingPayloadReferences.ts +++ b/packages/models/src/Domain/Utilities/Payload/PayloadsByUpdatingReferencingPayloadReferences.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { remove } from 'lodash' import { ImmutablePayloadCollection } from '../../Runtime/Collection/Payload/ImmutablePayloadCollection' import { ContentReference } from '../../Abstract/Reference/ContentReference' @@ -12,7 +11,7 @@ export function PayloadsByUpdatingReferencingPayloadReferences( payload: DecryptedPayloadInterface, baseCollection: ImmutablePayloadCollection, add: FullyFormedPayloadInterface[] = [], - removeIds: Uuid[] = [], + removeIds: string[] = [], ): SyncResolvedPayload[] { const referencingPayloads = baseCollection.elementsReferencingElement(payload).filter(isDecryptedPayload) diff --git a/packages/responses/package.json b/packages/responses/package.json index 3c441cbda..6b86b4cda 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -33,7 +33,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.45.0", + "@standardnotes/common": "^1.46.3", "@standardnotes/features": "workspace:*", "@standardnotes/security": "^1.7.0", "reflect-metadata": "^0.1.13" diff --git a/packages/responses/src/Domain/Http/ResponseMeta.ts b/packages/responses/src/Domain/Http/ResponseMeta.ts index 61edb11f4..e21278419 100644 --- a/packages/responses/src/Domain/Http/ResponseMeta.ts +++ b/packages/responses/src/Domain/Http/ResponseMeta.ts @@ -1,9 +1,8 @@ import { Role } from '@standardnotes/security' -import { Uuid } from '@standardnotes/common' export type ResponseMeta = { auth: { - userUuid?: Uuid + userUuid?: string roles?: Role[] } server: { diff --git a/packages/responses/src/Domain/Item/IntegrityPayload.ts b/packages/responses/src/Domain/Item/IntegrityPayload.ts index c7f173471..f22e0d3eb 100644 --- a/packages/responses/src/Domain/Item/IntegrityPayload.ts +++ b/packages/responses/src/Domain/Item/IntegrityPayload.ts @@ -1,6 +1,6 @@ -import { MicrosecondsTimestamp, Uuid } from '@standardnotes/common' +import { MicrosecondsTimestamp } from '@standardnotes/common' export type IntegrityPayload = { - uuid: Uuid + uuid: string updated_at_timestamp: MicrosecondsTimestamp } diff --git a/packages/responses/src/Domain/Item/ServerItemResponse.ts b/packages/responses/src/Domain/Item/ServerItemResponse.ts index 14ee3b7f1..7d6a27cdc 100644 --- a/packages/responses/src/Domain/Item/ServerItemResponse.ts +++ b/packages/responses/src/Domain/Item/ServerItemResponse.ts @@ -1,4 +1,4 @@ -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' export interface ServerItemResponse { content_type: ContentType @@ -6,7 +6,7 @@ export interface ServerItemResponse { created_at_timestamp: number created_at: Date deleted: boolean - duplicate_of?: Uuid + duplicate_of?: string enc_item_key: string items_key_id?: string updated_at_timestamp: number diff --git a/packages/services/package.json b/packages/services/package.json index 41c191f17..98c4e1e9e 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -18,8 +18,8 @@ "dependencies": { "@standardnotes/api": "workspace:^", "@standardnotes/auth": "^3.19.4", - "@standardnotes/common": "^1.45.0", - "@standardnotes/domain-core": "^1.11.0", + "@standardnotes/common": "^1.46.3", + "@standardnotes/domain-core": "^1.11.1", "@standardnotes/encryption": "workspace:^", "@standardnotes/files": "workspace:^", "@standardnotes/models": "workspace:^", diff --git a/packages/services/src/Domain/Api/ApiServiceInterface.ts b/packages/services/src/Domain/Api/ApiServiceInterface.ts index 598f61838..24c71ba01 100644 --- a/packages/services/src/Domain/Api/ApiServiceInterface.ts +++ b/packages/services/src/Domain/Api/ApiServiceInterface.ts @@ -1,4 +1,4 @@ -import { Either, Uuid } from '@standardnotes/common' +import { Either } from '@standardnotes/common' import { Role } from '@standardnotes/auth' import { FilesApiInterface } from '@standardnotes/files' import { Session } from '@standardnotes/domain-core' @@ -13,7 +13,7 @@ export enum ApiServiceEvent { } export type MetaReceivedData = { - userUuid: Uuid + userUuid: string userRoles: Role[] } diff --git a/packages/services/src/Domain/Backups/BackupService.ts b/packages/services/src/Domain/Backups/BackupService.ts index 16d113eef..2ab240e14 100644 --- a/packages/services/src/Domain/Backups/BackupService.ts +++ b/packages/services/src/Domain/Backups/BackupService.ts @@ -1,4 +1,4 @@ -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { EncryptionProviderInterface } from '@standardnotes/encryption' import { PayloadEmitSource, FileItem, CreateEncryptedBackupFileContextPayload } from '@standardnotes/models' import { ClientDisplayableError } from '@standardnotes/responses' @@ -20,7 +20,7 @@ import { log, LoggingDomain } from '../Logging' export class FilesBackupService extends AbstractService implements BackupServiceInterface { private itemsObserverDisposer: () => void - private pendingFiles = new Set() + private pendingFiles = new Set() private mappingCache?: FileBackupsMapping['files'] constructor( diff --git a/packages/services/src/Domain/Component/ComponentManagerInterface.ts b/packages/services/src/Domain/Component/ComponentManagerInterface.ts index e4332be4f..ad19279a8 100644 --- a/packages/services/src/Domain/Component/ComponentManagerInterface.ts +++ b/packages/services/src/Domain/Component/ComponentManagerInterface.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { ComponentArea, FeatureIdentifier } from '@standardnotes/features' import { ActionObserver, PermissionDialog, SNComponent, SNNote } from '@standardnotes/models' @@ -15,7 +14,7 @@ export interface ComponentManagerInterface { destroyComponentViewer(viewer: ComponentViewerInterface): void createComponentViewer( component: SNComponent, - contextItem?: Uuid, + contextItem?: string, actionObserver?: ActionObserver, urlOverride?: string, ): ComponentViewerInterface diff --git a/packages/services/src/Domain/Device/DatabaseLoadSorter.ts b/packages/services/src/Domain/Device/DatabaseLoadSorter.ts index 12a05fd63..6aa874680 100644 --- a/packages/services/src/Domain/Device/DatabaseLoadSorter.ts +++ b/packages/services/src/Domain/Device/DatabaseLoadSorter.ts @@ -1,6 +1,6 @@ import { DatabaseItemMetadata } from './DatabaseItemMetadata' import { DatabaseLoadOptions } from './DatabaseLoadOptions' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' /** * Sorts payloads according by most recently modified first, according to the priority, @@ -47,7 +47,7 @@ function SortPayloadsByRecentAndContentPriority( payloads: T[], - uuidPriorityList: Uuid[], + uuidPriorityList: string[], ): T[] { return payloads.sort((a, b) => { const dateResult = new Date(b.updated_at).getTime() - new Date(a.updated_at).getTime() diff --git a/packages/services/src/Domain/Feature/FeaturesClientInterface.ts b/packages/services/src/Domain/Feature/FeaturesClientInterface.ts index 39ddd8bdc..21db88300 100644 --- a/packages/services/src/Domain/Feature/FeaturesClientInterface.ts +++ b/packages/services/src/Domain/Feature/FeaturesClientInterface.ts @@ -1,6 +1,5 @@ import { FeatureDescription, FeatureIdentifier } from '@standardnotes/features' import { SNComponent } from '@standardnotes/models' -import { RoleName } from '@standardnotes/common' import { FeatureStatus } from './FeatureStatus' import { SetOfflineFeaturesFunctionResponse } from './SetOfflineFeaturesFunctionResponse' @@ -12,7 +11,7 @@ export interface FeaturesClientInterface { getFeatureStatus(featureId: FeatureIdentifier): FeatureStatus - hasMinimumRole(role: RoleName): boolean + hasMinimumRole(role: string): boolean setOfflineFeaturesCode(code: string): Promise diff --git a/packages/services/src/Domain/Item/ItemsClientInterface.ts b/packages/services/src/Domain/Item/ItemsClientInterface.ts index 39957b281..27e7d0ce0 100644 --- a/packages/services/src/Domain/Item/ItemsClientInterface.ts +++ b/packages/services/src/Domain/Item/ItemsClientInterface.ts @@ -1,6 +1,6 @@ /* istanbul ignore file */ -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { SNNote, FileItem, @@ -129,14 +129,14 @@ export interface ItemsClientInterface { /** * Finds an item by UUID. */ - findItem(uuid: Uuid): T | undefined + findItem(uuid: string): T | undefined /** * Finds an item by predicate. */ - findItems(uuids: Uuid[]): T[] + findItems(uuids: string[]): T[] - findSureItem(uuid: Uuid): T + findSureItem(uuid: string): T /** * Finds an item by predicate. diff --git a/packages/services/src/Domain/Item/ItemsServerInterface.ts b/packages/services/src/Domain/Item/ItemsServerInterface.ts index 973d69902..80b06cb37 100644 --- a/packages/services/src/Domain/Item/ItemsServerInterface.ts +++ b/packages/services/src/Domain/Item/ItemsServerInterface.ts @@ -1,6 +1,5 @@ -import { Uuid } from '@standardnotes/common' import { GetSingleItemResponse } from '@standardnotes/responses' export interface ItemsServerInterface { - getSingleItem(itemUuid: Uuid): Promise + getSingleItem(itemUuid: string): Promise } diff --git a/packages/services/src/Domain/Subscription/SubscriptionClientInterface.ts b/packages/services/src/Domain/Subscription/SubscriptionClientInterface.ts index de20c323c..05b1872c3 100644 --- a/packages/services/src/Domain/Subscription/SubscriptionClientInterface.ts +++ b/packages/services/src/Domain/Subscription/SubscriptionClientInterface.ts @@ -1,12 +1,11 @@ -import { Uuid } from '@standardnotes/common' import { Invitation } from '@standardnotes/models' import { AppleIAPReceipt } from './AppleIAPReceipt' export interface SubscriptionClientInterface { listSubscriptionInvitations(): Promise inviteToSubscription(inviteeEmail: string): Promise - cancelInvitation(inviteUuid: Uuid): Promise - acceptInvitation(inviteUuid: Uuid): Promise<{ success: true } | { success: false; message: string }> + cancelInvitation(inviteUuid: string): Promise + acceptInvitation(inviteUuid: string): Promise<{ success: true } | { success: false; message: string }> confirmAppleIAP( receipt: AppleIAPReceipt, subscriptionToken: string, diff --git a/packages/services/src/Domain/Subscription/SubscriptionManager.ts b/packages/services/src/Domain/Subscription/SubscriptionManager.ts index 0c08d213d..11d3dec01 100644 --- a/packages/services/src/Domain/Subscription/SubscriptionManager.ts +++ b/packages/services/src/Domain/Subscription/SubscriptionManager.ts @@ -3,7 +3,6 @@ import { SubscriptionApiServiceInterface } from '@standardnotes/api' import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface' import { AbstractService } from '../Service/AbstractService' import { SubscriptionClientInterface } from './SubscriptionClientInterface' -import { Uuid } from '@standardnotes/common' import { AppleIAPReceipt } from './AppleIAPReceipt' export class SubscriptionManager extends AbstractService implements SubscriptionClientInterface { @@ -48,7 +47,7 @@ export class SubscriptionManager extends AbstractService implements Subscription } } - async cancelInvitation(inviteUuid: Uuid): Promise { + async cancelInvitation(inviteUuid: string): Promise { try { const result = await this.subscriptionApiService.cancelInvite(inviteUuid) diff --git a/packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts b/packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts index c74171161..40a2a4199 100644 --- a/packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts +++ b/packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts @@ -1,4 +1,4 @@ -import { Uuid, WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common' +import { WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common' import { Workspace, WorkspaceUser } from '@standardnotes/api' export interface WorkspaceClientInterface { @@ -11,20 +11,20 @@ export interface WorkspaceClientInterface { }): Promise<{ uuid: string } | null> inviteToWorkspace(dto: { inviteeEmail: string - workspaceUuid: Uuid + workspaceUuid: string accessLevel: WorkspaceAccessLevel }): Promise<{ uuid: string } | null> acceptInvite(dto: { - inviteUuid: Uuid - userUuid: Uuid + inviteUuid: string + userUuid: string publicKey: string encryptedPrivateKey: string }): Promise<{ success: boolean }> listWorkspaces(): Promise<{ ownedWorkspaces: Array; joinedWorkspaces: Array }> - listWorkspaceUsers(dto: { workspaceUuid: Uuid }): Promise<{ users: Array }> + listWorkspaceUsers(dto: { workspaceUuid: string }): Promise<{ users: Array }> initiateKeyshare(dto: { - workspaceUuid: Uuid - userUuid: Uuid + workspaceUuid: string + userUuid: string encryptedWorkspaceKey: string }): Promise<{ success: boolean }> } diff --git a/packages/services/src/Domain/Workspace/WorkspaceManager.ts b/packages/services/src/Domain/Workspace/WorkspaceManager.ts index fca97be4a..8f363694d 100644 --- a/packages/services/src/Domain/Workspace/WorkspaceManager.ts +++ b/packages/services/src/Domain/Workspace/WorkspaceManager.ts @@ -1,5 +1,5 @@ import { WorkspaceApiServiceInterface, Workspace, WorkspaceUser } from '@standardnotes/api' -import { Uuid, WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common' +import { WorkspaceAccessLevel, WorkspaceType } from '@standardnotes/common' import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface' import { AbstractService } from '../Service/AbstractService' import { WorkspaceClientInterface } from './WorkspaceClientInterface' @@ -79,7 +79,7 @@ export class WorkspaceManager extends AbstractService implements WorkspaceClient async inviteToWorkspace(dto: { inviteeEmail: string - workspaceUuid: Uuid + workspaceUuid: string accessLevel: WorkspaceAccessLevel }): Promise<{ uuid: string } | null> { try { diff --git a/packages/snjs/lib/Services/Api/ApiService.ts b/packages/snjs/lib/Services/Api/ApiService.ts index 65fd1283f..60b60e9e0 100644 --- a/packages/snjs/lib/Services/Api/ApiService.ts +++ b/packages/snjs/lib/Services/Api/ApiService.ts @@ -1,7 +1,7 @@ import { FeatureDescription } from '@standardnotes/features' import { isNullOrUndefined, joinPaths } from '@standardnotes/utils' import { SettingName, SubscriptionSettingName } from '@standardnotes/settings' -import { Uuid, ErrorTag } from '@standardnotes/common' +import { ErrorTag } from '@standardnotes/common' import { AbstractService, ApiServiceInterface, @@ -852,7 +852,7 @@ export class SNApiService }) } - async getSingleItem(itemUuid: Uuid): Promise { + async getSingleItem(itemUuid: string): Promise { return await this.tokenRefreshableRequest({ verb: HttpVerb.Get, url: joinPaths(this.host, Paths.v1.getSingleItem(itemUuid)), diff --git a/packages/snjs/lib/Services/Api/Paths.ts b/packages/snjs/lib/Services/Api/Paths.ts index 07f273ac6..96a8fe3e8 100644 --- a/packages/snjs/lib/Services/Api/Paths.ts +++ b/packages/snjs/lib/Services/Api/Paths.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { SettingName, SubscriptionSettingName } from '@standardnotes/settings' const FilesPaths = { @@ -12,7 +11,7 @@ const FilesPaths = { const UserPaths = { changeCredentials: (userUuid: string) => `/v1/users/${userUuid}/attributes/credentials`, - deleteAccount: (userUuid: Uuid) => `/v1/users/${userUuid}`, + deleteAccount: (userUuid: string) => `/v1/users/${userUuid}`, keyParams: '/v1/login-params', refreshSession: '/v1/sessions/refresh', register: '/v1/users', @@ -24,23 +23,23 @@ const UserPaths = { const ItemsPaths = { checkIntegrity: '/v1/items/check-integrity', - getSingleItem: (uuid: Uuid) => `/v1/items/${uuid}`, + getSingleItem: (uuid: string) => `/v1/items/${uuid}`, itemRevisions: (itemUuid: string) => `/v1/items/${itemUuid}/revisions`, itemRevision: (itemUuid: string, revisionUuid: string) => `/v1/items/${itemUuid}/revisions/${revisionUuid}`, sync: '/v1/items', } const SettingsPaths = { - settings: (userUuid: Uuid) => `/v1/users/${userUuid}/settings`, - setting: (userUuid: Uuid, settingName: SettingName) => `/v1/users/${userUuid}/settings/${settingName}`, - subscriptionSetting: (userUuid: Uuid, settingName: SubscriptionSettingName) => + settings: (userUuid: string) => `/v1/users/${userUuid}/settings`, + setting: (userUuid: string, settingName: SettingName) => `/v1/users/${userUuid}/settings/${settingName}`, + subscriptionSetting: (userUuid: string, settingName: SubscriptionSettingName) => `/v1/users/${userUuid}/subscription-settings/${settingName}`, } const SubscriptionPaths = { offlineFeatures: '/v1/offline/features', purchase: '/v1/purchase', - subscription: (userUuid: Uuid) => `/v1/users/${userUuid}/subscription`, + subscription: (userUuid: string) => `/v1/users/${userUuid}/subscription`, subscriptionTokens: '/v1/subscription-tokens', userFeatures: (userUuid: string) => `/v1/users/${userUuid}/features`, } @@ -55,7 +54,7 @@ const UserPathsV2 = { } const ListedPaths = { - listedRegistration: (userUuid: Uuid) => `/v1/users/${userUuid}/integrations/listed`, + listedRegistration: (userUuid: string) => `/v1/users/${userUuid}/integrations/listed`, } export const Paths = { diff --git a/packages/snjs/lib/Services/Features/FeaturesService.spec.ts b/packages/snjs/lib/Services/Features/FeaturesService.spec.ts index e6beb7495..8f6f7e788 100644 --- a/packages/snjs/lib/Services/Features/FeaturesService.spec.ts +++ b/packages/snjs/lib/Services/Features/FeaturesService.spec.ts @@ -2,7 +2,8 @@ import { ItemInterface, SNComponent, SNFeatureRepo } from '@standardnotes/models import { SNSyncService } from '../Sync/SyncService' import { SettingName } from '@standardnotes/settings' import { SNFeaturesService } from '@Lib/Services/Features' -import { ContentType, RoleName } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' +import { RoleName } from '@standardnotes/domain-core' import { FeatureDescription, FeatureIdentifier, GetFeatures } from '@standardnotes/features' import { SNWebSocketsService } from '../Api/WebsocketsService' import { SNSettingsService } from '../Settings' @@ -31,7 +32,7 @@ describe('featuresService', () => { let alertService: AlertService let sessionManager: SNSessionManager let crypto: PureCryptoInterface - let roles: RoleName[] + let roles: string[] let features: FeatureDescription[] let items: ItemInterface[] let now: Date @@ -57,7 +58,7 @@ describe('featuresService', () => { } beforeEach(() => { - roles = [RoleName.CoreUser, RoleName.PlusUser] + roles = [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser] now = new Date() tomorrow_client = now.setDate(now.getDate() + 1) @@ -161,7 +162,7 @@ describe('featuresService', () => { }, }) - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] storageService.getValue = jest.fn().mockReturnValue(roles) @@ -180,7 +181,7 @@ describe('featuresService', () => { }, }) - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] storageService.getValue = jest.fn().mockReturnValue(roles) @@ -211,7 +212,7 @@ describe('featuresService', () => { const mock = (featuresService['notifyEvent'] = jest.fn()) - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] await featuresService.setRoles(newRoles) expect(mock.mock.calls[0][0]).toEqual(FeaturesEvent.UserRolesChanged) @@ -224,7 +225,7 @@ describe('featuresService', () => { const spy = jest.spyOn(featuresService, 'notifyEvent' as never) - const newRoles = [...roles, RoleName.ProUser] + const newRoles = [...roles, RoleName.NAMES.ProUser] await featuresService.updateRolesAndFetchFeatures('123', newRoles) expect(spy.mock.calls[2][0]).toEqual(FeaturesEvent.DidPurchaseSubscription) @@ -238,7 +239,7 @@ describe('featuresService', () => { const spy = jest.spyOn(featuresService, 'notifyEvent' as never) - const newRoles = [...roles, RoleName.ProUser] + const newRoles = [...roles, RoleName.NAMES.ProUser] await featuresService.updateRolesAndFetchFeatures('123', newRoles) const triggeredEvents = spy.mock.calls.map((call) => call[0]) @@ -246,7 +247,7 @@ describe('featuresService', () => { }) it('saves new roles to storage and fetches features if a role has been added', async () => { - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() @@ -257,7 +258,7 @@ describe('featuresService', () => { }) it('saves new roles to storage and fetches features if a role has been removed', async () => { - const newRoles = [RoleName.CoreUser] + const newRoles = [RoleName.NAMES.CoreUser] storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() @@ -268,7 +269,7 @@ describe('featuresService', () => { }) it('saves features to storage when roles change', async () => { - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() @@ -278,7 +279,7 @@ describe('featuresService', () => { }) it('creates items for non-expired features with content type if they do not exist', async () => { - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() @@ -321,7 +322,7 @@ describe('featuresService', () => { }, } as never) - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] storageService.getValue = jest.fn().mockReturnValue(roles) itemManager.getItems = jest.fn().mockReturnValue([existingItem]) @@ -333,7 +334,7 @@ describe('featuresService', () => { }) it('creates items for expired components if they do not exist', async () => { - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] const now = new Date() const yesterday_client = now.setDate(now.getDate() - 1) @@ -379,7 +380,7 @@ describe('featuresService', () => { }, } as never) - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] const now = new Date() const yesterday = now.setDate(now.getDate() - 1) @@ -418,7 +419,7 @@ describe('featuresService', () => { }, }) - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() @@ -441,7 +442,7 @@ describe('featuresService', () => { }, }) - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() @@ -468,7 +469,7 @@ describe('featuresService', () => { expires_at: tomorrow_server, } as FeatureDescription - const newRoles = [...roles, RoleName.PlusUser] + const newRoles = [...roles, RoleName.NAMES.PlusUser] storageService.getValue = jest.fn().mockReturnValue(roles) apiService.getUserFeatures = jest.fn().mockReturnValue({ @@ -516,13 +517,13 @@ describe('featuresService', () => { identifier: FeatureIdentifier.MidnightTheme, content_type: ContentType.Theme, expires_at: tomorrow_server, - role_name: RoleName.PlusUser, + role_name: RoleName.NAMES.PlusUser, }, { identifier: FeatureIdentifier.PlusEditor, content_type: ContentType.Component, expires_at: expiredDate, - role_name: RoleName.ProUser, + role_name: RoleName.NAMES.ProUser, }, ] as jest.Mocked @@ -534,13 +535,13 @@ describe('featuresService', () => { sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser, RoleName.PlusUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.Entitled) expect(featuresService.getFeatureStatus(FeatureIdentifier.PlusEditor)).toBe(FeatureStatus.NotInCurrentPlan) expect(featuresService.getFeatureStatus(FeatureIdentifier.SheetsEditor)).toBe(FeatureStatus.NotInCurrentPlan) - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.NoUserSubscription) expect(featuresService.getFeatureStatus(FeatureIdentifier.PlusEditor)).toBe(FeatureStatus.NoUserSubscription) @@ -551,13 +552,13 @@ describe('featuresService', () => { identifier: FeatureIdentifier.MidnightTheme, content_type: ContentType.Theme, expires_at: expiredDate, - role_name: RoleName.PlusUser, + role_name: RoleName.NAMES.PlusUser, }, { identifier: FeatureIdentifier.PlusEditor, content_type: ContentType.Component, expires_at: expiredDate, - role_name: RoleName.ProUser, + role_name: RoleName.NAMES.ProUser, }, ] as jest.Mocked @@ -567,7 +568,7 @@ describe('featuresService', () => { }, }) - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.PlusUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.PlusUser]) expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe( FeatureStatus.InCurrentPlanButExpired, @@ -579,7 +580,7 @@ describe('featuresService', () => { it('availableInRoles-based features', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.ProUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.ProUser]) expect(featuresService.getFeatureStatus(FeatureIdentifier.SuperEditor)).toBe(FeatureStatus.Entitled) }) @@ -591,14 +592,14 @@ describe('featuresService', () => { identifier: 'third-party-theme' as FeatureIdentifier, content_type: ContentType.Theme, expires_at: tomorrow_server, - role_name: RoleName.CoreUser, + role_name: RoleName.NAMES.CoreUser, } const editorFeature = { identifier: 'third-party-editor' as FeatureIdentifier, content_type: ContentType.Component, expires_at: expiredDate, - role_name: RoleName.PlusUser, + role_name: RoleName.NAMES.PlusUser, } features = [themeFeature, editorFeature] as jest.Mocked @@ -628,7 +629,7 @@ describe('featuresService', () => { } as never), ]) - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) expect(featuresService.getFeatureStatus(themeFeature.identifier)).toBe(FeatureStatus.Entitled) expect(featuresService.getFeatureStatus(editorFeature.identifier)).toBe(FeatureStatus.InCurrentPlanButExpired) @@ -640,7 +641,7 @@ describe('featuresService', () => { it('feature status should be not entitled if no account or offline repo', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(false) @@ -661,7 +662,7 @@ describe('featuresService', () => { }, }) - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser, RoleName.PlusUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) @@ -689,7 +690,7 @@ describe('featuresService', () => { it('feature status should be dynamic for subscriber if cached features and no successful features request made yet', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser, RoleName.PlusUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) featuresService['completedSuccessfulFeaturesRetrieval'] = false @@ -707,7 +708,7 @@ describe('featuresService', () => { it('feature status for offline subscription', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser, RoleName.PlusUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(false) featuresService.rolesIncludePaidSubscription = jest.fn().mockReturnValue(false) @@ -733,7 +734,7 @@ describe('featuresService', () => { FeatureStatus.NoUserSubscription, ) - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser, RoleName.PlusUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) expect(featuresService.getFeatureStatus(FeatureIdentifier.DeprecatedFileSafe as FeatureIdentifier)).toBe( FeatureStatus.Entitled, @@ -743,12 +744,12 @@ describe('featuresService', () => { it('has paid subscription', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) expect(featuresService.hasPaidOnlineOrOfflineSubscription()).toBeFalsy - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser, RoleName.PlusUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) expect(featuresService.hasPaidOnlineOrOfflineSubscription()).toEqual(true) }) @@ -756,7 +757,7 @@ describe('featuresService', () => { it('has paid subscription should be true if offline repo and signed into third party server', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) featuresService.hasOfflineRepo = jest.fn().mockReturnValue(true) sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(false) @@ -828,9 +829,9 @@ describe('featuresService', () => { it('should sort given roles according to role hierarchy', () => { const featuresService = createService() - const sortedRoles = featuresService.rolesBySorting([RoleName.ProUser, RoleName.CoreUser, RoleName.PlusUser]) + const sortedRoles = featuresService.rolesBySorting([RoleName.NAMES.ProUser, RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) - expect(sortedRoles).toStrictEqual([RoleName.CoreUser, RoleName.PlusUser, RoleName.ProUser]) + expect(sortedRoles).toStrictEqual([RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser]) }) }) @@ -838,9 +839,9 @@ describe('featuresService', () => { it('should be false if core user checks for plus role', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.CoreUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) - const hasPlusUserRole = featuresService.hasMinimumRole(RoleName.PlusUser) + const hasPlusUserRole = featuresService.hasMinimumRole(RoleName.NAMES.PlusUser) expect(hasPlusUserRole).toBe(false) }) @@ -848,9 +849,9 @@ describe('featuresService', () => { it('should be false if plus user checks for pro role', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.PlusUser, RoleName.CoreUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.PlusUser, RoleName.NAMES.CoreUser]) - const hasProUserRole = featuresService.hasMinimumRole(RoleName.ProUser) + const hasProUserRole = featuresService.hasMinimumRole(RoleName.NAMES.ProUser) expect(hasProUserRole).toBe(false) }) @@ -858,9 +859,9 @@ describe('featuresService', () => { it('should be true if pro user checks for core user', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.ProUser, RoleName.PlusUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.ProUser, RoleName.NAMES.PlusUser]) - const hasCoreUserRole = featuresService.hasMinimumRole(RoleName.CoreUser) + const hasCoreUserRole = featuresService.hasMinimumRole(RoleName.NAMES.CoreUser) expect(hasCoreUserRole).toBe(true) }) @@ -868,9 +869,9 @@ describe('featuresService', () => { it('should be true if pro user checks for pro user', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.ProUser, RoleName.PlusUser]) + await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.ProUser, RoleName.NAMES.PlusUser]) - const hasProUserRole = featuresService.hasMinimumRole(RoleName.ProUser) + const hasProUserRole = featuresService.hasMinimumRole(RoleName.NAMES.ProUser) expect(hasProUserRole).toBe(true) }) diff --git a/packages/snjs/lib/Services/Features/FeaturesService.ts b/packages/snjs/lib/Services/Features/FeaturesService.ts index c5dfbb6c5..dc57038bf 100644 --- a/packages/snjs/lib/Services/Features/FeaturesService.ts +++ b/packages/snjs/lib/Services/Features/FeaturesService.ts @@ -8,7 +8,8 @@ import { isString, } from '@standardnotes/utils' import { ClientDisplayableError, UserFeaturesResponse } from '@standardnotes/responses' -import { ContentType, RoleName } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' +import { RoleName } from '@standardnotes/domain-core' import { FillItemContent, PayloadEmitSource } from '@standardnotes/models' import { ItemManager } from '../Items/ItemManager' import { LEGACY_PROD_EXT_ORIGIN, PROD_OFFLINE_FEATURES_URL } from '../../Hosts' @@ -57,7 +58,7 @@ export class SNFeaturesService implements FeaturesClientInterface, InternalEventHandlerInterface { private deinited = false - private roles: RoleName[] = [] + private roles: string[] = [] private features: FeaturesImports.FeatureDescription[] = [] private enabledExperimentalFeatures: FeaturesImports.FeatureIdentifier[] = [] private removeWebSocketsServiceObserver: () => void @@ -363,14 +364,14 @@ export class SNFeaturesService } public initializeFromDisk(): void { - this.roles = this.storageService.getValue(StorageKey.UserRoles, undefined, []) + this.roles = this.storageService.getValue(StorageKey.UserRoles, undefined, []) this.features = this.storageService.getValue(StorageKey.UserFeatures, undefined, []) this.enabledExperimentalFeatures = this.storageService.getValue(StorageKey.ExperimentalFeatures, undefined, []) } - public async updateRolesAndFetchFeatures(userUuid: UuidString, roles: RoleName[]): Promise { + public async updateRolesAndFetchFeatures(userUuid: UuidString, roles: string[]): Promise { const previousRoles = this.roles const userRolesChanged = this.haveRolesChanged(roles) @@ -403,7 +404,7 @@ export class SNFeaturesService } } - async setRoles(roles: RoleName[]): Promise { + async setRoles(roles: string[]): Promise { const rolesChanged = !arraysEqual(this.roles, roles) this.roles = roles @@ -469,7 +470,7 @@ export class SNFeaturesService } rolesIncludePaidSubscription(): boolean { - const unpaidRoles = [RoleName.CoreUser] + const unpaidRoles = [RoleName.NAMES.CoreUser] return this.roles.some((role) => !unpaidRoles.includes(role)) } @@ -477,16 +478,16 @@ export class SNFeaturesService return this.rolesIncludePaidSubscription() || this.hasOfflineRepo() } - public rolesBySorting(roles: RoleName[]): RoleName[] { - return Object.values(RoleName).filter((role) => roles.includes(role)) + public rolesBySorting(roles: string[]): string[] { + return Object.values(RoleName.NAMES).filter((role) => roles.includes(role)) } - public hasMinimumRole(role: RoleName): boolean { - const sortedAllRoles = Object.values(RoleName) + public hasMinimumRole(role: string): boolean { + const sortedAllRoles = Object.values(RoleName.NAMES) const sortedUserRoles = this.rolesBySorting(this.roles) - const highestUserRoleIndex = sortedAllRoles.indexOf(lastElement(sortedUserRoles) as RoleName) + const highestUserRoleIndex = sortedAllRoles.indexOf(lastElement(sortedUserRoles) as string) const indexOfRoleToCheck = sortedAllRoles.indexOf(role) @@ -556,7 +557,7 @@ export class SNFeaturesService const expired = feature.expires_at && new Date(feature.expires_at).getTime() < new Date().getTime() if (expired) { - if (!this.roles.includes(feature.role_name as RoleName)) { + if (!this.roles.includes(feature.role_name as string)) { return FeatureStatus.NotInCurrentPlan } else { return FeatureStatus.InCurrentPlanButExpired @@ -566,7 +567,7 @@ export class SNFeaturesService return FeatureStatus.Entitled } - private haveRolesChanged(roles: RoleName[]): boolean { + private haveRolesChanged(roles: string[]): boolean { return roles.some((role) => !this.roles.includes(role)) || this.roles.some((role) => !roles.includes(role)) } diff --git a/packages/snjs/lib/Services/Items/ItemManager.ts b/packages/snjs/lib/Services/Items/ItemManager.ts index b2592c9b3..eee33c739 100644 --- a/packages/snjs/lib/Services/Items/ItemManager.ts +++ b/packages/snjs/lib/Services/Items/ItemManager.ts @@ -1,4 +1,4 @@ -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { assert, naturalSort, removeFromArray, UuidGenerator, Uuids } from '@standardnotes/utils' import { ItemsKeyMutator, SNItemsKey } from '@standardnotes/encryption' import { PayloadManager } from '../Payloads/PayloadManager' @@ -240,7 +240,7 @@ export class ItemManager return this.collection.findAll(uuids) } - private findSystemSmartView(uuid: Uuid): Models.SmartView | undefined { + private findSystemSmartView(uuid: string): Models.SmartView | undefined { return this.systemSmartViews.find((view) => view.uuid === uuid) } diff --git a/packages/snjs/lib/Services/KeyRecovery/KeyRecoveryService.ts b/packages/snjs/lib/Services/KeyRecovery/KeyRecoveryService.ts index 2da7f193a..62cc56f01 100644 --- a/packages/snjs/lib/Services/KeyRecovery/KeyRecoveryService.ts +++ b/packages/snjs/lib/Services/KeyRecovery/KeyRecoveryService.ts @@ -15,7 +15,7 @@ import { DiskStorageService } from '../Storage/DiskStorageService' import { PayloadManager } from '../Payloads/PayloadManager' import { ChallengeService } from '../Challenge' import { SNApiService } from '@Lib/Services/Api/ApiService' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { ItemManager } from '../Items/ItemManager' import { removeFromArray, Uuids } from '@standardnotes/utils' import { ClientDisplayableError, KeyParamsResponse } from '@standardnotes/responses' @@ -240,7 +240,7 @@ export class SNKeyRecoveryService extends AbstractService boolean requestNewListedAccount: () => Promise getListedAccounts(): Promise - getListedAccountInfo(account: ListedAccount, inContextOfItem?: Uuid): Promise + getListedAccountInfo(account: ListedAccount, inContextOfItem?: string): Promise isNoteAuthorizedForListed(note: SNNote): boolean authorizeNoteForListed(note: SNNote): Promise } diff --git a/packages/snjs/lib/Services/Payloads/PayloadManager.ts b/packages/snjs/lib/Services/Payloads/PayloadManager.ts index d7b086cf0..6ab84667b 100644 --- a/packages/snjs/lib/Services/Payloads/PayloadManager.ts +++ b/packages/snjs/lib/Services/Payloads/PayloadManager.ts @@ -1,4 +1,4 @@ -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { PayloadsChangeObserver, QueueElement, PayloadsChangeObserverCallback, EmitQueue } from './Types' import { removeFromArray, Uuids } from '@standardnotes/utils' import { @@ -66,11 +66,11 @@ export class PayloadManager extends AbstractService implements PayloadManagerInt this.collection = new PayloadCollection() } - public find(uuids: Uuid[]): FullyFormedPayloadInterface[] { + public find(uuids: string[]): FullyFormedPayloadInterface[] { return this.collection.findAll(uuids) } - public findOne(uuid: Uuid): FullyFormedPayloadInterface | undefined { + public findOne(uuid: string): FullyFormedPayloadInterface | undefined { return this.collection.findAll([uuid])[0] } @@ -288,7 +288,7 @@ export class PayloadManager extends AbstractService implements PayloadManagerInt * and marks the items as dirty. * @returns Resulting items */ - public async importPayloads(payloads: DecryptedPayloadInterface[], historyMap: HistoryMap): Promise { + public async importPayloads(payloads: DecryptedPayloadInterface[], historyMap: HistoryMap): Promise { const sourcedPayloads = payloads.map((p) => p.copy(undefined, PayloadSource.FileImport)) const delta = new DeltaFileImport(this.getMasterCollection(), sourcedPayloads, historyMap) diff --git a/packages/snjs/lib/Services/Session/Sessions/Types.ts b/packages/snjs/lib/Services/Session/Sessions/Types.ts index ddcb4f447..6fea67bc5 100644 --- a/packages/snjs/lib/Services/Session/Sessions/Types.ts +++ b/packages/snjs/lib/Services/Session/Sessions/Types.ts @@ -1,5 +1,3 @@ -import { Uuid } from '@standardnotes/common' - export type RawJwtPayload = { jwt?: string } @@ -15,7 +13,7 @@ export type RawSessionPayload = { export type RawStorageValue = RawJwtPayload | RawSessionPayload export type RemoteSession = { - uuid: Uuid + uuid: string updated_at: Date device_info: string current: boolean diff --git a/packages/snjs/lib/Services/Storage/DiskStorageService.ts b/packages/snjs/lib/Services/Storage/DiskStorageService.ts index 4a01cb0d9..25bb88581 100644 --- a/packages/snjs/lib/Services/Storage/DiskStorageService.ts +++ b/packages/snjs/lib/Services/Storage/DiskStorageService.ts @@ -1,4 +1,4 @@ -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { Copy, extendArray, UuidGenerator } from '@standardnotes/utils' import { SNLog } from '../../Log' import { isErrorDecryptingParameters, SNRootKey } from '@standardnotes/encryption' @@ -448,7 +448,7 @@ export class DiskStorageService extends Services.AbstractService implements Serv await Promise.all(payloads.map((payload) => this.deletePayloadWithId(payload.uuid))) } - public async deletePayloadWithId(uuid: Uuid) { + public async deletePayloadWithId(uuid: string) { return this.executeCriticalFunction(async () => { return this.deviceInterface.removeDatabaseEntry(uuid, this.identifier) }) diff --git a/packages/snjs/lib/index.ts b/packages/snjs/lib/index.ts index d3821b4a6..92d8f264a 100644 --- a/packages/snjs/lib/index.ts +++ b/packages/snjs/lib/index.ts @@ -8,6 +8,7 @@ export * from './Services' export * from './Types' export * from './Version' export * from '@standardnotes/common' +export * from '@standardnotes/domain-core' export * from '@standardnotes/encryption' export * from '@standardnotes/features' export * from '@standardnotes/files' diff --git a/packages/snjs/package.json b/packages/snjs/package.json index f19e26232..1888c3382 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -36,7 +36,7 @@ "@babel/core": "*", "@babel/preset-env": "*", "@standardnotes/api": "workspace:*", - "@standardnotes/common": "^1.45.0", + "@standardnotes/common": "^1.46.3", "@standardnotes/domain-events": "^2.88.0", "@standardnotes/encryption": "workspace:*", "@standardnotes/features": "workspace:*", @@ -86,6 +86,6 @@ "webpack-merge": "^5.8.0" }, "dependencies": { - "@standardnotes/domain-core": "^1.11.0" + "@standardnotes/domain-core": "^1.11.1" } } diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index adb275484..e0d2f590c 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -15,7 +15,7 @@ "test": "jest spec" }, "dependencies": { - "@standardnotes/common": "^1.45.0", + "@standardnotes/common": "^1.46.3", "@standardnotes/features": "workspace:^", "@standardnotes/filepicker": "workspace:^", "@standardnotes/services": "workspace:^", diff --git a/packages/ui-services/src/Route/Params/SubscriptionInviteParams.ts b/packages/ui-services/src/Route/Params/SubscriptionInviteParams.ts index 979f70ea9..90052a5d6 100644 --- a/packages/ui-services/src/Route/Params/SubscriptionInviteParams.ts +++ b/packages/ui-services/src/Route/Params/SubscriptionInviteParams.ts @@ -1,5 +1,3 @@ -import { Uuid } from '@standardnotes/common' - export type SubscriptionInviteParams = { - inviteUuid: Uuid + inviteUuid: string } diff --git a/packages/ui-services/src/Route/RouteParser.ts b/packages/ui-services/src/Route/RouteParser.ts index cd753e43a..83cc4fb78 100644 --- a/packages/ui-services/src/Route/RouteParser.ts +++ b/packages/ui-services/src/Route/RouteParser.ts @@ -1,4 +1,4 @@ -import { UserRequestType, Uuid } from '@standardnotes/common' +import { UserRequestType } from '@standardnotes/common' import { PreferenceId } from './../Preferences/PreferenceId' import { DemoParams } from './Params/DemoParams' import { OnboardingParams } from './Params/OnboardingParams' @@ -41,7 +41,7 @@ export class RouteParser implements RouteParserInterface { this.checkForProperRouteType(RouteType.AcceptSubscriptionInvite) return { - inviteUuid: this.searchParams.get(RootQueryParam.AcceptSubscriptionInvite) as Uuid, + inviteUuid: this.searchParams.get(RootQueryParam.AcceptSubscriptionInvite) as string, } } diff --git a/packages/ui-services/src/Theme/ThemeManager.ts b/packages/ui-services/src/Theme/ThemeManager.ts index fa027e202..9f819127d 100644 --- a/packages/ui-services/src/Theme/ThemeManager.ts +++ b/packages/ui-services/src/Theme/ThemeManager.ts @@ -1,5 +1,5 @@ import { dismissToast, ToastType, addTimedToast } from '@standardnotes/toast' -import { ContentType, Uuid } from '@standardnotes/common' +import { ContentType } from '@standardnotes/common' import { CreateDecryptedLocalStorageContextPayload, LocalStorageDecryptedContextualPayload, @@ -23,7 +23,7 @@ const TimeBeforeApplyingColorScheme = 5 const DefaultThemeIdentifier = 'Default' export class ThemeManager extends AbstractService { - private activeThemes: Uuid[] = [] + private activeThemes: string[] = [] private unregisterDesktop?: () => void private unregisterStream!: () => void private lastUseDeviceThemeSettings = false diff --git a/packages/utils/package.json b/packages/utils/package.json index 0ea6d8c54..734649b14 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -25,7 +25,7 @@ "test": "jest spec" }, "dependencies": { - "@standardnotes/common": "^1.45.0", + "@standardnotes/common": "^1.46.3", "dompurify": "^2.4.1", "lodash": "^4.17.21", "reflect-metadata": "^0.1.13" diff --git a/packages/utils/src/Domain/Uuid/UuidMap.ts b/packages/utils/src/Domain/Uuid/UuidMap.ts index bcd58586e..917ae4eed 100644 --- a/packages/utils/src/Domain/Uuid/UuidMap.ts +++ b/packages/utils/src/Domain/Uuid/UuidMap.ts @@ -1,4 +1,3 @@ -import { Uuid } from '@standardnotes/common' import { addIfUnique, removeFromArray } from '../Utils/Utils' /** @@ -7,9 +6,9 @@ import { addIfUnique, removeFromArray } from '../Utils/Utils' */ export class UuidMap { /** uuid to uuids that we have a relationship with */ - private directMap: Partial> = {} + private directMap: Partial> = {} /** uuid to uuids that have a relationship with us */ - private inverseMap: Partial> = {} + private inverseMap: Partial> = {} public makeCopy(): UuidMap { const copy = new UuidMap() @@ -18,25 +17,25 @@ export class UuidMap { return copy } - public getDirectRelationships(uuid: Uuid): Uuid[] { + public getDirectRelationships(uuid: string): string[] { return this.directMap[uuid] || [] } - public getInverseRelationships(uuid: Uuid): Uuid[] { + public getInverseRelationships(uuid: string): string[] { return this.inverseMap[uuid] || [] } - public establishRelationship(uuidA: Uuid, uuidB: Uuid): void { + public establishRelationship(uuidA: string, uuidB: string): void { this.establishDirectRelationship(uuidA, uuidB) this.establishInverseRelationship(uuidA, uuidB) } - public deestablishRelationship(uuidA: Uuid, uuidB: Uuid): void { + public deestablishRelationship(uuidA: string, uuidB: string): void { this.deestablishDirectRelationship(uuidA, uuidB) this.deestablishInverseRelationship(uuidA, uuidB) } - public setAllRelationships(uuid: Uuid, relationships: Uuid[]): void { + public setAllRelationships(uuid: string, relationships: string[]): void { const previousDirect = this.directMap[uuid] || [] this.directMap[uuid] = relationships @@ -53,7 +52,7 @@ export class UuidMap { } } - public removeFromMap(uuid: Uuid): void { + public removeFromMap(uuid: string): void { /** Items that we reference */ const directReferences = this.directMap[uuid] || [] for (const directReference of directReferences) { @@ -69,25 +68,25 @@ export class UuidMap { delete this.inverseMap[uuid] } - private establishDirectRelationship(uuidA: Uuid, uuidB: Uuid): void { + private establishDirectRelationship(uuidA: string, uuidB: string): void { const index = this.directMap[uuidA] || [] addIfUnique(index, uuidB) this.directMap[uuidA] = index } - private establishInverseRelationship(uuidA: Uuid, uuidB: Uuid): void { + private establishInverseRelationship(uuidA: string, uuidB: string): void { const inverseIndex = this.inverseMap[uuidB] || [] addIfUnique(inverseIndex, uuidA) this.inverseMap[uuidB] = inverseIndex } - private deestablishDirectRelationship(uuidA: Uuid, uuidB: Uuid): void { + private deestablishDirectRelationship(uuidA: string, uuidB: string): void { const index = this.directMap[uuidA] || [] removeFromArray(index, uuidB) this.directMap[uuidA] = index } - private deestablishInverseRelationship(uuidA: Uuid, uuidB: Uuid): void { + private deestablishInverseRelationship(uuidA: string, uuidB: string): void { const inverseIndex = this.inverseMap[uuidB] || [] removeFromArray(inverseIndex, uuidA) this.inverseMap[uuidB] = inverseIndex diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/InvitationsList.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/InvitationsList.tsx index d10d8f6b5..36c906f8f 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/InvitationsList.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/SubscriptionSharing/InvitationsList.tsx @@ -1,6 +1,6 @@ import { useState } from 'react' import { observer } from 'mobx-react-lite' -import { InvitationStatus, Uuid } from '@standardnotes/snjs' +import { InvitationStatus } from '@standardnotes/snjs' import { SubtitleLight, Text } from '@/Components/Preferences/PreferencesComponents/Content' import { SubscriptionController } from '@/Controllers/Subscription/SubscriptionController' @@ -25,7 +25,7 @@ const InvitationsList = ({ subscriptionState, application }: Props) => { [InvitationStatus.Declined, InvitationStatus.Canceled].includes(invitation.status), ) - const handleCancel = async (invitationUuid: Uuid) => { + const handleCancel = async (invitationUuid: string) => { if (lockContinue) { application.alertService.alert('Cancelation already in progress.').catch(console.error) diff --git a/packages/web/src/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx b/packages/web/src/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx index 4b00a5bc2..7ce497bca 100644 --- a/packages/web/src/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx +++ b/packages/web/src/javascripts/Components/RevisionHistoryModal/RemoteHistoryList.tsx @@ -4,7 +4,7 @@ import Icon from '@/Components/Icon/Icon' import { useListKeyboardNavigation } from '@/Hooks/useListKeyboardNavigation' import HistoryListItem from './HistoryListItem' import { previewHistoryEntryTitle } from './utils' -import { FeaturesClientInterface, RevisionMetadata, RoleName } from '@standardnotes/snjs' +import { FeaturesClientInterface, RevisionMetadata } from '@standardnotes/snjs' import { NoteHistoryController } from '@/Controllers/NoteHistory/NoteHistoryController' import Spinner from '@/Components/Spinner/Spinner' import { PremiumFeatureIconClass, PremiumFeatureIconName } from '../Icon/PremiumFeatureIcon' @@ -54,7 +54,7 @@ const RemoteHistoryList: FunctionComponent = ({ >

{previewHistoryEntryTitle(entry)}
- {!features.hasMinimumRole(entry.required_role as RoleName) && ( + {!features.hasMinimumRole(entry.required_role) && ( )}
diff --git a/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts b/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts index ec3c6d3bb..4616ce862 100644 --- a/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts +++ b/packages/web/src/javascripts/Controllers/NoteHistory/NoteHistoryController.ts @@ -16,7 +16,6 @@ import { NoteHistoryEntry, PayloadEmitSource, RevisionMetadata, - RoleName, SNNote, } from '@standardnotes/snjs' import { makeObservable, observable, action } from 'mobx' @@ -120,7 +119,7 @@ export class NoteHistoryController { return } - if (!this.application.features.hasMinimumRole(entry.required_role as RoleName)) { + if (!this.application.features.hasMinimumRole(entry.required_role)) { this.setContentState(RevisionContentState.NotEntitled) this.setSelectedRevision(undefined) return diff --git a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts index dbd14b8d8..4c26f5fe1 100644 --- a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts +++ b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts @@ -7,7 +7,6 @@ import { Invitation, InvitationStatus, SubscriptionClientInterface, - Uuid, } from '@standardnotes/snjs' import { action, computed, makeObservable, observable, runInAction } from 'mobx' import { WebApplication } from '../../Application/Application' @@ -157,7 +156,7 @@ export class SubscriptionController extends AbstractViewController { return success } - async cancelSubscriptionInvitation(invitationUuid: Uuid): Promise { + async cancelSubscriptionInvitation(invitationUuid: string): Promise { const success = await this.subscriptionManager.cancelInvitation(invitationUuid) if (success) { diff --git a/yarn.lock b/yarn.lock index 5e758e9ce..47201be67 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4372,8 +4372,8 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/api@workspace:packages/api" dependencies: - "@standardnotes/common": ^1.45.0 - "@standardnotes/domain-core": ^1.11.0 + "@standardnotes/common": ^1.46.3 + "@standardnotes/domain-core": ^1.11.1 "@standardnotes/encryption": "workspace:*" "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" @@ -4494,7 +4494,7 @@ __metadata: languageName: node linkType: hard -"@standardnotes/common@npm:1.45.0, @standardnotes/common@npm:^1.45.0": +"@standardnotes/common@npm:1.45.0": version: 1.45.0 resolution: "@standardnotes/common@npm:1.45.0" dependencies: @@ -4512,6 +4512,15 @@ __metadata: languageName: node linkType: hard +"@standardnotes/common@npm:^1.46.3": + version: 1.46.3 + resolution: "@standardnotes/common@npm:1.46.3" + dependencies: + reflect-metadata: ^0.1.13 + checksum: 0fa509e30431a740ed142274c4f21ae03d74b6e05bcd4f028d89a3f1a6566de792bbd7c37b1b92587138dd6ea10459eead5a8cad2150f9f2268481615d390dee + languageName: node + linkType: hard + "@standardnotes/component-relay@github:standardnotes/component-relay#839ff5db9bc92db9d42cad8d202ddc4df729597d, @standardnotes/component-relay@standardnotes/component-relay#839ff5db9bc92db9d42cad8d202ddc4df729597d": version: 2.3.0 resolution: "@standardnotes/component-relay@https://github.com/standardnotes/component-relay.git#commit=839ff5db9bc92db9d42cad8d202ddc4df729597d" @@ -4586,14 +4595,14 @@ __metadata: languageName: unknown linkType: soft -"@standardnotes/domain-core@npm:^1.11.0": - version: 1.11.0 - resolution: "@standardnotes/domain-core@npm:1.11.0" +"@standardnotes/domain-core@npm:^1.11.1": + version: 1.11.1 + resolution: "@standardnotes/domain-core@npm:1.11.1" dependencies: reflect-metadata: ^0.1.13 shallow-equal-object: ^1.1.1 uuid: ^9.0.0 - checksum: cf4c9b7534338a8d5b8322a472621a2b2dde3cc3fe2d3c3c0eb12a3bdb7ba5f58bdfcc900338e5ba509311eeca6f163d95bffd46c40301532d974f397b57554e + checksum: 98af016a83bab8a60001bea9aa1c13607b2ecfff72bb901d709ac6b3d2c3d7f33e5e1289158c03d2a91ad5aa5afc586bfcc3efa3e0dda776ecddc10f3eb4eff9 languageName: node linkType: hard @@ -4641,7 +4650,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/encryption@workspace:packages/encryption" dependencies: - "@standardnotes/common": ^1.45.0 + "@standardnotes/common": ^1.46.3 "@standardnotes/config": 2.4.3 "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" @@ -4665,7 +4674,8 @@ __metadata: resolution: "@standardnotes/features@workspace:packages/features" dependencies: "@standardnotes/auth": ^3.19.4 - "@standardnotes/common": ^1.45.0 + "@standardnotes/common": ^1.46.3 + "@standardnotes/domain-core": ^1.11.1 "@standardnotes/security": ^1.7.0 "@types/jest": ^29.2.3 "@typescript-eslint/eslint-plugin": "*" @@ -4694,7 +4704,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/filepicker@workspace:packages/filepicker" dependencies: - "@standardnotes/common": ^1.45.0 + "@standardnotes/common": ^1.46.3 "@standardnotes/files": "workspace:*" "@standardnotes/utils": "workspace:*" "@types/jest": ^29.2.3 @@ -4714,7 +4724,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/files@workspace:packages/files" dependencies: - "@standardnotes/common": ^1.45.0 + "@standardnotes/common": ^1.46.3 "@standardnotes/encryption": "workspace:*" "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" @@ -4878,7 +4888,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/models@workspace:packages/models" dependencies: - "@standardnotes/common": ^1.45.0 + "@standardnotes/common": ^1.46.3 "@standardnotes/features": "workspace:*" "@standardnotes/responses": "workspace:*" "@standardnotes/utils": "workspace:*" @@ -4928,7 +4938,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/responses@workspace:packages/responses" dependencies: - "@standardnotes/common": ^1.45.0 + "@standardnotes/common": ^1.46.3 "@standardnotes/features": "workspace:*" "@standardnotes/security": ^1.7.0 "@types/jest": ^29.2.3 @@ -4979,8 +4989,8 @@ __metadata: dependencies: "@standardnotes/api": "workspace:^" "@standardnotes/auth": ^3.19.4 - "@standardnotes/common": ^1.45.0 - "@standardnotes/domain-core": ^1.11.0 + "@standardnotes/common": ^1.46.3 + "@standardnotes/domain-core": ^1.11.1 "@standardnotes/encryption": "workspace:^" "@standardnotes/files": "workspace:^" "@standardnotes/models": "workspace:^" @@ -5076,8 +5086,8 @@ __metadata: "@babel/core": "*" "@babel/preset-env": "*" "@standardnotes/api": "workspace:*" - "@standardnotes/common": ^1.45.0 - "@standardnotes/domain-core": ^1.11.0 + "@standardnotes/common": ^1.46.3 + "@standardnotes/domain-core": ^1.11.1 "@standardnotes/domain-events": ^2.88.0 "@standardnotes/encryption": "workspace:*" "@standardnotes/features": "workspace:*" @@ -5204,7 +5214,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/ui-services@workspace:packages/ui-services" dependencies: - "@standardnotes/common": ^1.45.0 + "@standardnotes/common": ^1.46.3 "@standardnotes/features": "workspace:^" "@standardnotes/filepicker": "workspace:^" "@standardnotes/services": "workspace:^" @@ -5226,7 +5236,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/utils@workspace:packages/utils" dependencies: - "@standardnotes/common": ^1.45.0 + "@standardnotes/common": ^1.46.3 "@types/dompurify": ^2.4.0 "@types/jest": ^29.2.3 "@types/jsdom": ^20.0.1 From 05c9fe1c1b0baf2628d96a82344bca6de099e130 Mon Sep 17 00:00:00 2001 From: StandardNotes CI Date: Thu, 19 Jan 2023 15:54:47 +0000 Subject: [PATCH 02/19] chore(release): publish - @standardnotes/api@1.24.1 - @standardnotes/desktop@3.104.94 - @standardnotes/encryption@1.21.1 - @standardnotes/features@1.58.1 - @standardnotes/filepicker@1.28.6 - @standardnotes/files@1.14.16 - @standardnotes/mobile@3.50.30 - @standardnotes/models@1.42.3 - @standardnotes/releases@1.4.117 - @standardnotes/responses@1.13.1 - @standardnotes/services@1.56.1 - @standardnotes/snjs@2.164.1 - @standardnotes/ui-services@1.24.5 - @standardnotes/utils@1.16.1 - @standardnotes/web@3.140.1 --- packages/api/CHANGELOG.md | 4 ++++ packages/api/package.json | 2 +- packages/desktop/CHANGELOG.md | 4 ++++ packages/desktop/package.json | 2 +- packages/encryption/CHANGELOG.md | 4 ++++ packages/encryption/package.json | 2 +- packages/features/CHANGELOG.md | 4 ++++ packages/features/package.json | 2 +- packages/filepicker/CHANGELOG.md | 4 ++++ packages/filepicker/package.json | 2 +- packages/files/CHANGELOG.md | 4 ++++ packages/files/package.json | 2 +- packages/mobile/CHANGELOG.md | 4 ++++ packages/mobile/package.json | 2 +- packages/models/CHANGELOG.md | 4 ++++ packages/models/package.json | 2 +- packages/releases/CHANGELOG.md | 4 ++++ packages/releases/package.json | 2 +- packages/responses/CHANGELOG.md | 4 ++++ packages/responses/package.json | 2 +- packages/services/CHANGELOG.md | 4 ++++ packages/services/package.json | 2 +- packages/snjs/CHANGELOG.md | 4 ++++ packages/snjs/package.json | 2 +- packages/ui-services/CHANGELOG.md | 4 ++++ packages/ui-services/package.json | 2 +- packages/utils/CHANGELOG.md | 4 ++++ packages/utils/package.json | 2 +- packages/web/CHANGELOG.md | 6 ++++++ packages/web/CHANGELOG.md.json | 14 ++++++++++++++ packages/web/package.json | 2 +- 31 files changed, 91 insertions(+), 15 deletions(-) diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index 2e5d149f5..fd36bef3c 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.1](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.0...@standardnotes/api@1.24.1) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/api + # [1.24.0](https://github.com/standardnotes/app/compare/@standardnotes/api@1.23.2...@standardnotes/api@1.24.0) (2023-01-18) ### Features diff --git a/packages/api/package.json b/packages/api/package.json index 51aabd492..e1c65a4d3 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/api", - "version": "1.24.0", + "version": "1.24.1", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index 801a226ba..8c002adda 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.104.94](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.0...@standardnotes/desktop@3.104.94) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/desktop + ## [3.104.93](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.139.0...@standardnotes/desktop@3.104.93) (2023-01-18) **Note:** Version bump only for package @standardnotes/desktop diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 31290f6a2..bd70a14df 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/desktop", "main": "./app/dist/index.js", - "version": "3.104.93", + "version": "3.104.94", "license": "AGPL-3.0-or-later", "author": "Standard Notes.", "private": true, diff --git a/packages/encryption/CHANGELOG.md b/packages/encryption/CHANGELOG.md index 75af0da05..546cda2b1 100644 --- a/packages/encryption/CHANGELOG.md +++ b/packages/encryption/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.21.1](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.0...@standardnotes/encryption@1.21.1) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/encryption + # [1.21.0](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.20.1...@standardnotes/encryption@1.21.0) (2023-01-18) ### Features diff --git a/packages/encryption/package.json b/packages/encryption/package.json index 242a0cb0f..94176e868 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/encryption", - "version": "1.21.0", + "version": "1.21.1", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/features/CHANGELOG.md b/packages/features/CHANGELOG.md index bdd879dfc..64b469b36 100644 --- a/packages/features/CHANGELOG.md +++ b/packages/features/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.58.1](https://github.com/standardnotes/app/compare/@standardnotes/features@1.58.0...@standardnotes/features@1.58.1) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/features + # [1.58.0](https://github.com/standardnotes/app/compare/@standardnotes/features@1.57.1...@standardnotes/features@1.58.0) (2023-01-06) ### Features diff --git a/packages/features/package.json b/packages/features/package.json index fb533e2f0..7dc44c66b 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/features", - "version": "1.58.0", + "version": "1.58.1", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/filepicker/CHANGELOG.md b/packages/filepicker/CHANGELOG.md index 225f93b24..89cb0427b 100644 --- a/packages/filepicker/CHANGELOG.md +++ b/packages/filepicker/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.28.6](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.5...@standardnotes/filepicker@1.28.6) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/filepicker + ## [1.28.5](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.4...@standardnotes/filepicker@1.28.5) (2023-01-18) **Note:** Version bump only for package @standardnotes/filepicker diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index 5d65e64f5..c4268863f 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/filepicker", - "version": "1.28.5", + "version": "1.28.6", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/files/CHANGELOG.md b/packages/files/CHANGELOG.md index 70287b8f4..bb4449dfa 100644 --- a/packages/files/CHANGELOG.md +++ b/packages/files/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.14.16](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.15...@standardnotes/files@1.14.16) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/files + ## [1.14.15](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.14...@standardnotes/files@1.14.15) (2023-01-18) **Note:** Version bump only for package @standardnotes/files diff --git a/packages/files/package.json b/packages/files/package.json index 4aa4ab17f..938f61130 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/files", - "version": "1.14.15", + "version": "1.14.16", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index 29e31c038..5b6a54028 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.50.30](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.29...@standardnotes/mobile@3.50.30) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/mobile + ## [3.50.29](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.28...@standardnotes/mobile@3.50.29) (2023-01-18) **Note:** Version bump only for package @standardnotes/mobile diff --git a/packages/mobile/package.json b/packages/mobile/package.json index ae87e2dde..2414ef675 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/mobile", - "version": "3.50.29", + "version": "3.50.30", "author": "Standard Notes.", "private": true, "license": "AGPL-3.0-or-later", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index b57a896a7..119b53cc1 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.3](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.2...@standardnotes/models@1.42.3) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/models + ## [1.42.2](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.1...@standardnotes/models@1.42.2) (2023-01-18) **Note:** Version bump only for package @standardnotes/models diff --git a/packages/models/package.json b/packages/models/package.json index 42b11a081..614a24e83 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/models", - "version": "1.42.2", + "version": "1.42.3", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md index f4219d914..bd5c0a92f 100644 --- a/packages/releases/CHANGELOG.md +++ b/packages/releases/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.117](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.116...@standardnotes/releases@1.4.117) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/releases + ## [1.4.116](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.115...@standardnotes/releases@1.4.116) (2023-01-18) **Note:** Version bump only for package @standardnotes/releases diff --git a/packages/releases/package.json b/packages/releases/package.json index 46594d011..967a7e2aa 100644 --- a/packages/releases/package.json +++ b/packages/releases/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/releases", - "version": "1.4.116", + "version": "1.4.117", "license": "AGPL-3.0-or-later", "main": "dist/releases.json", "types": "dist/index.d.ts", diff --git a/packages/responses/CHANGELOG.md b/packages/responses/CHANGELOG.md index a6efe38a4..943a71acb 100644 --- a/packages/responses/CHANGELOG.md +++ b/packages/responses/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.13.1](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.0...@standardnotes/responses@1.13.1) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/responses + # [1.13.0](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.12.13...@standardnotes/responses@1.13.0) (2023-01-18) ### Features diff --git a/packages/responses/package.json b/packages/responses/package.json index 6b86b4cda..ee7a1c771 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/responses", - "version": "1.13.0", + "version": "1.13.1", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md index 196c8feed..f802fe0c5 100644 --- a/packages/services/CHANGELOG.md +++ b/packages/services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.56.1](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.0...@standardnotes/services@1.56.1) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/services + # [1.56.0](https://github.com/standardnotes/app/compare/@standardnotes/services@1.55.2...@standardnotes/services@1.56.0) (2023-01-18) ### Bug Fixes diff --git a/packages/services/package.json b/packages/services/package.json index 98c4e1e9e..f97aefa98 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/services", - "version": "1.56.0", + "version": "1.56.1", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/snjs/CHANGELOG.md b/packages/snjs/CHANGELOG.md index 4fab31f90..f75e19f52 100644 --- a/packages/snjs/CHANGELOG.md +++ b/packages/snjs/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.164.1](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.0...@standardnotes/snjs@2.164.1) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/snjs + # [2.164.0](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.163.7...@standardnotes/snjs@2.164.0) (2023-01-18) ### Bug Fixes diff --git a/packages/snjs/package.json b/packages/snjs/package.json index 1888c3382..5e3946d92 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/snjs", - "version": "2.164.0", + "version": "2.164.1", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/ui-services/CHANGELOG.md b/packages/ui-services/CHANGELOG.md index 6f0ade2bb..02e6aa1f3 100644 --- a/packages/ui-services/CHANGELOG.md +++ b/packages/ui-services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.5](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.4...@standardnotes/ui-services@1.24.5) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/ui-services + ## [1.24.4](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.3...@standardnotes/ui-services@1.24.4) (2023-01-18) **Note:** Version bump only for package @standardnotes/ui-services diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index e0d2f590c..216024778 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/ui-services", - "version": "1.24.4", + "version": "1.24.5", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 2bf6d0ea2..02352c428 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.16.1](https://github.com/standardnotes/app/compare/@standardnotes/utils@1.16.0...@standardnotes/utils@1.16.1) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/utils + # [1.16.0](https://github.com/standardnotes/app/compare/@standardnotes/utils@1.15.2...@standardnotes/utils@1.16.0) (2023-01-12) ### Features diff --git a/packages/utils/package.json b/packages/utils/package.json index 734649b14..b25999268 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/utils", - "version": "1.16.0", + "version": "1.16.1", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index 0863aad7c..ee0a88d93 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.140.1](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.0...@standardnotes/web@3.140.1) (2023-01-19) + +### Bug Fixes + +* Fixed issue where using arrow keys while renaming file would navigate to another file ([2d63b74](https://github.com/standardnotes/app/commit/2d63b7431a1e6afcd9e6cf8b48c6c8e580221001)) + # [3.140.0](https://github.com/standardnotes/app/compare/@standardnotes/web@3.139.0...@standardnotes/web@3.140.0) (2023-01-18) ### Bug Fixes diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json index 480503471..051a45677 100644 --- a/packages/web/CHANGELOG.md.json +++ b/packages/web/CHANGELOG.md.json @@ -1,5 +1,19 @@ { "versions": [ + { + "version": "3.140.1", + "title": "[3.140.1](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.0...@standardnotes/web@3.140.1) (2023-01-19)", + "date": null, + "body": "### Bug Fixes\n\n* Fixed issue where using arrow keys while renaming file would navigate to another file ([2d63b74](https://github.com/standardnotes/app/commit/2d63b7431a1e6afcd9e6cf8b48c6c8e580221001))", + "parsed": { + "_": [ + "Fixed issue where using arrow keys while renaming file would navigate to another file (2d63b74)" + ], + "Bug Fixes": [ + "Fixed issue where using arrow keys while renaming file would navigate to another file (2d63b74)" + ] + } + }, { "version": "3.140.0", "title": "[3.140.0](https://github.com/standardnotes/app/compare/@standardnotes/web@3.139.0...@standardnotes/web@3.140.0) (2023-01-18)", diff --git a/packages/web/package.json b/packages/web/package.json index 73de8e1fa..f1538c84a 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/web", - "version": "3.140.0", + "version": "3.140.1", "license": "AGPL-3.0-or-later", "main": "dist/app.js", "author": "Standard Notes.", From 561d4da9bd64af3c0b5dae774d5354d2282fcfb8 Mon Sep 17 00:00:00 2001 From: moughxyz Date: Thu, 19 Jan 2023 17:05:10 -0600 Subject: [PATCH 03/19] chore: upgrade @standardnotes deps --- ...ommon-npm-1.45.0-1794cae3f1-3bf1dd805b.zip | Bin 43898 -> 0 bytes ...ents-npm-2.106.0-e3526437e9-db98a6b4ef.zip | Bin 0 -> 95867 bytes ...vents-npm-2.88.0-556633609b-8574ba4c7e.zip | Bin 115285 -> 0 bytes ...cates-npm-1.6.4-25be0ec067-6d7235896a.zip} | Bin 19090 -> 19044 bytes ...urity-npm-1.7.5-1479a77fe3-69d180d259.zip} | Bin 28354 -> 28199 bytes ...btoken-npm-9.0.0-36fd1594c0-b9181cecf9.zip | Bin 0 -> 16555 bytes packages/api/package.json | 2 +- packages/features/package.json | 3 +- packages/responses/package.json | 2 +- packages/services/package.json | 3 +- .../src/Domain/Api/ApiServiceInterface.ts | 2 +- packages/snjs/package.json | 4 +- yarn.lock | 75 ++++++++---------- 13 files changed, 42 insertions(+), 49 deletions(-) delete mode 100644 .yarn/cache/@standardnotes-common-npm-1.45.0-1794cae3f1-3bf1dd805b.zip create mode 100644 .yarn/cache/@standardnotes-domain-events-npm-2.106.0-e3526437e9-db98a6b4ef.zip delete mode 100644 .yarn/cache/@standardnotes-domain-events-npm-2.88.0-556633609b-8574ba4c7e.zip rename .yarn/cache/{@standardnotes-predicates-npm-1.6.0-2063cce139-020e2206c7.zip => @standardnotes-predicates-npm-1.6.4-25be0ec067-6d7235896a.zip} (90%) rename .yarn/cache/{@standardnotes-security-npm-1.7.0-6af9b8c3c4-c053af16e6.zip => @standardnotes-security-npm-1.7.5-1479a77fe3-69d180d259.zip} (80%) create mode 100644 .yarn/cache/jsonwebtoken-npm-9.0.0-36fd1594c0-b9181cecf9.zip diff --git a/.yarn/cache/@standardnotes-common-npm-1.45.0-1794cae3f1-3bf1dd805b.zip b/.yarn/cache/@standardnotes-common-npm-1.45.0-1794cae3f1-3bf1dd805b.zip deleted file mode 100644 index e71c9f8d2eba95b46f9678b7588d3578721d4c0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 43898 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

d`3cR4_&Y-< zZj0q|X~L6#MppgzH!IbTL~1KV;woRDpKqNR*JwXKm50uS+V1M8&#^EQ*WpQL0iFk{ zIg*Ce)lE|lS9s}vUZ}46rI=~GZdTV_2KZDjBv}(Jy~BV0y55T)<9Xk%dw|86BI`6G zKGfdPHS3!)$M!i{PYswBD9Mj~$ggkMxOUIsf0T_qm!%f9yPn8TQY z`c2-nia&rY;k@#)d;kO%v#PXb3a_Hz+``Ho(LokdN1d+YqVk?Pn)dlOO%T3KT?ST= zmypy_XB~TG1?R7t$)pIAI8d!{PO<*zQSgkvomRejd-J+hga6Zs<$&_Xr{AjnX2Gl6 zP8=~!Dn1k+-|uDXcL4E6txQBt&NkjB77jz6 z7nYWj+{aSN9@FkU^QJ$?vb}tLoDq|;8J(tasK%{>yongnu2`$_&d%ENyvcrBcWj&} z!$9EU<`z!)gt!qNLid?M;CR6V_-aB6Ko}bhCDM+_snx0lmNwmo{_g0@7mbEJn@|v7OMs> zo8K<`uKt`I-MOcScm#h-bGHFq1aAa_PL!r+I3tj&Gy60ek@6!S7uQRH+xXjagX5jH zIQ`5Ov~xMP>+alIf8jw)tCB$o?JySZU7SXD82 z6aUw_gpgkkt2U$ozOD7hQlrZVfD?_vK#&3}vm-bz^G5R3eq!$y(KHtX8ogpuRan2( zp<%ABZB$!<0=04xD!5U%1b@a(L=Zk>!7TjF!k&kB6hsR*``D(*Vtri-++SMQt!i7o zTMMT-`~>{x!vJLecPH|V%pINni;)7V{|1VqgW-RH#Q5Jt60)_{H~){3gRgu4KZ6n6 ze+*F4*j-NFLEri>gA`DILjE)KIyIb<^w;&DUW#9@|83^t?*=LUIu7w?-TmoX|5eui zgyy$#|Jxsewl+@2Hcm7ajs(t*#(0iS4(5hV1e{Q^1{TJKPBccwCgwKAat^k3#tu&I zWX5iGwhm5?RColsy2g&uf1ddupu+RSbJ4eQHs-){a&R`r^Cstn`sbGC`eV`y={xBw zx!W24*@pjEFJk{9@|Ri^j16rajQ$N}a++K3x{nbF+D+}Pp& zKk@(MjsKD-3g|l;|IHQu9diHUsU^-oCih=sphcuP(`(*5&aq%1@PbJb7eU3wP^x@7Wn>{_^Jm=7=Ea0qUm;?){fUD z$TWvCFz6c4i9#eW)w+2yLQckIdM&6a=6f84PRvTPnUUFxt_D+!Leh*yru?MeyYPQ(pSVp{V>nX*%(*r0QUzZ)p7Q z@#+7Val6=Fv$qBU0O0m$;`P@oYGb-hE zCC3+_xuZmai)(tKO@i2fpWf$QY;bH1t^KzLzv#!8X?^ekAV^F#rvcbIAzKb3LiOs?`jJJ-{8pX z)}}t#6u?a0_WT1tuUi+$#Kal~TC0@sU(_|qMvnQlH}WX8^mP~2`0{*g6I!v_DN~{I z3+=ICYELQiOXVtq-8?kX3#A{B4)@m0#W~GTu;22b9$HV5p2i;*-A~NLL*SFlqMA=c z&x<|AtL5Ox8>lTHv{6ny*HKn^!ztsfZm$^5j!hz>cyuj)7g3iz3WbZ9(D4=$Zc;sB zssm5jWqi{qz}DS=-YL$bY^0ubE@QZZ#Bn)>@~#075e`oOdDdh1Yl|krsad$sBn6QJ zF7|`De5-=pE$}(^M@*@y_mVlTR1^I-2wpWoj=hCSTOPoPqm2IK4S z@W=fqb8MIh4YqgA!g0`a4A=rARV~etCx*jlu-U@;)Y(jEM=%o9QIfk&O3^2c$M5+< zW--!Jr9Eirpkd}+^DvL~!Yorg1*;blJ0X*i5=!CQ5Qz*&QrjAh8$Ht!YDW6=JtPUR zpnJ{TOWJn%LgQ^6=<-3G0|LQ_4_=B1jlx?urKr(i4Jc?gG~>p34nPo&)OVIEO3UO?4=h&Q}e%RezR^T8|@%sYuhzjUHscK5qn}AJX zW``jllYwI*^#X3GER{WAq*~fv9_*W(upPaU6SLuMZ*UX|*Mk?&)ZAasUbne>3ieHc zPhT_5UKaTN^Stm!qr$<#*5U7>VzYvEmGY~58~ut5p+6WEe})zQ)4P(s=~wj(QmD1* zr9;@bMJ1JmB$#fM4}pWhK?to=MrF7LT?gajUPC0ix^xzw6+qUoeZ2VP>AGk*iH9M{ z&`1Soa>^=oE~ZCngX7pTTaEVVBbcX`2HPmo8I_h1q0T?^d7Jjgb~qEU?S!3oF*u@Q+d7 z!D&n=c;~^J;I#Tz118jUoWgq}&YX6fxCE9HYEMv}ue^c&V&nhlXPWJ=up7S&Ve{3Z z{lOmH+{Vb*?aKy*D)O>xbO=6&s#>={kV+{k){vEh^ytE@r^A6fQxO;@3*E%e#$EJK z@47C}3dm30#LSdec(O0sFE7q417`6s%0ZiZ%nswsTiSQA(gqCi4e<}@f~R>PfZN-* z4|;-m{8P{&NFTdm*Z2$l1R)X>94HfElyPr(3hr=3t~!A45FrDP5e9eZ6B!1D#3Bjp zIAf#VAcqJ=`pk<(vhsg&jg+c@TC}s_|3nK?=5X4cDd{C!e1IvJ%}Ba`ApnTqh#-A zk~XEcIyTf^mqHq9fRH%^j=^t*OwlX_KyCvR1bh{fL@%I=1weESbz^i;xbLa%$|HcL z>S&AG-ehEl*yvW3<3F?fG0!`G4jky!&^S#O`*YP*RGflJ3b^5zm0Y`$GX?kPUDn5= z6>3kY3bBSR<~Fl%@mCqluPtZA5Ci$Dyy1oJqQrmpAffbmg2fkjM}dS_{lRkTP0uiyo|DcM+M^IJW38 zphkXxMOQ3Rx6um2%BAs84K*~WiEG2M<=EQ#tl{pr^9+qy6ZG<6?H7t@js4(h>`Sc^ zzR0rXZoWiST!L&JO&@@@m|HzB9F6q~U#6A<$7a>4=^!3ach`OIMXL1;G>kKzC+cje zCwn%KY&ma;Mw>SSxa3v0lN^^noi; zT$HnWx`22%zudV?XmUAdhWm*;L{E|H1oL_7brJT>(*a zw~lJSe1W0v;tXnreVTzaYVZ4P$4AG^yee0TKxr1yKzLGOUeQuVhdZ*>k*YfhxA%6+ zY$yZ2$$>edY`?Qn)I=t37x9CIaR#-CTeA4NxKdDbx!B=jr-2sNeFCRcPJQmk(5|*b zrAKX`!%ymnJlE3=oeUVaerSZIxjPPiGN;S(5?U(N#98r$#>Hf*{3lz1OG=^Q@>qe| zCM&7gon?Kc_ z|8W-YAItnNbC7>yeg4XM(9zNVKP^4O|I^Yl{y!}})4xM{6oCKeN)F|P$sfM*Z|GNN z@&^gqzj-_D->zgG%uUU0{!HC|i60eTYti?$baLe#$Q2J}bE-N*;YdPK97d6lD~u@L z5j!Aig^k|&C3E(Jyb9U+<<55&hZK$5AKpkwk3ikmD;G*K%F~dZR24sna436J{t8;J z9p^>0*f7ir5O%&U@(IF^Kp-RB2!clUDpfKbyo*E;gEGJ#Ei1=Gq%T0sLYxj25pqkk zoW`67RV-ILM^n*M^C39sn4|S<+4J#xK0PAi$t{1n!#%mR->)#!*wU==wAQ zZ{bDK?bWx?|D28cgL?j3PLwt`bg*^&;!$mk9F@$ijlcfYl(pTz!%hBidgT3Ymg~Q6 z(fpaXkhQUL|943Gj|ql9NU!lFlr#5In)GGDu!Nds}9;DT2 zjwAEdnLPNMo~0(rSyxVB8Q{Gkz{rt8?UV%=+g2lCckk4 z2b~_8a`~(30xJT`HiSf7mOQ|$D}jmA%DgH4bb2c|a=!6U50Yz$$YxZG-N%5J$C$Ov zNoBoC0v6vzq0x-uj(&hHwR!;j^Y!Wik_>n3_2+)cvJrkuN>}!Pen# zz<+tbUrAr<82&%yAmK-j0Z~f!z=G58?>P~(a&^$eWDhM;@sUjs)#x-WO!cqX ztm9nT4ET~e8V$T`u&PiF-#B`aUxs17SFGB0t82BOz<)r{BWgSZPUzgz=rTj zS6L9}1xIty>6$8LqV4%O+$5V`qD@KGTTn{ty4*}?+0eTfi&A8c`1~*Q{|EORzqUP{ zYz=Myo=AJ~NJbv{ss*B7M4HSW3-td){_7)Dj2#@mHu1h(K1s#e_KQUO$kMfsAerEg z1v4uwP4vOaC~~%Lto11^V}S%Wf@Z1zc^7oEbx0&L0u309(C?nro_U$YITQ)vAIo)B z$WB+)v2`Tr=|A^lhuKte?yFi-k3Il@uK=M~VXo88iTDQTR+KJd3~0kNqHs)JGZd(9Pl_Qs z2VMUC-SJd^|6j6YWQ$6& zH(6;I*?SWrd+)un_Xrt@gf69w6v`%%am^?s%1&8DD%9_N)xDSZ=hpA@x%GYbc<1`# zp6BcJI%7kMb+{%omTG6Karl)_9V<=Bh<9t7){7xrCA#6AoW?s6&&g!fjFla7 zu$G=Z?ze^|C84@m118nZtQsWoH+2cy+{4w=DBRvi76&Tfq$c=%2| zRtm|PTbt!m9zz>pLrxV7L&bhQZ5*^X&SDOB>|`09Z|_#6E2vOjeKbDd_HeZ20!#iy zg6UUnXE(9}L_4FkuGZu=#n+XdIq}vt_VU}RXv<#p#IT5((2r8;ndM%$7E{F%_Rq?Z z4;Hruh^`ZkjEOHs%YW~*O_-Plt^|y(dmk&h`082zsD++A$Mwy8VUzd4UrhxyRkQv72lfEqp7#tln*{6GOi|DvaC>VzHLHs($&-J1eDV>M@Q4pZdl=D zYsm|ew$AIJKEx;8m5#lWbDkLb!gn%4IGNrj|ELsa!sWsYe6l`ErkB1R=2ff{ z!>;r4biZ!;jJr3rQz(9;dm0!l3Bas%4!uFMvpT^3Q#Eyj9a4EFNh-BSkVY(Taz>tU zRJ1)qcX~J_R9!_Ls=(xMC8oHz*3wIa&GuWZKVOB}^_O%FPoe&&MX}}-DsygeiPxFG z(>wgB^P=RZ=;=nROGmhUA7YIQ&L4547W}{*&nJI)h3YhRIJ?3K$s>-EHr6j8F1TSj zhsPie^%ygCf>F7W^|VTO^#gcuLUc^c@8vV+!))vC<2K^@&Ttj207T<_V~zzf?g$@NX0TVj=QB(+3-zE<8Oo5gm*BOkXNGRa&Iepfqw zi#(cBC_#&Ca}(#+Yl;MVM%3~&b2oRhb%9X^KnqL!&}iISpjBsJZZr7{t?!1CvUP9( zHmI_0mad+bPUf%xryzyj9$0Q7ytiY|U7?ps@tRlf&!fE`K_!-^8OnX*8K;z+YD$so z*2KF<$8OTK6N%Jqd=~X#)snzV?vO5ORa#A8;ZZDZf5W+X=wuZ^kX@G=*X*-uCy?$1b(_$j>Vis`dGBm=?6U;ZT?@#ae`X z>Nz1LLuFb;q0+-A(=Vmdk$DB%j^nB%>&2@@(5DdghvTihFFSkRtkpiNVf(7P_Q0L} zVbJvE!9ZOn7U$c|-cVl)@nYFeGSBjR2gR8$49%?KEp!glo~1iGO}%#@IEydgcLLUR z0|o+`yXf79<=y?u&w&w`)C?@-0BhheF-JPoDSgabcQP#L4#D{Ii z18E)j9*ezV3X}?HgeH@czhvpqq<<%3H&9s6<2OL>H@TKKKY*+1N_1X_;^?`o!yQ7h z2ih!a&P^&`jnxbY%hD<}Z>drf{v77ZI%bYn)mlpNlF~uB?ZrrQPT)l;>%*p%lwqb^ zyh?dB@3YFN?5er=2%weOjq;0bgFQZ9#2VB6z6ab{`}T&9Zv6Ght;aVK#n-fNiyJxF z8JDSlx8PH4r5|AZwfmzPx9YfCf=>YQ5BT#I0Ug2tbciB)Zokti>_1JId%Ju545&OW z^AiH+01+EovB$MAD@EzXJSb#5$k>JIr65c~)v4)K-(MZ5(GHl}AYSr6jT0_0ZZjEs z_^8@os-8Yw9P6^dnjqeL!#Q?~rZ~)&W}R}$oMyZWBhq6SU!wVxTF*v(5y};x;xxSJ`sb1w|7G`sNDw4Z}z!A6MIT9Qi)|9Ds`cEf6*vyFAAS3grE){vX~yeBpwO(Q^H@r<=@gLnrt2Zh%$P6kKbE`s&}N?X$#RLXg&Zjb_NYI1 z_T!6KM1w{r>#zif^Aa?li?CE*nat#57q#6_J7_>~6;iA{W+19fhjaGB)~6bMsPimu zL*UjYu^8*q#=Kd!bR?exF7u}Ecda^Jc%tF!x%JP}6=#lgd5AYIeKMUVzx=hJmQTJ% zdu3W&z24hS>Z@u{UiBnZ3)`1zZ6~Qw`DOb@0--m#!aCW9x}DE&mTiWKSvJDPF=_`x z^CTK!NnXUK|1swV@Pofa^3-#7vv+p^*g>ELII!T&#tQ&u448?~On@MpMtqVqHwVt@ zl`Xw29RRnBNInBwbt89H-2<-kM#;_ou}T>S3b1r)f;II7SUYU*ZBKB%q`k0Fxal)~ z%IET}U{c2OhpR2t=O{hL=<4*N%BBq=KGdI|`Nf*zZUwZhOsd!=E$2q53gO>4rYS{3 z*m30bx9PW>6^iBsLXj>{i0MQn=1M|XJH%w}Mar}AbiB2x-(QYH(RZS~T-bkZz5Cee z<$&nTlWBA=mJKC_7lm#auF!F4)y_7oq~0A+n@OLQ7B-uKLN0hbEYjkz?zBBebvfd5 zOOeX)sC`ewRX5C&CsubdNyt=0+O`EtC1A+&fFaQwxCry{B0j-q^`u^c$9xCcmIGt^ zv~U@7xX*^N39K*(EKucrJFj$&_-U25w|T9ym8!{yZM-jx<`Q_y!q!EtZ$33;zrY@M zjFEFY5@R26bUC_(z#`prxR$X&y)-wZvyRazgq_hNhKl^r*;9Tv&Th)~m+ysjj$jHK zXh&Y0war^9hmO>c4MG)i5B9xq@JVK!(>LBsOTj6~xJuFOZ{edJ2TgXcq>+QFB~V=e z_&p{)gH^fT3LI-7-&;X3NFYrIT@7F#KlEb|gjJCCfh~Yq9;P0iJDD5xGqAPq)kn@m zW%j{I2NxGA4N_OqN=y`rheZL=OW$-5)NSIMYHNi}I;Bl3x^`H%$3#P9;W0qY`3_k5l z%szdom`Wu-@@_okc7Q|ziH3;6splY5trI@1?+46O2^_)!x5@t-x+^fU?Ez{GFxZ@( z95tJrUh*BN-{1_V4^v2A6pV{ z<3~H>8pcTP^XG?kP1O7O2O~=xBK7_rRB0DyK;-fmn9N!Mn@nE6y{U{ltwX zeMH*zvD!DpXK>qSS&x3?7$$mL#xE0cMVI7~S?y(+=<5k z!-)!MoR>Ew{W9)&OUV%zT<^_J%M>Qa8SxEmoj>YNhgo`_>=0)|a>=l=$va`$E!CUc zt}h*{uE%X{9DR21GdX+Y>Y&|*&qS7i2z6R`>T9!A8V25l-2H7b_>BRZ>tX5f&&CII zeeMg`9=Bn9so&p*?n!Dv09S?2tPM=|?4Yr45cdG^eSFX277?oa$X+;uOsxawXL zgQn!2J0)zp{M1nQ!&{1u)9vBUnnRzSh}{%l(swNic%@#h{BHixn_{D+g0z_TO)`c(y0B}RqwNP zZf_p)466SE+SQV5GrGnDUQq~m2$}>^#DM@WDq6k;kB55~l)IgmL*usYifYLLc`ijL zw^vUur$RR;KOdj=Z5?^e&R!k$7tfwD-gW9ui!pp~(70Rnvk=|XkVCx51AOCd7K!d6 z%8T9XMI9$&WQquw)3A#O5`EL=V<{cVaTJMkC!Swi#}U>bx915Aw2YYC8pxm4o_G=( z3awk~V>oKa#nY$M&&mG0O9d#m*t?hU!|vxd0MxexUNl2zM5Ksh-@|lPDq(}^EU%!_ zqrj!8!&by4uj2x}dq7d8hgVVKo(`To7e|LOv^)fFm?DG1a<PP zDdsY$m~VY$p`yUBlnM)Qcr&`LxuzJq?nX`s(qLLJ=LoFhtbtb-c+p_9BQ-!t#{Z=@ zTx{(f%Box)(B6;AKxcL+cPVpg-qT^@Vef=0J)9kQp{L8%!^^Fxx~{^-hCvX4^JUm< z2$GSnr&*klr4Q~3_AM#)AwYptz!TNbQv~UWdujPF4II@^+3)8+Futr8(09xwtbPtJ zqSR4g-k!QDg=UG%{BGW{>BblJ_5&=^S&(Jsh+_)6^!GaRCn4Wo8-+^Km-h%VWcQSYkaHXcz} z!)BI#>XOMyt=4I?h({OoetC}V+PN_g>klu}n@=SYyh_Qp{-9peEzW%Y`&vXY%SRK9 zFI`3v&esJ--WNWEmIaLnJuNN&L@aam!IZUPk*t4^uYu8+U0uH!j^e~#XFlIq;#>z< z&H=C>nrU5lfdGid4>MrIz8&edB58NFH#d)ip2Cdc)TH~PVz<}Nv*ime)+v_9SE?vg{AY}?5@(!Nw=c%pt`uo3Vehrm z=upy^Y`{)rfSvTv^EA|ULI&_)gHdDKE|-Yo*5gq^Uhgl?s-SZ8QqZCp^!B#ZSW$7!t^Vm?Ou+vQ$&<{-@@Ac(w1a$JwM}H zO&8o5GYizQuDqUX@d_~Yp3-^FO7@*4u_=fHhdw7nj>Db>ny;72L~e6|HT_fDCI)?6 zz{w962x#H-0tDJ4%kbf!0nWI$DW{HC$(KH9zw`$t%-n-3!@U$}=(9(dxGvTf|e7;lJTnSLQv;7sKBPf zJ;plOFrhvUf9UK%zD93GhHw#OI?a70xEjFUj9}sz)JooeR_0n&F1vN)3ccKUEML<& zO(N21BT?1-*8@W;>f`#uRs15=(`Fqvpk(be2g4Rw4rVF#bP<$-celDRaG@57E)18ujg*oMrNi4ODj3eEh^BjzCMaBGOZx5=^(2Y{7 zS6D>emwa!szZ}z+E;>84QoB~m^Q$vu!vTRTYW#xUoQWiR9?3v{S;A=96iPN=s7gyw z#GcV`^nb=?7)v)7pLEaq)pSd|`yHvyAmQ7Bvrdf)!j`zln4HO%B>dco+yLKqz#GJj ze8A>_H3relen{Zs)lYNc1dSO}MHJUj;%KeOrTMi}(jtOSAAP#R*-pqzmEie3Lq>ut zHqs{no86|u`@7uD3i|-f&n#1pbUZHOMWnz@4oFFJigGh z8!L`hXE#sz`#kFESw4CzqhTrW>8m%D$wO0%6YFNRkFu#Zmp+s19Vid3McwNK21yg( zV6y1Ve>>!9UIc|2=1!i;D#W3%E=u7#hF7T)Hq$ISl}iXV zmyT|HoMCP?=DZ(oet!S4b0flB$2GN^BF^le?P&-td7n#_UBKnQ5gi^B`L3gPb)4Yw zNr@?cOicrL6mf-fZO26}F6N+p=$Zy3I}>k}DZ!K_&Zk zB%9i^v`a0KF_k`lI<4Ku_FDhwJ4}-7(^rCzT5PX`ox%5kWDE8j2-8bq;y4|3p?BKAo+Zdjb*1dK;Cla@aio-j+LX?LgsDV_R{lxd>c zlS%0_k)jn9@)1r8ZN4srmf_}E!_M+R6ePDl~va0xs?x}^- zb~EbLH{8=`9VSd(;}2s*BqsODCDt_?k{0yfzGlE$TGOst@kzAT=JZ)8WxEU46HWX?^m#L&VQ6F&8;Y= zhR!x64fjDFiwalg^x?)u=#XqLKYCg3r1;2I@sXqAqf=M-%twdmVZllFXrBVVXye42KuX;+6@7N%iF(~fpMUN$DPau{ zaxveM@@2Wnu}o%j+v{ypfoawC9?PzURBY8I8u4rEW?K>*ZGjYWJ+k;$onfAjOk`^N zM<0WAAM6$WkDib0zaK@_3>*wrZqAMjtUNypwpmXR@bVsKaCi1}Gq+SRb#VdC&vZ1E z&mh0Z<7n!#cPR3!V@1M-pa$@w8HymbGrMS|FfT*3BU>T(v_ZJDU(o|LE;uKOtJl`k zC}Te=#ieKkk`odHOXW$Pt-?$5WA|fj^{bA-2JOChGU89A1EQ`0?;mfU5!;ua(It#g z3KQJ1rN!(%V`?G3`2wt#8w;m2n}I ze)>22(rfk$h=uHPqNj(jY_3!&&!0SO)FIrCH7XN&assPtTBuh~Jy3`zPwgVTo4yEk zwA>pj`7a2W=Nr*kjzw`r(7y|6yV>@LL7W*YGG zY6SRvFfFYr^*=O(07^s98`jL<4#n#syR1QQhB}3UyI|Srt@>)p>gJUjgFHC8^QH+> zh6}{)^H?~KTwRi`y>EFYkT>Vy!u*nf+=d!|Hh{b?<;7_e$@QT};b%i!+f83lFmzTn zW{|f&9l`0x40y-$XnZw>gH!`3@w`rnQL7R&K zD*^Rbz#Cxe$^XD3PW&)L0^kvR6pfO4p3E;;dqs4Z zqBUsiTNcU5gDrS;S}sv7{Ym)PEc5KxHjuBA2~?l635gfGNij)i-z++7S;UW3an4_& z%HSio{h<^mU^)4@`qhBCh0M99%!M|q=UBN@4I~u2@B8qb)bl&LSS#*4pui(=bqiGf za@2C3?h2sz$p1!p!Jo=25r#@oL~MME-7mQ$OI;#hIDJ2q)ZpoBBlBEe4{M0@)^bdo z)I3+?$APv}i8L-rA&G+~OiJW@`Igp6u@24881pua)CW&9k(({!n>4x!rzH3`NXA^t zxo)Ld+xp~){Q-OyTOk?GyD<;(k}K<}Pi&NBc~<2eJsii>rHfZO71=Ye8DsoT>&u)T z+rcotfgsSNKzuE@_YPnI8DM=xGbMwV3Q*H+cV>koNx%mHvfCM%z7j{ZJ{{KrGxjx% za{^B!uHavxpj=%VEwth8SrR|;z2$W`xm=$5rzW;OB3=5Gaf~n`YvEDR=*Vmzi^)K4 zJ90)=?HD574^|@V{)B~PysrflaT576v~m(~q#lvoEt|H!|KTd5!osOCT5U4xRFW9( zL(J^Ow8t(Tl1u5rFR8yVGhHzAJ~M4b7weGzBz~QUs`p~~*NrPul>8J_TcD$jKKCHL zzm>2;O_JTQPFFKgFv9_irbaEnRg(QQ!bz9=_i+eDO4~e>%70lKydmxvUU{z2<0jdf z9-f&(r)-R2RlWB8L>&eRx^<=tEX&q>N3OBu%iF#vFL@(U{l2C;_5*0j!z=0;bpg6L z9C#&x7mdu@&h~1DF8j*`3fN~=;P-3bRchVSxjn0i5ju|%0X-e@ez0>(Fd|8xGa_j| zSl_{@C%OV*G%I8L3zjhL|ekqXYC~Ano#?JJ83tP$0uH9RIm!$+ zEGDbM;6Vz*W>2}N2B2)H#cV+okVbqwv`{dgM)7Wjg$kTToa#3dwE|SQ1iWYl5U9wd zDEddfo3k58;}%0zx;gP->0Ma&VD{EQQ=m`iu??{cl<~9_aJdeqUdu2bPG$?`OM7Go z3NHjc4x9tByUEH!ze-Tweo%G{#yI200u%*QLc_^^N!5hul%T1i2Jn;XH}sTOLb2Fm zjf36D5>`({k3C$(pnG}U)7wt4?fcTFbIBhL`ej02W{Nn^Qi==GM$+7rroqxaPoNfg zl~K{krkDxaE7EPv$rF(Sc%cT7{r|YD9^x9=&j0EePNnT(}L%3d0 zj^WEj;ds_vc|dZyaVYdH*|CGA@_NiG#zoecG6ync_@o0q#NHq!h~t-U8w~B@uGrci zp?`@X?c>;V_rpZ{yLZMficfq#r*wQ+$7Hs4{fz=mIwP$rA0s)5eX65NL%5CXO`>t% z!u)JpNQn^T2|g#?sQDM3M>dWzDXQOYHto7;urjdt@+G%a*+U~*#itwsH?HwtvN}GL zZyVPaC2+*Konvb)7u&^+z>OF)l9bB#p>kMm=iNDtQ16QZy1Ws1Wzg&Ty@W$pf9v!p!6Ju< zH@>>AMOq4aeIeZJc>U>5;+1T8HRZ1*;o?n>Q!?jUf4$y(S!7u%6x;gdeoUv4P#2uu zQN}U+y64rw9A?2dcbrHaG*e>izE|~6>pM&EcpKP*&l>B*>(78FB-i-y|F$`cU3#eZ@G|SfSk5$!s4eTCjZD#_S9z4LgNH zGhqCs@;h|8f1~inotYW7yaZJOZp9YUo)V!A#=a%l(20?3nnI8VE$;Q41;WOT^eU`wH}3uRJ)( zoWycWL56*Mxh*z!p2*pE!hhMqJb|!Ja!7ICne1#^2FrL}zSp0uV#MPG)usu@@=`Fv zTqB65RrQ~-wgq+56ucv))aLZS(x^ZBX{&T3d zw;m{XF}n#^Kl`2lpy$eLWJ^Kpr?MHsHc};WEvTy4@)8{^ZrQTe``=6{zcwE9oh08n zRY+*ZF4H1O5ZD($vQdvYHMz43zO z9Lv(1d6rDV^Pg(^FFhM$*p$uiTrV2^gmtoXaz2#3JD@f(aATQwN~Oc9c@4DvCd${X zas`yX47_N1JqiOLjDR9VFU_92Iyfd@+h`b%DL;|c8GUd{|GG!2bUXgNea7)JJDCY}kb{%-p zTq{s$w~O|KVk!dZ2%B4Z6u8*Ab$8apr_(9W``WMxRhmx;h<53du4SZTW-MJdIG?>w z0GrJO2u%$HRQvF{0OKl%J;7X{draCuhj?GGl*wV^3s23 z^~cqvzi#;iqFq=Qwg1PK5m%Z18UU8xhChpvwEX|xASmx2{b74#8XbJODI5wC;_;_Y zs5n)2?!W8&({Oa)=c1&509v{tB9z~$D!&T}5)%K1NJ#z^TtCzXhON}_2NEI<_|Cr= zh2Xnn5&B7@}^ z;EO=vK#&j;p+5ow(TU(HqV8YV!UlgJA)Ug15g8ep!9_q)uEAGPB1MQ5`5Pka#1KeW zSo7d%8&(noe-2(%8HGkgk_G2M~s|mj04XI}LpTHo< z3P{D^h~R6?kcb8nXekE2%?aFt;2WZlKsEql>AyJ2UIf%LivqlP;3p(R8rZ!57lfZ- z24dydb-WC>AZl2xJ+PnAgGDYEh)=tYiT{fLRX}zh4ZRVt$RjC)0I<7*emCXpwSb4* zUl#y&{m;J_KmZ6_{;~yNH~4^^8+`2!+zlWhD}POZy_fL(&IEhICVfS;On`8H)F*Fn z8=xKsusdbo4=f-T;sV2u0CAM4WJeR0H44f>bT&4}tdF(*hqTu;#(x!rt9WA;4otM?d7fCwrGt z@XaSk1!38uKSKJ)Jt%N3;eG?YKmv&^1k{kCfxY*1=l5VYp`fCEB8hW`TEZs>m;=^#~y+ZudF0aBQ=!1m%#Ro^Yl&l?Ni)_?(lU3%|S0^y3SE3wl>l|DU>pYl4viEE@kS0d`jigS!@7Qi^Px5IEdN!;6tS4^+ue*pUTT z1aMg=QUn4sv_wG6Psk)CDqL_eCK4C=r?@E7l&E9?*HI#6NHa%Eccl6ECMr>ZgG&&R z;4duD0*9w6K^a6;*x<50B=&dUs0IzcLye7`Kv4++E~P^XK?+pp{<#o4GYTqTaIqH> zc+Lhb;GK=uuF@~?7z0;iApsxQq6PT>)@Okw0GI6`B_MS`PlCOF2LY9t!F4Z4%yW)t zVIqqmeyE3x2Eer$NGJm5{{{udKrVvdatkCz)_=tKO?C{G9l?bYNMJ>m|EAneVB{=? z_=HGL{V1aVyAQZz0V#qOz#u?ls3L$-X2?)k0bDGA6v4>tuZ!@bbO3AxFl8Sp!g=?< zF2WB2KUf4XUmhufiO1g(VRxPkRZoCf=|~v@J<*Z@5iy|7l%bLVOejanAnS#e49Hv= zDmXCV8wp40jTRgzkA(^o%+5w)j-iK%$YkwGFrfkl^Qe))cYV-O_P4BRu!n=Gyh!vy zKeW*IrhZT<4Cd4#A(Q;kg4~_-`2QKUU<-g*u1Ikb0{*Tz2+k{51TYO1DS~q#S|aSE zWWdQ1RDA(vj3SZG0<>o|RvN_Qg5ZyWl?Aguk&rX!K_U_eD7c_ta4@eD362+xmcB@E z#HZhf;b0ylQi4(RBtRq;khg{HPA{P9bubkXDZ|SUw5)(ahF@+6z)V3Tcy;LC0^gNl X_@O^G4h%*Q_}9pafl&|!`|bY#IAP^B diff --git a/.yarn/cache/@standardnotes-domain-events-npm-2.106.0-e3526437e9-db98a6b4ef.zip b/.yarn/cache/@standardnotes-domain-events-npm-2.106.0-e3526437e9-db98a6b4ef.zip new file mode 100644 index 0000000000000000000000000000000000000000..7f200e02cdefbf2944e1e081dd078dc4df51873a GIT binary patch literal 95867 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�nvr6}Juwsp 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%0DGMr!;Qot2js5)(l&5Bw656J|R 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 Bu!;Zx diff --git a/.yarn/cache/@standardnotes-predicates-npm-1.6.0-2063cce139-020e2206c7.zip b/.yarn/cache/@standardnotes-predicates-npm-1.6.4-25be0ec067-6d7235896a.zip similarity index 90% rename from .yarn/cache/@standardnotes-predicates-npm-1.6.0-2063cce139-020e2206c7.zip rename to .yarn/cache/@standardnotes-predicates-npm-1.6.4-25be0ec067-6d7235896a.zip index d12da18356e3504a6b7824cea9e9d1cbabe553a3..0d752f12f6c4f2a94403bb1fe1002873aa9d92be 100644 GIT binary patch delta 837 zcmV-L1G@Z@l>y|G0kH8o4XE^wLFNGf0I~xB05g-3H7b)RIt+hhQ(bS8NkmWgbRPmj2vA`_S4D1BB+dx5DKmleEY%lmUNY$f*Zc{5qDnlrj z*5%f)Tq-Ue$RWXWa(it&;d`10-RgM`_c(@rUq^G|5~GttVEm2~&AjC@U!IEm_dSFI za2HaHQ#(kz|EN_b`?ENdF=0dTKwxK4;31R^%6<6!?JIw-NP)G%1L$vJS5dSJrP&~8 zkii@g?hNw%oO*-h!8VQa@FO(}MRG!C$XSN)h`@wKVK}W2#($|}`xCjHFOTH@lNbeTMlpGL zUpHZY`5}Mh-L1ByB;~1GM1xW|HkC(%$6@N@)$FcF@6aWGM2mnB?)(BErT4!kh006U3JXHY+>Q_~~lmGw#36rfoSAUPe z3c@fDMDO{E1rNO?_k34w=%KNde7Ig^e&3X=gyDgxp>lc7K|lV3<09O_q9yp#X{ z00{vA08an_00000000000HlF;J(Hn8Oq1bAF9CRy5lMvtU_X;lMp2XLNiG6cK$D?B PW0QPJ5C&sG00000uV-~x delta 893 zcmaDdg>lkU#tk1WdEJl94q;_tU=U$pU@)FM(Nt@)h80hJZm@6vWdnh|-@_v;!*2Y1 zH7$)bL(rqZL0iQ^Mqp}8^`u>1ZxXCeuM7Kqf2M`sEmps6pYNU7Q)yfoBRDDJo@0^k zBUg=jC*O*AbVTsU1+BXiCR@5_ z%7!b3Xgv>3cU`rmrMj%kK>p9g8xudMmbv7ez0_X+qWRwb#j2kt2CgIlM6R-H&rGqD<3^cL+Ri`sg5#9{hpv7VGnSbwB=e)=$$}eC(3g z-|drEo!r8`+?CtrMuN3dwzr$@W-}Q%zstV_>mGzn?v%O6`pHk=mat7zK+d@gra#rkNP(Ur|BjDt5|0Y{m&f}!-DZB=qF!j*quFvW_7U%ctKBaai(7ZySwGug{}++^&+odsp6bj$?VC~1<+te4%LTR8CYP_hSsyX; z=wH>%-#UU#&Q-G}R)3QYn-grmK0=4rs;V<(P0R#WFQ0A6vrn`AzkT;}eZY)$v+H-B zy&Ac>brQg*Y};~I%FW=`u%4YqxfCb-)&9r zLS0_4A4$2=Q8~fqV9>Ak+opycIrr&a^^D|Lp3Vi$yEd{_?O66;!Hu+_dn;0E6wWxY zKX1}k+5Gv}lnW7SIm&tOI&Zq7rz8IVsa918-}M!S@(eY;4UT_9I2&(u#EWUYkl^{w zG5zA6Ie(st{A|=$ufJczW%_!G_P?F>g-GL*W!(#zENvz>YEGWuAuu`LhHLU=cP%DHTZjnfWCL5S$<`hM zGH@R=GBEf9eGUUl8mB?k1~DzOgXmJ8Y~X3Z)MpRl?KfwgyxUWcsnr24;vhcR&r5)9 Iq9e#00L=`W5C8xG diff --git a/.yarn/cache/@standardnotes-security-npm-1.7.0-6af9b8c3c4-c053af16e6.zip b/.yarn/cache/@standardnotes-security-npm-1.7.5-1479a77fe3-69d180d259.zip similarity index 80% rename from .yarn/cache/@standardnotes-security-npm-1.7.0-6af9b8c3c4-c053af16e6.zip rename to .yarn/cache/@standardnotes-security-npm-1.7.5-1479a77fe3-69d180d259.zip index 48d1c248ce24e727abcce471e386f5a2d549cab9..e47c76834a09f272e3e06b08dd1ef0d9c5645a19 100644 GIT binary patch delta 1849 zcmY*ZX;>5370pI!2w=b<5Eel|LD@$IDg=ftFd>NuVXXv4FhE!WLXZKQ27*+m#qto@ z7bgRV5<;Pc=@2c8EE-0LNkG|`vbYem3J!uc(hu8tKi+%az2`gUe)rw;dZwTalTd-Z zCrY>4ZD$<{foK6&Pj~k3RY3dzxw1Gh^{$}1Uwbjx!jL$2)sA3SBtBLAadWkoRmrD} z$s9LVRwh5BlAZ&tF*=2%P#e1%Vm<@HZIgbyWW$Y*-B!gpE+d_*w@4{PbyqpglI`@8sq}0 zOYZHtGT$>Ui78PYnk&=$uC)4P_^M&%4;p@%YuVC{sY;bM*J9uc=~<$|ied3n<`8?i zZVJlI_DF9Ei`<|U$M>xjp`%rNJDo7&ru#SHV(ti@z4H#PWzzf2LP_YzC{@JJuw!tp zXunmT^D<`3>Fcss=6Q*%m)>NWzi6Ou#L({1PchX_EA-ch-1e}X*uS`C5{fTM-hR~@ zI9LnsXB*8kFR`S5Hu`ZKzA$^tPX7|BeiApT@7qxaw?_>1r51Em9BpjgLeEuAbh-=w zdZj+?IHxeeyrBf?<&{#T*d$7?jfzkn6g)2o%am&$$kt`*F!{c3km?BNEJd#AC&2I zaVhUJ$-cyAkIibxM$%R1rK&c~SdHZwtr@dW)-dfov&)2iS92;UpUHOa>~x%0rfO|J z|MX1noG@4Axp^$2GJ-+&=ND`orrWlMoxYFqw;OBkw!b{wA620#%#E+yv8EXNEhqnW zE>%_*VLVb;Q2r!KKwNiE+P@Oyk}oRxmuBor-|W@%qLmk0$r-GWT+5<^mIKypuf3%R zRP|3vtYAeyE`Z0RZ-5sG>#^_QV;`!3+PHKUk}VdCu*Y-fi*AX!QW*m8@NW~3x$$J> zL>eum&f$K$nWNOcwH9KA!!4di+j&@fw(x?j?OP#`wsLY06lEK*VaQc*_W*++CxBuY zuoHf6Rqk=caOd!p)`*(7DD#(6x7W~9={X3i%tzA(9)0QdF~;-7w69zOhnKMG8oGmW z<$p+SBPyiJ7AM5t*Cmt(le=mg=1)CJxOCj4M7U{^Ru*vxjb!!F__$BW5h!m|YlHbR zqNFZEjWqVEaWM``2%P%JU+#UcFYA{fh(8JLwT1h+AXIg;+UDLVYLhAc1M=<|oQcMO z$^;ZU?K*|nXM=el-@(ESHe}ObL4F>XK<>F0&J!Yj&hVil2L$|`wSHv#jgvQBr{%+$ z2kfR>|A`6@D17sBdIX;lWx8nbCuRgaf*MGdQ2l2=M9IeA<*P@nJ5*e3@aV>om3Rl> zDY`ym819fk#p=nfBQ?_xF0YhsZ%Q2DH5hhtKRiTIMtADRzN;~Ezg=sjE^(p0xHz%H z>Cpb&qMEy^y(q3zB)r&^oV_2{Ji@ttGx-VYV8TES<>K1y0sYIfX{x8nom1-j?_?2X zPXCbfo9+>$gcx%q(M-BU9jI??LJw*ly0K|~Zz@stXvQkdyzaz9_WxW0FhMU+={Lfk z#4EbPE%J2(g^Bv{X(C&-9vc;}Ip+pJU-eo*RRmY5vDEzy+EZyFMGwX8JS~JIZC}Z| zneV8%NU*zpUo-W=D~k+{oU8Nn&bsHpb$rIHt9Xv=yPRQRiRHRmqAa9(;rV+c3R0M98+v|9#k~3xRrHtozxyisJSbj}t=xe<1{c`Zx@j zzkq{1@&==^UjrAq2ke87B4ZDj=a8U>ZUwaguj$dyUd3(;3`tlZbkG3&7%LdxR{?Vd zmL#3eBzj*=p^$LjlTn;JP7!IB4^39vRcj<;(0h3vhX_Vuvtc%rU9NG8<}TM46DV;0 zd)QsBPZUL&4nUbffW8HzaSp%`uL)`xRxr%jT@gb(7JT|v8JH$ufkQkF_V53O4cxGx zCf*um8L*2oa5MOf(EHUu|4PS%3PuwMirM}OmK&(JM(cigUIp&6`S%u&!vKDX3?ykc F_#dUIDeV9N delta 2080 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 yg!yEK{ Date: Thu, 19 Jan 2023 23:32:24 +0000 Subject: [PATCH 04/19] chore(release): publish - @standardnotes/api@1.24.2 - @standardnotes/desktop@3.104.95 - @standardnotes/encryption@1.21.2 - @standardnotes/features@1.58.2 - @standardnotes/filepicker@1.28.7 - @standardnotes/files@1.14.17 - @standardnotes/mobile@3.50.31 - @standardnotes/models@1.42.4 - @standardnotes/releases@1.4.118 - @standardnotes/responses@1.13.2 - @standardnotes/services@1.56.2 - @standardnotes/snjs@2.164.2 - @standardnotes/ui-services@1.24.6 - @standardnotes/web@3.140.2 --- packages/api/CHANGELOG.md | 4 ++++ packages/api/package.json | 2 +- packages/desktop/CHANGELOG.md | 4 ++++ packages/desktop/package.json | 2 +- packages/encryption/CHANGELOG.md | 4 ++++ packages/encryption/package.json | 2 +- packages/features/CHANGELOG.md | 4 ++++ packages/features/package.json | 2 +- packages/filepicker/CHANGELOG.md | 4 ++++ packages/filepicker/package.json | 2 +- packages/files/CHANGELOG.md | 4 ++++ packages/files/package.json | 2 +- packages/mobile/CHANGELOG.md | 4 ++++ packages/mobile/package.json | 2 +- packages/models/CHANGELOG.md | 4 ++++ packages/models/package.json | 2 +- packages/releases/CHANGELOG.md | 4 ++++ packages/releases/package.json | 2 +- packages/responses/CHANGELOG.md | 4 ++++ packages/responses/package.json | 2 +- packages/services/CHANGELOG.md | 4 ++++ packages/services/package.json | 2 +- packages/snjs/CHANGELOG.md | 4 ++++ packages/snjs/package.json | 2 +- packages/ui-services/CHANGELOG.md | 4 ++++ packages/ui-services/package.json | 2 +- packages/web/CHANGELOG.md | 4 ++++ packages/web/CHANGELOG.md.json | 11 +++++++++++ packages/web/package.json | 2 +- 29 files changed, 81 insertions(+), 14 deletions(-) diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index fd36bef3c..c64a6f62d 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.2](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.1...@standardnotes/api@1.24.2) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/api + ## [1.24.1](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.0...@standardnotes/api@1.24.1) (2023-01-19) **Note:** Version bump only for package @standardnotes/api diff --git a/packages/api/package.json b/packages/api/package.json index 9c94304e6..7b2776997 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/api", - "version": "1.24.1", + "version": "1.24.2", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index 8c002adda..c020f59c4 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.104.95](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.1...@standardnotes/desktop@3.104.95) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/desktop + ## [3.104.94](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.0...@standardnotes/desktop@3.104.94) (2023-01-19) **Note:** Version bump only for package @standardnotes/desktop diff --git a/packages/desktop/package.json b/packages/desktop/package.json index bd70a14df..a09f9823a 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/desktop", "main": "./app/dist/index.js", - "version": "3.104.94", + "version": "3.104.95", "license": "AGPL-3.0-or-later", "author": "Standard Notes.", "private": true, diff --git a/packages/encryption/CHANGELOG.md b/packages/encryption/CHANGELOG.md index 546cda2b1..cbe624653 100644 --- a/packages/encryption/CHANGELOG.md +++ b/packages/encryption/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.21.2](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.1...@standardnotes/encryption@1.21.2) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/encryption + ## [1.21.1](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.0...@standardnotes/encryption@1.21.1) (2023-01-19) **Note:** Version bump only for package @standardnotes/encryption diff --git a/packages/encryption/package.json b/packages/encryption/package.json index 94176e868..746a2e8c3 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/encryption", - "version": "1.21.1", + "version": "1.21.2", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/features/CHANGELOG.md b/packages/features/CHANGELOG.md index 64b469b36..5444dc243 100644 --- a/packages/features/CHANGELOG.md +++ b/packages/features/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.58.2](https://github.com/standardnotes/app/compare/@standardnotes/features@1.58.1...@standardnotes/features@1.58.2) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/features + ## [1.58.1](https://github.com/standardnotes/app/compare/@standardnotes/features@1.58.0...@standardnotes/features@1.58.1) (2023-01-19) **Note:** Version bump only for package @standardnotes/features diff --git a/packages/features/package.json b/packages/features/package.json index d7a8a6689..0fffded70 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/features", - "version": "1.58.1", + "version": "1.58.2", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/filepicker/CHANGELOG.md b/packages/filepicker/CHANGELOG.md index 89cb0427b..8fed16b72 100644 --- a/packages/filepicker/CHANGELOG.md +++ b/packages/filepicker/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.28.7](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.6...@standardnotes/filepicker@1.28.7) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/filepicker + ## [1.28.6](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.5...@standardnotes/filepicker@1.28.6) (2023-01-19) **Note:** Version bump only for package @standardnotes/filepicker diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index c4268863f..814210963 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/filepicker", - "version": "1.28.6", + "version": "1.28.7", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/files/CHANGELOG.md b/packages/files/CHANGELOG.md index bb4449dfa..dee85d8a4 100644 --- a/packages/files/CHANGELOG.md +++ b/packages/files/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.14.17](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.16...@standardnotes/files@1.14.17) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/files + ## [1.14.16](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.15...@standardnotes/files@1.14.16) (2023-01-19) **Note:** Version bump only for package @standardnotes/files diff --git a/packages/files/package.json b/packages/files/package.json index 938f61130..f4ca1f493 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/files", - "version": "1.14.16", + "version": "1.14.17", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index 5b6a54028..4b28a8ece 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.50.31](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.30...@standardnotes/mobile@3.50.31) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/mobile + ## [3.50.30](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.29...@standardnotes/mobile@3.50.30) (2023-01-19) **Note:** Version bump only for package @standardnotes/mobile diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 2414ef675..f247d8f9f 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/mobile", - "version": "3.50.30", + "version": "3.50.31", "author": "Standard Notes.", "private": true, "license": "AGPL-3.0-or-later", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 119b53cc1..325844147 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.4](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.3...@standardnotes/models@1.42.4) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/models + ## [1.42.3](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.2...@standardnotes/models@1.42.3) (2023-01-19) **Note:** Version bump only for package @standardnotes/models diff --git a/packages/models/package.json b/packages/models/package.json index 614a24e83..d1b525b39 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/models", - "version": "1.42.3", + "version": "1.42.4", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md index bd5c0a92f..83ea223cc 100644 --- a/packages/releases/CHANGELOG.md +++ b/packages/releases/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.118](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.117...@standardnotes/releases@1.4.118) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/releases + ## [1.4.117](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.116...@standardnotes/releases@1.4.117) (2023-01-19) **Note:** Version bump only for package @standardnotes/releases diff --git a/packages/releases/package.json b/packages/releases/package.json index 967a7e2aa..e4899e30c 100644 --- a/packages/releases/package.json +++ b/packages/releases/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/releases", - "version": "1.4.117", + "version": "1.4.118", "license": "AGPL-3.0-or-later", "main": "dist/releases.json", "types": "dist/index.d.ts", diff --git a/packages/responses/CHANGELOG.md b/packages/responses/CHANGELOG.md index 943a71acb..08631ca11 100644 --- a/packages/responses/CHANGELOG.md +++ b/packages/responses/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.13.2](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.1...@standardnotes/responses@1.13.2) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/responses + ## [1.13.1](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.0...@standardnotes/responses@1.13.1) (2023-01-19) **Note:** Version bump only for package @standardnotes/responses diff --git a/packages/responses/package.json b/packages/responses/package.json index 79d4996d5..6887d6129 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/responses", - "version": "1.13.1", + "version": "1.13.2", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md index f802fe0c5..46eaba1dc 100644 --- a/packages/services/CHANGELOG.md +++ b/packages/services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.56.2](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.1...@standardnotes/services@1.56.2) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/services + ## [1.56.1](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.0...@standardnotes/services@1.56.1) (2023-01-19) **Note:** Version bump only for package @standardnotes/services diff --git a/packages/services/package.json b/packages/services/package.json index e5417246a..38492cc54 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/services", - "version": "1.56.1", + "version": "1.56.2", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/snjs/CHANGELOG.md b/packages/snjs/CHANGELOG.md index f75e19f52..eb12dbe1d 100644 --- a/packages/snjs/CHANGELOG.md +++ b/packages/snjs/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.164.2](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.1...@standardnotes/snjs@2.164.2) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/snjs + ## [2.164.1](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.0...@standardnotes/snjs@2.164.1) (2023-01-19) **Note:** Version bump only for package @standardnotes/snjs diff --git a/packages/snjs/package.json b/packages/snjs/package.json index c639a8ca7..639787be2 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/snjs", - "version": "2.164.1", + "version": "2.164.2", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/ui-services/CHANGELOG.md b/packages/ui-services/CHANGELOG.md index 02e6aa1f3..09462da88 100644 --- a/packages/ui-services/CHANGELOG.md +++ b/packages/ui-services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.6](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.5...@standardnotes/ui-services@1.24.6) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/ui-services + ## [1.24.5](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.4...@standardnotes/ui-services@1.24.5) (2023-01-19) **Note:** Version bump only for package @standardnotes/ui-services diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index 216024778..32b624591 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/ui-services", - "version": "1.24.5", + "version": "1.24.6", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index ee0a88d93..86e77d287 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.140.2](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.1...@standardnotes/web@3.140.2) (2023-01-19) + +**Note:** Version bump only for package @standardnotes/web + ## [3.140.1](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.0...@standardnotes/web@3.140.1) (2023-01-19) ### Bug Fixes diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json index 051a45677..9c834e579 100644 --- a/packages/web/CHANGELOG.md.json +++ b/packages/web/CHANGELOG.md.json @@ -1,5 +1,16 @@ { "versions": [ + { + "version": "3.140.2", + "title": "[3.140.2](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.1...@standardnotes/web@3.140.2) (2023-01-19)", + "date": null, + "body": "**Note:** Version bump only for package @standardnotes/web", + "parsed": { + "_": [ + "Note: Version bump only for package @standardnotes/web" + ] + } + }, { "version": "3.140.1", "title": "[3.140.1](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.0...@standardnotes/web@3.140.1) (2023-01-19)", diff --git a/packages/web/package.json b/packages/web/package.json index f1538c84a..6575539f5 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/web", - "version": "3.140.1", + "version": "3.140.2", "license": "AGPL-3.0-or-later", "main": "dist/app.js", "author": "Standard Notes.", From 391b2af4e1eee761e35cb8b19afe6a7e5bb26516 Mon Sep 17 00:00:00 2001 From: moughxyz Date: Thu, 19 Jan 2023 21:26:26 -0600 Subject: [PATCH 05/19] temp: skip history e2e tests --- packages/snjs/mocha/history.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/snjs/mocha/history.test.js b/packages/snjs/mocha/history.test.js index bed7de3bb..1866a85aa 100644 --- a/packages/snjs/mocha/history.test.js +++ b/packages/snjs/mocha/history.test.js @@ -5,7 +5,7 @@ import { createNoteParams } from './lib/Items.js' chai.use(chaiAsPromised) const expect = chai.expect -describe('history manager', () => { +describe.skip('history manager', () => { const largeCharacterChange = 25 const syncOptions = { From 544a28d450f276684697439c754d3bc4d3ed3062 Mon Sep 17 00:00:00 2001 From: Mo Date: Thu, 19 Jan 2023 21:46:21 -0600 Subject: [PATCH 06/19] refactor: offline roles (#2169) --- .../src/Domain/Feature/FeatureIdentifier.ts | 2 - .../features/src/Domain/Feature/Features.ts | 11 +- .../src/Domain/Lists/ClientFeatures.ts | 42 ++-- .../src/Domain/Lists/DeprecatedFeatures.ts | 6 + packages/features/src/Domain/Lists/Editors.ts | 8 + .../src/Domain/Lists/ServerFeatures.ts | 6 + packages/features/src/Domain/Lists/Themes.ts | 7 + .../Domain/User/GetOfflineFeaturesResponse.ts | 1 + .../Domain/Feature/FeaturesClientInterface.ts | 6 +- .../src/Domain/Storage/StorageKeys.ts | 1 + packages/snjs/lib/Application/Application.ts | 4 +- packages/snjs/lib/Hosts.ts | 13 +- packages/snjs/lib/Services/Api/ApiService.ts | 6 +- .../lib/Services/Api/WebsocketsService.ts | 2 +- .../Services/Features/FeaturesService.spec.ts | 194 +++++++----------- .../lib/Services/Features/FeaturesService.ts | 133 +++++++----- .../Services/Settings/SNSettingsService.ts | 7 +- packages/snjs/mocha/features.test.js | 10 +- packages/snjs/mocha/keys.test.js | 2 + .../snjs/mocha/sync_tests/conflicting.test.js | 4 +- packages/snjs/mocha/sync_tests/online.test.js | 2 + packages/web/CHANGELOG.md | 1 - packages/web/CHANGELOG.md.json | 6 +- .../Components/Footer/UpgradeNow.tsx | 11 +- .../Preferences/Panes/Account/Email.tsx | 2 +- .../Account/Subscription/Subscription.tsx | 4 +- .../CloudBackups/CloudBackupProvider.tsx | 4 +- .../Packages/Provider/PackageProvider.ts | 2 +- .../Subviews/UpgradePrompt.tsx | 7 +- .../Controllers/FeaturesController.ts | 1 + .../Controllers/LinkingController.tsx | 2 +- .../Subscription/SubscriptionController.ts | 37 +++- .../Utils/createEditorMenuGroups.ts | 4 +- 33 files changed, 282 insertions(+), 266 deletions(-) diff --git a/packages/features/src/Domain/Feature/FeatureIdentifier.ts b/packages/features/src/Domain/Feature/FeatureIdentifier.ts index 990fee0b5..ea1bb4fec 100644 --- a/packages/features/src/Domain/Feature/FeatureIdentifier.ts +++ b/packages/features/src/Domain/Feature/FeatureIdentifier.ts @@ -1,5 +1,4 @@ export enum FeatureIdentifier { - AccountSwitcher = 'com.standardnotes.account-switcher', CloudLink = 'org.standardnotes.cloudlink', DailyDropboxBackup = 'org.standardnotes.daily-dropbox-backup', DailyEmailBackup = 'org.standardnotes.daily-email-backup', @@ -21,7 +20,6 @@ export enum FeatureIdentifier { AutobiographyTheme = 'org.standardnotes.theme-autobiography', DynamicTheme = 'org.standardnotes.theme-dynamic', DarkTheme = 'org.standardnotes.theme-focus', - FocusMode = 'org.standardnotes.focus-mode', FuturaTheme = 'org.standardnotes.theme-futura', MidnightTheme = 'org.standardnotes.theme-midnight', SolarizedDarkTheme = 'org.standardnotes.theme-solarized-dark', diff --git a/packages/features/src/Domain/Feature/Features.ts b/packages/features/src/Domain/Feature/Features.ts index 38465be7f..b457d5bf8 100644 --- a/packages/features/src/Domain/Feature/Features.ts +++ b/packages/features/src/Domain/Feature/Features.ts @@ -1,7 +1,5 @@ import { FeatureDescription } from './FeatureDescription' import { FeatureIdentifier } from './FeatureIdentifier' -import { editors } from '../Lists/Editors' -import { themes } from '../Lists/Themes' import { serverFeatures } from '../Lists/ServerFeatures' import { clientFeatures } from '../Lists/ClientFeatures' import { GetDeprecatedFeatures } from '../Lists/DeprecatedFeatures' @@ -9,14 +7,7 @@ import { experimentalFeatures } from '../Lists/ExperimentalFeatures' import { SubscriptionName } from '@standardnotes/common' export function GetFeatures(): FeatureDescription[] { - return [ - ...themes(), - ...editors(), - ...serverFeatures(), - ...clientFeatures(), - ...experimentalFeatures(), - ...GetDeprecatedFeatures(), - ] + return [...serverFeatures(), ...clientFeatures(), ...experimentalFeatures(), ...GetDeprecatedFeatures()] } export function GetFeaturesForSubscription(subscription: SubscriptionName): FeatureDescription[] { diff --git a/packages/features/src/Domain/Lists/ClientFeatures.ts b/packages/features/src/Domain/Lists/ClientFeatures.ts index 2a67eabd0..167166e11 100644 --- a/packages/features/src/Domain/Lists/ClientFeatures.ts +++ b/packages/features/src/Domain/Lists/ClientFeatures.ts @@ -1,14 +1,19 @@ -import { ClientFeatureDescription } from '../Feature/FeatureDescription' +import { FeatureDescription } from '../Feature/FeatureDescription' import { PermissionName } from '../Permission/PermissionName' import { FeatureIdentifier } from '../Feature/FeatureIdentifier' import { SubscriptionName } from '@standardnotes/common' import { RoleName } from '@standardnotes/domain-core' +import { themes } from './Themes' +import { editors } from './Editors' -export function clientFeatures(): ClientFeatureDescription[] { +export function clientFeatures(): FeatureDescription[] { return [ + ...themes(), + ...editors(), { - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], name: 'Tag Nesting', + availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], identifier: FeatureIdentifier.TagNesting, permission_name: PermissionName.TagNesting, description: 'Organize your tags into folders.', @@ -17,45 +22,26 @@ export function clientFeatures(): ClientFeatureDescription[] { name: 'Super Notes', identifier: FeatureIdentifier.SuperEditor, availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], permission_name: PermissionName.SuperEditor, description: - 'Type / to bring up the block selection menu, or @ to embed images or link other tags and notes. Type - then space to start a list, or [] then space to start a checklist. Drag and drop an image or file to embed it in your note.', - availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], + 'A new way to edit notes. Type / to bring up the block selection menu, or @ to embed images or link other tags and notes. Type - then space to start a list, or [] then space to start a checklist. Drag and drop an image or file to embed it in your note. Cmd/Ctrl + F to bring up search and replace.', }, { - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], name: 'Smart Filters', + availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], identifier: FeatureIdentifier.SmartFilters, permission_name: PermissionName.SmartFilters, description: 'Create smart filters for viewing notes matching specific criteria.', }, { - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], name: 'Encrypted files', + availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + availableInRoles: [RoleName.NAMES.ProUser], identifier: FeatureIdentifier.Files, permission_name: PermissionName.Files, description: '', }, - { - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], - name: 'Focus Mode', - identifier: FeatureIdentifier.FocusMode, - permission_name: PermissionName.FocusMode, - description: '', - }, - { - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], - name: 'Listed Custom Domain', - identifier: FeatureIdentifier.ListedCustomDomain, - permission_name: PermissionName.ListedCustomDomain, - description: '', - }, - { - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], - name: 'Multiple accounts', - identifier: FeatureIdentifier.AccountSwitcher, - permission_name: PermissionName.AccountSwitcher, - description: '', - }, ] } diff --git a/packages/features/src/Domain/Lists/DeprecatedFeatures.ts b/packages/features/src/Domain/Lists/DeprecatedFeatures.ts index 4e2d9e4dd..306440aa2 100644 --- a/packages/features/src/Domain/Lists/DeprecatedFeatures.ts +++ b/packages/features/src/Domain/Lists/DeprecatedFeatures.ts @@ -10,6 +10,7 @@ import { NoteType } from '../Component/NoteType' import { FillEditorComponentDefaults } from './Utilities/FillEditorComponentDefaults' import { ComponentAction } from '../Component/ComponentAction' import { ComponentArea } from '../Component/ComponentArea' +import { RoleName } from '@standardnotes/domain-core' export function GetDeprecatedFeatures(): FeatureDescription[] { const bold: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -37,6 +38,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] { permission_name: PermissionName.BoldEditor, description: 'A simple and peaceful rich editor that helps you write and think clearly.', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/bold.jpg', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const markdownBasic: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -50,6 +52,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] { permission_name: PermissionName.MarkdownBasicEditor, description: 'A Markdown editor with dynamic split-pane preview.', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/simple-markdown.jpg', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const markdownMinimist: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -64,6 +67,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] { deprecated: true, description: 'A minimal Markdown editor with live rendering and in-text search via Ctrl/Cmd + F', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/min-markdown.jpg', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const markdownMath: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -78,6 +82,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] { index_path: 'index.html', description: 'A beautiful split-pane Markdown editor with synced-scroll, LaTeX support, and colorful syntax.', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/fancy-markdown.jpg', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const filesafe: IframeComponentFeatureDescription = FillEditorComponentDefaults({ @@ -104,6 +109,7 @@ export function GetDeprecatedFeatures(): FeatureDescription[] { description: 'Encrypted attachments for your notes using your Dropbox, Google Drive, or WebDAV server. Limited to 50MB per file.', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/FileSafe-banner.png', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) return [bold, markdownBasic, markdownMinimist, markdownMath, filesafe] diff --git a/packages/features/src/Domain/Lists/Editors.ts b/packages/features/src/Domain/Lists/Editors.ts index f7446c848..8cc277f4a 100644 --- a/packages/features/src/Domain/Lists/Editors.ts +++ b/packages/features/src/Domain/Lists/Editors.ts @@ -4,6 +4,7 @@ import { PermissionName } from '../Permission/PermissionName' import { FeatureIdentifier } from '../Feature/FeatureIdentifier' import { NoteType } from '../Component/NoteType' import { FillEditorComponentDefaults } from './Utilities/FillEditorComponentDefaults' +import { RoleName } from '@standardnotes/domain-core' export function editors(): EditorFeatureDescription[] { const code: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -20,6 +21,7 @@ export function editors(): EditorFeatureDescription[] { 'Syntax highlighting and convenient keyboard shortcuts for over 120 programming' + ' languages. Ideal for code snippets and procedures.', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/code.jpg', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const plus: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -33,6 +35,7 @@ export function editors(): EditorFeatureDescription[] { description: 'From highlighting to custom font sizes and colors, to tables and lists, this editor is perfect for crafting any document.', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/plus-editor.jpg', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const markdown: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -46,6 +49,7 @@ export function editors(): EditorFeatureDescription[] { description: 'A fully featured Markdown editor that supports live preview, a styling toolbar, and split pane support.', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/adv-markdown.jpg', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const markdownAlt: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -59,6 +63,7 @@ export function editors(): EditorFeatureDescription[] { description: 'A WYSIWYG-style Markdown editor that renders Markdown in preview-mode while you type without displaying any syntax.', index_path: 'build/index.html', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const task: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -73,6 +78,7 @@ export function editors(): EditorFeatureDescription[] { description: 'A great way to manage short-term and long-term to-do"s. You can mark tasks as completed, change their order, and edit the text naturally in place.', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/task-editor.jpg', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const tokenvault: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -86,6 +92,7 @@ export function editors(): EditorFeatureDescription[] { description: 'Encrypt and protect your 2FA secrets for all your internet accounts. Authenticator handles your 2FA secrets so that you never lose them again, or have to start over when you get a new device.', thumbnail_url: 'https://standard-notes.s3.amazonaws.com/screenshots/models/editors/token-vault.png', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const spreadsheets: EditorFeatureDescription = FillEditorComponentDefaults({ @@ -99,6 +106,7 @@ export function editors(): EditorFeatureDescription[] { description: 'A powerful spreadsheet editor with formatting and formula support. Not recommended for large data sets, as encryption of such data may decrease editor performance.', thumbnail_url: 'https://s3.amazonaws.com/standard-notes/screenshots/models/editors/spreadsheets.png', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) return [code, plus, markdown, markdownAlt, task, tokenvault, spreadsheets] diff --git a/packages/features/src/Domain/Lists/ServerFeatures.ts b/packages/features/src/Domain/Lists/ServerFeatures.ts index 37c0389d4..9448215c2 100644 --- a/packages/features/src/Domain/Lists/ServerFeatures.ts +++ b/packages/features/src/Domain/Lists/ServerFeatures.ts @@ -65,5 +65,11 @@ export function serverFeatures(): ServerFeatureDescription[] { identifier: FeatureIdentifier.SubscriptionSharing, permission_name: PermissionName.SubscriptionSharing, }, + { + availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + name: 'Listed Custom Domain', + identifier: FeatureIdentifier.ListedCustomDomain, + permission_name: PermissionName.ListedCustomDomain, + }, ] } diff --git a/packages/features/src/Domain/Lists/Themes.ts b/packages/features/src/Domain/Lists/Themes.ts index e03e550ce..247e14f57 100644 --- a/packages/features/src/Domain/Lists/Themes.ts +++ b/packages/features/src/Domain/Lists/Themes.ts @@ -3,6 +3,7 @@ import { PermissionName } from '../Permission/PermissionName' import { FeatureIdentifier } from '../Feature/FeatureIdentifier' import { FillThemeComponentDefaults } from './Utilities/FillThemeComponentDefaults' import { SubscriptionName } from '@standardnotes/common' +import { RoleName } from '@standardnotes/domain-core' export function themes(): ThemeFeatureDescription[] { const midnight: ThemeFeatureDescription = FillThemeComponentDefaults({ @@ -17,10 +18,12 @@ export function themes(): ThemeFeatureDescription[] { foreground_color: '#ffffff', border_color: '#086DD6', }, + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) const futura: ThemeFeatureDescription = FillThemeComponentDefaults({ availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], name: 'Futura', identifier: FeatureIdentifier.FuturaTheme, permission_name: PermissionName.FuturaTheme, @@ -35,6 +38,7 @@ export function themes(): ThemeFeatureDescription[] { const solarizedDark: ThemeFeatureDescription = FillThemeComponentDefaults({ availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], name: 'Solarized Dark', identifier: FeatureIdentifier.SolarizedDarkTheme, permission_name: PermissionName.SolarizedDarkTheme, @@ -49,6 +53,7 @@ export function themes(): ThemeFeatureDescription[] { const autobiography: ThemeFeatureDescription = FillThemeComponentDefaults({ availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], name: 'Autobiography', identifier: FeatureIdentifier.AutobiographyTheme, permission_name: PermissionName.AutobiographyTheme, @@ -77,6 +82,7 @@ export function themes(): ThemeFeatureDescription[] { const titanium: ThemeFeatureDescription = FillThemeComponentDefaults({ availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], name: 'Titanium', identifier: FeatureIdentifier.TitaniumTheme, permission_name: PermissionName.TitaniumTheme, @@ -90,6 +96,7 @@ export function themes(): ThemeFeatureDescription[] { const dynamic: ThemeFeatureDescription = FillThemeComponentDefaults({ availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], name: 'Dynamic Panels', identifier: FeatureIdentifier.DynamicTheme, permission_name: PermissionName.ThemeDynamic, diff --git a/packages/responses/src/Domain/User/GetOfflineFeaturesResponse.ts b/packages/responses/src/Domain/User/GetOfflineFeaturesResponse.ts index ec5edb54a..4c564ab1f 100644 --- a/packages/responses/src/Domain/User/GetOfflineFeaturesResponse.ts +++ b/packages/responses/src/Domain/User/GetOfflineFeaturesResponse.ts @@ -4,5 +4,6 @@ import { MinimalHttpResponse } from '../Http/MinimalHttpResponses' export type GetOfflineFeaturesResponse = MinimalHttpResponse & { data?: { features: FeatureDescription[] + roles: string[] } } diff --git a/packages/services/src/Domain/Feature/FeaturesClientInterface.ts b/packages/services/src/Domain/Feature/FeaturesClientInterface.ts index 21db88300..7d8862852 100644 --- a/packages/services/src/Domain/Feature/FeaturesClientInterface.ts +++ b/packages/services/src/Domain/Feature/FeaturesClientInterface.ts @@ -1,4 +1,4 @@ -import { FeatureDescription, FeatureIdentifier } from '@standardnotes/features' +import { FeatureIdentifier } from '@standardnotes/features' import { SNComponent } from '@standardnotes/models' import { FeatureStatus } from './FeatureStatus' @@ -7,10 +7,10 @@ import { SetOfflineFeaturesFunctionResponse } from './SetOfflineFeaturesFunction export interface FeaturesClientInterface { downloadExternalFeature(urlOrCode: string): Promise - getUserFeature(featureId: FeatureIdentifier): FeatureDescription | undefined - getFeatureStatus(featureId: FeatureIdentifier): FeatureStatus + hasFirstPartySubscription(): boolean + hasMinimumRole(role: string): boolean setOfflineFeaturesCode(code: string): Promise diff --git a/packages/services/src/Domain/Storage/StorageKeys.ts b/packages/services/src/Domain/Storage/StorageKeys.ts index d22fc232e..55ce4ba6b 100644 --- a/packages/services/src/Domain/Storage/StorageKeys.ts +++ b/packages/services/src/Domain/Storage/StorageKeys.ts @@ -34,6 +34,7 @@ export enum StorageKey { StorageEncryptionPolicy = 'storage_policy', WebSocketUrl = 'webSocket_url', UserRoles = 'user_roles', + OfflineUserRoles = 'offline_user_roles', UserFeatures = 'user_features', ExperimentalFeatures = 'experimental_features', DeinitMode = 'deinit_mode', diff --git a/packages/snjs/lib/Application/Application.ts b/packages/snjs/lib/Application/Application.ts index 653f8667e..77e555106 100644 --- a/packages/snjs/lib/Application/Application.ts +++ b/packages/snjs/lib/Application/Application.ts @@ -1160,8 +1160,8 @@ export class SNApplication implements ApplicationInterface, AppGroupManagedAppli return this.apiService.isThirdPartyHostUsed() } - public getCloudProviderIntegrationUrl(cloudProviderName: Settings.CloudProvider, isDevEnvironment: boolean): string { - return this.settingsService.getCloudProviderIntegrationUrl(cloudProviderName, isDevEnvironment) + public getCloudProviderIntegrationUrl(cloudProviderName: Settings.CloudProvider): string { + return this.settingsService.getCloudProviderIntegrationUrl(cloudProviderName) } private constructServices() { diff --git a/packages/snjs/lib/Hosts.ts b/packages/snjs/lib/Hosts.ts index 1ba17f90e..9f88db3a3 100644 --- a/packages/snjs/lib/Hosts.ts +++ b/packages/snjs/lib/Hosts.ts @@ -1,24 +1,15 @@ -export const APPLICATION_DEFAULT_HOSTS = [ - 'api.standardnotes.com', - 'api-dev.standardnotes.com', - 'sync.standardnotes.org', - 'syncing-server-demo.standardnotes.com', -] +export const APPLICATION_DEFAULT_HOSTS = ['api.standardnotes.com', 'sync.standardnotes.org'] -export const FILES_DEFAULT_HOSTS = ['files.standardnotes.com', 'files-dev.standardnotes.com'] +export const FILES_DEFAULT_HOSTS = ['files.standardnotes.com'] export const TRUSTED_FEATURE_HOSTS = [ - 'api-dev.standardnotes.com', 'api.standardnotes.com', 'extensions.standardnotes.com', 'extensions.standardnotes.org', - 'extensions-server-dev.standardnotes.org', - 'extensions-server-dev.standardnotes.com', 'features.standardnotes.com', ] export enum ExtensionsServerURL { - Dev = 'https://extensions-server-dev.standardnotes.org', Prod = 'https://extensions.standardnotes.org', } diff --git a/packages/snjs/lib/Services/Api/ApiService.ts b/packages/snjs/lib/Services/Api/ApiService.ts index 60b60e9e0..bf22149cb 100644 --- a/packages/snjs/lib/Services/Api/ApiService.ts +++ b/packages/snjs/lib/Services/Api/ApiService.ts @@ -654,7 +654,7 @@ export class SNApiService public async downloadOfflineFeaturesFromRepo( repo: SNFeatureRepo, - ): Promise<{ features: FeatureDescription[] } | ClientDisplayableError> { + ): Promise<{ features: FeatureDescription[]; roles: string[] } | ClientDisplayableError> { try { const featuresUrl = repo.offlineFeaturesUrl const extensionKey = repo.offlineKey @@ -678,8 +678,10 @@ export class SNApiService if (response.error) { return ClientDisplayableError.FromError(response.error) } + const data = (response as Responses.GetOfflineFeaturesResponse).data return { - features: (response as Responses.GetOfflineFeaturesResponse).data?.features || [], + features: data?.features || [], + roles: data?.roles || [], } } catch { return new ClientDisplayableError(API_MESSAGE_FAILED_OFFLINE_ACTIVATION) diff --git a/packages/snjs/lib/Services/Api/WebsocketsService.ts b/packages/snjs/lib/Services/Api/WebsocketsService.ts index 3a8fa7788..fc76572fd 100644 --- a/packages/snjs/lib/Services/Api/WebsocketsService.ts +++ b/packages/snjs/lib/Services/Api/WebsocketsService.ts @@ -80,7 +80,7 @@ export class SNWebSocketsService extends AbstractService { featuresService.getExperimentalFeatures = jest.fn().mockReturnValue([FeatureIdentifier.PlusEditor]) featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(itemManager.createItem).not.toHaveBeenCalled() }) @@ -191,7 +191,7 @@ describe('featuresService', () => { featuresService.getEnabledExperimentalFeatures = jest.fn().mockReturnValue([FeatureIdentifier.PlusEditor]) featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(itemManager.createItem).toHaveBeenCalled() }) }) @@ -213,7 +213,7 @@ describe('featuresService', () => { const mock = (featuresService['notifyEvent'] = jest.fn()) const newRoles = [...roles, RoleName.NAMES.PlusUser] - await featuresService.setRoles(newRoles) + await featuresService.setOnlineRoles(newRoles) expect(mock.mock.calls[0][0]).toEqual(FeaturesEvent.UserRolesChanged) }) @@ -226,7 +226,7 @@ describe('featuresService', () => { const spy = jest.spyOn(featuresService, 'notifyEvent' as never) const newRoles = [...roles, RoleName.NAMES.ProUser] - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(spy.mock.calls[2][0]).toEqual(FeaturesEvent.DidPurchaseSubscription) }) @@ -235,12 +235,12 @@ describe('featuresService', () => { storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() featuresService.initializeFromDisk() - featuresService['roles'] = [] + featuresService['onlineRoles'] = [] const spy = jest.spyOn(featuresService, 'notifyEvent' as never) const newRoles = [...roles, RoleName.NAMES.ProUser] - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) const triggeredEvents = spy.mock.calls.map((call) => call[0]) expect(triggeredEvents).not.toContain(FeaturesEvent.DidPurchaseSubscription) @@ -252,7 +252,7 @@ describe('featuresService', () => { storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(storageService.setValue).toHaveBeenCalledWith(StorageKey.UserRoles, newRoles) expect(apiService.getUserFeatures).toHaveBeenCalledWith('123') }) @@ -263,7 +263,7 @@ describe('featuresService', () => { storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(storageService.setValue).toHaveBeenCalledWith(StorageKey.UserRoles, newRoles) expect(apiService.getUserFeatures).toHaveBeenCalledWith('123') }) @@ -274,7 +274,7 @@ describe('featuresService', () => { storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(storageService.setValue).toHaveBeenCalledWith(StorageKey.UserFeatures, features) }) @@ -284,7 +284,7 @@ describe('featuresService', () => { storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(itemManager.createItem).toHaveBeenCalledTimes(2) expect(itemManager.createItem).toHaveBeenCalledWith( ContentType.Theme, @@ -328,7 +328,7 @@ describe('featuresService', () => { itemManager.getItems = jest.fn().mockReturnValue([existingItem]) const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(itemManager.changeComponent).toHaveBeenCalledWith(existingItem, expect.any(Function)) }) @@ -354,7 +354,7 @@ describe('featuresService', () => { const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(itemManager.createItem).toHaveBeenCalledWith( ContentType.Component, expect.objectContaining({ @@ -401,7 +401,7 @@ describe('featuresService', () => { const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(itemManager.setItemsToBeDeleted).toHaveBeenCalledWith([existingItem]) }) @@ -424,7 +424,7 @@ describe('featuresService', () => { storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(itemManager.createItem).not.toHaveBeenCalled() }) @@ -447,7 +447,7 @@ describe('featuresService', () => { storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(itemManager.createItem).not.toHaveBeenCalled() }) @@ -455,10 +455,10 @@ describe('featuresService', () => { storageService.getValue = jest.fn().mockReturnValue(roles) const featuresService = createService() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', roles) - await featuresService.updateRolesAndFetchFeatures('123', roles) - await featuresService.updateRolesAndFetchFeatures('123', roles) - await featuresService.updateRolesAndFetchFeatures('123', roles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', roles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', roles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', roles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', roles) expect(storageService.setValue).toHaveBeenCalledTimes(2) }) @@ -482,7 +482,7 @@ describe('featuresService', () => { const nativeFeature = featuresService['mapRemoteNativeFeatureToStaticFeature'](remoteFeature) featuresService['mapRemoteNativeFeatureToItem'] = jest.fn() featuresService.initializeFromDisk() - await featuresService.updateRolesAndFetchFeatures('123', newRoles) + await featuresService.updateOnlineRolesAndFetchFeatures('123', newRoles) expect(featuresService['mapRemoteNativeFeatureToItem']).toHaveBeenCalledWith( nativeFeature, expect.anything(), @@ -509,7 +509,26 @@ describe('featuresService', () => { await expect(() => featuresService['mapRemoteNativeFeatureToItem'](clientFeature, [], [])).rejects.toThrow() }) - it('feature status', async () => { + it('role-based feature status', async () => { + const featuresService = createService() + + features = [] as jest.Mocked + + apiService.getUserFeatures = jest.fn().mockReturnValue({ + data: { + features, + }, + }) + + sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) + + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) + + expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.Entitled) + expect(featuresService.getFeatureStatus(FeatureIdentifier.SuperEditor)).toBe(FeatureStatus.Entitled) + }) + + it('feature status with no paid role but features listings', async () => { const featuresService = createService() features = [ @@ -535,54 +554,21 @@ describe('featuresService', () => { sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) - - expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.Entitled) - expect(featuresService.getFeatureStatus(FeatureIdentifier.PlusEditor)).toBe(FeatureStatus.NotInCurrentPlan) - expect(featuresService.getFeatureStatus(FeatureIdentifier.SheetsEditor)).toBe(FeatureStatus.NotInCurrentPlan) - - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.NoUserSubscription) expect(featuresService.getFeatureStatus(FeatureIdentifier.PlusEditor)).toBe(FeatureStatus.NoUserSubscription) expect(featuresService.getFeatureStatus(FeatureIdentifier.SheetsEditor)).toBe(FeatureStatus.NoUserSubscription) - - features = [ - { - identifier: FeatureIdentifier.MidnightTheme, - content_type: ContentType.Theme, - expires_at: expiredDate, - role_name: RoleName.NAMES.PlusUser, - }, - { - identifier: FeatureIdentifier.PlusEditor, - content_type: ContentType.Component, - expires_at: expiredDate, - role_name: RoleName.NAMES.ProUser, - }, - ] as jest.Mocked - - apiService.getUserFeatures = jest.fn().mockReturnValue({ - data: { - features, - }, - }) - - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.PlusUser]) - - expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe( - FeatureStatus.InCurrentPlanButExpired, - ) - expect(featuresService.getFeatureStatus(FeatureIdentifier.PlusEditor)).toBe(FeatureStatus.NotInCurrentPlan) - expect(featuresService.getFeatureStatus(FeatureIdentifier.SheetsEditor)).toBe(FeatureStatus.NotInCurrentPlan) }) - it('availableInRoles-based features', async () => { + it('role-based features while not signed into first party server', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.ProUser]) + sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(false) - expect(featuresService.getFeatureStatus(FeatureIdentifier.SuperEditor)).toBe(FeatureStatus.Entitled) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.ProUser]) + + expect(featuresService.getFeatureStatus(FeatureIdentifier.SuperEditor)).toBe(FeatureStatus.NotInCurrentPlan) }) it('third party feature status', async () => { @@ -629,7 +615,7 @@ describe('featuresService', () => { } as never), ]) - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) expect(featuresService.getFeatureStatus(themeFeature.identifier)).toBe(FeatureStatus.Entitled) expect(featuresService.getFeatureStatus(editorFeature.identifier)).toBe(FeatureStatus.InCurrentPlanButExpired) @@ -641,7 +627,7 @@ describe('featuresService', () => { it('feature status should be not entitled if no account or offline repo', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(false) @@ -653,30 +639,6 @@ describe('featuresService', () => { ) }) - it('feature status should be entitled for subscriber until first successful features request made if no cached features', async () => { - const featuresService = createService() - - apiService.getUserFeatures = jest.fn().mockReturnValue({ - data: { - features: [], - }, - }) - - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) - - sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) - - featuresService['completedSuccessfulFeaturesRetrieval'] = false - - expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.Entitled) - expect(featuresService.getFeatureStatus(FeatureIdentifier.TokenVaultEditor)).toBe(FeatureStatus.Entitled) - - await featuresService.didDownloadFeatures(features) - - expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.Entitled) - expect(featuresService.getFeatureStatus(FeatureIdentifier.TokenVaultEditor)).toBe(FeatureStatus.NotInCurrentPlan) - }) - it('didDownloadFeatures should filter out client controlled features', async () => { const featuresService = createService() @@ -687,31 +649,13 @@ describe('featuresService', () => { expect(featuresService['mapRemoteNativeFeaturesToItems']).toHaveBeenCalledWith([]) }) - it('feature status should be dynamic for subscriber if cached features and no successful features request made yet', async () => { - const featuresService = createService() - - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) - - featuresService['completedSuccessfulFeaturesRetrieval'] = false - - sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) - - expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.Entitled) - expect(featuresService.getFeatureStatus(FeatureIdentifier.TokenVaultEditor)).toBe(FeatureStatus.NotInCurrentPlan) - - featuresService['completedSuccessfulFeaturesRetrieval'] = false - - expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.Entitled) - expect(featuresService.getFeatureStatus(FeatureIdentifier.TokenVaultEditor)).toBe(FeatureStatus.NotInCurrentPlan) - }) - it('feature status for offline subscription', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(false) - featuresService.rolesIncludePaidSubscription = jest.fn().mockReturnValue(false) + featuresService.onlineRolesIncludePaidSubscription = jest.fn().mockReturnValue(false) featuresService['completedSuccessfulFeaturesRetrieval'] = true expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.NoUserSubscription) @@ -720,9 +664,11 @@ describe('featuresService', () => { ) featuresService.hasOfflineRepo = jest.fn().mockReturnValue(true) + featuresService.hasFirstPartySubscription = jest.fn().mockReturnValue(true) + await featuresService.setOfflineRoles([RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) expect(featuresService.getFeatureStatus(FeatureIdentifier.MidnightTheme)).toBe(FeatureStatus.Entitled) - expect(featuresService.getFeatureStatus(FeatureIdentifier.TokenVaultEditor)).toBe(FeatureStatus.NotInCurrentPlan) + expect(featuresService.getFeatureStatus(FeatureIdentifier.TokenVaultEditor)).toBe(FeatureStatus.Entitled) }) it('feature status for deprecated feature', async () => { @@ -734,7 +680,7 @@ describe('featuresService', () => { FeatureStatus.NoUserSubscription, ) - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) expect(featuresService.getFeatureStatus(FeatureIdentifier.DeprecatedFileSafe as FeatureIdentifier)).toBe( FeatureStatus.Entitled, @@ -744,25 +690,25 @@ describe('featuresService', () => { it('has paid subscription', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) - expect(featuresService.hasPaidOnlineOrOfflineSubscription()).toBeFalsy + expect(featuresService.hasPaidAnyPartyOnlineOrOfflineSubscription()).toBeFalsy - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) - expect(featuresService.hasPaidOnlineOrOfflineSubscription()).toEqual(true) + expect(featuresService.hasPaidAnyPartyOnlineOrOfflineSubscription()).toEqual(true) }) it('has paid subscription should be true if offline repo and signed into third party server', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) featuresService.hasOfflineRepo = jest.fn().mockReturnValue(true) sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(false) - expect(featuresService.hasPaidOnlineOrOfflineSubscription()).toEqual(true) + expect(featuresService.hasPaidAnyPartyOnlineOrOfflineSubscription()).toEqual(true) }) }) @@ -829,7 +775,11 @@ describe('featuresService', () => { it('should sort given roles according to role hierarchy', () => { const featuresService = createService() - const sortedRoles = featuresService.rolesBySorting([RoleName.NAMES.ProUser, RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser]) + const sortedRoles = featuresService.rolesBySorting([ + RoleName.NAMES.ProUser, + RoleName.NAMES.CoreUser, + RoleName.NAMES.PlusUser, + ]) expect(sortedRoles).toStrictEqual([RoleName.NAMES.CoreUser, RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser]) }) @@ -839,7 +789,7 @@ describe('featuresService', () => { it('should be false if core user checks for plus role', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.CoreUser]) const hasPlusUserRole = featuresService.hasMinimumRole(RoleName.NAMES.PlusUser) @@ -849,7 +799,9 @@ describe('featuresService', () => { it('should be false if plus user checks for pro role', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.PlusUser, RoleName.NAMES.CoreUser]) + sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) + + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.PlusUser, RoleName.NAMES.CoreUser]) const hasProUserRole = featuresService.hasMinimumRole(RoleName.NAMES.ProUser) @@ -859,7 +811,9 @@ describe('featuresService', () => { it('should be true if pro user checks for core user', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.ProUser, RoleName.NAMES.PlusUser]) + sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) + + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.ProUser, RoleName.NAMES.PlusUser]) const hasCoreUserRole = featuresService.hasMinimumRole(RoleName.NAMES.CoreUser) @@ -869,7 +823,9 @@ describe('featuresService', () => { it('should be true if pro user checks for pro user', async () => { const featuresService = createService() - await featuresService.updateRolesAndFetchFeatures('123', [RoleName.NAMES.ProUser, RoleName.NAMES.PlusUser]) + sessionManager.isSignedIntoFirstPartyServer = jest.fn().mockReturnValue(true) + + await featuresService.updateOnlineRolesAndFetchFeatures('123', [RoleName.NAMES.ProUser, RoleName.NAMES.PlusUser]) const hasProUserRole = featuresService.hasMinimumRole(RoleName.NAMES.ProUser) diff --git a/packages/snjs/lib/Services/Features/FeaturesService.ts b/packages/snjs/lib/Services/Features/FeaturesService.ts index dc57038bf..db1718271 100644 --- a/packages/snjs/lib/Services/Features/FeaturesService.ts +++ b/packages/snjs/lib/Services/Features/FeaturesService.ts @@ -58,7 +58,8 @@ export class SNFeaturesService implements FeaturesClientInterface, InternalEventHandlerInterface { private deinited = false - private roles: string[] = [] + private onlineRoles: string[] = [] + private offlineRoles: string[] = [] private features: FeaturesImports.FeatureDescription[] = [] private enabledExperimentalFeatures: FeaturesImports.FeatureIdentifier[] = [] private removeWebSocketsServiceObserver: () => void @@ -87,7 +88,7 @@ export class SNFeaturesService const { payload: { userUuid, currentRoles }, } = data as UserRolesChangedEvent - await this.updateRolesAndFetchFeatures(userUuid, currentRoles) + await this.updateOnlineRolesAndFetchFeatures(userUuid, currentRoles) } }) @@ -124,6 +125,16 @@ export class SNFeaturesService }) } + public initializeFromDisk(): void { + this.onlineRoles = this.storageService.getValue(StorageKey.UserRoles, undefined, []) + + this.offlineRoles = this.storageService.getValue(StorageKey.OfflineUserRoles, undefined, []) + + this.features = this.storageService.getValue(StorageKey.UserFeatures, undefined, []) + + this.enabledExperimentalFeatures = this.storageService.getValue(StorageKey.ExperimentalFeatures, undefined, []) + } + async handleEvent(event: InternalEventInterface): Promise { if (event.type === ApiServiceEvent.MetaReceived) { if (!this.syncService) { @@ -142,7 +153,7 @@ export class SNFeaturesService } const { userUuid, userRoles } = event.payload as MetaReceivedData - await this.updateRolesAndFetchFeatures( + await this.updateOnlineRolesAndFetchFeatures( userUuid, userRoles.map((role) => role.name), ) @@ -155,7 +166,7 @@ export class SNFeaturesService if (stage === ApplicationStage.FullSyncCompleted_13) { void this.mapClientControlledFeaturesToItems() - if (!this.rolesIncludePaidSubscription()) { + if (!this.hasFirstPartyOnlineSubscription()) { const offlineRepo = this.getOfflineRepo() if (offlineRepo) { void this.downloadOfflineFeatures(offlineRepo) @@ -194,7 +205,7 @@ export class SNFeaturesService } public enableExperimentalFeature(identifier: FeaturesImports.FeatureIdentifier): void { - const feature = this.getUserFeature(identifier) + const feature = this.getFeatureThatOriginallyCameFromServer(identifier) this.enabledExperimentalFeatures.push(identifier) @@ -309,10 +320,14 @@ export class SNFeaturesService repo: Models.SNFeatureRepo, ): Promise { const result = await this.apiService.downloadOfflineFeaturesFromRepo(repo) + if (result instanceof ClientDisplayableError) { return result } + await this.didDownloadFeatures(result.features) + await this.setOfflineRoles(result.roles) + return undefined } @@ -363,18 +378,29 @@ export class SNFeaturesService } } - public initializeFromDisk(): void { - this.roles = this.storageService.getValue(StorageKey.UserRoles, undefined, []) - - this.features = this.storageService.getValue(StorageKey.UserFeatures, undefined, []) - - this.enabledExperimentalFeatures = this.storageService.getValue(StorageKey.ExperimentalFeatures, undefined, []) + hasFirstPartyOnlineSubscription(): boolean { + return this.sessionManager.isSignedIntoFirstPartyServer() && this.onlineRolesIncludePaidSubscription() } - public async updateRolesAndFetchFeatures(userUuid: UuidString, roles: string[]): Promise { - const previousRoles = this.roles + hasFirstPartySubscription(): boolean { + if (this.hasFirstPartyOnlineSubscription()) { + return true + } - const userRolesChanged = this.haveRolesChanged(roles) + const offlineRepo = this.getOfflineRepo() + if (!offlineRepo) { + return false + } + + const hasFirstPartyOfflineSubscription = offlineRepo.content.offlineFeaturesUrl === PROD_OFFLINE_FEATURES_URL + return hasFirstPartyOfflineSubscription + } + + async updateOnlineRolesAndFetchFeatures(userUuid: UuidString, roles: string[]): Promise { + const previousRoles = this.onlineRoles + + const userRolesChanged = + roles.some((role) => !this.onlineRoles.includes(role)) || this.onlineRoles.some((role) => !roles.includes(role)) const isInitialLoadRolesChange = previousRoles.length === 0 && userRolesChanged @@ -384,7 +410,7 @@ export class SNFeaturesService this.needsInitialFeaturesUpdate = false - await this.setRoles(roles) + await this.setOnlineRoles(roles) const shouldDownloadRoleBasedFeatures = !this.hasOfflineRepo() @@ -398,22 +424,34 @@ export class SNFeaturesService } if (userRolesChanged && !isInitialLoadRolesChange) { - if (this.rolesIncludePaidSubscription()) { + if (this.onlineRolesIncludePaidSubscription()) { await this.notifyEvent(FeaturesEvent.DidPurchaseSubscription) } } } - async setRoles(roles: string[]): Promise { - const rolesChanged = !arraysEqual(this.roles, roles) + async setOnlineRoles(roles: string[]): Promise { + const rolesChanged = !arraysEqual(this.onlineRoles, roles) - this.roles = roles + this.onlineRoles = roles if (rolesChanged) { void this.notifyEvent(FeaturesEvent.UserRolesChanged) } - this.storageService.setValue(StorageKey.UserRoles, this.roles) + this.storageService.setValue(StorageKey.UserRoles, this.onlineRoles) + } + + async setOfflineRoles(roles: string[]): Promise { + const rolesChanged = !arraysEqual(this.offlineRoles, roles) + + this.offlineRoles = roles + + if (rolesChanged) { + void this.notifyEvent(FeaturesEvent.UserRolesChanged) + } + + this.storageService.setValue(StorageKey.OfflineUserRoles, this.offlineRoles) } public async didDownloadFeatures(features: FeaturesImports.FeatureDescription[]): Promise { @@ -465,17 +503,19 @@ export class SNFeaturesService return nativeFeatureCopy } - public getUserFeature(featureId: FeaturesImports.FeatureIdentifier): FeaturesImports.FeatureDescription | undefined { + public getFeatureThatOriginallyCameFromServer( + featureId: FeaturesImports.FeatureIdentifier, + ): FeaturesImports.FeatureDescription | undefined { return this.features.find((feature) => feature.identifier === featureId) } - rolesIncludePaidSubscription(): boolean { + onlineRolesIncludePaidSubscription(): boolean { const unpaidRoles = [RoleName.NAMES.CoreUser] - return this.roles.some((role) => !unpaidRoles.includes(role)) + return this.onlineRoles.some((role) => !unpaidRoles.includes(role)) } - public hasPaidOnlineOrOfflineSubscription(): boolean { - return this.rolesIncludePaidSubscription() || this.hasOfflineRepo() + hasPaidAnyPartyOnlineOrOfflineSubscription(): boolean { + return this.onlineRolesIncludePaidSubscription() || this.hasOfflineRepo() } public rolesBySorting(roles: string[]): string[] { @@ -485,7 +525,7 @@ export class SNFeaturesService public hasMinimumRole(role: string): boolean { const sortedAllRoles = Object.values(RoleName.NAMES) - const sortedUserRoles = this.rolesBySorting(this.roles) + const sortedUserRoles = this.rolesBySorting(this.rolesToUseForFeatureCheck()) const highestUserRoleIndex = sortedAllRoles.indexOf(lastElement(sortedUserRoles) as string) @@ -508,16 +548,10 @@ export class SNFeaturesService } const nativeFeature = FeaturesImports.FindNativeFeature(featureId) - if (nativeFeature && nativeFeature.availableInRoles) { - const hasRole = this.roles.some((role) => nativeFeature.availableInRoles?.includes(role)) - if (hasRole) { - return FeatureStatus.Entitled - } - } const isDeprecated = this.isFeatureDeprecated(featureId) if (isDeprecated) { - if (this.hasPaidOnlineOrOfflineSubscription()) { + if (this.hasPaidAnyPartyOnlineOrOfflineSubscription()) { return FeatureStatus.Entitled } else { return FeatureStatus.NoUserSubscription @@ -538,7 +572,7 @@ export class SNFeaturesService return FeatureStatus.Entitled } - if (this.hasPaidOnlineOrOfflineSubscription()) { + if (this.hasPaidAnyPartyOnlineOrOfflineSubscription()) { if (!this.completedSuccessfulFeaturesRetrieval) { const hasCachedFeatures = this.features.length > 0 const temporarilyAllowUntilServerUpdates = !hasCachedFeatures @@ -550,25 +584,27 @@ export class SNFeaturesService return FeatureStatus.NoUserSubscription } - const feature = this.getUserFeature(featureId) - if (!feature) { - return FeatureStatus.NotInCurrentPlan - } - - const expired = feature.expires_at && new Date(feature.expires_at).getTime() < new Date().getTime() - if (expired) { - if (!this.roles.includes(feature.role_name as string)) { + if (nativeFeature) { + if (!this.hasFirstPartySubscription()) { return FeatureStatus.NotInCurrentPlan - } else { - return FeatureStatus.InCurrentPlanButExpired + } + + const roles = this.rolesToUseForFeatureCheck() + if (nativeFeature.availableInRoles) { + const hasRole = roles.some((role) => { + return nativeFeature.availableInRoles?.includes(role) + }) + if (!hasRole) { + return FeatureStatus.NotInCurrentPlan + } } } return FeatureStatus.Entitled } - private haveRolesChanged(roles: string[]): boolean { - return roles.some((role) => !this.roles.includes(role)) || this.roles.some((role) => !roles.includes(role)) + private rolesToUseForFeatureCheck(): string[] { + return this.hasFirstPartyOnlineSubscription() ? this.onlineRoles : this.offlineRoles } private componentContentForNativeFeatureDescription(feature: FeaturesImports.FeatureDescription): Models.ItemContent { @@ -776,7 +812,8 @@ export class SNFeaturesService ;(this.removeWebSocketsServiceObserver as unknown) = undefined this.removefeatureReposObserver() ;(this.removefeatureReposObserver as unknown) = undefined - ;(this.roles as unknown) = undefined + ;(this.onlineRoles as unknown) = undefined + ;(this.offlineRoles as unknown) = undefined ;(this.storageService as unknown) = undefined ;(this.apiService as unknown) = undefined ;(this.itemManager as unknown) = undefined @@ -793,7 +830,7 @@ export class SNFeaturesService override getDiagnostics(): Promise { return Promise.resolve({ features: { - roles: this.roles, + roles: this.onlineRoles, features: this.features, enabledExperimentalFeatures: this.enabledExperimentalFeatures, needsInitialFeaturesUpdate: this.needsInitialFeaturesUpdate, diff --git a/packages/snjs/lib/Services/Settings/SNSettingsService.ts b/packages/snjs/lib/Services/Settings/SNSettingsService.ts index cc4621be7..89f7632e0 100644 --- a/packages/snjs/lib/Services/Settings/SNSettingsService.ts +++ b/packages/snjs/lib/Services/Settings/SNSettingsService.ts @@ -66,10 +66,9 @@ export class SNSettingsService extends AbstractService implements SettingsClient return this.frequencyOptionsLabels[frequency] } - getCloudProviderIntegrationUrl(cloudProviderName: CloudProvider, isDevEnvironment: boolean): string { - const { Dev, Prod } = ExtensionsServerURL - const extServerUrl = isDevEnvironment ? Dev : Prod - return `${extServerUrl}/${this.cloudProviderIntegrationUrlEndpoints[cloudProviderName]}?redirect_url=${extServerUrl}/components/cloudlink?` + getCloudProviderIntegrationUrl(cloudProviderName: CloudProvider): string { + const { Prod } = ExtensionsServerURL + return `${Prod}/${this.cloudProviderIntegrationUrlEndpoints[cloudProviderName]}?redirect_url=${Prod}/components/cloudlink?` } override deinit(): void { diff --git a/packages/snjs/mocha/features.test.js b/packages/snjs/mocha/features.test.js index 7b624dc5f..31419d60d 100644 --- a/packages/snjs/mocha/features.test.js +++ b/packages/snjs/mocha/features.test.js @@ -60,8 +60,8 @@ describe('features', () => { describe('new user roles received on api response meta', () => { it('should save roles and features', async () => { - expect(application.featuresService.roles).to.have.lengthOf(1) - expect(application.featuresService.roles[0]).to.equal('CORE_USER') + expect(application.featuresService.onlineRoles).to.have.lengthOf(1) + expect(application.featuresService.onlineRoles[0]).to.equal('CORE_USER') expect(application.featuresService.features).to.have.lengthOf(3) expect(application.featuresService.features[0]).to.containSubset(midnightThemeFeature) @@ -115,7 +115,7 @@ describe('features', () => { // Wipe items from initial sync await application.itemManager.removeAllItemsFromMemory() // Wipe roles from initial sync - await application.featuresService.setRoles([]) + await application.featuresService.setOnlineRoles([]) // Create pre-existing item for theme without all the info await application.itemManager.createItem( ContentType.Theme, @@ -165,7 +165,7 @@ describe('features', () => { .find((theme) => theme.identifier === midnightThemeFeature.identifier) // Wipe roles from initial sync - await application.featuresService.setRoles([]) + await application.featuresService.setOnlineRoles([]) // Call sync intentionally to get roles again in meta await application.sync.sync() @@ -184,7 +184,7 @@ describe('features', () => { }) it('should provide feature', async () => { - const feature = application.features.getUserFeature(FeatureIdentifier.PlusEditor) + const feature = application.features.getFeatureThatOriginallyCameFromServer(FeatureIdentifier.PlusEditor) expect(feature).to.containSubset(plusEditorFeature) }) diff --git a/packages/snjs/mocha/keys.test.js b/packages/snjs/mocha/keys.test.js index 222f483ff..bbdd4d46b 100644 --- a/packages/snjs/mocha/keys.test.js +++ b/packages/snjs/mocha/keys.test.js @@ -645,6 +645,8 @@ describe('keys', function () { expect(Object.keys(clientBUndecryptables).length).to.equal(1) expect(Object.keys(clientAUndecryptables).length).to.equal(0) + + await contextB.deinit() }) describe('changing password on 003 client while signed into 004 client should', function () { diff --git a/packages/snjs/mocha/sync_tests/conflicting.test.js b/packages/snjs/mocha/sync_tests/conflicting.test.js index 07d3be138..1c5c3817a 100644 --- a/packages/snjs/mocha/sync_tests/conflicting.test.js +++ b/packages/snjs/mocha/sync_tests/conflicting.test.js @@ -40,7 +40,7 @@ describe('online conflict handling', function () { afterEach(async function () { if (!this.application.dealloced) { - await Factory.safeDeinit(this.application) + await this.context.deinit() } localStorage.clear() }) @@ -950,6 +950,7 @@ describe('online conflict handling', function () { expect(contextA.findNoteByTitle('title-B').payload.updated_at_timestamp).to.equal(noteBExpectedTimestamp) await this.sharedFinalAssertions() + await contextB.deinit() }).timeout(20000) it('editing original note many times after conflict on other client should only result in 2 cumulative notes', async function () { @@ -979,5 +980,6 @@ describe('online conflict handling', function () { expect(contextB.noteCount).to.equal(2) await this.sharedFinalAssertions() + await contextB.deinit() }).timeout(20000) }) diff --git a/packages/snjs/mocha/sync_tests/online.test.js b/packages/snjs/mocha/sync_tests/online.test.js index ffbbda1cd..1ab803218 100644 --- a/packages/snjs/mocha/sync_tests/online.test.js +++ b/packages/snjs/mocha/sync_tests/online.test.js @@ -1052,5 +1052,7 @@ describe('online syncing', function () { await contextB.sync() expect(contextB.application.items.allCountableNotesCount()).to.equal(0) + + await contextB.deinit() }) }) diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index 86e77d287..fb8488483 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -28,7 +28,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline ### Features * Added rename option to file preview modal ([aa88966](https://github.com/standardnotes/app/commit/aa8896678315de67551c786e64aec7dfd10479e3)) -* **snjs:** add revisions api v2 ([#2154](https://github.com/standardnotes/app/issues/2154)) ([880a537](https://github.com/standardnotes/app/commit/880a537774ddcefaedb0d4e5dc50b363f4b93e01)) ## [3.138.6](https://github.com/standardnotes/app/compare/@standardnotes/web@3.138.5...@standardnotes/web@3.138.6) (2023-01-17) diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json index 9c834e579..238b7c54f 100644 --- a/packages/web/CHANGELOG.md.json +++ b/packages/web/CHANGELOG.md.json @@ -50,12 +50,10 @@ "body": "### Features\n\n* Added rename option to file preview modal ([aa88966](https://github.com/standardnotes/app/commit/aa8896678315de67551c786e64aec7dfd10479e3))\n* **snjs:** add revisions api v2 ([#2154](https://github.com/standardnotes/app/issues/2154)) ([880a537](https://github.com/standardnotes/app/commit/880a537774ddcefaedb0d4e5dc50b363f4b93e01))", "parsed": { "_": [ - "Added rename option to file preview modal (aa88966)", - "snjs: add revisions api v2 (#2154) (880a537)" + "Added rename option to file preview modal (aa88966)" ], "Features": [ - "Added rename option to file preview modal (aa88966)", - "snjs: add revisions api v2 (#2154) (880a537)" + "Added rename option to file preview modal (aa88966)" ] } }, diff --git a/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx b/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx index edd18750a..719b08a99 100644 --- a/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx +++ b/packages/web/src/javascripts/Components/Footer/UpgradeNow.tsx @@ -13,6 +13,7 @@ type Props = { const UpgradeNow = ({ application, featuresController, subscriptionContoller }: Props) => { const shouldShowCTA = !featuresController.hasFolders const hasAccount = subscriptionContoller.hasAccount + const hasAccessToFeatures = subscriptionContoller.hasFirstPartySubscription const onClick = useCallback(() => { if (hasAccount && application.isNativeIOS()) { @@ -22,16 +23,20 @@ const UpgradeNow = ({ application, featuresController, subscriptionContoller }: } }, [application, hasAccount]) - return shouldShowCTA ? ( + if (!shouldShowCTA || hasAccessToFeatures) { + return null + } + + return (

- ) : null + ) } export default observer(UpgradeNow) diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email.tsx index deaba555b..fa6306631 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Email.tsx @@ -99,7 +99,7 @@ const Email: FunctionComponent = ({ application }: Props) => { Disable sign-in notification emails Disables email notifications when a new sign-in occurs on your account. (Email notifications are - available to paid subscribers). + available only to paid subscribers). {isLoading ? ( diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/Subscription.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/Subscription.tsx index 6d7ffdf67..f8b111167 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/Subscription.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Account/Subscription/Subscription.tsx @@ -15,7 +15,7 @@ type Props = { const Subscription: FunctionComponent = ({ application, viewControllerManager }: Props) => { const subscriptionState = viewControllerManager.subscriptionController - const { userSubscription } = subscriptionState + const { onlineSubscription } = subscriptionState const now = new Date().getTime() @@ -25,7 +25,7 @@ const Subscription: FunctionComponent = ({ application, viewControllerMan
Subscription - {userSubscription && userSubscription.endsAt > now ? ( + {onlineSubscription && onlineSubscription.endsAt > now ? ( ) : ( diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/CloudBackups/CloudBackupProvider.tsx b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/CloudBackups/CloudBackupProvider.tsx index 6d7eec50c..cbb651d68 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/Backups/CloudBackups/CloudBackupProvider.tsx +++ b/packages/web/src/javascripts/Components/Preferences/Panes/Backups/CloudBackups/CloudBackupProvider.tsx @@ -17,7 +17,7 @@ import { } from '@standardnotes/snjs' import { WebApplication } from '@/Application/Application' import Button from '@/Components/Button/Button' -import { isDev, openInNewTab } from '@/Utils' +import { openInNewTab } from '@/Utils' import { Subtitle } from '@/Components/Preferences/PreferencesComponents/Content' import { KeyboardKey } from '@standardnotes/ui-services' @@ -61,7 +61,7 @@ const CloudBackupProvider: FunctionComponent = ({ application, providerNa } event.stopPropagation() - const authUrl = application.getCloudProviderIntegrationUrl(providerName, isDev) + const authUrl = application.getCloudProviderIntegrationUrl(providerName) openInNewTab(authUrl) setAuthBegan(true) } diff --git a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider.ts b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider.ts index 27cc2511c..c2ab019e6 100644 --- a/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider.ts +++ b/packages/web/src/javascripts/Components/Preferences/Panes/General/Advanced/Packages/Provider/PackageProvider.ts @@ -7,7 +7,7 @@ export class PackageProvider { static async load(application: WebApplication): Promise { const response = await application.getAvailableSubscriptions() - if (response instanceof ClientDisplayableError) { + if (!response || response instanceof ClientDisplayableError) { return undefined } diff --git a/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx b/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx index 3d75ad7b1..95c03ba9a 100644 --- a/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx +++ b/packages/web/src/javascripts/Components/PremiumFeaturesModal/Subviews/UpgradePrompt.tsx @@ -64,7 +64,10 @@ export const UpgradePrompt = ({
The Professional Plan costs $119.99/year and includes benefits like
  • 100GB encrypted file storage
    • -
  • Access to all note types, including markdown, rich text, authenticator, tasks, and spreadsheets
    • +
  • + Access to all note types, including Super, markdown, rich text, authenticator, tasks, and spreadsheets +
    • +
  • Access to Daily Notebooks and Moments journals
  • Note history going back indefinitely
  • Nested folders for your tags
  • Premium support
    • @@ -79,7 +82,7 @@ export const UpgradePrompt = ({ className="no-border w-full cursor-pointer rounded bg-info py-2 font-bold text-info-contrast hover:brightness-125 focus:brightness-125" ref={ctaRef} > - Upgrade + {application.isNativeIOS() ? 'Start Free Trial' : 'Upgrade'}
diff --git a/packages/web/src/javascripts/Controllers/FeaturesController.ts b/packages/web/src/javascripts/Controllers/FeaturesController.ts index bc2d40de7..b9bedbace 100644 --- a/packages/web/src/javascripts/Controllers/FeaturesController.ts +++ b/packages/web/src/javascripts/Controllers/FeaturesController.ts @@ -65,6 +65,7 @@ export class FeaturesController extends AbstractViewController { break case ApplicationEvent.FeaturesUpdated: case ApplicationEvent.Launched: + case ApplicationEvent.LocalDataLoaded: runInAction(() => { this.hasFolders = this.isEntitledToFolders() this.hasSmartViews = this.isEntitledToSmartViews() diff --git a/packages/web/src/javascripts/Controllers/LinkingController.tsx b/packages/web/src/javascripts/Controllers/LinkingController.tsx index 990052764..43b43c933 100644 --- a/packages/web/src/javascripts/Controllers/LinkingController.tsx +++ b/packages/web/src/javascripts/Controllers/LinkingController.tsx @@ -75,7 +75,7 @@ export class LinkingController extends AbstractViewController { } get isEntitledToNoteLinking() { - return !!this.subscriptionController.userSubscription + return !!this.subscriptionController.onlineSubscription } setIsLinkingPanelOpen = (open: boolean) => { diff --git a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts index 4c26f5fe1..bc60bb1ae 100644 --- a/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts +++ b/packages/web/src/javascripts/Controllers/Subscription/SubscriptionController.ts @@ -17,14 +17,15 @@ import { Subscription } from './SubscriptionType' export class SubscriptionController extends AbstractViewController { private readonly ALLOWED_SUBSCRIPTION_INVITATIONS = 5 - userSubscription: Subscription | undefined = undefined + onlineSubscription: Subscription | undefined = undefined availableSubscriptions: AvailableSubscriptions | undefined = undefined subscriptionInvitations: Invitation[] | undefined = undefined hasAccount: boolean + hasFirstPartySubscription: boolean override deinit() { super.deinit() - ;(this.userSubscription as unknown) = undefined + ;(this.onlineSubscription as unknown) = undefined ;(this.availableSubscriptions as unknown) = undefined ;(this.subscriptionInvitations as unknown) = undefined @@ -38,12 +39,14 @@ export class SubscriptionController extends AbstractViewController { ) { super(application, eventBus) this.hasAccount = application.hasAccount() + this.hasFirstPartySubscription = application.features.hasFirstPartySubscription() makeObservable(this, { - userSubscription: observable, + onlineSubscription: observable, availableSubscriptions: observable, subscriptionInvitations: observable, hasAccount: observable, + hasFirstPartySubscription: observable, userSubscriptionName: computed, userSubscriptionExpirationDate: computed, @@ -64,11 +67,20 @@ export class SubscriptionController extends AbstractViewController { this.reloadSubscriptionInvitations().catch(console.error) } runInAction(() => { + this.hasFirstPartySubscription = application.features.hasFirstPartySubscription() this.hasAccount = application.hasAccount() }) }, ApplicationEvent.Launched), ) + this.disposers.push( + application.addEventObserver(async () => { + runInAction(() => { + this.hasFirstPartySubscription = application.features.hasFirstPartySubscription() + }) + }, ApplicationEvent.LocalDataLoaded), + ) + this.disposers.push( application.addEventObserver(async () => { this.getSubscriptionInfo().catch(console.error) @@ -83,6 +95,9 @@ export class SubscriptionController extends AbstractViewController { application.addEventObserver(async () => { this.getSubscriptionInfo().catch(console.error) this.reloadSubscriptionInvitations().catch(console.error) + runInAction(() => { + this.hasFirstPartySubscription = application.features.hasFirstPartySubscription() + }) }, ApplicationEvent.UserRolesChanged), ) } @@ -90,20 +105,20 @@ export class SubscriptionController extends AbstractViewController { get userSubscriptionName(): string { if ( this.availableSubscriptions && - this.userSubscription && - this.availableSubscriptions[this.userSubscription.planName] + this.onlineSubscription && + this.availableSubscriptions[this.onlineSubscription.planName] ) { - return this.availableSubscriptions[this.userSubscription.planName].name + return this.availableSubscriptions[this.onlineSubscription.planName].name } return '' } get userSubscriptionExpirationDate(): Date | undefined { - if (!this.userSubscription) { + if (!this.onlineSubscription) { return undefined } - return new Date(convertTimestampToMilliseconds(this.userSubscription.endsAt)) + return new Date(convertTimestampToMilliseconds(this.onlineSubscription.endsAt)) } get isUserSubscriptionExpired(): boolean { @@ -115,11 +130,11 @@ export class SubscriptionController extends AbstractViewController { } get isUserSubscriptionCanceled(): boolean { - return Boolean(this.userSubscription?.cancelled) + return Boolean(this.onlineSubscription?.cancelled) } hasValidSubscription(): boolean { - return this.userSubscription != undefined && !this.isUserSubscriptionExpired && !this.isUserSubscriptionCanceled + return this.onlineSubscription != undefined && !this.isUserSubscriptionExpired && !this.isUserSubscriptionCanceled } get usedInvitationsCount(): number { @@ -139,7 +154,7 @@ export class SubscriptionController extends AbstractViewController { } public setUserSubscription(subscription: Subscription): void { - this.userSubscription = subscription + this.onlineSubscription = subscription } public setAvailableSubscriptions(subscriptions: AvailableSubscriptions): void { diff --git a/packages/web/src/javascripts/Utils/createEditorMenuGroups.ts b/packages/web/src/javascripts/Utils/createEditorMenuGroups.ts index 8c5ca46b7..c0152ccf5 100644 --- a/packages/web/src/javascripts/Utils/createEditorMenuGroups.ts +++ b/packages/web/src/javascripts/Utils/createEditorMenuGroups.ts @@ -6,6 +6,7 @@ import { ComponentArea, FeatureDescription, GetFeatures, + FindNativeFeature, NoteType, FeatureIdentifier, } from '@standardnotes/snjs' @@ -149,8 +150,7 @@ const createBaselineMap = (application: WebApplication): NoteTypeToEditorRowsMap isEntitled: application.features.getFeatureStatus(FeatureIdentifier.SuperEditor) === FeatureStatus.Entitled, noteType: NoteType.Super, isLabs: true, - description: - 'A new way to edit notes. Type / to bring up the block selection menu, or @ to embed images or link other tags and notes. Type - then space to start a list, or [] then space to start a checklist. Drag and drop an image or file to embed it in your note.', + description: FindNativeFeature(FeatureIdentifier.SuperEditor)?.description, }, ], [NoteType.RichText]: [], From e61ac4c54a7ee8a2be9312ea4dfabe17aecad2ad Mon Sep 17 00:00:00 2001 From: StandardNotes CI Date: Fri, 20 Jan 2023 04:11:59 +0000 Subject: [PATCH 07/19] chore(release): publish - @standardnotes/api@1.24.3 - @standardnotes/desktop@3.104.96 - @standardnotes/encryption@1.21.3 - @standardnotes/features@1.58.3 - @standardnotes/filepicker@1.28.8 - @standardnotes/files@1.14.18 - @standardnotes/mobile@3.50.32 - @standardnotes/models@1.42.5 - @standardnotes/releases@1.4.119 - @standardnotes/responses@1.13.3 - @standardnotes/services@1.56.3 - @standardnotes/snjs@2.164.3 - @standardnotes/ui-services@1.24.7 - @standardnotes/web@3.140.3 --- packages/api/CHANGELOG.md | 4 ++++ packages/api/package.json | 2 +- packages/desktop/CHANGELOG.md | 4 ++++ packages/desktop/package.json | 2 +- packages/encryption/CHANGELOG.md | 4 ++++ packages/encryption/package.json | 2 +- packages/features/CHANGELOG.md | 4 ++++ packages/features/package.json | 2 +- packages/filepicker/CHANGELOG.md | 4 ++++ packages/filepicker/package.json | 2 +- packages/files/CHANGELOG.md | 4 ++++ packages/files/package.json | 2 +- packages/mobile/CHANGELOG.md | 4 ++++ packages/mobile/package.json | 2 +- packages/models/CHANGELOG.md | 4 ++++ packages/models/package.json | 2 +- packages/releases/CHANGELOG.md | 4 ++++ packages/releases/package.json | 2 +- packages/responses/CHANGELOG.md | 4 ++++ packages/responses/package.json | 2 +- packages/services/CHANGELOG.md | 4 ++++ packages/services/package.json | 2 +- packages/snjs/CHANGELOG.md | 4 ++++ packages/snjs/package.json | 2 +- packages/ui-services/CHANGELOG.md | 4 ++++ packages/ui-services/package.json | 2 +- packages/web/CHANGELOG.md | 4 ++++ packages/web/CHANGELOG.md.json | 13 ++++++++++++- packages/web/package.json | 2 +- 29 files changed, 82 insertions(+), 15 deletions(-) diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index c64a6f62d..664f3f9da 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.3](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.2...@standardnotes/api@1.24.3) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/api + ## [1.24.2](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.1...@standardnotes/api@1.24.2) (2023-01-19) **Note:** Version bump only for package @standardnotes/api diff --git a/packages/api/package.json b/packages/api/package.json index 7b2776997..85620f1b4 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/api", - "version": "1.24.2", + "version": "1.24.3", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index c020f59c4..26847be4f 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.104.96](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.2...@standardnotes/desktop@3.104.96) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/desktop + ## [3.104.95](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.1...@standardnotes/desktop@3.104.95) (2023-01-19) **Note:** Version bump only for package @standardnotes/desktop diff --git a/packages/desktop/package.json b/packages/desktop/package.json index a09f9823a..32b202efc 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/desktop", "main": "./app/dist/index.js", - "version": "3.104.95", + "version": "3.104.96", "license": "AGPL-3.0-or-later", "author": "Standard Notes.", "private": true, diff --git a/packages/encryption/CHANGELOG.md b/packages/encryption/CHANGELOG.md index cbe624653..688440b8b 100644 --- a/packages/encryption/CHANGELOG.md +++ b/packages/encryption/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.21.3](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.2...@standardnotes/encryption@1.21.3) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/encryption + ## [1.21.2](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.1...@standardnotes/encryption@1.21.2) (2023-01-19) **Note:** Version bump only for package @standardnotes/encryption diff --git a/packages/encryption/package.json b/packages/encryption/package.json index 746a2e8c3..e0146e9c6 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/encryption", - "version": "1.21.2", + "version": "1.21.3", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/features/CHANGELOG.md b/packages/features/CHANGELOG.md index 5444dc243..e9dba4422 100644 --- a/packages/features/CHANGELOG.md +++ b/packages/features/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.58.3](https://github.com/standardnotes/app/compare/@standardnotes/features@1.58.2...@standardnotes/features@1.58.3) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/features + ## [1.58.2](https://github.com/standardnotes/app/compare/@standardnotes/features@1.58.1...@standardnotes/features@1.58.2) (2023-01-19) **Note:** Version bump only for package @standardnotes/features diff --git a/packages/features/package.json b/packages/features/package.json index 0fffded70..fe51f52ab 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/features", - "version": "1.58.2", + "version": "1.58.3", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/filepicker/CHANGELOG.md b/packages/filepicker/CHANGELOG.md index 8fed16b72..9c193c17e 100644 --- a/packages/filepicker/CHANGELOG.md +++ b/packages/filepicker/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.28.8](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.7...@standardnotes/filepicker@1.28.8) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/filepicker + ## [1.28.7](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.6...@standardnotes/filepicker@1.28.7) (2023-01-19) **Note:** Version bump only for package @standardnotes/filepicker diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index 814210963..d00bc9ff4 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/filepicker", - "version": "1.28.7", + "version": "1.28.8", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/files/CHANGELOG.md b/packages/files/CHANGELOG.md index dee85d8a4..c8bf3217b 100644 --- a/packages/files/CHANGELOG.md +++ b/packages/files/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.14.18](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.17...@standardnotes/files@1.14.18) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/files + ## [1.14.17](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.16...@standardnotes/files@1.14.17) (2023-01-19) **Note:** Version bump only for package @standardnotes/files diff --git a/packages/files/package.json b/packages/files/package.json index f4ca1f493..f5bd2ea41 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/files", - "version": "1.14.17", + "version": "1.14.18", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index 4b28a8ece..fcf567c80 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.50.32](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.31...@standardnotes/mobile@3.50.32) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/mobile + ## [3.50.31](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.30...@standardnotes/mobile@3.50.31) (2023-01-19) **Note:** Version bump only for package @standardnotes/mobile diff --git a/packages/mobile/package.json b/packages/mobile/package.json index f247d8f9f..f4f786bba 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/mobile", - "version": "3.50.31", + "version": "3.50.32", "author": "Standard Notes.", "private": true, "license": "AGPL-3.0-or-later", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 325844147..90bbfb3de 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.5](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.4...@standardnotes/models@1.42.5) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/models + ## [1.42.4](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.3...@standardnotes/models@1.42.4) (2023-01-19) **Note:** Version bump only for package @standardnotes/models diff --git a/packages/models/package.json b/packages/models/package.json index d1b525b39..536101738 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/models", - "version": "1.42.4", + "version": "1.42.5", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md index 83ea223cc..187cefe42 100644 --- a/packages/releases/CHANGELOG.md +++ b/packages/releases/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.119](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.118...@standardnotes/releases@1.4.119) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/releases + ## [1.4.118](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.117...@standardnotes/releases@1.4.118) (2023-01-19) **Note:** Version bump only for package @standardnotes/releases diff --git a/packages/releases/package.json b/packages/releases/package.json index e4899e30c..25dc5726d 100644 --- a/packages/releases/package.json +++ b/packages/releases/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/releases", - "version": "1.4.118", + "version": "1.4.119", "license": "AGPL-3.0-or-later", "main": "dist/releases.json", "types": "dist/index.d.ts", diff --git a/packages/responses/CHANGELOG.md b/packages/responses/CHANGELOG.md index 08631ca11..96056bd74 100644 --- a/packages/responses/CHANGELOG.md +++ b/packages/responses/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.13.3](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.2...@standardnotes/responses@1.13.3) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/responses + ## [1.13.2](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.1...@standardnotes/responses@1.13.2) (2023-01-19) **Note:** Version bump only for package @standardnotes/responses diff --git a/packages/responses/package.json b/packages/responses/package.json index 6887d6129..d6b5e11c7 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/responses", - "version": "1.13.2", + "version": "1.13.3", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md index 46eaba1dc..905e6c1fc 100644 --- a/packages/services/CHANGELOG.md +++ b/packages/services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.56.3](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.2...@standardnotes/services@1.56.3) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/services + ## [1.56.2](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.1...@standardnotes/services@1.56.2) (2023-01-19) **Note:** Version bump only for package @standardnotes/services diff --git a/packages/services/package.json b/packages/services/package.json index 38492cc54..07e580a47 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/services", - "version": "1.56.2", + "version": "1.56.3", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/snjs/CHANGELOG.md b/packages/snjs/CHANGELOG.md index eb12dbe1d..91da0f2ba 100644 --- a/packages/snjs/CHANGELOG.md +++ b/packages/snjs/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.164.3](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.2...@standardnotes/snjs@2.164.3) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/snjs + ## [2.164.2](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.1...@standardnotes/snjs@2.164.2) (2023-01-19) **Note:** Version bump only for package @standardnotes/snjs diff --git a/packages/snjs/package.json b/packages/snjs/package.json index 639787be2..3dfe434b1 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/snjs", - "version": "2.164.2", + "version": "2.164.3", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/ui-services/CHANGELOG.md b/packages/ui-services/CHANGELOG.md index 09462da88..d72b01496 100644 --- a/packages/ui-services/CHANGELOG.md +++ b/packages/ui-services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.7](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.6...@standardnotes/ui-services@1.24.7) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/ui-services + ## [1.24.6](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.5...@standardnotes/ui-services@1.24.6) (2023-01-19) **Note:** Version bump only for package @standardnotes/ui-services diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index 32b624591..5439c354d 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/ui-services", - "version": "1.24.6", + "version": "1.24.7", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index fb8488483..fd069f17b 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.140.3](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.2...@standardnotes/web@3.140.3) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/web + ## [3.140.2](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.1...@standardnotes/web@3.140.2) (2023-01-19) **Note:** Version bump only for package @standardnotes/web diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json index 238b7c54f..edd8d9df1 100644 --- a/packages/web/CHANGELOG.md.json +++ b/packages/web/CHANGELOG.md.json @@ -1,5 +1,16 @@ { "versions": [ + { + "version": "3.140.3", + "title": "[3.140.3](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.2...@standardnotes/web@3.140.3) (2023-01-20)", + "date": null, + "body": "**Note:** Version bump only for package @standardnotes/web", + "parsed": { + "_": [ + "Note: Version bump only for package @standardnotes/web" + ] + } + }, { "version": "3.140.2", "title": "[3.140.2](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.1...@standardnotes/web@3.140.2) (2023-01-19)", @@ -47,7 +58,7 @@ "version": "3.139.0", "title": "[3.139.0](https://github.com/standardnotes/app/compare/@standardnotes/web@3.138.6...@standardnotes/web@3.139.0) (2023-01-18)", "date": null, - "body": "### Features\n\n* Added rename option to file preview modal ([aa88966](https://github.com/standardnotes/app/commit/aa8896678315de67551c786e64aec7dfd10479e3))\n* **snjs:** add revisions api v2 ([#2154](https://github.com/standardnotes/app/issues/2154)) ([880a537](https://github.com/standardnotes/app/commit/880a537774ddcefaedb0d4e5dc50b363f4b93e01))", + "body": "### Features\n\n* Added rename option to file preview modal ([aa88966](https://github.com/standardnotes/app/commit/aa8896678315de67551c786e64aec7dfd10479e3))", "parsed": { "_": [ "Added rename option to file preview modal (aa88966)" diff --git a/packages/web/package.json b/packages/web/package.json index 6575539f5..9b4a705ab 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/web", - "version": "3.140.2", + "version": "3.140.3", "license": "AGPL-3.0-or-later", "main": "dist/app.js", "author": "Standard Notes.", From cb9c16047ebea7134c1aadaf89a8023497358a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Fri, 20 Jan 2023 10:02:48 +0100 Subject: [PATCH 08/19] fix(snjs): bring back history tests and fix handlinf of error with revisions --- .../src/Domain/Revision/RevisionManager.ts | 42 +++++++------------ .../DeleteRevision/DeleteRevision.spec.ts | 14 +++++++ .../UseCase/DeleteRevision/DeleteRevision.ts | 8 +++- .../UseCase/GetRevision/GetRevision.spec.ts | 14 +++++++ .../Domain/UseCase/GetRevision/GetRevision.ts | 10 ++++- .../ListRevisions/ListRevisions.spec.ts | 11 +++++ .../UseCase/ListRevisions/ListRevisions.ts | 8 +++- packages/snjs/mocha/history.test.js | 2 +- 8 files changed, 75 insertions(+), 34 deletions(-) diff --git a/packages/services/src/Domain/Revision/RevisionManager.ts b/packages/services/src/Domain/Revision/RevisionManager.ts index dd0705ea7..7d492c871 100644 --- a/packages/services/src/Domain/Revision/RevisionManager.ts +++ b/packages/services/src/Domain/Revision/RevisionManager.ts @@ -16,31 +16,23 @@ export class RevisionManager extends AbstractService implements RevisionClientIn async listRevisions( itemUuid: Uuid, ): Promise<{ uuid: string; content_type: string; created_at: string; updated_at: string; required_role: string }[]> { - try { - const result = await this.revisionApiService.listRevisions(itemUuid.value) + const result = await this.revisionApiService.listRevisions(itemUuid.value) - if (result.data.error) { - return [] - } - - return result.data.revisions - } catch (error) { - return [] + if (result.data.error) { + throw new Error(result.data.error.message) } + + return result.data.revisions } async deleteRevision(itemUuid: Uuid, revisionUuid: Uuid): Promise { - try { - const result = await this.revisionApiService.deleteRevision(itemUuid.value, revisionUuid.value) + const result = await this.revisionApiService.deleteRevision(itemUuid.value, revisionUuid.value) - if (result.data.error) { - return result.data.error.message - } - - return result.data.message - } catch (error) { - return 'An error occurred while deleting the revision.' + if (result.data.error) { + throw new Error(result.data.error.message) } + + return result.data.message } async getRevision( @@ -57,16 +49,12 @@ export class RevisionManager extends AbstractService implements RevisionClientIn created_at: string updated_at: string } | null> { - try { - const result = await this.revisionApiService.getRevision(itemUuid.value, revisionUuid.value) + const result = await this.revisionApiService.getRevision(itemUuid.value, revisionUuid.value) - if (result.data.error) { - return null - } - - return result.data.revision - } catch (error) { - return null + if (result.data.error) { + throw new Error(result.data.error.message) } + + return result.data.revision } } diff --git a/packages/snjs/lib/Domain/UseCase/DeleteRevision/DeleteRevision.spec.ts b/packages/snjs/lib/Domain/UseCase/DeleteRevision/DeleteRevision.spec.ts index 9d06d88e9..38f6a46ff 100644 --- a/packages/snjs/lib/Domain/UseCase/DeleteRevision/DeleteRevision.spec.ts +++ b/packages/snjs/lib/Domain/UseCase/DeleteRevision/DeleteRevision.spec.ts @@ -46,4 +46,18 @@ describe('DeleteRevision', () => { expect(result.isFailed()).toBe(true) expect(result.getError()).toEqual('Could not delete revision: Given value is not a valid uuid: invalid') }) + + it('should fail if revision manager throws', async () => { + const useCase = createUseCase() + + revisionManager.deleteRevision = jest.fn().mockRejectedValue(new Error('error')) + + const result = await useCase.execute({ + itemUuid: '00000000-0000-0000-0000-000000000000', + revisionUuid: '00000000-0000-0000-0000-000000000000', + }) + + expect(result.isFailed()).toBe(true) + expect(result.getError()).toEqual('Could not delete revision: error') + }) }) diff --git a/packages/snjs/lib/Domain/UseCase/DeleteRevision/DeleteRevision.ts b/packages/snjs/lib/Domain/UseCase/DeleteRevision/DeleteRevision.ts index ba7b6cd93..7529f1e48 100644 --- a/packages/snjs/lib/Domain/UseCase/DeleteRevision/DeleteRevision.ts +++ b/packages/snjs/lib/Domain/UseCase/DeleteRevision/DeleteRevision.ts @@ -19,8 +19,12 @@ export class DeleteRevision implements UseCaseInterface { } const revisionUuid = revisionUuidOrError.getValue() - await this.revisionManager.deleteRevision(itemUuid, revisionUuid) + try { + await this.revisionManager.deleteRevision(itemUuid, revisionUuid) - return Result.ok() + return Result.ok() + } catch (error) { + return Result.fail(`Could not delete revision: ${(error as Error).message}`) + } } } diff --git a/packages/snjs/lib/Domain/UseCase/GetRevision/GetRevision.spec.ts b/packages/snjs/lib/Domain/UseCase/GetRevision/GetRevision.spec.ts index 30ae8996c..29b0106bf 100644 --- a/packages/snjs/lib/Domain/UseCase/GetRevision/GetRevision.spec.ts +++ b/packages/snjs/lib/Domain/UseCase/GetRevision/GetRevision.spec.ts @@ -155,4 +155,18 @@ describe('GetRevision', () => { expect(result.isFailed()).toBe(true) }) + + it('should fail if revision manager throws', async () => { + revisionManager.getRevision = jest.fn().mockRejectedValue(new Error('error')) + + const useCase = createUseCase() + + const result = await useCase.execute({ + itemUuid: '00000000-0000-0000-0000-000000000000', + revisionUuid: '00000000-0000-0000-0000-000000000000', + }) + + expect(result.isFailed()).toBe(true) + expect(result.getError()).toEqual('Could not get revision: error') + }) }) diff --git a/packages/snjs/lib/Domain/UseCase/GetRevision/GetRevision.ts b/packages/snjs/lib/Domain/UseCase/GetRevision/GetRevision.ts index 267722c7b..a3fb37248 100644 --- a/packages/snjs/lib/Domain/UseCase/GetRevision/GetRevision.ts +++ b/packages/snjs/lib/Domain/UseCase/GetRevision/GetRevision.ts @@ -29,8 +29,14 @@ export class GetRevision implements UseCaseInterface { } const revisionUuid = revisionUuidOrError.getValue() - const revision = await this.revisionManager.getRevision(itemUuid, revisionUuid) - if (revision === null) { + let revision + try { + revision = await this.revisionManager.getRevision(itemUuid, revisionUuid) + } catch (error) { + return Result.fail(`Could not get revision: ${(error as Error).message}`) + } + + if (!revision) { return Result.fail('Could not get revision: Revision not found') } diff --git a/packages/snjs/lib/Domain/UseCase/ListRevisions/ListRevisions.spec.ts b/packages/snjs/lib/Domain/UseCase/ListRevisions/ListRevisions.spec.ts index d54d6adbe..37640ba94 100644 --- a/packages/snjs/lib/Domain/UseCase/ListRevisions/ListRevisions.spec.ts +++ b/packages/snjs/lib/Domain/UseCase/ListRevisions/ListRevisions.spec.ts @@ -29,4 +29,15 @@ describe('ListRevisions', () => { expect(result.isFailed()).toBe(true) expect(result.getError()).toEqual('Could not list item revisions: Given value is not a valid uuid: invalid') }) + + it('should fail if revision manager throws', async () => { + const useCase = createUseCase() + + revisionManager.listRevisions = jest.fn().mockRejectedValue(new Error('error')) + + const result = await useCase.execute({ itemUuid: '00000000-0000-0000-0000-000000000000' }) + + expect(result.isFailed()).toBe(true) + expect(result.getError()).toEqual('Could not list item revisions: error') + }) }) diff --git a/packages/snjs/lib/Domain/UseCase/ListRevisions/ListRevisions.ts b/packages/snjs/lib/Domain/UseCase/ListRevisions/ListRevisions.ts index 419925903..e88cf7c25 100644 --- a/packages/snjs/lib/Domain/UseCase/ListRevisions/ListRevisions.ts +++ b/packages/snjs/lib/Domain/UseCase/ListRevisions/ListRevisions.ts @@ -15,8 +15,12 @@ export class ListRevisions implements UseCaseInterface> } const itemUuid = itemUuidOrError.getValue() - const revisions = await this.revisionManager.listRevisions(itemUuid) + try { + const revisions = await this.revisionManager.listRevisions(itemUuid) - return Result.ok(revisions) + return Result.ok(revisions) + } catch (error) { + return Result.fail(`Could not list item revisions: ${(error as Error).message}`) + } } } diff --git a/packages/snjs/mocha/history.test.js b/packages/snjs/mocha/history.test.js index 1866a85aa..bed7de3bb 100644 --- a/packages/snjs/mocha/history.test.js +++ b/packages/snjs/mocha/history.test.js @@ -5,7 +5,7 @@ import { createNoteParams } from './lib/Items.js' chai.use(chaiAsPromised) const expect = chai.expect -describe.skip('history manager', () => { +describe('history manager', () => { const largeCharacterChange = 25 const syncOptions = { From 6a7ff423ff82bd6eb7fbfbc95f4b1ebda36cc842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Fri, 20 Jan 2023 10:45:16 +0100 Subject: [PATCH 09/19] fix(snjs): remove isFailed() checks during tests in order for getValue() to give a meaningful exception --- packages/snjs/mocha/history.test.js | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/packages/snjs/mocha/history.test.js b/packages/snjs/mocha/history.test.js index bed7de3bb..b8b6b9551 100644 --- a/packages/snjs/mocha/history.test.js +++ b/packages/snjs/mocha/history.test.js @@ -286,7 +286,6 @@ describe('history manager', () => { await this.application.syncService.sync(syncOptions) const itemHistoryOrError = await this.application.listRevisions.execute({ itemUuid: item.uuid }) - expect(itemHistoryOrError.isFailed()).to.equal(false) expect(itemHistoryOrError.getValue().length).to.equal(0) }) @@ -295,8 +294,6 @@ describe('history manager', () => { await Factory.sleep(Factory.ServerRevisionCreationDelay) let itemHistoryOrError = await this.application.listRevisions.execute({ itemUuid: item.uuid }) - expect(itemHistoryOrError.isFailed()).to.equal(false) - let itemHistory = itemHistoryOrError.getValue() /** Server history should save initial revision */ @@ -305,8 +302,6 @@ describe('history manager', () => { /** Sync within 5 seconds (ENV VAR dependend on self-hosted setup), should not create a new entry */ await Factory.markDirtyAndSyncItem(this.application, item) itemHistoryOrError = await this.application.listRevisions.execute({ itemUuid: item.uuid }) - expect(itemHistoryOrError.isFailed()).to.equal(false) - itemHistory = itemHistoryOrError.getValue() expect(itemHistory.length).to.equal(1) @@ -322,8 +317,6 @@ describe('history manager', () => { ) await Factory.sleep(Factory.ServerRevisionCreationDelay) itemHistoryOrError = await this.application.listRevisions.execute({ itemUuid: item.uuid }) - expect(itemHistoryOrError.isFailed()).to.equal(false) - itemHistory = itemHistoryOrError.getValue() expect(itemHistory.length).to.equal(1) }) @@ -346,15 +339,11 @@ describe('history manager', () => { await Factory.sleep(Factory.ServerRevisionCreationDelay) const itemHistoryOrError = await this.application.listRevisions.execute({ itemUuid: item.uuid }) - expect(itemHistoryOrError.isFailed()).to.equal(false) - const itemHistory = itemHistoryOrError.getValue() expect(itemHistory.length).to.equal(2) const oldestEntry = lastElement(itemHistory) let revisionFromServerOrError = await this.application.getRevision.execute({ itemUuid: item.uuid, revisionUuid: oldestEntry.uuid }) - expect(revisionFromServerOrError.isFailed()).to.equal(false) - const revisionFromServer = revisionFromServerOrError.getValue() expect(revisionFromServer).to.be.ok @@ -376,12 +365,9 @@ describe('history manager', () => { await Factory.sleep(Factory.ServerRevisionCreationDelay) const dupeHistoryOrError = await this.application.listRevisions.execute({ itemUuid: dupe.uuid }) - expect(dupeHistoryOrError.isFailed()).to.equal(false) const dupeHistory = dupeHistoryOrError.getValue() const dupeRevisionOrError = await this.application.getRevision.execute({ itemUuid: dupe.uuid, revisionUuid: dupeHistory[0].uuid }) - expect(dupeRevisionOrError.isFailed()).to.equal(false) - const dupeRevision = dupeRevisionOrError.getValue() expect(dupeRevision.payload.uuid).to.equal(dupe.uuid) }) @@ -405,11 +391,9 @@ describe('history manager', () => { const expectedRevisions = 4 const noteHistoryOrError = await this.application.listRevisions.execute({ itemUuid: note.uuid }) - expect(noteHistoryOrError.isFailed()).to.equal(false) const noteHistory = noteHistoryOrError.getValue() const dupeHistoryOrError = await this.application.listRevisions.execute({ itemUuid: dupe.uuid }) - expect(dupeHistoryOrError.isFailed()).to.equal(false) const dupeHistory = dupeHistoryOrError.getValue() expect(noteHistory.length).to.equal(expectedRevisions) @@ -432,15 +416,11 @@ describe('history manager', () => { await Factory.sleep(Factory.ServerRevisionCreationDelay) const itemHistoryOrError = await this.application.listRevisions.execute({ itemUuid: dupe.uuid }) - expect(itemHistoryOrError.isFailed()).to.equal(false) - const itemHistory = itemHistoryOrError.getValue() expect(itemHistory.length).to.be.above(1) const newestRevision = itemHistory[0] const fetchedOrError = await this.application.getRevision.execute({ itemUuid: dupe.uuid, revisionUuid: newestRevision.uuid }) - expect(fetchedOrError.isFailed()).to.equal(false) - const fetched = fetchedOrError.getValue() expect(fetched.payload.errorDecrypting).to.not.be.ok expect(fetched.payload.content.title).to.equal(changedText) From 21a4eb0cf00add2c4cf2e69e55c55cb9fd50c239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Fri, 20 Jan 2023 11:26:16 +0100 Subject: [PATCH 10/19] fix(snjs): signed out fetching revisions test --- packages/snjs/mocha/history.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/snjs/mocha/history.test.js b/packages/snjs/mocha/history.test.js index b8b6b9551..a373ea95f 100644 --- a/packages/snjs/mocha/history.test.js +++ b/packages/snjs/mocha/history.test.js @@ -277,7 +277,7 @@ describe('history manager', () => { await Factory.safeDeinit(this.application) }) - it('response from server should be empty if not signed in', async function () { + it('response from server should be failed if not signed in', async function () { await this.application.user.signOut() this.application = await Factory.createInitAppWithFakeCrypto() this.historyManager = this.application.historyManager @@ -286,7 +286,7 @@ describe('history manager', () => { await this.application.syncService.sync(syncOptions) const itemHistoryOrError = await this.application.listRevisions.execute({ itemUuid: item.uuid }) - expect(itemHistoryOrError.getValue().length).to.equal(0) + expect(itemHistoryOrError.isFailed()).to.equal(true) }) it('create basic history entries 2', async function () { From 16aaef00c3ff519325d3c840155e96ea7f818d8b Mon Sep 17 00:00:00 2001 From: StandardNotes CI Date: Fri, 20 Jan 2023 10:52:46 +0000 Subject: [PATCH 11/19] chore(release): publish - @standardnotes/desktop@3.104.97 - @standardnotes/mobile@3.50.33 - @standardnotes/releases@1.4.120 - @standardnotes/services@1.56.4 - @standardnotes/snjs@2.164.4 - @standardnotes/ui-services@1.24.8 - @standardnotes/web@3.140.4 --- packages/desktop/CHANGELOG.md | 4 ++++ packages/desktop/package.json | 2 +- packages/mobile/CHANGELOG.md | 4 ++++ packages/mobile/package.json | 2 +- packages/releases/CHANGELOG.md | 4 ++++ packages/releases/package.json | 2 +- packages/services/CHANGELOG.md | 6 ++++++ packages/services/package.json | 2 +- packages/snjs/CHANGELOG.md | 8 ++++++++ packages/snjs/package.json | 2 +- packages/ui-services/CHANGELOG.md | 4 ++++ packages/ui-services/package.json | 2 +- packages/web/CHANGELOG.md | 4 ++++ packages/web/CHANGELOG.md.json | 11 +++++++++++ packages/web/package.json | 2 +- 15 files changed, 52 insertions(+), 7 deletions(-) diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index 26847be4f..dd3f60fa2 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.104.97](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.3...@standardnotes/desktop@3.104.97) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/desktop + ## [3.104.96](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.2...@standardnotes/desktop@3.104.96) (2023-01-20) **Note:** Version bump only for package @standardnotes/desktop diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 32b202efc..6784f30d0 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/desktop", "main": "./app/dist/index.js", - "version": "3.104.96", + "version": "3.104.97", "license": "AGPL-3.0-or-later", "author": "Standard Notes.", "private": true, diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index fcf567c80..9a8e2e8cc 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.50.33](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.32...@standardnotes/mobile@3.50.33) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/mobile + ## [3.50.32](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.31...@standardnotes/mobile@3.50.32) (2023-01-20) **Note:** Version bump only for package @standardnotes/mobile diff --git a/packages/mobile/package.json b/packages/mobile/package.json index f4f786bba..414cd7638 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/mobile", - "version": "3.50.32", + "version": "3.50.33", "author": "Standard Notes.", "private": true, "license": "AGPL-3.0-or-later", diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md index 187cefe42..e4ed97451 100644 --- a/packages/releases/CHANGELOG.md +++ b/packages/releases/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.120](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.119...@standardnotes/releases@1.4.120) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/releases + ## [1.4.119](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.118...@standardnotes/releases@1.4.119) (2023-01-20) **Note:** Version bump only for package @standardnotes/releases diff --git a/packages/releases/package.json b/packages/releases/package.json index 25dc5726d..c6cd55dc2 100644 --- a/packages/releases/package.json +++ b/packages/releases/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/releases", - "version": "1.4.119", + "version": "1.4.120", "license": "AGPL-3.0-or-later", "main": "dist/releases.json", "types": "dist/index.d.ts", diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md index 905e6c1fc..1f314182d 100644 --- a/packages/services/CHANGELOG.md +++ b/packages/services/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.56.4](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.3...@standardnotes/services@1.56.4) (2023-01-20) + +### Bug Fixes + +* **snjs:** bring back history tests and fix handlinf of error with revisions ([cb9c160](https://github.com/standardnotes/app/commit/cb9c16047ebea7134c1aadaf89a8023497358a8e)) + ## [1.56.3](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.2...@standardnotes/services@1.56.3) (2023-01-20) **Note:** Version bump only for package @standardnotes/services diff --git a/packages/services/package.json b/packages/services/package.json index 07e580a47..8a4eadde5 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/services", - "version": "1.56.3", + "version": "1.56.4", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/snjs/CHANGELOG.md b/packages/snjs/CHANGELOG.md index 91da0f2ba..faecd80e0 100644 --- a/packages/snjs/CHANGELOG.md +++ b/packages/snjs/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.164.4](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.3...@standardnotes/snjs@2.164.4) (2023-01-20) + +### Bug Fixes + +* **snjs:** bring back history tests and fix handlinf of error with revisions ([cb9c160](https://github.com/standardnotes/app/commit/cb9c16047ebea7134c1aadaf89a8023497358a8e)) +* **snjs:** remove isFailed() checks during tests in order for getValue() to give a meaningful exception ([6a7ff42](https://github.com/standardnotes/app/commit/6a7ff423ff82bd6eb7fbfbc95f4b1ebda36cc842)) +* **snjs:** signed out fetching revisions test ([21a4eb0](https://github.com/standardnotes/app/commit/21a4eb0cf00add2c4cf2e69e55c55cb9fd50c239)) + ## [2.164.3](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.2...@standardnotes/snjs@2.164.3) (2023-01-20) **Note:** Version bump only for package @standardnotes/snjs diff --git a/packages/snjs/package.json b/packages/snjs/package.json index 3dfe434b1..b0cf067e8 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/snjs", - "version": "2.164.3", + "version": "2.164.4", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/ui-services/CHANGELOG.md b/packages/ui-services/CHANGELOG.md index d72b01496..a6dd7d392 100644 --- a/packages/ui-services/CHANGELOG.md +++ b/packages/ui-services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.8](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.7...@standardnotes/ui-services@1.24.8) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/ui-services + ## [1.24.7](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.6...@standardnotes/ui-services@1.24.7) (2023-01-20) **Note:** Version bump only for package @standardnotes/ui-services diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index 5439c354d..4ec724203 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/ui-services", - "version": "1.24.7", + "version": "1.24.8", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index fd069f17b..344f9a941 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.140.4](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.3...@standardnotes/web@3.140.4) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/web + ## [3.140.3](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.2...@standardnotes/web@3.140.3) (2023-01-20) **Note:** Version bump only for package @standardnotes/web diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json index edd8d9df1..17e075489 100644 --- a/packages/web/CHANGELOG.md.json +++ b/packages/web/CHANGELOG.md.json @@ -1,5 +1,16 @@ { "versions": [ + { + "version": "3.140.4", + "title": "[3.140.4](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.3...@standardnotes/web@3.140.4) (2023-01-20)", + "date": null, + "body": "**Note:** Version bump only for package @standardnotes/web", + "parsed": { + "_": [ + "Note: Version bump only for package @standardnotes/web" + ] + } + }, { "version": "3.140.3", "title": "[3.140.3](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.2...@standardnotes/web@3.140.3) (2023-01-20)", diff --git a/packages/web/package.json b/packages/web/package.json index 9b4a705ab..0eebada29 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/web", - "version": "3.140.3", + "version": "3.140.4", "license": "AGPL-3.0-or-later", "main": "dist/app.js", "author": "Standard Notes.", From 87b974bdd543a8529d0fd5adccfb09f766439244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Fri, 20 Jan 2023 12:37:38 +0100 Subject: [PATCH 12/19] chore: upgrade @standardnotes/common --- ...mmon-npm-1.46.4-0012c2a1fe-6d21999a1d.zip} | Bin 39911 -> 39912 bytes packages/api/package.json | 2 +- packages/encryption/package.json | 2 +- packages/features/package.json | 2 +- packages/filepicker/package.json | 2 +- packages/files/package.json | 2 +- packages/models/package.json | 2 +- packages/responses/package.json | 2 +- packages/services/package.json | 2 +- packages/snjs/package.json | 2 +- packages/ui-services/package.json | 2 +- packages/utils/package.json | 2 +- yarn.lock | 30 +++++++++--------- 13 files changed, 26 insertions(+), 26 deletions(-) rename .yarn/cache/{@standardnotes-common-npm-1.46.3-a99a2b97e2-0fa509e304.zip => @standardnotes-common-npm-1.46.4-0012c2a1fe-6d21999a1d.zip} (93%) diff --git a/.yarn/cache/@standardnotes-common-npm-1.46.3-a99a2b97e2-0fa509e304.zip b/.yarn/cache/@standardnotes-common-npm-1.46.4-0012c2a1fe-6d21999a1d.zip similarity index 93% rename from .yarn/cache/@standardnotes-common-npm-1.46.3-a99a2b97e2-0fa509e304.zip rename to .yarn/cache/@standardnotes-common-npm-1.46.4-0012c2a1fe-6d21999a1d.zip index 9bf1e154e37273d8a995f5ba687747e20313aa52..bc87e2417c7ce726419d333401ef20cca5a86aee 100644 GIT binary patch delta 980 zcmaF9o$1APrVaX$yb*lsSuZm(Fl=RJV9=j7k1^nxWITjQG)G_g-(Oc#dS>4Mk+gB1bo@=FTZVaf^FaxW%-lt`|+c-kSN=P{i@udk(gpuQE0*5)ZRjA1d{CmbH_8jd#YC zS3GBCMbs`(DkwFsQx!Yfs zX@0t2?@@kWzJsBkul||Kizlspp{Esi>_E#S#fI1`g?t{uD)oQidr~QhFDNw23FMi6`m3|obn=Ux$JZosJbrO5LVw9u0g3-kM;?B7v?f-)II6W{ z^X3yh4>V^KEqAcq5%=P=xWvIu^_e^NwYDo1R?Um_J38@+O8klR63ZErcTcxbKOSvy zrYpHU)1>0fa=mwdLndxgOFBBKsQGbVb7{KBw|Xtl!j(0*FU-p0-REYsDSG18sWaD< zeXlqDUwt?`qq=-$1%tQcR+E&pxQ4r`TZO+#U)Zp~Ia-eI_cEo%NBrbly+urp(UTKvf+sKR(_?g)e4($Li79sS z#XkGVF|m@9yC(@uz7Z?H!vF!34VWh6z`3V@+}>O`*LRu$)8srTmveG}C(q=|)AX1&=7UXN z=Os2-p@3y_^mHwzssgB+xh5Z*uE*qAI61JxbF%#mJtm1FAk%Dezc1(Hbu(<4giF8* z6G|l~*OZ7(4w$LMBv1+!QkuN9Phj%nnNm!jAVTrotdmc53rzN$rN?xz46N!yh4AFv vJv@^Q%2~jwAI_3uI#dpqa-D6=w4egYRT2yEW@Q7#hc^(qDKRkgRDyT_TRf?* delta 944 zcmaE{o$2{@rVaX$ypG5Aw_ajoVA#scz@R_zpjv%FVsdt3da7PlaeiKIkZ<-K1A)EI z!#U)qdu_XZuF8Cgs%q=E0I!9|FR?~SSx4oZ^eFP+{Q3Us^zywX>X~2C?wzsOdtJK4 z$kYAAyMS*AI#cIl=}l#wY;4-+l_p9 z{ApWFkH&ZPr9a+OmU|`yH@(c6Kjjr7V1ZM8K%-_|h_vqXt1!-BSE}0hT#$mXT5#>-=DJKOAdHFZj8E6 zxN5~cuOc%BUZWR+5B-$w&l^QscQ;m_k!myOOFYD;xVHVk4{0U7cJcCCpVRzSPbe%> zHxjPkS~f>Cga0*u?LQ`Ai;pV8+4?ptou7k~Ec5u6s62I=cj2gk`}66WRNAvG-gG@~ zskHfEa;Emr_s6;`_iRrLIw{(x&U@{q#-INi)oyz~f8Dt4c`k39vg@ZGNmC8Hlx|P1 z+WWuyboL9j=OH#tOXoyMX>sd2lxn_h{mW)j6L5DL@9OSf)2_Q-4e>qwEq7z`l&!wS z8n?RMm(|>U8~gG0S^Le7(Nm3B!SO!%c5e}rL-gdp1k=g>CR~%x8;VTc5X~}qS)Uf8 z{p5>%oJ{zaQ#grCQDDyW8#Si%6d)ndh^VCZC?7#nhG!=GJ@2O!k;+ zz|@}u=B}UW!_<=tm64kqFinqXQXZ5mJUPIVXYv)G(1v`l&;(=7$?LqtCPz%yW2!8G z=m$FcLILOG)6=z>JPN@=d_J6$3w*dIJIv5y5-$P^_4#s5UO&T@NvH(Oz27A{xwb?U z7={9q6K6^>@s~n{o(h% UX?_Ke89e#iY!SBZN(LYR03afkTmS$7 diff --git a/packages/api/package.json b/packages/api/package.json index 85620f1b4..1fb4305c4 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -36,7 +36,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/domain-core": "^1.11.1", "@standardnotes/encryption": "workspace:*", "@standardnotes/models": "workspace:*", diff --git a/packages/encryption/package.json b/packages/encryption/package.json index e0146e9c6..9bafb53f7 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -35,7 +35,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", "@standardnotes/sncrypto-common": "workspace:*", diff --git a/packages/features/package.json b/packages/features/package.json index fe51f52ab..230e7e627 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -25,7 +25,7 @@ "test": "jest" }, "dependencies": { - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/domain-core": "^1.11.1", "@standardnotes/security": "^1.7.5", "reflect-metadata": "^0.1.13" diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index d00bc9ff4..4d33c87ed 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -26,7 +26,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/files": "workspace:*", "@standardnotes/utils": "workspace:*", "@types/wicg-file-system-access": "^2020.9.5", diff --git a/packages/files/package.json b/packages/files/package.json index f5bd2ea41..4135011df 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -28,7 +28,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/encryption": "workspace:*", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", diff --git a/packages/models/package.json b/packages/models/package.json index 536101738..f11c6022e 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -22,7 +22,7 @@ "test": "jest" }, "devDependencies": { - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/features": "workspace:*", "@standardnotes/responses": "workspace:*", "@standardnotes/utils": "workspace:*", diff --git a/packages/responses/package.json b/packages/responses/package.json index d6b5e11c7..4eeafd162 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -33,7 +33,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/features": "workspace:*", "@standardnotes/security": "^1.7.5", "reflect-metadata": "^0.1.13" diff --git a/packages/services/package.json b/packages/services/package.json index 8a4eadde5..80bbc1134 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "@standardnotes/api": "workspace:^", - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/domain-core": "^1.11.1", "@standardnotes/encryption": "workspace:^", "@standardnotes/files": "workspace:^", diff --git a/packages/snjs/package.json b/packages/snjs/package.json index b0cf067e8..0390cfff4 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -36,7 +36,7 @@ "@babel/core": "*", "@babel/preset-env": "*", "@standardnotes/api": "workspace:*", - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/domain-events": "^2.106.0", "@standardnotes/encryption": "workspace:*", "@standardnotes/features": "workspace:*", diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index 4ec724203..115317508 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -15,7 +15,7 @@ "test": "jest spec" }, "dependencies": { - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "@standardnotes/features": "workspace:^", "@standardnotes/filepicker": "workspace:^", "@standardnotes/services": "workspace:^", diff --git a/packages/utils/package.json b/packages/utils/package.json index b25999268..67cb59317 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -25,7 +25,7 @@ "test": "jest spec" }, "dependencies": { - "@standardnotes/common": "^1.46.3", + "@standardnotes/common": "^1.46.4", "dompurify": "^2.4.1", "lodash": "^4.17.21", "reflect-metadata": "^0.1.13" diff --git a/yarn.lock b/yarn.lock index c2932ccbd..47868e16f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4372,7 +4372,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/api@workspace:packages/api" dependencies: - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/domain-core": ^1.11.1 "@standardnotes/encryption": "workspace:*" "@standardnotes/models": "workspace:*" @@ -4503,12 +4503,12 @@ __metadata: languageName: node linkType: hard -"@standardnotes/common@npm:^1.46.3": - version: 1.46.3 - resolution: "@standardnotes/common@npm:1.46.3" +"@standardnotes/common@npm:^1.46.4": + version: 1.46.4 + resolution: "@standardnotes/common@npm:1.46.4" dependencies: reflect-metadata: ^0.1.13 - checksum: 0fa509e30431a740ed142274c4f21ae03d74b6e05bcd4f028d89a3f1a6566de792bbd7c37b1b92587138dd6ea10459eead5a8cad2150f9f2268481615d390dee + checksum: 6d21999a1df420040a8dfa5eb3157744320cd0a610f2a1b911a86b44a66bf23d07235dd543fe5849e853ac6e8e944bd14f5cc0f6ef2ad4f264b5cea55066ebcb languageName: node linkType: hard @@ -4639,7 +4639,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/encryption@workspace:packages/encryption" dependencies: - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/config": 2.4.3 "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" @@ -4662,7 +4662,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/features@workspace:packages/features" dependencies: - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/domain-core": ^1.11.1 "@standardnotes/security": ^1.7.5 "@types/jest": ^29.2.3 @@ -4692,7 +4692,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/filepicker@workspace:packages/filepicker" dependencies: - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/files": "workspace:*" "@standardnotes/utils": "workspace:*" "@types/jest": ^29.2.3 @@ -4712,7 +4712,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/files@workspace:packages/files" dependencies: - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/encryption": "workspace:*" "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" @@ -4876,7 +4876,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/models@workspace:packages/models" dependencies: - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/features": "workspace:*" "@standardnotes/responses": "workspace:*" "@standardnotes/utils": "workspace:*" @@ -4923,7 +4923,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/responses@workspace:packages/responses" dependencies: - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/features": "workspace:*" "@standardnotes/security": ^1.7.5 "@types/jest": ^29.2.3 @@ -4972,7 +4972,7 @@ __metadata: resolution: "@standardnotes/services@workspace:packages/services" dependencies: "@standardnotes/api": "workspace:^" - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/domain-core": ^1.11.1 "@standardnotes/encryption": "workspace:^" "@standardnotes/files": "workspace:^" @@ -5069,7 +5069,7 @@ __metadata: "@babel/core": "*" "@babel/preset-env": "*" "@standardnotes/api": "workspace:*" - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/domain-core": ^1.11.1 "@standardnotes/domain-events": ^2.106.0 "@standardnotes/encryption": "workspace:*" @@ -5197,7 +5197,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/ui-services@workspace:packages/ui-services" dependencies: - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@standardnotes/features": "workspace:^" "@standardnotes/filepicker": "workspace:^" "@standardnotes/services": "workspace:^" @@ -5219,7 +5219,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/utils@workspace:packages/utils" dependencies: - "@standardnotes/common": ^1.46.3 + "@standardnotes/common": ^1.46.4 "@types/dompurify": ^2.4.0 "@types/jest": ^29.2.3 "@types/jsdom": ^20.0.1 From 6e7517650b8d654a696c0b447132538e0990125a Mon Sep 17 00:00:00 2001 From: StandardNotes CI Date: Fri, 20 Jan 2023 12:48:06 +0000 Subject: [PATCH 13/19] chore(release): publish - @standardnotes/api@1.24.4 - @standardnotes/desktop@3.104.98 - @standardnotes/encryption@1.21.4 - @standardnotes/features@1.58.4 - @standardnotes/filepicker@1.28.9 - @standardnotes/files@1.14.19 - @standardnotes/mobile@3.50.34 - @standardnotes/models@1.42.6 - @standardnotes/releases@1.4.121 - @standardnotes/responses@1.13.4 - @standardnotes/services@1.56.5 - @standardnotes/snjs@2.164.5 - @standardnotes/ui-services@1.24.9 - @standardnotes/utils@1.16.2 - @standardnotes/web@3.140.5 --- packages/api/CHANGELOG.md | 4 ++++ packages/api/package.json | 2 +- packages/desktop/CHANGELOG.md | 4 ++++ packages/desktop/package.json | 2 +- packages/encryption/CHANGELOG.md | 4 ++++ packages/encryption/package.json | 2 +- packages/features/CHANGELOG.md | 4 ++++ packages/features/package.json | 2 +- packages/filepicker/CHANGELOG.md | 4 ++++ packages/filepicker/package.json | 2 +- packages/files/CHANGELOG.md | 4 ++++ packages/files/package.json | 2 +- packages/mobile/CHANGELOG.md | 4 ++++ packages/mobile/package.json | 2 +- packages/models/CHANGELOG.md | 4 ++++ packages/models/package.json | 2 +- packages/releases/CHANGELOG.md | 4 ++++ packages/releases/package.json | 2 +- packages/responses/CHANGELOG.md | 4 ++++ packages/responses/package.json | 2 +- packages/services/CHANGELOG.md | 4 ++++ packages/services/package.json | 2 +- packages/snjs/CHANGELOG.md | 4 ++++ packages/snjs/package.json | 2 +- packages/ui-services/CHANGELOG.md | 4 ++++ packages/ui-services/package.json | 2 +- packages/utils/CHANGELOG.md | 4 ++++ packages/utils/package.json | 2 +- packages/web/CHANGELOG.md | 4 ++++ packages/web/CHANGELOG.md.json | 11 +++++++++++ packages/web/package.json | 2 +- 31 files changed, 86 insertions(+), 15 deletions(-) diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index 664f3f9da..9c592f053 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.4](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.3...@standardnotes/api@1.24.4) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/api + ## [1.24.3](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.2...@standardnotes/api@1.24.3) (2023-01-20) **Note:** Version bump only for package @standardnotes/api diff --git a/packages/api/package.json b/packages/api/package.json index 1fb4305c4..5e2687d76 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/api", - "version": "1.24.3", + "version": "1.24.4", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index dd3f60fa2..25ff3cf67 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.104.98](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.4...@standardnotes/desktop@3.104.98) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/desktop + ## [3.104.97](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.3...@standardnotes/desktop@3.104.97) (2023-01-20) **Note:** Version bump only for package @standardnotes/desktop diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 6784f30d0..e32d2fbe6 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/desktop", "main": "./app/dist/index.js", - "version": "3.104.97", + "version": "3.104.98", "license": "AGPL-3.0-or-later", "author": "Standard Notes.", "private": true, diff --git a/packages/encryption/CHANGELOG.md b/packages/encryption/CHANGELOG.md index 688440b8b..b4dd3c026 100644 --- a/packages/encryption/CHANGELOG.md +++ b/packages/encryption/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.21.4](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.3...@standardnotes/encryption@1.21.4) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/encryption + ## [1.21.3](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.2...@standardnotes/encryption@1.21.3) (2023-01-20) **Note:** Version bump only for package @standardnotes/encryption diff --git a/packages/encryption/package.json b/packages/encryption/package.json index 9bafb53f7..1f27ac78b 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/encryption", - "version": "1.21.3", + "version": "1.21.4", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/features/CHANGELOG.md b/packages/features/CHANGELOG.md index e9dba4422..77b37fe67 100644 --- a/packages/features/CHANGELOG.md +++ b/packages/features/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.58.4](https://github.com/standardnotes/app/compare/@standardnotes/features@1.58.3...@standardnotes/features@1.58.4) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/features + ## [1.58.3](https://github.com/standardnotes/app/compare/@standardnotes/features@1.58.2...@standardnotes/features@1.58.3) (2023-01-20) **Note:** Version bump only for package @standardnotes/features diff --git a/packages/features/package.json b/packages/features/package.json index 230e7e627..3c975440d 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/features", - "version": "1.58.3", + "version": "1.58.4", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/filepicker/CHANGELOG.md b/packages/filepicker/CHANGELOG.md index 9c193c17e..4b3c49c2f 100644 --- a/packages/filepicker/CHANGELOG.md +++ b/packages/filepicker/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.28.9](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.8...@standardnotes/filepicker@1.28.9) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/filepicker + ## [1.28.8](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.7...@standardnotes/filepicker@1.28.8) (2023-01-20) **Note:** Version bump only for package @standardnotes/filepicker diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index 4d33c87ed..9a026acbb 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/filepicker", - "version": "1.28.8", + "version": "1.28.9", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/files/CHANGELOG.md b/packages/files/CHANGELOG.md index c8bf3217b..2e751aa9a 100644 --- a/packages/files/CHANGELOG.md +++ b/packages/files/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.14.19](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.18...@standardnotes/files@1.14.19) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/files + ## [1.14.18](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.17...@standardnotes/files@1.14.18) (2023-01-20) **Note:** Version bump only for package @standardnotes/files diff --git a/packages/files/package.json b/packages/files/package.json index 4135011df..45dbf495d 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/files", - "version": "1.14.18", + "version": "1.14.19", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index 9a8e2e8cc..de8d6ca19 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.50.34](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.33...@standardnotes/mobile@3.50.34) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/mobile + ## [3.50.33](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.32...@standardnotes/mobile@3.50.33) (2023-01-20) **Note:** Version bump only for package @standardnotes/mobile diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 414cd7638..404abafb1 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/mobile", - "version": "3.50.33", + "version": "3.50.34", "author": "Standard Notes.", "private": true, "license": "AGPL-3.0-or-later", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 90bbfb3de..dcfd4b19b 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.6](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.5...@standardnotes/models@1.42.6) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/models + ## [1.42.5](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.4...@standardnotes/models@1.42.5) (2023-01-20) **Note:** Version bump only for package @standardnotes/models diff --git a/packages/models/package.json b/packages/models/package.json index f11c6022e..8800d4358 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/models", - "version": "1.42.5", + "version": "1.42.6", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md index e4ed97451..32493a66f 100644 --- a/packages/releases/CHANGELOG.md +++ b/packages/releases/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.121](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.120...@standardnotes/releases@1.4.121) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/releases + ## [1.4.120](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.119...@standardnotes/releases@1.4.120) (2023-01-20) **Note:** Version bump only for package @standardnotes/releases diff --git a/packages/releases/package.json b/packages/releases/package.json index c6cd55dc2..c6014d5af 100644 --- a/packages/releases/package.json +++ b/packages/releases/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/releases", - "version": "1.4.120", + "version": "1.4.121", "license": "AGPL-3.0-or-later", "main": "dist/releases.json", "types": "dist/index.d.ts", diff --git a/packages/responses/CHANGELOG.md b/packages/responses/CHANGELOG.md index 96056bd74..ee2794f38 100644 --- a/packages/responses/CHANGELOG.md +++ b/packages/responses/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.13.4](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.3...@standardnotes/responses@1.13.4) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/responses + ## [1.13.3](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.2...@standardnotes/responses@1.13.3) (2023-01-20) **Note:** Version bump only for package @standardnotes/responses diff --git a/packages/responses/package.json b/packages/responses/package.json index 4eeafd162..fafb64fe1 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/responses", - "version": "1.13.3", + "version": "1.13.4", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md index 1f314182d..85ad7a399 100644 --- a/packages/services/CHANGELOG.md +++ b/packages/services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.56.5](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.4...@standardnotes/services@1.56.5) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/services + ## [1.56.4](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.3...@standardnotes/services@1.56.4) (2023-01-20) ### Bug Fixes diff --git a/packages/services/package.json b/packages/services/package.json index 80bbc1134..dc5077d10 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/services", - "version": "1.56.4", + "version": "1.56.5", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/snjs/CHANGELOG.md b/packages/snjs/CHANGELOG.md index faecd80e0..2114c5359 100644 --- a/packages/snjs/CHANGELOG.md +++ b/packages/snjs/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.164.5](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.4...@standardnotes/snjs@2.164.5) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/snjs + ## [2.164.4](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.3...@standardnotes/snjs@2.164.4) (2023-01-20) ### Bug Fixes diff --git a/packages/snjs/package.json b/packages/snjs/package.json index 0390cfff4..f63d455f0 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/snjs", - "version": "2.164.4", + "version": "2.164.5", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/ui-services/CHANGELOG.md b/packages/ui-services/CHANGELOG.md index a6dd7d392..e94445e26 100644 --- a/packages/ui-services/CHANGELOG.md +++ b/packages/ui-services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.9](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.8...@standardnotes/ui-services@1.24.9) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/ui-services + ## [1.24.8](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.7...@standardnotes/ui-services@1.24.8) (2023-01-20) **Note:** Version bump only for package @standardnotes/ui-services diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index 115317508..d92a84099 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/ui-services", - "version": "1.24.8", + "version": "1.24.9", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 02352c428..2810a866e 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.16.2](https://github.com/standardnotes/app/compare/@standardnotes/utils@1.16.1...@standardnotes/utils@1.16.2) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/utils + ## [1.16.1](https://github.com/standardnotes/app/compare/@standardnotes/utils@1.16.0...@standardnotes/utils@1.16.1) (2023-01-19) **Note:** Version bump only for package @standardnotes/utils diff --git a/packages/utils/package.json b/packages/utils/package.json index 67cb59317..84a8acd1f 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/utils", - "version": "1.16.1", + "version": "1.16.2", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index 344f9a941..ef71915b4 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.140.5](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.4...@standardnotes/web@3.140.5) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/web + ## [3.140.4](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.3...@standardnotes/web@3.140.4) (2023-01-20) **Note:** Version bump only for package @standardnotes/web diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json index 17e075489..414427d7f 100644 --- a/packages/web/CHANGELOG.md.json +++ b/packages/web/CHANGELOG.md.json @@ -1,5 +1,16 @@ { "versions": [ + { + "version": "3.140.5", + "title": "[3.140.5](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.4...@standardnotes/web@3.140.5) (2023-01-20)", + "date": null, + "body": "**Note:** Version bump only for package @standardnotes/web", + "parsed": { + "_": [ + "Note: Version bump only for package @standardnotes/web" + ] + } + }, { "version": "3.140.4", "title": "[3.140.4](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.3...@standardnotes/web@3.140.4) (2023-01-20)", diff --git a/packages/web/package.json b/packages/web/package.json index 0eebada29..26456ba0c 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/web", - "version": "3.140.4", + "version": "3.140.5", "license": "AGPL-3.0-or-later", "main": "dist/app.js", "author": "Standard Notes.", From beccfb16b361ba70bd4f7c09d5840d73ed6e85da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Fri, 20 Jan 2023 15:01:44 +0100 Subject: [PATCH 14/19] fix(models): dependency declaration --- packages/models/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/models/package.json b/packages/models/package.json index 8800d4358..de6a53cf4 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -21,11 +21,13 @@ "lint": "eslint src --ext .ts", "test": "jest" }, + "dependencies": { + "@standardnotes/utils": "workspace:*" + }, "devDependencies": { "@standardnotes/common": "^1.46.4", "@standardnotes/features": "workspace:*", "@standardnotes/responses": "workspace:*", - "@standardnotes/utils": "workspace:*", "@types/jest": "^29.2.3", "@types/lodash": "^4.14.189", "@typescript-eslint/eslint-plugin": "*", From e9a10123fed9e2883e3d2af38939b1608d7b2ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Fri, 20 Jan 2023 15:02:25 +0100 Subject: [PATCH 15/19] fix(models): dependency on utils declaration --- packages/models/package.json | 2 +- yarn.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/models/package.json b/packages/models/package.json index de6a53cf4..a7006386a 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -22,7 +22,7 @@ "test": "jest" }, "dependencies": { - "@standardnotes/utils": "workspace:*" + "@standardnotes/utils": "workspace:^" }, "devDependencies": { "@standardnotes/common": "^1.46.4", diff --git a/yarn.lock b/yarn.lock index 47868e16f..146deeb28 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4879,7 +4879,7 @@ __metadata: "@standardnotes/common": ^1.46.4 "@standardnotes/features": "workspace:*" "@standardnotes/responses": "workspace:*" - "@standardnotes/utils": "workspace:*" + "@standardnotes/utils": "workspace:^" "@types/jest": ^29.2.3 "@types/lodash": ^4.14.189 "@typescript-eslint/eslint-plugin": "*" From 67374ab49b063a714d8e61f7ce92f9a941e2a7b3 Mon Sep 17 00:00:00 2001 From: StandardNotes CI Date: Fri, 20 Jan 2023 15:22:48 +0000 Subject: [PATCH 16/19] chore(release): publish - @standardnotes/api@1.24.5 - @standardnotes/desktop@3.104.99 - @standardnotes/encryption@1.21.5 - @standardnotes/filepicker@1.28.10 - @standardnotes/files@1.14.20 - @standardnotes/mobile@3.50.35 - @standardnotes/models@1.42.7 - @standardnotes/releases@1.4.122 - @standardnotes/services@1.56.6 - @standardnotes/snjs@2.164.6 - @standardnotes/ui-services@1.24.10 - @standardnotes/web@3.140.6 --- packages/api/CHANGELOG.md | 4 ++++ packages/api/package.json | 2 +- packages/desktop/CHANGELOG.md | 4 ++++ packages/desktop/package.json | 2 +- packages/encryption/CHANGELOG.md | 4 ++++ packages/encryption/package.json | 2 +- packages/filepicker/CHANGELOG.md | 4 ++++ packages/filepicker/package.json | 2 +- packages/files/CHANGELOG.md | 4 ++++ packages/files/package.json | 2 +- packages/mobile/CHANGELOG.md | 4 ++++ packages/mobile/package.json | 2 +- packages/models/CHANGELOG.md | 7 +++++++ packages/models/package.json | 2 +- packages/releases/CHANGELOG.md | 4 ++++ packages/releases/package.json | 2 +- packages/services/CHANGELOG.md | 4 ++++ packages/services/package.json | 2 +- packages/snjs/CHANGELOG.md | 4 ++++ packages/snjs/package.json | 2 +- packages/ui-services/CHANGELOG.md | 4 ++++ packages/ui-services/package.json | 2 +- packages/web/CHANGELOG.md | 4 ++++ packages/web/CHANGELOG.md.json | 11 +++++++++++ packages/web/package.json | 2 +- 25 files changed, 74 insertions(+), 12 deletions(-) diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index 9c592f053..aad4d6bc9 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.5](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.4...@standardnotes/api@1.24.5) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/api + ## [1.24.4](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.3...@standardnotes/api@1.24.4) (2023-01-20) **Note:** Version bump only for package @standardnotes/api diff --git a/packages/api/package.json b/packages/api/package.json index 5e2687d76..f3cf1d23b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/api", - "version": "1.24.4", + "version": "1.24.5", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index 25ff3cf67..b27d91edc 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.104.99](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.5...@standardnotes/desktop@3.104.99) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/desktop + ## [3.104.98](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.4...@standardnotes/desktop@3.104.98) (2023-01-20) **Note:** Version bump only for package @standardnotes/desktop diff --git a/packages/desktop/package.json b/packages/desktop/package.json index e32d2fbe6..4495550db 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/desktop", "main": "./app/dist/index.js", - "version": "3.104.98", + "version": "3.104.99", "license": "AGPL-3.0-or-later", "author": "Standard Notes.", "private": true, diff --git a/packages/encryption/CHANGELOG.md b/packages/encryption/CHANGELOG.md index b4dd3c026..0cd7a536c 100644 --- a/packages/encryption/CHANGELOG.md +++ b/packages/encryption/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.21.5](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.4...@standardnotes/encryption@1.21.5) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/encryption + ## [1.21.4](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.3...@standardnotes/encryption@1.21.4) (2023-01-20) **Note:** Version bump only for package @standardnotes/encryption diff --git a/packages/encryption/package.json b/packages/encryption/package.json index 1f27ac78b..59ff01986 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/encryption", - "version": "1.21.4", + "version": "1.21.5", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/filepicker/CHANGELOG.md b/packages/filepicker/CHANGELOG.md index 4b3c49c2f..13c763900 100644 --- a/packages/filepicker/CHANGELOG.md +++ b/packages/filepicker/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.28.10](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.9...@standardnotes/filepicker@1.28.10) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/filepicker + ## [1.28.9](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.8...@standardnotes/filepicker@1.28.9) (2023-01-20) **Note:** Version bump only for package @standardnotes/filepicker diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index 9a026acbb..ab1d4452a 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/filepicker", - "version": "1.28.9", + "version": "1.28.10", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/files/CHANGELOG.md b/packages/files/CHANGELOG.md index 2e751aa9a..b2bf64ced 100644 --- a/packages/files/CHANGELOG.md +++ b/packages/files/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.14.20](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.19...@standardnotes/files@1.14.20) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/files + ## [1.14.19](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.18...@standardnotes/files@1.14.19) (2023-01-20) **Note:** Version bump only for package @standardnotes/files diff --git a/packages/files/package.json b/packages/files/package.json index 45dbf495d..50ba58c41 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/files", - "version": "1.14.19", + "version": "1.14.20", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index de8d6ca19..93f740838 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.50.35](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.34...@standardnotes/mobile@3.50.35) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/mobile + ## [3.50.34](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.33...@standardnotes/mobile@3.50.34) (2023-01-20) **Note:** Version bump only for package @standardnotes/mobile diff --git a/packages/mobile/package.json b/packages/mobile/package.json index 404abafb1..c7025d723 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/mobile", - "version": "3.50.34", + "version": "3.50.35", "author": "Standard Notes.", "private": true, "license": "AGPL-3.0-or-later", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index dcfd4b19b..707235f99 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.7](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.6...@standardnotes/models@1.42.7) (2023-01-20) + +### Bug Fixes + +* **models:** dependency declaration ([beccfb1](https://github.com/standardnotes/app/commit/beccfb16b361ba70bd4f7c09d5840d73ed6e85da)) +* **models:** dependency on utils declaration ([e9a1012](https://github.com/standardnotes/app/commit/e9a10123fed9e2883e3d2af38939b1608d7b2ffa)) + ## [1.42.6](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.5...@standardnotes/models@1.42.6) (2023-01-20) **Note:** Version bump only for package @standardnotes/models diff --git a/packages/models/package.json b/packages/models/package.json index a7006386a..f9582e681 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/models", - "version": "1.42.6", + "version": "1.42.7", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md index 32493a66f..6bba098cf 100644 --- a/packages/releases/CHANGELOG.md +++ b/packages/releases/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.122](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.121...@standardnotes/releases@1.4.122) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/releases + ## [1.4.121](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.120...@standardnotes/releases@1.4.121) (2023-01-20) **Note:** Version bump only for package @standardnotes/releases diff --git a/packages/releases/package.json b/packages/releases/package.json index c6014d5af..e88e50356 100644 --- a/packages/releases/package.json +++ b/packages/releases/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/releases", - "version": "1.4.121", + "version": "1.4.122", "license": "AGPL-3.0-or-later", "main": "dist/releases.json", "types": "dist/index.d.ts", diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md index 85ad7a399..e62346140 100644 --- a/packages/services/CHANGELOG.md +++ b/packages/services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.56.6](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.5...@standardnotes/services@1.56.6) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/services + ## [1.56.5](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.4...@standardnotes/services@1.56.5) (2023-01-20) **Note:** Version bump only for package @standardnotes/services diff --git a/packages/services/package.json b/packages/services/package.json index dc5077d10..dbba35426 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/services", - "version": "1.56.5", + "version": "1.56.6", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/snjs/CHANGELOG.md b/packages/snjs/CHANGELOG.md index 2114c5359..408ec3b64 100644 --- a/packages/snjs/CHANGELOG.md +++ b/packages/snjs/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.164.6](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.5...@standardnotes/snjs@2.164.6) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/snjs + ## [2.164.5](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.4...@standardnotes/snjs@2.164.5) (2023-01-20) **Note:** Version bump only for package @standardnotes/snjs diff --git a/packages/snjs/package.json b/packages/snjs/package.json index f63d455f0..28f32b05c 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/snjs", - "version": "2.164.5", + "version": "2.164.6", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/ui-services/CHANGELOG.md b/packages/ui-services/CHANGELOG.md index e94445e26..406e0e2fa 100644 --- a/packages/ui-services/CHANGELOG.md +++ b/packages/ui-services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.10](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.9...@standardnotes/ui-services@1.24.10) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/ui-services + ## [1.24.9](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.8...@standardnotes/ui-services@1.24.9) (2023-01-20) **Note:** Version bump only for package @standardnotes/ui-services diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index d92a84099..f29015e6c 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/ui-services", - "version": "1.24.9", + "version": "1.24.10", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index ef71915b4..35a2395f7 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.140.6](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.5...@standardnotes/web@3.140.6) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/web + ## [3.140.5](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.4...@standardnotes/web@3.140.5) (2023-01-20) **Note:** Version bump only for package @standardnotes/web diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json index 414427d7f..24c7c43c6 100644 --- a/packages/web/CHANGELOG.md.json +++ b/packages/web/CHANGELOG.md.json @@ -1,5 +1,16 @@ { "versions": [ + { + "version": "3.140.6", + "title": "[3.140.6](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.5...@standardnotes/web@3.140.6) (2023-01-20)", + "date": null, + "body": "**Note:** Version bump only for package @standardnotes/web", + "parsed": { + "_": [ + "Note: Version bump only for package @standardnotes/web" + ] + } + }, { "version": "3.140.5", "title": "[3.140.5](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.4...@standardnotes/web@3.140.5) (2023-01-20)", diff --git a/packages/web/package.json b/packages/web/package.json index 26456ba0c..709174261 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/web", - "version": "3.140.5", + "version": "3.140.6", "license": "AGPL-3.0-or-later", "main": "dist/app.js", "author": "Standard Notes.", From e7214ea73ad5d3026d958c79022d2238a4d1cfdc Mon Sep 17 00:00:00 2001 From: Mo Date: Fri, 20 Jan 2023 16:32:33 -0600 Subject: [PATCH 17/19] fix: fixed issue with third party editors not loading (#2174) --- .../src/Domain/Component/NoteType.spec.ts | 1 - .../src/Domain/Feature/FeatureIdentifier.ts | 2 +- .../src/Domain/Lists/DeprecatedFeatures.ts | 17 ++++++++++++++++- packages/features/src/Domain/Lists/Editors.ts | 16 +--------------- .../Domain/Syncable/Component/Component.spec.ts | 4 ++-- .../src/Domain/Syncable/Component/Component.ts | 2 +- .../ComponentManager/ComponentManager.spec.ts | 2 +- .../Items/Icons/getIconAndTintForNoteType.ts | 6 +++++- 8 files changed, 27 insertions(+), 23 deletions(-) diff --git a/packages/features/src/Domain/Component/NoteType.spec.ts b/packages/features/src/Domain/Component/NoteType.spec.ts index 7d53b1420..7fcc6e1ff 100644 --- a/packages/features/src/Domain/Component/NoteType.spec.ts +++ b/packages/features/src/Domain/Component/NoteType.spec.ts @@ -5,7 +5,6 @@ describe('note type', () => { it('should return the correct note type for editor identifier', () => { expect(noteTypeForEditorIdentifier(FeatureIdentifier.PlainEditor)).toEqual(NoteType.Plain) expect(noteTypeForEditorIdentifier(FeatureIdentifier.SuperEditor)).toEqual(NoteType.Super) - expect(noteTypeForEditorIdentifier(FeatureIdentifier.MarkdownVisualEditor)).toEqual(NoteType.Markdown) expect(noteTypeForEditorIdentifier(FeatureIdentifier.MarkdownProEditor)).toEqual(NoteType.Markdown) expect(noteTypeForEditorIdentifier(FeatureIdentifier.PlusEditor)).toEqual(NoteType.RichText) expect(noteTypeForEditorIdentifier(FeatureIdentifier.CodeEditor)).toEqual(NoteType.Code) diff --git a/packages/features/src/Domain/Feature/FeatureIdentifier.ts b/packages/features/src/Domain/Feature/FeatureIdentifier.ts index ea1bb4fec..1c6861207 100644 --- a/packages/features/src/Domain/Feature/FeatureIdentifier.ts +++ b/packages/features/src/Domain/Feature/FeatureIdentifier.ts @@ -30,12 +30,12 @@ export enum FeatureIdentifier { CodeEditor = 'org.standardnotes.code-editor', MarkdownProEditor = 'org.standardnotes.advanced-markdown-editor', - MarkdownVisualEditor = 'org.standardnotes.markdown-visual-editor', PlusEditor = 'org.standardnotes.plus-editor', SheetsEditor = 'org.standardnotes.standard-sheets', TaskEditor = 'org.standardnotes.simple-task-editor', TokenVaultEditor = 'org.standardnotes.token-vault', + DeprecatedMarkdownVisualEditor = 'org.standardnotes.markdown-visual-editor', DeprecatedBoldEditor = 'org.standardnotes.bold-editor', DeprecatedMarkdownBasicEditor = 'org.standardnotes.simple-markdown-editor', DeprecatedMarkdownMathEditor = 'org.standardnotes.fancy-markdown-editor', diff --git a/packages/features/src/Domain/Lists/DeprecatedFeatures.ts b/packages/features/src/Domain/Lists/DeprecatedFeatures.ts index 306440aa2..95e726a9b 100644 --- a/packages/features/src/Domain/Lists/DeprecatedFeatures.ts +++ b/packages/features/src/Domain/Lists/DeprecatedFeatures.ts @@ -55,6 +55,21 @@ export function GetDeprecatedFeatures(): FeatureDescription[] { availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) + const markdownAlt: EditorFeatureDescription = FillEditorComponentDefaults({ + availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], + name: 'Markdown Alternative', + identifier: FeatureIdentifier.DeprecatedMarkdownVisualEditor, + note_type: NoteType.Markdown, + file_type: 'md', + deprecated: true, + permission_name: PermissionName.MarkdownVisualEditor, + spellcheckControl: true, + description: + 'A WYSIWYG-style Markdown editor that renders Markdown in preview-mode while you type without displaying any syntax.', + index_path: 'build/index.html', + availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], + }) + const markdownMinimist: EditorFeatureDescription = FillEditorComponentDefaults({ availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], name: 'Minimal Markdown', @@ -112,5 +127,5 @@ export function GetDeprecatedFeatures(): FeatureDescription[] { availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) - return [bold, markdownBasic, markdownMinimist, markdownMath, filesafe] + return [bold, markdownBasic, markdownMinimist, markdownMath, markdownAlt, filesafe] } diff --git a/packages/features/src/Domain/Lists/Editors.ts b/packages/features/src/Domain/Lists/Editors.ts index 8cc277f4a..611ca50f6 100644 --- a/packages/features/src/Domain/Lists/Editors.ts +++ b/packages/features/src/Domain/Lists/Editors.ts @@ -52,20 +52,6 @@ export function editors(): EditorFeatureDescription[] { availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) - const markdownAlt: EditorFeatureDescription = FillEditorComponentDefaults({ - availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], - name: 'Markdown Alternative', - identifier: FeatureIdentifier.MarkdownVisualEditor, - note_type: NoteType.Markdown, - file_type: 'md', - permission_name: PermissionName.MarkdownVisualEditor, - spellcheckControl: true, - description: - 'A WYSIWYG-style Markdown editor that renders Markdown in preview-mode while you type without displaying any syntax.', - index_path: 'build/index.html', - availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], - }) - const task: EditorFeatureDescription = FillEditorComponentDefaults({ availableInSubscriptions: [SubscriptionName.PlusPlan, SubscriptionName.ProPlan], name: 'Checklist', @@ -109,5 +95,5 @@ export function editors(): EditorFeatureDescription[] { availableInRoles: [RoleName.NAMES.PlusUser, RoleName.NAMES.ProUser], }) - return [code, plus, markdown, markdownAlt, task, tokenvault, spreadsheets] + return [code, plus, markdown, task, tokenvault, spreadsheets] } diff --git a/packages/models/src/Domain/Syncable/Component/Component.spec.ts b/packages/models/src/Domain/Syncable/Component/Component.spec.ts index 839aacd2c..a91d47d40 100644 --- a/packages/models/src/Domain/Syncable/Component/Component.spec.ts +++ b/packages/models/src/Domain/Syncable/Component/Component.spec.ts @@ -68,7 +68,7 @@ describe('component model', () => { expect(component.noteType).toEqual(NoteType.Authentication) }) - it('should return plain as noteType if no note type defined in package_info', () => { + it('should return unknown as noteType if no note type defined in package_info', () => { const component = new SNComponent( new DecryptedPayload( { @@ -83,6 +83,6 @@ describe('component model', () => { ), ) - expect(component.noteType).toEqual(NoteType.Plain) + expect(component.noteType).toEqual(NoteType.Unknown) }) }) diff --git a/packages/models/src/Domain/Syncable/Component/Component.ts b/packages/models/src/Domain/Syncable/Component/Component.ts index 509f28bc9..1b13d37dc 100644 --- a/packages/models/src/Domain/Syncable/Component/Component.ts +++ b/packages/models/src/Domain/Syncable/Component/Component.ts @@ -180,7 +180,7 @@ export class SNComponent extends DecryptedItem implements Comp } public get noteType(): NoteType { - return this.package_info.note_type || NoteType.Plain + return this.package_info.note_type || NoteType.Unknown } public get isDeprecated(): boolean { diff --git a/packages/snjs/lib/Services/ComponentManager/ComponentManager.spec.ts b/packages/snjs/lib/Services/ComponentManager/ComponentManager.spec.ts index 2c3e265c8..f5454bb16 100644 --- a/packages/snjs/lib/Services/ComponentManager/ComponentManager.spec.ts +++ b/packages/snjs/lib/Services/ComponentManager/ComponentManager.spec.ts @@ -147,7 +147,7 @@ describe('featuresService', () => { const manager = createManager(Environment.Desktop, Platform.MacDesktop) expect( - manager.areRequestedPermissionsValid(nativeComponent(FeatureIdentifier.MarkdownVisualEditor), permissions), + manager.areRequestedPermissionsValid(nativeComponent(FeatureIdentifier.MarkdownProEditor), permissions), ).toEqual(true) }) diff --git a/packages/web/src/javascripts/Utils/Items/Icons/getIconAndTintForNoteType.ts b/packages/web/src/javascripts/Utils/Items/Icons/getIconAndTintForNoteType.ts index e94fee989..e9a34d601 100644 --- a/packages/web/src/javascripts/Utils/Items/Icons/getIconAndTintForNoteType.ts +++ b/packages/web/src/javascripts/Utils/Items/Icons/getIconAndTintForNoteType.ts @@ -4,6 +4,9 @@ import { IconType } from '@standardnotes/models' export function getIconAndTintForNoteType(noteType?: NoteType, subtle?: boolean): [IconType, number] { switch (noteType) { + case undefined: + case NoteType.Plain: + return [PlainEditorMetadata.icon, PlainEditorMetadata.iconTintNumber] case NoteType.RichText: return ['rich-text', 1] case NoteType.Markdown: @@ -21,7 +24,8 @@ export function getIconAndTintForNoteType(noteType?: NoteType, subtle?: boolean) subtle ? (SuperEditorMetadata.subtleIcon as IconType) : SuperEditorMetadata.icon, SuperEditorMetadata.iconTintNumber, ] + case NoteType.Unknown: default: - return [PlainEditorMetadata.icon, PlainEditorMetadata.iconTintNumber] + return ['editor', PlainEditorMetadata.iconTintNumber] } } From 545d2dbfa9e60a1b1dba149411faf0e42c3c6186 Mon Sep 17 00:00:00 2001 From: moughxyz Date: Fri, 20 Jan 2023 17:06:52 -0600 Subject: [PATCH 18/19] temp: skip history e2e --- packages/snjs/mocha/history.test.js | 2 +- packages/web/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/snjs/mocha/history.test.js b/packages/snjs/mocha/history.test.js index a373ea95f..8f518a69f 100644 --- a/packages/snjs/mocha/history.test.js +++ b/packages/snjs/mocha/history.test.js @@ -5,7 +5,7 @@ import { createNoteParams } from './lib/Items.js' chai.use(chaiAsPromised) const expect = chai.expect -describe('history manager', () => { +describe.skip('history manager', () => { const largeCharacterChange = 25 const syncOptions = { diff --git a/packages/web/package.json b/packages/web/package.json index 709174261..616d0db46 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/web", - "version": "3.140.6", + "version": "3.140.7", "license": "AGPL-3.0-or-later", "main": "dist/app.js", "author": "Standard Notes.", From 607ac361d1e8f3f95890ae51a972f154581bd274 Mon Sep 17 00:00:00 2001 From: StandardNotes CI Date: Fri, 20 Jan 2023 23:32:47 +0000 Subject: [PATCH 19/19] chore(release): publish - @standardnotes/api@1.24.6 - @standardnotes/desktop@3.104.100 - @standardnotes/encryption@1.21.6 - @standardnotes/features@1.58.5 - @standardnotes/filepicker@1.28.11 - @standardnotes/files@1.14.21 - @standardnotes/mobile@3.50.36 - @standardnotes/models@1.42.8 - @standardnotes/releases@1.4.123 - @standardnotes/responses@1.13.5 - @standardnotes/services@1.56.7 - @standardnotes/snjs@2.164.7 - @standardnotes/ui-services@1.24.11 - @standardnotes/web@3.140.8 --- packages/api/CHANGELOG.md | 4 ++++ packages/api/package.json | 2 +- packages/desktop/CHANGELOG.md | 4 ++++ packages/desktop/package.json | 2 +- packages/encryption/CHANGELOG.md | 4 ++++ packages/encryption/package.json | 2 +- packages/features/CHANGELOG.md | 6 ++++++ packages/features/package.json | 2 +- packages/filepicker/CHANGELOG.md | 4 ++++ packages/filepicker/package.json | 2 +- packages/files/CHANGELOG.md | 4 ++++ packages/files/package.json | 2 +- packages/mobile/CHANGELOG.md | 4 ++++ packages/mobile/package.json | 2 +- packages/models/CHANGELOG.md | 6 ++++++ packages/models/package.json | 2 +- packages/releases/CHANGELOG.md | 4 ++++ packages/releases/package.json | 2 +- packages/responses/CHANGELOG.md | 4 ++++ packages/responses/package.json | 2 +- packages/services/CHANGELOG.md | 4 ++++ packages/services/package.json | 2 +- packages/snjs/CHANGELOG.md | 6 ++++++ packages/snjs/package.json | 2 +- packages/ui-services/CHANGELOG.md | 4 ++++ packages/ui-services/package.json | 2 +- packages/web/CHANGELOG.md | 6 ++++++ packages/web/CHANGELOG.md.json | 14 ++++++++++++++ packages/web/package.json | 2 +- 29 files changed, 92 insertions(+), 14 deletions(-) diff --git a/packages/api/CHANGELOG.md b/packages/api/CHANGELOG.md index aad4d6bc9..b89755841 100644 --- a/packages/api/CHANGELOG.md +++ b/packages/api/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.6](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.5...@standardnotes/api@1.24.6) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/api + ## [1.24.5](https://github.com/standardnotes/app/compare/@standardnotes/api@1.24.4...@standardnotes/api@1.24.5) (2023-01-20) **Note:** Version bump only for package @standardnotes/api diff --git a/packages/api/package.json b/packages/api/package.json index f3cf1d23b..afbeaff33 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/api", - "version": "1.24.5", + "version": "1.24.6", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/desktop/CHANGELOG.md b/packages/desktop/CHANGELOG.md index b27d91edc..9c3dfa073 100644 --- a/packages/desktop/CHANGELOG.md +++ b/packages/desktop/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.104.100](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.6...@standardnotes/desktop@3.104.100) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/desktop + ## [3.104.99](https://github.com/standardnotes/app/compare/@standardnotes/desktop@3.140.5...@standardnotes/desktop@3.104.99) (2023-01-20) **Note:** Version bump only for package @standardnotes/desktop diff --git a/packages/desktop/package.json b/packages/desktop/package.json index 4495550db..c941ce59e 100644 --- a/packages/desktop/package.json +++ b/packages/desktop/package.json @@ -1,7 +1,7 @@ { "name": "@standardnotes/desktop", "main": "./app/dist/index.js", - "version": "3.104.99", + "version": "3.104.100", "license": "AGPL-3.0-or-later", "author": "Standard Notes.", "private": true, diff --git a/packages/encryption/CHANGELOG.md b/packages/encryption/CHANGELOG.md index 0cd7a536c..4a4ff7daa 100644 --- a/packages/encryption/CHANGELOG.md +++ b/packages/encryption/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.21.6](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.5...@standardnotes/encryption@1.21.6) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/encryption + ## [1.21.5](https://github.com/standardnotes/app/compare/@standardnotes/encryption@1.21.4...@standardnotes/encryption@1.21.5) (2023-01-20) **Note:** Version bump only for package @standardnotes/encryption diff --git a/packages/encryption/package.json b/packages/encryption/package.json index 59ff01986..08e22dc3f 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/encryption", - "version": "1.21.5", + "version": "1.21.6", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/features/CHANGELOG.md b/packages/features/CHANGELOG.md index 77b37fe67..99f0c6f36 100644 --- a/packages/features/CHANGELOG.md +++ b/packages/features/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.58.5](https://github.com/standardnotes/app/compare/@standardnotes/features@1.58.4...@standardnotes/features@1.58.5) (2023-01-20) + +### Bug Fixes + +* fixed issue with third party editors not loading ([#2174](https://github.com/standardnotes/app/issues/2174)) ([e7214ea](https://github.com/standardnotes/app/commit/e7214ea73ad5d3026d958c79022d2238a4d1cfdc)) + ## [1.58.4](https://github.com/standardnotes/app/compare/@standardnotes/features@1.58.3...@standardnotes/features@1.58.4) (2023-01-20) **Note:** Version bump only for package @standardnotes/features diff --git a/packages/features/package.json b/packages/features/package.json index 3c975440d..3faffa560 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/features", - "version": "1.58.4", + "version": "1.58.5", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/filepicker/CHANGELOG.md b/packages/filepicker/CHANGELOG.md index 13c763900..d7a89e80f 100644 --- a/packages/filepicker/CHANGELOG.md +++ b/packages/filepicker/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.28.11](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.10...@standardnotes/filepicker@1.28.11) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/filepicker + ## [1.28.10](https://github.com/standardnotes/app/compare/@standardnotes/filepicker@1.28.9...@standardnotes/filepicker@1.28.10) (2023-01-20) **Note:** Version bump only for package @standardnotes/filepicker diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index ab1d4452a..ed47a95b8 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/filepicker", - "version": "1.28.10", + "version": "1.28.11", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/files/CHANGELOG.md b/packages/files/CHANGELOG.md index b2bf64ced..d72acca8f 100644 --- a/packages/files/CHANGELOG.md +++ b/packages/files/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.14.21](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.20...@standardnotes/files@1.14.21) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/files + ## [1.14.20](https://github.com/standardnotes/app/compare/@standardnotes/files@1.14.19...@standardnotes/files@1.14.20) (2023-01-20) **Note:** Version bump only for package @standardnotes/files diff --git a/packages/files/package.json b/packages/files/package.json index 50ba58c41..4360ae0cc 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/files", - "version": "1.14.20", + "version": "1.14.21", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/mobile/CHANGELOG.md b/packages/mobile/CHANGELOG.md index 93f740838..2973f5318 100644 --- a/packages/mobile/CHANGELOG.md +++ b/packages/mobile/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.50.36](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.35...@standardnotes/mobile@3.50.36) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/mobile + ## [3.50.35](https://github.com/standardnotes/app/compare/@standardnotes/mobile@3.50.34...@standardnotes/mobile@3.50.35) (2023-01-20) **Note:** Version bump only for package @standardnotes/mobile diff --git a/packages/mobile/package.json b/packages/mobile/package.json index c7025d723..1ea92e868 100644 --- a/packages/mobile/package.json +++ b/packages/mobile/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/mobile", - "version": "3.50.35", + "version": "3.50.36", "author": "Standard Notes.", "private": true, "license": "AGPL-3.0-or-later", diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md index 707235f99..20a2efeae 100644 --- a/packages/models/CHANGELOG.md +++ b/packages/models/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.42.8](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.7...@standardnotes/models@1.42.8) (2023-01-20) + +### Bug Fixes + +* fixed issue with third party editors not loading ([#2174](https://github.com/standardnotes/app/issues/2174)) ([e7214ea](https://github.com/standardnotes/app/commit/e7214ea73ad5d3026d958c79022d2238a4d1cfdc)) + ## [1.42.7](https://github.com/standardnotes/app/compare/@standardnotes/models@1.42.6...@standardnotes/models@1.42.7) (2023-01-20) ### Bug Fixes diff --git a/packages/models/package.json b/packages/models/package.json index f9582e681..10c96433e 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/models", - "version": "1.42.7", + "version": "1.42.8", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/releases/CHANGELOG.md b/packages/releases/CHANGELOG.md index 6bba098cf..bffb1daab 100644 --- a/packages/releases/CHANGELOG.md +++ b/packages/releases/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.4.123](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.122...@standardnotes/releases@1.4.123) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/releases + ## [1.4.122](https://github.com/standardnotes/app/compare/@standardnotes/releases@1.4.121...@standardnotes/releases@1.4.122) (2023-01-20) **Note:** Version bump only for package @standardnotes/releases diff --git a/packages/releases/package.json b/packages/releases/package.json index e88e50356..12cb54e7d 100644 --- a/packages/releases/package.json +++ b/packages/releases/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/releases", - "version": "1.4.122", + "version": "1.4.123", "license": "AGPL-3.0-or-later", "main": "dist/releases.json", "types": "dist/index.d.ts", diff --git a/packages/responses/CHANGELOG.md b/packages/responses/CHANGELOG.md index ee2794f38..fd2a42241 100644 --- a/packages/responses/CHANGELOG.md +++ b/packages/responses/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.13.5](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.4...@standardnotes/responses@1.13.5) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/responses + ## [1.13.4](https://github.com/standardnotes/app/compare/@standardnotes/responses@1.13.3...@standardnotes/responses@1.13.4) (2023-01-20) **Note:** Version bump only for package @standardnotes/responses diff --git a/packages/responses/package.json b/packages/responses/package.json index fafb64fe1..f741b250d 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/responses", - "version": "1.13.4", + "version": "1.13.5", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/services/CHANGELOG.md b/packages/services/CHANGELOG.md index e62346140..f2557eecd 100644 --- a/packages/services/CHANGELOG.md +++ b/packages/services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.56.7](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.6...@standardnotes/services@1.56.7) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/services + ## [1.56.6](https://github.com/standardnotes/app/compare/@standardnotes/services@1.56.5...@standardnotes/services@1.56.6) (2023-01-20) **Note:** Version bump only for package @standardnotes/services diff --git a/packages/services/package.json b/packages/services/package.json index dbba35426..e951021e9 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/services", - "version": "1.56.6", + "version": "1.56.7", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/snjs/CHANGELOG.md b/packages/snjs/CHANGELOG.md index 408ec3b64..441ff18be 100644 --- a/packages/snjs/CHANGELOG.md +++ b/packages/snjs/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [2.164.7](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.6...@standardnotes/snjs@2.164.7) (2023-01-20) + +### Bug Fixes + +* fixed issue with third party editors not loading ([#2174](https://github.com/standardnotes/app/issues/2174)) ([e7214ea](https://github.com/standardnotes/app/commit/e7214ea73ad5d3026d958c79022d2238a4d1cfdc)) + ## [2.164.6](https://github.com/standardnotes/app/compare/@standardnotes/snjs@2.164.5...@standardnotes/snjs@2.164.6) (2023-01-20) **Note:** Version bump only for package @standardnotes/snjs diff --git a/packages/snjs/package.json b/packages/snjs/package.json index 28f32b05c..cf696cb4a 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/snjs", - "version": "2.164.6", + "version": "2.164.7", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/ui-services/CHANGELOG.md b/packages/ui-services/CHANGELOG.md index 406e0e2fa..eb7d39b7d 100644 --- a/packages/ui-services/CHANGELOG.md +++ b/packages/ui-services/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [1.24.11](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.10...@standardnotes/ui-services@1.24.11) (2023-01-20) + +**Note:** Version bump only for package @standardnotes/ui-services + ## [1.24.10](https://github.com/standardnotes/app/compare/@standardnotes/ui-services@1.24.9...@standardnotes/ui-services@1.24.10) (2023-01-20) **Note:** Version bump only for package @standardnotes/ui-services diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index f29015e6c..2dc255eb0 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/ui-services", - "version": "1.24.10", + "version": "1.24.11", "engines": { "node": ">=16.0.0 <17.0.0" }, diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md index 35a2395f7..7403403c5 100644 --- a/packages/web/CHANGELOG.md +++ b/packages/web/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [3.140.8](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.6...@standardnotes/web@3.140.8) (2023-01-20) + +### Bug Fixes + +* fixed issue with third party editors not loading ([#2174](https://github.com/standardnotes/app/issues/2174)) ([e7214ea](https://github.com/standardnotes/app/commit/e7214ea73ad5d3026d958c79022d2238a4d1cfdc)) + ## [3.140.6](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.5...@standardnotes/web@3.140.6) (2023-01-20) **Note:** Version bump only for package @standardnotes/web diff --git a/packages/web/CHANGELOG.md.json b/packages/web/CHANGELOG.md.json index 24c7c43c6..06b695d2e 100644 --- a/packages/web/CHANGELOG.md.json +++ b/packages/web/CHANGELOG.md.json @@ -1,5 +1,19 @@ { "versions": [ + { + "version": "3.140.8", + "title": "[3.140.8](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.6...@standardnotes/web@3.140.8) (2023-01-20)", + "date": null, + "body": "### Bug Fixes\n\n* fixed issue with third party editors not loading ([#2174](https://github.com/standardnotes/app/issues/2174)) ([e7214ea](https://github.com/standardnotes/app/commit/e7214ea73ad5d3026d958c79022d2238a4d1cfdc))", + "parsed": { + "_": [ + "fixed issue with third party editors not loading (#2174) (e7214ea)" + ], + "Bug Fixes": [ + "fixed issue with third party editors not loading (#2174) (e7214ea)" + ] + } + }, { "version": "3.140.6", "title": "[3.140.6](https://github.com/standardnotes/app/compare/@standardnotes/web@3.140.5...@standardnotes/web@3.140.6) (2023-01-20)", diff --git a/packages/web/package.json b/packages/web/package.json index 616d0db46..ff171e42b 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "@standardnotes/web", - "version": "3.140.7", + "version": "3.140.8", "license": "AGPL-3.0-or-later", "main": "dist/app.js", "author": "Standard Notes.",