Skip to content

Commit bb2b6f7

Browse files
KevinVandyKevinVandy
committed
Merge branch 'main' into kylemathews/db
2 parents aed8d71 + 05bffe1 commit bb2b6f7

30 files changed

Lines changed: 534 additions & 594 deletions

‎.tanstack-start/server-routes/routeTree.gen.ts‎

Lines changed: 92 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,40 +19,114 @@ import {
1919
createServerFileRoute,
2020
} from '@tanstack/react-start/server'
2121

22+
import { ServerRoute as LibraryIdVersionDocsChar123Char125DotmdRouteImport } from './../../src/routes/$libraryId/$version.docs.{$}[.]md'
23+
import { ServerRoute as LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRouteImport } from './../../src/routes/$libraryId/$version.docs.framework.$framework.{$}[.]md'
24+
2225
// Create/Update Routes
2326

2427
const rootRoute = createServerRoute()
2528

29+
const LibraryIdVersionDocsChar123Char125DotmdRoute =
30+
LibraryIdVersionDocsChar123Char125DotmdRouteImport.update({
31+
id: '/$libraryId/$version/docs/{$}.md',
32+
path: '/$libraryId/$version/docs/{$}.md',
33+
getParentRoute: () => rootRoute,
34+
} as any)
35+
36+
const LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRoute =
37+
LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRouteImport.update({
38+
id: '/$libraryId/$version/docs/framework/$framework/{$}.md',
39+
path: '/$libraryId/$version/docs/framework/$framework/{$}.md',
40+
getParentRoute: () => rootRoute,
41+
} as any)
42+
2643
// Populate the FileRoutesByPath interface
2744

2845
declare module '@tanstack/react-start/server' {
29-
interface FileRoutesByPath {}
46+
interface FileRoutesByPath {
47+
'/$libraryId/$version/docs/{$}.md': {
48+
id: '/$libraryId/$version/docs/{$}.md'
49+
path: '/$libraryId/$version/docs/{$}.md'
50+
fullPath: '/$libraryId/$version/docs/{$}.md'
51+
preLoaderRoute: typeof LibraryIdVersionDocsChar123Char125DotmdRouteImport
52+
parentRoute: typeof rootRoute
53+
}
54+
'/$libraryId/$version/docs/framework/$framework/{$}.md': {
55+
id: '/$libraryId/$version/docs/framework/$framework/{$}.md'
56+
path: '/$libraryId/$version/docs/framework/$framework/{$}.md'
57+
fullPath: '/$libraryId/$version/docs/framework/$framework/{$}.md'
58+
preLoaderRoute: typeof LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRouteImport
59+
parentRoute: typeof rootRoute
60+
}
61+
}
3062
}
3163

3264
// Add type-safety to the createFileRoute function across the route tree
3365

66+
declare module './../../src/routes/$libraryId/$version.docs.{$}[.]md' {
67+
const createServerFileRoute: CreateServerFileRoute<
68+
FileRoutesByPath['/$libraryId/$version/docs/{$}.md']['parentRoute'],
69+
FileRoutesByPath['/$libraryId/$version/docs/{$}.md']['id'],
70+
FileRoutesByPath['/$libraryId/$version/docs/{$}.md']['path'],
71+
FileRoutesByPath['/$libraryId/$version/docs/{$}.md']['fullPath'],
72+
unknown
73+
>
74+
}
75+
declare module './../../src/routes/$libraryId/$version.docs.framework.$framework.{$}[.]md' {
76+
const createServerFileRoute: CreateServerFileRoute<
77+
FileRoutesByPath['/$libraryId/$version/docs/framework/$framework/{$}.md']['parentRoute'],
78+
FileRoutesByPath['/$libraryId/$version/docs/framework/$framework/{$}.md']['id'],
79+
FileRoutesByPath['/$libraryId/$version/docs/framework/$framework/{$}.md']['path'],
80+
FileRoutesByPath['/$libraryId/$version/docs/framework/$framework/{$}.md']['fullPath'],
81+
unknown
82+
>
83+
}
84+
3485
// Create and export the route tree
3586

36-
export interface FileRoutesByFullPath {}
87+
export interface FileRoutesByFullPath {
88+
'/$libraryId/$version/docs/{$}.md': typeof LibraryIdVersionDocsChar123Char125DotmdRoute
89+
'/$libraryId/$version/docs/framework/$framework/{$}.md': typeof LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRoute
90+
}
3791

38-
export interface FileRoutesByTo {}
92+
export interface FileRoutesByTo {
93+
'/$libraryId/$version/docs/{$}.md': typeof LibraryIdVersionDocsChar123Char125DotmdRoute
94+
'/$libraryId/$version/docs/framework/$framework/{$}.md': typeof LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRoute
95+
}
3996

4097
export interface FileRoutesById {
4198
__root__: typeof rootRoute
99+
'/$libraryId/$version/docs/{$}.md': typeof LibraryIdVersionDocsChar123Char125DotmdRoute
100+
'/$libraryId/$version/docs/framework/$framework/{$}.md': typeof LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRoute
42101
}
43102

44103
export interface FileRouteTypes {
45104
fileRoutesByFullPath: FileRoutesByFullPath
46-
fullPaths: never
105+
fullPaths:
106+
| '/$libraryId/$version/docs/{$}.md'
107+
| '/$libraryId/$version/docs/framework/$framework/{$}.md'
47108
fileRoutesByTo: FileRoutesByTo
48-
to: never
49-
id: '__root__'
109+
to:
110+
| '/$libraryId/$version/docs/{$}.md'
111+
| '/$libraryId/$version/docs/framework/$framework/{$}.md'
112+
id:
113+
| '__root__'
114+
| '/$libraryId/$version/docs/{$}.md'
115+
| '/$libraryId/$version/docs/framework/$framework/{$}.md'
50116
fileRoutesById: FileRoutesById
51117
}
52118

53-
export interface RootRouteChildren {}
119+
export interface RootRouteChildren {
120+
LibraryIdVersionDocsChar123Char125DotmdRoute: typeof LibraryIdVersionDocsChar123Char125DotmdRoute
121+
LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRoute: typeof LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRoute
122+
}
54123

55-
const rootRouteChildren: RootRouteChildren = {}
124+
const rootRouteChildren: RootRouteChildren = {
125+
LibraryIdVersionDocsChar123Char125DotmdRoute:
126+
LibraryIdVersionDocsChar123Char125DotmdRoute,
127+
LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRoute:
128+
LibraryIdVersionDocsFrameworkFrameworkChar123Char125DotmdRoute,
129+
}
56130

57131
export const routeTree = rootRoute
58132
._addFileChildren(rootRouteChildren)
@@ -63,7 +137,16 @@ export const routeTree = rootRoute
63137
"routes": {
64138
"__root__": {
65139
"filePath": "__root.tsx",
66-
"children": []
140+
"children": [
141+
"/$libraryId/$version/docs/{$}.md",
142+
"/$libraryId/$version/docs/framework/$framework/{$}.md"
143+
]
144+
},
145+
"/$libraryId/$version/docs/{$}.md": {
146+
"filePath": "$libraryId/$version.docs.{$}[.]md.tsx"
147+
},
148+
"/$libraryId/$version/docs/framework/$framework/{$}.md": {
149+
"filePath": "$libraryId/$version.docs.framework.$framework.{$}[.]md.tsx"
67150
}
68151
}
69152
}

‎content-collections.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ const posts = defineCollection({
1616
...post,
1717
slug: post._meta.path,
1818
excerpt: frontMatter.excerpt,
19+
description: frontMatter.data.description,
1920
content,
2021
}
2122
},

‎package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
"@tanstack/pacer": "^0.2.0",
3636
"@tanstack/react-pacer": "^0.2.0",
3737
"@tanstack/react-query": "^5.66.0",
38-
"@tanstack/react-router": "1.120.4-alpha.13",
39-
"@tanstack/react-router-with-query": "1.120.4-alpha.13",
40-
"@tanstack/react-start": "1.120.4-alpha.13",
41-
"@tanstack/react-router-devtools": "1.120.4-alpha.13",
38+
"@tanstack/react-router": "1.121.0-alpha.11",
39+
"@tanstack/react-router-devtools": "1.121.0-alpha.11",
40+
"@tanstack/react-router-with-query": "1.121.0-alpha.11",
41+
"@tanstack/react-start": "1.121.0-alpha.11",
4242
"@types/d3": "^7.4.3",
4343
"@typescript-eslint/parser": "^7.2.0",
4444
"@vercel/analytics": "^1.2.2",

0 commit comments

Comments
 (0)