From 1989686ca216a1c58bf2e932faf78f23be1f3a08 Mon Sep 17 00:00:00 2001 From: Hans Christian Reinl Date: Sat, 22 Jun 2019 14:18:55 +0200 Subject: [PATCH] Upgrade modules to material ui v4 --- .eslintrc.js | 12 --- examples/form/EditForm.jsx | 6 +- examples/list/UserListing.jsx | 4 +- package.json | 19 ++-- src/AddButton/AddButton.jsx | 4 +- src/BackButton/BackButtonBranch.jsx | 2 +- src/Base/Base.jsx | 7 +- src/Base/BaseBranch.jsx | 10 +- src/CookieInfo/CookieInfo.jsx | 8 +- src/Dashboard/DashboardBranch.jsx | 6 +- src/Dashboard/DashboardCard.jsx | 4 +- src/Dashboard/DashboardGroup.jsx | 6 +- src/Drawer/Drawer.jsx | 2 +- src/Form/FormBranch.jsx | 18 ++-- src/Form/FormFieldBranch.jsx | 20 ++-- src/Form/FormFieldDate.jsx | 3 - src/Form/FormFieldInput.jsx | 3 +- src/Form/FormFieldListBranch.jsx | 2 +- src/Form/FormGroupWrapper.jsx | 10 +- src/Form/FormSubmitButton.jsx | 10 +- src/Header/Header.jsx | 2 +- src/Listing/ListingBranch.jsx | 2 +- src/Listing/ListingSearchBranch.jsx | 6 +- src/Menu/MenuItem.jsx | 4 +- src/NoMatch/NoMatch.jsx | 4 +- src/Tabs/Tabs.jsx | 4 +- src/tests/Page.jsx | 2 +- yarn.lock | 146 ++++++++-------------------- 28 files changed, 126 insertions(+), 200 deletions(-) delete mode 100644 .eslintrc.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 2a5c63a..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,12 +0,0 @@ -module.exports = { - extends: "airbnb", - parser: "babel-eslint", - env: { - browser: true, - es6: true, - jest: true, - }, - rules: { - semi: ["error", "never"], - }, -} diff --git a/examples/form/EditForm.jsx b/examples/form/EditForm.jsx index fc9e38d..1d0c1b2 100644 --- a/examples/form/EditForm.jsx +++ b/examples/form/EditForm.jsx @@ -8,9 +8,9 @@ import data from './data' const styles = theme => ({ root: { - marginTop: theme.spacing.unit * 3, - marginLeft: theme.spacing.unit * 3, - marginRight: theme.spacing.unit * 3, + marginTop: theme.spacing(3), + marginLeft: theme.spacing(3), + marginRight: theme.spacing(3), }, }) diff --git a/examples/list/UserListing.jsx b/examples/list/UserListing.jsx index 65ae0da..63d7490 100644 --- a/examples/list/UserListing.jsx +++ b/examples/list/UserListing.jsx @@ -13,8 +13,8 @@ import headers from './headers' const styles = theme => ({ root: { - marginLeft: theme.spacing.unit * 3, - marginRight: theme.spacing.unit * 3, + marginLeft: theme.spacing(3), + marginRight: theme.spacing(3), }, }) diff --git a/package.json b/package.json index 611bc61..4583a15 100644 --- a/package.json +++ b/package.json @@ -21,11 +21,11 @@ "prepublishOnly": "rm -rf ./dist && yarn build:babel" }, "dependencies": { - "@date-io/moment": "^1.3.6", - "@material-ui/core": "^4.1.0", - "@material-ui/icons": "^4.1.0", - "@material-ui/pickers": "^3.1.0", - "@material-ui/styles": "^4.1.0", + "@date-io/moment": "^1.3.7", + "@material-ui/core": "^4.1.1", + "@material-ui/icons": "^4.2.0", + "@material-ui/pickers": "^3.1.1", + "@material-ui/styles": "^4.1.1", "classnames": "^2.2.6", "init-uuid": "^1.2.0", "is-url": "^1.2.4", @@ -39,7 +39,7 @@ "react-jss": "^8.6.1", "react-router-dom": "^5.0.1", "recompose": "^0.30.0", - "typescript": "^3.5.1", + "typescript": "^3.5.2", "vanilla-store": "^0.4.0" }, "peerDependencies": { @@ -57,16 +57,11 @@ "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.14.0", "enzyme-to-json": "^3.3.5", - "eslint": "^5.16.0", - "eslint-config-airbnb": "^17.1.0", - "eslint-plugin-import": "^2.17.3", - "eslint-plugin-jsx-a11y": "^6.2.1", - "eslint-plugin-react": "^7.13.0", "express": "^4.17.1", "jest-enzyme": "^7.0.2", "react-mock-router": "^1.0.15", "react-scripts": "^3.0.1", - "tslint": "^5.17.0", + "tslint": "^5.18.0", "tslint-react": "^4.0.0" }, "keywords": [ diff --git a/src/AddButton/AddButton.jsx b/src/AddButton/AddButton.jsx index 56a11e8..c652cec 100644 --- a/src/AddButton/AddButton.jsx +++ b/src/AddButton/AddButton.jsx @@ -10,8 +10,8 @@ import AddIcon from '@material-ui/icons/Add' const styles = theme => ({ button: { position: 'fixed', - right: theme.spacing.unit * 3, - bottom: theme.spacing.unit * 3, + right: theme.spacing(3), + bottom: theme.spacing(3), }, }) diff --git a/src/BackButton/BackButtonBranch.jsx b/src/BackButton/BackButtonBranch.jsx index 85d29e8..97cf71d 100644 --- a/src/BackButton/BackButtonBranch.jsx +++ b/src/BackButton/BackButtonBranch.jsx @@ -9,7 +9,7 @@ import BackIcon from '@material-ui/icons/ArrowBackIos' const styles = theme => ({ leftIcon: { - marginRight: theme.spacing.unit, + marginRight: theme.spacing(), }, }) diff --git a/src/Base/Base.jsx b/src/Base/Base.jsx index 5f7ac0a..3fbb01a 100644 --- a/src/Base/Base.jsx +++ b/src/Base/Base.jsx @@ -13,7 +13,7 @@ const withBase = Component => class extends React.Component { isHeaderFixed: PropTypes.bool, hasHeader: PropTypes.bool, hasCookieInfo: PropTypes.bool, - history: PropTypes.objectOf(PropTypes.any).isRequired, + history: PropTypes.objectOf(PropTypes.any), } static defaultProps = { @@ -22,6 +22,7 @@ const withBase = Component => class extends React.Component { hasCookieInfo: false, menuOpen: false, rightContent: null, + history: undefined, } constructor(props) { @@ -77,7 +78,9 @@ const withBase = Component => class extends React.Component { redirectTo(link) { const { history } = this.props - history.push(link) + if (history) { + history.push(link) + } } handleCookieInfoAccept() { diff --git a/src/Base/BaseBranch.jsx b/src/Base/BaseBranch.jsx index 6488b20..cee527d 100644 --- a/src/Base/BaseBranch.jsx +++ b/src/Base/BaseBranch.jsx @@ -19,20 +19,20 @@ const styles = theme => ({ transition: '0.25s', }, appFrameWithCookieInfo: { - marginTop: theme.spacing.unit * 6, - minHeight: `calc(100vh - ${theme.spacing.unit * 6}px)`, + marginTop: theme.spacing(6), + minHeight: `calc(100vh - ${theme.spacing(6)}px)`, }, content: { - width: `calc(100vw - ${theme.spacing.unit * 3 * 2}px)`, + width: `calc(100vw - ${theme.spacing(3) * 2}px)`, flexGrow: 1, backgroundColor: theme.palette.background.default, - padding: theme.spacing.unit * 3, + padding: theme.spacing(3), transition: theme.transitions.create('margin', { easing: theme.transitions.easing.sharp, duration: theme.transitions.duration.leavingScreen, }), height: 'calc(100% - 56px)', - marginTop: theme.spacing.unit * 8, + marginTop: theme.spacing(8), marginLeft: -drawerWidth, }, contentShift: { diff --git a/src/CookieInfo/CookieInfo.jsx b/src/CookieInfo/CookieInfo.jsx index 7ab6fc6..c64a54c 100644 --- a/src/CookieInfo/CookieInfo.jsx +++ b/src/CookieInfo/CookieInfo.jsx @@ -18,10 +18,10 @@ const styles = theme => ({ zIndex: 3000, display: 'flex', backgroundColor: theme.palette.secondary.main, - paddingTop: theme.spacing.unit, - paddingBottom: theme.spacing.unit, - paddingLeft: theme.spacing.unit * 3, - paddingRight: theme.spacing.unit * 3, + paddingTop: theme.spacing(), + paddingBottom: theme.spacing(), + paddingLeft: theme.spacing(3), + paddingRight: theme.spacing(3), transform: 'translate(0, -100%)', opacity: 0, transition: 'transform 0.25s, opacity 0s 0.25s', diff --git a/src/Dashboard/DashboardBranch.jsx b/src/Dashboard/DashboardBranch.jsx index 748b111..3729714 100644 --- a/src/Dashboard/DashboardBranch.jsx +++ b/src/Dashboard/DashboardBranch.jsx @@ -7,13 +7,13 @@ import DashboardGroup from './DashboardGroup' const styles = theme => ({ root: { flexGrow: 1, - maxWidth: theme.spacing.unit * 140, + maxWidth: theme.spacing(140), marginLeft: 'auto', marginRight: 'auto', }, headline: { - marginTop: theme.spacing.unit * 3, - marginBottom: theme.spacing.unit * 2, + marginTop: theme.spacing(3), + marginBottom: theme.spacing(2), }, }) diff --git a/src/Dashboard/DashboardCard.jsx b/src/Dashboard/DashboardCard.jsx index f67b255..b9936d3 100644 --- a/src/Dashboard/DashboardCard.jsx +++ b/src/Dashboard/DashboardCard.jsx @@ -17,11 +17,11 @@ const styles = theme => ({ cursor: 'pointer', }, content: { - paddingBottom: `${theme.spacing.unit * 2}px !important`, + paddingBottom: `${theme.spacing(2)}px !important`, }, avatar: { float: 'left', - marginRight: theme.spacing.unit * 2, + marginRight: theme.spacing(2), backgroundColor: theme.palette.secondary.dark, }, title: { diff --git a/src/Dashboard/DashboardGroup.jsx b/src/Dashboard/DashboardGroup.jsx index a7cf3d0..86e0722 100644 --- a/src/Dashboard/DashboardGroup.jsx +++ b/src/Dashboard/DashboardGroup.jsx @@ -11,8 +11,8 @@ import DashboardCard from './DashboardCard' const styles = theme => ({ headline: { - marginTop: theme.spacing.unit * 3, - marginBottom: theme.spacing.unit * 2, + marginTop: theme.spacing(3), + marginBottom: theme.spacing(2), }, }) @@ -29,7 +29,7 @@ const DashboardGroup = ({ - + {cards ? cards.map(card => ( diff --git a/src/Drawer/Drawer.jsx b/src/Drawer/Drawer.jsx index 5e9d32f..e078703 100644 --- a/src/Drawer/Drawer.jsx +++ b/src/Drawer/Drawer.jsx @@ -24,7 +24,7 @@ const styles = theme => ({ alignItems: 'center', justifyContent: 'flex-end', padding: '0 8px', - height: theme.spacing.unit * 8, + height: theme.spacing(8), }, }) diff --git a/src/Form/FormBranch.jsx b/src/Form/FormBranch.jsx index 0e7afb4..a865951 100644 --- a/src/Form/FormBranch.jsx +++ b/src/Form/FormBranch.jsx @@ -11,12 +11,12 @@ import FormSubmitButton from './FormSubmitButton' const styles = theme => ({ title: { - marginLeft: theme.spacing.unit, - marginRight: theme.spacing.unit, + marginLeft: theme.spacing(), + marginRight: theme.spacing(), }, errorMessage: { - marginTop: theme.spacing.unit * 2, - marginBottom: theme.spacing.unit * 2, + marginTop: theme.spacing(2), + marginBottom: theme.spacing(2), color: theme.palette.error.main, }, }) @@ -79,7 +79,7 @@ const FormBranch = ({ > {field.title ? ( {field.title} @@ -102,9 +102,11 @@ const FormBranch = ({ {children} - {error ? ( - {errorMessage} - ) : null} + {error && ( + + {errorMessage} + + )} ({ }, headline: { - marginTop: theme.spacing.unit * 3, + marginTop: theme.spacing(3), }, field: { - marginLeft: theme.spacing.unit, - marginRight: theme.spacing.unit, + marginLeft: theme.spacing(), + marginRight: theme.spacing(), verticalAlign: 'top', }, @@ -30,25 +30,25 @@ const styles = theme => ({ }, fieldDate: { - marginTop: theme.spacing.unit * 2, - marginBottom: theme.spacing.unit, + marginTop: theme.spacing(2), + marginBottom: theme.spacing(), }, widthSmall: { - width: `calc(25% - ${theme.spacing.unit * 2}px)`, + width: `calc(25% - ${theme.spacing(2)}px)`, }, widthMid: { - width: `calc(50% - ${theme.spacing.unit * 2}px)`, + width: `calc(50% - ${theme.spacing(2)}px)`, }, widthFull: { - width: `calc(100% - ${theme.spacing.unit * 2}px)`, + width: `calc(100% - ${theme.spacing(2)}px)`, }, divider: { - marginTop: theme.spacing.unit * 3, - marginBottom: theme.spacing.unit * 3, + marginTop: theme.spacing(3), + marginBottom: theme.spacing(3), }, }) diff --git a/src/Form/FormFieldDate.jsx b/src/Form/FormFieldDate.jsx index e2b688b..abc94a9 100644 --- a/src/Form/FormFieldDate.jsx +++ b/src/Form/FormFieldDate.jsx @@ -3,7 +3,6 @@ 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 MomentUtils from '@date-io/moment' @@ -57,13 +56,11 @@ const FormFieldDate = ({ } className={className} helperText={helperText} {...additionalAttributes} diff --git a/src/Form/FormFieldInput.jsx b/src/Form/FormFieldInput.jsx index 0685dfe..9f0dd36 100644 --- a/src/Form/FormFieldInput.jsx +++ b/src/Form/FormFieldInput.jsx @@ -84,7 +84,7 @@ const FormFieldInput = ({ FormFieldInput.propTypes = { id: PropTypes.string.isRequired, type: PropTypes.string, - title: PropTypes.string.isRequired, + title: PropTypes.string, value: PropTypes.oneOfType([ PropTypes.string, PropTypes.array, @@ -113,6 +113,7 @@ FormFieldInput.propTypes = { FormFieldInput.defaultProps = { type: 'text', + title: undefined, value: '', defaultValue: undefined, isMultiline: false, diff --git a/src/Form/FormFieldListBranch.jsx b/src/Form/FormFieldListBranch.jsx index 12169e6..4a1c554 100644 --- a/src/Form/FormFieldListBranch.jsx +++ b/src/Form/FormFieldListBranch.jsx @@ -23,7 +23,7 @@ const styles = theme => ({ }, list: { position: 'absolute', - top: theme.spacing.unit * 9, + top: theme.spacing(9), width: '100%', height: 0, opacity: 0, diff --git a/src/Form/FormGroupWrapper.jsx b/src/Form/FormGroupWrapper.jsx index 34b454c..723bb73 100644 --- a/src/Form/FormGroupWrapper.jsx +++ b/src/Form/FormGroupWrapper.jsx @@ -6,13 +6,13 @@ import { Paper, withStyles } from '@material-ui/core' const styles = theme => ({ group: { - marginTop: theme.spacing.unit, - marginBottom: theme.spacing.unit, - padding: theme.spacing.unit * 2, - paddingTop: theme.spacing.unit * 3, + marginTop: theme.spacing(), + marginBottom: theme.spacing(), + padding: theme.spacing(2), + paddingTop: theme.spacing(3), }, groupIntegrated: { - paddingTop: theme.spacing.unit * 3, + paddingTop: theme.spacing(3), }, hidden: { display: 'none', diff --git a/src/Form/FormSubmitButton.jsx b/src/Form/FormSubmitButton.jsx index d8fa4be..6d7e80e 100644 --- a/src/Form/FormSubmitButton.jsx +++ b/src/Form/FormSubmitButton.jsx @@ -12,13 +12,13 @@ const styles = theme => ({ }, fixed: { position: 'fixed', - right: theme.spacing.unit * 5, - bottom: theme.spacing.unit * 3, - marginBottom: theme.spacing.unit, + right: theme.spacing(5), + bottom: theme.spacing(3), + marginBottom: theme.spacing(), }, button: { - paddingLeft: theme.spacing.unit * 6, - paddingRight: theme.spacing.unit * 6, + paddingLeft: theme.spacing(6), + paddingRight: theme.spacing(6), }, progress: { color: green[500], diff --git a/src/Header/Header.jsx b/src/Header/Header.jsx index 3a80eff..2fe5e7a 100644 --- a/src/Header/Header.jsx +++ b/src/Header/Header.jsx @@ -24,7 +24,7 @@ const styles = theme => ({ transform: 'translate(0, 0)', }, appBarWithCookieInfo: { - transform: `translate(0, ${theme.spacing.unit * 6}px)`, + transform: `translate(0, ${theme.spacing(6)}px)`, }, appBarShift: { width: `calc(100% - ${drawerWidth}px)`, diff --git a/src/Listing/ListingBranch.jsx b/src/Listing/ListingBranch.jsx index 28a3340..f958ecb 100644 --- a/src/Listing/ListingBranch.jsx +++ b/src/Listing/ListingBranch.jsx @@ -19,7 +19,7 @@ import ListingLoader from './ListingLoader' const styles = theme => ({ root: { width: '100%', - marginTop: theme.spacing.unit * 3, + marginTop: theme.spacing(3), }, table: { minWidth: 800, diff --git a/src/Listing/ListingSearchBranch.jsx b/src/Listing/ListingSearchBranch.jsx index d530062..656ed1d 100644 --- a/src/Listing/ListingSearchBranch.jsx +++ b/src/Listing/ListingSearchBranch.jsx @@ -13,17 +13,17 @@ import SearchIcon from '@material-ui/icons/Search' const styles = theme => ({ root: { position: 'relative', - marginRight: theme.spacing.unit, + marginRight: theme.spacing(), }, field: { position: 'absolute', right: '100%', width: 0, - marginTop: theme.spacing.unit, + marginTop: theme.spacing(), transition: 'width 0.25s', }, fieldActive: { - width: theme.spacing.unit * 30, + width: theme.spacing(30), }, }) diff --git a/src/Menu/MenuItem.jsx b/src/Menu/MenuItem.jsx index a62de4b..f6cbcbd 100644 --- a/src/Menu/MenuItem.jsx +++ b/src/Menu/MenuItem.jsx @@ -1,5 +1,5 @@ import React from 'react' -import PropTypes from 'prop-types' +import PropTypes, { any } from 'prop-types' import classNames from 'classnames' import { @@ -45,7 +45,7 @@ MenuItem.propTypes = { url: PropTypes.string.isRequired, title: PropTypes.string.isRequired, isDisabled: PropTypes.bool, - icon: PropTypes.func, + icon: PropTypes.objectOf(any), classes: PropTypes.objectOf(PropTypes.string).isRequired, } diff --git a/src/NoMatch/NoMatch.jsx b/src/NoMatch/NoMatch.jsx index b58ef0c..97b0b0f 100644 --- a/src/NoMatch/NoMatch.jsx +++ b/src/NoMatch/NoMatch.jsx @@ -13,8 +13,8 @@ const styles = theme => ({ justifyContent: 'center', alignItems: 'center', maxWidth: '60rem', - paddingLeft: theme.spacing.unit * 3, - paddingRight: theme.spacing.unit * 3, + paddingLeft: theme.spacing(3), + paddingRight: theme.spacing(3), marginLeft: 'auto', marginRight: 'auto', height: 'calc(100vh - 104px)', diff --git a/src/Tabs/Tabs.jsx b/src/Tabs/Tabs.jsx index e68f5d4..1d781dc 100644 --- a/src/Tabs/Tabs.jsx +++ b/src/Tabs/Tabs.jsx @@ -25,7 +25,7 @@ const styles = theme => ({ root: { flexGrow: 1, width: '100%', - marginTop: theme.spacing.unit * 3, + marginTop: theme.spacing() * 3, backgroundColor: theme.palette.background.paper, }, }) @@ -88,7 +88,7 @@ class Tabs extends React.Component { value={value} onChange={this.handleChange} indicatorColor="secondary" - scrollable={isScrollable} + variant={isScrollable ? "scrollable" : undefined} scrollButtons="auto" > {data.map(item => ( diff --git a/src/tests/Page.jsx b/src/tests/Page.jsx index 6f0f9ca..8cfcba7 100644 --- a/src/tests/Page.jsx +++ b/src/tests/Page.jsx @@ -30,7 +30,7 @@ const noop = () => {} const styles = theme => ({ headline: { - marginTop: theme.spacing.unit * 4, + marginTop: theme.spacing(4), }, }) diff --git a/yarn.lock b/yarn.lock index 2c9f1dc..133dc6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -974,10 +974,17 @@ resolved "https://registry.yarnpkg.com/@csstools/normalize.css/-/normalize.css-9.0.1.tgz#c27b391d8457d1e893f1eddeaf5e5412d12ffbb5" integrity sha512-6It2EVfGskxZCQhuykrfnALg7oVeiI6KclWSmGDqB0AiInVrTGB9Jp9i4/Ad21u9Jde/voVQz6eFX/eSg/UsPA== -"@date-io/moment@^1.3.6": - version "1.3.6" - resolved "https://registry.yarnpkg.com/@date-io/moment/-/moment-1.3.6.tgz#ee6d911c400e66c0bfe6cd782be36834f529de03" - integrity sha512-aaWDAPaiwmya/W8ERd19BohO8mgNwPP/l/nTwcG7V+WZKQjDotOfcIHJaDSLKbDsA5WDP6kxDrbXE15Jztvu/g== +"@date-io/core@^1.3.7": + version "1.3.7" + resolved "https://registry.yarnpkg.com/@date-io/core/-/core-1.3.7.tgz#c65d2979ee7696c0551d8f24df618b21b83cde4a" + integrity sha512-oHFBOjQskqrFngyDnJPOM1o4FVpKPyNe/aDtkj1HQEfCe7BV3cggwuTll0AOchNdiYY0yJEVyUl8Vi63HZxfBA== + +"@date-io/moment@^1.3.7": + version "1.3.7" + resolved "https://registry.yarnpkg.com/@date-io/moment/-/moment-1.3.7.tgz#e731aa68ab711756d31f43b8f7630b5eb2c01c53" + integrity sha512-DpXK6s5f9HOoPPURmqSUN0mwFTTorSXfJyJA42PspJ8ZTJLIeuWUXRkjJKS6hdXUfy3PmshEQTzWbhoOiDwjfw== + dependencies: + "@date-io/core" "^1.3.7" "@emotion/hash@^0.7.1": version "0.7.1" @@ -1186,14 +1193,14 @@ "@types/istanbul-reports" "^1.1.1" "@types/yargs" "^12.0.9" -"@material-ui/core@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.1.0.tgz#4a350b5c77f4427a35b6c6d46e100c95e4eaaafd" - integrity sha512-dpS7OvW4eBInskB3l72htaBY+3VFfgEs0UiNczyJyqb6SjymVx7ymi0BnwfUOWJYwPq0jfRqPddy0ThADBqvHQ== +"@material-ui/core@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.1.1.tgz#11e703f3d44d84750c9b829f13bb08ad8949e12a" + integrity sha512-dZVuVFqKnG3uf+s32U5wMTAXYBGBM6e2LF4fz4ud9woaYcthRiEFJTg2idt0j1jBMg99gqLuznR5+A9TCQbgxQ== dependencies: "@babel/runtime" "^7.2.0" - "@material-ui/styles" "^4.1.0" - "@material-ui/system" "^4.1.0" + "@material-ui/styles" "^4.1.1" + "@material-ui/system" "^4.2.0" "@material-ui/types" "^4.1.0" "@material-ui/utils" "^4.1.0" "@types/react-transition-group" "^2.0.16" @@ -1210,17 +1217,17 @@ react-transition-group "^4.0.0" warning "^4.0.1" -"@material-ui/icons@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.1.0.tgz#583f09918f0217948485a548c18e3088ede3a352" - integrity sha512-EwlS/D3O1lBEFBBOwBJgcV3c9zkLYy6GpJzBFL4i8rpkwfpWAE2dvz2TGsHfftfR60tiiLpZJhngBL7NJYnRng== +"@material-ui/icons@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.2.0.tgz#cd0b6521288c5e6c0b084d6defec37a4491e0c51" + integrity sha512-v+rz61KzH+qR8x17BrfOF73f75x+wUNiBhv9tsKnEed+ElROMK2dqfMAlsdgEP+wgGl4VOcxzUQqWHcaApZ+CA== dependencies: "@babel/runtime" "^7.2.0" -"@material-ui/pickers@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@material-ui/pickers/-/pickers-3.1.0.tgz#e0af9cd954e703e397e02d2516439d89648435c8" - integrity sha512-gV9mH1oHIJ6rrx7cOmsDOVL2/pTMqKRa2sKHBX1Rf2Hi5CTfdd/HppJVos+ZFQqJaNHFSihmT2dl02Vj3Vnm+w== +"@material-ui/pickers@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@material-ui/pickers/-/pickers-3.1.1.tgz#f81f2a71b995beb604d07a0cff6cc83908f3b62a" + integrity sha512-YLVGMN4/TkixRzhjNR+Fd/m4+8wHyH1SJw3aEKtTa6tlq6Sw9LGzN630NiQScWNxokw7bI10Q8lWyDIGDgrt8g== dependencies: "@types/styled-jsx" "^2.2.8" clsx "^1.0.2" @@ -1228,10 +1235,10 @@ rifm "^0.7.0" tslib "^1.9.3" -"@material-ui/styles@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.1.0.tgz#a8a200bf81c4a603a298b7df114d66b624b7fab1" - integrity sha512-GMv/8UcfZv5P9Cl2eR+HbyJwCnrYOeDRW3BALCGZgQ7nBiQTQnrhXxA1MprBoRBPl5KiD2kQJdjbdkvT8OSfNg== +"@material-ui/styles@^4.1.1": + version "4.1.1" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.1.1.tgz#16e9d4770bd18b85c25fd3cb925043af5fa37f36" + integrity sha512-BmtfLRY0CqAkYPdcFmNcD1/zyU6ATRx9vaBxJ31//YVxfRsyPOuQXW6fvAoDvQt/hbZpTR4E0K/+4D3wHHTdHQ== dependencies: "@babel/runtime" "^7.2.0" "@emotion/hash" "^0.7.1" @@ -1252,10 +1259,10 @@ prop-types "^15.7.2" warning "^4.0.1" -"@material-ui/system@^4.1.0": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.1.0.tgz#c850a625d1a5d5440e1ad039d2503da63f8c6727" - integrity sha512-1v/J2X820CzYhiH46z9qcbd+AVcQ+578ycsHAo6MVpu5eI399S6t+OcO6vg0FPhCrLshWynNGNfeF0JcLlrYzA== +"@material-ui/system@^4.2.0": + version "4.2.0" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.2.0.tgz#1c0759f1168bf871a7970239dc781b7bf9dfd010" + integrity sha512-t51525FWVDjca/3UPwN99vqyvbfGNtBVesGYH2UpxVgKOdiP1ZINeHhBrZ8h4uOu5ZwgO4aceuk1TuM9uMttYw== dependencies: "@babel/runtime" "^7.2.0" deepmerge "^3.0.0" @@ -4052,24 +4059,6 @@ escodegen@^1.11.0, escodegen@^1.9.1: optionalDependencies: source-map "~0.6.1" -eslint-config-airbnb-base@^13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.1.0.tgz#b5a1b480b80dfad16433d6c4ad84e6605052c05c" - integrity sha512-XWwQtf3U3zIoKO1BbHh6aUhJZQweOwSt4c2JrPDg9FP3Ltv3+YfEv7jIDB8275tVnO/qOHbfuYg3kzw6Je7uWw== - dependencies: - eslint-restricted-globals "^0.1.1" - object.assign "^4.1.0" - object.entries "^1.0.4" - -eslint-config-airbnb@^17.1.0: - version "17.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-airbnb/-/eslint-config-airbnb-17.1.0.tgz#3964ed4bc198240315ff52030bf8636f42bc4732" - integrity sha512-R9jw28hFfEQnpPau01NO5K/JWMGLi6aymiF6RsnMURjTk+MqZKllCqGK/0tOvHkPi/NWSSOU2Ced/GX++YxLnw== - dependencies: - eslint-config-airbnb-base "^13.1.0" - object.assign "^4.1.0" - object.entries "^1.0.4" - eslint-config-react-app@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/eslint-config-react-app/-/eslint-config-react-app-4.0.1.tgz#23fd0fd7ea89442ef1e733f66a7207674b23c8db" @@ -4096,7 +4085,7 @@ eslint-loader@2.1.2: object-hash "^1.1.4" rimraf "^2.6.1" -eslint-module-utils@^2.3.0, eslint-module-utils@^2.4.0: +eslint-module-utils@^2.3.0: version "2.4.0" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.4.0.tgz#8b93499e9b00eab80ccb6614e69f03678e84e09a" integrity sha512-14tltLm38Eu3zS+mt0KvILC3q8jyIAH518MlG+HO0p+yK885Lb1UHTY/UgR91eOyGdmxAPb+OLoW4znqIT6Ndw== @@ -4127,24 +4116,7 @@ eslint-plugin-import@2.16.0: read-pkg-up "^2.0.0" resolve "^1.9.0" -eslint-plugin-import@^2.17.3: - version "2.17.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.3.tgz#00548b4434c18faebaba04b24ae6198f280de189" - integrity sha512-qeVf/UwXFJbeyLbxuY8RgqDyEKCkqV7YC+E5S5uOjAp4tOc8zj01JP3ucoBM8JcEqd1qRasJSg6LLlisirfy0Q== - dependencies: - array-includes "^3.0.3" - contains-path "^0.1.0" - debug "^2.6.9" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.0" - has "^1.0.3" - lodash "^4.17.11" - minimatch "^3.0.4" - read-pkg-up "^2.0.0" - resolve "^1.11.0" - -eslint-plugin-jsx-a11y@6.2.1, eslint-plugin-jsx-a11y@^6.2.1: +eslint-plugin-jsx-a11y@6.2.1: version "6.2.1" resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.1.tgz#4ebba9f339b600ff415ae4166e3e2e008831cf0c" integrity sha512-cjN2ObWrRz0TTw7vEcGQrx+YltMvZoOEx4hWU8eEERDnBIU00OTq7Vr+jA7DFKxiwLNv4tTh5Pq2GUNEa8b6+w== @@ -4176,24 +4148,6 @@ eslint-plugin-react@7.12.4: prop-types "^15.6.2" resolve "^1.9.0" -eslint-plugin-react@^7.13.0: - version "7.13.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.13.0.tgz#bc13fd7101de67996ea51b33873cd9dc2b7e5758" - integrity sha512-uA5LrHylu8lW/eAH3bEQe9YdzpPaFd9yAJTwTi/i/BKTD7j6aQMKVAdGM/ML72zD6womuSK7EiGtMKuK06lWjQ== - dependencies: - array-includes "^3.0.3" - doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.1.0" - object.fromentries "^2.0.0" - prop-types "^15.7.2" - resolve "^1.10.1" - -eslint-restricted-globals@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/eslint-restricted-globals/-/eslint-restricted-globals-0.1.1.tgz#35f0d5cbc64c2e3ed62e93b4b1a7af05ba7ed4d7" - integrity sha1-NfDVy8ZMLj7WLpO0saevBbp+1Nc= - eslint-scope@3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" @@ -6817,13 +6771,6 @@ jsx-ast-utils@^2.0.1: dependencies: array-includes "^3.0.3" -jsx-ast-utils@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.1.0.tgz#0ee4e2c971fb9601c67b5641b71be80faecf0b36" - integrity sha512-yDGDG2DS4JcqhA6blsuYbtsT09xL8AoLuUR2Gb5exrw7UEM19sBcOTq+YBBhrNbl0PUC4R4LnFu+dHg2HKeVvA== - dependencies: - array-includes "^3.0.3" - keycode@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04" @@ -9760,13 +9707,6 @@ resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1: dependencies: path-parse "^1.0.6" -resolve@^1.10.1, resolve@^1.11.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232" - integrity sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw== - dependencies: - path-parse "^1.0.6" - restore-cursor@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf" @@ -10826,10 +10766,10 @@ tslint-react@^4.0.0: dependencies: tsutils "^3.9.1" -tslint@^5.17.0: - version "5.17.0" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.17.0.tgz#f9f0ce2011d8e90debaa6e9b4975f24cd16852b8" - integrity sha512-pflx87WfVoYepTet3xLfDOLDm9Jqi61UXIKePOuca0qoAZyrGWonDG9VTbji58Fy+8gciUn8Bt7y69+KEVjc/w== +tslint@^5.18.0: + version "5.18.0" + resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.18.0.tgz#f61a6ddcf372344ac5e41708095bbf043a147ac6" + integrity sha512-Q3kXkuDEijQ37nXZZLKErssQVnwCV/+23gFEMROi8IlbaBG6tXqLPQJ5Wjcyt/yHPKBC+hD5SzuGaMora+ZS6w== dependencies: "@babel/code-frame" "^7.0.0" builtin-modules "^1.1.1" @@ -10904,10 +10844,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.1.tgz#ba72a6a600b2158139c5dd8850f700e231464202" - integrity sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw== +typescript@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.2.tgz#a09e1dc69bc9551cadf17dba10ee42cf55e5d56c" + integrity sha512-7KxJovlYhTX5RaRbUdkAXN1KUZ8PwWlTzQdHV6xNqvuFOs7+WBo10TQUqT19Q/Jz2hk5v9TQDIhyLhhJY4p5AA== ua-parser-js@^0.7.18: version "0.7.19"