Skip to content

Commit

Permalink
Merge branch 'master' into slide-value-label-prop-types
Browse files Browse the repository at this point in the history
  • Loading branch information
ZeeshanTamboli committed Oct 26, 2024
2 parents f9751c2 + 2359c0b commit 23950d5
Show file tree
Hide file tree
Showing 21,538 changed files with 51,066 additions and 67,275 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
26 changes: 13 additions & 13 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ jobs:
<<: *default-job
resource_class: 'medium+'
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
steps:
- checkout
- install_js:
Expand Down Expand Up @@ -408,7 +408,7 @@ jobs:
test_e2e:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
steps:
- checkout
- install_js:
Expand All @@ -420,7 +420,7 @@ jobs:
# NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
steps:
- checkout
- install_js:
Expand All @@ -433,7 +433,7 @@ jobs:
test_profile:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
steps:
- checkout
- install_js:
Expand All @@ -458,7 +458,7 @@ jobs:
test_regressions:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
steps:
- checkout
- install_js:
Expand Down Expand Up @@ -525,7 +525,7 @@ jobs:
test_bundling_next_webpack4:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
steps:
- checkout:
Expand All @@ -543,7 +543,7 @@ jobs:
test_bundling_next_webpack5:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
steps:
- checkout:
Expand All @@ -561,7 +561,7 @@ jobs:
test_bundling_create_react_app:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
steps:
- checkout:
Expand All @@ -579,7 +579,7 @@ jobs:
test_bundling_snowpack:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
steps:
- checkout:
Expand All @@ -597,7 +597,7 @@ jobs:
test_bundling_vite:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
steps:
- checkout:
Expand All @@ -615,7 +615,7 @@ jobs:
test_bundling_esbuild:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
steps:
- checkout:
Expand All @@ -633,7 +633,7 @@ jobs:
test_bundling_gatsby:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
environment:
GATSBY_CPU_COUNT: '3'
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
Expand Down Expand Up @@ -734,7 +734,7 @@ jobs:
test_benchmark:
<<: *default-job
docker:
- image: mcr.microsoft.com/playwright:v1.47.2-focal
- image: mcr.microsoft.com/playwright:v1.48.1-focal
steps:
- checkout
- install_js:
Expand Down
50 changes: 22 additions & 28 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -257,10 +257,7 @@ module.exports = /** @type {Config} */ ({
{
files: [
// matching the pattern of the test runner
'*.test.mjs',
'*.test.js',
'*.test.ts',
'*.test.tsx',
'*.test.?(c|m)[jt]s?(x)',
],
extends: ['plugin:mocha/recommended'],
rules: {
Expand Down Expand Up @@ -332,14 +329,14 @@ module.exports = /** @type {Config} */ ({
},
// Next.js entry points pages
{
files: ['docs/pages/**/*{.tsx,.js}'],
files: ['docs/pages/**/*.?(c|m)[jt]s?(x)'],
rules: {
'react/prop-types': 'off',
},
},
// demos
{
files: ['docs/src/pages/**/*{.tsx,.js}', 'docs/data/**/*{.tsx,.js}'],
files: ['docs/src/pages/**/*.?(c|m)[jt]s?(x)', 'docs/data/**/*.?(c|m)[jt]s?(x)'],
rules: {
// This most often reports data that is defined after the component definition.
// This is safe to do and helps readability of the demo code since the data is mostly irrelevant.
Expand All @@ -349,23 +346,14 @@ module.exports = /** @type {Config} */ ({
'no-console': 'off',
},
},
// demos - proptype generation
{
files: ['docs/data/base/components/modal/UseModal.js'],
rules: {
'consistent-return': 'off',
'func-names': 'off',
'no-else-return': 'off',
'prefer-template': 'off',
},
},
{
files: ['docs/data/**/*{.tsx,.js}'],
files: ['docs/data/**/*.?(c|m)[jt]s?(x)'],
excludedFiles: [
'docs/data/joy/getting-started/templates/**/*.tsx',
'docs/data/**/css/*{.tsx,.js}',
'docs/data/**/system/*{.tsx,.js}',
'docs/data/**/tailwind/*{.tsx,.js}',
// filenames/match-exported sees filename as 'file-name.d'
// Plugin looks unmaintain, find alternative? (e.g. eslint-plugin-project-structure)
'*.d.ts',
'docs/data/joy/getting-started/templates/**/*',
'docs/data/**/{css,system,tailwind}/*',
],
rules: {
'filenames/match-exported': ['error'],
Expand All @@ -380,6 +368,13 @@ module.exports = /** @type {Config} */ ({
{
files: ['packages/*/src/**/*.tsx'],
excludedFiles: '*.spec.tsx',
rules: {
'react/prop-types': 'off',
},
},
{
files: ['packages/*/src/**/*.?(c|m)[jt]s?(x)'],
excludedFiles: '*.spec.*',
rules: {
'no-restricted-imports': [
'error',
Expand All @@ -406,11 +401,10 @@ module.exports = /** @type {Config} */ ({
],
},
],
'react/prop-types': 'off',
},
},
{
files: ['*.spec.tsx', '*.spec.ts'],
files: ['*.spec.*'],
rules: {
'no-alert': 'off',
'no-console': 'off',
Expand Down Expand Up @@ -449,7 +443,7 @@ module.exports = /** @type {Config} */ ({
},
},
{
files: ['docs/**/*{.ts,.tsx,.js}'],
files: ['docs/**/*.?(c|m)[jt]s?(x)'],
rules: {
'no-restricted-imports': [
'error',
Expand All @@ -461,8 +455,8 @@ module.exports = /** @type {Config} */ ({
},
},
{
files: ['packages/*/src/**/*{.ts,.tsx,.js}'],
excludedFiles: ['*.d.ts', '*.spec.ts', '*.spec.tsx'],
files: ['packages/*/src/**/*.?(c|m)[jt]s?(x)'],
excludedFiles: ['*.d.ts', '*.spec.*'],
rules: {
'no-restricted-imports': [
'error',
Expand All @@ -477,8 +471,8 @@ module.exports = /** @type {Config} */ ({
},
},
{
files: ['packages/*/src/**/*{.ts,.tsx,.js}'],
excludedFiles: ['*.d.ts', '*.spec.ts', '*.spec.tsx', 'packages/mui-joy/**/*{.ts,.tsx,.js}'],
files: ['packages/*/src/**/*.?(c|m)[jt]s?(x)'],
excludedFiles: ['*.d.ts', '*.spec.*', 'packages/mui-joy/**/*'],
rules: {
'material-ui/mui-name-matches-component-name': 'error',
},
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@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
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@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/vale-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
pull-requests: write
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
- uses: errata-ai/vale-action@38bf078c328061f59879b347ca344a718a736018 # v2.1.0
- uses: errata-ai/vale-action@d89dee975228ae261d22c15adcd03578634d429c # v2.1.1
continue-on-error: true # GitHub Action flag needed until https://github.com/errata-ai/vale-action/issues/89 is fixed
with:
# Errors should be more visible
Expand Down
52 changes: 50 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,53 @@
# [Versions](https://mui.com/versions/)

## 6.1.5

<!-- generated comparing v6.1.4..master -->

_Oct 22, 2024_

A big thanks to the 9 contributors who made this release possible.

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

- [Autocomplete] Fix bug with child chip button events propagating to parent (#43982) @snapwich
- [Autocomplete] Fix Autocomplete crashing if ownerState is used in styleOverrides (#43994) @sai6855
- [Checkbox] Fix disableRipple regression (#44099) @siriwatknp
- [Dialog] Add the aria-modal="true" by default (#44118) @mnajdova
- [IconButton] Fix disableRipple behavior when disableRipple is set in MuiButtonBase theme (#43714) @sai6855
- [pigment-css] Support project without enabling CSS variables (#44171) @siriwatknp
- Make the palette always return new light and dark object (#44059) @siriwatknp

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

- Add `defaultMode` to `InitColorSchemeScript` (#44139) @siriwatknp

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

- [Grid2] Add removal `zeroMinWidth` prop to codemod (#44178) @sai6855

### Docs

- [material-ui][FormControlLabel] Don't use unintuitive label position on chec… (#44119) @mnajdova
- [material-ui][TextField] Dynamically modify the eye password button aria-label (#44122) @ChinoUkaegbu
- [icons] Run pnpm docs:mdicons:synonyms (#44098) @oliviertassinari
- [joy-ui] Update Overview copy to match Readme (#44136) @samuelsycamore
- Add CodeSandbox/Stackblitz to the rest of the templates (#43708) @siriwatknp
- Update Figma link to fix 301 (a7b7d9c) @oliviertassinari
- Link Toolpad from Core repo (#44111) @prakhargupta1
- Remove HighlightedCode max-width (#43731) @Janpot

### Core

- [code-infra] Widen eslint file patterns (#44148) @Janpot
- [code-infra] Fix icon builder tests (#44143) @Janpot
- [code-infra] Fix dependabot vulnerabilities (#44124) @Janpot
- [core] Reference commits in changelog when no PR (#44115) @oliviertassinari
- [examples] Fix Pigment CSS Vite example (#44074) @oliviertassinari
- Fix fast-xml-parser vulnerability (#44121) @Janpot

All contributors of this release in alphabetical order: @ChinoUkaegbu, @Janpot, @mnajdova, @oliviertassinari, @prakhargupta1, @sai6855, @samuelsycamore, @siriwatknp, @snapwich

## v6.1.4

<!-- generated comparing v6.1.3..master -->
Expand Down Expand Up @@ -310,7 +358,7 @@ A big thanks to the 11 contributors who made this release possible.

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

- Fix `createTheme` with just color schemes (#43518) @siriwatknp
- Fix `createTheme()` with just color schemes (#43518) @siriwatknp
- [Menu,Popover] Fix Backdrop props descriptions (#43503) @Michael-Hutchinson
- [MenuList] Do not react to an event with modifier key pressed (#43505) @MateuszGroth

Expand Down Expand Up @@ -1052,7 +1100,7 @@ A big thanks to the 18 contributors who made this release possible.

### Docs

- Add `theme.applyStyles` and migrate docs (#42498) @siriwatknp
- Add `theme.applyStyles()` and migrate docs (#42498) @siriwatknp
- Fix dashboard template console error (#42594) @oliviertassinari
- Migrate system props to `sx` prop (#42475) @siriwatknp
- [material-ui]Fix duplicated sentence (#42521) @alexfauquette
Expand Down
12 changes: 6 additions & 6 deletions CHANGELOG.old.md
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,7 @@ This release was mostly about 🐛 bug fixes and 📚 documentation improvements

- [zero-runtime] Use lodash instead of its subpackages (#40868) @michaldudak
- Add `applyStyles()` to theme (#40667) @siriwatknp
- [zero] Use `theme.applyStyles` in the demo app (#40787) @siriwatknp
- [zero] Use `theme.applyStyles()` in the demo app (#40787) @siriwatknp
- [zero] Add `useThemeProps` processor (#40648) @siriwatknp

### `@mui/[email protected]`
Expand Down Expand Up @@ -3301,7 +3301,7 @@ A big thanks to the 25 contributors who made this release possible. Here are som
- [docs] Add summary and improve `test_static` CI doc in CONTRIBUTING readme file (#36711) @kriskw1999
- [docs] Update theme customization TypeScript (#35551) @siriwatknp
- [docs] Add Joy Frames X web blocks template (#37203) @siriwatknp
- [docs] Change Base UI `alpha` to `beta` in README (#37228) @ZeeshanTamboli
- [docs] Change Base UI `alpha()` to `beta()` in README (#37228) @ZeeshanTamboli
- [docs] Improve Base UI overview page (#37227) @mnajdova
- [docs] Update Joy + Material guide (#36911) @cherniavskii

Expand Down Expand Up @@ -5909,7 +5909,7 @@ A big thanks to the 15 contributors who made this release possible. Here are som
- [docs] Fix en-US format in the Skeleton demo (#33699) @husseinsaad98
- [docs] Update module reference for `usePagination` (#33675) @fullstackzach
- [docs] Fix code examples in `styled` API vs `sx` prop docs (#33665) @ZeeshanTamboli
- [docs][system] Throw an informative error when `theme.vars` is used in `createTheme` and mention this in the theming docs (#33619) @hbjORbj
- [docs][system] Throw an informative error when `theme.vars` is used in `createTheme()` and mention this in the theming docs (#33619) @hbjORbj

### Core

Expand Down Expand Up @@ -10448,7 +10448,7 @@ A big thanks to the 17 contributors who made this release possible. Here are som
}
```

- [theme] Rename `createMuiTheme` to `createTheme` (#25992) @m4theushw
- [theme] Rename `createMuiTheme()` to `createTheme()` (#25992) @m4theushw

Developers only need one theme in their application. A prefix would suggest a second theme is needed. It's not the case. `createMuiTheme` will be removed in v6.

Expand Down Expand Up @@ -13019,7 +13019,7 @@ Here are some highlights ✨:
### `@material-ui/[email protected]`

- [TreeView] Fix bundle size link and refactor array spreads (#22992) @joshwooding
- [TreeView] Fix `alpha` color utility instead of deprecated `fade` (#22978) @joshwooding
- [TreeView] Fix `alpha()` color utility instead of deprecated `fade()` (#22978) @joshwooding
- [core] Ship modern bundle (#22814) @eps1lon

### `@material-ui/[email protected]`
Expand Down Expand Up @@ -14927,7 +14927,7 @@ You can expect similar releases like this one in the coming months.

#### Deprecations

- [theme] Deprecate `fade` color utility in favor of `alpha` (#22837) @mnajdova
- [theme] Deprecate `fade()` color utility in favor of `alpha()` (#22837) @mnajdova
- [theme] Deprecate theme.mixins.gutters (#22245) @joshwooding
- [Avatar] Add circular variant (#22090) @eps1lon
- [Badge] Add overlap circular and rectangular (#22076) @eps1lon
Expand Down
Loading

0 comments on commit 23950d5

Please sign in to comment.