Skip to content

Commit b06977f

Browse files
TkDodoTkDodo
authored
Merge branch 'main' into feature/environmentManager
2 parents 2f82fa9 + 67cf8b6 commit b06977f

42 files changed

Lines changed: 536 additions & 502 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/renovate.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
"react-dom",
2626
"tsup",
2727
"typescript",
28-
"typescript50",
29-
"typescript51",
30-
"typescript52",
31-
"typescript53",
3228
"typescript54",
3329
"typescript55",
3430
"typescript56",
3531
"typescript57",
32+
"typescript58",
33+
"typescript59",
34+
"typescript60",
3635
"vue",
3736
"vue-tsc",
3837
"vue2",

‎docs/framework/react/guides/migrating-to-react-query-4.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ Due to this change, disabled queries (even temporarily disabled ones) will start
121121
isInitialLoading // [!code ++]
122122
```
123123

124-
See also the guide on [disabling queries](./disabling-queries.md#isInitialLoading)
124+
See also the guide on [disabling queries](./disabling-queries.md#isloading-previously-isinitialloading)
125125

126126
### new API for `useQueries`
127127

@@ -296,7 +296,7 @@ Since these plugins are no longer experimental, their import paths have also bee
296296
297297
### The `cancel` method on promises is no longer supported
298298
299-
The [old `cancel` method](./query-cancellation.md#old-cancel-function) that allowed you to define a `cancel` function on promises, which was then used by the library to support query cancellation, has been removed. We recommend to use the [newer API](./query-cancellation.md) (introduced with v3.30.0) for query cancellation that uses the [`AbortController` API](https://developer.mozilla.org/en-US/docs/Web/API/AbortController) internally and provides you with an [`AbortSignal` instance](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) for your query function to support query cancellation.
299+
The old `cancel` method (which allowed you to define a `cancel` function on promises and was used by the library to support query cancellation) has been removed. We recommend using the [newer API](./query-cancellation.md) (introduced with v3.30.0) for query cancellation, which uses the [`AbortController` API](https://developer.mozilla.org/en-US/docs/Web/API/AbortController) internally and provides you with an [`AbortSignal` instance](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal) in your query function to support query cancellation.
300300
301301
### TypeScript
302302

‎docs/framework/react/guides/ssr.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ In this guide you'll learn how to use React Query with server rendering.
77

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

10+
For deeper examples on hydration + prefetching (including code splitting), see the [Dependent Queries & Code Splitting](./prefetching.md#dependent-queries-code-splitting) section.
11+
1012
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.md).
1113

1214
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.
@@ -15,7 +17,7 @@ If you just want to see some code, you can skip ahead to the [Full Next.js pages
1517

1618
So what is server rendering anyway? The rest of this guide will assume you are familiar with the concept, but let's spend some time to look at how it relates to React Query. Server rendering is the act of generating the initial html on the server, so that the user has some content to look at as soon as the page loads. This can happen on demand when a page is requested (SSR). It can also happen ahead of time either because a previous request was cached, or at build time (SSG).
1719

18-
If you've read the Request Waterfalls guide, you might remember this:
20+
If you've read the [Performance & Request Waterfalls guide](./request-waterfalls.md), you might remember this:
1921

2022
```
2123
1. |-> Markup (without content)
@@ -386,7 +388,7 @@ With Remix, this is a little bit more involved, we recommend checking out the [u
386388

387389
## Prefetching dependent queries
388390

389-
Over in the Prefetching guide we learned how to [prefetch dependent queries](./prefetching.md#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.md):
391+
Over in the Prefetching guide we learned how to [prefetch dependent queries](./prefetching.md#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.md):
390392

391393
```tsx
392394
// Get the user

‎docs/framework/react/typescript.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ React Query is now written in **TypeScript** to make sure the library and your p
77

88
Things to keep in mind:
99

10-
- Types currently require using TypeScript **v4.7** or greater
10+
- TanStack Query follows [DefinitelyTyped's support window](https://github.com/DefinitelyTyped/DefinitelyTyped#support-window) and supports TypeScript versions released within the last 2 years. At the moment, that means TypeScript **5.4** and newer.
1111
- Changes to types in this repository are considered **non-breaking** and are usually released as **patch** semver changes (otherwise every type enhancement would be a major version!).
1212
- It is **highly recommended that you lock your react-query package version to a specific patch release and upgrade with the expectation that types may be fixed or upgraded between any release**
1313
- The non-type-related public API of React Query still follows semver very strictly.

‎docs/framework/solid/typescript.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Solid Query is written in **TypeScript** to make sure the library and your proje
77

88
Things to keep in mind:
99

10-
- Types currently require using TypeScript **v4.7** or greater
10+
- TanStack Query follows [DefinitelyTyped's support window](https://github.com/DefinitelyTyped/DefinitelyTyped#support-window) and supports TypeScript versions released within the last 2 years. At the moment, that means TypeScript **5.4** and newer.
1111
- Changes to types in this repository are considered **non-breaking** and are usually released as **patch** semver changes (otherwise every type enhancement would be a major version!).
1212
- It is **highly recommended that you lock your solid-query package version to a specific patch release and upgrade with the expectation that types may be fixed or upgraded between any release**
1313
- The non-type-related public API of Solid Query still follows semver very strictly.

‎package.json‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,14 @@
7272
"size-limit": "^12.0.0",
7373
"tinyglobby": "^0.2.15",
7474
"tsup": "^8.4.0",
75-
"typescript": "5.8.3",
76-
"typescript50": "npm:[email protected]",
77-
"typescript51": "npm:[email protected]",
78-
"typescript52": "npm:[email protected]",
79-
"typescript53": "npm:[email protected]",
75+
"typescript": "5.9.3",
8076
"typescript54": "npm:[email protected]",
8177
"typescript55": "npm:[email protected]",
8278
"typescript56": "npm:[email protected]",
8379
"typescript57": "npm:[email protected]",
80+
"typescript58": "npm:[email protected]",
81+
"typescript59": "npm:[email protected]",
82+
"typescript60": "npm:[email protected]",
8483
"vite": "^6.4.1",
8584
"vitest": "^4.0.18"
8685
},
@@ -89,6 +88,18 @@
8988
"@types/react": "^19.2.7",
9089
"@types/react-dom": "^19.2.3",
9190
"@types/node": "^22.15.3",
91+
"@typescript-eslint/eslint-plugin": "8.56.1",
92+
"@typescript-eslint/parser": "8.56.1",
93+
"@typescript-eslint/project-service": "8.56.1",
94+
"@typescript-eslint/rule-tester": "8.56.1",
95+
"@typescript-eslint/scope-manager": "8.56.1",
96+
"@typescript-eslint/tsconfig-utils": "8.56.1",
97+
"@typescript-eslint/type-utils": "8.56.1",
98+
"@typescript-eslint/types": "8.56.1",
99+
"@typescript-eslint/typescript-estree": "8.56.1",
100+
"@typescript-eslint/utils": "8.56.1",
101+
"@typescript-eslint/visitor-keys": "8.56.1",
102+
"typescript-eslint": "8.56.1",
92103
"vite": "^6.4.1",
93104
"esbuild": "^0.27.2"
94105
}

‎packages/angular-query-experimental/package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@
3131
"compile": "tsc --build",
3232
"test:eslint": "eslint --concurrency=auto ./src",
3333
"test:types": "npm-run-all --serial test:types:*",
34-
"test:types:ts50": "node ../../node_modules/typescript50/lib/tsc.js --build",
35-
"test:types:ts51": "node ../../node_modules/typescript51/lib/tsc.js --build",
36-
"test:types:ts52": "node ../../node_modules/typescript52/lib/tsc.js --build",
37-
"test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js --build",
3834
"test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js --build",
3935
"test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js --build",
4036
"test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js --build",
4137
"test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js --build",
38+
"test:types:ts58": "node ../../node_modules/typescript58/lib/tsc.js --build",
39+
"test:types:ts59": "node ../../node_modules/typescript59/lib/tsc.js --build",
4240
"test:types:tscurrent": "tsc --build",
41+
"test:types:ts60": "node ../../node_modules/typescript60/lib/tsc.js --build",
4342
"test:lib": "vitest",
4443
"test:lib:dev": "pnpm run test:lib --watch",
4544
"test:build": "pnpm pack && publint ./dist/*.tgz --strict && attw ./dist/*.tgz; premove ./dist/*.tgz",

‎packages/angular-query-experimental/tsup.config.ts‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,14 @@
2020
"compile": "tsc --build",
2121
"test:eslint": "eslint --concurrency=auto ./src",
2222
"test:types": "npm-run-all --serial test:types:*",
23-
"test:types:ts50": "node ../../node_modules/typescript50/lib/tsc.js --build",
24-
"test:types:ts51": "node ../../node_modules/typescript51/lib/tsc.js --build",
25-
"test:types:ts52": "node ../../node_modules/typescript52/lib/tsc.js --build",
26-
"test:types:ts53": "node ../../node_modules/typescript53/lib/tsc.js --build",
2723
"test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js --build",
2824
"test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js --build",
2925
"test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js --build",
3026
"test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js --build",
27+
"test:types:ts58": "node ../../node_modules/typescript58/lib/tsc.js --build",
28+
"test:types:ts59": "node ../../node_modules/typescript59/lib/tsc.js --build",
3129
"test:types:tscurrent": "tsc --build",
30+
"test:types:ts60": "node ../../node_modules/typescript60/lib/tsc.js --build",
3231
"test:lib": "vitest",
3332
"test:lib:dev": "pnpm run test:lib --watch",
3433
"test:build": "publint --strict && attw --pack",

‎packages/angular-query-persist-client/tsup.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export default defineConfig({
55
sourcemap: true,
66
clean: true,
77
format: ['esm'],
8-
dts: true,
8+
experimentalDts: true,
99
outDir: 'build',
1010
outExtension({ format }) {
1111
return format === 'esm' ? { js: '.mjs' } : { js: '.js' }

0 commit comments

Comments
 (0)