actually run lint fix

src/app/base/components/AppSideNavigation/AppSideNavigation.test.tsx

@@ -1,12 +1,6 @@
 import { createMemoryHistory } from "history";
 import { Provider } from "react-redux";
-import {
-  BrowserRouter,
-  Router,
-  CompatRouter,
-  Route,
-  Routes,
-} from "react-router-dom";
+import { BrowserRouter, Router, Route, Routes } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import AppSideNavigation from "./AppSideNavigation";

src/app/base/components/ControllerLink/ControllerLink.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import ControllerLink, { Labels } from "./ControllerLink";

src/app/base/components/DHCPTable/DHCPTable.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import DHCPTable, { TestIds } from "./DHCPTable";

src/app/base/components/DeviceLink/DeviceLink.test.tsx

@@ -1,5 +1,5 @@
 import { Provider } from "react-redux";
-import { MemoryRouter, CompatRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import DeviceLink, { Labels } from "./DeviceLink";

src/app/base/components/DhcpForm/DhcpForm.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import { Labels as FieldLabels } from "../DhcpFormFields";

src/app/base/components/DhcpFormFields/DhcpFormFields.test.tsx

@@ -1,7 +1,6 @@
 import * as reduxToolkit from "@reduxjs/toolkit";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import { Labels } from "./DhcpFormFields";

src/app/base/components/FabricLink/FabricLink.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import FabricLink, { Labels } from "./FabricLink";

src/app/base/components/FormikForm/FormikForm.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import FormikForm from "./FormikForm";

src/app/base/components/FormikFormContent/FormikFormContent.test.tsx

@@ -1,6 +1,6 @@
 import { Field, Formik } from "formik";
 import { Provider } from "react-redux";
-import { MemoryRouter, CompatRouter } from "react-router-dom";
+import { MemoryRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 import * as Yup from "yup";
 

src/app/base/components/MachineLink/MachineLink.test.tsx

@@ -1,7 +1,6 @@
 import * as reduxToolkit from "@reduxjs/toolkit";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import MachineLink, { Labels } from "./MachineLink";

src/app/base/components/ModelNotFound/ModelNotFound.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import ModelNotFound from "./ModelNotFound";

src/app/base/components/NodeConfigurationFields/NodeConfigurationFields.test.tsx

@@ -1,7 +1,6 @@
 import { Formik } from "formik";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import NodeConfigurationFields, { Label } from "./NodeConfigurationFields";

src/app/base/components/SpaceLink/SpaceLink.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import SpaceLink from "./SpaceLink";

src/app/base/components/SubnetLink/SubnetLink.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import SubnetLink from "./SubnetLink";

src/app/base/components/TagLinks/TagLinks.test.tsx

@@ -1,5 +1,4 @@
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 
 import TagLinks from "./TagLinks";
 

src/app/base/components/VLANLink/VLANLink.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import VLANLink from "./VLANLink";

src/app/base/components/node/MachinesHeader/MachinesHeader.test.tsx

@@ -1,7 +1,6 @@
 import { render, screen } from "@testing-library/react";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import MachinesHeader from "./MachinesHeader";

src/app/base/components/node/NodeLink/NodeLink.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import NodeLink from "./NodeLink";

src/app/base/components/node/NodeLogs/NodeLogs.tsx

@@ -1,6 +1,5 @@
 import { Tabs } from "@canonical/react-components";
-import { Route, useLocation } from "react-router-dom";
-import { Link } from "react-router-dom";
+import { Route, useLocation, Link } from "react-router-dom";
 
 import DownloadMenu from "./DownloadMenu";
 import EventLogs from "./EventLogs";

src/app/base/components/node/OverviewCard/CpuCard/CpuCard.test.tsx

@@ -1,7 +1,6 @@
 import { render, screen } from "@testing-library/react";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import CpuCard from "./CpuCard";

src/app/base/components/node/OverviewCard/MemoryCard/MemoryCard.test.tsx

@@ -2,7 +2,6 @@ import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import MemoryCard from "./MemoryCard";

src/app/base/components/node/OverviewCard/OverviewCard.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import OverviewCard from "./OverviewCard";

src/app/base/components/node/OverviewCard/StorageCard/StorageCard.test.tsx

@@ -1,7 +1,6 @@
 import { render, screen } from "@testing-library/react";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import StorageCard from "./StorageCard";

src/app/base/components/node/SetZoneForm/SetZoneForm.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import SetZoneForm from "./SetZoneForm";

src/app/base/components/node/StorageTables/AvailableStorageTable/AvailableStorageTable.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import AvailableStorageTable from "./AvailableStorageTable";

src/app/base/components/node/StorageTables/FilesystemsTable/AddSpecialFilesystem/AddSpecialFilesystem.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import AddSpecialFilesystem from "./AddSpecialFilesystem";

src/app/base/components/node/StorageTables/FilesystemsTable/FilesystemsTable.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import FilesystemsTable from "./FilesystemsTable";

src/app/base/components/node/StorageTables/UsedStorageTable/UsedStorageTable.test.tsx

@@ -1,5 +1,4 @@
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 
 import UsedStorageTable from "./UsedStorageTable";
 

src/app/base/components/node/TestResults/TestResults.test.tsx

@@ -1,7 +1,6 @@
 import { render, screen } from "@testing-library/react";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import TestResults from "./TestResults";

src/app/base/components/node/networking/FabricColumn/FabricColumn.test.tsx

@@ -1,7 +1,6 @@
 import { render, screen } from "@testing-library/react";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import FabricColumn from "./FabricColumn";

src/app/base/hooks/urls.test.tsx

@@ -2,8 +2,7 @@ import type { ReactNode } from "react";
 
 import { renderHook } from "@testing-library/react";
 import { Provider } from "react-redux";
-import { MemoryRouter } from "react-router-dom";
-import { CompatRouter, Route, Routes } from "react-router-dom";
+import { MemoryRouter, Route, Routes } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import { useGetURLId } from "./urls";

src/app/controllers/views/ControllerDetails/ControllerConfiguration/ControllerConfiguration.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import ControllerConfiguration from "./ControllerConfiguration";

src/app/controllers/views/ControllerDetails/ControllerDetails.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
-import { MemoryRouter } from "react-router-dom";
-import { CompatRouter, Route, Routes } from "react-router-dom";
+import { MemoryRouter, Route, Routes } from "react-router-dom";
 import configureStore from "redux-mock-store";
 import type { Mock } from "vitest";
 

src/app/controllers/views/ControllerDetails/ControllerDetails.tsx

@@ -1,8 +1,7 @@
 import { useEffect } from "react";
 
 import { useDispatch, useSelector } from "react-redux";
-import { Redirect } from "react-router-dom";
-import { Routes, Route } from "react-router-dom";
+import { Redirect, Routes, Route } from "react-router-dom";
 
 import ControllerCommissioning from "./ControllerCommissioning";
 import ControllerConfiguration from "./ControllerConfiguration";

src/app/controllers/views/ControllerDetails/ControllerDetailsHeader/ControllerDetailsHeader.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import ControllerDetailsHeader from "./ControllerDetailsHeader";

src/app/controllers/views/ControllerDetails/ControllerDetailsHeader/ControllerName/ControllerName.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import ControllerName from "./ControllerName";

src/app/controllers/views/ControllerDetails/ControllerStorage/ControllerStorage.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import ControllerStorage from "./ControllerStorage";

src/app/controllers/views/ControllerList/ControllerList.test.tsx

@@ -1,7 +1,6 @@
 import { Provider } from "react-redux";
 import { useLocation } from "react-router";
 import { MemoryRouter, Route } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import ControllerList from "./ControllerList";

src/app/devices/views/DeviceDetails/DeviceConfiguration/DeviceConfiguration.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import DeviceConfiguration, { Label } from "./DeviceConfiguration";

src/app/devices/views/DeviceDetails/DeviceDetails.tsx

@@ -1,8 +1,7 @@
 import { useEffect } from "react";
 
 import { useDispatch, useSelector } from "react-redux";
-import { Redirect } from "react-router-dom";
-import { Route, Routes } from "react-router-dom";
+import { Redirect, Route, Routes } from "react-router-dom";
 
 import DeviceConfiguration from "./DeviceConfiguration";
 import DeviceDetailsHeader from "./DeviceDetailsHeader";

src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchImagesForm/FetchImagesForm.test.tsx

@@ -1,7 +1,6 @@
 import * as reactComponentHooks from "@canonical/react-components/dist/hooks";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import FetchImagesForm, {

src/app/images/views/ImageList/SyncedImages/ChangeSource/FetchedImages/FetchedImages.test.tsx

@@ -1,7 +1,6 @@
 import * as reactComponentHooks from "@canonical/react-components/dist/hooks";
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import FetchedImages, { Labels as FetchedImagesLabels } from "./FetchedImages";

src/app/images/views/ImageList/SyncedImages/OtherImages/OtherImages.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import OtherImages, { Labels as OtherImagesLabels } from "./OtherImages";

src/app/images/views/ImageList/SyncedImages/UbuntuCoreImages/UbuntuCoreImages.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import UbuntuCoreImages, {

src/app/images/views/ImageList/SyncedImages/UbuntuImages/UbuntuImages.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import UbuntuImages, { Labels as UbuntuImagesLabels } from "./UbuntuImages";

src/app/intro/components/IntroSection/IntroSection.test.tsx

@@ -1,6 +1,5 @@
 import { createMemoryHistory } from "history";
 import { Router } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 
 import IntroSection from "./IntroSection";
 

src/app/intro/views/ImagesIntro/ImagesIntro.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import ImagesIntro, { Labels as ImagesIntroLabels } from "./ImagesIntro";

src/app/intro/views/MaasIntro/MaasIntro.test.tsx

@@ -1,5 +1,4 @@
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import { Labels as ConnectivityCardLabels } from "./ConnectivityCard/ConnectivityCard";

src/app/intro/views/MaasIntroSuccess/MaasIntroSuccess.test.tsx

@@ -1,5 +1,4 @@
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import MaasIntroSuccess, {

src/app/intro/views/UserIntro/UserIntro.test.tsx

@@ -1,5 +1,4 @@
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 import type { SpyInstance } from "vitest";
 

src/app/kvm/components/KVMConfigurationCard/KVMConfigurationCard.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import KVMConfigurationCard from "./KVMConfigurationCard";

src/app/kvm/components/LXDHostToolbar/LXDHostToolbar.test.tsx

@@ -1,6 +1,5 @@
 import { Provider } from "react-redux";
 import { MemoryRouter } from "react-router-dom";
-import { CompatRouter } from "react-router-dom";
 import configureStore from "redux-mock-store";
 
 import LXDHostToolbar from "./LXDHostToolbar";

src/app/kvm/components/LXDHostToolbar/LXDHostToolbar.tsx

@@ -1,7 +1,6 @@
 import { Icon, Spinner } from "@canonical/react-components";
 import { useSelector } from "react-redux";
-import { useLocation } from "react-router-dom";
-import { Link } from "react-router-dom";
+import { useLocation, Link } from "react-router-dom";
 
 import Switch from "@/app/base/components/Switch";
 import { useFetchActions, useSendAnalytics } from "@/app/base/hooks";