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

package/build/cjs/router-core/build/esm/index.js

@@ -1739,7 +1739,6 @@ function createRouter(userOptions) {
       matches: [],
       actions: {},
       loaders: {},
-      loaderData: {},
       lastUpdated: Date.now(),
       isFetching: false,
       isPreloading: false
@@ -1773,11 +1772,11 @@ function createRouter(userOptions) {
 
       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
@@ -1799,6 +1798,17 @@ function createRouter(userOptions) {
       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,
@@ -1847,7 +1857,7 @@ function createRouter(userOptions) {
 
       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, {
@@ -2449,8 +2459,6 @@ function createRouter(userOptions) {
       }
     }
   };
-  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);