From 5f62c0d4e8a7d791d31f11b2efe25dcf5e46487a Mon Sep 17 00:00:00 2001 From: Mo Date: Thu, 2 Jun 2022 08:43:20 -0500 Subject: [PATCH 1/4] chore: upgrade web --- web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web b/web index ef8fc83e..a87e3b98 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit ef8fc83e3691cf73f8c5a79d489863e381bd24bb +Subproject commit a87e3b98e269257cb1998796546d48ec3f420b31 From 8d4ff1d19acde038da06b89f19c839c6df6fd560 Mon Sep 17 00:00:00 2001 From: Mo Date: Thu, 2 Jun 2022 08:47:06 -0500 Subject: [PATCH 2/4] fix: device import path --- app/javascripts/Main/FileBackups/FileBackupsManager.ts | 2 +- app/javascripts/Main/Remote/RemoteBridge.ts | 2 +- app/javascripts/Renderer/CrossProcessBridge.ts | 2 +- app/javascripts/Renderer/DesktopDevice.ts | 4 ++-- app/javascripts/Renderer/Renderer.ts | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/javascripts/Main/FileBackups/FileBackupsManager.ts b/app/javascripts/Main/FileBackups/FileBackupsManager.ts index 018a919c..942bbede 100644 --- a/app/javascripts/Main/FileBackups/FileBackupsManager.ts +++ b/app/javascripts/Main/FileBackups/FileBackupsManager.ts @@ -1,4 +1,4 @@ -import { FileBackupsDevice, FileBackupsMapping } from '@web/Device/DesktopSnjsExports' +import { FileBackupsDevice, FileBackupsMapping } from '@web/Application/Device/DesktopSnjsExports' import { AppState } from 'app/application' import { StoreKeys } from '../Store' import { diff --git a/app/javascripts/Main/Remote/RemoteBridge.ts b/app/javascripts/Main/Remote/RemoteBridge.ts index 3e477680..1020c8e8 100644 --- a/app/javascripts/Main/Remote/RemoteBridge.ts +++ b/app/javascripts/Main/Remote/RemoteBridge.ts @@ -11,7 +11,7 @@ import { PackageManagerInterface, Component } from '../Packages/PackageManagerIn import { SearchManagerInterface } from '../Search/SearchManagerInterface' import { RemoteDataInterface } from './DataInterface' import { MenuManagerInterface } from '../Menus/MenuManagerInterface' -import { FileBackupsDevice, FileBackupsMapping } from '@web/Device/DesktopSnjsExports' +import { FileBackupsDevice, FileBackupsMapping } from '@web/Application/Device/DesktopSnjsExports' /** * Read https://github.com/electron/remote to understand how electron/remote works. diff --git a/app/javascripts/Renderer/CrossProcessBridge.ts b/app/javascripts/Renderer/CrossProcessBridge.ts index 0e8a0abe..00152197 100644 --- a/app/javascripts/Renderer/CrossProcessBridge.ts +++ b/app/javascripts/Renderer/CrossProcessBridge.ts @@ -1,5 +1,5 @@ import { Component } from '../Main/Packages/PackageManagerInterface' -import { FileBackupsDevice } from '@web/Device/DesktopSnjsExports' +import { FileBackupsDevice } from '@web/Application/Device/DesktopSnjsExports' export interface CrossProcessBridge extends FileBackupsDevice { get extServerHost(): string diff --git a/app/javascripts/Renderer/DesktopDevice.ts b/app/javascripts/Renderer/DesktopDevice.ts index bc0a7406..9f315bde 100644 --- a/app/javascripts/Renderer/DesktopDevice.ts +++ b/app/javascripts/Renderer/DesktopDevice.ts @@ -1,11 +1,11 @@ -import { WebOrDesktopDevice } from '@web/Device/WebOrDesktopDevice' +import { WebOrDesktopDevice } from '@web/Application/Device/WebOrDesktopDevice' import { Component } from '../Main/Packages/PackageManagerInterface' import { RawKeychainValue, Environment, DesktopDeviceInterface, FileBackupsMapping, -} from '@web/Device/DesktopSnjsExports' +} from '@web/Application/Device/DesktopSnjsExports' import { CrossProcessBridge } from './CrossProcessBridge' const FallbackLocalStorageKey = 'keychain' diff --git a/app/javascripts/Renderer/Renderer.ts b/app/javascripts/Renderer/Renderer.ts index 9a6ea42c..063d5181 100644 --- a/app/javascripts/Renderer/Renderer.ts +++ b/app/javascripts/Renderer/Renderer.ts @@ -1,7 +1,7 @@ import { DesktopDevice } from './DesktopDevice' import { MessageToWebApp } from '../Shared/IpcMessages' -import { DesktopClientRequiresWebMethods } from '@web/Device/DesktopSnjsExports' -import { StartApplication } from '@web/Device/StartApplication' +import { DesktopClientRequiresWebMethods } from '@web/Application/Device/DesktopSnjsExports' +import { StartApplication } from '@web/Application/Device/StartApplication' import { CrossProcessBridge } from './CrossProcessBridge' declare const DEFAULT_SYNC_SERVER: string From 4cb12c695103b691f575a7fe9864a816ec1502b0 Mon Sep 17 00:00:00 2001 From: Mo Date: Thu, 2 Jun 2022 11:03:18 -0500 Subject: [PATCH 3/4] chore: upgrade web --- app/package.json | 2 +- package.json | 2 +- web | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/package.json b/app/package.json index bb2bc562..fbc1a655 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "productName": "Standard Notes", "description": "An end-to-end encrypted notes app for digitalists and professionals.", "author": "Standard Notes ", - "version": "3.20.1", + "version": "3.20.2", "main": "./dist/index.js", "dependencies": { "keytar": "^7.9.0" diff --git a/package.json b/package.json index 2f1c2bb9..818594af 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "standard-notes", "main": "./app/dist/index.js", - "version": "3.20.1", + "version": "3.20.2", "repository": { "type": "git", "url": "git://github.com/standardnotes/desktop" diff --git a/web b/web index a87e3b98..94199fb6 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit a87e3b98e269257cb1998796546d48ec3f420b31 +Subproject commit 94199fb6b53ba19e77b2b43f47d717898c085ba1 From 5b29e5875bb452f55b5b9c8511a46c2195f4a87a Mon Sep 17 00:00:00 2001 From: Mo Date: Thu, 2 Jun 2022 11:17:52 -0500 Subject: [PATCH 4/4] chore: upgrade web --- web | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web b/web index 94199fb6..46219940 160000 --- a/web +++ b/web @@ -1 +1 @@ -Subproject commit 94199fb6b53ba19e77b2b43f47d717898c085ba1 +Subproject commit 462199406c99a9a88e2566075fb35f2c51777611