refactor: add icons package (#1078)

packages/desktop/.eslintrc

@@ -3,39 +3,12 @@
     "node": true,
     "commonjs": true
   },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier",
-    "../../node_modules/@standardnotes/config/src/.eslintrc"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "ignorePatterns": ["test", "scripts", ".eslintrc", "tsconfig.json", "node_modules", "*.webpack.*.js"],
+  "extends": ["../../.eslintrc.json"],
   "rules": {
-    /** Style */
-    "quotes": ["error", "single", { "avoidEscape": true }],
-
-    /** Preferences */
-    "no-console": "off",
-    "accessor-pairs": 0,
-    "no-nonoctal-decimal-escape": 0,
-    "no-unsafe-optional-chaining": 0,
-    "@typescript-eslint/explicit-function-return-type": 0,
-    "@typescript-eslint/no-use-before-define": ["error", "nofunc"],
-    "@typescript-eslint/no-non-null-assertion": 0,
-    "@typescript-eslint/no-explicit-any": 0,
-    "@typescript-eslint/no-var-requires": 0,
-    /**
-     * The following rules are disabled because they are already implemented
-     * in the TypeScript configuration, or vice-versa
-     */
-    "no-unused-vars": 0,
-    "no-useless-constructor": 0,
-    "no-unused-expressions": 0,
-    "@typescript-eslint/camelcase": 0
+    "no-console": "warn",
+    "@typescript-eslint/no-explicit-any": "warn",
+    "@typescript-eslint/no-var-requires": "off"
   },
-  "plugins": ["@typescript-eslint"],
   "globals": {
     "zip": true
   }

packages/desktop/.prettierignore

@@ -1,8 +1,3 @@
-node_modules/
 dist/
 app/dist/
-test/data/tmp/
-web/
-.github
-codeqldb
-*.js
+test/data/tmp/

packages/desktop/.prettierrc

@@ -1,6 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "printWidth": 120,
-  "semi": false
-}

packages/desktop/app/application.ts

@@ -1,16 +1,16 @@
 import { App, Shell } from 'electron'
+import { action, makeObservable, observable } from 'mobx'
+import { MessageType } from '../test/TestIpcMessage'
 import { createExtensionsServer } from './javascripts/Main/ExtensionsServer'
-import { isLinux, isMac, isWindows } from './javascripts/Main/Types/Platforms'
+import { Keychain } from './javascripts/Main/Keychain/Keychain'
 import { Store, StoreKeys } from './javascripts/Main/Store'
 import { AppName, initializeStrings } from './javascripts/Main/Strings'
-import { createWindowState, WindowState } from './javascripts/Main/Window'
-import { Keychain } from './javascripts/Main/Keychain/Keychain'
-import { isDev, isTesting } from './javascripts/Main/Utils/Utils'
-import { Urls, Paths } from './javascripts/Main/Types/Paths'
-import { action, makeObservable, observable } from 'mobx'
+import { Paths, Urls } from './javascripts/Main/Types/Paths'
+import { isLinux, isMac, isWindows } from './javascripts/Main/Types/Platforms'
 import { UpdateState } from './javascripts/Main/UpdateManager'
 import { handleTestMessage } from './javascripts/Main/Utils/Testing'
-import { MessageType } from '../test/TestIpcMessage'
+import { isDev, isTesting } from './javascripts/Main/Utils/Utils'
+import { createWindowState, WindowState } from './javascripts/Main/Window'
 
 const deepLinkScheme = 'standardnotes'
 

packages/desktop/app/index.ts

@@ -1,16 +1,16 @@
 import { app, ipcMain, shell } from 'electron'
-import path from 'path'
-import fs from 'fs-extra'
 import log from 'electron-log'
+import fs from 'fs-extra'
+import path from 'path'
 import './@types/modules'
 import { initializeApplication } from './application'
-import { isSnap } from './javascripts/Main/Types/Constants'
-import { isTesting } from './javascripts/Main/Utils/Utils'
-import { setupTesting } from './javascripts/Main/Utils/Testing'
-import { CommandLineArgs } from './javascripts/Shared/CommandLineArgs'
-import { Store, StoreKeys } from './javascripts/Main/Store'
-import { Paths } from './javascripts/Main/Types/Paths'
 import { enableExperimentalFeaturesForFileAccessFix } from './enableExperimentalWebFeatures'
+import { Store, StoreKeys } from './javascripts/Main/Store'
+import { isSnap } from './javascripts/Main/Types/Constants'
+import { Paths } from './javascripts/Main/Types/Paths'
+import { setupTesting } from './javascripts/Main/Utils/Testing'
+import { isTesting } from './javascripts/Main/Utils/Utils'
+import { CommandLineArgs } from './javascripts/Shared/CommandLineArgs'
 
 enableExperimentalFeaturesForFileAccessFix()
 

packages/desktop/app/javascripts/Main/Backups/BackupsManager.ts

@@ -1,10 +1,12 @@
-import { dialog, WebContents, shell } from 'electron'
+import { dialog, shell, WebContents } from 'electron'
 import { promises as fs } from 'fs'
 import path from 'path'
 import { AppMessageType, MessageType } from '../../../../test/TestIpcMessage'
 import { AppState } from '../../../application'
 import { MessageToWebApp } from '../../Shared/IpcMessages'
-import { BackupsManagerInterface } from './BackupsManagerInterface'
+import { StoreKeys } from '../Store'
+import { backups as str } from '../Strings'
+import { Paths } from '../Types/Paths'
 import {
   deleteDir,
   deleteDirContents,
@@ -13,11 +15,9 @@ import {
   moveFiles,
   openDirectoryPicker,
 } from '../Utils/FileUtils'
-import { Paths } from '../Types/Paths'
-import { StoreKeys } from '../Store'
-import { backups as str } from '../Strings'
 import { handleTestMessage, send } from '../Utils/Testing'
 import { isTesting, last } from '../Utils/Utils'
+import { BackupsManagerInterface } from './BackupsManagerInterface'
 
 function log(...message: any) {
   console.log('BackupsManager:', ...message)

packages/desktop/app/javascripts/Main/ExtensionsServer.ts

@@ -3,9 +3,9 @@ import http, { IncomingMessage, ServerResponse } from 'http'
 import mime from 'mime-types'
 import path from 'path'
 import { URL } from 'url'
-import { FileDoesNotExist } from './Utils/FileUtils'
-import { Paths } from './Types/Paths'
 import { extensions as str } from './Strings'
+import { Paths } from './Types/Paths'
+import { FileDoesNotExist } from './Utils/FileUtils'
 
 const Protocol = 'http'
 

packages/desktop/app/javascripts/Main/FileBackups/FileBackupsManager.ts

@@ -1,5 +1,6 @@
 import { FileBackupsDevice, FileBackupsMapping } from '@web/Application/Device/DesktopSnjsExports'
 import { AppState } from 'app/application'
+import { shell } from 'electron'
 import { StoreKeys } from '../Store'
 import {
   ensureDirectoryExists,
@@ -10,7 +11,6 @@ import {
   writeJSONFile,
 } from '../Utils/FileUtils'
 import { FileDownloader } from './FileDownloader'
-import { shell } from 'electron'
 
 export const FileBackupsConstantsV1 = {
   Version: '1.0.0',

packages/desktop/app/javascripts/Main/FileBackups/FileDownloader.ts

@@ -1,4 +1,4 @@
-import { WriteStream, createWriteStream } from 'fs'
+import { createWriteStream, WriteStream } from 'fs'
 import { downloadData } from './FileNetworking'
 
 export class FileDownloader {

packages/desktop/app/javascripts/Main/FileBackups/FileNetworking.ts

@@ -1,5 +1,5 @@
+import axios, { AxiosRequestHeaders, AxiosResponseHeaders } from 'axios'
 import { WriteStream } from 'fs'
-import axios, { AxiosResponseHeaders, AxiosRequestHeaders } from 'axios'
 
 export async function downloadData(
   writeStream: WriteStream,

packages/desktop/app/javascripts/Main/Keychain/Keychain.ts

@@ -1,12 +1,12 @@
 import { app, BrowserWindow, ipcMain } from 'electron'
 import keytar from 'keytar'
-import { isLinux } from '../Types/Platforms'
+import { MessageToMainProcess } from '../../Shared/IpcMessages'
+import { Store, StoreKeys } from '../Store'
 import { AppName } from '../Strings'
 import { keychainAccessIsUserConfigurable } from '../Types/Constants'
+import { Paths, Urls } from '../Types/Paths'
+import { isLinux } from '../Types/Platforms'
 import { isDev, isTesting } from '../Utils/Utils'
-import { MessageToMainProcess } from '../../Shared/IpcMessages'
-import { Urls, Paths } from '../Types/Paths'
-import { Store, StoreKeys } from '../Store'
 import { KeychainInterface } from './KeychainInterface'
 
 const ServiceName = isTesting() ? AppName + ' (Testing)' : isDev() ? AppName + ' (Development)' : AppName

packages/desktop/app/javascripts/Main/Menus/Menus.ts

@@ -10,17 +10,17 @@ import {
   WebContents,
 } from 'electron'
 import { autorun } from 'mobx'
-import { autoUpdatingAvailable } from '../Types/Constants'
-import { isLinux, isMac } from '../Types/Platforms'
 import { Store, StoreKeys } from '../Store'
 import { appMenu as str, contextMenu } from '../Strings'
-import { handleTestMessage } from '../Utils/Testing'
 import { TrayManager } from '../TrayManager'
-import { SpellcheckerManager } from './../SpellcheckerManager'
-import { BackupsManagerInterface } from './../Backups/BackupsManagerInterface'
-import { MessageType } from './../../../../test/TestIpcMessage'
+import { autoUpdatingAvailable } from '../Types/Constants'
+import { isLinux, isMac } from '../Types/Platforms'
 import { checkForUpdate, openChangelog, showUpdateInstallationDialog } from '../UpdateManager'
+import { handleTestMessage } from '../Utils/Testing'
 import { isDev, isTesting } from '../Utils/Utils'
+import { MessageType } from './../../../../test/TestIpcMessage'
+import { BackupsManagerInterface } from './../Backups/BackupsManagerInterface'
+import { SpellcheckerManager } from './../SpellcheckerManager'
 import { MenuManagerInterface } from './MenuManagerInterface'
 
 export const enum MenuId {

packages/desktop/app/javascripts/Main/Packages/PackageManager.ts

@@ -1,7 +1,10 @@
 import compareVersions from 'compare-versions'
+import log from 'electron-log'
 import fs from 'fs'
 import path from 'path'
 import { MessageToWebApp } from '../../Shared/IpcMessages'
+import { AppName } from '../Strings'
+import { Paths } from '../Types/Paths'
 import {
   debouncedJSONDiskWriter,
   deleteDir,
@@ -11,12 +14,9 @@ import {
   FileDoesNotExist,
   readJSONFile,
 } from '../Utils/FileUtils'
-import { downloadFile, getJSON } from './Networking'
-import { Paths } from '../Types/Paths'
-import { AppName } from '../Strings'
 import { timeout } from '../Utils/Utils'
-import log from 'electron-log'
-import { Component, MappingFile, PackageManagerInterface, SyncTask, PackageInfo } from './PackageManagerInterface'
+import { downloadFile, getJSON } from './Networking'
+import { Component, MappingFile, PackageInfo, PackageManagerInterface, SyncTask } from './PackageManagerInterface'
 
 function logMessage(...message: any) {
   log.info('PackageManager:', ...message)

packages/desktop/app/javascripts/Main/Remote/RemoteBridge.ts

@@ -4,14 +4,14 @@ import { Store, StoreKeys } from '../Store'
 const path = require('path')
 const rendererPath = path.join('file://', __dirname, '/renderer.js')
 
+import { FileBackupsDevice, FileBackupsMapping } from '@web/Application/Device/DesktopSnjsExports'
 import { app, BrowserWindow } from 'electron'
-import { KeychainInterface } from '../Keychain/KeychainInterface'
 import { BackupsManagerInterface } from '../Backups/BackupsManagerInterface'
-import { PackageManagerInterface, Component } from '../Packages/PackageManagerInterface'
+import { KeychainInterface } from '../Keychain/KeychainInterface'
+import { MenuManagerInterface } from '../Menus/MenuManagerInterface'
+import { Component, PackageManagerInterface } from '../Packages/PackageManagerInterface'
 import { SearchManagerInterface } from '../Search/SearchManagerInterface'
 import { RemoteDataInterface } from './DataInterface'
-import { MenuManagerInterface } from '../Menus/MenuManagerInterface'
-import { FileBackupsDevice, FileBackupsMapping } from '@web/Application/Device/DesktopSnjsExports'
 
 /**
  * Read https://github.com/electron/remote to understand how electron/remote works.

packages/desktop/app/javascripts/Main/SpellcheckerManager.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-inline-comments */
-import { isMac } from './Types/Platforms'
 import { Store, StoreKeys } from './Store'
+import { isMac } from './Types/Platforms'
 import { isDev } from './Utils/Utils'
 
 export enum Language {

packages/desktop/app/javascripts/Main/Store.ts

@@ -1,11 +1,11 @@
 import fs from 'fs'
 import path from 'path'
 import { MessageType } from '../../../test/TestIpcMessage'
-import { Language } from './SpellcheckerManager'
-import { ensureIsBoolean, isTesting, isDev, isBoolean } from './Utils/Utils'
-import { FileDoesNotExist } from './Utils/FileUtils'
 import { BackupsDirectoryName } from './Backups/BackupsManager'
+import { Language } from './SpellcheckerManager'
+import { FileDoesNotExist } from './Utils/FileUtils'
 import { handleTestMessage } from './Utils/Testing'
+import { ensureIsBoolean, isBoolean, isDev, isTesting } from './Utils/Utils'
 
 const app = process.type === 'browser' ? require('electron').app : require('@electron/remote').app
 

packages/desktop/app/javascripts/Main/Strings/french.ts

@@ -1,6 +1,6 @@
-import { Strings } from './types'
-import { createEnglishStrings } from './english'
 import { isDev } from '../Utils/Utils'
+import { createEnglishStrings } from './english'
+import { Strings } from './types'
 
 export function createFrenchStrings(): Strings {
   const fallback = createEnglishStrings()

packages/desktop/app/javascripts/Main/Strings/index.ts

@@ -1,7 +1,7 @@
+import { isDev } from '../Utils/Utils'
 import { createEnglishStrings } from './english'
 import { createFrenchStrings } from './french'
 import { Strings } from './types'
-import { isDev } from '../Utils/Utils'
 
 let strings: Strings
 

packages/desktop/app/javascripts/Main/TrayManager.ts

@@ -1,8 +1,8 @@
 import { Menu, Tray } from 'electron'
 import path from 'path'
-import { isLinux, isWindows } from './Types/Platforms'
 import { Store, StoreKeys } from './Store'
 import { AppName, tray as str } from './Strings'
+import { isLinux, isWindows } from './Types/Platforms'
 import { isDev } from './Utils/Utils'
 
 const icon = path.join(__dirname, '/icon/Icon-256x256.png')

packages/desktop/app/javascripts/Main/Types/Paths.ts

@@ -1,8 +1,8 @@
-import path from 'path'
-import index from '../../../index.html'
-import grantLinuxPasswordsAccess from '../../../grantLinuxPasswordsAccess.html'
 import decryptScript from 'decrypt/dist/decrypt.html'
 import { app } from 'electron'
+import path from 'path'
+import grantLinuxPasswordsAccess from '../../../grantLinuxPasswordsAccess.html'
+import index from '../../../index.html'
 
 function url(fileName: string): string {
   if ('APP_RELATIVE_PATH' in process.env) {

packages/desktop/app/javascripts/Main/UpdateManager.ts

@@ -3,12 +3,12 @@ import { BrowserWindow, dialog, shell } from 'electron'
 import electronLog from 'electron-log'
 import { autoUpdater } from 'electron-updater'
 import { action, autorun, computed, makeObservable, observable } from 'mobx'
-import { autoUpdatingAvailable } from './Types/Constants'
 import { MessageType } from '../../../test/TestIpcMessage'
 import { AppState } from '../../application'
 import { BackupsManagerInterface } from './Backups/BackupsManagerInterface'
 import { StoreKeys } from './Store'
 import { updates as str } from './Strings'
+import { autoUpdatingAvailable } from './Types/Constants'
 import { handleTestMessage } from './Utils/Testing'
 import { isTesting } from './Utils/Utils'
 

packages/desktop/app/javascripts/Main/Utils/FileUtils.ts

@@ -1,9 +1,9 @@
+import { dialog } from 'electron'
 import fs, { PathLike } from 'fs'
 import { debounce } from 'lodash'
 import path from 'path'
 import yauzl from 'yauzl'
 import { removeFromArray } from '../Utils/Utils'
-import { dialog } from 'electron'
 
 export const FileDoesNotExist = 'ENOENT'
 export const FileAlreadyExists = 'EEXIST'

packages/desktop/app/javascripts/Main/Window.ts

@@ -1,3 +1,4 @@
+import { clearSensitiveDirectories } from '@standardnotes/electron-clear-data'
 import { BrowserWindow, Rectangle, screen, Shell } from 'electron'
 import fs from 'fs'
 import { debounce } from 'lodash'
@@ -7,23 +8,22 @@ import { AppState } from '../../application'
 import { MessageToWebApp } from '../Shared/IpcMessages'
 import { createBackupsManager } from './Backups/BackupsManager'
 import { BackupsManagerInterface } from './Backups/BackupsManagerInterface'
+import { FilesBackupManager } from './FileBackups/FileBackupsManager'
+import { Keychain } from './Keychain/Keychain'
+import { MenuManagerInterface } from './Menus/MenuManagerInterface'
 import { buildContextMenu, createMenuManager } from './Menus/Menus'
 import { initializePackageManager } from './Packages/PackageManager'
-import { isMac, isWindows } from './Types/Platforms'
+import { RemoteBridge } from './Remote/RemoteBridge'
 import { initializeSearchManager } from './Search/SearchManager'
 import { createSpellcheckerManager } from './SpellcheckerManager'
 import { Store, StoreKeys } from './Store'
-import { handleTestMessage, send } from './Utils/Testing'
 import { createTrayManager, TrayManager } from './TrayManager'
+import { Paths } from './Types/Paths'
+import { isMac, isWindows } from './Types/Platforms'
 import { checkForUpdate, setupUpdates } from './UpdateManager'
+import { handleTestMessage, send } from './Utils/Testing'
 import { isTesting, lowercaseDriveLetter } from './Utils/Utils'
 import { initializeZoomManager } from './ZoomManager'
-import { Paths } from './Types/Paths'
-import { clearSensitiveDirectories } from '@standardnotes/electron-clear-data'
-import { RemoteBridge } from './Remote/RemoteBridge'
-import { Keychain } from './Keychain/Keychain'
-import { MenuManagerInterface } from './Menus/MenuManagerInterface'
-import { FilesBackupManager } from './FileBackups/FileBackupsManager'
 
 const WINDOW_DEFAULT_WIDTH = 1100
 const WINDOW_DEFAULT_HEIGHT = 800

packages/desktop/app/javascripts/Renderer/CrossProcessBridge.ts

@@ -1,5 +1,5 @@
-import { Component } from '../Main/Packages/PackageManagerInterface'
 import { FileBackupsDevice } from '@web/Application/Device/DesktopSnjsExports'
+import { Component } from '../Main/Packages/PackageManagerInterface'
 
 export interface CrossProcessBridge extends FileBackupsDevice {
   get extServerHost(): string

packages/desktop/app/javascripts/Renderer/DesktopDevice.ts

@@ -1,11 +1,11 @@
+import {
+  DesktopDeviceInterface,
+  Environment,
+  FileBackupsMapping,
+  RawKeychainValue,
+} from '@web/Application/Device/DesktopSnjsExports'
 import { WebOrDesktopDevice } from '@web/Application/Device/WebOrDesktopDevice'
 import { Component } from '../Main/Packages/PackageManagerInterface'
-import {
-  RawKeychainValue,
-  Environment,
-  DesktopDeviceInterface,
-  FileBackupsMapping,
-} from '@web/Application/Device/DesktopSnjsExports'
 import { CrossProcessBridge } from './CrossProcessBridge'
 
 const FallbackLocalStorageKey = 'keychain'

packages/desktop/app/javascripts/Renderer/Renderer.ts

@@ -1,8 +1,8 @@
-import { DesktopDevice } from './DesktopDevice'
-import { MessageToWebApp } from '../Shared/IpcMessages'
 import { DesktopClientRequiresWebMethods } from '@web/Application/Device/DesktopSnjsExports'
 import { StartApplication } from '@web/Application/Device/StartApplication'
+import { MessageToWebApp } from '../Shared/IpcMessages'
 import { CrossProcessBridge } from './CrossProcessBridge'
+import { DesktopDevice } from './DesktopDevice'
 
 declare const DEFAULT_SYNC_SERVER: string
 declare const WEBSOCKET_URL: string

packages/desktop/commitlint.config.js

@@ -1,3 +1,3 @@
 module.exports = {
   extends: ['@commitlint/config-conventional'],
-};
+}

packages/desktop/desktop.webpack.dev.js

@@ -1,5 +1,5 @@
-const { merge } = require('webpack-merge');
-const common = require('./desktop.webpack.common.js');
+const { merge } = require('webpack-merge')
+const common = require('./desktop.webpack.common.js')
 
 module.exports = (env) =>
   common({
@@ -10,5 +10,5 @@ module.exports = (env) =>
     merge(config, {
       mode: 'development',
       devtool: 'inline-cheap-source-map',
-    })
-  );
+    }),
+  )

packages/desktop/desktop.webpack.prod.js

@@ -1,10 +1,10 @@
-const { merge } = require('webpack-merge');
-const common = require('./desktop.webpack.common.js');
+const { merge } = require('webpack-merge')
+const common = require('./desktop.webpack.common.js')
 
 module.exports = (env) =>
   common(env).map((config) =>
     merge(config, {
       mode: 'production',
       devtool: 'source-map',
-    })
-  );
+    }),
+  )

packages/desktop/package.json

@@ -68,6 +68,7 @@
     "husky": "^7.0.4",
     "mime-types": "^2.1.35",
     "pre-push": "^0.1.2",
+    "prettier": "*",
     "proxyquire": "^2.1.3",
     "rimraf": "^3.0.2",
     "terser-webpack-plugin": "^5.3.1",

packages/desktop/test/backupsManager.spec.ts

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs'
 import path from 'path'
 
 import anyTest, { TestFn } from 'ava'
-import { Driver, createDriver } from './driver'
+import { createDriver, Driver } from './driver'
 
 const test = anyTest as TestFn<Driver>
 

packages/desktop/test/driver.ts

@@ -2,10 +2,10 @@
 import { ChildProcess, spawn } from 'child_process'
 import electronPath, { MenuItem } from 'electron'
 import path from 'path'
-import { deleteDir, ensureDirectoryExists, readJSONFile } from '../app/javascripts/Main/Utils/fileUtils'
 import { Language } from '../app/javascripts/Main/spellcheckerManager'
 import { StoreKeys } from '../app/javascripts/Main/store'
 import { UpdateState } from '../app/javascripts/Main/updateManager'
+import { deleteDir, ensureDirectoryExists, readJSONFile } from '../app/javascripts/Main/Utils/fileUtils'
 import { CommandLineArgs } from '../app/javascripts/Shared/CommandLineArgs'
 import { AppMessageType, AppTestMessage, MessageType, TestIPCMessage, TestIPCMessageResult } from './TestIpcMessage'
 

packages/desktop/test/extServer.spec.ts

@@ -4,10 +4,10 @@ import http from 'http'
 import { AddressInfo } from 'net'
 import path from 'path'
 import proxyquire from 'proxyquire'
-import { ensureDirectoryExists } from '../app/javascripts/Main/Utils/FileUtils'
 import { initializeStrings } from '../app/javascripts/Main/strings'
-import { createTmpDir } from './testUtils'
+import { ensureDirectoryExists } from '../app/javascripts/Main/Utils/FileUtils'
 import makeFakePaths from './fakePaths'
+import { createTmpDir } from './testUtils'
 
 const test = anyTest as TestFn<{
   server: http.Server

packages/desktop/test/fileUtils.spec.ts

@@ -1,4 +1,4 @@
-import test, { TestFn } from 'ava'
+import test from 'ava'
 import { promises as fs } from 'fs'
 import path from 'path'
 import {

packages/desktop/test/packageManager.spec.ts

@@ -2,11 +2,11 @@ import test from 'ava'
 import { promises as fs } from 'fs'
 import path from 'path'
 import proxyquire from 'proxyquire'
-import { ensureDirectoryExists, readJSONFile } from '../app/javascripts/Main/Utils/FileUtils'
-import { createTmpDir } from './testUtils'
-import { AppName } from '../app/javascripts/Main/strings'
-import makeFakePaths from './fakePaths'
 import { PackageManagerInterface } from '../app/javascripts/Main/Packages/PackageManagerInterface'
+import { AppName } from '../app/javascripts/Main/strings'
+import { ensureDirectoryExists, readJSONFile } from '../app/javascripts/Main/Utils/FileUtils'
+import makeFakePaths from './fakePaths'
+import { createTmpDir } from './testUtils'
 
 const tmpDir = createTmpDir(__filename)
 const FakePaths = makeFakePaths(tmpDir.path)

packages/desktop/test/spellcheckerManager.spec.ts

@@ -1,5 +1,5 @@
 import anyTest, { TestFn } from 'ava'
-import { Driver, createDriver } from './driver'
+import { createDriver, Driver } from './driver'
 
 const StoreKeys = {
   SelectedSpellCheckerLanguageCodes: 'selectedSpellCheckerLanguageCodes',

packages/desktop/test/storage.spec.ts

@@ -1,4 +1,4 @@
-import anyTest, { TestFn, ExecutionContext } from 'ava'
+import anyTest, { ExecutionContext, TestFn } from 'ava'
 import fs from 'fs'
 import path from 'path'
 import proxyquire from 'proxyquire'