@octanejs/tanstack-start 0.1.52 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@octanejs/tanstack-start",
-  "version": "0.1.52",
+  "version": "0.2.1",
   "description": "TanStack Start for Octane, including file-route generation, server functions, SSR streaming, hydration, and Vite or Rsbuild integration.",
   "license": "MIT",
   "type": "module",
@@ -117,10 +117,10 @@
     "@babel/core": "7.29.7",
     "@babel/template": "^7.27.2",
     "@babel/types": "^7.28.5",
-    "@tanstack/router-core": "1.171.15",
+    "@tanstack/router-core": "1.171.34",
     "@tanstack/router-utils": "1.162.2",
-    "@tanstack/start-client-core": "1.170.14",
-    "@tanstack/start-server-core": "1.169.17",
+    "@tanstack/start-client-core": "1.170.34",
+    "@tanstack/start-server-core": "1.169.39",
     "@tanstack/virtual-file-routes": "1.162.0",
     "chokidar": "^5.0.0",
     "exsolve": "^1.0.7",
@@ -139,12 +139,12 @@
     "vitefu": "^1.1.1",
     "xmlbuilder2": "^4.0.3",
     "zod": "^4.4.3",
-    "@octanejs/rspack-plugin": "0.1.55",
-    "@octanejs/tanstack-router": "0.1.60"
+    "@octanejs/rspack-plugin": "0.1.57",
+    "@octanejs/tanstack-router": "0.2.1"
   },
   "peerDependencies": {
     "@rsbuild/core": "^2.0.0",
-    "octane": "^0.7.0",
+    "octane": "^0.9.0",
     "vite": ">=7.0.0"
   },
   "peerDependenciesMeta": {
@@ -160,7 +160,7 @@
     "@types/node": "^24.13.3",
     "vite": "^8.1.5",
     "vitest": "^4.1.10",
-    "octane": "0.7.0"
+    "octane": "0.9.0"
   },
   "scripts": {
     "test": "cd ../.. && vitest run --project tanstack-start --project tanstack-start-rsbuild"

package/src/internal/router-plugin/core/hmr/handle-route-update.js

@@ -39,33 +39,24 @@ function handleRouteUpdate(routeId, newRoute, shouldApplyRouteUpdate = true) {
 	syncHotRouteExport(oldRoute);
 	router.resolvePathCache.clear();
 	const filter = (m) => m.routeId === oldRoute.id;
+	// router-core 1.171.34 keys stores by routeId (`byRoute`/`getMatchStore`) and
+	// dropped the pending/cached match pools, so HMR patches the active match only;
+	// a full reload still covers pending/cached matches.
 	const activeMatch = router.stores.matches.get().find(filter);
-	const pendingMatch = router.stores.pendingMatches.get().find(filter);
-	const cachedMatches = router.stores.cachedMatches.get().filter(filter);
-	if (activeMatch || pendingMatch || cachedMatches.length > 0) {
+	if (activeMatch) {
 		if (removedKeys.has('loader') || removedKeys.has('beforeLoad')) {
-			const matchIds = [
-				activeMatch?.id,
-				pendingMatch?.id,
-				...cachedMatches.map((match) => match.id),
-			].filter(Boolean);
 			router.batch(() => {
-				for (const matchId of matchIds) {
-					const store =
-						router.stores.pendingMatchStores.get(matchId) ||
-						router.stores.matchStores.get(matchId) ||
-						router.stores.cachedMatchStores.get(matchId);
-					if (store)
-						store.set((prev) => {
-							const next = { ...prev };
-							if (removedKeys.has('loader')) next.loaderData = void 0;
-							if (removedKeys.has('beforeLoad')) {
-								next.__beforeLoadContext = void 0;
-								next.context = rebuildMatchContextWithoutBeforeLoad(next);
-							}
-							return next;
-						});
-				}
+				const store = router.stores.getMatchStore(activeMatch.routeId);
+				if (store)
+					store.set((prev) => {
+						const next = { ...prev };
+						if (removedKeys.has('loader')) next.loaderData = void 0;
+						if (removedKeys.has('beforeLoad')) {
+							next.__beforeLoadContext = void 0;
+							next.context = rebuildMatchContextWithoutBeforeLoad(next);
+						}
+						return next;
+					});
 			});
 		}
 		router.invalidate({
@@ -81,28 +72,15 @@ function handleRouteUpdate(routeId, newRoute, shouldApplyRouteUpdate = true) {
 		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()
-		);
-	}
-	function getMatchList(matchId) {
-		const pendingMatches = router.stores.pendingMatches.get();
-		if (pendingMatches.some((match) => match.id === matchId)) return pendingMatches;
-		const activeMatches = router.stores.matches.get();
-		if (activeMatches.some((match) => match.id === matchId)) return activeMatches;
-		const cachedMatches = router.stores.cachedMatches.get();
-		if (cachedMatches.some((match) => match.id === matchId)) return cachedMatches;
-		return [];
+	function getStoreMatch(routeId) {
+		return router.stores.getMatchStore(routeId)?.get();
 	}
 	function getParentMatch(match) {
-		const matchList = getMatchList(match.id);
-		const matchIndex = matchList.findIndex((item) => item.id === match.id);
+		const matches = router.stores.matches.get();
+		const matchIndex = matches.findIndex((item) => item.routeId === match.routeId);
 		if (matchIndex <= 0) return;
-		const parentMatch = matchList[matchIndex - 1];
-		return getStoreMatch(parentMatch.id) || parentMatch;
+		const parentMatch = matches[matchIndex - 1];
+		return getStoreMatch(parentMatch.routeId) || parentMatch;
 	}
 	function rebuildMatchContextWithoutBeforeLoad(match) {
 		const parentMatch = getParentMatch(match);

package/src/runtime/client/hydrateStart.js

@@ -7,7 +7,7 @@ import { hydrateStart as hydrateStartCore } from '@tanstack/start-client-core/cl
  * document with an empty match tree.
  */
 export function waitForRouterMatches(router) {
-	const matchesId = router.stores.matchesId;
+	const matchesId = router.stores.ids;
 	if (matchesId.get().length > 0) return Promise.resolve();
 
 	return new Promise((resolve) => {