chore: upgrade to solid v2 beta 10

brenelz · brenelz · commit 993fcc012c5e · 2026-04-30T21:30:58.000-05:00
diff --git a/examples/solid/astro/package.json b/examples/solid/astro/package.json
@@ -18,8 +18,8 @@
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
     "astro": "^5.5.6",
-    "@solidjs/web": "2.0.0-beta.7",
-    "solid-js": "2.0.0-beta.7",
+    "@solidjs/web": "2.0.0-beta.10",
+    "solid-js": "2.0.0-beta.10",
     "tailwindcss": "^3.4.7",
     "typescript": "5.8.3"
   }
diff --git a/examples/solid/astro/tsconfig.json b/examples/solid/astro/tsconfig.json
@@ -2,6 +2,6 @@
   "extends": "astro/tsconfigs/strict",
   "compilerOptions": {
     "jsx": "preserve",
-    "jsxImportSource": "solid-js"
+    "jsxImportSource": "@solidjs/web"
   }
 }
diff --git a/examples/solid/basic-graphql-request/package.json b/examples/solid/basic-graphql-request/package.json
@@ -12,8 +12,8 @@
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
     "graphql": "^16.9.0",
     "graphql-request": "^7.1.2",
-    "@solidjs/web": "2.0.0-beta.7",
-    "solid-js": "2.0.0-beta.7"
+    "@solidjs/web": "2.0.0-beta.10",
+    "solid-js": "2.0.0-beta.10"
   },
   "devDependencies": {
     "typescript": "5.8.3",
diff --git a/examples/solid/basic-graphql-request/tsconfig.json b/examples/solid/basic-graphql-request/tsconfig.json
@@ -13,7 +13,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
 
     /* Linting */
     "strict": true,
diff --git a/examples/solid/basic/package.json b/examples/solid/basic/package.json
@@ -10,8 +10,8 @@
   "dependencies": {
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@solidjs/web": "2.0.0-beta.7",
-    "solid-js": "2.0.0-beta.7"
+    "@solidjs/web": "2.0.0-beta.10",
+    "solid-js": "2.0.0-beta.10"
   },
   "devDependencies": {
     "typescript": "5.8.3",
diff --git a/examples/solid/basic/tsconfig.json b/examples/solid/basic/tsconfig.json
@@ -13,7 +13,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
 
     /* Linting */
     "strict": true,
diff --git a/examples/solid/default-query-function/package.json b/examples/solid/default-query-function/package.json
@@ -10,8 +10,8 @@
   "dependencies": {
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@solidjs/web": "2.0.0-beta.7",
-    "solid-js": "2.0.0-beta.7"
+    "@solidjs/web": "2.0.0-beta.10",
+    "solid-js": "2.0.0-beta.10"
   },
   "devDependencies": {
     "typescript": "5.8.3",
diff --git a/examples/solid/default-query-function/tsconfig.json b/examples/solid/default-query-function/tsconfig.json
@@ -13,7 +13,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
 
     /* Linting */
     "strict": true,
diff --git a/examples/solid/offline/package.json b/examples/solid/offline/package.json
@@ -13,8 +13,8 @@
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
     "@tanstack/solid-query-persist-client": "^6.0.0-beta.4",
     "msw": "^2.6.6",
-    "@solidjs/web": "2.0.0-beta.7",
-    "solid-js": "2.0.0-beta.7"
+    "@solidjs/web": "2.0.0-beta.10",
+    "solid-js": "2.0.0-beta.10"
   },
   "devDependencies": {
     "typescript": "5.8.3",
diff --git a/examples/solid/offline/tsconfig.json b/examples/solid/offline/tsconfig.json
@@ -13,7 +13,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
 
     /* Linting */
     "strict": true,
diff --git a/examples/solid/simple/package.json b/examples/solid/simple/package.json
@@ -10,8 +10,8 @@
   "dependencies": {
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@solidjs/web": "2.0.0-beta.7",
-    "solid-js": "2.0.0-beta.7"
+    "@solidjs/web": "2.0.0-beta.10",
+    "solid-js": "2.0.0-beta.10"
   },
   "devDependencies": {
     "@tanstack/eslint-plugin-query": "^5.91.5",
diff --git a/examples/solid/simple/tsconfig.json b/examples/solid/simple/tsconfig.json
@@ -13,7 +13,7 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
 
     /* Linting */
     "strict": true,
diff --git a/examples/solid/solid-start-streaming/package.json b/examples/solid/solid-start-streaming/package.json
@@ -14,8 +14,8 @@
     "@solidjs/start": "^1.1.3",
     "@tanstack/solid-query": "^6.0.0-beta.4",
     "@tanstack/solid-query-devtools": "^6.0.0-beta.4",
-    "@solidjs/web": "2.0.0-beta.7",
-    "solid-js": "2.0.0-beta.7",
+    "@solidjs/web": "2.0.0-beta.10",
+    "solid-js": "2.0.0-beta.10",
     "vinxi": "^0.5.3"
   },
   "engines": {
diff --git a/examples/solid/solid-start-streaming/tsconfig.json b/examples/solid/solid-start-streaming/tsconfig.json
@@ -6,7 +6,7 @@
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
     "allowJs": true,
     "strict": true,
     "noEmit": true,
diff --git a/integrations/solid-vite/package.json b/integrations/solid-vite/package.json
@@ -8,9 +8,9 @@
   "dependencies": {
     "@tanstack/solid-query": "workspace:*",
     "@tanstack/solid-query-devtools": "workspace:*",
-    "solid-js": "2.0.0-beta.7",
+    "solid-js": "2.0.0-beta.10",
     "vite": "^6.4.1",
     "vite-plugin-solid": "3.0.0-next.5",
-    "@solidjs/web": "2.0.0-beta.7"
+    "@solidjs/web": "2.0.0-beta.10"
   }
 }
diff --git a/packages/solid-query-devtools/package.json b/packages/solid-query-devtools/package.json
@@ -68,11 +68,11 @@
     "@babel/core": "^7.28.0",
     "@babel/preset-typescript": "^7.18.6",
     "@solidjs/testing-library": "^0.8.10",
-    "@solidjs/web": "2.0.0-beta.7",
+    "@solidjs/web": "2.0.0-beta.10",
     "@tanstack/solid-query": "workspace:*",
-    "babel-preset-solid": "2.0.0-beta.7",
+    "babel-preset-solid": "2.0.0-beta.10",
     "npm-run-all2": "^5.0.0",
-    "solid-js": "2.0.0-beta.7",
+    "solid-js": "2.0.0-beta.10",
     "tsup-preset-solid": "^2.2.0",
     "vite-plugin-solid": "3.0.0-next.5"
   },
diff --git a/packages/solid-query-devtools/src/clientOnly.tsx b/packages/solid-query-devtools/src/clientOnly.tsx
@@ -7,7 +7,8 @@ import {
   untrack,
 } from 'solid-js'
 import { isServer } from '@solidjs/web'
-import type { Component, ComponentProps, JSX } from 'solid-js'
+import type { Component, ComponentProps } from 'solid-js'
+import type { JSX } from '@solidjs/web'
 
 /*
   This function has been taken from solid-start's codebase
diff --git a/packages/solid-query-devtools/src/devtoolsPanel.tsx b/packages/solid-query-devtools/src/devtoolsPanel.tsx
@@ -3,7 +3,7 @@ import { onlineManager, useQueryClient } from '@tanstack/solid-query'
 import { TanstackQueryDevtoolsPanel } from '@tanstack/query-devtools'
 import type { DevtoolsErrorType, Theme } from '@tanstack/query-devtools'
 import type { QueryClient } from '@tanstack/solid-query'
-import type { JSX } from 'solid-js'
+import type { JSX } from '@solidjs/web'
 
 export interface DevtoolsPanelOptions {
   /**
diff --git a/packages/solid-query-devtools/tsconfig.json b/packages/solid-query-devtools/tsconfig.json
@@ -4,7 +4,7 @@
     "outDir": "./dist-ts",
     "rootDir": ".",
     "jsx": "preserve",
-    "jsxImportSource": "solid-js"
+    "jsxImportSource": "@solidjs/web"
   },
   "include": ["src", "*.config.*", "package.json"],
   "references": [{ "path": "../query-devtools" }, { "path": "../solid-query" }]
diff --git a/packages/solid-query-devtools/tsconfig.prod.json b/packages/solid-query-devtools/tsconfig.prod.json
@@ -3,6 +3,7 @@
   "compilerOptions": {
     "incremental": false,
     "composite": false,
-    "rootDir": "../../"
+    "rootDir": "../../",
+    "customConditions": []
   }
 }
diff --git a/packages/solid-query-persist-client/package.json b/packages/solid-query-persist-client/package.json
@@ -69,12 +69,12 @@
     "@babel/core": "^7.28.0",
     "@babel/preset-typescript": "^7.18.6",
     "@solidjs/testing-library": "^0.8.10",
-    "@solidjs/web": "2.0.0-beta.7",
+    "@solidjs/web": "2.0.0-beta.10",
     "@tanstack/query-test-utils": "workspace:*",
     "@tanstack/solid-query": "workspace:*",
-    "babel-preset-solid": "2.0.0-beta.7",
+    "babel-preset-solid": "2.0.0-beta.10",
     "npm-run-all2": "^5.0.0",
-    "solid-js": "2.0.0-beta.7",
+    "solid-js": "2.0.0-beta.10",
     "tsup-preset-solid": "^2.2.0",
     "vite-plugin-solid": "3.0.0-next.5"
   },
diff --git a/packages/solid-query-persist-client/src/PersistQueryClientProvider.tsx b/packages/solid-query-persist-client/src/PersistQueryClientProvider.tsx
@@ -6,7 +6,7 @@ import { createEffect, createMemo, createSignal, onCleanup } from 'solid-js'
 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'
+import type { JSX } from '@solidjs/web'
 
 export type PersistQueryClientProviderProps = QueryClientProviderProps & {
   persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
diff --git a/packages/solid-query-persist-client/tsconfig.json b/packages/solid-query-persist-client/tsconfig.json
@@ -4,7 +4,7 @@
     "outDir": "./dist-ts",
     "rootDir": ".",
     "jsx": "preserve",
-    "jsxImportSource": "solid-js"
+    "jsxImportSource": "@solidjs/web"
   },
   "include": ["src", "test-setup.ts", "*.config.*", "package.json"],
   "references": [
diff --git a/packages/solid-query/package.json b/packages/solid-query/package.json
@@ -71,11 +71,11 @@
     "@babel/core": "^7.28.0",
     "@babel/preset-typescript": "^7.18.6",
     "@solidjs/testing-library": "^0.8.10",
-    "@solidjs/web": "2.0.0-beta.7",
+    "@solidjs/web": "2.0.0-beta.10",
     "@tanstack/query-test-utils": "workspace:*",
-    "babel-preset-solid": "2.0.0-beta.7",
+    "babel-preset-solid": "2.0.0-beta.10",
     "npm-run-all2": "^5.0.0",
-    "solid-js": "2.0.0-beta.7",
+    "solid-js": "2.0.0-beta.10",
     "tsup-preset-solid": "^2.2.0",
     "vite-plugin-solid": "3.0.0-next.5"
   },
diff --git a/packages/solid-query/src/QueryClientProvider.tsx b/packages/solid-query/src/QueryClientProvider.tsx
@@ -1,6 +1,6 @@
 import { createContext, onCleanup, useContext } from 'solid-js'
 import type { QueryClient } from './QueryClient'
-import type { JSX } from 'solid-js'
+import type { JSX } from '@solidjs/web'
 
 export const QueryClientContext = createContext<(() => QueryClient) | null>(
   null,
diff --git a/packages/solid-query/src/__tests__/useIsMutating.test.tsx b/packages/solid-query/src/__tests__/useIsMutating.test.tsx
@@ -69,7 +69,7 @@ describe('useIsMutating', () => {
 
     await vi.advanceTimersByTimeAsync(150)
 
-    expect(isMutatingArray).toEqual([0, 1, 2, 1, 0])
+    expect(isMutatingArray).toEqual([0, 1, 0])
   })
 
   it('should filter correctly by mutationKey', async () => {
diff --git a/packages/solid-query/src/__tests__/useQuery.test.tsx b/packages/solid-query/src/__tests__/useQuery.test.tsx
@@ -44,7 +44,7 @@ import type {
   UseQueryResult,
 } from '..'
 import type { Mock } from 'vitest'
-import type { JSX } from 'solid-js'
+import type { JSX } from '@solidjs/web'
 
 describe('useQuery', () => {
   const queryCache = new QueryCache()
diff --git a/packages/solid-query/tsconfig.json b/packages/solid-query/tsconfig.json
@@ -4,7 +4,7 @@
     "outDir": "./dist-ts",
     "rootDir": ".",
     "jsx": "preserve",
-    "jsxImportSource": "solid-js"
+    "jsxImportSource": "@solidjs/web"
   },
   "include": ["src", "test-setup.ts", "*.config.*", "package.json"],
   "references": [{ "path": "../query-core" }]
diff --git a/packages/solid-query/tsconfig.legacy.json b/packages/solid-query/tsconfig.legacy.json
@@ -2,7 +2,7 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "jsx": "preserve",
-    "jsxImportSource": "solid-js",
+    "jsxImportSource": "@solidjs/web",
     "outDir": "./dist-ts/legacy"
   },
   "include": ["src"],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@`
`2`	`2`	`"extends": "astro/tsconfigs/strict",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"jsx": "preserve",`
`5`		`- "jsxImportSource": "solid-js"`
	`5`	`+ "jsxImportSource": "@solidjs/web"`
`6`	`6`	`}`
`7`	`7`	`}`