Merge branch 'main' into implement-simplified-imperitive-methods

Author: DogPawHat

docs/framework/react/guides/paginated-queries.md

@@ -10,7 +10,7 @@ Rendering paginated data is a very common UI pattern and in TanStack Query, it "
 ```tsx
 const result = useQuery({
   queryKey: ['projects', page],
-  queryFn: fetchProjects,
+  queryFn: () => fetchProjects(page),
 })
 ```
 

examples/solid/astro/package.json

@@ -15,7 +15,7 @@
     "@astrojs/solid-js": "^5.0.7",
     "@astrojs/tailwind": "^6.0.2",
     "@astrojs/vercel": "^8.1.3",
-    "@tanstack/solid-query": "^5.90.8",
+    "@tanstack/solid-query": "^5.90.9",
     "@tanstack/solid-query-devtools": "^5.90.4",
     "astro": "^5.5.6",
     "solid-js": "^1.9.7",

examples/solid/basic-graphql-request/package.json

@@ -8,7 +8,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.90.8",
+    "@tanstack/solid-query": "^5.90.9",
     "@tanstack/solid-query-devtools": "^5.90.4",
     "graphql": "^16.9.0",
     "graphql-request": "^7.1.2",

examples/solid/basic/package.json

@@ -8,7 +8,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.90.8",
+    "@tanstack/solid-query": "^5.90.9",
     "@tanstack/solid-query-devtools": "^5.90.4",
     "solid-js": "^1.9.7"
   },

examples/solid/default-query-function/package.json

@@ -8,7 +8,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.90.8",
+    "@tanstack/solid-query": "^5.90.9",
     "@tanstack/solid-query-devtools": "^5.90.4",
     "solid-js": "^1.9.7"
   },

examples/solid/simple/package.json

@@ -8,7 +8,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.90.8",
+    "@tanstack/solid-query": "^5.90.9",
     "@tanstack/solid-query-devtools": "^5.90.4",
     "solid-js": "^1.9.7"
   },

examples/solid/solid-start-streaming/package.json

@@ -12,7 +12,7 @@
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.15.3",
     "@solidjs/start": "^1.1.3",
-    "@tanstack/solid-query": "^5.90.8",
+    "@tanstack/solid-query": "^5.90.9",
     "@tanstack/solid-query-devtools": "^5.90.4",
     "solid-js": "^1.9.7",
     "vinxi": "^0.5.3"

packages/solid-query/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @tanstack/solid-query
 
+## 5.90.9
+
+### Patch Changes
+
+- Skip errors if returned data is undefined ([#9841](https://github.com/TanStack/query/pull/9841))
+
 ## 5.90.8
 
 ### Patch Changes

packages/solid-query/package.json

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

packages/solid-query/src/useBaseQuery.ts

@@ -159,7 +159,7 @@ export function useBaseQuery<
         const query = observer().getCurrentQuery()
         const unwrappedResult = hydratableObserverResult(query, result)
 
-        if (unwrappedResult.isError) {
+        if (result.data !== undefined && unwrappedResult.isError) {
           reject(unwrappedResult.error)
           unsubscribeIfQueued()
         } else {