From baa88af782b5c063ccdb0b2171e200d68c686a86 Mon Sep 17 00:00:00 2001 From: o-az Date: Wed, 11 Sep 2024 12:59:57 -0700 Subject: [PATCH] chore: replace persisted provider with default one --- app/app.nix | 2 +- app/package-lock.json | 46 ----------------------------------- app/package.json | 2 -- app/src/lib/query-client.ts | 17 +++++-------- app/src/routes/+layout.svelte | 11 +++------ 5 files changed, 10 insertions(+), 68 deletions(-) diff --git a/app/app.nix b/app/app.nix index 81d4272c93..79055ff3a6 100644 --- a/app/app.nix +++ b/app/app.nix @@ -9,7 +9,7 @@ { packages = { app = unstablePkgs.buildNpmPackage { - npmDepsHash = "sha256-5wMINt346EVAAPt32eRsFvF7m6rH6taeE55Z9tEme1A="; + npmDepsHash = "sha256-/K7Qkq4pjeyrFETev1xIaGK0x2A1k+YZDR0na/32FOo="; src = ./.; sourceRoot = "app"; npmFlags = [ "--legacy-peer-deps" "--ignore-scripts" ]; diff --git a/app/package-lock.json b/app/package-lock.json index afff585f1e..52fc82f1d4 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -14,9 +14,7 @@ "@sentry/sveltekit": "^8.29.0", "@tanstack/match-sorter-utils": "^8.19.4", "@tanstack/query-core": "^5.55.4", - "@tanstack/query-sync-storage-persister": "^5.55.4", "@tanstack/svelte-query": "^5.55.4", - "@tanstack/svelte-query-persist-client": "^5.55.4", "@tanstack/svelte-table": "^8.20.5", "@tanstack/svelte-virtual": "^3.10.7", "@unionlabs/client": "^0.0.18", @@ -4084,33 +4082,6 @@ "url": "https://github.com/sponsors/tannerlinsley" } }, - "node_modules/@tanstack/query-persist-client-core": { - "version": "5.55.4", - "resolved": "https://registry.npmjs.org/@tanstack/query-persist-client-core/-/query-persist-client-core-5.55.4.tgz", - "integrity": "sha512-ebdslxxgS+F9Fq0MVrCAk8f126ynX/3HW5UxmFe6YvrwU/TQ6pSsdtkp+Lt6/9llj6H6bKonRfloVN6i4BAnoA==", - "license": "MIT", - "dependencies": { - "@tanstack/query-core": "5.55.4" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - } - }, - "node_modules/@tanstack/query-sync-storage-persister": { - "version": "5.55.4", - "resolved": "https://registry.npmjs.org/@tanstack/query-sync-storage-persister/-/query-sync-storage-persister-5.55.4.tgz", - "integrity": "sha512-gV4sp6T7jBctOFGv4Ebcqslqqmg137CeSOI3g+xfirrgXa71Os44EwGYGaSWH17GRYOPB9RH0vZsm3XtYbpDsw==", - "license": "MIT", - "dependencies": { - "@tanstack/query-core": "5.55.4", - "@tanstack/query-persist-client-core": "5.55.4" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - } - }, "node_modules/@tanstack/svelte-query": { "version": "5.55.4", "resolved": "https://registry.npmjs.org/@tanstack/svelte-query/-/svelte-query-5.55.4.tgz", @@ -4146,23 +4117,6 @@ "svelte": "^3.54.0 || ^4.0.0 || ^5.0.0-next.0" } }, - "node_modules/@tanstack/svelte-query-persist-client": { - "version": "5.55.4", - "resolved": "https://registry.npmjs.org/@tanstack/svelte-query-persist-client/-/svelte-query-persist-client-5.55.4.tgz", - "integrity": "sha512-mfhmNDig/q6Svv/7OoCbS7kzVKEOR+3KXEYTCOdSJ2QzZemrNMEJ5Go+QgbyZp78hqnFB987csy/XCoN4PbE0g==", - "license": "MIT", - "dependencies": { - "@tanstack/query-persist-client-core": "5.55.4" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "peerDependencies": { - "@tanstack/svelte-query": "^5.55.4", - "svelte": "^3.54.0 || ^4.0.0 || ^5.0.0-next.0" - } - }, "node_modules/@tanstack/svelte-table": { "version": "8.20.5", "resolved": "https://registry.npmjs.org/@tanstack/svelte-table/-/svelte-table-8.20.5.tgz", diff --git a/app/package.json b/app/package.json index 7d03ad3f83..ac52bd215a 100644 --- a/app/package.json +++ b/app/package.json @@ -20,9 +20,7 @@ "@sentry/sveltekit": "^8.29.0", "@tanstack/match-sorter-utils": "^8.19.4", "@tanstack/query-core": "^5.55.4", - "@tanstack/query-sync-storage-persister": "^5.55.4", "@tanstack/svelte-query": "^5.55.4", - "@tanstack/svelte-query-persist-client": "^5.55.4", "@tanstack/svelte-table": "^8.20.5", "@tanstack/svelte-virtual": "^3.10.7", "@unionlabs/client": "^0.0.18", diff --git a/app/src/lib/query-client.ts b/app/src/lib/query-client.ts index 856e00de96..d150971a3d 100644 --- a/app/src/lib/query-client.ts +++ b/app/src/lib/query-client.ts @@ -1,15 +1,17 @@ import { toast } from "svelte-sonner" import { browser } from "$app/environment" -import { PersistQueryClientProvider } from "@tanstack/svelte-query-persist-client" -import { createSyncStoragePersister } from "@tanstack/query-sync-storage-persister" import { MutationCache, QueryCache, QueryClient, QueryClientProvider } from "@tanstack/svelte-query" +const SECOND = 1_000 +const MINUTE = 60 * SECOND +const HOUR = 60 * MINUTE + export function createQueryClient() { const queryClient: QueryClient = new QueryClient({ defaultOptions: { queries: { enabled: browser, - gcTime: 1000 * 60 * 60 * 24, + gcTime: HOUR * 1, // 1 hour refetchOnReconnect: () => !queryClient.isMutating() } }, @@ -34,15 +36,8 @@ export function createQueryClient() { }) }) - const localStoragePersister = createSyncStoragePersister({ - key: "SVELTE_QUERY", - storage: typeof window !== "undefined" ? window.localStorage : undefined // Use local storage if in browser - }) - return { queryClient, - QueryClientProvider, - localStoragePersister, - PersistQueryClientProvider + QueryClientProvider } } diff --git a/app/src/routes/+layout.svelte b/app/src/routes/+layout.svelte index a6f98e1591..409d40a4da 100644 --- a/app/src/routes/+layout.svelte +++ b/app/src/routes/+layout.svelte @@ -19,7 +19,7 @@ import { SvelteQueryDevtools } from "@tanstack/svelte-query-devtools" import { checkWebGLSupport, deviceWidth } from "$lib/utilities/device.ts" import { disablePinchToZoom } from "$lib/utilities/disable-pinch-to-zoom.ts" -const { queryClient, localStoragePersister, PersistQueryClientProvider } = createQueryClient() +const { queryClient, QueryClientProvider } = createQueryClient() if (browser) notifyManager.setScheduler(window.requestAnimationFrame) onMount(() => { @@ -56,10 +56,7 @@ $: updateTheme({ path: $page.url.pathname, activeTheme: "dark" }) - + @@ -76,9 +73,7 @@ $: updateTheme({ path: $page.url.pathname, activeTheme: "dark" }) buttonPosition="bottom-right" /> - - - +