Skip to content

Commit 1c6de69

Browse files
authored
Merge branch 'master' into badge-slots
2 parents 08a62b8 + 5aa1231 commit 1c6de69

File tree

198 files changed

+3558
-2151
lines changed

Some content is hidden

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

198 files changed

+3558
-2151
lines changed

.browserslistrc

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
[modern]
2-
last 1 chrome version
3-
last 1 edge version
4-
last 1 firefox version
5-
last 1 safari version
6-
node 14
7-
81
# Default/Fallback
92
# `npx browserslist --mobile-to-desktop "> 0.5%, last 2 versions, Firefox ESR, not dead, safari >= 15.4, iOS >= 15.4"` when the last major is released.
103
# Explicit safari versions are here based on the agreed terms in: https://github.com/mui/material-ui/issues/40958#issuecomment-1953215043

.eslintrc.js

Lines changed: 2 additions & 2 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.js',
67+
require.resolve('./eslint/config-airbnb-typescript.js'),
6868
'eslint-config-prettier',
6969
],
7070
parser: '@typescript-eslint/parser',
@@ -555,7 +555,7 @@ module.exports = /** @type {Config} */ ({
555555
},
556556
{
557557
// TODO, move rule to be global, propagate: https://github.com/mui/material-ui/issues/42169
558-
files: ['examples/pigment-css-remix-ts/**/*'],
558+
files: ['examples/material-ui-pigment-css-vite-ts/**/*'],
559559
rules: {
560560
'react/react-in-jsx-scope': 'off',
561561
},

.mocharc.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,7 @@ module.exports = {
2020
'**/build/**',
2121
'docs/.next/**',
2222
],
23+
// detect-modules doesn't work with @babel/register
24+
// https://github.com/babel/babel/issues/6737
25+
'node-option': ['no-experimental-detect-module'],
2326
};

CHANGELOG.md

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

3+
## 7.0.2
4+
5+
_Apr 9, 2025_
6+
7+
A big thanks to the 12 contributors who made this release possible.
8+
9+
10+
11+
- [Autocomplete] Add ability to render custom single value (#45387) @ZeeshanTamboli
12+
- [Autocomplete] Prevent shrink animation in controlled Autocomplete when initial `value` is provided (#45734) @imadx
13+
- [AvatarGroup] Fix `spacing` prop ignoring value `0` (#45799) @Kartik-Murthy
14+
- [Dialog] Deprecate composed classes (#45418) @sai6855
15+
16+
17+
18+
- Fix nonce issues (#45794) @Janpot
19+
- Add warnings to nextjs router integration (#45778) @Janpot
20+
21+
22+
23+
- Added caching to `StyledEngineProvider` to improve performance for running tests with Jest (#45846) @siriwatknp
24+
25+
### Core
26+
27+
- [blog] Improve upvote video (0646444) @oliviertassinari
28+
- [code-infra] Remove webpack aliases (#45841) @Janpot
29+
- [code-infra] Remove .tsbuildinfo from build folder (#45727) @Janpot
30+
- [code-infra] Stabilize theme viewer screenshot tests (#45768) @Janpot
31+
- [code-infra] Remove modern bundles (#45808) @Janpot
32+
- Update buildTypes script to optionally remove css imports (#45835) @brijeshb42
33+
- Allow repo to be accepted as an argument for releaseTag (#45801) @brijeshb42
34+
- Update scripts to support base-ui (#45784) @brijeshb42
35+
- Sync scorecards.yml across codebase (4de5076) @oliviertassinari
36+
- Remove baseUrl and skipLibCheck (#45806) @Janpot
37+
- [docs-infra] Fix redirect styles pages (#45848) @siriwatknp
38+
- [docs-infra] Remove false-positive Vale rules (#45843) @oliviertassinari
39+
- [docs-infra] Make sure Next.js can find package.json through its aliases (#45840) @Janpot
40+
- [docs-infra] Fix Next.js brand name coverage (6915f8d) @oliviertassinari
41+
- [docs-infra] Fix layout shift between MIT and commercial pages (#45760) @oliviertassinari
42+
- [docs-infra] Non breaking space for ESM (#45758) @oliviertassinari
43+
- [support-infra] Remove dead 'workflow_call:' (#45736) @oliviertassinari
44+
- [utils] Support cleanup callbacks in useForkRef (#45621) @DiegoAndai
45+
46+
### Docs
47+
48+
- Fix pigment vite integration example (#44746) @brijeshb42
49+
- Update migration instructions and codemod references for deprecated APIs (#45793) @sai6855
50+
- Add TanStack Router routing example (#44930) @vetledv
51+
- Fix layout shifting in icons page (#45779) @sai6855
52+
- Fix migration instructions (#45762) @oliviertassinari
53+
- Fix wrong TypeScript support version (#45761) @oliviertassinari
54+
- Fix link to mui-joy/src/styles/components.d.ts (#45763) @oliviertassinari
55+
- Fix 301 link (ae94c40) @oliviertassinari
56+
- Fix 301 links (abd8f63) @oliviertassinari
57+
- Fix 301 redirection (c7658de) @oliviertassinari
58+
- [nextjs] Migrate from deprecated "legacyBehavior" prop (#44871) @oliviertassinari
59+
- [nextjs] Document CSP for Next.js Pages Router (#45798) @Grohden
60+
61+
All contributors of this release in alphabetical order: @brijeshb42, @DiegoAndai, @Grohden, @imadx, @Janpot, @Kartik-Murthy, @oliviertassinari, @renovate[bot], @sai6855, @siriwatknp, @vetledv, @ZeeshanTamboli
62+
363
## 7.0.1
464

565
<!-- generated comparing v7.0.0..master -->

CHANGELOG.old.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ A big thanks to the 8 contributors who made this release possible.
144144

145145
- [examples] Update Next.js examples Next.js and React versions (#44852) @DiegoAndai
146146
- [code-infra] Prevent wrong nested imports in Base UI (#44426) @oliviertassinari
147-
- [docs-infra] Add vale coverage for App Router and Page Router (060c55c) @oliviertassinari
147+
- [docs-infra] Add vale coverage for App Router and Pages Router (060c55c) @oliviertassinari
148148
- Sync with other repos (1b9300f) @oliviertassinari
149149
- Fix docs:build to work in docs folder too (6b923a4) @oliviertassinari
150150
- Setup React 18 CI tests (#44868) @DiegoAndai

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ View the [Joy UI documentation](https://mui.com/joy-ui/getting-started/).
6060
### Diamond 💎
6161

6262
<p>
63-
<a href="https://octopus.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="128" width="128" src="https://mui.com/static/sponsors/octopus-square.svg" alt="octopus" title="Repeatable, reliable deployments" loading="lazy" /></a>
6463
<a href="https://www.doit.com/?utm_source=mui.com&utm_medium=referral&utm_content=readme" rel="noopener sponsored" target="_blank"><img height="128" width="128" src="https://mui.com/static/sponsors/doit-square.svg" alt="doit" title="Management Platform for Google Cloud and AWS" loading="lazy" /></a>
6564
</p>
6665

@@ -77,8 +76,6 @@ via [Open Collective](https://opencollective.com/mui-org) or via [Patreon](http
7776
&nbsp;
7877
<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>
7978
&nbsp;
80-
<a href="https://route4me.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/route4me/71fb6fa/avatar/288.png" alt="Route4Me" title="Route4Me: Trusted last mile route planning and route optimization." loading="lazy" /></a>
81-
&nbsp;
8279
</p>
8380

8481
<p>

apps/bare-next-app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
},
2525
"devDependencies": {
2626
"@pigment-css/nextjs-plugin": "0.0.30",
27-
"@types/node": "^20.17.28",
28-
"@types/react": "^19.0.12",
29-
"@types/react-dom": "^19.0.4",
27+
"@types/node": "^20.17.30",
28+
"@types/react": "^19.1.0",
29+
"@types/react-dom": "^19.1.1",
3030
"eslint": "^8.57.1",
31-
"typescript": "^5.8.2"
31+
"typescript": "^5.8.3"
3232
},
3333
"nx": {
3434
"targets": {

apps/pigment-css-next-app/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
},
2525
"devDependencies": {
2626
"@pigment-css/nextjs-plugin": "0.0.30",
27-
"@types/node": "^20.17.28",
28-
"@types/react": "^19.0.12",
29-
"@types/react-dom": "^19.0.4",
27+
"@types/node": "^20.17.30",
28+
"@types/react": "^19.1.0",
29+
"@types/react-dom": "^19.1.1",
3030
"eslint": "^8.57.1",
31-
"typescript": "^5.8.2"
31+
"typescript": "^5.8.3"
3232
},
3333
"nx": {
3434
"targets": {

apps/pigment-css-vite-app/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
"@babel/preset-react": "^7.26.3",
2929
"@babel/preset-typescript": "^7.27.0",
3030
"@pigment-css/vite-plugin": "0.0.30",
31-
"@types/react": "^19.0.12",
32-
"@types/react-dom": "^19.0.4",
31+
"@types/react": "^19.1.0",
32+
"@types/react-dom": "^19.1.1",
3333
"@types/webfontloader": "^1.6.38",
3434
"@vitejs/plugin-react": "^4.3.4",
3535
"postcss": "^8.5.3",
3636
"postcss-combine-media-query": "^1.0.1",
37-
"vite": "5.4.15",
37+
"vite": "5.4.16",
3838
"vite-plugin-node-polyfills": "0.23.0",
3939
"vite-plugin-pages": "^0.32.5"
4040
},

babel.config.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function resolveAliasPath(relativeToBabelConf) {
1919

2020
/** @type {babel.ConfigFunction} */
2121
module.exports = function getBabelConfig(api) {
22-
const useESModules = api.env(['regressions', 'modern', 'stable']);
22+
const useESModules = api.env(['regressions', 'stable']);
2323

2424
const defaultAlias = {
2525
'@mui/material': resolveAliasPath('./packages/mui-material/src'),
@@ -50,7 +50,6 @@ module.exports = function getBabelConfig(api) {
5050
browserslistEnv: api.env() || process.env.NODE_ENV,
5151
debug: process.env.MUI_BUILD_VERBOSE === 'true',
5252
modules: useESModules ? false : 'commonjs',
53-
shippedProposals: api.env('modern'),
5453
},
5554
],
5655
[

0 commit comments

Comments
 (0)