Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into upgrade-typescript
Browse files Browse the repository at this point in the history
  • Loading branch information
@chorobin
chorobin committed Dec 2, 2024
2 parents 5cacb38 + 8f1d437 commit 70b4210
Show file tree
Hide file tree
Showing 86 changed files with 1,140 additions and 1,073 deletions.
8 changes: 4 additions & 4 deletions docs/framework/react/guide/file-based-routing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ Both flat and directory routes can be mixed together to create a route tree that

Dynamic path params can be used in both flat and directory routes to create routes that can match a dynamic segment of the URL path. Dynamic path params are denoted by the `$` character in the filename:

| Filename | Route Path | Component Output |
| --------------------- | ---------------- | --------------------------- |
| ... | ... | ... |
| ʦ `posts.$postId.tsx` | `/posts/$postId` | `<Root><Posts><Post><Post>` |
| Filename | Route Path | Component Output |
| --------------------- | ---------------- | --------------------- |
| ... | ... | ... |
| ʦ `posts.$postId.tsx` | `/posts/$postId` | `<Root><Posts><Post>` |

We'll learn more about dynamic path params in the [Path Params](./path-params.md) guide.

Expand Down
2 changes: 1 addition & 1 deletion docs/framework/react/start/getting-started.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Once configuration is done, we'll have a file tree that looks like the following
## The Router Configuration

This is the file that will dictate the behavior of TanStack Router used within Start. Here, you can configure everything
from the default [preloading functionality](./preloading.md) to [caching staleness](./data-loading.md).
from the default [preloading functionality](../guide/preloading.md) to [caching staleness](../guide/data-loading.md).

```tsx
// app/router.tsx
Expand Down
2 changes: 1 addition & 1 deletion e2e/react-router/basic-file-based-code-splitting/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@playwright/test": "^1.49.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"vite": "^5.4.11"
}
}
2 changes: 1 addition & 1 deletion e2e/react-router/basic-file-based/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@playwright/test": "^1.49.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"vite": "^5.4.11"
}
}
6 changes: 3 additions & 3 deletions e2e/react-router/basic-react-query-file-based/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
"@tanstack/react-query": "^5.61.3",
"@tanstack/react-query-devtools": "^5.61.3",
"@tanstack/react-query": "^5.62.0",
"@tanstack/react-query-devtools": "^5.62.0",
"@tanstack/react-router": "workspace:^",
"@tanstack/router-devtools": "workspace:^",
"@tanstack/router-plugin": "workspace:^",
Expand All @@ -24,7 +24,7 @@
"@playwright/test": "^1.49.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"vite": "^5.4.11"
}
}
6 changes: 3 additions & 3 deletions e2e/react-router/basic-react-query/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
"@tanstack/react-query": "^5.61.3",
"@tanstack/react-query-devtools": "^5.61.3",
"@tanstack/react-query": "^5.62.0",
"@tanstack/react-query-devtools": "^5.62.0",
"@tanstack/react-router": "workspace:^",
"@tanstack/router-devtools": "workspace:^",
"react": "^18.2.0",
Expand All @@ -22,7 +22,7 @@
"@playwright/test": "^1.49.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"vite": "^5.4.11"
}
}
2 changes: 1 addition & 1 deletion e2e/react-router/basic-scroll-restoration/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@playwright/test": "^1.49.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"vite": "^5.4.11"
}
}
2 changes: 1 addition & 1 deletion e2e/react-router/basic-virtual-file-based/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"@playwright/test": "^1.49.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"vite": "^5.4.11"
}
}
2 changes: 1 addition & 1 deletion e2e/react-router/basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@playwright/test": "^1.49.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"vite": "^5.4.11"
}
}
6 changes: 3 additions & 3 deletions e2e/react-router/scroll-restoration-sandbox-vite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
"zod": "^3.23.8"
},
"devDependencies": {
"@playwright/test": "^1.45.3",
"@playwright/test": "^1.49.0",
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.1",
"vite": "^5.3.5"
"@vitejs/plugin-react": "^4.3.4",
"vite": "^5.4.11"
}
}
2 changes: 1 addition & 1 deletion e2e/start/basic-auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@types/node": "^22.5.4",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.21",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.15",
Expand Down
6 changes: 3 additions & 3 deletions e2e/start/basic-react-query/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"test:e2e": "playwright test --project=chromium"
},
"dependencies": {
"@tanstack/react-query": "^5.61.3",
"@tanstack/react-query-devtools": "^5.61.3",
"@tanstack/react-query": "^5.62.0",
"@tanstack/react-query-devtools": "^5.62.0",
"@tanstack/react-router": "workspace:^",
"@tanstack/react-router-with-query": "workspace:^",
"@tanstack/router-devtools": "workspace:^",
Expand All @@ -27,7 +27,7 @@
"@types/node": "^22.5.4",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.21",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.15",
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic-rsc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"devDependencies": {
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.21",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.15",
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@types/node": "^22.5.4",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.21",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.15",
Expand Down
4 changes: 2 additions & 2 deletions e2e/start/clerk-basic/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"test:e2e": "exit 0; playwright test --project=chromium"
},
"dependencies": {
"@clerk/tanstack-start": "0.5.3",
"@clerk/tanstack-start": "0.5.4",
"@tanstack/react-router": "workspace:^",
"@tanstack/router-devtools": "workspace:^",
"@tanstack/start": "workspace:^",
Expand All @@ -27,7 +27,7 @@
"@types/node": "^22.5.4",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.21",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.15",
Expand Down
2 changes: 1 addition & 1 deletion e2e/start/website/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"@types/node": "^22.5.4",
"@types/react": "^18.2.65",
"@types/react-dom": "^18.2.21",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20",
"postcss": "^8.4.49",
"tailwindcss": "^3.4.15",
Expand Down
8 changes: 4 additions & 4 deletions examples/react/authenticated-routes/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.85.0",
"@tanstack/router-devtools": "^1.85.0",
"@tanstack/router-plugin": "^1.84.4",
"@tanstack/react-router": "^1.85.2",
"@tanstack/router-devtools": "^1.85.2",
"@tanstack/router-plugin": "^1.85.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"redaxios": "^0.5.1",
Expand All @@ -20,7 +20,7 @@
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
"vite": "^5.4.11"
}
Expand Down
8 changes: 4 additions & 4 deletions examples/react/basic-default-search-params/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-query": "^5.61.3",
"@tanstack/react-router": "^1.85.0",
"@tanstack/router-devtools": "^1.85.0",
"@tanstack/react-query": "^5.62.0",
"@tanstack/react-router": "^1.85.2",
"@tanstack/router-devtools": "^1.85.2",
"redaxios": "^0.5.1",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -20,7 +20,7 @@
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
"vite": "^5.4.11"
}
Expand Down
8 changes: 4 additions & 4 deletions examples/react/basic-file-based-codesplitting/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.85.0",
"@tanstack/router-devtools": "^1.85.0",
"@tanstack/router-plugin": "^1.84.4",
"@tanstack/react-router": "^1.85.2",
"@tanstack/router-devtools": "^1.85.2",
"@tanstack/router-plugin": "^1.85.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"redaxios": "^0.5.1",
Expand All @@ -20,7 +20,7 @@
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
"vite": "^5.4.11"
}
Expand Down
8 changes: 4 additions & 4 deletions examples/react/basic-file-based/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-router": "^1.85.0",
"@tanstack/router-devtools": "^1.85.0",
"@tanstack/router-plugin": "^1.84.4",
"@tanstack/react-router": "^1.85.2",
"@tanstack/router-devtools": "^1.85.2",
"@tanstack/router-plugin": "^1.85.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"redaxios": "^0.5.1",
Expand All @@ -20,7 +20,7 @@
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
"vite": "^5.4.11"
}
Expand Down
12 changes: 6 additions & 6 deletions examples/react/basic-react-query-file-based/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-query": "^5.61.3",
"@tanstack/react-query-devtools": "^5.61.3",
"@tanstack/react-router": "^1.85.0",
"@tanstack/router-devtools": "^1.85.0",
"@tanstack/router-plugin": "^1.84.4",
"@tanstack/react-query": "^5.62.0",
"@tanstack/react-query-devtools": "^5.62.0",
"@tanstack/react-router": "^1.85.2",
"@tanstack/router-devtools": "^1.85.2",
"@tanstack/router-plugin": "^1.85.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"redaxios": "^0.5.1",
Expand All @@ -22,7 +22,7 @@
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
"vite": "^5.4.11"
}
Expand Down
10 changes: 5 additions & 5 deletions examples/react/basic-react-query/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
"start": "vite"
},
"dependencies": {
"@tanstack/react-query": "^5.61.3",
"@tanstack/react-query-devtools": "^5.61.3",
"@tanstack/react-router": "^1.85.0",
"@tanstack/router-devtools": "^1.85.0",
"@tanstack/react-query": "^5.62.0",
"@tanstack/react-query-devtools": "^5.62.0",
"@tanstack/react-router": "^1.85.2",
"@tanstack/router-devtools": "^1.85.2",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"redaxios": "^0.5.1"
},
"devDependencies": {
"@types/react": "^18.2.47",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
"vite": "^5.4.11"
}
Expand Down
10 changes: 5 additions & 5 deletions examples/react/basic-ssr-file-based/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"debug": "node --inspect-brk server"
},
"dependencies": {
"@tanstack/react-router": "^1.85.0",
"@tanstack/router-devtools": "^1.85.0",
"@tanstack/router-plugin": "^1.84.4",
"@tanstack/start": "^1.85.0",
"@tanstack/react-router": "^1.85.2",
"@tanstack/router-devtools": "^1.85.2",
"@tanstack/router-plugin": "^1.85.2",
"@tanstack/start": "^1.85.2",
"get-port": "^7.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -25,7 +25,7 @@
"@babel/generator": "^7.26.2",
"@rollup/plugin-babel": "^6.0.4",
"@types/express": "^4.17.21",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
"compression": "^1.7.5",
"express": "^4.21.1",
Expand Down
10 changes: 5 additions & 5 deletions examples/react/basic-ssr-streaming-file-based/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
"debug": "node --inspect-brk server"
},
"dependencies": {
"@tanstack/react-router": "^1.85.0",
"@tanstack/router-devtools": "^1.85.0",
"@tanstack/router-plugin": "^1.84.4",
"@tanstack/start": "^1.85.0",
"@tanstack/react-router": "^1.85.2",
"@tanstack/router-devtools": "^1.85.2",
"@tanstack/router-plugin": "^1.85.2",
"@tanstack/start": "^1.85.2",
"get-port": "^7.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -26,7 +26,7 @@
"@babel/generator": "^7.26.2",
"@rollup/plugin-babel": "^6.0.4",
"@types/express": "^4.17.21",
"@vitejs/plugin-react": "^4.3.3",
"@vitejs/plugin-react": "^4.3.4",
"typescript": "^5.7.2",
"compression": "^1.7.5",
"express": "^4.21.1",
Expand Down
Loading

0 comments on commit 70b4210

Please sign in to comment.