Merge branch 'main' into fix/heda-content-utils

Author: jong-kyung

.devcontainer/devcontainer.json

@@ -0,0 +1,3 @@
+{
+  "image": "mcr.microsoft.com/devcontainers/typescript-node:24"
+}

benchmarks/bundle-size/package.json

@@ -20,11 +20,11 @@
     "@tanstack/router-plugin": "workspace:^",
     "@types/react": "^19.0.8",
     "@types/react-dom": "^19.0.3",
-    "@vitejs/plugin-react": "^4.3.4",
-    "@vitejs/plugin-vue": "^5.2.3",
-    "@vitejs/plugin-vue-jsx": "^4.1.2",
+    "@vitejs/plugin-react": "^6.0.1",
+    "@vitejs/plugin-vue": "^6.0.5",
+    "@vitejs/plugin-vue-jsx": "^5.1.5",
     "typescript": "^5.7.2",
-    "vite": "^7.3.1",
-    "vite-plugin-solid": "^2.11.10"
+    "vite": "^8.0.0",
+    "vite-plugin-solid": "^2.11.11"
   }
 }

benchmarks/client-nav/package.json

@@ -32,13 +32,13 @@
     "@platformatic/flame": "^1.6.0",
     "@codspeed/vitest-plugin": "^5.0.1",
     "@testing-library/react": "^16.2.0",
-    "@vitejs/plugin-react": "^4.3.4",
-    "@vitejs/plugin-vue": "^5.2.3",
-    "@vitejs/plugin-vue-jsx": "^4.1.2",
+    "@vitejs/plugin-react": "^6.0.1",
+    "@vitejs/plugin-vue": "^6.0.5",
+    "@vitejs/plugin-vue-jsx": "^5.1.5",
     "@types/jsdom": "28.0.0",
     "typescript": "^5.7.2",
-    "vite": "^7.3.1",
-    "vite-plugin-solid": "^2.11.10",
+    "vite": "^8.0.0",
+    "vite-plugin-solid": "^2.11.11",
     "vitest": "^4.0.17"
   },
   "nx": {

benchmarks/ssr/package.json

@@ -29,11 +29,11 @@
   },
   "devDependencies": {
     "@codspeed/vitest-plugin": "^5.0.1",
-    "@vitejs/plugin-react": "^4.3.4",
-    "@vitejs/plugin-vue-jsx": "^4.1.2",
+    "@vitejs/plugin-react": "^6.0.1",
+    "@vitejs/plugin-vue-jsx": "^5.1.5",
     "typescript": "^5.7.2",
-    "vite": "^7.3.1",
-    "vite-plugin-solid": "^2.11.10",
+    "vite": "^8.0.0",
+    "vite-plugin-solid": "^2.11.11",
     "vitest": "^4.0.17"
   },
   "nx": {

docs/router/api/router/RouterStateType.md

@@ -11,7 +11,6 @@ type RouterState = {
   isLoading: boolean
   isTransitioning: boolean
   matches: Array<RouteMatch>
-  pendingMatches: Array<RouteMatch>
   location: ParsedLocation
   resolvedLocation: ParsedLocation
 }
@@ -41,11 +40,6 @@ The `RouterState` type contains all of the properties that are available on the
 - Type: [`Array<RouteMatch>`](./RouteMatchType.md)
 - An array of all of the route matches that have been resolved and are currently active.
 
-### `pendingMatches` property
-
-- Type: [`Array<RouteMatch>`](./RouteMatchType.md)
-- An array of all of the route matches that are currently pending.
-
 ### `location` property
 
 - Type: [`ParsedLocation`](./ParsedLocationType.md)

docs/router/api/router/retainSearchParamsFunction.md

@@ -15,14 +15,14 @@ If `true` is passed in, all search params will be retained.
 ```tsx
 import { z } from 'zod'
 import { createRootRoute, retainSearchParams } from '@tanstack/react-router'
-import { zodValidator } from '@tanstack/zod-adapter'
 
 const searchSchema = z.object({
   rootValue: z.string().optional(),
 })
 
 export const Route = createRootRoute({
-  validateSearch: zodValidator(searchSchema),
+  // Use the schema directly for Zod v4
+  validateSearch: searchSchema,
   search: {
     middlewares: [retainSearchParams(['rootValue'])],
   },
@@ -32,15 +32,15 @@ export const Route = createRootRoute({
 ```tsx
 import { z } from 'zod'
 import { createFileRoute, retainSearchParams } from '@tanstack/react-router'
-import { zodValidator } from '@tanstack/zod-adapter'
 
 const searchSchema = z.object({
   one: z.string().optional(),
   two: z.string().optional(),
 })
 
 export const Route = createFileRoute('/')({
-  validateSearch: zodValidator(searchSchema),
+  // Use the schema directly for Zod v4
+  validateSearch: searchSchema,
   search: {
     middlewares: [retainSearchParams(true)],
   },

docs/router/api/router/stripSearchParamsFunction.md

@@ -18,7 +18,6 @@ title: Search middleware to strip search params
 ```tsx
 import { z } from 'zod'
 import { createFileRoute, stripSearchParams } from '@tanstack/react-router'
-import { zodValidator } from '@tanstack/zod-adapter'
 
 const defaultValues = {
   one: 'abc',
@@ -31,7 +30,8 @@ const searchSchema = z.object({
 })
 
 export const Route = createFileRoute('/')({
-  validateSearch: zodValidator(searchSchema),
+  // for Zod v4, use the schema directly
+  validateSearch: searchSchema,
   search: {
     // strip default values
     middlewares: [stripSearchParams(defaultValues)],
@@ -42,15 +42,15 @@ export const Route = createFileRoute('/')({
 ```tsx
 import { z } from 'zod'
 import { createRootRoute, stripSearchParams } from '@tanstack/react-router'
-import { zodValidator } from '@tanstack/zod-adapter'
 
 const searchSchema = z.object({
   hello: z.string().default('world'),
   requiredParam: z.string(),
 })
 
 export const Route = createRootRoute({
-  validateSearch: zodValidator(searchSchema),
+  // for Zod v4, use the schema directly
+  validateSearch: searchSchema,
   search: {
     // always remove `hello`
     middlewares: [stripSearchParams(['hello'])],
@@ -61,15 +61,15 @@ export const Route = createRootRoute({
 ```tsx
 import { z } from 'zod'
 import { createFileRoute, stripSearchParams } from '@tanstack/react-router'
-import { zodValidator } from '@tanstack/zod-adapter'
 
 const searchSchema = z.object({
   one: z.string().default('abc'),
   two: z.string().default('xyz'),
 })
 
 export const Route = createFileRoute('/')({
-  validateSearch: zodValidator(searchSchema),
+  // for Zod v4, use the schema directly
+  validateSearch: searchSchema,
   search: {
     // remove all search params
     middlewares: [stripSearchParams(true)],

docs/router/api/router/useChildMatchesHook.md

@@ -6,7 +6,7 @@ title: useChildMatches hook
 The `useChildMatches` hook returns all of the child [`RouteMatch`](./RouteMatchType.md) objects from the closest match down to the leaf-most match. **It does not include the current match, which can be obtained using the `useMatch` hook.**
 
 > [!IMPORTANT]
-> If the router has pending matches and they are showing their pending component fallbacks, `router.state.pendingMatches` will used instead of `router.state.matches`.
+> If the router has pending matches and they are showing their pending component fallbacks, pending matches are used instead of active matches.
 
 ## useChildMatches options
 

docs/router/api/router/useParentMatchesHook.md

@@ -6,7 +6,7 @@ title: useParentMatches hook
 The `useParentMatches` hook returns all of the parent [`RouteMatch`](./RouteMatchType.md) objects from the root down to the immediate parent of the current match in context. **It does not include the current match, which can be obtained using the `useMatch` hook.**
 
 > [!IMPORTANT]
-> If the router has pending matches and they are showing their pending component fallbacks, `router.state.pendingMatches` will used instead of `router.state.matches`.
+> If the router has pending matches and they are showing their pending component fallbacks, pending matches are used instead of active matches.
 
 ## useParentMatches options
 

docs/router/api/router/useRouterStateHook.md

@@ -6,7 +6,7 @@ title: useRouterState hook
 The `useRouterState` method is a hook that returns the current internal state of the router. This hook is useful for accessing the current state of the router in a component.
 
 > [!TIP]
-> If you want to access the current location or the current matches, you should try out the [`useLocation`](./useLocationHook.md) and [`useMatches`](./useMatchesHook.md) hooks first. These hooks are designed to be more ergonomic and easier to use than accessing the router state directly.
+> If you want to access the current location or the current matches, you should try out the [`useLocation`](./useLocationHook.md) and [`useMatches`](./useMatchesHook.md) hooks first. These hooks are designed to be more performant, more ergonomic and easier to use than accessing the router state directly.
 
 ## useRouterState options