paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 47 Packages Projects Releases Wiki Activity

refactor react-router -> react-router-dom

Browse Source 
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
This commit is contained in:
Patrik Oldsberg
2022-12-08 21:18:01 +01:00
parent b586504966
commit 2e701b3796
112 changed files with 136 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/app-defaults/package.json
-1
View File
@@ -43,7 +43,6 @@
"peerDependencies": {
"react": "^16.13.1 || ^17.0.0",
"react-dom": "^16.13.1 || ^17.0.0",
"react-router": "6.0.0-beta.0 || ^6.3.0",
"react-router-dom": "6.0.0-beta.0 || ^6.3.0"
},
"devDependencies": {
packages/app/package.json
-1
View File
@@ -77,7 +77,6 @@
"prop-types": "^15.7.2",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4",
"zen-observable": "^0.10.0"
packages/app/src/App.tsx
+1 -1
View File
@@ -86,7 +86,7 @@ import {
import { AdvancedSettings } from './components/advancedSettings';
import AlarmIcon from '@material-ui/icons/Alarm';
import React from 'react';
import { Navigate, Route } from 'react-router';
import { Navigate, Route } from 'react-router-dom';
import { apis } from './apis';
import { entityPage } from './components/catalog/EntityPage';
import { homePage } from './components/home/HomePage';
packages/core-components/package.json
-1
View File
@@ -74,7 +74,6 @@
"@types/react": "^16.13.1 || ^17.0.0",
"react": "^16.13.1 || ^17.0.0",
"react-dom": "^16.13.1 || ^17.0.0",
"react-router": "6.0.0-beta.0 || ^6.3.0",
"react-router-dom": "6.0.0-beta.0 || ^6.3.0"
},
"devDependencies": {
packages/core-components/src/components/Button/Button.test.tsx
+1 -1
View File
@@ -18,7 +18,7 @@ import React from 'react';
import { render, fireEvent, act } from '@testing-library/react';
import { wrapInTestApp } from '@backstage/test-utils';
import { Button } from './Button';
import { Route, Routes } from 'react-router';
import { Route, Routes } from 'react-router-dom';
describe('<Button />', () => {
it('navigates using react-router', async () => {
packages/core-components/src/components/Link/Link.test.tsx
+1 -1
View File
@@ -23,7 +23,7 @@ import {
} from '@backstage/test-utils';
import { analyticsApiRef, configApiRef } from '@backstage/core-plugin-api';
import { isExternalUri, Link, useResolvedPath } from './Link';
import { Route, Routes } from 'react-router';
import { Route, Routes } from 'react-router-dom';
import { renderHook, WrapperComponent } from '@testing-library/react-hooks';
import { ConfigReader } from '@backstage/config';
packages/core-components/src/components/ProgressBars/GaugeCard.stories.tsx
+1 -1
View File
@@ -17,7 +17,7 @@
import React, { PropsWithChildren } from 'react';
import { GaugeCard } from './GaugeCard';
import Grid from '@material-ui/core/Grid';
import { MemoryRouter } from 'react-router';
import { MemoryRouter } from 'react-router-dom';
import Tooltip from '@material-ui/core/Tooltip';
import Info from '@material-ui/icons/Info';
packages/core-components/src/components/TabbedLayout/RoutedTabs.test.tsx
+1 -1
View File
@@ -17,7 +17,7 @@
import { renderInTestApp } from '@backstage/test-utils';
import { act, fireEvent } from '@testing-library/react';
import React from 'react';
import { Route, Routes } from 'react-router';
import { Route, Routes } from 'react-router-dom';
import { RoutedTabs } from './RoutedTabs';
const testRoute1 = {
packages/core-components/src/components/TabbedLayout/RoutedTabs.tsx
+6 -1
View File
@@ -15,7 +15,12 @@
*/
import React, { useMemo } from 'react';
import { Helmet } from 'react-helmet';
import { matchRoutes, useNavigate, useParams, useRoutes } from 'react-router';
import {
matchRoutes,
useNavigate,
useParams,
useRoutes,
} from 'react-router-dom';
import { Content } from '../../layout/Content';
import { HeaderTabs } from '../../layout/HeaderTabs';
import { SubRoute } from './types';
packages/core-components/src/components/TabbedLayout/TabbedLayout.stories.tsx
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
import React, { PropsWithChildren } from 'react';
import { MemoryRouter, Route, Routes } from 'react-router';
import { MemoryRouter, Route, Routes } from 'react-router-dom';
import { TabbedLayout } from './TabbedLayout';
export default {
packages/core-components/src/layout/ErrorPage/ErrorPage.tsx
+1 -1
View File
@@ -19,7 +19,7 @@ import Grid from '@material-ui/core/Grid';
import { makeStyles } from '@material-ui/core/styles';
import Typography from '@material-ui/core/Typography';
import React from 'react';
import { useNavigate } from 'react-router';
import { useNavigate } from 'react-router-dom';
import { Link } from '../../components/Link';
import { useSupportConfig } from '../../hooks';
import { MicDrop } from './MicDrop';
packages/core-components/src/layout/InfoCard/InfoCard.stories.tsx
+1 -1
View File
@@ -17,7 +17,7 @@
import Grid from '@material-ui/core/Grid';
import Typography from '@material-ui/core/Typography';
import React, { PropsWithChildren } from 'react';
import { MemoryRouter } from 'react-router';
import { MemoryRouter } from 'react-router-dom';
import { InfoCard, Props } from './InfoCard';
export default {
packages/core-components/src/layout/ItemCard/ItemCard.stories.tsx
+1 -1
View File
@@ -21,7 +21,7 @@ import CardContent from '@material-ui/core/CardContent';
import CardMedia from '@material-ui/core/CardMedia';
import Typography from '@material-ui/core/Typography';
import React from 'react';
import { MemoryRouter } from 'react-router';
import { MemoryRouter } from 'react-router-dom';
import { Button } from '../../components';
import { ItemCardGrid } from './ItemCardGrid';
import { ItemCardHeader } from './ItemCardHeader';
packages/core-components/src/layout/Sidebar/MobileSidebar.tsx
+1 -1
View File
@@ -26,7 +26,7 @@ import CloseIcon from '@material-ui/icons/Close';
import MenuIcon from '@material-ui/icons/Menu';
import { orderBy } from 'lodash';
import React, { createContext, useEffect, useState, useContext } from 'react';
import { useLocation } from 'react-router';
import { useLocation } from 'react-router-dom';
import { SidebarOpenStateProvider } from './SidebarOpenStateContext';
import { SidebarGroup } from './SidebarGroup';
import { SidebarConfigContext, SidebarConfig } from './config';
packages/core-components/src/layout/TabbedCard/TabbedCard.stories.tsx
+1 -1
View File
@@ -16,7 +16,7 @@
import Grid from '@material-ui/core/Grid';
import React, { PropsWithChildren, useState } from 'react';
import { MemoryRouter } from 'react-router';
import { MemoryRouter } from 'react-router-dom';
import { CardTab, TabbedCard } from './TabbedCard';
const cardContentStyle = { height: 200, width: 500 };
packages/dev-utils/package.json
-1
View File
@@ -53,7 +53,6 @@
"@types/react": "^16.13.1 || ^17.0.0",
"react": "^16.13.1 || ^17.0.0",
"react-dom": "^16.13.1 || ^17.0.0",
"react-router": "6.0.0-beta.0 || ^6.3.0",
"react-router-dom": "6.0.0-beta.0 || ^6.3.0"
},
"devDependencies": {
packages/dev-utils/src/devApp/render.tsx
+1 -1
View File
@@ -46,7 +46,7 @@ import { Box } from '@material-ui/core';
import BookmarkIcon from '@material-ui/icons/Bookmark';
import React, { ComponentType, ReactNode } from 'react';
import ReactDOM from 'react-dom';
import { createRoutesFromChildren, Route } from 'react-router';
import { createRoutesFromChildren, Route } from 'react-router-dom';
import { SidebarThemeSwitcher } from './SidebarThemeSwitcher';
export function isReactRouterBeta(): boolean {
packages/techdocs-cli-embedded-app/package.json
-1
View File
@@ -25,7 +25,6 @@
"history": "^5.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router": "^6.3.0",
"react-router-dom": "^6.3.0",
"react-use": "^17.2.4"
},
packages/techdocs-cli-embedded-app/src/App.tsx
+1 -1
View File
@@ -15,7 +15,7 @@
*/
import React from 'react';
import { Navigate, Route } from 'react-router';
import { Navigate, Route } from 'react-router-dom';
import {
DefaultTechDocsHome,
packages/test-utils/package.json
-1
View File
@@ -52,7 +52,6 @@
"@types/react": "^16.13.1 || ^17.0.0",
"react": "^16.13.1 || ^17.0.0",
"react-dom": "^16.13.1 || ^17.0.0",
"react-router": "6.0.0-beta.0 || ^6.3.0",
"react-router-dom": "6.0.0-beta.0 || ^6.3.0"
},
"devDependencies": {
packages/test-utils/src/testUtils/appWrappers.test.tsx
+1 -1
View File
@@ -26,7 +26,7 @@ import {
import { withLogCollector } from './logCollector';
import { render } from '@testing-library/react';
import React, { useEffect } from 'react';
import { Route, Routes } from 'react-router';
import { Route, Routes } from 'react-router-dom';
import { MockErrorApi } from './apis';
import { renderInTestApp, wrapInTestApp } from './appWrappers';
import { TestApiProvider } from './TestApiProvider';
packages/test-utils/src/testUtils/appWrappers.tsx
+1 -1
View File
@@ -15,7 +15,7 @@
*/
import React, { ComponentType, ReactNode, ReactElement } from 'react';
import { MemoryRouter } from 'react-router';
import { MemoryRouter } from 'react-router-dom';
import { Route } from 'react-router-dom';
import { lightTheme } from '@backstage/theme';
import { ThemeProvider } from '@material-ui/core/styles';