Skip to content

Commit 347c4d4

Browse files
authored
Merge branch 'main' into main
2 parents 3a8c2b1 + aadb831 commit 347c4d4

89 files changed

Lines changed: 23614 additions & 19095 deletions

File tree

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ jobs:
2727
with:
2828
fetch-depth: '0'
2929
- name: Setup pnpm
30-
uses: pnpm/action-setup@v2
31-
with:
32-
version: 8
30+
uses: pnpm/action-setup@v4
3331
- name: Setup Node
3432
uses: actions/setup-node@v4
3533
with:

.github/workflows/pr.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ jobs:
2222
with:
2323
fetch-depth: 0
2424
- name: Setup pnpm
25-
uses: pnpm/action-setup@v2
26-
with:
27-
version: 8
25+
uses: pnpm/action-setup@v4
2826
- name: Setup Node
2927
uses: actions/setup-node@v4
3028
with:

.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
link-workspace-packages=true
12
prefer-workspace-packages=true

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v18.19.0
1+
v22.2.0

docs/framework/react/community/community-projects.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,12 @@ Link: https://github.com/lukemorales/query-key-factory
9191

9292
Link: https://github.com/liaoliao666/react-query-kit
9393

94+
## React Query Rewind
95+
96+
Time travel and visualize state during development
97+
98+
Link: https://reactqueryrewind.com/
99+
94100
## React Query Swagger
95101

96102
Generate React Query hooks based on Swagger API definitions

docs/framework/react/guides/advanced-ssr.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ The first step of any React Query setup is always to create a `queryClient` and
2929
// In Next.js, this file would be called: app/providers.jsx
3030
'use client'
3131

32-
// We can not useState or useRef in a server component, which is why we are
33-
// extracting this part out into it's own file with 'use client' on top
34-
import { useState } from 'react'
32+
// Since QueryClientProvider relies on useContext under the hood, we have to put 'use client' on top
3533
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
3634

3735
function makeQueryClient() {

docs/framework/react/guides/suspense.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ Since you can't change `throwOnError` (because it would allow for `data` to beco
4040
```tsx
4141
import { useSuspenseQuery } from '@tanstack/react-query'
4242

43-
const { data, error } = useSuspenseQuery({ queryKey, queryFn })
43+
const { data, error, isFetching } = useSuspenseQuery({ queryKey, queryFn })
4444

45-
if (error) {
45+
if (error && !isFetching) {
4646
throw error
4747
}
4848

examples/angular/basic/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@
99
},
1010
"private": true,
1111
"dependencies": {
12-
"@angular/animations": "^17.3.3",
13-
"@angular/common": "^17.3.3",
14-
"@angular/compiler": "^17.3.3",
15-
"@angular/core": "^17.3.3",
16-
"@angular/forms": "^17.3.3",
17-
"@angular/platform-browser": "^17.3.3",
18-
"@angular/platform-browser-dynamic": "^17.3.3",
19-
"@angular/router": "^17.3.3",
20-
"@tanstack/angular-query-experimental": "^5.36.1",
12+
"@angular/animations": "^17.3.9",
13+
"@angular/common": "^17.3.9",
14+
"@angular/compiler": "^17.3.9",
15+
"@angular/core": "^17.3.9",
16+
"@angular/forms": "^17.3.9",
17+
"@angular/platform-browser": "^17.3.9",
18+
"@angular/platform-browser-dynamic": "^17.3.9",
19+
"@angular/router": "^17.3.9",
20+
"@tanstack/angular-query-experimental": "^5.37.1",
2121
"rxjs": "^7.8.1",
2222
"tslib": "^2.6.2",
23-
"zone.js": "^0.14.4"
23+
"zone.js": "^0.14.6"
2424
},
2525
"devDependencies": {
26-
"@angular-devkit/build-angular": "^17.3.3",
27-
"@angular/cli": "^17.3.3",
28-
"@angular/compiler-cli": "^17.3.3",
29-
"@tanstack/angular-query-devtools-experimental": "^5.36.1",
30-
"typescript": "5.2.2"
26+
"@angular-devkit/build-angular": "^17.3.7",
27+
"@angular/cli": "^17.3.7",
28+
"@angular/compiler-cli": "^17.3.9",
29+
"@tanstack/angular-query-devtools-experimental": "^5.37.1",
30+
"typescript": "5.3.3"
3131
}
3232
}

examples/angular/infinite-query-with-max-pages/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@
99
},
1010
"private": true,
1111
"dependencies": {
12-
"@angular/animations": "^17.3.3",
13-
"@angular/common": "^17.3.3",
14-
"@angular/compiler": "^17.3.3",
15-
"@angular/core": "^17.3.3",
16-
"@angular/forms": "^17.3.3",
17-
"@angular/platform-browser": "^17.3.3",
18-
"@angular/platform-browser-dynamic": "^17.3.3",
19-
"@angular/router": "^17.3.3",
20-
"@tanstack/angular-query-experimental": "^5.36.1",
12+
"@angular/animations": "^17.3.9",
13+
"@angular/common": "^17.3.9",
14+
"@angular/compiler": "^17.3.9",
15+
"@angular/core": "^17.3.9",
16+
"@angular/forms": "^17.3.9",
17+
"@angular/platform-browser": "^17.3.9",
18+
"@angular/platform-browser-dynamic": "^17.3.9",
19+
"@angular/router": "^17.3.9",
20+
"@tanstack/angular-query-experimental": "^5.37.1",
2121
"rxjs": "^7.8.1",
2222
"tslib": "^2.6.2",
23-
"zone.js": "^0.14.4"
23+
"zone.js": "^0.14.6"
2424
},
2525
"devDependencies": {
26-
"@angular-devkit/build-angular": "^17.3.3",
27-
"@angular/cli": "^17.3.3",
28-
"@angular/compiler-cli": "^17.3.3",
29-
"@tanstack/angular-query-devtools-experimental": "^5.36.1",
30-
"typescript": "5.2.2"
26+
"@angular-devkit/build-angular": "^17.3.7",
27+
"@angular/cli": "^17.3.7",
28+
"@angular/compiler-cli": "^17.3.9",
29+
"@tanstack/angular-query-devtools-experimental": "^5.37.1",
30+
"typescript": "5.3.3"
3131
}
3232
}

examples/angular/router/package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@
99
},
1010
"private": true,
1111
"dependencies": {
12-
"@angular/animations": "^17.3.3",
13-
"@angular/common": "^17.3.3",
14-
"@angular/compiler": "^17.3.3",
15-
"@angular/core": "^17.3.3",
16-
"@angular/forms": "^17.3.3",
17-
"@angular/platform-browser": "^17.3.3",
18-
"@angular/platform-browser-dynamic": "^17.3.3",
19-
"@angular/router": "^17.3.3",
20-
"@tanstack/angular-query-experimental": "^5.36.1",
12+
"@angular/animations": "^17.3.9",
13+
"@angular/common": "^17.3.9",
14+
"@angular/compiler": "^17.3.9",
15+
"@angular/core": "^17.3.9",
16+
"@angular/forms": "^17.3.9",
17+
"@angular/platform-browser": "^17.3.9",
18+
"@angular/platform-browser-dynamic": "^17.3.9",
19+
"@angular/router": "^17.3.9",
20+
"@tanstack/angular-query-experimental": "^5.37.1",
2121
"rxjs": "^7.8.1",
2222
"tslib": "^2.6.2",
23-
"zone.js": "^0.14.4"
23+
"zone.js": "^0.14.6"
2424
},
2525
"devDependencies": {
26-
"@angular-devkit/build-angular": "^17.3.3",
27-
"@angular/cli": "^17.3.3",
28-
"@angular/compiler-cli": "^17.3.3",
29-
"@tanstack/angular-query-devtools-experimental": "^5.36.1",
30-
"typescript": "5.2.2"
26+
"@angular-devkit/build-angular": "^17.3.7",
27+
"@angular/cli": "^17.3.7",
28+
"@angular/compiler-cli": "^17.3.9",
29+
"@tanstack/angular-query-devtools-experimental": "^5.37.1",
30+
"typescript": "5.3.3"
3131
}
3232
}

0 commit comments

Comments
 (0)