@tanstack/solid-router 1.133.36 → 1.134.4

package/dist/cjs/Match.cjs

@@ -207,20 +207,21 @@ const MatchInner = (props) => {
   });
   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;
     if (Comp) {
-      const key = matchState().key ?? matchState().match.id;
-      return Solid.createComponent(Solid__namespace.Show, {
-        when: key,
-        keyed: true,
-        get children() {
-          return Solid.createComponent(Comp, {});
-        }
-      });
+      return Solid.createComponent(Comp, {});
     }
     return Solid.createComponent(Outlet, {});
   };
+  const keyedOut = () => Solid.createComponent(Solid__namespace.Show, {
+    get when() {
+      return componentKey();
+    },
+    keyed: true,
+    children: (_key) => out()
+  });
   return Solid.createComponent(Solid__namespace.Switch, {
     get children() {
       return [Solid.createComponent(Solid__namespace.Match, {
@@ -307,7 +308,7 @@ const MatchInner = (props) => {
           return match().status === "success";
         },
         get children() {
-          return out();
+          return keyedOut();
         }
       })];
     }

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 { 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      invariant(\n        match,\n        `Could not find match for matchId \"${props.matchId}\". Please file an issue!`,\n      )\n      return {\n        routeId: match.routeId,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    },\n  })\n\n  const route: () => AnyRoute = () => router.routesById[matchState().routeId]\n\n  const PendingComponent = () =>\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 = () =>\n    // If we're on the root route, allow forcefully wrapping in suspense\n    (!route().isRoot ||\n      route().options.wrapInSuspense ||\n      resolvedNoSsr ||\n      matchState()._displayPending) &&\n    (route().options.wrapInSuspense ??\n      PendingComponent() ??\n      ((route().options.errorComponent as any)?.preload || resolvedNoSsr))\n      ? Solid.Suspense\n      : SafeFragment\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            router.isServer || resolvedNoSsr ? undefined : (\n              <Dynamic component={PendingComponent()} />\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: ${props.matchId}`)\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={!router.isServer}\n                    fallback={<Dynamic component={PendingComponent()} />}\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      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  const route = () => router.routesById[matchState().routeId]!\n\n  const match = () => matchState().match\n\n  const out = () => {\n    const Comp = route().options.component ?? router.options.defaultComponent\n    if (Comp) {\n      const key = matchState().key ?? matchState().match.id\n      return (\n        <Solid.Show when={key} keyed>\n          <Comp />\n        </Solid.Show>\n      )\n    }\n    return <Outlet />\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 (!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          return <>{loaderResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'notFound'}>\n        {(_) => {\n          invariant(isNotFound(match().error), 'Expected a notFound error')\n\n          return renderRouteNotFound(router, route(), match().error)\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          if (router.isServer) {\n            const RouteErrorComponent =\n              (route().options.errorComponent ??\n                router.options.defaultErrorComponent) ||\n              ErrorComponent\n\n            return (\n              <RouteErrorComponent\n                error={match().error}\n                info={{\n                  componentStack: '',\n                }}\n              />\n            )\n          }\n\n          throw match().error\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'success'}>{out()}</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      invariant(\n        parentMatch,\n        `Could not find parent match for matchId \"${matchId()}\"`,\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  return (\n    <Solid.Switch>\n      <Solid.Match when={parentGlobalNotFound()}>\n        {renderRouteNotFound(router, route(), undefined)}\n      </Solid.Match>\n      <Solid.Match when={childMatchId()}>\n        {(matchId) => {\n          // const nextMatch = <Match matchId={matchId()} />\n\n          return (\n            <Solid.Show\n              when={matchId() === rootRouteId}\n              fallback={<Match matchId={matchId()} />}\n            >\n              <Solid.Suspense\n                fallback={\n                  <Dynamic component={router.options.defaultPendingComponent} />\n                }\n              >\n                <Match matchId={matchId()} />\n              </Solid.Suspense>\n            </Solid.Show>\n          )\n        }}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n"],"names":["Match","props","router","useRouter","matchState","useRouterState","select","s","match","matches","find","d","id","matchId","invariant","routeId","ssr","_displayPending","route","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ResolvedSuspenseBoundary","wrapInSuspense","preload","Solid","Suspense","SafeFragment","ResolvedCatchBoundary","CatchBoundary","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","out","Comp","defaultComponent","keyed","Outlet","_","displayPendingResult","createResource","getMatch","_nonReactive","displayPendingPromise","minPendingResult","minPendingPromise","pendingMinMs","defaultPendingMinMs","routerMatch","createControlledPromise","setTimeout","resolve","loaderResult","Promise","r","loadPromise","renderRouteNotFound","isRedirect","RouteErrorComponent","info","componentStack","useContext","parentGlobalNotFound","parentMatch","globalNotFound","childMatchId","v"],"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 { 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      invariant(\n        match,\n        `Could not find match for matchId \"${props.matchId}\". Please file an issue!`,\n      )\n      return {\n        routeId: match.routeId,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    },\n  })\n\n  const route: () => AnyRoute = () => router.routesById[matchState().routeId]\n\n  const PendingComponent = () =>\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 = () =>\n    // If we're on the root route, allow forcefully wrapping in suspense\n    (!route().isRoot ||\n      route().options.wrapInSuspense ||\n      resolvedNoSsr ||\n      matchState()._displayPending) &&\n    (route().options.wrapInSuspense ??\n      PendingComponent() ??\n      ((route().options.errorComponent as any)?.preload || resolvedNoSsr))\n      ? Solid.Suspense\n      : SafeFragment\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            router.isServer || resolvedNoSsr ? undefined : (\n              <Dynamic component={PendingComponent()} />\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: ${props.matchId}`)\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={!router.isServer}\n                    fallback={<Dynamic component={PendingComponent()} />}\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      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  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 (!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          return <>{loaderResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'notFound'}>\n        {(_) => {\n          invariant(isNotFound(match().error), 'Expected a notFound error')\n\n          return renderRouteNotFound(router, route(), match().error)\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          if (router.isServer) {\n            const RouteErrorComponent =\n              (route().options.errorComponent ??\n                router.options.defaultErrorComponent) ||\n              ErrorComponent\n\n            return (\n              <RouteErrorComponent\n                error={match().error}\n                info={{\n                  componentStack: '',\n                }}\n              />\n            )\n          }\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      invariant(\n        parentMatch,\n        `Could not find parent match for matchId \"${matchId()}\"`,\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  return (\n    <Solid.Switch>\n      <Solid.Match when={parentGlobalNotFound()}>\n        {renderRouteNotFound(router, route(), undefined)}\n      </Solid.Match>\n      <Solid.Match when={childMatchId()}>\n        {(matchId) => {\n          // const nextMatch = <Match matchId={matchId()} />\n\n          return (\n            <Solid.Show\n              when={matchId() === rootRouteId}\n              fallback={<Match matchId={matchId()} />}\n            >\n              <Solid.Suspense\n                fallback={\n                  <Dynamic component={router.options.defaultPendingComponent} />\n                }\n              >\n                <Match matchId={matchId()} />\n              </Solid.Suspense>\n            </Solid.Show>\n          )\n        }}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n"],"names":["Match","props","router","useRouter","matchState","useRouterState","select","s","match","matches","find","d","id","matchId","invariant","routeId","ssr","_displayPending","route","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ResolvedSuspenseBoundary","wrapInSuspense","preload","Solid","Suspense","SafeFragment","ResolvedCatchBoundary","CatchBoundary","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","renderRouteNotFound","isRedirect","RouteErrorComponent","info","componentStack","useContext","parentGlobalNotFound","parentMatch","globalNotFound","childMatchId","v"],"mappings":"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"}

package/dist/esm/Match.js

@@ -188,20 +188,21 @@ const MatchInner = (props) => {
   });
   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;
     if (Comp) {
-      const key = matchState().key ?? matchState().match.id;
-      return createComponent(Solid.Show, {
-        when: key,
-        keyed: true,
-        get children() {
-          return createComponent(Comp, {});
-        }
-      });
+      return createComponent(Comp, {});
     }
     return createComponent(Outlet, {});
   };
+  const keyedOut = () => createComponent(Solid.Show, {
+    get when() {
+      return componentKey();
+    },
+    keyed: true,
+    children: (_key) => out()
+  });
   return createComponent(Solid.Switch, {
     get children() {
       return [createComponent(Solid.Match, {
@@ -288,7 +289,7 @@ const MatchInner = (props) => {
           return match().status === "success";
         },
         get children() {
-          return out();
+          return keyedOut();
         }
       })];
     }

package/dist/esm/Match.js.map

@@ -1 +1 @@
-{"version":3,"file":"Match.js","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 { 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      invariant(\n        match,\n        `Could not find match for matchId \"${props.matchId}\". Please file an issue!`,\n      )\n      return {\n        routeId: match.routeId,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    },\n  })\n\n  const route: () => AnyRoute = () => router.routesById[matchState().routeId]\n\n  const PendingComponent = () =>\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 = () =>\n    // If we're on the root route, allow forcefully wrapping in suspense\n    (!route().isRoot ||\n      route().options.wrapInSuspense ||\n      resolvedNoSsr ||\n      matchState()._displayPending) &&\n    (route().options.wrapInSuspense ??\n      PendingComponent() ??\n      ((route().options.errorComponent as any)?.preload || resolvedNoSsr))\n      ? Solid.Suspense\n      : SafeFragment\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            router.isServer || resolvedNoSsr ? undefined : (\n              <Dynamic component={PendingComponent()} />\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: ${props.matchId}`)\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={!router.isServer}\n                    fallback={<Dynamic component={PendingComponent()} />}\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      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  const route = () => router.routesById[matchState().routeId]!\n\n  const match = () => matchState().match\n\n  const out = () => {\n    const Comp = route().options.component ?? router.options.defaultComponent\n    if (Comp) {\n      const key = matchState().key ?? matchState().match.id\n      return (\n        <Solid.Show when={key} keyed>\n          <Comp />\n        </Solid.Show>\n      )\n    }\n    return <Outlet />\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 (!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          return <>{loaderResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'notFound'}>\n        {(_) => {\n          invariant(isNotFound(match().error), 'Expected a notFound error')\n\n          return renderRouteNotFound(router, route(), match().error)\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          if (router.isServer) {\n            const RouteErrorComponent =\n              (route().options.errorComponent ??\n                router.options.defaultErrorComponent) ||\n              ErrorComponent\n\n            return (\n              <RouteErrorComponent\n                error={match().error}\n                info={{\n                  componentStack: '',\n                }}\n              />\n            )\n          }\n\n          throw match().error\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'success'}>{out()}</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      invariant(\n        parentMatch,\n        `Could not find parent match for matchId \"${matchId()}\"`,\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  return (\n    <Solid.Switch>\n      <Solid.Match when={parentGlobalNotFound()}>\n        {renderRouteNotFound(router, route(), undefined)}\n      </Solid.Match>\n      <Solid.Match when={childMatchId()}>\n        {(matchId) => {\n          // const nextMatch = <Match matchId={matchId()} />\n\n          return (\n            <Solid.Show\n              when={matchId() === rootRouteId}\n              fallback={<Match matchId={matchId()} />}\n            >\n              <Solid.Suspense\n                fallback={\n                  <Dynamic component={router.options.defaultPendingComponent} />\n                }\n              >\n                <Match matchId={matchId()} />\n              </Solid.Suspense>\n            </Solid.Show>\n          )\n        }}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n"],"names":["Match","props","router","useRouter","matchState","useRouterState","select","s","match","matches","find","d","id","matchId","invariant","routeId","ssr","_displayPending","route","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ResolvedSuspenseBoundary","wrapInSuspense","preload","Solid","Suspense","SafeFragment","ResolvedCatchBoundary","CatchBoundary","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","out","Comp","defaultComponent","keyed","Outlet","_","displayPendingResult","createResource","getMatch","_nonReactive","displayPendingPromise","minPendingResult","minPendingPromise","pendingMinMs","defaultPendingMinMs","routerMatch","createControlledPromise","setTimeout","resolve","loaderResult","Promise","r","loadPromise","renderRouteNotFound","isRedirect","RouteErrorComponent","info","componentStack","useContext","parentGlobalNotFound","parentMatch","globalNotFound","childMatchId","v"],"mappings":"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"}
+{"version":3,"file":"Match.js","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 { 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      invariant(\n        match,\n        `Could not find match for matchId \"${props.matchId}\". Please file an issue!`,\n      )\n      return {\n        routeId: match.routeId,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    },\n  })\n\n  const route: () => AnyRoute = () => router.routesById[matchState().routeId]\n\n  const PendingComponent = () =>\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 = () =>\n    // If we're on the root route, allow forcefully wrapping in suspense\n    (!route().isRoot ||\n      route().options.wrapInSuspense ||\n      resolvedNoSsr ||\n      matchState()._displayPending) &&\n    (route().options.wrapInSuspense ??\n      PendingComponent() ??\n      ((route().options.errorComponent as any)?.preload || resolvedNoSsr))\n      ? Solid.Suspense\n      : SafeFragment\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            router.isServer || resolvedNoSsr ? undefined : (\n              <Dynamic component={PendingComponent()} />\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: ${props.matchId}`)\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={!router.isServer}\n                    fallback={<Dynamic component={PendingComponent()} />}\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      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  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 (!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          return <>{loaderResult()}</>\n        }}\n      </Solid.Match>\n      <Solid.Match when={match().status === 'notFound'}>\n        {(_) => {\n          invariant(isNotFound(match().error), 'Expected a notFound error')\n\n          return renderRouteNotFound(router, route(), match().error)\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          if (router.isServer) {\n            const RouteErrorComponent =\n              (route().options.errorComponent ??\n                router.options.defaultErrorComponent) ||\n              ErrorComponent\n\n            return (\n              <RouteErrorComponent\n                error={match().error}\n                info={{\n                  componentStack: '',\n                }}\n              />\n            )\n          }\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      invariant(\n        parentMatch,\n        `Could not find parent match for matchId \"${matchId()}\"`,\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  return (\n    <Solid.Switch>\n      <Solid.Match when={parentGlobalNotFound()}>\n        {renderRouteNotFound(router, route(), undefined)}\n      </Solid.Match>\n      <Solid.Match when={childMatchId()}>\n        {(matchId) => {\n          // const nextMatch = <Match matchId={matchId()} />\n\n          return (\n            <Solid.Show\n              when={matchId() === rootRouteId}\n              fallback={<Match matchId={matchId()} />}\n            >\n              <Solid.Suspense\n                fallback={\n                  <Dynamic component={router.options.defaultPendingComponent} />\n                }\n              >\n                <Match matchId={matchId()} />\n              </Solid.Suspense>\n            </Solid.Show>\n          )\n        }}\n      </Solid.Match>\n    </Solid.Switch>\n  )\n}\n"],"names":["Match","props","router","useRouter","matchState","useRouterState","select","s","match","matches","find","d","id","matchId","invariant","routeId","ssr","_displayPending","route","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ResolvedSuspenseBoundary","wrapInSuspense","preload","Solid","Suspense","SafeFragment","ResolvedCatchBoundary","CatchBoundary","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","renderRouteNotFound","isRedirect","RouteErrorComponent","info","componentStack","useContext","parentGlobalNotFound","parentMatch","globalNotFound","childMatchId","v"],"mappings":"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"}

package/dist/source/Match.jsx

@@ -153,16 +153,17 @@ export const MatchInner = (props) => {
     });
     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;
         if (Comp) {
-            const key = matchState().key ?? matchState().match.id;
-            return (<Solid.Show when={key} keyed>
-          <Comp />
-        </Solid.Show>);
+            return <Comp />;
         }
         return <Outlet />;
     };
+    const keyedOut = () => (<Solid.Show when={componentKey()} keyed>
+      {(_key) => out()}
+    </Solid.Show>);
     return (<Solid.Switch>
       <Solid.Match when={match()._displayPending}>
         {(_) => {
@@ -230,7 +231,9 @@ export const MatchInner = (props) => {
             throw match().error;
         }}
       </Solid.Match>
-      <Solid.Match when={match().status === 'success'}>{out()}</Solid.Match>
+      <Solid.Match when={match().status === 'success'}>
+        {keyedOut()}
+      </Solid.Match>
     </Solid.Switch>);
 };
 export const Outlet = () => {

package/dist/source/Match.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"Match.jsx","sourceRoot":"","sources":["../../src/Match.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Match.jsx","sourceRoot":"","sources":["../../src/Match.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,UAAU,CAAA;AACjC,OAAO,SAAS,MAAM,gBAAgB,CAAA;AACtC,OAAO,OAAO,MAAM,cAAc,CAAA;AAClC,OAAO,EACL,uBAAuB,EACvB,qBAAqB,EACrB,UAAU,EACV,UAAU,EACV,WAAW,GACZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAGxD,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,KAA0B,EAAE,EAAE;IAClD,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,UAAU,GAAG,cAAc,CAAC;QAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,OAAO,CAAC,CAAA;YAE3D,SAAS,CACP,KAAK,EACL,qCAAqC,KAAK,CAAC,OAAO,0BAA0B,CAC7E,CAAA;YACD,OAAO;gBACL,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,EAAE,KAAK,CAAC,GAAG;gBACd,eAAe,EAAE,KAAK,CAAC,eAAe;aACvC,CAAA;QACH,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,KAAK,GAAmB,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,CAAA;IAE3E,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAC5B,KAAK,EAAE,CAAC,OAAO,CAAC,gBAAgB,IAAI,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAA;IAE5E,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAC/B,KAAK,EAAE,CAAC,OAAO,CAAC,cAAc,IAAI,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAA;IAExE,MAAM,YAAY,GAAG,GAAG,EAAE,CACxB,KAAK,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAA;IAE1D,MAAM,sBAAsB,GAAG,GAAG,EAAE,CAClC,KAAK,EAAE,CAAC,MAAM;QACZ,CAAC,CAAC,wGAAwG;YACxG,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,iBAAiB;gBAClC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC;QAClD,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,iBAAiB,CAAA;IAEvC,MAAM,aAAa,GACjB,UAAU,EAAE,CAAC,GAAG,KAAK,KAAK,IAAI,UAAU,EAAE,CAAC,GAAG,KAAK,WAAW,CAAA;IAEhE,MAAM,wBAAwB,GAAG,GAAG,EAAE;IACpC,oEAAoE;IACpE,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM;QACd,KAAK,EAAE,CAAC,OAAO,CAAC,cAAc;QAC9B,aAAa;QACb,UAAU,EAAE,CAAC,eAAe,CAAC;QAC/B,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,cAAc;YAC7B,gBAAgB,EAAE;YAClB,CAAE,KAAK,EAAE,CAAC,OAAO,CAAC,cAAsB,EAAE,OAAO,IAAI,aAAa,CAAC,CAAC;QACpE,CAAC,CAAC,KAAK,CAAC,QAAQ;QAChB,CAAC,CAAC,YAAY,CAAA;IAElB,MAAM,qBAAqB,GAAG,GAAG,EAAE,CACjC,mBAAmB,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAA;IAEtD,MAAM,wBAAwB,GAAG,GAAG,EAAE,CACpC,sBAAsB,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAA;IAEzD,MAAM,QAAQ,GAAG,cAAc,CAAC;QAC9B,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ;KAC1B,CAAC,CAAA;IAEF,MAAM,aAAa,GAAG,cAAc,CAAC;QACnC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,OAAO,CAAC,CAAA;YAChE,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,OAAiB,CAAA;QAChD,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,cAAc,GAAG,KAAK,EAAE,CAAC,MAAM;QACnC,CAAC,CAAC,CAAE,KAAK,EAAE,CAAC,OAA4B,CAAC,cAAc,IAAI,YAAY,CAAC;QACxE,CAAC,CAAC,YAAY,CAAA;IAEhB,OAAO,CACL,CAAC,cAAc,CACb;MAAA,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAChD;QAAA,CAAC,OAAO,CACN,SAAS,CAAC,CAAC,wBAAwB,EAAE,CAAC,CACtC,QAAQ,CAAC,CAAC;QACR,mFAAmF;QACnF,MAAM,CAAC,QAAQ,IAAI,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC7C,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,gBAAgB,EAAE,CAAC,EAAG,CAE9C,CAAC,CAED;UAAA,CAAC,OAAO,CACN,SAAS,CAAC,CAAC,qBAAqB,EAAE,CAAC,CACnC,WAAW,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,CAC9B,cAAc,CAAC,CAAC,mBAAmB,EAAE,IAAI,cAAc,CAAC,CACxD,OAAO,CAAC,CAAC,CAAC,KAAY,EAAE,EAAE;YACxB,iFAAiF;YACjF,IAAI,UAAU,CAAC,KAAK,CAAC;gBAAE,MAAM,KAAK,CAAA;YAClC,OAAO,CAAC,KAAK,EAAE,yBAAyB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;YACxD,YAAY,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;QACzB,CAAC,CAAC,CAEF;YAAA,CAAC,OAAO,CACN,SAAS,CAAC,CAAC,wBAAwB,EAAE,CAAC,CACtC,QAAQ,CAAC,CAAC,CAAC,KAAU,EAAE,EAAE;YACvB,6DAA6D;YAC7D,oEAAoE;YACpE,IACE,CAAC,sBAAsB,EAAE;gBACzB,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC,OAAO,CAAC;gBACzD,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC;gBAEnC,MAAM,KAAK,CAAA;YAEb,OAAO,CACL,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,sBAAsB,EAAE,CAAC,CAAC,IAAI,KAAK,CAAC,EAAG,CAC5D,CAAA;QACH,CAAC,CAAC,CAEF;cAAA,CAAC,KAAK,CAAC,MAAM,CACX;gBAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,aAAa,CAAC,CAC/B;kBAAA,CAAC,KAAK,CAAC,IAAI,CACT,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CACvB,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,gBAAgB,EAAE,CAAC,EAAG,CAAC,CAErD;oBAAA,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EACrC;kBAAA,EAAE,KAAK,CAAC,IAAI,CACd;gBAAA,EAAE,KAAK,CAAC,KAAK,CACb;gBAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,CAChC;kBAAA,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EACrC;gBAAA,EAAE,KAAK,CAAC,KAAK,CACf;cAAA,EAAE,KAAK,CAAC,MAAM,CAChB;YAAA,EAAE,OAAO,CACX;UAAA,EAAE,OAAO,CACX;QAAA,EAAE,OAAO,CACX;MAAA,EAAE,YAAY,CAAC,QAAQ,CAEvB;;MAAA,CAAC,aAAa,EAAE,KAAK,WAAW,CAAC,CAAC,CAAC,CACjC,EACE;UAAA,CAAC,UAAU,CAAC,AAAD,EACX;UAAA,CAAC,iBAAiB,CAAC,AAAD,EACpB;QAAA,GAAG,CACJ,CAAC,CAAC,CAAC,IAAI,CACV;IAAA,EAAE,cAAc,CAAC,CAClB,CAAA;AACH,CAAC,CAAA;AAED,qEAAqE;AACrE,sEAAsE;AACtE,sEAAsE;AACtE,yEAAyE;AACzE,sEAAsE;AACtE,sEAAsE;AACtE,oBAAoB;AACpB,SAAS,UAAU;IACjB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAE1B,MAAM,QAAQ,GAAG,cAAc,CAAC;QAC9B,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,OAAO,CAAC,CAAC,gBAAgB,EAAE,KAAK,CAAC,SAAS,CAAA;QAC5C,CAAC;KACF,CAAC,CAAA;IACF,KAAK,CAAC,YAAY,CAChB,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE;QACxB,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,YAAY;YAClB,GAAG,qBAAqB,CAAC,MAAM,CAAC,KAAK,CAAC;SACvC,CAAC,CAAA;IACJ,CAAC,CAAC,CACH,CAAA;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAA0B,EAAO,EAAE;IAC5D,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAE1B,MAAM,UAAU,GAAG,cAAc,CAAC;QAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,MAAM,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,OAAO,CAAE,CAAA;YAC5D,MAAM,OAAO,GAAG,KAAK,CAAC,OAAiB,CAAA;YAEvC,MAAM,SAAS,GACZ,MAAM,CAAC,UAAU,CAAC,OAAO,CAAc,CAAC,OAAO,CAAC,WAAW;gBAC5D,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAA;YACnC,MAAM,WAAW,GAAG,SAAS,EAAE,CAAC;gBAC9B,OAAO;gBACP,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,MAAM,EAAE,KAAK,CAAC,aAAa;gBAC3B,MAAM,EAAE,KAAK,CAAC,aAAa;aAC5B,CAAC,CAAA;YACF,MAAM,GAAG,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;YAEjE,OAAO;gBACL,GAAG;gBACH,OAAO;gBACP,KAAK,EAAE;oBACL,EAAE,EAAE,KAAK,CAAC,EAAE;oBACZ,MAAM,EAAE,KAAK,CAAC,MAAM;oBACpB,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,aAAa,EAAE,KAAK,CAAC,aAAa;oBAClC,eAAe,EAAE,KAAK,CAAC,eAAe;iBACvC;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,OAAO,CAAE,CAAA;IAE5D,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,KAAK,CAAA;IAEtC,MAAM,YAAY,GAAG,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,CAAA;IAEpE,MAAM,GAAG,GAAG,GAAG,EAAE;QACf,MAAM,IAAI,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAA;QACzE,IAAI,IAAI,EAAE,CAAC;YACT,OAAO,CAAC,IAAI,CAAC,AAAD,EAAG,CAAA;QACjB,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,AAAD,EAAG,CAAA;IACnB,CAAC,CAAA;IAED,MAAM,QAAQ,GAAG,GAAG,EAAE,CAAC,CACrB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,KAAK,CACrC;MAAA,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CAClB;IAAA,EAAE,KAAK,CAAC,IAAI,CAAC,CACd,CAAA;IAED,OAAO,CACL,CAAC,KAAK,CAAC,MAAM,CACX;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,eAAe,CAAC,CACzC;QAAA,CAAC,CAAC,CAAC,EAAE,EAAE;YACL,MAAM,CAAC,oBAAoB,CAAC,GAAG,KAAK,CAAC,cAAc,CACjD,GAAG,EAAE,CACH,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,qBAAqB,CAClE,CAAA;YAED,OAAO,EAAE,CAAC,oBAAoB,EAAE,CAAC,GAAG,CAAA;QACtC,CAAC,CACH;MAAA,EAAE,KAAK,CAAC,KAAK,CACb;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CACvC;QAAA,CAAC,CAAC,CAAC,EAAE,EAAE;YACL,MAAM,CAAC,gBAAgB,CAAC,GAAG,KAAK,CAAC,cAAc,CAC7C,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,iBAAiB,CAClE,CAAA;YAED,OAAO,EAAE,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAA;QAClC,CAAC,CACH;MAAA,EAAE,KAAK,CAAC,KAAK,CACb;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAC9C;QAAA,CAAC,CAAC,CAAC,EAAE,EAAE;YACL,MAAM,YAAY,GAChB,KAAK,EAAE,CAAC,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC,OAAO,CAAC,mBAAmB,CAAA;YAEpE,IAAI,YAAY,EAAE,CAAC;gBACjB,MAAM,WAAW,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;gBAC/C,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,iBAAiB,EAAE,CAAC;oBAC/D,4DAA4D;oBAC5D,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;wBACrB,MAAM,iBAAiB,GAAG,uBAAuB,EAAQ,CAAA;wBAEzD,WAAW,CAAC,YAAY,CAAC,iBAAiB,GAAG,iBAAiB,CAAA;wBAE9D,UAAU,CAAC,GAAG,EAAE;4BACd,iBAAiB,CAAC,OAAO,EAAE,CAAA;4BAC3B,2DAA2D;4BAC3D,WAAW,CAAC,YAAY,CAAC,iBAAiB,GAAG,SAAS,CAAA;wBACxD,CAAC,EAAE,YAAY,CAAC,CAAA;oBAClB,CAAC;gBACH,CAAC;YACH,CAAC;YAED,MAAM,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,KAAK,IAAI,EAAE;gBACrD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;gBAC1C,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,WAAW,CAAA;YAC9D,CAAC,CAAC,CAAA;YAEF,OAAO,EAAE,CAAC,YAAY,EAAE,CAAC,GAAG,CAAA;QAC9B,CAAC,CACH;MAAA,EAAE,KAAK,CAAC,KAAK,CACb;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,KAAK,UAAU,CAAC,CAC/C;QAAA,CAAC,CAAC,CAAC,EAAE,EAAE;YACL,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,2BAA2B,CAAC,CAAA;YAEjE,OAAO,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,CAAA;QAC5D,CAAC,CACH;MAAA,EAAE,KAAK,CAAC,KAAK,CACb;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,KAAK,YAAY,CAAC,CACjD;QAAA,CAAC,CAAC,CAAC,EAAE,EAAE;YACL,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,2BAA2B,CAAC,CAAA;YAEjE,MAAM,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,cAAc,CAAC,KAAK,IAAI,EAAE;gBACrD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;gBAC1C,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,CAAC,WAAW,CAAA;YAC9D,CAAC,CAAC,CAAA;YAEF,OAAO,EAAE,CAAC,YAAY,EAAE,CAAC,GAAG,CAAA;QAC9B,CAAC,CACH;MAAA,EAAE,KAAK,CAAC,KAAK,CACb;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,KAAK,OAAO,CAAC,CAC5C;QAAA,CAAC,CAAC,CAAC,EAAE,EAAE;YACL,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACpB,MAAM,mBAAmB,GACvB,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,cAAc;oBAC7B,MAAM,CAAC,OAAO,CAAC,qBAAqB,CAAC;oBACvC,cAAc,CAAA;gBAEhB,OAAO,CACL,CAAC,mBAAmB,CAClB,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,KAAK,CAAC,CACrB,IAAI,CAAC,CAAC;wBACJ,cAAc,EAAE,EAAE;qBACnB,CAAC,EACF,CACH,CAAA;YACH,CAAC;YAED,MAAM,KAAK,EAAE,CAAC,KAAK,CAAA;QACrB,CAAC,CACH;MAAA,EAAE,KAAK,CAAC,KAAK,CACb;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,KAAK,SAAS,CAAC,CAC9C;QAAA,CAAC,QAAQ,EAAE,CACb;MAAA,EAAE,KAAK,CAAC,KAAK,CACf;IAAA,EAAE,KAAK,CAAC,MAAM,CAAC,CAChB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,EAAE;IACzB,MAAM,MAAM,GAAG,SAAS,EAAE,CAAA;IAC1B,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,CAAA;IAC9C,MAAM,OAAO,GAAG,cAAc,CAAC;QAC7B,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC,EAAE,OAAiB;KAC5E,CAAC,CAAA;IAEF,MAAM,KAAK,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,CAAE,CAAA;IAEjD,MAAM,oBAAoB,GAAG,cAAc,CAAC;QAC1C,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAA;YACzB,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC,CAAA;YAC3D,SAAS,CACP,WAAW,EACX,4CAA4C,OAAO,EAAE,GAAG,CACzD,CAAA;YACD,OAAO,WAAW,CAAC,cAAc,CAAA;QACnC,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,YAAY,GAAG,cAAc,CAAC;QAClC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;YACZ,MAAM,OAAO,GAAG,CAAC,CAAC,OAAO,CAAA;YACzB,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,EAAE,CAAC,CAAA;YAC1D,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,EAAE,CAAA;YAChC,OAAO,CAAC,CAAA;QACV,CAAC;KACF,CAAC,CAAA;IAEF,OAAO,CACL,CAAC,KAAK,CAAC,MAAM,CACX;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,oBAAoB,EAAE,CAAC,CACxC;QAAA,CAAC,mBAAmB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,SAAS,CAAC,CAClD;MAAA,EAAE,KAAK,CAAC,KAAK,CACb;MAAA,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC,CAChC;QAAA,CAAC,CAAC,OAAO,EAAE,EAAE;YACX,kDAAkD;YAElD,OAAO,CACL,CAAC,KAAK,CAAC,IAAI,CACT,IAAI,CAAC,CAAC,OAAO,EAAE,KAAK,WAAW,CAAC,CAChC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAAG,CAAC,CAExC;cAAA,CAAC,KAAK,CAAC,QAAQ,CACb,QAAQ,CAAC,CACP,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,EAC7D,CAAC,CAED;gBAAA,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC,EAC5B;cAAA,EAAE,KAAK,CAAC,QAAQ,CAClB;YAAA,EAAE,KAAK,CAAC,IAAI,CAAC,CACd,CAAA;QACH,CAAC,CACH;MAAA,EAAE,KAAK,CAAC,KAAK,CACf;IAAA,EAAE,KAAK,CAAC,MAAM,CAAC,CAChB,CAAA;AACH,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-router",
-  "version": "1.133.36",
+  "version": "1.134.4",
   "description": "Modern and scalable routing for Solid applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -88,8 +88,8 @@
     "isbot": "^5.1.22",
     "tiny-invariant": "^1.3.3",
     "tiny-warning": "^1.0.3",
-    "@tanstack/history": "1.133.28",
-    "@tanstack/router-core": "1.133.36"
+    "@tanstack/router-core": "1.134.4",
+    "@tanstack/history": "1.133.28"
   },
   "devDependencies": {
     "@solidjs/testing-library": "^0.8.10",

package/src/Match.tsx

@@ -222,19 +222,22 @@ export const MatchInner = (props: { matchId: string }): any => {
 
   const match = () => matchState().match
 
+  const componentKey = () => matchState().key ?? matchState().match.id
+
   const out = () => {
     const Comp = route().options.component ?? router.options.defaultComponent
     if (Comp) {
-      const key = matchState().key ?? matchState().match.id
-      return (
-        <Solid.Show when={key} keyed>
-          <Comp />
-        </Solid.Show>
-      )
+      return <Comp />
     }
     return <Outlet />
   }
 
+  const keyedOut = () => (
+    <Solid.Show when={componentKey()} keyed>
+      {(_key) => out()}
+    </Solid.Show>
+  )
+
   return (
     <Solid.Switch>
       <Solid.Match when={match()._displayPending}>
@@ -327,7 +330,9 @@ export const MatchInner = (props: { matchId: string }): any => {
           throw match().error
         }}
       </Solid.Match>
-      <Solid.Match when={match().status === 'success'}>{out()}</Solid.Match>
+      <Solid.Match when={match().status === 'success'}>
+        {keyedOut()}
+      </Solid.Match>
     </Solid.Switch>
   )
 }