@tanstack/router-core 0.0.1-beta.178 → 0.0.1-beta.180

package/build/esm/index.js

@@ -711,6 +711,7 @@ function stringifySearchWith(stringify, parser) {
 const componentTypes = ['component', 'errorComponent', 'pendingComponent'];
 const visibilityChangeEvent = 'visibilitychange';
 const focusEvent = 'focus';
+const preloadWarning = 'Error preloading route! ☝️';
 class Router {
   #unsubHistory;
   resetNextScroll = false;
@@ -1439,14 +1440,14 @@ class Router {
       if (preload) {
         this.preloadRoute(nextOpts).catch(err => {
           console.warn(err);
-          console.warn('Error preloading route! ☝️');
+          console.warn(preloadWarning);
         });
       }
     };
     const handleTouchStart = e => {
       this.preloadRoute(nextOpts).catch(err => {
         console.warn(err);
-        console.warn('Error preloading route! ☝️');
+        console.warn(preloadWarning);
       });
     };
     const handleEnter = e => {
@@ -1459,7 +1460,7 @@ class Router {
           target.preloadTimeout = null;
           this.preloadRoute(nextOpts).catch(err => {
             console.warn(err);
-            console.warn('Error preloading route! ☝️');
+            console.warn(preloadWarning);
           });
         }, preloadDelay);
       }
@@ -1486,6 +1487,7 @@ class Router {
   dehydrate = () => {
     return {
       state: {
+        matchIds: this.state.matchIds,
         dehydratedMatches: this.state.matches.map(d => pick(d, ['fetchedAt', 'invalid', 'preloadMaxAge', 'maxAge', 'id', 'loaderData', 'status', 'updatedAt']))
       }
     };
@@ -1500,11 +1502,9 @@ class Router {
     const ctx = _ctx;
     this.dehydratedData = ctx.payload;
     this.options.hydrate?.(ctx.payload);
-    const {
-      dehydratedMatches
-    } = ctx.router.state;
+    const dehydratedState = ctx.router.state;
     let matches = this.matchRoutes(this.state.location.pathname, this.state.location.search).map(match => {
-      const dehydratedMatch = dehydratedMatches.find(d => d.id === match.id);
+      const dehydratedMatch = dehydratedState.dehydratedMatches.find(d => d.id === match.id);
       invariant(dehydratedMatch, `Could not find a client-side match for dehydrated match with id: ${match.id}!`);
       if (dehydratedMatch) {
         return {
@@ -1517,6 +1517,7 @@ class Router {
     this.__store.setState(s => {
       return {
         ...s,
+        matchIds: dehydratedState.matchIds,
         matches,
         matchesById: this.#mergeMatches(s.matchesById, matches)
       };
@@ -1533,10 +1534,10 @@ class Router {
         const id = `__TSR_DEHYDRATED__${strKey}`;
         const data = typeof getData === 'function' ? await getData() : getData;
         return `<script id='${id}' suppressHydrationWarning>window["__TSR_DEHYDRATED__${escapeJSON(strKey)}"] = ${JSON.stringify(data)}
-        // ;(() => {
-        //   var el = document.getElementById('${id}')
-        //   el.parentElement.removeChild(el)
-        // })()
+        ;(() => {
+          var el = document.getElementById('${id}')
+          el.parentElement.removeChild(el)
+        })()
         </script>`;
       });
       return () => this.hydrateData(key);