V7 - Typing around subscribing to Router Events

[Ecksters]

In v6 we had:

    this.router = createBrowserRouter(newRoutes);
    this._subscribeDisposer = this.router.subscribe(this.onSubscribeEvent.bind(this));

  private async onSubscribeEvent(event: RouterState) {
    ...
  }

After updating imports:

import { LoaderFunctionArgs, RouterState } from '@remix-run/router';
import {
RouteObject, IndexRouteObject, NonIndexRouteObject, createBrowserRouter,
} from 'react-router';

I'm thinking the issue is RouterState from @remix-run/router is no longer the correct type with V7, but I can't seem to find the correct type exported, here's the TypeScript error I'm getting during build:

src/client/utils/overlays/overlayManager.ts:88:53 - error TS2345: Argument of type '(event: RouterState) => Promise<void>' is not assignable to parameter of type 'RouterSubscriber'.
  Types of parameters 'event' and 'state' are incompatible.
    Type 'import("/app/node_modules/.pnpm/[email protected][email protected][email protected][email protected]/node_modules/react-router/dist/development/route-data-DuV3tXo2").w' is not assignable to type 'import("/app/node_modules/.pnpm/@[email protected]/node_modules/@remix-run/router/dist/router").RouterState'.
      Types of property 'matches' are incompatible.
        Type 'AgnosticDataRouteMatch[]' is not assignable to type 'import("/app/node_modules/.pnpm/@[email protected]/node_modules/@remix-run/router/dist/utils").AgnosticDataRouteMatch[]'.
          Type 'AgnosticDataRouteMatch' is not assignable to type 'import("/app/node_modules/.pnpm/@[email protected]/node_modules/@remix-run/router/dist/utils").AgnosticDataRouteMatch'.
            Types of property 'route' are incompatible.
              Type 'AgnosticDataRouteObject' is not assignable to type 'import("/app/node_modules/.pnpm/@[email protected]/node_modules/@remix-run/router/dist/utils").AgnosticDataRouteObject'.
                Type 'AgnosticDataIndexRouteObject' is not assignable to type 'AgnosticDataRouteObject'.
                  Type 'AgnosticDataIndexRouteObject' is not assignable to type 'import("/app/node_modules/.pnpm/@[email protected]/node_modules/@remix-run/router/dist/utils").AgnosticDataIndexRouteObject'.
                    Type 'AgnosticDataIndexRouteObject' is not assignable to type 'AgnosticBaseRouteObject'.
                      Types of property 'shouldRevalidate' are incompatible.
                        Type 'import("/app/node_modules/.pnpm/[email protected][email protected][email protected][email protected]/node_modules/react-router/dist/development/route-data-DuV3tXo2").a3 | undefined' is not assignable to type 'import("/app/node_modules/.pnpm/@[email protected]/node_modules/@remix-run/router/dist/utils").ShouldRevalidateFunction | undefined'.
                          Type 'import("/app/node_modules/.pnpm/[email protected][email protected][email protected][email protected]/node_modules/react-router/dist/development/route-data-DuV3tXo2").a3' is not assignable to type 'import("/app/node_modules/.pnpm/@[email protected]/node_modules/@remix-run/router/dist/utils").ShouldRevalidateFunction'.
                            Types of parameters 'args' and 'args' are incompatible.
                              Type 'import("/app/node_modules/.pnpm/@[email protected]/node_modules/@remix-run/router/dist/utils").ShouldRevalidateFunctionArgs' is not assignable to type 'import("/app/node_modules/.pnpm/[email protected][email protected][email protected][email protected]/node_modules/react-router/dist/development/route-data-DuV3tXo2").a4'.
                                Types of property 'formMethod' are incompatible.
                                  Type '"GET" | "POST" | "PUT" | "PATCH" | "DELETE" | LowerCaseFormMethod | undefined' is not assignable to type '"GET" | "POST" | "PUT" | "PATCH" | "DELETE" | undefined'.
                                    Type '"get"' is not assignable to type '"GET" | "POST" | "PUT" | "PATCH" | "DELETE" | undefined'. Did you mean '"GET"'?

88     this._subscribeDisposer = this.router.subscribe(this.onSubscribeEvent.bind(this));

How do I get the new types needed to type the function I pass into router.subcribe ?

[Ecksters]

Nevermind, looks like I needed to restart my TypeScript server so it'd stop complaining about the imports after I updated my dependencies.

With v7 I was able to remove the @remix-run/router dependency from my project, as all the types I was using are now exported from the react-router import:
https://github.com/remix-run/react-router/blob/main/packages/react-router/index.ts#L18