Skip to content

refactor(solid-query): solid 2 reactivity compliance #10316

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

Merged
birkskyum merged 4 commits into from
Mar 23, 2026
+142 −107
Merged

refactor(solid-query): solid 2 reactivity compliance #10316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4a38106
no destructing
2wheeh Mar 22, 2026
4c2010b
untrack, pureWrite
2wheeh Mar 22, 2026
2641790
changeset
2wheeh Mar 22, 2026
72ddf97
effect
2wheeh Mar 23, 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
7 changes: 7 additions & 0 deletions .changeset/legal-signs-call.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@tanstack/solid-query-persist-client': patch
'@tanstack/solid-query-devtools': patch
'@tanstack/solid-query': patch
---

refactor: solid 2 reactivity compliance
72 changes: 36 additions & 36 deletions packages/solid-query/src/__tests__/mutationOptions.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ describe('mutationOptions', () => {

function Mutation() {
const isMutating = useIsMutating()
const { mutate } = useMutation(() => mutationOpts)
const mutation = useMutation(() => mutationOpts)

createRenderEffect(isMutating, (count) => {
isMutatingArray.push(count)
})

return (
<div>
<button onClick={() => mutate()}>mutate</button>
<button onClick={() => mutation.mutate()}>mutate</button>
</div>
)
}
Expand Down Expand Up @@ -85,15 +85,15 @@ describe('mutationOptions', () => {

function Mutation() {
const isMutating = useIsMutating()
const { mutate } = useMutation(() => mutationOpts)
const mutation = useMutation(() => mutationOpts)

createRenderEffect(isMutating, (count) => {
isMutatingArray.push(count)
})

return (
<div>
<button onClick={() => mutate()}>mutate</button>
<button onClick={() => mutation.mutate()}>mutate</button>
</div>
)
}
Expand Down Expand Up @@ -126,17 +126,17 @@ describe('mutationOptions', () => {

function Mutation() {
const isMutating = useIsMutating()
const { mutate: mutate1 } = useMutation(() => mutationOpts1)
const { mutate: mutate2 } = useMutation(() => mutationOpts2)
const mutation1 = useMutation(() => mutationOpts1)
const mutation2 = useMutation(() => mutationOpts2)

createRenderEffect(isMutating, (count) => {
isMutatingArray.push(count)
})

return (
<div>
<button onClick={() => mutate1()}>mutate1</button>
<button onClick={() => mutate2()}>mutate2</button>
<button onClick={() => mutation1.mutate()}>mutate1</button>
<button onClick={() => mutation2.mutate()}>mutate2</button>
</div>
)
}
Expand Down Expand Up @@ -171,17 +171,17 @@ describe('mutationOptions', () => {
const isMutating = useIsMutating(() => ({
mutationKey: mutationOpts1.mutationKey,
}))
const { mutate: mutate1 } = useMutation(() => mutationOpts1)
const { mutate: mutate2 } = useMutation(() => mutationOpts2)
const mutation1 = useMutation(() => mutationOpts1)
const mutation2 = useMutation(() => mutationOpts2)

createRenderEffect(isMutating, (count) => {
isMutatingArray.push(count)
})

return (
<div>
<button onClick={() => mutate1()}>mutate1</button>
<button onClick={() => mutate2()}>mutate2</button>
<button onClick={() => mutation1.mutate()}>mutate1</button>
<button onClick={() => mutation2.mutate()}>mutate2</button>
</div>
)
}
Expand Down Expand Up @@ -211,11 +211,11 @@ describe('mutationOptions', () => {
})

function Mutation() {
const { mutate } = useMutation(() => mutationOpts)
const mutation = useMutation(() => mutationOpts)

return (
<div>
<button onClick={() => mutate()}>mutate</button>
<button onClick={() => mutation.mutate()}>mutate</button>
</div>
)
}
Expand Down Expand Up @@ -252,11 +252,11 @@ describe('mutationOptions', () => {
})

function Mutation() {
const { mutate } = useMutation(() => mutationOpts)
const mutation = useMutation(() => mutationOpts)

return (
<div>
<button onClick={() => mutate()}>mutate</button>
<button onClick={() => mutation.mutate()}>mutate</button>
</div>
)
}
Expand Down Expand Up @@ -297,13 +297,13 @@ describe('mutationOptions', () => {
})

function Mutation() {
const { mutate: mutate1 } = useMutation(() => mutationOpts1)
const { mutate: mutate2 } = useMutation(() => mutationOpts2)
const mutation1 = useMutation(() => mutationOpts1)
const mutation2 = useMutation(() => mutationOpts2)

return (
<div>
<button onClick={() => mutate1()}>mutate1</button>
<button onClick={() => mutate2()}>mutate2</button>
<button onClick={() => mutation1.mutate()}>mutate1</button>
<button onClick={() => mutation2.mutate()}>mutate2</button>
</div>
)
}
Expand Down Expand Up @@ -345,13 +345,13 @@ describe('mutationOptions', () => {
})

function Mutation() {
const { mutate: mutate1 } = useMutation(() => mutationOpts1)
const { mutate: mutate2 } = useMutation(() => mutationOpts2)
const mutation1 = useMutation(() => mutationOpts1)
const mutation2 = useMutation(() => mutationOpts2)

return (
<div>
<button onClick={() => mutate1()}>mutate1</button>
<button onClick={() => mutate2()}>mutate2</button>
<button onClick={() => mutation1.mutate()}>mutate1</button>
<button onClick={() => mutation2.mutate()}>mutate2</button>
</div>
)
}
Expand Down Expand Up @@ -398,7 +398,7 @@ describe('mutationOptions', () => {
})

function Mutation() {
const { mutate } = useMutation(() => mutationOpts)
const mutation = useMutation(() => mutationOpts)
const states = useMutationState(() => ({
filters: { mutationKey: mutationOpts.mutationKey, status: 'success' },
}))
Expand All @@ -412,7 +412,7 @@ describe('mutationOptions', () => {

return (
<div>
<button onClick={() => mutate()}>mutate</button>
<button onClick={() => mutation.mutate()}>mutate</button>
</div>
)
}
Expand Down Expand Up @@ -441,7 +441,7 @@ describe('mutationOptions', () => {
})

function Mutation() {
const { mutate } = useMutation(() => mutationOpts)
const mutation = useMutation(() => mutationOpts)
const states = useMutationState(() => ({
filters: { status: 'success' },
}))
Expand All @@ -455,7 +455,7 @@ describe('mutationOptions', () => {

return (
<div>
<button onClick={() => mutate()}>mutate</button>
<button onClick={() => mutation.mutate()}>mutate</button>
</div>
)
}
Expand Down Expand Up @@ -488,8 +488,8 @@ describe('mutationOptions', () => {
})

function Mutation() {
const { mutate: mutate1 } = useMutation(() => mutationOpts1)
const { mutate: mutate2 } = useMutation(() => mutationOpts2)
const mutation1 = useMutation(() => mutationOpts1)
const mutation2 = useMutation(() => mutationOpts2)
const states = useMutationState(() => ({
filters: { status: 'success' },
}))
Expand All @@ -503,8 +503,8 @@ describe('mutationOptions', () => {

return (
<div>
<button onClick={() => mutate1()}>mutate1</button>
<button onClick={() => mutate2()}>mutate2</button>
<button onClick={() => mutation1.mutate()}>mutate1</button>
<button onClick={() => mutation2.mutate()}>mutate2</button>
</div>
)
}
Expand Down Expand Up @@ -539,8 +539,8 @@ describe('mutationOptions', () => {
})

function Mutation() {
const { mutate: mutate1 } = useMutation(() => mutationOpts1)
const { mutate: mutate2 } = useMutation(() => mutationOpts2)
const mutation1 = useMutation(() => mutationOpts1)
const mutation2 = useMutation(() => mutationOpts2)
const states = useMutationState(() => ({
filters: { mutationKey: mutationOpts1.mutationKey, status: 'success' },
}))
Expand All @@ -554,8 +554,8 @@ describe('mutationOptions', () => {

return (
<div>
<button onClick={() => mutate1()}>mutate1</button>
<button onClick={() => mutate2()}>mutate2</button>
<button onClick={() => mutation1.mutate()}>mutate1</button>
<button onClick={() => mutation2.mutate()}>mutate2</button>
</div>
)
}
Expand Down
34 changes: 17 additions & 17 deletions packages/solid-query/src/__tests__/useIsMutating.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { fireEvent, render } from '@solidjs/testing-library'
import { Show, createRenderEffect, createSignal } from 'solid-js'
import { Show, createRenderEffect, createSignal, untrack } from 'solid-js'
import * as QueryCore from '@tanstack/query-core'
import { sleep } from '@tanstack/query-test-utils'
import {
Expand Down Expand Up @@ -35,18 +35,18 @@ describe('useIsMutating', () => {
}

function Mutations() {
const { mutate: mutate1 } = useMutation(() => ({
const mutation1 = useMutation(() => ({
mutationKey: ['mutation1'],
mutationFn: () => sleep(150).then(() => 'data'),
}))
const { mutate: mutate2 } = useMutation(() => ({
const mutation2 = useMutation(() => ({
mutationKey: ['mutation2'],
mutationFn: () => sleep(50).then(() => 'data'),
}))

mutate1()
untrack(() => mutation1.mutate())
setActTimeout(() => {
mutate2()
mutation2.mutate()
}, 50)

return null
Expand Down Expand Up @@ -87,18 +87,18 @@ describe('useIsMutating', () => {
}

function Page() {
const { mutate: mutate1 } = useMutation(() => ({
const mutation1 = useMutation(() => ({
mutationKey: ['mutation1'],
mutationFn: () => sleep(100).then(() => 'data'),
}))
const { mutate: mutate2 } = useMutation(() => ({
const mutation2 = useMutation(() => ({
mutationKey: ['mutation2'],
mutationFn: () => sleep(100).then(() => 'data'),
}))

setActTimeout(() => {
mutate1()
mutate2()
mutation1.mutate()
mutation2.mutate()
}, 10)

return <IsMutating />
Expand Down Expand Up @@ -135,18 +135,18 @@ describe('useIsMutating', () => {
}

function Page() {
const { mutate: mutate1 } = useMutation(() => ({
const mutation1 = useMutation(() => ({
mutationKey: ['mutation1'],
mutationFn: () => sleep(100).then(() => 'data'),
}))
const { mutate: mutate2 } = useMutation(() => ({
const mutation2 = useMutation(() => ({
mutationKey: ['mutation2'],
mutationFn: () => sleep(100).then(() => 'data'),
}))

setActTimeout(() => {
mutate1()
mutate2()
mutation1.mutate()
mutation2.mutate()
}, 10)

return <IsMutating />
Expand All @@ -170,7 +170,7 @@ describe('useIsMutating', () => {

function Page() {
const isMutating = useIsMutating(undefined, () => queryClient)
const { mutate } = useMutation(
const mutation = useMutation(
() => ({
mutationKey: ['mutation1'],
mutationFn: () => sleep(20).then(() => 'data'),
Expand All @@ -179,7 +179,7 @@ describe('useIsMutating', () => {
)

setActTimeout(() => {
mutate()
mutation.mutate()
}, 10)

return (
Expand Down Expand Up @@ -225,12 +225,12 @@ describe('useIsMutating', () => {
function Page() {
const [mounted, setMounted] = createSignal(true)

const { mutate: mutate1 } = useMutation(() => ({
const mutation1 = useMutation(() => ({
mutationKey: ['mutation1'],
mutationFn: () => sleep(10).then(() => 'data'),
}))

mutate1()
untrack(() => mutation1.mutate())

return (
<div>
Expand Down
Loading
Loading