Support MUI 6 (#1175)

* mui 6 * chlog
ukrbublik · Jan 13, 2025 · 55f8d70 · 55f8d70
1 parent a0433c0
commit 55f8d70
Show file tree

Hide file tree

Showing 7 changed files with 351 additions and 438 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 - 6.6.8
   - Support safe navigation operator in SpEL operators/functions (PR #1172) (issue #1010)
   - SpEL: backward compatibility for import of `CollectionUtils.containsAny` (PR #1174) (issue #1007)
+  - Support MUI 6 (PR #1175) (issue #1113)
 - 6.6.7
   - Fix import of ambiguous operators (like, select_any_in) (PR #1168) (issue #1159)
   - Allow import of epoch for date/datetime widgets from JsonLogic (PR #1171) (issue #1154)

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -35,11 +35,11 @@
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.61",
     "@material-ui/pickers": "^3.3.11",
-    "@mui/base": "^5.0.0-beta.40",
-    "@mui/icons-material": "^5.15.18",
-    "@mui/material": "^5.15.18",
-    "@mui/system": "^5.15.15",
-    "@mui/x-date-pickers": "^7.9.0",
+    "@mui/base": "^5.0.0-beta.68",
+    "@mui/icons-material": "^6.3.1",
+    "@mui/material": "^6.3.1",
+    "@mui/system": "^6.3.1",
+    "@mui/x-date-pickers": "^7.23.6",
     "@popperjs/core": "^2.11.8",
     "@react-awesome-query-builder/antd": "workspace:^",
     "@react-awesome-query-builder/bootstrap": "workspace:^",

diff --git a/packages/mui/package.json b/packages/mui/package.json
@@ -66,11 +66,11 @@
     "@babel/runtime": "^7.24.5",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@mui/base": "^5.0.0-beta.40",
-    "@mui/icons-material": "^5.15.18",
-    "@mui/material": "^5.15.18",
-    "@mui/system": "^5.15.15",
-    "@mui/x-date-pickers": "^7.9.0",
+    "@mui/base": "^5.0.0-beta.68",
+    "@mui/icons-material": "^6.3.1",
+    "@mui/material": "^6.3.1",
+    "@mui/system": "^6.3.1",
+    "@mui/x-date-pickers": "^7.23.6",
     "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11",
     "react": "^17.0.2",
@@ -81,8 +81,8 @@
     "@emotion/react": "^11.7.1",
     "@emotion/styled": "^11.6.0",
     "@mui/base": "^5.0.0-alpha.87",
-    "@mui/icons-material": "^5.2.4",
-    "@mui/material": "^5.2.4",
+    "@mui/icons-material": "^5.2.4 || ^6.0.0",
+    "@mui/material": "^5.2.4 || ^6.0.0",
     "@mui/x-date-pickers": "^5.0.0-beta.2 || ^6.0.0 || ^7.0.0",
     "react": "^16.8.4 || ^17.0.1 || ^18.0.0",
     "react-dom": "^16.8.4 || ^17.0.1 || ^18.0.0"

diff --git a/packages/sandbox/package.json b/packages/sandbox/package.json
@@ -38,11 +38,11 @@
     "@ant-design/icons": "^5.3.7",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@mui/base": "^5.0.0-beta.40",
-    "@mui/icons-material": "^5.15.18",
-    "@mui/material": "^5.15.18",
-    "@mui/system": "^5.15.15",
-    "@mui/x-date-pickers": "^7.9.0",
+    "@mui/base": "^5.0.0-beta.68",
+    "@mui/icons-material": "^6.3.1",
+    "@mui/material": "^6.3.1",
+    "@mui/system": "^6.3.1",
+    "@mui/x-date-pickers": "^7.23.6",
     "@react-awesome-query-builder/antd": "workspace:^",
     "@react-awesome-query-builder/mui": "workspace:^",
     "antd": "^5.18.3",

diff --git a/packages/sandbox_next/package.json b/packages/sandbox_next/package.json
@@ -36,11 +36,11 @@
   "dependencies": {
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
-    "@mui/base": "^5.0.0-beta.40",
-    "@mui/icons-material": "^5.15.18",
-    "@mui/material": "^5.15.18",
-    "@mui/system": "^5.15.15",
-    "@mui/x-date-pickers": "^7.9.0",
+    "@mui/base": "^5.0.0-beta.68",
+    "@mui/icons-material": "^6.3.1",
+    "@mui/material": "^6.3.1",
+    "@mui/system": "^6.3.1",
+    "@mui/x-date-pickers": "^7.23.6",
     "@react-awesome-query-builder/core": "workspace:^",
     "@react-awesome-query-builder/mui": "workspace:^",
     "@react-awesome-query-builder/sql": "workspace:^",

diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -35,11 +35,11 @@
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.61",
     "@material-ui/pickers": "^3.3.11",
-    "@mui/base": "^5.0.0-beta.40",
-    "@mui/icons-material": "^5.15.18",
-    "@mui/material": "^5.15.18",
-    "@mui/system": "^5.15.15",
-    "@mui/x-date-pickers": "^7.9.0",
+    "@mui/base": "^5.0.0-beta.68",
+    "@mui/icons-material": "^6.3.1",
+    "@mui/material": "^6.3.1",
+    "@mui/system": "^6.3.1",
+    "@mui/x-date-pickers": "^7.23.6",
     "@popperjs/core": "^2.11.8",
     "@react-awesome-query-builder/antd": "workspace:^",
     "@react-awesome-query-builder/bootstrap": "workspace:^",