Merge remote-tracking branch 'origin/march-2023-03-21' into feat/cv2-network-limits

DorkNet.Server/admin-ui/src/pages/Dashboard.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { api, get } from '../lib/api';
 import type { Stats } from '../lib/types';
 import { absoluteTime, num, relativeTime } from '../lib/format';

DorkNet.Server/admin-ui/src/pages/Login.tsx

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import { useNavigate, useLocation } from 'react-router-dom';
+import { useNavigate, useLocation } from 'react-router';
 import { api, ApiError } from '../lib/api';
 import { notifyAuthChange, setSession } from '../lib/auth';
 import { BrandMark } from '../components/BrandMark';

DorkNet.Server/admin-ui/src/pages/Players.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
+import { useSearchParams } from 'react-router';
 import { api, get } from '../lib/api';
 import type { Player, PlayerDetail } from '../lib/types';
 import { absoluteTime, currencyName, num, relativeTime } from '../lib/format';

DorkNet.Server/admin-ui/src/pages/Room.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useState } from 'react';
-import { Link, useNavigate, useParams } from 'react-router-dom';
+import { Link, useNavigate, useParams } from 'react-router';
 import { api } from '../lib/api';
 import type { Player, RoomDetail, RoomInstance, RoomRoleGrant } from '../lib/types';
 import { profileImageUrl } from '../lib/types';

DorkNet.Server/admin-ui/src/pages/Rooms.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { api } from '../lib/api';
 import { imageCdnUrl, type Room } from '../lib/types';
 import { useApi } from '../lib/useApi';