Skip to content

Commit 1c3303b

Browse files
committed
merge
2 parents eeeaeda + 6e183ba commit 1c3303b

File tree

3,957 files changed

+150719
-49741
lines changed

Some content is hidden

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

3,957 files changed

+150719
-49741
lines changed

.github/labeler.yml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
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-router':
14+
- 'packages/react-router/**/*'
15+
'package: react-router-devtools':
16+
- 'packages/react-router-devtools/**/*'
17+
'package: react-router-with-query':
18+
- 'packages/react-router-with-query/**/*'
19+
'package: react-start':
20+
- 'packages/react-start/**/*'
21+
'package: start-api-routes':
22+
- 'packages/start-api-routes/**/*'
23+
'package: react-start-client':
24+
- 'packages/react-start-client/**/*'
25+
'package: react-start-config':
26+
- 'packages/react-start-config/**/*'
27+
'package: react-start-plugin':
28+
- 'packages/react-start-plugin/**/*'
29+
'package: react-start-router-manifest':
30+
- 'packages/react-start-router-manifest/**/*'
31+
'package: react-start-server':
32+
- 'packages/react-start-server/**/*'
33+
'package: start-server-functions-client':
34+
- 'packages/start-server-functions-client/**/*'
35+
'package: start-server-functions-fetcher':
36+
- 'packages/start-server-functions-fetcher/**/*'
37+
'package: start-server-functions-handler':
38+
- 'packages/start-server-functions-handler/**/*'
39+
'package: start-server-functions-ssr':
40+
- 'packages/start-server-functions-ssr/**/*'
41+
'package: router-cli':
42+
- 'packages/router-cli/**/*'
43+
'package: router-core':
44+
- 'packages/router-core/**/*'
45+
'package: router-devtools':
46+
- 'packages/router-devtools/**/*'
47+
'package: router-devtools-core':
48+
- 'packages/router-devtools-core/**/*'
49+
'package: router-generator':
50+
- 'packages/router-generator/**/*'
51+
'package: router-plugin':
52+
- 'packages/router-plugin/**/*'
53+
'package: router-utils':
54+
- 'packages/router-utils/**/*'
55+
'package: router-vite-plugin':
56+
- 'packages/router-vite-plugin/**/*'
57+
'package: server-functions-plugin':
58+
- 'packages/server-functions-plugin/**/*'
59+
'package: solid-router':
60+
- 'packages/solid-router/**/*'
61+
'package: solid-router-devtools':
62+
- 'packages/solid-router-devtools/**/*'
63+
'package: solid-start':
64+
- 'packages/solid-start/**/*'
65+
'package: solid-start-client':
66+
- 'packages/solid-start-client/**/*'
67+
'package: solid-start-config':
68+
- 'packages/solid-start-config/**/*'
69+
'package: solid-start-plugin':
70+
- 'packages/solid-start-plugin/**/*'
71+
'package: solid-start-router-manifest':
72+
- 'packages/solid-start-router-manifest/**/*'
73+
'package: solid-start-server':
74+
- 'packages/solid-start-server/**/*'
75+
'package: start':
76+
- 'packages/start/**/*'
77+
'package: start-config':
78+
- 'packages/start-config/**/*'
79+
'package: start-server-functions-server':
80+
- 'packages/start-server-functions-server/**/*'
81+
'package: valibot-adapter':
82+
- 'packages/valibot-adapter/**/*'
83+
'package: virtual-file-routes':
84+
- 'packages/virtual-file-routes/**/*'
85+
'package: zod-adapter':
86+
- 'packages/zod-adapter/**/*'
87+
'documentation':
88+
- 'docs/**/*'

.github/renovate.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"@types/node",
2121
"@types/react",
2222
"@types/react-dom",
23+
"h3",
2324
"node",
2425
"react",
2526
"react-dom",

.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/labeler@v4.3.0
11+
with:
12+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,4 @@ jobs:
4848
- name: Build Packages
4949
run: pnpm run build:all
5050
- name: Publish Previews
51-
run: pnpx pkg-pr-new publish --pnpm --compact './packages/*' --template './examples/*/*'
51+
run: pnpx pkg-pr-new publish --pnpm './packages/*' --template './examples/*/*'

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ ts-perf
5555
.netlify
5656

5757
nx-cloud.env
58-
.vscode
5958
.nx/cache
6059
.nx/workspace-data
6160

@@ -74,3 +73,7 @@ app.config.js.timestamp_*
7473
app.config.ts.timestamp_*
7574
.idea
7675
*.vitest-temp.json
76+
77+
# Handling VSCode settings
78+
/.vscode/
79+
!/examples/react/**/.vscode/settings.json

.prettierignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ node_modules
1414

1515
**/test-results
1616
**/tests/generator/file-modification/routes/(test)/*
17+
**/tests/generator/no-formatted-route-tree/routeTree.snapshot.ts
1718
/.nx/workspace-data

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
- `pnpm install`
1212
- This installs dependencies for all of the packages in the monorepo, even examples!
1313
- Dependencies inside of the packages and examples are automatically linked together as local/dynamic dependencies.
14+
- Install test dependencies
15+
- `pnpm exec playwright install` (required for e2e tests)
1416
- Run the build or dev watcher
1517
- `pnpm build:all` (build all packages) or
1618
- `pnpm build` (cached build with [nx affected](https://nx.dev/nx-api/nx/documents/affected)) or

README.md

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

3131
## Partners
3232

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"
35-
</a></div><br />
3633
<div><a href="https://go.clerk.com/wOwHtuJ">
3734
<img alt="Clerk" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/clerk.svg" height="40"
3835
</a></div><br />
3936
<div><a href="https://ag-grid.com/react-data-grid/?utm_source=reacttable&utm_campaign=githubreacttable">
4037
<img alt="AG Grid" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/ag-grid.svg" height="40"
4138
</a></div><br />
39+
<div><a href="https://netlify.com?utm_source=tanstack">
40+
<img alt="Netlify" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/netlify.svg" height="40"
41+
</a></div><br />
42+
<div><a href="https://neon.tech?utm_source=tanstack">
43+
<img alt="Neon" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/neon.svg" height="40"
44+
</a></div><br />
45+
<div><a href="https://convex.dev?utm_source=tanstack">
46+
<img alt="Convex" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/convex.svg" height="40"
47+
</a></div><br />
4248
<div><a href="https://sentry.io?utm_source=tanstack">
4349
<img alt="Sentry" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/sentry.svg" height="40"
4450
</a></div><br />
51+
<div><a href="https://speakeasy.com/?utm_source=tanstack&utm_campaign=tanstack">
52+
<img alt="Speakeasy" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/speakeasy.svg" height="40"
53+
</a></div><br />
4554
<div><a href="https://nozzle.io/?utm_source=tanstack&utm_campaign=tanstack">
4655
<img alt="Nozzle.io" src="https://raw.githubusercontent.com/tannerlinsley/files/master/partners/nozzle.svg" height="40"
4756
</a></div><br />

0 commit comments

Comments
 (0)