From 927b4a56744f50430576707f29c7d7f94046ff6f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 01:42:38 +0000 Subject: [PATCH 1/2] Update dependency redux-thunk to v3 --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index a4cad0a7..3739b9dc 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "react-scripts": "5.0.0", "redux": "4.2.0", "redux-logger": "3.0.6", - "redux-thunk": "2.4.1", + "redux-thunk": "3.1.0", "single-spa": "5.9.1", "typeface-roboto": "1.1.13", "typescript": "5.3.3" diff --git a/yarn.lock b/yarn.lock index a06e906a..7d206bfc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -13205,12 +13205,12 @@ __metadata: languageName: node linkType: hard -"redux-thunk@npm:2.4.1": - version: 2.4.1 - resolution: "redux-thunk@npm:2.4.1" +"redux-thunk@npm:3.1.0": + version: 3.1.0 + resolution: "redux-thunk@npm:3.1.0" peerDependencies: - redux: ^4 - checksum: af5abb425fb9dccda02e5f387d6f3003997f62d906542a3d35fc9420088f550dc1a018bdc246c7d23ee852b4d4ab8b5c64c5be426e45a328d791c4586a3c6b6e + redux: ^5.0.0 + checksum: bea96f8233975aad4c9f24ca1ffd08ac7ec91eaefc26e7ba9935544dc55d7f09ba2aa726676dab53dc79d0c91e8071f9729cddfea927f4c41839757d2ade0f50 languageName: node linkType: hard @@ -13797,7 +13797,7 @@ __metadata: redux: 4.2.0 redux-logger: 3.0.6 redux-mock-store: 1.5.4 - redux-thunk: 2.4.1 + redux-thunk: 3.1.0 serve: 14.2.0 single-spa: 5.9.1 start-server-and-test: 2.0.0 From 1a4309f9ab2daa321a80d293cee18f27756854fa Mon Sep 17 00:00:00 2001 From: Kacper Roemer Date: Fri, 23 Feb 2024 11:41:44 +0000 Subject: [PATCH 2/2] updated thunk imports --- src/App.tsx | 2 +- src/accessibilityPage/accessibilityPage.component.test.tsx | 2 +- src/adminPage/adminPage.component.test.tsx | 2 +- src/adminPage/maintenancePage.component.test.tsx | 2 +- src/loginPage/loginPage.component.test.tsx | 2 +- src/logoutPage/logoutPage.component.test.tsx | 2 +- src/mainAppBar/userProfile.component.test.tsx | 2 +- src/pageContainer.test.tsx | 2 +- src/pageNotFound/pageNotFound.component.test.tsx | 2 +- src/preloader/preloader.component.test.tsx | 2 +- src/routing/authorisedRoute.component.test.tsx | 2 +- src/state/middleware/scigateway.middleware.test.tsx | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 03c6b0e0..65abfef2 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -5,7 +5,7 @@ import * as React from 'react'; import { Provider } from 'react-redux'; import { AnyAction, applyMiddleware, compose, createStore } from 'redux'; import { createLogger } from 'redux-logger'; -import thunk, { ThunkDispatch } from 'redux-thunk'; +import { thunk, ThunkDispatch } from 'redux-thunk'; import { configureSite, loadMaintenanceState, diff --git a/src/accessibilityPage/accessibilityPage.component.test.tsx b/src/accessibilityPage/accessibilityPage.component.test.tsx index 451f7cd4..c47ac450 100644 --- a/src/accessibilityPage/accessibilityPage.component.test.tsx +++ b/src/accessibilityPage/accessibilityPage.component.test.tsx @@ -6,7 +6,7 @@ import { StateType } from '../state/state.types'; import { authState, initialState } from '../state/reducers/scigateway.reducer'; import { createLocation } from 'history'; import configureStore from 'redux-mock-store'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import { Provider } from 'react-redux'; import { render } from '@testing-library/react'; diff --git a/src/adminPage/adminPage.component.test.tsx b/src/adminPage/adminPage.component.test.tsx index 36a5d350..e2aaba7d 100644 --- a/src/adminPage/adminPage.component.test.tsx +++ b/src/adminPage/adminPage.component.test.tsx @@ -8,7 +8,7 @@ import AdminPage from './adminPage.component'; import { Provider } from 'react-redux'; import { buildTheme } from '../theming'; import TestAuthProvider from '../authentication/testAuthProvider'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import { Router } from 'react-router'; import { StyledEngineProvider, ThemeProvider } from '@mui/material'; import { render, screen } from '@testing-library/react'; diff --git a/src/adminPage/maintenancePage.component.test.tsx b/src/adminPage/maintenancePage.component.test.tsx index 7708ede5..d5b0de21 100644 --- a/src/adminPage/maintenancePage.component.test.tsx +++ b/src/adminPage/maintenancePage.component.test.tsx @@ -7,7 +7,7 @@ import configureStore, { MockStore } from 'redux-mock-store'; import { Provider } from 'react-redux'; import { buildTheme } from '../theming'; import TestAuthProvider from '../authentication/testAuthProvider'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import { loadMaintenanceState, loadScheduledMaintenanceState, diff --git a/src/loginPage/loginPage.component.test.tsx b/src/loginPage/loginPage.component.test.tsx index f5fdb6bf..a515a325 100644 --- a/src/loginPage/loginPage.component.test.tsx +++ b/src/loginPage/loginPage.component.test.tsx @@ -20,7 +20,7 @@ import { resetAuthState, } from '../state/actions/scigateway.actions'; import { Provider } from 'react-redux'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import { AnyAction } from 'redux'; import { NotificationType } from '../state/scigateway.types'; import * as log from 'loglevel'; diff --git a/src/logoutPage/logoutPage.component.test.tsx b/src/logoutPage/logoutPage.component.test.tsx index a21b30b9..4f5681e8 100644 --- a/src/logoutPage/logoutPage.component.test.tsx +++ b/src/logoutPage/logoutPage.component.test.tsx @@ -8,7 +8,7 @@ import configureStore from 'redux-mock-store'; import { authState, initialState } from '../state/reducers/scigateway.reducer'; import { Provider } from 'react-redux'; import { push } from 'connected-react-router'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import TestAuthProvider from '../authentication/testAuthProvider'; import { buildTheme } from '../theming'; import { ThemeProvider } from '@mui/material/styles'; diff --git a/src/mainAppBar/userProfile.component.test.tsx b/src/mainAppBar/userProfile.component.test.tsx index 60f4afce..9a68ecf6 100644 --- a/src/mainAppBar/userProfile.component.test.tsx +++ b/src/mainAppBar/userProfile.component.test.tsx @@ -6,7 +6,7 @@ import { authState, initialState } from '../state/reducers/scigateway.reducer'; import { Provider } from 'react-redux'; import { push } from 'connected-react-router'; import { StyledEngineProvider, ThemeProvider } from '@mui/material'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import TestAuthProvider from '../authentication/testAuthProvider'; import { buildTheme } from '../theming'; import { render, screen, within } from '@testing-library/react'; diff --git a/src/pageContainer.test.tsx b/src/pageContainer.test.tsx index 3cd8829f..fec64ff2 100644 --- a/src/pageContainer.test.tsx +++ b/src/pageContainer.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import configureStore from 'redux-mock-store'; import { createLocation } from 'history'; diff --git a/src/pageNotFound/pageNotFound.component.test.tsx b/src/pageNotFound/pageNotFound.component.test.tsx index 25300054..a585712f 100644 --- a/src/pageNotFound/pageNotFound.component.test.tsx +++ b/src/pageNotFound/pageNotFound.component.test.tsx @@ -1,6 +1,6 @@ import React from 'react'; import PageNotFoundComponent from './pageNotFound.component'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import { authState, initialState } from '../state/reducers/scigateway.reducer'; import { createMemoryHistory, History } from 'history'; import configureStore from 'redux-mock-store'; diff --git a/src/preloader/preloader.component.test.tsx b/src/preloader/preloader.component.test.tsx index b4ec1ec2..914585e4 100644 --- a/src/preloader/preloader.component.test.tsx +++ b/src/preloader/preloader.component.test.tsx @@ -5,7 +5,7 @@ import { StateType } from '../state/state.types'; import { authState, initialState } from '../state/reducers/scigateway.reducer'; import { createLocation } from 'history'; import { Provider } from 'react-redux'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import { StyledEngineProvider, ThemeProvider } from '@mui/material'; import { render } from '@testing-library/react'; import { createTheme } from '@mui/material/styles'; diff --git a/src/routing/authorisedRoute.component.test.tsx b/src/routing/authorisedRoute.component.test.tsx index caa17554..05cc3273 100644 --- a/src/routing/authorisedRoute.component.test.tsx +++ b/src/routing/authorisedRoute.component.test.tsx @@ -26,7 +26,7 @@ import { } from 'redux'; import { Router } from 'react-router-dom'; import { SignOutType } from '../state/scigateway.types'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import { StyledEngineProvider, ThemeProvider } from '@mui/material'; import { buildTheme } from '../theming'; import { connectRouter } from 'connected-react-router'; diff --git a/src/state/middleware/scigateway.middleware.test.tsx b/src/state/middleware/scigateway.middleware.test.tsx index 369a3267..4de963e5 100644 --- a/src/state/middleware/scigateway.middleware.test.tsx +++ b/src/state/middleware/scigateway.middleware.test.tsx @@ -27,7 +27,7 @@ import TestAuthProvider from '../../authentication/testAuthProvider'; import { flushPromises } from '../../setupTests'; import { authState, initialState } from '../reducers/scigateway.reducer'; import { buildTheme } from '../../theming'; -import thunk from 'redux-thunk'; +import { thunk } from 'redux-thunk'; import { autoLoginAuthorised } from '../actions/scigateway.actions'; import * as singleSpa from 'single-spa';