Skip to content

Commit 4a31246

Browse files
authored
Merge branch 'master' into updare-textfield-doc
2 parents a1ee510 + 11cf1ba commit 4a31246

File tree

110 files changed

+1309
-810
lines changed

Some content is hidden

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

110 files changed

+1309
-810
lines changed

.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ module.exports = /** @type {Config} */ ({
120120
variables: true,
121121
},
122122
],
123+
'@typescript-eslint/no-unused-vars': [
124+
'error',
125+
{ vars: 'all', args: 'after-used', ignoreRestSiblings: true, argsIgnorePattern: '^_' },
126+
],
123127
'no-use-before-define': 'off',
124128

125129
// disabled type-aware linting due to performance considerations

CHANGELOG.md

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

3+
## 6.1.9
4+
5+
<!-- generated comparing v6.1.8..master -->
6+
7+
_Nov 27, 2024_
8+
9+
A big thanks to the 8 contributors who made this release possible.
10+
11+
12+
13+
- [Select] Omit `placeholder` from props (#44502) @Juneezee
14+
- [Grid2] Add container class to `Grid2Classes` (#44562) @sai6855
15+
16+
17+
18+
- Add ThemeProvider `noSsr` to prevent double rendering (#44451) @siriwatknp
19+
20+
21+
22+
- [codemod] Fix handling of computed `paragraph` props (#44195) @joshkel
23+
24+
25+
26+
- Make @pigment-css/react as peer dependency (#44498) @brijeshb42
27+
28+
### Docs
29+
30+
- [material-ui] Add missing required dependencies in dashboard template README (#44476) @mesqueeb
31+
- [material-ui] Add missing Roboto import to Next.js integration docs (#44462) @StaceyD22
32+
- [material-ui][Dialog] Fix padding in SimpleDialog demo (#44467) @oliviertassinari
33+
- Fix template page issues (#44466) @oliviertassinari
34+
- [examples] Add dark mode example for Material UI + Pigment CSS (#44480) @mnajdova
35+
36+
### Core
37+
38+
- Remove TODO line in the changelog (#44484) @mnajdova
39+
- Polish image display (418e888) @oliviertassinari
40+
- [core-infra] Add no-relative-packages (#44489) @oliviertassinari
41+
- [docs-infra] Support CSS variables API info (#44559) @mnajdova
42+
- [docs-infra] Fix display when ad-block triggers (#44567) @oliviertassinari
43+
- [docs-infra] Improve locator finding using visible option (#44541) @siriwatknp
44+
- [docs-infra] Correctly flatten the pages tree (#44514) @oliviertassinari
45+
- [docs-infra] Fix Sponsor design regression (#44515) @oliviertassinari
46+
- [test] Remove React.ReactElement<any> from describeConformance.tsx (#44318) @sai6855
47+
- [test] Do not enforce the presence of `ownerState.className` in `describeConformance` (#44479) @flaviendelangle
48+
49+
All contributors of this release in alphabetical order: @brijeshb42, @flaviendelangle, @joshkel, @Juneezee, @mesqueeb, @mnajdova, @oliviertassinari, @sai6855, @siriwatknp, @StaceyD22
50+
351
## v6.1.8
452

553
<!-- generated comparing v6.1.7..master -->

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
"react-dom": "^18.3.1"
2424
},
2525
"devDependencies": {
26-
"@pigment-css/nextjs-plugin": "0.0.27",
27-
"@types/node": "^20.17.7",
26+
"@pigment-css/nextjs-plugin": "0.0.28",
27+
"@types/node": "^20.17.9",
2828
"@types/react": "^18.3.12",
2929
"@types/react-dom": "^18.3.1",
3030
"eslint": "^8.57.1",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"devDependencies": {
2828
"@babel/preset-react": "^7.25.9",
2929
"@babel/preset-typescript": "^7.26.0",
30-
"@pigment-css/vite-plugin": "0.0.27",
30+
"@pigment-css/vite-plugin": "0.0.28",
3131
"@types/react": "^18.3.12",
3232
"@types/react-dom": "^18.3.1",
3333
"@types/webfontloader": "^1.6.38",
34-
"@vitejs/plugin-react": "^4.3.3",
34+
"@vitejs/plugin-react": "^4.3.4",
3535
"postcss": "^8.4.49",
3636
"postcss-combine-media-query": "^1.0.1",
3737
"vite": "5.4.11",
3838
"vite-plugin-node-polyfills": "0.22.0",
39-
"vite-plugin-pages": "^0.32.3"
39+
"vite-plugin-pages": "^0.32.4"
4040
},
4141
"nx": {
4242
"targets": {

docs/data/base/components/tabs/UnstyledTabsRouting.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import { Tab as BaseTab, tabClasses } from '@mui/base/Tab';
55
import { TabsList as BaseTabsList } from '@mui/base/TabsList';
66
import {
77
MemoryRouter,
8+
StaticRouter,
89
Route,
910
Routes,
1011
Link,
1112
matchPath,
1213
useLocation,
13-
} from 'react-router-dom';
14-
import { StaticRouter } from 'react-router-dom/server';
14+
} from 'react-router';
1515
import { styled } from '@mui/system';
1616

1717
function Router(props) {

docs/data/base/components/tabs/UnstyledTabsRouting.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import { Tab as BaseTab, TabRootSlotProps, tabClasses } from '@mui/base/Tab';
44
import { TabsList as BaseTabsList } from '@mui/base/TabsList';
55
import {
66
MemoryRouter,
7+
StaticRouter,
78
Route,
89
Routes,
910
Link,
1011
matchPath,
1112
useLocation,
12-
} from 'react-router-dom';
13-
import { StaticRouter } from 'react-router-dom/server';
13+
} from 'react-router';
1414
import { styled } from '@mui/system';
1515

1616
function Router(props: { children?: React.ReactNode }) {

docs/data/joy/components/link/link.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ import Link from '@mui/joy/Link';
125125
</NextLink>;
126126
```
127127

128-
### React Router
128+
### React Router
129129

130-
Here is an example with the [Link component](https://reactrouter.com/en/main/components/link) of React Router:
130+
Here is a demo with the [Link component](https://reactrouter.com/start/library/navigating#link) of [React Router](https://github.com/remix-run/react-router).
131131

132132
```js
133-
import { Link as RouterLink } from 'react-router-dom';
133+
import { Link as RouterLink } from 'react-router';
134134
import Link from '@mui/joy/Link';
135135

136136
<Link component={RouterLink} to="/docs">

docs/data/material/components/breadcrumbs/RouterBreadcrumbs.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {
1717
Routes,
1818
MemoryRouter,
1919
useLocation,
20-
} from 'react-router-dom';
20+
} from 'react-router';
2121

2222
const breadcrumbNameMap = {
2323
'/inbox': 'Inbox',

docs/data/material/components/breadcrumbs/RouterBreadcrumbs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import {
1616
Routes,
1717
MemoryRouter,
1818
useLocation,
19-
} from 'react-router-dom';
19+
} from 'react-router';
2020

2121
interface ListItemLinkProps extends ListItemProps {
2222
to: string;

docs/data/material/components/pagination/PaginationLink.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { Link, MemoryRouter, Route, Routes, useLocation } from 'react-router-dom';
2+
import { Link, MemoryRouter, Route, Routes, useLocation } from 'react-router';
33
import Pagination from '@mui/material/Pagination';
44
import PaginationItem from '@mui/material/PaginationItem';
55

0 commit comments

Comments
 (0)