chore: upgrade @standardnotes/domain-core and @standardnotes/settings (#2607)

packages/snjs/lib/Domain/UseCase/GetRecoveryCodes/GetRecoveryCodes.ts

@@ -1,6 +1,5 @@
 import { AuthClientInterface } from '@standardnotes/services'
-import { Result, UseCaseInterface } from '@standardnotes/domain-core'
-import { SettingName } from '@standardnotes/settings'
+import { Result, SettingName, UseCaseInterface } from '@standardnotes/domain-core'
 
 import { SettingsClientInterface } from '@Lib/Services/Settings/SettingsClientInterface'
 

packages/snjs/lib/Services/Features/FeaturesService.spec.ts

@@ -1,8 +1,7 @@
 import { ItemInterface, SNFeatureRepo } from '@standardnotes/models'
 import { SyncService } from '../Sync/SyncService'
-import { SettingName } from '@standardnotes/settings'
 import { FeaturesService } from '@Lib/Services/Features'
-import { RoleName, ContentType, Uuid, Result } from '@standardnotes/domain-core'
+import { RoleName, ContentType, Uuid, Result, SettingName } from '@standardnotes/domain-core'
 import { NativeFeatureIdentifier, GetFeatures } from '@standardnotes/features'
 import { SettingsService } from '../Settings'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'

packages/snjs/lib/Services/Features/UseCase/MigrateFeatureRepoToUserSetting.ts

@@ -1,7 +1,7 @@
 import { SettingsClientInterface } from '@Lib/Services/Settings/SettingsClientInterface'
+import { SettingName } from '@standardnotes/domain-core'
 import { SNFeatureRepo } from '@standardnotes/models'
 import { MutatorClientInterface } from '@standardnotes/services'
-import { SettingName } from '@standardnotes/settings'
 
 export class MigrateFeatureRepoToUserSettingUseCase {
   constructor(

packages/snjs/lib/Services/Listed/ListedService.ts

@@ -2,7 +2,6 @@ import { isString, lastElement, sleep } from '@standardnotes/utils'
 import { UuidString } from '@Lib/Types/UuidString'
 import { ItemManager } from '@Lib/Services/Items/ItemManager'
 import { DeprecatedHttpService } from '../Api/DeprecatedHttpService'
-import { SettingName } from '@standardnotes/settings'
 import { SettingsService } from '../Settings/SNSettingsService'
 import { ListedClientInterface } from './ListedClientInterface'
 import { LegacyApiService } from '../Api/ApiService'
@@ -15,7 +14,7 @@ import {
   SyncServiceInterface,
 } from '@standardnotes/services'
 import { ProtectionService } from '../Protection'
-import { ContentType } from '@standardnotes/domain-core'
+import { ContentType, SettingName } from '@standardnotes/domain-core'
 
 export class ListedService extends AbstractService implements ListedClientInterface {
   constructor(

packages/snjs/lib/Services/Mfa/MfaService.ts

@@ -1,9 +1,8 @@
-import { SettingName } from '@standardnotes/settings'
-
 import { SettingsService } from '../Settings'
 import { PureCryptoInterface } from '@standardnotes/sncrypto-common'
 import { FeaturesService } from '../Features/FeaturesService'
 import { AbstractService, InternalEventBusInterface, MfaServiceInterface, SignInStrings } from '@standardnotes/services'
+import { SettingName } from '@standardnotes/domain-core'
 
 export class MfaService extends AbstractService implements MfaServiceInterface {
   constructor(

packages/snjs/lib/Services/Settings/SNSettingsService.ts

@@ -1,9 +1,10 @@
 import { LegacyApiService } from '../Api/ApiService'
 import { SettingsGateway } from './SettingsGateway'
 import { SessionManager } from '../Session/SessionManager'
-import { EmailBackupFrequency, SettingName } from '@standardnotes/settings'
+import { EmailBackupFrequency } from '@standardnotes/settings'
 import { AbstractService, InternalEventBusInterface } from '@standardnotes/services'
 import { SettingsClientInterface } from './SettingsClientInterface'
+import { SettingName } from '@standardnotes/domain-core'
 
 export class SettingsService extends AbstractService implements SettingsClientInterface {
   private provider!: SettingsGateway

packages/snjs/lib/Services/Settings/SettingsClientInterface.ts

@@ -1,5 +1,6 @@
-import { SettingName, EmailBackupFrequency } from '@standardnotes/settings'
+import { EmailBackupFrequency } from '@standardnotes/settings'
 import { SettingsList } from './SettingsList'
+import { SettingName } from '@standardnotes/domain-core'
 
 export interface SettingsClientInterface {
   listSettings(): Promise<SettingsList>

packages/snjs/lib/Services/Settings/SettingsGateway.ts

@@ -1,8 +1,8 @@
 import { SettingsList } from './SettingsList'
-import { SettingName } from '@standardnotes/settings'
 import { API_MESSAGE_INVALID_SESSION } from '@standardnotes/services'
 import { getErrorFromErrorResponse, HttpStatusCode, isErrorResponse, User } from '@standardnotes/responses'
 import { SettingsServerInterface } from './SettingsServerInterface'
+import { SettingName } from '@standardnotes/domain-core'
 
 /**
  * SettingsGateway coordinates communication with the API service

packages/snjs/lib/Services/Settings/SettingsList.ts

@@ -1,3 +1,4 @@
+import { SettingName } from '@standardnotes/domain-core'
 import { SettingData } from '@standardnotes/responses'
 import {
   MuteSignInEmailsOption,
@@ -5,7 +6,6 @@ import {
   EmailBackupFrequency,
   ListedAuthorSecretsData,
   LogSessionUserAgentOption,
-  SettingName,
   MuteMarketingEmailsOption,
 } from '@standardnotes/settings'
 

packages/snjs/package.json

@@ -37,7 +37,7 @@
     "@babel/preset-env": "*",
     "@standardnotes/api": "workspace:*",
     "@standardnotes/common": "^1.50.0",
-    "@standardnotes/domain-core": "^1.34.1",
+    "@standardnotes/domain-core": "^1.40.0",
     "@standardnotes/domain-events": "^2.122.0",
     "@standardnotes/encryption": "workspace:*",
     "@standardnotes/features": "workspace:*",
@@ -45,7 +45,7 @@
     "@standardnotes/models": "workspace:*",
     "@standardnotes/responses": "workspace:*",
     "@standardnotes/services": "workspace:*",
-    "@standardnotes/settings": "^1.20.0",
+    "@standardnotes/settings": "^1.22.0",
     "@standardnotes/sncrypto-common": "workspace:*",
     "@standardnotes/sncrypto-web": "workspace:*",
     "@standardnotes/utils": "workspace:*",