Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VE-219 Migrate RUI to MUI v6 #984

Merged
merged 20 commits into from
Dec 5, 2024
Merged

VE-219 Migrate RUI to MUI v6 #984

Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b2af3da
upgrade mui packages to v6
m4manjesh Nov 21, 2024
d7c2d4c
Update Grid to Grid2 EditLabelDialog
m4manjesh Nov 21, 2024
d4c289d
Update Grid to Grid2 FileUploader
m4manjesh Nov 21, 2024
efa84e1
Update Grid to Grid2 in LoginForm
m4manjesh Nov 21, 2024
9a570c6
Update Grid to Grid2 in PasswordChangeDialog
m4manjesh Nov 21, 2024
8e67cb4
Update Grid to Grid2 in PasswordChangeForm
m4manjesh Nov 21, 2024
bcc5fd0
Update Grid to Grid2 in PasswordResetForm
m4manjesh Nov 21, 2024
899da11
Update Grid to Grid2 in RegistrationForm
m4manjesh Nov 21, 2024
4b19197
moving Typography color system prop into sx
m4manjesh Nov 21, 2024
674a378
adding ode mode utility in styles components
m4manjesh Nov 21, 2024
2fb1d42
Merge branch 'main' into migrate-to-MUI6
m4manjesh Nov 25, 2024
082ad8c
theme sx props override for MUI 6 and using theme.applyStyles() for …
m4manjesh Nov 25, 2024
1ec5b78
enabling css variables and color schemes
m4manjesh Nov 25, 2024
d5c6f72
adding yaml file
m4manjesh Nov 25, 2024
9d82d37
correcting the colors to fix the test
m4manjesh Nov 25, 2024
039ba00
Merge branch 'release/v10.0.0' into migrate-to-MUI6
m4manjesh Dec 2, 2024
2542ade
updated packages
m4manjesh Dec 2, 2024
f221433
removing enabling cssVariables and colorSchemes
m4manjesh Dec 3, 2024
2189d31
correcting using padding
m4manjesh Dec 3, 2024
b771c62
updating mui version to latest
m4manjesh Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"devDependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/material": "^5.16.4",
"@mui/material": "^6.0.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why just 6.0.0? Why not 6.1.9 which is latest?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes we can update to 6.1.9, i was following what documentation suggests here

"@mui/x-data-grid-generator": "^7.10.0",
"@playwright/test": "^1.45.2",
"@storybook/addon-actions": "^8.2.6",
Expand Down Expand Up @@ -102,7 +102,7 @@
},
"dependencies": {
"@juggle/resize-observer": "^3.4.0",
"@mui/icons-material": "^5.16.4",
"@mui/icons-material": "^6.0.0",
"@mui/x-data-grid": "^7.10.0",
"@mui/x-tree-view": "^7.10.0",
"colord": "^2.9.3",
Expand All @@ -122,7 +122,7 @@
"peerDependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.15.14",
"@mui/material": "^6.0.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
Expand Down
Loading