@tanstack/router-core 0.0.1-beta.51 → 0.0.1-beta.53

package/build/types/index.d.ts

@@ -271,7 +271,7 @@ declare class Router<TRouteConfig extends AnyRouteConfig = RouteConfig, TAllRout
         gcMaxAge?: never;
     }) => Promise<void>;
     loadMatchData: (routeMatch: RouteMatch<any, any>) => Promise<Record<string, unknown>>;
-    invalidateRoute: (opts: MatchLocation) => Promise<void>;
+    invalidateRoute: <TFrom extends ValidFromPath<TAllRouteInfo> = "/", TTo extends string = ".">(opts: ToOptions<TAllRouteInfo, TFrom, TTo, ResolveRelativePath<TFrom, NoInfer<TTo>>>) => Promise<void>;
     reload: () => void;
     resolvePath: (from: string, path: string) => string;
     navigate: <TFrom extends ValidFromPath<TAllRouteInfo> = "/", TTo extends string = ".">({ from, to, search, hash, replace, params, }: NavigateOptions<TAllRouteInfo, TFrom, TTo>) => Promise<void>;
@@ -320,6 +320,7 @@ declare class RouteMatch<TAllRouteInfo extends AnyAllRouteInfo = DefaultAllRoute
         params: TRouteInfo['allParams'];
         pathname: string;
     });
+    setLoaderData: (loaderData: TRouteInfo['routeLoaderData']) => void;
     cancel: () => void;
     load: (loaderOpts?: {
         preload: true;

package/build/umd/index.development.js

@@ -119,13 +119,8 @@
       const getLocation = () => parseLocation(entries[index], currentState);
       return createHistory({
         getLocation,
-        listener: onUpdate => {
-          window.addEventListener(popStateEvent, onUpdate);
-          // We might need to handle the hashchange event in the future
-          // window.addEventListener(hashChangeEvent, onUpdate)
-          return () => {
-            window.removeEventListener(popStateEvent, onUpdate);
-          };
+        listener: () => {
+          return () => {};
         },
         pushState: (path, state) => {
           currentState = {
@@ -154,10 +149,9 @@
     function parseLocation(href, state) {
       let hashIndex = href.indexOf('#');
       let searchIndex = href.indexOf('?');
-      const pathEnd = Math.min(hashIndex, searchIndex);
       return {
         href,
-        pathname: pathEnd > -1 ? href.substring(0, pathEnd) : href,
+        pathname: href.substring(0, hashIndex > 0 ? searchIndex > 0 ? Math.min(hashIndex, searchIndex) : hashIndex : searchIndex > 0 ? searchIndex : href.length),
         hash: hashIndex > -1 ? href.substring(hashIndex, searchIndex) : '',
         search: searchIndex > -1 ? href.substring(searchIndex) : '',
         state
@@ -696,7 +690,7 @@
           this.store.setState(s => s.status = 'success');
         }
       }
-      #setLoaderData = loaderData => {
+      setLoaderData = loaderData => {
         batch(() => {
           this.store.setState(s => {
             s.routeLoaderData = loaderData;
@@ -771,7 +765,7 @@
               if (this.route.options.loader) {
                 const data = await this.router.loadMatchData(this);
                 if (latestPromise = checkLatest()) return latestPromise;
-                this.#setLoaderData(data);
+                this.setLoaderData(data);
               }
               this.store.setState(s => {
                 s.error = undefined;
@@ -956,8 +950,7 @@
       throw new Error('Failed to fetch match data');
     };
     class Router {
-      // __location: Location<TAllRouteInfo['fullSearchSchema']>
-
+      #unsubHistory;
       startedLoadingAt = Date.now();
       resolveNavigation = () => {};
       constructor(options) {
@@ -989,9 +982,6 @@
           if (!this.store.state.currentMatches.length) {
             this.load();
           }
-          const unsubHistory = this.history.listen(() => {
-            this.load(this.#parseLocation(this.store.state.latestLocation));
-          });
           const visibilityChangeEvent = 'visibilitychange';
           const focusEvent = 'focus';
 
@@ -1004,7 +994,6 @@
             window.addEventListener(focusEvent, this.#onFocus, false);
           }
           return () => {
-            unsubHistory();
             if (window.removeEventListener) {
               // Be sure to unsubscribe if a new handler is set
 
@@ -1018,11 +1007,17 @@
       update = opts => {
         Object.assign(this.options, opts);
         if (!this.history || this.options.history && this.options.history !== this.history) {
-          this.history = this.options?.history ?? isServer ? createMemoryHistory() : createBrowserHistory();
+          if (this.#unsubHistory) {
+            this.#unsubHistory();
+          }
+          this.history = this.options.history ?? (isServer ? createMemoryHistory() : createBrowserHistory());
           this.store.setState(s => {
             s.latestLocation = this.#parseLocation();
             s.currentLocation = s.latestLocation;
           });
+          this.#unsubHistory = this.history.listen(() => {
+            this.load(this.#parseLocation(this.store.state.latestLocation));
+          });
         }
         const {
           basepath,
@@ -1536,7 +1531,10 @@
           currentMatches.forEach((match, index) => {
             const dehydratedMatch = dehydratedRouter.state.currentMatches[index];
             invariant(dehydratedMatch && dehydratedMatch.id === match.id, 'Oh no! There was a hydration mismatch when attempting to rethis.store the state of the router! 😬');
-            Object.assign(match, dehydratedMatch);
+            match.store.setState(s => {
+              Object.assign(s, dehydratedMatch.state);
+            });
+            match.setLoaderData(dehydratedMatch.state.routeLoaderData);
           });
           currentMatches.forEach(match => match.__validate());
           Object.assign(s, {