@tanstack/solid-router 1.168.12 → 1.168.13

package/dist/cjs/Match.cjs

@@ -17,7 +17,7 @@ var Match = (props) => {
 	const match = solid_js.createMemo(() => {
 		const id = props.matchId;
 		if (!id) return void 0;
-		return router.stores.activeMatchStoresById.get(id)?.state;
+		return router.stores.activeMatchStoresById.get(id)?.get();
 	});
 	const rawMatchState = solid_js.createMemo(() => {
 		const currentMatch = match();
@@ -38,7 +38,7 @@ var Match = (props) => {
 		match,
 		hasPending: solid_js.createMemo(() => {
 			const currentRouteId = rawMatchState()?.routeId;
-			return currentRouteId ? Boolean(router.stores.pendingRouteIds.state[currentRouteId]) : false;
+			return currentRouteId ? Boolean(router.stores.pendingRouteIds.get()[currentRouteId]) : false;
 		})
 	};
 	return (0, solid_js_web.createComponent)(solid_js.Show, {
@@ -73,7 +73,7 @@ var Match = (props) => {
 									get component() {
 										return ResolvedCatchBoundary();
 									},
-									getResetKey: () => router.stores.loadedAt.state,
+									getResetKey: () => router.stores.loadedAt.get(),
 									get errorComponent() {
 										return routeErrorComponent() || require_CatchBoundary.ErrorComponent;
 									},
@@ -139,11 +139,11 @@ var Match = (props) => {
 };
 function OnRendered() {
 	const router = require_useRouter.useRouter();
-	const location = solid_js.createMemo(() => router.stores.resolvedLocation.state?.state.__TSR_key);
+	const location = solid_js.createMemo(() => router.stores.resolvedLocation.get()?.state.__TSR_key);
 	solid_js.createEffect(solid_js.on([location], () => {
 		router.emit({
 			type: "onRendered",
-			...(0, _tanstack_router_core.getLocationChangeInfo)(router.stores.location.state, router.stores.resolvedLocation.state)
+			...(0, _tanstack_router_core.getLocationChangeInfo)(router.stores.location.get(), router.stores.resolvedLocation.get())
 		});
 	}));
 	return null;
@@ -315,12 +315,12 @@ var Outlet = () => {
 	const parentGlobalNotFound = solid_js.createMemo(() => parentMatch()?.globalNotFound ?? false);
 	const childMatchId = solid_js.createMemo(() => {
 		const currentRouteId = routeId();
-		return currentRouteId ? router.stores.childMatchIdByRouteId.state[currentRouteId] : void 0;
+		return currentRouteId ? router.stores.childMatchIdByRouteId.get()[currentRouteId] : void 0;
 	});
 	const childMatchStatus = solid_js.createMemo(() => {
 		const id = childMatchId();
 		if (!id) return void 0;
-		return router.stores.activeMatchStoresById.get(id)?.state.status;
+		return router.stores.activeMatchStoresById.get(id)?.get().status;
 	});
 	const shouldShowNotFound = () => childMatchStatus() !== "redirected" && parentGlobalNotFound();
 	return (0, solid_js_web.createComponent)(solid_js.Show, {

package/dist/cjs/Match.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Match.cjs","names":["Solid","createControlledPromise","getLocationChangeInfo","invariant","isNotFound","isRedirect","rootRouteId","isServer","Dynamic","CatchBoundary","ErrorComponent","useRouter","CatchNotFound","getNotFound","nearestMatchContext","SafeFragment","renderRouteNotFound","ScrollRestoration","AnyRoute","RootRouteOptions","Match","props","matchId","router","match","createMemo","id","undefined","stores","activeMatchStoresById","get","state","rawMatchState","currentMatch","routeId","parentRouteId","routesById","parentRoute","ssr","_displayPending","hasPendingMatch","currentRouteId","Boolean","pendingRouteIds","nearestMatch","hasPending","_$createComponent","Show","when","children","currentMatchState","route","resolvePendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ResolvedSuspenseBoundary","Suspense","ResolvedCatchBoundary","ResolvedNotFoundBoundary","ShellComponent","shellComponent","Provider","value","fallback","_$memo","getResetKey","loadedAt","error","Error","notFoundError","process","env","NODE_ENV","console","warn","_$mergeProps","Switch","MatchInner","OnRendered","scrollRestoration","location","resolvedLocation","__TSR_key","createEffect","on","emit","type","useContext","remountFn","remountDeps","defaultRemountDeps","loaderDeps","params","_strictParams","search","_strictSearch","key","JSON","stringify","status","_forcePending","componentKey","out","Comp","defaultComponent","Outlet","getLoadPromise","fallbackMatch","_nonReactive","loadPromise","Promise","getMatch","keyedOut","keyed","_key","_","displayPendingResult","createResource","displayPendingPromise","minPendingResult","minPendingPromise","pendingMinMs","defaultPendingMinMs","routerMatch","setTimeout","resolve","loaderResult","r","FallbackComponent","_routeId","RouteErrorComponent","info","componentStack","nearestParentMatch","parentMatch","parentGlobalNotFound","globalNotFound","childMatchId","childMatchIdByRouteId","childMatchStatus","shouldShowNotFound","resolvedRoute","childMatchIdAccessor","currentMatchId"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  createControlledPromise,\n  getLocationChangeInfo,\n  invariant,\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 { useRouter } from './useRouter'\nimport { CatchNotFound, getNotFound } from './not-found'\nimport { nearestMatchContext } 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\n  const match = Solid.createMemo(() => {\n    const id = props.matchId\n    if (!id) return undefined\n    return router.stores.activeMatchStoresById.get(id)?.state\n  })\n\n  const rawMatchState = Solid.createMemo(() => {\n    const currentMatch = match()\n    if (!currentMatch) {\n      return null\n    }\n\n    const routeId = currentMatch.routeId as string\n    const parentRouteId = (router.routesById[routeId] as AnyRoute)?.parentRoute\n      ?.id\n\n    return {\n      matchId: currentMatch.id,\n      routeId,\n      ssr: currentMatch.ssr,\n      _displayPending: currentMatch._displayPending,\n      parentRouteId: parentRouteId as string | undefined,\n    }\n  })\n\n  const hasPendingMatch = Solid.createMemo(() => {\n    const currentRouteId = rawMatchState()?.routeId\n    return currentRouteId\n      ? Boolean(router.stores.pendingRouteIds.state[currentRouteId])\n      : false\n  })\n  const nearestMatch = {\n    matchId: () => rawMatchState()?.matchId,\n    routeId: () => rawMatchState()?.routeId,\n    match,\n    hasPending: hasPendingMatch,\n  }\n\n  return (\n    <Solid.Show when={rawMatchState()}>\n      {(currentMatchState) => {\n        const route: () => AnyRoute = () =>\n          router.routesById[currentMatchState().routeId]\n\n        const resolvePendingComponent = () =>\n          route().options.pendingComponent ??\n          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          currentMatchState().ssr === false ||\n          currentMatchState().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 ShellComponent = route().isRoot\n          ? ((route().options as RootRouteOptions).shellComponent ??\n            SafeFragment)\n          : SafeFragment\n\n        return (\n          <ShellComponent>\n            <nearestMatchContext.Provider value={nearestMatch}>\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={() => router.stores.loadedAt.state}\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                    const notFoundError = getNotFound(error)\n                    if (notFoundError) {\n                      notFoundError.routeId ??= currentMatchState()\n                        .routeId as any\n                      throw notFoundError\n                    }\n                    if (process.env.NODE_ENV !== 'production') {\n                      console.warn(\n                        `Warning: Error in route match: ${currentMatchState().routeId}`,\n                      )\n                    }\n                    routeOnCatch()?.(error)\n                  }}\n                >\n                  <Dynamic\n                    component={ResolvedNotFoundBoundary()}\n                    fallback={(error: any) => {\n                      const notFoundError = getNotFound(error) ?? error\n\n                      notFoundError.routeId ??= currentMatchState()\n                        .routeId as any\n\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                        (notFoundError.routeId &&\n                          notFoundError.routeId !==\n                            currentMatchState().routeId) ||\n                        (!notFoundError.routeId && !route().isRoot)\n                      )\n                        throw notFoundError\n\n                      return (\n                        <Dynamic\n                          component={routeNotFoundComponent()}\n                          {...notFoundError}\n                        />\n                      )\n                    }}\n                  >\n                    <Solid.Switch>\n                      <Solid.Match when={resolvedNoSsr}>\n                        <Solid.Show\n                          when={!(isServer ?? router.isServer)}\n                          fallback={\n                            <Dynamic component={resolvePendingComponent()} />\n                          }\n                        >\n                          <MatchInner />\n                        </Solid.Show>\n                      </Solid.Match>\n                      <Solid.Match when={!resolvedNoSsr}>\n                        <MatchInner />\n                      </Solid.Match>\n                    </Solid.Switch>\n                  </Dynamic>\n                </Dynamic>\n              </Dynamic>\n            </nearestMatchContext.Provider>\n\n            {currentMatchState().parentRouteId === rootRouteId ? (\n              <>\n                <OnRendered />\n                {router.options.scrollRestoration &&\n                (isServer ?? router.isServer) ? (\n                  <ScrollRestoration />\n                ) : null}\n              </>\n            ) : null}\n          </ShellComponent>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n\n// On Rendered can't happen above the root layout because it needs to run\n// after the app has committed below the root layout. Keeping it here lets us\n// fire onRendered even after a hydration mismatch above the root layout\n// (like bad head/link tags, which is common).\nfunction OnRendered() {\n  const router = useRouter()\n\n  const location = Solid.createMemo(\n    () => router.stores.resolvedLocation.state?.state.__TSR_key,\n  )\n  Solid.createEffect(\n    Solid.on([location], () => {\n      router.emit({\n        type: 'onRendered',\n        ...getLocationChangeInfo(\n          router.stores.location.state,\n          router.stores.resolvedLocation.state,\n        ),\n      })\n    }),\n  )\n  return null\n}\n\nexport const MatchInner = (): any => {\n  const router = useRouter()\n  const match = Solid.useContext(nearestMatchContext).match\n\n  const rawMatchState = Solid.createMemo(() => {\n    const currentMatch = match()\n    if (!currentMatch) {\n      return null\n    }\n\n    const routeId = currentMatch.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: currentMatch.loaderDeps,\n      params: currentMatch._strictParams,\n      search: currentMatch._strictSearch,\n    })\n    const key = remountDeps ? JSON.stringify(remountDeps) : undefined\n\n    return {\n      key,\n      routeId,\n      match: {\n        id: currentMatch.id,\n        status: currentMatch.status,\n        error: currentMatch.error,\n        _forcePending: currentMatch._forcePending ?? false,\n        _displayPending: currentMatch._displayPending ?? false,\n      },\n    }\n  })\n\n  return (\n    <Solid.Show when={rawMatchState()}>\n      {(currentMatchState) => {\n        const route = () => router.routesById[currentMatchState().routeId]!\n\n        const currentMatch = () => currentMatchState().match\n\n        const componentKey = () =>\n          currentMatchState().key ?? currentMatchState().match.id\n\n        const out = () => {\n          const Comp =\n            route().options.component ?? router.options.defaultComponent\n          if (Comp) {\n            return <Comp />\n          }\n          return <Outlet />\n        }\n\n        const getLoadPromise = (\n          matchId: string,\n          fallbackMatch:\n            | {\n                _nonReactive: {\n                  loadPromise?: Promise<void>\n                }\n              }\n            | undefined,\n        ) => {\n          return (\n            router.getMatch(matchId)?._nonReactive.loadPromise ??\n            fallbackMatch?._nonReactive.loadPromise\n          )\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={currentMatch()._displayPending}>\n              {(_) => {\n                const [displayPendingResult] = Solid.createResource(\n                  () =>\n                    router.getMatch(currentMatch().id)?._nonReactive\n                      .displayPendingPromise,\n                )\n\n                return <>{displayPendingResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch()._forcePending}>\n              {(_) => {\n                const [minPendingResult] = Solid.createResource(\n                  () =>\n                    router.getMatch(currentMatch().id)?._nonReactive\n                      .minPendingPromise,\n                )\n\n                return <>{minPendingResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'pending'}>\n              {(_) => {\n                const pendingMinMs =\n                  route().options.pendingMinMs ??\n                  router.options.defaultPendingMinMs\n\n                if (pendingMinMs) {\n                  const routerMatch = router.getMatch(currentMatch().id)\n                  if (\n                    routerMatch &&\n                    !routerMatch._nonReactive.minPendingPromise\n                  ) {\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 =\n                        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(currentMatch().id)?._nonReactive\n                    .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={currentMatch().status === 'notFound'}>\n              {(_) => {\n                if (!isNotFound(currentMatch().error)) {\n                  if (process.env.NODE_ENV !== 'production') {\n                    throw new Error(\n                      'Invariant failed: Expected a notFound error',\n                    )\n                  }\n\n                  invariant()\n                }\n\n                // Use Show with keyed to ensure re-render when routeId changes\n                return (\n                  <Solid.Show when={currentMatchState().routeId} keyed>\n                    {(_routeId) =>\n                      renderRouteNotFound(router, route(), currentMatch().error)\n                    }\n                  </Solid.Show>\n                )\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'redirected'}>\n              {(_) => {\n                const matchId = currentMatch().id\n                const routerMatch = router.getMatch(matchId)\n\n                if (!isRedirect(currentMatch().error)) {\n                  if (process.env.NODE_ENV !== 'production') {\n                    throw new Error(\n                      'Invariant failed: Expected a redirect error',\n                    )\n                  }\n\n                  invariant()\n                }\n\n                const [loaderResult] = Solid.createResource(async () => {\n                  await new Promise((r) => setTimeout(r, 0))\n                  return getLoadPromise(matchId, routerMatch)\n                })\n\n                return <>{loaderResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'error'}>\n              {(_) => {\n                if (isServer ?? router.isServer) {\n                  const RouteErrorComponent =\n                    (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 currentMatch().error\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'success'}>\n              {keyedOut()}\n            </Solid.Match>\n          </Solid.Switch>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n\nexport const Outlet = () => {\n  const router = useRouter()\n  const nearestParentMatch = Solid.useContext(nearestMatchContext)\n  const parentMatch = nearestParentMatch.match\n  const routeId = nearestParentMatch.routeId\n  const route = Solid.createMemo(() =>\n    routeId() ? router.routesById[routeId()!] : undefined,\n  )\n\n  const parentGlobalNotFound = Solid.createMemo(\n    () => parentMatch()?.globalNotFound ?? false,\n  )\n\n  const childMatchId = Solid.createMemo(() => {\n    const currentRouteId = routeId()\n    return currentRouteId\n      ? router.stores.childMatchIdByRouteId.state[currentRouteId]\n      : undefined\n  })\n\n  const childMatchStatus = Solid.createMemo(() => {\n    const id = childMatchId()\n    if (!id) return undefined\n    return router.stores.activeMatchStoresById.get(id)?.state.status\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() && route()}>\n          {(resolvedRoute) =>\n            renderRouteNotFound(router, resolvedRoute(), undefined)\n          }\n        </Solid.Show>\n      }\n    >\n      {(childMatchIdAccessor) => {\n        const currentMatchId = Solid.createMemo(() => childMatchIdAccessor())\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"],"mappings":"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"}
+{"version":3,"file":"Match.cjs","names":["Solid","createControlledPromise","getLocationChangeInfo","invariant","isNotFound","isRedirect","rootRouteId","isServer","Dynamic","CatchBoundary","ErrorComponent","useRouter","CatchNotFound","getNotFound","nearestMatchContext","SafeFragment","renderRouteNotFound","ScrollRestoration","AnyRoute","RootRouteOptions","Match","props","matchId","router","match","createMemo","id","undefined","stores","activeMatchStoresById","get","rawMatchState","currentMatch","routeId","parentRouteId","routesById","parentRoute","ssr","_displayPending","hasPendingMatch","currentRouteId","Boolean","pendingRouteIds","nearestMatch","hasPending","_$createComponent","Show","when","children","currentMatchState","route","resolvePendingComponent","options","pendingComponent","defaultPendingComponent","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","resolvedNoSsr","ResolvedSuspenseBoundary","Suspense","ResolvedCatchBoundary","ResolvedNotFoundBoundary","ShellComponent","shellComponent","Provider","value","fallback","_$memo","getResetKey","loadedAt","error","Error","notFoundError","process","env","NODE_ENV","console","warn","_$mergeProps","Switch","MatchInner","OnRendered","scrollRestoration","location","resolvedLocation","state","__TSR_key","createEffect","on","emit","type","useContext","remountFn","remountDeps","defaultRemountDeps","loaderDeps","params","_strictParams","search","_strictSearch","key","JSON","stringify","status","_forcePending","componentKey","out","Comp","defaultComponent","Outlet","getLoadPromise","fallbackMatch","_nonReactive","loadPromise","Promise","getMatch","keyedOut","keyed","_key","_","displayPendingResult","createResource","displayPendingPromise","minPendingResult","minPendingPromise","pendingMinMs","defaultPendingMinMs","routerMatch","setTimeout","resolve","loaderResult","r","FallbackComponent","_routeId","RouteErrorComponent","info","componentStack","nearestParentMatch","parentMatch","parentGlobalNotFound","globalNotFound","childMatchId","childMatchIdByRouteId","childMatchStatus","shouldShowNotFound","resolvedRoute","childMatchIdAccessor","currentMatchId"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  createControlledPromise,\n  getLocationChangeInfo,\n  invariant,\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 { useRouter } from './useRouter'\nimport { CatchNotFound, getNotFound } from './not-found'\nimport { nearestMatchContext } 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\n  const match = Solid.createMemo(() => {\n    const id = props.matchId\n    if (!id) return undefined\n    return router.stores.activeMatchStoresById.get(id)?.get()\n  })\n\n  const rawMatchState = Solid.createMemo(() => {\n    const currentMatch = match()\n    if (!currentMatch) {\n      return null\n    }\n\n    const routeId = currentMatch.routeId as string\n    const parentRouteId = (router.routesById[routeId] as AnyRoute)?.parentRoute\n      ?.id\n\n    return {\n      matchId: currentMatch.id,\n      routeId,\n      ssr: currentMatch.ssr,\n      _displayPending: currentMatch._displayPending,\n      parentRouteId: parentRouteId as string | undefined,\n    }\n  })\n\n  const hasPendingMatch = Solid.createMemo(() => {\n    const currentRouteId = rawMatchState()?.routeId\n    return currentRouteId\n      ? Boolean(router.stores.pendingRouteIds.get()[currentRouteId])\n      : false\n  })\n  const nearestMatch = {\n    matchId: () => rawMatchState()?.matchId,\n    routeId: () => rawMatchState()?.routeId,\n    match,\n    hasPending: hasPendingMatch,\n  }\n\n  return (\n    <Solid.Show when={rawMatchState()}>\n      {(currentMatchState) => {\n        const route: () => AnyRoute = () =>\n          router.routesById[currentMatchState().routeId]\n\n        const resolvePendingComponent = () =>\n          route().options.pendingComponent ??\n          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          currentMatchState().ssr === false ||\n          currentMatchState().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 ShellComponent = route().isRoot\n          ? ((route().options as RootRouteOptions).shellComponent ??\n            SafeFragment)\n          : SafeFragment\n\n        return (\n          <ShellComponent>\n            <nearestMatchContext.Provider value={nearestMatch}>\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={() => router.stores.loadedAt.get()}\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                    const notFoundError = getNotFound(error)\n                    if (notFoundError) {\n                      notFoundError.routeId ??= currentMatchState()\n                        .routeId as any\n                      throw notFoundError\n                    }\n                    if (process.env.NODE_ENV !== 'production') {\n                      console.warn(\n                        `Warning: Error in route match: ${currentMatchState().routeId}`,\n                      )\n                    }\n                    routeOnCatch()?.(error)\n                  }}\n                >\n                  <Dynamic\n                    component={ResolvedNotFoundBoundary()}\n                    fallback={(error: any) => {\n                      const notFoundError = getNotFound(error) ?? error\n\n                      notFoundError.routeId ??= currentMatchState()\n                        .routeId as any\n\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                        (notFoundError.routeId &&\n                          notFoundError.routeId !==\n                            currentMatchState().routeId) ||\n                        (!notFoundError.routeId && !route().isRoot)\n                      )\n                        throw notFoundError\n\n                      return (\n                        <Dynamic\n                          component={routeNotFoundComponent()}\n                          {...notFoundError}\n                        />\n                      )\n                    }}\n                  >\n                    <Solid.Switch>\n                      <Solid.Match when={resolvedNoSsr}>\n                        <Solid.Show\n                          when={!(isServer ?? router.isServer)}\n                          fallback={\n                            <Dynamic component={resolvePendingComponent()} />\n                          }\n                        >\n                          <MatchInner />\n                        </Solid.Show>\n                      </Solid.Match>\n                      <Solid.Match when={!resolvedNoSsr}>\n                        <MatchInner />\n                      </Solid.Match>\n                    </Solid.Switch>\n                  </Dynamic>\n                </Dynamic>\n              </Dynamic>\n            </nearestMatchContext.Provider>\n\n            {currentMatchState().parentRouteId === rootRouteId ? (\n              <>\n                <OnRendered />\n                {router.options.scrollRestoration &&\n                (isServer ?? router.isServer) ? (\n                  <ScrollRestoration />\n                ) : null}\n              </>\n            ) : null}\n          </ShellComponent>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n\n// On Rendered can't happen above the root layout because it needs to run\n// after the app has committed below the root layout. Keeping it here lets us\n// fire onRendered even after a hydration mismatch above the root layout\n// (like bad head/link tags, which is common).\nfunction OnRendered() {\n  const router = useRouter()\n\n  const location = Solid.createMemo(\n    () => router.stores.resolvedLocation.get()?.state.__TSR_key,\n  )\n  Solid.createEffect(\n    Solid.on([location], () => {\n      router.emit({\n        type: 'onRendered',\n        ...getLocationChangeInfo(\n          router.stores.location.get(),\n          router.stores.resolvedLocation.get(),\n        ),\n      })\n    }),\n  )\n  return null\n}\n\nexport const MatchInner = (): any => {\n  const router = useRouter()\n  const match = Solid.useContext(nearestMatchContext).match\n\n  const rawMatchState = Solid.createMemo(() => {\n    const currentMatch = match()\n    if (!currentMatch) {\n      return null\n    }\n\n    const routeId = currentMatch.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: currentMatch.loaderDeps,\n      params: currentMatch._strictParams,\n      search: currentMatch._strictSearch,\n    })\n    const key = remountDeps ? JSON.stringify(remountDeps) : undefined\n\n    return {\n      key,\n      routeId,\n      match: {\n        id: currentMatch.id,\n        status: currentMatch.status,\n        error: currentMatch.error,\n        _forcePending: currentMatch._forcePending ?? false,\n        _displayPending: currentMatch._displayPending ?? false,\n      },\n    }\n  })\n\n  return (\n    <Solid.Show when={rawMatchState()}>\n      {(currentMatchState) => {\n        const route = () => router.routesById[currentMatchState().routeId]!\n\n        const currentMatch = () => currentMatchState().match\n\n        const componentKey = () =>\n          currentMatchState().key ?? currentMatchState().match.id\n\n        const out = () => {\n          const Comp =\n            route().options.component ?? router.options.defaultComponent\n          if (Comp) {\n            return <Comp />\n          }\n          return <Outlet />\n        }\n\n        const getLoadPromise = (\n          matchId: string,\n          fallbackMatch:\n            | {\n                _nonReactive: {\n                  loadPromise?: Promise<void>\n                }\n              }\n            | undefined,\n        ) => {\n          return (\n            router.getMatch(matchId)?._nonReactive.loadPromise ??\n            fallbackMatch?._nonReactive.loadPromise\n          )\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={currentMatch()._displayPending}>\n              {(_) => {\n                const [displayPendingResult] = Solid.createResource(\n                  () =>\n                    router.getMatch(currentMatch().id)?._nonReactive\n                      .displayPendingPromise,\n                )\n\n                return <>{displayPendingResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch()._forcePending}>\n              {(_) => {\n                const [minPendingResult] = Solid.createResource(\n                  () =>\n                    router.getMatch(currentMatch().id)?._nonReactive\n                      .minPendingPromise,\n                )\n\n                return <>{minPendingResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'pending'}>\n              {(_) => {\n                const pendingMinMs =\n                  route().options.pendingMinMs ??\n                  router.options.defaultPendingMinMs\n\n                if (pendingMinMs) {\n                  const routerMatch = router.getMatch(currentMatch().id)\n                  if (\n                    routerMatch &&\n                    !routerMatch._nonReactive.minPendingPromise\n                  ) {\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 =\n                        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(currentMatch().id)?._nonReactive\n                    .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={currentMatch().status === 'notFound'}>\n              {(_) => {\n                if (!isNotFound(currentMatch().error)) {\n                  if (process.env.NODE_ENV !== 'production') {\n                    throw new Error(\n                      'Invariant failed: Expected a notFound error',\n                    )\n                  }\n\n                  invariant()\n                }\n\n                // Use Show with keyed to ensure re-render when routeId changes\n                return (\n                  <Solid.Show when={currentMatchState().routeId} keyed>\n                    {(_routeId) =>\n                      renderRouteNotFound(router, route(), currentMatch().error)\n                    }\n                  </Solid.Show>\n                )\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'redirected'}>\n              {(_) => {\n                const matchId = currentMatch().id\n                const routerMatch = router.getMatch(matchId)\n\n                if (!isRedirect(currentMatch().error)) {\n                  if (process.env.NODE_ENV !== 'production') {\n                    throw new Error(\n                      'Invariant failed: Expected a redirect error',\n                    )\n                  }\n\n                  invariant()\n                }\n\n                const [loaderResult] = Solid.createResource(async () => {\n                  await new Promise((r) => setTimeout(r, 0))\n                  return getLoadPromise(matchId, routerMatch)\n                })\n\n                return <>{loaderResult()}</>\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'error'}>\n              {(_) => {\n                if (isServer ?? router.isServer) {\n                  const RouteErrorComponent =\n                    (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 currentMatch().error\n              }}\n            </Solid.Match>\n            <Solid.Match when={currentMatch().status === 'success'}>\n              {keyedOut()}\n            </Solid.Match>\n          </Solid.Switch>\n        )\n      }}\n    </Solid.Show>\n  )\n}\n\nexport const Outlet = () => {\n  const router = useRouter()\n  const nearestParentMatch = Solid.useContext(nearestMatchContext)\n  const parentMatch = nearestParentMatch.match\n  const routeId = nearestParentMatch.routeId\n  const route = Solid.createMemo(() =>\n    routeId() ? router.routesById[routeId()!] : undefined,\n  )\n\n  const parentGlobalNotFound = Solid.createMemo(\n    () => parentMatch()?.globalNotFound ?? false,\n  )\n\n  const childMatchId = Solid.createMemo(() => {\n    const currentRouteId = routeId()\n    return currentRouteId\n      ? router.stores.childMatchIdByRouteId.get()[currentRouteId]\n      : undefined\n  })\n\n  const childMatchStatus = Solid.createMemo(() => {\n    const id = childMatchId()\n    if (!id) return undefined\n    return router.stores.activeMatchStoresById.get(id)?.get().status\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() && route()}>\n          {(resolvedRoute) =>\n            renderRouteNotFound(router, resolvedRoute(), undefined)\n          }\n        </Solid.Show>\n      }\n    >\n      {(childMatchIdAccessor) => {\n        const currentMatchId = Solid.createMemo(() => childMatchIdAccessor())\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"],"mappings":"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"}

package/dist/cjs/Matches.cjs

@@ -29,11 +29,11 @@ function Matches() {
 }
 function MatchesInner() {
 	const router = require_useRouter.useRouter();
-	const matchId = () => router.stores.firstMatchId.state;
+	const matchId = () => router.stores.firstMatchId.get();
 	const routeId = () => matchId() ? _tanstack_router_core.rootRouteId : void 0;
-	const match = () => routeId() ? router.stores.getMatchStoreByRouteId(_tanstack_router_core.rootRouteId).state : void 0;
-	const hasPendingMatch = () => routeId() ? Boolean(router.stores.pendingRouteIds.state[_tanstack_router_core.rootRouteId]) : false;
-	const resetKey = () => router.stores.loadedAt.state;
+	const match = () => routeId() ? router.stores.getMatchStoreByRouteId(_tanstack_router_core.rootRouteId).get() : void 0;
+	const hasPendingMatch = () => routeId() ? Boolean(router.stores.pendingRouteIds.get()[_tanstack_router_core.rootRouteId]) : false;
+	const resetKey = () => router.stores.loadedAt.get();
 	const nearestMatch = {
 		matchId,
 		routeId,
@@ -76,7 +76,7 @@ function useMatchRoute() {
 	return (opts) => {
 		return solid_js.createMemo(() => {
 			const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts;
-			router.stores.matchRouteReactivity.state;
+			router.stores.matchRouteReactivity.get();
 			return router.matchRoute(rest, {
 				pending,
 				caseSensitive,
@@ -98,7 +98,7 @@ function MatchRoute(props) {
 function useMatches(opts) {
 	const router = require_useRouter.useRouter();
 	return solid_js.createMemo((prev) => {
-		const matches = router.stores.activeMatchesSnapshot.state;
+		const matches = router.stores.activeMatchesSnapshot.get();
 		const res = opts?.select ? opts.select(matches) : matches;
 		if (prev === void 0) return res;
 		return (0, _tanstack_router_core.replaceEqualDeep)(prev, res);

package/dist/cjs/Matches.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Matches.cjs","names":["Solid","replaceEqualDeep","rootRouteId","isServer","CatchBoundary","ErrorComponent","useRouter","Transitioner","nearestMatchContext","SafeFragment","Match","AnyRoute","AnyRouter","DeepPartial","Expand","MakeOptionalPathParams","MakeOptionalSearchParams","MakeRouteMatchUnion","MaskOptions","MatchRouteOptions","RegisteredRouter","ResolveRoute","ToSubOptionsProps","RouteMatchExtensions","meta","Array","JSX","IntrinsicElements","links","scripts","styles","headScripts","Matches","router","ResolvedSuspense","document","ssr","Suspense","rootRoute","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","OptionalWrapper","InnerWrap","_$createComponent","children","fallback","MatchesInner","matchId","stores","firstMatchId","state","routeId","undefined","match","getMatchStoreByRouteId","hasPendingMatch","Boolean","pendingRouteIds","resetKey","loadedAt","nearestMatch","hasPending","matchComponent","Show","when","Provider","value","_$memo","disableGlobalCatchBoundary","getResetKey","errorComponent","onCatch","process","env","NODE_ENV","error","console","warn","message","toString","UseMatchRouteOptions","TFrom","TRouter","TTo","TMaskFrom","TMaskTo","useMatchRoute","opts","Accessor","createMemo","pending","caseSensitive","fuzzy","includeSearch","rest","matchRouteReactivity","matchRoute","MakeMatchRouteOptions","params","Element","MatchRoute","props","renderedChild","matchedParams","child","UseMatchesBaseOptions","select","matches","TSelected","UseMatchesResult","useMatches","prev","activeMatchesSnapshot","res","useParentMatches","contextMatchId","useContext","slice","findIndex","d","id","useChildMatches"],"sources":["../../src/Matches.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { replaceEqualDeep, rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { Transitioner } from './Transitioner'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Match } from './Match'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  DeepPartial,\n  Expand,\n  MakeOptionalPathParams,\n  MakeOptionalSearchParams,\n  MakeRouteMatchUnion,\n  MaskOptions,\n  MatchRouteOptions,\n  RegisteredRouter,\n  ResolveRoute,\n  ToSubOptionsProps,\n} from '@tanstack/router-core'\n\ndeclare module '@tanstack/router-core' {\n  export interface RouteMatchExtensions {\n    meta?: Array<Solid.JSX.IntrinsicElements['meta'] | undefined>\n    links?: Array<Solid.JSX.IntrinsicElements['link'] | undefined>\n    scripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n    styles?: Array<Solid.JSX.IntrinsicElements['style'] | undefined>\n    headScripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n  }\n}\n\nexport function Matches() {\n  const router = useRouter()\n\n  const ResolvedSuspense =\n    (isServer ?? router.isServer) ||\n    (typeof document !== 'undefined' && router.ssr)\n      ? SafeFragment\n      : Solid.Suspense\n\n  const rootRoute: () => AnyRoute = () => router.routesById[rootRouteId]\n  const PendingComponent =\n    rootRoute().options.pendingComponent ??\n    router.options.defaultPendingComponent\n\n  const OptionalWrapper = router.options.InnerWrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <ResolvedSuspense\n        fallback={PendingComponent ? <PendingComponent /> : null}\n      >\n        <Transitioner />\n        <MatchesInner />\n      </ResolvedSuspense>\n    </OptionalWrapper>\n  )\n}\n\nfunction MatchesInner() {\n  const router = useRouter()\n  const matchId = () => router.stores.firstMatchId.state\n  const routeId = () => (matchId() ? rootRouteId : undefined)\n  const match = () =>\n    routeId()\n      ? router.stores.getMatchStoreByRouteId(rootRouteId).state\n      : undefined\n  const hasPendingMatch = () =>\n    routeId()\n      ? Boolean(router.stores.pendingRouteIds.state[rootRouteId])\n      : false\n  const resetKey = () => router.stores.loadedAt.state\n  const nearestMatch = {\n    matchId,\n    routeId,\n    match,\n    hasPending: hasPendingMatch,\n  }\n\n  const matchComponent = () => {\n    return (\n      <Solid.Show when={matchId()}>\n        <Match matchId={matchId()!} />\n      </Solid.Show>\n    )\n  }\n\n  return (\n    <nearestMatchContext.Provider value={nearestMatch}>\n      {router.options.disableGlobalCatchBoundary ? (\n        matchComponent()\n      ) : (\n        <CatchBoundary\n          getResetKey={() => resetKey()}\n          errorComponent={ErrorComponent}\n          onCatch={\n            process.env.NODE_ENV !== 'production'\n              ? (error) => {\n                  console.warn(\n                    `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`,\n                  )\n                  console.warn(`Warning: ${error.message || error.toString()}`)\n                }\n              : undefined\n          }\n        >\n          {matchComponent()}\n        </CatchBoundary>\n      )}\n    </nearestMatchContext.Provider>\n  )\n}\n\nexport type UseMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = ToSubOptionsProps<TRouter, TFrom, TTo> &\n  DeepPartial<MakeOptionalSearchParams<TRouter, TFrom, TTo>> &\n  DeepPartial<MakeOptionalPathParams<TRouter, TFrom, TTo>> &\n  MaskOptions<TRouter, TMaskFrom, TMaskTo> &\n  MatchRouteOptions\n\nexport function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {\n  const router = useRouter()\n\n  return <\n    const TFrom extends string = string,\n    const TTo extends string | undefined = undefined,\n    const TMaskFrom extends string = TFrom,\n    const TMaskTo extends string = '',\n  >(\n    opts: UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n  ): Solid.Accessor<\n    false | Expand<ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']>\n  > => {\n    return Solid.createMemo(() => {\n      const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts\n\n      router.stores.matchRouteReactivity.state\n      return router.matchRoute(rest as any, {\n        pending,\n        caseSensitive,\n        fuzzy,\n        includeSearch,\n      })\n    })\n  }\n}\n\nexport type MakeMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | ((\n        params?: Expand<\n          ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']\n        >,\n      ) => Solid.JSX.Element)\n    | Solid.JSX.Element\n}\n\nexport function MatchRoute<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = string,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(props: MakeMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): any {\n  const matchRoute = useMatchRoute()\n  const params = matchRoute(props as any)\n\n  const renderedChild = Solid.createMemo(() => {\n    const matchedParams = params()\n    const child = props.children\n\n    if (typeof child === 'function') {\n      return (child as any)(matchedParams)\n    }\n\n    return matchedParams ? child : null\n  })\n\n  return <>{renderedChild()}</>\n}\n\nexport interface UseMatchesBaseOptions<TRouter extends AnyRouter, TSelected> {\n  select?: (matches: Array<MakeRouteMatchUnion<TRouter>>) => TSelected\n}\n\nexport type UseMatchesResult<\n  TRouter extends AnyRouter,\n  TSelected,\n> = unknown extends TSelected ? Array<MakeRouteMatchUnion<TRouter>> : TSelected\n\nexport function useMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const router = useRouter<TRouter>()\n  return Solid.createMemo((prev: TSelected | undefined) => {\n    const matches = router.stores.activeMatchesSnapshot.state as Array<\n      MakeRouteMatchUnion<TRouter>\n    >\n    const res = opts?.select ? opts.select(matches) : matches\n    if (prev === undefined) return res\n    return replaceEqualDeep(prev, res) as any\n  }) as Solid.Accessor<UseMatchesResult<TRouter, TSelected>>\n}\n\nexport function useParentMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextMatchId = Solid.useContext(nearestMatchContext).matchId\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        0,\n        matches.findIndex((d) => d.id === contextMatchId()),\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n\nexport function useChildMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextMatchId = Solid.useContext(nearestMatchContext).matchId\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        matches.findIndex((d) => d.id === contextMatchId()) + 1,\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n"],"mappings":"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"}
+{"version":3,"file":"Matches.cjs","names":["Solid","replaceEqualDeep","rootRouteId","isServer","CatchBoundary","ErrorComponent","useRouter","Transitioner","nearestMatchContext","SafeFragment","Match","AnyRoute","AnyRouter","DeepPartial","Expand","MakeOptionalPathParams","MakeOptionalSearchParams","MakeRouteMatchUnion","MaskOptions","MatchRouteOptions","RegisteredRouter","ResolveRoute","ToSubOptionsProps","RouteMatchExtensions","meta","Array","JSX","IntrinsicElements","links","scripts","styles","headScripts","Matches","router","ResolvedSuspense","document","ssr","Suspense","rootRoute","routesById","PendingComponent","options","pendingComponent","defaultPendingComponent","OptionalWrapper","InnerWrap","_$createComponent","children","fallback","MatchesInner","matchId","stores","firstMatchId","get","routeId","undefined","match","getMatchStoreByRouteId","hasPendingMatch","Boolean","pendingRouteIds","resetKey","loadedAt","nearestMatch","hasPending","matchComponent","Show","when","Provider","value","_$memo","disableGlobalCatchBoundary","getResetKey","errorComponent","onCatch","process","env","NODE_ENV","error","console","warn","message","toString","UseMatchRouteOptions","TFrom","TRouter","TTo","TMaskFrom","TMaskTo","useMatchRoute","opts","Accessor","createMemo","pending","caseSensitive","fuzzy","includeSearch","rest","matchRouteReactivity","matchRoute","MakeMatchRouteOptions","params","Element","MatchRoute","props","renderedChild","matchedParams","child","UseMatchesBaseOptions","select","matches","TSelected","UseMatchesResult","useMatches","prev","activeMatchesSnapshot","res","useParentMatches","contextMatchId","useContext","slice","findIndex","d","id","useChildMatches"],"sources":["../../src/Matches.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { replaceEqualDeep, rootRouteId } from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { useRouter } from './useRouter'\nimport { Transitioner } from './Transitioner'\nimport { nearestMatchContext } from './matchContext'\nimport { SafeFragment } from './SafeFragment'\nimport { Match } from './Match'\nimport type {\n  AnyRoute,\n  AnyRouter,\n  DeepPartial,\n  Expand,\n  MakeOptionalPathParams,\n  MakeOptionalSearchParams,\n  MakeRouteMatchUnion,\n  MaskOptions,\n  MatchRouteOptions,\n  RegisteredRouter,\n  ResolveRoute,\n  ToSubOptionsProps,\n} from '@tanstack/router-core'\n\ndeclare module '@tanstack/router-core' {\n  export interface RouteMatchExtensions {\n    meta?: Array<Solid.JSX.IntrinsicElements['meta'] | undefined>\n    links?: Array<Solid.JSX.IntrinsicElements['link'] | undefined>\n    scripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n    styles?: Array<Solid.JSX.IntrinsicElements['style'] | undefined>\n    headScripts?: Array<Solid.JSX.IntrinsicElements['script'] | undefined>\n  }\n}\n\nexport function Matches() {\n  const router = useRouter()\n\n  const ResolvedSuspense =\n    (isServer ?? router.isServer) ||\n    (typeof document !== 'undefined' && router.ssr)\n      ? SafeFragment\n      : Solid.Suspense\n\n  const rootRoute: () => AnyRoute = () => router.routesById[rootRouteId]\n  const PendingComponent =\n    rootRoute().options.pendingComponent ??\n    router.options.defaultPendingComponent\n\n  const OptionalWrapper = router.options.InnerWrap || SafeFragment\n\n  return (\n    <OptionalWrapper>\n      <ResolvedSuspense\n        fallback={PendingComponent ? <PendingComponent /> : null}\n      >\n        <Transitioner />\n        <MatchesInner />\n      </ResolvedSuspense>\n    </OptionalWrapper>\n  )\n}\n\nfunction MatchesInner() {\n  const router = useRouter()\n  const matchId = () => router.stores.firstMatchId.get()\n  const routeId = () => (matchId() ? rootRouteId : undefined)\n  const match = () =>\n    routeId()\n      ? router.stores.getMatchStoreByRouteId(rootRouteId).get()\n      : undefined\n  const hasPendingMatch = () =>\n    routeId()\n      ? Boolean(router.stores.pendingRouteIds.get()[rootRouteId])\n      : false\n  const resetKey = () => router.stores.loadedAt.get()\n  const nearestMatch = {\n    matchId,\n    routeId,\n    match,\n    hasPending: hasPendingMatch,\n  }\n\n  const matchComponent = () => {\n    return (\n      <Solid.Show when={matchId()}>\n        <Match matchId={matchId()!} />\n      </Solid.Show>\n    )\n  }\n\n  return (\n    <nearestMatchContext.Provider value={nearestMatch}>\n      {router.options.disableGlobalCatchBoundary ? (\n        matchComponent()\n      ) : (\n        <CatchBoundary\n          getResetKey={() => resetKey()}\n          errorComponent={ErrorComponent}\n          onCatch={\n            process.env.NODE_ENV !== 'production'\n              ? (error) => {\n                  console.warn(\n                    `Warning: The following error wasn't caught by any route! At the very least, consider setting an 'errorComponent' in your RootRoute!`,\n                  )\n                  console.warn(`Warning: ${error.message || error.toString()}`)\n                }\n              : undefined\n          }\n        >\n          {matchComponent()}\n        </CatchBoundary>\n      )}\n    </nearestMatchContext.Provider>\n  )\n}\n\nexport type UseMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = ToSubOptionsProps<TRouter, TFrom, TTo> &\n  DeepPartial<MakeOptionalSearchParams<TRouter, TFrom, TTo>> &\n  DeepPartial<MakeOptionalPathParams<TRouter, TFrom, TTo>> &\n  MaskOptions<TRouter, TMaskFrom, TMaskTo> &\n  MatchRouteOptions\n\nexport function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {\n  const router = useRouter()\n\n  return <\n    const TFrom extends string = string,\n    const TTo extends string | undefined = undefined,\n    const TMaskFrom extends string = TFrom,\n    const TMaskTo extends string = '',\n  >(\n    opts: UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>,\n  ): Solid.Accessor<\n    false | Expand<ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']>\n  > => {\n    return Solid.createMemo(() => {\n      const { pending, caseSensitive, fuzzy, includeSearch, ...rest } = opts\n\n      router.stores.matchRouteReactivity.get()\n      return router.matchRoute(rest as any, {\n        pending,\n        caseSensitive,\n        fuzzy,\n        includeSearch,\n      })\n    })\n  }\n}\n\nexport type MakeMatchRouteOptions<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TFrom extends string = string,\n  TTo extends string | undefined = undefined,\n  TMaskFrom extends string = TFrom,\n  TMaskTo extends string = '',\n> = UseMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo> & {\n  // If a function is passed as a child, it will be given the `isActive` boolean to aid in further styling on the element it returns\n  children?:\n    | ((\n        params?: Expand<\n          ResolveRoute<TRouter, TFrom, TTo>['types']['allParams']\n        >,\n      ) => Solid.JSX.Element)\n    | Solid.JSX.Element\n}\n\nexport function MatchRoute<\n  TRouter extends AnyRouter = RegisteredRouter,\n  const TFrom extends string = string,\n  const TTo extends string | undefined = undefined,\n  const TMaskFrom extends string = TFrom,\n  const TMaskTo extends string = '',\n>(props: MakeMatchRouteOptions<TRouter, TFrom, TTo, TMaskFrom, TMaskTo>): any {\n  const matchRoute = useMatchRoute()\n  const params = matchRoute(props as any)\n\n  const renderedChild = Solid.createMemo(() => {\n    const matchedParams = params()\n    const child = props.children\n\n    if (typeof child === 'function') {\n      return (child as any)(matchedParams)\n    }\n\n    return matchedParams ? child : null\n  })\n\n  return <>{renderedChild()}</>\n}\n\nexport interface UseMatchesBaseOptions<TRouter extends AnyRouter, TSelected> {\n  select?: (matches: Array<MakeRouteMatchUnion<TRouter>>) => TSelected\n}\n\nexport type UseMatchesResult<\n  TRouter extends AnyRouter,\n  TSelected,\n> = unknown extends TSelected ? Array<MakeRouteMatchUnion<TRouter>> : TSelected\n\nexport function useMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const router = useRouter<TRouter>()\n  return Solid.createMemo((prev: TSelected | undefined) => {\n    const matches = router.stores.activeMatchesSnapshot.get() as Array<\n      MakeRouteMatchUnion<TRouter>\n    >\n    const res = opts?.select ? opts.select(matches) : matches\n    if (prev === undefined) return res\n    return replaceEqualDeep(prev, res) as any\n  }) as Solid.Accessor<UseMatchesResult<TRouter, TSelected>>\n}\n\nexport function useParentMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextMatchId = Solid.useContext(nearestMatchContext).matchId\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        0,\n        matches.findIndex((d) => d.id === contextMatchId()),\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n\nexport function useChildMatches<\n  TRouter extends AnyRouter = RegisteredRouter,\n  TSelected = unknown,\n>(\n  opts?: UseMatchesBaseOptions<TRouter, TSelected>,\n): Solid.Accessor<UseMatchesResult<TRouter, TSelected>> {\n  const contextMatchId = Solid.useContext(nearestMatchContext).matchId\n\n  return useMatches({\n    select: (matches: Array<MakeRouteMatchUnion<TRouter>>) => {\n      matches = matches.slice(\n        matches.findIndex((d) => d.id === contextMatchId()) + 1,\n      )\n      return opts?.select ? opts.select(matches) : matches\n    },\n  } as any)\n}\n"],"mappings":";;;;;;;;;;;;;AAkCA,SAAgBgC,UAAU;CACxB,MAAMC,SAAS3B,kBAAAA,WAAW;CAE1B,MAAM4B,oBACH/B,+BAAAA,YAAY8B,OAAO9B,aACnB,OAAOgC,aAAa,eAAeF,OAAOG,MACvC3B,qBAAAA,eACAT,SAAMqC;CAEZ,MAAMC,kBAAkCL,OAAOM,WAAWrC,sBAAAA;CAC1D,MAAMsC,mBACJF,WAAW,CAACG,QAAQC,oBACpBT,OAAOQ,QAAQE;AAIjB,SAAA,GAAA,aAAA,iBAFwBV,OAAOQ,QAAQI,aAAapC,qBAAAA,cAGlC,EAAA,IAAAsC,WAAA;AAAA,UAAA,GAAA,aAAA,iBACbb,kBAAgB;GAAA,IACfc,WAAQ;AAAA,WAAER,oBAAAA,GAAAA,aAAAA,iBAAoBA,kBAAgB,EAAA,CAAA,GAAM;;GAAI,IAAAO,WAAA;AAAA,WAAA,EAAA,GAAA,aAAA,iBAEvDxC,qBAAAA,cAAY,EAAA,CAAA,GAAA,GAAA,aAAA,iBACZ0C,cAAY,EAAA,CAAA,CAAA;;GAAA,CAAA;IAAA,CAAA;;AAMrB,SAASA,eAAe;CACtB,MAAMhB,SAAS3B,kBAAAA,WAAW;CAC1B,MAAM4C,gBAAgBjB,OAAOkB,OAAOC,aAAaC,KAAK;CACtD,MAAMC,gBAAiBJ,SAAS,GAAGhD,sBAAAA,cAAcqD,KAAAA;CACjD,MAAMC,cACJF,SAAS,GACLrB,OAAOkB,OAAOM,uBAAuBvD,sBAAAA,YAAY,CAACmD,KAAK,GACvDE,KAAAA;CACN,MAAMG,wBACJJ,SAAS,GACLK,QAAQ1B,OAAOkB,OAAOS,gBAAgBP,KAAK,CAACnD,sBAAAA,aAAa,GACzD;CACN,MAAM2D,iBAAiB5B,OAAOkB,OAAOW,SAAST,KAAK;CACnD,MAAMU,eAAe;EACnBb;EACAI;EACAE;EACAQ,YAAYN;EACb;CAED,MAAMO,uBAAuB;AAC3B,UAAA,GAAA,aAAA,iBACGjE,SAAMkE,MAAI;GAAA,IAACC,OAAI;AAAA,WAAEjB,SAAS;;GAAA,IAAAH,WAAA;AAAA,YAAA,GAAA,aAAA,iBACxBrC,cAAAA,OAAK,EAAA,IAACwC,UAAO;AAAA,YAAEA,SAAS;OAAC,CAAA;;GAAA,CAAA;;AAKhC,SAAA,GAAA,aAAA,iBACG1C,qBAAAA,oBAAoB4D,UAAQ;EAACC,OAAON;EAAY,IAAAhB,WAAA;AAAA,WAAA,GAAA,aAAA,YAC9C,CAAA,CAAAd,OAAOQ,QAAQ8B,2BAA0B,EAAA,GACxCN,gBAAgB,IAAA,GAAA,aAAA,iBAEf7D,sBAAAA,eAAa;IACZoE,mBAAmBX,UAAU;IAC7BY,gBAAgBpE,sBAAAA;IAAc,IAC9BqE,UAAO;AAAA,YAAA,QAAA,IAAA,aACoB,gBACpBI,UAAU;AACTC,cAAQC,KACN,sIACD;AACDD,cAAQC,KAAK,YAAYF,MAAMG,WAAWH,MAAMI,UAAU,GAAG;SAE/D3B,KAAAA;;IAAS,IAAAR,WAAA;AAAA,YAGdkB,gBAAgB;;IAAA,CAEpB;;EAAA,CAAA;;AAiBP,SAAgBwB,gBAA8D;CAC5E,MAAMxD,SAAS3B,kBAAAA,WAAW;AAE1B,SAMEoF,SAGG;AACH,SAAO1F,SAAM4F,iBAAiB;GAC5B,MAAM,EAAEC,SAASC,eAAeC,OAAOC,eAAe,GAAGC,SAASP;AAElEzD,UAAOkB,OAAO+C,qBAAqB7C,KAAK;AACxC,UAAOpB,OAAOkE,WAAWF,MAAa;IACpCJ;IACAC;IACAC;IACAC;IACD,CAAC;IACF;;;AAqBN,SAAgBO,WAMdC,OAA4E;CAE5E,MAAMH,SADaZ,eAAe,CACRe,MAAa;AAavC,SAAA,GAAA,aAAA,MAXsBxG,SAAM4F,iBAAiB;EAC3C,MAAMc,gBAAgBL,QAAQ;EAC9B,MAAMM,QAAQH,MAAMzD;AAEpB,MAAI,OAAO4D,UAAU,WACnB,QAAQA,MAAcD,cAAc;AAGtC,SAAOA,gBAAgBC,QAAQ;GAC/B,CAEqB;;AAYzB,SAAgBM,WAIdvB,MACsD;CACtD,MAAMzD,SAAS3B,kBAAAA,WAAoB;AACnC,QAAON,SAAM4F,YAAYsB,SAAgC;EACvD,MAAMJ,UAAU7E,OAAOkB,OAAOgE,sBAAsB9D,KAAK;EAGzD,MAAM+D,MAAM1B,MAAMmB,SAASnB,KAAKmB,OAAOC,QAAQ,GAAGA;AAClD,MAAII,SAAS3D,KAAAA,EAAW,QAAO6D;AAC/B,UAAA,GAAA,sBAAA,kBAAwBF,MAAME,IAAI;GAClC;;AAGJ,SAAgBC,iBAId3B,MACsD;CACtD,MAAM4B,iBAAiBtH,SAAMuH,WAAW/G,qBAAAA,oBAAoB,CAAC0C;AAE7D,QAAO+D,WAAW,EAChBJ,SAASC,YAAiD;AACxDA,YAAUA,QAAQU,MAChB,GACAV,QAAQW,WAAWC,MAAMA,EAAEC,OAAOL,gBAAgB,CACpD,CAAC;AACD,SAAO5B,MAAMmB,SAASnB,KAAKmB,OAAOC,QAAQ,GAAGA;IAEhD,CAAQ;;AAGX,SAAgBc,gBAIdlC,MACsD;CACtD,MAAM4B,iBAAiBtH,SAAMuH,WAAW/G,qBAAAA,oBAAoB,CAAC0C;AAE7D,QAAO+D,WAAW,EAChBJ,SAASC,YAAiD;AACxDA,YAAUA,QAAQU,MAChBV,QAAQW,WAAWC,MAAMA,EAAEC,OAAOL,gBAAgB,CAAC,GAAG,EACvD;AACD,SAAO5B,MAAMmB,SAASnB,KAAKmB,OAAOC,QAAQ,GAAGA;IAEhD,CAAQ"}

package/dist/cjs/Scripts.cjs

@@ -8,7 +8,7 @@ solid_js = require_runtime.__toESM(solid_js);
 var Scripts = () => {
 	const router = require_useRouter.useRouter();
 	const nonce = router.options.ssr?.nonce;
-	const activeMatches = solid_js.createMemo(() => router.stores.activeMatchesSnapshot.state);
+	const activeMatches = solid_js.createMemo(() => router.stores.activeMatchesSnapshot.get());
 	const assetScripts = solid_js.createMemo(() => {
 		const assetScripts = [];
 		const manifest = router.ssr?.manifest;

package/dist/cjs/Scripts.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Scripts.cjs","names":["Solid","Asset","useRouter","RouterManagedTag","Scripts","router","nonce","options","ssr","activeMatches","createMemo","stores","activeMatchesSnapshot","state","assetScripts","Array","manifest","map","match","looseRoutesById","routeId","forEach","route","routes","id","assets","filter","d","tag","asset","push","attrs","children","scripts","flat","Boolean","script","serverBufferedScript","undefined","serverSsr","takeBufferedScripts","allScripts","unshift","_$memo","i","_$createComponent"],"sources":["../../src/Scripts.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { Asset } from './Asset'\nimport { useRouter } from './useRouter'\nimport type { RouterManagedTag } from '@tanstack/router-core'\n\nexport const Scripts = () => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const activeMatches = Solid.createMemo(\n    () => router.stores.activeMatchesSnapshot.state,\n  )\n  const assetScripts = Solid.createMemo(() => {\n    const assetScripts: Array<RouterManagedTag> = []\n    const manifest = router.ssr?.manifest\n\n    if (!manifest) {\n      return []\n    }\n\n    activeMatches()\n      .map((match) => router.looseRoutesById[match.routeId]!)\n      .forEach((route) =>\n        manifest.routes[route.id]?.assets\n          ?.filter((d) => d.tag === 'script')\n          .forEach((asset) => {\n            assetScripts.push({\n              tag: 'script',\n              attrs: { ...asset.attrs, nonce },\n              children: asset.children,\n            } as any)\n          }),\n      )\n\n    return assetScripts\n  })\n\n  const scripts = Solid.createMemo(() =>\n    (\n      activeMatches()\n        .map((match) => match.scripts!)\n        .flat(1)\n        .filter(Boolean) as Array<RouterManagedTag>\n    ).map(({ children, ...script }) => ({\n      tag: 'script',\n      attrs: {\n        ...script,\n        nonce,\n      },\n      children,\n    })),\n  )\n\n  let serverBufferedScript: RouterManagedTag | undefined = undefined\n\n  if (router.serverSsr) {\n    serverBufferedScript = router.serverSsr.takeBufferedScripts()\n  }\n\n  const allScripts = [\n    ...scripts(),\n    ...assetScripts(),\n  ] as Array<RouterManagedTag>\n\n  if (serverBufferedScript) {\n    allScripts.unshift(serverBufferedScript)\n  }\n\n  return (\n    <>\n      {allScripts.map((asset, i) => (\n        <Asset {...asset} />\n      ))}\n    </>\n  )\n}\n"],"mappings":";;;;;;;AAKA,IAAaI,gBAAgB;CAC3B,MAAMC,SAASH,kBAAAA,WAAW;CAC1B,MAAMI,QAAQD,OAAOE,QAAQC,KAAKF;CAClC,MAAMG,gBAAgBT,SAAMU,iBACpBL,OAAOM,OAAOC,sBAAsBC,MAC3C;CACD,MAAMC,eAAed,SAAMU,iBAAiB;EAC1C,MAAMI,eAAwC,EAAE;EAChD,MAAME,WAAWX,OAAOG,KAAKQ;AAE7B,MAAI,CAACA,SACH,QAAO,EAAE;AAGXP,iBAAe,CACZQ,KAAKC,UAAUb,OAAOc,gBAAgBD,MAAME,SAAU,CACtDC,SAASC,UACRN,SAASO,OAAOD,MAAME,KAAKC,QACvBC,QAAQC,MAAMA,EAAEC,QAAQ,SAAS,CAClCP,SAASQ,UAAU;AAClBf,gBAAagB,KAAK;IAChBF,KAAK;IACLG,OAAO;KAAE,GAAGF,MAAME;KAAOzB;KAAO;IAChC0B,UAAUH,MAAMG;IACjB,CAAQ;IAEf,CAAC;AAEH,SAAOlB;GACP;CAEF,MAAMmB,UAAUjC,SAAMU,iBAElBD,eAAe,CACZQ,KAAKC,UAAUA,MAAMe,QAAS,CAC9BC,KAAK,EAAE,CACPR,OAAOS,QAAQ,CAClBlB,KAAK,EAAEe,UAAU,GAAGI,cAAc;EAClCR,KAAK;EACLG,OAAO;GACL,GAAGK;GACH9B;GACD;EACD0B;EACD,EACH,CAAC;CAED,IAAIK,uBAAqDC,KAAAA;AAEzD,KAAIjC,OAAOkC,UACTF,wBAAuBhC,OAAOkC,UAAUC,qBAAqB;CAG/D,MAAMC,aAAa,CACjB,GAAGR,SAAS,EACZ,GAAGnB,cAAc,CAClB;AAED,KAAIuB,qBACFI,YAAWC,QAAQL,qBAAqB;AAG1C,SAAA,GAAA,aAAA,YAEKI,WAAWxB,KAAKY,OAAOe,OAAAA,GAAAA,aAAAA,iBACrB3C,cAAAA,OAAU4B,MACZ,CAAC,CAAA"}
+{"version":3,"file":"Scripts.cjs","names":["Solid","Asset","useRouter","RouterManagedTag","Scripts","router","nonce","options","ssr","activeMatches","createMemo","stores","activeMatchesSnapshot","get","assetScripts","Array","manifest","map","match","looseRoutesById","routeId","forEach","route","routes","id","assets","filter","d","tag","asset","push","attrs","children","scripts","flat","Boolean","script","serverBufferedScript","undefined","serverSsr","takeBufferedScripts","allScripts","unshift","_$memo","i","_$createComponent"],"sources":["../../src/Scripts.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport { Asset } from './Asset'\nimport { useRouter } from './useRouter'\nimport type { RouterManagedTag } from '@tanstack/router-core'\n\nexport const Scripts = () => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const activeMatches = Solid.createMemo(() =>\n    router.stores.activeMatchesSnapshot.get(),\n  )\n  const assetScripts = Solid.createMemo(() => {\n    const assetScripts: Array<RouterManagedTag> = []\n    const manifest = router.ssr?.manifest\n\n    if (!manifest) {\n      return []\n    }\n\n    activeMatches()\n      .map((match) => router.looseRoutesById[match.routeId]!)\n      .forEach((route) =>\n        manifest.routes[route.id]?.assets\n          ?.filter((d) => d.tag === 'script')\n          .forEach((asset) => {\n            assetScripts.push({\n              tag: 'script',\n              attrs: { ...asset.attrs, nonce },\n              children: asset.children,\n            } as any)\n          }),\n      )\n\n    return assetScripts\n  })\n\n  const scripts = Solid.createMemo(() =>\n    (\n      activeMatches()\n        .map((match) => match.scripts!)\n        .flat(1)\n        .filter(Boolean) as Array<RouterManagedTag>\n    ).map(({ children, ...script }) => ({\n      tag: 'script',\n      attrs: {\n        ...script,\n        nonce,\n      },\n      children,\n    })),\n  )\n\n  let serverBufferedScript: RouterManagedTag | undefined = undefined\n\n  if (router.serverSsr) {\n    serverBufferedScript = router.serverSsr.takeBufferedScripts()\n  }\n\n  const allScripts = [\n    ...scripts(),\n    ...assetScripts(),\n  ] as Array<RouterManagedTag>\n\n  if (serverBufferedScript) {\n    allScripts.unshift(serverBufferedScript)\n  }\n\n  return (\n    <>\n      {allScripts.map((asset, i) => (\n        <Asset {...asset} />\n      ))}\n    </>\n  )\n}\n"],"mappings":";;;;;;;AAKA,IAAaI,gBAAgB;CAC3B,MAAMC,SAASH,kBAAAA,WAAW;CAC1B,MAAMI,QAAQD,OAAOE,QAAQC,KAAKF;CAClC,MAAMG,gBAAgBT,SAAMU,iBAC1BL,OAAOM,OAAOC,sBAAsBC,KACtC,CAAC;CACD,MAAMC,eAAed,SAAMU,iBAAiB;EAC1C,MAAMI,eAAwC,EAAE;EAChD,MAAME,WAAWX,OAAOG,KAAKQ;AAE7B,MAAI,CAACA,SACH,QAAO,EAAE;AAGXP,iBAAe,CACZQ,KAAKC,UAAUb,OAAOc,gBAAgBD,MAAME,SAAU,CACtDC,SAASC,UACRN,SAASO,OAAOD,MAAME,KAAKC,QACvBC,QAAQC,MAAMA,EAAEC,QAAQ,SAAS,CAClCP,SAASQ,UAAU;AAClBf,gBAAagB,KAAK;IAChBF,KAAK;IACLG,OAAO;KAAE,GAAGF,MAAME;KAAOzB;KAAO;IAChC0B,UAAUH,MAAMG;IACjB,CAAQ;IAEf,CAAC;AAEH,SAAOlB;GACP;CAEF,MAAMmB,UAAUjC,SAAMU,iBAElBD,eAAe,CACZQ,KAAKC,UAAUA,MAAMe,QAAS,CAC9BC,KAAK,EAAE,CACPR,OAAOS,QAAQ,CAClBlB,KAAK,EAAEe,UAAU,GAAGI,cAAc;EAClCR,KAAK;EACLG,OAAO;GACL,GAAGK;GACH9B;GACD;EACD0B;EACD,EACH,CAAC;CAED,IAAIK,uBAAqDC,KAAAA;AAEzD,KAAIjC,OAAOkC,UACTF,wBAAuBhC,OAAOkC,UAAUC,qBAAqB;CAG/D,MAAMC,aAAa,CACjB,GAAGR,SAAS,EACZ,GAAGnB,cAAc,CAClB;AAED,KAAIuB,qBACFI,YAAWC,QAAQL,qBAAqB;AAG1C,SAAA,GAAA,aAAA,YAEKI,WAAWxB,KAAKY,OAAOe,OAAAA,GAAAA,aAAAA,iBACrB3C,cAAAA,OAAU4B,MACZ,CAAC,CAAA"}

package/dist/cjs/Transitioner.cjs

@@ -11,10 +11,10 @@ function Transitioner() {
 		router,
 		mounted: false
 	};
-	const isLoading = solid_js.createMemo(() => router.stores.isLoading.state);
+	const isLoading = solid_js.createMemo(() => router.stores.isLoading.get());
 	if (_tanstack_router_core_isServer.isServer ?? router.isServer) return null;
 	const [isSolidTransitioning, startSolidTransition] = solid_js.useTransition();
-	const hasPendingMatches = solid_js.createMemo(() => router.stores.hasPendingMatches.state);
+	const hasPendingMatches = solid_js.createMemo(() => router.stores.hasPendingMatches.get());
 	const isAnyPending = solid_js.createMemo(() => isLoading() || isSolidTransitioning() || hasPendingMatches());
 	const isPagePending = solid_js.createMemo(() => isLoading() || hasPendingMatches());
 	router.startTransition = (fn) => {
@@ -61,7 +61,7 @@ function Transitioner() {
 		const currentIsLoading = isLoading();
 		if (previousIsLoading && !currentIsLoading) router.emit({
 			type: "onLoad",
-			...(0, _tanstack_router_core.getLocationChangeInfo)(router.stores.location.state, router.stores.resolvedLocation.state)
+			...(0, _tanstack_router_core.getLocationChangeInfo)(router.stores.location.get(), router.stores.resolvedLocation.get())
 		});
 		return currentIsLoading;
 	});
@@ -69,21 +69,21 @@ function Transitioner() {
 		const currentIsPagePending = isPagePending();
 		if (previousIsPagePending && !currentIsPagePending) router.emit({
 			type: "onBeforeRouteMount",
-			...(0, _tanstack_router_core.getLocationChangeInfo)(router.stores.location.state, router.stores.resolvedLocation.state)
+			...(0, _tanstack_router_core.getLocationChangeInfo)(router.stores.location.get(), router.stores.resolvedLocation.get())
 		});
 		return currentIsPagePending;
 	});
 	solid_js.createRenderEffect((previousIsAnyPending = false) => {
 		const currentIsAnyPending = isAnyPending();
 		if (previousIsAnyPending && !currentIsAnyPending) {
-			const changeInfo = (0, _tanstack_router_core.getLocationChangeInfo)(router.stores.location.state, router.stores.resolvedLocation.state);
+			const changeInfo = (0, _tanstack_router_core.getLocationChangeInfo)(router.stores.location.get(), router.stores.resolvedLocation.get());
 			router.emit({
 				type: "onResolved",
 				...changeInfo
 			});
 			solid_js.batch(() => {
-				router.stores.status.setState(() => "idle");
-				router.stores.resolvedLocation.setState(() => router.stores.location.state);
+				router.stores.status.set("idle");
+				router.stores.resolvedLocation.set(router.stores.location.get());
 			});
 			if (changeInfo.hrefChanged) (0, _tanstack_router_core.handleHashScroll)(router);
 		}

package/dist/cjs/Transitioner.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Transitioner.cjs","names":["Solid","getLocationChangeInfo","handleHashScroll","trimPathRight","isServer","useRouter","Transitioner","router","mountLoadForRouter","mounted","isLoading","createMemo","stores","state","isSolidTransitioning","startSolidTransition","useTransition","hasPendingMatches","isAnyPending","isPagePending","startTransition","fn","Promise","onMount","unsub","history","subscribe","load","nextLocation","buildLocation","to","latestLocation","pathname","search","params","hash","_includeValidateSearch","publicHref","commitLocation","replace","onCleanup","createRenderEffect","untrack","window","ssr","tryLoad","err","console","error","previousIsLoading","currentIsLoading","emit","type","location","resolvedLocation","createComputed","previousIsPagePending","currentIsPagePending","previousIsAnyPending","currentIsAnyPending","changeInfo","batch","status","setState","hrefChanged"],"sources":["../../src/Transitioner.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  getLocationChangeInfo,\n  handleHashScroll,\n  trimPathRight,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\n\nexport function Transitioner() {\n  const router = useRouter()\n  let mountLoadForRouter = { router, mounted: false }\n  const isLoading = Solid.createMemo(() => router.stores.isLoading.state)\n\n  if (isServer ?? router.isServer) {\n    return null\n  }\n\n  const [isSolidTransitioning, startSolidTransition] = Solid.useTransition()\n\n  // Track pending state changes\n  const hasPendingMatches = Solid.createMemo(\n    () => router.stores.hasPendingMatches.state,\n  )\n\n  const isAnyPending = Solid.createMemo(\n    () => isLoading() || isSolidTransitioning() || hasPendingMatches(),\n  )\n\n  const isPagePending = Solid.createMemo(\n    () => isLoading() || hasPendingMatches(),\n  )\n\n  router.startTransition = (fn: () => void | Promise<void>) => {\n    Solid.startTransition(() => {\n      startSolidTransition(fn)\n    })\n  }\n\n  // Subscribe to location changes\n  // and try to load the new location\n  Solid.onMount(() => {\n    const unsub = router.history.subscribe(router.load)\n\n    const nextLocation = router.buildLocation({\n      to: router.latestLocation.pathname,\n      search: true,\n      params: true,\n      hash: true,\n      state: true,\n      _includeValidateSearch: true,\n    })\n\n    // Check if the current URL matches the canonical form.\n    // Compare publicHref (browser-facing URL) for consistency with\n    // the server-side redirect check in router.beforeLoad.\n    if (\n      trimPathRight(router.latestLocation.publicHref) !==\n      trimPathRight(nextLocation.publicHref)\n    ) {\n      router.commitLocation({ ...nextLocation, replace: true })\n    }\n\n    Solid.onCleanup(() => {\n      unsub()\n    })\n  })\n\n  // Try to load the initial location\n  Solid.createRenderEffect(() => {\n    Solid.untrack(() => {\n      if (\n        // if we are hydrating from SSR, loading is triggered in ssr-client\n        (typeof window !== 'undefined' && router.ssr) ||\n        (mountLoadForRouter.router === router && mountLoadForRouter.mounted)\n      ) {\n        return\n      }\n      mountLoadForRouter = { router, mounted: true }\n      const tryLoad = async () => {\n        try {\n          await router.load()\n        } catch (err) {\n          console.error(err)\n        }\n      }\n      tryLoad()\n    })\n  })\n\n  Solid.createRenderEffect((previousIsLoading = false) => {\n    const currentIsLoading = isLoading()\n\n    if (previousIsLoading && !currentIsLoading) {\n      router.emit({\n        type: 'onLoad',\n        ...getLocationChangeInfo(\n          router.stores.location.state,\n          router.stores.resolvedLocation.state,\n        ),\n      })\n    }\n\n    return currentIsLoading\n  })\n\n  Solid.createComputed((previousIsPagePending = false) => {\n    const currentIsPagePending = isPagePending()\n\n    if (previousIsPagePending && !currentIsPagePending) {\n      router.emit({\n        type: 'onBeforeRouteMount',\n        ...getLocationChangeInfo(\n          router.stores.location.state,\n          router.stores.resolvedLocation.state,\n        ),\n      })\n    }\n\n    return currentIsPagePending\n  })\n\n  Solid.createRenderEffect((previousIsAnyPending = false) => {\n    const currentIsAnyPending = isAnyPending()\n\n    if (previousIsAnyPending && !currentIsAnyPending) {\n      const changeInfo = getLocationChangeInfo(\n        router.stores.location.state,\n        router.stores.resolvedLocation.state,\n      )\n      router.emit({\n        type: 'onResolved',\n        ...changeInfo,\n      })\n\n      Solid.batch(() => {\n        router.stores.status.setState(() => 'idle')\n        router.stores.resolvedLocation.setState(\n          () => router.stores.location.state,\n        )\n      })\n\n      if (changeInfo.hrefChanged) {\n        handleHashScroll(router)\n      }\n    }\n\n    return currentIsAnyPending\n  })\n\n  return null\n}\n"],"mappings":"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"}
+{"version":3,"file":"Transitioner.cjs","names":["Solid","getLocationChangeInfo","handleHashScroll","trimPathRight","isServer","useRouter","Transitioner","router","mountLoadForRouter","mounted","isLoading","createMemo","stores","get","isSolidTransitioning","startSolidTransition","useTransition","hasPendingMatches","isAnyPending","isPagePending","startTransition","fn","Promise","onMount","unsub","history","subscribe","load","nextLocation","buildLocation","to","latestLocation","pathname","search","params","hash","state","_includeValidateSearch","publicHref","commitLocation","replace","onCleanup","createRenderEffect","untrack","window","ssr","tryLoad","err","console","error","previousIsLoading","currentIsLoading","emit","type","location","resolvedLocation","createComputed","previousIsPagePending","currentIsPagePending","previousIsAnyPending","currentIsAnyPending","changeInfo","batch","status","set","hrefChanged"],"sources":["../../src/Transitioner.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  getLocationChangeInfo,\n  handleHashScroll,\n  trimPathRight,\n} from '@tanstack/router-core'\nimport { isServer } from '@tanstack/router-core/isServer'\nimport { useRouter } from './useRouter'\n\nexport function Transitioner() {\n  const router = useRouter()\n  let mountLoadForRouter = { router, mounted: false }\n  const isLoading = Solid.createMemo(() => router.stores.isLoading.get())\n\n  if (isServer ?? router.isServer) {\n    return null\n  }\n\n  const [isSolidTransitioning, startSolidTransition] = Solid.useTransition()\n\n  // Track pending state changes\n  const hasPendingMatches = Solid.createMemo(() =>\n    router.stores.hasPendingMatches.get(),\n  )\n\n  const isAnyPending = Solid.createMemo(\n    () => isLoading() || isSolidTransitioning() || hasPendingMatches(),\n  )\n\n  const isPagePending = Solid.createMemo(\n    () => isLoading() || hasPendingMatches(),\n  )\n\n  router.startTransition = (fn: () => void | Promise<void>) => {\n    Solid.startTransition(() => {\n      startSolidTransition(fn)\n    })\n  }\n\n  // Subscribe to location changes\n  // and try to load the new location\n  Solid.onMount(() => {\n    const unsub = router.history.subscribe(router.load)\n\n    const nextLocation = router.buildLocation({\n      to: router.latestLocation.pathname,\n      search: true,\n      params: true,\n      hash: true,\n      state: true,\n      _includeValidateSearch: true,\n    })\n\n    // Check if the current URL matches the canonical form.\n    // Compare publicHref (browser-facing URL) for consistency with\n    // the server-side redirect check in router.beforeLoad.\n    if (\n      trimPathRight(router.latestLocation.publicHref) !==\n      trimPathRight(nextLocation.publicHref)\n    ) {\n      router.commitLocation({ ...nextLocation, replace: true })\n    }\n\n    Solid.onCleanup(() => {\n      unsub()\n    })\n  })\n\n  // Try to load the initial location\n  Solid.createRenderEffect(() => {\n    Solid.untrack(() => {\n      if (\n        // if we are hydrating from SSR, loading is triggered in ssr-client\n        (typeof window !== 'undefined' && router.ssr) ||\n        (mountLoadForRouter.router === router && mountLoadForRouter.mounted)\n      ) {\n        return\n      }\n      mountLoadForRouter = { router, mounted: true }\n      const tryLoad = async () => {\n        try {\n          await router.load()\n        } catch (err) {\n          console.error(err)\n        }\n      }\n      tryLoad()\n    })\n  })\n\n  Solid.createRenderEffect((previousIsLoading = false) => {\n    const currentIsLoading = isLoading()\n\n    if (previousIsLoading && !currentIsLoading) {\n      router.emit({\n        type: 'onLoad',\n        ...getLocationChangeInfo(\n          router.stores.location.get(),\n          router.stores.resolvedLocation.get(),\n        ),\n      })\n    }\n\n    return currentIsLoading\n  })\n\n  Solid.createComputed((previousIsPagePending = false) => {\n    const currentIsPagePending = isPagePending()\n\n    if (previousIsPagePending && !currentIsPagePending) {\n      router.emit({\n        type: 'onBeforeRouteMount',\n        ...getLocationChangeInfo(\n          router.stores.location.get(),\n          router.stores.resolvedLocation.get(),\n        ),\n      })\n    }\n\n    return currentIsPagePending\n  })\n\n  Solid.createRenderEffect((previousIsAnyPending = false) => {\n    const currentIsAnyPending = isAnyPending()\n\n    if (previousIsAnyPending && !currentIsAnyPending) {\n      const changeInfo = getLocationChangeInfo(\n        router.stores.location.get(),\n        router.stores.resolvedLocation.get(),\n      )\n      router.emit({\n        type: 'onResolved',\n        ...changeInfo,\n      })\n\n      Solid.batch(() => {\n        router.stores.status.set('idle')\n        router.stores.resolvedLocation.set(router.stores.location.get())\n      })\n\n      if (changeInfo.hrefChanged) {\n        handleHashScroll(router)\n      }\n    }\n\n    return currentIsAnyPending\n  })\n\n  return null\n}\n"],"mappings":"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"}

package/dist/cjs/headContentUtils.cjs

@@ -11,7 +11,7 @@ solid_js = require_runtime.__toESM(solid_js);
 var useTags = (assetCrossOrigin) => {
 	const router = require_useRouter.useRouter();
 	const nonce = router.options.ssr?.nonce;
-	const activeMatches = solid_js.createMemo(() => router.stores.activeMatchesSnapshot.state);
+	const activeMatches = solid_js.createMemo(() => router.stores.activeMatchesSnapshot.get());
 	const routeMeta = solid_js.createMemo(() => activeMatches().map((match) => match.meta).filter(Boolean));
 	const meta = solid_js.createMemo(() => {
 		const resultMeta = [];

package/dist/cjs/headContentUtils.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"headContentUtils.cjs","names":["Solid","escapeHtml","getAssetCrossOrigin","replaceEqualDeep","resolveManifestAssetLink","useRouter","AssetCrossOriginConfig","RouterManagedTag","useTags","assetCrossOrigin","router","nonce","options","ssr","activeMatches","createMemo","stores","activeMatchesSnapshot","state","routeMeta","map","match","meta","filter","Boolean","Accessor","Array","resultMeta","metaByAttribute","Record","title","routeMetasArray","i","length","metas","j","m","tag","children","json","JSON","stringify","push","attrs","type","attribute","name","property","content","reverse","links","matches","constructed","flat","link","manifest","assets","routes","routeId","asset","crossOrigin","preloadLinks","looseRoutesById","forEach","route","id","preloads","preload","preloadLink","rel","href","styles","style","headScripts","script","prev","next","uniqBy","d","undefined","arr","T","fn","item","seen","Set","key","has","add"],"sources":["../../src/headContentUtils.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  escapeHtml,\n  getAssetCrossOrigin,\n  replaceEqualDeep,\n  resolveManifestAssetLink,\n} from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport type {\n  AssetCrossOriginConfig,\n  RouterManagedTag,\n} from '@tanstack/router-core'\n\n/**\n * Build the list of head/link/meta/script tags to render for active matches.\n * Used internally by `HeadContent`.\n */\nexport const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const activeMatches = Solid.createMemo(\n    () => router.stores.activeMatchesSnapshot.state,\n  )\n  const routeMeta = Solid.createMemo(() =>\n    activeMatches()\n      .map((match) => match.meta!)\n      .filter(Boolean),\n  )\n\n  const meta: Solid.Accessor<Array<RouterManagedTag>> = Solid.createMemo(() => {\n    const resultMeta: Array<RouterManagedTag> = []\n    const metaByAttribute: Record<string, true> = {}\n    let title: RouterManagedTag | undefined\n    const routeMetasArray = routeMeta()\n    for (let i = routeMetasArray.length - 1; i >= 0; i--) {\n      const metas = routeMetasArray[i]!\n      for (let j = metas.length - 1; j >= 0; j--) {\n        const m = metas[j]\n        if (!m) continue\n\n        if (m.title) {\n          if (!title) {\n            title = {\n              tag: 'title',\n              children: m.title,\n            }\n          }\n        } else if ('script:ld+json' in m) {\n          // Handle JSON-LD structured data\n          // Content is HTML-escaped to prevent XSS when injected via innerHTML\n          try {\n            const json = JSON.stringify(m['script:ld+json'])\n            resultMeta.push({\n              tag: 'script',\n              attrs: {\n                type: 'application/ld+json',\n              },\n              children: escapeHtml(json),\n            })\n          } catch {\n            // Skip invalid JSON-LD objects\n          }\n        } else {\n          const attribute = m.name ?? m.property\n          if (attribute) {\n            if (metaByAttribute[attribute]) {\n              continue\n            } else {\n              metaByAttribute[attribute] = true\n            }\n          }\n\n          resultMeta.push({\n            tag: 'meta',\n            attrs: {\n              ...m,\n              nonce,\n            },\n          })\n        }\n      }\n    }\n\n    if (title) {\n      resultMeta.push(title)\n    }\n\n    if (router.options.ssr?.nonce) {\n      resultMeta.push({\n        tag: 'meta',\n        attrs: {\n          property: 'csp-nonce',\n          content: router.options.ssr.nonce,\n        },\n      })\n    }\n    resultMeta.reverse()\n\n    return resultMeta\n  })\n\n  const links = Solid.createMemo(() => {\n    const matches = activeMatches()\n    const constructed = matches\n      .map((match) => match.links!)\n      .filter(Boolean)\n      .flat(1)\n      .map((link) => ({\n        tag: 'link',\n        attrs: {\n          ...link,\n          nonce,\n        },\n      })) satisfies Array<RouterManagedTag>\n\n    const manifest = router.ssr?.manifest\n\n    const assets = matches\n      .map((match) => manifest?.routes[match.routeId]?.assets ?? [])\n      .filter(Boolean)\n      .flat(1)\n      .filter((asset) => asset.tag === 'link')\n      .map(\n        (asset) =>\n          ({\n            tag: 'link',\n            attrs: {\n              ...asset.attrs,\n              crossOrigin:\n                getAssetCrossOrigin(assetCrossOrigin, 'stylesheet') ??\n                asset.attrs?.crossOrigin,\n              nonce,\n            },\n          }) satisfies RouterManagedTag,\n      )\n\n    return [...constructed, ...assets]\n  })\n\n  const preloadLinks = Solid.createMemo(() => {\n    const matches = activeMatches()\n    const preloadLinks: Array<RouterManagedTag> = []\n\n    matches\n      .map((match) => router.looseRoutesById[match.routeId]!)\n      .forEach((route) =>\n        router.ssr?.manifest?.routes[route.id]?.preloads\n          ?.filter(Boolean)\n          .forEach((preload) => {\n            const preloadLink = resolveManifestAssetLink(preload)\n            preloadLinks.push({\n              tag: 'link',\n              attrs: {\n                rel: 'modulepreload',\n                href: preloadLink.href,\n                crossOrigin:\n                  getAssetCrossOrigin(assetCrossOrigin, 'modulepreload') ??\n                  preloadLink.crossOrigin,\n                nonce,\n              },\n            })\n          }),\n      )\n\n    return preloadLinks\n  })\n\n  const styles = Solid.createMemo(() =>\n    (\n      activeMatches()\n        .map((match) => match.styles!)\n        .flat(1)\n        .filter(Boolean) as Array<RouterManagedTag>\n    ).map(({ children, ...style }) => ({\n      tag: 'style',\n      attrs: {\n        ...style,\n        nonce,\n      },\n      children,\n    })),\n  )\n\n  const headScripts = Solid.createMemo(() =>\n    (\n      activeMatches()\n        .map((match) => match.headScripts!)\n        .flat(1)\n        .filter(Boolean) as Array<RouterManagedTag>\n    ).map(({ children, ...script }) => ({\n      tag: 'script',\n      attrs: {\n        ...script,\n        nonce,\n      },\n      children,\n    })),\n  )\n\n  return Solid.createMemo((prev: Array<RouterManagedTag> | undefined) => {\n    const next = uniqBy(\n      [\n        ...meta(),\n        ...preloadLinks(),\n        ...links(),\n        ...styles(),\n        ...headScripts(),\n      ] as Array<RouterManagedTag>,\n      (d) => {\n        return JSON.stringify(d)\n      },\n    )\n    if (prev === undefined) {\n      return next\n    }\n    return replaceEqualDeep(prev, next)\n  })\n}\n\nexport function uniqBy<T>(arr: Array<T>, fn: (item: T) => string) {\n  const seen = new Set<string>()\n  return arr.filter((item) => {\n    const key = fn(item)\n    if (seen.has(key)) {\n      return false\n    }\n    seen.add(key)\n    return true\n  })\n}\n"],"mappings":"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"}
+{"version":3,"file":"headContentUtils.cjs","names":["Solid","escapeHtml","getAssetCrossOrigin","replaceEqualDeep","resolveManifestAssetLink","useRouter","AssetCrossOriginConfig","RouterManagedTag","useTags","assetCrossOrigin","router","nonce","options","ssr","activeMatches","createMemo","stores","activeMatchesSnapshot","get","routeMeta","map","match","meta","filter","Boolean","Accessor","Array","resultMeta","metaByAttribute","Record","title","routeMetasArray","i","length","metas","j","m","tag","children","json","JSON","stringify","push","attrs","type","attribute","name","property","content","reverse","links","matches","constructed","flat","link","manifest","assets","routes","routeId","asset","crossOrigin","preloadLinks","looseRoutesById","forEach","route","id","preloads","preload","preloadLink","rel","href","styles","style","headScripts","script","prev","next","uniqBy","d","undefined","arr","T","fn","item","seen","Set","key","has","add"],"sources":["../../src/headContentUtils.tsx"],"sourcesContent":["import * as Solid from 'solid-js'\nimport {\n  escapeHtml,\n  getAssetCrossOrigin,\n  replaceEqualDeep,\n  resolveManifestAssetLink,\n} from '@tanstack/router-core'\nimport { useRouter } from './useRouter'\nimport type {\n  AssetCrossOriginConfig,\n  RouterManagedTag,\n} from '@tanstack/router-core'\n\n/**\n * Build the list of head/link/meta/script tags to render for active matches.\n * Used internally by `HeadContent`.\n */\nexport const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {\n  const router = useRouter()\n  const nonce = router.options.ssr?.nonce\n  const activeMatches = Solid.createMemo(() =>\n    router.stores.activeMatchesSnapshot.get(),\n  )\n  const routeMeta = Solid.createMemo(() =>\n    activeMatches()\n      .map((match) => match.meta!)\n      .filter(Boolean),\n  )\n\n  const meta: Solid.Accessor<Array<RouterManagedTag>> = Solid.createMemo(() => {\n    const resultMeta: Array<RouterManagedTag> = []\n    const metaByAttribute: Record<string, true> = {}\n    let title: RouterManagedTag | undefined\n    const routeMetasArray = routeMeta()\n    for (let i = routeMetasArray.length - 1; i >= 0; i--) {\n      const metas = routeMetasArray[i]!\n      for (let j = metas.length - 1; j >= 0; j--) {\n        const m = metas[j]\n        if (!m) continue\n\n        if (m.title) {\n          if (!title) {\n            title = {\n              tag: 'title',\n              children: m.title,\n            }\n          }\n        } else if ('script:ld+json' in m) {\n          // Handle JSON-LD structured data\n          // Content is HTML-escaped to prevent XSS when injected via innerHTML\n          try {\n            const json = JSON.stringify(m['script:ld+json'])\n            resultMeta.push({\n              tag: 'script',\n              attrs: {\n                type: 'application/ld+json',\n              },\n              children: escapeHtml(json),\n            })\n          } catch {\n            // Skip invalid JSON-LD objects\n          }\n        } else {\n          const attribute = m.name ?? m.property\n          if (attribute) {\n            if (metaByAttribute[attribute]) {\n              continue\n            } else {\n              metaByAttribute[attribute] = true\n            }\n          }\n\n          resultMeta.push({\n            tag: 'meta',\n            attrs: {\n              ...m,\n              nonce,\n            },\n          })\n        }\n      }\n    }\n\n    if (title) {\n      resultMeta.push(title)\n    }\n\n    if (router.options.ssr?.nonce) {\n      resultMeta.push({\n        tag: 'meta',\n        attrs: {\n          property: 'csp-nonce',\n          content: router.options.ssr.nonce,\n        },\n      })\n    }\n    resultMeta.reverse()\n\n    return resultMeta\n  })\n\n  const links = Solid.createMemo(() => {\n    const matches = activeMatches()\n    const constructed = matches\n      .map((match) => match.links!)\n      .filter(Boolean)\n      .flat(1)\n      .map((link) => ({\n        tag: 'link',\n        attrs: {\n          ...link,\n          nonce,\n        },\n      })) satisfies Array<RouterManagedTag>\n\n    const manifest = router.ssr?.manifest\n\n    const assets = matches\n      .map((match) => manifest?.routes[match.routeId]?.assets ?? [])\n      .filter(Boolean)\n      .flat(1)\n      .filter((asset) => asset.tag === 'link')\n      .map(\n        (asset) =>\n          ({\n            tag: 'link',\n            attrs: {\n              ...asset.attrs,\n              crossOrigin:\n                getAssetCrossOrigin(assetCrossOrigin, 'stylesheet') ??\n                asset.attrs?.crossOrigin,\n              nonce,\n            },\n          }) satisfies RouterManagedTag,\n      )\n\n    return [...constructed, ...assets]\n  })\n\n  const preloadLinks = Solid.createMemo(() => {\n    const matches = activeMatches()\n    const preloadLinks: Array<RouterManagedTag> = []\n\n    matches\n      .map((match) => router.looseRoutesById[match.routeId]!)\n      .forEach((route) =>\n        router.ssr?.manifest?.routes[route.id]?.preloads\n          ?.filter(Boolean)\n          .forEach((preload) => {\n            const preloadLink = resolveManifestAssetLink(preload)\n            preloadLinks.push({\n              tag: 'link',\n              attrs: {\n                rel: 'modulepreload',\n                href: preloadLink.href,\n                crossOrigin:\n                  getAssetCrossOrigin(assetCrossOrigin, 'modulepreload') ??\n                  preloadLink.crossOrigin,\n                nonce,\n              },\n            })\n          }),\n      )\n\n    return preloadLinks\n  })\n\n  const styles = Solid.createMemo(() =>\n    (\n      activeMatches()\n        .map((match) => match.styles!)\n        .flat(1)\n        .filter(Boolean) as Array<RouterManagedTag>\n    ).map(({ children, ...style }) => ({\n      tag: 'style',\n      attrs: {\n        ...style,\n        nonce,\n      },\n      children,\n    })),\n  )\n\n  const headScripts = Solid.createMemo(() =>\n    (\n      activeMatches()\n        .map((match) => match.headScripts!)\n        .flat(1)\n        .filter(Boolean) as Array<RouterManagedTag>\n    ).map(({ children, ...script }) => ({\n      tag: 'script',\n      attrs: {\n        ...script,\n        nonce,\n      },\n      children,\n    })),\n  )\n\n  return Solid.createMemo((prev: Array<RouterManagedTag> | undefined) => {\n    const next = uniqBy(\n      [\n        ...meta(),\n        ...preloadLinks(),\n        ...links(),\n        ...styles(),\n        ...headScripts(),\n      ] as Array<RouterManagedTag>,\n      (d) => {\n        return JSON.stringify(d)\n      },\n    )\n    if (prev === undefined) {\n      return next\n    }\n    return replaceEqualDeep(prev, next)\n  })\n}\n\nexport function uniqBy<T>(arr: Array<T>, fn: (item: T) => string) {\n  const seen = new Set<string>()\n  return arr.filter((item) => {\n    const key = fn(item)\n    if (seen.has(key)) {\n      return false\n    }\n    seen.add(key)\n    return true\n  })\n}\n"],"mappings":"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"}

package/dist/cjs/link.cjs

@@ -57,7 +57,7 @@ function useLinkProps(options) {
 		"unsafeRelative",
 		"from"
 	]);
-	const currentLocation = solid_js.createMemo(() => router.stores.location.state, void 0, { equals: (prev, next) => prev.href === next.href });
+	const currentLocation = solid_js.createMemo(() => router.stores.location.get(), void 0, { equals: (prev, next) => prev.href === next.href });
 	const _options = () => options;
 	const next = solid_js.createMemo(() => {
 		const options = {