Merge branch 'release/3.20.2'

standardnotes · Jun 2, 2022 · 503e21f · 503e21f
2 parents 2bd0f69 + 5b29e58
commit 503e21f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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

diff --git 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 <[email protected]>",
-  "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
@@ -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