[core] Replace @mui/base with @mui/utils + @mui/material #13823

mnajdova · 2024-07-12T16:12:53Z

This PR removes the dependency to @mui/base in favor of @mui/utils. @mui/base is not being actively working on, so depending on it creates internal problems in the Core repo, especially in this period when we have two active branches.

It is not required to merge this PR, everything that you had before will still work, however we don't plan to continue to do releases of @mui/base, all fixes are going to be done directly in @mui/utils and @mui/material. I will leave it up to the MUI X team to decide on what's best as a next step.

mui-bot · 2024-07-12T16:17:44Z

Deploy preview: https://deploy-preview-13823--material-ui-x.netlify.app/

Generated by 🚫 dangerJS against a225cc3

github-actions · 2024-07-12T16:32:43Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.js

packages/x-charts/src/ChartsTooltip/ChartsTooltip.tsx

packages/x-tree-view/src/TreeItem/TreeItem.tsx

Co-authored-by: Lukas <llukas.tyla@gmail.com> Signed-off-by: Marija Najdova <mnajdova@gmail.com>

github-actions · 2024-07-16T12:12:03Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Signed-off-by: Marija Najdova <mnajdova@gmail.com>

github-actions · 2024-07-16T12:41:57Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

packages/x-tree-view-pro/package.json

packages/x-tree-view/package.json

packages/x-data-grid/package.json

packages/x-data-grid-pro/package.json

packages/x-charts/package.json

packages/x-charts-pro/package.json

packages/x-date-pickers-pro/package.json

packages/x-date-pickers/package.json

docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.js

LukasTy · 2024-07-18T13:44:32Z

I've taken the chance to update the PR.

The dependency versions were aligned
any duplicate dependencies removed

I think that we mostly need agreement from @mui/xcharts if they are good with reverting to @mui/material/<Component> imports instead of @mui/base/<Component>. 🤔

github-actions · 2024-07-18T13:48:07Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

docs/data/data-grid/filtering-recipes/QuickFilterOutsideOfGrid.js

oliviertassinari · 2024-07-19T13:10:19Z

packages/x-data-grid/src/components/containers/GridToolbarContainer.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { styled, SxProps, Theme } from '@mui/system';
-import { unstable_composeClasses as composeClasses } from '@mui/utils';
+import composeClasses from '@mui/utils/composeClasses';


Nice, looks like we can have the flattening of imports as it's own PR.

It's one of the goal of #13401 but it's blocked because we use the unstable_ part which is really not nice

Ah right, I have missed this. We can't make this change for demos in the docs.
But for the source, it looks great.

By the way, it's a small argument in favor of named import:
You can do:

import { unstable_composeClasses } from '@mui/utils/composeClasses'

With default import we'd need to do this to keep the info:

import { unstable_composeClasses } from '@mui/utils/unstable_composeClasses'

Now, I guess I that we can do

Suggested change

import composeClasses from '@mui/utils/composeClasses';

import unstable_composeClasses from '@mui/utils/composeClasses';

and call it a day.

That's a fragile convention 😆

Or we could say all of those are public APIs at this point anyway. I mean, how can someone build a custom Material UI component that feels native without composeClasses? Good luck, which is not OK.

I think we need a way to share some private stuff, especially as our amount of component increases.

But yeah some (most ?) of the APIs in @mui/utils could probably be public and stable by now.

But yeah some (most ?) of the APIs in @mui/utils could probably be public and stable by now.

Agree, these are here for years already.

mnajdova · 2024-07-22T10:52:09Z

I think that we mostly need agreement from @mui/xcharts if they are good with reverting to @mui/material/ imports instead of @mui/base/. 🤔

I am happy to revert these changes, and we can progressivly replace these with @base_ui imports in the upcoming months. It's up to you, I will wait on your decision before doing the changes in the PR.

mnajdova · 2024-07-30T11:29:13Z

docs/package.json

@@ -66,7 +66,6 @@
    "date-fns-jalali": "^2.30.0-0",
    "dayjs": "^1.11.11",
    "doctrine": "^3.0.0",
-    "d3-scale-chromatic": "^3.1.0",


It's already defined in line 64.

packages/x-tree-view-pro/README.md

LukasTy

Thank you for all the effort! 💯 🙏

…` given the need for explicit `type`

docs/data/charts/zoom-and-pan/ZoomControlled.tsx

github-actions · 2024-07-31T06:51:48Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

…ports

mnajdova added 2 commits July 12, 2024 11:27

[core] Remove @mui/base as dependency

ee019d9

use latest Material UI commit

8062f12

mnajdova added the core Infrastructure work going on behind the scenes label Jul 12, 2024

fix wrong imports & few package.json changes

4fb62bc

github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Jul 12, 2024

mnajdova added 2 commits July 12, 2024 18:38

prettier

249a721

imports fixes

04a45f2

oliviertassinari reviewed Jul 12, 2024

View reviewed changes

docs/data/date-pickers/custom-field/BrowserV7SingleInputRangeField.js Show resolved Hide resolved

LukasTy reviewed Jul 15, 2024

View reviewed changes

packages/x-charts/src/ChartsTooltip/ChartsTooltip.tsx Show resolved Hide resolved

LukasTy reviewed Jul 15, 2024

View reviewed changes

packages/x-tree-view/src/TreeItem/TreeItem.tsx Outdated Show resolved Hide resolved

mnajdova and others added 4 commits July 16, 2024 11:07

Update packages/x-tree-view/src/TreeItem/TreeItem.tsx

d719a0c

Co-authored-by: Lukas <llukas.tyla@gmail.com> Signed-off-by: Marija Najdova <mnajdova@gmail.com>

replace unstable_composeClasses imports

741d029

use latest version

5c81ebf

revert latest changes

ed8ccd0

mnajdova requested a review from oliviertassinari July 16, 2024 09:44

Merge branch 'master' into update/base-ui-imports

2d4b70f

github-actions bot removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Jul 16, 2024

pnpm-lock.yaml

e64e8b3

mnajdova marked this pull request as ready for review July 16, 2024 11:04

mnajdova requested a review from LukasTy July 16, 2024 11:08

github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Jul 16, 2024

Merge branch 'master' into update/base-ui-imports

3a9bb14

Signed-off-by: Marija Najdova <mnajdova@gmail.com>

github-actions bot added PR: out-of-date The pull request has merge conflicts and can't be merged and removed PR: out-of-date The pull request has merge conflicts and can't be merged labels Jul 16, 2024

bump to latest version

afd1a7e

LukasTy reviewed Jul 18, 2024

View reviewed changes

LukasTy added 2 commits July 18, 2024 16:36

Update import

c5f9ca5

dedupe

dee7977

LukasTy requested review from a team July 18, 2024 13:42

github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Jul 18, 2024

LukasTy mentioned this pull request Jul 19, 2024

[core] Use re exported utils from packages in docs examples #13901

Open

oliviertassinari reviewed Jul 19, 2024

View reviewed changes

oliviertassinari mentioned this pull request Jul 21, 2024

[material] Remove dependency to @mui/base mui/material-ui#42907

Merged

1 task

Merge branch 'master' into update/base-ui-imports

880496d

github-actions bot removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Jul 30, 2024

revert unintentional change

dcb987b

mnajdova commented Jul 30, 2024

View reviewed changes

LukasTy reviewed Jul 30, 2024

View reviewed changes

packages/x-tree-view-pro/README.md Outdated Show resolved Hide resolved

LukasTy approved these changes Jul 30, 2024

View reviewed changes

mnajdova and others added 6 commits July 30, 2024 13:33

Remove Base UI dependency from the packages

ab0a2ef

apply RREADME.md change

5b864d1

lock file

0bbfb6d

Remove @mui/base from docs

397f494

Avoid using @mui/base

bb30d35

Use material button to avoid extra line and destruction of `preview…

c0d3c6f

…` given the need for explicit `type`

LukasTy reviewed Jul 30, 2024

View reviewed changes

docs/data/charts/zoom-and-pan/ZoomControlled.tsx Show resolved Hide resolved

github-actions bot added the PR: out-of-date The pull request has merge conflicts and can't be merged label Jul 31, 2024

Merge remote-tracking branch 'upstream/master' into update/base-ui-im…

a225cc3

…ports

github-actions bot removed the PR: out-of-date The pull request has merge conflicts and can't be merged label Jul 31, 2024

LukasTy enabled auto-merge (squash) July 31, 2024 12:53

LukasTy merged commit 42e02ea into mui:master Jul 31, 2024
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[core] Replace @mui/base with @mui/utils + @mui/material #13823

[core] Replace @mui/base with @mui/utils + @mui/material #13823

mnajdova commented Jul 12, 2024 •

edited by oliviertassinari

Loading

mui-bot commented Jul 12, 2024 •

edited

Loading

github-actions bot commented Jul 12, 2024

github-actions bot commented Jul 16, 2024

github-actions bot commented Jul 16, 2024

LukasTy commented Jul 18, 2024

github-actions bot commented Jul 18, 2024

oliviertassinari Jul 19, 2024

flaviendelangle Jul 19, 2024

oliviertassinari Jul 19, 2024 •

edited

Loading

flaviendelangle Jul 19, 2024

oliviertassinari Jul 19, 2024

flaviendelangle Jul 19, 2024

oliviertassinari Jul 19, 2024 •

edited

Loading

flaviendelangle Jul 23, 2024

mnajdova Jul 30, 2024

mnajdova commented Jul 22, 2024 •

edited

Loading

mnajdova Jul 30, 2024

LukasTy left a comment

github-actions bot commented Jul 31, 2024

	import composeClasses from '@mui/utils/composeClasses';
	import unstable_composeClasses from '@mui/utils/composeClasses';

[core] Replace @mui/base with @mui/utils + @mui/material #13823

[core] Replace @mui/base with @mui/utils + @mui/material #13823

Conversation

mnajdova commented Jul 12, 2024 • edited by oliviertassinari Loading

mui-bot commented Jul 12, 2024 • edited Loading

github-actions bot commented Jul 12, 2024

github-actions bot commented Jul 16, 2024

github-actions bot commented Jul 16, 2024

LukasTy commented Jul 18, 2024

github-actions bot commented Jul 18, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oliviertassinari Jul 19, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oliviertassinari Jul 19, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mnajdova commented Jul 22, 2024 • edited Loading

Choose a reason for hiding this comment

LukasTy left a comment

Choose a reason for hiding this comment

github-actions bot commented Jul 31, 2024

mnajdova commented Jul 12, 2024 •

edited by oliviertassinari

Loading

mui-bot commented Jul 12, 2024 •

edited

Loading

oliviertassinari Jul 19, 2024 •

edited

Loading

oliviertassinari Jul 19, 2024 •

edited

Loading

mnajdova commented Jul 22, 2024 •

edited

Loading