Skip to content

Commit 670eb95

Browse files
Merge branch 'next' into eslint-config
2 parents 1a0bb04 + 3fb43fd commit 670eb95

File tree

666 files changed

+18368
-7781
lines changed

Some content is hidden

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

666 files changed

+18368
-7781
lines changed

.circleci/config.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ jobs:
138138
name: Should not have any git not staged
139139
command: git add -A && git diff --exit-code --staged
140140
- run:
141-
name: Check for duplicated packages
141+
name: '`pnpm dedupe` was run?'
142142
command: |
143143
# #default-branch-switch
144144
if [[ $(git diff --name-status next | grep -E 'pnpm-workspace\.yaml|pnpm-lock.yaml|package\.json') == "" ]];
@@ -391,7 +391,7 @@ jobs:
391391
<<: *default-job
392392
resource_class: 'medium+'
393393
docker:
394-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
394+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
395395
environment:
396396
NODE_ENV: development # Needed if playwright is in `devDependencies`
397397
steps:
@@ -421,7 +421,7 @@ jobs:
421421
test_e2e:
422422
<<: *default-job
423423
docker:
424-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
424+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
425425
environment:
426426
NODE_ENV: development # Needed if playwright is in `devDependencies`
427427
steps:
@@ -435,7 +435,7 @@ jobs:
435435
# NOTE: This workflow runs after successful docs deploy. See /test/e2e-website/README.md#ci
436436
<<: *default-job
437437
docker:
438-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
438+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
439439
environment:
440440
NODE_ENV: development # Needed if playwright is in `devDependencies`
441441
steps:
@@ -450,7 +450,7 @@ jobs:
450450
test_profile:
451451
<<: *default-job
452452
docker:
453-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
453+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
454454
environment:
455455
NODE_ENV: development # Needed if playwright is in `devDependencies`
456456
steps:
@@ -477,7 +477,7 @@ jobs:
477477
test_regressions:
478478
<<: *default-job
479479
docker:
480-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
480+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
481481
environment:
482482
NODE_ENV: development # Needed if playwright is in `devDependencies`
483483
steps:
@@ -531,7 +531,7 @@ jobs:
531531
<<: *default-job
532532
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack4/
533533
docker:
534-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
534+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
535535
environment:
536536
NODE_ENV: development # Needed if playwright is in `devDependencies`
537537
steps:
@@ -555,7 +555,7 @@ jobs:
555555
<<: *default-job
556556
working_directory: /tmp/material-ui/test/bundling/fixtures/next-webpack5/
557557
docker:
558-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
558+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
559559
environment:
560560
NODE_ENV: development # Needed if playwright is in `devDependencies`
561561
steps:
@@ -579,7 +579,7 @@ jobs:
579579
<<: *default-job
580580
working_directory: /tmp/material-ui/test/bundling/fixtures/create-react-app/
581581
docker:
582-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
582+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
583583
environment:
584584
NODE_ENV: development # Needed if playwright is in `devDependencies`
585585
steps:
@@ -603,7 +603,7 @@ jobs:
603603
<<: *default-job
604604
working_directory: /tmp/material-ui/test/bundling/fixtures/snowpack/
605605
docker:
606-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
606+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
607607
environment:
608608
NODE_ENV: development # Needed if playwright is in `devDependencies`
609609
steps:
@@ -627,7 +627,7 @@ jobs:
627627
<<: *default-job
628628
working_directory: /tmp/material-ui/test/bundling/fixtures/vite/
629629
docker:
630-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
630+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
631631
environment:
632632
NODE_ENV: development # Needed if playwright is in `devDependencies`
633633
steps:
@@ -651,7 +651,7 @@ jobs:
651651
<<: *default-job
652652
working_directory: /tmp/material-ui/test/bundling/fixtures/esbuild/
653653
docker:
654-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
654+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
655655
environment:
656656
NODE_ENV: development # Needed if playwright is in `devDependencies`
657657
steps:
@@ -679,7 +679,7 @@ jobs:
679679
<<: *default-job
680680
working_directory: /tmp/material-ui/test/bundling/fixtures/gatsby/
681681
docker:
682-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
682+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
683683
environment:
684684
NODE_ENV: development # Needed if playwright is in `devDependencies`
685685
steps:
@@ -780,7 +780,7 @@ jobs:
780780
test_benchmark:
781781
<<: *default-job
782782
docker:
783-
- image: mcr.microsoft.com/playwright:v1.44.1-focal
783+
- image: mcr.microsoft.com/playwright:v1.45.1-focal
784784
environment:
785785
NODE_ENV: development # Needed if playwright is in `devDependencies`
786786
steps:

.codesandbox/ci.json

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"packages/mui-core-downloads-tracker",
1111
"packages/mui-docs",
1212
"packages/mui-icons-material",
13-
"packages/mui-joy",
1413
"packages/mui-lab",
1514
"packages/mui-material-nextjs",
1615
"packages/mui-material",
@@ -36,7 +35,6 @@
3635
"@mui/internal-docs-utils": "packages-internal/docs-utils",
3736
"@mui/internal-markdown": "packages/markdown",
3837
"@mui/internal-scripts": "packages-internal/scripts",
39-
"@mui/joy": "packages/mui-joy/build",
4038
"@mui/lab": "packages/mui-lab/build",
4139
"@mui/material-nextjs": "packages/mui-material-nextjs/build",
4240
"@mui/material": "packages/mui-material/build",
@@ -48,10 +46,6 @@
4846
"@mui/types": "packages/mui-types/build",
4947
"@mui/utils": "packages/mui-utils/build"
5048
},
51-
"sandboxes": [
52-
"/examples/material-ui-cra-ts",
53-
"/examples/joy-ui-cra-ts",
54-
"/examples/base-ui-cra-ts"
55-
],
49+
"sandboxes": ["/examples/material-ui-cra-ts", "/examples/base-ui-cra-ts"],
5650
"silent": true
5751
}

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ module.exports = {
467467
rules: {
468468
'import/no-default-export': 'error',
469469
'import/prefer-default-export': 'off',
470-
...(ENABLE_REACT_COMPILER_PLUGIN ? { 'react-compiler/react-compiler': 'off' } : {}),
470+
'react-compiler/react-compiler': 'off',
471471
},
472472
},
473473
{

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Set up pnpm
3333
uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # v4.0.0
3434
- name: Use Node.js 18.x
35-
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
35+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
3636
with:
3737
node-version: 18
3838
cache: 'pnpm' # https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#caching-packages-dependencies

.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@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
2020
# Initializes the CodeQL tools for scanning.
2121
- name: Initialize CodeQL
22-
uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
22+
uses: github/codeql-action/init@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
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@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
33+
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12

.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@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
46+
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
4747
with:
4848
sarif_file: results.sarif

CHANGELOG.md

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

3+
## v6.0.0-beta.0
4+
5+
<!-- generated comparing v6.0.0-alpha.14..next -->
6+
7+
_Jul 11, 2024_
8+
9+
A big thanks to the 12 contributors who made this release possible. Here are some highlights ✨:
10+
11+
- 🎉 This is the first v6 beta release! A huge thanks to everyone who helped to make this happen! The target date for a stable release is the 28th of July. The next month will be used to polish v6, and ease the migration from v5. You can follow the [v6 stable milestone](https://github.com/mui/material-ui/milestone/42) for more details.
12+
- 🚀 All planned breaking changes are completed.
13+
14+
15+
16+
- Revert deprecation warnings for `*Components` and `*Props` for v6 (#42466) @lhilgert9
17+
- Performance: lazy Ripple (#41061) @romgrk
18+
- [AppBar] Fix inherit color is inconsistent between ThemeProvider and CssVarsProvider (#42714) @ZeeshanTamboli
19+
- [Autocomplete] Add new AutocompleteInputChangeReason (#37301) @binh1298
20+
21+
22+
23+
- Create a wrapper package over Pigment CSS (#42819) @brijeshb42
24+
25+
26+
27+
- [Autocomplete] Add new AutocompleteInputChangeReason (#37301) @binh1298
28+
29+
### Docs
30+
31+
- Replace v6 "alpha" mentions with "beta" (#42895) @DiegoAndai
32+
- Fix typos (#42862) @omahs
33+
- Fix issues reported by react compiler in docs folder (#42881) @sai6855
34+
- Fix 301 @oliviertassinari
35+
- [LinearProgress] Fix buffer demo (#42858) @mbrookes
36+
- Adjust site to add Toolpad on the homepage (#38604) @bharatkashyap
37+
38+
### Core
39+
40+
- Fix imports in `Demo` component (#42857) @LukasTy
41+
- Use @mui/docs/HighlightedCodeWithTabs in markdown (#42841) @Janpot
42+
- Simpler pnpm dedupe error message to act on @oliviertassinari
43+
- Fix split infinitive use in tests @oliviertassinari
44+
- [lab] Fix issues reported by react-compiler in mui-lab (#42880) @sai6855
45+
46+
All contributors of this release in alphabetical order: @bharatkashyap, @brijeshb42, @DiegoAndai, @Janpot, @lhilgert9, @LukasTy, @mbrookes, @oliviertassinari, @omahs, @romgrk, @sai6855, @ZeeshanTamboli
47+
48+
## v6.0.0-alpha.14
49+
50+
<!-- generated comparing v6.0.0-alpha.13..next -->
51+
52+
_Jul 3, 2024_
53+
54+
A big thanks to the 12 contributors who made this release possible. Here are some highlights ✨:
55+
56+
- ✨ Updated Grid v2 to match PigmentGrid (#42742) @DiegoAndai
57+
58+
59+
60+
#### BREAKING CHANGES
61+
62+
- [Grid] Update Grid props to match PigmentGrid (#42742) @DiegoAndai
63+
64+
Use the codemod below to migrate the props:
65+
66+
```bash
67+
npx @mui/codemod@next v6.0.0/grid-v2-props /path/to/folder
68+
```
69+
70+
#### Changes
71+
72+
- [Alert] Add ability to override slot props (#42787) @alexey-kozlenkov
73+
- [Dialog] Revert incorrect textAlign style removal (#42778) @DiegoAndai
74+
- [theme] Support `CssVarsTheme` in `responsiveFontSizes` return type (#42786) @jxdp
75+
76+
### Docs
77+
78+
- [material-ui] Add some writing tweaks to v6 migration page (#42623) @danilo-leal
79+
- [material-ui] Fix issues reported by react-compiler in docs folder (#42830) @sai6855
80+
- [material-ui] Add some writing tweaks to v6 migration page (#42623) @danilo-leal
81+
- [base-ui] Fix wrong description for `UseTabParameters.onChange` (#42749) @ohgree
82+
- Fix 301 MDN redirections @oliviertassinari
83+
84+
### Core
85+
86+
- [core] Bump React to 18.3.1 (#42047) @renovate[bot]
87+
- [core] Revert lint for `useThemeProps` (#42817) @siriwatknp
88+
- [core] Remove useIsFocusVisible util (#42467) @DiegoAndai
89+
- [core] Remove react-test-renderer (#42784) @aarongarciah
90+
- [core][mui-utils] Remove remaining IE11 references (#42777) @DiegoAndai
91+
- [code-infra] Move `HighlightedCode` test into `@mui/docs` package (#42835) @LukasTy
92+
- [code-infra] Cleanup `@mui/docs` usage and legacy re-exports (#42833) @LukasTy
93+
- [docs-infra] Fix React Compiler ESLint issues in website components (#42566) @aarongarciah
94+
- [docs-infra] Add batch of design polish (#42823) @danilo-leal
95+
- [test][mui-utils] Remove usages of deprecated react-dom APIs (#42780) @aarongarciah
96+
- [test][joy-ui][Autocomplete] Fix spread key error in test (#42775) @aarongarciah
97+
98+
All contributors of this release in alphabetical order: @aarongarciah, @alexey-kozlenkov, @danilo-leal, @DiegoAndai, @Janpot, @jxdp, @LukasTy, @ohgree, @oliviertassinari, @renovate[bot], @sai6855, @siriwatknp
99+
3100
## v6.0.0-alpha.13
4101

5102
<!-- generated comparing v6.0.0-alpha.12..next -->

apps/local-ui-lib/.eslintrc

Lines changed: 0 additions & 6 deletions
This file was deleted.

apps/local-ui-lib/index.d.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.

apps/local-ui-lib/index.js

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)