Skip to content

Commit f05ae95

Browse files
garronejgarronej
committed
Fix issue with MUI v5.11.0
1 parent 7be9d10 commit f05ae95

File tree

5 files changed

+57
-71
lines changed

5 files changed

+57
-71
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"@emotion/react": "^11.10.4",
7575
"@emotion/styled": "^11.10.4",
7676
"@gouvfr/dsfr": "1.8.4",
77-
"@mui/material": "5.10.7",
77+
"@mui/material": "^5.11.0",
7878
"@storybook/addon-actions": "^6.5.13",
7979
"@storybook/addon-essentials": "^6.5.13",
8080
"@storybook/addon-interactions": "^6.5.13",

‎src/mui.tsx‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ export function getMuiDsfrThemeOptions(params: { isDark: boolean }): ThemeOption
135135
})();
136136
})(),
137137
"shadows": (() => {
138+
const [, , , , , , , , ...rest] = createTheme().shadows;
139+
138140
return id<Shadows>([
139141
"none",
140142
/** ButtonBar shadow */
@@ -151,23 +153,7 @@ export function getMuiDsfrThemeOptions(params: { isDark: boolean }): ThemeOption
151153
"0px 6px 10px 0px rgba(0,0,0,0.14)",
152154
/** Dialog **/
153155
"0px 8px 10px -7px rgba(0,0,0,0.07)",
154-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
155-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
156-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
157-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
158-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
159-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
160-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
161-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
162-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
163-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
164-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
165-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
166-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
167-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
168-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
169-
"0px 8px 10px -7px rgba(0,0,0,0.07)",
170-
"0px 8px 10px -7px rgba(0,0,0,0.07)"
156+
...rest
171157
]);
172158
})(),
173159
"components": {

‎test/integration/next/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"@emotion/react": "^11.10.5",
2020
"@emotion/server": "^11.10.0",
2121
"tss-react": "^4.4.4",
22-
"@mui/material": "5.10.7",
23-
"@mui/icons-material": "5.10.15",
22+
"@mui/material": "^5.11.0",
23+
"@mui/icons-material": "^5.11.0",
2424
"@emotion/styled": "^11.10.5",
2525
"dayjs": "^1.11.6",
2626
"@mui/x-date-pickers": "^5.0.9",

‎test/integration/next/yarn.lock‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
core-js-pure "^3.25.1"
6363
regenerator-runtime "^0.13.11"
6464

65-
"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.19.0", "@babel/runtime@^7.20.1", "@babel/runtime@^7.20.6", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
65+
"@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.18.3", "@babel/runtime@^7.18.9", "@babel/runtime@^7.20.6", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.7":
6666
version "7.20.6"
6767
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3"
6868
integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
@@ -79,7 +79,7 @@
7979
to-fast-properties "^2.0.0"
8080

8181
"@codegouvfr/react-dsfr@file:../../../dist":
82-
version "0.5.0"
82+
version "0.5.3-rc.0"
8383
dependencies:
8484
tsafe "^1.4.0"
8585

@@ -263,43 +263,43 @@
263263
resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
264264
integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
265265

266-
"@mui/base@5.0.0-alpha.99":
267-
version "5.0.0-alpha.99"
268-
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.99.tgz#52589c72b6bf69e016e5811292529d60f81537ad"
269-
integrity sha512-D04H6O1c0Jv561yI0SVbpa8MpqpW3G43CwJxV2o6ALfI0DMJ45w07dGafmDchb6aCWTRTdggd3rjgmuzyNwPiQ==
266+
"@mui/base@5.0.0-alpha.110":
267+
version "5.0.0-alpha.110"
268+
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.110.tgz#61174f64b23e667387708b2cbb31339e58c714cf"
269+
integrity sha512-q4TH9T3sTBknTXXTEf2zO8F3nbHg5iGgiaRx9XErTbXvHrmLrQXbQ4hmrLERocSTBFCFWkKyne/qZj0diWlPtA==
270270
dependencies:
271-
"@babel/runtime" "^7.19.0"
271+
"@babel/runtime" "^7.20.6"
272272
"@emotion/is-prop-valid" "^1.2.0"
273-
"@mui/types" "^7.2.0"
274-
"@mui/utils" "^5.10.6"
273+
"@mui/types" "^7.2.3"
274+
"@mui/utils" "^5.11.0"
275275
"@popperjs/core" "^2.11.6"
276276
clsx "^1.2.1"
277277
prop-types "^15.8.1"
278278
react-is "^18.2.0"
279279

280-
"@mui/core-downloads-tracker@^5.10.7":
280+
"@mui/core-downloads-tracker@^5.11.0":
281281
version "5.11.0"
282282
resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.0.tgz#7ae98a3df113270097f3024c713c4efce5537c6a"
283283
integrity sha512-Bmogung451ezVv2YI1RvweOIVsTj2RQ4Fk61+e/+8LFPLTFEwVGbL0YhNy1VB5tri8pzGNV228kxtWVTFooQkg==
284284

285-
"@mui/icons-material@5.10.15":
286-
version "5.10.15"
287-
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.10.15.tgz#c93f1ba8d2b55fe0a16f559a568304df172cbbcb"
288-
integrity sha512-fXkz7CtYTt4AH4YYT67VFhM/A3YCUqZGGLp/3BlzRPQRNEfFKknw3MgG1S5UYrY5weti8jxMx3mwwfhVP8OMhQ==
285+
"@mui/icons-material@^5.11.0":
286+
version "5.11.0"
287+
resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.11.0.tgz#9ea6949278b2266d2683866069cd43009eaf6464"
288+
integrity sha512-I2LaOKqO8a0xcLGtIozC9xoXjZAto5G5gh0FYUMAlbsIHNHIjn4Xrw9rvjY20vZonyiGrZNMAlAXYkY6JvhF6A==
289289
dependencies:
290-
"@babel/runtime" "^7.20.1"
290+
"@babel/runtime" "^7.20.6"
291291

292-
"@mui/material@5.10.7":
293-
version "5.10.7"
294-
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.10.7.tgz#08e72c554bd528f9f5fef604eea542551f9e5986"
295-
integrity sha512-o1jcQGii+q7ORrXhBiMmGzFDaboc1qTgOOC3zDW+NR9ryVzWzL7qEeqoORbgDB5zk9OBsXCjB91fUH/ls5xMwg==
292+
"@mui/material@^5.11.0":
293+
version "5.11.0"
294+
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.11.0.tgz#01ead6ca389de440fbc78b2dbb8547845ca40f93"
295+
integrity sha512-8Zl34lb89rLKTTi50Kakki675/LLHMKKnkp8Ee3rAZ2qmisQlRODsGh1MBjENKp0vwhQnNSvlsCfJteVTfotPQ==
296296
dependencies:
297-
"@babel/runtime" "^7.19.0"
298-
"@mui/base" "5.0.0-alpha.99"
299-
"@mui/core-downloads-tracker" "^5.10.7"
300-
"@mui/system" "^5.10.7"
301-
"@mui/types" "^7.2.0"
302-
"@mui/utils" "^5.10.6"
297+
"@babel/runtime" "^7.20.6"
298+
"@mui/base" "5.0.0-alpha.110"
299+
"@mui/core-downloads-tracker" "^5.11.0"
300+
"@mui/system" "^5.11.0"
301+
"@mui/types" "^7.2.3"
302+
"@mui/utils" "^5.11.0"
303303
"@types/react-transition-group" "^4.4.5"
304304
clsx "^1.2.1"
305305
csstype "^3.1.1"
@@ -326,7 +326,7 @@
326326
csstype "^3.1.1"
327327
prop-types "^15.8.1"
328328

329-
"@mui/system@^5.10.7":
329+
"@mui/system@^5.11.0":
330330
version "5.11.0"
331331
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.11.0.tgz#9938d5beeddfee3e419911ec43e5f9a6f55fe161"
332332
integrity sha512-HFUT7Dlmyq6Wfuxsw8QBXZxXDYIQQaJ4YHaZd7s+nDMcjerLnILxjh2g3a6umtOUM+jEcRaFJAtvLZvlGfa5fw==
@@ -340,12 +340,12 @@
340340
csstype "^3.1.1"
341341
prop-types "^15.8.1"
342342

343-
"@mui/types@^7.2.0", "@mui/types@^7.2.3":
343+
"@mui/types@^7.2.3":
344344
version "7.2.3"
345345
resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.3.tgz#06faae1c0e2f3a31c86af6f28b3a4a42143670b9"
346346
integrity sha512-tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw==
347347

348-
"@mui/utils@^5.10.3", "@mui/utils@^5.10.6", "@mui/utils@^5.11.0":
348+
"@mui/utils@^5.10.3", "@mui/utils@^5.11.0":
349349
version "5.11.0"
350350
resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.11.0.tgz#06d1d907935391f3f8bc58c669800194c77e6601"
351351
integrity sha512-DP/YDaVVCVzJpZ5FFPLKNmaJkeaYRviTyIZkL/D5/FmPXQiA6ecd6z0/+VwoNQtp7aXAQWaRhvz4FM25yqFlHA==

‎yarn.lock‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@
10751075
dependencies:
10761076
regenerator-runtime "^0.13.2"
10771077

1078-
"@babel/runtime@^7.0.0", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.19.0", "@babel/runtime@^7.20.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
1078+
"@babel/runtime@^7.0.0", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
10791079
version "7.20.6"
10801080
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3"
10811081
integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA==
@@ -1519,36 +1519,36 @@
15191519
call-me-maybe "^1.0.1"
15201520
glob-to-regexp "^0.3.0"
15211521

1522-
"@mui/base@5.0.0-alpha.99":
1523-
version "5.0.0-alpha.99"
1524-
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.99.tgz#52589c72b6bf69e016e5811292529d60f81537ad"
1525-
integrity sha512-D04H6O1c0Jv561yI0SVbpa8MpqpW3G43CwJxV2o6ALfI0DMJ45w07dGafmDchb6aCWTRTdggd3rjgmuzyNwPiQ==
1522+
"@mui/base@5.0.0-alpha.110":
1523+
version "5.0.0-alpha.110"
1524+
resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.110.tgz#61174f64b23e667387708b2cbb31339e58c714cf"
1525+
integrity sha512-q4TH9T3sTBknTXXTEf2zO8F3nbHg5iGgiaRx9XErTbXvHrmLrQXbQ4hmrLERocSTBFCFWkKyne/qZj0diWlPtA==
15261526
dependencies:
1527-
"@babel/runtime" "^7.19.0"
1527+
"@babel/runtime" "^7.20.6"
15281528
"@emotion/is-prop-valid" "^1.2.0"
1529-
"@mui/types" "^7.2.0"
1530-
"@mui/utils" "^5.10.6"
1529+
"@mui/types" "^7.2.3"
1530+
"@mui/utils" "^5.11.0"
15311531
"@popperjs/core" "^2.11.6"
15321532
clsx "^1.2.1"
15331533
prop-types "^15.8.1"
15341534
react-is "^18.2.0"
15351535

1536-
"@mui/core-downloads-tracker@^5.10.7":
1536+
"@mui/core-downloads-tracker@^5.11.0":
15371537
version "5.11.0"
15381538
resolved "https://registry.yarnpkg.com/@mui/core-downloads-tracker/-/core-downloads-tracker-5.11.0.tgz#7ae98a3df113270097f3024c713c4efce5537c6a"
15391539
integrity sha512-Bmogung451ezVv2YI1RvweOIVsTj2RQ4Fk61+e/+8LFPLTFEwVGbL0YhNy1VB5tri8pzGNV228kxtWVTFooQkg==
15401540

1541-
"@mui/material@5.10.7":
1542-
version "5.10.7"
1543-
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.10.7.tgz#08e72c554bd528f9f5fef604eea542551f9e5986"
1544-
integrity sha512-o1jcQGii+q7ORrXhBiMmGzFDaboc1qTgOOC3zDW+NR9ryVzWzL7qEeqoORbgDB5zk9OBsXCjB91fUH/ls5xMwg==
1545-
dependencies:
1546-
"@babel/runtime" "^7.19.0"
1547-
"@mui/base" "5.0.0-alpha.99"
1548-
"@mui/core-downloads-tracker" "^5.10.7"
1549-
"@mui/system" "^5.10.7"
1550-
"@mui/types" "^7.2.0"
1551-
"@mui/utils" "^5.10.6"
1541+
"@mui/material@^5.11.0":
1542+
version "5.11.0"
1543+
resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.11.0.tgz#01ead6ca389de440fbc78b2dbb8547845ca40f93"
1544+
integrity sha512-8Zl34lb89rLKTTi50Kakki675/LLHMKKnkp8Ee3rAZ2qmisQlRODsGh1MBjENKp0vwhQnNSvlsCfJteVTfotPQ==
1545+
dependencies:
1546+
"@babel/runtime" "^7.20.6"
1547+
"@mui/base" "5.0.0-alpha.110"
1548+
"@mui/core-downloads-tracker" "^5.11.0"
1549+
"@mui/system" "^5.11.0"
1550+
"@mui/types" "^7.2.3"
1551+
"@mui/utils" "^5.11.0"
15521552
"@types/react-transition-group" "^4.4.5"
15531553
clsx "^1.2.1"
15541554
csstype "^3.1.1"
@@ -1575,7 +1575,7 @@
15751575
csstype "^3.1.1"
15761576
prop-types "^15.8.1"
15771577

1578-
"@mui/system@^5.10.7":
1578+
"@mui/system@^5.11.0":
15791579
version "5.11.0"
15801580
resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.11.0.tgz#9938d5beeddfee3e419911ec43e5f9a6f55fe161"
15811581
integrity sha512-HFUT7Dlmyq6Wfuxsw8QBXZxXDYIQQaJ4YHaZd7s+nDMcjerLnILxjh2g3a6umtOUM+jEcRaFJAtvLZvlGfa5fw==
@@ -1589,12 +1589,12 @@
15891589
csstype "^3.1.1"
15901590
prop-types "^15.8.1"
15911591

1592-
"@mui/types@^7.2.0", "@mui/types@^7.2.3":
1592+
"@mui/types@^7.2.3":
15931593
version "7.2.3"
15941594
resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.2.3.tgz#06faae1c0e2f3a31c86af6f28b3a4a42143670b9"
15951595
integrity sha512-tZ+CQggbe9Ol7e/Fs5RcKwg/woU+o8DCtOnccX6KmbBc7YrfqMYEYuaIcXHuhpT880QwNkZZ3wQwvtlDFA2yOw==
15961596

1597-
"@mui/utils@^5.10.6", "@mui/utils@^5.11.0":
1597+
"@mui/utils@^5.11.0":
15981598
version "5.11.0"
15991599
resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.11.0.tgz#06d1d907935391f3f8bc58c669800194c77e6601"
16001600
integrity sha512-DP/YDaVVCVzJpZ5FFPLKNmaJkeaYRviTyIZkL/D5/FmPXQiA6ecd6z0/+VwoNQtp7aXAQWaRhvz4FM25yqFlHA==

0 commit comments

Comments
 (0)