Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core] Upgrade the dependencies #12409

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .size-limit.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ module.exports = [
name: 'The initial cost people pay for using one component',
webpack: true,
path: 'packages/material-ui/build/Paper/index.js',
limit: '17.7 KB',
limit: '17.6 KB',
},
{
name: 'The size of all the modules of material-ui.',
webpack: true,
path: 'packages/material-ui/build/index.js',
limit: '95.8 KB',
limit: '95.6 KB',
},
{
name: 'The main bundle of the docs',
webpack: false,
path: getMainFile().path,
limit: '179 KB',
limit: '180 KB',
},
{
name: 'The home page of the docs',
Expand Down
9 changes: 7 additions & 2 deletions docs/src/pages/demos/cards/SimpleCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,18 @@ function SimpleCard(props) {
Word of the Day
</Typography>
<Typography variant="headline" component="h2">
be{bull}nev{bull}o{bull}lent
be
{bull}
nev
{bull}o{bull}
lent
</Typography>
<Typography className={classes.pos} color="textSecondary">
adjective
</Typography>
<Typography component="p">
well meaning and kindly.<br />
well meaning and kindly.
<br />
{'"a benevolent smile"'}
</Typography>
</CardContent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ function DetailedExpansionPanel(props) {
</div>
<div className={classNames(classes.column, classes.helper)}>
<Typography variant="caption">
Select your destination of choice<br />
Select your destination of choice
<br />
<a href="#sub-labels-and-columns" className={classes.link}>
Learn more
</a>
Expand Down
4 changes: 3 additions & 1 deletion docs/src/pages/demos/selects/MultipleSelect.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ class MultipleSelect extends React.Component {
input={<Input id="select-multiple-chip" />}
renderValue={selected => (
<div className={classes.chips}>
{selected.map(value => <Chip key={value} label={value} className={classes.chip} />)}
{selected.map(value => (
<Chip key={value} label={value} className={classes.chip} />
))}
</div>
)}
MenuProps={MenuProps}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"rollup-plugin-uglify": "^4.0.0",
"sinon": "^6.0.0",
"size-limit": "^0.19.0",
"typescript": "^2.8.0",
"typescript": "^3.0.0",
"url-loader": "^1.0.1",
"vrtest": "^0.2.0",
"webfontloader": "^1.6.28",
Expand Down
4 changes: 2 additions & 2 deletions packages/material-ui-icons/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
"react-dom": "^16.3.0"
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.42",
"recompose": "^0.27.0"
"@babel/runtime": "7.0.0-beta.42",
"recompose": "^0.28.0"
},
"devDependencies": {
"fs-extra": "^7.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/material-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"react-dom": "^16.3.0"
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.42",
"@babel/runtime": "7.0.0-beta.42",
"@types/jss": "^9.5.3",
"@types/react-transition-group": "^2.0.8",
"brcast": "^3.0.1",
Expand All @@ -56,10 +56,10 @@
"normalize-scroll-left": "^0.1.2",
"popper.js": "^1.14.1",
"prop-types": "^15.6.0",
"react-event-listener": "^0.6.0",
"react-event-listener": "^0.6.2",
"react-jss": "^8.1.0",
"react-transition-group": "^2.2.1",
"recompose": "^0.27.0",
"recompose": "^0.28.0",
"warning": "^4.0.1"
},
"sideEffects": false,
Expand Down
6 changes: 4 additions & 2 deletions packages/material-ui/test/typescript/components.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ const CardTest = () => (
</Typography>
<Typography variant="body1">adjective</Typography>
<Typography component="p">
well meaning and kindly.<br />
well meaning and kindly.
<br />
{'"a benevolent smile"'}
</Typography>
</CardContent>
Expand Down Expand Up @@ -442,7 +443,8 @@ const GridListTest = () => (
<GridList cellHeight={160} cols={3} onClick={event => log(event)}>
<GridListTile cols={1} rows={4} onClick={event => log(event)}>
<img src="img.png" alt="alt text" />
</GridListTile>,
</GridListTile>
,
</GridList>
);

Expand Down
Loading