Skip to content

Commit 778a06b

Browse files
swarnim02swarnim02
authored
Merge branch 'main' into fix/validation-types-circular-reference
2 parents c9b2554 + d7ba00c commit 778a06b

File tree

157 files changed

+457
-476
lines changed

Some content is hidden

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

157 files changed

+457
-476
lines changed

‎e2e/react-start/selective-ssr/src/routes/__root.tsx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ export const Route = createRootRoute({
4242
}
4343
},
4444
beforeLoad: ({ search }) => {
45-
if (typeof window !== 'undefined') {
46-
if (Route.options.ssr !== undefined) {
47-
const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
48-
console.error(error)
49-
throw new Error(error)
50-
}
51-
}
5245
console.log(
5346
`beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
5447
)

‎e2e/react-start/selective-ssr/src/routes/posts.$postId.tsx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts/$postId')({
1515
}
1616
},
1717
beforeLoad: ({ search }) => {
18-
if (typeof window !== 'undefined') {
19-
if (Route.options.ssr !== undefined) {
20-
const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
21-
console.error(error)
22-
throw new Error(error)
23-
}
24-
}
2518
console.log(
2619
`beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
2720
)

‎e2e/react-start/selective-ssr/src/routes/posts.tsx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts')({
1515
}
1616
},
1717
beforeLoad: ({ search }) => {
18-
if (typeof window !== 'undefined') {
19-
if (Route.options.ssr !== undefined) {
20-
const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
21-
console.error(error)
22-
throw new Error(error)
23-
}
24-
}
2518
console.log(
2619
`beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
2720
)

‎e2e/solid-start/selective-ssr/src/routes/__root.tsx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,6 @@ export const Route = createRootRoute({
4242
}
4343
},
4444
beforeLoad: ({ search }) => {
45-
if (typeof window !== 'undefined') {
46-
if (Route.options.ssr !== undefined) {
47-
const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
48-
console.error(error)
49-
throw new Error(error)
50-
}
51-
}
5245
console.log(
5346
`beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
5447
)

‎e2e/solid-start/selective-ssr/src/routes/posts.$postId.tsx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts/$postId')({
1515
}
1616
},
1717
beforeLoad: ({ search }) => {
18-
if (typeof window !== 'undefined') {
19-
if (Route.options.ssr !== undefined) {
20-
const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
21-
console.error(error)
22-
throw new Error(error)
23-
}
24-
}
2518
console.log(
2619
`beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
2720
)

‎e2e/solid-start/selective-ssr/src/routes/posts.tsx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ export const Route = createFileRoute('/posts')({
1515
}
1616
},
1717
beforeLoad: ({ search }) => {
18-
if (typeof window !== 'undefined') {
19-
if (Route.options.ssr !== undefined) {
20-
const error = `ssr() for ${Route.id} should have been deleted from the Route options on the client`
21-
console.error(error)
22-
throw new Error(error)
23-
}
24-
}
2518
console.log(
2619
`beforeLoad for ${Route.id} called on the ${typeof window !== 'undefined' ? 'client' : 'server'}`,
2720
)

‎examples/react/authenticated-routes-firebase/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"dependencies": {
1212
"@tailwindcss/postcss": "^4.1.15",
13-
"@tanstack/react-router": "^1.139.3",
14-
"@tanstack/react-router-devtools": "^1.139.3",
15-
"@tanstack/router-plugin": "^1.139.4",
13+
"@tanstack/react-router": "^1.139.6",
14+
"@tanstack/react-router-devtools": "^1.139.6",
15+
"@tanstack/router-plugin": "^1.139.6",
1616
"firebase": "^11.4.0",
1717
"postcss": "^8.5.1",
1818
"react": "^19.0.0",

‎examples/react/authenticated-routes/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"dependencies": {
1212
"@tailwindcss/postcss": "^4.1.15",
13-
"@tanstack/react-router": "^1.139.3",
14-
"@tanstack/react-router-devtools": "^1.139.3",
15-
"@tanstack/router-plugin": "^1.139.4",
13+
"@tanstack/react-router": "^1.139.6",
14+
"@tanstack/react-router-devtools": "^1.139.6",
15+
"@tanstack/router-plugin": "^1.139.6",
1616
"postcss": "^8.5.1",
1717
"react": "^19.0.0",
1818
"react-dom": "^19.0.0",

‎examples/react/basic-default-search-params/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"dependencies": {
1212
"@tailwindcss/postcss": "^4.1.15",
1313
"@tanstack/react-query": "^5.90.0",
14-
"@tanstack/react-router": "^1.139.3",
15-
"@tanstack/react-router-devtools": "^1.139.3",
14+
"@tanstack/react-router": "^1.139.6",
15+
"@tanstack/react-router-devtools": "^1.139.6",
1616
"postcss": "^8.5.1",
1717
"react": "^19.0.0",
1818
"react-dom": "^19.0.0",

‎examples/react/basic-devtools-panel/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"dependencies": {
1212
"@tailwindcss/postcss": "^4.1.15",
1313
"@tanstack/react-query-devtools": "^5.67.2",
14-
"@tanstack/react-router": "^1.139.3",
15-
"@tanstack/react-router-devtools": "^1.139.3",
14+
"@tanstack/react-router": "^1.139.6",
15+
"@tanstack/react-router-devtools": "^1.139.6",
1616
"postcss": "^8.5.1",
1717
"react": "^19.0.0",
1818
"react-dom": "^19.0.0",

0 commit comments

Comments
 (0)