Skip to content

Commit 0bffc35

Browse files
louise-davieslouise-davies
authored
Merge pull request #1752 from ral-facilities/renovate/tanstack-query-monorepo
Update tanstack-query monorepo to v4.40.0 (minor)
2 parents 9323950 + bc70fac commit 0bffc35

File tree

6 files changed

+43
-45
lines changed

6 files changed

+43
-45
lines changed

‎packages/datagateway-common/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"@emotion/react": "11.11.1",
1313
"@emotion/styled": "11.11.0",
1414
"@mui/x-date-pickers": "6.11.2",
15-
"@tanstack/react-query": "4.36.1",
16-
"@tanstack/react-query-devtools": "4.36.1",
15+
"@tanstack/react-query": "4.40.0",
16+
"@tanstack/react-query-devtools": "4.40.0",
1717
"@types/lodash.debounce": "4.0.6",
1818
"@vitejs/plugin-react": "4.5.1",
1919
"axios": "1.10.0",

‎packages/datagateway-dataview/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"@emotion/styled": "11.11.0",
99
"@mui/icons-material": "5.11.0",
1010
"@mui/material": "5.11.0",
11-
"@tanstack/react-query": "4.36.1",
12-
"@tanstack/react-query-devtools": "4.36.1",
11+
"@tanstack/react-query": "4.40.0",
12+
"@tanstack/react-query-devtools": "4.40.0",
1313
"@types/history": "4.7.11",
1414
"@types/jsrsasign": "10.5.2",
1515
"@types/lodash.debounce": "4.0.6",

‎packages/datagateway-dataview/src/page/pageContainer.component.test.tsx‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
1-
import thunk from 'redux-thunk';
2-
import configureStore from 'redux-mock-store';
3-
import { StateType } from '../state/app.types';
4-
import { initialState as dgDataViewInitialState } from '../state/reducers/dgdataview.reducer';
51
import {
62
dGCommonInitialState,
73
DownloadCartItem,
84
readSciGatewayToken,
95
} from 'datagateway-common';
106
import { createMemoryHistory, createPath, History } from 'history';
117
import { generatePath, Router } from 'react-router-dom';
8+
import configureStore from 'redux-mock-store';
9+
import thunk from 'redux-thunk';
10+
import { StateType } from '../state/app.types';
11+
import { initialState as dgDataViewInitialState } from '../state/reducers/dgdataview.reducer';
1212

13-
import PageContainer, { paths } from './pageContainer.component';
14-
import {
15-
checkInstrumentId as unmockedCheckInstrumentId,
16-
checkInvestigationId as unmockedCheckInvestigationId,
17-
} from './idCheckFunctions';
18-
import axios, { AxiosResponse } from 'axios';
1913
import {
2014
QueryClient,
2115
QueryClientProvider,
2216
useIsFetching,
2317
useQueryClient,
2418
} from '@tanstack/react-query';
25-
import { Provider } from 'react-redux';
2619
import {
2720
act,
2821
render,
29-
type RenderResult,
3022
screen,
3123
waitFor,
3224
within,
25+
type RenderResult,
3326
} from '@testing-library/react';
3427
import userEvent from '@testing-library/user-event';
28+
import axios, { AxiosResponse } from 'axios';
29+
import { Provider } from 'react-redux';
30+
import {
31+
checkInstrumentId as unmockedCheckInstrumentId,
32+
checkInvestigationId as unmockedCheckInvestigationId,
33+
} from './idCheckFunctions';
34+
import PageContainer, { paths } from './pageContainer.component';
3535

3636
vi.mock('loglevel');
3737
vi.mock('./idCheckFunctions');
@@ -135,7 +135,6 @@ describe('PageContainer - Tests', () => {
135135
document.body.appendChild(holder);
136136

137137
vi.mocked(useQueryClient, { partial: true }).mockReturnValue({
138-
// @ts-expect-error doesn't like that number isn't a generic type
139138
getQueryData: vi.fn(() => 0),
140139
});
141140

@@ -174,8 +173,7 @@ describe('PageContainer - Tests', () => {
174173

175174
it('displays the correct entity count', async () => {
176175
history.replace(paths.toggle.investigation);
177-
vi.mocked(useQueryClient).mockReturnValue({
178-
// @ts-expect-error doesn't like that number isn't a generic type
176+
vi.mocked(useQueryClient, { partial: true }).mockReturnValue({
179177
getQueryData: vi.fn(() => 101),
180178
});
181179

‎packages/datagateway-download/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"@emotion/styled": "11.11.0",
99
"@mui/icons-material": "5.11.0",
1010
"@mui/material": "5.11.0",
11-
"@tanstack/react-query": "4.36.1",
12-
"@tanstack/react-query-devtools": "4.36.1",
11+
"@tanstack/react-query": "4.40.0",
12+
"@tanstack/react-query-devtools": "4.40.0",
1313
"@types/jsrsasign": "10.5.2",
1414
"@types/lodash.chunk": "4.2.6",
1515
"@types/node": "20.19.0",

‎packages/datagateway-search/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"@mui/icons-material": "5.11.0",
1111
"@mui/material": "5.11.0",
1212
"@mui/x-date-pickers": "6.11.2",
13-
"@tanstack/react-query": "4.36.1",
14-
"@tanstack/react-query-devtools": "4.36.1",
13+
"@tanstack/react-query": "4.40.0",
14+
"@tanstack/react-query-devtools": "4.40.0",
1515
"@types/history": "4.7.11",
1616
"@types/jsrsasign": "10.5.2",
1717
"@types/lodash.isequal": "4.5.8",

‎yarn.lock‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2749,33 +2749,33 @@ __metadata:
27492749
languageName: node
27502750
linkType: hard
27512751

2752-
"@tanstack/query-core@npm:4.36.1":
2753-
version: 4.36.1
2754-
resolution: "@tanstack/query-core@npm:4.36.1"
2755-
checksum: 47672094da20d89402d9fe03bb7b0462be73a76ff9ca715169738bc600a719d064d106d083a8eedae22a2c22de22f87d5eb5d31ef447aba771d9190f2117ed10
2752+
"@tanstack/query-core@npm:4.40.0":
2753+
version: 4.40.0
2754+
resolution: "@tanstack/query-core@npm:4.40.0"
2755+
checksum: 0d51f905819bdaeeeddad30a94a85c2cdda6de90dde716195274613ef0f2840cbc476fc2401848b5ef70bbcbc67749ac4c216a3c5bc56fc933b642a346f32b87
27562756
languageName: node
27572757
linkType: hard
27582758

2759-
"@tanstack/react-query-devtools@npm:4.36.1":
2760-
version: 4.36.1
2761-
resolution: "@tanstack/react-query-devtools@npm:4.36.1"
2759+
"@tanstack/react-query-devtools@npm:4.40.0":
2760+
version: 4.40.0
2761+
resolution: "@tanstack/react-query-devtools@npm:4.40.0"
27622762
dependencies:
27632763
"@tanstack/match-sorter-utils": ^8.7.0
27642764
superjson: ^1.10.0
27652765
use-sync-external-store: ^1.2.0
27662766
peerDependencies:
2767-
"@tanstack/react-query": ^4.36.1
2767+
"@tanstack/react-query": ^4.40.0
27682768
react: ^16.8.0 || ^17.0.0 || ^18.0.0
27692769
react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
2770-
checksum: d4f7da4121a933be0d0406fb75f682b193a33e7d4ba9a4d54ff19e04db823d00513fbe86230c43d34aae55f6d0d1f8be17315f19d515b298b6bb0dabd0c5d261
2770+
checksum: d898ba93be69f1fb09924fa4ae20b60e16df9aa2c181b6a017008dee5f010b8018a7cb2c9ba0da4b267c5bd4af0aa1fe7997b7703dec9349bb9a078318da7b17
27712771
languageName: node
27722772
linkType: hard
27732773

2774-
"@tanstack/react-query@npm:4.36.1":
2775-
version: 4.36.1
2776-
resolution: "@tanstack/react-query@npm:4.36.1"
2774+
"@tanstack/react-query@npm:4.40.0":
2775+
version: 4.40.0
2776+
resolution: "@tanstack/react-query@npm:4.40.0"
27772777
dependencies:
2778-
"@tanstack/query-core": 4.36.1
2778+
"@tanstack/query-core": 4.40.0
27792779
use-sync-external-store: ^1.2.0
27802780
peerDependencies:
27812781
react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -2786,7 +2786,7 @@ __metadata:
27862786
optional: true
27872787
react-native:
27882788
optional: true
2789-
checksum: 1aff0a476859386f8d32253fa0d0bde7b81769a6d4d4d9cbd78778f0f955459a3bdb7ee27a0d2ee7373090f12998b45df80db0b5b313bd0a7a39d36c6e8e51c5
2789+
checksum: 146fb59e0c47545d25b6518d000738de80c9a0be800693269dc420eef6633b8e944aa5642700b44b15d7071fad023af3035384d040568f2b082c51e1fcf6b9f2
27902790
languageName: node
27912791
linkType: hard
27922792

@@ -4755,8 +4755,8 @@ __metadata:
47554755
"@mui/icons-material": 5.11.0
47564756
"@mui/material": 5.11.0
47574757
"@mui/x-date-pickers": 6.11.2
4758-
"@tanstack/react-query": 4.36.1
4759-
"@tanstack/react-query-devtools": 4.36.1
4758+
"@tanstack/react-query": 4.40.0
4759+
"@tanstack/react-query-devtools": 4.40.0
47604760
"@testing-library/jest-dom": 6.4.1
47614761
"@testing-library/react": 14.0.0
47624762
"@testing-library/user-event": 14.5.2
@@ -4820,8 +4820,8 @@ __metadata:
48204820
"@emotion/styled": 11.11.0
48214821
"@mui/icons-material": 5.11.0
48224822
"@mui/material": 5.11.0
4823-
"@tanstack/react-query": 4.36.1
4824-
"@tanstack/react-query-devtools": 4.36.1
4823+
"@tanstack/react-query": 4.40.0
4824+
"@tanstack/react-query-devtools": 4.40.0
48254825
"@testing-library/jest-dom": 6.4.1
48264826
"@testing-library/react": 14.0.0
48274827
"@testing-library/user-event": 14.5.2
@@ -4894,8 +4894,8 @@ __metadata:
48944894
"@emotion/styled": 11.11.0
48954895
"@mui/icons-material": 5.11.0
48964896
"@mui/material": 5.11.0
4897-
"@tanstack/react-query": 4.36.1
4898-
"@tanstack/react-query-devtools": 4.36.1
4897+
"@tanstack/react-query": 4.40.0
4898+
"@tanstack/react-query-devtools": 4.40.0
48994899
"@testing-library/cypress": 10.0.0
49004900
"@testing-library/jest-dom": 6.4.1
49014901
"@testing-library/react": 14.0.0
@@ -4965,8 +4965,8 @@ __metadata:
49654965
"@mui/icons-material": 5.11.0
49664966
"@mui/material": 5.11.0
49674967
"@mui/x-date-pickers": 6.11.2
4968-
"@tanstack/react-query": 4.36.1
4969-
"@tanstack/react-query-devtools": 4.36.1
4968+
"@tanstack/react-query": 4.40.0
4969+
"@tanstack/react-query-devtools": 4.40.0
49704970
"@testing-library/cypress": 10.0.0
49714971
"@testing-library/jest-dom": 6.4.1
49724972
"@testing-library/react": 14.0.0

0 commit comments

Comments
 (0)