From 5cde83c607409bf67157843e2bce9facad600855 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2024 14:54:55 +0100 Subject: [PATCH] chore(deps): update dependency react-router-dom to v7 (#1644) * chore(deps): update dependency react-router-dom to v7 * chore: additions --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: caele --- commands/serve/package.json | 4 +- commands/serve/web/components/Hub/AppList.jsx | 2 +- .../web/components/Hub/ConnectionSteps.jsx | 2 +- .../Hub/SelectEngine/ConnectionHistory.jsx | 2 +- .../Hub/SelectEngine/FormManager.jsx | 2 +- .../__tests__/ConnectionHistory.test.jsx | 6 +-- .../__tests__/FormManager.test.jsx | 6 +-- .../Hub/__tests__/ConnectionSteps.test.jsx | 6 +-- .../web/components/Layouts/HubLayout.jsx | 2 +- .../Layouts/__tests__/HubLayout.test.jsx | 4 +- commands/serve/web/components/Root.jsx | 2 +- .../web/components/Visualize/Visualize.jsx | 2 +- commands/serve/web/contexts/RootContext.jsx | 2 +- .../web/hooks/__tests__/useAppList.test.js | 6 +-- commands/serve/web/hooks/useAppList.js | 2 +- commands/serve/web/hooks/useConnection.js | 2 +- commands/serve/web/utils/testRenderer.jsx | 2 +- jest.setup.js | 3 ++ yarn.lock | 46 +++++++++++-------- 19 files changed, 58 insertions(+), 45 deletions(-) diff --git a/commands/serve/package.json b/commands/serve/package.json index 322dcda56..7b70b2850 100644 --- a/commands/serve/package.json +++ b/commands/serve/package.json @@ -71,6 +71,6 @@ "monaco-editor-webpack-plugin": "7.1.0", "react": "18.3.1", "react-dom": "18.3.1", - "react-router-dom": "6.28.1" + "react-router": "7.1.1" } -} +} \ No newline at end of file diff --git a/commands/serve/web/components/Hub/AppList.jsx b/commands/serve/web/components/Hub/AppList.jsx index c3397cf68..01358f0c8 100644 --- a/commands/serve/web/components/Hub/AppList.jsx +++ b/commands/serve/web/components/Hub/AppList.jsx @@ -4,7 +4,7 @@ import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; import Typography from '@mui/material/Typography'; import CircularProgress from '@mui/material/CircularProgress'; -import { useNavigate, useLocation } from 'react-router-dom'; +import { useNavigate, useLocation } from 'react-router'; import { useAppList } from '../../hooks'; import { ContentWrapper } from './styles'; import { getAppLink } from '../../utils'; diff --git a/commands/serve/web/components/Hub/ConnectionSteps.jsx b/commands/serve/web/components/Hub/ConnectionSteps.jsx index 4facfd7ce..1b7ebf568 100644 --- a/commands/serve/web/components/Hub/ConnectionSteps.jsx +++ b/commands/serve/web/components/Hub/ConnectionSteps.jsx @@ -1,6 +1,6 @@ import React from 'react'; import Step from '@mui/material/Step'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { ThemeWrapper } from '../ThemeWrapper'; import { StepperWrapper, CustomStepLabel } from './styles'; import { steps } from '../../constants/connectionSteps'; diff --git a/commands/serve/web/components/Hub/SelectEngine/ConnectionHistory.jsx b/commands/serve/web/components/Hub/SelectEngine/ConnectionHistory.jsx index 79cb93992..8a1869729 100644 --- a/commands/serve/web/components/Hub/SelectEngine/ConnectionHistory.jsx +++ b/commands/serve/web/components/Hub/SelectEngine/ConnectionHistory.jsx @@ -7,7 +7,7 @@ import ListItem from '@mui/material/ListItem'; import ListItemText from '@mui/material/ListItemText'; import ListItemSecondaryAction from '@mui/material/ListItemSecondaryAction'; import Typography from '@mui/material/Typography'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { useRootContext } from '../../../contexts/RootContext'; import { checkIfHistoryConnectionDisabled } from '../../../utils'; diff --git a/commands/serve/web/components/Hub/SelectEngine/FormManager.jsx b/commands/serve/web/components/Hub/SelectEngine/FormManager.jsx index 1eaab01d1..7d9439c77 100644 --- a/commands/serve/web/components/Hub/SelectEngine/FormManager.jsx +++ b/commands/serve/web/components/Hub/SelectEngine/FormManager.jsx @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import OutlinedInput from '@mui/material/OutlinedInput'; import Grid from '@mui/material/Grid'; import Button from '@mui/material/Button'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { useRootContext } from '../../../contexts/RootContext'; import { getFieldPlaceHolder, shouldDisableSubmitBtn } from '../../../utils'; diff --git a/commands/serve/web/components/Hub/SelectEngine/__tests__/ConnectionHistory.test.jsx b/commands/serve/web/components/Hub/SelectEngine/__tests__/ConnectionHistory.test.jsx index d42747872..a04800c84 100644 --- a/commands/serve/web/components/Hub/SelectEngine/__tests__/ConnectionHistory.test.jsx +++ b/commands/serve/web/components/Hub/SelectEngine/__tests__/ConnectionHistory.test.jsx @@ -1,11 +1,11 @@ import React from 'react'; import { screen, act } from '@testing-library/react'; -import * as reactRouterDomModule from 'react-router-dom'; +import * as reactRouterDomModule from 'react-router'; import { TestRenderer } from '../../../../utils'; import ConnectionHistory from '../ConnectionHistory'; -jest.mock('react-router-dom', () => ({ - ...jest.requireActual('react-router-dom'), +jest.mock('react-router', () => ({ + ...jest.requireActual('react-router'), useNavigate: jest.fn(), })); diff --git a/commands/serve/web/components/Hub/SelectEngine/__tests__/FormManager.test.jsx b/commands/serve/web/components/Hub/SelectEngine/__tests__/FormManager.test.jsx index 6dc905d2e..832f6d45f 100644 --- a/commands/serve/web/components/Hub/SelectEngine/__tests__/FormManager.test.jsx +++ b/commands/serve/web/components/Hub/SelectEngine/__tests__/FormManager.test.jsx @@ -1,11 +1,11 @@ import React from 'react'; import { screen, act } from '@testing-library/react'; -import * as reactRouterDomModule from 'react-router-dom'; +import * as reactRouterDomModule from 'react-router'; import { TestRenderer } from '../../../../utils/testRenderer'; import FormManager from '../FormManager'; -jest.mock('react-router-dom', () => ({ - ...jest.requireActual('react-router-dom'), +jest.mock('react-router', () => ({ + ...jest.requireActual('react-router'), useNavigate: jest.fn(), })); diff --git a/commands/serve/web/components/Hub/__tests__/ConnectionSteps.test.jsx b/commands/serve/web/components/Hub/__tests__/ConnectionSteps.test.jsx index 1a317a4e1..40f673fc4 100644 --- a/commands/serve/web/components/Hub/__tests__/ConnectionSteps.test.jsx +++ b/commands/serve/web/components/Hub/__tests__/ConnectionSteps.test.jsx @@ -1,13 +1,13 @@ import React from 'react'; import { screen } from '@testing-library/react'; -import * as reactRouterDomModule from 'react-router-dom'; +import * as reactRouterDomModule from 'react-router'; import { TestRenderer } from '../../../utils'; import ConnectionSteps from '../ConnectionSteps'; import { steps } from '../../../constants/connectionSteps'; -jest.mock('react-router-dom', () => ({ - ...jest.requireActual('react-router-dom'), +jest.mock('react-router', () => ({ + ...jest.requireActual('react-router'), useNavigate: jest.fn(), })); diff --git a/commands/serve/web/components/Layouts/HubLayout.jsx b/commands/serve/web/components/Layouts/HubLayout.jsx index 590692096..858d34ae7 100644 --- a/commands/serve/web/components/Layouts/HubLayout.jsx +++ b/commands/serve/web/components/Layouts/HubLayout.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Outlet } from 'react-router-dom'; +import { Outlet } from 'react-router'; import ConnectionSteps from '../Hub/ConnectionSteps'; import { ThemeWrapper } from '../ThemeWrapper'; diff --git a/commands/serve/web/components/Layouts/__tests__/HubLayout.test.jsx b/commands/serve/web/components/Layouts/__tests__/HubLayout.test.jsx index 6ade052b0..e06ada509 100644 --- a/commands/serve/web/components/Layouts/__tests__/HubLayout.test.jsx +++ b/commands/serve/web/components/Layouts/__tests__/HubLayout.test.jsx @@ -1,11 +1,11 @@ import React from 'react'; import { screen } from '@testing-library/react'; -import * as RouterModule from 'react-router-dom'; +import * as RouterModule from 'react-router'; import HubLayout from '../HubLayout'; import { TestRenderer } from '../../../utils'; import { steps } from '../../../constants/connectionSteps'; -jest.mock('react-router-dom', () => ({ ...jest.requireActual('react-router-dom') })); +jest.mock('react-router', () => ({ ...jest.requireActual('react-router') })); describe('Should render layout', () => { let useNavigateMock; diff --git a/commands/serve/web/components/Root.jsx b/commands/serve/web/components/Root.jsx index f9b743507..a95718f0d 100644 --- a/commands/serve/web/components/Root.jsx +++ b/commands/serve/web/components/Root.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { BrowserRouter, Routes, Route } from 'react-router-dom'; +import { BrowserRouter, Routes, Route } from 'react-router'; import { RootContextProvider } from '../contexts/RootContext'; import HubLayout from './Layouts/HubLayout'; diff --git a/commands/serve/web/components/Visualize/Visualize.jsx b/commands/serve/web/components/Visualize/Visualize.jsx index 6022e2764..e3e090904 100644 --- a/commands/serve/web/components/Visualize/Visualize.jsx +++ b/commands/serve/web/components/Visualize/Visualize.jsx @@ -1,6 +1,6 @@ /* eslint no-underscore-dangle:0 */ import React, { useEffect, useLayoutEffect, useState, useRef, useMemo } from 'react'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { embed } from '@nebula.js/stardust'; import { createTheme, ThemeProvider, StyledEngineProvider } from '@nebula.js/ui/theme'; import { WbSunny, Brightness3, ColorLens, Language, Home } from '@nebula.js/ui/icons'; diff --git a/commands/serve/web/contexts/RootContext.jsx b/commands/serve/web/contexts/RootContext.jsx index 91d59b218..22e1c111d 100644 --- a/commands/serve/web/contexts/RootContext.jsx +++ b/commands/serve/web/contexts/RootContext.jsx @@ -1,5 +1,5 @@ import React, { useMemo, createContext, useContext, useEffect } from 'react'; -import { useLocation, useNavigate } from 'react-router-dom'; +import { useLocation, useNavigate } from 'react-router'; import { useInfo, useConnection, useCachedConnections } from '../hooks'; import storageFn from '../storage'; diff --git a/commands/serve/web/hooks/__tests__/useAppList.test.js b/commands/serve/web/hooks/__tests__/useAppList.test.js index 001587ba0..ab6660e31 100644 --- a/commands/serve/web/hooks/__tests__/useAppList.test.js +++ b/commands/serve/web/hooks/__tests__/useAppList.test.js @@ -1,4 +1,4 @@ -import * as ReactRouterDomModule from 'react-router-dom'; +import * as ReactRouterDomModule from 'react-router'; import { renderHook, act } from '@testing-library/react'; import { useAppList } from '../useAppList'; import * as connectModule from '../../connect'; @@ -11,8 +11,8 @@ jest.mock('../../utils', () => ({ ...jest.requireActual('../../utils'), })); -jest.mock('react-router-dom', () => ({ - ...jest.requireActual('react-router-dom'), +jest.mock('react-router', () => ({ + ...jest.requireActual('react-router'), useNavigate: jest.fn(), })); diff --git a/commands/serve/web/hooks/useAppList.js b/commands/serve/web/hooks/useAppList.js index d997c4283..d43af2b5a 100644 --- a/commands/serve/web/hooks/useAppList.js +++ b/commands/serve/web/hooks/useAppList.js @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react'; -import { useNavigate } from 'react-router-dom'; +import { useNavigate } from 'react-router'; import { useRootContext } from '../contexts/RootContext'; import { getConnectionInfo } from '../connect'; import { checkIfAuthorized, getAppList } from '../utils'; diff --git a/commands/serve/web/hooks/useConnection.js b/commands/serve/web/hooks/useConnection.js index 48234dbb3..d79b9d880 100644 --- a/commands/serve/web/hooks/useConnection.js +++ b/commands/serve/web/hooks/useConnection.js @@ -1,5 +1,5 @@ import { useState, useEffect } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation } from 'react-router'; import { connect } from '../connect'; export const useConnection = ({ info, cachedConnectionsData }) => { diff --git a/commands/serve/web/utils/testRenderer.jsx b/commands/serve/web/utils/testRenderer.jsx index 4b5d3dc07..3a6595fc1 100644 --- a/commands/serve/web/utils/testRenderer.jsx +++ b/commands/serve/web/utils/testRenderer.jsx @@ -1,7 +1,7 @@ import React from 'react'; import { render } from '@testing-library/react'; import userEvents from '@testing-library/user-event'; -import { BrowserRouter } from 'react-router-dom'; +import { BrowserRouter } from 'react-router'; import { createTheme, ThemeProvider } from '@nebula.js/ui/theme'; import { RootContext } from '../contexts/RootContext'; diff --git a/jest.setup.js b/jest.setup.js index 4dc63cb26..3756360ad 100644 --- a/jest.setup.js +++ b/jest.setup.js @@ -1,3 +1,6 @@ import '@testing-library/jest-dom'; import 'whatwg-fetch'; import 'jest-location-mock'; +import { TextEncoder, TextDecoder } from 'util'; + +Object.assign(global, { TextDecoder, TextEncoder }); diff --git a/yarn.lock b/yarn.lock index 167e2797d..be2363a04 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3943,11 +3943,6 @@ jsonwebtoken "9.0.2" ws "8.18.0" -"@remix-run/router@1.21.0": - version "1.21.0" - resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.21.0.tgz#c65ae4262bdcfe415dbd4f64ec87676e4a56e2b5" - integrity sha512-xfSkCAchbdG5PnbrKqFWwia4Bi61nH+wm8wLEqfHDyp7Y3dZzgqS2itV8i4gAq9pC2HsTpwyBC6Ds8VHZ96JlA== - "@rollup/plugin-babel@6.0.4": version "6.0.4" resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-6.0.4.tgz#bd698e351fa9aa9619fcae780aea2a603d98e4c4" @@ -4438,6 +4433,11 @@ dependencies: "@types/node" "*" +"@types/cookie@^0.6.0": + version "0.6.0" + resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.6.0.tgz#eac397f28bf1d6ae0ae081363eca2f425bedf0d5" + integrity sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA== + "@types/eslint-scope@^3.7.7": version "3.7.7" resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" @@ -6740,6 +6740,11 @@ cookie@0.7.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.1.tgz#2f73c42142d5d5cf71310a74fc4ae61670e5dbc9" integrity sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w== +cookie@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610" + integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA== + core-js-compat@^3.38.0, core-js-compat@^3.38.1: version "3.39.0" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.39.0.tgz#b12dccb495f2601dc860bdbe7b4e3ffa8ba63f61" @@ -14912,20 +14917,15 @@ react-is@18.3.1, react-is@^16.12.0, "react-is@^16.12.0 || ^17.0.0 || ^18.0.0", r resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== -react-router-dom@6.28.1: - version "6.28.1" - resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.28.1.tgz#b78fe452d2cd31919b80e57047a896bfa1509f8c" - integrity sha512-YraE27C/RdjcZwl5UCqF/ffXnZDxpJdk9Q6jw38SZHjXs7NNdpViq2l2c7fO7+4uWaEfcwfGCv3RSg4e1By/fQ== +react-router@7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/react-router/-/react-router-7.1.1.tgz#88f5657fa5b8f0b918c7222ec710de0274d00b2e" + integrity sha512-39sXJkftkKWRZ2oJtHhCxmoCrBCULr/HAH4IT5DHlgu/Q0FCPV0S4Lx+abjDTx/74xoZzNYDYbOZWlJjruyuDQ== dependencies: - "@remix-run/router" "1.21.0" - react-router "6.28.1" - -react-router@6.28.1: - version "6.28.1" - resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.28.1.tgz#f82317ab24eee67d7beb7b304c0378b2b48fa178" - integrity sha512-2omQTA3rkMljmrvvo6WtewGdVh45SpL9hGiCI9uUrwGGfNFDIvGK4gYJsKlJoNVi6AQZcopSCballL+QGOm7fA== - dependencies: - "@remix-run/router" "1.21.0" + "@types/cookie" "^0.6.0" + cookie "^1.0.1" + set-cookie-parser "^2.6.0" + turbo-stream "2.4.0" react-shallow-renderer@^16.15.0: version "16.15.0" @@ -15883,6 +15883,11 @@ set-blocking@^2.0.0, set-blocking@~2.0.0: resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== +set-cookie-parser@^2.6.0: + version "2.7.1" + resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz#3016f150072202dfbe90fadee053573cc89d2943" + integrity sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ== + set-function-length@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed" @@ -17079,6 +17084,11 @@ tuf-js@^2.2.1: debug "^4.3.4" make-fetch-happen "^13.0.1" +turbo-stream@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/turbo-stream/-/turbo-stream-2.4.0.tgz#1e4fca6725e90fa14ac4adb782f2d3759a5695f0" + integrity sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g== + type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"