From 3a1614069928fe14857f64bd849fdca3ce5b3959 Mon Sep 17 00:00:00 2001 From: Baptiste Grob <60621355+baptiste-grob@users.noreply.github.com> Date: Thu, 19 Nov 2020 13:37:49 +0100 Subject: [PATCH] chore(deps): upgrade snjs & sncrypto-web to npm package versions --- app/assets/javascripts/app.ts | 2 +- app/assets/javascripts/database.ts | 4 +- .../directives/views/accountMenu.ts | 6 +-- .../directives/views/actionsMenu.ts | 6 +-- .../directives/views/componentModal.ts | 2 +- .../directives/views/componentView.ts | 2 +- .../directives/views/editorMenu.ts | 4 +- .../directives/views/historyMenu.ts | 6 +-- .../directives/views/privilegesAuthModal.ts | 2 +- .../views/privilegesManagementModal.ts | 4 +- .../directives/views/revisionPreviewModal.ts | 4 +- .../javascripts/services/alertService.ts | 2 +- .../javascripts/services/archiveManager.ts | 4 +- .../javascripts/services/autolock_service.ts | 2 +- app/assets/javascripts/services/bridge.ts | 6 +-- .../javascripts/services/browserBridge.ts | 2 +- .../javascripts/services/desktopManager.ts | 4 +- .../javascripts/services/errorReporting.ts | 2 +- .../javascripts/services/keyboardManager.ts | 2 +- .../javascripts/services/nativeExtManager.ts | 6 +-- .../services/preferencesManager.ts | 2 +- .../javascripts/services/statusManager.ts | 2 +- .../javascripts/services/themeManager.ts | 2 +- app/assets/javascripts/types.ts | 4 +- app/assets/javascripts/ui_models/app_state.ts | 2 +- .../javascripts/ui_models/application.ts | 8 ++-- .../ui_models/application_group.ts | 2 +- .../javascripts/ui_models/component_group.ts | 6 +-- app/assets/javascripts/ui_models/editor.ts | 2 +- .../javascripts/ui_models/editor_group.ts | 2 +- .../views/abstract/pure_view_ctrl.ts | 2 +- .../account_switcher/account_switcher.ts | 2 +- .../views/application/application_view.ts | 2 +- .../views/challenge_modal/challenge_modal.ts | 2 +- .../javascripts/views/editor/editor_view.ts | 2 +- .../javascripts/views/footer/footer_view.ts | 2 +- .../javascripts/views/notes/note_utils.ts | 2 +- .../javascripts/views/notes/notes_view.ts | 4 +- .../javascripts/views/tags/tags_view.ts | 4 +- .../javascripts/web_device_interface.ts | 6 ++- package-lock.json | 43 +++++++++++++++---- package.json | 6 +-- 42 files changed, 106 insertions(+), 75 deletions(-) diff --git a/app/assets/javascripts/app.ts b/app/assets/javascripts/app.ts index 58ae18e44..66e9ca7de 100644 --- a/app/assets/javascripts/app.ts +++ b/app/assets/javascripts/app.ts @@ -3,7 +3,7 @@ declare const __VERSION__: string; declare const __WEB__: boolean; -import { SNLog } from 'snjs'; +import { SNLog } from '@standardnotes/snjs'; import angular from 'angular'; import { configRoutes } from './routes'; diff --git a/app/assets/javascripts/database.ts b/app/assets/javascripts/database.ts index c29449110..deac64b9e 100644 --- a/app/assets/javascripts/database.ts +++ b/app/assets/javascripts/database.ts @@ -1,4 +1,4 @@ -import { SNAlertService } from "snjs/dist/@types"; +import { SNAlertService } from "@standardnotes/snjs"; const STORE_NAME = 'items'; const READ_WRITE = 'readwrite'; @@ -216,4 +216,4 @@ export class Database { "Please close any other app instances and reload the page."; this.alertService!.alert(message); } -} \ No newline at end of file +} diff --git a/app/assets/javascripts/directives/views/accountMenu.ts b/app/assets/javascripts/directives/views/accountMenu.ts index 2f38002cf..85789c0e5 100644 --- a/app/assets/javascripts/directives/views/accountMenu.ts +++ b/app/assets/javascripts/directives/views/accountMenu.ts @@ -1,7 +1,7 @@ import { WebDirective } from './../../types'; import { isDesktopApplication, preventRefreshing } from '@/utils'; import template from '%/directives/account-menu.pug'; -import { ProtectedAction, ContentType } from 'snjs'; +import { ProtectedAction, ContentType } from '@standardnotes/snjs'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; import { STRING_ACCOUNT_MENU_UNCHECK_MERGE, @@ -22,9 +22,9 @@ import { STRING_CONFIRM_APP_QUIT_DURING_PASSCODE_REMOVAL, STRING_UNSUPPORTED_BACKUP_FILE_VERSION } from '@/strings'; -import { SyncOpStatus } from 'snjs/dist/@types/services/sync/sync_op_status'; +import { SyncOpStatus } from '@standardnotes/snjs'; import { PasswordWizardType } from '@/types'; -import { BackupFile } from 'snjs/dist/@types/services/protocol_service'; +import { BackupFile } from '@standardnotes/snjs'; import { confirmDialog, alertDialog } from '@/services/alertService'; import { autorun, IReactionDisposer } from 'mobx'; import { storage, StorageKey } from '@/services/localStorage'; diff --git a/app/assets/javascripts/directives/views/actionsMenu.ts b/app/assets/javascripts/directives/views/actionsMenu.ts index 52cdcd27c..99d60426a 100644 --- a/app/assets/javascripts/directives/views/actionsMenu.ts +++ b/app/assets/javascripts/directives/views/actionsMenu.ts @@ -2,9 +2,9 @@ import { WebApplication } from '@/ui_models/application'; import { WebDirective } from './../../types'; import template from '%/directives/actions-menu.pug'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; -import { SNItem, Action, SNActionsExtension, UuidString } from 'snjs/dist/@types'; -import { ActionResponse } from 'snjs'; -import { ActionsExtensionMutator } from 'snjs/dist/@types/models/app/extension'; +import { SNItem, Action, SNActionsExtension, UuidString } from '@standardnotes/snjs'; +import { ActionResponse } from '@standardnotes/snjs'; +import { ActionsExtensionMutator } from '@standardnotes/snjs'; import { autorun, IReactionDisposer } from 'mobx'; type ActionsMenuScope = { diff --git a/app/assets/javascripts/directives/views/componentModal.ts b/app/assets/javascripts/directives/views/componentModal.ts index fe01ee99f..d03ed2289 100644 --- a/app/assets/javascripts/directives/views/componentModal.ts +++ b/app/assets/javascripts/directives/views/componentModal.ts @@ -1,5 +1,5 @@ import { WebApplication } from '@/ui_models/application'; -import { SNComponent, LiveItem } from 'snjs'; +import { SNComponent, LiveItem } from '@standardnotes/snjs'; import { WebDirective } from './../../types'; import template from '%/directives/component-modal.pug'; diff --git a/app/assets/javascripts/directives/views/componentView.ts b/app/assets/javascripts/directives/views/componentView.ts index 776914f26..4819a002f 100644 --- a/app/assets/javascripts/directives/views/componentView.ts +++ b/app/assets/javascripts/directives/views/componentView.ts @@ -1,6 +1,6 @@ import { RootScopeMessages } from './../../messages'; import { WebApplication } from '@/ui_models/application'; -import { SNComponent, ComponentAction, LiveItem } from 'snjs'; +import { SNComponent, ComponentAction, LiveItem } from '@standardnotes/snjs'; import { WebDirective } from './../../types'; import template from '%/directives/component-view.pug'; import { isDesktopApplication } from '../../utils'; diff --git a/app/assets/javascripts/directives/views/editorMenu.ts b/app/assets/javascripts/directives/views/editorMenu.ts index 863b826e3..d4e4c4906 100644 --- a/app/assets/javascripts/directives/views/editorMenu.ts +++ b/app/assets/javascripts/directives/views/editorMenu.ts @@ -1,10 +1,10 @@ import { WebDirective } from './../../types'; import { WebApplication } from '@/ui_models/application'; -import { SNComponent, SNItem, ComponentArea } from 'snjs'; +import { SNComponent, SNItem, ComponentArea } from '@standardnotes/snjs'; import { isDesktopApplication } from '@/utils'; import template from '%/directives/editor-menu.pug'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; -import { ComponentMutator } from 'snjs/dist/@types/models'; +import { ComponentMutator } from '@standardnotes/snjs'; interface EditorMenuScope { callback: (component: SNComponent) => void diff --git a/app/assets/javascripts/directives/views/historyMenu.ts b/app/assets/javascripts/directives/views/historyMenu.ts index 10c7d2769..c933d91a1 100644 --- a/app/assets/javascripts/directives/views/historyMenu.ts +++ b/app/assets/javascripts/directives/views/historyMenu.ts @@ -1,10 +1,10 @@ import { WebDirective } from '../../types'; import { WebApplication } from '@/ui_models/application'; import template from '%/directives/history-menu.pug'; -import { SNItem, ItemHistoryEntry } from 'snjs/dist/@types'; +import { SNItem, ItemHistoryEntry } from '@standardnotes/snjs'; import { PureViewCtrl } from '@/views'; -import { ItemSessionHistory } from 'snjs/dist/@types/services/history/session/item_session_history'; -import { RevisionListEntry, SingleRevision } from 'snjs/dist/@types/services/api/responses'; +import { ItemSessionHistory } from '@standardnotes/snjs'; +import { RevisionListEntry, SingleRevision } from '@standardnotes/snjs'; import { confirmDialog } from '@/services/alertService'; type HistoryState = { diff --git a/app/assets/javascripts/directives/views/privilegesAuthModal.ts b/app/assets/javascripts/directives/views/privilegesAuthModal.ts index dba4db4ba..e715ee9c4 100644 --- a/app/assets/javascripts/directives/views/privilegesAuthModal.ts +++ b/app/assets/javascripts/directives/views/privilegesAuthModal.ts @@ -1,6 +1,6 @@ import { WebDirective } from './../../types'; import { WebApplication } from '@/ui_models/application'; -import { ProtectedAction, PrivilegeCredential, PrivilegeSessionLength } from 'snjs'; +import { ProtectedAction, PrivilegeCredential, PrivilegeSessionLength } from '@standardnotes/snjs'; import template from '%/directives/privileges-auth-modal.pug'; type PrivilegesAuthModalScope = { diff --git a/app/assets/javascripts/directives/views/privilegesManagementModal.ts b/app/assets/javascripts/directives/views/privilegesManagementModal.ts index 837d4e3b3..81403b69a 100644 --- a/app/assets/javascripts/directives/views/privilegesManagementModal.ts +++ b/app/assets/javascripts/directives/views/privilegesManagementModal.ts @@ -1,9 +1,9 @@ import { WebDirective } from './../../types'; import { WebApplication } from '@/ui_models/application'; import template from '%/directives/privileges-management-modal.pug'; -import { PrivilegeCredential, ProtectedAction, SNPrivileges, PrivilegeSessionLength } from 'snjs'; +import { PrivilegeCredential, ProtectedAction, SNPrivileges, PrivilegeSessionLength } from '@standardnotes/snjs'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; -import { PrivilegeMutator } from 'snjs/dist/@types/models'; +import { PrivilegeMutator } from '@standardnotes/snjs'; type DisplayInfo = { label: string diff --git a/app/assets/javascripts/directives/views/revisionPreviewModal.ts b/app/assets/javascripts/directives/views/revisionPreviewModal.ts index 26d2fe49d..a67755eb1 100644 --- a/app/assets/javascripts/directives/views/revisionPreviewModal.ts +++ b/app/assets/javascripts/directives/views/revisionPreviewModal.ts @@ -7,9 +7,9 @@ import { SNComponent, SNNote, ComponentArea -} from 'snjs'; +} from '@standardnotes/snjs'; import template from '%/directives/revision-preview-modal.pug'; -import { PayloadContent } from 'snjs/dist/@types/protocol/payloads/generator'; +import { PayloadContent } from '@standardnotes/snjs'; import { confirmDialog } from '@/services/alertService'; interface RevisionPreviewScope { diff --git a/app/assets/javascripts/services/alertService.ts b/app/assets/javascripts/services/alertService.ts index 38c0d457a..8ae7e7b61 100644 --- a/app/assets/javascripts/services/alertService.ts +++ b/app/assets/javascripts/services/alertService.ts @@ -1,5 +1,5 @@ /* eslint-disable prefer-promise-reject-errors */ -import { SNAlertService, ButtonType } from 'snjs'; +import { SNAlertService, ButtonType } from '@standardnotes/snjs'; import { SKAlert } from 'sn-stylekit'; /** @returns a promise resolving to true if the user confirmed, false if they canceled */ diff --git a/app/assets/javascripts/services/archiveManager.ts b/app/assets/javascripts/services/archiveManager.ts index 9901f5361..b6e7f915c 100644 --- a/app/assets/javascripts/services/archiveManager.ts +++ b/app/assets/javascripts/services/archiveManager.ts @@ -1,5 +1,5 @@ import { WebApplication } from '@/ui_models/application'; -import { EncryptionIntent, ProtectedAction, SNItem, ContentType, SNNote } from 'snjs'; +import { EncryptionIntent, ProtectedAction, SNItem, ContentType, SNNote } from '@standardnotes/snjs'; function zippableTxtName(name: string, suffix = ""): string { const sanitizedName = name @@ -111,7 +111,7 @@ export class ArchiveManager { ); zipWriter.add(fileName, new this.zip.BlobReader(blob), resolve); }); - + let index = 0; const nextFile = () => { const item = items[index]; diff --git a/app/assets/javascripts/services/autolock_service.ts b/app/assets/javascripts/services/autolock_service.ts index 544296bdd..895674dcd 100644 --- a/app/assets/javascripts/services/autolock_service.ts +++ b/app/assets/javascripts/services/autolock_service.ts @@ -1,4 +1,4 @@ -import { ApplicationService } from 'snjs'; +import { ApplicationService } from '@standardnotes/snjs'; import { WebApplication } from '@/ui_models/application'; import { isDesktopApplication } from '@/utils'; import { AppStateEvent } from '@/ui_models/app_state'; diff --git a/app/assets/javascripts/services/bridge.ts b/app/assets/javascripts/services/bridge.ts index f5f4488c6..11d65d8ca 100644 --- a/app/assets/javascripts/services/bridge.ts +++ b/app/assets/javascripts/services/bridge.ts @@ -1,8 +1,8 @@ /** - * This file will be imported by desktop, so we make sure imports are not - * carrying too much code with them that's not tree-shakeable. + * This file will be imported by desktop, so we make sure imports are carrying + * as little extra code as possible with them. */ -import { Environment } from 'snjs/lib/platforms'; +import { Environment } from '@standardnotes/snjs/dist/@types/platforms'; export { Environment }; /** Platform-specific (i-e Electron/browser) behavior is handled by a Bridge object. */ diff --git a/app/assets/javascripts/services/browserBridge.ts b/app/assets/javascripts/services/browserBridge.ts index a7d2e2dab..ff8eb9ac6 100644 --- a/app/assets/javascripts/services/browserBridge.ts +++ b/app/assets/javascripts/services/browserBridge.ts @@ -1,5 +1,5 @@ import { Bridge } from "./bridge"; -import { Environment } from 'snjs'; +import { Environment } from '@standardnotes/snjs'; const KEYCHAIN_STORAGE_KEY = 'keychain'; diff --git a/app/assets/javascripts/services/desktopManager.ts b/app/assets/javascripts/services/desktopManager.ts index fb8962565..baae0aca2 100644 --- a/app/assets/javascripts/services/desktopManager.ts +++ b/app/assets/javascripts/services/desktopManager.ts @@ -1,9 +1,9 @@ -import { SNComponent, PurePayload, ComponentMutator, AppDataField, ContentType } from 'snjs'; +import { SNComponent, PurePayload, ComponentMutator, AppDataField, ContentType } from '@standardnotes/snjs'; /* eslint-disable camelcase */ import { WebApplication } from '@/ui_models/application'; // An interface used by the Desktop app to interact with SN import { isDesktopApplication } from '@/utils'; -import { EncryptionIntent, ApplicationService, ApplicationEvent, removeFromArray } from 'snjs'; +import { EncryptionIntent, ApplicationService, ApplicationEvent, removeFromArray } from '@standardnotes/snjs'; import { Bridge } from './bridge'; type UpdateObserverCallback = (component: SNComponent) => void diff --git a/app/assets/javascripts/services/errorReporting.ts b/app/assets/javascripts/services/errorReporting.ts index 57eddf3ed..8577376c9 100644 --- a/app/assets/javascripts/services/errorReporting.ts +++ b/app/assets/javascripts/services/errorReporting.ts @@ -1,4 +1,4 @@ -import { SNLog } from 'snjs'; +import { SNLog } from '@standardnotes/snjs'; import { isDesktopApplication, isDev } from '@/utils'; import { storage, StorageKey } from './localStorage'; import Bugsnag from '@bugsnag/js'; diff --git a/app/assets/javascripts/services/keyboardManager.ts b/app/assets/javascripts/services/keyboardManager.ts index 35ab89bc4..85918c3f7 100644 --- a/app/assets/javascripts/services/keyboardManager.ts +++ b/app/assets/javascripts/services/keyboardManager.ts @@ -1,4 +1,4 @@ -import { removeFromArray } from 'snjs'; +import { removeFromArray } from '@standardnotes/snjs'; export enum KeyboardKey { Tab = "Tab", Backspace = "Backspace", diff --git a/app/assets/javascripts/services/nativeExtManager.ts b/app/assets/javascripts/services/nativeExtManager.ts index 8cec7f356..955193a3c 100644 --- a/app/assets/javascripts/services/nativeExtManager.ts +++ b/app/assets/javascripts/services/nativeExtManager.ts @@ -9,9 +9,9 @@ import { ComponentMutator, Copy, dictToArray -} from 'snjs'; -import { PayloadContent } from 'snjs/dist/@types/protocol/payloads/generator'; -import { ComponentPermission } from 'snjs/dist/@types/models/app/component'; +} from '@standardnotes/snjs'; +import { PayloadContent } from '@standardnotes/snjs'; +import { ComponentPermission } from '@standardnotes/snjs'; /** A class for handling installation of system extensions */ export class NativeExtManager extends ApplicationService { diff --git a/app/assets/javascripts/services/preferencesManager.ts b/app/assets/javascripts/services/preferencesManager.ts index 3ad9faef4..9e8ef35ae 100644 --- a/app/assets/javascripts/services/preferencesManager.ts +++ b/app/assets/javascripts/services/preferencesManager.ts @@ -8,7 +8,7 @@ import { UserPrefsMutator, FillItemContent, ApplicationEvent, -} from 'snjs'; +} from '@standardnotes/snjs'; export class PreferencesManager extends ApplicationService { private userPreferences!: SNUserPrefs; diff --git a/app/assets/javascripts/services/statusManager.ts b/app/assets/javascripts/services/statusManager.ts index fed54e1c0..1a0a7692a 100644 --- a/app/assets/javascripts/services/statusManager.ts +++ b/app/assets/javascripts/services/statusManager.ts @@ -1,4 +1,4 @@ -import { removeFromArray } from 'snjs'; +import { removeFromArray } from '@standardnotes/snjs'; type StatusCallback = (string: string) => void; diff --git a/app/assets/javascripts/services/themeManager.ts b/app/assets/javascripts/services/themeManager.ts index c3bb0797d..ef9b65eb3 100644 --- a/app/assets/javascripts/services/themeManager.ts +++ b/app/assets/javascripts/services/themeManager.ts @@ -6,7 +6,7 @@ import { SNTheme, removeFromArray, ApplicationEvent, ContentType -} from 'snjs'; +} from '@standardnotes/snjs'; const CACHED_THEMES_KEY = 'cachedThemes'; diff --git a/app/assets/javascripts/types.ts b/app/assets/javascripts/types.ts index 9042d0ee6..fd1358866 100644 --- a/app/assets/javascripts/types.ts +++ b/app/assets/javascripts/types.ts @@ -1,4 +1,4 @@ -import { SNComponent } from 'snjs'; +import { SNComponent } from '@standardnotes/snjs'; export class WebDirective implements ng.IDirective { controller?: string | ng.Injectable; controllerAs?: string; @@ -42,4 +42,4 @@ export type PanelPuppet = { export type FooterStatus = { string: string -} \ No newline at end of file +} diff --git a/app/assets/javascripts/ui_models/app_state.ts b/app/assets/javascripts/ui_models/app_state.ts index c607c894d..a935851e8 100644 --- a/app/assets/javascripts/ui_models/app_state.ts +++ b/app/assets/javascripts/ui_models/app_state.ts @@ -11,7 +11,7 @@ import { PayloadSource, DeinitSource, UuidString -} from 'snjs'; +} from '@standardnotes/snjs'; import { WebApplication } from '@/ui_models/application'; import { Editor } from '@/ui_models/editor'; import { action, makeObservable, observable } from 'mobx'; diff --git a/app/assets/javascripts/ui_models/application.ts b/app/assets/javascripts/ui_models/application.ts index ebf1323c0..59465b74f 100644 --- a/app/assets/javascripts/ui_models/application.ts +++ b/app/assets/javascripts/ui_models/application.ts @@ -1,4 +1,4 @@ -import { PermissionDialog } from 'snjs/dist/@types/services/component_manager'; +import { PermissionDialog } from '@standardnotes/snjs'; import { ComponentModalScope } from './../directives/views/componentModal'; import { AccountSwitcherScope, PermissionsModalScope } from './../types'; import { ComponentGroup } from './component_group'; @@ -10,7 +10,7 @@ import { platformFromString, Challenge, ProtectedAction, SNComponent -} from 'snjs'; +} from '@standardnotes/snjs'; import angular from 'angular'; import { getPlatformString } from '@/utils'; import { AlertService } from '@/services/alertService'; @@ -26,9 +26,9 @@ import { KeyboardManager } from '@/services'; import { AppState } from '@/ui_models/app_state'; -import { SNWebCrypto } from 'sncrypto/dist/sncrypto-web'; +import { SNWebCrypto } from '@standardnotes/sncrypto-web'; import { Bridge } from '@/services/bridge'; -import { DeinitSource } from 'snjs/dist/@types/types'; +import { DeinitSource } from '@standardnotes/snjs'; type WebServices = { appState: AppState diff --git a/app/assets/javascripts/ui_models/application_group.ts b/app/assets/javascripts/ui_models/application_group.ts index f29ed8d34..e5ea91113 100644 --- a/app/assets/javascripts/ui_models/application_group.ts +++ b/app/assets/javascripts/ui_models/application_group.ts @@ -1,6 +1,6 @@ import { WebDeviceInterface } from '@/web_device_interface'; import { WebApplication } from './application'; -import { ApplicationDescriptor, SNApplicationGroup, DeviceInterface } from 'snjs'; +import { ApplicationDescriptor, SNApplicationGroup, DeviceInterface } from '@standardnotes/snjs'; import { ArchiveManager, DesktopManager, diff --git a/app/assets/javascripts/ui_models/component_group.ts b/app/assets/javascripts/ui_models/component_group.ts index 7aa3b4c89..77e69ee5d 100644 --- a/app/assets/javascripts/ui_models/component_group.ts +++ b/app/assets/javascripts/ui_models/component_group.ts @@ -1,6 +1,6 @@ -import { SNComponent, ComponentArea, removeFromArray, addIfUnique } from 'snjs'; +import { SNComponent, ComponentArea, removeFromArray, addIfUnique } from '@standardnotes/snjs'; import { WebApplication } from './application'; -import { UuidString } from 'snjs/dist/@types/types'; +import { UuidString } from '@standardnotes/snjs'; /** Areas that only allow a single component to be active */ const SingleComponentAreas = [ @@ -99,4 +99,4 @@ export class ComponentGroup { observer(); } } -} \ No newline at end of file +} diff --git a/app/assets/javascripts/ui_models/editor.ts b/app/assets/javascripts/ui_models/editor.ts index 0a5eed08e..606d239c6 100644 --- a/app/assets/javascripts/ui_models/editor.ts +++ b/app/assets/javascripts/ui_models/editor.ts @@ -1,4 +1,4 @@ -import { SNNote, ContentType, PayloadSource, UuidString, TagMutator } from 'snjs'; +import { SNNote, ContentType, PayloadSource, UuidString, TagMutator } from '@standardnotes/snjs'; import { WebApplication } from './application'; export class Editor { diff --git a/app/assets/javascripts/ui_models/editor_group.ts b/app/assets/javascripts/ui_models/editor_group.ts index 6ded5a3e0..46e46a136 100644 --- a/app/assets/javascripts/ui_models/editor_group.ts +++ b/app/assets/javascripts/ui_models/editor_group.ts @@ -1,4 +1,4 @@ -import { removeFromArray, UuidString } from 'snjs'; +import { removeFromArray, UuidString } from '@standardnotes/snjs'; import { Editor } from './editor'; import { WebApplication } from './application'; diff --git a/app/assets/javascripts/views/abstract/pure_view_ctrl.ts b/app/assets/javascripts/views/abstract/pure_view_ctrl.ts index 7bab3ee98..c3e275a1c 100644 --- a/app/assets/javascripts/views/abstract/pure_view_ctrl.ts +++ b/app/assets/javascripts/views/abstract/pure_view_ctrl.ts @@ -1,4 +1,4 @@ -import { ApplicationEvent } from 'snjs'; +import { ApplicationEvent } from '@standardnotes/snjs'; import { WebApplication } from '@/ui_models/application'; export type CtrlState = Partial> diff --git a/app/assets/javascripts/views/account_switcher/account_switcher.ts b/app/assets/javascripts/views/account_switcher/account_switcher.ts index 2f2a64e4b..3cbb1d4ed 100644 --- a/app/assets/javascripts/views/account_switcher/account_switcher.ts +++ b/app/assets/javascripts/views/account_switcher/account_switcher.ts @@ -3,7 +3,7 @@ import { WebApplication } from '@/ui_models/application'; import template from './account-switcher.pug'; import { ApplicationDescriptor, -} from 'snjs'; +} from '@standardnotes/snjs'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; import { WebDirective } from '@/types'; diff --git a/app/assets/javascripts/views/application/application_view.ts b/app/assets/javascripts/views/application/application_view.ts index ebb346437..fe477fdd4 100644 --- a/app/assets/javascripts/views/application/application_view.ts +++ b/app/assets/javascripts/views/application/application_view.ts @@ -3,7 +3,7 @@ import { WebDirective } from '@/types'; import { getPlatformString } from '@/utils'; import template from './application-view.pug'; import { AppStateEvent } from '@/ui_models/app_state'; -import { ApplicationEvent } from 'snjs'; +import { ApplicationEvent } from '@standardnotes/snjs'; import { PANEL_NAME_NOTES, PANEL_NAME_TAGS diff --git a/app/assets/javascripts/views/challenge_modal/challenge_modal.ts b/app/assets/javascripts/views/challenge_modal/challenge_modal.ts index 98d6e77da..a605dac9f 100644 --- a/app/assets/javascripts/views/challenge_modal/challenge_modal.ts +++ b/app/assets/javascripts/views/challenge_modal/challenge_modal.ts @@ -6,7 +6,7 @@ import { Challenge, ChallengeReason, ChallengePrompt -} from 'snjs'; +} from '@standardnotes/snjs'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; import { WebDirective } from '@/types'; import { confirmDialog } from '@/services/alertService'; diff --git a/app/assets/javascripts/views/editor/editor_view.ts b/app/assets/javascripts/views/editor/editor_view.ts index 1e5bbcd91..d00e33e5c 100644 --- a/app/assets/javascripts/views/editor/editor_view.ts +++ b/app/assets/javascripts/views/editor/editor_view.ts @@ -18,7 +18,7 @@ import { ComponentAction, WebPrefKey, ComponentMutator, -} from 'snjs'; +} from '@standardnotes/snjs'; import find from 'lodash/find'; import { isDesktopApplication } from '@/utils'; import { KeyboardModifier, KeyboardKey } from '@/services/keyboardManager'; diff --git a/app/assets/javascripts/views/footer/footer_view.ts b/app/assets/javascripts/views/footer/footer_view.ts index d8ed09884..cf0f53564 100644 --- a/app/assets/javascripts/views/footer/footer_view.ts +++ b/app/assets/javascripts/views/footer/footer_view.ts @@ -11,7 +11,7 @@ import { SNTheme, ComponentArea, CollectionSort, -} from 'snjs'; +} from '@standardnotes/snjs'; import template from './footer-view.pug'; import { AppStateEvent, EventSource } from '@/ui_models/app_state'; import { diff --git a/app/assets/javascripts/views/notes/note_utils.ts b/app/assets/javascripts/views/notes/note_utils.ts index 2c7577b5f..83c860796 100644 --- a/app/assets/javascripts/views/notes/note_utils.ts +++ b/app/assets/javascripts/views/notes/note_utils.ts @@ -1,4 +1,4 @@ -import { SNNote } from 'snjs'; +import { SNNote } from '@standardnotes/snjs'; export enum NoteSortKey { CreatedAt = 'created_at', diff --git a/app/assets/javascripts/views/notes/notes_view.ts b/app/assets/javascripts/views/notes/notes_view.ts index fed7d2127..36ccba36b 100644 --- a/app/assets/javascripts/views/notes/notes_view.ts +++ b/app/assets/javascripts/views/notes/notes_view.ts @@ -9,7 +9,7 @@ import { WebPrefKey, findInArray, CollectionSort, -} from 'snjs'; +} from '@standardnotes/snjs'; import { PureViewCtrl } from '@Views/abstract/pure_view_ctrl'; import { AppStateEvent } from '@/ui_models/app_state'; import { KeyboardModifier, KeyboardKey } from '@/services/keyboardManager'; @@ -20,7 +20,7 @@ import { NoteSortKey, notePassesFilter } from './note_utils'; -import { UuidString } from 'snjs/dist/@types/types'; +import { UuidString } from '@standardnotes/snjs'; type NotesState = { panelTitle: string diff --git a/app/assets/javascripts/views/tags/tags_view.ts b/app/assets/javascripts/views/tags/tags_view.ts index 3f17199ea..aa2f2a29e 100644 --- a/app/assets/javascripts/views/tags/tags_view.ts +++ b/app/assets/javascripts/views/tags/tags_view.ts @@ -1,4 +1,4 @@ -import { PayloadContent } from 'snjs/dist/@types/protocol/payloads/generator'; +import { PayloadContent } from '@standardnotes/snjs'; import { WebDirective, PanelPuppet } from '@/types'; import { WebApplication } from '@/ui_models/application'; import { @@ -12,7 +12,7 @@ import { WebPrefKey, UuidString, TagMutator -} from 'snjs'; +} from '@standardnotes/snjs'; import template from './tags-view.pug'; import { AppStateEvent } from '@/ui_models/app_state'; import { PANEL_NAME_TAGS } from '@/views/constants'; diff --git a/app/assets/javascripts/web_device_interface.ts b/app/assets/javascripts/web_device_interface.ts index 0df7b5b64..c49d44bdd 100644 --- a/app/assets/javascripts/web_device_interface.ts +++ b/app/assets/javascripts/web_device_interface.ts @@ -1,4 +1,4 @@ -import { DeviceInterface, getGlobalScope, SNApplication, ApplicationIdentifier } from 'snjs'; +import { DeviceInterface, getGlobalScope, SNApplication, ApplicationIdentifier } from '@standardnotes/snjs'; import { Database } from '@/database'; import { Bridge } from './services/bridge'; @@ -125,6 +125,10 @@ export class WebDeviceInterface extends DeviceInterface { return this.bridge.getKeychainValue(); } + legacy_setRawKeychainValue(value: unknown): Promise { + return this.bridge.setKeychainValue(value); + } + clearRawKeychainValue() { return this.bridge.clearKeychainValue(); } diff --git a/package-lock.json b/package-lock.json index 64a01ac23..091607997 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2559,6 +2559,28 @@ "resolved": "https://registry.npmjs.org/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz", "integrity": "sha512-htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA==" }, + "@standardnotes/sncrypto-common": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/@standardnotes/sncrypto-common/-/sncrypto-common-1.2.9.tgz", + "integrity": "sha512-xJ5IUGOZztjSgNP/6XL+Ut5+q9UgSTv6xMtKkcQC5aJxCOkJy9u6RamPLdF00WQgwibxx2tu0e43bKUjTgzMig==" + }, + "@standardnotes/sncrypto-web": { + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/@standardnotes/sncrypto-web/-/sncrypto-web-1.2.9.tgz", + "integrity": "sha512-OJVsoLiKoFHkEnrRImZQ6fH5H0ptk67IrVrb97Y4WEDLVABqEkX/HgdjaQwnreXWc489fqtg3BVvfgIPS7GXnQ==", + "requires": { + "@standardnotes/sncrypto-common": "^1.2.7", + "libsodium-wrappers": "^0.7.8" + } + }, + "@standardnotes/snjs": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@standardnotes/snjs/-/snjs-2.0.7.tgz", + "integrity": "sha512-S9h+ryQ225ekvCDwX4wFk7duic+j6644indtSLCiODo1SMflk8EQa7Q6Ier5lvBdUZJNxvZsN51iAgmIbT5BCQ==", + "requires": { + "@standardnotes/sncrypto-common": "^1.2.9" + } + }, "@types/angular": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.7.0.tgz", @@ -7983,6 +8005,19 @@ "type-check": "~0.3.2" } }, + "libsodium": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/libsodium/-/libsodium-0.7.8.tgz", + "integrity": "sha512-/Qc+APf0jbeWSaeEruH0L1/tbbT+sbf884ZL0/zV/0JXaDPBzYkKbyb/wmxMHgAHzm3t6gqe7bOOXAVwfqVikQ==" + }, + "libsodium-wrappers": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/libsodium-wrappers/-/libsodium-wrappers-0.7.8.tgz", + "integrity": "sha512-PDhPWXBqd/SaqAFUBgH2Ux7b3VEEJgyD6BQB+VdNFJb9PbExGr/T/myc/MBoSvl8qLzfm0W0IVByOQS5L1MrCg==", + "requires": { + "libsodium": "0.7.8" + } + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", @@ -11023,14 +11058,6 @@ "kind-of": "^3.2.0" } }, - "sncrypto": { - "version": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad", - "from": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad" - }, - "snjs": { - "version": "github:standardnotes/snjs#9e212add83688f65267c9300d7b9d2b1e5772a27", - "from": "github:standardnotes/snjs#9e212add83688f65267c9300d7b9d2b1e5772a27" - }, "sockjs": { "version": "0.3.20", "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.20.tgz", diff --git a/package.json b/package.json index 1c4a1f384..5dbcfd722 100644 --- a/package.json +++ b/package.json @@ -70,8 +70,8 @@ }, "dependencies": { "@bugsnag/js": "^7.5.1", - "mobx": "^6.0.1", - "sncrypto": "github:standardnotes/sncrypto#8794c88daa967eaae493cd5fdec7506d52b257ad", - "snjs": "github:standardnotes/snjs#9e212add83688f65267c9300d7b9d2b1e5772a27" + "@standardnotes/sncrypto-web": "^1.2.9", + "@standardnotes/snjs": "^2.0.7", + "mobx": "^6.0.1" } }