From 28601b1fe31c6350519e74880fd39cd1da4b5c98 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 7 Feb 2023 17:46:00 -0500 Subject: [PATCH 1/4] Move invariant to an UNSAFE_ export --- packages/react-router-dom/index.tsx | 2 +- packages/react-router-dom/server.tsx | 2 +- packages/react-router/lib/components.tsx | 2 +- packages/react-router/lib/hooks.tsx | 2 +- packages/router/index.ts | 3 ++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/react-router-dom/index.tsx b/packages/react-router-dom/index.tsx index 882159e6cc..560c85a483 100644 --- a/packages/react-router-dom/index.tsx +++ b/packages/react-router-dom/index.tsx @@ -40,7 +40,7 @@ import { createRouter, createBrowserHistory, createHashHistory, - invariant, + UNSAFE_invariant as invariant, joinPaths, ErrorResponse, } from "@remix-run/router"; diff --git a/packages/react-router-dom/server.tsx b/packages/react-router-dom/server.tsx index 3ace651b43..7800f856ce 100644 --- a/packages/react-router-dom/server.tsx +++ b/packages/react-router-dom/server.tsx @@ -10,7 +10,7 @@ import { IDLE_FETCHER, IDLE_NAVIGATION, Action, - invariant, + UNSAFE_invariant as invariant, isRouteErrorResponse, UNSAFE_convertRoutesToDataRoutes as convertRoutesToDataRoutes, } from "@remix-run/router"; diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index b76e5781e8..1b5daa76f1 100644 --- a/packages/react-router/lib/components.tsx +++ b/packages/react-router/lib/components.tsx @@ -12,7 +12,7 @@ import { Action as NavigationType, AbortedDeferredError, createMemoryHistory, - invariant, + UNSAFE_invariant as invariant, parsePath, stripBasename, warning, diff --git a/packages/react-router/lib/hooks.tsx b/packages/react-router/lib/hooks.tsx index f766c26e83..951b434670 100644 --- a/packages/react-router/lib/hooks.tsx +++ b/packages/react-router/lib/hooks.tsx @@ -13,7 +13,7 @@ import type { } from "@remix-run/router"; import { Action as NavigationType, - invariant, + UNSAFE_invariant as invariant, isRouteErrorResponse, joinPaths, matchPath, diff --git a/packages/router/index.ts b/packages/router/index.ts index 21670631d3..323f02ca68 100644 --- a/packages/router/index.ts +++ b/packages/router/index.ts @@ -63,7 +63,6 @@ export { createPath, createHashHistory, createMemoryHistory, - invariant, parsePath, } from "./history"; @@ -82,3 +81,5 @@ export { convertRoutesToDataRoutes as UNSAFE_convertRoutesToDataRoutes, getPathContributingMatches as UNSAFE_getPathContributingMatches, } from "./utils"; + +export { invariant as UNSAFE_invariant } from "./history"; From 1227e5ff78be4c27800cca3466ae91e5f4183351 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 7 Feb 2023 17:46:45 -0500 Subject: [PATCH 2/4] Add changeset --- .changeset/fluffy-forks-attack.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/fluffy-forks-attack.md diff --git a/.changeset/fluffy-forks-attack.md b/.changeset/fluffy-forks-attack.md new file mode 100644 index 0000000000..52df984834 --- /dev/null +++ b/.changeset/fluffy-forks-attack.md @@ -0,0 +1,5 @@ +--- +"@remix-run/router": patch +--- + +Change `invariant` to an `UNSAFE_` export since it's only intended for internal use From e34820fecf10c3bcbe0c61709959555b23c50780 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Tue, 7 Feb 2023 17:56:31 -0500 Subject: [PATCH 3/4] Organize imports --- packages/react-router-dom/index.tsx | 52 ++++++++++++------------ packages/react-router-dom/server.tsx | 6 +-- packages/react-router/index.ts | 38 ++++++++--------- packages/react-router/lib/components.tsx | 18 ++++---- packages/react-router/lib/context.ts | 4 +- packages/react-router/lib/hooks.tsx | 10 ++--- packages/router/index.ts | 50 +++++++++++------------ packages/router/router.ts | 14 +++---- 8 files changed, 94 insertions(+), 98 deletions(-) diff --git a/packages/react-router-dom/index.tsx b/packages/react-router-dom/index.tsx index 560c85a483..99f1a2b167 100644 --- a/packages/react-router-dom/index.tsx +++ b/packages/react-router-dom/index.tsx @@ -3,28 +3,6 @@ * you'll need to update the rollup config for react-router-dom-v5-compat. */ import * as React from "react"; -import type { - NavigateOptions, - RelativeRoutingType, - RouteObject, - To, -} from "react-router"; -import { - Router, - createPath, - useHref, - useLocation, - useMatches, - useNavigate, - useNavigation, - useResolvedPath, - unstable_useBlocker as useBlocker, - UNSAFE_DataRouterContext as DataRouterContext, - UNSAFE_DataRouterStateContext as DataRouterStateContext, - UNSAFE_NavigationContext as NavigationContext, - UNSAFE_RouteContext as RouteContext, - UNSAFE_enhanceManualRouteObjects as enhanceManualRouteObjects, -} from "react-router"; import type { BrowserHistory, Fetcher, @@ -37,17 +15,39 @@ import type { Router as RemixRouter, } from "@remix-run/router"; import { - createRouter, createBrowserHistory, createHashHistory, - UNSAFE_invariant as invariant, - joinPaths, + createRouter, ErrorResponse, + joinPaths, + UNSAFE_invariant as invariant, } from "@remix-run/router"; +import type { + NavigateOptions, + RelativeRoutingType, + RouteObject, + To, +} from "react-router"; +import { + createPath, + Router, + UNSAFE_DataRouterContext as DataRouterContext, + UNSAFE_DataRouterStateContext as DataRouterStateContext, + UNSAFE_enhanceManualRouteObjects as enhanceManualRouteObjects, + UNSAFE_NavigationContext as NavigationContext, + UNSAFE_RouteContext as RouteContext, + unstable_useBlocker as useBlocker, + useHref, + useLocation, + useMatches, + useNavigate, + useNavigation, + useResolvedPath, +} from "react-router"; import type { - SubmitOptions, ParamKeyValuePair, + SubmitOptions, URLSearchParamsInit, } from "./dom"; import { diff --git a/packages/react-router-dom/server.tsx b/packages/react-router-dom/server.tsx index 7800f856ce..41795ef43d 100644 --- a/packages/react-router-dom/server.tsx +++ b/packages/react-router-dom/server.tsx @@ -7,12 +7,12 @@ import type { StaticHandlerContext, } from "@remix-run/router"; import { + Action, IDLE_FETCHER, IDLE_NAVIGATION, - Action, - UNSAFE_invariant as invariant, isRouteErrorResponse, UNSAFE_convertRoutesToDataRoutes as convertRoutesToDataRoutes, + UNSAFE_invariant as invariant, } from "@remix-run/router"; import type { DataRouteObject, @@ -20,11 +20,11 @@ import type { RouteObject, To, } from "react-router-dom"; -import { Routes } from "react-router-dom"; import { createPath, parsePath, Router, + Routes, UNSAFE_DataRouterContext as DataRouterContext, UNSAFE_DataRouterStateContext as DataRouterStateContext, UNSAFE_enhanceManualRouteObjects as enhanceManualRouteObjects, diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 3d55ed2e22..0771509ea7 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -5,13 +5,14 @@ import type { BlockerFunction, Fetcher, HydrationState, + InitialEntry, JsonFunction, LoaderFunction, LoaderFunctionArgs, Location, Navigation, - Params, ParamParseKey, + Params, Path, PathMatch, PathPattern, @@ -19,7 +20,6 @@ import type { Router as RemixRouter, ShouldRevalidateFunction, To, - InitialEntry, } from "@remix-run/router"; import { AbortedDeferredError, @@ -40,25 +40,25 @@ import { import type { AwaitProps, + IndexRouteProps, + LayoutRouteProps, MemoryRouterProps, NavigateProps, OutletProps, - RouteProps, PathRouteProps, - LayoutRouteProps, - IndexRouteProps, + RouteProps, RouterProps, - RoutesProps, RouterProviderProps, + RoutesProps, } from "./lib/components"; import { - enhanceManualRouteObjects, - createRoutesFromChildren, - renderMatches, Await, + createRoutesFromChildren, + enhanceManualRouteObjects, MemoryRouter, Navigate, Outlet, + renderMatches, Route, Router, RouterProvider, @@ -68,12 +68,12 @@ import type { DataRouteMatch, DataRouteObject, IndexRouteObject, - Navigator, NavigateOptions, + Navigator, NonIndexRouteObject, + RelativeRoutingType, RouteMatch, RouteObject, - RelativeRoutingType, } from "./lib/context"; import { DataRouterContext, @@ -84,27 +84,27 @@ 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, - useLoaderData, - useMatches, - useNavigation, useRevalidator, useRouteError, useRouteLoaderData, + useRoutes, } from "./lib/hooks"; // Exported for backwards compatibility, but not being used internally anymore diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index 1b5daa76f1..703a22398a 100644 --- a/packages/react-router/lib/components.tsx +++ b/packages/react-router/lib/components.tsx @@ -1,39 +1,39 @@ -import * as React from "react"; import type { - TrackedPromise, InitialEntry, Location, MemoryHistory, Router as RemixRouter, RouterState, To, + TrackedPromise, } from "@remix-run/router"; import { - Action as NavigationType, AbortedDeferredError, + Action as NavigationType, createMemoryHistory, - UNSAFE_invariant as invariant, parsePath, stripBasename, + UNSAFE_invariant as invariant, warning, } from "@remix-run/router"; +import * as React from "react"; import { useSyncExternalStore as useSyncExternalStoreShim } from "./use-sync-external-store-shim"; import type { DataRouteObject, IndexRouteObject, - RouteMatch, - RouteObject, Navigator, NonIndexRouteObject, RelativeRoutingType, + RouteMatch, + RouteObject, } from "./context"; import { - LocationContext, - NavigationContext, + AwaitContext, DataRouterContext, DataRouterStateContext, - AwaitContext, + LocationContext, + NavigationContext, } from "./context"; import { useAsyncValue, diff --git a/packages/react-router/lib/context.ts b/packages/react-router/lib/context.ts index e29e01ef1b..0e6943a517 100644 --- a/packages/react-router/lib/context.ts +++ b/packages/react-router/lib/context.ts @@ -1,8 +1,9 @@ import * as React from "react"; import type { - AgnosticRouteMatch, + Action as NavigationType, AgnosticIndexRouteObject, AgnosticNonIndexRouteObject, + AgnosticRouteMatch, History, Location, Router, @@ -10,7 +11,6 @@ import type { To, TrackedPromise, } 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 diff --git a/packages/react-router/lib/hooks.tsx b/packages/react-router/lib/hooks.tsx index 951b434670..6676837ef0 100644 --- a/packages/react-router/lib/hooks.tsx +++ b/packages/react-router/lib/hooks.tsx @@ -13,33 +13,33 @@ import type { } from "@remix-run/router"; import { Action as NavigationType, - UNSAFE_invariant as invariant, isRouteErrorResponse, joinPaths, matchPath, matchRoutes, parsePath, resolveTo, - warning, UNSAFE_getPathContributingMatches as getPathContributingMatches, + UNSAFE_invariant as invariant, + warning, } from "@remix-run/router"; import type { + DataRouteMatch, NavigateOptions, + RelativeRoutingType, RouteContextObject, RouteMatch, RouteObject, - DataRouteMatch, - RelativeRoutingType, } from "./context"; import { + AwaitContext, DataRouterContext, DataRouterStateContext, LocationContext, NavigationContext, RouteContext, RouteErrorContext, - AwaitContext, } from "./context"; /** diff --git a/packages/router/index.ts b/packages/router/index.ts index 323f02ca68..8ca47db39d 100644 --- a/packages/router/index.ts +++ b/packages/router/index.ts @@ -1,3 +1,24 @@ +export type { + BrowserHistory, + BrowserHistoryOptions, + HashHistory, + HashHistoryOptions, + History, + InitialEntry, + Location, + MemoryHistory, + MemoryHistoryOptions, + Path, + To, +} from "./history"; +export { + Action, + createBrowserHistory, + createHashHistory, + createMemoryHistory, + createPath, + parsePath, +} from "./history"; export type { ActionFunction, ActionFunctionArgs, @@ -9,7 +30,6 @@ export type { AgnosticNonIndexRouteObject, AgnosticRouteMatch, AgnosticRouteObject, - TrackedPromise, FormEncType, FormMethod, JsonFunction, @@ -22,12 +42,12 @@ export type { RedirectFunction, ShouldRevalidateFunction, Submission, + TrackedPromise, } from "./utils"; - export { AbortedDeferredError, - ErrorResponse, defer, + ErrorResponse, generatePath, getToPathname, isRouteErrorResponse, @@ -42,30 +62,6 @@ export { stripBasename, warning, } from "./utils"; - -export type { - BrowserHistory, - BrowserHistoryOptions, - HashHistory, - HashHistoryOptions, - History, - InitialEntry, - Location, - MemoryHistory, - MemoryHistoryOptions, - Path, - To, -} from "./history"; - -export { - Action, - createBrowserHistory, - createPath, - createHashHistory, - createMemoryHistory, - parsePath, -} from "./history"; - export * from "./router"; /////////////////////////////////////////////////////////////////////////////// diff --git a/packages/router/router.ts b/packages/router/router.ts index 874be611d6..b9007bbe27 100644 --- a/packages/router/router.ts +++ b/packages/router/router.ts @@ -7,32 +7,32 @@ import { parsePath, } from "./history"; import type { - DataResult, AgnosticDataRouteMatch, AgnosticDataRouteObject, + AgnosticRouteMatch, + AgnosticRouteObject, + DataResult, DeferredResult, ErrorResult, FormEncType, FormMethod, + MutationFormMethod, RedirectResult, RouteData, - AgnosticRouteObject, + ShouldRevalidateFunction, Submission, SuccessResult, - AgnosticRouteMatch, - MutationFormMethod, - ShouldRevalidateFunction, } from "./utils"; import { + convertRoutesToDataRoutes, DeferredData, ErrorResponse, - ResultType, - convertRoutesToDataRoutes, getPathContributingMatches, isRouteErrorResponse, joinPaths, matchRoutes, resolveTo, + ResultType, warning, } from "./utils"; From d1bf58ae1f2d2e107137f8d83a45ab9aecf9d7b9 Mon Sep 17 00:00:00 2001 From: Matt Brophy Date: Wed, 15 Feb 2023 10:10:59 -0500 Subject: [PATCH 4/4] Revert "Organize imports" This reverts commit e34820fecf10c3bcbe0c61709959555b23c50780. --- packages/react-router-dom/index.tsx | 52 ++++++++++++------------ packages/react-router-dom/server.tsx | 6 +-- packages/react-router/index.ts | 38 ++++++++--------- packages/react-router/lib/components.tsx | 18 ++++---- packages/react-router/lib/context.ts | 4 +- packages/react-router/lib/hooks.tsx | 10 ++--- packages/router/index.ts | 50 ++++++++++++----------- packages/router/router.ts | 14 +++---- 8 files changed, 98 insertions(+), 94 deletions(-) diff --git a/packages/react-router-dom/index.tsx b/packages/react-router-dom/index.tsx index 99f1a2b167..560c85a483 100644 --- a/packages/react-router-dom/index.tsx +++ b/packages/react-router-dom/index.tsx @@ -3,6 +3,28 @@ * you'll need to update the rollup config for react-router-dom-v5-compat. */ import * as React from "react"; +import type { + NavigateOptions, + RelativeRoutingType, + RouteObject, + To, +} from "react-router"; +import { + Router, + createPath, + useHref, + useLocation, + useMatches, + useNavigate, + useNavigation, + useResolvedPath, + unstable_useBlocker as useBlocker, + UNSAFE_DataRouterContext as DataRouterContext, + UNSAFE_DataRouterStateContext as DataRouterStateContext, + UNSAFE_NavigationContext as NavigationContext, + UNSAFE_RouteContext as RouteContext, + UNSAFE_enhanceManualRouteObjects as enhanceManualRouteObjects, +} from "react-router"; import type { BrowserHistory, Fetcher, @@ -15,39 +37,17 @@ import type { Router as RemixRouter, } from "@remix-run/router"; import { + createRouter, createBrowserHistory, createHashHistory, - createRouter, - ErrorResponse, - joinPaths, UNSAFE_invariant as invariant, + joinPaths, + ErrorResponse, } from "@remix-run/router"; -import type { - NavigateOptions, - RelativeRoutingType, - RouteObject, - To, -} from "react-router"; -import { - createPath, - Router, - UNSAFE_DataRouterContext as DataRouterContext, - UNSAFE_DataRouterStateContext as DataRouterStateContext, - UNSAFE_enhanceManualRouteObjects as enhanceManualRouteObjects, - UNSAFE_NavigationContext as NavigationContext, - UNSAFE_RouteContext as RouteContext, - unstable_useBlocker as useBlocker, - useHref, - useLocation, - useMatches, - useNavigate, - useNavigation, - useResolvedPath, -} from "react-router"; import type { - ParamKeyValuePair, SubmitOptions, + ParamKeyValuePair, URLSearchParamsInit, } from "./dom"; import { diff --git a/packages/react-router-dom/server.tsx b/packages/react-router-dom/server.tsx index 41795ef43d..7800f856ce 100644 --- a/packages/react-router-dom/server.tsx +++ b/packages/react-router-dom/server.tsx @@ -7,12 +7,12 @@ import type { StaticHandlerContext, } from "@remix-run/router"; import { - Action, IDLE_FETCHER, IDLE_NAVIGATION, + Action, + UNSAFE_invariant as invariant, isRouteErrorResponse, UNSAFE_convertRoutesToDataRoutes as convertRoutesToDataRoutes, - UNSAFE_invariant as invariant, } from "@remix-run/router"; import type { DataRouteObject, @@ -20,11 +20,11 @@ import type { RouteObject, To, } from "react-router-dom"; +import { Routes } from "react-router-dom"; import { createPath, parsePath, Router, - Routes, UNSAFE_DataRouterContext as DataRouterContext, UNSAFE_DataRouterStateContext as DataRouterStateContext, UNSAFE_enhanceManualRouteObjects as enhanceManualRouteObjects, diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts index 0771509ea7..3d55ed2e22 100644 --- a/packages/react-router/index.ts +++ b/packages/react-router/index.ts @@ -5,14 +5,13 @@ import type { BlockerFunction, Fetcher, HydrationState, - InitialEntry, JsonFunction, LoaderFunction, LoaderFunctionArgs, Location, Navigation, - ParamParseKey, Params, + ParamParseKey, Path, PathMatch, PathPattern, @@ -20,6 +19,7 @@ import type { Router as RemixRouter, ShouldRevalidateFunction, To, + InitialEntry, } from "@remix-run/router"; import { AbortedDeferredError, @@ -40,25 +40,25 @@ import { import type { AwaitProps, - IndexRouteProps, - LayoutRouteProps, MemoryRouterProps, NavigateProps, OutletProps, - PathRouteProps, RouteProps, + PathRouteProps, + LayoutRouteProps, + IndexRouteProps, RouterProps, - RouterProviderProps, RoutesProps, + RouterProviderProps, } from "./lib/components"; import { - Await, - createRoutesFromChildren, enhanceManualRouteObjects, + createRoutesFromChildren, + renderMatches, + Await, MemoryRouter, Navigate, Outlet, - renderMatches, Route, Router, RouterProvider, @@ -68,12 +68,12 @@ import type { DataRouteMatch, DataRouteObject, IndexRouteObject, - NavigateOptions, Navigator, + NavigateOptions, NonIndexRouteObject, - RelativeRoutingType, RouteMatch, RouteObject, + RelativeRoutingType, } from "./lib/context"; import { DataRouterContext, @@ -84,27 +84,27 @@ import { } from "./lib/context"; import type { NavigateFunction } from "./lib/hooks"; import { - useActionData, - useAsyncError, - useAsyncValue, useBlocker, useHref, useInRouterContext, - useLoaderData, useLocation, useMatch, - useMatches, - useNavigate, - useNavigation, useNavigationType, + useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, + useRoutes, + useActionData, + useAsyncError, + useAsyncValue, + useLoaderData, + useMatches, + useNavigation, useRevalidator, useRouteError, useRouteLoaderData, - useRoutes, } from "./lib/hooks"; // Exported for backwards compatibility, but not being used internally anymore diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx index 703a22398a..1b5daa76f1 100644 --- a/packages/react-router/lib/components.tsx +++ b/packages/react-router/lib/components.tsx @@ -1,39 +1,39 @@ +import * as React from "react"; import type { + TrackedPromise, InitialEntry, Location, MemoryHistory, Router as RemixRouter, RouterState, To, - TrackedPromise, } from "@remix-run/router"; import { - AbortedDeferredError, Action as NavigationType, + AbortedDeferredError, createMemoryHistory, + UNSAFE_invariant as invariant, parsePath, stripBasename, - UNSAFE_invariant as invariant, warning, } from "@remix-run/router"; -import * as React from "react"; import { useSyncExternalStore as useSyncExternalStoreShim } from "./use-sync-external-store-shim"; import type { DataRouteObject, IndexRouteObject, + RouteMatch, + RouteObject, Navigator, NonIndexRouteObject, RelativeRoutingType, - RouteMatch, - RouteObject, } from "./context"; import { - AwaitContext, - DataRouterContext, - DataRouterStateContext, LocationContext, NavigationContext, + DataRouterContext, + DataRouterStateContext, + AwaitContext, } from "./context"; import { useAsyncValue, diff --git a/packages/react-router/lib/context.ts b/packages/react-router/lib/context.ts index 0e6943a517..e29e01ef1b 100644 --- a/packages/react-router/lib/context.ts +++ b/packages/react-router/lib/context.ts @@ -1,9 +1,8 @@ import * as React from "react"; import type { - Action as NavigationType, + AgnosticRouteMatch, AgnosticIndexRouteObject, AgnosticNonIndexRouteObject, - AgnosticRouteMatch, History, Location, Router, @@ -11,6 +10,7 @@ import type { To, TrackedPromise, } 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 diff --git a/packages/react-router/lib/hooks.tsx b/packages/react-router/lib/hooks.tsx index 6676837ef0..951b434670 100644 --- a/packages/react-router/lib/hooks.tsx +++ b/packages/react-router/lib/hooks.tsx @@ -13,33 +13,33 @@ import type { } from "@remix-run/router"; import { Action as NavigationType, + UNSAFE_invariant as invariant, isRouteErrorResponse, joinPaths, matchPath, matchRoutes, parsePath, resolveTo, - UNSAFE_getPathContributingMatches as getPathContributingMatches, - UNSAFE_invariant as invariant, warning, + UNSAFE_getPathContributingMatches as getPathContributingMatches, } from "@remix-run/router"; import type { - DataRouteMatch, NavigateOptions, - RelativeRoutingType, RouteContextObject, RouteMatch, RouteObject, + DataRouteMatch, + RelativeRoutingType, } from "./context"; import { - AwaitContext, DataRouterContext, DataRouterStateContext, LocationContext, NavigationContext, RouteContext, RouteErrorContext, + AwaitContext, } from "./context"; /** diff --git a/packages/router/index.ts b/packages/router/index.ts index 8ca47db39d..323f02ca68 100644 --- a/packages/router/index.ts +++ b/packages/router/index.ts @@ -1,24 +1,3 @@ -export type { - BrowserHistory, - BrowserHistoryOptions, - HashHistory, - HashHistoryOptions, - History, - InitialEntry, - Location, - MemoryHistory, - MemoryHistoryOptions, - Path, - To, -} from "./history"; -export { - Action, - createBrowserHistory, - createHashHistory, - createMemoryHistory, - createPath, - parsePath, -} from "./history"; export type { ActionFunction, ActionFunctionArgs, @@ -30,6 +9,7 @@ export type { AgnosticNonIndexRouteObject, AgnosticRouteMatch, AgnosticRouteObject, + TrackedPromise, FormEncType, FormMethod, JsonFunction, @@ -42,12 +22,12 @@ export type { RedirectFunction, ShouldRevalidateFunction, Submission, - TrackedPromise, } from "./utils"; + export { AbortedDeferredError, - defer, ErrorResponse, + defer, generatePath, getToPathname, isRouteErrorResponse, @@ -62,6 +42,30 @@ export { stripBasename, warning, } from "./utils"; + +export type { + BrowserHistory, + BrowserHistoryOptions, + HashHistory, + HashHistoryOptions, + History, + InitialEntry, + Location, + MemoryHistory, + MemoryHistoryOptions, + Path, + To, +} from "./history"; + +export { + Action, + createBrowserHistory, + createPath, + createHashHistory, + createMemoryHistory, + parsePath, +} from "./history"; + export * from "./router"; /////////////////////////////////////////////////////////////////////////////// diff --git a/packages/router/router.ts b/packages/router/router.ts index b9007bbe27..874be611d6 100644 --- a/packages/router/router.ts +++ b/packages/router/router.ts @@ -7,32 +7,32 @@ import { parsePath, } from "./history"; import type { + DataResult, AgnosticDataRouteMatch, AgnosticDataRouteObject, - AgnosticRouteMatch, - AgnosticRouteObject, - DataResult, DeferredResult, ErrorResult, FormEncType, FormMethod, - MutationFormMethod, RedirectResult, RouteData, - ShouldRevalidateFunction, + AgnosticRouteObject, Submission, SuccessResult, + AgnosticRouteMatch, + MutationFormMethod, + ShouldRevalidateFunction, } from "./utils"; import { - convertRoutesToDataRoutes, DeferredData, ErrorResponse, + ResultType, + convertRoutesToDataRoutes, getPathContributingMatches, isRouteErrorResponse, joinPaths, matchRoutes, resolveTo, - ResultType, warning, } from "./utils";