diff --git a/.vscode/extensions.json b/.vscode/extensions.json
new file mode 100644
index 00000000..067a3bbc
--- /dev/null
+++ b/.vscode/extensions.json
@@ -0,0 +1,20 @@
+{
+ "recommendations": [
+ "vdanchenkov.tailwind-class-sorter",
+ "bradlc.vscode-tailwindcss",
+ "formulahendry.auto-close-tag",
+ "formulahendry.auto-rename-tag",
+ "oven.bun-vscode",
+ "streetsidesoftware.code-spell-checker",
+ "dbaeumer.vscode-eslint",
+ "mquandalle.graphql",
+ "ymotongpoo.licenser",
+ "yoavbls.pretty-ts-errors",
+ "esbenp.prettier-vscode",
+ "rvest.vs-code-prettier-eslint",
+ "fivethree.vscode-svelte-snippets",
+ "svelte.svelte-vscode",
+ "ardenivanov.svelte-intellisense",
+ "stivo.tailwind-fold"
+ ]
+}
diff --git a/bun.lockb b/bun.lockb
index 8a489eff..0b7effaf 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/package.json b/package.json
index 71a6c7a0..1249f8f2 100644
--- a/package.json
+++ b/package.json
@@ -13,51 +13,47 @@
"generate": "graphql-codegen"
},
"devDependencies": {
- "@sveltejs/adapter-auto": "^3.0.0",
- "@sveltejs/kit": "^2.0.0",
- "@typescript-eslint/eslint-plugin": "^6.0.0",
- "@typescript-eslint/parser": "^6.0.0",
- "@sveltejs/vite-plugin-svelte": "^3.0.0",
- "eslint": "^8.28.0",
+ "@skeletonlabs/skeleton": "^2.7.1",
+ "@skeletonlabs/tw-plugin": "^0.3.1",
+ "@sveltejs/kit": "^2.5.0",
+ "@sveltejs/vite-plugin-svelte": "^3.0.1",
+ "@tailwindcss/forms": "^0.5.7",
+ "@tailwindcss/typography": "0.5.10",
+ "@types/node": "^20.10.7",
+ "@typescript-eslint/eslint-plugin": "^6.19.1",
+ "@typescript-eslint/parser": "^6.19.1",
+ "autoprefixer": "10.4.17",
+ "eslint": "^8.56.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-svelte": "^2.35.1",
+ "postcss": "8.4.33",
"prettier": "^2.8.0",
"prettier-plugin-svelte": "^2.10.1",
- "svelte": "4.2.8",
- "svelte-check": "^3.6.2",
- "tslib": "^2.4.1",
- "typescript": "^5.0.0",
- "vite": "^5.0.10",
- "postcss": "8.4.31",
- "autoprefixer": "10.4.16",
- "tailwindcss": "^3.3.6",
- "@skeletonlabs/skeleton": "^2.6.0",
- "@skeletonlabs/tw-plugin": "^0.3.0",
- "vite-plugin-tailwind-purgecss": "^0.2.0",
- "@tailwindcss/typography": "0.5.10",
- "@tailwindcss/forms": "^0.5.7",
- "@types/node": "^20.10.4"
+ "svelte": "4.2.9",
+ "svelte-check": "^3.6.3",
+ "tailwindcss": "^3.4.1",
+ "typescript": "^5.3.3",
+ "vite": "^5.0.12",
+ "vite-plugin-tailwind-purgecss": "^0.2.0"
},
"type": "module",
"dependencies": {
- "@apollo/client": "^3.8.8",
- "@floating-ui/dom": "^1.5.3",
+ "@apollo/client": "^3.8.10",
+ "@floating-ui/dom": "^1.6.0",
"@graphql-codegen/cli": "^5.0.0",
"@graphql-codegen/typescript": "^4.0.1",
"@graphql-codegen/typescript-operations": "^4.0.1",
"@iconify/svelte": "^3.1.6",
"@iconify/types": "^2.0.0",
- "@sveltejs/adapter-static": "^3.0.0",
- "@types/apollo-upload-client": "17",
+ "@sveltejs/adapter-static": "^3.0.1",
+ "@types/apollo-upload-client": "18.0.0",
"@types/dom-view-transitions": "^1.0.4",
- "@types/sanitize-html": "^2.9.5",
- "apollo-upload-client": "^17.0.0",
+ "apollo-upload-client": "^18.0.1",
"devalue": "^4.3.2",
"graphql": "^16.8.1",
"graphql-codegen-svelte-apollo": "^1.1.0",
- "graphql-ws": "^5.14.2",
+ "graphql-ws": "^5.14.3",
"p-queue": "^8.0.1",
- "sanitize-html": "^2.11.0",
- "sveltekit-search-params": "^1.1.0"
+ "sveltekit-search-params": "^2.1.0"
}
}
diff --git a/src/app.html b/src/app.html
index 67202216..d1cb8839 100644
--- a/src/app.html
+++ b/src/app.html
@@ -13,6 +13,8 @@
+
+
diff --git a/src/lib/apollo.ts b/src/lib/apollo.ts
index 775af387..f70de789 100644
--- a/src/lib/apollo.ts
+++ b/src/lib/apollo.ts
@@ -5,10 +5,10 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
import { ApolloClient, InMemoryCache, split, type ApolloLink } from '@apollo/client/core';
-import { createUploadLink } from 'apollo-upload-client';
import { GraphQLWsLink } from '@apollo/client/link/subscriptions';
import { createClient } from 'graphql-ws';
import { getMainDefinition } from '@apollo/client/utilities';
+import createUploadLink from 'apollo-upload-client/createUploadLink.mjs';
let splitLink: ApolloLink = createUploadLink({ uri: '/api/graphql' }) as unknown as ApolloLink;
diff --git a/src/routes/(app)/(library)/+page.svelte b/src/routes/(app)/(library)/+page.svelte
index 8b4383af..8d8c7b04 100644
--- a/src/routes/(app)/(library)/+page.svelte
+++ b/src/routes/(app)/(library)/+page.svelte
@@ -18,7 +18,6 @@
import { selected, selectMode } from './LibraryStores';
import { onMount } from 'svelte';
import { AppBarData } from '$lib/MountTitleAction';
- import { goto } from '$app/navigation';
import { gridValues, HelpDoSelect, HelpSelectAll } from '$lib/util';
import IconWrapper from '$lib/components/IconWrapper.svelte';
@@ -202,14 +201,12 @@
use:longPress
on:longPress={() => $selectMode || LongHandler()}
href="/manga/{manga.id}"
- on:click|stopPropagation={(e) => {
+ on:click={(e) => {
if (e.ctrlKey) return;
if ($selectMode) {
+ e.stopPropagation();
e.preventDefault();
lastSelected = HelpDoSelect(manga, e, lastSelected, sortedMangas, selected);
- } else {
- e.preventDefault();
- goto(`/manga/${manga.id}`);
}
}}
class="hover:opacity-70 cursor-pointer h-full"
diff --git a/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte b/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte
index 897325af..7c84e92c 100644
--- a/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte
+++ b/src/routes/(app)/manga/[MangaID]/(manga)/chaptersSide.svelte
@@ -7,7 +7,6 @@
-->