Skip to content

Ensure query-devtools lists Solid peer dependencies #10457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Gujiassh wants to merge 2 commits into
base: main
Choose a base branch
from
+24 −2
Open

Ensure query-devtools lists Solid peer dependencies #10457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e97512
Add Solid peers to query devtools
Gujiassh Apr 12, 2026
c4a95db
fix(solid-query): avoid useContext call inside memo
Gujiassh Apr 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packages/query-devtools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,17 @@
"src",
"!src/__tests__"
],
"peerDependencies": {
"@kobalte/core": "^0.13.4",
"@solid-primitives/keyed": "^1.2.2",
"@solid-primitives/resize-observer": "^2.0.26",
"@solid-primitives/storage": "^1.3.11",
"@tanstack/match-sorter-utils": "^8.19.4",
"clsx": "^2.1.1",
"goober": "^2.1.16",
"solid-js": "^1.9.7",
"solid-transition-group": "^0.2.3"
},
"devDependencies": {
"@kobalte/core": "^0.13.4",
"@solid-primitives/keyed": "^1.2.2",
Expand Down
15 changes: 13 additions & 2 deletions packages/solid-query/src/useBaseQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ import {
createSignal,
on,
onCleanup,
useContext,
} from 'solid-js'
import { createStore, reconcile, unwrap } from 'solid-js/store'
import { useQueryClient } from './QueryClientProvider'
import { QueryClientContext } from './QueryClientProvider'
import { useIsRestoring } from './isRestoring'
import type { UseBaseQueryOptions } from './types'
import type { Accessor, Signal } from 'solid-js'
Expand Down Expand Up @@ -115,7 +116,17 @@ export function useBaseQuery<
) {
type ResourceData = QueryObserverResult<TData, TError>

const client = createMemo(() => useQueryClient(queryClient?.()))
const queryClientFromContext = useContext(QueryClientContext)
const client = createMemo(() => {
const clientFromOptions = queryClient?.()
if (clientFromOptions) {
return clientFromOptions
}
if (!queryClientFromContext) {
throw new Error('No QueryClient set, use QueryClientProvider to set one')
}
return queryClientFromContext()
})
const isRestoring = useIsRestoring()
// There are times when we run a query on the server but the resource is never read
// This could lead to times when the queryObserver is unsubscribed before the resource has loaded
Expand Down