Skip to content

Commit f805326

Browse files
manudelimanudeli
authored
Merge branch 'main' into react-query/test/use-fake-timer-HydrationBoundary
2 parents 5f3a17c + 1dba812 commit f805326

File tree

80 files changed

+305
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+305
-243
lines changed

Diff for: ‎docs/framework/react/guides/query-options.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ id: query-options
33
title: Query Options
44
---
55

6-
One of the best ways to share `queryKey` and `queryFn` between multiple places, yet keep them co-located to one another, is to use the `queryOptions` helper. At runtime, this helper just returns whatever you pass into it, but it has a lot of advantages when using it [with TypeScript](../../typescript#typing-query-options). You can define all possible options for a query in one place, and you'll also get type inference and type safety for all of them.
6+
One of the best ways to share `queryKey` and `queryFn` between multiple places, yet keep them co-located to one another, is to use the `queryOptions` helper. At runtime, this helper just returns whatever you pass into it, but it has a lot of advantages when using it [with TypeScript](../typescript#typing-query-options). You can define all possible options for a query in one place, and you'll also get type inference and type safety for all of them.
77

88
[//]: # 'Example1'
99

Diff for: ‎docs/framework/react/guides/ssr.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ title: Server Rendering & Hydration
55

66
In this guide you'll learn how to use React Query with server rendering.
77

8-
See the guide on [Prefetching & Router Integration](./prefetching) for some background. You might also want to check out the [Performance & Request Waterfalls guide](./request-waterfalls) before that.
8+
See the guide on [Prefetching & Router Integration](../prefetching) for some background. You might also want to check out the [Performance & Request Waterfalls guide](../request-waterfalls) before that.
99

10-
For advanced server rendering patterns, such as streaming, Server Components and the new Next.js app router, see the [Advanced Server Rendering guide](./advanced-ssr).
10+
For advanced server rendering patterns, such as streaming, Server Components and the new Next.js app router, see the [Advanced Server Rendering guide](../advanced-ssr).
1111

1212
If you just want to see some code, you can skip ahead to the [Full Next.js pages router example](#full-nextjs-pages-router-example) or the [Full Remix example](#full-remix-example) below.
1313

@@ -181,7 +181,7 @@ With just a little more setup, you can use a `queryClient` to prefetch queries d
181181
182182
### Full Next.js pages router example
183183

184-
> For app router documentation, see the [Advanced Server Rendering guide](./advanced-ssr).
184+
> For app router documentation, see the [Advanced Server Rendering guide](../advanced-ssr).
185185
186186
Initial setup:
187187

@@ -386,7 +386,7 @@ With Remix, this is a little bit more involved, we recommend checking out the [u
386386

387387
## Prefetching dependent queries
388388

389-
Over in the Prefetching guide we learned how to [prefetch dependent queries](./prefetching#dependent-queries--code-splitting), but how do we do this in framework loaders? Consider the following code, taken from the [Dependent Queries guide](./dependent-queries):
389+
Over in the Prefetching guide we learned how to [prefetch dependent queries](../prefetching#dependent-queries--code-splitting), but how do we do this in framework loaders? Consider the following code, taken from the [Dependent Queries guide](../dependent-queries):
390390

391391
```tsx
392392
// Get the user

Diff for: ‎examples/angular/auto-refetching/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.1.0-next.0",
1515
"@angular/platform-browser": "^19.1.0-next.0",
1616
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
17-
"@tanstack/angular-query-experimental": "^5.67.3",
17+
"@tanstack/angular-query-experimental": "^5.68.0",
1818
"rxjs": "^7.8.1",
1919
"tslib": "^2.6.3",
2020
"zone.js": "^0.15.0"

Diff for: ‎examples/angular/basic/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.1.0-next.0",
1515
"@angular/platform-browser": "^19.1.0-next.0",
1616
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
17-
"@tanstack/angular-query-experimental": "^5.67.3",
17+
"@tanstack/angular-query-experimental": "^5.68.0",
1818
"rxjs": "^7.8.1",
1919
"tslib": "^2.6.3",
2020
"zone.js": "^0.15.0"

Diff for: ‎examples/angular/devtools-panel/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"@angular/platform-browser": "^19.1.0-next.0",
1616
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
1717
"@angular/router": "^19.1.0-next.0",
18-
"@tanstack/angular-query-devtools-experimental": "^5.67.3",
19-
"@tanstack/angular-query-experimental": "^5.67.3",
18+
"@tanstack/angular-query-devtools-experimental": "^5.68.0",
19+
"@tanstack/angular-query-experimental": "^5.68.0",
2020
"rxjs": "^7.8.1",
2121
"tslib": "^2.6.3",
2222
"zone.js": "^0.15.0"

Diff for: ‎examples/angular/infinite-query-with-max-pages/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.1.0-next.0",
1515
"@angular/platform-browser": "^19.1.0-next.0",
1616
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
17-
"@tanstack/angular-query-experimental": "^5.67.3",
17+
"@tanstack/angular-query-experimental": "^5.68.0",
1818
"rxjs": "^7.8.1",
1919
"tslib": "^2.6.3",
2020
"zone.js": "^0.15.0"

Diff for: ‎examples/angular/optimistic-updates/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/forms": "19.1.0-next.0",
1616
"@angular/platform-browser": "^19.1.0-next.0",
1717
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
18-
"@tanstack/angular-query-experimental": "^5.67.3",
18+
"@tanstack/angular-query-experimental": "^5.68.0",
1919
"rxjs": "^7.8.1",
2020
"tslib": "^2.6.3",
2121
"zone.js": "^0.15.0"

Diff for: ‎examples/angular/pagination/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.1.0-next.0",
1515
"@angular/platform-browser": "^19.1.0-next.0",
1616
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
17-
"@tanstack/angular-query-experimental": "^5.67.3",
17+
"@tanstack/angular-query-experimental": "^5.68.0",
1818
"rxjs": "^7.8.1",
1919
"tslib": "^2.6.3",
2020
"zone.js": "^0.15.0"

Diff for: ‎examples/angular/query-options-from-a-service/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/platform-browser": "^19.1.0-next.0",
1616
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
1717
"@angular/router": "^19.1.0-next.0",
18-
"@tanstack/angular-query-experimental": "^5.67.3",
18+
"@tanstack/angular-query-experimental": "^5.68.0",
1919
"rxjs": "^7.8.1",
2020
"tslib": "^2.6.3",
2121
"zone.js": "^0.15.0"

Diff for: ‎examples/angular/router/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/platform-browser": "^19.1.0-next.0",
1616
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
1717
"@angular/router": "^19.1.0-next.0",
18-
"@tanstack/angular-query-experimental": "^5.67.3",
18+
"@tanstack/angular-query-experimental": "^5.68.0",
1919
"rxjs": "^7.8.1",
2020
"tslib": "^2.6.3",
2121
"zone.js": "^0.15.0"

Diff for: ‎examples/angular/rxjs/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"@angular/forms": "19.1.0-next.0",
1616
"@angular/platform-browser": "^19.1.0-next.0",
1717
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
18-
"@tanstack/angular-query-experimental": "^5.67.3",
18+
"@tanstack/angular-query-experimental": "^5.68.0",
1919
"rxjs": "^7.8.1",
2020
"tslib": "^2.6.3",
2121
"zone.js": "^0.15.0"

Diff for: ‎examples/angular/simple/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"@angular/core": "^19.1.0-next.0",
1515
"@angular/platform-browser": "^19.1.0-next.0",
1616
"@angular/platform-browser-dynamic": "^19.1.0-next.0",
17-
"@tanstack/angular-query-experimental": "^5.67.3",
17+
"@tanstack/angular-query-experimental": "^5.68.0",
1818
"rxjs": "^7.8.1",
1919
"tslib": "^2.6.3",
2020
"zone.js": "^0.15.0"

Diff for: ‎examples/react/algolia/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
},
1010
"dependencies": {
1111
"@algolia/client-search": "5.2.1",
12-
"@tanstack/react-query": "^5.67.3",
13-
"@tanstack/react-query-devtools": "^5.67.3",
12+
"@tanstack/react-query": "^5.68.0",
13+
"@tanstack/react-query-devtools": "^5.68.0",
1414
"react": "^19.0.0",
1515
"react-dom": "^19.0.0"
1616
},
1717
"devDependencies": {
18-
"@tanstack/eslint-plugin-query": "^5.67.2",
18+
"@tanstack/eslint-plugin-query": "^5.68.0",
1919
"@types/react": "^18.2.79",
2020
"@types/react-dom": "^18.2.25",
2121
"@vitejs/plugin-react": "^4.3.3",

Diff for: ‎examples/react/auto-refetching/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"next": "^14.2.20",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0"

Diff for: ‎examples/react/basic-graphql-request/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/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"graphql": "^16.9.0",
1414
"graphql-request": "^7.1.2",
1515
"react": "^19.0.0",

Diff for: ‎examples/react/basic/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@tanstack/query-sync-storage-persister": "^5.67.3",
12-
"@tanstack/react-query": "^5.67.3",
13-
"@tanstack/react-query-devtools": "^5.67.3",
14-
"@tanstack/react-query-persist-client": "^5.67.3",
11+
"@tanstack/query-sync-storage-persister": "^5.68.0",
12+
"@tanstack/react-query": "^5.68.0",
13+
"@tanstack/react-query-devtools": "^5.68.0",
14+
"@tanstack/react-query-persist-client": "^5.68.0",
1515
"react": "^19.0.0",
1616
"react-dom": "^19.0.0"
1717
},
1818
"devDependencies": {
19-
"@tanstack/eslint-plugin-query": "^5.67.2",
19+
"@tanstack/eslint-plugin-query": "^5.68.0",
2020
"@types/react": "^18.2.79",
2121
"@types/react-dom": "^18.2.25",
2222
"@vitejs/plugin-react": "^4.3.3",

Diff for: ‎examples/react/default-query-function/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/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"react": "^19.0.0",
1414
"react-dom": "^19.0.0"
1515
},

Diff for: ‎examples/react/devtools-panel/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/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"react": "^19.0.0",
1414
"react-dom": "^19.0.0"
1515
},

Diff for: ‎examples/react/infinite-query-with-max-pages/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"next": "^14.2.20",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0"

Diff for: ‎examples/react/load-more-infinite-scroll/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"next": "^14.2.20",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0",

Diff for: ‎examples/react/nextjs-app-prefetching/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"next": "^15.1.0",
1414
"react": "^19.0.0",
1515
"react-dom": "^19.0.0"

Diff for: ‎examples/react/nextjs-suspense-streaming/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
13-
"@tanstack/react-query-next-experimental": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
13+
"@tanstack/react-query-next-experimental": "^5.68.0",
1414
"next": "^14.2.20",
1515
"react": "^18.2.0",
1616
"react-dom": "^18.2.0"

Diff for: ‎examples/react/nextjs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"next": "^14.2.20",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0"

Diff for: ‎examples/react/offline/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
"preview": "vite preview"
99
},
1010
"dependencies": {
11-
"@tanstack/query-sync-storage-persister": "^5.67.3",
11+
"@tanstack/query-sync-storage-persister": "^5.68.0",
1212
"@tanstack/react-location": "^3.7.4",
13-
"@tanstack/react-query": "^5.67.3",
14-
"@tanstack/react-query-devtools": "^5.67.3",
15-
"@tanstack/react-query-persist-client": "^5.67.3",
13+
"@tanstack/react-query": "^5.68.0",
14+
"@tanstack/react-query-devtools": "^5.68.0",
15+
"@tanstack/react-query-persist-client": "^5.68.0",
1616
"msw": "^2.6.6",
1717
"react": "^19.0.0",
1818
"react-dom": "^19.0.0",

Diff for: ‎examples/react/optimistic-updates-cache/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"next": "^14.2.20",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0"

Diff for: ‎examples/react/optimistic-updates-ui/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"next": "^14.2.20",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0"

Diff for: ‎examples/react/pagination/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"next": "^14.2.20",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0"

Diff for: ‎examples/react/playground/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/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"react": "^19.0.0",
1414
"react-dom": "^19.0.0"
1515
},

Diff for: ‎examples/react/prefetching/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"start": "next start"
99
},
1010
"dependencies": {
11-
"@tanstack/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"next": "^14.2.20",
1414
"react": "^18.2.0",
1515
"react-dom": "^18.2.0"

Diff for: ‎examples/react/react-native/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"@react-native-community/netinfo": "^11.4.1",
1515
"@react-navigation/native": "^6.1.18",
1616
"@react-navigation/stack": "^6.4.1",
17-
"@tanstack/react-query": "^5.67.3",
18-
"@tanstack/react-query-devtools": "^5.67.3",
17+
"@tanstack/react-query": "^5.68.0",
18+
"@tanstack/react-query-devtools": "^5.68.0",
1919
"expo": "^52.0.11",
2020
"expo-constants": "^17.0.3",
2121
"expo-status-bar": "^2.0.0",

Diff for: ‎examples/react/react-router/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/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"localforage": "^1.10.0",
1414
"match-sorter": "^6.3.4",
1515
"react": "^19.0.0",

Diff for: ‎examples/react/rick-morty/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"@emotion/styled": "^11.13.5",
1313
"@mui/material": "^6.1.8",
1414
"@mui/styles": "^6.1.8",
15-
"@tanstack/react-query": "^5.67.3",
16-
"@tanstack/react-query-devtools": "^5.67.3",
15+
"@tanstack/react-query": "^5.68.0",
16+
"@tanstack/react-query-devtools": "^5.68.0",
1717
"react": "^19.0.0",
1818
"react-dom": "^19.0.0",
1919
"react-router": "^6.25.1",

Diff for: ‎examples/react/shadow-dom/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/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"react": "^19.0.0",
1414
"react-dom": "^19.0.0"
1515
},

Diff for: ‎examples/react/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/react-query": "^5.67.3",
12-
"@tanstack/react-query-devtools": "^5.67.3",
11+
"@tanstack/react-query": "^5.68.0",
12+
"@tanstack/react-query-devtools": "^5.68.0",
1313
"react": "^19.0.0",
1414
"react-dom": "^19.0.0"
1515
},

0 commit comments

Comments
 (0)