@tanstack/solid-query 5.30.2 → 5.30.3

package/build/dev.cjs

@@ -173,10 +173,12 @@ function createBaseQuery(options, Observer, queryClient) {
     ];
   }
   let unsubscribe = null;
+  let resolver = null;
   const [queryResource, { refetch }] = solidJs.createResource(
     () => {
       const obs = observer();
       return new Promise((resolve, reject) => {
+        resolver = resolve;
         if (web.isServer) {
           unsubscribe = createServerSubscriber(resolve, reject);
         } else if (!unsubscribe && !isRestoring()) {
@@ -192,6 +194,7 @@ function createBaseQuery(options, Observer, queryClient) {
         }
         if (!observerResult.isLoading) {
           const query = obs.getCurrentQuery();
+          resolver = null;
           return resolve(hydratableObserverResult(query, observerResult));
         }
         setStateWithReconciliation(observerResult);
@@ -270,6 +273,10 @@ function createBaseQuery(options, Observer, queryClient) {
       unsubscribe();
       unsubscribe = null;
     }
+    if (resolver && !web.isServer) {
+      resolver(observerResult);
+      resolver = null;
+    }
   });
   solidJs.createComputed(
     solidJs.on(

package/build/dev.js

@@ -172,10 +172,12 @@ function createBaseQuery(options, Observer, queryClient) {
     ];
   }
   let unsubscribe = null;
+  let resolver = null;
   const [queryResource, { refetch }] = createResource(
     () => {
       const obs = observer();
       return new Promise((resolve, reject) => {
+        resolver = resolve;
         if (isServer) {
           unsubscribe = createServerSubscriber(resolve, reject);
         } else if (!unsubscribe && !isRestoring()) {
@@ -191,6 +193,7 @@ function createBaseQuery(options, Observer, queryClient) {
         }
         if (!observerResult.isLoading) {
           const query = obs.getCurrentQuery();
+          resolver = null;
           return resolve(hydratableObserverResult(query, observerResult));
         }
         setStateWithReconciliation(observerResult);
@@ -269,6 +272,10 @@ function createBaseQuery(options, Observer, queryClient) {
       unsubscribe();
       unsubscribe = null;
     }
+    if (resolver && !isServer) {
+      resolver(observerResult);
+      resolver = null;
+    }
   });
   createComputed(
     on(

package/build/index.cjs

@@ -164,10 +164,12 @@ function createBaseQuery(options, Observer, queryClient) {
     ];
   }
   let unsubscribe = null;
+  let resolver = null;
   const [queryResource, { refetch }] = solidJs.createResource(
     () => {
       const obs = observer();
       return new Promise((resolve, reject) => {
+        resolver = resolve;
         if (web.isServer) {
           unsubscribe = createServerSubscriber(resolve, reject);
         } else if (!unsubscribe && !isRestoring()) {
@@ -183,6 +185,7 @@ function createBaseQuery(options, Observer, queryClient) {
         }
         if (!observerResult.isLoading) {
           const query = obs.getCurrentQuery();
+          resolver = null;
           return resolve(hydratableObserverResult(query, observerResult));
         }
         setStateWithReconciliation(observerResult);
@@ -261,6 +264,10 @@ function createBaseQuery(options, Observer, queryClient) {
       unsubscribe();
       unsubscribe = null;
     }
+    if (resolver && !web.isServer) {
+      resolver(observerResult);
+      resolver = null;
+    }
   });
   solidJs.createComputed(
     solidJs.on(

package/build/index.js

@@ -163,10 +163,12 @@ function createBaseQuery(options, Observer, queryClient) {
     ];
   }
   let unsubscribe = null;
+  let resolver = null;
   const [queryResource, { refetch }] = createResource(
     () => {
       const obs = observer();
       return new Promise((resolve, reject) => {
+        resolver = resolve;
         if (isServer) {
           unsubscribe = createServerSubscriber(resolve, reject);
         } else if (!unsubscribe && !isRestoring()) {
@@ -182,6 +184,7 @@ function createBaseQuery(options, Observer, queryClient) {
         }
         if (!observerResult.isLoading) {
           const query = obs.getCurrentQuery();
+          resolver = null;
           return resolve(hydratableObserverResult(query, observerResult));
         }
         setStateWithReconciliation(observerResult);
@@ -260,6 +263,10 @@ function createBaseQuery(options, Observer, queryClient) {
       unsubscribe();
       unsubscribe = null;
     }
+    if (resolver && !isServer) {
+      resolver(observerResult);
+      resolver = null;
+    }
   });
   createComputed(
     on(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.30.2",
+  "version": "5.30.3",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",

package/src/createBaseQuery.ts

@@ -236,10 +236,19 @@ export function createBaseQuery<
    */
   let unsubscribe: (() => void) | null = null
 
+  /*
+    Fixes #7275
+    In a few cases, the observer could unmount before the resource is loaded.
+    This leads to Suspense boundaries to be suspended indefinitely.
+    This resolver will be called when the observer is unmounting 
+    but the resource is still in a loading state
+  */
+  let resolver: ((value: ResourceData) => void) | null = null
   const [queryResource, { refetch }] = createResource<ResourceData | undefined>(
     () => {
       const obs = observer()
       return new Promise((resolve, reject) => {
+        resolver = resolve
         if (isServer) {
           unsubscribe = createServerSubscriber(resolve, reject)
         } else if (!unsubscribe && !isRestoring()) {
@@ -261,6 +270,7 @@ export function createBaseQuery<
         }
         if (!observerResult.isLoading) {
           const query = obs.getCurrentQuery()
+          resolver = null
           return resolve(hydratableObserverResult(query, observerResult))
         }
 
@@ -354,6 +364,10 @@ export function createBaseQuery<
       unsubscribe()
       unsubscribe = null
     }
+    if (resolver && !isServer) {
+      resolver(observerResult)
+      resolver = null
+    }
   })
 
   createComputed(