client: Upgrade to react-router 7

Not much relevant to us. Just the renaming of the package,
and the features behind the `future` flags being enabled by default.
https://github.com/remix-run/react-router/blob/08e4f2fd399543cab776f4be8a29181093a3702c/CHANGELOG.md#v700
https://reactrouter.com/upgrading/v6

client/js/helpers/hooks.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router';
 import { useMediaMatch } from 'rooks';
 
 /**

client/js/helpers/uri.js

@@ -1,4 +1,4 @@
-import { useLocation, useMatch } from 'react-router-dom';
+import { useLocation, useMatch } from 'react-router';
 import { FilterType } from '../Filter';
 
 /**

client/js/templates/App.jsx

@@ -9,7 +9,7 @@ import {
     Navigate,
     useNavigate,
     useLocation,
-} from 'react-router-dom';
+} from 'react-router';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Collapse } from '@kunukn/react-collapse';
 import classNames from 'classnames';
@@ -852,15 +852,7 @@ App.propTypes = {
  */
 export function createApp({ basePath, appRef, configuration }) {
     return (
-        <Router
-            basename={basePath}
-            future={{
-                // eslint-disable-next-line camelcase
-                v7_startTransition: true,
-                // eslint-disable-next-line camelcase
-                v7_relativeSplatPath: true,
-            }}
-        >
+        <Router basename={basePath}>
             <App ref={appRef} configuration={configuration} />
         </Router>
     );

client/js/templates/EntriesPage.jsx

@@ -7,7 +7,7 @@ import React, {
     forwardRef,
 } from 'react';
 import PropTypes from 'prop-types';
-import { Link, useLocation, useParams } from 'react-router-dom';
+import { Link, useLocation, useParams } from 'react-router';
 import { useOnline } from 'rooks';
 import { useStateWithDeps } from 'use-state-with-deps';
 import nullable from 'prop-types-nullable';
@@ -28,7 +28,7 @@ import { LocalizationContext } from '../helpers/i18n';
 import { useShouldReload } from '../helpers/hooks';
 import { forceReload, makeEntriesLinkLocation } from '../helpers/uri';
 import { HttpError } from '../errors';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 
 function reloadList({
     fetchParams,

client/js/templates/HashPassword.jsx

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import React, { useCallback, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router';
 import { useInput } from 'rooks';
 import { LoadingState } from '../requests/LoadingState';
 import { HttpError } from '../errors';

client/js/templates/Item.jsx

@@ -7,7 +7,7 @@ import React, {
     useState,
 } from 'react';
 import PropTypes from 'prop-types';
-import { Link, useNavigate, useLocation } from 'react-router-dom';
+import { Link, useNavigate, useLocation } from 'react-router';
 import { usePreviousImmediate } from 'rooks';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import classNames from 'classnames';

client/js/templates/LoginForm.jsx

@@ -2,7 +2,7 @@ import React, { useCallback, useContext, useState } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { SpinnerBig } from './Spinner';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router';
 import { HttpError, LoginError } from '../errors';
 import { ConfigurationContext } from '../helpers/configuration';
 import { LocalizationContext } from '../helpers/i18n';

client/js/templates/NavFilters.jsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useContext, useState, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import { useEntriesParams } from '../helpers/uri';
-import { Link, useLocation } from 'react-router-dom';
+import { Link, useLocation } from 'react-router';
 import classNames from 'classnames';
 import { FilterType } from '../Filter';
 import { makeEntriesLinkLocation, useForceReload } from '../helpers/uri';

client/js/templates/NavSearch.jsx

@@ -6,7 +6,7 @@ import React, {
     useState,
 } from 'react';
 import PropTypes from 'prop-types';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router';
 import classNames from 'classnames';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { makeEntriesLink } from '../helpers/uri';

client/js/templates/NavSources.jsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo, useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { Link, useLocation } from 'react-router-dom';
+import { Link, useLocation } from 'react-router';
 import { usePreviousImmediate } from 'rooks';
 import classNames from 'classnames';
 import { unescape } from 'html-escaper';

client/js/templates/NavTags.jsx

@@ -1,7 +1,7 @@
 import React, { useContext, useMemo, useCallback, useState } from 'react';
 import PropTypes from 'prop-types';
 import nullable from 'prop-types-nullable';
-import { Link, useLocation } from 'react-router-dom';
+import { Link, useLocation } from 'react-router';
 import classNames from 'classnames';
 import { unescape } from 'html-escaper';
 import {

client/js/templates/NavToolBar.jsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useState } from 'react';
 import PropTypes from 'prop-types';
-import { Link } from 'react-router-dom';
+import { Link } from 'react-router';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import * as icons from '../icons';
 import {

client/js/templates/OpmlImport.jsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { useOnline } from 'rooks';
-import { Link, useNavigate } from 'react-router-dom';
+import { Link, useNavigate } from 'react-router';
 import { LoadingState } from '../requests/LoadingState';
 import { HttpError, UnexpectedStateError } from '../errors';
 import { importOpml } from '../requests/common';

client/js/templates/SearchList.jsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useLocation, useNavigate } from 'react-router';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { makeEntriesLink } from '../helpers/uri';
 import * as icons from '../icons';

client/js/templates/Source.jsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { useRef } from 'react';
 import { Menu, MenuButton, MenuItem } from '@szhsin/react-menu';
-import { useNavigate, useLocation } from 'react-router-dom';
+import { useNavigate, useLocation } from 'react-router';
 import { fadeOut } from '@siteparts/show-hide-effects';
 import { makeEntriesLinkLocation } from '../helpers/uri';
 import PropTypes from 'prop-types';

client/js/templates/SourcesPage.jsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useEffect, useState } from 'react';
 import { useMemo } from 'react';
-import { Link, useNavigate, useLocation, useMatch } from 'react-router-dom';
+import { Link, useNavigate, useLocation, useMatch } from 'react-router';
 import Source from './Source';
 import { SpinnerBig } from './Spinner';
 import { LoadingState } from '../requests/LoadingState';

client/package.json

@@ -22,7 +22,7 @@
     "ramda": "^0.30.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-router-dom": "^6.28.1",
+    "react-router": "^7.1.1",
     "reset-css": "^5.0.1",
     "rooks": "^7.1.1",
     "tinykeys": "^3.0.0",