Skip to content

Commit ae44394

Browse files
authored
Merge pull request #327 from sah/mui-v5
Support MUI v5 (and upgrade to React v17).
2 parents 92701c5 + af3f6c3 commit ae44394

20 files changed

+1580
-1886
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ If applicable, add screenshots to help explain your problem.
4242

4343
- OS: [e.g. iOS]
4444
- Browser: [e.g. chrome, safari]
45-
- `@material-ui/core` version: [e.g. 4.9.2]
45+
- `@mui/material` version: [e.g. 5.0.2]
4646
- `material-ui-dropzone` version: [e.g. 3.0.1]
4747

4848
### Additional context

.size-snapshot.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
{
22
"dist/index.js": {
3-
"bundled": 57189,
4-
"minified": 25753,
5-
"gzipped": 5983
3+
"bundled": 57136,
4+
"minified": 25700,
5+
"gzipped": 5981
66
},
77
"dist/index.es.js": {
8-
"bundled": 56007,
9-
"minified": 24741,
10-
"gzipped": 5861,
8+
"bundled": 55954,
9+
"minified": 24688,
10+
"gzipped": 5858,
1111
"treeshaked": {
1212
"rollup": {
13-
"code": 10815,
14-
"import_statements": 1533
13+
"code": 10762,
14+
"import_statements": 1480
1515
},
1616
"webpack": {
17-
"code": 21871
17+
"code": 21818
1818
}
1919
}
2020
}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ This component provides the DropzoneArea inside of a MaterialUI Dialog.
9696
```jsx static
9797
import React, { Component } from 'react'
9898
import {DropzoneDialog} from 'material-ui-dropzone'
99-
import Button from '@material-ui/core/Button';
99+
import Button from '@mui/material/Button';
100100

101101
export default class DropzoneDialogExample extends Component {
102102
constructor(props) {

dist/index.d.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { ChipProps } from '@material-ui/core/Chip';
2-
import { DialogProps } from '@material-ui/core/Dialog';
3-
import { GridProps } from '@material-ui/core/Grid';
4-
import { SnackbarProps } from '@material-ui/core/Snackbar';
1+
import { ChipProps } from '@mui/material/Chip';
2+
import { DialogProps } from '@mui/material/Dialog';
3+
import { GridProps } from '@mui/material/Grid';
4+
import { SnackbarProps } from '@mui/material/Snackbar';
55
import * as React from 'react';
66
import { DropEvent, DropzoneProps } from 'react-dropzone';
77

dist/index.es.js

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.es.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/theming.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
### Sample theme override
4242

4343
```jsx
44-
import { MuiThemeProvider, createMuiTheme } from "@material-ui/core/styles";
44+
import { MuiThemeProvider, createMuiTheme } from "@mui/styles";
4545

4646
import DropzoneArea from '../src/components/DropzoneArea';
4747

package.json

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,12 @@
4545
"react-dropzone": "^10.2.1"
4646
},
4747
"peerDependencies": {
48-
"@material-ui/core": "^4.0.0",
49-
"@material-ui/icons": "^4.0.0",
48+
"@mui/icons-material": "^5.0.0",
49+
"@mui/material": "^5.0.0",
50+
"@mui/styles": "^5.0.1",
5051
"prop-types": "^15.7.2",
51-
"react": ">= 16.8",
52-
"react-dom": ">= 16.8"
52+
"react": ">= 17.0",
53+
"react-dom": ">= 17.0"
5354
},
5455
"devDependencies": {
5556
"@babel/core": "^7.10.2",
@@ -60,8 +61,8 @@
6061
"@babel/plugin-transform-runtime": "^7.10.1",
6162
"@babel/preset-env": "^7.10.2",
6263
"@babel/preset-react": "^7.10.1",
63-
"@material-ui/core": "^4.9.7",
64-
"@material-ui/icons": "^4.9.1",
64+
"@mui/icons-material": "^5.0.1",
65+
"@mui/material": "^5.0.2",
6566
"@rollup/plugin-commonjs": "^11.0.2",
6667
"@rollup/plugin-node-resolve": "^7.1.1",
6768
"babel-eslint": "^10.1.0",
@@ -73,8 +74,8 @@
7374
"eslint-plugin-babel": "^5.3.0",
7475
"eslint-plugin-react": "^7.19.0",
7576
"gh-pages": "^1.2.0",
76-
"react": "^16.13.1",
77-
"react-dom": "^16.13.1",
77+
"react": "^17.0.2",
78+
"react-dom": "^17.0.2",
7879
"react-styleguidist": "^11.0.4",
7980
"rollup": "^1.32.0",
8081
"rollup-plugin-babel": "^4.4.0",

0 commit comments

Comments
 (0)