Skip to content

Commit 024c705

Browse files
committed
Merge branch 'master' of https://github.com/mui/material-ui into fix/transition-slot-props
2 parents d74e669 + df4b10f commit 024c705

File tree

637 files changed

+34720
-5428
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

637 files changed

+34720
-5428
lines changed

.circleci/config.yml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22
orbs:
3-
aws-cli: circleci/aws-cli@5.1.2
4-
aws-s3: circleci/[email protected].0
3+
aws-cli: circleci/aws-cli@5.2.0
4+
aws-s3: circleci/[email protected].1
55

66
parameters:
77
browserstack-force:
@@ -315,7 +315,7 @@ jobs:
315315
git add -f packages/mui-material/build || echo '/material declarations do not exist'
316316
git add -f packages/mui-lab/build || echo '/lab declarations do not exist'
317317
git add -f packages/mui-utils/build || echo '/utils declarations do not exist'
318-
pnpm -r build:types
318+
pnpm -r build:stable && pnpm -r build:types
319319
git --no-pager diff
320320
- run:
321321
name: Any defect declaration files?
@@ -379,7 +379,7 @@ jobs:
379379
<<: *default-job
380380
resource_class: 'medium+'
381381
docker:
382-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
382+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
383383
steps:
384384
- checkout
385385
- install_js:
@@ -407,7 +407,7 @@ jobs:
407407
test_e2e:
408408
<<: *default-job
409409
docker:
410-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
410+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
411411
steps:
412412
- checkout
413413
- install_js:
@@ -419,7 +419,7 @@ jobs:
419419
# NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci
420420
<<: *default-job
421421
docker:
422-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
422+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
423423
steps:
424424
- checkout
425425
- install_js:
@@ -432,7 +432,7 @@ jobs:
432432
test_profile:
433433
<<: *default-job
434434
docker:
435-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
435+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
436436
steps:
437437
- checkout
438438
- install_js:
@@ -457,7 +457,7 @@ jobs:
457457
test_regressions:
458458
<<: *default-job
459459
docker:
460-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
460+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
461461
steps:
462462
- checkout
463463
- install_js:
@@ -524,7 +524,7 @@ jobs:
524524
test_bundling_next_webpack4:
525525
<<: *default-job
526526
docker:
527-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
527+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
528528
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
529529
steps:
530530
- checkout:
@@ -542,7 +542,7 @@ jobs:
542542
test_bundling_next_webpack5:
543543
<<: *default-job
544544
docker:
545-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
545+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
546546
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
547547
steps:
548548
- checkout:
@@ -560,7 +560,7 @@ jobs:
560560
test_bundling_create_react_app:
561561
<<: *default-job
562562
docker:
563-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
563+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
564564
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
565565
steps:
566566
- checkout:
@@ -578,7 +578,7 @@ jobs:
578578
test_bundling_snowpack:
579579
<<: *default-job
580580
docker:
581-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
581+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
582582
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
583583
steps:
584584
- checkout:
@@ -596,7 +596,7 @@ jobs:
596596
test_bundling_vite:
597597
<<: *default-job
598598
docker:
599-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
599+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
600600
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
601601
steps:
602602
- checkout:
@@ -614,7 +614,7 @@ jobs:
614614
test_bundling_esbuild:
615615
<<: *default-job
616616
docker:
617-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
617+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
618618
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
619619
steps:
620620
- checkout:
@@ -632,7 +632,7 @@ jobs:
632632
test_bundling_gatsby:
633633
<<: *default-job
634634
docker:
635-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
635+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
636636
environment:
637637
GATSBY_CPU_COUNT: '3'
638638
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
@@ -683,8 +683,8 @@ jobs:
683683
value: << pipeline.git.branch >>
684684
steps:
685685
- aws-cli/setup:
686-
aws_access_key_id: AWS_ACCESS_KEY_ID_ARTIFACTS
687-
aws_secret_access_key: AWS_SECRET_ACCESS_KEY_ARTIFACTS
686+
aws_access_key_id: $AWS_ACCESS_KEY_ID_ARTIFACTS
687+
aws_secret_access_key: $AWS_SECRET_ACCESS_KEY_ARTIFACTS
688688
region: ${AWS_REGION_ARTIFACTS}
689689
# Upload distributables to S3
690690
- aws-s3/copy:
@@ -712,8 +712,8 @@ jobs:
712712
value: << pipeline.git.branch >>
713713
steps:
714714
- aws-cli/setup:
715-
aws_access_key_id: AWS_ACCESS_KEY_ID_ARTIFACTS
716-
aws_secret_access_key: AWS_SECRET_ACCESS_KEY_ARTIFACTS
715+
aws_access_key_id: $AWS_ACCESS_KEY_ID_ARTIFACTS
716+
aws_secret_access_key: $AWS_SECRET_ACCESS_KEY_ARTIFACTS
717717
region: ${AWS_REGION_ARTIFACTS}
718718
# persist size snapshot on S3
719719
- aws-s3/copy:
@@ -733,7 +733,7 @@ jobs:
733733
test_benchmark:
734734
<<: *default-job
735735
docker:
736-
- image: mcr.microsoft.com/playwright:v1.48.2-focal
736+
- image: mcr.microsoft.com/playwright:v1.50.1-noble
737737
steps:
738738
- checkout
739739
- install_js:

.eslintrc.js

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ module.exports = /** @type {Config} */ ({
6464
'plugin:eslint-plugin-import/recommended',
6565
'plugin:eslint-plugin-import/typescript',
6666
'eslint-config-airbnb',
67-
'eslint-config-airbnb-typescript',
67+
'./eslint/config-airbnb-typescript.js',
6868
'eslint-config-prettier',
6969
],
7070
parser: '@typescript-eslint/parser',
@@ -74,7 +74,7 @@ module.exports = /** @type {Config} */ ({
7474
plugins: [
7575
'eslint-plugin-material-ui',
7676
'eslint-plugin-react-hooks',
77-
'@typescript-eslint/eslint-plugin',
77+
'@typescript-eslint',
7878
'eslint-plugin-filenames',
7979
...(ENABLE_REACT_COMPILER_PLUGIN ? ['eslint-plugin-react-compiler'] : []),
8080
],
@@ -92,6 +92,7 @@ module.exports = /** @type {Config} */ ({
9292
rules: {
9393
'consistent-this': ['error', 'self'],
9494
curly: ['error', 'all'],
95+
'dot-notation': 'error',
9596
// Just as bad as "max components per file"
9697
'max-classes-per-file': 'off',
9798
// Too interruptive
@@ -112,14 +113,18 @@ module.exports = /** @type {Config} */ ({
112113
],
113114
'no-continue': 'off',
114115
'no-constant-condition': 'error',
116+
'no-implied-eval': 'error',
117+
'no-throw-literal': 'error',
115118
// Use the proptype inheritance chain
116119
'no-prototype-builtins': 'off',
120+
'no-return-await': 'error',
117121
'no-underscore-dangle': 'error',
118122
'nonblock-statement-body-position': 'error',
119123
'prefer-arrow-callback': ['error', { allowNamedFunctions: true }],
120124
// Destructuring harm grep potential.
121125
'prefer-destructuring': 'off',
122126

127+
'no-use-before-define': 'off',
123128
'@typescript-eslint/no-use-before-define': [
124129
'error',
125130
{
@@ -128,24 +133,17 @@ module.exports = /** @type {Config} */ ({
128133
variables: true,
129134
},
130135
],
136+
'no-unused-vars': 'off',
131137
'@typescript-eslint/no-unused-vars': [
132138
'error',
133-
{ vars: 'all', args: 'after-used', ignoreRestSiblings: true, argsIgnorePattern: '^_' },
139+
{
140+
vars: 'all',
141+
args: 'after-used',
142+
ignoreRestSiblings: true,
143+
argsIgnorePattern: '^_',
144+
caughtErrors: 'none',
145+
},
134146
],
135-
'no-use-before-define': 'off',
136-
137-
// disabled type-aware linting due to performance considerations
138-
'@typescript-eslint/dot-notation': 'off',
139-
'dot-notation': 'error',
140-
// disabled type-aware linting due to performance considerations
141-
'@typescript-eslint/no-implied-eval': 'off',
142-
'no-implied-eval': 'error',
143-
// disabled type-aware linting due to performance considerations
144-
'@typescript-eslint/no-throw-literal': 'off',
145-
'no-throw-literal': 'error',
146-
// disabled type-aware linting due to performance considerations
147-
'@typescript-eslint/return-await': 'off',
148-
'no-return-await': 'error',
149147

150148
// Not sure why it doesn't work
151149
'import/named': 'off',

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# fetch all tags which are required for `pnpm release:changelog`
3030
fetch-depth: 0
3131
- name: Set up pnpm
32-
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
32+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
3333
- name: Use Node.js 20.x
3434
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
3535
with:
@@ -38,7 +38,7 @@ jobs:
3838
- run: pnpm install
3939
- run: pnpm build:ci
4040
env:
41-
NODE_OPTIONS: --max_old_space_size=4096
41+
NODE_OPTIONS: --max_old_space_size=6144
4242
- run: pnpm release:changelog
4343
env:
4444
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
22+
uses: github/codeql-action/init@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
2323
with:
2424
languages: typescript
2525
config-file: ./.github/codeql/codeql-config.yml
@@ -30,4 +30,4 @@ jobs:
3030
# 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
3131
# queries: security-extended,security-and-quality
3232
- name: Perform CodeQL Analysis
33-
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
33+
uses: github/codeql-action/analyze@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9

.github/workflows/publish-canaries.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
with:
1414
fetch-depth: 0
1515
- name: Set up pnpm
16-
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
16+
uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
1717
- name: Use Node.js 20.x
1818
uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
1919
with:

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343

4444
# Upload the results to GitHub's code scanning dashboard.
4545
- name: Upload to code-scanning
46-
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
46+
uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
4747
with:
4848
sarif_file: results.sarif

CHANGELOG.md

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,66 @@
11
# [Versions](https://mui.com/versions/)
22

3+
## 7.0.0-alpha.1
4+
5+
<!-- generated comparing v7.0.0-alpha.0..master -->
6+
7+
_Feb 11, 2025_
8+
9+
A big thanks to the 11 contributors who made this release possible.
10+
11+
12+
13+
- [Checkbox] Add slots and slotProps (#44974) @sai6855
14+
- [LinearProgress][CircularProgress] Add variant overrides for module augumentation (#45163) @kingflamez
15+
- [Drawer] Deprecate \*Props and complete `slots`, `slotProps` (#44960) @siriwatknp
16+
- Fix wrong `slotProps` of `DetailsHTMLAttributes` types (#45215) @siriwatknp
17+
- [MobileStepper] deprecate `LinearProgressProps` and complete `slots`, `slotProps` (#45033) @siriwatknp
18+
- [Radio] Add slots and slotProps (#44972) @sai6855
19+
- [Radio] Remove empty line (#45184) @sai6855
20+
- [Slider] Deprecate composed classes (#45201) @sai6855
21+
- [Snackbar] Fix generated proptypes (#45156) @siriwatknp
22+
- [SpeedDialAction] Add slots and slotProps (#45065) @sai6855
23+
- [SwitchBase] Fix spreading of `handlers` in getSlotProps (#45197) @sai6855
24+
- [Tabs] Deprecate \*Props and complete `slots`, `slotProps` (#45012) @siriwatknp
25+
- [TextField] Remove deprecated props from documentation (#45199) @sai6855
26+
27+
28+
29+
- Change icon source URL and add overrides (#45020) @siriwatknp
30+
31+
32+
33+
- Remove components which were moved from lab to material (#45232) @DiegoAndai
34+
35+
### Docs
36+
37+
- [Autocomplete] Improve Google Maps search example (#44708) @oliviertassinari
38+
- [Dialog] Removes deprecated PaperProps from docs (#45195) @sai6855
39+
- [Menu] Add Grouped Menu demo (#45241) @noobDev31
40+
- [material] Add disableInteractive on colorTool grid Tooltips (#37800) @Janpot
41+
- [blog] Consistent Base UI terminology (#45264) @oliviertassinari
42+
- A quick first step to update docs for Tailwind v4 (#45147) @oliviertassinari
43+
- Fix `element.ref` accessing warning on docs (#45155) @DiegoAndai
44+
- Mention Toolpad as experimental (#45273) @prakhargupta1
45+
- [joy-ui] Update "Set up providers" section of integration with Material UI (#45183) @mateuseap
46+
47+
### Core
48+
49+
- Update branch switch tags (#45198) @DiegoAndai
50+
- Fix double redirection to Base UI (#45146) @oliviertassinari
51+
- Fix corepack and pnpm installation in CircleCI (#45185) @mj12albert
52+
- Fix typo on Netlify script (#45278) @maximevtush
53+
- [code-infra] Fix testing library resolution with custom react (#44061) @Janpot
54+
- [code-infra] Update package layout for better ESM support (#43264) @Janpot
55+
- Update `@typescript-eslint/*` packages and remove deprecated `eslint-config-airbnb-typescript` package (#45245) @ZeeshanTamboli
56+
- [docs] Restore utility component docs from MUI Base to Material UI (#45213) @mapache-salvaje
57+
- [docs] Sync active sponsors (#45204) @oliviertassinari
58+
- [docs] Fix links in CONTRIBUTING.md (#45202) @bernardobelchior
59+
- [docs-infra] Point to MUI X next docs (#45207) @cherniavskii
60+
- [test] Fix React 18 tests (#45161) @DiegoAndai
61+
62+
All contributors of this release in alphabetical order: @bernardobelchior, @cherniavskii, @DiegoAndai, @Janpot, @kingflamez, @mapache-salvaje, @mateuseap, @maximevtush, @mj12albert, @noobDev31, @oliviertassinari, @prakhargupta1, @sai6855, @siriwatknp, @ZeeshanTamboli
63+
364
## 7.0.0-alpha.0
465

566
<!-- generated comparing v6.4.1..master -->

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ via [Open Collective](https://opencollective.com/mui-org) or via [Patreon](http
7373
<p>
7474
<a href="https://tidelift.com/subscription/pkg/npm-material-ui?utm_source=npm-material-ui&utm_medium=referral&utm_campaign=homepage" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://avatars.githubusercontent.com/u/30204434?s=288" alt="tidelift.com" title="Tidelift: Enterprise-ready open-source software." loading="lazy" /></a>
7575
&nbsp;
76-
<a href="https://rxdb.info/?utm_source=sponsor&utm_medium=opencollective&utm_campaign=opencollective-mui" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://rxdb.info/files/logo/logo_text.svg" alt="RxDB" title="RxDB: Local-first JavaScript database." loading="lazy" /></a>
77-
&nbsp;
7876
<a href="https://www.text-em-all.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img src="https://avatars.githubusercontent.com/u/1262264?s=288" alt="text-em-all.com" title="Text-em-all: Mass text messaging and automated calling." height="96" width="96" loading="lazy"></a>
7977
&nbsp;
8078
<a href="https://www.dialmycalls.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="96" width="96" src="https://images.opencollective.com/dialmycalls/f5ae9ab/avatar/288.png" alt="dialmycalls.com" title="DialMyCalls: Send text messages, calls, and emails." loading="lazy" /></a>
@@ -92,8 +90,6 @@ via [Open Collective](https://opencollective.com/mui-org) or via [Patreon](http
9290
&nbsp;
9391
<a href="https://views4you.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="26" width="26" src="https://images.opencollective.com/buy-instagram-followers-v4y/6364714/logo/78.png" alt="views4you.com" title="Views4you: Social media growth services." loading="lazy" />Views4You</a>
9492
&nbsp;
95-
<a href="https://poprey.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="26" width="26" src="https://images.opencollective.com/instagram-likes/2a72a03/logo/78.png" alt="poprey.com" title="Poprey: Buy Instagram likes with crypto." loading="lazy" />Poprey</a>
96-
&nbsp;
9793
</p>
9894

9995
Gold sponsors are those who have pledged \$500/month or more to MUI.

apps/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
To test Pigment CSS demo apps, you can directly run -
44

5-
`pnpm nx run @app/vite-app:preview` to start vite demo or `pnpm nx run @app/next-app:preview` to start nextjs demo after building automatically.
5+
`pnpm nx run @app/pigment-css-vite-app:preview` to start vite demo or `pnpm nx run @app/pigment-css-next-app:preview` to start nextjs demo after building automatically.
66

77
To start either of the apps in dev mode, just run -
88

9-
`pnpm nx run @app/vite-app:dev` or `pnpm nx run @app/next-app:dev`
9+
`pnpm nx run @app/pigment-css-vite-app:dev` or `pnpm nx run @app/pigment-css-next-app:dev`

apps/bare-next-app/.eslintrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"extends": ["plugin:react/jsx-runtime"],
3+
"rules": {
4+
"import/prefer-default-export": "off",
5+
"import/extensions": "off",
6+
"import/no-unresolved": "off",
7+
"react/no-unknown-property": ["error", { "ignore": ["sx"] }],
8+
},
9+
}

0 commit comments

Comments
 (0)