Skip to content

Commit edbde2f

Browse files
louise-davieslouise-davies
authored
Merge pull request #1749 from ral-facilities/renovate/material-ui-monorepo
Update dependency @mui/x-date-pickers to v6.20.2
2 parents e1968b8 + 812e154 commit edbde2f

File tree

6 files changed

+87
-31
lines changed

6 files changed

+87
-31
lines changed

‎packages/datagateway-common/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@emotion/react": "11.14.0",
1313
"@emotion/styled": "11.14.1",
1414
"@mui/lab": "5.0.0-alpha.177",
15-
"@mui/x-date-pickers": "6.11.2",
15+
"@mui/x-date-pickers": "6.20.2",
1616
"@tanstack/react-query": "4.40.0",
1717
"@tanstack/react-query-devtools": "4.40.0",
1818
"@types/lodash.debounce": "4.0.6",

‎packages/datagateway-common/src/table/columnFilters/__snapshots__/dateColumnFilter.component.test.tsx.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ exports[`Date filter component > DatePicker functionality > useDateFilter hook r
44
<DocumentFragment>
55
<form>
66
<div
7-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
7+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
88
>
99
<div
1010
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-adornedEnd css-1eed5fa-MuiInputBase-root-MuiInput-root"
@@ -48,7 +48,7 @@ exports[`Date filter component > DatePicker functionality > useDateFilter hook r
4848
</div>
4949
</div>
5050
<div
51-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
51+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
5252
>
5353
<div
5454
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-adornedEnd css-1eed5fa-MuiInputBase-root-MuiInput-root"
@@ -99,7 +99,7 @@ exports[`Date filter component > renders correctly 1`] = `
9999
<DocumentFragment>
100100
<form>
101101
<div
102-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
102+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
103103
>
104104
<div
105105
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-adornedEnd css-1eed5fa-MuiInputBase-root-MuiInput-root"
@@ -143,7 +143,7 @@ exports[`Date filter component > renders correctly 1`] = `
143143
</div>
144144
</div>
145145
<div
146-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
146+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
147147
>
148148
<div
149149
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-adornedEnd css-1eed5fa-MuiInputBase-root-MuiInput-root"
@@ -194,7 +194,7 @@ exports[`Date filter component > renders correctly with default values 1`] = `
194194
<DocumentFragment>
195195
<form>
196196
<div
197-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
197+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
198198
>
199199
<div
200200
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-adornedEnd css-1eed5fa-MuiInputBase-root-MuiInput-root"
@@ -238,7 +238,7 @@ exports[`Date filter component > renders correctly with default values 1`] = `
238238
</div>
239239
</div>
240240
<div
241-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
241+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
242242
>
243243
<div
244244
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-adornedEnd css-1eed5fa-MuiInputBase-root-MuiInput-root"

‎packages/datagateway-download/src/downloadStatus/__snapshots__/adminDownloadStatusTable.component.test.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ exports[`Admin Download Status Table > should render correctly 1`] = `
941941
</div>
942942
<form>
943943
<div
944-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
944+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
945945
>
946946
<div
947947
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorSecondary MuiInputBase-formControl MuiInputBase-adornedEnd css-cv41kj-MuiInputBase-root-MuiInput-root"
@@ -985,7 +985,7 @@ exports[`Admin Download Status Table > should render correctly 1`] = `
985985
</div>
986986
</div>
987987
<div
988-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
988+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
989989
>
990990
<div
991991
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-adornedEnd css-1eed5fa-MuiInputBase-root-MuiInput-root"

‎packages/datagateway-download/src/downloadStatus/__snapshots__/downloadStatusTable.component.test.tsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ exports[`Download Status Table > should render correctly 1`] = `
453453
</div>
454454
<form>
455455
<div
456-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
456+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
457457
>
458458
<div
459459
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorSecondary MuiInputBase-formControl MuiInputBase-adornedEnd css-cv41kj-MuiInputBase-root-MuiInput-root"
@@ -497,7 +497,7 @@ exports[`Download Status Table > should render correctly 1`] = `
497497
</div>
498498
</div>
499499
<div
500-
class="MuiFormControl-root MuiTextField-root css-1u3bzj6-MuiFormControl-root-MuiTextField-root"
500+
class="MuiFormControl-root MuiTextField-root css-z3c6am-MuiFormControl-root-MuiTextField-root"
501501
>
502502
<div
503503
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-formControl MuiInputBase-adornedEnd css-1eed5fa-MuiInputBase-root-MuiInput-root"

‎packages/datagateway-search/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"@emotion/styled": "11.14.1",
1010
"@mui/icons-material": "5.18.0",
1111
"@mui/material": "5.18.0",
12-
"@mui/x-date-pickers": "6.11.2",
12+
"@mui/x-date-pickers": "6.20.2",
1313
"@tanstack/react-query": "4.40.0",
1414
"@tanstack/react-query-devtools": "4.40.0",
1515
"@types/history": "4.7.11",

‎yarn.lock‎

Lines changed: 75 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,10 +1444,10 @@ __metadata:
14441444
languageName: node
14451445
linkType: hard
14461446

1447-
"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.6, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
1448-
version: 7.28.4
1449-
resolution: "@babel/runtime@npm:7.28.4"
1450-
checksum: 934b0a0460f7d06637d93fcd1a44ac49adc33518d17253b5a0b55ff4cb90a45d8fe78bf034b448911dbec7aff2a90b918697559f78d21c99ff8dbadae9565b55
1447+
"@babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.23.9, @babel/runtime@npm:^7.24.6, @babel/runtime@npm:^7.26.0, @babel/runtime@npm:^7.28.6, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2":
1448+
version: 7.28.6
1449+
resolution: "@babel/runtime@npm:7.28.6"
1450+
checksum: 42d8a868c2fc2e9a77927945a6daa7ec03c7ea49e611e0d15442933cdabb12f20e3a6849c729259076c10a4247adec229331d1f94c2d0073ea0979d7853e29fd
14511451
languageName: node
14521452
linkType: hard
14531453

@@ -2359,6 +2359,28 @@ __metadata:
23592359
languageName: node
23602360
linkType: hard
23612361

2362+
"@mui/base@npm:^5.0.0-beta.22":
2363+
version: 5.0.0-dev.20240529-082515-213b5e33ab
2364+
resolution: "@mui/base@npm:5.0.0-dev.20240529-082515-213b5e33ab"
2365+
dependencies:
2366+
"@babel/runtime": ^7.24.6
2367+
"@floating-ui/react-dom": ^2.0.8
2368+
"@mui/types": ^7.2.14-dev.20240529-082515-213b5e33ab
2369+
"@mui/utils": ^6.0.0-dev.20240529-082515-213b5e33ab
2370+
"@popperjs/core": ^2.11.8
2371+
clsx: ^2.1.1
2372+
prop-types: ^15.8.1
2373+
peerDependencies:
2374+
"@types/react": ^17.0.0 || ^18.0.0
2375+
react: ^17.0.0 || ^18.0.0
2376+
react-dom: ^17.0.0 || ^18.0.0
2377+
peerDependenciesMeta:
2378+
"@types/react":
2379+
optional: true
2380+
checksum: 7ca5d369c5f4dfa2bb36fe49d721f3dc28a6d067bd74492e8f4531671ff9debe33bade579d0cdcb7d5f899bfc5003c8f710b1f9422edd22f06d805dbc68c9f4e
2381+
languageName: node
2382+
linkType: hard
2383+
23622384
"@mui/core-downloads-tracker@npm:^5.18.0":
23632385
version: 5.18.0
23642386
resolution: "@mui/core-downloads-tracker@npm:5.18.0"
@@ -2511,7 +2533,21 @@ __metadata:
25112533
languageName: node
25122534
linkType: hard
25132535

2514-
"@mui/types@npm:~7.2.15":
2536+
"@mui/types@npm:^7.2.14-dev.20240529-082515-213b5e33ab":
2537+
version: 7.4.11
2538+
resolution: "@mui/types@npm:7.4.11"
2539+
dependencies:
2540+
"@babel/runtime": ^7.28.6
2541+
peerDependencies:
2542+
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
2543+
peerDependenciesMeta:
2544+
"@types/react":
2545+
optional: true
2546+
checksum: 95fb7622b34034b6601193e515174194ff1d211447ffdf52a69968a9c492866313aafc540338770c2d119c9797c966ab3788cd9b630ff74efccaf64125722be3
2547+
languageName: node
2548+
linkType: hard
2549+
2550+
"@mui/types@npm:~7.2.15, @mui/types@npm:~7.2.24":
25152551
version: 7.2.24
25162552
resolution: "@mui/types@npm:7.2.24"
25172553
peerDependencies:
@@ -2523,7 +2559,7 @@ __metadata:
25232559
languageName: node
25242560
linkType: hard
25252561

2526-
"@mui/utils@npm:^5.14.5, @mui/utils@npm:^5.17.1":
2562+
"@mui/utils@npm:^5.14.16, @mui/utils@npm:^5.17.1":
25272563
version: 5.17.1
25282564
resolution: "@mui/utils@npm:5.17.1"
25292565
dependencies:
@@ -2543,23 +2579,43 @@ __metadata:
25432579
languageName: node
25442580
linkType: hard
25452581

2546-
"@mui/x-date-pickers@npm:6.11.2":
2547-
version: 6.11.2
2548-
resolution: "@mui/x-date-pickers@npm:6.11.2"
2582+
"@mui/utils@npm:^6.0.0-dev.20240529-082515-213b5e33ab":
2583+
version: 6.4.9
2584+
resolution: "@mui/utils@npm:6.4.9"
25492585
dependencies:
2550-
"@babel/runtime": ^7.22.6
2551-
"@mui/utils": ^5.14.5
2552-
"@types/react-transition-group": ^4.4.6
2586+
"@babel/runtime": ^7.26.0
2587+
"@mui/types": ~7.2.24
2588+
"@types/prop-types": ^15.7.14
2589+
clsx: ^2.1.1
2590+
prop-types: ^15.8.1
2591+
react-is: ^19.0.0
2592+
peerDependencies:
2593+
"@types/react": ^17.0.0 || ^18.0.0 || ^19.0.0
2594+
react: ^17.0.0 || ^18.0.0 || ^19.0.0
2595+
peerDependenciesMeta:
2596+
"@types/react":
2597+
optional: true
2598+
checksum: b11d8f76d1c3a6c256a0b832b19b7640ade2d1cda52bb1d04f98ef14b1416461d98af0131399d01f3e327f32c255821e277b175d07723bfc4817eaea249419b1
2599+
languageName: node
2600+
linkType: hard
2601+
2602+
"@mui/x-date-pickers@npm:6.20.2":
2603+
version: 6.20.2
2604+
resolution: "@mui/x-date-pickers@npm:6.20.2"
2605+
dependencies:
2606+
"@babel/runtime": ^7.23.2
2607+
"@mui/base": ^5.0.0-beta.22
2608+
"@mui/utils": ^5.14.16
2609+
"@types/react-transition-group": ^4.4.8
25532610
clsx: ^2.0.0
25542611
prop-types: ^15.8.1
25552612
react-transition-group: ^4.4.5
25562613
peerDependencies:
25572614
"@emotion/react": ^11.9.0
25582615
"@emotion/styled": ^11.8.1
2559-
"@mui/base": ^5.0.0-alpha.87
25602616
"@mui/material": ^5.8.6
25612617
"@mui/system": ^5.8.0
2562-
date-fns: ^2.25.0
2618+
date-fns: ^2.25.0 || ^3.2.0
25632619
date-fns-jalali: ^2.13.0-0
25642620
dayjs: ^1.10.7
25652621
luxon: ^3.0.2
@@ -2587,7 +2643,7 @@ __metadata:
25872643
optional: true
25882644
moment-jalaali:
25892645
optional: true
2590-
checksum: 389932d3e990d596a24d593086a02960a1111217745587ef9ac35a2e419bfbc3b7c112d50df591ff80ee864731acecb6cfe2945274796c52856f87275d1b4b10
2646+
checksum: 0447b911ea0d78d4ee2080827bc075d8c1ed4764bd289d6bf65ee2ff870ac8ef72daef8a1858ccf27aad6c296cfece5455f6834a2d18a2c8e719518cd5464a0b
25912647
languageName: node
25922648
linkType: hard
25932649

@@ -3176,7 +3232,7 @@ __metadata:
31763232
languageName: node
31773233
linkType: hard
31783234

3179-
"@types/prop-types@npm:*, @types/prop-types@npm:^15.7.12":
3235+
"@types/prop-types@npm:*, @types/prop-types@npm:^15.7.12, @types/prop-types@npm:^15.7.14":
31803236
version: 15.7.15
31813237
resolution: "@types/prop-types@npm:15.7.15"
31823238
checksum: 31aa2f59b28f24da6fb4f1d70807dae2aedfce090ec63eaf9ea01727a9533ef6eaf017de5bff99fbccad7d1c9e644f52c6c2ba30869465dd22b1a7221c29f356
@@ -3225,7 +3281,7 @@ __metadata:
32253281
languageName: node
32263282
linkType: hard
32273283

3228-
"@types/react-transition-group@npm:^4.4.10, @types/react-transition-group@npm:^4.4.6":
3284+
"@types/react-transition-group@npm:^4.4.10, @types/react-transition-group@npm:^4.4.8":
32293285
version: 4.4.12
32303286
resolution: "@types/react-transition-group@npm:4.4.12"
32313287
peerDependencies:
@@ -4808,7 +4864,7 @@ __metadata:
48084864
"@mui/icons-material": 5.18.0
48094865
"@mui/lab": 5.0.0-alpha.177
48104866
"@mui/material": 5.18.0
4811-
"@mui/x-date-pickers": 6.11.2
4867+
"@mui/x-date-pickers": 6.20.2
48124868
"@tanstack/react-query": 4.40.0
48134869
"@tanstack/react-query-devtools": 4.40.0
48144870
"@testing-library/dom": 10.4.1
@@ -5024,7 +5080,7 @@ __metadata:
50245080
"@emotion/styled": 11.14.1
50255081
"@mui/icons-material": 5.18.0
50265082
"@mui/material": 5.18.0
5027-
"@mui/x-date-pickers": 6.11.2
5083+
"@mui/x-date-pickers": 6.20.2
50285084
"@tanstack/react-query": 4.40.0
50295085
"@tanstack/react-query-devtools": 4.40.0
50305086
"@testing-library/cypress": 10.1.0

0 commit comments

Comments
 (0)