Skip to content

Commit 55f8d70

Browse files
authored
Support MUI 6 (#1175)
* mui 6 * chlog
1 parent a0433c0 commit 55f8d70

File tree

7 files changed

+351
-438
lines changed

7 files changed

+351
-438
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
- 6.6.8
33
- Support safe navigation operator in SpEL operators/functions (PR #1172) (issue #1010)
44
- SpEL: backward compatibility for import of `CollectionUtils.containsAny` (PR #1174) (issue #1007)
5+
- Support MUI 6 (PR #1175) (issue #1113)
56
- 6.6.7
67
- Fix import of ambiguous operators (like, select_any_in) (PR #1168) (issue #1159)
78
- Allow import of epoch for date/datetime widgets from JsonLogic (PR #1171) (issue #1154)

packages/examples/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
"@material-ui/icons": "^4.11.3",
3636
"@material-ui/lab": "^4.0.0-alpha.61",
3737
"@material-ui/pickers": "^3.3.11",
38-
"@mui/base": "^5.0.0-beta.40",
39-
"@mui/icons-material": "^5.15.18",
40-
"@mui/material": "^5.15.18",
41-
"@mui/system": "^5.15.15",
42-
"@mui/x-date-pickers": "^7.9.0",
38+
"@mui/base": "^5.0.0-beta.68",
39+
"@mui/icons-material": "^6.3.1",
40+
"@mui/material": "^6.3.1",
41+
"@mui/system": "^6.3.1",
42+
"@mui/x-date-pickers": "^7.23.6",
4343
"@popperjs/core": "^2.11.8",
4444
"@react-awesome-query-builder/antd": "workspace:^",
4545
"@react-awesome-query-builder/bootstrap": "workspace:^",

packages/mui/package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@
6666
"@babel/runtime": "^7.24.5",
6767
"@emotion/react": "^11.11.4",
6868
"@emotion/styled": "^11.11.5",
69-
"@mui/base": "^5.0.0-beta.40",
70-
"@mui/icons-material": "^5.15.18",
71-
"@mui/material": "^5.15.18",
72-
"@mui/system": "^5.15.15",
73-
"@mui/x-date-pickers": "^7.9.0",
69+
"@mui/base": "^5.0.0-beta.68",
70+
"@mui/icons-material": "^6.3.1",
71+
"@mui/material": "^6.3.1",
72+
"@mui/system": "^6.3.1",
73+
"@mui/x-date-pickers": "^7.23.6",
7474
"@types/react": "^17.0.39",
7575
"@types/react-dom": "^17.0.11",
7676
"react": "^17.0.2",
@@ -81,8 +81,8 @@
8181
"@emotion/react": "^11.7.1",
8282
"@emotion/styled": "^11.6.0",
8383
"@mui/base": "^5.0.0-alpha.87",
84-
"@mui/icons-material": "^5.2.4",
85-
"@mui/material": "^5.2.4",
84+
"@mui/icons-material": "^5.2.4 || ^6.0.0",
85+
"@mui/material": "^5.2.4 || ^6.0.0",
8686
"@mui/x-date-pickers": "^5.0.0-beta.2 || ^6.0.0 || ^7.0.0",
8787
"react": "^16.8.4 || ^17.0.1 || ^18.0.0",
8888
"react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0"

packages/sandbox/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
"@ant-design/icons": "^5.3.7",
3939
"@emotion/react": "^11.11.4",
4040
"@emotion/styled": "^11.11.5",
41-
"@mui/base": "^5.0.0-beta.40",
42-
"@mui/icons-material": "^5.15.18",
43-
"@mui/material": "^5.15.18",
44-
"@mui/system": "^5.15.15",
45-
"@mui/x-date-pickers": "^7.9.0",
41+
"@mui/base": "^5.0.0-beta.68",
42+
"@mui/icons-material": "^6.3.1",
43+
"@mui/material": "^6.3.1",
44+
"@mui/system": "^6.3.1",
45+
"@mui/x-date-pickers": "^7.23.6",
4646
"@react-awesome-query-builder/antd": "workspace:^",
4747
"@react-awesome-query-builder/mui": "workspace:^",
4848
"antd": "^5.18.3",

packages/sandbox_next/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@
3636
"dependencies": {
3737
"@emotion/react": "^11.11.4",
3838
"@emotion/styled": "^11.11.5",
39-
"@mui/base": "^5.0.0-beta.40",
40-
"@mui/icons-material": "^5.15.18",
41-
"@mui/material": "^5.15.18",
42-
"@mui/system": "^5.15.15",
43-
"@mui/x-date-pickers": "^7.9.0",
39+
"@mui/base": "^5.0.0-beta.68",
40+
"@mui/icons-material": "^6.3.1",
41+
"@mui/material": "^6.3.1",
42+
"@mui/system": "^6.3.1",
43+
"@mui/x-date-pickers": "^7.23.6",
4444
"@react-awesome-query-builder/core": "workspace:^",
4545
"@react-awesome-query-builder/mui": "workspace:^",
4646
"@react-awesome-query-builder/sql": "workspace:^",

packages/tests/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
"@material-ui/icons": "^4.11.3",
3636
"@material-ui/lab": "^4.0.0-alpha.61",
3737
"@material-ui/pickers": "^3.3.11",
38-
"@mui/base": "^5.0.0-beta.40",
39-
"@mui/icons-material": "^5.15.18",
40-
"@mui/material": "^5.15.18",
41-
"@mui/system": "^5.15.15",
42-
"@mui/x-date-pickers": "^7.9.0",
38+
"@mui/base": "^5.0.0-beta.68",
39+
"@mui/icons-material": "^6.3.1",
40+
"@mui/material": "^6.3.1",
41+
"@mui/system": "^6.3.1",
42+
"@mui/x-date-pickers": "^7.23.6",
4343
"@popperjs/core": "^2.11.8",
4444
"@react-awesome-query-builder/antd": "workspace:^",
4545
"@react-awesome-query-builder/bootstrap": "workspace:^",

0 commit comments

Comments
 (0)