@tanstack/router-core 1.133.12 → 1.133.15

package/src/router.ts

@@ -1162,7 +1162,6 @@ export class RouterCore<
         maskedLocation: location,
       }
     }
-
     return location
   }
 
@@ -1966,7 +1965,12 @@ export class RouterCore<
         trimPath(normalizeUrl(this.latestLocation.href)) !==
         trimPath(normalizeUrl(nextLocation.href))
       ) {
-        throw redirect({ href: nextLocation.href })
+        let href = nextLocation.url
+        if (this.origin && href.startsWith(this.origin)) {
+          href = href.replace(this.origin, '') || '/'
+        }
+
+        throw redirect({ href })
       }
     }
 
@@ -2131,10 +2135,16 @@ export class RouterCore<
       await this.latestLoadPromise
     }
 
+    let newStatusCode: number | undefined = undefined
     if (this.hasNotFoundMatch()) {
+      newStatusCode = 404
+    } else if (this.__store.state.matches.some((d) => d.status === 'error')) {
+      newStatusCode = 500
+    }
+    if (newStatusCode !== undefined) {
       this.__store.setState((s) => ({
         ...s,
-        statusCode: 404,
+        statusCode: newStatusCode,
       }))
     }
   }