upgrade material-ui to 1.0.0 (stable) (#8)

natterstefan · web-flow · commit b1d1a22e6c78 · 2018-05-25T20:20:47.000+02:00
diff --git a/package.json b/package.json
@@ -63,8 +63,8 @@
     }
  ],
   "peerDependencies": {
-    "material-ui": "1.0.0-beta.36",
-    "material-ui-icons": "1.0.0-beta.36",
+    "@material-ui/core": "1.0.0",
+    "@material-ui/icons": "1.0.0",
     "react": "16.2.x",
     "react-dom": "16.2.x"
   },
@@ -73,11 +73,11 @@
     "@fortawesome/fontawesome-free-brands": "5.0.10",
     "@fortawesome/fontawesome-free-solid": "5.0.10",
     "@fortawesome/react-fontawesome": "0.0.18",
+    "@material-ui/core": "1.0.0",
+    "@material-ui/icons": "1.0.0",
     "babel-polyfill": "6.26.0",
     "classnames": "2.2.5",
     "lodash": "4.17.5",
-    "material-ui": "1.0.0-beta.36",
-    "material-ui-icons": "1.0.0-beta.36",
     "prop-types": "15.6.1",
     "react": "16.3.2",
     "react-dom": "16.3.2",
diff --git a/src/__tests__/__snapshots__/index.test.js.snap b/src/__tests__/__snapshots__/index.test.js.snap
@@ -13,7 +13,7 @@ exports[`Component/TrelloMultiBoard should render without throwing an error 1`]
   }
 >
   <div>
-    <WithStyles(Reboot) />
+    <WithStyles(CssBaseline) />
     <HashRouter>
       <Switch>
         <Route
diff --git a/src/components/app-menu-container/__tests__/__snapshots__/menu.test.js.snap b/src/components/app-menu-container/__tests__/__snapshots__/menu.test.js.snap
@@ -1,8 +1,10 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Component/AppMenuContent should render without throwing an error 1`] = `
-<WithStyles(List)>
-  <div>
+<div>
+  <WithStyles(List)
+    component="nav"
+  >
     <WithStyles(ListItem)
       button={true}
       component={[Function]}
@@ -61,6 +63,6 @@ exports[`Component/AppMenuContent should render without throwing an error 1`] =
         primary="GitHub"
       />
     </WithStyles(ListItem)>
-  </div>
-</WithStyles(List)>
+  </WithStyles(List)>
+</div>
 `;
diff --git a/src/components/app-menu-container/__tests__/menu.test.js b/src/components/app-menu-container/__tests__/menu.test.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { mount, shallow } from 'enzyme'
 import { HashRouter as Router } from 'react-router-dom'
-import { ListItem } from 'material-ui/List'
+import ListItem from '@material-ui/core/ListItem'
 
 import AppMenuContent from '../menu'
 
diff --git a/src/components/app-menu-container/index.js b/src/components/app-menu-container/index.js
@@ -3,16 +3,16 @@ import PropTypes from 'prop-types'
 import classNames from 'classnames'
 
 // Material UI Components
-import { withStyles } from 'material-ui/styles'
-import Drawer from 'material-ui/Drawer'
-import AppBar from 'material-ui/AppBar'
-import Toolbar from 'material-ui/Toolbar'
-import Typography from 'material-ui/Typography'
-import Divider from 'material-ui/Divider'
-import IconButton from 'material-ui/IconButton'
-import MenuIcon from 'material-ui-icons/Menu'
-import ChevronLeftIcon from 'material-ui-icons/ChevronLeft'
-import ChevronRightIcon from 'material-ui-icons/ChevronRight'
+import { withStyles } from '@material-ui/core/styles'
+import Drawer from '@material-ui/core/Drawer'
+import AppBar from '@material-ui/core/AppBar'
+import Toolbar from '@material-ui/core/Toolbar'
+import Typography from '@material-ui/core/Typography'
+import Divider from '@material-ui/core/Divider'
+import IconButton from '@material-ui/core/IconButton'
+import MenuIcon from '@material-ui/icons/Menu'
+import ChevronLeftIcon from '@material-ui/icons/ChevronLeft'
+import ChevronRightIcon from '@material-ui/icons/ChevronRight'
 
 // App Menu Content
 import AppMenuContent from './menu'
diff --git a/src/components/app-menu-container/menu.js b/src/components/app-menu-container/menu.js
@@ -1,16 +1,18 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 import FontAwesomeIcon from '@fortawesome/react-fontawesome'
-import List, { ListItem, ListItemIcon, ListItemText } from 'material-ui/List'
-import DashboardIcon from 'material-ui-icons/Dashboard'
-import SettingsIcon from 'material-ui-icons/Settings'
-
-const GITHUB_URL = 'https://github.com/natterstefan/react-trello-multiboard/'
+import List from '@material-ui/core/List'
+import ListItem from '@material-ui/core/ListItem'
+import ListItemIcon from '@material-ui/core/ListItemIcon'
+import ListItemText from '@material-ui/core/ListItemText'
+import DashboardIcon from '@material-ui/icons/Dashboard'
+import SettingsIcon from '@material-ui/icons/Settings'
+import { GITHUB_URL } from '../../constants'
 
 // NOTE: add replace to ListItem because of: https://github.com/ReactTraining/react-router/issues/4467
 const AppMenuContent = () => (
-  <List>
-    <div>
+  <div>
+    <List component="nav">
       <ListItem component={Link} button replace to="/">
         <ListItemIcon>
           <DashboardIcon />
@@ -34,8 +36,8 @@ const AppMenuContent = () => (
         </ListItemIcon>
         <ListItemText primary="GitHub" />
       </ListItem>
-    </div>
-  </List>
+    </List>
+  </div>
 )
 
 AppMenuContent.displayName = 'AppMenuContent'
diff --git a/src/components/board/__tests__/component.test.js b/src/components/board/__tests__/component.test.js
@@ -1,8 +1,8 @@
 import React from 'react'
 import { shallow } from 'enzyme'
 
-import { LinearProgress } from 'material-ui/Progress'
-import Typography from 'material-ui/Typography'
+import LinearProgress from '@material-ui/core/LinearProgress'
+import Typography from '@material-ui/core/Typography'
 
 import Board from '../component'
 import TrelloCardsList from '../../trello-cards-list'
diff --git a/src/components/board/component.js b/src/components/board/component.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { invoke, map } from 'lodash'
-import Typography from 'material-ui/Typography'
-import { LinearProgress } from 'material-ui/Progress'
+import Typography from '@material-ui/core/Typography'
+import LinearProgress from '@material-ui/core/LinearProgress'
 import styled from 'styled-components'
 
 import proptypes from './prop-types'
diff --git a/src/components/boards-list/__tests__/component.test.js b/src/components/boards-list/__tests__/component.test.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { shallow } from 'enzyme'
-import { LinearProgress } from 'material-ui/Progress'
+import LinearProgress from '@material-ui/core/LinearProgress'
 
 import BoardsList from '../component'
 import Board from '../../board'
diff --git a/src/components/boards-list/component.js b/src/components/boards-list/component.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { get, map } from 'lodash'
-import { LinearProgress } from 'material-ui/Progress'
-import Typography from 'material-ui/Typography'
+import LinearProgress from '@material-ui/core/LinearProgress'
+import Typography from '@material-ui/core/Typography'
 import styled from 'styled-components'
 
 import proptypes from './prop-types'
diff --git a/src/components/estimation-card/__tests__/__snapshots__/component.test.js.snap b/src/components/estimation-card/__tests__/__snapshots__/component.test.js.snap
@@ -8,9 +8,7 @@ exports[`Component/EstimationCard should render without throwing an error 1`] =
     }
   }
 >
-  <Card
-    raised={false}
-  >
+  <WithStyles(Card)>
     <WithStyles(CardContent)>
       <WithStyles(List)>
         <WithStyles(ListItem)
@@ -44,6 +42,6 @@ exports[`Component/EstimationCard should render without throwing an error 1`] =
         </WithStyles(ListItem)>
       </WithStyles(List)>
     </WithStyles(CardContent)>
-  </Card>
+  </WithStyles(Card)>
 </div>
 `;
diff --git a/src/components/estimation-card/__tests__/component.test.js b/src/components/estimation-card/__tests__/component.test.js
@@ -2,7 +2,7 @@ import React from 'react'
 import { shallow } from 'enzyme'
 import { assign } from 'lodash'
 
-import { LinearProgress } from 'material-ui/Progress'
+import LinearProgress from '@material-ui/core/LinearProgress'
 import EstimationCard from '../component'
 
 const props = {
diff --git a/src/components/estimation-card/component.js b/src/components/estimation-card/component.js
@@ -1,10 +1,12 @@
 import React from 'react'
 import { get, map } from 'lodash'
 
-import { LinearProgress } from 'material-ui/Progress'
-import List, { ListItem } from 'material-ui/List'
-import Card, { CardContent } from 'material-ui/Card'
-import Typography from 'material-ui/Typography'
+import LinearProgress from '@material-ui/core/LinearProgress'
+import List from '@material-ui/core/List'
+import ListItem from '@material-ui/core/ListItem'
+import Card from '@material-ui/core/Card'
+import CardContent from '@material-ui/core/CardContent'
+import Typography from '@material-ui/core/Typography'
 
 import proptypes from './prop-types'
 import { getBoardName } from '../../utils/get-board-name'
diff --git a/src/components/footer/index.js b/src/components/footer/index.js
@@ -1,9 +1,8 @@
 import React from 'react'
-import Typography from 'material-ui/Typography'
+import Typography from '@material-ui/core/Typography'
 import FontAwesomeIcon from '@fortawesome/react-fontawesome'
 import styled from 'styled-components'
-
-const GITHUB_URL = 'https://github.com/natterstefan/react-trello-multiboard/'
+import { GITHUB_URL } from '../../constants'
 
 export const FooterContainer = styled.footer`
   background-color: #3f51b5;
diff --git a/src/components/main-app/__tests__/component.test.js b/src/components/main-app/__tests__/component.test.js
@@ -4,7 +4,7 @@
 //    instead (2018-04-02)
 import React from 'react'
 import { shallow } from 'enzyme'
-import { LinearProgress } from 'material-ui/Progress'
+import LinearProgress from '@material-ui/core/LinearProgress'
 
 import MainApp from '../component'
 import EstimationCard from '../../estimation-card'
diff --git a/src/components/main-app/component.js b/src/components/main-app/component.js
@@ -2,10 +2,10 @@ import React from 'react'
 import { find, get, has, invoke, isEqual } from 'lodash'
 
 // Material UI
-import { withStyles } from 'material-ui/styles'
-import { LinearProgress } from 'material-ui/Progress'
-import Button from 'material-ui/Button'
-import Typography from 'material-ui/Typography'
+import { withStyles } from '@material-ui/core/styles'
+import LinearProgress from '@material-ui/core/LinearProgress'
+import Button from '@material-ui/core/Button'
+import Typography from '@material-ui/core/Typography'
 
 // Components
 import proptypes from './prop-types'
diff --git a/src/components/member/__tests__/__snapshots__/component.test.js.snap b/src/components/member/__tests__/__snapshots__/component.test.js.snap
@@ -1,10 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Component/Member should render without throwing an error 1`] = `
-<Card
+<WithStyles(Card)
   className="member_card_member-1"
   onClick={[Function]}
-  raised={false}
   style={
     Object {
       "backgroundColor": undefined,
@@ -45,5 +44,5 @@ exports[`Component/Member should render without throwing an error 1`] = `
       </WithStyles(Typography)>
     </styled.div>
   </WithStyles(CardContent)>
-</Card>
+</WithStyles(Card)>
 `;
diff --git a/src/components/member/__tests__/component.test.js b/src/components/member/__tests__/component.test.js
@@ -2,9 +2,9 @@ import React from 'react'
 import { shallow } from 'enzyme'
 import { merge } from 'lodash'
 
-import { LinearProgress } from 'material-ui/Progress'
-import Card from 'material-ui/Card'
-import Typography from 'material-ui/Typography'
+import LinearProgress from '@material-ui/core/LinearProgress'
+import Card from '@material-ui/core/Card'
+import Typography from '@material-ui/core/Typography'
 
 import { mockEampleUser1 } from '../../../__mocks__/mocks'
 
diff --git a/src/components/member/__tests__/user-avatar.test.js b/src/components/member/__tests__/user-avatar.test.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { shallow } from 'enzyme'
-import Avatar from 'material-ui/Avatar'
+import Avatar from '@material-ui/core/Avatar'
 
 import { mockEampleUser1, mockEampleUser3 } from '../../../__mocks__/mocks'
 
diff --git a/src/components/member/component.js b/src/components/member/component.js
@@ -1,10 +1,11 @@
 import React from 'react'
 import { get } from 'lodash'
 
-import { withStyles } from 'material-ui/styles'
-import Card, { CardContent } from 'material-ui/Card'
-import Typography from 'material-ui/Typography'
-import { LinearProgress } from 'material-ui/Progress'
+import { withStyles } from '@material-ui/core/styles'
+import Card from '@material-ui/core/Card'
+import CardContent from '@material-ui/core/CardContent'
+import Typography from '@material-ui/core/Typography'
+import LinearProgress from '@material-ui/core/LinearProgress'
 import styled from 'styled-components'
 
 import proptypes from './prop-types'
diff --git a/src/components/member/user-avatar.js b/src/components/member/user-avatar.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { withStyles } from 'material-ui/styles'
-import Avatar from 'material-ui/Avatar'
+import { withStyles } from '@material-ui/core/styles'
+import Avatar from '@material-ui/core/Avatar'
 
 import { member as memberPropType } from './prop-types'
 
diff --git a/src/components/members-list/component.js b/src/components/members-list/component.js
@@ -1,7 +1,8 @@
 import React from 'react'
 import { get, map } from 'lodash'
-import List, { ListItem } from 'material-ui/List'
-import { withStyles } from 'material-ui/styles'
+import List from '@material-ui/core/List'
+import ListItem from '@material-ui/core/ListItem'
+import { withStyles } from '@material-ui/core/styles'
 
 // Styles Components
 import { ScrollContainer } from '../styled-components'
diff --git a/src/components/trello-cards-list/__tests__/component.test.js b/src/components/trello-cards-list/__tests__/component.test.js
@@ -1,8 +1,8 @@
 import React from 'react'
 import { shallow } from 'enzyme'
 
-import { LinearProgress } from 'material-ui/Progress'
-import Typography from 'material-ui/Typography'
+import LinearProgress from '@material-ui/core/LinearProgress'
+import Typography from '@material-ui/core/Typography'
 
 import TrelloCardsList from '../component'
 import TrelloCard from '../../trello-card'
diff --git a/src/components/trello-cards-list/component.js b/src/components/trello-cards-list/component.js
@@ -1,8 +1,8 @@
 import React from 'react'
 import { get, invoke, map } from 'lodash'
 
-import Typography from 'material-ui/Typography'
-import { LinearProgress } from 'material-ui/Progress'
+import Typography from '@material-ui/core/Typography'
+import LinearProgress from '@material-ui/core/LinearProgress'
 import styled from 'styled-components'
 
 import proptypes from './prop-types' // eslint-disable-line
diff --git a/src/constants/index.js b/src/constants/index.js
@@ -0,0 +1 @@
+export const GITHUB_URL = 'https://github.com/natterstefan/react-trello-multiboard/'
diff --git a/src/index.js b/src/index.js
@@ -3,7 +3,7 @@ import { render } from 'react-dom'
 import { HashRouter as Router, Route, Switch } from 'react-router-dom'
 
 // Material UI
-import Reboot from 'material-ui/Reboot'
+import CssBaseline from '@material-ui/core/CssBaseline'
 
 // FontAwesomeIcons
 // - add it here, to enable usage in all component
@@ -35,7 +35,7 @@ fontawesome.library.add(brands, faAlignLeft, faCheckSquare, faCommentDots, faPap
 export const TrelloMultiboard = () => (
   <Provider store={store}>
     <div>
-      <Reboot />
+      <CssBaseline />
       <Router>
         <Switch>
           <Route exact path="/config" component={ConfigPage} />
diff --git a/src/pages/page-config.js b/src/pages/page-config.js
@@ -6,9 +6,9 @@ import SyntaxHighlighter from 'react-syntax-highlighter'
 import { docco } from 'react-syntax-highlighter/styles/hljs'
 
 // Material UI
-import { withStyles } from 'material-ui/styles'
-import Paper from 'material-ui/Paper'
-import Typography from 'material-ui/Typography'
+import { withStyles } from '@material-ui/core/styles'
+import Paper from '@material-ui/core/Paper'
+import Typography from '@material-ui/core/Typography'
 
 // Config & Components
 import proptypes from './page-config.prop-types'
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ exports[`Component/TrelloMultiBoard should render without throwing an error 1`]
`13`	`13`	`}`
`14`	`14`	`>`
`15`	`15`	`<div>`
`16`		`- <WithStyles(Reboot) />`
	`16`	`+ <WithStyles(CssBaseline) />`
`17`	`17`	`<HashRouter>`
`18`	`18`	`<Switch>`
`19`	`19`	`<Route`