Skip to content

Commit

Permalink
Merge branch 'master' into fix/15819
Browse files Browse the repository at this point in the history
  • Loading branch information
MBilalShafi authored Dec 13, 2024
2 parents 09edae4 + e33b19c commit 5dfe4d6
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion docs/data/data-grid/export/export.md
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ In the following demo, both methods are used to set a custom header and a custom

:::warning
This feature only works with `@mui/styled-engine` v5.11.8 or newer.
Make sure that the MUI Core version you are using is also installing the correct version for this dependency.
Make sure that the Material UI version you are using is also installing the correct version for this dependency.
:::

Instead of generating the Excel file in the main thread, you can delegate the task to a web worker.
Expand Down
2 changes: 1 addition & 1 deletion docs/data/data-grid/getting-started/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ const theme = createTheme({

## Licenses

While MUI Core is entirely licensed under MIT, MUI X serves a part of its components under a commercial license.
While our Core libraries are entirely licensed under MIT, MUI X serves a part of its components under a commercial license.
Please pay attention to the license.

### Plans
Expand Down
12 changes: 6 additions & 6 deletions docs/data/introduction/overview/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ MUI X is a collection of advanced UI components, including:
- [Charts](/x/react-charts/)
- [Tree View](/x/react-tree-view/)

These components are significantly more complex than the ones found in the MUI Core libraries.
These components are significantly more complex than the ones found in our Core libraries.
They feature advanced functionality for data-rich applications and a wide range of other use cases.

:::info
Expand All @@ -28,23 +28,23 @@ Throughout the documentation, Pro- and Premium-only features are denoted with th
## Advantages of MUI X

- **Ship faster:** Our team has invested thousands of hours into these components so you don't have to. Get up and running in a fraction of the time it would take to build from scratch.
- **Expand on the power of MUI Core**: MUI X components work seamlessly with MUI Core libraries like Material UI, delivering more advanced functionality, but can also be used standalone.
- **Expand on the power of Core**: MUI X components work seamlessly with Core libraries like Material UI, delivering more advanced functionality, but can also be used standalone.
- **Grow with us:** You can start for free with the MIT-licensed packages, and upgrade to Pro or Premium when you need more advanced features or technical support.
- **Dedicated maintenance:** MUI X is maintained by a full-time staff of engineers, so you can rest assured that any issues will be addressed in a timely manner.
- **Technical support:** Pro and Premium users get access to technical support from our team as well as priority for bug fixes and feature requests.

## MUI X vs. MUI Core
## MUI X vs. Core

MUI X is a collection of advanced UI components for complex use cases.
Most of MUI X's components are available for free, but more advanced features require a Pro or Premium commercial license.

MUI Core focuses on empowering the creation of great design systems with React.
Core focuses on empowering the creation of great design systems with React.
It comes with two themes (Material Design and an in-house one).
It's about solving design problems.
It contains foundational UI component libraries like Material UI and Base UI.
These libraries are open source, MIT-licensed, and free forever.

MUI X components are fully compatible with MUI Core.
MUI X components are fully compatible with Core.
MUI X can extend the functionality of UIs built with Material UI or Base UI, but its components can also stand on their own, they can be used with third-parties React component libraries that implement different designs.

You can find [more details](https://mui-org.notion.site/MUI-s-products-a-brief-overview-9c5e8e11eb1247c3a124b446be7451cb) about the difference in our handbook.
You can find [more details](https://mui-org.notion.site/X-FAQ-c33e9a7eabba4da1ad7f8c04f99044cc#11751b16538c489ba23c5133db1e67b8) about the difference in our handbook.
2 changes: 1 addition & 1 deletion packages/x-charts-pro/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MUI X Pro

This package is the Pro plan edition of the chart components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/x-charts/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MUI X Charts

This package is the community edition of the chart components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/x-data-grid-premium/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MUI X Data Grid Premium

This package is the Premium plan edition of the Data Grid components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/x-data-grid-pro/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MUI X Data Grid Pro

This package is the Pro plan edition of the Data Grid component.
It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/x-data-grid/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MUI X Data Grid

This package is the Community plan edition of the Data Grid components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers-pro/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MUI X Date Pickers Pro

This package is the Pro plan edition of the Date and Time Picker Components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/x-date-pickers/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MUI X Date Pickers

This package is the Community plan edition of the Date and Time Picker components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/x-tree-view-pro/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MUI X Tree View

This package is the Pro plan edition of the Tree View components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/x-tree-view/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# MUI X Tree View

This package is the Community plan edition of the Tree View components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of MUI Core, with advanced components.
It's part of [MUI X](https://mui.com/x/), an open-core extension of our Core libraries, with advanced components.

## Installation

Expand Down
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"enabled": false
},
{
"groupName": "MUI Core",
"groupName": "Material UI",
"matchPackageNames": [
"@mui/icons-material",
"@mui/joy",
Expand Down
2 changes: 1 addition & 1 deletion scripts/l10n.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function extractTranslations(translationsPath: string): [TranslationsByGroup, Tr
(property.key as babelTypes.Identifier).name ||
`'${(property.key as babelTypes.StringLiteral).value}'`;

// Ignore translations for MUI Core components, for example MuiTablePagination
// Ignore translations for Core components, for example MuiTablePagination
if (key.startsWith('Mui')) {
return;
}
Expand Down

0 comments on commit 5dfe4d6

Please sign in to comment.