From 7ac0ad84e94d2dc6c0bfaf3987d1c18067e28f3b Mon Sep 17 00:00:00 2001 From: maalni Date: Sun, 31 Mar 2024 17:26:30 +0200 Subject: [PATCH] fix: update prettier and eslint configs (#76) * fix: update prettier and eslint configs * fix: prettier --- .eslintrc.cjs | 19 +- .prettierrc | 10 +- README.md | 6 +- package.json | 1 + pnpm-lock.yaml | 49 +++++ .../graphs/PullDistributionByMonth.svelte | 23 +- .../components/layout/DefaultLayout.svelte | 4 +- .../BannerHistoryTable.svelte | 25 ++- src/lib/components/ui/badge/index.ts | 4 +- .../components/ui/builds/defaultBuilds.json | 21 +- src/lib/components/ui/button/index.ts | 3 +- .../date-range-picker/DateRangePicker.svelte | 14 +- .../components/ui/searchbar/Searchbar.svelte | 12 +- src/lib/components/ui/sonner/sonner.svelte | 3 +- src/lib/components/ui/toggle/index.ts | 3 +- src/lib/services/importer/paimon.ts | 20 +- src/lib/utils.ts | 6 +- src/routes/+error.svelte | 208 +++++++----------- src/routes/+page.svelte | 4 +- src/routes/characters/[slug]/+page.svelte | 11 +- src/routes/settings/+page.svelte | 3 +- .../wish-statistics/overview/+page.svelte | 12 +- 22 files changed, 262 insertions(+), 199 deletions(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 16a21345..7b8289fd 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -1,24 +1,17 @@ -/** @type { import("eslint").Linter.Config } */ +/** @type { import('eslint').Linter.Config } */ module.exports = { root: true, - extends: [ - 'eslint:recommended', - 'plugin:@typescript-eslint/recommended', - 'plugin:svelte/recommended', - 'prettier' - ], parser: '@typescript-eslint/parser', - plugins: ['@typescript-eslint'], parserOptions: { sourceType: 'module', ecmaVersion: 2020, extraFileExtensions: ['.svelte'] }, - env: { - browser: true, - es2017: true, - node: true - }, + extends: [ + 'plugin:@typescript-eslint/recommended', + 'plugin:svelte/prettier', + 'plugin:prettier/recommended' + ], rules: { 'no-unused-vars': 'off', '@typescript-eslint/no-unused-vars': [ diff --git a/.prettierrc b/.prettierrc index d73a6a79..9f2e4778 100644 --- a/.prettierrc +++ b/.prettierrc @@ -4,6 +4,14 @@ "trailingComma": "none", "printWidth": 100, "endOfLine": "lf", + "tabWidth": 4, "plugins": ["prettier-plugin-svelte"], - "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] + "overrides": [ + { + "files": "*.svelte", + "options": { + "parser": "svelte" + } + } + ] } diff --git a/README.md b/README.md index ec05a914..dd14ac3f 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ #### Requirements: -- [Node 20](https://nodejs.org/) -- [pnpm](https://pnpm.io/) -- [dvalin-backend](https://github.com/dval-in/dvalin-backend) +- [Node 20](https://nodejs.org/) +- [pnpm](https://pnpm.io/) +- [dvalin-backend](https://github.com/dval-in/dvalin-backend) #### Steps: diff --git a/package.json b/package.json index c2a82e51..635c24ad 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,7 @@ "autoprefixer": "^10.4.16", "eslint": "^8.56.0", "eslint-config-prettier": "^9.1.0", + "eslint-plugin-prettier": "^5.1.3", "eslint-plugin-svelte": "^2.35.1", "husky": "^9.0.11", "postcss": "^8.4.32", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 67b35ffc..af699231 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -115,6 +115,9 @@ devDependencies: eslint-config-prettier: specifier: ^9.1.0 version: 9.1.0(eslint@8.56.0) + eslint-plugin-prettier: + specifier: ^5.1.3 + version: 5.1.3(@types/eslint@8.56.0)(eslint-config-prettier@9.1.0)(eslint@8.56.0)(prettier@3.2.4) eslint-plugin-svelte: specifier: ^2.35.1 version: 2.35.1(eslint@8.56.0)(svelte@4.2.9) @@ -1882,6 +1885,11 @@ packages: requiresBuild: true optional: true + /@pkgr/core@0.1.1: + resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} + engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0} + dev: true + /@polka/url@1.0.0-next.24: resolution: {integrity: sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==} @@ -3441,6 +3449,28 @@ packages: eslint: 8.56.0 dev: true + /eslint-plugin-prettier@5.1.3(@types/eslint@8.56.0)(eslint-config-prettier@9.1.0)(eslint@8.56.0)(prettier@3.2.4): + resolution: {integrity: sha512-C9GCVAs4Eq7ZC/XFQHITLiHJxQngdtraXaM+LoUFoFp/lHNl2Zn8f3WQbe9HvTBBQ9YnKFB0/2Ajdqwo5D1EAw==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + '@types/eslint': '>=8.0.0' + eslint: '>=8.0.0' + eslint-config-prettier: '*' + prettier: '>=3.0.0' + peerDependenciesMeta: + '@types/eslint': + optional: true + eslint-config-prettier: + optional: true + dependencies: + '@types/eslint': 8.56.0 + eslint: 8.56.0 + eslint-config-prettier: 9.1.0(eslint@8.56.0) + prettier: 3.2.4 + prettier-linter-helpers: 1.0.0 + synckit: 0.8.8 + dev: true + /eslint-plugin-svelte@2.35.1(eslint@8.56.0)(svelte@4.2.9): resolution: {integrity: sha512-IF8TpLnROSGy98Z3NrsKXWDSCbNY2ReHDcrYTuXZMbfX7VmESISR78TWgO9zdg4Dht1X8coub5jKwHzP0ExRug==} engines: {node: ^14.17.0 || >=16.0.0} @@ -3602,6 +3632,10 @@ packages: resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==} dev: true + /fast-diff@1.3.0: + resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==} + dev: true + /fast-fifo@1.3.2: resolution: {integrity: sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==} dev: true @@ -5109,6 +5143,13 @@ packages: engines: {node: '>= 0.8.0'} dev: true + /prettier-linter-helpers@1.0.0: + resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==} + engines: {node: '>=6.0.0'} + dependencies: + fast-diff: 1.3.0 + dev: true + /prettier-plugin-svelte@3.1.2(prettier@3.2.4)(svelte@4.2.9): resolution: {integrity: sha512-7xfMZtwgAWHMT0iZc8jN4o65zgbAQ3+O32V6W7pXrqNvKnHnkoyQCGCbKeUyXKZLbYE0YhFRnamfxfkEGxm8qA==} peerDependencies: @@ -6131,6 +6172,14 @@ packages: zod: 3.22.4 dev: false + /synckit@0.8.8: + resolution: {integrity: sha512-HwOKAP7Wc5aRGYdKH+dw0PRRpbO841v2DENBtjnR5HFWoiNByAl7vrx3p0G/rCyYXQsrxqtX48TImFtPcIHSpQ==} + engines: {node: ^14.18.0 || >=16.0.0} + dependencies: + '@pkgr/core': 0.1.1 + tslib: 2.6.2 + dev: true + /tabbable@6.2.0: resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==} dev: false diff --git a/src/lib/components/graphs/PullDistributionByMonth.svelte b/src/lib/components/graphs/PullDistributionByMonth.svelte index 6112480b..dd9a0526 100644 --- a/src/lib/components/graphs/PullDistributionByMonth.svelte +++ b/src/lib/components/graphs/PullDistributionByMonth.svelte @@ -63,7 +63,8 @@ ); }; - const formatDateLabel = (d: string) => formatDate(d, PeriodType.MonthYear, { variant: 'short' }); + const formatDateLabel = (d: string) => + formatDate(d, PeriodType.MonthYear, { variant: 'short' });
@@ -87,7 +88,12 @@ > - + {#each data as seriesData} - + d[0]} @@ -137,7 +149,10 @@
{#each keys as key}
- + {key}: {data.data[key]}
{/each} diff --git a/src/lib/components/layout/DefaultLayout.svelte b/src/lib/components/layout/DefaultLayout.svelte index d9fb0116..0b60d959 100644 --- a/src/lib/components/layout/DefaultLayout.svelte +++ b/src/lib/components/layout/DefaultLayout.svelte @@ -15,7 +15,9 @@ > {title} {#if $$slots.titlebarActions} -
+
{/if} diff --git a/src/lib/components/tables/banner-history-table/BannerHistoryTable.svelte b/src/lib/components/tables/banner-history-table/BannerHistoryTable.svelte index b1ff2eac..761ce20a 100644 --- a/src/lib/components/tables/banner-history-table/BannerHistoryTable.svelte +++ b/src/lib/components/tables/banner-history-table/BannerHistoryTable.svelte @@ -9,16 +9,16 @@ Row as TableRow } from '$lib/components/ui/table'; import { - Root as PaginationRoot, Content as PaginationContent, + Ellipsis as PaginationEllipsis, Item as PaginationItem, + Link as PaginationLink, NextButton as PaginationNextButton, PrevButton as PaginationPrevButton, - Link as PaginationLink, - Ellipsis as PaginationEllipsis + Root as PaginationRoot } from '$lib/components/ui/pagination'; import { readable } from 'svelte/store'; - import { createTable, Subscribe, Render, createRender } from 'svelte-headless-table'; + import { createRender, createTable, Render, Subscribe } from 'svelte-headless-table'; import { mdiAccount, mdiArrowDown, @@ -110,7 +110,9 @@ accessor: 'type', header: 'Type', cell: ({ value }) => { - return createRender(Icon, { path: value === 'Character' ? mdiAccount : mdiSwordCross }); + return createRender(Icon, { + path: value === 'Character' ? mdiAccount : mdiSwordCross + }); }, plugins: { sort: { @@ -120,7 +122,11 @@ fn: includeFilter, initialFilterValue: [], render: ({ filterValue, preFilteredValues }) => - createRender(SelectFilter, { filterValue, title: 'Type', preFilteredValues }) + createRender(SelectFilter, { + filterValue, + title: 'Type', + preFilteredValues + }) }, resize: { initialWidth: 88 @@ -184,7 +190,12 @@ {#each headerRow.cells as cell (cell.id)} - + - import CalendarIcon from 'lucide-svelte/icons/calendar'; import type { DateRange } from 'bits-ui'; - import { - CalendarDate, - DateFormatter, - getLocalTimeZone, - type DateValue - } from '@internationalized/date'; + import { DateFormatter, getLocalTimeZone } from '@internationalized/date'; import { cn } from '$lib/utils'; import { Button } from '$lib/components/ui/button'; import { RangeCalendar } from '$lib/components/ui/range-calendar'; - import * as Popover from '$lib/components/ui/popover'; const df = new DateFormatter('en-US', { dateStyle: 'medium' @@ -25,7 +18,10 @@