diff --git a/app/main/autoupdater.ts b/app/main/autoupdater.ts index 3627b0de..bc48f312 100644 --- a/app/main/autoupdater.ts +++ b/app/main/autoupdater.ts @@ -2,7 +2,8 @@ import {app, dialog, session} from 'electron'; import util from 'util'; import log from 'electron-log'; -import {UpdateDownloadedEvent, UpdateInfo, autoUpdater} from 'electron-updater'; +import type {UpdateDownloadedEvent, UpdateInfo} from 'electron-updater'; +import {autoUpdater} from 'electron-updater'; import * as ConfigUtil from '../renderer/js/utils/config-util'; import * as LinkUtil from '../renderer/js/utils/link-util'; diff --git a/app/main/request.ts b/app/main/request.ts index 4bf9649e..f3ae8627 100644 --- a/app/main/request.ts +++ b/app/main/request.ts @@ -1,4 +1,5 @@ -import {ClientRequest, IncomingMessage, app, net} from 'electron'; +import type {ClientRequest, IncomingMessage} from 'electron'; +import {app, net} from 'electron'; import fs from 'fs'; import path from 'path'; import stream from 'stream'; @@ -6,7 +7,7 @@ import util from 'util'; import getStream from 'get-stream'; -import {ServerConf} from '../renderer/js/utils/domain-util'; +import type {ServerConf} from '../renderer/js/utils/domain-util'; import Logger from '../renderer/js/utils/logger-util'; import * as Messages from '../resources/messages'; diff --git a/app/renderer/js/components/context-menu.ts b/app/renderer/js/components/context-menu.ts index 9ef0ea32..307e1128 100644 --- a/app/renderer/js/components/context-menu.ts +++ b/app/renderer/js/components/context-menu.ts @@ -1,4 +1,5 @@ -import {remote, ContextMenuParams} from 'electron'; +import type {ContextMenuParams} from 'electron'; +import {remote} from 'electron'; import * as t from '../utils/translation-util'; diff --git a/app/renderer/js/components/functional-tab.ts b/app/renderer/js/components/functional-tab.ts index 1e4465d1..2eb48405 100644 --- a/app/renderer/js/components/functional-tab.ts +++ b/app/renderer/js/components/functional-tab.ts @@ -1,6 +1,7 @@ import {htmlEscape} from 'escape-goat'; -import Tab, {TabProps} from './tab'; +import type {TabProps} from './tab'; +import Tab from './tab'; export default class FunctionalTab extends Tab { $closeButton: Element; diff --git a/app/renderer/js/components/server-tab.ts b/app/renderer/js/components/server-tab.ts index 81a0bb2a..00be0940 100644 --- a/app/renderer/js/components/server-tab.ts +++ b/app/renderer/js/components/server-tab.ts @@ -4,7 +4,8 @@ import {htmlEscape} from 'escape-goat'; import * as SystemUtil from '../utils/system-util'; -import Tab, {TabProps} from './tab'; +import type {TabProps} from './tab'; +import Tab from './tab'; export default class ServerTab extends Tab { $badge: Element; diff --git a/app/renderer/js/components/tab.ts b/app/renderer/js/components/tab.ts index acc4c68c..bfd67b48 100644 --- a/app/renderer/js/components/tab.ts +++ b/app/renderer/js/components/tab.ts @@ -1,5 +1,5 @@ import BaseComponent from './base'; -import WebView from './webview'; +import type WebView from './webview'; export interface TabProps { role: string; diff --git a/app/renderer/js/electron-bridge.ts b/app/renderer/js/electron-bridge.ts index c0a8b757..88fde8c5 100644 --- a/app/renderer/js/electron-bridge.ts +++ b/app/renderer/js/electron-bridge.ts @@ -2,7 +2,8 @@ import {ipcRenderer, remote} from 'electron'; import {EventEmitter} from 'events'; import {ClipboardDecrypterImpl} from './clipboard-decrypter'; -import {NotificationData, newNotification} from './notification'; +import type {NotificationData} from './notification'; +import {newNotification} from './notification'; type ListenerType = ((...args: any[]) => void); diff --git a/app/renderer/js/pages/preference/general-section.ts b/app/renderer/js/pages/preference/general-section.ts index 942e050b..5bb7ac39 100644 --- a/app/renderer/js/pages/preference/general-section.ts +++ b/app/renderer/js/pages/preference/general-section.ts @@ -1,4 +1,5 @@ -import {ipcRenderer, remote, OpenDialogOptions} from 'electron'; +import type {OpenDialogOptions} from 'electron'; +import {ipcRenderer, remote} from 'electron'; import fs from 'fs'; import path from 'path'; diff --git a/app/renderer/js/tray.ts b/app/renderer/js/tray.ts index b52e9b7c..87a2bbec 100644 --- a/app/renderer/js/tray.ts +++ b/app/renderer/js/tray.ts @@ -1,4 +1,5 @@ -import {ipcRenderer, remote, WebviewTag, NativeImage} from 'electron'; +import type {WebviewTag, NativeImage} from 'electron'; +import {ipcRenderer, remote} from 'electron'; import path from 'path'; import * as ConfigUtil from './utils/config-util'; diff --git a/package.json b/package.json index deb8c43f..964074e6 100644 --- a/package.json +++ b/package.json @@ -229,6 +229,9 @@ "files": [ "**/*.ts" ], + "rules": { + "@typescript-eslint/consistent-type-imports": "error" + }, "settings": { "import/resolver": "typescript" }