Skip to content

Commit 0b074af

Browse files
committed
Merge branch 'main' into fix/vue-query-useBaseQuery-prevent-dual-error-propagation
2 parents 4ecefd7 + 24de260 commit 0b074af

422 files changed

Lines changed: 20751 additions & 9397 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.

.changeset/config.json

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,36 @@
88
"access": "public",
99
"baseBranch": "main",
1010
"updateInternalDependencies": "patch",
11-
"fixed": [],
11+
"fixed": [
12+
[
13+
"@tanstack/angular-query-experimental",
14+
"@tanstack/angular-query-persist-client",
15+
"@tanstack/eslint-plugin-query",
16+
"@tanstack/preact-query",
17+
"@tanstack/preact-query-devtools",
18+
"@tanstack/preact-query-persist-client",
19+
"@tanstack/query-async-storage-persister",
20+
"@tanstack/query-broadcast-client-experimental",
21+
"@tanstack/query-core",
22+
"@tanstack/query-devtools",
23+
"@tanstack/query-persist-client-core",
24+
"@tanstack/query-sync-storage-persister",
25+
"@tanstack/react-query",
26+
"@tanstack/react-query-devtools",
27+
"@tanstack/react-query-next-experimental",
28+
"@tanstack/react-query-persist-client",
29+
"@tanstack/solid-query",
30+
"@tanstack/solid-query-devtools",
31+
"@tanstack/solid-query-persist-client",
32+
"@tanstack/vue-query"
33+
],
34+
[
35+
"@tanstack/vue-query-devtools",
36+
"@tanstack/svelte-query",
37+
"@tanstack/svelte-query-devtools",
38+
"@tanstack/svelte-query-persist-client"
39+
]
40+
],
1241
"linked": [],
1342
"ignore": [],
1443
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {

.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",

.github/workflows/autofix.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: autofix.ci # needed to securely identify the workflow
33
on:
44
pull_request:
55
push:
6-
branches: [main, alpha, beta, rc, v4]
6+
branches: [main, 'v[0-9]', '*-pre', '*-maint']
77

88
concurrency:
99
group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
@@ -18,11 +18,9 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout
21-
uses: actions/checkout@v6.0.1
22-
with:
23-
fetch-depth: 0
21+
uses: actions/checkout@v6.0.2
2422
- name: Setup Tools
25-
uses: tanstack/config/.github/setup@main
23+
uses: TanStack/config/.github/setup@main
2624
- name: Fix formatting
2725
run: pnpm run format
2826
- name: Apply fixes

.github/workflows/detect-agent.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: Detect Agent
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
workflow_dispatch: {}
7+
8+
permissions:
9+
issues: write
10+
pull-requests: write
11+
12+
jobs:
13+
detect:
14+
if: github.event_name != 'workflow_dispatch'
15+
uses: bombshell-dev/automation/.github/workflows/detect-agent.yml@a1553cebd9318d416f6a8e9f38f363b6aaa19c72
16+
17+
backfill:
18+
if: github.event_name == 'workflow_dispatch'
19+
uses: bombshell-dev/automation/.github/workflows/detect-agent-backfill.yml@a1553cebd9318d416f6a8e9f38f363b6aaa19c72

.github/workflows/labeler.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
name: Labeler
22

33
on:
4-
- pull_request_target
4+
pull_request_target:
55

66
permissions:
77
contents: read
88
pull-requests: write
99

1010
jobs:
1111
labeler:
12+
name: Labeler
1213
runs-on: ubuntu-latest
1314
steps:
14-
- uses: actions/labeler@v5.0.0
15+
- name: Labeler
16+
uses: actions/labeler@v6.0.1
1517
with:
1618
repo-token: ${{ secrets.GITHUB_TOKEN }}
1719
configuration-path: labeler-config.yml

.github/workflows/pr.yml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,21 @@ env:
1313
permissions:
1414
contents: read
1515
pull-requests: write
16+
issues: write
1617

1718
jobs:
1819
test:
1920
name: Test
2021
runs-on: ubuntu-latest
2122
steps:
2223
- name: Checkout
23-
uses: actions/checkout@v6.0.1
24+
uses: actions/checkout@v6.0.2
2425
with:
2526
fetch-depth: 0
2627
- name: Start Nx Agents
2728
run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml"
2829
- name: Setup Tools
29-
uses: tanstack/config/.github/setup@main
30+
uses: TanStack/config/.github/setup@main
3031
- name: Get base and head commits for `nx affected`
3132
uses: nrwl/nx-set-shas@v4.4.0
3233
with:
@@ -41,11 +42,9 @@ jobs:
4142
runs-on: ubuntu-latest
4243
steps:
4344
- name: Checkout
44-
uses: actions/checkout@v6.0.1
45-
with:
46-
fetch-depth: 0
45+
uses: actions/checkout@v6.0.2
4746
- name: Setup Tools
48-
uses: tanstack/config/.github/setup@main
47+
uses: TanStack/config/.github/setup@main
4948
- name: Build Packages
5049
run: pnpm run build:all
5150
- name: Publish Previews
@@ -65,10 +64,18 @@ jobs:
6564
runs-on: ubuntu-latest
6665
steps:
6766
- name: Checkout
68-
uses: actions/checkout@v6.0.1
69-
with:
70-
fetch-depth: 0
67+
uses: actions/checkout@v6.0.2
7168
- name: Check Provenance
7269
uses: danielroe/provenance-action@v0.1.1
7370
with:
7471
fail-on-downgrade: true
72+
version-preview:
73+
name: Version Preview
74+
runs-on: ubuntu-latest
75+
steps:
76+
- name: Checkout
77+
uses: actions/checkout@v6.0.2
78+
- name: Setup Tools
79+
uses: TanStack/config/.github/setup@main
80+
- name: Changeset Preview
81+
uses: TanStack/config/.github/changeset-preview@main

.github/workflows/release.yml

Lines changed: 30 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ name: Release
22

33
on:
44
push:
5-
branches: [main, alpha, beta, rc, v4]
6-
repository_dispatch:
7-
types: [release]
5+
branches: [main, 'v[0-9]', '*-pre', '*-maint']
86

97
concurrency:
10-
group: ${{ github.workflow }}-${{ github.event.number || github.ref }}
11-
cancel-in-progress: true
8+
group: ${{ github.workflow }}-${{ github.ref }}
9+
cancel-in-progress: false
1210

1311
env:
1412
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
@@ -21,54 +19,43 @@ permissions:
2119
jobs:
2220
release:
2321
name: Release
24-
if: github.repository_owner == 'TanStack'
2522
runs-on: ubuntu-latest
2623
steps:
2724
- name: Checkout
28-
uses: actions/checkout@v6.0.1
25+
uses: actions/checkout@v6.0.2
2926
with:
3027
fetch-depth: 0
31-
- name: Start Nx Agents
32-
run: npx nx-cloud start-ci-run --distribute-on=".nx/workflows/dynamic-changesets.yaml"
3328
- name: Setup Tools
34-
uses: tanstack/config/.github/setup@main
35-
- name: Run Tests
36-
run: pnpm run test:ci
37-
- name: Stop Nx Agents
38-
if: ${{ always() }}
39-
run: npx nx-cloud stop-all-agents
40-
# - name: Check for Changesets marked as major
41-
# id: major
42-
# run: |
43-
# echo "found=false" >> $GITHUB_OUTPUT
44-
# regex="(major)"
45-
# shopt -s nullglob
46-
# for file in .changeset/*.md; do
47-
# if [[ $(cat $file) =~ $regex ]]; then
48-
# echo "found=true" >> $GITHUB_OUTPUT
49-
# fi
50-
# done
51-
- name: Run Changesets (version or publish)
29+
uses: TanStack/config/.github/setup@main
30+
- name: Run Build
31+
run: pnpm run build:all
32+
- name: Determine dist-tag
33+
id: dist-tag
34+
run: |
35+
BRANCH="${GITHUB_REF_NAME}"
36+
if [[ "$BRANCH" == *-pre ]]; then
37+
echo "prerelease=true" >> "$GITHUB_OUTPUT"
38+
echo "tag=pre" >> "$GITHUB_OUTPUT"
39+
elif [[ "$BRANCH" == *-maint ]]; then
40+
echo "tag=maint" >> "$GITHUB_OUTPUT"
41+
elif [[ "$BRANCH" =~ ^v[0-9]+$ ]]; then
42+
echo "tag=$BRANCH" >> "$GITHUB_OUTPUT"
43+
else
44+
echo "latest=true" >> "$GITHUB_OUTPUT"
45+
fi
46+
- name: Create Release Pull Request or Publish
5247
id: changesets
53-
uses: changesets/action@v1.5.3
48+
uses: changesets/action@v1
5449
with:
5550
version: pnpm run changeset:version
56-
publish: pnpm run changeset:publish
57-
commit: 'ci: Version Packages'
51+
publish: pnpm run changeset:publish ${{ steps.dist-tag.outputs.tag && format('--tag {0}', steps.dist-tag.outputs.tag) }}
5852
title: 'ci: Version Packages'
53+
commit: 'ci: changeset release'
5954
env:
6055
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61-
# - name: Auto-merge Changesets PR
62-
# if: steps.changesets.outputs.hasChangesets == 'true' && steps.major.outputs.found == 'false'
63-
# run: |
64-
# gh pr merge --squash "$PR_NUMBER"
65-
# gh api --method POST /repos/$REPO/dispatches -f 'event_type=release'
66-
# env:
67-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
68-
# REPO: ${{ github.repository }}
69-
# PR_NUMBER: ${{ steps.changesets.outputs.pullRequestNumber }}
70-
- name: Comment on PRs about release
56+
- name: Create GitHub Release
7157
if: steps.changesets.outputs.published == 'true'
72-
uses: tanstack/config/.github/comment-on-release@main
73-
with:
74-
published-packages: ${{ steps.changesets.outputs.publishedPackages }}
58+
run: node scripts/create-github-release.mjs ${{ steps.dist-tag.outputs.prerelease == 'true' && '--prerelease' }} ${{ steps.dist-tag.outputs.latest == 'true' && '--latest' }}
59+
env:
60+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

docs/community-resources.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ others:
133133
{
134134
title: 'Hey API',
135135
url: 'https://heyapi.dev/openapi-ts/plugins/tanstack-query',
136-
description: 'The OpenAPI to TypeScript codegen. Generate clients, SDKs, validators, and more.',
136+
description: 'OpenAPI to TypeScript codegen. Production-ready SDKs, Zod schemas, TanStack Query hooks, and 20+ plugins. Used by Vercel, OpenCode, and PayPal.',
137137
},
138138
{
139139
title: 'Kubb',
@@ -175,6 +175,11 @@ others:
175175
url: 'https://github.com/rametta/rapini',
176176
description: '🥬 OpenAPI to React Query (or SWR) & Axios',
177177
},
178+
{
179+
title: 'React Query Visualizer',
180+
url: 'https://marketplace.visualstudio.com/items?itemName=fe-dudu.react-query-visualizer',
181+
description: 'VS Code extension for TanStack Query (React Query): visualize query keys, cache invalidation/refetch flows, and file impact graph',
182+
},
178183
{
179184
title: 'Tanstack Query Visualizer',
180185
url: 'https://tanstack-query-visualizer.sofi.coop/',

docs/config.json

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,10 @@
246246
"label": "Window Focus Refetching",
247247
"to": "framework/react/guides/window-focus-refetching"
248248
},
249+
{
250+
"label": "Polling",
251+
"to": "framework/react/guides/polling"
252+
},
249253
{
250254
"label": "Disabling/Pausing Queries",
251255
"to": "framework/react/guides/disabling-queries"
@@ -399,6 +403,10 @@
399403
"label": "Window Focus Refetching",
400404
"to": "framework/solid/guides/window-focus-refetching"
401405
},
406+
{
407+
"label": "Polling",
408+
"to": "framework/solid/guides/polling"
409+
},
402410
{
403411
"label": "Disabling/Pausing Queries",
404412
"to": "framework/solid/guides/disabling-queries"
@@ -536,6 +544,10 @@
536544
"label": "Window Focus Refetching",
537545
"to": "framework/vue/guides/window-focus-refetching"
538546
},
547+
{
548+
"label": "Polling",
549+
"to": "framework/vue/guides/polling"
550+
},
539551
{
540552
"label": "Disabling/Pausing Queries",
541553
"to": "framework/vue/guides/disabling-queries"
@@ -913,6 +925,10 @@
913925
"label": "onlineManager",
914926
"to": "reference/onlineManager"
915927
},
928+
{
929+
"label": "environmentManager",
930+
"to": "reference/environmentManager"
931+
},
916932
{
917933
"label": "notifyManager",
918934
"to": "reference/notifyManager"
@@ -1051,6 +1067,18 @@
10511067
"label": "infiniteQueryOptions",
10521068
"to": "framework/vue/reference/infiniteQueryOptions"
10531069
},
1070+
{
1071+
"label": "mutationOptions",
1072+
"to": "framework/vue/reference/mutationOptions"
1073+
},
1074+
{
1075+
"label": "usePrefetchQuery",
1076+
"to": "framework/vue/reference/usePrefetchQuery"
1077+
},
1078+
{
1079+
"label": "usePrefetchInfiniteQuery",
1080+
"to": "framework/vue/reference/usePrefetchInfiniteQuery"
1081+
},
10541082
{
10551083
"label": "hydration",
10561084
"to": "framework/vue/reference/hydration"
@@ -1096,6 +1124,10 @@
10961124
"label": "infiniteQueryOptions",
10971125
"to": "framework/solid/reference/infiniteQueryOptions"
10981126
},
1127+
{
1128+
"label": "mutationOptions",
1129+
"to": "framework/solid/reference/mutationOptions"
1130+
},
10991131
{
11001132
"label": "hydration",
11011133
"to": "framework/solid/reference/hydration"
@@ -1249,7 +1281,7 @@
12491281
},
12501282
{
12511283
"label": "hydration",
1252-
"to": "framework/react/reference/functions/HydrationBoundary"
1284+
"to": "framework/preact/reference/functions/HydrationBoundary"
12531285
}
12541286
]
12551287
}
@@ -1289,6 +1321,10 @@
12891321
{
12901322
"label": "Mutation Property Order",
12911323
"to": "eslint/mutation-property-order"
1324+
},
1325+
{
1326+
"label": "Prefer Query Options",
1327+
"to": "eslint/prefer-query-options"
12921328
}
12931329
]
12941330
},

0 commit comments

Comments
 (0)