@tanstack/router-core 0.0.1-beta.4 → 0.0.1-beta.5

package/build/umd/index.development.js

@@ -1725,7 +1725,6 @@
         matches: [],
         actions: {},
         loaders: {},
-        loaderData: {},
         lastUpdated: Date.now(),
         isFetching: false,
         isPreloading: false
@@ -1759,11 +1758,11 @@
 
         if (next.href !== router.location.href) {
           router.__.commitLocation(next, true);
-        } else {
-          router.loadLocation();
         }
 
-        const unsub = history.listen(event => {
+        router.loadLocation();
+        const unsub = router.history.listen(event => {
+          console.log(event.location);
           router.loadLocation(router.__.parseLocation(event.location, router.location));
         }); // addEventListener does not exist in React Native, but window does
         // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
@@ -1785,6 +1784,17 @@
         router.loadLocation();
       },
       update: opts => {
+        const newHistory = (opts == null ? void 0 : opts.history) !== router.history;
+
+        if (!router.location || newHistory) {
+          if (opts != null && opts.history) {
+            router.history = opts.history;
+          }
+
+          router.location = router.__.parseLocation(router.history.location);
+          router.state.location = router.location;
+        }
+
         Object.assign(router.options, opts);
         const {
           basepath,
@@ -1833,7 +1843,7 @@
 
         router.cancelMatches(); // Match the routes
 
-        const matches = router.matchRoutes(location.pathname, {
+        const matches = router.matchRoutes(router.location.pathname, {
           strictParseParams: true
         });
         router.state = _extends({}, router.state, {
@@ -2435,8 +2445,6 @@
         }
       }
     };
-    router.location = router.__.parseLocation(history.location);
-    router.state.location = router.location;
     router.update(userOptions); // Allow frameworks to hook into the router creation
 
     router.options.createRouter == null ? void 0 : router.options.createRouter(router);