Skip to content

Commit dbd7a8e

Browse files
authored
Merge branch 'main' into test-2255
2 parents 6b8a715 + 227dd03 commit dbd7a8e

File tree

1,360 files changed

+37692
-14858
lines changed

Some content is hidden

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

1,360 files changed

+37692
-14858
lines changed

.github/labeler.yml

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
'package: arktype-adapter':
2+
- 'packages/arktype-adapter/**/*'
3+
'package: create-router':
4+
- 'packages/create-router/**/*'
5+
'package: create-start':
6+
- 'packages/create-start/**/*'
7+
'package: directive-functions-plugin':
8+
- 'packages/directive-functions-plugin/**/*'
9+
'package: eslint-plugin-router':
10+
- 'packages/eslint-plugin-router/**/*'
11+
'package: history':
12+
- 'packages/history/**/*'
13+
'package: react-cross-context':
14+
- 'packages/react-cross-context/**/*'
15+
'package: react-router':
16+
- 'packages/react-router/**/*'
17+
'package: react-router-with-query':
18+
- 'packages/react-router-with-query/**/*'
19+
'package: router-cli':
20+
- 'packages/router-cli/**/*'
21+
'package: router-core':
22+
- 'packages/router-core/**/*'
23+
'package: router-devtools':
24+
- 'packages/router-devtools/**/*'
25+
'package: router-generator':
26+
- 'packages/router-generator/**/*'
27+
'package: router-plugin':
28+
- 'packages/router-plugin/**/*'
29+
'package: router-utils':
30+
- 'packages/router-utils/**/*'
31+
'package: router-vite-plugin':
32+
- 'packages/router-vite-plugin/**/*'
33+
'package: server-functions-plugin':
34+
- 'packages/server-functions-plugin/**/*'
35+
'package: start':
36+
- 'packages/start/**/*'
37+
'package: start-api-routes':
38+
- 'packages/start-api-routes/**/*'
39+
'package: start-client':
40+
- 'packages/start-client/**/*'
41+
'package: start-config':
42+
- 'packages/start-config/**/*'
43+
'package: start-plugin':
44+
- 'packages/start-plugin/**/*'
45+
'package: start-router-manifest':
46+
- 'packages/start-router-manifest/**/*'
47+
'package: start-server':
48+
- 'packages/start-server/**/*'
49+
'package: start-server-functions-client':
50+
- 'packages/start-server-functions-client/**/*'
51+
'package: start-server-functions-fetcher':
52+
- 'packages/start-server-functions-fetcher/**/*'
53+
'package: start-server-functions-handler':
54+
- 'packages/start-server-functions-handler/**/*'
55+
'package: start-server-functions-server':
56+
- 'packages/start-server-functions-server/**/*'
57+
'package: start-server-functions-ssr':
58+
- 'packages/start-server-functions-ssr/**/*'
59+
'package: valibot-adapter':
60+
- 'packages/valibot-adapter/**/*'
61+
'package: virtual-file-routes':
62+
- 'packages/virtual-file-routes/**/*'
63+
'package: zod-adapter':
64+
- 'packages/zod-adapter/**/*'
65+
'documentation':
66+
- 'docs/**/*'

.github/workflows/autofix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
- name: Fix formatting
2525
run: pnpm prettier:write
2626
- name: Apply fixes
27-
uses: autofix-ci/action@ff86a557419858bb967097bfc916833f5647fa8c
27+
uses: autofix-ci/action@551dded8c6cc8a1054039c8bc0b8b48c51dfc6ef
2828
with:
2929
commit-message: 'ci: apply automated fixes'

.github/workflows/labeler.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Labeler
2+
3+
on:
4+
- pull_request_target
5+
6+
jobs:
7+
triage:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/[email protected]
11+
with:
12+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20.15.1
1+
20.17.0

.prettierignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,5 @@ pnpm-lock.yaml
1313
node_modules
1414

1515
**/test-results
16-
**/tests/generator/file-modification/routes/(test)/*
16+
**/tests/generator/file-modification/routes/(test)/*
17+
/.nx/workspace-data

README.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,15 @@ Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Quer
3030

3131
## Partners
3232

33-
<div><a href="https://vercel.com?utm_source=tanstack">
34-
<img alt="Vercel" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/vercel.svg" height="40"
33+
<div><a href="https://convex.dev?utm_source=tanstack">
34+
<img alt="Convex" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/convex.svg" height="40"
3535
</a></div><br />
3636
<div><a href="https://go.clerk.com/wOwHtuJ">
3737
<img alt="Clerk" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/clerk.svg" height="40"
3838
</a></div><br />
3939
<div><a href="https://ag-grid.com/react-data-grid/?utm_source=reacttable&utm_campaign=githubreacttable">
4040
<img alt="AG Grid" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/ag-grid.svg" height="40"
4141
</a></div><br />
42-
<div><a href="https://convex.dev?utm_source=tanstack">
43-
<img alt="Convex" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/convex.svg" height="40"
44-
</a></div><br />
4542
<div><a href="https://sentry.io?utm_source=tanstack">
4643
<img alt="Sentry" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/sentry.svg" height="40"
4744
</a></div><br />
@@ -81,4 +78,4 @@ Enjoy this library? Try the entire [TanStack](https://tanstack.com)! [React Quer
8178

8279
To run example React projects with Tanstack Router, see [CONTRIBUTING.md](./CONTRIBUTING.md)
8380

84-
<!-- Use the force, Luke!! -->
81+
<!-- Use the force, Luke!!!! -->

docs/framework/react/api/router/DeferredPromiseType.md

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

docs/framework/react/api/router/NavigateOptionsType.md

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

docs/framework/react/api/router/useBlockerHook.md

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

docs/assets/search-serialization-deserialization-idempotency.jpg renamed to docs/router/assets/search-serialization-deserialization-idempotency.jpg

File renamed without changes.

0 commit comments

Comments
 (0)