diff --git a/web/.prettierrc b/web/.prettierrc index c19bf13b1..060db6d6b 100644 --- a/web/.prettierrc +++ b/web/.prettierrc @@ -1,9 +1,11 @@ { "importOrder": ["", "", "^\\$(.*)$", "^#test-data(.*)$", "^[./]"], - "importOrderSeparation": false, + "importOrderCaseSensitive": true, + "importOrderSafeSideEffects": [".*"], + "importOrderTypeScriptVersion": "6.0.0", "jsonRecursiveSort": true, "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }], - "plugins": ["@trivago/prettier-plugin-sort-imports", "prettier-plugin-svelte", "prettier-plugin-sort-json"], + "plugins": ["@ianvs/prettier-plugin-sort-imports", "prettier-plugin-svelte", "prettier-plugin-sort-json"], "printWidth": 120, "semi": true, "singleQuote": true, diff --git a/web/package.json b/web/package.json index 40a69a30d..7160e51be 100644 --- a/web/package.json +++ b/web/package.json @@ -83,6 +83,7 @@ }, "devDependencies": { "@eslint/js": "^10.0.0", + "@ianvs/prettier-plugin-sort-imports": "^4.7.1", "@koddsson/eslint-plugin-tscompat": "^0.4.0", "@playwright/test": "1.64.1", "@socket.io/component-emitter": "^3.1.0", @@ -91,7 +92,6 @@ "@sveltejs/kit": "^3.0.0", "@sveltejs/vite-plugin-svelte": "7.3.1", "@tailwindcss/vite": "^4.2.4", - "@trivago/prettier-plugin-sort-imports": "^6.0.2", "@types/chromecast-caf-sender": "^1.0.11", "@types/dom-to-image": "^2.6.7", "@types/justified-layout": "^4.1.4", diff --git a/web/src/lib/commands.ts b/web/src/lib/commands.ts index a6814e71f..56475bc5f 100644 --- a/web/src/lib/commands.ts +++ b/web/src/lib/commands.ts @@ -3,7 +3,7 @@ import { readPreloadedQuery } from '#lib/queries/client.ts'; import { getUserConfigQuery } from '#lib/queries/config-user.query.ts'; import { Route } from '#lib/route.ts'; import { copyToClipboard } from '#lib/utils.ts'; -import { defaultProvider, screencastManager, themeManager, ThemePreference, type ActionItem } from '@immich/ui'; +import { ThemePreference, defaultProvider, screencastManager, themeManager, type ActionItem } from '@immich/ui'; import { mdiAccountMultipleOutline, mdiAccountOutline, diff --git a/web/src/lib/components/AdaptiveImage.svelte b/web/src/lib/components/AdaptiveImage.svelte index 6b3896de1..e9f8216b3 100644 --- a/web/src/lib/components/AdaptiveImage.svelte +++ b/web/src/lib/components/AdaptiveImage.svelte @@ -51,11 +51,12 @@ diff --git a/web/src/lib/components/pages/SharedLinkPage.svelte b/web/src/lib/components/pages/SharedLinkPage.svelte index 13724a6be..d086d7fdd 100644 --- a/web/src/lib/components/pages/SharedLinkPage.svelte +++ b/web/src/lib/components/pages/SharedLinkPage.svelte @@ -8,7 +8,7 @@ import { setSharedLink } from '#lib/utils.ts'; import { handleError } from '#lib/utils/handle-error.ts'; import { navigate } from '#lib/utils/navigation.ts'; - import { sharedLinkLogin, SharedLinkType, type AssetResponseDto, type SharedLinkResponseDto } from '@immich/sdk'; + import { SharedLinkType, sharedLinkLogin, type AssetResponseDto, type SharedLinkResponseDto } from '@immich/sdk'; import { Button, Logo, PasswordInput } from '@immich/ui'; import { onDestroy, tick } from 'svelte'; import { t } from 'svelte-i18n'; diff --git a/web/src/lib/components/share-page/IndividualSharedViewer.svelte b/web/src/lib/components/share-page/IndividualSharedViewer.svelte index dcbff1c31..e34f86228 100644 --- a/web/src/lib/components/share-page/IndividualSharedViewer.svelte +++ b/web/src/lib/components/share-page/IndividualSharedViewer.svelte @@ -1,9 +1,8 @@ {#if themeManager.preference !== ThemePreference.System} diff --git a/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts b/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts index 443f9363a..386d7b0be 100644 --- a/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts +++ b/web/src/lib/components/shared-components/album-selection/album-selection-utils.spec.ts @@ -1,7 +1,7 @@ import { - type AlbumModalRow, AlbumModalRowConverter, AlbumModalRowType, + type AlbumModalRow, } from '#lib/components/shared-components/album-selection/album-selection-utils.ts'; import { AlbumSortBy, SortOrder } from '#lib/stores/preferences.store.ts'; import { factory } from '#test/unit/factories.ts'; diff --git a/web/src/lib/components/shared-components/context-menu/MenuOption.svelte b/web/src/lib/components/shared-components/context-menu/MenuOption.svelte index 769bb75a8..06c41f423 100644 --- a/web/src/lib/components/shared-components/context-menu/MenuOption.svelte +++ b/web/src/lib/components/shared-components/context-menu/MenuOption.svelte @@ -1,6 +1,9 @@ diff --git a/web/src/lib/components/shared-components/search-bar/SearchLocationSection.svelte b/web/src/lib/components/shared-components/search-bar/SearchLocationSection.svelte index 6df1c1d36..6d7ec5f17 100644 --- a/web/src/lib/components/shared-components/search-bar/SearchLocationSection.svelte +++ b/web/src/lib/components/shared-components/search-bar/SearchLocationSection.svelte @@ -2,7 +2,7 @@ import Combobox, { asComboboxOptions, asSelectedOption } from '#lib/components/shared-components/Combobox.svelte'; import { searchManager } from '#lib/managers/search-manager.svelte.ts'; import { handlePromiseError } from '#lib/utils.ts'; - import { getSearchSuggestions, SearchSuggestionType } from '@immich/sdk'; + import { SearchSuggestionType, getSearchSuggestions } from '@immich/sdk'; import { Text } from '@immich/ui'; import { onMount } from 'svelte'; import { t } from 'svelte-i18n'; diff --git a/web/src/lib/components/shared-components/search-bar/SearchMediaSection.svelte b/web/src/lib/components/shared-components/search-bar/SearchMediaSection.svelte index af4f0bdfc..fc08bee65 100644 --- a/web/src/lib/components/shared-components/search-bar/SearchMediaSection.svelte +++ b/web/src/lib/components/shared-components/search-bar/SearchMediaSection.svelte @@ -1,8 +1,8 @@
diff --git a/web/src/lib/components/shared-components/side-bar/PurchaseInfo.svelte b/web/src/lib/components/shared-components/side-bar/PurchaseInfo.svelte index e3f2c5e28..0aadb12cf 100644 --- a/web/src/lib/components/shared-components/side-bar/PurchaseInfo.svelte +++ b/web/src/lib/components/shared-components/side-bar/PurchaseInfo.svelte @@ -1,5 +1,4 @@ diff --git a/web/src/routes/auth/pin-prompt/+page.svelte b/web/src/routes/auth/pin-prompt/+page.svelte index 65c1ab749..26a486625 100644 --- a/web/src/routes/auth/pin-prompt/+page.svelte +++ b/web/src/routes/auth/pin-prompt/+page.svelte @@ -1,5 +1,4 @@