@tanstack/solid-query-persist-client 5.94.5 → 6.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query-persist-client",
-  "version": "5.94.5",
+  "version": "6.0.0-alpha.1",
   "description": "Solid.js bindings to work with persisters in TanStack/solid-query",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -46,20 +46,24 @@
     "!src/__tests__"
   ],
   "dependencies": {
-    "@tanstack/query-persist-client-core": "5.94.5"
+    "@tanstack/query-persist-client-core": "5.92.4"
   },
   "devDependencies": {
+    "@babel/core": "^7.28.0",
+    "@babel/preset-typescript": "^7.18.6",
     "@solidjs/testing-library": "^0.8.10",
+    "@solidjs/web": "2.0.0-beta.4",
+    "babel-preset-solid": "2.0.0-beta.4",
     "npm-run-all2": "^5.0.0",
-    "solid-js": "^1.9.7",
+    "solid-js": "2.0.0-beta.4",
     "tsup-preset-solid": "^2.2.0",
-    "vite-plugin-solid": "^2.11.6",
+    "vite-plugin-solid": "3.0.0-next.2",
     "@tanstack/query-test-utils": "0.0.0",
-    "@tanstack/solid-query": "5.94.5"
+    "@tanstack/solid-query": "6.0.0-alpha.1"
   },
   "peerDependencies": {
-    "solid-js": "^1.6.0",
-    "@tanstack/solid-query": "^5.94.5"
+    "solid-js": ">=2.0.0-beta.0 <3.0.0",
+    "@tanstack/solid-query": "^6.0.0-alpha.1"
   },
   "scripts": {
     "clean": "premove ./build ./coverage ./dist-ts",

package/src/PersistQueryClientProvider.tsx

@@ -3,7 +3,7 @@ import {
   persistQueryClientSubscribe,
 } from '@tanstack/query-persist-client-core'
 import { createEffect, createMemo, createSignal, onCleanup } from 'solid-js'
-import { IsRestoringProvider, QueryClientProvider } from '@tanstack/solid-query'
+import { IsRestoringContext, QueryClientProvider } from '@tanstack/solid-query'
 import type { PersistQueryClientOptions } from '@tanstack/query-persist-client-core'
 import type { OmitKeyof, QueryClientProviderProps } from '@tanstack/solid-query'
 import type { JSX } from 'solid-js'
@@ -18,35 +18,45 @@ export const PersistQueryClientProvider = (
   props: PersistQueryClientProviderProps,
 ): JSX.Element => {
   const [isRestoring, setIsRestoring] = createSignal(true)
+  let didRestore = false
 
   const options = createMemo(() => ({
     ...props.persistOptions,
     queryClient: props.client,
   }))
 
-  createEffect(() => {
-    setIsRestoring(true)
-    persistQueryClientRestore(options())
-      .then(() => props.onSuccess?.())
-      .catch(() => props.onError?.())
-      .finally(() => {
-        setIsRestoring(false)
-      })
-  })
+  createEffect(
+    () => {
+      const opts = options()
+      if (!didRestore) {
+        didRestore = true
+        persistQueryClientRestore(opts)
+          .then(() => props.onSuccess?.())
+          .catch(() => props.onError?.())
+          .finally(() => {
+            setIsRestoring(false)
+          })
+      }
+    },
+    () => {},
+  )
 
-  createEffect(() => {
-    let unsubscribe = () => {}
-    if (!isRestoring()) {
-      unsubscribe = persistQueryClientSubscribe(options())
-    }
-    onCleanup(() => unsubscribe())
-  })
+  createEffect(
+    () => {
+      let unsubscribe = () => {}
+      if (!isRestoring()) {
+        unsubscribe = persistQueryClientSubscribe(options())
+      }
+      onCleanup(() => unsubscribe())
+    },
+    () => {},
+  )
 
   return (
     <QueryClientProvider client={props.client}>
-      <IsRestoringProvider value={isRestoring}>
+      <IsRestoringContext value={isRestoring}>
         {props.children}
-      </IsRestoringProvider>
+      </IsRestoringContext>
     </QueryClientProvider>
   )
 }