Organize imports (#10777)

Author: brophdawg11

packages/react-router-dom-v5-compat/index.ts

@@ -47,42 +47,10 @@
  *   deprecate the deep require if we wanted to avoid the duplication here.
  */
 export type {
-  BrowserRouterProps,
-  Hash,
-  HashRouterProps,
-  HistoryRouterProps,
-  LinkProps,
-  Location,
-  Path,
-  To,
-  MemoryRouterProps,
-  NavigateFunction,
-  NavigateOptions,
-  NavigateProps,
-  Navigator,
-  NavLinkProps,
-  OutletProps,
-  Params,
-  ParamParseKey,
-  PathMatch,
-  RouteMatch,
-  RouteObject,
-  RouteProps,
-  PathRouteProps,
-  LayoutRouteProps,
-  IndexRouteProps,
-  RouterProps,
-  Pathname,
-  Search,
-  RoutesProps,
-  ParamKeyValuePair,
-  URLSearchParamsInit,
-  // New stuff from RR 6.4
   ActionFunction,
   ActionFunctionArgs,
   AwaitProps,
-  unstable_Blocker,
-  unstable_BlockerFunction,
+  BrowserRouterProps,
   DataRouteMatch,
   DataRouteObject,
   Fetcher,
@@ -91,23 +59,57 @@ export type {
   FormMethod,
   FormProps,
   GetScrollRestorationKeyFunction,
+  Hash,
+  HashRouterProps,
+  HistoryRouterProps,
   IndexRouteObject,
+  IndexRouteProps,
   JsonFunction,
+  LayoutRouteProps,
+  LinkProps,
   LoaderFunction,
   LoaderFunctionArgs,
+  Location,
+  MemoryRouterProps,
+  NavLinkProps,
+  NavigateFunction,
+  NavigateOptions,
+  NavigateProps,
   Navigation,
+  Navigator,
   NonIndexRouteObject,
+  OutletProps,
+  ParamKeyValuePair,
+  ParamParseKey,
+  Params,
+  Path,
+  PathMatch,
   PathPattern,
+  PathRouteProps,
+  Pathname,
   RedirectFunction,
   RelativeRoutingType,
+  RouteMatch,
+  RouteObject,
+  RouteProps,
+  RouterProps,
   RouterProviderProps,
+  RoutesProps,
   ScrollRestorationProps,
+  Search,
   ShouldRevalidateFunction,
   SubmitFunction,
   SubmitOptions,
+  To,
+  URLSearchParamsInit,
+  unstable_Blocker,
+  unstable_BlockerFunction,
 } from "./react-router-dom";
 export {
+  AbortedDeferredError,
+  Await,
   BrowserRouter,
+  Form,
   HashRouter,
   Link,
   MemoryRouter,
@@ -117,69 +119,65 @@ export {
   Outlet,
   Route,
   Router,
+  RouterProvider,
   Routes,
+  ScrollRestoration,
+  UNSAFE_DataRouterContext,
+  UNSAFE_DataRouterStateContext,
   UNSAFE_LocationContext,
   UNSAFE_NavigationContext,
   UNSAFE_RouteContext,
+  UNSAFE_useRouteId,
+  UNSAFE_useScrollRestoration,
+  createBrowserRouter,
+  createHashRouter,
+  createMemoryRouter,
   createPath,
   createRoutesFromChildren,
+  createRoutesFromElements,
   createSearchParams,
+  defer,
   generatePath,
+  isRouteErrorResponse,
+  json,
   matchPath,
   matchRoutes,
   parsePath,
+  redirect,
+  redirectDocument,
   renderMatches,
   resolvePath,
   unstable_HistoryRouter,
+  unstable_useBlocker,
+  unstable_usePrompt,
+  useActionData,
+  useAsyncError,
+  useAsyncValue,
+  useBeforeUnload,
+  useFetcher,
+  useFetchers,
+  useFormAction,
   useHref,
   useInRouterContext,
   useLinkClickHandler,
+  useLoaderData,
   useLocation,
   useMatch,
+  useMatches,
   useNavigate,
+  useNavigation,
   useNavigationType,
   useOutlet,
   useOutletContext,
   useParams,
   useResolvedPath,
-  useRoutes,
-  useSearchParams,
-  // New stuff from 6.4
-  AbortedDeferredError,
-  Await,
-  RouterProvider,
-  ScrollRestoration,
-  createBrowserRouter,
-  createHashRouter,
-  createMemoryRouter,
-  createRoutesFromElements,
-  defer,
-  isRouteErrorResponse,
-  Form,
-  json,
-  redirect,
-  redirectDocument,
-  useActionData,
-  useAsyncError,
-  useAsyncValue,
-  useBeforeUnload,
-  unstable_useBlocker,
-  useFetcher,
-  useFetchers,
-  useFormAction,
-  useLoaderData,
-  useMatches,
-  useNavigation,
-  unstable_usePrompt,
   useRevalidator,
   useRouteError,
   useRouteLoaderData,
+  useRoutes,
+  useSearchParams,
   useSubmit,
-  UNSAFE_DataRouterContext,
-  UNSAFE_DataRouterStateContext,
-  UNSAFE_useScrollRestoration,
-  UNSAFE_useRouteId,
 } from "./react-router-dom";
 
 export type { StaticRouterProps } from "./lib/components";
-export { CompatRouter, CompatRoute, StaticRouter } from "./lib/components";
+export { CompatRoute, CompatRouter, StaticRouter } from "./lib/components";

packages/react-router/index.ts

@@ -6,24 +6,24 @@ import type {
   BlockerFunction,
   Fetcher,
   HydrationState,
+  InitialEntry,
   JsonFunction,
+  LazyRouteFunction,
   LoaderFunction,
   LoaderFunctionArgs,
   Location,
   Navigation,
-  Params,
   ParamParseKey,
+  Params,
   Path,
   PathMatch,
   PathPattern,
   RedirectFunction,
   RelativeRoutingType,
   Router as RemixRouter,
+  FutureConfig as RouterFutureConfig,
   ShouldRevalidateFunction,
   To,
-  InitialEntry,
-  LazyRouteFunction,
-  FutureConfig as RouterFutureConfig,
 } from "@remix-run/router";
 import {
   AbortedDeferredError,
@@ -46,21 +46,19 @@ import {
 
 import type {
   AwaitProps,
+  FutureConfig,
+  IndexRouteProps,
+  LayoutRouteProps,
   MemoryRouterProps,
   NavigateProps,
   OutletProps,
-  RouteProps,
   PathRouteProps,
-  LayoutRouteProps,
-  IndexRouteProps,
+  RouteProps,
   RouterProps,
-  RoutesProps,
   RouterProviderProps,
-  FutureConfig,
+  RoutesProps,
 } from "./lib/components";
 import {
-  createRoutesFromChildren,
-  renderMatches,
   Await,
   MemoryRouter,
   Navigate,
@@ -69,13 +67,15 @@ import {
   Router,
   RouterProvider,
   Routes,
+  createRoutesFromChildren,
+  renderMatches,
 } from "./lib/components";
 import type {
   DataRouteMatch,
   DataRouteObject,
   IndexRouteObject,
-  Navigator,
   NavigateOptions,
+  Navigator,
   NonIndexRouteObject,
   RouteMatch,
   RouteObject,
@@ -89,28 +89,28 @@ import {
 } from "./lib/context";
 import type { NavigateFunction } from "./lib/hooks";
 import {
+  useActionData,
+  useAsyncError,
+  useAsyncValue,
   useBlocker,
   useHref,
   useInRouterContext,
+  useLoaderData,
   useLocation,
   useMatch,
-  useNavigationType,
+  useMatches,
   useNavigate,
+  useNavigation,
+  useNavigationType,
   useOutlet,
   useOutletContext,
   useParams,
   useResolvedPath,
-  useRoutes,
-  useActionData,
-  useAsyncError,
-  useAsyncValue,
-  useRouteId,
-  useLoaderData,
-  useMatches,
-  useNavigation,
   useRevalidator,
   useRouteError,
+  useRouteId,
   useRouteLoaderData,
+  useRoutes,
   useRoutesImpl,
 } from "./lib/hooks";
 
@@ -124,8 +124,6 @@ export type {
   ActionFunction,
   ActionFunctionArgs,
   AwaitProps,
-  Blocker as unstable_Blocker,
-  BlockerFunction as unstable_BlockerFunction,
   DataRouteMatch,
   DataRouteObject,
   Fetcher,
@@ -134,8 +132,8 @@ export type {
   IndexRouteObject,
   IndexRouteProps,
   JsonFunction,
-  LazyRouteFunction,
   LayoutRouteProps,
+  LazyRouteFunction,
   LoaderFunction,
   LoaderFunctionArgs,
   Location,
@@ -147,13 +145,13 @@ export type {
   Navigator,
   NonIndexRouteObject,
   OutletProps,
-  Params,
   ParamParseKey,
+  Params,
   Path,
   PathMatch,
-  Pathname,
   PathPattern,
   PathRouteProps,
+  Pathname,
   RedirectFunction,
   RelativeRoutingType,
   RouteMatch,
@@ -165,6 +163,8 @@ export type {
   Search,
   ShouldRevalidateFunction,
   To,
+  Blocker as unstable_Blocker,
+  BlockerFunction as unstable_BlockerFunction,
 };
 export {
   AbortedDeferredError,
@@ -181,8 +181,8 @@ export {
   createRoutesFromChildren,
   createRoutesFromChildren as createRoutesFromElements,
   defer,
-  isRouteErrorResponse,
   generatePath,
+  isRouteErrorResponse,
   json,
   matchPath,
   matchRoutes,
@@ -191,10 +191,10 @@ export {
   redirectDocument,
   renderMatches,
   resolvePath,
+  useBlocker as unstable_useBlocker,
   useActionData,
   useAsyncError,
   useAsyncValue,
-  useBlocker as unstable_useBlocker,
   useHref,
   useInRouterContext,
   useLoaderData,
@@ -297,11 +297,11 @@ export function createMemoryRouter(
 
 /** @internal */
 export {
-  NavigationContext as UNSAFE_NavigationContext,
-  LocationContext as UNSAFE_LocationContext,
-  RouteContext as UNSAFE_RouteContext,
   DataRouterContext as UNSAFE_DataRouterContext,
   DataRouterStateContext as UNSAFE_DataRouterStateContext,
+  LocationContext as UNSAFE_LocationContext,
+  NavigationContext as UNSAFE_NavigationContext,
+  RouteContext as UNSAFE_RouteContext,
   mapRouteProperties as UNSAFE_mapRouteProperties,
   useRouteId as UNSAFE_useRouteId,
   useRoutesImpl as UNSAFE_useRoutesImpl,

packages/react-router/lib/components.tsx

@@ -1,52 +1,52 @@
-import * as React from "react";
 import type {
-  TrackedPromise,
   InitialEntry,
+  LazyRouteFunction,
   Location,
   MemoryHistory,
-  Router as RemixRouter,
-  To,
-  LazyRouteFunction,
   RelativeRoutingType,
+  Router as RemixRouter,
   RouterState,
+  To,
+  TrackedPromise,
 } from "@remix-run/router";
 import {
-  Action as NavigationType,
   AbortedDeferredError,
+  Action as NavigationType,
   createMemoryHistory,
+  UNSAFE_getPathContributingMatches as getPathContributingMatches,
   UNSAFE_invariant as invariant,
   parsePath,
   resolveTo,
   stripBasename,
   UNSAFE_warning as warning,
-  UNSAFE_getPathContributingMatches as getPathContributingMatches,
 } from "@remix-run/router";
+import * as React from "react";
 
 import type {
   DataRouteObject,
   IndexRouteObject,
-  RouteMatch,
-  RouteObject,
   Navigator,
   NonIndexRouteObject,
+  RouteMatch,
+  RouteObject,
 } from "./context";
 import {
-  LocationContext,
-  NavigationContext,
+  AwaitContext,
   DataRouterContext,
   DataRouterStateContext,
-  AwaitContext,
+  LocationContext,
+  NavigationContext,
   RouteContext,
 } from "./context";
 import {
+  _renderMatches,
   useAsyncValue,
   useInRouterContext,
+  useLocation,
   useNavigate,
   useOutlet,
   useRoutes,
-  _renderMatches,
   useRoutesImpl,
-  useLocation,
 } from "./hooks";
 
 export interface FutureConfig {

packages/react-router/lib/context.ts

@@ -1,18 +1,18 @@
 import * as React from "react";
 import type {
-  AgnosticRouteMatch,
   AgnosticIndexRouteObject,
   AgnosticNonIndexRouteObject,
+  AgnosticRouteMatch,
   History,
+  LazyRouteFunction,
   Location,
+  Action as NavigationType,
   RelativeRoutingType,
   Router,
   StaticHandlerContext,
   To,
   TrackedPromise,
-  LazyRouteFunction,
 } from "@remix-run/router";
-import type { Action as NavigationType } from "@remix-run/router";
 
 // Create react-specific types from the agnostic types in @remix-run/router to
 // export from react-router

packages/react-router/lib/hooks.tsx

@@ -14,7 +14,9 @@ import type {
   To,
 } from "@remix-run/router";
 import {
+  IDLE_BLOCKER,
   Action as NavigationType,
+  UNSAFE_getPathContributingMatches as getPathContributingMatches,
   UNSAFE_invariant as invariant,
   isRouteErrorResponse,
   joinPaths,
@@ -23,26 +25,24 @@ import {
   parsePath,
   resolveTo,
   stripBasename,
-  IDLE_BLOCKER,
-  UNSAFE_getPathContributingMatches as getPathContributingMatches,
   UNSAFE_warning as warning,
 } from "@remix-run/router";
 
 import type {
+  DataRouteMatch,
   NavigateOptions,
   RouteContextObject,
   RouteMatch,
   RouteObject,
-  DataRouteMatch,
 } from "./context";
 import {
+  AwaitContext,
   DataRouterContext,
   DataRouterStateContext,
   LocationContext,
   NavigationContext,
   RouteContext,
   RouteErrorContext,
-  AwaitContext,
 } from "./context";
 
 /**

packages/router/index.ts

@@ -9,12 +9,11 @@ export type {
   AgnosticNonIndexRouteObject,
   AgnosticRouteMatch,
   AgnosticRouteObject,
-  LazyRouteFunction,
-  TrackedPromise,
   FormEncType,
   FormMethod,
   HTMLFormMethod,
   JsonFunction,
+  LazyRouteFunction,
   LoaderFunction,
   LoaderFunctionArgs,
   ParamParseKey,
@@ -23,6 +22,7 @@ export type {
   PathPattern,
   RedirectFunction,
   ShouldRevalidateFunction,
+  TrackedPromise,
   V7_FormMethod,
 } from "./utils";
 
@@ -62,9 +62,9 @@ export type {
 export {
   Action,
   createBrowserHistory,
-  createPath,
   createHashHistory,
   createMemoryHistory,
+  createPath,
   parsePath,
 } from "./history";
 

packages/router/router.ts

@@ -8,31 +8,31 @@ import {
   warning,
 } from "./history";
 import type {
-  DataResult,
-  DeferredData,
+  ActionFunction,
   AgnosticDataRouteMatch,
   AgnosticDataRouteObject,
+  AgnosticRouteMatch,
+  AgnosticRouteObject,
+  DataResult,
+  DeferredData,
   DeferredResult,
+  DetectErrorBoundaryFunction,
   ErrorResult,
   FormEncType,
   FormMethod,
-  DetectErrorBoundaryFunction,
+  HTMLFormMethod,
+  ImmutableRouteKey,
+  LoaderFunction,
+  MapRoutePropertiesFunction,
+  MutationFormMethod,
   RedirectResult,
   RouteData,
-  AgnosticRouteObject,
+  RouteManifest,
+  ShouldRevalidateFunction,
   Submission,
   SuccessResult,
-  AgnosticRouteMatch,
-  ShouldRevalidateFunction,
-  RouteManifest,
-  ImmutableRouteKey,
-  ActionFunction,
-  LoaderFunction,
-  V7_MutationFormMethod,
   V7_FormMethod,
-  HTMLFormMethod,
-  MutationFormMethod,
-  MapRoutePropertiesFunction,
+  V7_MutationFormMethod,
 } from "./utils";
 import {
   ErrorResponse,

packages/router/utils.ts

@@ -1,5 +1,5 @@
 import type { Location, Path, To } from "./history";
-import { warning, invariant, parsePath } from "./history";
+import { invariant, parsePath, warning } from "./history";
 
 /**
  * Map of routeId -> data returned from a loader/action/error