@tanstack/router-core 1.141.1 → 1.141.2

package/dist/cjs/router.d.cts

@@ -643,6 +643,7 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
      *   on the next `load()` call (eg. after HMR or a manual invalidation).
      */
     invalidate: InvalidateFn<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>>;
+    getParsedLocationHref: (location: ParsedLocation) => string;
     resolveRedirect: (redirect: AnyRedirect) => AnyRedirect;
     clearCache: ClearCacheFn<this>;
     clearExpiredCache: () => void;

package/dist/esm/location.d.ts

@@ -37,14 +37,14 @@ export interface ParsedLocation<TSearchObj extends AnySchema = {}> {
     unmaskOnReload?: boolean;
     /**
      * @private
-     * @description The public href of the location, including the origin before any rewrites.
+     * @description The public href of the location.
      * If a rewrite is applied, the `href` property will be the rewritten URL.
      */
     publicHref: string;
     /**
      * @private
-     * @description The full URL of the location, including the origin.
+     * @description The full URL of the location.
      * @private
      */
-    url: string;
+    url: URL;
 }

package/dist/esm/router.d.ts

@@ -643,6 +643,7 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
      *   on the next `load()` call (eg. after HMR or a manual invalidation).
      */
     invalidate: InvalidateFn<RouterCore<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory, TDehydrated>>;
+    getParsedLocationHref: (location: ParsedLocation) => string;
     resolveRedirect: (redirect: AnyRedirect) => AnyRedirect;
     clearCache: ClearCacheFn<this>;
     clearExpiredCache: () => void;

package/dist/esm/router.js

@@ -206,15 +206,14 @@ class RouterCore {
         const searchStr = this.options.stringifySearch(parsedSearch);
         url.search = searchStr;
         const fullPath = url.href.replace(url.origin, "");
-        const { pathname, hash } = url;
         return {
           href: fullPath,
           publicHref: href,
-          url: url.href,
-          pathname: decodePath(pathname),
+          url,
+          pathname: decodePath(url.pathname),
           searchStr,
           search: replaceEqualDeep(previousLocation?.search, parsedSearch),
-          hash: hash.split("#").reverse()[0] ?? "",
+          hash: url.hash.split("#").reverse()[0] ?? "",
           state: replaceEqualDeep(previousLocation?.state, state)
         };
       };
@@ -375,7 +374,7 @@ class RouterCore {
         return {
           publicHref: rewrittenUrl.pathname + rewrittenUrl.search + rewrittenUrl.hash,
           href: fullPath,
-          url: rewrittenUrl.href,
+          url: rewrittenUrl,
           pathname: nextPathname,
           search: nextSearch,
           searchStr,
@@ -454,7 +453,16 @@ class RouterCore {
       if (isSameUrl && isSameState()) {
         this.load();
       } else {
-        let { maskedLocation, hashScrollIntoView, ...nextHistory } = next;
+        let {
+          // eslint-disable-next-line prefer-const
+          maskedLocation,
+          // eslint-disable-next-line prefer-const
+          hashScrollIntoView,
+          // don't pass url into history since it is a URL instance that cannot be serialized
+          // eslint-disable-next-line prefer-const
+          url: _url,
+          ...nextHistory
+        } = next;
         if (maskedLocation) {
           nextHistory = {
             ...maskedLocation,
@@ -542,7 +550,7 @@ class RouterCore {
       if (reloadDocument) {
         if (!href) {
           const location = this.buildLocation({ to, ...rest });
-          href = location.url;
+          href = location.url.href;
         }
         if (!rest.ignoreBlocker) {
           const historyWithBlockers = this.history;
@@ -587,18 +595,8 @@ class RouterCore {
           state: true,
           _includeValidateSearch: true
         });
-        const normalizeUrl = (url) => {
-          try {
-            return encodeURI(decodeURI(url));
-          } catch {
-            return url;
-          }
-        };
-        if (trimPath(normalizeUrl(this.latestLocation.href)) !== trimPath(normalizeUrl(nextLocation.href))) {
-          let href = nextLocation.url;
-          if (this.origin && href.startsWith(this.origin)) {
-            href = href.replace(this.origin, "") || "/";
-          }
+        if (this.latestLocation.publicHref !== nextLocation.publicHref || nextLocation.url.origin !== this.origin) {
+          const href = this.getParsedLocationHref(nextLocation);
           throw redirect({ href });
         }
       }
@@ -817,13 +815,17 @@ class RouterCore {
       this.shouldViewTransition = false;
       return this.load({ sync: opts?.sync });
     };
+    this.getParsedLocationHref = (location) => {
+      let href = location.url.href;
+      if (this.origin && location.url.origin === this.origin) {
+        href = href.replace(this.origin, "") || "/";
+      }
+      return href;
+    };
     this.resolveRedirect = (redirect2) => {
       if (!redirect2.options.href) {
         const location = this.buildLocation(redirect2.options);
-        let href = location.url;
-        if (this.origin && href.startsWith(this.origin)) {
-          href = href.replace(this.origin, "") || "/";
-        }
+        const href = this.getParsedLocationHref(location);
         redirect2.options.href = location.href;
         redirect2.headers.set("Location", href);
       }