Upgrade material-ui to v1.0.0-beta.41, use @material-ui/icons

drublic · drublic · commit 0b35ae323822 · 2018-04-09T15:15:11.000+02:00
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ might want to use in a backoffice app.
 
 ![](.presentational/header.png)
 
-Backoffice also uses `react-router-dom`, `material-ui-icons`, `material-ui-picker` and some more OSS.
+Backoffice also uses `react-router-dom`, `@material-ui/icons`, `material-ui-picker` and some more OSS.
 
 [![Build Status](https://travis-ci.org/drublic/backoffice.svg?branch=master)](https://travis-ci.org/drublic/backoffice)
 [![codecov](https://codecov.io/gh/drublic/backoffice/branch/master/graph/badge.svg)](https://codecov.io/gh/drublic/backoffice)
diff --git a/__tests__/data/form.jsx b/__tests__/data/form.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react'
 
-import Icon from 'material-ui-icons/Visibility'
+import Icon from '@material-ui/icons/Visibility'
 import Divider from 'material-ui/Divider/Divider'
 import Typography from 'material-ui/Typography/Typography'
 
diff --git a/__tests__/data/menu.js b/__tests__/data/menu.js
@@ -1,4 +1,4 @@
-import BugIcon from 'material-ui-icons/BugReport'
+import BugIcon from '@material-ui/icons/BugReport'
 
 export default [{
   type: 'link',
diff --git a/__tests__/visual/Page.jsx b/__tests__/visual/Page.jsx
@@ -5,7 +5,7 @@ import withStyles from 'material-ui/styles/withStyles'
 import Tooltip from 'material-ui/Tooltip'
 import IconButton from 'material-ui/IconButton'
 import Button from 'material-ui/Button'
-import DeleteIcon from 'material-ui-icons/Delete'
+import DeleteIcon from '@material-ui/icons/Delete'
 
 import Dashboard from '../../src/Dashboard'
 import dashboardData from '../data/dashboard'
diff --git a/examples/form/data.jsx b/examples/form/data.jsx
@@ -1,6 +1,6 @@
 import React, { Fragment } from 'react'
 
-import Icon from 'material-ui-icons/Visibility'
+import Icon from '@material-ui/icons/Visibility'
 import Divider from 'material-ui/Divider/Divider'
 import Typography from 'material-ui/Typography/Typography'
 
diff --git a/examples/list/UserListing.jsx b/examples/list/UserListing.jsx
@@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
 import withStyles from 'material-ui/styles/withStyles'
 import Tooltip from 'material-ui/Tooltip'
 import IconButton from 'material-ui/IconButton'
-import DeleteIcon from 'material-ui-icons/Delete'
+import DeleteIcon from '@material-ui/icons/Delete'
 
 import Listing from 'backoffice/src/Listing'
 import data from './data'
diff --git a/examples/package.json b/examples/package.json
@@ -16,7 +16,7 @@
     "babel-preset-react": "^6.24.1",
     "backoffice": "^2.0.0-beta.7",
     "material-ui": "^0.20.0",
-    "material-ui-icons": "^1.0.0-beta.36",
+    "@material-ui/icons": "^1.0.0-beta.36",
     "prop-types": "^15.6.1",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
diff --git a/examples/yarn.lock b/examples/yarn.lock
@@ -1059,7 +1059,7 @@ backoffice@^2.0.0-beta.7:
     jss "^9.5.1"
     keycode "^2.1.9"
     material-ui "^1.0.0-beta.33"
-    material-ui-icons "^1.0.0-beta.17"
+    @material-ui/icons "^1.0.0-beta.17"
     material-ui-pickers "^1.0.0-beta.15.1"
     moment "^2.20.1"
     react-hot-loader "^3.1.3"
@@ -4407,9 +4407,9 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-material-ui-icons@^1.0.0-beta.17, material-ui-icons@^1.0.0-beta.36:
+@material-ui/icons@^1.0.0-beta.17, @material-ui/icons@^1.0.0-beta.36:
   version "1.0.0-beta.36"
-  resolved "https://registry.yarnpkg.com/material-ui-icons/-/material-ui-icons-1.0.0-beta.36.tgz#86390a61f4c83f718eaba77ccce575834f2cf2a8"
+  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/@material-ui/icons-1.0.0-beta.36.tgz#86390a61f4c83f718eaba77ccce575834f2cf2a8"
   dependencies:
     recompose "^0.26.0"
 
diff --git a/package.json b/package.json
@@ -22,14 +22,14 @@
     "prepublishOnly": "rm -rf ./dist && yarn build"
   },
   "dependencies": {
+    "@material-ui/icons": "^1.0.0-beta.42",
     "classnames": "^2.2.5",
     "is-url": "^1.2.2",
     "isemail": "^3.0.0",
     "jest": "^22.1.4",
     "jss": "^9.5.1",
     "keycode": "^2.1.9",
     "material-ui": "^1.0.0-beta.33",
-    "material-ui-icons": "^1.0.0-beta.17",
     "material-ui-pickers": "^1.0.0-beta.15.1",
     "moment": "^2.20.1",
     "prop-types": "^15.6.1",
diff --git a/src/AddButton/AddButtonBranch.jsx b/src/AddButton/AddButtonBranch.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 
 import { withStyles } from 'material-ui/styles'
 import Button from 'material-ui/Button'
-import AddIcon from 'material-ui-icons/Add'
+import AddIcon from '@material-ui/icons/Add'
 
 const styles = theme => ({
   button: {
diff --git a/src/BackButton/BackButtonBranch.jsx b/src/BackButton/BackButtonBranch.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 
 import Button from 'material-ui/Button'
-import BackIcon from 'material-ui-icons/KeyboardArrowLeft'
+import BackIcon from '@material-ui/icons/KeyboardArrowLeft'
 import withStyles from 'material-ui/styles/withStyles'
 
 const styles = theme => ({
diff --git a/src/Dashboard/DashboardCard.jsx b/src/Dashboard/DashboardCard.jsx
@@ -7,7 +7,7 @@ import Card, { CardContent } from 'material-ui/Card'
 import Typography from 'material-ui/Typography'
 import Avatar from 'material-ui/Avatar'
 
-import DisabledIcon from 'material-ui-icons/Lock'
+import DisabledIcon from '@material-ui/icons/Lock'
 
 const styles = theme => ({
   root: {
diff --git a/src/Dashboard/DashboardGroup.jsx b/src/Dashboard/DashboardGroup.jsx
@@ -27,10 +27,10 @@ const DashboardGroup = ({
       </Typography>
     </div>
 
-    <Grid container>
+    <Grid spacing={16} container>
 
       {cards ? cards.map(card => (
-        <Grid item xs={12} sm={4} key={`group-card-${card.id}`}>
+        <Grid spacing={16} item xs={12} sm={4} key={`group-card-${card.id}`}>
           <DashboardCard
             title={card.title}
             description={card.description}
diff --git a/src/Drawer/Drawer.jsx b/src/Drawer/Drawer.jsx
@@ -5,7 +5,7 @@ import { withStyles } from 'material-ui/styles'
 import MaterialDrawer from 'material-ui/Drawer'
 import Divider from 'material-ui/Divider'
 import IconButton from 'material-ui/IconButton'
-import ChevronLeftIcon from 'material-ui-icons/ChevronLeft'
+import ChevronLeftIcon from '@material-ui/icons/ChevronLeft'
 
 import Menu from '../Menu'
 
diff --git a/src/Form/FormFieldDate.jsx b/src/Form/FormFieldDate.jsx
@@ -1,11 +1,11 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import KeyboardArrowLeftIcon from 'material-ui-icons/KeyboardArrowLeft'
-import KeyboardArrowRightIcon from 'material-ui-icons/KeyboardArrowRight'
-import EventIcon from 'material-ui-icons/Event'
-import DateRangeIcon from 'material-ui-icons/DateRange'
-import AccessTimeIcon from 'material-ui-icons/AccessTime'
+import KeyboardArrowLeftIcon from '@material-ui/icons/KeyboardArrowLeft'
+import KeyboardArrowRightIcon from '@material-ui/icons/KeyboardArrowRight'
+import EventIcon from '@material-ui/icons/Event'
+import DateRangeIcon from '@material-ui/icons/DateRange'
+import AccessTimeIcon from '@material-ui/icons/AccessTime'
 import {
   DateTimePicker,
   DatePicker,
diff --git a/src/Header/Header.jsx b/src/Header/Header.jsx
@@ -6,7 +6,7 @@ import AppBar from 'material-ui/AppBar'
 import Toolbar from 'material-ui/Toolbar'
 import Typography from 'material-ui/Typography'
 import IconButton from 'material-ui/IconButton'
-import MenuIcon from 'material-ui-icons/Menu'
+import MenuIcon from '@material-ui/icons/Menu'
 
 const drawerWidth = 280
 
diff --git a/src/Listing/ListingHeader.jsx b/src/Listing/ListingHeader.jsx
@@ -31,6 +31,7 @@ class ListingHeader extends React.Component {
         <TableRow>
           <TableCell padding="checkbox">
             <Checkbox
+              color="primary"
               indeterminate={numSelected > 0 && numSelected < rowCount}
               checked={numSelected === rowCount}
               onChange={onSelectAllClick}
diff --git a/src/Listing/ListingLine.jsx b/src/Listing/ListingLine.jsx
@@ -96,7 +96,7 @@ class ListingLine extends React.Component {
           padding="checkbox"
           onClick={() => handleCheckClick(data.id)}
         >
-          <Checkbox checked={isSelected} />
+          <Checkbox color="primary" checked={isSelected} />
         </TableCell>
 
         {this.renderCells()}
diff --git a/src/Listing/ListingSearchBranch.jsx b/src/Listing/ListingSearchBranch.jsx
@@ -6,7 +6,7 @@ import withStyles from 'material-ui/styles/withStyles'
 import TextField from 'material-ui/TextField/TextField'
 import Tooltip from 'material-ui/Tooltip'
 import IconButton from 'material-ui/IconButton/IconButton'
-import SearchIcon from 'material-ui-icons/Search'
+import SearchIcon from '@material-ui/icons/Search'
 
 const styles = theme => ({
   root: {
diff --git a/src/Menu/Menu.test.jsx b/src/Menu/Menu.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import renderer from 'react-test-renderer'
 
-import Icon from 'material-ui-icons/AccessAlarm'
+import Icon from '@material-ui/icons/AccessAlarm'
 
 import Menu from './'
 
diff --git a/src/Menu/MenuItem.test.jsx b/src/Menu/MenuItem.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import renderer from 'react-test-renderer'
 
-import Icon from 'material-ui-icons/AccessAlarm'
+import Icon from '@material-ui/icons/AccessAlarm'
 
 import MenuItem from './MenuItem'
 
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import BugIcon from 'material-ui-icons/BugReport'`
	`1`	`+import BugIcon from '@material-ui/icons/BugReport'`
`2`	`2`
`3`	`3`	`export default [{`
`4`	`4`	`type: 'link',`