Merge pull request #233 from Suwayomi/main

lint
Suwayomi · Oct 24, 2024 · 2b223dd · 2b223dd
2 parents 8068534 + aeb321a
commit 2b223dd
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 65 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
       - name: Use bun latest
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: latest
+          bun-version: 1.1.0
       - name: Install bun dependencies
         run: bun i
       - run: bun run build

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Use bun latest
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: latest
+          bun-version: 1.1.0
       - name: Install bun dependencies
         run: bun i
       - name: Run check
@@ -37,7 +37,7 @@ jobs:
       - name: Use bun latest
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: latest
+          bun-version: 1.1.0
       - name: Install bun dependencies
         run: bun i
       - name: Run build

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Use bun latest
         uses: oven-sh/setup-bun@v1
         with:
-          bun-version: latest
+          bun-version: 1.1.0
       - name: Install bun dependencies
         run: bun i
       - name: Run linters

diff --git a/src/app.html b/src/app.html
@@ -29,8 +29,6 @@
 		%sveltekit.head%
 	</head>
 	<body data-sveltekit-preload-data="hover" data-theme="skeleton">
-		<div style="display: contents">
-		%sveltekit.body%
-		</div>
+		<div style="display: contents">%sveltekit.body%</div>
 	</body>
 </html>
diff --git a/src/lib/components/Slide.svelte b/src/lib/components/Slide.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import IconWrapper from './IconWrapper.svelte';
 
 	// Types

diff --git a/src/lib/components/TriStateSlide.svelte b/src/lib/components/TriStateSlide.svelte
@@ -7,27 +7,12 @@
 -->
 
 <script lang="ts">
-	import { run, createBubbler } from 'svelte/legacy';
-
-	const bubble = createBubbler();
 	import IconWrapper from './IconWrapper.svelte';
-	import { createEventDispatcher } from 'svelte';
 
 	// Types
 	import type { CssClasses, SvelteEvent } from '@skeletonlabs/skeleton';
 	import type { TriState } from '$lib/util';
 
-	// Event Dispatcher
-	type SlideToggleEvent = {
-		keyup: SvelteEvent<KeyboardEvent, HTMLDivElement>;
-		changeE: boolean;
-	};
-	const dispatch = createEventDispatcher<SlideToggleEvent>();
-
-	// Props
-
-	// Props (a11y)
-
 	// Base Styles
 	const cBase = 'inline-block';
 	const cLabel = 'unstyled flex items-center';
@@ -52,7 +37,7 @@
 		if (['Enter', 'Space'].includes(event.code)) {
 			event.preventDefault();
 			/** @event {{ event }} keyup Fires when the component is focused and key is pressed. */
-			dispatch('keyup', event);
+			onkeyup(event);
 			const inputElem = event.currentTarget.firstChild as HTMLLabelElement;
 			inputElem.click();
 		}
@@ -99,6 +84,7 @@
 		state?: TriState;
 		children?: import('svelte').Snippet;
 		onchange?: (e: boolean) => void;
+		onkeyup?: (e: SvelteEvent<KeyboardEvent, HTMLDivElement>) => void;
 		[key: string]: unknown;
 	}
 
@@ -116,6 +102,7 @@
 		label = '',
 		state: Lstate = $bindable(checked === null ? 0 : checked ? 1 : 2),
 		onchange = () => {},
+		onkeyup = () => {},
 		children,
 		...rest
 	}: Props = $props();
@@ -197,13 +184,6 @@
 			bind:checked
 			{name}
 			onclick={handelClick}
-			onkeydown={bubble('keydown')}
-			onkeyup={bubble('keyup')}
-			onkeypress={bubble('keypress')}
-			onmouseover={bubble('mouseover')}
-			onchange={bubble('change')}
-			onfocus={bubble('focus')}
-			onblur={bubble('blur')}
 			{...prunedRestProps()}
 			disabled={rest.disabled as boolean | undefined | null}
 		/>

diff --git a/src/routes/(app)/(library)/+page.svelte b/src/routes/(app)/(library)/+page.svelte
@@ -214,7 +214,7 @@
 	let orderedCategories = $derived(
 		($categories.data?.categories?.nodes ?? [])
 			.filter((e) => e.mangas.totalCount)
-			.toSorted((a, b) => {
+			.sort((a, b) => {
 				return a.order > b.order ? 1 : -1;
 			})
 	);

diff --git a/src/routes/(app)/browse/globalSearch.svelte b/src/routes/(app)/browse/globalSearch.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import GlobalSearchActions from './globalsearch/GlobalSearchActions.svelte';
 	import PQueue from 'p-queue';
 	import { queryParam, ssp } from 'sveltekit-search-params';

diff --git a/src/routes/(app)/browse/migrate/source/[SourceID]/+page.svelte b/src/routes/(app)/browse/migrate/source/[SourceID]/+page.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import { AppBarData } from '$lib/MountTitleAction';
 	import IntersectionObserver from '$lib/components/IntersectionObserver.svelte';
 	import MangaCard from '$lib/components/MangaCard.svelte';

diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/CheckBoxFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/CheckBoxFilter.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import Slide from '$lib/components/Slide.svelte';
 	import type { fetchSourceManga } from '$lib/gql/Mutations';
 	import type { getSource } from '$lib/gql/Queries';

diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/SelectFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/SelectFilter.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import type { fetchSourceManga } from '$lib/gql/Mutations';
 	import type { getSource } from '$lib/gql/Queries';
 	import type { ResultOf, VariablesOf } from '$lib/gql/graphql';

diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/SortFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/SortFilter.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import Slide from '$lib/components/Slide.svelte';
 	import { AccordionItem } from '@skeletonlabs/skeleton';
 

diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/TextFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/TextFilter.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import type { fetchSourceManga } from '$lib/gql/Mutations';
 	import type { getSource } from '$lib/gql/Queries';
 	import type { ResultOf, VariablesOf } from '$lib/gql/graphql';

diff --git a/src/routes/(app)/browse/source/[sourceID]/filter/filters/TriStateFilter.svelte b/src/routes/(app)/browse/source/[sourceID]/filter/filters/TriStateFilter.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import TriStateSlide from '$lib/components/TriStateSlide.svelte';
 	import type { TriState } from '$lib/util';
 	import type { getSource } from '$lib/gql/Queries';

diff --git a/src/routes/(app)/history/+page.svelte b/src/routes/(app)/history/+page.svelte
@@ -10,7 +10,6 @@
 	import { AppBarData } from '$lib/MountTitleAction';
 	import { getContextClient, queryStore } from '@urql/svelte';
 	import { History } from '$lib/gql/Queries';
-	import { writable } from 'svelte/store';
 	import type { ResultOf } from '$lib/gql/graphql';
 	import { formatDate, gridValues } from '$lib/util';
 	import MangaCard from '$lib/components/MangaCard.svelte';

diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/+page.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/+page.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import { AppBarData } from '$lib/MountTitleAction';
 	import { ErrorHelpUntyped } from '$lib/util';
 	import type { PageData } from './$types';

diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/TrackingModal.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/TrackingModal.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import Image from '$lib/components/Image.svelte';
 	import { TrackRecordTypeFragment } from '$lib/gql/Fragments';
 	import {

diff --git a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/[email protected] b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/[email protected]
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import IconButton from '$lib/components/IconButton.svelte';
 	import { getDrawerStore, AppShell } from '@skeletonlabs/skeleton';
 	import type { LayoutData } from './$types';

diff --git a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+page.svelte b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/+page.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import { goto } from '$app/navigation';
 	import { page } from '$app/stores';
 	import { AppBarData } from '$lib/MountTitleAction';

diff --git a/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/chapterDrawer.svelte b/src/routes/(app)/manga/[MangaID]/chapter/[ChapterID]/chapterDrawer.svelte
@@ -81,10 +81,10 @@
 		const _ = [mangaMeta, $manga];
 		const tmp = untrack(() => {
 			return $manga.data?.manga.chapters.nodes
-				.toSorted((a, b) => {
+				.filter(filterChapters(mangaMeta, true))
+				.sort((a, b) => {
 					return b.sourceOrder - a.sourceOrder;
-				})
-				.filter(filterChapters(mangaMeta, true));
+				});
 		});
 		untrack(() => {
 			manga.resume();

diff --git a/src/routes/(app)/settings/BackupModal.svelte b/src/routes/(app)/settings/BackupModal.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import { ErrorHelp } from '$lib/util';
 	import {
 		FileDropzone,

diff --git a/src/routes/(app)/updates/+page.svelte b/src/routes/(app)/updates/+page.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import UpdatesActions from './UpdatesActions.svelte';
 	import { AppBarData } from '$lib/MountTitleAction';
 	import { writable } from 'svelte/store';

diff --git a/src/routes/QuickSearchModal.svelte b/src/routes/QuickSearchModal.svelte
@@ -7,8 +7,6 @@
 -->
 
 <script lang="ts">
-	import { run } from 'svelte/legacy';
-
 	import Image from '../lib/components/Image.svelte';
 	import { getModalStore } from '@skeletonlabs/skeleton';
 	import IconWrapper from '../lib/components/IconWrapper.svelte';