-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
[core] Support @mui/material@6
peer dependency
#14142
Merged
Merged
Changes from 9 commits
Commits
Show all changes
120 commits
Select commit
Hold shift + click to select a range
b11d987
add @mui/material@^6 to peer dependencies
cherniavskii e6456ff
log @mui/material version in tests
cherniavskii b521dce
temp: add @mui/material@next to dev deps
cherniavskii c30d0b5
fix matchMedia stub
cherniavskii fb12801
fix failing test
cherniavskii 29c5ec4
temp: use monorepo version from the PR
cherniavskii 1e4d2c1
Revert "temp: use monorepo version from the PR"
cherniavskii b198bcb
temp: use test utils from a PR
cherniavskii 7e4e8c7
pnpm dedupe
cherniavskii 0ef6096
Merge branch 'master' into material-ui-v6
cherniavskii 080e02c
fix test
cherniavskii 38a27b4
lint
cherniavskii f1ca4a5
use material ui v6 in the docs
cherniavskii e9f9c0f
Merge branch 'master' into material-ui-v6
cherniavskii 4a90723
bump material in the root package.json
cherniavskii 5fb0be8
proptypes
LukasTy 9c9bece
Propagate `slots` and `slotProps` to fields
LukasTy ff76fa7
Bumo remaining dev material deps to v6
LukasTy 658db02
Merge remote-tracking branch 'upstream/master' into material-ui-v6
LukasTy 13299eb
Fix import
LukasTy 4210fbe
Merge remote-tracking branch 'upstream/master' into material-ui-v6
LukasTy 0e7395b
docs:api
LukasTy 706969e
Bump `system` and `utils` to v6
LukasTy 3ea45df
Use stable `CssVarsProvider`
LukasTy 52753e9
Use stable grid and working API
LukasTy 70a5b1d
Merge branch 'master' into material-ui-v6
cherniavskii 0fd9edb
Merge branch 'master' into material-ui-v6
cherniavskii 938c714
fix failing test
cherniavskii 1ef093e
dedupe
LukasTy 367a893
Merge remote-tracking branch 'upstream/master' into material-ui-v6
LukasTy 6d8c54e
dedupe
LukasTy 2f39b71
Merge branch 'master' into material-ui-v6
cherniavskii f3b885b
use waitFor where necessary only
cherniavskii 5115974
remove waitFor
cherniavskii f8a13ab
fix act warnings in test:unit
cherniavskii 8a5b09f
Merge branch 'master' into material-ui-v6
cherniavskii 4080545
Merge remote-tracking branch 'upstream/master' into material-ui-v6
LukasTy c14d7f7
Fix lock file
LukasTy 6ccf1b8
get rid of waitFor
cherniavskii 1e43dc0
Merge branch 'master' into material-ui-v6
cherniavskii 683a4d7
update lockfile
cherniavskii 511a9b4
fix merge
cherniavskii 69412eb
temp: Revert "Propagate `slots` and `slotProps` to fields"
cherniavskii bf0c1be
fix ts issues
cherniavskii fbbcd55
fix errors in jsdom tests
cherniavskii 9933919
fix errors in jsdom tests
cherniavskii 8734cc5
fix browser tests
cherniavskii 0df4c92
flush microtasks
cherniavskii bb4ed81
mock deprecated methods as well
cherniavskii 1cdb9d2
Merge branch 'master' into material-ui-v6
cherniavskii 052064d
Merge remote-tracking branch 'mui/master' into material-ui-v6
cherniavskii 28878a2
automate @mui/material version testing
cherniavskii 5f387e6
use @mui/material v5
cherniavskii c63a240
use v5 imports
cherniavskii e7e1ded
Merge remote-tracking branch 'mui/master' into material-ui-v6
cherniavskii d43e721
update lockfile
cherniavskii bf97234
proptypes
LukasTy 32ef7c5
docs:api
LukasTy 88fefcd
Use `>=` v6 specifier
LukasTy 8455ec7
Use more specific v6 `^` version specifier
LukasTy 9f509d4
update supported version range for @mui/material peer dep
cherniavskii 65ba268
add use-material-ui-v6 script
cherniavskii 9c6b41d
add material-ui-v6 workflow
cherniavskii cbf3d26
fix workflow
cherniavskii 52004b4
try to fix skipped step
cherniavskii 03793d1
exit with proper code
cherniavskii ec08b52
--no-frozen-lockfile
cherniavskii 3ce39ea
fix jobs names
cherniavskii 8175906
Merge remote-tracking branch 'mui/master' into material-ui-v6
cherniavskii 4663687
Avoid using `Grid2` because of unstable behavior between v6 and v5
LukasTy d5694b9
Merge remote-tracking branch 'upstream/master' into material-ui-v6
LukasTy e03bf63
remove unnecessary from the readme
cherniavskii 33b61ac
update readme
cherniavskii 5c0267c
format
cherniavskii 1a9b909
update readme
cherniavskii e8ed9c9
update readme
cherniavskii cc54863
update patch
cherniavskii 10684a9
fix applying 0-unified patch
cherniavskii 30ba53b
update readme
cherniavskii 8bc293b
ignore material ui v6 warnings
cherniavskii 983e44e
use createTheme instead of extendTheme
cherniavskii a7789df
add test_types job to material-ui-v6 workflow
cherniavskii 6fc6b5f
only diff specific folders after docs:typescript:formatted
cherniavskii 2856ca6
Make `@mui/system` a peer dep
LukasTy 4fa883e
update patch
cherniavskii 30b0113
fix ignored warnings check
cherniavskii 27719dd
Merge remote-tracking branch 'mui/master' into material-ui-v6
cherniavskii 6262ce2
use pnpm update instead of git patch
cherniavskii e84a016
format test/package.json
cherniavskii 0fdb1a7
Test `@mui/system` dependency with `||` case
LukasTy ae64e19
Test `>=` specifier
LukasTy 567b805
Revert "Test `>=` specifier"
LukasTy 087882a
Revert "Test `@mui/system` dependency with `||` case"
LukasTy 20b8a85
Align `@mui/system` peer dep version with `@mui/material`
LukasTy 8fa45f1
Merge remote-tracking branch 'upstream/master' into material-ui-v6
LukasTy 555d8e1
Don't update `@mui/system` as it's a peer dependency now
LukasTy af2f7f3
Try updating only what is relevant to packages (excluding `docs`)
LukasTy 98fcced
prettier
LukasTy 5932ead
fix failing browser test
cherniavskii 9b8d679
Merge branch 'master' into material-ui-v6
cherniavskii c045f74
avoid visual regression with material-ui-v6
cherniavskii ba041e2
avoid visual regressions between v5 and v6
cherniavskii e5650dd
Merge branch 'master' into material-ui-v6
cherniavskii ddcb5c7
Merge branch 'master' into material-ui-v6
cherniavskii 442ad04
Remove no longer needed version case
LukasTy 9234725
Use `6.x` in the script for material v6
LukasTy 00d0080
Merge remote-tracking branch 'upstream/master' into material-ui-v6
LukasTy 6e5c397
dedupe
LukasTy 767d9f1
Forgot this one :(
LukasTy 6335c86
Try reverting `flushMicrotasks` usage
LukasTy b88a0aa
These as well
LukasTy 3ef28ea
And a few more
LukasTy 9d35f08
Fix majority of tests on @mui/material@6
LukasTy efcf5e6
fix data grid tests
cherniavskii ad1ef0a
fix pickers test
cherniavskii 540d383
Merge branch 'master' into material-ui-v6
cherniavskii 39805f5
Fix 2 open/close Pickers tests
LukasTy af8eefe
Remove no longer relevant `experimental_extendTheme` error message ex…
LukasTy 054893f
prettier
LukasTy e64adb1
Merge branch 'master' into material-ui-v6
cherniavskii File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,6 +4,11 @@ import { createRenderer, screen, waitFor } from '@mui/internal-test-utils'; | |
import { LicenseInfo } from '@mui/x-license'; | ||
import { sharedLicenseStatuses } from '@mui/x-license/useLicenseVerifier/useLicenseVerifier'; | ||
import { ResponsiveChartContainerPro } from './ResponsiveChartContainerPro'; | ||
// eslint-disable-next-line import/order | ||
import packageJson from '@mui/material/package.json'; | ||
|
||
// eslint-disable-next-line no-console | ||
console.log(`@mui/x-charts-pro: @mui/material version`, packageJson.version); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
|
||
describe('<ResponsiveChartContainerPro /> - License', () => { | ||
const { render } = createRenderer(); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The dev dependency here is the key to running the tests against the specific version of
@mui/material
.