Skip to content

Commit d27ab12

Browse files
authored
Merge branch 'main' into test/react-query-useMutation-use-precise-time-advanceTimersByTimeAsync
2 parents 70130f5 + ed90d1a commit d27ab12

File tree

36 files changed

+1698
-4062
lines changed

36 files changed

+1698
-4062
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
run: |
6666
echo "COMMIT_SHA=${{ github.event.pull_request.head.sha || github.sha }}" >> $GITHUB_ENV
6767
- name: Preview Bundle Size
68-
uses: marocchino/sticky-pull-request-comment@52423e01640425a022ef5fd42c6fb5f633a02728
68+
uses: marocchino/sticky-pull-request-comment@28d58c4b5a5eae3bbe45348c3990dcbc2ffcdc69
6969
with:
7070
message: |
7171
Sizes for commit ${{ env.COMMIT_SHA }}:

docs/framework/react/guides/important-defaults.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Out of the box, TanStack Query is configured with **aggressive but sane** defaul
1010
> To change this behavior, you can configure your queries both globally and per-query using the `staleTime` option. Specifying a longer `staleTime` means queries will not refetch their data as often
1111
1212
- A Query that has a `staleTime` set is considered **fresh** until that `staleTime` has elapsed.
13-
1413
- set `staleTime` to e.g. `2 * 60 * 1000` to make sure data is read from the cache, without triggering any kinds of refetches, for 2 minutes, or until the Query is [invalidated manually](../query-invalidation.md).
1514
- set `staleTime` to `Infinity` to never trigger a refetch until the Query is [invalidated manually](../query-invalidation.md).
1615
- set `staleTime` to `'static'` to **never** trigger a refetch, even if the Query is [invalidated manually](../query-invalidation.md).

docs/framework/react/guides/optimistic-updates.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ If the mutation errors, the item will also disappear. But we could continue to s
6060

6161
### If the mutation and the query don't live in the same component
6262

63-
This approach works very well if the mutation and the query live in the same component, However, you also get access to all mutations in other components via the dedicated `useMutationState` hook. It is best combined with a `mutationKey`:
63+
This approach works very well if the mutation and the query live in the same component. However, you also get access to all mutations in other components via the dedicated `useMutationState` hook. It is best combined with a `mutationKey`:
6464

6565
[//]: # 'ExampleUI4'
6666

docs/framework/react/quick-start.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ function Todos() {
5353

5454
return (
5555
<div>
56-
<ul>{query.data?.map((todo) => <li key={todo.id}>{todo.title}</li>)}</ul>
56+
<ul>
57+
{query.data?.map((todo) => (
58+
<li key={todo.id}>{todo.title}</li>
59+
))}
60+
</ul>
5761

5862
<button
5963
onClick={() => {

docs/framework/react/reference/usePrefetchInfiniteQuery.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,17 @@ usePrefetchInfiniteQuery(options)
1212
You can pass everything to `usePrefetchInfiniteQuery` that you can pass to [`queryClient.prefetchInfiniteQuery`](../../../../reference/QueryClient.md#queryclientprefetchinfinitequery). Remember that some of them are required as below:
1313

1414
- `queryKey: QueryKey`
15-
1615
- **Required**
1716
- The query key to prefetch during render
1817

1918
- `queryFn: (context: QueryFunctionContext) => Promise<TData>`
20-
2119
- **Required, but only if no default query function has been defined** See [Default Query Function](../../guides/default-query-function.md) for more information.
2220

2321
- `initialPageParam: TPageParam`
24-
2522
- **Required**
2623
- The default page param to use when fetching the first page.
2724

2825
- `getNextPageParam: (lastPage, allPages, lastPageParam, allPageParams) => TPageParam | undefined | null`
29-
3026
- **Required**
3127
- When new data is received for this query, this function receives both the last page of the infinite list of data and the full array of all pages, as well as pageParam information.
3228
- It should return a **single variable** that will be passed as the last optional parameter to your query function.

docs/framework/react/reference/usePrefetchQuery.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ usePrefetchQuery(options)
1212
You can pass everything to `usePrefetchQuery` that you can pass to [`queryClient.prefetchQuery`](../../../../reference/QueryClient.md#queryclientprefetchquery). Remember that some of them are required as below:
1313

1414
- `queryKey: QueryKey`
15-
1615
- **Required**
1716
- The query key to prefetch during render
1817

docs/framework/solid/reference/useQuery.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ function App() {
187187
## `useQuery` Parameters
188188

189189
- ### Query Options - `Accessor<QueryOptions>`
190-
191190
- ##### `queryKey: unknown[]`
192191
- **Required**
193192
- The query key to use for this query.

examples/solid/astro/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"@tanstack/solid-query": "^5.83.0",
1919
"@tanstack/solid-query-devtools": "^5.83.0",
2020
"astro": "^5.5.6",
21-
"solid-js": "^1.9.5",
21+
"solid-js": "^1.9.7",
2222
"tailwindcss": "^3.4.7",
2323
"typescript": "5.8.3"
2424
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@tanstack/solid-query-devtools": "^5.83.0",
1313
"graphql": "^16.9.0",
1414
"graphql-request": "^7.1.2",
15-
"solid-js": "^1.9.5"
15+
"solid-js": "^1.9.7"
1616
},
1717
"devDependencies": {
1818
"typescript": "5.8.3",

examples/solid/basic/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"@tanstack/solid-query": "^5.83.0",
1212
"@tanstack/solid-query-devtools": "^5.83.0",
13-
"solid-js": "^1.9.5"
13+
"solid-js": "^1.9.7"
1414
},
1515
"devDependencies": {
1616
"typescript": "5.8.3",

0 commit comments

Comments
 (0)