Skip to content

Commit 86e28f5

Browse files
committed
xo: Fix import/no-duplicates.
Signed-off-by: Anders Kaseorg <[email protected]>
1 parent 7072a41 commit 86e28f5

17 files changed

+41
-46
lines changed

app/main/autoupdater.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ import {app, dialog, session} from "electron/main";
33
import process from "node:process";
44

55
import log from "electron-log/main";
6-
import type {UpdateDownloadedEvent, UpdateInfo} from "electron-updater";
7-
import {autoUpdater} from "electron-updater";
6+
import {
7+
type UpdateDownloadedEvent,
8+
type UpdateInfo,
9+
autoUpdater,
10+
} from "electron-updater";
811

912
import * as ConfigUtil from "../common/config-util.js";
1013

app/main/badge-settings.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import {nativeImage} from "electron/common";
2-
import type {BrowserWindow} from "electron/main";
3-
import {app} from "electron/main";
2+
import {type BrowserWindow, app} from "electron/main";
43
import process from "node:process";
54

65
import * as ConfigUtil from "../common/config-util.js";

app/main/handle-external-link.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import type {Event} from "electron/common";
2-
import {shell} from "electron/common";
3-
import type {
4-
HandlerDetails,
5-
SaveDialogOptions,
6-
WebContents,
1+
import {type Event, shell} from "electron/common";
2+
import {
3+
type HandlerDetails,
4+
Notification,
5+
type SaveDialogOptions,
6+
type WebContents,
7+
app,
78
} from "electron/main";
8-
import {Notification, app} from "electron/main";
99
import fs from "node:fs";
1010
import path from "node:path";
1111

app/main/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import {clipboard} from "electron/common";
2-
import type {IpcMainEvent, WebContents} from "electron/main";
32
import {
43
BrowserWindow,
4+
type IpcMainEvent,
5+
type WebContents,
56
app,
67
dialog,
78
powerMonitor,

app/main/linuxupdater.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type {Session} from "electron/main";
2-
import {Notification, app} from "electron/main";
1+
import {Notification, type Session, app} from "electron/main";
32

43
import * as semver from "semver";
54
import {z} from "zod";

app/main/menu.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import {shell} from "electron/common";
2-
import type {MenuItemConstructorOptions} from "electron/main";
3-
import {BrowserWindow, Menu, app} from "electron/main";
2+
import {
3+
BrowserWindow,
4+
Menu,
5+
type MenuItemConstructorOptions,
6+
app,
7+
} from "electron/main";
48
import process from "node:process";
59

610
import AdmZip from "adm-zip";

app/main/request.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type {Session} from "electron/main";
2-
import {app} from "electron/main";
1+
import {type Session, app} from "electron/main";
32
import fs from "node:fs";
43
import path from "node:path";
54
import {Readable} from "node:stream";

app/main/typed-ipc-main.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import type {
2-
IpcMainEvent,
3-
IpcMainInvokeEvent,
4-
WebContents,
5-
} from "electron/main";
61
import {
2+
type IpcMainEvent,
3+
type IpcMainInvokeEvent,
4+
type WebContents,
75
ipcMain as untypedIpcMain, // eslint-disable-line no-restricted-imports
86
} from "electron/main";
97

app/renderer/js/components/context-menu.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import type {Event} from "electron/common";
2-
import {clipboard} from "electron/common";
1+
import {type Event, clipboard} from "electron/common";
32
import type {WebContents} from "electron/main";
43
import type {
54
ContextMenuParams,

app/renderer/js/components/functional-tab.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
import type {Html} from "../../../common/html.js";
2-
import {html} from "../../../common/html.js";
1+
import {type Html, html} from "../../../common/html.js";
32

43
import {generateNodeFromHtml} from "./base.js";
5-
import type {TabProps} from "./tab.js";
6-
import Tab from "./tab.js";
4+
import Tab, {type TabProps} from "./tab.js";
75

86
export type FunctionalTabProps = {
97
$view: Element;

0 commit comments

Comments
 (0)