@tanstack/router-core 1.132.30 → 1.132.33

package/dist/cjs/router.d.cts

@@ -181,18 +181,6 @@ export interface RouterOptions<TRouteTree extends AnyRoute, TTrailingSlashOption
     routeTree?: TRouteTree;
     /**
      * The basepath for then entire router. This is useful for mounting a router instance at a subpath.
-     *
-     * @deprecated - use `rewrite.input` with the new `rewriteBasepath` utility instead:
-     * ```ts
-     * const router = createRouter({
-     *   routeTree,
-     *   rewrite: rewriteBasepath('/basepath')
-     *   // Or wrap existing rewrite functionality
-     *   rewrite: rewriteBasepath('/basepath', {
-     *     output: ({ url }) => {...},
-     *     input: ({ url }) => {...},
-     *   })
-     * })
      * ```
      * @default '/'
      * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#basepath-property)
@@ -349,8 +337,8 @@ export interface RouterOptions<TRouteTree extends AnyRoute, TTrailingSlashOption
      * Configures how the router will rewrite the location between the actual href and the internal href of the router.
      *
      * @default undefined
-     * @description You can provide a custom rewrite pair (in/out) or use the utilities like `rewriteBasepath` as a convenience for common use cases, or even do both!
-     * This is useful for basepath rewriting, shifting data from the origin to the path (for things like )
+     * @description You can provide a custom rewrite pair (in/out).
+     * This is useful for shifting data from the origin to the path (for things like subdomain routing), or other advanced use cases.
      */
     rewrite?: LocationRewrite;
     origin?: string;
@@ -361,14 +349,12 @@ export interface RouterOptions<TRouteTree extends AnyRoute, TTrailingSlashOption
 export type LocationRewrite = {
     /**
      * A function that will be called to rewrite the URL before it is interpreted by the router from the history instance.
-     * Utilities like `rewriteBasepath` are provided as a convenience for common use cases.
      *
      * @default undefined
      */
     input?: LocationRewriteFunction;
     /**
      * A function that will be called to rewrite the URL before it is committed to the actual history instance from the router.
-     * Utilities like `rewriteBasepath` are provided as a convenience for common use cases.
      *
      * @default undefined
      */

package/dist/esm/index.d.ts

@@ -46,5 +46,5 @@ export type { ValidateFromPath, ValidateToPath, ValidateSearch, ValidateParams,
 export type { AnySerializationAdapter, SerializationAdapter, ValidateSerializableInput, ValidateSerializableInputResult, SerializerExtensions, ValidateSerializable, RegisteredSerializableInput, SerializableExtensions, DefaultSerializable, Serializable, } from './ssr/serializer/transformer.js';
 export { createSerializationAdapter, makeSerovalPlugin, makeSsrSerovalPlugin, } from './ssr/serializer/transformer.js';
 export { defaultSerovalPlugins } from './ssr/serializer/seroval-plugins.js';
-export { rewriteBasepath, composeRewrites, executeRewriteInput, executeRewriteOutput, } from './rewrite.js';
+export { composeRewrites, executeRewriteInput, executeRewriteOutput, } from './rewrite.js';
 export type { LocationRewrite, LocationRewriteFunction } from './router.js';

package/dist/esm/index.js

@@ -17,7 +17,7 @@ import { isNotFound, notFound } from "./not-found.js";
 import { defaultGetScrollRestorationKey, getCssSelector, handleHashScroll, restoreScroll, scrollRestorationCache, setupScrollRestoration, storageKey } from "./scroll-restoration.js";
 import { createSerializationAdapter, makeSerovalPlugin, makeSsrSerovalPlugin } from "./ssr/serializer/transformer.js";
 import { defaultSerovalPlugins } from "./ssr/serializer/seroval-plugins.js";
-import { composeRewrites, executeRewriteInput, executeRewriteOutput, rewriteBasepath } from "./rewrite.js";
+import { composeRewrites, executeRewriteInput, executeRewriteOutput } from "./rewrite.js";
 export {
   BaseRootRoute,
   BaseRoute,
@@ -77,7 +77,6 @@ export {
   resolvePath,
   restoreScroll,
   retainSearchParams,
-  rewriteBasepath,
   rootRouteId,
   scrollRestorationCache,
   setupScrollRestoration,

package/dist/esm/router.d.ts

@@ -181,18 +181,6 @@ export interface RouterOptions<TRouteTree extends AnyRoute, TTrailingSlashOption
     routeTree?: TRouteTree;
     /**
      * The basepath for then entire router. This is useful for mounting a router instance at a subpath.
-     *
-     * @deprecated - use `rewrite.input` with the new `rewriteBasepath` utility instead:
-     * ```ts
-     * const router = createRouter({
-     *   routeTree,
-     *   rewrite: rewriteBasepath('/basepath')
-     *   // Or wrap existing rewrite functionality
-     *   rewrite: rewriteBasepath('/basepath', {
-     *     output: ({ url }) => {...},
-     *     input: ({ url }) => {...},
-     *   })
-     * })
      * ```
      * @default '/'
      * @link [API Docs](https://tanstack.com/router/latest/docs/framework/react/api/router/RouterOptionsType#basepath-property)
@@ -349,8 +337,8 @@ export interface RouterOptions<TRouteTree extends AnyRoute, TTrailingSlashOption
      * Configures how the router will rewrite the location between the actual href and the internal href of the router.
      *
      * @default undefined
-     * @description You can provide a custom rewrite pair (in/out) or use the utilities like `rewriteBasepath` as a convenience for common use cases, or even do both!
-     * This is useful for basepath rewriting, shifting data from the origin to the path (for things like )
+     * @description You can provide a custom rewrite pair (in/out).
+     * This is useful for shifting data from the origin to the path (for things like subdomain routing), or other advanced use cases.
      */
     rewrite?: LocationRewrite;
     origin?: string;
@@ -361,14 +349,12 @@ export interface RouterOptions<TRouteTree extends AnyRoute, TTrailingSlashOption
 export type LocationRewrite = {
     /**
      * A function that will be called to rewrite the URL before it is interpreted by the router from the history instance.
-     * Utilities like `rewriteBasepath` are provided as a convenience for common use cases.
      *
      * @default undefined
      */
     input?: LocationRewriteFunction;
     /**
      * A function that will be called to rewrite the URL before it is committed to the actual history instance from the router.
-     * Utilities like `rewriteBasepath` are provided as a convenience for common use cases.
      *
      * @default undefined
      */

package/dist/esm/router.js

@@ -2,7 +2,7 @@ import { Store, batch } from "@tanstack/store";
 import { createBrowserHistory, parseHref } from "@tanstack/history";
 import { createControlledPromise, deepEqual, replaceEqualDeep, last, findLast, functionalUpdate } from "./utils.js";
 import { processRouteTree } from "./process-route-tree.js";
-import { resolvePath, cleanPath, trimPathRight, trimPath, matchPathname, interpolatePath } from "./path.js";
+import { trimPath, resolvePath, cleanPath, trimPathRight, matchPathname, interpolatePath } from "./path.js";
 import { isNotFound } from "./not-found.js";
 import { setupScrollRestoration } from "./scroll-restoration.js";
 import { defaultParseSearch, defaultStringifySearch } from "./searchParams.js";
@@ -55,8 +55,12 @@ class RouterCore {
           "The notFoundRoute API is deprecated and will be removed in the next major version. See https://tanstack.com/router/v1/docs/framework/react/guide/not-found-errors#migrating-from-notfoundroute for more info."
         );
       }
+      const prevOptions = this.options;
+      const prevBasepath = this.basepath ?? prevOptions?.basepath ?? "/";
+      const basepathWasUnset = this.basepath === void 0;
+      const prevRewriteOption = prevOptions?.rewrite;
       this.options = {
-        ...this.options,
+        ...prevOptions,
         ...newOptions
       };
       this.isServer = this.options.isServer ?? typeof document === "undefined";
@@ -75,18 +79,6 @@ class RouterCore {
           this.history = this.options.history;
         }
       }
-      if (this.options.basepath) {
-        const basepathRewrite = rewriteBasepath({
-          basepath: this.options.basepath
-        });
-        if (this.options.rewrite) {
-          this.rewrite = composeRewrites([basepathRewrite, this.options.rewrite]);
-        } else {
-          this.rewrite = basepathRewrite;
-        }
-      } else {
-        this.rewrite = this.options.rewrite;
-      }
       this.origin = this.options.origin;
       if (!this.origin) {
         if (!this.isServer) {
@@ -115,6 +107,36 @@ class RouterCore {
         });
         setupScrollRestoration(this);
       }
+      let needsLocationUpdate = false;
+      const nextBasepath = this.options.basepath ?? "/";
+      const nextRewriteOption = this.options.rewrite;
+      const basepathChanged = basepathWasUnset || prevBasepath !== nextBasepath;
+      const rewriteChanged = prevRewriteOption !== nextRewriteOption;
+      if (basepathChanged || rewriteChanged) {
+        this.basepath = nextBasepath;
+        const rewrites = [];
+        if (trimPath(nextBasepath) !== "") {
+          rewrites.push(
+            rewriteBasepath({
+              basepath: nextBasepath
+            })
+          );
+        }
+        if (nextRewriteOption) {
+          rewrites.push(nextRewriteOption);
+        }
+        this.rewrite = rewrites.length === 0 ? void 0 : rewrites.length === 1 ? rewrites[0] : composeRewrites(rewrites);
+        if (this.history) {
+          this.updateLatestLocation();
+        }
+        needsLocationUpdate = true;
+      }
+      if (needsLocationUpdate && this.__store) {
+        this.__store.state = {
+          ...this.state,
+          location: this.latestLocation
+        };
+      }
       if (typeof window !== "undefined" && "CSS" in window && typeof window.CSS?.supports === "function") {
         this.isViewTransitionTypesSupported = window.CSS.supports(
           "selector(:active-view-transition-type(a)"