@tanstack/vue-router 1.168.10 → 1.168.11

package/dist/esm/Match.js

@@ -143,7 +143,8 @@ var MatchInner = Vue.defineComponent({
 					error: match.error,
 					ssr: match.ssr,
 					_forcePending: match._forcePending,
-					_displayPending: match._displayPending
+					_displayPending: match._displayPending,
+					_nonReactive: match._nonReactive
 				},
 				remountKey
 			};
@@ -154,6 +155,9 @@ var MatchInner = Vue.defineComponent({
 		});
 		const match = Vue.computed(() => combinedState.value?.match);
 		const remountKey = Vue.computed(() => combinedState.value?.remountKey);
+		const getMatchPromise = (match, key) => {
+			return router.getMatch(match.id)?._nonReactive[key] ?? match._nonReactive[key];
+		};
 		return () => {
 			if (!combinedState.value || !match.value || !route.value) return null;
 			if (match.value._displayPending) {
@@ -176,7 +180,7 @@ var MatchInner = Vue.defineComponent({
 					if (process.env.NODE_ENV !== "production") throw new Error("Invariant failed: Expected a redirect error");
 					invariant();
 				}
-				throw router.getMatch(match.value.id)?._nonReactive.loadPromise;
+				throw getMatchPromise(match.value, "loadPromise");
 			}
 			if (match.value.status === "error") {
 				const RouteErrorComponent = route.value.options.errorComponent ?? router.options.defaultErrorComponent;

package/dist/esm/Match.js.map

@@ -1 +1 @@
-{"version":3,"file":"Match.js","names":["Vue","createControlledPromise","getLocationChangeInfo","invariant","isNotFound","isRedirect","rootRouteId","isServer","useStore","CatchBoundary","ErrorComponent","ClientOnly","useRouter","CatchNotFound","matchContext","pendingMatchContext","routeIdContext","renderRouteNotFound","ScrollRestoration","Match","defineComponent","name","props","matchId","type","String","required","setup","router","routeId","stores","activeMatchStoresById","get","process","env","NODE_ENV","Error","isChildOfRoot","routesById","parentRoute","id","activeMatch","getMatchStoreByRouteId","value","isPendingMatchRef","pendingRouteIds","Boolean","equal","Object","is","loadedAt","matchData","computed","match","ssr","_displayPending","route","PendingComponent","options","pendingComponent","defaultPendingComponent","pendingElement","h","undefined","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","hasShellComponent","shellComponent","ShellComponent","provide","matchIdRef","actualMatchId","resolvedNoSsr","shouldClientOnly","renderMatchContent","matchInner","MatchInner","content","fallback","default","error","children","getResetKey","console","warn","withScrollRestoration","Fragment","OnRendered","scrollRestoration","filter","length","location","resolvedLocation","state","__TSR_key","prevHref","watch","currentHref","latestLocation","href","emit","immediate","inject","combinedState","matchRouteId","remountFn","remountDeps","defaultRemountDeps","remountKey","loaderDeps","params","_strictParams","search","_strictSearch","JSON","stringify","status","_forcePending","getMatch","_nonReactive","loadPromise","RouteErrorComponent","reset","invalidate","info","componentStack","pendingMinMs","defaultPendingMinMs","routerMatch","minPendingPromise","setTimeout","resolve","Comp","defaultComponent","key","Outlet","parentRouteId","parentMatch","v","parentGlobalNotFound","globalNotFound","childMatchIdMap","childMatchIdByRouteId","childMatchData","childId","child","paramsKey","nextMatch"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Vue from 'vue'\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 { useStore } from '@tanstack/vue-store'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { ClientOnly } from './ClientOnly'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound } from './not-found'\nimport {\n  matchContext,\n  pendingMatchContext,\n  routeIdContext,\n} from './matchContext'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport type { VNode } from 'vue'\nimport type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'\n\nexport const Match = Vue.defineComponent({\n  name: 'Match',\n  props: {\n    matchId: {\n      type: String,\n      required: true,\n    },\n  },\n  setup(props) {\n    const router = useRouter()\n\n    // Derive routeId from initial props.matchId — stable for this component's\n    // lifetime. The routeId never changes for a given route position in the\n    // tree, even when matchId changes (loaderDepsHash, etc).\n    const routeId = router.stores.activeMatchStoresById.get(\n      props.matchId,\n    )?.routeId\n\n    if (!routeId) {\n      if (process.env.NODE_ENV !== 'production') {\n        throw new Error(\n          `Invariant failed: Could not find routeId for matchId \"${props.matchId}\". Please file an issue!`,\n        )\n      }\n\n      invariant()\n    }\n\n    // Static route-tree check: is this route a direct child of the root?\n    // parentRoute is set at build time, so no reactive tracking needed.\n    const isChildOfRoot =\n      (router.routesById[routeId] as AnyRoute)?.parentRoute?.id === rootRouteId\n\n    // Single stable store subscription — getMatchStoreByRouteId returns a\n    // cached computed store that resolves routeId → current match state\n    // through the signal graph. No bridge needed.\n    const activeMatch = useStore(\n      router.stores.getMatchStoreByRouteId(routeId),\n      (value) => value,\n    )\n    const isPendingMatchRef = useStore(\n      router.stores.pendingRouteIds,\n      (pendingRouteIds) => Boolean(pendingRouteIds[routeId]),\n      { equal: Object.is },\n    )\n    const loadedAt = useStore(router.stores.loadedAt, (value) => value)\n\n    const matchData = Vue.computed(() => {\n      const match = activeMatch.value\n      if (!match) {\n        return null\n      }\n\n      return {\n        matchId: match.id,\n        routeId,\n        loadedAt: loadedAt.value,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    })\n\n    const route = Vue.computed(() =>\n      matchData.value ? router.routesById[matchData.value.routeId] : null,\n    )\n\n    const PendingComponent = Vue.computed(\n      () =>\n        route.value?.options?.pendingComponent ??\n        router?.options?.defaultPendingComponent,\n    )\n\n    const pendingElement = Vue.computed(() =>\n      PendingComponent.value ? Vue.h(PendingComponent.value) : undefined,\n    )\n\n    const routeErrorComponent = Vue.computed(\n      () =>\n        route.value?.options?.errorComponent ??\n        router?.options?.defaultErrorComponent,\n    )\n\n    const routeOnCatch = Vue.computed(\n      () => route.value?.options?.onCatch ?? router?.options?.defaultOnCatch,\n    )\n\n    const routeNotFoundComponent = Vue.computed(() =>\n      route.value?.isRoot\n        ? // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component\n          (route.value?.options?.notFoundComponent ??\n          router?.options?.notFoundRoute?.options?.component)\n        : route.value?.options?.notFoundComponent,\n    )\n\n    const hasShellComponent = Vue.computed(() => {\n      if (!route.value?.isRoot) return false\n      return !!(route.value.options as RootRouteOptions).shellComponent\n    })\n\n    const ShellComponent = Vue.computed(() =>\n      hasShellComponent.value\n        ? ((route.value!.options as RootRouteOptions).shellComponent as any)\n        : null,\n    )\n\n    // Provide routeId context (stable string) for children.\n    // MatchInner, Outlet, and useMatch all consume this.\n    Vue.provide(routeIdContext, routeId)\n\n    // Provide reactive nearest-match context for hooks that slice the active\n    // matches array relative to the current match.\n    const matchIdRef = Vue.computed(\n      () => activeMatch.value?.id ?? props.matchId,\n    )\n    Vue.provide(matchContext, matchIdRef)\n\n    Vue.provide(pendingMatchContext, isPendingMatchRef)\n\n    return (): VNode => {\n      const actualMatchId = matchData.value?.matchId ?? props.matchId\n\n      const resolvedNoSsr =\n        matchData.value?.ssr === false || matchData.value?.ssr === 'data-only'\n      const shouldClientOnly =\n        resolvedNoSsr || !!matchData.value?._displayPending\n\n      const renderMatchContent = (): VNode => {\n        const matchInner = Vue.h(MatchInner, { matchId: actualMatchId })\n\n        let content: VNode = shouldClientOnly\n          ? Vue.h(\n              ClientOnly,\n              {\n                fallback: pendingElement.value,\n              },\n              {\n                default: () => matchInner,\n              },\n            )\n          : matchInner\n\n        // Wrap in NotFound boundary if needed\n        if (routeNotFoundComponent.value) {\n          content = Vue.h(CatchNotFound, {\n            fallback: (error: any) => {\n              error.routeId ??= matchData.value?.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.value ||\n                (error.routeId && error.routeId !== matchData.value?.routeId) ||\n                (!error.routeId && route.value && !route.value.isRoot)\n              )\n                throw error\n\n              return Vue.h(routeNotFoundComponent.value, error)\n            },\n            children: content,\n          })\n        }\n\n        // Wrap in error boundary if needed\n        if (routeErrorComponent.value) {\n          content = CatchBoundary({\n            getResetKey: () => matchData.value?.loadedAt ?? 0,\n            errorComponent: routeErrorComponent.value || ErrorComponent,\n            onCatch: (error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              if (isNotFound(error)) {\n                error.routeId ??= matchData.value?.routeId as any\n                throw error\n              }\n              if (process.env.NODE_ENV !== 'production') {\n                console.warn(`Warning: Error in route match: ${actualMatchId}`)\n              }\n              routeOnCatch.value?.(error)\n            },\n            children: content,\n          })\n        }\n\n        // Add scroll restoration if needed\n        const withScrollRestoration: Array<VNode> = [\n          content,\n          isChildOfRoot\n            ? Vue.h(Vue.Fragment, null, [\n                Vue.h(OnRendered),\n                router.options.scrollRestoration &&\n                (isServer ?? router.isServer)\n                  ? Vue.h(ScrollRestoration)\n                  : null,\n              ])\n            : null,\n        ].filter(Boolean) as Array<VNode>\n\n        // Return single child directly to avoid Fragment wrapper that causes hydration mismatch\n        if (withScrollRestoration.length === 1) {\n          return withScrollRestoration[0]!\n        }\n\n        return Vue.h(Vue.Fragment, null, withScrollRestoration)\n      }\n\n      if (!hasShellComponent.value) {\n        return renderMatchContent()\n      }\n\n      return Vue.h(ShellComponent.value, null, {\n        // Important: return a fresh VNode on each slot invocation so that shell\n        // components can re-render without reusing a cached VNode instance.\n        default: () => renderMatchContent(),\n      })\n    }\n  },\n})\n\n// On Rendered can't happen above the root layout because it actually\n// renders a dummy dom element to track the rendered state of the app.\n// We render a script tag with a key that changes based on the current\n// location state.__TSR_key. Also, because it's below the root layout, it\n// allows us to fire onRendered events even after a hydration mismatch\n// error that occurred above the root layout (like bad head/link tags,\n// which is common).\nconst OnRendered = Vue.defineComponent({\n  name: 'OnRendered',\n  setup() {\n    const router = useRouter()\n\n    const location = useStore(\n      router.stores.resolvedLocation,\n      (resolvedLocation) => resolvedLocation?.state.__TSR_key,\n    )\n\n    let prevHref: string | undefined\n\n    Vue.watch(\n      location,\n      () => {\n        if (location.value) {\n          const currentHref = router.latestLocation.href\n          if (prevHref === undefined || prevHref !== currentHref) {\n            router.emit({\n              type: 'onRendered',\n              ...getLocationChangeInfo(\n                router.stores.location.state,\n                router.stores.resolvedLocation.state,\n              ),\n            })\n            prevHref = currentHref\n          }\n        }\n      },\n      { immediate: true },\n    )\n\n    return () => null\n  },\n})\n\nexport const MatchInner = Vue.defineComponent({\n  name: 'MatchInner',\n  props: {\n    matchId: {\n      type: String,\n      required: true,\n    },\n  },\n  setup(props) {\n    const router = useRouter()\n\n    // Use routeId from context (provided by parent Match) — stable string.\n    const routeId = Vue.inject(routeIdContext)!\n    const activeMatch = useStore(\n      router.stores.getMatchStoreByRouteId(routeId),\n      (value) => value,\n    )\n\n    // Combined selector for match state AND remount key\n    // This ensures both are computed in the same selector call with consistent data\n    const combinedState = Vue.computed(() => {\n      const match = activeMatch.value\n      if (!match) {\n        // Route no longer exists - truly navigating away\n        return null\n      }\n\n      const matchRouteId = match.routeId as string\n\n      // Compute remount key\n      const remountFn =\n        (router.routesById[matchRouteId] as AnyRoute).options.remountDeps ??\n        router.options.defaultRemountDeps\n\n      let remountKey: string | undefined\n      if (remountFn) {\n        const remountDeps = remountFn({\n          routeId: matchRouteId,\n          loaderDeps: match.loaderDeps,\n          params: match._strictParams,\n          search: match._strictSearch,\n        })\n        remountKey = remountDeps ? JSON.stringify(remountDeps) : undefined\n      }\n\n      return {\n        routeId: matchRouteId,\n        match: {\n          id: match.id,\n          status: match.status,\n          error: match.error,\n          ssr: match.ssr,\n          _forcePending: match._forcePending,\n          _displayPending: match._displayPending,\n        },\n        remountKey,\n      }\n    })\n\n    const route = Vue.computed(() => {\n      if (!combinedState.value) return null\n      return router.routesById[combinedState.value.routeId]!\n    })\n\n    const match = Vue.computed(() => combinedState.value?.match)\n    const remountKey = Vue.computed(() => combinedState.value?.remountKey)\n\n    return (): VNode | null => {\n      // If match doesn't exist, return null (component is being unmounted or not ready)\n      if (!combinedState.value || !match.value || !route.value) return null\n\n      // Handle different match statuses\n      if (match.value._displayPending) {\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        return PendingComponent ? Vue.h(PendingComponent) : null\n      }\n\n      if (match.value._forcePending) {\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        return PendingComponent ? Vue.h(PendingComponent) : null\n      }\n\n      if (match.value.status === 'notFound') {\n        if (!isNotFound(match.value.error)) {\n          if (process.env.NODE_ENV !== 'production') {\n            throw new Error('Invariant failed: Expected a notFound error')\n          }\n\n          invariant()\n        }\n        return renderRouteNotFound(router, route.value, match.value.error)\n      }\n\n      if (match.value.status === 'redirected') {\n        if (!isRedirect(match.value.error)) {\n          if (process.env.NODE_ENV !== 'production') {\n            throw new Error('Invariant failed: Expected a redirect error')\n          }\n\n          invariant()\n        }\n        throw router.getMatch(match.value.id)?._nonReactive.loadPromise\n      }\n\n      if (match.value.status === 'error') {\n        // Check if this route or any parent has an error component\n        const RouteErrorComponent =\n          route.value.options.errorComponent ??\n          router.options.defaultErrorComponent\n\n        // If this route has an error component, render it directly\n        // This is more reliable than relying on Vue's error boundary\n        if (RouteErrorComponent) {\n          return Vue.h(RouteErrorComponent, {\n            error: match.value.error,\n            reset: () => {\n              router.invalidate()\n            },\n            info: {\n              componentStack: '',\n            },\n          })\n        }\n\n        // If there's no error component for this route, throw the error\n        // so it can bubble up to the nearest parent with an error component\n        throw match.value.error\n      }\n\n      if (match.value.status === 'pending') {\n        const pendingMinMs =\n          route.value.options.pendingMinMs ?? router.options.defaultPendingMinMs\n\n        const routerMatch = router.getMatch(match.value.id)\n        if (\n          pendingMinMs &&\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 = 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        // In Vue, we render the pending component directly instead of throwing a promise\n        // because Vue's Suspense doesn't catch thrown promises like React does\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        if (PendingComponent) {\n          return Vue.h(PendingComponent)\n        }\n\n        // If no pending component, return null while loading\n        return null\n      }\n\n      // Success status - render the component with remount key\n      const Comp =\n        route.value.options.component ?? router.options.defaultComponent\n      const key = remountKey.value\n\n      if (Comp) {\n        // Pass key as a prop - Vue.h properly handles 'key' as a special prop\n        return Vue.h(Comp, key !== undefined ? { key } : undefined)\n      }\n\n      return Vue.h(Outlet, key !== undefined ? { key } : undefined)\n    }\n  },\n})\n\nexport const Outlet = Vue.defineComponent({\n  name: 'Outlet',\n  setup() {\n    const router = useRouter()\n    const parentRouteId = Vue.inject(routeIdContext)\n\n    if (!parentRouteId) {\n      return (): VNode | null => null\n    }\n\n    // Parent state via stable routeId store — single subscription\n    const parentMatch = useStore(\n      router.stores.getMatchStoreByRouteId(parentRouteId),\n      (v) => v,\n    )\n\n    const route = Vue.computed(() =>\n      parentMatch.value\n        ? router.routesById[parentMatch.value.routeId as string]!\n        : undefined,\n    )\n\n    const parentGlobalNotFound = Vue.computed(\n      () => parentMatch.value?.globalNotFound ?? false,\n    )\n\n    // Child match lookup: read the child matchId from the shared derived\n    // map (one reactive node for the whole tree), then grab match state\n    // directly from the pool.\n    const childMatchIdMap = useStore(\n      router.stores.childMatchIdByRouteId,\n      (v) => v,\n    )\n\n    const childMatchData = Vue.computed(() => {\n      const childId = childMatchIdMap.value[parentRouteId]\n      if (!childId) return null\n      const child = router.stores.activeMatchStoresById.get(childId)?.state\n      if (!child) return null\n\n      return {\n        id: child.id,\n        // Key based on routeId + params only (not loaderDeps)\n        // This ensures component recreates when params change,\n        // but NOT when only loaderDeps change\n        paramsKey: child.routeId + JSON.stringify(child._strictParams),\n      }\n    })\n\n    return (): VNode | null => {\n      if (parentGlobalNotFound.value) {\n        if (!route.value) {\n          return null\n        }\n        return renderRouteNotFound(router, route.value, undefined)\n      }\n\n      if (!childMatchData.value) {\n        return null\n      }\n\n      const nextMatch = Vue.h(Match, {\n        matchId: childMatchData.value.id,\n        key: childMatchData.value.paramsKey,\n      })\n\n      // Note: We intentionally do NOT wrap in Suspense here.\n      // The top-level Suspense in Matches already covers the root.\n      // The old code compared matchId (e.g. \"__root__/\") with rootRouteId (\"__root__\")\n      // which never matched, so this Suspense was effectively dead code.\n      // With routeId-based lookup, parentRouteId === rootRouteId would match,\n      // causing a double-Suspense that corrupts Vue's DOM during updates.\n      return nextMatch\n    }\n  },\n})\n"],"mappings":"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"}
+{"version":3,"file":"Match.js","names":["Vue","createControlledPromise","getLocationChangeInfo","invariant","isNotFound","isRedirect","rootRouteId","isServer","useStore","CatchBoundary","ErrorComponent","ClientOnly","useRouter","CatchNotFound","matchContext","pendingMatchContext","routeIdContext","renderRouteNotFound","ScrollRestoration","Match","defineComponent","name","props","matchId","type","String","required","setup","router","routeId","stores","activeMatchStoresById","get","process","env","NODE_ENV","Error","isChildOfRoot","routesById","parentRoute","id","activeMatch","getMatchStoreByRouteId","value","isPendingMatchRef","pendingRouteIds","Boolean","equal","Object","is","loadedAt","matchData","computed","match","ssr","_displayPending","route","PendingComponent","options","pendingComponent","defaultPendingComponent","pendingElement","h","undefined","routeErrorComponent","errorComponent","defaultErrorComponent","routeOnCatch","onCatch","defaultOnCatch","routeNotFoundComponent","isRoot","notFoundComponent","notFoundRoute","component","hasShellComponent","shellComponent","ShellComponent","provide","matchIdRef","actualMatchId","resolvedNoSsr","shouldClientOnly","renderMatchContent","matchInner","MatchInner","content","fallback","default","error","children","getResetKey","console","warn","withScrollRestoration","Fragment","OnRendered","scrollRestoration","filter","length","location","resolvedLocation","state","__TSR_key","prevHref","watch","currentHref","latestLocation","href","emit","immediate","inject","combinedState","matchRouteId","remountFn","remountDeps","defaultRemountDeps","remountKey","loaderDeps","params","_strictParams","search","_strictSearch","JSON","stringify","status","_forcePending","_nonReactive","getMatchPromise","key","getMatch","RouteErrorComponent","reset","invalidate","info","componentStack","pendingMinMs","defaultPendingMinMs","routerMatch","minPendingPromise","setTimeout","resolve","Comp","defaultComponent","Outlet","parentRouteId","parentMatch","v","parentGlobalNotFound","globalNotFound","childMatchIdMap","childMatchIdByRouteId","childMatchData","childId","child","paramsKey","nextMatch"],"sources":["../../src/Match.tsx"],"sourcesContent":["import * as Vue from 'vue'\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 { useStore } from '@tanstack/vue-store'\nimport { CatchBoundary, ErrorComponent } from './CatchBoundary'\nimport { ClientOnly } from './ClientOnly'\nimport { useRouter } from './useRouter'\nimport { CatchNotFound } from './not-found'\nimport {\n  matchContext,\n  pendingMatchContext,\n  routeIdContext,\n} from './matchContext'\nimport { renderRouteNotFound } from './renderRouteNotFound'\nimport { ScrollRestoration } from './scroll-restoration'\nimport type { VNode } from 'vue'\nimport type { AnyRoute, RootRouteOptions } from '@tanstack/router-core'\n\nexport const Match = Vue.defineComponent({\n  name: 'Match',\n  props: {\n    matchId: {\n      type: String,\n      required: true,\n    },\n  },\n  setup(props) {\n    const router = useRouter()\n\n    // Derive routeId from initial props.matchId — stable for this component's\n    // lifetime. The routeId never changes for a given route position in the\n    // tree, even when matchId changes (loaderDepsHash, etc).\n    const routeId = router.stores.activeMatchStoresById.get(\n      props.matchId,\n    )?.routeId\n\n    if (!routeId) {\n      if (process.env.NODE_ENV !== 'production') {\n        throw new Error(\n          `Invariant failed: Could not find routeId for matchId \"${props.matchId}\". Please file an issue!`,\n        )\n      }\n\n      invariant()\n    }\n\n    // Static route-tree check: is this route a direct child of the root?\n    // parentRoute is set at build time, so no reactive tracking needed.\n    const isChildOfRoot =\n      (router.routesById[routeId] as AnyRoute)?.parentRoute?.id === rootRouteId\n\n    // Single stable store subscription — getMatchStoreByRouteId returns a\n    // cached computed store that resolves routeId → current match state\n    // through the signal graph. No bridge needed.\n    const activeMatch = useStore(\n      router.stores.getMatchStoreByRouteId(routeId),\n      (value) => value,\n    )\n    const isPendingMatchRef = useStore(\n      router.stores.pendingRouteIds,\n      (pendingRouteIds) => Boolean(pendingRouteIds[routeId]),\n      { equal: Object.is },\n    )\n    const loadedAt = useStore(router.stores.loadedAt, (value) => value)\n\n    const matchData = Vue.computed(() => {\n      const match = activeMatch.value\n      if (!match) {\n        return null\n      }\n\n      return {\n        matchId: match.id,\n        routeId,\n        loadedAt: loadedAt.value,\n        ssr: match.ssr,\n        _displayPending: match._displayPending,\n      }\n    })\n\n    const route = Vue.computed(() =>\n      matchData.value ? router.routesById[matchData.value.routeId] : null,\n    )\n\n    const PendingComponent = Vue.computed(\n      () =>\n        route.value?.options?.pendingComponent ??\n        router?.options?.defaultPendingComponent,\n    )\n\n    const pendingElement = Vue.computed(() =>\n      PendingComponent.value ? Vue.h(PendingComponent.value) : undefined,\n    )\n\n    const routeErrorComponent = Vue.computed(\n      () =>\n        route.value?.options?.errorComponent ??\n        router?.options?.defaultErrorComponent,\n    )\n\n    const routeOnCatch = Vue.computed(\n      () => route.value?.options?.onCatch ?? router?.options?.defaultOnCatch,\n    )\n\n    const routeNotFoundComponent = Vue.computed(() =>\n      route.value?.isRoot\n        ? // If it's the root route, use the globalNotFound option, with fallback to the notFoundRoute's component\n          (route.value?.options?.notFoundComponent ??\n          router?.options?.notFoundRoute?.options?.component)\n        : route.value?.options?.notFoundComponent,\n    )\n\n    const hasShellComponent = Vue.computed(() => {\n      if (!route.value?.isRoot) return false\n      return !!(route.value.options as RootRouteOptions).shellComponent\n    })\n\n    const ShellComponent = Vue.computed(() =>\n      hasShellComponent.value\n        ? ((route.value!.options as RootRouteOptions).shellComponent as any)\n        : null,\n    )\n\n    // Provide routeId context (stable string) for children.\n    // MatchInner, Outlet, and useMatch all consume this.\n    Vue.provide(routeIdContext, routeId)\n\n    // Provide reactive nearest-match context for hooks that slice the active\n    // matches array relative to the current match.\n    const matchIdRef = Vue.computed(\n      () => activeMatch.value?.id ?? props.matchId,\n    )\n    Vue.provide(matchContext, matchIdRef)\n\n    Vue.provide(pendingMatchContext, isPendingMatchRef)\n\n    return (): VNode => {\n      const actualMatchId = matchData.value?.matchId ?? props.matchId\n\n      const resolvedNoSsr =\n        matchData.value?.ssr === false || matchData.value?.ssr === 'data-only'\n      const shouldClientOnly =\n        resolvedNoSsr || !!matchData.value?._displayPending\n\n      const renderMatchContent = (): VNode => {\n        const matchInner = Vue.h(MatchInner, { matchId: actualMatchId })\n\n        let content: VNode = shouldClientOnly\n          ? Vue.h(\n              ClientOnly,\n              {\n                fallback: pendingElement.value,\n              },\n              {\n                default: () => matchInner,\n              },\n            )\n          : matchInner\n\n        // Wrap in NotFound boundary if needed\n        if (routeNotFoundComponent.value) {\n          content = Vue.h(CatchNotFound, {\n            fallback: (error: any) => {\n              error.routeId ??= matchData.value?.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.value ||\n                (error.routeId && error.routeId !== matchData.value?.routeId) ||\n                (!error.routeId && route.value && !route.value.isRoot)\n              )\n                throw error\n\n              return Vue.h(routeNotFoundComponent.value, error)\n            },\n            children: content,\n          })\n        }\n\n        // Wrap in error boundary if needed\n        if (routeErrorComponent.value) {\n          content = CatchBoundary({\n            getResetKey: () => matchData.value?.loadedAt ?? 0,\n            errorComponent: routeErrorComponent.value || ErrorComponent,\n            onCatch: (error: Error) => {\n              // Forward not found errors (we don't want to show the error component for these)\n              if (isNotFound(error)) {\n                error.routeId ??= matchData.value?.routeId as any\n                throw error\n              }\n              if (process.env.NODE_ENV !== 'production') {\n                console.warn(`Warning: Error in route match: ${actualMatchId}`)\n              }\n              routeOnCatch.value?.(error)\n            },\n            children: content,\n          })\n        }\n\n        // Add scroll restoration if needed\n        const withScrollRestoration: Array<VNode> = [\n          content,\n          isChildOfRoot\n            ? Vue.h(Vue.Fragment, null, [\n                Vue.h(OnRendered),\n                router.options.scrollRestoration &&\n                (isServer ?? router.isServer)\n                  ? Vue.h(ScrollRestoration)\n                  : null,\n              ])\n            : null,\n        ].filter(Boolean) as Array<VNode>\n\n        // Return single child directly to avoid Fragment wrapper that causes hydration mismatch\n        if (withScrollRestoration.length === 1) {\n          return withScrollRestoration[0]!\n        }\n\n        return Vue.h(Vue.Fragment, null, withScrollRestoration)\n      }\n\n      if (!hasShellComponent.value) {\n        return renderMatchContent()\n      }\n\n      return Vue.h(ShellComponent.value, null, {\n        // Important: return a fresh VNode on each slot invocation so that shell\n        // components can re-render without reusing a cached VNode instance.\n        default: () => renderMatchContent(),\n      })\n    }\n  },\n})\n\n// On Rendered can't happen above the root layout because it actually\n// renders a dummy dom element to track the rendered state of the app.\n// We render a script tag with a key that changes based on the current\n// location state.__TSR_key. Also, because it's below the root layout, it\n// allows us to fire onRendered events even after a hydration mismatch\n// error that occurred above the root layout (like bad head/link tags,\n// which is common).\nconst OnRendered = Vue.defineComponent({\n  name: 'OnRendered',\n  setup() {\n    const router = useRouter()\n\n    const location = useStore(\n      router.stores.resolvedLocation,\n      (resolvedLocation) => resolvedLocation?.state.__TSR_key,\n    )\n\n    let prevHref: string | undefined\n\n    Vue.watch(\n      location,\n      () => {\n        if (location.value) {\n          const currentHref = router.latestLocation.href\n          if (prevHref === undefined || prevHref !== currentHref) {\n            router.emit({\n              type: 'onRendered',\n              ...getLocationChangeInfo(\n                router.stores.location.state,\n                router.stores.resolvedLocation.state,\n              ),\n            })\n            prevHref = currentHref\n          }\n        }\n      },\n      { immediate: true },\n    )\n\n    return () => null\n  },\n})\n\nexport const MatchInner = Vue.defineComponent({\n  name: 'MatchInner',\n  props: {\n    matchId: {\n      type: String,\n      required: true,\n    },\n  },\n  setup(props) {\n    const router = useRouter()\n\n    // Use routeId from context (provided by parent Match) — stable string.\n    const routeId = Vue.inject(routeIdContext)!\n    const activeMatch = useStore(\n      router.stores.getMatchStoreByRouteId(routeId),\n      (value) => value,\n    )\n\n    // Combined selector for match state AND remount key\n    // This ensures both are computed in the same selector call with consistent data\n    const combinedState = Vue.computed(() => {\n      const match = activeMatch.value\n      if (!match) {\n        // Route no longer exists - truly navigating away\n        return null\n      }\n\n      const matchRouteId = match.routeId as string\n\n      // Compute remount key\n      const remountFn =\n        (router.routesById[matchRouteId] as AnyRoute).options.remountDeps ??\n        router.options.defaultRemountDeps\n\n      let remountKey: string | undefined\n      if (remountFn) {\n        const remountDeps = remountFn({\n          routeId: matchRouteId,\n          loaderDeps: match.loaderDeps,\n          params: match._strictParams,\n          search: match._strictSearch,\n        })\n        remountKey = remountDeps ? JSON.stringify(remountDeps) : undefined\n      }\n\n      return {\n        routeId: matchRouteId,\n        match: {\n          id: match.id,\n          status: match.status,\n          error: match.error,\n          ssr: match.ssr,\n          _forcePending: match._forcePending,\n          _displayPending: match._displayPending,\n          _nonReactive: match._nonReactive,\n        },\n        remountKey,\n      }\n    })\n\n    const route = Vue.computed(() => {\n      if (!combinedState.value) return null\n      return router.routesById[combinedState.value.routeId]!\n    })\n\n    const match = Vue.computed(() => combinedState.value?.match)\n    const remountKey = Vue.computed(() => combinedState.value?.remountKey)\n\n    const getMatchPromise = (\n      match: {\n        id: string\n        _nonReactive: {\n          displayPendingPromise?: Promise<void>\n          minPendingPromise?: Promise<void>\n          loadPromise?: Promise<void>\n        }\n      },\n      key: 'displayPendingPromise' | 'minPendingPromise' | 'loadPromise',\n    ) => {\n      return (\n        router.getMatch(match.id)?._nonReactive[key] ?? match._nonReactive[key]\n      )\n    }\n\n    return (): VNode | null => {\n      // If match doesn't exist, return null (component is being unmounted or not ready)\n      if (!combinedState.value || !match.value || !route.value) return null\n\n      // Handle different match statuses\n      if (match.value._displayPending) {\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        return PendingComponent ? Vue.h(PendingComponent) : null\n      }\n\n      if (match.value._forcePending) {\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        return PendingComponent ? Vue.h(PendingComponent) : null\n      }\n\n      if (match.value.status === 'notFound') {\n        if (!isNotFound(match.value.error)) {\n          if (process.env.NODE_ENV !== 'production') {\n            throw new Error('Invariant failed: Expected a notFound error')\n          }\n\n          invariant()\n        }\n        return renderRouteNotFound(router, route.value, match.value.error)\n      }\n\n      if (match.value.status === 'redirected') {\n        if (!isRedirect(match.value.error)) {\n          if (process.env.NODE_ENV !== 'production') {\n            throw new Error('Invariant failed: Expected a redirect error')\n          }\n\n          invariant()\n        }\n        throw getMatchPromise(match.value, 'loadPromise')\n      }\n\n      if (match.value.status === 'error') {\n        // Check if this route or any parent has an error component\n        const RouteErrorComponent =\n          route.value.options.errorComponent ??\n          router.options.defaultErrorComponent\n\n        // If this route has an error component, render it directly\n        // This is more reliable than relying on Vue's error boundary\n        if (RouteErrorComponent) {\n          return Vue.h(RouteErrorComponent, {\n            error: match.value.error,\n            reset: () => {\n              router.invalidate()\n            },\n            info: {\n              componentStack: '',\n            },\n          })\n        }\n\n        // If there's no error component for this route, throw the error\n        // so it can bubble up to the nearest parent with an error component\n        throw match.value.error\n      }\n\n      if (match.value.status === 'pending') {\n        const pendingMinMs =\n          route.value.options.pendingMinMs ?? router.options.defaultPendingMinMs\n\n        const routerMatch = router.getMatch(match.value.id)\n        if (\n          pendingMinMs &&\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 = 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        // In Vue, we render the pending component directly instead of throwing a promise\n        // because Vue's Suspense doesn't catch thrown promises like React does\n        const PendingComponent =\n          route.value.options.pendingComponent ??\n          router.options.defaultPendingComponent\n\n        if (PendingComponent) {\n          return Vue.h(PendingComponent)\n        }\n\n        // If no pending component, return null while loading\n        return null\n      }\n\n      // Success status - render the component with remount key\n      const Comp =\n        route.value.options.component ?? router.options.defaultComponent\n      const key = remountKey.value\n\n      if (Comp) {\n        // Pass key as a prop - Vue.h properly handles 'key' as a special prop\n        return Vue.h(Comp, key !== undefined ? { key } : undefined)\n      }\n\n      return Vue.h(Outlet, key !== undefined ? { key } : undefined)\n    }\n  },\n})\n\nexport const Outlet = Vue.defineComponent({\n  name: 'Outlet',\n  setup() {\n    const router = useRouter()\n    const parentRouteId = Vue.inject(routeIdContext)\n\n    if (!parentRouteId) {\n      return (): VNode | null => null\n    }\n\n    // Parent state via stable routeId store — single subscription\n    const parentMatch = useStore(\n      router.stores.getMatchStoreByRouteId(parentRouteId),\n      (v) => v,\n    )\n\n    const route = Vue.computed(() =>\n      parentMatch.value\n        ? router.routesById[parentMatch.value.routeId as string]!\n        : undefined,\n    )\n\n    const parentGlobalNotFound = Vue.computed(\n      () => parentMatch.value?.globalNotFound ?? false,\n    )\n\n    // Child match lookup: read the child matchId from the shared derived\n    // map (one reactive node for the whole tree), then grab match state\n    // directly from the pool.\n    const childMatchIdMap = useStore(\n      router.stores.childMatchIdByRouteId,\n      (v) => v,\n    )\n\n    const childMatchData = Vue.computed(() => {\n      const childId = childMatchIdMap.value[parentRouteId]\n      if (!childId) return null\n      const child = router.stores.activeMatchStoresById.get(childId)?.state\n      if (!child) return null\n\n      return {\n        id: child.id,\n        // Key based on routeId + params only (not loaderDeps)\n        // This ensures component recreates when params change,\n        // but NOT when only loaderDeps change\n        paramsKey: child.routeId + JSON.stringify(child._strictParams),\n      }\n    })\n\n    return (): VNode | null => {\n      if (parentGlobalNotFound.value) {\n        if (!route.value) {\n          return null\n        }\n        return renderRouteNotFound(router, route.value, undefined)\n      }\n\n      if (!childMatchData.value) {\n        return null\n      }\n\n      const nextMatch = Vue.h(Match, {\n        matchId: childMatchData.value.id,\n        key: childMatchData.value.paramsKey,\n      })\n\n      // Note: We intentionally do NOT wrap in Suspense here.\n      // The top-level Suspense in Matches already covers the root.\n      // The old code compared matchId (e.g. \"__root__/\") with rootRouteId (\"__root__\")\n      // which never matched, so this Suspense was effectively dead code.\n      // With routeId-based lookup, parentRouteId === rootRouteId would match,\n      // causing a double-Suspense that corrupts Vue's DOM during updates.\n      return nextMatch\n    }\n  },\n})\n"],"mappings":"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"}

package/dist/source/Match.jsx

@@ -229,6 +229,7 @@ export const MatchInner = Vue.defineComponent({
                     ssr: match.ssr,
                     _forcePending: match._forcePending,
                     _displayPending: match._displayPending,
+                    _nonReactive: match._nonReactive,
                 },
                 remountKey,
             };
@@ -240,6 +241,9 @@ export const MatchInner = Vue.defineComponent({
         });
         const match = Vue.computed(() => combinedState.value?.match);
         const remountKey = Vue.computed(() => combinedState.value?.remountKey);
+        const getMatchPromise = (match, key) => {
+            return (router.getMatch(match.id)?._nonReactive[key] ?? match._nonReactive[key]);
+        };
         return () => {
             // If match doesn't exist, return null (component is being unmounted or not ready)
             if (!combinedState.value || !match.value || !route.value)
@@ -271,7 +275,7 @@ export const MatchInner = Vue.defineComponent({
                     }
                     invariant();
                 }
-                throw router.getMatch(match.value.id)?._nonReactive.loadPromise;
+                throw getMatchPromise(match.value, 'loadPromise');
             }
             if (match.value.status === 'error') {
                 // Check if this route or any parent has an error component

package/dist/source/Match.jsx.map

@@ -1 +1 @@
-{"version":3,"file":"Match.jsx","sourceRoot":"","sources":["../../src/Match.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Match.jsx","sourceRoot":"","sources":["../../src/Match.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/vue-router",
-  "version": "1.168.10",
+  "version": "1.168.11",
   "description": "Modern and scalable routing for Vue applications",
   "author": "Tanner Linsley",
   "license": "MIT",

package/src/Match.tsx

@@ -337,6 +337,7 @@ export const MatchInner = Vue.defineComponent({
           ssr: match.ssr,
           _forcePending: match._forcePending,
           _displayPending: match._displayPending,
+          _nonReactive: match._nonReactive,
         },
         remountKey,
       }
@@ -350,6 +351,22 @@ export const MatchInner = Vue.defineComponent({
     const match = Vue.computed(() => combinedState.value?.match)
     const remountKey = Vue.computed(() => combinedState.value?.remountKey)
 
+    const getMatchPromise = (
+      match: {
+        id: string
+        _nonReactive: {
+          displayPendingPromise?: Promise<void>
+          minPendingPromise?: Promise<void>
+          loadPromise?: Promise<void>
+        }
+      },
+      key: 'displayPendingPromise' | 'minPendingPromise' | 'loadPromise',
+    ) => {
+      return (
+        router.getMatch(match.id)?._nonReactive[key] ?? match._nonReactive[key]
+      )
+    }
+
     return (): VNode | null => {
       // If match doesn't exist, return null (component is being unmounted or not ready)
       if (!combinedState.value || !match.value || !route.value) return null
@@ -390,7 +407,7 @@ export const MatchInner = Vue.defineComponent({
 
           invariant()
         }
-        throw router.getMatch(match.value.id)?._nonReactive.loadPromise
+        throw getMatchPromise(match.value, 'loadPromise')
       }
 
       if (match.value.status === 'error') {