chore(deps): upgrade snjs & sncrypto-web to npm package versions

This commit is contained in:
Baptiste Grob
2020-11-19 13:37:49 +01:00
parent 1c9337113d
commit 3a16140699
42 changed files with 106 additions and 75 deletions

View File

@@ -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';

View File

@@ -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);
}
}
}

View File

@@ -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';

View File

@@ -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 = {

View File

@@ -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';

View File

@@ -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';

View File

@@ -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

View File

@@ -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 = {

View File

@@ -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 = {

View File

@@ -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

View File

@@ -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 {

View File

@@ -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 */

View File

@@ -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];

View File

@@ -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';

View File

@@ -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. */

View File

@@ -1,5 +1,5 @@
import { Bridge } from "./bridge";
import { Environment } from 'snjs';
import { Environment } from '@standardnotes/snjs';
const KEYCHAIN_STORAGE_KEY = 'keychain';

View File

@@ -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

View File

@@ -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';

View File

@@ -1,4 +1,4 @@
import { removeFromArray } from 'snjs';
import { removeFromArray } from '@standardnotes/snjs';
export enum KeyboardKey {
Tab = "Tab",
Backspace = "Backspace",

View File

@@ -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 {

View File

@@ -8,7 +8,7 @@ import {
UserPrefsMutator,
FillItemContent,
ApplicationEvent,
} from 'snjs';
} from '@standardnotes/snjs';
export class PreferencesManager extends ApplicationService {
private userPreferences!: SNUserPrefs;

View File

@@ -1,4 +1,4 @@
import { removeFromArray } from 'snjs';
import { removeFromArray } from '@standardnotes/snjs';
type StatusCallback = (string: string) => void;

View File

@@ -6,7 +6,7 @@ import {
SNTheme,
removeFromArray,
ApplicationEvent, ContentType
} from 'snjs';
} from '@standardnotes/snjs';
const CACHED_THEMES_KEY = 'cachedThemes';

View File

@@ -1,4 +1,4 @@
import { SNComponent } from 'snjs';
import { SNComponent } from '@standardnotes/snjs';
export class WebDirective implements ng.IDirective {
controller?: string | ng.Injectable<ng.IControllerConstructor>;
controllerAs?: string;
@@ -42,4 +42,4 @@ export type PanelPuppet = {
export type FooterStatus = {
string: string
}
}

View File

@@ -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';

View File

@@ -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

View File

@@ -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,

View File

@@ -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();
}
}
}
}

View File

@@ -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 {

View File

@@ -1,4 +1,4 @@
import { removeFromArray, UuidString } from 'snjs';
import { removeFromArray, UuidString } from '@standardnotes/snjs';
import { Editor } from './editor';
import { WebApplication } from './application';

View File

@@ -1,4 +1,4 @@
import { ApplicationEvent } from 'snjs';
import { ApplicationEvent } from '@standardnotes/snjs';
import { WebApplication } from '@/ui_models/application';
export type CtrlState = Partial<Record<string, any>>

View File

@@ -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';

View File

@@ -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

View File

@@ -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';

View File

@@ -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';

View File

@@ -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 {

View File

@@ -1,4 +1,4 @@
import { SNNote } from 'snjs';
import { SNNote } from '@standardnotes/snjs';
export enum NoteSortKey {
CreatedAt = 'created_at',

View File

@@ -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

View File

@@ -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';

View File

@@ -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<any> {
return this.bridge.setKeychainValue(value);
}
clearRawKeychainValue() {
return this.bridge.clearKeychainValue();
}

43
package-lock.json generated
View File

@@ -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",

View File

@@ -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"
}
}