Skip to content

Commit c93f83b

Browse files
committed
prettier: Sort imports
1 parent a0880c1 commit c93f83b

74 files changed

Lines changed: 322 additions & 204 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.prettierrc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,15 @@
55
"singleQuote": true,
66
"trailingComma": "es5",
77
"printWidth": 100,
8-
"plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"],
8+
"importOrder": ["^@.*", "^\\$.*", "^[a-zA-Z].*", "^\\..*"],
9+
"importOrderSeparation": false,
10+
"importOrderSortSpecifiers": true,
11+
"importOrderSideEffects": false,
12+
"plugins": [
13+
"prettier-plugin-svelte",
14+
"prettier-plugin-tailwindcss",
15+
"@trivago/prettier-plugin-sort-imports"
16+
],
917
"overrides": [
1018
{ "files": "*.svelte", "options": { "parser": "svelte" } },
1119
{ "files": "package*.json", "options": { "tabWidth": 2, "useTabs": true } }

eslint.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import prettier from 'eslint-config-prettier';
2-
import js from '@eslint/js';
31
import { includeIgnoreFile } from '@eslint/compat';
2+
import js from '@eslint/js';
3+
import prettier from 'eslint-config-prettier';
44
import svelte from 'eslint-plugin-svelte';
55
import globals from 'globals';
66
import { fileURLToPath } from 'node:url';

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"@tailwindcss/typography": "^0.5.16",
3232
"@tailwindcss/vite": "^4.1.7",
3333
"@tanstack/table-core": "^8.21.3",
34+
"@trivago/prettier-plugin-sort-imports": "^5.2.2",
3435
"@types/crypto-js": "^4.2.2",
3536
"@types/eslint": "^9.6.1",
3637
"@types/node": "^22.15.19",

pnpm-lock.yaml

Lines changed: 143 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/lib/EspTool/FlashManager.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1+
import Latin1 from 'crypto-js/enc-latin1';
2+
import HashMD5 from 'crypto-js/md5';
13
import {
24
ESPLoader,
3-
Transport,
4-
type LoaderOptions,
5-
type IEspLoaderTerminal,
65
type FlashOptions,
6+
type IEspLoaderTerminal,
7+
type LoaderOptions,
8+
Transport,
79
} from 'esptool-js';
8-
import HashMD5 from 'crypto-js/md5';
9-
import Latin1 from 'crypto-js/enc-latin1';
1010

1111
/**
1212
* Reboots the chip in ESPLoader mode.

src/lib/api/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import { PUBLIC_BACKEND_API_DOMAIN } from '$env/static/public';
22
import {
3+
APITokensApi,
34
AccountApi as AccountV1Api,
45
AdminApi,
5-
APITokensApi,
66
Configuration as ConfigurationV1,
77
HubManagementApi as HubManagementV1Api,
88
MetaApi,
9-
SessionsApi,
10-
ShockersApi as ShockersV1Api,
119
PublicShockerSharesApi,
10+
SessionsApi,
1211
ShockerSharesApi as ShockerSharesV1Api,
12+
ShockersApi as ShockersV1Api,
1313
UsersApi,
1414
} from './internal/v1';
1515
import {
1616
AccountApi as AccountV2Api,
1717
Configuration as ConfigurationV2,
1818
HubManagementApi as HubManagementV2Api,
19-
ShockersApi as ShockersV2Api,
2019
ShockerSharesApi as ShockerSharesV2Api,
20+
ShockersApi as ShockersV2Api,
2121
} from './internal/v2';
2222

2323
type Config = {

src/lib/components/ControlModules/ClassicControlModule.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
import type { ShockerResponse } from '$lib/api/internal/v1';
33
import {
44
ControlDurationDefault,
5+
ControlDurationProps,
56
ControlIntensityDefault,
67
ControlIntensityProps,
7-
ControlDurationProps,
88
} from '$lib/constants/ControlConstants';
99
import { SignalR_Connection } from '$lib/signalr';
1010
import { ControlType } from '$lib/signalr/models/ControlType';

src/lib/components/ControlModules/Internal/ActionButtons.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script lang="ts">
2+
import { Volume2, Waves, Zap } from '@lucide/svelte';
23
import Button from '$lib/components/ui/button/button.svelte';
34
import { ControlType } from '$lib/signalr/models/ControlType';
4-
import { Volume2, Waves, Zap } from '@lucide/svelte';
55
66
type Props = {
77
ctrl: (type: ControlType) => void;

src/lib/components/ControlModules/RichControlModule.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
<script lang="ts">
2+
import { Signal, Timer } from '@lucide/svelte';
23
import type { ShockerResponse } from '$lib/api/internal/v1';
34
import {
45
ControlDurationDefault,
5-
ControlIntensityDefault,
66
ControlDurationProps,
7+
ControlIntensityDefault,
78
ControlIntensityProps,
89
} from '$lib/constants/ControlConstants';
910
import { SignalR_Connection } from '$lib/signalr';
1011
import { ControlType } from '$lib/signalr/models/ControlType';
1112
import { serializeControlMessages } from '$lib/signalr/serializers/Control';
12-
13-
import { Signal, Timer } from '@lucide/svelte';
1413
import ActionButtons from './Internal/ActionButtons.svelte';
1514
1615
interface Props {

src/lib/components/ControlModules/SimpleControlHeader.svelte

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<script lang="ts">
2-
import { ControlIntensityProps, ControlDurationProps } from '$lib/constants/ControlConstants';
3-
import CircleSlider from './Internal/CircleSlider.svelte';
4-
52
import { Timer, Volume2, Zap } from '@lucide/svelte';
3+
import { ControlDurationProps, ControlIntensityProps } from '$lib/constants/ControlConstants';
4+
import CircleSlider from './Internal/CircleSlider.svelte';
65
76
interface Props {
87
shockIntensity: number;

0 commit comments

Comments
 (0)