@tanstack/react-router-devtools 0.0.1-beta.8 → 0.0.1-beta.80

package/build/cjs/{packages/react-router-devtools/src/devtools.js → devtools.js}

@@ -12,7 +12,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
+var _rollupPluginBabelHelpers = require('./_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var reactRouter = require('@tanstack/react-router');
 var useLocalStorage = require('./useLocalStorage.js');
@@ -20,53 +20,50 @@ var utils = require('./utils.js');
 var styledComponents = require('./styledComponents.js');
 var theme = require('./theme.js');
 var Explorer = require('./Explorer.js');
-var index = require('../../../node_modules/date-fns/esm/formatDistanceStrict/index.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-const _excluded = ["style"],
-      _excluded2 = ["style", "onClick"],
-      _excluded3 = ["style", "onClick"],
-      _excluded4 = ["isOpen", "setIsOpen", "handleDragStart", "router"];
 const isServer = typeof window === 'undefined';
-
 function Logo(props) {
-  var _props$style;
-
   return /*#__PURE__*/React__default["default"].createElement("div", _rollupPluginBabelHelpers["extends"]({}, props, {
-    style: _rollupPluginBabelHelpers["extends"]({}, (_props$style = props.style) != null ? _props$style : {}, {
+    style: {
+      ...(props.style ?? {}),
       display: 'flex',
       alignItems: 'center',
       flexDirection: 'column',
-      fontSize: '0.7rem',
-      fontWeight: '900',
+      fontSize: '0.8rem',
+      fontWeight: 'bolder',
       lineHeight: '1'
-    })
+    }
   }), /*#__PURE__*/React__default["default"].createElement("div", {
     style: {
       letterSpacing: '-0.05rem'
     }
   }, "TANSTACK"), /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "text-transparent bg-clip-text bg-gradient-to-r from-lime-500 to-emerald-500",
     style: {
+      backgroundImage: 'linear-gradient(to right, var(--tw-gradient-stops))',
+      // @ts-ignore
+      '--tw-gradient-from': '#84cc16',
+      '--tw-gradient-stops': 'var(--tw-gradient-from), var(--tw-gradient-to)',
+      '--tw-gradient-to': '#10b981',
+      WebkitBackgroundClip: 'text',
+      color: 'transparent',
       letterSpacing: '0.1rem',
       marginRight: '-0.2rem'
     }
   }, "ROUTER"));
 }
-
-function TanStackRouterDevtools(_ref) {
-  let {
-    initialIsOpen,
-    panelProps = {},
-    closeButtonProps = {},
-    toggleButtonProps = {},
-    position = 'bottom-left',
-    containerElement: Container = 'footer',
-    router
-  } = _ref;
+function TanStackRouterDevtools({
+  initialIsOpen,
+  panelProps = {},
+  closeButtonProps = {},
+  toggleButtonProps = {},
+  position = 'bottom-left',
+  containerElement: Container = 'footer',
+  router
+}) {
   const rootRef = React__default["default"].useRef(null);
   const panelRef = React__default["default"].useRef(null);
   const [isOpen, setIsOpen] = useLocalStorage["default"]('tanstackRouterDevtoolsOpen', initialIsOpen);
@@ -74,61 +71,51 @@ function TanStackRouterDevtools(_ref) {
   const [isResolvedOpen, setIsResolvedOpen] = utils.useSafeState(false);
   const [isResizing, setIsResizing] = utils.useSafeState(false);
   const isMounted = utils.useIsMounted();
-
-  const _handleDragStart = (panelElement, startEvent) => {
-    var _panelElement$getBoun;
-
+  const handleDragStart = (panelElement, startEvent) => {
     if (startEvent.button !== 0) return; // Only allow left click for drag
 
     setIsResizing(true);
     const dragInfo = {
-      originalHeight: (_panelElement$getBoun = panelElement == null ? void 0 : panelElement.getBoundingClientRect().height) != null ? _panelElement$getBoun : 0,
+      originalHeight: panelElement?.getBoundingClientRect().height ?? 0,
       pageY: startEvent.pageY
     };
-
     const run = moveEvent => {
       const delta = dragInfo.pageY - moveEvent.pageY;
-      const newHeight = (dragInfo == null ? void 0 : dragInfo.originalHeight) + delta;
+      const newHeight = dragInfo?.originalHeight + delta;
       setDevtoolsHeight(newHeight);
-
       if (newHeight < 70) {
         setIsOpen(false);
       } else {
         setIsOpen(true);
       }
     };
-
     const unsub = () => {
       setIsResizing(false);
       document.removeEventListener('mousemove', run);
       document.removeEventListener('mouseUp', unsub);
     };
-
     document.addEventListener('mousemove', run);
     document.addEventListener('mouseup', unsub);
   };
-
   React__default["default"].useEffect(() => {
-    setIsResolvedOpen(isOpen != null ? isOpen : false);
-  }, [isOpen, isResolvedOpen, setIsResolvedOpen]); // Toggle panel visibility before/after transition (depending on direction).
-  // Prevents focusing in a closed panel.
+    setIsResolvedOpen(isOpen ?? false);
+  }, [isOpen, isResolvedOpen, setIsResolvedOpen]);
 
+  // Toggle panel visibility before/after transition (depending on direction).
+  // Prevents focusing in a closed panel.
   React__default["default"].useEffect(() => {
     const ref = panelRef.current;
-
     if (ref) {
       const handlePanelTransitionStart = () => {
         if (ref && isResolvedOpen) {
           ref.style.visibility = 'visible';
         }
       };
-
       const handlePanelTransitionEnd = () => {
         if (ref && !isResolvedOpen) {
           ref.style.visibility = 'hidden';
         }
       };
-
       ref.addEventListener('transitionstart', handlePanelTransitionStart);
       ref.addEventListener('transitionend', handlePanelTransitionEnd);
       return () => {
@@ -136,62 +123,46 @@ function TanStackRouterDevtools(_ref) {
         ref.removeEventListener('transitionend', handlePanelTransitionEnd);
       };
     }
-
     return;
   }, [isResolvedOpen]);
   React__default["default"][isServer ? 'useEffect' : 'useLayoutEffect'](() => {
     if (isResolvedOpen) {
-      var _rootRef$current, _rootRef$current$pare;
-
-      const previousValue = (_rootRef$current = rootRef.current) == null ? void 0 : (_rootRef$current$pare = _rootRef$current.parentElement) == null ? void 0 : _rootRef$current$pare.style.paddingBottom;
-
+      const previousValue = rootRef.current?.parentElement?.style.paddingBottom;
       const run = () => {
-        var _panelRef$current, _rootRef$current2;
-
-        const containerHeight = (_panelRef$current = panelRef.current) == null ? void 0 : _panelRef$current.getBoundingClientRect().height;
-
-        if ((_rootRef$current2 = rootRef.current) != null && _rootRef$current2.parentElement) {
-          rootRef.current.parentElement.style.paddingBottom = containerHeight + "px";
+        const containerHeight = panelRef.current?.getBoundingClientRect().height;
+        if (rootRef.current?.parentElement) {
+          rootRef.current.parentElement.style.paddingBottom = `${containerHeight}px`;
         }
       };
-
       run();
-
       if (typeof window !== 'undefined') {
         window.addEventListener('resize', run);
         return () => {
-          var _rootRef$current3;
-
           window.removeEventListener('resize', run);
-
-          if ((_rootRef$current3 = rootRef.current) != null && _rootRef$current3.parentElement && typeof previousValue === 'string') {
+          if (rootRef.current?.parentElement && typeof previousValue === 'string') {
             rootRef.current.parentElement.style.paddingBottom = previousValue;
           }
         };
       }
     }
-
     return;
   }, [isResolvedOpen]);
-
   const {
-    style: panelStyle = {}
-  } = panelProps,
-        otherPanelProps = _rollupPluginBabelHelpers.objectWithoutPropertiesLoose(panelProps, _excluded);
-
+    style: panelStyle = {},
+    ...otherPanelProps
+  } = panelProps;
   const {
     style: closeButtonStyle = {},
-    onClick: onCloseClick
-  } = closeButtonProps,
-        otherCloseButtonProps = _rollupPluginBabelHelpers.objectWithoutPropertiesLoose(closeButtonProps, _excluded2);
-
+    onClick: onCloseClick,
+    ...otherCloseButtonProps
+  } = closeButtonProps;
   const {
     style: toggleButtonStyle = {},
-    onClick: onToggleClick
-  } = toggleButtonProps,
-        otherToggleButtonProps = _rollupPluginBabelHelpers.objectWithoutPropertiesLoose(toggleButtonProps, _excluded3); // Do not render on the server
-
+    onClick: onToggleClick,
+    ...otherToggleButtonProps
+  } = toggleButtonProps;
 
+  // Do not render on the server
   if (!isMounted()) return null;
   return /*#__PURE__*/React__default["default"].createElement(Container, {
     ref: rootRef,
@@ -202,35 +173,38 @@ function TanStackRouterDevtools(_ref) {
     ref: panelRef
   }, otherPanelProps, {
     router: router,
-    style: _rollupPluginBabelHelpers["extends"]({
+    style: {
       position: 'fixed',
       bottom: '0',
       right: '0',
       zIndex: 99999,
       width: '100%',
-      height: devtoolsHeight != null ? devtoolsHeight : 500,
+      height: devtoolsHeight ?? 500,
       maxHeight: '90%',
       boxShadow: '0 0 20px rgba(0,0,0,.3)',
-      borderTop: "1px solid " + theme.defaultTheme.gray,
+      borderTop: `1px solid ${theme.defaultTheme.gray}`,
       transformOrigin: 'top',
       // visibility will be toggled after transitions, but set initial state here
-      visibility: isOpen ? 'visible' : 'hidden'
-    }, panelStyle, isResizing ? {
-      transition: "none"
-    } : {
-      transition: "all .2s ease"
-    }, isResolvedOpen ? {
-      opacity: 1,
-      pointerEvents: 'all',
-      transform: "translateY(0) scale(1)"
-    } : {
-      opacity: 0,
-      pointerEvents: 'none',
-      transform: "translateY(15px) scale(1.02)"
-    }),
+      visibility: isOpen ? 'visible' : 'hidden',
+      ...panelStyle,
+      ...(isResizing ? {
+        transition: `none`
+      } : {
+        transition: `all .2s ease`
+      }),
+      ...(isResolvedOpen ? {
+        opacity: 1,
+        pointerEvents: 'all',
+        transform: `translateY(0) scale(1)`
+      } : {
+        opacity: 0,
+        pointerEvents: 'none',
+        transform: `translateY(15px) scale(1.02)`
+      })
+    },
     isOpen: isResolvedOpen,
     setIsOpen: setIsOpen,
-    handleDragStart: e => _handleDragStart(panelRef.current, e)
+    handleDragStart: e => handleDragStart(panelRef.current, e)
   })), isResolvedOpen ? /*#__PURE__*/React__default["default"].createElement(styledComponents.Button, _rollupPluginBabelHelpers["extends"]({
     type: "button",
     "aria-label": "Close TanStack Router Devtools"
@@ -239,20 +213,22 @@ function TanStackRouterDevtools(_ref) {
       setIsOpen(false);
       onCloseClick && onCloseClick(e);
     },
-    style: _rollupPluginBabelHelpers["extends"]({
+    style: {
       position: 'fixed',
       zIndex: 99999,
       margin: '.5em',
-      bottom: 0
-    }, position === 'top-right' ? {
-      right: '0'
-    } : position === 'top-left' ? {
-      left: '0'
-    } : position === 'bottom-right' ? {
-      right: '0'
-    } : {
-      left: '0'
-    }, closeButtonStyle)
+      bottom: 0,
+      ...(position === 'top-right' ? {
+        right: '0'
+      } : position === 'top-left' ? {
+        left: '0'
+      } : position === 'bottom-right' ? {
+        right: '0'
+      } : {
+        left: '0'
+      }),
+      ...closeButtonStyle
+    }
   }), "Close") : null), !isResolvedOpen ? /*#__PURE__*/React__default["default"].createElement("button", _rollupPluginBabelHelpers["extends"]({
     type: "button"
   }, otherToggleButtonProps, {
@@ -261,7 +237,7 @@ function TanStackRouterDevtools(_ref) {
       setIsOpen(true);
       onToggleClick && onToggleClick(e);
     },
-    style: _rollupPluginBabelHelpers["extends"]({
+    style: {
       appearance: 'none',
       background: 'none',
       border: 0,
@@ -272,65 +248,95 @@ function TanStackRouterDevtools(_ref) {
       fontSize: '1.5em',
       margin: '.5em',
       cursor: 'pointer',
-      width: 'fit-content'
-    }, position === 'top-right' ? {
-      top: '0',
-      right: '0'
-    } : position === 'top-left' ? {
-      top: '0',
-      left: '0'
-    } : position === 'bottom-right' ? {
-      bottom: '0',
-      right: '0'
-    } : {
-      bottom: '0',
-      left: '0'
-    }, toggleButtonStyle)
+      width: 'fit-content',
+      ...(position === 'top-right' ? {
+        top: '0',
+        right: '0'
+      } : position === 'top-left' ? {
+        top: '0',
+        left: '0'
+      } : position === 'bottom-right' ? {
+        bottom: '0',
+        right: '0'
+      } : {
+        bottom: '0',
+        left: '0'
+      }),
+      ...toggleButtonStyle
+    }
   }), /*#__PURE__*/React__default["default"].createElement(Logo, {
     "aria-hidden": true
   })) : null);
 }
 const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwardRef(function TanStackRouterDevtoolsPanel(props, ref) {
-  var _Object$values$find$m, _Object$values, _Object$values$find, _router$state$matches, _router$state$pending, _router$state$pending2, _last, _last2, _last3, _last4, _last5, _last6;
-
   const {
     isOpen = true,
+    setIsOpen,
     handleDragStart,
-    router
-  } = props,
-        panelProps = _rollupPluginBabelHelpers.objectWithoutPropertiesLoose(props, _excluded4);
-
-  const rerender = React__default["default"].useReducer(() => ({}), {})[1];
-  React__default["default"].useEffect(() => {
-    let interval = setInterval(() => {
-      router.cleanMatchCache(); // router.notify()
-
-      rerender();
-    }, 250);
-    return () => {
-      clearInterval(interval);
-    };
-  }, []);
+    router: userRouter,
+    ...panelProps
+  } = props;
+  const routerContextValue = React__default["default"].useContext(reactRouter.routerContext);
+  const router = userRouter ?? routerContextValue?.router;
+  reactRouter.invariant(router, 'No router was found for the TanStack Router Devtools. Please place the devtools in the <RouterProvider> component tree or pass the router instance to the devtools manually.');
+  reactRouter.useStore(router.__store);
   const [activeRouteId, setActiveRouteId] = useLocalStorage["default"]('tanstackRouterDevtoolsActiveRouteId', '');
   const [activeMatchId, setActiveMatchId] = useLocalStorage["default"]('tanstackRouterDevtoolsActiveMatchId', '');
   React__default["default"].useEffect(() => {
     setActiveMatchId('');
   }, [activeRouteId]);
-  const activeMatch = (_Object$values$find$m = (_Object$values = Object.values(router.matchCache)) == null ? void 0 : (_Object$values$find = _Object$values.find(d => d.match.matchId === activeMatchId)) == null ? void 0 : _Object$values$find.match) != null ? _Object$values$find$m : (_router$state$matches = router.state.matches) == null ? void 0 : _router$state$matches.find(d => d.routeId === activeRouteId);
-  const matchCacheValues = utils.multiSortBy(Object.keys(router.matchCache).filter(key => {
-    const cacheEntry = router.matchCache[key];
-    return cacheEntry.gc > Date.now();
-  }).map(key => router.matchCache[key]), [d => d.match.isFetching ? -1 : 1, d => -d.match.updatedAt]);
+  const allMatches = React__default["default"].useMemo(() => [...Object.values(router.state.currentMatches), ...Object.values(router.state.pendingMatches ?? [])], [router.state.currentMatches, router.state.pendingMatches]);
+  const activeMatch = allMatches?.find(d => d.id === activeMatchId) || allMatches?.find(d => d.route.id === activeRouteId);
   return /*#__PURE__*/React__default["default"].createElement(theme.ThemeProvider, {
     theme: theme.defaultTheme
-  }, /*#__PURE__*/React__default["default"].createElement("script", {
-    src: "https://cdn.tailwindcss.com"
-  }), /*#__PURE__*/React__default["default"].createElement(styledComponents.Panel, _rollupPluginBabelHelpers["extends"]({
+  }, /*#__PURE__*/React__default["default"].createElement(styledComponents.Panel, _rollupPluginBabelHelpers["extends"]({
     ref: ref,
     className: "TanStackRouterDevtoolsPanel"
   }, panelProps), /*#__PURE__*/React__default["default"].createElement("style", {
     dangerouslySetInnerHTML: {
-      __html: "\n\n            .TanStackRouterDevtoolsPanel * {\n              scrollbar-color: " + theme.defaultTheme.backgroundAlt + " " + theme.defaultTheme.gray + ";\n            }\n\n            .TanStackRouterDevtoolsPanel *::-webkit-scrollbar, .TanStackRouterDevtoolsPanel scrollbar {\n              width: 1em;\n              height: 1em;\n            }\n\n            .TanStackRouterDevtoolsPanel *::-webkit-scrollbar-track, .TanStackRouterDevtoolsPanel scrollbar-track {\n              background: " + theme.defaultTheme.backgroundAlt + ";\n            }\n\n            .TanStackRouterDevtoolsPanel *::-webkit-scrollbar-thumb, .TanStackRouterDevtoolsPanel scrollbar-thumb {\n              background: " + theme.defaultTheme.gray + ";\n              border-radius: .5em;\n              border: 3px solid " + theme.defaultTheme.backgroundAlt + ";\n            }\n\n            .TanStackRouterDevtoolsPanel table {\n              width: 100%;\n            }\n\n            .TanStackRouterDevtoolsPanel table tr {\n              border-bottom: 2px dotted rgba(255, 255, 255, .2);\n            }\n\n            .TanStackRouterDevtoolsPanel table tr:last-child {\n              border-bottom: none\n            }\n\n            .TanStackRouterDevtoolsPanel table td {\n              padding: .25rem .5rem;\n              border-right: 2px dotted rgba(255, 255, 255, .05);\n            }\n\n            .TanStackRouterDevtoolsPanel table td:last-child {\n              border-right: none\n            }\n\n          "
+      __html: `
+
+            .TanStackRouterDevtoolsPanel * {
+              scrollbar-color: ${theme.defaultTheme.backgroundAlt} ${theme.defaultTheme.gray};
+            }
+
+            .TanStackRouterDevtoolsPanel *::-webkit-scrollbar, .TanStackRouterDevtoolsPanel scrollbar {
+              width: 1em;
+              height: 1em;
+            }
+
+            .TanStackRouterDevtoolsPanel *::-webkit-scrollbar-track, .TanStackRouterDevtoolsPanel scrollbar-track {
+              background: ${theme.defaultTheme.backgroundAlt};
+            }
+
+            .TanStackRouterDevtoolsPanel *::-webkit-scrollbar-thumb, .TanStackRouterDevtoolsPanel scrollbar-thumb {
+              background: ${theme.defaultTheme.gray};
+              border-radius: .5em;
+              border: 3px solid ${theme.defaultTheme.backgroundAlt};
+            }
+
+            .TanStackRouterDevtoolsPanel table {
+              width: 100%;
+            }
+
+            .TanStackRouterDevtoolsPanel table tr {
+              border-bottom: 2px dotted rgba(255, 255, 255, .2);
+            }
+
+            .TanStackRouterDevtoolsPanel table tr:last-child {
+              border-bottom: none
+            }
+
+            .TanStackRouterDevtoolsPanel table td {
+              padding: .25rem .5rem;
+              border-right: 2px dotted rgba(255, 255, 255, .05);
+            }
+
+            .TanStackRouterDevtoolsPanel table td:last-child {
+              border-right: none
+            }
+
+          `
     }
   }), /*#__PURE__*/React__default["default"].createElement("div", {
     style: {
@@ -350,13 +356,17 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
       minHeight: '40%',
       maxHeight: '100%',
       overflow: 'auto',
-      borderRight: "1px solid " + theme.defaultTheme.grayAlt,
+      borderRight: `1px solid ${theme.defaultTheme.grayAlt}`,
       display: 'flex',
       flexDirection: 'column'
     }
   }, /*#__PURE__*/React__default["default"].createElement("div", {
-    className: "flex justify-start gap-2 p-2 items-center",
     style: {
+      display: 'flex',
+      justifyContent: 'start',
+      gap: '1rem',
+      padding: '1rem',
+      alignItems: 'center',
       background: theme.defaultTheme.backgroundAlt
     }
   }, /*#__PURE__*/React__default["default"].createElement(Logo, {
@@ -389,7 +399,7 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
       minHeight: '40%',
       maxHeight: '100%',
       overflow: 'auto',
-      borderRight: "1px solid " + theme.defaultTheme.grayAlt,
+      borderRight: `1px solid ${theme.defaultTheme.grayAlt}`,
       display: 'flex',
       flexDirection: 'column'
     }
@@ -401,15 +411,15 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
       top: 0,
       zIndex: 1
     }
-  }, "Active Matches"), router.state.matches.map((match, i) => {
+  }, "Active Matches"), router.state.currentMatches.map((match, i) => {
     return /*#__PURE__*/React__default["default"].createElement("div", {
-      key: match.routeId || i,
+      key: match.route.id || i,
       role: "button",
-      "aria-label": "Open match details for " + match.routeId,
-      onClick: () => setActiveRouteId(activeRouteId === match.routeId ? '' : match.routeId),
+      "aria-label": `Open match details for ${match.route.id}`,
+      onClick: () => setActiveRouteId(activeRouteId === match.route.id ? '' : match.route.id),
       style: {
         display: 'flex',
-        borderBottom: "solid 1px " + theme.defaultTheme.grayAlt,
+        borderBottom: `solid 1px ${theme.defaultTheme.grayAlt}`,
         cursor: 'pointer',
         alignItems: 'center',
         background: match === activeMatch ? 'rgba(255,255,255,.1)' : undefined
@@ -431,8 +441,8 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
       style: {
         padding: '.5em'
       }
-    }, "" + match.matchId));
-  }), (_router$state$pending = router.state.pending) != null && _router$state$pending.matches.length ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
+    }, `${match.id}`));
+  }), router.state.pendingMatches?.length ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
     style: {
       marginTop: '2rem',
       padding: '.5em',
@@ -441,15 +451,15 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
       top: 0,
       zIndex: 1
     }
-  }, "Pending Matches"), (_router$state$pending2 = router.state.pending) == null ? void 0 : _router$state$pending2.matches.map((match, i) => {
+  }, "Pending Matches"), router.state.pendingMatches?.map((match, i) => {
     return /*#__PURE__*/React__default["default"].createElement("div", {
-      key: match.routeId || i,
+      key: match.route.id || i,
       role: "button",
-      "aria-label": "Open match details for " + match.routeId,
-      onClick: () => setActiveRouteId(activeRouteId === match.routeId ? '' : match.routeId),
+      "aria-label": `Open match details for ${match.route.id}`,
+      onClick: () => setActiveRouteId(activeRouteId === match.route.id ? '' : match.route.id),
       style: {
         display: 'flex',
-        borderBottom: "solid 1px " + theme.defaultTheme.grayAlt,
+        borderBottom: `solid 1px ${theme.defaultTheme.grayAlt}`,
         cursor: 'pointer',
         background: match === activeMatch ? 'rgba(255,255,255,.1)' : undefined
       }
@@ -470,75 +480,7 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
       style: {
         padding: '.5em'
       }
-    }, "" + match.matchId));
-  })) : null, matchCacheValues.length ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement("div", {
-    style: {
-      marginTop: '2rem',
-      padding: '.5em',
-      background: theme.defaultTheme.backgroundAlt,
-      position: 'sticky',
-      top: 0,
-      bottom: 0,
-      zIndex: 1,
-      display: 'flex',
-      alignItems: 'center',
-      justifyContent: 'space-between'
-    }
-  }, /*#__PURE__*/React__default["default"].createElement("div", null, "Match Cache"), /*#__PURE__*/React__default["default"].createElement(styledComponents.Button, {
-    onClick: () => {
-      router.matchCache = {};
-      router.notify();
-    }
-  }, "Clear")), matchCacheValues.map((d, i) => {
-    const {
-      match,
-      gc
-    } = d;
-    return /*#__PURE__*/React__default["default"].createElement("div", {
-      key: match.matchId || i,
-      role: "button",
-      "aria-label": "Open match details for " + match.matchId,
-      onClick: () => setActiveMatchId(activeMatchId === match.matchId ? '' : match.matchId),
-      style: {
-        display: 'flex',
-        borderBottom: "solid 1px " + theme.defaultTheme.grayAlt,
-        cursor: 'pointer',
-        background: match === activeMatch ? 'rgba(255,255,255,.1)' : undefined
-      }
-    }, /*#__PURE__*/React__default["default"].createElement("div", {
-      style: {
-        display: 'flex',
-        flexDirection: 'column',
-        padding: '.5rem',
-        gap: '.3rem'
-      }
-    }, /*#__PURE__*/React__default["default"].createElement("div", {
-      style: {
-        display: 'flex',
-        alignItems: 'center',
-        gap: '.5rem'
-      }
-    }, /*#__PURE__*/React__default["default"].createElement("div", {
-      style: {
-        flex: '0 0 auto',
-        width: '1.3rem',
-        height: '1.3rem',
-        background: utils.getStatusColor(match, theme.defaultTheme),
-        alignItems: 'center',
-        justifyContent: 'center',
-        fontWeight: 'bold',
-        borderRadius: '.25rem',
-        transition: 'all .2s ease-out'
-      }
-    }), /*#__PURE__*/React__default["default"].createElement(styledComponents.Code, null, "" + match.matchId)), /*#__PURE__*/React__default["default"].createElement("span", {
-      style: {
-        fontSize: '.7rem',
-        opacity: '.5',
-        lineHeight: 1
-      }
-    }, "Expires", ' ', index["default"](new Date(gc), new Date(), {
-      addSuffix: true
-    }))));
+    }, `${match.id}`));
   })) : null), activeMatch ? /*#__PURE__*/React__default["default"].createElement(styledComponents.ActivePanel, null, /*#__PURE__*/React__default["default"].createElement("div", {
     style: {
       padding: '.5em',
@@ -556,23 +498,15 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
     style: {
       lineHeight: '1.8em'
     }
-  }, JSON.stringify(activeMatch.matchId, null, 2)))), /*#__PURE__*/React__default["default"].createElement("tr", null, /*#__PURE__*/React__default["default"].createElement("td", {
-    style: {
-      opacity: '.5'
-    }
-  }, "Status"), /*#__PURE__*/React__default["default"].createElement("td", null, activeMatch.status)), /*#__PURE__*/React__default["default"].createElement("tr", null, /*#__PURE__*/React__default["default"].createElement("td", {
-    style: {
-      opacity: '.5'
-    }
-  }, "Pending"), /*#__PURE__*/React__default["default"].createElement("td", null, activeMatch.isPending.toString())), /*#__PURE__*/React__default["default"].createElement("tr", null, /*#__PURE__*/React__default["default"].createElement("td", {
+  }, JSON.stringify(activeMatch.id, null, 2)))), /*#__PURE__*/React__default["default"].createElement("tr", null, /*#__PURE__*/React__default["default"].createElement("td", {
     style: {
       opacity: '.5'
     }
-  }, "Invalid"), /*#__PURE__*/React__default["default"].createElement("td", null, activeMatch.isInvalid.toString())), /*#__PURE__*/React__default["default"].createElement("tr", null, /*#__PURE__*/React__default["default"].createElement("td", {
+  }, "Status"), /*#__PURE__*/React__default["default"].createElement("td", null, activeMatch.state.status)), /*#__PURE__*/React__default["default"].createElement("tr", null, /*#__PURE__*/React__default["default"].createElement("td", {
     style: {
       opacity: '.5'
     }
-  }, "Last Updated"), /*#__PURE__*/React__default["default"].createElement("td", null, activeMatch.updatedAt ? new Date(activeMatch.updatedAt).toLocaleTimeString() : 'N/A'))))), /*#__PURE__*/React__default["default"].createElement("div", {
+  }, "Last Updated"), /*#__PURE__*/React__default["default"].createElement("td", null, activeMatch.state.updatedAt ? new Date(activeMatch.state.updatedAt).toLocaleTimeString() : 'N/A'))))), /*#__PURE__*/React__default["default"].createElement("div", {
     style: {
       background: theme.defaultTheme.backgroundAlt,
       padding: '.5em',
@@ -586,16 +520,6 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
       padding: '0.5em'
     }
   }, /*#__PURE__*/React__default["default"].createElement(styledComponents.Button, {
-    type: "button",
-    onClick: () => {
-      activeMatch.invalidate();
-      router.notify();
-    },
-    style: {
-      background: theme.defaultTheme.warning,
-      color: theme.defaultTheme.inputTextColor
-    }
-  }, "Invalidate"), ' ', /*#__PURE__*/React__default["default"].createElement(styledComponents.Button, {
     type: "button",
     onClick: () => activeMatch.load(),
     style: {
@@ -624,7 +548,7 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
       minHeight: '40%',
       maxHeight: '100%',
       overflow: 'auto',
-      borderRight: "1px solid " + theme.defaultTheme.grayAlt,
+      borderRight: `1px solid ${theme.defaultTheme.grayAlt}`,
       display: 'flex',
       flexDirection: 'column'
     }
@@ -637,36 +561,13 @@ const TanStackRouterDevtoolsPanel = /*#__PURE__*/React__default["default"].forwa
       bottom: 0,
       zIndex: 1
     }
-  }, "All Loader Data"), /*#__PURE__*/React__default["default"].createElement("div", {
-    style: {
-      padding: '.5em'
-    }
-  }, Object.keys(((_last = reactRouter.last(router.state.matches)) == null ? void 0 : _last.loaderData) || {}).length ? /*#__PURE__*/React__default["default"].createElement(Explorer["default"], {
-    value: ((_last2 = reactRouter.last(router.state.matches)) == null ? void 0 : _last2.loaderData) || {},
-    defaultExpanded: Object.keys(((_last3 = reactRouter.last(router.state.matches)) == null ? void 0 : _last3.loaderData) || {}).reduce((obj, next) => {
-      obj[next] = {};
-      return obj;
-    }, {})
-  }) : /*#__PURE__*/React__default["default"].createElement("em", {
-    style: {
-      opacity: 0.5
-    }
-  }, '{ }')), /*#__PURE__*/React__default["default"].createElement("div", {
-    style: {
-      padding: '.5em',
-      background: theme.defaultTheme.backgroundAlt,
-      position: 'sticky',
-      top: 0,
-      bottom: 0,
-      zIndex: 1
-    }
   }, "Search Params"), /*#__PURE__*/React__default["default"].createElement("div", {
     style: {
       padding: '.5em'
     }
-  }, Object.keys(((_last4 = reactRouter.last(router.state.matches)) == null ? void 0 : _last4.search) || {}).length ? /*#__PURE__*/React__default["default"].createElement(Explorer["default"], {
-    value: ((_last5 = reactRouter.last(router.state.matches)) == null ? void 0 : _last5.search) || {},
-    defaultExpanded: Object.keys(((_last6 = reactRouter.last(router.state.matches)) == null ? void 0 : _last6.search) || {}).reduce((obj, next) => {
+  }, Object.keys(reactRouter.last(router.state.currentMatches)?.state.search || {}).length ? /*#__PURE__*/React__default["default"].createElement(Explorer["default"], {
+    value: reactRouter.last(router.state.currentMatches)?.state.search || {},
+    defaultExpanded: Object.keys(reactRouter.last(router.state.currentMatches)?.state.search || {}).reduce((obj, next) => {
       obj[next] = {};
       return obj;
     }, {})