Skip to content

Commit

Permalink
Merge branch 'next' into docs-infra-design-improvements
Browse files Browse the repository at this point in the history
Signed-off-by: Danilo Leal <[email protected]>
  • Loading branch information
danilo-leal authored May 2, 2024
2 parents 7a5ada5 + 7bc7de6 commit 4596dca
Show file tree
Hide file tree
Showing 255 changed files with 6,382 additions and 2,980 deletions.
5 changes: 4 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ default-job: &default-job
AWS_REGION_ARTIFACTS: eu-central-1
working_directory: /tmp/material-ui
docker:
- image: cimg/node:18.19
- image: cimg/node:18.20

default-context: &default-context
context:
Expand Down Expand Up @@ -215,6 +215,9 @@ jobs:
#!/bin/bash
VALE_STR_CLI_VERSION=3.3.0
# set smart sudo
if [[ $EUID -eq 0 ]]; then export SUDO=""; else export SUDO="sudo"; fi
mkdir /tmp/vale-extract
cd /tmp/vale-extract
GZIPPED_OUTPUT="vale.tar.gz"
Expand Down
40 changes: 18 additions & 22 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const path = require('path');
const { rules: baseStyleRules } = require('eslint-config-airbnb-base/rules/style');

const forbidTopLevelMessage = [
'Prefer one level nested imports to avoid bundling everything in dev mode',
const OneLevelImportMessage = [
'Prefer one level nested imports to avoid bundling everything in dev mode or breaking CJS/ESM split.',
'See https://github.com/mui/material-ui/pull/24147 for the kind of win it can unlock.',
].join('\n');
// This only applies to packages published from this monorepo.
Expand Down Expand Up @@ -65,7 +65,20 @@ module.exports = {
'no-restricted-imports': [
'error',
{
patterns: ['@mui/*/*/*'],
patterns: [
{
group: [
'@mui/*/*/*',
'@pigment-css/*/*/*',
'@base_ui/*/*/*',
// Allow any import depth with any internal packages
'!@mui/internal-*/**',
// TODO delete, @mui/docs should be @mui/internal-docs
'!@mui/docs/**',
],
message: OneLevelImportMessage,
},
],
},
],
'no-continue': 'off',
Expand Down Expand Up @@ -331,23 +344,6 @@ module.exports = {
'import/export': 'off', // Not sure why it doesn't work
},
},
{
files: ['*.tsx'],
excludedFiles: '*.spec.tsx',
rules: {
// WARNING: If updated, make sure these rules are merged with `no-restricted-imports` (#ts-source-files)
'no-restricted-imports': [
'error',
{
patterns: [
// Allow deeper imports for TypeScript types. TODO remove
'@mui/*/*/*/*',
],
},
],
},
},
// Files used for generating TypeScript declaration files (#ts-source-files)
{
files: ['packages/*/src/**/*.tsx'],
excludedFiles: '*.spec.tsx',
Expand Down Expand Up @@ -429,11 +425,11 @@ module.exports = {
paths: [
{
name: '@mui/material',
message: forbidTopLevelMessage,
message: OneLevelImportMessage,
},
{
name: '@mui/lab',
message: forbidTopLevelMessage,
message: OneLevelImportMessage,
},
],
},
Expand Down
38 changes: 38 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,43 @@
# [Versions](https://mui.com/versions/)

## v6.0.0-alpha.5

<!-- generated comparing v6.0.0-alpha.4..next -->

_May 1, 2024_

A big thanks to the 9 contributors who made this release possible. Here are some highlights ✨:

### `@mui/[email protected]`

- [FormControlLabel] Deprecate `componentsProps` (#41767) @sai6855
- [PaginationItem] Deprecate components prop (#41777) @sai6855
- [SvgIcon] Convert to support CSS extraction (#41779) @aarongarciah

### `@mui/[email protected]`

- [TextareaAutosize] Fix resizing instability (#41638) @ZeeshanTamboli

### Docs

- Fix small SEO issues @oliviertassinari
- [material-ui] Fix minor spelling error in the "About the lab" page (#42073) @ryanhartwig
- [material-ui] Update Figma plugin name (#41967) @danilo-leal
- [material-ui][templates] Fix input props attributes in Landing Page template (#42013) @5-tom
- [system] Update typo on the sx prop page (#42035) @bricker

### Core

- [docs-infra] Clean up branding theme file and improve font-face readibility (#42023) @danilo-leal
- [docs-infra] Simplify docs demo (#42016) @oliviertassinari
- [website] Add content about the Sync plugin in the Material UI page (#40515) @danilo-leal
- [website] Sync career roles (#42058) @oliviertassinari
- [website] Add Nadja on the about page (#42021) @mnajdova
- [website] Fix code block design by changing the `MarkdownElement` import (#42022) @danilo-leal
- [wesbite] Remove duplicate MarkdownElement component (#42028) @danilo-leal

All contributors of this release in alphabetical order: @5-tom, @aarongarciah, @bricker, @danilo-leal, @mnajdova, @oliviertassinari, @ryanhartwig, @sai6855, @ZeeshanTamboli

## v6.0.0-alpha.4

<!-- generated comparing v6.0.0-alpha.3..next -->
Expand Down
2 changes: 1 addition & 1 deletion apps/pigment-css-vite-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"@vitejs/plugin-react": "^4.2.1",
"postcss": "^8.4.38",
"postcss-combine-media-query": "^1.0.1",
"vite": "5.2.8",
"vite": "5.2.10",
"vite-plugin-pages": "^0.32.1"
},
"nx": {
Expand Down
2 changes: 1 addition & 1 deletion apps/pigment-css-vite-app/src/Slider/ZeroSlider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import { isHostComponent, useSlotProps } from '@mui/base/utils';
import { styled } from '@pigment-css/react';
import { capitalize } from '@mui/material/utils';
import SliderValueLabel from '@mui/material/Slider/SliderValueLabel';
import { SliderValueLabel } from '@mui/material/Slider';
import { useSlider, valueToPercent } from '@mui/base/useSlider';
import { alpha, lighten, darken } from '@mui/system/colorManipulator';
import type { Theme } from '@mui/material/styles';
Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/autocomplete/autocomplete.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/combobox/

<p class="description">An autocomplete component is a text input enhanced by a panel of suggested options.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/badge/badge.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ githubLabel: 'component: badge'

<p class="description">The Badge component generates a small label that is attached to its child element.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/button/button.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/button/

<p class="description">Buttons let users take actions and make choices with a single tap.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ githubLabel: 'component: ClickAwayListener'

<p class="description">The Click-Away Listener component detects when a click event happens outside of its child element.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/focus-trap/focus-trap.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ githubLabel: 'component: FocusTrap'

<p class="description">The Focus Trap component prevents the user's focus from escaping its children components.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/form-control/form-control.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ githubLabel: 'component: FormControl'

<p class="description">The Form Control component is a utility that lets you associate a form input with auxiliary components, such as labels, error indicators, or helper text.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/input/input.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ githubLabel: 'component: input'

<p class="description">The Input component provides users with a field to enter and edit text.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/menu/menu.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/menu-button/

<p class="description">The Dropdown Menu components provide end users with a list of options on temporary surfaces.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/modal/modal.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/dialog-modal/

<p class="description">The Modal component lets you create dialogs, popovers, lightboxes, and other elements that force the user to take action before continuing.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/no-ssr/no-ssr.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ components: NoSsr

<p class="description">The No-SSR component defers the rendering of children components from the server to the client.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/number-input/number-input.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ githubLabel: 'component: number input'

<p class="description">The Number Input component provides users with a field for integer values, and buttons to increment or decrement the value.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/popper/popper.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/tooltip/

<p class="description">The Popper component lets you create tooltips and popovers that display information about an element on the page.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/popup/popup.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/tooltip/

<p class="description">The Popup component is a utility that lets you display content in tooltips and popovers.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/portal/portal.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ githubLabel: 'component: Portal'

<p class="description">The Portal component lets you render its children into a DOM node that exists outside of the Portal's own DOM hierarchy.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/select/select.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/combobox/examples/combobox-sel

<p class="description">The Select components let you create lists of options for users to choose from.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/slider/slider.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/slider-multithumb/
<p class="description">A slider is a UI element that lets users select a single value or a range of values along a bar.
</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/snackbar/snackbar.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ githubLabel: 'component: snackbar'

<p class="description">The Snackbar component informs users that an action has been or will be performed by the app.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/switch/switch.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/switch/

<p class="description">Switches are UI elements that let users choose between two states—most commonly on/off.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ githubLabel: 'component: TablePagination'

<p class="description">Table Pagination is an interface tool for splitting up large amounts of data to make it easier for users to navigate.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/base/components/tabs/tabs.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/tabs/

<p class="description">Tabs are UI elements for organizing and navigating between groups of related content.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ githubLabel: 'component: TextareaAutosize'

<p class="description">The Textarea Autosize component gives you a textarea HTML element that automatically adjusts its height to match the length of the content within.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

{{"component": "modules/components/ComponentPageTabs.js"}}

Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/components/alert/alert.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/alert/

<p class="description">Alerts display brief messages for the user without interrupting their use of the app.</p>

{{"component": "modules/components/ComponentLinkHeader.js"}}
{{"component": "@mui/docs/ComponentLinkHeader"}}

## Introduction

Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/components/autocomplete/autocomplete.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ waiAria: https://www.w3.org/WAI/ARIA/apg/patterns/combobox/

<p class="description">The autocomplete is a text input enhanced by a panel of suggested options when users start typing.</p>

{{"component": "modules/components/ComponentLinkHeader.js"}}
{{"component": "@mui/docs/ComponentLinkHeader"}}

## Introduction

Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/components/avatar/avatar.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ githubLabel: 'component: avatar'

<p class="description">An avatar is a graphical representation of a user's identity.</p>

{{"component": "modules/components/ComponentLinkHeader.js"}}
{{"component": "@mui/docs/ComponentLinkHeader"}}

## Introduction

Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/components/badge/badge.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ unstyled: /base-ui/react-badge/

<p class="description">The Badge component generates a small label that is attached to its child element.</p>

{{"component": "modules/components/ComponentLinkHeader.js"}}
{{"component": "@mui/docs/ComponentLinkHeader"}}

## Introduction

Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/components/box/box.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ githubLabel: 'component: Box'

<p class="description">The Box component is a generic, theme-aware container with access to CSS utilities from MUI System.</p>

{{"component": "modules/components/ComponentLinkHeader.js", "design": false}}
{{"component": "@mui/docs/ComponentLinkHeader", "design": false}}

## Introduction

Expand Down
2 changes: 1 addition & 1 deletion docs/data/joy/components/breadcrumbs/breadcrumbs.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ githubLabel: 'component: breadcrumbs'

<p class="description">A breadcrumb trail is a navigational tool that helps users keep track of their location within an app.</p>

{{"component": "modules/components/ComponentLinkHeader.js"}}
{{"component": "@mui/docs/ComponentLinkHeader"}}

## Introduction

Expand Down
Loading

0 comments on commit 4596dca

Please sign in to comment.