revert unrelated changes

Author: chaance

packages/react-router-dom/server.tsx

@@ -7,6 +7,8 @@ import {
   invariant,
 } from "@remix-run/router";
 import {
+  Location,
+  To,
   createPath,
   parsePath,
   Router,
@@ -15,7 +17,6 @@ import {
   UNSAFE_DataRouterContext as DataRouterContext,
   UNSAFE_DataRouterStateContext as DataRouterStateContext,
 } from "react-router-dom";
-import type { Location, To } from "react-router-dom";
 
 export interface StaticRouterProps {
   basename?: string;

packages/react-router/lib/components.tsx

@@ -22,12 +22,12 @@ import {
 } from "@remix-run/router";
 import { useSyncExternalStore as useSyncExternalStoreShim } from "./use-sync-external-store-shim";
 
-import type { Navigator } from "./context";
 import {
+  LocationContext,
+  NavigationContext,
+  Navigator,
   DataRouterContext,
   DataRouterStateContext,
-  NavigationContext,
-  LocationContext,
 } from "./context";
 import {
   useInRouterContext,
@@ -48,7 +48,7 @@ let routerSingleton: DataRouter;
  * @private
  */
 export function _resetModuleScope() {
-  // @ts-ignore
+  // @ts-expect-error
   routerSingleton = null;
 }
 

packages/router/router.ts

@@ -1,12 +1,11 @@
-import { createPath } from "./history";
-import type { History, Location, Path, To } from "./history";
+import { createPath, History, Location, Path, To } from "./history";
 import { Action as HistoryAction, createLocation, parsePath } from "./history";
 
-import { invariant } from "./utils";
-import type {
+import {
   DataRouteObject,
   FormEncType,
   FormMethod,
+  invariant,
   RouteMatch,
   RouteObject,
   Submission,