Skip to content

Commit e5ef14d

Browse files
committed
refactor: replace eslint default import sort with a plugin (it is autofixable now)
1 parent 366194d commit e5ef14d

File tree

10 files changed

+59
-49
lines changed

10 files changed

+59
-49
lines changed

bun.lockb

449 Bytes
Binary file not shown.

eslint.config.js

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1+
import { fileURLToPath } from "node:url";
2+
13
import { includeIgnoreFile } from "@eslint/compat";
2-
import { globalIgnores } from "eslint/config";
3-
import { defineConfigWithVueTs, vueTsConfigs } from "@vue/eslint-config-typescript";
44
import stylistic from "@stylistic/eslint-plugin";
5+
import unocss from "@unocss/eslint-config/flat";
6+
import { defineConfigWithVueTs, vueTsConfigs } from "@vue/eslint-config-typescript";
57
import vueRequireID from "@vue-require-id/eslint-plugin";
8+
import { globalIgnores } from "eslint/config";
9+
import simpleImportSort from "eslint-plugin-simple-import-sort";
610
import eslintPluginUnicorn from "eslint-plugin-unicorn";
711
import pluginVue from "eslint-plugin-vue";
8-
import unocss from "@unocss/eslint-config/flat";
912
import globals from "globals";
10-
import { fileURLToPath } from "node:url";
1113

1214
// Get the absolute path of a '.gitignore' file
1315
const gitIgnorePath = fileURLToPath(
@@ -35,8 +37,9 @@ export default defineConfigWithVueTs(
3537
},
3638
},
3739
"plugins": {
38-
"@stylistic" : stylistic,
39-
"@vue-require-id": vueRequireID,
40+
"@stylistic" : stylistic,
41+
"@vue-require-id" : vueRequireID,
42+
"simple-import-sort": simpleImportSort,
4043
},
4144
"rules": {
4245

@@ -65,13 +68,9 @@ export default defineConfigWithVueTs(
6568

6669
/* ESLint */
6770
"capitalized-comments": ["warn", "always"],
68-
"sort-imports" : ["warn", {
69-
"allowSeparatedGroups" : false,
70-
"ignoreCase" : false,
71-
"ignoreDeclarationSort": false,
72-
"ignoreMemberSort" : false,
73-
"memberSyntaxSortOrder": ["multiple", "single", "all", "none"],
74-
}],
71+
72+
/* Simple Import Sort */
73+
"simple-import-sort/imports": "warn",
7574

7675
// Element IDs simplify styling for plugins
7776
"@vue-require-id/require-id": ["warn", {

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"@vue/eslint-config-typescript": "^14.6.0",
4949
"@vue/tsconfig": "^0.7.0",
5050
"eslint": "^9.34.0",
51+
"eslint-plugin-simple-import-sort": "^12.1.1",
5152
"eslint-plugin-unicorn": "^60.0.0",
5253
"eslint-plugin-vue": "^10.4.0",
5354
"globals": "^16.3.0",

src/App.vue

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
<script setup lang="ts">
2+
import { defineAsyncComponent, nextTick, provide, shallowReactive } from "vue";
3+
4+
import ErrorBoundary from "@/components/handlers/ErrorBoundary.vue";
25
import Layout from "@/components/layout/Layout.vue";
36
import Router from "@/components/layout/Router.vue";
4-
import ErrorBoundary from "@/components/handlers/ErrorBoundary.vue";
5-
import GlobalError from "@/components/statuses/GlobalError.vue";
6-
import ExtensionsError from "@/components/statuses/ExtensionsError.vue";
77
import NonBundledClasses from "@/components/misc/NonBundledClasses.vue";
8-
import { defineAsyncComponent, nextTick, provide, shallowReactive } from "vue";
8+
import ExtensionsError from "@/components/statuses/ExtensionsError.vue";
9+
import GlobalError from "@/components/statuses/GlobalError.vue";
910
import {
10-
ApplicationNamespace, ContextMenuItems,
11+
ApplicationNamespace,
12+
ContextMenuItems,
1113
GlobalStatesChangerContextKey,
1214
GlobalStatesContextKey,
1315
} from "@/constants/application.ts";
16+
import { HookMappings } from "@/constants/mappings.ts";
17+
import { RouteItems } from "@/constants/routes.ts";
18+
import { log } from "@/lib/handlers/log.ts";
19+
import { capitalize } from "@/lib/helpers/capitalize.ts";
1420
import type {
1521
ContextGlobalStatesType,
1622
GlobalStatesChangerType,
1723
GlobalStatesType,
1824
} from "@/types/application/global-states.type.ts";
19-
import { HookMappings } from "@/constants/mappings.ts";
2025
import type { ExtensionStatusType } from "@/types/extensions/hook-return.type.ts";
21-
import { RouteItems } from "@/constants/routes.ts";
22-
import { capitalize } from "@/lib/helpers/capitalize.ts";
23-
import { log } from "@/lib/handlers/log.ts";
2426
2527
const LogViewer = defineAsyncComponent(
2628
() => import("@/components/logging/LogViewer.vue"),

src/components/layout/Layout.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<script setup lang="ts">
2-
import Sidebar from "@/components/layout/Sidebar.vue";
3-
import ErrorBoundary from "@/components/handlers/ErrorBoundary.vue";
2+
import { useEventListener } from "@vueuse/core";
43
import { ref } from "vue";
4+
5+
import ErrorBoundary from "@/components/handlers/ErrorBoundary.vue";
56
import ContextMenu from "@/components/layout/ContextMenu.vue";
6-
import { useEventListener } from "@vueuse/core";
7+
import Sidebar from "@/components/layout/Sidebar.vue";
78
import { ApplicationNamespace } from "@/constants/application.ts";
89
import type { RouteType } from "@/types/application/route.type.ts";
910

src/declarations.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
1-
import type { ConfigType } from "@/types/config/config.schema.ts";
2-
import type { log } from "@/lib/handlers/log.ts";
3-
import type { extractError } from "@/lib/helpers/extract-error.ts";
4-
import type { getRelativeDate } from "@/lib/helpers/get-relative-date.ts";
5-
import type { getConfigFile } from "@/lib/main/get-config-file.ts";
6-
import type { getDefaultConfig } from "@/lib/main/get-default-config.ts";
7-
import type { initializeConfigFile } from "@/lib/main/initialize-config-file.ts";
8-
import type { HookReturnType } from "@/types/extensions/hook-return.type.ts";
9-
import type { RouteType } from "@/types/application/route.type.ts";
101
import * as TauriApi from "@tauri-apps/api";
112
import * as TauriDialog from "@tauri-apps/plugin-dialog";
123
import * as TauriFs from "@tauri-apps/plugin-fs";
@@ -18,7 +9,17 @@ import * as TauriShell from "@tauri-apps/plugin-shell";
189
import * as TauriUpload from "@tauri-apps/plugin-upload";
1910
import * as TauriDiscordRpc from "tauri-plugin-drpc";
2011
import * as TauriDiscordRpcClasses from "tauri-plugin-drpc/activity";
12+
13+
import type { log } from "@/lib/handlers/log.ts";
14+
import type { extractError } from "@/lib/helpers/extract-error.ts";
15+
import type { getRelativeDate } from "@/lib/helpers/get-relative-date.ts";
16+
import type { getConfigFile } from "@/lib/main/get-config-file.ts";
17+
import type { getDefaultConfig } from "@/lib/main/get-default-config.ts";
18+
import type { initializeConfigFile } from "@/lib/main/initialize-config-file.ts";
2119
import type { GlobalStatesChangerType, GlobalStatesType } from "@/types/application/global-states.type.ts";
20+
import type { RouteType } from "@/types/application/route.type.ts";
21+
import type { ConfigType } from "@/types/config/config.schema.ts";
22+
import type { HookReturnType } from "@/types/extensions/hook-return.type.ts";
2223

2324
declare global {
2425
interface Window {

src/lib/main/declare-window.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1+
import * as DiscordRPC from "tauri-plugin-drpc";
2+
import * as DiscordRPCClasses from "tauri-plugin-drpc/activity.ts";
3+
14
import { ApplicationNamespace } from "@/constants/application.ts";
2-
import { getDefaultConfig } from "@/lib/main/get-default-config.ts";
35
import { log } from "@/lib/handlers/log.ts";
46
import { extractError } from "@/lib/helpers/extract-error.ts";
57
import { getRelativeDate } from "@/lib/helpers/get-relative-date.ts";
68
import { getConfigFile } from "@/lib/main/get-config-file.ts";
9+
import { getDefaultConfig } from "@/lib/main/get-default-config.ts";
710
import { initializeConfigFile } from "@/lib/main/initialize-config-file.ts";
811
import type { GlobalStatesType } from "@/types/application/global-states.type.ts";
9-
import * as DiscordRPC from "tauri-plugin-drpc";
10-
import * as DiscordRPCClasses from "tauri-plugin-drpc/activity.ts";
1112

1213
export function declareWindow(): void {
1314
window.__TAURI_PLUGINS_COMMUNITY__ = {

src/lib/main/get-config-file.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { log } from "@/lib/handlers/log.ts";
1+
import { BaseDirectory, exists, readTextFile } from "@tauri-apps/plugin-fs";
2+
23
import { ApplicationNamespace, ConfigFilename } from "@/constants/application.ts";
4+
import { log } from "@/lib/handlers/log.ts";
35
import { getDefaultConfig } from "@/lib/main/get-default-config.ts";
46
import { initializeConfigFile } from "@/lib/main/initialize-config-file.ts";
5-
import { BaseDirectory, exists, readTextFile } from "@tauri-apps/plugin-fs";
67
import { type ConfigType, ConfigValidator } from "@/types/config/config.schema.ts";
78

89
export async function getConfigFile(): Promise<ConfigType> {

src/lib/main/get-default-config.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import type { ConfigType } from "@/types/config/config.schema.ts";
2-
import { log } from "@/lib/handlers/log.ts";
3-
import { ApplicationNamespace } from "@/constants/application.ts";
41
import { getCurrentWindow } from "@tauri-apps/api/window";
52

3+
import { ApplicationNamespace } from "@/constants/application.ts";
4+
import { log } from "@/lib/handlers/log.ts";
5+
import type { ConfigType } from "@/types/config/config.schema.ts";
6+
67
export async function getDefaultConfig(): Promise<ConfigType> {
78
const hooksArray = window[ApplicationNamespace].hooks.getDefaultConfig.before;
89

src/main.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
import App from "@/App.vue";
2-
import { ApplicationRootID } from "@/constants/application";
3-
import { createApp } from "vue";
4-
import { declareWindow } from "@/lib/main/declare-window.ts";
5-
import { initializeLauncher } from "@/lib/main/initialize-launcher.ts";
6-
import { log } from "@/lib/handlers/log.ts";
7-
import { prepareLogFile } from "@/lib/main/prepare-log-file.ts";
81
// Import UnoCSS essentials
92
import "virtual:uno.css";
103
// Reset all CSS styles in a Tailwind style
114
import "@unocss/reset/tailwind.css";
5+
// Import custom CSS styles
126
import "@/globals.css";
137
// Import styles that are necessary for Material You ripple effect
148
import "m3ripple-vue/style.css";
159

10+
import { createApp } from "vue";
11+
12+
import App from "@/App.vue";
13+
import { ApplicationRootID } from "@/constants/application";
14+
import { log } from "@/lib/handlers/log.ts";
15+
import { declareWindow } from "@/lib/main/declare-window.ts";
16+
import { initializeLauncher } from "@/lib/main/initialize-launcher.ts";
17+
import { prepareLogFile } from "@/lib/main/prepare-log-file.ts";
18+
1619
await prepareLogFile().catch((error: unknown) => {
1720
log.error("Failed to prepare a log file:", JSON.stringify(error));
1821
});

0 commit comments

Comments
 (0)