@tanstack/router-core 1.157.9 → 1.157.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-core",
-  "version": "1.157.9",
+  "version": "1.157.11",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/redirect.ts

@@ -1,6 +1,7 @@
 import { SAFE_URL_PROTOCOLS, isDangerousProtocol } from './utils'
 import type { NavigateOptions } from './link'
 import type { AnyRouter, RegisteredRouter } from './router'
+import type { ParsedLocation } from './location'
 
 export type AnyRedirect = Redirect<any, any, any, any, any>
 
@@ -14,7 +15,13 @@ export type Redirect<
   TMaskFrom extends string = TFrom,
   TMaskTo extends string = '.',
 > = Response & {
-  options: NavigateOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>
+  options: NavigateOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & {
+    /**
+     * @internal
+     * A **trusted** built location that can be used to redirect to.
+     */
+    _builtLocation?: ParsedLocation
+  }
   redirectHandled?: boolean
 }
 
@@ -45,6 +52,11 @@ export type RedirectOptions<
    * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RedirectType#headers-property)
    */
   headers?: HeadersInit
+  /**
+   * @internal
+   * A **trusted** built location that can be used to redirect to.
+   */
+  _builtLocation?: ParsedLocation
 } & NavigateOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>
 
 export type ResolvedRedirect<
@@ -113,13 +125,21 @@ export function redirect<
   opts.statusCode = opts.statusCode || opts.code || 307
 
   // Block dangerous protocols in redirect href
-  if (typeof opts.href === 'string' && isDangerousProtocol(opts.href)) {
+  if (
+    !opts._builtLocation &&
+    typeof opts.href === 'string' &&
+    isDangerousProtocol(opts.href)
+  ) {
     throw new Error(
       `Redirect blocked: unsafe protocol in href "${opts.href}". Only ${SAFE_URL_PROTOCOLS.join(', ')} protocols are allowed.`,
     )
   }
 
-  if (!opts.reloadDocument && typeof opts.href === 'string') {
+  if (
+    !opts._builtLocation &&
+    !opts.reloadDocument &&
+    typeof opts.href === 'string'
+  ) {
     try {
       new URL(opts.href)
       opts.reloadDocument = true

package/src/router.ts

@@ -1821,16 +1821,8 @@ export class RouterCore<
           destMatchResult.routeParams['**']
         : trimPathRight(interpolatedNextTo)
 
-      let globalNotFoundRouteId: string | undefined
-      if (isGlobalNotFound) {
-        if (this.options.notFoundRoute) {
-          destRoutes = [...destRoutes, this.options.notFoundRoute]
-        } else {
-          globalNotFoundRouteId = findGlobalNotFoundRouteId(
-            this.options.notFoundMode,
-            destRoutes,
-          )
-        }
+      if (isGlobalNotFound && this.options.notFoundRoute) {
+        destRoutes = [...destRoutes, this.options.notFoundRoute]
       }
 
       // If there are any params, we need to stringify them
@@ -2292,8 +2284,11 @@ export class RouterCore<
       // always uses this.origin when constructing URLs
       if (this.latestLocation.publicHref !== nextLocation.publicHref) {
         const href = this.getParsedLocationHref(nextLocation)
-
-        throw redirect({ href })
+        if (nextLocation.external) {
+          throw redirect({ href })
+        } else {
+          throw redirect({ href, _builtLocation: nextLocation })
+        }
       }
     }
 
@@ -2622,8 +2617,9 @@ export class RouterCore<
   resolveRedirect = (redirect: AnyRedirect): AnyRedirect => {
     const locationHeader = redirect.headers.get('Location')
 
-    if (!redirect.options.href) {
-      const location = this.buildLocation(redirect.options)
+    if (!redirect.options.href || redirect.options._builtLocation) {
+      const location =
+        redirect.options._builtLocation ?? this.buildLocation(redirect.options)
       const href = this.getParsedLocationHref(location)
       redirect.options.href = href
       redirect.headers.set('Location', href)