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

package/build/stats-html.html

@@ -4014,7 +4014,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"0d6e-59","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"0d6e-61"},{"name":"react-router/src/index.tsx","uid":"0d6e-63"}]}]}],"isRoot":true},"nodeParts":{"0d6e-59":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"0d6e-58"},"0d6e-61":{"renderedLength":74844,"gzipLength":15588,"brotliLength":0,"mainUid":"0d6e-60"},"0d6e-63":{"renderedLength":12726,"gzipLength":3316,"brotliLength":0,"mainUid":"0d6e-62"}},"nodeMetas":{"0d6e-58":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"0d6e-59"},"imported":[],"importedBy":[{"uid":"0d6e-62"}]},"0d6e-60":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"0d6e-61"},"imported":[],"importedBy":[{"uid":"0d6e-62"}]},"0d6e-62":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"0d6e-63"},"imported":[{"uid":"0d6e-58"},{"uid":"0d6e-64"},{"uid":"0d6e-65"},{"uid":"0d6e-60"}],"importedBy":[],"isEntry":true},"0d6e-64":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"0d6e-62"}],"isExternal":true},"0d6e-65":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"0d6e-62"}],"isExternal":true}},"env":{"rollup":"2.77.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.production.js","children":[{"uid":"ec84-59","name":"\u0000rollupPluginBabelHelpers.js"},{"name":"packages","children":[{"name":"router-core/build/esm/index.js","uid":"ec84-61"},{"name":"react-router/src/index.tsx","uid":"ec84-63"}]}]}],"isRoot":true},"nodeParts":{"ec84-59":{"renderedLength":798,"gzipLength":366,"brotliLength":0,"mainUid":"ec84-58"},"ec84-61":{"renderedLength":75898,"gzipLength":15769,"brotliLength":0,"mainUid":"ec84-60"},"ec84-63":{"renderedLength":12607,"gzipLength":3287,"brotliLength":0,"mainUid":"ec84-62"}},"nodeMetas":{"ec84-58":{"id":"\u0000rollupPluginBabelHelpers.js","moduleParts":{"index.production.js":"ec84-59"},"imported":[],"importedBy":[{"uid":"ec84-62"}]},"ec84-60":{"id":"/packages/router-core/build/esm/index.js","moduleParts":{"index.production.js":"ec84-61"},"imported":[],"importedBy":[{"uid":"ec84-62"}]},"ec84-62":{"id":"/packages/react-router/src/index.tsx","moduleParts":{"index.production.js":"ec84-63"},"imported":[{"uid":"ec84-58"},{"uid":"ec84-64"},{"uid":"ec84-65"},{"uid":"ec84-60"}],"importedBy":[],"isEntry":true},"ec84-64":{"id":"react","moduleParts":{},"imported":[],"importedBy":[{"uid":"ec84-62"}],"isExternal":true},"ec84-65":{"id":"use-sync-external-store/shim","moduleParts":{},"imported":[],"importedBy":[{"uid":"ec84-62"}],"isExternal":true}},"env":{"rollup":"2.77.2"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/build/stats-react.json

@@ -7,7 +7,7 @@
         "name": "index.production.js",
         "children": [
           {
-            "uid": "0d6e-67",
+            "uid": "ec84-67",
             "name": "\u0000rollupPluginBabelHelpers.js"
           },
           {
@@ -15,11 +15,11 @@
             "children": [
               {
                 "name": "router-core/build/esm/index.js",
-                "uid": "0d6e-69"
+                "uid": "ec84-69"
               },
               {
                 "name": "react-router/src/index.tsx",
-                "uid": "0d6e-71"
+                "uid": "ec84-71"
               }
             ]
           }
@@ -29,90 +29,90 @@
     "isRoot": true
   },
   "nodeParts": {
-    "0d6e-67": {
+    "ec84-67": {
       "renderedLength": 798,
       "gzipLength": 366,
       "brotliLength": 0,
-      "mainUid": "0d6e-66"
+      "mainUid": "ec84-66"
     },
-    "0d6e-69": {
-      "renderedLength": 74844,
-      "gzipLength": 15588,
+    "ec84-69": {
+      "renderedLength": 75898,
+      "gzipLength": 15769,
       "brotliLength": 0,
-      "mainUid": "0d6e-68"
+      "mainUid": "ec84-68"
     },
-    "0d6e-71": {
-      "renderedLength": 12726,
-      "gzipLength": 3316,
+    "ec84-71": {
+      "renderedLength": 12607,
+      "gzipLength": 3287,
       "brotliLength": 0,
-      "mainUid": "0d6e-70"
+      "mainUid": "ec84-70"
     }
   },
   "nodeMetas": {
-    "0d6e-66": {
+    "ec84-66": {
       "id": "\u0000rollupPluginBabelHelpers.js",
       "moduleParts": {
-        "index.production.js": "0d6e-67"
+        "index.production.js": "ec84-67"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "0d6e-70"
+          "uid": "ec84-70"
         }
       ]
     },
-    "0d6e-68": {
+    "ec84-68": {
       "id": "/packages/router-core/build/esm/index.js",
       "moduleParts": {
-        "index.production.js": "0d6e-69"
+        "index.production.js": "ec84-69"
       },
       "imported": [],
       "importedBy": [
         {
-          "uid": "0d6e-70"
+          "uid": "ec84-70"
         }
       ]
     },
-    "0d6e-70": {
+    "ec84-70": {
       "id": "/packages/react-router/src/index.tsx",
       "moduleParts": {
-        "index.production.js": "0d6e-71"
+        "index.production.js": "ec84-71"
       },
       "imported": [
         {
-          "uid": "0d6e-66"
+          "uid": "ec84-66"
         },
         {
-          "uid": "0d6e-72"
+          "uid": "ec84-72"
         },
         {
-          "uid": "0d6e-73"
+          "uid": "ec84-73"
         },
         {
-          "uid": "0d6e-68"
+          "uid": "ec84-68"
         }
       ],
       "importedBy": [],
       "isEntry": true
     },
-    "0d6e-72": {
+    "ec84-72": {
       "id": "react",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "0d6e-70"
+          "uid": "ec84-70"
         }
       ],
       "isExternal": true
     },
-    "0d6e-73": {
+    "ec84-73": {
       "id": "use-sync-external-store/shim",
       "moduleParts": {},
       "imported": [],
       "importedBy": [
         {
-          "uid": "0d6e-70"
+          "uid": "ec84-70"
         }
       ],
       "isExternal": true

package/build/umd/index.development.js

@@ -991,6 +991,11 @@
 
     return updater;
   }
+  function pick(parent, keys) {
+    return keys.reduce((obj, key) => {
+      obj[key] = parent[key];
+    }, {});
+  }
 
   function joinPaths(paths) {
     return cleanPath(paths.filter(Boolean).join('/'));
@@ -1786,7 +1791,6 @@
         matches: [],
         actions: {},
         loaders: {},
-        loaderData: {},
         lastUpdated: Date.now(),
         isFetching: false,
         isPreloading: false
@@ -1809,6 +1813,26 @@
         cascadeLoaderData(router.state.matches);
         router.listeners.forEach(listener => listener(router));
       },
+      dehydrateState: () => {
+        router.state;
+        return _extends({}, pick(router.state, ['status', 'location', 'lastUpdated']), {
+          matches: router.state.matches.map(match => pick(match, ['matchId', 'status', 'routeLoaderData', 'loaderData', 'isInvalid', 'invalidAt']))
+        });
+      },
+      hydrateState: dehydratedState => {
+        // Match the routes
+        const matches = router.matchRoutes(router.location.pathname, {
+          strictParseParams: true
+        });
+        router.state = _extends({}, router.state, dehydratedState, {
+          matches: matches.map(match => {
+            const dehydratedMatch = dehydratedState.matches.find(d => d.matchId === match.matchId);
+            invariant(dehydratedMatch, 'Oh no! Dehydrated route matches did not match the active state of the router 😬');
+            Object.assign(match, dehydratedMatch);
+            return match;
+          })
+        });
+      },
       mount: () => {
         const next = router.__.buildLocation({
           to: '.',
@@ -1820,11 +1844,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
@@ -1846,6 +1870,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,
@@ -1894,7 +1929,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, {
@@ -2357,11 +2392,7 @@
           const recurseRoutes = (routeConfigs, parent) => {
             return routeConfigs.map(routeConfig => {
               const routeOptions = routeConfig.options;
-              const route = createRoute(routeConfig, routeOptions, parent, router); // {
-              //   pendingMs: routeOptions.pendingMs ?? router.defaultPendingMs,
-              //   pendingMinMs: routeOptions.pendingMinMs ?? router.defaultPendingMinMs,
-              // }
-
+              const route = createRoute(routeConfig, routeOptions, parent, router);
               const existingRoute = router.routesById[route.routeId];
 
               if (existingRoute) {
@@ -2496,8 +2527,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);
@@ -2802,13 +2831,6 @@
       this.state = {
         error: false
       };
-
-      this.reset = () => {
-        this.setState({
-          error: false,
-          info: false
-        });
-      };
     }
 
     componentDidCatch(error, info) {
@@ -2924,6 +2946,7 @@
   exports.matchPathname = matchPathname;
   exports.parsePathname = parsePathname;
   exports.parseSearchWith = parseSearchWith;
+  exports.pick = pick;
   exports.replaceEqualDeep = replaceEqualDeep;
   exports.resolvePath = resolvePath;
   exports.rootRouteId = rootRouteId;