@tanstack/router-plugin 1.136.4 → 1.136.6

package/dist/cjs/core/route-hmr-statement.cjs

@@ -28,14 +28,26 @@ function handleRouteUpdate(oldRoute, newRoute) {
   const router = window.__TSR_ROUTER__;
   router.routesById[newRoute.id] = newRoute;
   router.routesByPath[newRoute.fullPath] = newRoute;
-  const oldRouteIndex = router.flatRoutes.indexOf(oldRoute);
-  if (oldRouteIndex > -1) {
-    router.flatRoutes[oldRouteIndex] = newRoute;
-  }
+  router.processedTree.matchCache.clear();
+  router.processedTree.flatCache?.clear();
+  router.processedTree.singleCache.clear();
+  router.resolvePathCache.clear();
+  walkReplaceSegmentTree(newRoute, router.processedTree.segmentTree);
   const filter = (m) => m.routeId === oldRoute.id;
   if (router.state.matches.find(filter) || router.state.pendingMatches?.find(filter)) {
     router.invalidate({ filter });
   }
+  function walkReplaceSegmentTree(route, node) {
+    if (node.route?.id === route.id) node.route = route;
+    if (node.notFound?.id === route.id) node.notFound = route;
+    node.static?.forEach((child) => walkReplaceSegmentTree(route, child));
+    node.staticInsensitive?.forEach(
+      (child) => walkReplaceSegmentTree(route, child)
+    );
+    node.dynamic?.forEach((child) => walkReplaceSegmentTree(route, child));
+    node.optional?.forEach((child) => walkReplaceSegmentTree(route, child));
+    node.wildcard?.forEach((child) => walkReplaceSegmentTree(route, child));
+  }
 }
 const routeHmrStatement = template__namespace.statement(
   `

package/dist/cjs/core/route-hmr-statement.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"route-hmr-statement.cjs","sources":["../../../src/core/route-hmr-statement.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport type { AnyRoute, AnyRouteMatch } from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\nfunction handleRouteUpdate(\n  oldRoute: AnyRouteWithPrivateProps,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  newRoute._path = oldRoute._path\n  newRoute._id = oldRoute._id\n  newRoute._fullPath = oldRoute._fullPath\n  newRoute._to = oldRoute._to\n  newRoute.children = oldRoute.children\n  newRoute.parentRoute = oldRoute.parentRoute\n\n  const router = window.__TSR_ROUTER__!\n  router.routesById[newRoute.id] = newRoute\n  router.routesByPath[newRoute.fullPath] = newRoute\n  const oldRouteIndex = router.flatRoutes.indexOf(oldRoute)\n  if (oldRouteIndex > -1) {\n    router.flatRoutes[oldRouteIndex] = newRoute\n  }\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  if (\n    router.state.matches.find(filter) ||\n    router.state.pendingMatches?.find(filter)\n  ) {\n    router.invalidate({ filter })\n  }\n}\n\nexport const routeHmrStatement = template.statement(\n  `\nif (import.meta.hot) {\n  import.meta.hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      (${handleRouteUpdate.toString()})(Route, newModule.Route)\n    }\n   })\n}\n`,\n  // Disable placeholder parsing so identifiers like __TSR_ROUTER__ are treated as normal identifiers instead of template placeholders\n  { placeholderPattern: false },\n)()\n"],"names":["template"],"mappings":";;;;;;;;;;;;;;;;;;;;AAUA,SAAS,kBACP,UACA,UACA;AACA,WAAS,QAAQ,SAAS;AAC1B,WAAS,MAAM,SAAS;AACxB,WAAS,YAAY,SAAS;AAC9B,WAAS,MAAM,SAAS;AACxB,WAAS,WAAW,SAAS;AAC7B,WAAS,cAAc,SAAS;AAEhC,QAAM,SAAS,OAAO;AACtB,SAAO,WAAW,SAAS,EAAE,IAAI;AACjC,SAAO,aAAa,SAAS,QAAQ,IAAI;AACzC,QAAM,gBAAgB,OAAO,WAAW,QAAQ,QAAQ;AACxD,MAAI,gBAAgB,IAAI;AACtB,WAAO,WAAW,aAAa,IAAI;AAAA,EACrC;AACA,QAAM,SAAS,CAAC,MAAqB,EAAE,YAAY,SAAS;AAC5D,MACE,OAAO,MAAM,QAAQ,KAAK,MAAM,KAChC,OAAO,MAAM,gBAAgB,KAAK,MAAM,GACxC;AACA,WAAO,WAAW,EAAE,QAAQ;AAAA,EAC9B;AACF;AAEO,MAAM,oBAAoBA,oBAAS;AAAA,EACxC;AAAA;AAAA;AAAA;AAAA,SAIO,kBAAkB,UAAU;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMnC,EAAE,oBAAoB,MAAA;AACxB,EAAA;;"}
+{"version":3,"file":"route-hmr-statement.cjs","sources":["../../../src/core/route-hmr-statement.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport type { AnyRoute, AnyRouteMatch, AnyRouter } from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\nfunction handleRouteUpdate(\n  oldRoute: AnyRouteWithPrivateProps,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  newRoute._path = oldRoute._path\n  newRoute._id = oldRoute._id\n  newRoute._fullPath = oldRoute._fullPath\n  newRoute._to = oldRoute._to\n  newRoute.children = oldRoute.children\n  newRoute.parentRoute = oldRoute.parentRoute\n\n  const router = window.__TSR_ROUTER__!\n  router.routesById[newRoute.id] = newRoute\n  router.routesByPath[newRoute.fullPath] = newRoute\n  router.processedTree.matchCache.clear()\n  router.processedTree.flatCache?.clear()\n  router.processedTree.singleCache.clear()\n  router.resolvePathCache.clear()\n  // TODO: how to rebuild the tree if we add a new route?\n  walkReplaceSegmentTree(newRoute, router.processedTree.segmentTree)\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  if (\n    router.state.matches.find(filter) ||\n    router.state.pendingMatches?.find(filter)\n  ) {\n    router.invalidate({ filter })\n  }\n  function walkReplaceSegmentTree(\n    route: AnyRouteWithPrivateProps,\n    node: AnyRouter['processedTree']['segmentTree'],\n  ) {\n    if (node.route?.id === route.id) node.route = route\n    if (node.notFound?.id === route.id) node.notFound = route\n\n    node.static?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.staticInsensitive?.forEach((child) =>\n      walkReplaceSegmentTree(route, child),\n    )\n    node.dynamic?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.optional?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.wildcard?.forEach((child) => walkReplaceSegmentTree(route, child))\n  }\n}\n\nexport const routeHmrStatement = template.statement(\n  `\nif (import.meta.hot) {\n  import.meta.hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      (${handleRouteUpdate.toString()})(Route, newModule.Route)\n    }\n   })\n}\n`,\n  // Disable placeholder parsing so identifiers like __TSR_ROUTER__ are treated as normal identifiers instead of template placeholders\n  { placeholderPattern: false },\n)()\n"],"names":["template"],"mappings":";;;;;;;;;;;;;;;;;;;;AAUA,SAAS,kBACP,UACA,UACA;AACA,WAAS,QAAQ,SAAS;AAC1B,WAAS,MAAM,SAAS;AACxB,WAAS,YAAY,SAAS;AAC9B,WAAS,MAAM,SAAS;AACxB,WAAS,WAAW,SAAS;AAC7B,WAAS,cAAc,SAAS;AAEhC,QAAM,SAAS,OAAO;AACtB,SAAO,WAAW,SAAS,EAAE,IAAI;AACjC,SAAO,aAAa,SAAS,QAAQ,IAAI;AACzC,SAAO,cAAc,WAAW,MAAA;AAChC,SAAO,cAAc,WAAW,MAAA;AAChC,SAAO,cAAc,YAAY,MAAA;AACjC,SAAO,iBAAiB,MAAA;AAExB,yBAAuB,UAAU,OAAO,cAAc,WAAW;AACjE,QAAM,SAAS,CAAC,MAAqB,EAAE,YAAY,SAAS;AAC5D,MACE,OAAO,MAAM,QAAQ,KAAK,MAAM,KAChC,OAAO,MAAM,gBAAgB,KAAK,MAAM,GACxC;AACA,WAAO,WAAW,EAAE,QAAQ;AAAA,EAC9B;AACA,WAAS,uBACP,OACA,MACA;AACA,QAAI,KAAK,OAAO,OAAO,MAAM,SAAS,QAAQ;AAC9C,QAAI,KAAK,UAAU,OAAO,MAAM,SAAS,WAAW;AAEpD,SAAK,QAAQ,QAAQ,CAAC,UAAU,uBAAuB,OAAO,KAAK,CAAC;AACpE,SAAK,mBAAmB;AAAA,MAAQ,CAAC,UAC/B,uBAAuB,OAAO,KAAK;AAAA,IAAA;AAErC,SAAK,SAAS,QAAQ,CAAC,UAAU,uBAAuB,OAAO,KAAK,CAAC;AACrE,SAAK,UAAU,QAAQ,CAAC,UAAU,uBAAuB,OAAO,KAAK,CAAC;AACtE,SAAK,UAAU,QAAQ,CAAC,UAAU,uBAAuB,OAAO,KAAK,CAAC;AAAA,EACxE;AACF;AAEO,MAAM,oBAAoBA,oBAAS;AAAA,EACxC;AAAA;AAAA;AAAA;AAAA,SAIO,kBAAkB,UAAU;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMnC,EAAE,oBAAoB,MAAA;AACxB,EAAA;;"}

package/dist/esm/core/route-hmr-statement.js

@@ -9,14 +9,26 @@ function handleRouteUpdate(oldRoute, newRoute) {
   const router = window.__TSR_ROUTER__;
   router.routesById[newRoute.id] = newRoute;
   router.routesByPath[newRoute.fullPath] = newRoute;
-  const oldRouteIndex = router.flatRoutes.indexOf(oldRoute);
-  if (oldRouteIndex > -1) {
-    router.flatRoutes[oldRouteIndex] = newRoute;
-  }
+  router.processedTree.matchCache.clear();
+  router.processedTree.flatCache?.clear();
+  router.processedTree.singleCache.clear();
+  router.resolvePathCache.clear();
+  walkReplaceSegmentTree(newRoute, router.processedTree.segmentTree);
   const filter = (m) => m.routeId === oldRoute.id;
   if (router.state.matches.find(filter) || router.state.pendingMatches?.find(filter)) {
     router.invalidate({ filter });
   }
+  function walkReplaceSegmentTree(route, node) {
+    if (node.route?.id === route.id) node.route = route;
+    if (node.notFound?.id === route.id) node.notFound = route;
+    node.static?.forEach((child) => walkReplaceSegmentTree(route, child));
+    node.staticInsensitive?.forEach(
+      (child) => walkReplaceSegmentTree(route, child)
+    );
+    node.dynamic?.forEach((child) => walkReplaceSegmentTree(route, child));
+    node.optional?.forEach((child) => walkReplaceSegmentTree(route, child));
+    node.wildcard?.forEach((child) => walkReplaceSegmentTree(route, child));
+  }
 }
 const routeHmrStatement = template.statement(
   `

package/dist/esm/core/route-hmr-statement.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-hmr-statement.js","sources":["../../../src/core/route-hmr-statement.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport type { AnyRoute, AnyRouteMatch } from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\nfunction handleRouteUpdate(\n  oldRoute: AnyRouteWithPrivateProps,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  newRoute._path = oldRoute._path\n  newRoute._id = oldRoute._id\n  newRoute._fullPath = oldRoute._fullPath\n  newRoute._to = oldRoute._to\n  newRoute.children = oldRoute.children\n  newRoute.parentRoute = oldRoute.parentRoute\n\n  const router = window.__TSR_ROUTER__!\n  router.routesById[newRoute.id] = newRoute\n  router.routesByPath[newRoute.fullPath] = newRoute\n  const oldRouteIndex = router.flatRoutes.indexOf(oldRoute)\n  if (oldRouteIndex > -1) {\n    router.flatRoutes[oldRouteIndex] = newRoute\n  }\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  if (\n    router.state.matches.find(filter) ||\n    router.state.pendingMatches?.find(filter)\n  ) {\n    router.invalidate({ filter })\n  }\n}\n\nexport const routeHmrStatement = template.statement(\n  `\nif (import.meta.hot) {\n  import.meta.hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      (${handleRouteUpdate.toString()})(Route, newModule.Route)\n    }\n   })\n}\n`,\n  // Disable placeholder parsing so identifiers like __TSR_ROUTER__ are treated as normal identifiers instead of template placeholders\n  { placeholderPattern: false },\n)()\n"],"names":[],"mappings":";AAUA,SAAS,kBACP,UACA,UACA;AACA,WAAS,QAAQ,SAAS;AAC1B,WAAS,MAAM,SAAS;AACxB,WAAS,YAAY,SAAS;AAC9B,WAAS,MAAM,SAAS;AACxB,WAAS,WAAW,SAAS;AAC7B,WAAS,cAAc,SAAS;AAEhC,QAAM,SAAS,OAAO;AACtB,SAAO,WAAW,SAAS,EAAE,IAAI;AACjC,SAAO,aAAa,SAAS,QAAQ,IAAI;AACzC,QAAM,gBAAgB,OAAO,WAAW,QAAQ,QAAQ;AACxD,MAAI,gBAAgB,IAAI;AACtB,WAAO,WAAW,aAAa,IAAI;AAAA,EACrC;AACA,QAAM,SAAS,CAAC,MAAqB,EAAE,YAAY,SAAS;AAC5D,MACE,OAAO,MAAM,QAAQ,KAAK,MAAM,KAChC,OAAO,MAAM,gBAAgB,KAAK,MAAM,GACxC;AACA,WAAO,WAAW,EAAE,QAAQ;AAAA,EAC9B;AACF;AAEO,MAAM,oBAAoB,SAAS;AAAA,EACxC;AAAA;AAAA;AAAA;AAAA,SAIO,kBAAkB,UAAU;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMnC,EAAE,oBAAoB,MAAA;AACxB,EAAA;"}
+{"version":3,"file":"route-hmr-statement.js","sources":["../../../src/core/route-hmr-statement.ts"],"sourcesContent":["import * as template from '@babel/template'\nimport type { AnyRoute, AnyRouteMatch, AnyRouter } from '@tanstack/router-core'\n\ntype AnyRouteWithPrivateProps = AnyRoute & {\n  _path: string\n  _id: string\n  _fullPath: string\n  _to: string\n}\n\nfunction handleRouteUpdate(\n  oldRoute: AnyRouteWithPrivateProps,\n  newRoute: AnyRouteWithPrivateProps,\n) {\n  newRoute._path = oldRoute._path\n  newRoute._id = oldRoute._id\n  newRoute._fullPath = oldRoute._fullPath\n  newRoute._to = oldRoute._to\n  newRoute.children = oldRoute.children\n  newRoute.parentRoute = oldRoute.parentRoute\n\n  const router = window.__TSR_ROUTER__!\n  router.routesById[newRoute.id] = newRoute\n  router.routesByPath[newRoute.fullPath] = newRoute\n  router.processedTree.matchCache.clear()\n  router.processedTree.flatCache?.clear()\n  router.processedTree.singleCache.clear()\n  router.resolvePathCache.clear()\n  // TODO: how to rebuild the tree if we add a new route?\n  walkReplaceSegmentTree(newRoute, router.processedTree.segmentTree)\n  const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id\n  if (\n    router.state.matches.find(filter) ||\n    router.state.pendingMatches?.find(filter)\n  ) {\n    router.invalidate({ filter })\n  }\n  function walkReplaceSegmentTree(\n    route: AnyRouteWithPrivateProps,\n    node: AnyRouter['processedTree']['segmentTree'],\n  ) {\n    if (node.route?.id === route.id) node.route = route\n    if (node.notFound?.id === route.id) node.notFound = route\n\n    node.static?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.staticInsensitive?.forEach((child) =>\n      walkReplaceSegmentTree(route, child),\n    )\n    node.dynamic?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.optional?.forEach((child) => walkReplaceSegmentTree(route, child))\n    node.wildcard?.forEach((child) => walkReplaceSegmentTree(route, child))\n  }\n}\n\nexport const routeHmrStatement = template.statement(\n  `\nif (import.meta.hot) {\n  import.meta.hot.accept((newModule) => {\n    if (Route && newModule && newModule.Route) {\n      (${handleRouteUpdate.toString()})(Route, newModule.Route)\n    }\n   })\n}\n`,\n  // Disable placeholder parsing so identifiers like __TSR_ROUTER__ are treated as normal identifiers instead of template placeholders\n  { placeholderPattern: false },\n)()\n"],"names":[],"mappings":";AAUA,SAAS,kBACP,UACA,UACA;AACA,WAAS,QAAQ,SAAS;AAC1B,WAAS,MAAM,SAAS;AACxB,WAAS,YAAY,SAAS;AAC9B,WAAS,MAAM,SAAS;AACxB,WAAS,WAAW,SAAS;AAC7B,WAAS,cAAc,SAAS;AAEhC,QAAM,SAAS,OAAO;AACtB,SAAO,WAAW,SAAS,EAAE,IAAI;AACjC,SAAO,aAAa,SAAS,QAAQ,IAAI;AACzC,SAAO,cAAc,WAAW,MAAA;AAChC,SAAO,cAAc,WAAW,MAAA;AAChC,SAAO,cAAc,YAAY,MAAA;AACjC,SAAO,iBAAiB,MAAA;AAExB,yBAAuB,UAAU,OAAO,cAAc,WAAW;AACjE,QAAM,SAAS,CAAC,MAAqB,EAAE,YAAY,SAAS;AAC5D,MACE,OAAO,MAAM,QAAQ,KAAK,MAAM,KAChC,OAAO,MAAM,gBAAgB,KAAK,MAAM,GACxC;AACA,WAAO,WAAW,EAAE,QAAQ;AAAA,EAC9B;AACA,WAAS,uBACP,OACA,MACA;AACA,QAAI,KAAK,OAAO,OAAO,MAAM,SAAS,QAAQ;AAC9C,QAAI,KAAK,UAAU,OAAO,MAAM,SAAS,WAAW;AAEpD,SAAK,QAAQ,QAAQ,CAAC,UAAU,uBAAuB,OAAO,KAAK,CAAC;AACpE,SAAK,mBAAmB;AAAA,MAAQ,CAAC,UAC/B,uBAAuB,OAAO,KAAK;AAAA,IAAA;AAErC,SAAK,SAAS,QAAQ,CAAC,UAAU,uBAAuB,OAAO,KAAK,CAAC;AACrE,SAAK,UAAU,QAAQ,CAAC,UAAU,uBAAuB,OAAO,KAAK,CAAC;AACtE,SAAK,UAAU,QAAQ,CAAC,UAAU,uBAAuB,OAAO,KAAK,CAAC;AAAA,EACxE;AACF;AAEO,MAAM,oBAAoB,SAAS;AAAA,EACxC;AAAA;AAAA;AAAA;AAAA,SAIO,kBAAkB,UAAU;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAMnC,EAAE,oBAAoB,MAAA;AACxB,EAAA;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/router-plugin",
-  "version": "1.136.4",
+  "version": "1.136.6",
   "description": "Modern and scalable routing for React applications",
   "author": "Tanner Linsley",
   "license": "MIT",
@@ -97,10 +97,10 @@
     "chokidar": "^3.6.0",
     "unplugin": "^2.1.2",
     "zod": "^3.24.2",
-    "@tanstack/router-utils": "1.133.19",
+    "@tanstack/router-core": "1.136.6",
+    "@tanstack/router-generator": "1.136.6",
     "@tanstack/virtual-file-routes": "1.133.19",
-    "@tanstack/router-core": "1.136.4",
-    "@tanstack/router-generator": "1.136.4"
+    "@tanstack/router-utils": "1.133.19"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -112,7 +112,7 @@
     "vite": ">=5.0.0 || >=6.0.0 || >=7.0.0",
     "vite-plugin-solid": "^2.11.10",
     "webpack": ">=5.92.0",
-    "@tanstack/react-router": "^1.136.4"
+    "@tanstack/react-router": "^1.136.6"
   },
   "peerDependenciesMeta": {
     "@rsbuild/core": {

package/src/core/route-hmr-statement.ts

@@ -1,5 +1,5 @@
 import * as template from '@babel/template'
-import type { AnyRoute, AnyRouteMatch } from '@tanstack/router-core'
+import type { AnyRoute, AnyRouteMatch, AnyRouter } from '@tanstack/router-core'
 
 type AnyRouteWithPrivateProps = AnyRoute & {
   _path: string
@@ -22,10 +22,12 @@ function handleRouteUpdate(
   const router = window.__TSR_ROUTER__!
   router.routesById[newRoute.id] = newRoute
   router.routesByPath[newRoute.fullPath] = newRoute
-  const oldRouteIndex = router.flatRoutes.indexOf(oldRoute)
-  if (oldRouteIndex > -1) {
-    router.flatRoutes[oldRouteIndex] = newRoute
-  }
+  router.processedTree.matchCache.clear()
+  router.processedTree.flatCache?.clear()
+  router.processedTree.singleCache.clear()
+  router.resolvePathCache.clear()
+  // TODO: how to rebuild the tree if we add a new route?
+  walkReplaceSegmentTree(newRoute, router.processedTree.segmentTree)
   const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id
   if (
     router.state.matches.find(filter) ||
@@ -33,6 +35,21 @@ function handleRouteUpdate(
   ) {
     router.invalidate({ filter })
   }
+  function walkReplaceSegmentTree(
+    route: AnyRouteWithPrivateProps,
+    node: AnyRouter['processedTree']['segmentTree'],
+  ) {
+    if (node.route?.id === route.id) node.route = route
+    if (node.notFound?.id === route.id) node.notFound = route
+
+    node.static?.forEach((child) => walkReplaceSegmentTree(route, child))
+    node.staticInsensitive?.forEach((child) =>
+      walkReplaceSegmentTree(route, child),
+    )
+    node.dynamic?.forEach((child) => walkReplaceSegmentTree(route, child))
+    node.optional?.forEach((child) => walkReplaceSegmentTree(route, child))
+    node.wildcard?.forEach((child) => walkReplaceSegmentTree(route, child))
+  }
 }
 
 export const routeHmrStatement = template.statement(