Merge remote-tracking branch 'refs/remotes/origin/refactor/isServer' …

…into refactor/isServer
TanStack · Jun 8, 2024 · a4c94cf · a4c94cf
2 parents 900d289 + 6301a13
commit a4c94cf
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 28 deletions.
diff --git a/examples/solid/astro/package.json b/examples/solid/astro/package.json
@@ -15,8 +15,8 @@
     "@astrojs/tailwind": "^5.1.0",
     "@astrojs/vercel": "^7.6.0",
     "@astrojs/node": "^8.2.5",
-    "@tanstack/solid-query": "^5.40.1",
-    "@tanstack/solid-query-devtools": "^5.40.1",
+    "@tanstack/solid-query": "^5.40.2",
+    "@tanstack/solid-query-devtools": "^5.40.2",
     "astro": "^4.8.6",
     "solid-js": "^1.8.17",
     "tailwindcss": "^3.4.3",

diff --git a/examples/solid/basic-graphql-request/package.json b/examples/solid/basic-graphql-request/package.json
@@ -9,8 +9,8 @@
     "test:types": "tsc"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.40.1",
-    "@tanstack/solid-query-devtools": "^5.40.1",
+    "@tanstack/solid-query": "^5.40.2",
+    "@tanstack/solid-query-devtools": "^5.40.2",
     "graphql": "^16.8.1",
     "graphql-request": "^7.0.1",
     "solid-js": "^1.8.17"

diff --git a/examples/solid/basic-typescript/package.json b/examples/solid/basic-typescript/package.json
@@ -9,8 +9,8 @@
     "test:types": "tsc"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.40.1",
-    "@tanstack/solid-query-devtools": "^5.40.1",
+    "@tanstack/solid-query": "^5.40.2",
+    "@tanstack/solid-query-devtools": "^5.40.2",
     "solid-js": "^1.8.17"
   },
   "devDependencies": {

diff --git a/examples/solid/default-query-function/package.json b/examples/solid/default-query-function/package.json
@@ -9,8 +9,8 @@
     "test:types": "tsc"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.40.1",
-    "@tanstack/solid-query-devtools": "^5.40.1",
+    "@tanstack/solid-query": "^5.40.2",
+    "@tanstack/solid-query-devtools": "^5.40.2",
     "solid-js": "^1.8.17"
   },
   "devDependencies": {

diff --git a/examples/solid/simple/package.json b/examples/solid/simple/package.json
@@ -9,8 +9,8 @@
     "test:types": "tsc"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^5.40.1",
-    "@tanstack/solid-query-devtools": "^5.40.1",
+    "@tanstack/solid-query": "^5.40.2",
+    "@tanstack/solid-query-devtools": "^5.40.2",
     "solid-js": "^1.8.17"
   },
   "devDependencies": {

diff --git a/examples/solid/solid-start-streaming/package.json b/examples/solid/solid-start-streaming/package.json
@@ -11,8 +11,8 @@
     "@solidjs/meta": "^0.29.4",
     "@solidjs/router": "^0.13.3",
     "@solidjs/start": "^1.0.0-rc.1",
-    "@tanstack/solid-query": "^5.40.1",
-    "@tanstack/solid-query-devtools": "^5.40.1",
+    "@tanstack/solid-query": "^5.40.2",
+    "@tanstack/solid-query-devtools": "^5.40.2",
     "solid-js": "^1.8.17",
     "vinxi": "^0.3.10"
   },

diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query-devtools",
-  "version": "5.40.1",
+  "version": "5.40.2",
   "description": "Developer tools to interact with and visualize the TanStack/solid-query Query cache",
   "author": "tannerlinsley",
   "license": "MIT",

diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query-persist-client",
-  "version": "5.40.1",
+  "version": "5.40.2",
   "description": "Solid.js bindings to work with persisters in TanStack/solid-query",
   "author": "tannerlinsley",
   "license": "MIT",

diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "5.40.1",
+  "version": "5.40.2",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",

diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts
@@ -208,7 +208,7 @@ export function createBaseQuery<
         }
         // Hydration data exists on first load after SSR,
         // and should be removed from the observer result
-        if (v.hydrationData) {
+        if (v?.hydrationData) {
           const { hydrationData, ...rest } = v
           v = rest
         }

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml