fix(deps): update react-router monorepo to v6 (major) (#635)

* fix(deps): update react-router monorepo to v6 * chore: re-apply v6 changes * fix: `react-router` tests * Remove duplicate route * Replace route that missed it in conversion --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Afonso Jorge Ramos <afonsojorgeramos@gmail.com> Co-authored-by: Brendan Mulholland <brendan@recital.software>
gitify-app · Oct 3, 2023 · d52fd2d · d52fd2d
1 parent 78c08d7
commit d52fd2d
Show file tree

Hide file tree

Showing 13 changed files with 136 additions and 139 deletions.
diff --git a/package.json b/package.json
@@ -118,8 +118,8 @@
     "react-dom": "18.2.0",
     "react-emojione": "5.0.1",
     "react-final-form": "6.5.9",
-    "react-router": "5.3.4",
-    "react-router-dom": "5.3.4",
+    "react-router": "6.16.0",
+    "react-router-dom": "6.16.0",
     "react-transition-group": "4.4.5",
     "ts-loader": "9.4.4",
     "typescript": "5.2.2"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app.tsx b/src/app.tsx
@@ -1,9 +1,9 @@
 import React, { useContext } from 'react';
 import {
-  Redirect,
+  Navigate,
   HashRouter as Router,
   Route,
-  Switch,
+  Routes,
   useLocation,
 } from 'react-router-dom';
 
@@ -23,7 +23,7 @@ function RequireAuth({ children }) {
   return isLoggedIn ? (
     children
   ) : (
-    <Redirect to={{ pathname: '/login', state: { from: location } }} />
+    <Navigate to="/login" replace state={{ from: location }} />
   );
 }
 
@@ -34,31 +34,30 @@ export const App = () => {
         <div className="flex flex-col pl-14 h-full">
           <Loading />
           <Sidebar />
-
-          <Switch>
-            <Route path="/" exact>
-              <RequireAuth>
-                <NotificationsRoute />
-              </RequireAuth>
-            </Route>
-            <Route path="/settings" exact>
-              <RequireAuth>
-                <SettingsRoute />
-              </RequireAuth>
-            </Route>
-            <Route path="/login">
-              <LoginRoute />
-            </Route>
-            <Route path="/login">
-              <LoginRoute />
-            </Route>
-            <Route path="/login-enterprise">
-              <LoginEnterpriseRoute />
-            </Route>
-            <Route path="/login-token">
-              <LoginWithToken />
-            </Route>
-          </Switch>
+          <Routes>
+            <Route
+              path="/"
+              element={
+                <RequireAuth>
+                  <NotificationsRoute />
+                </RequireAuth>
+              }
+            />
+            <Route
+              path="/settings"
+              element={
+                <RequireAuth>
+                  <SettingsRoute />
+                </RequireAuth>
+              }
+            />
+            <Route path="/login" element={<LoginRoute />} />
+            <Route
+              path="/login-enterprise"
+              element={<LoginEnterpriseRoute />}
+            />
+            <Route path="/login-token" element={<LoginWithToken />} />
+          </Routes>
         </div>
       </Router>
     </AppProvider>

diff --git a/src/components/Sidebar.test.tsx b/src/components/Sidebar.test.tsx
@@ -12,6 +12,12 @@ import { mockedAccountNotifications } from '../__mocks__/mockedData';
 import { AppContext } from '../context/App';
 import { Sidebar } from './Sidebar';
 
+const mockNavigate = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockNavigate,
+}));
+
 describe('components/Sidebar.tsx', () => {
   const fetchNotifications = jest.fn();
   const history = createMemoryHistory();
@@ -73,17 +79,15 @@ describe('components/Sidebar.tsx', () => {
   });
 
   it('go to the settings route', () => {
-    const pushMock = jest.spyOn(history, 'push');
-
     const { getByLabelText } = render(
       <AppContext.Provider value={{ isLoggedIn: true, notifications: [] }}>
-        <Router history={history}>
+        <Router location={history.location} navigator={history}>
           <Sidebar />
         </Router>
       </AppContext.Provider>,
     );
     fireEvent.click(getByLabelText('Settings'));
-    expect(pushMock).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenNthCalledWith(1, '/settings');
   });
 
   it('opens github in the notifications page', () => {

diff --git a/src/components/Sidebar.tsx b/src/components/Sidebar.tsx
@@ -1,7 +1,7 @@
 import { BellIcon } from '@primer/octicons-react';
 import { ipcRenderer, shell } from 'electron';
 import React, { useCallback, useContext, useMemo } from 'react';
-import { useHistory, useLocation } from 'react-router-dom';
+import { useNavigate, useLocation } from 'react-router-dom';
 
 import { Logo } from '../components/Logo';
 import { AppContext } from '../context/App';
@@ -11,7 +11,7 @@ import { IconRefresh } from '../icons/Refresh';
 import { Constants } from '../utils/constants';
 
 export const Sidebar: React.FC = () => {
-  const history = useHistory();
+  const navigate = useNavigate();
   const location = useLocation();
 
   const { isLoggedIn } = useContext(AppContext);
@@ -66,7 +66,7 @@ export const Sidebar: React.FC = () => {
             <button
               className={footerButtonClasses}
               onClick={() => {
-                history.replace('/');
+                navigate('/', { replace: true });
                 fetchNotifications();
               }}
               aria-label="Refresh Notifications"
@@ -78,9 +78,9 @@ export const Sidebar: React.FC = () => {
               className={footerButtonClasses}
               onClick={() => {
                 if (location.pathname.startsWith('/settings')) {
-                  history.replace('/');
+                  navigate('/', { replace: true });
                 } else {
-                  history.push('/settings');
+                  navigate('/settings');
                 }
               }}
               aria-label="Settings"

diff --git a/src/routes/Login.test.tsx b/src/routes/Login.test.tsx
@@ -10,14 +10,17 @@ const { ipcRenderer } = require('electron');
 import { AppContext } from '../context/App';
 import { LoginRoute } from './Login';
 
+const mockNavigate = jest.fn();
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useNavigate: () => mockNavigate,
+}));
+
 describe('routes/Login.tsx', () => {
   const history = createMemoryHistory();
-  const pushMock = jest.spyOn(history, 'push');
-  const replaceMock = jest.spyOn(history, 'replace');
-
-  beforeEach(function () {
-    pushMock.mockReset();
 
+  beforeEach(() => {
+    mockNavigate.mockReset();
     jest.spyOn(ipcRenderer, 'send');
   });
 
@@ -34,35 +37,34 @@ describe('routes/Login.tsx', () => {
   it('should redirect to notifications once logged in', () => {
     const { rerender } = render(
       <AppContext.Provider value={{ isLoggedIn: false }}>
-        <Router history={history}>
+        <Router location={history.location} navigator={history}>
           <LoginRoute />
         </Router>
       </AppContext.Provider>,
     );
 
     rerender(
       <AppContext.Provider value={{ isLoggedIn: true }}>
-        <Router history={history}>
+        <Router location={history.location} navigator={history}>
           <LoginRoute />
         </Router>
       </AppContext.Provider>,
     );
 
     expect(ipcRenderer.send).toHaveBeenCalledTimes(1);
     expect(ipcRenderer.send).toHaveBeenCalledWith('reopen-window');
-    expect(replaceMock).toHaveBeenCalledTimes(1);
+    expect(mockNavigate).toHaveBeenNthCalledWith(1, '/', { replace: true });
   });
 
   it('should navigate to login with github enterprise', () => {
     const { getByLabelText } = render(
-      <Router history={history}>
+      <Router location={history.location} navigator={history}>
         <LoginRoute />
       </Router>,
     );
 
     fireEvent.click(getByLabelText('Login with GitHub Enterprise'));
 
-    expect(pushMock).toHaveBeenCalledTimes(1);
-    expect(pushMock).toHaveBeenCalledWith('/login-enterprise');
+    expect(mockNavigate).toHaveBeenNthCalledWith(1, '/login-enterprise');
   });
 });
diff --git a/src/routes/Login.tsx b/src/routes/Login.tsx
@@ -1,19 +1,19 @@
 const { ipcRenderer } = require('electron');
 
 import React, { useCallback, useContext, useEffect } from 'react';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 
 import { AppContext } from '../context/App';
 import { Logo } from '../components/Logo';
 
 export const LoginRoute: React.FC = () => {
-  const history = useHistory();
+  const navigate = useNavigate();
   const { isLoggedIn, login } = useContext(AppContext);
 
   useEffect(() => {
     if (isLoggedIn) {
       ipcRenderer.send('reopen-window');
-      history.replace('/');
+      navigate('/', { replace: true });
     }
   }, [isLoggedIn]);
 
@@ -46,15 +46,15 @@ export const LoginRoute: React.FC = () => {
 
       <button
         className={loginButtonClass}
-        onClick={() => history.push('/login-enterprise')}
+        onClick={() => navigate('/login-enterprise')}
         aria-label="Login with GitHub Enterprise"
       >
         Login to GitHub Enterprise
       </button>
 
       <button
         className="bg-none hover:text-gray-800 dark:text-gray-100 dark:hover:text-gray-300 mt-4 focus:outline-none"
-        onClick={() => history.push('/login-token')}
+        onClick={() => navigate('/login-token')}
         aria-label="Login with Personal Token"
       >
         <small>or login with a personal token</small>