Skip to content

Commit cdcadc3

Browse files
committed
Revert "fix(solid-query): add useQuery, useInfiniteQuery, useQueries, useMutation as alternative syntax to align with react and ease maintenance (#8938)"
This reverts commit 1202ba0.
1 parent 51d173f commit cdcadc3

22 files changed

+593
-545
lines changed

packages/solid-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { describe, expect, test, vi } from 'vitest'
22
import { render, screen, waitFor } from '@solidjs/testing-library'
3-
import { QueryClient, useQueries, useQuery } from '@tanstack/solid-query'
3+
import { QueryClient, createQueries, createQuery } from '@tanstack/solid-query'
44
import { persistQueryClientSave } from '@tanstack/query-persist-client-core'
55
import { createEffect, createSignal, onMount } from 'solid-js'
66

@@ -69,7 +69,7 @@ describe('PersistQueryClientProvider', () => {
6969
queryClient.clear()
7070

7171
function Page() {
72-
const state = useQuery(() => ({
72+
const state = createQuery(() => ({
7373
queryKey: key,
7474
queryFn: async () => {
7575
await sleep(10)
@@ -147,7 +147,7 @@ describe('PersistQueryClientProvider', () => {
147147
queryClient.clear()
148148

149149
function Page() {
150-
const [state] = useQueries(() => ({
150+
const [state] = createQueries(() => ({
151151
queries: [
152152
{
153153
queryKey: key,
@@ -230,7 +230,7 @@ describe('PersistQueryClientProvider', () => {
230230
queryClient.clear()
231231

232232
function Page() {
233-
const state = useQuery(() => ({
233+
const state = createQuery(() => ({
234234
queryKey: key,
235235
queryFn: async () => {
236236
await sleep(10)
@@ -315,7 +315,7 @@ describe('PersistQueryClientProvider', () => {
315315
let fetched = false
316316

317317
function Page() {
318-
const state = useQuery(() => ({
318+
const state = createQuery(() => ({
319319
queryKey: key,
320320
queryFn: async () => {
321321
fetched = true
@@ -386,7 +386,7 @@ describe('PersistQueryClientProvider', () => {
386386
queryClient.clear()
387387

388388
function Page() {
389-
const state = useQuery(() => ({
389+
const state = createQuery(() => ({
390390
queryKey: key,
391391
queryFn: async () => {
392392
await sleep(10)
@@ -432,7 +432,7 @@ describe('PersistQueryClientProvider', () => {
432432
const [error, persister] = createMockErrorPersister(removeClient)
433433

434434
function Page() {
435-
const state = useQuery(() => ({
435+
const state = createQuery(() => ({
436436
queryKey: key,
437437
queryFn: async () => {
438438
await sleep(10)
@@ -530,7 +530,7 @@ describe('PersistQueryClientProvider', () => {
530530
}
531531

532532
function Page() {
533-
const state = useQuery(() => ({ queryKey: key }))
533+
const state = createQuery(() => ({ queryKey: key }))
534534

535535
createEffect(() =>
536536
states.push({

packages/solid-query/src/__tests__/QueryClientProvider.test.tsx

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, expect, it, vi } from 'vitest'
22
import { render, waitFor } from '@solidjs/testing-library'
33
import { QueryCache } from '@tanstack/query-core'
4-
import { QueryClientProvider, useQuery, useQueryClient } from '..'
4+
import { QueryClientProvider, createQuery, useQueryClient } from '..'
55
import { createQueryClient, queryKey, sleep } from './utils'
66

77
describe('QueryClientProvider', () => {
@@ -12,7 +12,7 @@ describe('QueryClientProvider', () => {
1212
const queryClient = createQueryClient({ queryCache })
1313

1414
function Page() {
15-
const query = useQuery(() => ({
15+
const query = createQuery(() => ({
1616
queryKey: key,
1717
queryFn: async () => {
1818
await sleep(10)
@@ -51,7 +51,7 @@ describe('QueryClientProvider', () => {
5151
const queryClient2 = createQueryClient({ queryCache: queryCache2 })
5252

5353
function Page1() {
54-
const query = useQuery(() => ({
54+
const query = createQuery(() => ({
5555
queryKey: key1,
5656
queryFn: async () => {
5757
await sleep(10)
@@ -66,7 +66,7 @@ describe('QueryClientProvider', () => {
6666
)
6767
}
6868
function Page2() {
69-
const query = useQuery(() => ({
69+
const query = createQuery(() => ({
7070
queryKey: key2,
7171
queryFn: async () => {
7272
await sleep(10)
@@ -115,7 +115,7 @@ describe('QueryClientProvider', () => {
115115
})
116116

117117
function Page() {
118-
const query = useQuery(() => ({
118+
const query = createQuery(() => ({
119119
queryKey: key,
120120
queryFn: async () => {
121121
await sleep(10)

0 commit comments

Comments
 (0)