@tanstack/react-router 1.168.14 → 1.168.16

package/src/Match.tsx

@@ -30,7 +30,7 @@ export const Match = React.memo(function MatchImpl({
   const router = useRouter()
 
   if (isServer ?? router.isServer) {
-    const match = router.stores.activeMatchStoresById.get(matchId)?.get()
+    const match = router.stores.matchStores.get(matchId)?.get()
     if (!match) {
       if (process.env.NODE_ENV !== 'production') {
         throw new Error(
@@ -64,7 +64,7 @@ export const Match = React.memo(function MatchImpl({
   // The matchId prop is stable for this component's lifetime (set by Outlet),
   // and reconcileMatchPool reuses stores for the same matchId.
 
-  const matchStore = router.stores.activeMatchStoresById.get(matchId)
+  const matchStore = router.stores.matchStores.get(matchId)
   if (!matchStore) {
     if (process.env.NODE_ENV !== 'production') {
       throw new Error(
@@ -278,7 +278,7 @@ export const MatchInner = React.memo(function MatchInnerImpl({
   }
 
   if (isServer ?? router.isServer) {
-    const match = router.stores.activeMatchStoresById.get(matchId)?.get()
+    const match = router.stores.matchStores.get(matchId)?.get()
     if (!match) {
       if (process.env.NODE_ENV !== 'production') {
         throw new Error(
@@ -357,7 +357,7 @@ export const MatchInner = React.memo(function MatchInnerImpl({
     return out
   }
 
-  const matchStore = router.stores.activeMatchStoresById.get(matchId)
+  const matchStore = router.stores.matchStores.get(matchId)
   if (!matchStore) {
     if (process.env.NODE_ENV !== 'production') {
       throw new Error(
@@ -504,7 +504,7 @@ export const Outlet = React.memo(function OutletImpl() {
   let childMatchId: string | undefined
 
   if (isServer ?? router.isServer) {
-    const matches = router.stores.activeMatchesSnapshot.get()
+    const matches = router.stores.matches.get()
     const parentIndex = matchId
       ? matches.findIndex((match) => match.id === matchId)
       : -1
@@ -517,7 +517,7 @@ export const Outlet = React.memo(function OutletImpl() {
     // Subscribe directly to the match store from the pool instead of
     // the two-level byId → matchStore pattern.
     const parentMatchStore = matchId
-      ? router.stores.activeMatchStoresById.get(matchId)
+      ? router.stores.matchStores.get(matchId)
       : undefined
 
     // eslint-disable-next-line react-hooks/rules-of-hooks

package/src/Matches.tsx

@@ -77,9 +77,9 @@ function MatchesInner() {
   const router = useRouter()
   const _isServer = isServer ?? router.isServer
   const matchId = _isServer
-    ? router.stores.firstMatchId.get()
+    ? router.stores.firstId.get()
     : // eslint-disable-next-line react-hooks/rules-of-hooks
-      useStore(router.stores.firstMatchId, (id) => id)
+      useStore(router.stores.firstId, (id) => id)
   const resetKey = _isServer
     ? router.stores.loadedAt.get()
     : // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -142,7 +142,7 @@ export function useMatchRoute<TRouter extends AnyRouter = RegisteredRouter>() {
 
   if (!(isServer ?? router.isServer)) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-    useStore(router.stores.matchRouteReactivity, (d) => d)
+    useStore(router.stores.matchRouteDeps, (d) => d)
   }
 
   return React.useCallback(
@@ -240,7 +240,7 @@ export function useMatches<
     )
 
   if (isServer ?? router.isServer) {
-    const matches = router.stores.activeMatchesSnapshot.get() as Array<
+    const matches = router.stores.matches.get() as Array<
       MakeRouteMatchUnion<TRouter>
     >
     return (opts?.select ? opts.select(matches) : matches) as UseMatchesResult<
@@ -250,7 +250,7 @@ export function useMatches<
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  return useStore(router.stores.activeMatchesSnapshot, (matches) => {
+  return useStore(router.stores.matches, (matches) => {
     const selected = opts?.select
       ? opts.select(matches as Array<MakeRouteMatchUnion<TRouter>>)
       : (matches as any)

package/src/Scripts.tsx

@@ -58,7 +58,7 @@ export const Scripts = () => {
     )
 
   if (isServer ?? router.isServer) {
-    const activeMatches = router.stores.activeMatchesSnapshot.get()
+    const activeMatches = router.stores.matches.get()
     const assetScripts = getAssetScripts(activeMatches)
     const scripts = getScripts(activeMatches)
     return renderScripts(router, scripts, assetScripts)
@@ -66,16 +66,12 @@ export const Scripts = () => {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static
   const assetScripts = useStore(
-    router.stores.activeMatchesSnapshot,
+    router.stores.matches,
     getAssetScripts,
     deepEqual,
   )
   // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static
-  const scripts = useStore(
-    router.stores.activeMatchesSnapshot,
-    getScripts,
-    deepEqual,
-  )
+  const scripts = useStore(router.stores.matches, getScripts, deepEqual)
 
   return renderScripts(router, scripts, assetScripts)
 }

package/src/Transitioner.tsx

@@ -17,17 +17,14 @@ export function Transitioner() {
   const [isTransitioning, setIsTransitioning] = React.useState(false)
   // Track pending state changes
   const isLoading = useStore(router.stores.isLoading, (value) => value)
-  const hasPendingMatches = useStore(
-    router.stores.hasPendingMatches,
-    (value) => value,
-  )
+  const hasPending = useStore(router.stores.hasPending, (value) => value)
 
   const previousIsLoading = usePrevious(isLoading)
 
-  const isAnyPending = isLoading || isTransitioning || hasPendingMatches
+  const isAnyPending = isLoading || isTransitioning || hasPending
   const previousIsAnyPending = usePrevious(isAnyPending)
 
-  const isPagePending = isLoading || hasPendingMatches
+  const isPagePending = isLoading || hasPending
   const previousIsPagePending = usePrevious(isPagePending)
 
   router.startTransition = (fn: () => void) => {

package/src/headContentUtils.tsx

@@ -194,14 +194,14 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
     return buildTagsFromMatches(
       router,
       nonce,
-      router.stores.activeMatchesSnapshot.get(),
+      router.stores.matches.get(),
       assetCrossOrigin,
     )
   }
 
   // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static
   const routeMeta = useStore(
-    router.stores.activeMatchesSnapshot,
+    router.stores.matches,
     (matches) => {
       return matches.map((match) => match.meta!).filter(Boolean)
     },
@@ -282,7 +282,7 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static
   const links = useStore(
-    router.stores.activeMatchesSnapshot,
+    router.stores.matches,
     (matches) => {
       const constructed = matches
         .map((match) => match.links!)
@@ -327,7 +327,7 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static
   const preloadLinks = useStore(
-    router.stores.activeMatchesSnapshot,
+    router.stores.matches,
     (matches) => {
       const preloadLinks: Array<RouterManagedTag> = []
 
@@ -359,7 +359,7 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static
   const styles = useStore(
-    router.stores.activeMatchesSnapshot,
+    router.stores.matches,
     (matches) =>
       (
         matches
@@ -379,7 +379,7 @@ export const useTags = (assetCrossOrigin?: AssetCrossOriginConfig) => {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks -- condition is static
   const headScripts: Array<RouterManagedTag> = useStore(
-    router.stores.activeMatchesSnapshot,
+    router.stores.matches,
     (matches) =>
       (
         matches

package/src/index.tsx

@@ -73,6 +73,7 @@ export type {
   ResolveRouteContext,
   SearchSerializer,
   SearchParser,
+  SearchMiddleware,
   TrailingSlashOption,
   Manifest,
   RouterManagedTag,

package/src/useMatch.tsx

@@ -113,8 +113,8 @@ export function useMatch<
   const key = opts.from ?? nearestMatchId
   const matchStore = key
     ? opts.from
-      ? router.stores.getMatchStoreByRouteId(key)
-      : router.stores.activeMatchStoresById.get(key)
+      ? router.stores.getRouteMatchStore(key)
+      : router.stores.matchStores.get(key)
     : undefined
 
   if (isServer ?? router.isServer) {