Skip to content

Commit

Permalink
Merge branch 'master' into material-next/menu-useMenu
Browse files Browse the repository at this point in the history
  • Loading branch information
mnajdova committed Oct 10, 2023
2 parents 3cabcc9 + 7f9c09f commit 8edc2a3
Show file tree
Hide file tree
Showing 611 changed files with 15,928 additions and 11,120 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ defaults: &defaults
AWS_REGION_ARTIFACTS: eu-central-1
working_directory: /tmp/material-ui
docker:
- image: cimg/node:18.17
- image: cimg/node:18.18

# CircleCI has disabled the cache across forks for security reasons.
# Following their official statement, it was a quick solution, they
Expand Down
25 changes: 25 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ module.exports = {
],
},
],
'no-continue': 'off',
'no-constant-condition': 'error',
// Use the proptype inheritance chain
'no-prototype-builtins': 'off',
Expand All @@ -83,6 +84,16 @@ module.exports = {
// Destructuring harm grep potential.
'prefer-destructuring': 'off',

'@typescript-eslint/no-use-before-define': [
'error',
{
functions: false,
classes: true,
variables: true,
},
],
'no-use-before-define': 'off',

// disabled type-aware linting due to performance considerations
'@typescript-eslint/dot-notation': 'off',
'dot-notation': 'error',
Expand Down Expand Up @@ -262,6 +273,20 @@ module.exports = {
],
},
},
// Next.js plugin
{
files: ['docs/**/*'],
extends: ['plugin:@next/next/recommended'],
settings: {
next: {
rootDir: 'docs',
},
},
rules: {
// We're not using the Image component at the moment
'@next/next/no-img-element': 'off',
},
},
// Next.js entry points pages
{
files: ['docs/pages/**/*.js'],
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/5.priority-support.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Priority support: SLA ⏰'
name: 'Priority Support: SLA ⏰'
description: I'm an MUI X Premium user and we have purchased the Priority Support add-on. I can't find a solution to my problem with MUI Core (Material UI, Base UI, MUI System, and Joy UI).
title: '[question] '
labels: ['status: needs triage', 'support: unknown']
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
uses: github/codeql-action/init@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
with:
languages: typescript
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -30,4 +30,4 @@ jobs:
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
uses: github/codeql-action/analyze@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
2 changes: 1 addition & 1 deletion .github/workflows/priority-support-validation-prompt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
Do not share your support key in this issue!
Priority support is only provided to verified customers. Once you have verified your support key, we will remove the `support: unknown` label and add the `support: priority` label to this issue. Only then the time for the SLA will start counting.
Priority Support is only provided to verified customers. Once you have verified your support key, we will remove the `support: unknown` label and add the `support: priority` label to this issue. Only then the time for the SLA will start counting.
- name: Update comment
if: ${{ steps.findComment.outputs.comment-id != '' && contains(github.event.label.name, 'priority') }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
persist-credentials: false

- name: Run analysis
uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
with:
results_file: results.sarif
results_format: sarif
Expand All @@ -43,6 +43,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: Upload to code-scanning
uses: github/codeql-action/upload-sarif@6a28655e3dcb49cb0840ea372fd6d17733edd8a4 # v2.21.8
uses: github/codeql-action/upload-sarif@2cb752a87e96af96708ab57187ab6372ee1973ab # v2.22.0
with:
sarif_file: results.sarif
160 changes: 160 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,165 @@
# [Versions](https://mui.com/versions/)

## 5.14.12

<!-- generated comparing v5.14.11..master -->

_Oct 3, 2023_

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

- 🎨 Introduced color inversion utilities to Joy UI (#38916) @siriwatknp
- 🚀 Added Chip and related TextField components to Material You @DiegoAndai, @mj12albert
- 🏗️ Improve the Select's component a11y by adding the combobox role and aria-controls attribute (#38785) @xulingzhihou. If your tests require selecting the trigger element by the "button" role, then you'll have to change it to use the "combobox" role instead

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

- [DialogActions] Apply margin-left when children is not of `button` type (#39189) @sai6855
- [Select] Improve a11y by adding combobox role and aria-controls attribute (#38785) @xulingzhihou
- [Select] Fix MenuProps slotProps forwarding (#39177) @DiegoAndai
- [TextField] Polish types in Textfield demo (#39140) @sai6855
- [ButtonGroup] Fix rendering with conditional elements (#38989) @ZeeshanTamboli

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

- [system] Add support for `variants` in the styled() util (#39073) @mnajdova
- [Box] Add missing logical spacing property types (#39169) @Semigradsky

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

- [useSlider] Align externalProps handling (#38854) @mj12albert
- [useTabs] Align external props handling for useTab/useTabPanel/useTabsList (#39037) @mj12albert
- [test] Fix import paths in useTab tests (#39291) @mj12albert

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

- [Chip] Add Material You Chip component (#38927) @DiegoAndai
- [Divider] Copy v5 Divider (#39197) @mj12albert
- [FilledInput] Copy v5 FilledInput (#39040) @mj12albert
- [FormControl] Add FormControl component (#39032) @mj12albert
- [Select] Copy Select files from v5 (#39188) @DiegoAndai
- [TextField] Copy v5 TextField's inner components (#39166) @mj12albert

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

- Introduce color inversion utilities (#38916) @siriwatknp
- Replace margin with `gap` property (#39147) @siriwatknp
- [CssBaseline] use Joy `GlobalStyles` (#39278) @siriwatknp
- [Drawer] Apply content styles from theme to content slot (#39199) @sai6855
- [List] Add gap and missing active styles (#39146) @siriwatknp
- [Switch] Slight adjustments to the design (#39276) @danilo-leal

### Docs

- [docs] Update Autocomplete demo for React 18 (#39162) @oliviertassinari
- [docs-infra] Tweak feedback footer section design (#36556) @danilo-leal
- [docs-infra] Improve code syntax highlight (#39181) @oliviertassinari
- [docs][base] Add Tailwind CSS + plain CSS demo on the TextArea page (#39046) @alisasanib
- [docs][base-ui] Fix style for root div of multiline input (#39182) @ttlpta
- [docs][base-ui] Improve Select's country select demo (#38983) @oliviertassinari
- [docs][joy-ui] Add scrollable tabs example (#39260) @siriwatknp
- [docs][joy-ui] Match `Autocomplete` github label demo to actual github label dropdown (#39228) @sai6855
- [docs][joy-ui] Refine the Rental dashboard template (#39059) @zanivan
- [docs][joy-ui] Removed incomplete sentence in the Aspect Ratio page (#39227) @Erik-McKelvey
- [docs][joy-ui] Fix typo in the Accordion page (#39226) @Erik-McKelvey
- [docs][joy-ui] Update and standardize template Sidemenus (#39271) @zanivan
- [docs][joy-ui] Add a roadmap page (#39163) @danilo-leal
- [docs][material-ui] Replace `Box` with `Stack` in applicable demos (#39174) @sai6855
- [docs][material-ui] Add small polish to the Templates page (#39224) @danilo-leal
- [docs][material-ui] Small revision to the Icons page (#38840) @danilo-leal

### Core

- Add next lint config to eslint (#39183) @Janpot
- [core] Update eslint rules (#39178) @romgrk
- [core] Fix Greg GitHub slug @oliviertassinari
- [core] Priority Support casing normalization @oliviertassinari
- [website] Add Heat map in pricing page (#39269) @oliviertassinari
- [website] Update `React Engineer - xCharts` Ashby link (#39172) @DanailH
- [website] Add Charts to the pricing table (#38680) @alexfauquette
- [website] Polish career experience @oliviertassinari
- [website] Simplify the Core products file (#39194) @danilo-leal

All contributors of this release in alphabetical order: @alexfauquette, @brijeshb42, @DanailH, @danilo-leal, @DiegoAndai, @Erik-McKelvey, @Janpot, @mj12albert, @mnajdova, @oliviertassinari, @romgrk, @sai6855, @Semigradsky, @siriwatknp, @xulingzhihou, @zanivan, @ZeeshanTamboli

## 5.14.11

<!-- generated comparing v5.14.10..master -->

_Sep 26, 2023_

A big thanks to the 23 contributors who made this release possible.
This release was mostly about 🐛 bug fixes and 📚 documentation improvements.

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

- [Autocomplete] Re-export `AutocompleteValue` to make it available from path import (#38638) @vadimka123
- [Select][material-ui] Missing aria-multiselectable attribute on multiple Select component (#38855) @gitstart
- [l10n] labelDisplayedRows is added for trTR localization (#39056) @tebersefa

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

- Support RSC in `isMuiElement` util (#38129) @sai6855

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

- [NumberInput] Support adornments (#38900) @anle9650
- [Menu] Align external props handling for useMenu/MenuButton/MenuItem (#38946) @mj12albert
- [Select] Align external props handling (#39038) @mj12albert
- [TextareaAutosize] Simplify logic and add test (#38728) @oliviertassinari

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

- [Button] Fix disabled button styling when component prop is provided (#38996) @sai6855
- [Drawer] Add missing `JoyDrawer` in theme components (#39074) @Studio384

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

- [FormControl] Copy v5 FormControl (#39039) @mj12albert

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

- [TreeView] Fix JSDoc comments in TreeView and TreeItem (#38874) @jergason

### Docs

- Improve focus trap demo (#38985) @oliviertassinari
- Add Tailwind CSS + plain CSS demo on the Tabs page (#39000) @alisasanib
- Improve the default theme viewer design (#39049) @danilo-leal
- Add live demo with CssVarsProvider (#38792) @oliviertassinari
- Fix wrong hash on Card's page (#39151) @mnajdova
- Revise the Drawer page (#38988) @danilo-leal
- Simplify the button's loading indicator demo (#39082) @danilo-leal
- Fix the Templates link on the Overview page (#39086) @danilo-leal
- Refine the Sign in template (#38942) @zanivan
- Add `use-count-up` integration with the Circular Progress (#38952) @anon-phantom

### Core

- [blog] Add a company values blog post (#38802) @mikailaread
- [core] Downgrade lerna to 7.2.0 (#39149) @michaldudak
- [core] Simplify docs feedback interaction (#39075) @alexfauquette
- [core] Improve ref type definition (#38903) @oliviertassinari
- [core] Simplify career (#39112) @oliviertassinari
- [core] Update Babel types along with source packages (#39070) @michaldudak
- [core] Add a comment to explain `useEnhancedEffect` (#39035) @Janpot
- [docs-infra] Fix code removal in table of content (#39165) @alexfauquette
- [docs-infra] Improve callouts design (#39084) @danilo-leal
- [docs-infra] Fix key warning in Base UI Slider slots section (#38954) @ZeeshanTamboli
- [docs-infra] Fix error when redirecting to the root page (#38451) @maheshguntur
- [docs-infra] Open demo crash in the right repository (#39006) @oliviertassinari
- [test] Split the test package (#39061) @michaldudak
- [website] React Engineer - xCharts role (#38976) @DanailH
- [website] Improve the highlighter component colors (#39087) @danilo-leal
- [website] Fix Pricing page row hover (#39097) @danilo-leal
- [website] Fix typo with straight quote @oliviertassinari
- [website] Sync about page @oliviertassinari
- [website] Update the about page (#38733) @danilo-leal
- [website] Small fixes on the X marketing page (#38975) @flaviendelangle
- [website] Add stray design tweaks to the X page (#38589) @danilo-leal

All contributors of this release in alphabetical order: @alexfauquette, @alisasanib, @anle9650, @anon-phantom, @DanailH, @danilo-leal, @DiegoAndai, @flaviendelangle, @gitstart, @Janpot, @jergason, @maheshguntur, @michaldudak, @mikailaread, @mj12albert, @mnajdova, @oliviertassinari, @sai6855, @Studio384, @tebersefa, @vadimka123, @zanivan, @ZeeshanTamboli

## 5.14.10

<!-- generated comparing v5.14.9..master -->
Expand Down
1 change: 1 addition & 0 deletions apps/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
yarn.lock
4 changes: 1 addition & 3 deletions apps/zero-runtime-next-app/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ const theme = createTheme({
// @ts-ignore
theme.applyDarkStyles = function applyDarkStyles(obj) {
return {
// @TODO - Use custom stylis plugin as in docs/src/createEmotionCache.ts
// so that we don't need to use *
'* :where([data-mui-color-scheme="dark"]) &': obj,
':where([data-mui-color-scheme="dark"]) &': obj,
};
};

Expand Down
4 changes: 2 additions & 2 deletions apps/zero-runtime-next-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"@mui/zero-tag-processor": "file:../../packages/zero-tag-processor/build",
"@mui/zero-next-plugin": "file:../../packages/zero-next-plugin/build",
"@types/node": "20.5.7",
"@types/react": "18.2.21",
"@types/react-dom": "18.2.7",
"@types/react": "18.2.23",
"@types/react-dom": "18.2.11",
"typescript": "5.1.6"
},
"resolutions": {
Expand Down
Loading

0 comments on commit 8edc2a3

Please sign in to comment.