@tanstack/router-core 1.121.0-alpha.22 → 1.121.0-alpha.28

package/src/qss.ts

@@ -7,7 +7,6 @@
  * (namely URLSearchParams) and TypeScript while still
  * maintaining the original functionality and interface.
  */
-import { hasUriEncodedChars } from './utils'
 
 /**
  * Encodes an object into a query string.
@@ -42,11 +41,8 @@ export function encode(obj: any, pfx?: string) {
  * // Example input: toValue("123")
  * // Expected output: 123
  */
-function toValue(mix: any) {
-  if (!mix) return ''
-  const str = hasUriEncodedChars(mix)
-    ? decodeURIComponent(mix)
-    : decodeURIComponent(encodeURIComponent(mix))
+function toValue(str: unknown) {
+  if (!str) return ''
 
   if (str === 'false') return false
   if (str === 'true') return true

package/src/redirect.ts

@@ -73,6 +73,9 @@ export function redirect<
   }
 
   const headers = new Headers(opts.headers || {})
+  if (opts.href && headers.get('Location') === null) {
+    headers.set('Location', opts.href)
+  }
 
   const response = new Response(null, {
     status: opts.statusCode,

package/src/route.ts

@@ -8,6 +8,7 @@ import type { NavigateOptions, ParsePathParams } from './link'
 import type { ParsedLocation } from './location'
 import type {
   AnyRouteMatch,
+  MakePreValidationErrorHandlingRouteMatchUnion,
   MakeRouteMatchFromRoute,
   MakeRouteMatchUnion,
   RouteMatch,
@@ -612,7 +613,7 @@ export interface Route<
   _lazyPromise?: Promise<void>
   rank: number
   to: TrimPathRight<TFullPath>
-  init: (opts: { originalIndex: number; defaultSsr?: boolean }) => void
+  init: (opts: { originalIndex: number }) => void
   update: (
     options: UpdatableRouteOptions<
       TParentRoute,
@@ -823,6 +824,14 @@ export type FileBaseRouteOptions<
     ) => any
   >
 
+  ssr?:
+    | undefined
+    | boolean
+    | 'data-only'
+    | ((
+        ctx: SsrContextOptions<TParentRoute, TSearchValidator, TParams>,
+      ) => Awaitable<undefined | boolean | 'data-only'>)
+
   // This async function is called before a route is loaded.
   // If an error is thrown here, the route's loader will not be called.
   // If thrown during a navigation, the navigation will be cancelled and the error will be passed to the `onError` function.
@@ -927,6 +936,27 @@ export interface RouteContextOptions<
   context: Expand<RouteContextParameter<TParentRoute, TRouterContext>>
 }
 
+export interface SsrContextOptions<
+  in out TParentRoute extends AnyRoute,
+  in out TSearchValidator,
+  in out TParams,
+> {
+  params:
+    | {
+        status: 'success'
+        value: Expand<ResolveAllParamsFromParent<TParentRoute, TParams>>
+      }
+    | { status: 'error'; error: unknown }
+  search:
+    | {
+        status: 'success'
+        value: Expand<ResolveFullSearchSchema<TParentRoute, TSearchValidator>>
+      }
+    | { status: 'error'; error: unknown }
+  location: ParsedLocation
+  matches: Array<MakePreValidationErrorHandlingRouteMatchUnion>
+}
+
 export interface BeforeLoadContextOptions<
   in out TParentRoute extends AnyRoute,
   in out TSearchValidator,
@@ -1124,6 +1154,7 @@ export interface UpdatableRouteOptions<
     links?: AnyRouteMatch['links']
     scripts?: AnyRouteMatch['headScripts']
     meta?: AnyRouteMatch['meta']
+    styles?: AnyRouteMatch['styles']
   }>
   scripts?: (
     ctx: AssetFnContextOptions<
@@ -1139,7 +1170,6 @@ export interface UpdatableRouteOptions<
       TLoaderDeps
     >,
   ) => Awaitable<AnyRouteMatch['scripts']>
-  ssr?: boolean
   codeSplitGroupings?: Array<
     Array<
       | 'loader'
@@ -1205,6 +1235,13 @@ export interface LoaderFnContext<
   route: AnyRoute
 }
 
+export interface DefaultRootRouteOptionsExtensions {
+  shellComponent?: unknown
+}
+
+export interface RootRouteOptionsExtensions
+  extends DefaultRootRouteOptionsExtensions {}
+
 export type RootRouteOptions<
   TSearchValidator = undefined,
   TRouterContext = {},
@@ -1234,7 +1271,8 @@ export type RootRouteOptions<
   | 'parseParams'
   | 'stringifyParams'
   | 'params'
->
+> &
+  RootRouteOptionsExtensions
 
 export type RouteConstraints = {
   TParentRoute: AnyRoute
@@ -1279,8 +1317,8 @@ export type ErrorRouteProps = {
   reset: () => void
 }
 
-export type ErrorComponentProps = {
-  error: Error
+export type ErrorComponentProps<TError = Error> = {
+  error: TError
   info?: { componentStack: string }
   reset: () => void
 }
@@ -1327,7 +1365,6 @@ export class BaseRoute<
   private _path!: TPath
   private _fullPath!: TFullPath
   private _to!: TrimPathRight<TFullPath>
-  private _ssr!: boolean
 
   public get to() {
     return this._to
@@ -1345,10 +1382,6 @@ export class BaseRoute<
     return this._fullPath
   }
 
-  public get ssr() {
-    return this._ssr
-  }
-
   // Optional
   children?: TChildren
   originalIndex?: number
@@ -1417,7 +1450,7 @@ export class BaseRoute<
     TFileRouteTypes
   >
 
-  init = (opts: { originalIndex: number; defaultSsr?: boolean }): void => {
+  init = (opts: { originalIndex: number }): void => {
     this.originalIndex = opts.originalIndex
 
     const options = this.options as
@@ -1483,7 +1516,6 @@ export class BaseRoute<
     this._id = id as TId
     this._fullPath = fullPath as TFullPath
     this._to = fullPath as TrimPathRight<TFullPath>
-    this._ssr = options?.ssr ?? opts.defaultSsr ?? true
   }
 
   clone = (other: typeof this) => {
@@ -1491,7 +1523,6 @@ export class BaseRoute<
     this._id = other._id
     this._fullPath = other._fullPath
     this._to = other._to
-    this._ssr = other._ssr
     this.options.getParentRoute = other.options.getParentRoute
     this.children = other.children
   }