@tanstack/router-plugin 1.168.16 → 1.168.17

package/dist/cjs/core/hmr/handle-route-update.cjs

@@ -33,6 +33,7 @@ function handleRouteUpdate(routeId, newRoute) {
 	oldRoute._componentsPromise = void 0;
 	oldRoute._lazyPromise = void 0;
 	router.setRoutes(router.buildRouteTree());
+	syncHotRouteExport(oldRoute);
 	router.resolvePathCache.clear();
 	const filter = (m) => m.routeId === oldRoute.id;
 	const activeMatch = router.stores.matches.get().find(filter);
@@ -65,6 +66,14 @@ function handleRouteUpdate(routeId, newRoute) {
 			sync: true
 		});
 	}
+	function syncHotRouteExport(liveRoute) {
+		newRoute.options = liveRoute.options;
+		newRoute.parentRoute = liveRoute.parentRoute;
+		newRoute._path = liveRoute._path;
+		newRoute._id = liveRoute._id;
+		newRoute._fullPath = liveRoute._fullPath;
+		newRoute._to = liveRoute._to;
+	}
 	function getStoreMatch(matchId) {
 		return router.stores.pendingMatchStores.get(matchId)?.get() || router.stores.matchStores.get(matchId)?.get() || router.stores.cachedMatchStores.get(matchId)?.get();
 	}

package/dist/cjs/core/hmr/handle-route-update.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"handle-route-update.cjs","names":[],"sources":["../../../../src/core/hmr/handle-route-update.ts"],"sourcesContent":["import type {\n  AnyRoute,\n  AnyRouteMatch,\n  AnyRouter,\n  RouterWritableStore,\n} from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  options: Record<string, unknown>\n  _componentsPromise?: Promise<void>\n  _lazyPromise?: Promise<void>\n  update: (options: Record<string, unknown>) => unknown\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\ntype AnyRouterWithPrivateMaps = AnyRouter & {\n  routesById: Record<string, AnyRoute>\n  buildRouteTree: () => Parameters<AnyRouter['setRoutes']>[0]\n  setRoutes: AnyRouter['setRoutes']\n  stores: AnyRouter['stores'] & {\n    cachedMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n    pendingMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n    matchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n  }\n}\n\ntype AnyRouteMatchWithPrivateProps = AnyRouteMatch & {\n  __beforeLoadContext?: unknown\n  __routeContext?: Record<string, unknown>\n  context?: Record<string, unknown>\n}\n\nfunction handleRouteUpdate(\n  routeId: string,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  const router = window.__TSR_ROUTER__ as AnyRouterWithPrivateMaps\n  const oldRoute = router.routesById[routeId] as\n    | AnyRouteWithPrivateProps\n    | undefined\n\n  if (!oldRoute) {\n    return\n  }\n\n  // Generated route-tree options are not present on the freshly imported route\n  // module, but they must stay on the live route before rebuilding indexes.\n  const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute'])\n  const generatedRouteOptions: Record<string, unknown> = {}\n  generatedRouteOptionKeys.forEach((key) => {\n    if (key in oldRoute.options) {\n      generatedRouteOptions[key] = oldRoute.options[key]\n    }\n  })\n\n  const removedKeys = new Set<string>()\n  Object.keys(oldRoute.options).forEach((key) => {\n    if (!generatedRouteOptionKeys.has(key) && !(key in newRoute.options)) {\n      removedKeys.add(key)\n      delete oldRoute.options[key]\n    }\n  })\n\n  const oldHasShellComponent = 'shellComponent' in oldRoute.options\n  const newHasShellComponent = 'shellComponent' in newRoute.options\n  const preserveComponentIdentity =\n    oldHasShellComponent === newHasShellComponent\n\n  // Keys whose identity must remain stable to prevent React from\n  // unmounting/remounting the component tree.  React Fast Refresh already\n  // handles hot-updating the function bodies of these components — our job\n  // is only to update non-component route options (loader, head, etc.).\n  // For code-split (splittable) routes, the lazyRouteComponent wrapper is\n  // already cached in the bundler hot data so its identity is stable.\n  // For unsplittable routes (e.g. root routes), the component is a plain\n  // function reference that gets recreated on every module re-execution,\n  // so we must explicitly preserve the old reference.\n  // Preserve component identity so React doesn't remount.\n  // React Fast Refresh patches the function bodies in-place.\n  const componentKeys = '__TSR_COMPONENT_TYPES__' as unknown as Array<string>\n  if (preserveComponentIdentity) {\n    componentKeys.forEach((key) => {\n      if (key in oldRoute.options && key in newRoute.options) {\n        newRoute.options[key] = oldRoute.options[key]\n      }\n    })\n  }\n\n  const nextOptions = {\n    ...newRoute.options,\n    ...generatedRouteOptions,\n  }\n\n  oldRoute.options = nextOptions\n  oldRoute.update(nextOptions)\n  oldRoute._componentsPromise = undefined\n  oldRoute._lazyPromise = undefined\n\n  router.setRoutes(router.buildRouteTree())\n  router.resolvePathCache.clear()\n\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  const activeMatch = router.stores.matches.get().find(filter)\n  const pendingMatch = router.stores.pendingMatches.get().find(filter)\n  const cachedMatches = router.stores.cachedMatches.get().filter(filter)\n\n  if (activeMatch || pendingMatch || cachedMatches.length > 0) {\n    // Clear stale match data for removed route options BEFORE invalidating.\n    // Without this, router.invalidate() -> matchRoutes() reuses the existing\n    // match from the store (via ...existingMatch spread) and the stale\n    // loaderData / __beforeLoadContext survives the reload cycle.\n    //\n    // We must update the store directly (not via router.updateMatch) because\n    // updateMatch wraps in startTransition which may defer the state update,\n    // and we need the clear to be visible before invalidate reads the store.\n    if (removedKeys.has('loader') || removedKeys.has('beforeLoad')) {\n      const matchIds = [\n        activeMatch?.id,\n        pendingMatch?.id,\n        ...cachedMatches.map((match) => match.id),\n      ].filter(Boolean) as Array<string>\n      router.batch(() => {\n        for (const matchId of matchIds) {\n          const store =\n            router.stores.pendingMatchStores.get(matchId) ||\n            router.stores.matchStores.get(matchId) ||\n            router.stores.cachedMatchStores.get(matchId)\n          if (store) {\n            store.set((prev) => {\n              const next: AnyRouteMatchWithPrivateProps = { ...prev }\n\n              if (removedKeys.has('loader')) {\n                next.loaderData = undefined\n              }\n              if (removedKeys.has('beforeLoad')) {\n                next.__beforeLoadContext = undefined\n                next.context = rebuildMatchContextWithoutBeforeLoad(next)\n              }\n\n              return next\n            })\n          }\n        }\n      })\n    }\n\n    router.invalidate({ filter, sync: true })\n  }\n\n  function getStoreMatch(matchId: string) {\n    return (\n      router.stores.pendingMatchStores.get(matchId)?.get() ||\n      router.stores.matchStores.get(matchId)?.get() ||\n      router.stores.cachedMatchStores.get(matchId)?.get()\n    )\n  }\n\n  function getMatchList(matchId: string) {\n    const pendingMatches = router.stores.pendingMatches.get()\n    if (pendingMatches.some((match) => match.id === matchId)) {\n      return pendingMatches\n    }\n\n    const activeMatches = router.stores.matches.get()\n    if (activeMatches.some((match) => match.id === matchId)) {\n      return activeMatches\n    }\n\n    const cachedMatches = router.stores.cachedMatches.get()\n    if (cachedMatches.some((match) => match.id === matchId)) {\n      return cachedMatches\n    }\n\n    return []\n  }\n\n  function getParentMatch(match: AnyRouteMatch) {\n    const matchList = getMatchList(match.id)\n    const matchIndex = matchList.findIndex((item) => item.id === match.id)\n\n    if (matchIndex <= 0) {\n      return undefined\n    }\n\n    const parentMatch = matchList[matchIndex - 1]!\n    return getStoreMatch(parentMatch.id) || parentMatch\n  }\n\n  function rebuildMatchContextWithoutBeforeLoad(\n    match: AnyRouteMatchWithPrivateProps,\n  ) {\n    const parentMatch = getParentMatch(match)\n    const getParentContext = (\n      router as unknown as {\n        getParentContext?: (\n          parentMatch?: AnyRouteMatch,\n        ) => Record<string, unknown> | undefined\n      }\n    ).getParentContext\n    const parentContext = getParentContext\n      ? getParentContext.call(router, parentMatch)\n      : (parentMatch?.context ?? router.options.context)\n\n    return {\n      ...(parentContext ?? {}),\n      ...(match.__routeContext ?? {}),\n    }\n  }\n}\n\nconst handleRouteUpdateStr = handleRouteUpdate.toString()\n\nexport function getHandleRouteUpdateCode(stableRouteOptionKeys: Array<string>) {\n  return handleRouteUpdateStr.replace(\n    /['\"]__TSR_COMPONENT_TYPES__['\"]/,\n    JSON.stringify(stableRouteOptionKeys),\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"handle-route-update.cjs","names":[],"sources":["../../../../src/core/hmr/handle-route-update.ts"],"sourcesContent":["import type {\n  AnyRoute,\n  AnyRouteMatch,\n  AnyRouter,\n  RouterWritableStore,\n} from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  options: Record<string, unknown>\n  parentRoute: AnyRoute\n  _componentsPromise?: Promise<void>\n  _lazyPromise?: Promise<void>\n  update: (options: Record<string, unknown>) => unknown\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\ntype AnyRouterWithPrivateMaps = AnyRouter & {\n  routesById: Record<string, AnyRoute>\n  buildRouteTree: () => Parameters<AnyRouter['setRoutes']>[0]\n  setRoutes: AnyRouter['setRoutes']\n  stores: AnyRouter['stores'] & {\n    cachedMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n    pendingMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n    matchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n  }\n}\n\ntype AnyRouteMatchWithPrivateProps = AnyRouteMatch & {\n  __beforeLoadContext?: unknown\n  __routeContext?: Record<string, unknown>\n  context?: Record<string, unknown>\n}\n\nfunction handleRouteUpdate(\n  routeId: string,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  const router = window.__TSR_ROUTER__ as AnyRouterWithPrivateMaps\n  const oldRoute = router.routesById[routeId] as\n    | AnyRouteWithPrivateProps\n    | undefined\n\n  if (!oldRoute) {\n    return\n  }\n\n  // Generated route-tree options are not present on the freshly imported route\n  // module, but they must stay on the live route before rebuilding indexes.\n  const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute'])\n  const generatedRouteOptions: Record<string, unknown> = {}\n  generatedRouteOptionKeys.forEach((key) => {\n    if (key in oldRoute.options) {\n      generatedRouteOptions[key] = oldRoute.options[key]\n    }\n  })\n\n  const removedKeys = new Set<string>()\n  Object.keys(oldRoute.options).forEach((key) => {\n    if (!generatedRouteOptionKeys.has(key) && !(key in newRoute.options)) {\n      removedKeys.add(key)\n      delete oldRoute.options[key]\n    }\n  })\n\n  const oldHasShellComponent = 'shellComponent' in oldRoute.options\n  const newHasShellComponent = 'shellComponent' in newRoute.options\n  const preserveComponentIdentity =\n    oldHasShellComponent === newHasShellComponent\n\n  // Keys whose identity must remain stable to prevent React from\n  // unmounting/remounting the component tree.  React Fast Refresh already\n  // handles hot-updating the function bodies of these components — our job\n  // is only to update non-component route options (loader, head, etc.).\n  // For code-split (splittable) routes, the lazyRouteComponent wrapper is\n  // already cached in the bundler hot data so its identity is stable.\n  // For unsplittable routes (e.g. root routes), the component is a plain\n  // function reference that gets recreated on every module re-execution,\n  // so we must explicitly preserve the old reference.\n  // Preserve component identity so React doesn't remount.\n  // React Fast Refresh patches the function bodies in-place.\n  const componentKeys = '__TSR_COMPONENT_TYPES__' as unknown as Array<string>\n  if (preserveComponentIdentity) {\n    componentKeys.forEach((key) => {\n      if (key in oldRoute.options && key in newRoute.options) {\n        newRoute.options[key] = oldRoute.options[key]\n      }\n    })\n  }\n\n  const nextOptions = {\n    ...newRoute.options,\n    ...generatedRouteOptions,\n  }\n\n  oldRoute.options = nextOptions\n  oldRoute.update(nextOptions)\n  oldRoute._componentsPromise = undefined\n  oldRoute._lazyPromise = undefined\n\n  router.setRoutes(router.buildRouteTree())\n  syncHotRouteExport(oldRoute)\n  router.resolvePathCache.clear()\n\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  const activeMatch = router.stores.matches.get().find(filter)\n  const pendingMatch = router.stores.pendingMatches.get().find(filter)\n  const cachedMatches = router.stores.cachedMatches.get().filter(filter)\n\n  if (activeMatch || pendingMatch || cachedMatches.length > 0) {\n    // Clear stale match data for removed route options BEFORE invalidating.\n    // Without this, router.invalidate() -> matchRoutes() reuses the existing\n    // match from the store (via ...existingMatch spread) and the stale\n    // loaderData / __beforeLoadContext survives the reload cycle.\n    //\n    // We must update the store directly (not via router.updateMatch) because\n    // updateMatch wraps in startTransition which may defer the state update,\n    // and we need the clear to be visible before invalidate reads the store.\n    if (removedKeys.has('loader') || removedKeys.has('beforeLoad')) {\n      const matchIds = [\n        activeMatch?.id,\n        pendingMatch?.id,\n        ...cachedMatches.map((match) => match.id),\n      ].filter(Boolean) as Array<string>\n      router.batch(() => {\n        for (const matchId of matchIds) {\n          const store =\n            router.stores.pendingMatchStores.get(matchId) ||\n            router.stores.matchStores.get(matchId) ||\n            router.stores.cachedMatchStores.get(matchId)\n          if (store) {\n            store.set((prev) => {\n              const next: AnyRouteMatchWithPrivateProps = { ...prev }\n\n              if (removedKeys.has('loader')) {\n                next.loaderData = undefined\n              }\n              if (removedKeys.has('beforeLoad')) {\n                next.__beforeLoadContext = undefined\n                next.context = rebuildMatchContextWithoutBeforeLoad(next)\n              }\n\n              return next\n            })\n          }\n        }\n      })\n    }\n\n    router.invalidate({ filter, sync: true })\n  }\n\n  function syncHotRouteExport(liveRoute: AnyRouteWithPrivateProps) {\n    // routeTree.gen.ts mutates the original module export with generated\n    // routing state. Mirror that state onto the fresh HMR export too, so\n    // aliased route imports keep working after the module is hot-reloaded.\n    newRoute.options = liveRoute.options\n    newRoute.parentRoute = liveRoute.parentRoute\n    newRoute._path = liveRoute._path\n    newRoute._id = liveRoute._id\n    newRoute._fullPath = liveRoute._fullPath\n    newRoute._to = liveRoute._to\n  }\n\n  function getStoreMatch(matchId: string) {\n    return (\n      router.stores.pendingMatchStores.get(matchId)?.get() ||\n      router.stores.matchStores.get(matchId)?.get() ||\n      router.stores.cachedMatchStores.get(matchId)?.get()\n    )\n  }\n\n  function getMatchList(matchId: string) {\n    const pendingMatches = router.stores.pendingMatches.get()\n    if (pendingMatches.some((match) => match.id === matchId)) {\n      return pendingMatches\n    }\n\n    const activeMatches = router.stores.matches.get()\n    if (activeMatches.some((match) => match.id === matchId)) {\n      return activeMatches\n    }\n\n    const cachedMatches = router.stores.cachedMatches.get()\n    if (cachedMatches.some((match) => match.id === matchId)) {\n      return cachedMatches\n    }\n\n    return []\n  }\n\n  function getParentMatch(match: AnyRouteMatch) {\n    const matchList = getMatchList(match.id)\n    const matchIndex = matchList.findIndex((item) => item.id === match.id)\n\n    if (matchIndex <= 0) {\n      return undefined\n    }\n\n    const parentMatch = matchList[matchIndex - 1]!\n    return getStoreMatch(parentMatch.id) || parentMatch\n  }\n\n  function rebuildMatchContextWithoutBeforeLoad(\n    match: AnyRouteMatchWithPrivateProps,\n  ) {\n    const parentMatch = getParentMatch(match)\n    const getParentContext = (\n      router as unknown as {\n        getParentContext?: (\n          parentMatch?: AnyRouteMatch,\n        ) => Record<string, unknown> | undefined\n      }\n    ).getParentContext\n    const parentContext = getParentContext\n      ? getParentContext.call(router, parentMatch)\n      : (parentMatch?.context ?? router.options.context)\n\n    return {\n      ...(parentContext ?? {}),\n      ...(match.__routeContext ?? {}),\n    }\n  }\n}\n\nconst handleRouteUpdateStr = handleRouteUpdate.toString()\n\nexport function getHandleRouteUpdateCode(stableRouteOptionKeys: Array<string>) {\n  return handleRouteUpdateStr.replace(\n    /['\"]__TSR_COMPONENT_TYPES__['\"]/,\n    JSON.stringify(stableRouteOptionKeys),\n  )\n}\n"],"mappings":"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"}

package/dist/cjs/core/hmr/vite-adapter.cjs

@@ -18,13 +18,30 @@ function createViteHmrStatement(stableRouteOptionKeys, opts = {}) {
 if (import.meta.hot) {
   const hot = import.meta.hot
   const hotData = hot.data ??= {}
+  const handleRouteUpdate = ${handleRouteUpdateCode}
+  const initialRouteId = ${routeIdFallback} ?? hotData['tsr-route-id']
+  if (initialRouteId) {
+    hotData['tsr-route-id'] = initialRouteId
+  }
+  const existingRoute =
+    typeof window !== 'undefined' && initialRouteId
+      ? window.__TSR_ROUTER__?.routesById?.[initialRouteId]
+      : undefined
+  if (initialRouteId && existingRoute && existingRoute !== Route) {
+    handleRouteUpdate(initialRouteId, Route)
+    hotData['tsr-route-update-handled'] = Route
+  }
   hot.accept((newModule) => {
     if (Route && newModule && newModule.Route) {
       const routeId = hotData['tsr-route-id'] ?? ${routeIdFallback}
       if (routeId) {
         hotData['tsr-route-id'] = routeId
       }
-      (${handleRouteUpdateCode})(routeId, newModule.Route)
+      if (hotData['tsr-route-update-handled'] === newModule.Route) {
+        delete hotData['tsr-route-update-handled']
+        return
+      }
+      handleRouteUpdate(routeId, newModule.Route)
     }
     })
 }

package/dist/cjs/core/hmr/vite-adapter.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"vite-adapter.cjs","names":[],"sources":["../../../../src/core/hmr/vite-adapter.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport { getHandleRouteUpdateCode } from './handle-route-update'\nimport type * as t from '@babel/types'\n\n/**\n * Emits HMR accept code for Vite / native ESM HMR: `import.meta.hot.accept`\n * with a callback that receives the freshly re-imported module.\n *\n * `targetFramework` is currently unused — Vite's framework-specific fast-refresh\n * plugins handle component body patching via their own accept boundaries — but\n * we take it for API symmetry with `createWebpackHmrStatement`.\n */\nexport function createViteHmrStatement(\n  stableRouteOptionKeys: Array<string>,\n  opts: {\n    routeId?: string\n  } = {},\n): Array<t.Statement> {\n  const handleRouteUpdateCode = getHandleRouteUpdateCode(stableRouteOptionKeys)\n  // The replacement Route object can be uninitialized; keep a generated id as\n  // fallback for the existing router route we need to patch.\n  const routeIdFallback =\n    typeof opts.routeId === 'string' ? JSON.stringify(opts.routeId) : 'Route.id'\n\n  return [\n    template.statement(\n      `\nif (import.meta.hot) {\n  const hot = import.meta.hot\n  const hotData = hot.data ??= {}\n  hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      const routeId = hotData['tsr-route-id'] ?? ${routeIdFallback}\n      if (routeId) {\n        hotData['tsr-route-id'] = routeId\n      }\n      (${handleRouteUpdateCode})(routeId, newModule.Route)\n    }\n    })\n}\n`,\n      {\n        syntacticPlaceholders: true,\n      },\n    )(),\n  ]\n}\n"],"mappings":";;;;;;;;;;;;;AAYA,SAAgB,uBACd,uBACA,OAEI,CAAC,GACe;CACpB,MAAM,wBAAwB,4BAAA,yBAAyB,qBAAqB;CAG5E,MAAM,kBACJ,OAAO,KAAK,YAAY,WAAW,KAAK,UAAU,KAAK,OAAO,IAAI;CAEpE,OAAO,CACL,gBAAS,UACP;;;;;;mDAM6C,gBAAgB;;;;SAI1D,sBAAsB;;;;GAKzB,EACE,uBAAuB,KACzB,CACF,EAAE,CACJ;AACF"}
+{"version":3,"file":"vite-adapter.cjs","names":[],"sources":["../../../../src/core/hmr/vite-adapter.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport { getHandleRouteUpdateCode } from './handle-route-update'\nimport type * as t from '@babel/types'\n\n/**\n * Emits HMR accept code for Vite / native ESM HMR: `import.meta.hot.accept`\n * with a callback that receives the freshly re-imported module.\n *\n * `targetFramework` is currently unused — Vite's framework-specific fast-refresh\n * plugins handle component body patching via their own accept boundaries — but\n * we take it for API symmetry with `createWebpackHmrStatement`.\n */\nexport function createViteHmrStatement(\n  stableRouteOptionKeys: Array<string>,\n  opts: {\n    routeId?: string\n  } = {},\n): Array<t.Statement> {\n  const handleRouteUpdateCode = getHandleRouteUpdateCode(stableRouteOptionKeys)\n  // The replacement Route object can be uninitialized; keep a generated id as\n  // fallback for the existing router route we need to patch.\n  const routeIdFallback =\n    typeof opts.routeId === 'string' ? JSON.stringify(opts.routeId) : 'Route.id'\n\n  return [\n    template.statement(\n      `\nif (import.meta.hot) {\n  const hot = import.meta.hot\n  const hotData = hot.data ??= {}\n  const handleRouteUpdate = ${handleRouteUpdateCode}\n  const initialRouteId = ${routeIdFallback} ?? hotData['tsr-route-id']\n  if (initialRouteId) {\n    hotData['tsr-route-id'] = initialRouteId\n  }\n  const existingRoute =\n    typeof window !== 'undefined' && initialRouteId\n      ? window.__TSR_ROUTER__?.routesById?.[initialRouteId]\n      : undefined\n  if (initialRouteId && existingRoute && existingRoute !== Route) {\n    handleRouteUpdate(initialRouteId, Route)\n    hotData['tsr-route-update-handled'] = Route\n  }\n  hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      const routeId = hotData['tsr-route-id'] ?? ${routeIdFallback}\n      if (routeId) {\n        hotData['tsr-route-id'] = routeId\n      }\n      if (hotData['tsr-route-update-handled'] === newModule.Route) {\n        delete hotData['tsr-route-update-handled']\n        return\n      }\n      handleRouteUpdate(routeId, newModule.Route)\n    }\n    })\n}\n`,\n      {\n        syntacticPlaceholders: true,\n      },\n    )(),\n  ]\n}\n"],"mappings":";;;;;;;;;;;;;AAYA,SAAgB,uBACd,uBACA,OAEI,CAAC,GACe;CACpB,MAAM,wBAAwB,4BAAA,yBAAyB,qBAAqB;CAG5E,MAAM,kBACJ,OAAO,KAAK,YAAY,WAAW,KAAK,UAAU,KAAK,OAAO,IAAI;CAEpE,OAAO,CACL,gBAAS,UACP;;;;8BAIwB,sBAAsB;2BACzB,gBAAgB;;;;;;;;;;;;;;mDAcQ,gBAAgB;;;;;;;;;;;;GAa7D,EACE,uBAAuB,KACzB,CACF,EAAE,CACJ;AACF"}

package/dist/esm/core/hmr/handle-route-update.js

@@ -33,6 +33,7 @@ function handleRouteUpdate(routeId, newRoute) {
 	oldRoute._componentsPromise = void 0;
 	oldRoute._lazyPromise = void 0;
 	router.setRoutes(router.buildRouteTree());
+	syncHotRouteExport(oldRoute);
 	router.resolvePathCache.clear();
 	const filter = (m) => m.routeId === oldRoute.id;
 	const activeMatch = router.stores.matches.get().find(filter);
@@ -65,6 +66,14 @@ function handleRouteUpdate(routeId, newRoute) {
 			sync: true
 		});
 	}
+	function syncHotRouteExport(liveRoute) {
+		newRoute.options = liveRoute.options;
+		newRoute.parentRoute = liveRoute.parentRoute;
+		newRoute._path = liveRoute._path;
+		newRoute._id = liveRoute._id;
+		newRoute._fullPath = liveRoute._fullPath;
+		newRoute._to = liveRoute._to;
+	}
 	function getStoreMatch(matchId) {
 		return router.stores.pendingMatchStores.get(matchId)?.get() || router.stores.matchStores.get(matchId)?.get() || router.stores.cachedMatchStores.get(matchId)?.get();
 	}

package/dist/esm/core/hmr/handle-route-update.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-route-update.js","names":[],"sources":["../../../../src/core/hmr/handle-route-update.ts"],"sourcesContent":["import type {\n  AnyRoute,\n  AnyRouteMatch,\n  AnyRouter,\n  RouterWritableStore,\n} from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  options: Record<string, unknown>\n  _componentsPromise?: Promise<void>\n  _lazyPromise?: Promise<void>\n  update: (options: Record<string, unknown>) => unknown\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\ntype AnyRouterWithPrivateMaps = AnyRouter & {\n  routesById: Record<string, AnyRoute>\n  buildRouteTree: () => Parameters<AnyRouter['setRoutes']>[0]\n  setRoutes: AnyRouter['setRoutes']\n  stores: AnyRouter['stores'] & {\n    cachedMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n    pendingMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n    matchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n  }\n}\n\ntype AnyRouteMatchWithPrivateProps = AnyRouteMatch & {\n  __beforeLoadContext?: unknown\n  __routeContext?: Record<string, unknown>\n  context?: Record<string, unknown>\n}\n\nfunction handleRouteUpdate(\n  routeId: string,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  const router = window.__TSR_ROUTER__ as AnyRouterWithPrivateMaps\n  const oldRoute = router.routesById[routeId] as\n    | AnyRouteWithPrivateProps\n    | undefined\n\n  if (!oldRoute) {\n    return\n  }\n\n  // Generated route-tree options are not present on the freshly imported route\n  // module, but they must stay on the live route before rebuilding indexes.\n  const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute'])\n  const generatedRouteOptions: Record<string, unknown> = {}\n  generatedRouteOptionKeys.forEach((key) => {\n    if (key in oldRoute.options) {\n      generatedRouteOptions[key] = oldRoute.options[key]\n    }\n  })\n\n  const removedKeys = new Set<string>()\n  Object.keys(oldRoute.options).forEach((key) => {\n    if (!generatedRouteOptionKeys.has(key) && !(key in newRoute.options)) {\n      removedKeys.add(key)\n      delete oldRoute.options[key]\n    }\n  })\n\n  const oldHasShellComponent = 'shellComponent' in oldRoute.options\n  const newHasShellComponent = 'shellComponent' in newRoute.options\n  const preserveComponentIdentity =\n    oldHasShellComponent === newHasShellComponent\n\n  // Keys whose identity must remain stable to prevent React from\n  // unmounting/remounting the component tree.  React Fast Refresh already\n  // handles hot-updating the function bodies of these components — our job\n  // is only to update non-component route options (loader, head, etc.).\n  // For code-split (splittable) routes, the lazyRouteComponent wrapper is\n  // already cached in the bundler hot data so its identity is stable.\n  // For unsplittable routes (e.g. root routes), the component is a plain\n  // function reference that gets recreated on every module re-execution,\n  // so we must explicitly preserve the old reference.\n  // Preserve component identity so React doesn't remount.\n  // React Fast Refresh patches the function bodies in-place.\n  const componentKeys = '__TSR_COMPONENT_TYPES__' as unknown as Array<string>\n  if (preserveComponentIdentity) {\n    componentKeys.forEach((key) => {\n      if (key in oldRoute.options && key in newRoute.options) {\n        newRoute.options[key] = oldRoute.options[key]\n      }\n    })\n  }\n\n  const nextOptions = {\n    ...newRoute.options,\n    ...generatedRouteOptions,\n  }\n\n  oldRoute.options = nextOptions\n  oldRoute.update(nextOptions)\n  oldRoute._componentsPromise = undefined\n  oldRoute._lazyPromise = undefined\n\n  router.setRoutes(router.buildRouteTree())\n  router.resolvePathCache.clear()\n\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  const activeMatch = router.stores.matches.get().find(filter)\n  const pendingMatch = router.stores.pendingMatches.get().find(filter)\n  const cachedMatches = router.stores.cachedMatches.get().filter(filter)\n\n  if (activeMatch || pendingMatch || cachedMatches.length > 0) {\n    // Clear stale match data for removed route options BEFORE invalidating.\n    // Without this, router.invalidate() -> matchRoutes() reuses the existing\n    // match from the store (via ...existingMatch spread) and the stale\n    // loaderData / __beforeLoadContext survives the reload cycle.\n    //\n    // We must update the store directly (not via router.updateMatch) because\n    // updateMatch wraps in startTransition which may defer the state update,\n    // and we need the clear to be visible before invalidate reads the store.\n    if (removedKeys.has('loader') || removedKeys.has('beforeLoad')) {\n      const matchIds = [\n        activeMatch?.id,\n        pendingMatch?.id,\n        ...cachedMatches.map((match) => match.id),\n      ].filter(Boolean) as Array<string>\n      router.batch(() => {\n        for (const matchId of matchIds) {\n          const store =\n            router.stores.pendingMatchStores.get(matchId) ||\n            router.stores.matchStores.get(matchId) ||\n            router.stores.cachedMatchStores.get(matchId)\n          if (store) {\n            store.set((prev) => {\n              const next: AnyRouteMatchWithPrivateProps = { ...prev }\n\n              if (removedKeys.has('loader')) {\n                next.loaderData = undefined\n              }\n              if (removedKeys.has('beforeLoad')) {\n                next.__beforeLoadContext = undefined\n                next.context = rebuildMatchContextWithoutBeforeLoad(next)\n              }\n\n              return next\n            })\n          }\n        }\n      })\n    }\n\n    router.invalidate({ filter, sync: true })\n  }\n\n  function getStoreMatch(matchId: string) {\n    return (\n      router.stores.pendingMatchStores.get(matchId)?.get() ||\n      router.stores.matchStores.get(matchId)?.get() ||\n      router.stores.cachedMatchStores.get(matchId)?.get()\n    )\n  }\n\n  function getMatchList(matchId: string) {\n    const pendingMatches = router.stores.pendingMatches.get()\n    if (pendingMatches.some((match) => match.id === matchId)) {\n      return pendingMatches\n    }\n\n    const activeMatches = router.stores.matches.get()\n    if (activeMatches.some((match) => match.id === matchId)) {\n      return activeMatches\n    }\n\n    const cachedMatches = router.stores.cachedMatches.get()\n    if (cachedMatches.some((match) => match.id === matchId)) {\n      return cachedMatches\n    }\n\n    return []\n  }\n\n  function getParentMatch(match: AnyRouteMatch) {\n    const matchList = getMatchList(match.id)\n    const matchIndex = matchList.findIndex((item) => item.id === match.id)\n\n    if (matchIndex <= 0) {\n      return undefined\n    }\n\n    const parentMatch = matchList[matchIndex - 1]!\n    return getStoreMatch(parentMatch.id) || parentMatch\n  }\n\n  function rebuildMatchContextWithoutBeforeLoad(\n    match: AnyRouteMatchWithPrivateProps,\n  ) {\n    const parentMatch = getParentMatch(match)\n    const getParentContext = (\n      router as unknown as {\n        getParentContext?: (\n          parentMatch?: AnyRouteMatch,\n        ) => Record<string, unknown> | undefined\n      }\n    ).getParentContext\n    const parentContext = getParentContext\n      ? getParentContext.call(router, parentMatch)\n      : (parentMatch?.context ?? router.options.context)\n\n    return {\n      ...(parentContext ?? {}),\n      ...(match.__routeContext ?? {}),\n    }\n  }\n}\n\nconst handleRouteUpdateStr = handleRouteUpdate.toString()\n\nexport function getHandleRouteUpdateCode(stableRouteOptionKeys: Array<string>) {\n  return handleRouteUpdateStr.replace(\n    /['\"]__TSR_COMPONENT_TYPES__['\"]/,\n    JSON.stringify(stableRouteOptionKeys),\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"handle-route-update.js","names":[],"sources":["../../../../src/core/hmr/handle-route-update.ts"],"sourcesContent":["import type {\n  AnyRoute,\n  AnyRouteMatch,\n  AnyRouter,\n  RouterWritableStore,\n} from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  options: Record<string, unknown>\n  parentRoute: AnyRoute\n  _componentsPromise?: Promise<void>\n  _lazyPromise?: Promise<void>\n  update: (options: Record<string, unknown>) => unknown\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\ntype AnyRouterWithPrivateMaps = AnyRouter & {\n  routesById: Record<string, AnyRoute>\n  buildRouteTree: () => Parameters<AnyRouter['setRoutes']>[0]\n  setRoutes: AnyRouter['setRoutes']\n  stores: AnyRouter['stores'] & {\n    cachedMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n    pendingMatchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n    matchStores: Map<\n      string,\n      Pick<RouterWritableStore<AnyRouteMatch>, 'get' | 'set'>\n    >\n  }\n}\n\ntype AnyRouteMatchWithPrivateProps = AnyRouteMatch & {\n  __beforeLoadContext?: unknown\n  __routeContext?: Record<string, unknown>\n  context?: Record<string, unknown>\n}\n\nfunction handleRouteUpdate(\n  routeId: string,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  const router = window.__TSR_ROUTER__ as AnyRouterWithPrivateMaps\n  const oldRoute = router.routesById[routeId] as\n    | AnyRouteWithPrivateProps\n    | undefined\n\n  if (!oldRoute) {\n    return\n  }\n\n  // Generated route-tree options are not present on the freshly imported route\n  // module, but they must stay on the live route before rebuilding indexes.\n  const generatedRouteOptionKeys = new Set(['id', 'path', 'getParentRoute'])\n  const generatedRouteOptions: Record<string, unknown> = {}\n  generatedRouteOptionKeys.forEach((key) => {\n    if (key in oldRoute.options) {\n      generatedRouteOptions[key] = oldRoute.options[key]\n    }\n  })\n\n  const removedKeys = new Set<string>()\n  Object.keys(oldRoute.options).forEach((key) => {\n    if (!generatedRouteOptionKeys.has(key) && !(key in newRoute.options)) {\n      removedKeys.add(key)\n      delete oldRoute.options[key]\n    }\n  })\n\n  const oldHasShellComponent = 'shellComponent' in oldRoute.options\n  const newHasShellComponent = 'shellComponent' in newRoute.options\n  const preserveComponentIdentity =\n    oldHasShellComponent === newHasShellComponent\n\n  // Keys whose identity must remain stable to prevent React from\n  // unmounting/remounting the component tree.  React Fast Refresh already\n  // handles hot-updating the function bodies of these components — our job\n  // is only to update non-component route options (loader, head, etc.).\n  // For code-split (splittable) routes, the lazyRouteComponent wrapper is\n  // already cached in the bundler hot data so its identity is stable.\n  // For unsplittable routes (e.g. root routes), the component is a plain\n  // function reference that gets recreated on every module re-execution,\n  // so we must explicitly preserve the old reference.\n  // Preserve component identity so React doesn't remount.\n  // React Fast Refresh patches the function bodies in-place.\n  const componentKeys = '__TSR_COMPONENT_TYPES__' as unknown as Array<string>\n  if (preserveComponentIdentity) {\n    componentKeys.forEach((key) => {\n      if (key in oldRoute.options && key in newRoute.options) {\n        newRoute.options[key] = oldRoute.options[key]\n      }\n    })\n  }\n\n  const nextOptions = {\n    ...newRoute.options,\n    ...generatedRouteOptions,\n  }\n\n  oldRoute.options = nextOptions\n  oldRoute.update(nextOptions)\n  oldRoute._componentsPromise = undefined\n  oldRoute._lazyPromise = undefined\n\n  router.setRoutes(router.buildRouteTree())\n  syncHotRouteExport(oldRoute)\n  router.resolvePathCache.clear()\n\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  const activeMatch = router.stores.matches.get().find(filter)\n  const pendingMatch = router.stores.pendingMatches.get().find(filter)\n  const cachedMatches = router.stores.cachedMatches.get().filter(filter)\n\n  if (activeMatch || pendingMatch || cachedMatches.length > 0) {\n    // Clear stale match data for removed route options BEFORE invalidating.\n    // Without this, router.invalidate() -> matchRoutes() reuses the existing\n    // match from the store (via ...existingMatch spread) and the stale\n    // loaderData / __beforeLoadContext survives the reload cycle.\n    //\n    // We must update the store directly (not via router.updateMatch) because\n    // updateMatch wraps in startTransition which may defer the state update,\n    // and we need the clear to be visible before invalidate reads the store.\n    if (removedKeys.has('loader') || removedKeys.has('beforeLoad')) {\n      const matchIds = [\n        activeMatch?.id,\n        pendingMatch?.id,\n        ...cachedMatches.map((match) => match.id),\n      ].filter(Boolean) as Array<string>\n      router.batch(() => {\n        for (const matchId of matchIds) {\n          const store =\n            router.stores.pendingMatchStores.get(matchId) ||\n            router.stores.matchStores.get(matchId) ||\n            router.stores.cachedMatchStores.get(matchId)\n          if (store) {\n            store.set((prev) => {\n              const next: AnyRouteMatchWithPrivateProps = { ...prev }\n\n              if (removedKeys.has('loader')) {\n                next.loaderData = undefined\n              }\n              if (removedKeys.has('beforeLoad')) {\n                next.__beforeLoadContext = undefined\n                next.context = rebuildMatchContextWithoutBeforeLoad(next)\n              }\n\n              return next\n            })\n          }\n        }\n      })\n    }\n\n    router.invalidate({ filter, sync: true })\n  }\n\n  function syncHotRouteExport(liveRoute: AnyRouteWithPrivateProps) {\n    // routeTree.gen.ts mutates the original module export with generated\n    // routing state. Mirror that state onto the fresh HMR export too, so\n    // aliased route imports keep working after the module is hot-reloaded.\n    newRoute.options = liveRoute.options\n    newRoute.parentRoute = liveRoute.parentRoute\n    newRoute._path = liveRoute._path\n    newRoute._id = liveRoute._id\n    newRoute._fullPath = liveRoute._fullPath\n    newRoute._to = liveRoute._to\n  }\n\n  function getStoreMatch(matchId: string) {\n    return (\n      router.stores.pendingMatchStores.get(matchId)?.get() ||\n      router.stores.matchStores.get(matchId)?.get() ||\n      router.stores.cachedMatchStores.get(matchId)?.get()\n    )\n  }\n\n  function getMatchList(matchId: string) {\n    const pendingMatches = router.stores.pendingMatches.get()\n    if (pendingMatches.some((match) => match.id === matchId)) {\n      return pendingMatches\n    }\n\n    const activeMatches = router.stores.matches.get()\n    if (activeMatches.some((match) => match.id === matchId)) {\n      return activeMatches\n    }\n\n    const cachedMatches = router.stores.cachedMatches.get()\n    if (cachedMatches.some((match) => match.id === matchId)) {\n      return cachedMatches\n    }\n\n    return []\n  }\n\n  function getParentMatch(match: AnyRouteMatch) {\n    const matchList = getMatchList(match.id)\n    const matchIndex = matchList.findIndex((item) => item.id === match.id)\n\n    if (matchIndex <= 0) {\n      return undefined\n    }\n\n    const parentMatch = matchList[matchIndex - 1]!\n    return getStoreMatch(parentMatch.id) || parentMatch\n  }\n\n  function rebuildMatchContextWithoutBeforeLoad(\n    match: AnyRouteMatchWithPrivateProps,\n  ) {\n    const parentMatch = getParentMatch(match)\n    const getParentContext = (\n      router as unknown as {\n        getParentContext?: (\n          parentMatch?: AnyRouteMatch,\n        ) => Record<string, unknown> | undefined\n      }\n    ).getParentContext\n    const parentContext = getParentContext\n      ? getParentContext.call(router, parentMatch)\n      : (parentMatch?.context ?? router.options.context)\n\n    return {\n      ...(parentContext ?? {}),\n      ...(match.__routeContext ?? {}),\n    }\n  }\n}\n\nconst handleRouteUpdateStr = handleRouteUpdate.toString()\n\nexport function getHandleRouteUpdateCode(stableRouteOptionKeys: Array<string>) {\n  return handleRouteUpdateStr.replace(\n    /['\"]__TSR_COMPONENT_TYPES__['\"]/,\n    JSON.stringify(stableRouteOptionKeys),\n  )\n}\n"],"mappings":"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"}

package/dist/esm/core/hmr/vite-adapter.js

@@ -16,13 +16,30 @@ function createViteHmrStatement(stableRouteOptionKeys, opts = {}) {
 if (import.meta.hot) {
   const hot = import.meta.hot
   const hotData = hot.data ??= {}
+  const handleRouteUpdate = ${handleRouteUpdateCode}
+  const initialRouteId = ${routeIdFallback} ?? hotData['tsr-route-id']
+  if (initialRouteId) {
+    hotData['tsr-route-id'] = initialRouteId
+  }
+  const existingRoute =
+    typeof window !== 'undefined' && initialRouteId
+      ? window.__TSR_ROUTER__?.routesById?.[initialRouteId]
+      : undefined
+  if (initialRouteId && existingRoute && existingRoute !== Route) {
+    handleRouteUpdate(initialRouteId, Route)
+    hotData['tsr-route-update-handled'] = Route
+  }
   hot.accept((newModule) => {
     if (Route && newModule && newModule.Route) {
       const routeId = hotData['tsr-route-id'] ?? ${routeIdFallback}
       if (routeId) {
         hotData['tsr-route-id'] = routeId
       }
-      (${handleRouteUpdateCode})(routeId, newModule.Route)
+      if (hotData['tsr-route-update-handled'] === newModule.Route) {
+        delete hotData['tsr-route-update-handled']
+        return
+      }
+      handleRouteUpdate(routeId, newModule.Route)
     }
     })
 }

package/dist/esm/core/hmr/vite-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-adapter.js","names":[],"sources":["../../../../src/core/hmr/vite-adapter.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport { getHandleRouteUpdateCode } from './handle-route-update'\nimport type * as t from '@babel/types'\n\n/**\n * Emits HMR accept code for Vite / native ESM HMR: `import.meta.hot.accept`\n * with a callback that receives the freshly re-imported module.\n *\n * `targetFramework` is currently unused — Vite's framework-specific fast-refresh\n * plugins handle component body patching via their own accept boundaries — but\n * we take it for API symmetry with `createWebpackHmrStatement`.\n */\nexport function createViteHmrStatement(\n  stableRouteOptionKeys: Array<string>,\n  opts: {\n    routeId?: string\n  } = {},\n): Array<t.Statement> {\n  const handleRouteUpdateCode = getHandleRouteUpdateCode(stableRouteOptionKeys)\n  // The replacement Route object can be uninitialized; keep a generated id as\n  // fallback for the existing router route we need to patch.\n  const routeIdFallback =\n    typeof opts.routeId === 'string' ? JSON.stringify(opts.routeId) : 'Route.id'\n\n  return [\n    template.statement(\n      `\nif (import.meta.hot) {\n  const hot = import.meta.hot\n  const hotData = hot.data ??= {}\n  hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      const routeId = hotData['tsr-route-id'] ?? ${routeIdFallback}\n      if (routeId) {\n        hotData['tsr-route-id'] = routeId\n      }\n      (${handleRouteUpdateCode})(routeId, newModule.Route)\n    }\n    })\n}\n`,\n      {\n        syntacticPlaceholders: true,\n      },\n    )(),\n  ]\n}\n"],"mappings":";;;;;;;;;;;AAYA,SAAgB,uBACd,uBACA,OAEI,CAAC,GACe;CACpB,MAAM,wBAAwB,yBAAyB,qBAAqB;CAG5E,MAAM,kBACJ,OAAO,KAAK,YAAY,WAAW,KAAK,UAAU,KAAK,OAAO,IAAI;CAEpE,OAAO,CACL,SAAS,UACP;;;;;;mDAM6C,gBAAgB;;;;SAI1D,sBAAsB;;;;GAKzB,EACE,uBAAuB,KACzB,CACF,EAAE,CACJ;AACF"}
+{"version":3,"file":"vite-adapter.js","names":[],"sources":["../../../../src/core/hmr/vite-adapter.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport { getHandleRouteUpdateCode } from './handle-route-update'\nimport type * as t from '@babel/types'\n\n/**\n * Emits HMR accept code for Vite / native ESM HMR: `import.meta.hot.accept`\n * with a callback that receives the freshly re-imported module.\n *\n * `targetFramework` is currently unused — Vite's framework-specific fast-refresh\n * plugins handle component body patching via their own accept boundaries — but\n * we take it for API symmetry with `createWebpackHmrStatement`.\n */\nexport function createViteHmrStatement(\n  stableRouteOptionKeys: Array<string>,\n  opts: {\n    routeId?: string\n  } = {},\n): Array<t.Statement> {\n  const handleRouteUpdateCode = getHandleRouteUpdateCode(stableRouteOptionKeys)\n  // The replacement Route object can be uninitialized; keep a generated id as\n  // fallback for the existing router route we need to patch.\n  const routeIdFallback =\n    typeof opts.routeId === 'string' ? JSON.stringify(opts.routeId) : 'Route.id'\n\n  return [\n    template.statement(\n      `\nif (import.meta.hot) {\n  const hot = import.meta.hot\n  const hotData = hot.data ??= {}\n  const handleRouteUpdate = ${handleRouteUpdateCode}\n  const initialRouteId = ${routeIdFallback} ?? hotData['tsr-route-id']\n  if (initialRouteId) {\n    hotData['tsr-route-id'] = initialRouteId\n  }\n  const existingRoute =\n    typeof window !== 'undefined' && initialRouteId\n      ? window.__TSR_ROUTER__?.routesById?.[initialRouteId]\n      : undefined\n  if (initialRouteId && existingRoute && existingRoute !== Route) {\n    handleRouteUpdate(initialRouteId, Route)\n    hotData['tsr-route-update-handled'] = Route\n  }\n  hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      const routeId = hotData['tsr-route-id'] ?? ${routeIdFallback}\n      if (routeId) {\n        hotData['tsr-route-id'] = routeId\n      }\n      if (hotData['tsr-route-update-handled'] === newModule.Route) {\n        delete hotData['tsr-route-update-handled']\n        return\n      }\n      handleRouteUpdate(routeId, newModule.Route)\n    }\n    })\n}\n`,\n      {\n        syntacticPlaceholders: true,\n      },\n    )(),\n  ]\n}\n"],"mappings":";;;;;;;;;;;AAYA,SAAgB,uBACd,uBACA,OAEI,CAAC,GACe;CACpB,MAAM,wBAAwB,yBAAyB,qBAAqB;CAG5E,MAAM,kBACJ,OAAO,KAAK,YAAY,WAAW,KAAK,UAAU,KAAK,OAAO,IAAI;CAEpE,OAAO,CACL,SAAS,UACP;;;;8BAIwB,sBAAsB;2BACzB,gBAAgB;;;;;;;;;;;;;;mDAcQ,gBAAgB;;;;;;;;;;;;GAa7D,EACE,uBAAuB,KACzB,CACF,EAAE,CACJ;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-plugin",
-  "version": "1.168.16",
+  "version": "1.168.17",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -106,8 +106,8 @@
     "chokidar": "^5.0.0",
     "unplugin": "^3.0.0",
     "zod": "^4.4.3",
-    "@tanstack/router-core": "1.171.11",
-    "@tanstack/router-generator": "1.167.15",
+    "@tanstack/router-core": "1.171.12",
+    "@tanstack/router-generator": "1.167.16",
     "@tanstack/router-utils": "1.162.2"
   },
   "devDependencies": {
@@ -120,7 +120,7 @@
     "vite": ">=5.0.0 || >=6.0.0 || >=7.0.0 || >=8.0.0",
     "vite-plugin-solid": "^2.11.10 || ^3.0.0-0",
     "webpack": ">=5.92.0",
-    "@tanstack/react-router": "^1.170.13"
+    "@tanstack/react-router": "^1.170.14"
   },
   "peerDependenciesMeta": {
     "@rsbuild/core": {

package/src/core/hmr/handle-route-update.ts

@@ -7,6 +7,7 @@ import type {
 
 type AnyRouteWithPrivateProps = AnyRoute & {
   options: Record<string, unknown>
+  parentRoute: AnyRoute
   _componentsPromise?: Promise<void>
   _lazyPromise?: Promise<void>
   update: (options: Record<string, unknown>) => unknown
@@ -109,6 +110,7 @@ function handleRouteUpdate(
   oldRoute._lazyPromise = undefined
 
   router.setRoutes(router.buildRouteTree())
+  syncHotRouteExport(oldRoute)
   router.resolvePathCache.clear()
 
   const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id
@@ -159,6 +161,18 @@ function handleRouteUpdate(
     router.invalidate({ filter, sync: true })
   }
 
+  function syncHotRouteExport(liveRoute: AnyRouteWithPrivateProps) {
+    // routeTree.gen.ts mutates the original module export with generated
+    // routing state. Mirror that state onto the fresh HMR export too, so
+    // aliased route imports keep working after the module is hot-reloaded.
+    newRoute.options = liveRoute.options
+    newRoute.parentRoute = liveRoute.parentRoute
+    newRoute._path = liveRoute._path
+    newRoute._id = liveRoute._id
+    newRoute._fullPath = liveRoute._fullPath
+    newRoute._to = liveRoute._to
+  }
+
   function getStoreMatch(matchId: string) {
     return (
       router.stores.pendingMatchStores.get(matchId)?.get() ||

package/src/core/hmr/vite-adapter.ts

@@ -28,13 +28,30 @@ export function createViteHmrStatement(
 if (import.meta.hot) {
   const hot = import.meta.hot
   const hotData = hot.data ??= {}
+  const handleRouteUpdate = ${handleRouteUpdateCode}
+  const initialRouteId = ${routeIdFallback} ?? hotData['tsr-route-id']
+  if (initialRouteId) {
+    hotData['tsr-route-id'] = initialRouteId
+  }
+  const existingRoute =
+    typeof window !== 'undefined' && initialRouteId
+      ? window.__TSR_ROUTER__?.routesById?.[initialRouteId]
+      : undefined
+  if (initialRouteId && existingRoute && existingRoute !== Route) {
+    handleRouteUpdate(initialRouteId, Route)
+    hotData['tsr-route-update-handled'] = Route
+  }
   hot.accept((newModule) => {
     if (Route && newModule && newModule.Route) {
       const routeId = hotData['tsr-route-id'] ?? ${routeIdFallback}
       if (routeId) {
         hotData['tsr-route-id'] = routeId
       }
-      (${handleRouteUpdateCode})(routeId, newModule.Route)
+      if (hotData['tsr-route-update-handled'] === newModule.Route) {
+        delete hotData['tsr-route-update-handled']
+        return
+      }
+      handleRouteUpdate(routeId, newModule.Route)
     }
     })
 }