@tanstack/router-core 1.132.31 → 1.132.37

package/dist/cjs/index.cjs

@@ -87,5 +87,4 @@ exports.defaultSerovalPlugins = serovalPlugins.defaultSerovalPlugins;
 exports.composeRewrites = rewrite.composeRewrites;
 exports.executeRewriteInput = rewrite.executeRewriteInput;
 exports.executeRewriteOutput = rewrite.executeRewriteOutput;
-exports.rewriteBasepath = rewrite.rewriteBasepath;
 //# sourceMappingURL=index.cjs.map

package/dist/cjs/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/cjs/index.d.cts

@@ -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.cjs';
 export { createSerializationAdapter, makeSerovalPlugin, makeSsrSerovalPlugin, } from './ssr/serializer/transformer.cjs';
 export { defaultSerovalPlugins } from './ssr/serializer/seroval-plugins.cjs';
-export { rewriteBasepath, composeRewrites, executeRewriteInput, executeRewriteOutput, } from './rewrite.cjs';
+export { composeRewrites, executeRewriteInput, executeRewriteOutput, } from './rewrite.cjs';
 export type { LocationRewrite, LocationRewriteFunction } from './router.cjs';

package/dist/cjs/router.cjs

@@ -57,8 +57,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";
@@ -77,18 +81,6 @@ class RouterCore {
           this.history = this.options.history;
         }
       }
-      if (this.options.basepath) {
-        const basepathRewrite = rewrite.rewriteBasepath({
-          basepath: this.options.basepath
-        });
-        if (this.options.rewrite) {
-          this.rewrite = 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) {
@@ -117,6 +109,36 @@ class RouterCore {
         });
         scrollRestoration.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 (path.trimPath(nextBasepath) !== "") {
+          rewrites.push(
+            rewrite.rewriteBasepath({
+              basepath: nextBasepath
+            })
+          );
+        }
+        if (nextRewriteOption) {
+          rewrites.push(nextRewriteOption);
+        }
+        this.rewrite = rewrites.length === 0 ? void 0 : rewrites.length === 1 ? rewrites[0] : rewrite.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)"