Update imports from react-router-dom

app/src/accounts/AccountForm.tsx

@@ -3,7 +3,7 @@ import Button from "react-bootstrap/Button";
 import FormGroup from "react-bootstrap/FormGroup";
 import FormLabel from "react-bootstrap/FormLabel";
 import FormControl from "react-bootstrap/FormControl";
-import { Form } from "react-router-dom";
+import { Form } from "react-router";
 import { BuildingAdd } from "react-bootstrap-icons";
 
 export default function AccountForm() {

app/src/accounts/AccountList.tsx

@@ -2,7 +2,7 @@ import Container from "react-bootstrap/Container";
 import Row from "react-bootstrap/Row";
 import Col from "react-bootstrap/Col";
 import React from "react";
-import { useLoaderData, useAsyncValue, Await } from "react-router-dom";
+import { useLoaderData, useAsyncValue, Await } from "react-router";
 import { Account } from "../ApiClient";
 import ListGroup from "react-bootstrap/ListGroup";
 import { LinkContainer } from "react-router-bootstrap";

app/src/accounts/AccountSummary.tsx

@@ -2,7 +2,7 @@ import Breadcrumb from "react-bootstrap/Breadcrumb";
 import Col from "react-bootstrap/Col";
 import Row from "react-bootstrap/Row";
 import ListGroup from "react-bootstrap/ListGroup";
-import { useFetcher, useParams, useRouteLoaderData } from "react-router-dom";
+import { useFetcher, useParams, useRouteLoaderData } from "react-router";
 import {
   ChangeEvent,
   FormEvent,

app/src/accounts/NextSteps/AggregatorTypeSelection.tsx

@@ -13,7 +13,7 @@ import {
   useParams,
   useLoaderData,
   useRevalidator,
-} from "react-router-dom";
+} from "react-router";
 import ApiClient, {
   Aggregator,
   NewAggregator,

app/src/accounts/NextSteps/InlineCollectorCredentials.tsx

@@ -1,5 +1,5 @@
 import { Button, Col, Row } from "react-bootstrap";
-import { useFetcher, useParams, useRevalidator } from "react-router-dom";
+import { useFetcher, useParams, useRevalidator } from "react-router";
 import { ApiToken } from "../../ApiClient";
 import React from "react";
 import useInterval from "use-interval";

app/src/accounts/NextSteps/index.tsx

@@ -1,6 +1,6 @@
 import { Steps } from "primereact/steps";
 import { Button, Card, Col, Row } from "react-bootstrap";
-import { useLoaderData } from "react-router-dom";
+import { useLoaderData } from "react-router";
 import {
   Account,
   Aggregator,

app/src/accounts/index.tsx

@@ -1,4 +1,4 @@
-import { RouteObject, redirect } from "react-router-dom";
+import { RouteObject, redirect } from "react-router";
 import ApiClient, { NewAccount, UpdateAccount } from "../ApiClient";
 import AccountSummary from "./AccountSummary";
 import AccountForm from "./AccountForm";

app/src/admin/index.tsx

@@ -1,4 +1,4 @@
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 import ApiClient from "../ApiClient";
 
 export default function admin(

app/src/aggregators/AggregatorDetail.tsx

@@ -1,4 +1,4 @@
-import { Await, useLoaderData, useParams } from "react-router-dom";
+import { Await, useLoaderData, useParams } from "react-router";
 import { Aggregator } from "../ApiClient";
 import { AccountBreadcrumbs } from "../util";
 import { LinkContainer } from "react-router-bootstrap";

app/src/aggregators/AggregatorForm.tsx

@@ -18,7 +18,7 @@ import {
   useNavigate,
   useNavigation,
   useParams,
-} from "react-router-dom";
+} from "react-router";
 import { ApiClientContext } from "../ApiClientContext";
 
 async function submit(

app/src/aggregators/AggregatorList.tsx

@@ -6,7 +6,7 @@ import { AccountBreadcrumbs, WithAccount } from "../util";
 import { CloudUpload } from "react-bootstrap-icons";
 import { Suspense } from "react";
 import { LinkContainer } from "react-router-bootstrap";
-import { Await, useLoaderData } from "react-router-dom";
+import { Await, useLoaderData } from "react-router";
 import { Aggregator } from "../ApiClient";
 import { ListGroup } from "react-bootstrap";
 import D from "../logo/color/svg/small.svg";

app/src/aggregators/DeleteAggregatorButton.tsx

@@ -1,4 +1,4 @@
-import { useFetcher, useNavigation } from "react-router-dom";
+import { useFetcher, useNavigation } from "react-router";
 import React, { useEffect, useState } from "react";
 import { Trash } from "react-bootstrap-icons";
 import { Button, Modal } from "react-bootstrap";

app/src/aggregators/RenameAggregatorButton.tsx

@@ -1,4 +1,4 @@
-import { useFetcher } from "react-router-dom";
+import { useFetcher } from "react-router";
 import React from "react";
 import { Pencil, PencilSquare } from "react-bootstrap-icons";
 import {

app/src/aggregators/RotateBearerTokenButton.tsx

@@ -1,4 +1,4 @@
-import { useFetcher } from "react-router-dom";
+import { useFetcher } from "react-router";
 import React from "react";
 import { ArrowRepeat } from "react-bootstrap-icons";
 import {

app/src/aggregators/index.tsx

@@ -2,7 +2,7 @@ import Aggregators from "./AggregatorList";
 import AggregatorFormPage from "./AggregatorForm";
 import AggregatorDetail from "./AggregatorDetail";
 import ApiClient from "../ApiClient";
-import { RouteObject, redirect } from "react-router-dom";
+import { RouteObject, redirect } from "react-router";
 
 export default function aggregators(apiClient: ApiClient): RouteObject {
   return {

app/src/api-tokens/ApiTokenList.tsx

@@ -20,7 +20,7 @@ import {
   useFetcher,
   useLoaderData,
   useNavigation,
-} from "react-router-dom";
+} from "react-router";
 import { ApiToken } from "../ApiClient";
 import Table from "react-bootstrap/Table";
 import React from "react";

app/src/api-tokens/index.tsx

@@ -1,4 +1,4 @@
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 import ApiClient from "../ApiClient";
 import ApiTokens from "./ApiTokenList";
 

app/src/collector-credentials/CollectorCredentialForm.tsx

@@ -14,7 +14,7 @@ import {
   Row,
 } from "react-bootstrap";
 import { KeyFill } from "react-bootstrap-icons";
-import { useFetcher } from "react-router-dom";
+import { useFetcher } from "react-router";
 import { formikErrors } from "../ApiClient";
 import { CopyCode } from "../util";
 

app/src/collector-credentials/CollectorCredentialList.tsx

@@ -12,12 +12,7 @@ import {
   XCircle,
 } from "react-bootstrap-icons";
 import { Suspense, useCallback, useEffect, useState } from "react";
-import {
-  Await,
-  useFetcher,
-  useLoaderData,
-  useNavigation,
-} from "react-router-dom";
+import { Await, useFetcher, useLoaderData, useNavigation } from "react-router";
 import { CollectorCredential } from "../ApiClient";
 import Table from "react-bootstrap/Table";
 import React from "react";

app/src/collector-credentials/index.tsx

@@ -1,4 +1,4 @@
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 import ApiClient from "../ApiClient";
 import CollectorCredentials from "./CollectorCredentialList";
 export default function collectorCredentials(

app/src/layout/ErrorPage.tsx

@@ -1,6 +1,6 @@
 import { AxiosError } from "axios";
 import Alert from "react-bootstrap/Alert";
-import { isRouteErrorResponse, useRouteError } from "react-router-dom";
+import { isRouteErrorResponse, useRouteError } from "react-router";
 import ApiClient from "../ApiClient";
 import Layout from "./Layout";
 import React from "react";

app/src/layout/Header.tsx

@@ -1,4 +1,4 @@
-import { Await, Link, useAsyncValue, useLoaderData } from "react-router-dom";
+import { Await, Link, useAsyncValue, useLoaderData } from "react-router";
 import Container from "react-bootstrap/Container";
 import Navbar from "react-bootstrap/Navbar";
 import { User } from "../ApiClient";

app/src/layout/Layout.tsx

@@ -1,4 +1,4 @@
-import { Outlet } from "react-router-dom";
+import { Outlet } from "react-router";
 import Container from "react-bootstrap/Container";
 import Header, { HeaderPlaceholder } from "./Header";
 

app/src/layout/index.tsx

@@ -1,4 +1,4 @@
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 import ApiClient from "../ApiClient";
 import ErrorPage from "./ErrorPage";
 import Layout from "./Layout";

app/src/memberships/Memberships.tsx

@@ -8,7 +8,7 @@ import {
   useRouteLoaderData,
   Form,
   useSubmit,
-} from "react-router-dom";
+} from "react-router";
 import React, { Suspense, useState } from "react";
 import { Membership, User } from "../ApiClient";
 import { Button, FormControl } from "react-bootstrap";

app/src/memberships/index.tsx

@@ -1,4 +1,4 @@
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 import ApiClient from "../ApiClient";
 import Memberships from "./Memberships";
 

app/src/queue/Queue.tsx

@@ -11,7 +11,7 @@ import { Outlet, useLoaderData, useRevalidator } from "react-router";
 import { QueueJob } from "../ApiClient";
 import useInterval from "use-interval";
 import { LinkContainer } from "react-router-bootstrap";
-import { useSearchParams } from "react-router-dom";
+import { useSearchParams } from "react-router";
 import "@github/relative-time-element";
 import { DateTime } from "luxon";
 

app/src/queue/QueueJob.tsx

@@ -4,7 +4,7 @@ import { CheckSquare, Stopwatch, XCircle } from "react-bootstrap-icons";
 import { useLoaderData } from "react-router";
 import { QueueJob } from "../ApiClient";
 import { DateTime } from "luxon";
-import { Link } from "react-router-dom";
+import { Link } from "react-router";
 
 export const Component = QueueJobComponent;
 

app/src/router.tsx

@@ -4,7 +4,7 @@ import {
   RouterProvider,
   RouteObject,
   redirect,
-} from "react-router-dom";
+} from "react-router";
 import { ApiClientContext } from "./ApiClientContext";
 import { ApiClient } from "./ApiClient";
 import layout from "./layout";

app/src/shared-aggregators/SharedAggregatorForm.tsx

@@ -1,7 +1,7 @@
 import { FormikHelpers } from "formik";
 import ApiClient, { NewAggregator, formikErrors } from "../ApiClient";
 import { AggregatorForm } from "../aggregators/AggregatorForm";
-import { useRevalidator } from "react-router-dom";
+import { useRevalidator } from "react-router";
 import { ApiClientContext } from "../ApiClientContext";
 import React from "react";
 

app/src/shared-aggregators/SharedAggregatorList.tsx

@@ -11,12 +11,7 @@ import {
   Placeholder,
   Row,
 } from "react-bootstrap";
-import {
-  Await,
-  useFetcher,
-  useLoaderData,
-  useNavigation,
-} from "react-router-dom";
+import { Await, useFetcher, useLoaderData, useNavigation } from "react-router";
 import { Aggregator } from "../ApiClient";
 import "@github/relative-time-element";
 import { Suspense, useEffect, useState } from "react";

app/src/shared-aggregators/index.tsx

@@ -1,4 +1,4 @@
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 import ApiClient, { UpdateAggregator } from "../ApiClient";
 
 export default function sharedAggregators(apiClient: ApiClient): RouteObject {

app/src/swagger-ui.tsx

@@ -1,4 +1,4 @@
-import { RouteObject } from "react-router-dom";
+import { RouteObject } from "react-router";
 
 export default function swaggerUi(): RouteObject {
   return {

app/src/tasks/TaskDetail/ClientConfig.tsx

@@ -1,4 +1,4 @@
-import { useLoaderData } from "react-router-dom";
+import { useLoaderData } from "react-router";
 import Col from "react-bootstrap/Col";
 import { Tab, Tabs } from "react-bootstrap";
 import { Task, Aggregator } from "../../ApiClient";

app/src/tasks/TaskDetail/CollectorAuthTokens.tsx

@@ -1,4 +1,4 @@
-import { useFetcher } from "react-router-dom";
+import { useFetcher } from "react-router";
 import Col from "react-bootstrap/Col";
 import React from "react";
 import { Aggregator, CollectorAuthToken } from "../../ApiClient";

app/src/tasks/TaskDetail/DeleteTaskButton.tsx

@@ -1,4 +1,4 @@
-import { useFetcher, useNavigation } from "react-router-dom";
+import { useFetcher, useNavigation } from "react-router";
 import React, { useEffect, useState } from "react";
 import { Trash } from "react-bootstrap-icons";
 import { Button, Modal } from "react-bootstrap";

app/src/tasks/TaskDetail/DisableTaskButton.tsx

@@ -4,7 +4,7 @@ import {
   useLoaderData,
   useNavigation,
   useParams,
-} from "react-router-dom";
+} from "react-router";
 import React, { FormEvent, useCallback, useEffect, useState } from "react";
 import { Play, SignStop } from "react-bootstrap-icons";
 import { Button, Modal } from "react-bootstrap";

app/src/tasks/TaskDetail/Metrics.tsx

@@ -1,4 +1,4 @@
-import { Await, useLoaderData } from "react-router-dom";
+import { Await, useLoaderData } from "react-router";
 import Col from "react-bootstrap/Col";
 import { Suspense } from "react";
 import { Aggregator, Task } from "../../ApiClient";

app/src/tasks/TaskDetail/RenameTaskButton.tsx

@@ -1,4 +1,4 @@
-import { useFetcher } from "react-router-dom";
+import { useFetcher } from "react-router";
 import { useCallback, useEffect, useState } from "react";
 import { Pencil, PencilSquare } from "react-bootstrap-icons";
 import {

app/src/tasks/TaskDetail/TaskPropertyTable.tsx

@@ -1,4 +1,4 @@
-import { Await, useParams, useLoaderData, Link } from "react-router-dom";
+import { Await, useParams, useLoaderData, Link } from "react-router";
 import Col from "react-bootstrap/Col";
 import { Suspense } from "react";
 import { Task, Aggregator, CollectorCredential } from "../../ApiClient";

app/src/tasks/TaskDetail/index.tsx

@@ -1,4 +1,4 @@
-import { Await, useParams, useLoaderData } from "react-router-dom";
+import { Await, useParams, useLoaderData } from "react-router";
 import Breadcrumb from "react-bootstrap/Breadcrumb";
 import React, { Suspense } from "react";
 import Row from "react-bootstrap/Row";

app/src/tasks/TaskForm/HelperAggregator.tsx

@@ -1,4 +1,4 @@
-import { Await, useLoaderData } from "react-router-dom";
+import { Await, useLoaderData } from "react-router";
 import FormControl from "react-bootstrap/FormControl";
 import FormSelect from "react-bootstrap/FormSelect";
 import { Suspense } from "react";

app/src/tasks/TaskForm/LeaderAggregator.tsx

@@ -1,4 +1,4 @@
-import { Await, useLoaderData } from "react-router-dom";
+import { Await, useLoaderData } from "react-router";
 import FormControl from "react-bootstrap/FormControl";
 import FormSelect from "react-bootstrap/FormSelect";
 import { Suspense } from "react";

app/src/tasks/TaskForm/QueryType.tsx

@@ -1,4 +1,4 @@
-import { useLoaderData } from "react-router-dom";
+import { useLoaderData } from "react-router";
 import React, { ChangeEvent } from "react";
 import { Aggregator } from "../../ApiClient";
 import FormCheck from "react-bootstrap/FormCheck";

app/src/tasks/TaskForm/VdafType.tsx

@@ -1,4 +1,4 @@
-import { useLoaderData } from "react-router-dom";
+import { useLoaderData } from "react-router";
 import FormControl from "react-bootstrap/FormControl";
 import FormSelect from "react-bootstrap/FormSelect";
 import { Aggregator } from "../../ApiClient";

app/src/tasks/TaskForm/index.tsx

@@ -3,7 +3,7 @@ import {
   useNavigation,
   useParams,
   NavigateFunction,
-} from "react-router-dom";
+} from "react-router";
 import Breadcrumb from "react-bootstrap/Breadcrumb";
 import Button from "react-bootstrap/Button";
 import Col from "react-bootstrap/Col";

app/src/tasks/TaskList.tsx

@@ -2,7 +2,7 @@ import Breadcrumb from "react-bootstrap/Breadcrumb";
 import Col from "react-bootstrap/Col";
 import Row from "react-bootstrap/Row";
 import ListGroup from "react-bootstrap/ListGroup";
-import { Await, useLoaderData, useAsyncValue } from "react-router-dom";
+import { Await, useLoaderData, useAsyncValue } from "react-router";
 import { Suspense } from "react";
 import { Task } from "../ApiClient";
 import { Alert, Button, Spinner } from "react-bootstrap";

app/src/tasks/index.tsx

@@ -2,7 +2,7 @@ import AccountDetailFull from "./TaskList";
 import TaskForm from "./TaskForm";
 import TaskDetail from "./TaskDetail";
 import ApiClient from "../ApiClient";
-import { RouteObject, redirect } from "react-router-dom";
+import { RouteObject, redirect } from "react-router";
 
 export default function tasks(apiClient: ApiClient): RouteObject {
   return {

app/src/util.tsx

@@ -3,7 +3,7 @@ import Col from "react-bootstrap/Col";
 import Row from "react-bootstrap/Row";
 import { LinkContainer } from "react-router-bootstrap";
 import React, { Suspense, useRef } from "react";
-import { Await, useRouteLoaderData, useLoaderData } from "react-router-dom";
+import { Await, useRouteLoaderData, useLoaderData } from "react-router";
 import { Account } from "./ApiClient";
 import Placeholder from "react-bootstrap/Placeholder";
 import { Button, OverlayTrigger, Tooltip } from "react-bootstrap";