From 12f739fd83b0a9cba95b614509cac9854ff9a7a9 Mon Sep 17 00:00:00 2001
From: Tobbe Lundberg <tobbe@tlundberg.com>
Date: Fri, 28 Jul 2023 09:17:16 +0200
Subject: [PATCH] Limit code churn

---
 packages/router/src/index.ts   | 18 +++++++++---------
 packages/router/src/links.tsx  |  2 +-
 packages/router/src/router.tsx |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/router/src/index.ts b/packages/router/src/index.ts
index 5085ade1d5d9..a3a8e4d9e404 100644
--- a/packages/router/src/index.ts
+++ b/packages/router/src/index.ts
@@ -2,24 +2,24 @@
 // Rails' routing approach and from both React Router and Reach Router (the
 // latter of which has closely inspired some of this code).
 
+export { back, navigate } from './history'
+export { Link, NavLink, useMatch, Redirect } from './links'
+export { useLocation, LocationProvider } from './location'
 export {
-  PageLoadingContextProvider,
   usePageLoadingContext,
+  PageLoadingContextProvider,
 } from './PageLoadingContext'
-export { back, navigate } from './history'
-export { Link, NavLink, Redirect, useMatch } from './links'
-export { LocationProvider, useLocation } from './location'
-export { ParamsContext, ParamsProvider, useParams } from './params'
+export { useParams, ParamsProvider, ParamsContext } from './params'
 export { Route, Router, routes } from './router'
 
 export * from './Set'
 
-export * from './route-announcement'
 export { default as RouteAnnouncement } from './route-announcement'
-export * from './route-focus'
+export * from './route-announcement'
 export { default as RouteFocus } from './route-focus'
+export * from './route-focus'
 
-export { getRouteRegexAndParams, matchPath, parseSearch } from './util'
+export { parseSearch, getRouteRegexAndParams, matchPath } from './util'
 
 /**
  * A more specific interface will be generated by
@@ -38,7 +38,7 @@ export interface AvailableRoutes {
   ) => string
 }
 
-export { SkipNavContent, SkipNavLink } from '@reach/skip-nav'
+export { SkipNavLinkProps, SkipNavContent } from '@reach/skip-nav'
 
 // Used by packages/internal/src/generate/templates/web-routerRoutes.d.ts.template
 export * from './routeParamsTypes'
diff --git a/packages/router/src/links.tsx b/packages/router/src/links.tsx
index 987bf5572224..d3ee67029a43 100644
--- a/packages/router/src/links.tsx
+++ b/packages/router/src/links.tsx
@@ -190,4 +190,4 @@ const Redirect = ({ to, options }: RedirectProps) => {
   return null
 }
 
-export { Link, NavLink, Redirect, useMatch }
+export { Link, NavLink, useMatch, Redirect }
diff --git a/packages/router/src/router.tsx b/packages/router/src/router.tsx
index 1fdb131dca5b..461a6497966f 100644
--- a/packages/router/src/router.tsx
+++ b/packages/router/src/router.tsx
@@ -1,4 +1,4 @@
-import React, { memo, ReactElement, ReactNode, useMemo } from 'react'
+import React, { ReactNode, ReactElement, useMemo, memo } from 'react'
 
 import { ActiveRouteLoader } from './active-route-loader'
 import { AuthenticatedRoute } from './AuthenticatedRoute'
@@ -248,9 +248,9 @@ const WrappedPage = memo(
 )
 
 export {
-  isValidRoute as isRoute,
-  PageType,
-  Route,
   Router,
+  Route,
   namedRoutes as routes,
+  isValidRoute as isRoute,
+  PageType,
 }