Limit code churn

packages/router/src/__tests__/links.test.tsx

@@ -6,7 +6,7 @@ import { act, render, waitFor } from '@testing-library/react'
 expect.extend({ toHaveClass, toHaveStyle })
 
 import { navigate, Route, Router, routes } from '../'
-import { Link, NavLink, useMatch } from '../links'
+import { NavLink, useMatch, Link } from '../links'
 import { LocationProvider } from '../location'
 import { flattenSearchParams, RouteParams } from '../util'
 

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 { navigate, back } 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 { Route, Router, routes } from './router'
+export { useParams, ParamsProvider, ParamsContext } from './params'
+export { Router, Route, 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 { SkipNavLink, SkipNavContent } from '@reach/skip-nav'
 
 // Used by packages/internal/src/generate/templates/web-routerRoutes.d.ts.template
 export * from './routeParamsTypes'

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 }

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,
 }

packages/router/src/util.ts

@@ -308,7 +308,6 @@ export const RouteParams = {
  * given args object. Any extra params not used in the path will be appended
  * as key=value pairs in the search part.
  *
- *
  * Examples:
  *
  *   replaceParams('/tags/{tag}', { tag: 'code', extra: 'foo' })