Skip to content

Commit e9d8529

Browse files
TkDodoTkDodo
authored
Merge branch 'main' into react-query/prefetch/queryClient-param
2 parents d16287b + 6799b82 commit e9d8529

File tree

37 files changed

+160
-124
lines changed

37 files changed

+160
-124
lines changed

‎examples/solid/astro/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@astrojs/solid-js": "^4.4.0",
1616
"@astrojs/tailwind": "^5.1.0",
1717
"@astrojs/vercel": "^7.7.2",
18-
"@tanstack/solid-query": "^5.54.1",
19-
"@tanstack/solid-query-devtools": "^5.54.1",
18+
"@tanstack/solid-query": "^5.54.2",
19+
"@tanstack/solid-query-devtools": "^5.54.2",
2020
"astro": "^4.12.2",
2121
"solid-js": "^1.8.19",
2222
"tailwindcss": "^3.4.7",

‎examples/solid/basic-graphql-request/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "tsc"
1010
},
1111
"dependencies": {
12-
"@tanstack/solid-query": "^5.54.1",
13-
"@tanstack/solid-query-devtools": "^5.54.1",
12+
"@tanstack/solid-query": "^5.54.2",
13+
"@tanstack/solid-query-devtools": "^5.54.2",
1414
"graphql": "^16.9.0",
1515
"graphql-request": "^7.1.0",
1616
"solid-js": "^1.8.19"

‎examples/solid/basic/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "tsc"
1010
},
1111
"dependencies": {
12-
"@tanstack/solid-query": "^5.54.1",
13-
"@tanstack/solid-query-devtools": "^5.54.1",
12+
"@tanstack/solid-query": "^5.54.2",
13+
"@tanstack/solid-query-devtools": "^5.54.2",
1414
"solid-js": "^1.8.19"
1515
},
1616
"devDependencies": {

‎examples/solid/default-query-function/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "tsc"
1010
},
1111
"dependencies": {
12-
"@tanstack/solid-query": "^5.54.1",
13-
"@tanstack/solid-query-devtools": "^5.54.1",
12+
"@tanstack/solid-query": "^5.54.2",
13+
"@tanstack/solid-query-devtools": "^5.54.2",
1414
"solid-js": "^1.8.19"
1515
},
1616
"devDependencies": {

‎examples/solid/simple/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "tsc"
1010
},
1111
"dependencies": {
12-
"@tanstack/solid-query": "^5.54.1",
13-
"@tanstack/solid-query-devtools": "^5.54.1",
12+
"@tanstack/solid-query": "^5.54.2",
13+
"@tanstack/solid-query-devtools": "^5.54.2",
1414
"solid-js": "^1.8.19"
1515
},
1616
"devDependencies": {

‎examples/solid/solid-start-streaming/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"@solidjs/meta": "^0.29.4",
1313
"@solidjs/router": "^0.14.1",
1414
"@solidjs/start": "^1.0.6",
15-
"@tanstack/solid-query": "^5.54.1",
16-
"@tanstack/solid-query-devtools": "^5.54.1",
15+
"@tanstack/solid-query": "^5.54.2",
16+
"@tanstack/solid-query-devtools": "^5.54.2",
1717
"solid-js": "^1.8.19",
1818
"vinxi": "^0.4.1"
1919
},

‎examples/svelte/auto-refetching/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json"
1010
},
1111
"dependencies": {
12-
"@tanstack/svelte-query": "^5.54.1",
13-
"@tanstack/svelte-query-devtools": "^5.54.1"
12+
"@tanstack/svelte-query": "^5.54.2",
13+
"@tanstack/svelte-query-devtools": "^5.54.2"
1414
},
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",

‎examples/svelte/basic/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"dependencies": {
1212
"@tanstack/query-sync-storage-persister": "^5.54.1",
13-
"@tanstack/svelte-query": "^5.54.1",
14-
"@tanstack/svelte-query-devtools": "^5.54.1",
15-
"@tanstack/svelte-query-persist-client": "^5.54.1"
13+
"@tanstack/svelte-query": "^5.54.2",
14+
"@tanstack/svelte-query-devtools": "^5.54.2",
15+
"@tanstack/svelte-query-persist-client": "^5.54.2"
1616
},
1717
"devDependencies": {
1818
"@sveltejs/adapter-auto": "^3.2.2",

‎examples/svelte/load-more-infinite-scroll/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json"
1010
},
1111
"dependencies": {
12-
"@tanstack/svelte-query": "^5.54.1",
13-
"@tanstack/svelte-query-devtools": "^5.54.1"
12+
"@tanstack/svelte-query": "^5.54.2",
13+
"@tanstack/svelte-query-devtools": "^5.54.2"
1414
},
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",

‎examples/svelte/optimistic-updates/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json"
1010
},
1111
"dependencies": {
12-
"@tanstack/svelte-query": "^5.54.1",
13-
"@tanstack/svelte-query-devtools": "^5.54.1"
12+
"@tanstack/svelte-query": "^5.54.2",
13+
"@tanstack/svelte-query-devtools": "^5.54.2"
1414
},
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",

‎examples/svelte/playground/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json"
1010
},
1111
"dependencies": {
12-
"@tanstack/svelte-query": "^5.54.1",
13-
"@tanstack/svelte-query-devtools": "^5.54.1"
12+
"@tanstack/svelte-query": "^5.54.2",
13+
"@tanstack/svelte-query-devtools": "^5.54.2"
1414
},
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",

‎examples/svelte/simple/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "svelte-check --tsconfig ./tsconfig.json"
1010
},
1111
"dependencies": {
12-
"@tanstack/svelte-query": "^5.54.1",
13-
"@tanstack/svelte-query-devtools": "^5.54.1"
12+
"@tanstack/svelte-query": "^5.54.2",
13+
"@tanstack/svelte-query-devtools": "^5.54.2"
1414
},
1515
"devDependencies": {
1616
"@sveltejs/vite-plugin-svelte": "^3.1.1",

‎examples/svelte/ssr/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json"
1010
},
1111
"dependencies": {
12-
"@tanstack/svelte-query": "^5.54.1",
13-
"@tanstack/svelte-query-devtools": "^5.54.1"
12+
"@tanstack/svelte-query": "^5.54.2",
13+
"@tanstack/svelte-query-devtools": "^5.54.2"
1414
},
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",

‎examples/svelte/star-wars/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"test:types": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json"
1010
},
1111
"dependencies": {
12-
"@tanstack/svelte-query": "^5.54.1",
13-
"@tanstack/svelte-query-devtools": "^5.54.1"
12+
"@tanstack/svelte-query": "^5.54.2",
13+
"@tanstack/svelte-query-devtools": "^5.54.2"
1414
},
1515
"devDependencies": {
1616
"@sveltejs/adapter-auto": "^3.2.2",

‎examples/vue/2.6-basic/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"_preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@tanstack/vue-query": "^5.54.1",
11+
"@tanstack/vue-query": "^5.54.2",
1212
"@vue/composition-api": "1.7.2",
1313
"vue": "2.6.14",
1414
"vue-template-compiler": "2.6.14"

‎examples/vue/2.7-basic/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"_serve": "vite preview"
99
},
1010
"dependencies": {
11-
"@tanstack/vue-query": "^5.54.1",
11+
"@tanstack/vue-query": "^5.54.2",
1212
"vue": "2.7.16",
1313
"vue-template-compiler": "2.7.16"
1414
},

‎examples/vue/basic/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@tanstack/vue-query": "^5.54.1",
12-
"@tanstack/vue-query-devtools": "^5.54.1",
11+
"@tanstack/vue-query": "^5.54.2",
12+
"@tanstack/vue-query-devtools": "^5.54.2",
1313
"vue": "^3.4.27"
1414
},
1515
"devDependencies": {

‎examples/vue/dependent-queries/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@tanstack/vue-query": "^5.54.1",
11+
"@tanstack/vue-query": "^5.54.2",
1212
"vue": "^3.4.27"
1313
},
1414
"devDependencies": {

‎examples/vue/nuxt3/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"_start": "node .output/server/index.mjs"
88
},
99
"dependencies": {
10-
"@tanstack/vue-query": "^5.54.1"
10+
"@tanstack/vue-query": "^5.54.2"
1111
},
1212
"devDependencies": {
1313
"nuxt": "^3.12.4"

‎examples/vue/persister/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"@tanstack/query-core": "^5.54.1",
1212
"@tanstack/query-persist-client-core": "^5.54.1",
1313
"@tanstack/query-sync-storage-persister": "^5.54.1",
14-
"@tanstack/vue-query": "^5.54.1",
14+
"@tanstack/vue-query": "^5.54.2",
1515
"idb-keyval": "^6.2.1",
1616
"vue": "^3.4.27"
1717
},

‎examples/vue/simple/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@tanstack/vue-query": "^5.54.1",
12-
"@tanstack/vue-query-devtools": "^5.54.1",
11+
"@tanstack/vue-query": "^5.54.2",
12+
"@tanstack/vue-query-devtools": "^5.54.2",
1313
"vue": "^3.4.27"
1414
},
1515
"devDependencies": {

‎packages/solid-query-devtools/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/solid-query-devtools",
3-
"version": "5.54.1",
3+
"version": "5.54.2",
44
"description": "Developer tools to interact with and visualize the TanStack/solid-query Query cache",
55
"author": "tannerlinsley",
66
"license": "MIT",

‎packages/solid-query-persist-client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/solid-query-persist-client",
3-
"version": "5.54.1",
3+
"version": "5.54.2",
44
"description": "Solid.js bindings to work with persisters in TanStack/solid-query",
55
"author": "tannerlinsley",
66
"license": "MIT",

‎packages/solid-query/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/solid-query",
3-
"version": "5.54.1",
3+
"version": "5.54.2",
44
"description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
55
"author": "tannerlinsley",
66
"license": "MIT",

‎packages/svelte-query-devtools/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/svelte-query-devtools",
3-
"version": "5.54.1",
3+
"version": "5.54.2",
44
"description": "Developer tools to interact with and visualize the TanStack/svelte-query cache",
55
"author": "Lachlan Collins",
66
"license": "MIT",

‎packages/svelte-query-persist-client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/svelte-query-persist-client",
3-
"version": "5.54.1",
3+
"version": "5.54.2",
44
"description": "Svelte bindings to work with persisters in TanStack/svelte-query",
55
"author": "Lachlan Collins",
66
"license": "MIT",

‎packages/svelte-query/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/svelte-query",
3-
"version": "5.54.1",
3+
"version": "5.54.2",
44
"description": "Primitives for managing, caching and syncing asynchronous and remote data in Svelte",
55
"author": "Lachlan Collins",
66
"license": "MIT",

‎packages/vue-query-devtools/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/vue-query-devtools",
3-
"version": "5.54.1",
3+
"version": "5.54.2",
44
"description": "Developer tools to interact with and visualize the TanStack/vue-query cache",
55
"author": "tannerlinsley",
66
"license": "MIT",

‎packages/vue-query/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tanstack/vue-query",
3-
"version": "5.54.1",
3+
"version": "5.54.2",
44
"description": "Hooks for managing, caching and syncing asynchronous and remote data in Vue",
55
"author": "Damian Osipiuk",
66
"license": "MIT",

‎packages/vue-query/src/useBaseQuery.ts

+12-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import {
22
computed,
33
getCurrentScope,
44
onScopeDispose,
5-
reactive,
65
readonly,
6+
shallowReactive,
7+
shallowReadonly,
78
toRefs,
89
watch,
910
} from 'vue-demi'
@@ -105,7 +106,7 @@ export function useBaseQuery<
105106
})
106107

107108
const observer = new Observer(client, defaultedOptions.value)
108-
const state = reactive(observer.getCurrentResult())
109+
const state = shallowReactive(observer.getCurrentResult())
109110

110111
let unsubscribe = () => {
111112
// noop
@@ -201,7 +202,15 @@ export function useBaseQuery<
201202
},
202203
)
203204

204-
const object: any = toRefs(readonly(state))
205+
const readonlyState =
206+
process.env.NODE_ENV === 'production'
207+
? state
208+
: // @ts-expect-error
209+
defaultedOptions.value.shallow
210+
? shallowReadonly(state)
211+
: readonly(state)
212+
213+
const object: any = toRefs(readonlyState)
205214
for (const key in state) {
206215
if (typeof state[key as keyof typeof state] === 'function') {
207216
object[key] = state[key as keyof typeof state]

‎packages/vue-query/src/useInfiniteQuery.ts

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ export type UseInfiniteQueryOptions<
4949
TPageParam
5050
>[Property]
5151
>
52+
} & {
53+
shallow?: boolean
5254
}
5355

5456
export type UseInfiniteQueryReturnType<TData, TError> = UseBaseQueryReturnType<

‎packages/vue-query/src/useMutation.ts

+18-5
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import {
22
computed,
33
getCurrentScope,
44
onScopeDispose,
5-
reactive,
65
readonly,
6+
shallowReactive,
7+
shallowReadonly,
78
toRefs,
89
watch,
910
} from 'vue-demi'
@@ -26,12 +27,17 @@ type MutationResult<TData, TError, TVariables, TContext> = DistributiveOmit<
2627
'mutate' | 'reset'
2728
>
2829

30+
type UseMutationOptionsBase<TData, TError, TVariables, TContext> =
31+
MutationObserverOptions<TData, TError, TVariables, TContext> & {
32+
shallow?: boolean
33+
}
34+
2935
export type UseMutationOptions<
3036
TData = unknown,
3137
TError = DefaultError,
3238
TVariables = void,
3339
TContext = unknown,
34-
> = MaybeRefDeep<MutationObserverOptions<TData, TError, TVariables, TContext>>
40+
> = MaybeRefDeep<UseMutationOptionsBase<TData, TError, TVariables, TContext>>
3541

3642
type MutateSyncFunction<
3743
TData = unknown,
@@ -61,7 +67,7 @@ export function useMutation<
6167
TContext = unknown,
6268
>(
6369
mutationOptions: MaybeRefDeep<
64-
MutationObserverOptions<TData, TError, TVariables, TContext>
70+
UseMutationOptionsBase<TData, TError, TVariables, TContext>
6571
>,
6672
queryClient?: QueryClient,
6773
): UseMutationReturnType<TData, TError, TVariables, TContext> {
@@ -78,7 +84,7 @@ export function useMutation<
7884
return client.defaultMutationOptions(cloneDeepUnref(mutationOptions))
7985
})
8086
const observer = new MutationObserver(client, options.value)
81-
const state = reactive(observer.getCurrentResult())
87+
const state = shallowReactive(observer.getCurrentResult())
8288

8389
const unsubscribe = observer.subscribe((result) => {
8490
updateState(state, result)
@@ -101,7 +107,14 @@ export function useMutation<
101107
unsubscribe()
102108
})
103109

104-
const resultRefs = toRefs(readonly(state)) as unknown as ToRefs<
110+
const readonlyState =
111+
process.env.NODE_ENV === 'production'
112+
? state
113+
: options.value.shallow
114+
? shallowReadonly(state)
115+
: readonly(state)
116+
117+
const resultRefs = toRefs(readonlyState) as ToRefs<
105118
Readonly<MutationResult<TData, TError, TVariables, TContext>>
106119
>
107120

0 commit comments

Comments
 (0)