Skip to content

Commit ce64009

Browse files
authored
Merge pull request #1043 from Arnei/update-react-router-7.1.1
Update react-router to 7.1.1
2 parents 605cd02 + 236120b commit ce64009

20 files changed

Lines changed: 63 additions & 75 deletions

File tree

package-lock.json

Lines changed: 44 additions & 55 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"@mui/x-date-pickers": "^7.23.1",
1111
"@reduxjs/toolkit": "^2.5.0",
1212
"@types/dompurify": "^3.2.0",
13-
"@types/react-router-dom": "^5.3.3",
1413
"array-move": "^4.0.0",
1514
"axios": "^1.7.9",
1615
"bourbon": "^7.3.0",
@@ -34,7 +33,7 @@
3433
"react-i18next": "^15.4.0",
3534
"react-icons": "^5.3.0",
3635
"react-redux": "^9.2.0",
37-
"react-router-dom": "^6.27.0",
36+
"react-router": "^7.1.1",
3837
"react-select": "^5.8.0",
3938
"redux": "^5.0.1",
4039
"redux-persist": "^6.0.0",

src/App.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { useEffect } from "react";
2-
import { HashRouter, Navigate, Route, Routes } from "react-router-dom";
2+
import { HashRouter, Navigate, Route, Routes } from "react-router";
33
import "./App.scss";
44
import Events from "./components/events/Events";
55
import Recordings from "./components/recordings/Recordings";

src/components/About.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import NavBar from "./NavBar";
44
import Footer from "./Footer";
55
import MainNav from "./shared/MainNav";
66
import { useTranslation } from "react-i18next";
7-
import { Link, useLocation } from "react-router-dom";
7+
import { Link, useLocation } from "react-router";
88
import cn from "classnames";
99
import axios from 'axios';
1010
import i18n from "../i18n/i18n";

src/components/Footer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
getUserInformation,
55
} from "../selectors/userInfoSelectors";
66
import { useAppSelector } from "../store";
7-
import { Link } from "react-router-dom";
7+
import { Link } from "react-router";
88
import { useTranslation } from "react-i18next";
99
import { Tooltip } from "./shared/Tooltip";
1010

src/components/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React, { useEffect, useState } from "react";
22
import { useTranslation } from "react-i18next";
3-
import { Link } from "react-router-dom";
3+
import { Link } from "react-router";
44
import i18n from "../i18n/i18n";
55
import languages from "../i18n/languages";
66
import opencastLogo from "../img/opencast-white.svg?url";

src/components/configuration/Themes.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useState } from "react";
22
import { useTranslation } from "react-i18next";
33
import MainNav from "../shared/MainNav";
4-
import { Link } from "react-router-dom";
4+
import { Link } from "react-router";
55
import cn from "classnames";
66
import TableFilters from "../shared/TableFilters";
77
import Table from "../shared/Table";

src/components/events/Events.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React, { useEffect, useState } from "react";
22
import { useTranslation } from "react-i18next";
33
import cn from "classnames";
4-
import { Link, useLocation } from "react-router-dom";
4+
import { Link, useLocation } from "react-router";
55
import TableFilters from "../shared/TableFilters";
66
import MainNav from "../shared/MainNav";
77
import Stats from "../shared/Stats";

src/components/events/Series.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
22
import MainNav from "../shared/MainNav";
33
import { useTranslation } from "react-i18next";
44
import cn from "classnames";
5-
import { Link, useLocation } from "react-router-dom";
5+
import { Link, useLocation } from "react-router";
66
import TableFilters from "../shared/TableFilters";
77
import Table from "../shared/Table";
88
import Notifications from "../shared/Notifications";

src/components/events/partials/SeriesTitleCell.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React from "react";
22
import { useTranslation } from "react-i18next";
33
import { loadEventsIntoTable } from "../../../thunks/tableThunks";
44
import { setSpecificEventFilter } from "../../../slices/tableFilterSlice";
5-
import { Link } from "react-router-dom";
5+
import { Link } from "react-router";
66
import { useAppDispatch } from "../../../store";
77
import { Tooltip } from "../../shared/Tooltip";
88
import { Series } from "../../../slices/seriesSlice";

0 commit comments

Comments
 (0)