Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions packages/router-plugin/src/core/route-hmr-statement.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as template from '@babel/template'
import type { AnyRoute } from '@tanstack/router-core'
import type { AnyRoute, AnyRouteMatch } from '@tanstack/router-core'

type AnyRouteWithPrivateProps = AnyRoute & {
_path: string
Expand All @@ -26,7 +26,13 @@ function handleRouteUpdate(
if (oldRouteIndex > -1) {
router.flatRoutes[oldRouteIndex] = newRoute
}
router.invalidate({ filter: (m) => m.routeId === oldRoute.id })
const filter = (m: AnyRouteMatch) => m.routeId === oldRoute.id
if (
router.state.matches.find(filter) ||
router.state.pendingMatches?.find(filter)
) {
router.invalidate({ filter })
}
}

export const routeHmrStatement = template.statement(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ if (import.meta.hot) {
router.flatRoutes[oldRouteIndex] = newRoute;
}
;
router.invalidate({
filter: m => m.routeId === oldRoute.id
});
const filter = m => m.routeId === oldRoute.id;
if (router.state.matches.find(filter) || router.state.pendingMatches?.find(filter)) {
router.invalidate({
filter
});
}
})(Route, newModule.Route);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,12 @@ if (import.meta.hot) {
router.flatRoutes[oldRouteIndex] = newRoute;
}
;
router.invalidate({
filter: m => m.routeId === oldRoute.id
});
const filter = m => m.routeId === oldRoute.id;
if (router.state.matches.find(filter) || router.state.pendingMatches?.find(filter)) {
router.invalidate({
filter
});
}
})(Route, newModule.Route);
}
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@ if (import.meta.hot) {
router.flatRoutes[oldRouteIndex] = newRoute;
}
;
router.invalidate({
filter: m => m.routeId === oldRoute.id
});
const filter = m => m.routeId === oldRoute.id;
if (router.state.matches.find(filter) || router.state.pendingMatches?.find(filter)) {
router.invalidate({
filter
});
}
})(Route, newModule.Route);
}
});
Expand Down
Loading