bump minimum solid-js version

TanStack · Mar 9, 2023 · a8beb48 · a8beb48
1 parent 3d008f9
commit a8beb48
Show file tree

Hide file tree

Showing 11 changed files with 665 additions and 392 deletions.
diff --git a/examples/solid/basic-graphql-request/package.json b/examples/solid/basic-graphql-request/package.json
@@ -13,7 +13,7 @@
     "@tanstack/solid-query": "^4.3.9",
     "graphql": "^16.6.0",
     "graphql-request": "^5.0.0",
-    "solid-js": "^1.6.2"
+    "solid-js": "^1.6.13"
   },
   "devDependencies": {
     "typescript": "4.7.4",

diff --git a/examples/solid/basic-typescript/package.json b/examples/solid/basic-typescript/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "dependencies": {
     "@tanstack/solid-query": "^4.3.9",
-    "solid-js": "^1.6.2"
+    "solid-js": "^1.6.13"
   },
   "devDependencies": {
     "typescript": "4.7.4",

diff --git a/examples/solid/default-query-function/package.json b/examples/solid/default-query-function/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "dependencies": {
     "@tanstack/solid-query": "^4.3.9",
-    "solid-js": "^1.6.2"
+    "solid-js": "^1.6.13"
   },
   "devDependencies": {
     "typescript": "4.7.4",

diff --git a/examples/solid/simple/package.json b/examples/solid/simple/package.json
@@ -11,7 +11,7 @@
   "license": "MIT",
   "dependencies": {
     "@tanstack/solid-query": "^4.3.9",
-    "solid-js": "^1.6.2"
+    "solid-js": "^1.6.13"
   },
   "devDependencies": {
     "@tanstack/eslint-plugin-query": "^4.13.0",

diff --git a/examples/solid/solid-start-streaming/package.json b/examples/solid/solid-start-streaming/package.json
@@ -11,15 +11,15 @@
     "esbuild": "^0.14.54",
     "postcss": "^8.4.18",
     "solid-start-node": "^0.2.0",
-    "typescript": "^4.8.4",
-    "vite": "^3.1.8"
+    "typescript": "^4.9.4",
+    "vite": "^4.1.4"
   },
   "dependencies": {
-    "@tanstack/solid-query": "^4.3.9",
+    "@tanstack/solid-query": "^5.0.0-alpha.3",
     "@solidjs/meta": "^0.28.2",
-    "@solidjs/router": "^0.6.0",
-    "solid-js": "^1.6.9",
-    "solid-start": "^0.2.15",
+    "@solidjs/router": "^0.7.0",
+    "solid-js": "^1.6.13",
+    "solid-start": "^0.2.23",
     "undici": "^5.11.0"
   },
   "engines": {

diff --git a/examples/solid/solid-start-streaming/src/root.tsx b/examples/solid/solid-start-streaming/src/root.tsx
@@ -20,7 +20,7 @@ export default function Root() {
   const queryClient = new QueryClient({
     defaultOptions: {
       queries: {
-        retry: 0,
+        retry: false,
       },
     },
   })

diff --git a/examples/solid/solid-start-streaming/src/routes/hydration.tsx b/examples/solid/solid-start-streaming/src/routes/hydration.tsx
@@ -43,6 +43,8 @@ export default function Hydration() {
             <th>isLoading</th>
             <th>isStale</th>
             <th>isSuccess</th>
+            <th>isError</th>
+            <th>error</th>
             <th>fetchStatus</th>
             <th>dataUpdatedAt</th>
           </tr>
@@ -88,6 +90,8 @@ const QueryStateRow = (props: { context: string; query: QueryState }) => {
       <td>{String(props.query.isLoading)}</td>
       <td>{String(props.query.isStale)}</td>
       <td>{String(props.query.isSuccess)}</td>
+      <td>{String(props.query.isError)}</td>
+      <td>{String(props.query.error)}</td>
       <td>{String(props.query.fetchStatus)}</td>
       <td>{String(props.query.dataUpdatedAt)}</td>
     </tr>

diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-visualizer": "^5.9.0",
     "rollup-preset-solid": "^1.4.0",
-    "solid-js": "^1.5.7",
+    "solid-js": "^1.6.13",
     "solid-testing-library": "^0.3.0",
     "stream-to-array": "^2.3.0",
     "ts-jest": "^29.0.5",

diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json
@@ -54,7 +54,7 @@
     "@tanstack/query-core": "workspace:*"
   },
   "peerDependencies": {
-    "solid-js": "^1.6.2"
+    "solid-js": "^1.6.13"
   },
   "peerDependenciesMeta": {}
 }
diff --git a/packages/solid-query/src/createBaseQuery.ts b/packages/solid-query/src/createBaseQuery.ts
@@ -172,7 +172,7 @@ export function createBaseQuery<
   )
 
   onCleanup(() => {
-    if (!isServer && unsubscribe) {
+    if (unsubscribe) {
       unsubscribe()
       unsubscribe = null
     }