From 620eeeb346736993ba38bd15239abc2ddd02fff3 Mon Sep 17 00:00:00 2001 From: terraputix Date: Sun, 15 Feb 2026 15:08:08 +0100 Subject: [PATCH] consistent formatting --- .prettierrc | 16 --------- eslint.config.js | 10 +++--- prettier.config.js | 35 +++++++++++++++++++ src/demo.spec.ts | 2 +- .../location/location-search.svelte | 2 ++ .../components/navigation/weather-nav.svelte | 5 +-- .../ui/alert/alert-description.svelte | 5 +-- .../components/ui/alert/alert-title.svelte | 3 +- src/lib/components/ui/alert/alert.svelte | 3 +- src/lib/components/ui/alert/index.ts | 3 +- src/lib/components/ui/button/button.svelte | 6 ++-- src/lib/components/ui/card/card-action.svelte | 3 +- .../components/ui/card/card-content.svelte | 3 +- .../ui/card/card-description.svelte | 5 +-- src/lib/components/ui/card/card-footer.svelte | 3 +- src/lib/components/ui/card/card-header.svelte | 3 +- src/lib/components/ui/card/card-title.svelte | 3 +- src/lib/components/ui/card/card.svelte | 5 +-- src/lib/components/ui/card/index.ts | 4 +-- .../components/ui/checkbox/checkbox.svelte | 7 ++-- src/lib/components/ui/checkbox/index.ts | 1 + .../ui/dialog/dialog-content.svelte | 15 ++++---- .../ui/dialog/dialog-description.svelte | 3 +- .../components/ui/dialog/dialog-footer.svelte | 3 +- .../components/ui/dialog/dialog-header.svelte | 3 +- .../ui/dialog/dialog-overlay.svelte | 3 +- .../components/ui/dialog/dialog-title.svelte | 1 + src/lib/components/ui/dialog/index.ts | 12 +++---- src/lib/components/ui/input/input.svelte | 15 ++++---- src/lib/components/ui/label/label.svelte | 1 + src/lib/components/ui/select/index.ts | 16 ++++----- .../ui/select/select-content.svelte | 11 +++--- .../ui/select/select-group-heading.svelte | 4 ++- .../components/ui/select/select-item.svelte | 5 +-- .../components/ui/select/select-label.svelte | 5 +-- .../select/select-scroll-down-button.svelte | 3 +- .../ui/select/select-scroll-up-button.svelte | 3 +- .../ui/select/select-separator.svelte | 8 +++-- .../ui/select/select-trigger.svelte | 7 ++-- .../components/ui/separator/separator.svelte | 3 +- src/lib/components/ui/switch/switch.svelte | 7 ++-- src/lib/utils.ts | 2 +- src/routes/+layout.svelte | 3 +- src/routes/+page.svelte | 6 ++-- src/routes/page.svelte.spec.ts | 3 +- src/routes/weather/+layout.svelte | 11 +++--- src/routes/weather/+page.ts | 1 + src/routes/weather/week/+page.ts | 4 +++ .../weather/week/[location]/+page.svelte | 5 +-- vite.config.ts | 6 ++-- 50 files changed, 186 insertions(+), 110 deletions(-) delete mode 100644 .prettierrc create mode 100644 prettier.config.js diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index 819fa57..0000000 --- a/.prettierrc +++ /dev/null @@ -1,16 +0,0 @@ -{ - "useTabs": true, - "singleQuote": true, - "trailingComma": "none", - "printWidth": 100, - "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], - "overrides": [ - { - "files": "*.svelte", - "options": { - "parser": "svelte" - } - } - ], - "tailwindStylesheet": "./src/routes/layout.css" -} diff --git a/eslint.config.js b/eslint.config.js index d25cf1e..3d31f3e 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,11 +1,12 @@ -import prettier from 'eslint-config-prettier'; -import { fileURLToPath } from 'node:url'; import { includeIgnoreFile } from '@eslint/compat'; import js from '@eslint/js'; +import prettier from 'eslint-config-prettier'; import svelte from 'eslint-plugin-svelte'; -import { defineConfig } from 'eslint/config'; +import { defineConfig, globalIgnores } from 'eslint/config'; import globals from 'globals'; +import { fileURLToPath } from 'node:url'; import ts from 'typescript-eslint'; + import svelteConfig from './svelte.config.js'; const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url)); @@ -44,5 +45,6 @@ export default defineConfig( svelteConfig } } - } + }, + globalIgnores(['src/lib/components/ui/**/*'], 'Ignore Shadcn Component Directory') ); diff --git a/prettier.config.js b/prettier.config.js new file mode 100644 index 0000000..4eb2009 --- /dev/null +++ b/prettier.config.js @@ -0,0 +1,35 @@ +export default { + useTabs: true, + singleQuote: true, + trailingComma: 'none', + printWidth: 100, + importOrder: [ + '^svelte($|/)', + '', + '\\$app/', + '\\$lib/stores', + '\\$lib/utils', + '\\$lib/components', + '\\$lib/assets', + '\\$lib', + '^~/', + '^\\.', + '', + '' + ], + importOrderSeparation: true, + importOrderSortSpecifiers: true, + plugins: [ + 'prettier-plugin-svelte', + 'prettier-plugin-tailwindcss', + '@trivago/prettier-plugin-sort-imports' + ], + overrides: [ + { + files: '*.svelte', + options: { + parser: 'svelte' + } + } + ] +}; diff --git a/src/demo.spec.ts b/src/demo.spec.ts index e07cbbd..5d40967 100644 --- a/src/demo.spec.ts +++ b/src/demo.spec.ts @@ -1,4 +1,4 @@ -import { describe, it, expect } from 'vitest'; +import { describe, expect, it } from 'vitest'; describe('sum test', () => { it('adds 1 + 2 to equal 3', () => { diff --git a/src/lib/components/location/location-search.svelte b/src/lib/components/location/location-search.svelte index 839fdb0..c26032c 100644 --- a/src/lib/components/location/location-search.svelte +++ b/src/lib/components/location/location-search.svelte @@ -1,6 +1,8 @@ diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 7560029..57e6aad 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,6 +1,10 @@