Skip to content

Commit 077f3e6

Browse files
committed
eslint: Enable sort-imports for member sorting.
This sorts the members imported within each individual declaration; we use import/order for sorting multiple declarations. Signed-off-by: Anders Kaseorg <anders@zulip.com>
1 parent 3b2256b commit 077f3e6

File tree

9 files changed

+14
-8
lines changed

9 files changed

+14
-8
lines changed

app/common/logger-util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import fs from "fs";
44
import os from "os";
55

66
import {initSetUp} from "./default-util";
7-
import {sentryInit, captureException} from "./sentry-util";
7+
import {captureException, sentryInit} from "./sentry-util";
88

99
const {app} = process.type === "renderer" ? electron.remote : electron;
1010

app/main/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {appUpdater} from "./autoupdater";
1111
import * as BadgeSettings from "./badge-settings";
1212
import * as AppMenu from "./menu";
1313
import * as ProxyUtil from "./proxy-util";
14-
import {_getServerSettings, _saveServerIcon, _isOnline} from "./request";
14+
import {_getServerSettings, _isOnline, _saveServerIcon} from "./request";
1515
import {setAutoLaunch} from "./startup";
1616

1717
const {GDK_BACKEND} = process.env;

app/main/linuxupdater.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {app, Notification, net} from "electron";
1+
import {Notification, app, net} from "electron";
22

33
import getStream from "get-stream";
44
import * as semver from "semver";

app/main/menu.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {app, shell, BrowserWindow, Menu} from "electron";
1+
import {BrowserWindow, Menu, app, shell} from "electron";
22

33
import AdmZip from "adm-zip";
44

app/renderer/js/main.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {ipcRenderer, remote, clipboard} from "electron";
1+
import {clipboard, ipcRenderer, remote} from "electron";
22
import path from "path";
33

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

app/renderer/js/pages/preference/server-info-form.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {remote, ipcRenderer} from "electron";
1+
import {ipcRenderer, remote} from "electron";
22

33
import {html} from "../../../../common/html";
44
import * as Messages from "../../../../common/messages";

app/renderer/js/tray.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type {WebviewTag, NativeImage} from "electron";
1+
import type {NativeImage, WebviewTag} from "electron";
22
import {ipcRenderer, remote} from "electron";
33
import path from "path";
44

app/renderer/js/utils/domain-util.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {remote, ipcRenderer} from "electron";
1+
import {ipcRenderer, remote} from "electron";
22
import fs from "fs";
33
import path from "path";
44

package.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,12 @@
244244
],
245245
"import/unambiguous": "error",
246246
"no-warning-comments": "off",
247+
"sort-imports": [
248+
"error",
249+
{
250+
"ignoreDeclarationSort": true
251+
}
252+
],
247253
"strict": "error"
248254
},
249255
"envs": [

0 commit comments

Comments
 (0)