From 769263c2696ce3a289fc748fddcaf67d185c0316 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Fri, 18 Nov 2022 07:53:05 -0700 Subject: [PATCH] fix: ResolveRouter => RegisterRouter --- examples/react/basic-ssr-lite/src/router.tsx | 2 +- examples/react/basic-ssr/src/router.tsx | 2 +- examples/react/basic/src/main.tsx | 4 ++-- examples/react/kitchen-sink-codesplit/src/router.tsx | 2 +- examples/react/kitchen-sink-routegen/src/router.tsx | 2 +- examples/react/kitchen-sink/src/main.tsx | 2 +- examples/react/with-react-query/src/main.tsx | 2 +- examples/react/with-trpc-react-query/client/main.tsx | 2 +- examples/react/with-trpc/client/main.tsx | 2 +- packages/react-router/src/index.tsx | 6 +++--- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/react/basic-ssr-lite/src/router.tsx b/examples/react/basic-ssr-lite/src/router.tsx index ee74a285a1..886aa89438 100644 --- a/examples/react/basic-ssr-lite/src/router.tsx +++ b/examples/react/basic-ssr-lite/src/router.tsx @@ -8,7 +8,7 @@ export const createRouter = () => }) declare module '@tanstack/react-router' { - interface ResolveRouter { + interface RegisterRouter { router: ReturnType } } diff --git a/examples/react/basic-ssr/src/router.tsx b/examples/react/basic-ssr/src/router.tsx index ee74a285a1..886aa89438 100644 --- a/examples/react/basic-ssr/src/router.tsx +++ b/examples/react/basic-ssr/src/router.tsx @@ -8,7 +8,7 @@ export const createRouter = () => }) declare module '@tanstack/react-router' { - interface ResolveRouter { + interface RegisterRouter { router: ReturnType } } diff --git a/examples/react/basic/src/main.tsx b/examples/react/basic/src/main.tsx index fcd29eb71b..9d5d91d67a 100644 --- a/examples/react/basic/src/main.tsx +++ b/examples/react/basic/src/main.tsx @@ -9,7 +9,7 @@ import { useMatch, ResolvedRouter, ResolvedAllRouteInfo, - ResolveRouter, + RegisterRouter, Router, AnyAllRouteInfo, } from '@tanstack/react-router' @@ -68,7 +68,7 @@ const router = createReactRouter({ }) declare module '@tanstack/react-router' { - interface ResolveRouter { + interface RegisterRouter { router: typeof router } } diff --git a/examples/react/kitchen-sink-codesplit/src/router.tsx b/examples/react/kitchen-sink-codesplit/src/router.tsx index 702ff850ff..57c242fefb 100644 --- a/examples/react/kitchen-sink-codesplit/src/router.tsx +++ b/examples/react/kitchen-sink-codesplit/src/router.tsx @@ -39,7 +39,7 @@ export const router = createReactRouter({ }) declare module '@tanstack/react-router' { - interface ResolveRouter { + interface RegisterRouter { router: typeof router } } diff --git a/examples/react/kitchen-sink-routegen/src/router.tsx b/examples/react/kitchen-sink-routegen/src/router.tsx index 9fe60760c3..6c4ddb2a68 100644 --- a/examples/react/kitchen-sink-routegen/src/router.tsx +++ b/examples/react/kitchen-sink-routegen/src/router.tsx @@ -14,7 +14,7 @@ export const router = createReactRouter({ }) declare module '@tanstack/react-router' { - interface ResolveRouter { + interface RegisterRouter { router: typeof router } } diff --git a/examples/react/kitchen-sink/src/main.tsx b/examples/react/kitchen-sink/src/main.tsx index 0c5c237464..17956b06ee 100644 --- a/examples/react/kitchen-sink/src/main.tsx +++ b/examples/react/kitchen-sink/src/main.tsx @@ -201,7 +201,7 @@ const router = createReactRouter({ }) declare module '@tanstack/react-router' { - interface ResolveRouter { + interface RegisterRouter { router: typeof router } } diff --git a/examples/react/with-react-query/src/main.tsx b/examples/react/with-react-query/src/main.tsx index 0e29dd06da..6955e93269 100644 --- a/examples/react/with-react-query/src/main.tsx +++ b/examples/react/with-react-query/src/main.tsx @@ -72,7 +72,7 @@ const router = createReactRouter({ }) declare module '@tanstack/react-router' { - interface ResolveRouter { + interface RegisterRouter { router: typeof router } } diff --git a/examples/react/with-trpc-react-query/client/main.tsx b/examples/react/with-trpc-react-query/client/main.tsx index 57a77cb1ba..4559e6c26b 100644 --- a/examples/react/with-trpc-react-query/client/main.tsx +++ b/examples/react/with-trpc-react-query/client/main.tsx @@ -77,7 +77,7 @@ const router = createReactRouter({ }) declare module '@tanstack/react-router' { - interface ResolveRouter { + interface RegisterRouter { router: typeof router } } diff --git a/examples/react/with-trpc/client/main.tsx b/examples/react/with-trpc/client/main.tsx index 7ff73f2d19..5cc64ae334 100644 --- a/examples/react/with-trpc/client/main.tsx +++ b/examples/react/with-trpc/client/main.tsx @@ -96,7 +96,7 @@ const router = createReactRouter({ }) declare module '@tanstack/react-router' { - interface ResolveRouter { + interface RegisterRouter { router: typeof router } } diff --git a/packages/react-router/src/index.tsx b/packages/react-router/src/index.tsx index 09f1218601..bb498024f1 100644 --- a/packages/react-router/src/index.tsx +++ b/packages/react-router/src/index.tsx @@ -35,17 +35,17 @@ import { export * from '@tanstack/router-core' -export interface ResolveRouter { +export interface RegisterRouter { // router: Router } -export type ResolvedRouter = ResolveRouter extends { +export type ResolvedRouter = RegisterRouter extends { router: Router } ? Router : Router -export type ResolvedAllRouteInfo = ResolveRouter extends { +export type ResolvedAllRouteInfo = RegisterRouter extends { router: Router } ? TAllRouteInfo