Skip to content

Commit 185ba00

Browse files
authored
Merge pull request #1347 from Rajesh-Nagarajan-11/mui-v7
chore: update MUI to v7
2 parents c453961 + 9742a9e commit 185ba00

File tree

13 files changed

+206
-87
lines changed

13 files changed

+206
-87
lines changed

package-lock.json

Lines changed: 66 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,17 @@
77
"url": "git+ssh://git@github.com/layer5io/sistent.git"
88
},
99
"main": "./dist/index.js",
10-
"module": "./dist/index.js",
10+
"module": "./dist/index.mjs",
1111
"types": "./dist/index.d.ts",
12+
"exports": {
13+
".": {
14+
"types": "./dist/index.d.ts",
15+
"node": "./dist/index.js",
16+
"import": "./dist/index.mjs",
17+
"require": "./dist/index.js",
18+
"default": "./dist/index.js"
19+
}
20+
},
1221
"files": [
1322
"dist"
1423
],
@@ -47,7 +56,7 @@
4756
"@eslint/eslintrc": "^3.3.1",
4857
"@eslint/js": "^9.39.2",
4958
"@meshery/schemas": "^0.8.124",
50-
"@mui/icons-material": "^6.4.8",
59+
"@mui/icons-material": "^7.3.7",
5160
"@reduxjs/toolkit": "^2.2.5",
5261
"@testing-library/react": "^16.2.0",
5362
"@types/jest": "^29.5.14",
@@ -93,8 +102,8 @@
93102
"xstate": "^5.25.0"
94103
},
95104
"overrides": {
96-
"@mui/icons-material": "^6.4.8",
97-
"@mui/material": "^6.4.8",
105+
"@mui/icons-material": "^7.3.7",
106+
"@mui/material": "^7.3.7",
98107
"@meshery/schemas": {
99108
"react": "$react",
100109
"react-dom": "$react-dom"
@@ -115,8 +124,8 @@
115124
"@emotion/react": "^11.14.0",
116125
"@emotion/styled": "^11.14.0",
117126
"@layer5/meshery-design-embed": "^0.4.0",
118-
"@mui/material": "^6.4.8",
119-
"@sistent/mui-datatables": "^5.1.4",
127+
"@mui/material": "^7.3.7",
128+
"@sistent/mui-datatables": "^6.0.1",
120129
"@types/mui-datatables": "*",
121130
"billboard.js": "^3.15.0",
122131
"js-yaml": "^4.1.0",

src/base/Grid2/Grid2.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
import MuiGrid, { Grid2Props as MuiGridProps } from '@mui/material/Grid2';
21
import React from 'react';
2+
import MuiGrid from '@mui/material/Grid';
3+
import type { GridProps as MuiGridProps } from '@mui/material/Grid';
34

45
const Grid2 = React.forwardRef<HTMLDivElement, MuiGridProps>((props, ref) => {
56
return <MuiGrid {...props} ref={ref} />;

0 commit comments

Comments
 (0)