@tanstack/router-core 1.156.0 → 1.157.1

package/dist/esm/location.d.ts

@@ -43,8 +43,7 @@ export interface ParsedLocation<TSearchObj extends AnySchema = {}> {
     publicHref: string;
     /**
      * @private
-     * @description The full URL of the location.
-     * @private
+     * @description Whether the publicHref is external (different origin from rewrite).
      */
-    url: URL;
+    external: boolean;
 }

package/dist/esm/router.js

@@ -1,6 +1,6 @@
 import { Store, batch } from "@tanstack/store";
 import { createBrowserHistory, parseHref } from "@tanstack/history";
-import { createControlledPromise, isDangerousProtocol, deepEqual, replaceEqualDeep, last, decodePath, functionalUpdate, findLast } from "./utils.js";
+import { createControlledPromise, isDangerousProtocol, deepEqual, replaceEqualDeep, last, decodePath, functionalUpdate, findLast, encodeNonAscii } from "./utils.js";
 import { processRouteTree, processRouteMasks, findSingleMatch, findRouteMatch, findFlatMatch } from "./new-process-route-tree.js";
 import { compileDecodeCharMap, trimPath, resolvePath, cleanPath, trimPathRight, interpolatePath } from "./path.js";
 import { createLRUCache } from "./lru-cache.js";
@@ -134,7 +134,8 @@ class RouterCore {
       if (basepathChanged || rewriteChanged) {
         this.basepath = nextBasepath;
         const rewrites = [];
-        if (trimPath(nextBasepath) !== "") {
+        const trimmed = trimPath(nextBasepath);
+        if (trimmed && trimmed !== "/") {
           rewrites.push(
             rewriteBasepath({
               basepath: nextBasepath
@@ -214,8 +215,8 @@ class RouterCore {
         return {
           href: fullPath,
           publicHref: href,
-          url,
           pathname: decodePath(url.pathname),
+          external: !!this.rewrite && url.origin !== this.origin,
           searchStr,
           search: replaceEqualDeep(previousLocation?.search, parsedSearch),
           hash: decodePath(url.hash.split("#").reverse()[0] ?? ""),
@@ -380,17 +381,32 @@ class RouterCore {
         let nextState = dest.state === true ? currentLocation.state : dest.state ? functionalUpdate(dest.state, currentLocation.state) : {};
         nextState = replaceEqualDeep(currentLocation.state, nextState);
         const fullPath = `${nextPathname}${searchStr}${hashStr}`;
-        const url = new URL(fullPath, this.origin);
-        const rewrittenUrl = executeRewriteOutput(this.rewrite, url);
+        let href;
+        let publicHref;
+        let external = false;
+        if (this.rewrite) {
+          const url = new URL(fullPath, this.origin);
+          const rewrittenUrl = executeRewriteOutput(this.rewrite, url);
+          href = url.href.replace(url.origin, "");
+          if (rewrittenUrl.origin !== this.origin) {
+            publicHref = rewrittenUrl.href;
+            external = true;
+          } else {
+            publicHref = rewrittenUrl.pathname + rewrittenUrl.search + rewrittenUrl.hash;
+          }
+        } else {
+          href = encodeNonAscii(fullPath);
+          publicHref = href;
+        }
         return {
-          publicHref: rewrittenUrl.pathname + rewrittenUrl.search + rewrittenUrl.hash,
-          href: fullPath,
-          url: rewrittenUrl,
+          publicHref,
+          href,
           pathname: nextPathname,
           search: nextSearch,
           searchStr,
           state: nextState,
           hash: hash ?? "",
+          external,
           unmaskOnReload: dest.unmaskOnReload
         };
       };
@@ -469,9 +485,6 @@ class RouterCore {
           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) {
@@ -573,8 +586,8 @@ class RouterCore {
       if (reloadDocument) {
         if (to !== void 0 || !href) {
           const location = this.buildLocation({ to, ...rest });
-          href = href ?? location.url.href;
-          publicHref = publicHref ?? location.url.href;
+          href = href ?? location.publicHref;
+          publicHref = publicHref ?? location.publicHref;
         }
         const reloadHref = !hrefIsUrl && publicHref ? publicHref : href;
         if (isDangerousProtocol(reloadHref)) {
@@ -628,7 +641,7 @@ class RouterCore {
           state: true,
           _includeValidateSearch: true
         });
-        if (this.latestLocation.publicHref !== nextLocation.publicHref || nextLocation.url.origin !== this.origin) {
+        if (this.latestLocation.publicHref !== nextLocation.publicHref) {
           const href = this.getParsedLocationHref(nextLocation);
           throw redirect({ href });
         }
@@ -849,11 +862,7 @@ class RouterCore {
       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;
+      return location.publicHref || "/";
     };
     this.resolveRedirect = (redirect2) => {
       const locationHeader = redirect2.headers.get("Location");