@tanstack/solid-router 1.166.6 → 2.0.0-alpha.1

package/dist/cjs/Match.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid = require("solid-js/web");
-const Solid$1 = require("solid-js");
+const Solid$1 = require("@solidjs/web");
+const Solid = require("solid-js");
 const invariant = require("tiny-invariant");
 const warning = require("tiny-warning");
 const routerCore = require("@tanstack/router-core");
@@ -30,7 +30,8 @@ function _interopNamespaceDefault(e) {
   n.default = e;
   return Object.freeze(n);
 }
-const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid$1);
+const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
+const MatchContext = matchContext.matchContext;
 const Match = (props) => {
   const router = useRouter.useRouter();
   const matchState = useRouterState.useRouterState({
@@ -46,7 +47,7 @@ const Match = (props) => {
       };
     }
   });
-  if (!matchState()) return null;
+  if (!Solid__namespace.untrack(matchState)) return null;
   const route = () => router.routesById[matchState().routeId];
   const resolvePendingComponent = () => route().options.pendingComponent ?? router.options.defaultPendingComponent;
   const routeErrorComponent = () => route().options.errorComponent ?? router.options.defaultErrorComponent;
@@ -55,8 +56,8 @@ const Match = (props) => {
     // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component
     route().options.notFoundComponent ?? router.options.notFoundRoute?.options.component
   ) : route().options.notFoundComponent;
-  const resolvedNoSsr = matchState().ssr === false || matchState().ssr === "data-only";
-  const ResolvedSuspenseBoundary = () => Solid__namespace.Suspense;
+  const resolvedNoSsr = Solid__namespace.createMemo(() => matchState().ssr === false || matchState().ssr === "data-only");
+  const ResolvedSuspenseBoundary = () => resolvedNoSsr() ? SafeFragment.SafeFragment : Solid__namespace.Loading;
   const ResolvedCatchBoundary = () => routeErrorComponent() ? CatchBoundary.CatchBoundary : SafeFragment.SafeFragment;
   const ResolvedNotFoundBoundary = () => routeNotFoundComponent() ? notFound.CatchNotFound : SafeFragment.SafeFragment;
   const resetKey = useRouterState.useRouterState({
@@ -68,20 +69,23 @@ const Match = (props) => {
       return s.matches[index - 1]?.routeId;
     }
   });
-  const ShellComponent = route().isRoot ? route().options.shellComponent ?? SafeFragment.SafeFragment : SafeFragment.SafeFragment;
-  return Solid.createComponent(ShellComponent, {
+  const ShellComponent = Solid__namespace.createMemo(() => route().isRoot ? route().options.shellComponent ?? SafeFragment.SafeFragment : SafeFragment.SafeFragment);
+  return Solid$1.createComponent(Solid$1.Dynamic, {
+    get component() {
+      return ShellComponent();
+    },
     get children() {
-      return [Solid.createComponent(matchContext.matchContext.Provider, {
+      return [Solid$1.createComponent(MatchContext, {
         value: () => props.matchId,
         get children() {
-          return Solid.createComponent(Solid.Dynamic, {
+          return Solid$1.createComponent(Solid$1.Dynamic, {
             get component() {
               return ResolvedSuspenseBoundary();
             },
             get fallback() {
               return (
                 // Don't show fallback on server when using no-ssr mode to avoid hydration mismatch
-                Solid.memo(() => !!((isServer.isServer ?? router.isServer) || resolvedNoSsr))() ? void 0 : Solid.createComponent(Solid.Dynamic, {
+                Solid$1.memo(() => !!((isServer.isServer ?? router.isServer) || resolvedNoSsr()))() ? void 0 : Solid$1.createComponent(Solid$1.Dynamic, {
                   get component() {
                     return resolvePendingComponent();
                   }
@@ -89,7 +93,7 @@ const Match = (props) => {
               );
             },
             get children() {
-              return Solid.createComponent(Solid.Dynamic, {
+              return Solid$1.createComponent(Solid$1.Dynamic, {
                 get component() {
                   return ResolvedCatchBoundary();
                 },
@@ -99,41 +103,43 @@ const Match = (props) => {
                 },
                 onCatch: (error) => {
                   if (routerCore.isNotFound(error)) throw error;
-                  warning(false, `Error in route match: ${matchState().routeId}`);
+                  warning(false, `Error in route match: ${Solid__namespace.untrack(matchState).routeId}`);
                   routeOnCatch()?.(error);
                 },
                 get children() {
-                  return Solid.createComponent(Solid.Dynamic, {
+                  return Solid$1.createComponent(Solid$1.Dynamic, {
                     get component() {
                       return ResolvedNotFoundBoundary();
                     },
                     fallback: (error) => {
                       if (!routeNotFoundComponent() || error.routeId && error.routeId !== matchState().routeId || !error.routeId && !route().isRoot) throw error;
-                      return Solid.createComponent(Solid.Dynamic, Solid.mergeProps({
+                      return Solid$1.createComponent(Solid$1.Dynamic, Solid$1.mergeProps({
                         get component() {
                           return routeNotFoundComponent();
                         }
                       }, error));
                     },
                     get children() {
-                      return Solid.createComponent(Solid__namespace.Switch, {
+                      return Solid$1.createComponent(Solid__namespace.Switch, {
                         get children() {
-                          return [Solid.createComponent(Solid__namespace.Match, {
-                            when: resolvedNoSsr,
+                          return [Solid$1.createComponent(Solid__namespace.Match, {
+                            get when() {
+                              return resolvedNoSsr();
+                            },
                             get children() {
-                              return Solid.createComponent(Solid__namespace.Show, {
+                              return Solid$1.createComponent(Solid__namespace.Show, {
                                 get when() {
                                   return !(isServer.isServer ?? router.isServer);
                                 },
                                 get fallback() {
-                                  return Solid.createComponent(Solid.Dynamic, {
+                                  return Solid$1.createComponent(Solid$1.Dynamic, {
                                     get component() {
                                       return resolvePendingComponent();
                                     }
                                   });
                                 },
                                 get children() {
-                                  return Solid.createComponent(MatchInner, {
+                                  return Solid$1.createComponent(MatchInner, {
                                     get matchId() {
                                       return props.matchId;
                                     }
@@ -141,10 +147,12 @@ const Match = (props) => {
                                 }
                               });
                             }
-                          }), Solid.createComponent(Solid__namespace.Match, {
-                            when: !resolvedNoSsr,
+                          }), Solid$1.createComponent(Solid__namespace.Match, {
+                            get when() {
+                              return !resolvedNoSsr();
+                            },
                             get children() {
-                              return Solid.createComponent(MatchInner, {
+                              return Solid$1.createComponent(MatchInner, {
                                 get matchId() {
                                   return props.matchId;
                                 }
@@ -160,10 +168,11 @@ const Match = (props) => {
             }
           });
         }
-      }), Solid.memo(() => Solid.memo(() => parentRouteId() === routerCore.rootRouteId)() ? [Solid.createComponent(OnRendered, {}), Solid.createComponent(scrollRestoration.ScrollRestoration, {})] : null)];
+      }), Solid$1.memo(() => Solid$1.memo(() => parentRouteId() === routerCore.rootRouteId)() ? [Solid$1.createComponent(OnRendered, {}), Solid$1.createComponent(scrollRestoration.ScrollRestoration, {})] : null)];
     }
   });
 };
+const lastOnRenderedKey = /* @__PURE__ */ new WeakMap();
 function OnRendered() {
   const router = useRouter.useRouter();
   const location = useRouterState.useRouterState({
@@ -171,12 +180,15 @@ function OnRendered() {
       return s.resolvedLocation?.state.__TSR_key;
     }
   });
-  Solid__namespace.createEffect(Solid__namespace.on([location], () => {
+  Solid__namespace.createEffect(() => [location()], ([location2]) => {
+    if (!location2) return;
+    if (lastOnRenderedKey.get(router) === location2) return;
+    lastOnRenderedKey.set(router, location2);
     router.emit({
       type: "onRendered",
       ...routerCore.getLocationChangeInfo(router.state)
     });
-  }));
+  });
   return null;
 }
 const MatchInner = (props) => {
@@ -209,50 +221,55 @@ const MatchInner = (props) => {
       };
     }
   });
-  if (!matchState()) return null;
+  if (!Solid__namespace.untrack(matchState)) return null;
   const route = () => router.routesById[matchState().routeId];
   const match = () => matchState().match;
   const componentKey = () => matchState().key ?? matchState().match.id;
   const out = () => {
-    const Comp = route().options.component ?? router.options.defaultComponent;
+    const currentRoute = Solid__namespace.untrack(route);
+    const Comp = currentRoute.options.component ?? router.options.defaultComponent;
     if (Comp) {
-      return Solid.createComponent(Comp, {});
+      return Solid$1.createComponent(Comp, {});
     }
-    return Solid.createComponent(Outlet, {});
+    return Solid$1.createComponent(Outlet, {});
   };
-  const keyedOut = () => Solid.createComponent(Solid__namespace.Show, {
+  const keyedOut = () => Solid$1.createComponent(Solid__namespace.Show, {
     get when() {
       return componentKey();
     },
     keyed: true,
     children: (_key) => out()
   });
-  return Solid.createComponent(Solid__namespace.Switch, {
+  return Solid$1.createComponent(Solid__namespace.Switch, {
     get children() {
-      return [Solid.createComponent(Solid__namespace.Match, {
+      return [Solid$1.createComponent(Solid__namespace.Match, {
         get when() {
           return match()._displayPending;
         },
         children: (_) => {
-          const [displayPendingResult] = Solid__namespace.createResource(() => router.getMatch(match().id)?._nonReactive.displayPendingPromise);
-          return Solid.memo(displayPendingResult);
+          const matchId = Solid__namespace.untrack(() => match().id);
+          const displayPendingResult = Solid__namespace.createMemo(() => router.getMatch(matchId)?._nonReactive.displayPendingPromise);
+          return Solid$1.memo(displayPendingResult);
         }
-      }), Solid.createComponent(Solid__namespace.Match, {
+      }), Solid$1.createComponent(Solid__namespace.Match, {
         get when() {
           return match()._forcePending;
         },
         children: (_) => {
-          const [minPendingResult] = Solid__namespace.createResource(() => router.getMatch(match().id)?._nonReactive.minPendingPromise);
-          return Solid.memo(minPendingResult);
+          const matchId = Solid__namespace.untrack(() => match().id);
+          const minPendingResult = Solid__namespace.createMemo(() => router.getMatch(matchId)?._nonReactive.minPendingPromise);
+          return Solid$1.memo(minPendingResult);
         }
-      }), Solid.createComponent(Solid__namespace.Match, {
+      }), Solid$1.createComponent(Solid__namespace.Match, {
         get when() {
           return match().status === "pending";
         },
         children: (_) => {
-          const pendingMinMs = route().options.pendingMinMs ?? router.options.defaultPendingMinMs;
+          const currentMatch = Solid__namespace.untrack(match);
+          const currentRoute = Solid__namespace.untrack(route);
+          const pendingMinMs = currentRoute.options.pendingMinMs ?? router.options.defaultPendingMinMs;
           if (pendingMinMs) {
-            const routerMatch = router.getMatch(match().id);
+            const routerMatch = router.getMatch(currentMatch.id);
             if (routerMatch && !routerMatch._nonReactive.minPendingPromise) {
               if (!(isServer.isServer ?? router.isServer)) {
                 const minPendingPromise = routerCore.createControlledPromise();
@@ -264,49 +281,63 @@ const MatchInner = (props) => {
               }
             }
           }
-          const [loaderResult] = Solid__namespace.createResource(async () => {
+          const loaderResult = Solid__namespace.createMemo(async () => {
             await new Promise((r) => setTimeout(r, 0));
-            return router.getMatch(match().id)?._nonReactive.loadPromise;
+            return router.getMatch(currentMatch.id)?._nonReactive.loadPromise;
           });
-          const FallbackComponent = route().options.pendingComponent ?? router.options.defaultPendingComponent;
-          return [FallbackComponent && pendingMinMs > 0 ? Solid.createComponent(Solid.Dynamic, {
+          const FallbackComponent = currentRoute.options.pendingComponent ?? router.options.defaultPendingComponent;
+          return [FallbackComponent && pendingMinMs > 0 ? Solid$1.createComponent(Solid$1.Dynamic, {
             component: FallbackComponent
-          }) : null, Solid.memo(loaderResult)];
+          }) : null, Solid$1.memo(loaderResult)];
         }
-      }), Solid.createComponent(Solid__namespace.Match, {
+      }), Solid$1.createComponent(Solid__namespace.Match, {
         get when() {
           return match().status === "notFound";
         },
         children: (_) => {
-          invariant(routerCore.isNotFound(match().error), "Expected a notFound error");
-          return Solid.createComponent(Solid__namespace.Show, {
-            get when() {
-              return matchState().routeId;
-            },
+          const currentMatch = Solid__namespace.untrack(match);
+          const currentRoute = Solid__namespace.untrack(route);
+          const currentRouteId = Solid__namespace.untrack(() => matchState().routeId);
+          invariant(routerCore.isNotFound(currentMatch.error), "Expected a notFound error");
+          return Solid$1.createComponent(Solid__namespace.Show, {
+            when: currentRouteId,
             keyed: true,
-            children: (_routeId) => renderRouteNotFound.renderRouteNotFound(router, route(), match().error)
+            children: (_routeId) => renderRouteNotFound.renderRouteNotFound(router, currentRoute, currentMatch.error)
           });
         }
-      }), Solid.createComponent(Solid__namespace.Match, {
+      }), Solid$1.createComponent(Solid__namespace.Match, {
         get when() {
           return match().status === "redirected";
         },
         children: (_) => {
-          invariant(routerCore.isRedirect(match().error), "Expected a redirect error");
-          const [loaderResult] = Solid__namespace.createResource(async () => {
+          const matchId = Solid__namespace.untrack(() => match().id);
+          invariant(routerCore.isRedirect(Solid__namespace.untrack(match).error), "Expected a redirect error");
+          const loaderResult = Solid__namespace.createMemo(async () => {
             await new Promise((r) => setTimeout(r, 0));
-            return router.getMatch(match().id)?._nonReactive.loadPromise;
+            return router.getMatch(matchId)?._nonReactive.loadPromise;
           });
-          return Solid.memo(loaderResult);
+          return Solid$1.memo(loaderResult);
         }
-      }), Solid.createComponent(Solid__namespace.Match, {
+      }), Solid$1.createComponent(Solid__namespace.Match, {
         get when() {
           return match().status === "error";
         },
         children: (_) => {
-          throw match().error;
+          if (isServer.isServer ?? router.isServer) {
+            const currentMatch = Solid__namespace.untrack(match);
+            const RouteErrorComponent = (Solid__namespace.untrack(route).options.errorComponent ?? router.options.defaultErrorComponent) || CatchBoundary.ErrorComponent;
+            return Solid$1.createComponent(RouteErrorComponent, {
+              get error() {
+                return currentMatch.error;
+              },
+              info: {
+                componentStack: ""
+              }
+            });
+          }
+          throw Solid__namespace.untrack(match).error;
         }
-      }), Solid.createComponent(Solid__namespace.Match, {
+      }), Solid$1.createComponent(Solid__namespace.Match, {
         get when() {
           return match().status === "success";
         },
@@ -342,6 +373,13 @@ const Outlet = () => {
       return v;
     }
   });
+  const childRouteId = useRouterState.useRouterState({
+    select: (s) => {
+      const matches = s.matches;
+      const index = matches.findIndex((d) => d.id === matchId());
+      return matches[index + 1]?.routeId;
+    }
+  });
   const childMatchStatus = useRouterState.useRouterState({
     select: (s) => {
       const matches = s.matches;
@@ -350,12 +388,12 @@ const Outlet = () => {
     }
   });
   const shouldShowNotFound = () => childMatchStatus() !== "redirected" && parentGlobalNotFound();
-  return Solid.createComponent(Solid__namespace.Show, {
+  return Solid$1.createComponent(Solid__namespace.Show, {
     get when() {
-      return Solid.memo(() => !!!shouldShowNotFound())() && childMatchId();
+      return Solid$1.memo(() => !!!shouldShowNotFound())() && childMatchId();
     },
     get fallback() {
-      return Solid.createComponent(Solid__namespace.Show, {
+      return Solid$1.createComponent(Solid__namespace.Show, {
         get when() {
           return shouldShowNotFound();
         },
@@ -366,33 +404,39 @@ const Outlet = () => {
     },
     children: (matchIdAccessor) => {
       const currentMatchId = Solid__namespace.createMemo(() => matchIdAccessor());
-      return Solid.createComponent(Solid__namespace.Show, {
+      return Solid$1.createComponent(Solid__namespace.Show, {
         get when() {
           return routeId() === routerCore.rootRouteId;
         },
         get fallback() {
-          return Solid.createComponent(Match, {
+          return Solid$1.createComponent(Match, {
             get matchId() {
               return currentMatchId();
             }
           });
         },
         get children() {
-          return Solid.createComponent(Solid__namespace.Suspense, {
-            get fallback() {
-              return Solid.createComponent(Solid.Dynamic, {
-                get component() {
-                  return router.options.defaultPendingComponent;
-                }
-              });
+          return Solid$1.createComponent(Solid__namespace.Show, {
+            get when() {
+              return childRouteId();
             },
-            get children() {
-              return Solid.createComponent(Match, {
-                get matchId() {
-                  return currentMatchId();
-                }
-              });
-            }
+            keyed: true,
+            children: (_routeId) => Solid$1.createComponent(Solid__namespace.Loading, {
+              get fallback() {
+                return Solid$1.createComponent(Solid$1.Dynamic, {
+                  get component() {
+                    return router.options.defaultPendingComponent;
+                  }
+                });
+              },
+              get children() {
+                return Solid$1.createComponent(Match, {
+                  get matchId() {
+                    return currentMatchId();
+                  }
+                });
+              }
+            })
           });
         }
       });

package/dist/cjs/Match.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Match.cjs","sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport invariant from 'tiny-invariant'\nimport warning from 'tiny-warning'\nimport {\n  createControlledPromise,\n  getLocationChangeInfo,\n  isNotFound,\n  isRedirect,\n  rootRouteId,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from 'solid-js/web'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouterState } from './useRouterState'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound } from './not-found'\nimport { matchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'\n\nexport const Match = (props: { matchId: string }) => {\n  const router = useRouter()\n  const matchState = useRouterState({\n    select: (s) => {\n      const match = s.matches.find((d) => d.id === props.matchId)\n\n      // During navigation transitions, matches can be temporarily removed\n      // Return null to avoid errors - the component will handle this gracefully\n      if (!match) {\n        return null\n      }\n\n      return {\n        routeId: match.routeId,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    },\n  })\n\n  // If match doesn't exist yet, return null (component is being unmounted or not ready)\n  if (!matchState()) return null\n\n  const route: () => AnyRoute = () => router.routesById[matchState()!.routeId]\n\n  const resolvePendingComponent = () =>\n    route().options.pendingComponent ?? router.options.defaultPendingComponent\n\n  const routeErrorComponent = () =>\n    route().options.errorComponent ?? router.options.defaultErrorComponent\n\n  const routeOnCatch = () =>\n    route().options.onCatch ?? router.options.defaultOnCatch\n\n  const routeNotFoundComponent = () =>\n    route().isRoot\n      ? // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component\n        (route().options.notFoundComponent ??\n        router.options.notFoundRoute?.options.component)\n      : route().options.notFoundComponent\n\n  const resolvedNoSsr =\n    matchState()!.ssr === false || matchState()!.ssr === 'data-only'\n\n  const ResolvedSuspenseBoundary = () => Solid.Suspense\n\n  const ResolvedCatchBoundary = () =>\n    routeErrorComponent() ? CatchBoundary : SafeFragment\n\n  const ResolvedNotFoundBoundary = () =>\n    routeNotFoundComponent() ? CatchNotFound : SafeFragment\n\n  const resetKey = useRouterState({\n    select: (s) => s.loadedAt,\n  })\n\n  const parentRouteId = useRouterState({\n    select: (s) => {\n      const index = s.matches.findIndex((d) => d.id === props.matchId)\n      return s.matches[index - 1]?.routeId as string\n    },\n  })\n\n  const ShellComponent = route().isRoot\n    ? ((route().options as RootRouteOptions).shellComponent ?? SafeFragment)\n    : SafeFragment\n\n  return (\n    <ShellComponent>\n      <matchContext.Provider value={() => props.matchId}>\n        <Dynamic\n          component={ResolvedSuspenseBoundary()}\n          fallback={\n            // Don't show fallback on server when using no-ssr mode to avoid hydration mismatch\n            (isServer ?? router.isServer) || resolvedNoSsr ? undefined : (\n              <Dynamic component={resolvePendingComponent()} />\n            )\n          }\n        >\n          <Dynamic\n            component={ResolvedCatchBoundary()}\n            getResetKey={() => resetKey()}\n            errorComponent={routeErrorComponent() || ErrorComponent}\n            onCatch={(error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              if (isNotFound(error)) throw error\n              warning(false, `Error in route match: ${matchState()!.routeId}`)\n              routeOnCatch()?.(error)\n            }}\n          >\n            <Dynamic\n              component={ResolvedNotFoundBoundary()}\n              fallback={(error: any) => {\n                // If the current not found handler doesn't exist or it has a\n                // route ID which doesn't match the current route, rethrow the error\n                if (\n                  !routeNotFoundComponent() ||\n                  (error.routeId && error.routeId !== matchState()!.routeId) ||\n                  (!error.routeId && !route().isRoot)\n                )\n                  throw error\n\n                return (\n                  <Dynamic component={routeNotFoundComponent()} {...error} />\n                )\n              }}\n            >\n              <Solid.Switch>\n                <Solid.Match when={resolvedNoSsr}>\n                  <Solid.Show\n                    when={!(isServer ?? router.isServer)}\n                    fallback={<Dynamic component={resolvePendingComponent()} />}\n                  >\n                    <MatchInner matchId={props.matchId} />\n                  </Solid.Show>\n                </Solid.Match>\n                <Solid.Match when={!resolvedNoSsr}>\n                  <MatchInner matchId={props.matchId} />\n                </Solid.Match>\n              </Solid.Switch>\n            </Dynamic>\n          </Dynamic>\n        </Dynamic>\n      </matchContext.Provider>\n\n      {parentRouteId() === rootRouteId ? (\n        <>\n          <OnRendered />\n          <ScrollRestoration />\n        </>\n      ) : null}\n    </ShellComponent>\n  )\n}\n\n// On Rendered can't happen above the root layout because it actually\n// renders a dummy dom element to track the rendered state of the app.\n// We render a script tag with a key that changes based on the current\n// location state.__TSR_key. Also, because it's below the root layout, it\n// allows us to fire onRendered events even after a hydration mismatch\n// error that occurred above the root layout (like bad head/link tags,\n// which is common).\nfunction OnRendered() {\n  const router = useRouter()\n\n  const location = useRouterState({\n    select: (s) => {\n      return s.resolvedLocation?.state.__TSR_key\n    },\n  })\n  Solid.createEffect(\n    Solid.on([location], () => {\n      router.emit({\n        type: 'onRendered',\n        ...getLocationChangeInfo(router.state),\n      })\n    }),\n  )\n  return null\n}\n\nexport const MatchInner = (props: { matchId: string }): any => {\n  const router = useRouter()\n\n  const matchState = useRouterState({\n    select: (s) => {\n      const match = s.matches.find((d) => d.id === props.matchId)\n\n      // During navigation transitions, matches can be temporarily removed\n      if (!match) {\n        return null\n      }\n\n      const routeId = match.routeId as string\n\n      const remountFn =\n        (router.routesById[routeId] as AnyRoute).options.remountDeps ??\n        router.options.defaultRemountDeps\n      const remountDeps = remountFn?.({\n        routeId,\n        loaderDeps: match.loaderDeps,\n        params: match._strictParams,\n        search: match._strictSearch,\n      })\n      const key = remountDeps ? JSON.stringify(remountDeps) : undefined\n\n      return {\n        key,\n        routeId,\n        match: {\n          id: match.id,\n          status: match.status,\n          error: match.error,\n          _forcePending: match._forcePending,\n          _displayPending: match._displayPending,\n        },\n      }\n    },\n  })\n\n  if (!matchState()) return null\n\n  const route = () => router.routesById[matchState()!.routeId]!\n\n  const match = () => matchState()!.match\n\n  const componentKey = () => matchState()!.key ?? matchState()!.match.id\n\n  const out = () => {\n    const Comp = route().options.component ?? router.options.defaultComponent\n    if (Comp) {\n      return <Comp />\n    }\n    return <Outlet />\n  }\n\n  const keyedOut = () => (\n    <Solid.Show when={componentKey()} keyed>\n      {(_key) => out()}\n    </Solid.Show>\n  )\n\n  return (\n    <Solid.Switch>\n      <Solid.Match when={match()._displayPending}>\n        {(_) => {\n          const [displayPendingResult] = Solid.createResource(\n            () =>\n              router.getMatch(match().id)?._nonReactive.displayPendingPromise,\n          )\n\n          return <>{displayPendingResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match()._forcePending}>\n        {(_) => {\n          const [minPendingResult] = Solid.createResource(\n            () => router.getMatch(match().id)?._nonReactive.minPendingPromise,\n          )\n\n          return <>{minPendingResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'pending'}>\n        {(_) => {\n          const pendingMinMs =\n            route().options.pendingMinMs ?? router.options.defaultPendingMinMs\n\n          if (pendingMinMs) {\n            const routerMatch = router.getMatch(match().id)\n            if (routerMatch && !routerMatch._nonReactive.minPendingPromise) {\n              // Create a promise that will resolve after the minPendingMs\n              if (!(isServer ?? router.isServer)) {\n                const minPendingPromise = createControlledPromise<void>()\n\n                routerMatch._nonReactive.minPendingPromise = minPendingPromise\n\n                setTimeout(() => {\n                  minPendingPromise.resolve()\n                  // We've handled the minPendingPromise, so we can delete it\n                  routerMatch._nonReactive.minPendingPromise = undefined\n                }, pendingMinMs)\n              }\n            }\n          }\n\n          const [loaderResult] = Solid.createResource(async () => {\n            await new Promise((r) => setTimeout(r, 0))\n            return router.getMatch(match().id)?._nonReactive.loadPromise\n          })\n\n          const FallbackComponent =\n            route().options.pendingComponent ??\n            router.options.defaultPendingComponent\n\n          return (\n            <>\n              {FallbackComponent && pendingMinMs > 0 ? (\n                <Dynamic component={FallbackComponent} />\n              ) : null}\n              {loaderResult()}\n            </>\n          )\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'notFound'}>\n        {(_) => {\n          invariant(isNotFound(match().error), 'Expected a notFound error')\n\n          // Use Show with keyed to ensure re-render when routeId changes\n          return (\n            <Solid.Show when={matchState()!.routeId} keyed>\n              {(_routeId) =>\n                renderRouteNotFound(router, route(), match().error)\n              }\n            </Solid.Show>\n          )\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'redirected'}>\n        {(_) => {\n          invariant(isRedirect(match().error), 'Expected a redirect error')\n\n          const [loaderResult] = Solid.createResource(async () => {\n            await new Promise((r) => setTimeout(r, 0))\n            return router.getMatch(match().id)?._nonReactive.loadPromise\n          })\n\n          return <>{loaderResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'error'}>\n        {(_) => {\n          throw match().error\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'success'}>\n        {keyedOut()}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n\nexport const Outlet = () => {\n  const router = useRouter()\n  const matchId = Solid.useContext(matchContext)\n  const routeId = useRouterState({\n    select: (s) => s.matches.find((d) => d.id === matchId())?.routeId as string,\n  })\n\n  const route = () => router.routesById[routeId()]!\n\n  const parentGlobalNotFound = useRouterState({\n    select: (s) => {\n      const matches = s.matches\n      const parentMatch = matches.find((d) => d.id === matchId())\n\n      // During navigation transitions, parent match can be temporarily removed\n      // Return false to avoid errors - the component will handle this gracefully\n      if (!parentMatch) {\n        return false\n      }\n\n      return parentMatch.globalNotFound\n    },\n  })\n\n  const childMatchId = useRouterState({\n    select: (s) => {\n      const matches = s.matches\n      const index = matches.findIndex((d) => d.id === matchId())\n      const v = matches[index + 1]?.id\n      return v\n    },\n  })\n\n  const childMatchStatus = useRouterState({\n    select: (s) => {\n      const matches = s.matches\n      const index = matches.findIndex((d) => d.id === matchId())\n      return matches[index + 1]?.status\n    },\n  })\n\n  // Only show not-found if we're not in a redirected state\n  const shouldShowNotFound = () =>\n    childMatchStatus() !== 'redirected' && parentGlobalNotFound()\n\n  return (\n    <Solid.Show\n      when={!shouldShowNotFound() && childMatchId()}\n      fallback={\n        <Solid.Show when={shouldShowNotFound()}>\n          {renderRouteNotFound(router, route(), undefined)}\n        </Solid.Show>\n      }\n    >\n      {(matchIdAccessor) => {\n        // Use a memo to avoid stale accessor errors while keeping reactivity\n        const currentMatchId = Solid.createMemo(() => matchIdAccessor())\n\n        return (\n          <Solid.Show\n            when={routeId() === rootRouteId}\n            fallback={<Match matchId={currentMatchId()} />}\n          >\n            <Solid.Suspense\n              fallback={\n                <Dynamic component={router.options.defaultPendingComponent} />\n              }\n            >\n              <Match matchId={currentMatchId()} />\n            </Solid.Suspense>\n          </Solid.Show>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n"],"names":["Match","props","router","useRouter","matchState","useRouterState","select","s","match","matches","find","d","id","matchId","routeId","ssr","_displayPending","route","routesById","resolvePendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ResolvedSuspenseBoundary","Solid","Suspense","ResolvedCatchBoundary","CatchBoundary","SafeFragment","ResolvedNotFoundBoundary","CatchNotFound","resetKey","loadedAt","parentRouteId","index","findIndex","ShellComponent","shellComponent","_$createComponent","children","matchContext","Provider","value","Dynamic","fallback","_$memo","isServer","undefined","getResetKey","ErrorComponent","error","isNotFound","warning","_$mergeProps","Switch","when","Show","MatchInner","rootRouteId","OnRendered","ScrollRestoration","location","resolvedLocation","state","__TSR_key","createEffect","on","emit","type","getLocationChangeInfo","remountFn","remountDeps","defaultRemountDeps","loaderDeps","params","_strictParams","search","_strictSearch","key","JSON","stringify","status","_forcePending","componentKey","out","Comp","defaultComponent","Outlet","keyedOut","keyed","_key","_","displayPendingResult","createResource","getMatch","_nonReactive","displayPendingPromise","minPendingResult","minPendingPromise","pendingMinMs","defaultPendingMinMs","routerMatch","createControlledPromise","setTimeout","resolve","loaderResult","Promise","r","loadPromise","FallbackComponent","invariant","_routeId","renderRouteNotFound","isRedirect","useContext","parentGlobalNotFound","parentMatch","globalNotFound","childMatchId","v","childMatchStatus","shouldShowNotFound","matchIdAccessor","currentMatchId","createMemo"],"mappings":"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"}
+{"version":3,"file":"Match.cjs","sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport invariant from 'tiny-invariant'\nimport warning from 'tiny-warning'\nimport {\n  createControlledPromise,\n  getLocationChangeInfo,\n  isNotFound,\n  isRedirect,\n  rootRouteId,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { Dynamic } from '@solidjs/web'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouterState } from './useRouterState'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound } from './not-found'\nimport { matchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'\n\nconst MatchContext = matchContext as unknown as Solid.Component<{\n  value: any\n  children?: any\n}>\n\nexport const Match = (props: { matchId: string }) => {\n  const router = useRouter()\n  const matchState = useRouterState({\n    select: (s) => {\n      const match = s.matches.find((d) => d.id === props.matchId)\n\n      // During navigation transitions, matches can be temporarily removed\n      // Return null to avoid errors - the component will handle this gracefully\n      if (!match) {\n        return null\n      }\n\n      return {\n        routeId: match.routeId,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    },\n  })\n\n  // If match doesn't exist yet, return null (component is being unmounted or not ready)\n  if (!Solid.untrack(matchState)) return null\n\n  const route: () => AnyRoute = () => router.routesById[matchState()!.routeId]\n\n  const resolvePendingComponent = () =>\n    route().options.pendingComponent ?? router.options.defaultPendingComponent\n\n  const routeErrorComponent = () =>\n    route().options.errorComponent ?? router.options.defaultErrorComponent\n\n  const routeOnCatch = () =>\n    route().options.onCatch ?? router.options.defaultOnCatch\n\n  const routeNotFoundComponent = () =>\n    route().isRoot\n      ? // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component\n        (route().options.notFoundComponent ??\n        router.options.notFoundRoute?.options.component)\n      : route().options.notFoundComponent\n\n  const resolvedNoSsr = Solid.createMemo(\n    () => matchState()!.ssr === false || matchState()!.ssr === 'data-only',\n  )\n\n  const ResolvedSuspenseBoundary = () =>\n    resolvedNoSsr() ? SafeFragment : Solid.Loading\n\n  const ResolvedCatchBoundary = () =>\n    routeErrorComponent() ? CatchBoundary : SafeFragment\n\n  const ResolvedNotFoundBoundary = () =>\n    routeNotFoundComponent() ? CatchNotFound : SafeFragment\n\n  const resetKey = useRouterState({\n    select: (s) => s.loadedAt,\n  })\n\n  const parentRouteId = useRouterState({\n    select: (s) => {\n      const index = s.matches.findIndex((d) => d.id === props.matchId)\n      return s.matches[index - 1]?.routeId as string\n    },\n  })\n\n  const ShellComponent = Solid.createMemo(() =>\n    route().isRoot\n      ? ((route().options as RootRouteOptions).shellComponent ?? SafeFragment)\n      : SafeFragment,\n  )\n\n  return (\n    <Dynamic component={ShellComponent()}>\n      <MatchContext value={() => props.matchId}>\n        <Dynamic\n          component={ResolvedSuspenseBoundary()}\n          fallback={\n            // Don't show fallback on server when using no-ssr mode to avoid hydration mismatch\n            (isServer ?? router.isServer) || resolvedNoSsr() ? undefined : (\n              <Dynamic component={resolvePendingComponent()} />\n            )\n          }\n        >\n          <Dynamic\n            component={ResolvedCatchBoundary()}\n            getResetKey={() => resetKey()}\n            errorComponent={routeErrorComponent() || ErrorComponent}\n            onCatch={(error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              if (isNotFound(error)) throw error\n              warning(\n                false,\n                `Error in route match: ${Solid.untrack(matchState)!.routeId}`,\n              )\n              routeOnCatch()?.(error)\n            }}\n          >\n            <Dynamic\n              component={ResolvedNotFoundBoundary()}\n              fallback={(error: any) => {\n                // If the current not found handler doesn't exist or it has a\n                // route ID which doesn't match the current route, rethrow the error\n                if (\n                  !routeNotFoundComponent() ||\n                  (error.routeId && error.routeId !== matchState()!.routeId) ||\n                  (!error.routeId && !route().isRoot)\n                )\n                  throw error\n\n                return (\n                  <Dynamic component={routeNotFoundComponent()} {...error} />\n                )\n              }}\n            >\n              <Solid.Switch>\n                <Solid.Match when={resolvedNoSsr()}>\n                  <Solid.Show\n                    when={!(isServer ?? router.isServer)}\n                    fallback={<Dynamic component={resolvePendingComponent()} />}\n                  >\n                    <MatchInner matchId={props.matchId} />\n                  </Solid.Show>\n                </Solid.Match>\n                <Solid.Match when={!resolvedNoSsr()}>\n                  <MatchInner matchId={props.matchId} />\n                </Solid.Match>\n              </Solid.Switch>\n            </Dynamic>\n          </Dynamic>\n        </Dynamic>\n      </MatchContext>\n\n      {parentRouteId() === rootRouteId ? (\n        <>\n          <OnRendered />\n          <ScrollRestoration />\n        </>\n      ) : null}\n    </Dynamic>\n  )\n}\n\n// On Rendered can't happen above the root layout because it actually\n// renders a dummy dom element to track the rendered state of the app.\n// We render a script tag with a key that changes based on the current\n// location state.__TSR_key. Also, because it's below the root layout, it\n// allows us to fire onRendered events even after a hydration mismatch\n// error that occurred above the root layout (like bad head/link tags,\n// which is common).\n//\n// In Solid, createEffect(source, fn) fires on initial mount as well as on\n// reactive changes. OnRendered can also remount when the first child route\n// changes (e.g. navigating from / to /posts). We deduplicate by tracking\n// the last emitted resolvedLocation key per router so each unique resolved\n// location only triggers one onRendered event regardless of remounts.\nconst lastOnRenderedKey = new WeakMap<object, string>()\n\nfunction OnRendered() {\n  const router = useRouter()\n\n  const location = useRouterState({\n    select: (s) => {\n      return s.resolvedLocation?.state.__TSR_key\n    },\n  })\n  Solid.createEffect(\n    () => [location()] as const,\n    ([location]) => {\n      if (!location) return\n      if (lastOnRenderedKey.get(router) === location) return\n      lastOnRenderedKey.set(router, location)\n      router.emit({\n        type: 'onRendered',\n        ...getLocationChangeInfo(router.state),\n      })\n    },\n  )\n  return null\n}\n\nexport const MatchInner = (props: { matchId: string }): any => {\n  const router = useRouter()\n\n  const matchState = useRouterState({\n    select: (s) => {\n      const match = s.matches.find((d) => d.id === props.matchId)\n\n      // During navigation transitions, matches can be temporarily removed\n      if (!match) {\n        return null\n      }\n\n      const routeId = match.routeId as string\n\n      const remountFn =\n        (router.routesById[routeId] as AnyRoute).options.remountDeps ??\n        router.options.defaultRemountDeps\n      const remountDeps = remountFn?.({\n        routeId,\n        loaderDeps: match.loaderDeps,\n        params: match._strictParams,\n        search: match._strictSearch,\n      })\n      const key = remountDeps ? JSON.stringify(remountDeps) : undefined\n\n      return {\n        key,\n        routeId,\n        match: {\n          id: match.id,\n          status: match.status,\n          error: match.error,\n          _forcePending: match._forcePending,\n          _displayPending: match._displayPending,\n        },\n      }\n    },\n  })\n\n  if (!Solid.untrack(matchState)) return null\n\n  const route = () => router.routesById[matchState()!.routeId]!\n\n  const match = () => matchState()!.match\n\n  const componentKey = () => matchState()!.key ?? matchState()!.match.id\n\n  const out = () => {\n    const currentRoute = Solid.untrack(route)\n    const Comp =\n      currentRoute.options.component ?? router.options.defaultComponent\n    if (Comp) {\n      return <Comp />\n    }\n    return <Outlet />\n  }\n\n  const keyedOut = () => (\n    <Solid.Show when={componentKey()} keyed>\n      {(_key) => out()}\n    </Solid.Show>\n  )\n\n  return (\n    <Solid.Switch>\n      <Solid.Match when={match()._displayPending}>\n        {(_) => {\n          const matchId = Solid.untrack(() => match().id)\n          const displayPendingResult = Solid.createMemo(\n            () => router.getMatch(matchId)?._nonReactive.displayPendingPromise,\n          )\n\n          return <>{displayPendingResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match()._forcePending}>\n        {(_) => {\n          const matchId = Solid.untrack(() => match().id)\n          const minPendingResult = Solid.createMemo(\n            () => router.getMatch(matchId)?._nonReactive.minPendingPromise,\n          )\n\n          return <>{minPendingResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'pending'}>\n        {(_) => {\n          const currentMatch = Solid.untrack(match)\n          const currentRoute = Solid.untrack(route)\n          const pendingMinMs =\n            currentRoute.options.pendingMinMs ??\n            router.options.defaultPendingMinMs\n\n          if (pendingMinMs) {\n            const routerMatch = router.getMatch(currentMatch.id)\n            if (routerMatch && !routerMatch._nonReactive.minPendingPromise) {\n              // Create a promise that will resolve after the minPendingMs\n              if (!(isServer ?? router.isServer)) {\n                const minPendingPromise = createControlledPromise<void>()\n\n                routerMatch._nonReactive.minPendingPromise = minPendingPromise\n\n                setTimeout(() => {\n                  minPendingPromise.resolve()\n                  // We've handled the minPendingPromise, so we can delete it\n                  routerMatch._nonReactive.minPendingPromise = undefined\n                }, pendingMinMs)\n              }\n            }\n          }\n\n          const loaderResult = Solid.createMemo(async () => {\n            await new Promise((r) => setTimeout(r, 0))\n            return router.getMatch(currentMatch.id)?._nonReactive.loadPromise\n          })\n\n          const FallbackComponent =\n            currentRoute.options.pendingComponent ??\n            router.options.defaultPendingComponent\n\n          return (\n            <>\n              {FallbackComponent && pendingMinMs > 0 ? (\n                <Dynamic component={FallbackComponent} />\n              ) : null}\n              {loaderResult()}\n            </>\n          )\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'notFound'}>\n        {(_) => {\n          const currentMatch = Solid.untrack(match)\n          const currentRoute = Solid.untrack(route)\n          const currentRouteId = Solid.untrack(() => matchState()!.routeId)\n          invariant(isNotFound(currentMatch.error), 'Expected a notFound error')\n\n          // Use Show with keyed to ensure re-render when routeId changes\n          return (\n            <Solid.Show when={currentRouteId} keyed>\n              {(_routeId) =>\n                renderRouteNotFound(router, currentRoute, currentMatch.error)\n              }\n            </Solid.Show>\n          )\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'redirected'}>\n        {(_) => {\n          const matchId = Solid.untrack(() => match().id)\n          invariant(\n            isRedirect(Solid.untrack(match).error),\n            'Expected a redirect error',\n          )\n\n          const loaderResult = Solid.createMemo(async () => {\n            await new Promise((r) => setTimeout(r, 0))\n            return router.getMatch(matchId)?._nonReactive.loadPromise\n          })\n\n          return <>{loaderResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'error'}>\n        {(_) => {\n          if (isServer ?? router.isServer) {\n            const currentMatch = Solid.untrack(match)\n            const RouteErrorComponent =\n              (Solid.untrack(route).options.errorComponent ??\n                router.options.defaultErrorComponent) ||\n              ErrorComponent\n\n            return (\n              <RouteErrorComponent\n                error={currentMatch.error}\n                info={{\n                  componentStack: '',\n                }}\n              />\n            )\n          }\n\n          throw Solid.untrack(match).error\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'success'}>\n        {keyedOut()}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n\nexport const Outlet = () => {\n  const router = useRouter()\n  const matchId = Solid.useContext(matchContext)\n  const routeId = useRouterState({\n    select: (s) => s.matches.find((d) => d.id === matchId())?.routeId as string,\n  })\n\n  const route = () => router.routesById[routeId()]!\n\n  const parentGlobalNotFound = useRouterState({\n    select: (s) => {\n      const matches = s.matches\n      const parentMatch = matches.find((d) => d.id === matchId())\n\n      // During navigation transitions, parent match can be temporarily removed\n      // Return false to avoid errors - the component will handle this gracefully\n      if (!parentMatch) {\n        return false\n      }\n\n      return parentMatch.globalNotFound\n    },\n  })\n\n  const childMatchId = useRouterState({\n    select: (s) => {\n      const matches = s.matches\n      const index = matches.findIndex((d) => d.id === matchId())\n      const v = matches[index + 1]?.id\n      return v\n    },\n  })\n\n  const childRouteId = useRouterState({\n    select: (s) => {\n      const matches = s.matches\n      const index = matches.findIndex((d) => d.id === matchId())\n      return matches[index + 1]?.routeId\n    },\n  })\n\n  const childMatchStatus = useRouterState({\n    select: (s) => {\n      const matches = s.matches\n      const index = matches.findIndex((d) => d.id === matchId())\n      return matches[index + 1]?.status\n    },\n  })\n\n  // Only show not-found if we're not in a redirected state\n  const shouldShowNotFound = () =>\n    childMatchStatus() !== 'redirected' && parentGlobalNotFound()\n\n  return (\n    <Solid.Show\n      when={!shouldShowNotFound() && childMatchId()}\n      fallback={\n        <Solid.Show when={shouldShowNotFound()}>\n          {renderRouteNotFound(router, route(), undefined)}\n        </Solid.Show>\n      }\n    >\n      {(matchIdAccessor) => {\n        // Use a memo to avoid stale accessor errors while keeping reactivity\n        const currentMatchId = Solid.createMemo(() => matchIdAccessor())\n\n        return (\n          <Solid.Show\n            when={routeId() === rootRouteId}\n            fallback={<Match matchId={currentMatchId()} />}\n          >\n            <Solid.Show when={childRouteId()} keyed>\n              {(_routeId) => (\n                <Solid.Loading\n                  fallback={\n                    <Dynamic\n                      component={router.options.defaultPendingComponent}\n                    />\n                  }\n                >\n                  <Match matchId={currentMatchId()} />\n                </Solid.Loading>\n              )}\n            </Solid.Show>\n          </Solid.Show>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n"],"names":["MatchContext","matchContext","Match","props","router","useRouter","matchState","useRouterState","select","s","match","matches","find","d","id","matchId","routeId","ssr","_displayPending","Solid","untrack","route","routesById","resolvePendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","createMemo","ResolvedSuspenseBoundary","SafeFragment","Loading","ResolvedCatchBoundary","CatchBoundary","ResolvedNotFoundBoundary","CatchNotFound","resetKey","loadedAt","parentRouteId","index","findIndex","ShellComponent","shellComponent","_$createComponent","Dynamic","children","value","fallback","_$memo","isServer","undefined","getResetKey","ErrorComponent","error","isNotFound","warning","_$mergeProps","Switch","when","Show","MatchInner","rootRouteId","OnRendered","ScrollRestoration","lastOnRenderedKey","WeakMap","location","resolvedLocation","state","__TSR_key","createEffect","get","set","emit","type","getLocationChangeInfo","remountFn","remountDeps","defaultRemountDeps","loaderDeps","params","_strictParams","search","_strictSearch","key","JSON","stringify","status","_forcePending","componentKey","out","currentRoute","Comp","defaultComponent","Outlet","keyedOut","keyed","_key","_","displayPendingResult","getMatch","_nonReactive","displayPendingPromise","minPendingResult","minPendingPromise","currentMatch","pendingMinMs","defaultPendingMinMs","routerMatch","createControlledPromise","setTimeout","resolve","loaderResult","Promise","r","loadPromise","FallbackComponent","currentRouteId","invariant","_routeId","renderRouteNotFound","isRedirect","RouteErrorComponent","info","componentStack","useContext","parentGlobalNotFound","parentMatch","globalNotFound","childMatchId","v","childRouteId","childMatchStatus","shouldShowNotFound","matchIdAccessor","currentMatchId"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAsBA,MAAMA,eAAeC,aAAAA;AAKd,MAAMC,QAAQA,CAACC,UAA+B;AACnD,QAAMC,SAASC,UAAAA,UAAAA;AACf,QAAMC,aAAaC,eAAAA,eAAe;AAAA,IAChCC,QAASC,CAAAA,MAAM;AACb,YAAMC,QAAQD,EAAEE,QAAQC,KAAMC,OAAMA,EAAEC,OAAOX,MAAMY,OAAO;AAI1D,UAAI,CAACL,OAAO;AACV,eAAO;AAAA,MACT;AAEA,aAAO;AAAA,QACLM,SAASN,MAAMM;AAAAA,QACfC,KAAKP,MAAMO;AAAAA,QACXC,iBAAiBR,MAAMQ;AAAAA,MAAAA;AAAAA,IAE3B;AAAA,EAAA,CACD;AAGD,MAAI,CAACC,iBAAMC,QAAQd,UAAU,EAAG,QAAO;AAEvC,QAAMe,QAAwBA,MAAMjB,OAAOkB,WAAWhB,WAAAA,EAAcU,OAAO;AAE3E,QAAMO,0BAA0BA,MAC9BF,MAAAA,EAAQG,QAAQC,oBAAoBrB,OAAOoB,QAAQE;AAErD,QAAMC,sBAAsBA,MAC1BN,MAAAA,EAAQG,QAAQI,kBAAkBxB,OAAOoB,QAAQK;AAEnD,QAAMC,eAAeA,MACnBT,MAAAA,EAAQG,QAAQO,WAAW3B,OAAOoB,QAAQQ;AAE5C,QAAMC,yBAAyBA,MAC7BZ,MAAAA,EAAQa;AAAAA;AAAAA,IAEHb,QAAQG,QAAQW,qBACjB/B,OAAOoB,QAAQY,eAAeZ,QAAQa;AAAAA,MACtChB,MAAAA,EAAQG,QAAQW;AAEtB,QAAMG,gBAAgBnB,iBAAMoB,WAC1B,MAAMjC,WAAAA,EAAcW,QAAQ,SAASX,aAAcW,QAAQ,WAC7D;AAEA,QAAMuB,2BAA2BA,MAC/BF,cAAAA,IAAkBG,aAAAA,eAAetB,iBAAMuB;AAEzC,QAAMC,wBAAwBA,MAC5BhB,oBAAAA,IAAwBiB,cAAAA,gBAAgBH,aAAAA;AAE1C,QAAMI,2BAA2BA,MAC/BZ,uBAAAA,IAA2Ba,SAAAA,gBAAgBL,aAAAA;AAE7C,QAAMM,WAAWxC,eAAAA,eAAe;AAAA,IAC9BC,QAASC,OAAMA,EAAEuC;AAAAA,EAAAA,CAClB;AAED,QAAMC,gBAAgB1C,eAAAA,eAAe;AAAA,IACnCC,QAASC,CAAAA,MAAM;AACb,YAAMyC,QAAQzC,EAAEE,QAAQwC,UAAWtC,OAAMA,EAAEC,OAAOX,MAAMY,OAAO;AAC/D,aAAON,EAAEE,QAAQuC,QAAQ,CAAC,GAAGlC;AAAAA,IAC/B;AAAA,EAAA,CACD;AAED,QAAMoC,iBAAiBjC,iBAAMoB,WAAW,MACtClB,MAAAA,EAAQa,SACFb,MAAAA,EAAQG,QAA6B6B,kBAAkBZ,aAAAA,eACzDA,aAAAA,YACN;AAEA,SAAAa,QAAAA,gBACGC,QAAAA,SAAO;AAAA,IAAA,IAAClB,YAAS;AAAA,aAAEe,eAAAA;AAAAA,IAAgB;AAAA,IAAA,IAAAI,WAAA;AAAA,aAAA,CAAAF,QAAAA,gBACjCtD,cAAY;AAAA,QAACyD,OAAOA,MAAMtD,MAAMY;AAAAA,QAAO,IAAAyC,WAAA;AAAA,iBAAAF,QAAAA,gBACrCC,QAAAA,SAAO;AAAA,YAAA,IACNlB,YAAS;AAAA,qBAAEG,yBAAAA;AAAAA,YAA0B;AAAA,YAAA,IACrCkB,WAAQ;AAAA;AAAA;AAAA,gBAENC,QAAAA,KAAA,MAAA,CAAA,GAACC,SAAAA,YAAYxD,OAAOwD,aAAatB,cAAAA,EAAe,EAAA,IAAGuB,SAASP,QAAAA,gBACzDC,QAAAA,SAAO;AAAA,kBAAA,IAAClB,YAAS;AAAA,2BAAEd,wBAAAA;AAAAA,kBAAyB;AAAA,gBAAA,CAAA;AAAA;AAAA,YAC9C;AAAA,YAAA,IAAAiC,WAAA;AAAA,qBAAAF,QAAAA,gBAGFC,QAAAA,SAAO;AAAA,gBAAA,IACNlB,YAAS;AAAA,yBAAEM,sBAAAA;AAAAA,gBAAuB;AAAA,gBAClCmB,aAAaA,MAAMf,SAAAA;AAAAA,gBAAU,IAC7BnB,iBAAc;AAAA,yBAAED,yBAAyBoC,cAAAA;AAAAA,gBAAc;AAAA,gBACvDhC,SAASA,CAACiC,UAAiB;AAEzB,sBAAIC,WAAAA,WAAWD,KAAK,EAAG,OAAMA;AAC7BE,0BACE,OACA,yBAAyB/C,iBAAMC,QAAQd,UAAU,EAAGU,OAAO,EAC7D;AACAc,+BAAAA,IAAiBkC,KAAK;AAAA,gBACxB;AAAA,gBAAC,IAAAR,WAAA;AAAA,yBAAAF,QAAAA,gBAEAC,QAAAA,SAAO;AAAA,oBAAA,IACNlB,YAAS;AAAA,6BAAEQ,yBAAAA;AAAAA,oBAA0B;AAAA,oBACrCa,UAAUA,CAACM,UAAe;AAGxB,0BACE,CAAC/B,uBAAAA,KACA+B,MAAMhD,WAAWgD,MAAMhD,YAAYV,WAAAA,EAAcU,WACjD,CAACgD,MAAMhD,WAAW,CAACK,MAAAA,EAAQa,OAE5B,OAAM8B;AAER,6BAAAV,QAAAA,gBACGC,QAAAA,SAAOY,mBAAA;AAAA,wBAAA,IAAC9B,YAAS;AAAA,iCAAEJ,uBAAAA;AAAAA,wBAAwB;AAAA,sBAAA,GAAM+B,KAAK,CAAA;AAAA,oBAE3D;AAAA,oBAAC,IAAAR,WAAA;AAAA,6BAAAF,QAAAA,gBAEAnC,iBAAMiD,QAAM;AAAA,wBAAA,IAAAZ,WAAA;AAAA,iCAAA,CAAAF,QAAAA,gBACVnC,iBAAMjB,OAAK;AAAA,4BAAA,IAACmE,OAAI;AAAA,qCAAE/B,cAAAA;AAAAA,4BAAe;AAAA,4BAAA,IAAAkB,WAAA;AAAA,qCAAAF,QAAAA,gBAC/BnC,iBAAMmD,MAAI;AAAA,gCAAA,IACTD,OAAI;AAAA,yCAAE,EAAET,SAAAA,YAAYxD,OAAOwD;AAAAA,gCAAS;AAAA,gCAAA,IACpCF,WAAQ;AAAA,yCAAAJ,QAAAA,gBAAGC,QAAAA,SAAO;AAAA,oCAAA,IAAClB,YAAS;AAAA,6CAAEd,wBAAAA;AAAAA,oCAAyB;AAAA,kCAAA,CAAA;AAAA,gCAAA;AAAA,gCAAA,IAAAiC,WAAA;AAAA,yCAAAF,QAAAA,gBAEtDiB,YAAU;AAAA,oCAAA,IAACxD,UAAO;AAAA,6CAAEZ,MAAMY;AAAAA,oCAAO;AAAA,kCAAA,CAAA;AAAA,gCAAA;AAAA,8BAAA,CAAA;AAAA,4BAAA;AAAA,0BAAA,CAAA,GAAAuC,QAAAA,gBAGrCnC,iBAAMjB,OAAK;AAAA,4BAAA,IAACmE,OAAI;AAAA,qCAAE,CAAC/B,cAAAA;AAAAA,4BAAe;AAAA,4BAAA,IAAAkB,WAAA;AAAA,qCAAAF,QAAAA,gBAChCiB,YAAU;AAAA,gCAAA,IAACxD,UAAO;AAAA,yCAAEZ,MAAMY;AAAAA,gCAAO;AAAA,8BAAA,CAAA;AAAA,4BAAA;AAAA,0BAAA,CAAA,CAAA;AAAA,wBAAA;AAAA,sBAAA,CAAA;AAAA,oBAAA;AAAA,kBAAA,CAAA;AAAA,gBAAA;AAAA,cAAA,CAAA;AAAA,YAAA;AAAA,UAAA,CAAA;AAAA,QAAA;AAAA,MAAA,CAAA,GAAA4C,QAAAA,KAAA,MAQ7CA,QAAAA,WAAAV,cAAAA,MAAoBuB,WAAAA,WAAW,MAAA,CAAAlB,QAAAA,gBAE3BmB,YAAU,CAAA,CAAA,GAAAnB,QAAAA,gBACVoB,kBAAAA,0BAED,IAAI,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAGd;AAeA,MAAMC,wCAAwBC,QAAAA;AAE9B,SAASH,aAAa;AACpB,QAAMrE,SAASC,UAAAA,UAAAA;AAEf,QAAMwE,WAAWtE,eAAAA,eAAe;AAAA,IAC9BC,QAASC,CAAAA,MAAM;AACb,aAAOA,EAAEqE,kBAAkBC,MAAMC;AAAAA,IACnC;AAAA,EAAA,CACD;AACD7D,mBAAM8D,aACJ,MAAM,CAACJ,SAAAA,CAAU,GACjB,CAAC,CAACA,SAAQ,MAAM;AACd,QAAI,CAACA,UAAU;AACf,QAAIF,kBAAkBO,IAAI9E,MAAM,MAAMyE,UAAU;AAChDF,sBAAkBQ,IAAI/E,QAAQyE,SAAQ;AACtCzE,WAAOgF,KAAK;AAAA,MACVC,MAAM;AAAA,MACN,GAAGC,WAAAA,sBAAsBlF,OAAO2E,KAAK;AAAA,IAAA,CACtC;AAAA,EACH,CACF;AACA,SAAO;AACT;AAEO,MAAMR,aAAaA,CAACpE,UAAoC;AAC7D,QAAMC,SAASC,UAAAA,UAAAA;AAEf,QAAMC,aAAaC,eAAAA,eAAe;AAAA,IAChCC,QAASC,CAAAA,MAAM;AACb,YAAMC,SAAQD,EAAEE,QAAQC,KAAMC,OAAMA,EAAEC,OAAOX,MAAMY,OAAO;AAG1D,UAAI,CAACL,QAAO;AACV,eAAO;AAAA,MACT;AAEA,YAAMM,UAAUN,OAAMM;AAEtB,YAAMuE,YACHnF,OAAOkB,WAAWN,OAAO,EAAeQ,QAAQgE,eACjDpF,OAAOoB,QAAQiE;AACjB,YAAMD,cAAcD,YAAY;AAAA,QAC9BvE;AAAAA,QACA0E,YAAYhF,OAAMgF;AAAAA,QAClBC,QAAQjF,OAAMkF;AAAAA,QACdC,QAAQnF,OAAMoF;AAAAA,MAAAA,CACf;AACD,YAAMC,MAAMP,cAAcQ,KAAKC,UAAUT,WAAW,IAAI3B;AAExD,aAAO;AAAA,QACLkC;AAAAA,QACA/E;AAAAA,QACAN,OAAO;AAAA,UACLI,IAAIJ,OAAMI;AAAAA,UACVoF,QAAQxF,OAAMwF;AAAAA,UACdlC,OAAOtD,OAAMsD;AAAAA,UACbmC,eAAezF,OAAMyF;AAAAA,UACrBjF,iBAAiBR,OAAMQ;AAAAA,QAAAA;AAAAA,MACzB;AAAA,IAEJ;AAAA,EAAA,CACD;AAED,MAAI,CAACC,iBAAMC,QAAQd,UAAU,EAAG,QAAO;AAEvC,QAAMe,QAAQA,MAAMjB,OAAOkB,WAAWhB,WAAAA,EAAcU,OAAO;AAE3D,QAAMN,QAAQA,MAAMJ,WAAAA,EAAcI;AAElC,QAAM0F,eAAeA,MAAM9F,WAAAA,EAAcyF,OAAOzF,WAAAA,EAAcI,MAAMI;AAEpE,QAAMuF,MAAMA,MAAM;AAChB,UAAMC,eAAenF,iBAAMC,QAAQC,KAAK;AACxC,UAAMkF,OACJD,aAAa9E,QAAQa,aAAajC,OAAOoB,QAAQgF;AACnD,QAAID,MAAM;AACR,aAAAjD,QAAAA,gBAAQiD,MAAI,EAAA;AAAA,IACd;AACA,WAAAjD,QAAAA,gBAAQmD,QAAM,EAAA;AAAA,EAChB;AAEA,QAAMC,WAAWA,MAAApD,wBACdnC,iBAAMmD,MAAI;AAAA,IAAA,IAACD,OAAI;AAAA,aAAE+B,aAAAA;AAAAA,IAAc;AAAA,IAAEO,OAAK;AAAA,IAAAnD,UACnCoD,UAASP,IAAAA;AAAAA,EAAI,CAAC;AAIpB,SAAA/C,QAAAA,gBACGnC,iBAAMiD,QAAM;AAAA,IAAA,IAAAZ,WAAA;AAAA,aAAA,CAAAF,QAAAA,gBACVnC,iBAAMjB,OAAK;AAAA,QAAA,IAACmE,OAAI;AAAA,iBAAE3D,QAAQQ;AAAAA,QAAe;AAAA,QAAAsC,UACtCqD,CAAAA,MAAM;AACN,gBAAM9F,UAAUI,iBAAMC,QAAQ,MAAMV,MAAAA,EAAQI,EAAE;AAC9C,gBAAMgG,uBAAuB3F,iBAAMoB,WACjC,MAAMnC,OAAO2G,SAAShG,OAAO,GAAGiG,aAAaC,qBAC/C;AAEA,iBAAAtD,QAAAA,KAAUmD,oBAAoB;AAAA,QAChC;AAAA,MAAA,CAAC,GAAAxD,QAAAA,gBAEFnC,iBAAMjB,OAAK;AAAA,QAAA,IAACmE,OAAI;AAAA,iBAAE3D,QAAQyF;AAAAA,QAAa;AAAA,QAAA3C,UACpCqD,CAAAA,MAAM;AACN,gBAAM9F,UAAUI,iBAAMC,QAAQ,MAAMV,MAAAA,EAAQI,EAAE;AAC9C,gBAAMoG,mBAAmB/F,iBAAMoB,WAC7B,MAAMnC,OAAO2G,SAAShG,OAAO,GAAGiG,aAAaG,iBAC/C;AAEA,iBAAAxD,QAAAA,KAAUuD,gBAAgB;AAAA,QAC5B;AAAA,MAAA,CAAC,GAAA5D,QAAAA,gBAEFnC,iBAAMjB,OAAK;AAAA,QAAA,IAACmE,OAAI;AAAA,iBAAE3D,MAAAA,EAAQwF,WAAW;AAAA,QAAS;AAAA,QAAA1C,UAC3CqD,CAAAA,MAAM;AACN,gBAAMO,eAAejG,iBAAMC,QAAQV,KAAK;AACxC,gBAAM4F,eAAenF,iBAAMC,QAAQC,KAAK;AACxC,gBAAMgG,eACJf,aAAa9E,QAAQ6F,gBACrBjH,OAAOoB,QAAQ8F;AAEjB,cAAID,cAAc;AAChB,kBAAME,cAAcnH,OAAO2G,SAASK,aAAatG,EAAE;AACnD,gBAAIyG,eAAe,CAACA,YAAYP,aAAaG,mBAAmB;AAE9D,kBAAI,EAAEvD,SAAAA,YAAYxD,OAAOwD,WAAW;AAClC,sBAAMuD,oBAAoBK,WAAAA,wBAAAA;AAE1BD,4BAAYP,aAAaG,oBAAoBA;AAE7CM,2BAAW,MAAM;AACfN,oCAAkBO,QAAAA;AAElBH,8BAAYP,aAAaG,oBAAoBtD;AAAAA,gBAC/C,GAAGwD,YAAY;AAAA,cACjB;AAAA,YACF;AAAA,UACF;AAEA,gBAAMM,eAAexG,iBAAMoB,WAAW,YAAY;AAChD,kBAAM,IAAIqF,QAASC,CAAAA,MAAMJ,WAAWI,GAAG,CAAC,CAAC;AACzC,mBAAOzH,OAAO2G,SAASK,aAAatG,EAAE,GAAGkG,aAAac;AAAAA,UACxD,CAAC;AAED,gBAAMC,oBACJzB,aAAa9E,QAAQC,oBACrBrB,OAAOoB,QAAQE;AAEjB,iBAAA,CAEKqG,qBAAqBV,eAAe,IAAC/D,QAAAA,gBACnCC,QAAAA,SAAO;AAAA,YAAClB,WAAW0F;AAAAA,UAAAA,CAAiB,IACnC,MAAIpE,aACPgE,YAAY,CAAA;AAAA,QAGnB;AAAA,MAAA,CAAC,GAAArE,QAAAA,gBAEFnC,iBAAMjB,OAAK;AAAA,QAAA,IAACmE,OAAI;AAAA,iBAAE3D,MAAAA,EAAQwF,WAAW;AAAA,QAAU;AAAA,QAAA1C,UAC5CqD,CAAAA,MAAM;AACN,gBAAMO,eAAejG,iBAAMC,QAAQV,KAAK;AACxC,gBAAM4F,eAAenF,iBAAMC,QAAQC,KAAK;AACxC,gBAAM2G,iBAAiB7G,iBAAMC,QAAQ,MAAMd,WAAAA,EAAcU,OAAO;AAChEiH,oBAAUhE,WAAAA,WAAWmD,aAAapD,KAAK,GAAG,2BAA2B;AAGrE,iBAAAV,QAAAA,gBACGnC,iBAAMmD,MAAI;AAAA,YAACD,MAAM2D;AAAAA,YAAgBrB,OAAK;AAAA,YAAAnD,UACnC0E,CAAAA,aACAC,oBAAAA,oBAAoB/H,QAAQkG,cAAcc,aAAapD,KAAK;AAAA,UAAA,CAAC;AAAA,QAIrE;AAAA,MAAA,CAAC,GAAAV,QAAAA,gBAEFnC,iBAAMjB,OAAK;AAAA,QAAA,IAACmE,OAAI;AAAA,iBAAE3D,MAAAA,EAAQwF,WAAW;AAAA,QAAY;AAAA,QAAA1C,UAC9CqD,CAAAA,MAAM;AACN,gBAAM9F,UAAUI,iBAAMC,QAAQ,MAAMV,MAAAA,EAAQI,EAAE;AAC9CmH,oBACEG,WAAAA,WAAWjH,iBAAMC,QAAQV,KAAK,EAAEsD,KAAK,GACrC,2BACF;AAEA,gBAAM2D,eAAexG,iBAAMoB,WAAW,YAAY;AAChD,kBAAM,IAAIqF,QAASC,CAAAA,MAAMJ,WAAWI,GAAG,CAAC,CAAC;AACzC,mBAAOzH,OAAO2G,SAAShG,OAAO,GAAGiG,aAAac;AAAAA,UAChD,CAAC;AAED,iBAAAnE,QAAAA,KAAUgE,YAAY;AAAA,QACxB;AAAA,MAAA,CAAC,GAAArE,QAAAA,gBAEFnC,iBAAMjB,OAAK;AAAA,QAAA,IAACmE,OAAI;AAAA,iBAAE3D,MAAAA,EAAQwF,WAAW;AAAA,QAAO;AAAA,QAAA1C,UACzCqD,CAAAA,MAAM;AACN,cAAIjD,SAAAA,YAAYxD,OAAOwD,UAAU;AAC/B,kBAAMwD,eAAejG,iBAAMC,QAAQV,KAAK;AACxC,kBAAM2H,uBACHlH,iBAAMC,QAAQC,KAAK,EAAEG,QAAQI,kBAC5BxB,OAAOoB,QAAQK,0BACjBkC,cAAAA;AAEF,mBAAAT,QAAAA,gBACG+E,qBAAmB;AAAA,cAAA,IAClBrE,QAAK;AAAA,uBAAEoD,aAAapD;AAAAA,cAAK;AAAA,cACzBsE,MAAM;AAAA,gBACJC,gBAAgB;AAAA,cAAA;AAAA,YAClB,CAAC;AAAA,UAGP;AAEA,gBAAMpH,iBAAMC,QAAQV,KAAK,EAAEsD;AAAAA,QAC7B;AAAA,MAAA,CAAC,GAAAV,QAAAA,gBAEFnC,iBAAMjB,OAAK;AAAA,QAAA,IAACmE,OAAI;AAAA,iBAAE3D,MAAAA,EAAQwF,WAAW;AAAA,QAAS;AAAA,QAAA,IAAA1C,WAAA;AAAA,iBAC5CkD,SAAAA;AAAAA,QAAU;AAAA,MAAA,CAAA,CAAA;AAAA,IAAA;AAAA,EAAA,CAAA;AAInB;AAEO,MAAMD,SAASA,MAAM;AAC1B,QAAMrG,SAASC,UAAAA,UAAAA;AACf,QAAMU,UAAUI,iBAAMqH,WAAWvI,yBAAY;AAC7C,QAAMe,UAAUT,eAAAA,eAAe;AAAA,IAC7BC,QAASC,CAAAA,MAAMA,EAAEE,QAAQC,KAAMC,OAAMA,EAAEC,OAAOC,QAAAA,CAAS,GAAGC;AAAAA,EAAAA,CAC3D;AAED,QAAMK,QAAQA,MAAMjB,OAAOkB,WAAWN,SAAS;AAE/C,QAAMyH,uBAAuBlI,eAAAA,eAAe;AAAA,IAC1CC,QAASC,CAAAA,MAAM;AACb,YAAME,UAAUF,EAAEE;AAClB,YAAM+H,cAAc/H,QAAQC,KAAMC,OAAMA,EAAEC,OAAOC,SAAS;AAI1D,UAAI,CAAC2H,aAAa;AAChB,eAAO;AAAA,MACT;AAEA,aAAOA,YAAYC;AAAAA,IACrB;AAAA,EAAA,CACD;AAED,QAAMC,eAAerI,eAAAA,eAAe;AAAA,IAClCC,QAASC,CAAAA,MAAM;AACb,YAAME,UAAUF,EAAEE;AAClB,YAAMuC,QAAQvC,QAAQwC,UAAWtC,OAAMA,EAAEC,OAAOC,SAAS;AACzD,YAAM8H,IAAIlI,QAAQuC,QAAQ,CAAC,GAAGpC;AAC9B,aAAO+H;AAAAA,IACT;AAAA,EAAA,CACD;AAED,QAAMC,eAAevI,eAAAA,eAAe;AAAA,IAClCC,QAASC,CAAAA,MAAM;AACb,YAAME,UAAUF,EAAEE;AAClB,YAAMuC,QAAQvC,QAAQwC,UAAWtC,OAAMA,EAAEC,OAAOC,SAAS;AACzD,aAAOJ,QAAQuC,QAAQ,CAAC,GAAGlC;AAAAA,IAC7B;AAAA,EAAA,CACD;AAED,QAAM+H,mBAAmBxI,eAAAA,eAAe;AAAA,IACtCC,QAASC,CAAAA,MAAM;AACb,YAAME,UAAUF,EAAEE;AAClB,YAAMuC,QAAQvC,QAAQwC,UAAWtC,OAAMA,EAAEC,OAAOC,SAAS;AACzD,aAAOJ,QAAQuC,QAAQ,CAAC,GAAGgD;AAAAA,IAC7B;AAAA,EAAA,CACD;AAGD,QAAM8C,qBAAqBA,MACzBD,uBAAuB,gBAAgBN,qBAAAA;AAEzC,SAAAnF,QAAAA,gBACGnC,iBAAMmD,MAAI;AAAA,IAAA,IACTD,OAAI;AAAA,aAAEV,QAAAA,cAACqF,mBAAAA,CAAoB,EAAA,KAAIJ,aAAAA;AAAAA,IAAc;AAAA,IAAA,IAC7ClF,WAAQ;AAAA,aAAAJ,QAAAA,gBACLnC,iBAAMmD,MAAI;AAAA,QAAA,IAACD,OAAI;AAAA,iBAAE2E,mBAAAA;AAAAA,QAAoB;AAAA,QAAA,IAAAxF,WAAA;AAAA,iBACnC2E,wCAAoB/H,QAAQiB,MAAAA,GAASwC,MAAS;AAAA,QAAC;AAAA,MAAA,CAAA;AAAA,IAAA;AAAA,IAAAL,UAIlDyF,CAAAA,oBAAoB;AAEpB,YAAMC,iBAAiB/H,iBAAMoB,WAAW,MAAM0G,iBAAiB;AAE/D,aAAA3F,QAAAA,gBACGnC,iBAAMmD,MAAI;AAAA,QAAA,IACTD,OAAI;AAAA,iBAAErD,cAAcwD,WAAAA;AAAAA,QAAW;AAAA,QAAA,IAC/Bd,WAAQ;AAAA,iBAAAJ,QAAAA,gBAAGpD,OAAK;AAAA,YAAA,IAACa,UAAO;AAAA,qBAAEmI,eAAAA;AAAAA,YAAgB;AAAA,UAAA,CAAA;AAAA,QAAA;AAAA,QAAA,IAAA1F,WAAA;AAAA,iBAAAF,QAAAA,gBAEzCnC,iBAAMmD,MAAI;AAAA,YAAA,IAACD,OAAI;AAAA,qBAAEyE,aAAAA;AAAAA,YAAc;AAAA,YAAEnC,OAAK;AAAA,YAAAnD,UACnC0E,CAAAA,aAAQ5E,wBACPnC,iBAAMuB,SAAO;AAAA,cAAA,IACZgB,WAAQ;AAAA,uBAAAJ,QAAAA,gBACLC,QAAAA,SAAO;AAAA,kBAAA,IACNlB,YAAS;AAAA,2BAAEjC,OAAOoB,QAAQE;AAAAA,kBAAuB;AAAA,gBAAA,CAAA;AAAA,cAAA;AAAA,cAAA,IAAA8B,WAAA;AAAA,uBAAAF,QAAAA,gBAIpDpD,OAAK;AAAA,kBAAA,IAACa,UAAO;AAAA,2BAAEmI,eAAAA;AAAAA,kBAAgB;AAAA,gBAAA,CAAA;AAAA,cAAA;AAAA,YAAA,CAAA;AAAA,UAAA,CAEnC;AAAA,QAAA;AAAA,MAAA,CAAA;AAAA,IAIT;AAAA,EAAA,CAAC;AAGP;;;;"}

package/dist/cjs/Matches.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Solid$1 = require("solid-js/web");
+const Solid$1 = require("@solidjs/web");
 const Solid = require("solid-js");
 const warning = require("tiny-warning");
 const routerCore = require("@tanstack/router-core");
@@ -29,9 +29,10 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const Solid__namespace = /* @__PURE__ */ _interopNamespaceDefault(Solid);
+const MatchContext = matchContext.matchContext;
 function Matches() {
   const router = useRouter.useRouter();
-  const ResolvedSuspense = (isServer.isServer ?? router.isServer) || typeof document !== "undefined" && router.ssr ? SafeFragment.SafeFragment : Solid__namespace.Suspense;
+  const ResolvedSuspense = router.options.disableGlobalCatchBoundary || (isServer.isServer ?? router.isServer) || typeof document !== "undefined" && router.ssr ? SafeFragment.SafeFragment : Solid__namespace.Loading;
   const rootRoute = () => router.routesById[routerCore.rootRouteId];
   const PendingComponent = rootRoute().options.pendingComponent ?? router.options.defaultPendingComponent;
   const OptionalWrapper = router.options.InnerWrap || SafeFragment.SafeFragment;
@@ -58,24 +59,30 @@ function MatchesInner() {
   const resetKey = useRouterState.useRouterState({
     select: (s) => s.loadedAt
   });
-  const matchComponent = () => {
-    return Solid$1.createComponent(Solid__namespace.Show, {
-      get when() {
-        return matchId();
-      },
+  const matchContent = () => Solid$1.createComponent(Solid__namespace.Show, {
+    get when() {
+      return matchId();
+    },
+    get children() {
+      return Solid$1.createComponent(Match.Match, {
+        get matchId() {
+          return matchId();
+        }
+      });
+    }
+  });
+  if (router.options.disableGlobalCatchBoundary) {
+    return Solid$1.createComponent(MatchContext, {
+      value: matchId,
       get children() {
-        return Solid$1.createComponent(Match.Match, {
-          get matchId() {
-            return matchId();
-          }
-        });
+        return matchContent();
       }
     });
-  };
-  return Solid$1.createComponent(matchContext.matchContext.Provider, {
+  }
+  return Solid$1.createComponent(MatchContext, {
     value: matchId,
     get children() {
-      return Solid$1.memo(() => !!router.options.disableGlobalCatchBoundary)() ? matchComponent() : Solid$1.createComponent(CatchBoundary.CatchBoundary, {
+      return Solid$1.createComponent(CatchBoundary.CatchBoundary, {
         getResetKey: () => resetKey(),
         errorComponent: CatchBoundary.ErrorComponent,
         get onCatch() {
@@ -86,7 +93,7 @@ function MatchesInner() {
           } : void 0;
         },
         get children() {
-          return matchComponent();
+          return matchContent();
         }
       });
     }