From 2deb6a4004245863ebbae30697d07798badf44dc Mon Sep 17 00:00:00 2001 From: David Cramer Date: Mon, 11 Nov 2019 17:26:55 -0800 Subject: [PATCH] Update more things --- package.json | 49 +- webapp/components/AggregateTestList.jsx | 14 +- webapp/components/Badge.jsx | 3 +- webapp/components/Breadcrumbs.jsx | 2 +- webapp/components/BuildCoverage.jsx | 7 +- webapp/components/BuildDetailsBase.jsx | 7 +- webapp/components/BuildListItem.jsx | 6 +- webapp/components/BuildOverviewBase.jsx | 6 +- webapp/components/BundleList.jsx | 4 +- webapp/components/Button.jsx | 3 +- webapp/components/ChangeRequestListItem.jsx | 6 +- webapp/components/Collapsable.jsx | 2 +- webapp/components/Container.jsx | 2 +- webapp/components/Content.jsx | 2 +- webapp/components/Fieldset.jsx | 2 +- webapp/components/Footer.jsx | 2 +- webapp/components/FormActions.jsx | 2 +- webapp/components/Header.jsx | 7 +- webapp/components/HorizontalHeader.jsx | 2 +- webapp/components/Input.jsx | 2 +- webapp/components/Label.jsx | 2 +- webapp/components/ListItemLink.jsx | 2 +- webapp/components/Nav.jsx | 2 +- webapp/components/NavHeading.jsx | 2 +- webapp/components/ObjectAuthor.jsx | 4 +- webapp/components/ObjectResult.jsx | 34 +- webapp/components/PageLoadingIndicator.jsx | 2 +- webapp/components/Panel.jsx | 2 +- webapp/components/RepositoryNav.jsx | 2 +- webapp/components/RepositoryNavItem.jsx | 2 +- webapp/components/ResultGrid.jsx | 4 +- webapp/components/ResultGridRow.jsx | 2 +- webapp/components/RevisionListItem.jsx | 6 +- webapp/components/ScrollView.jsx | 2 +- webapp/components/Section.jsx | 2 +- webapp/components/SectionHeading.jsx | 2 +- webapp/components/SectionSubheading.jsx | 2 +- webapp/components/Select.jsx | 2 +- webapp/components/StyleViolationList.jsx | 2 +- webapp/components/SyntaxHighlight.jsx | 2 +- webapp/components/TabbedNav.jsx | 2 +- webapp/components/TabbedNavItem.jsx | 2 +- webapp/components/TestChart.jsx | 2 +- webapp/components/TestDetails.jsx | 2 +- webapp/components/TestList.jsx | 4 +- webapp/components/ToastIndicator.jsx | 2 +- webapp/components/Tree.jsx | 2 +- webapp/index.jsx | 17 +- webapp/pages/Dashboard.jsx | 12 +- webapp/pages/GitHubRepositoryList.jsx | 4 +- webapp/pages/RepositoryHookDetails.jsx | 2 +- webapp/pages/RepositoryOverview.jsx | 8 +- webapp/pages/RepositorySettingsLayout.jsx | 2 +- webapp/pages/TestDetails.jsx | 4 +- webapp/pages/TokenSettings.jsx | 13 +- webapp/pages/Welcome.jsx | 2 +- webapp/utils/media.jsx | 4 +- yarn.lock | 827 ++++++++++++-------- 58 files changed, 658 insertions(+), 463 deletions(-) diff --git a/package.json b/package.json index 86eeb5e8..28309273 100644 --- a/package.json +++ b/package.json @@ -10,14 +10,13 @@ "enzyme-to-json": "^3.4.3", "eslint": "^6.6.0", "eslint-loader": "^3.0.2", - "eslint-plugin-babel": "^4.1.1", - "eslint-plugin-flowtype": "2.34.0", + "eslint-plugin-babel": "^5.3.0", "eslint-plugin-import": "^2.18.2", "eslint-plugin-jsx-a11y": "^6.2.3", "eslint-plugin-react": "^7.16.0", "jest": "^24.9.0", "jest-junit": "^9.0.0", - "mockdate": "^2.0.2", + "mockdate": "^2.0.5", "prettier": "^1.19.1", "react-dev-utils": "^9.1.0", "react-test-renderer": "^16.11.0", @@ -32,50 +31,51 @@ "@babel/preset-env": "^7.7.1", "@babel/preset-react": "^7.7.0", "@babel/register": "^7.7.0", + "@emotion/core": "^10.0.22", + "@emotion/styled": "^10.0.23", + "@rebass/grid": "^6.1.0", "@sentry/browser": "^5.8.0", "@sentry/integrations": "^5.8.0", "babel-loader": "^8.0.6", "babel-plugin-idx": "^2.4.0", - "case-sensitive-paths-webpack-plugin": "2.1.1", + "case-sensitive-paths-webpack-plugin": "2.2.0", "chalk": "1.1.3", - "chart.js": "^2.7.2", - "classnames": "^2.2.5", + "chart.js": "^2.9.2", + "classnames": "^2.2.6", "dompurify": "^2.0.7", - "dotenv": "4.0.0", + "dotenv": "8.2.0", + "emotion-theming": "^10.0.19", "file-loader": "^4.2.0", - "fs-extra": "3.0.1", - "grid-styled": "^2.0.0-8", + "fs-extra": "8.1.0", "html-webpack-plugin": "^3.2.0", "idx": "^2.5.6", - "lodash": "^4.17.13", + "lodash": "^4.17.15", "marked": "^0.7.0", - "moment": "^2.18.1", + "moment": "^2.24.0", "object-assign": "4.1.1", - "percentile": "^1.2.0", - "promise": "7.1.1", - "prop-types": "^15.6.2", + "percentile": "^1.2.2", + "promise": "8.0.3", + "prop-types": "^15.7.2", "react": "^16.11.0", - "react-chartjs-2": "^2.7.4", + "react-chartjs-2": "^2.8.0", "react-document-title": "^2.0.3", "react-dom": "^16.11.0", "react-gravatar": "^2.6.3", - "react-icon-base": "^2.0.8", - "react-icons": "^2.2.7", - "react-loadable": "^5.3.1", - "react-redux": "5", + "react-icon-base": "^2.1.2", + "react-icons": "^3.8.0", + "react-loadable": "^5.5.0", + "react-redux": "7.1.3", "react-router": "3", "react-select": "^1.0.0-rc.10", - "react-syntax-highlighter": "^6.1.1", + "react-syntax-highlighter": "^11.0.2", "react-transition-group": "^4.3.0", "redux": "^4.0.4", "redux-thunk": "^2.3.0", - "style-loader": "0.18.2", - "styled-components": "^4.4.1", "sw-precache-webpack-plugin": "^0.11.5", "webpack": "^4.41.2", "webpack-cli": "^3.3.10", "webpack-manifest-plugin": "^2.2.0", - "whatwg-fetch": "2.0.3" + "whatwg-fetch": "3.0.0" }, "scripts": { "start": "node scripts/start.js", @@ -162,7 +162,8 @@ "plugin:react/recommended" ], "rules": { - "react/no-deprecated": "off" + "react/no-deprecated": "off", + "react/prop-types": "off" } }, "volta": { diff --git a/webapp/components/AggregateTestList.jsx b/webapp/components/AggregateTestList.jsx index f4fb5c82..2da4f2e7 100644 --- a/webapp/components/AggregateTestList.jsx +++ b/webapp/components/AggregateTestList.jsx @@ -1,11 +1,9 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import {Flex, Box} from 'grid-styled'; +import {Flex, Box} from '@rebass/grid/emotion'; import {Link} from 'react-router'; -import styled from 'styled-components'; -import ExpandIcon from 'react-icons/lib/md/expand-more'; -import CollapseIcon from 'react-icons/lib/md/expand-less'; -import HistoryIcon from 'react-icons/lib/md/history'; +import styled from '@emotion/styled'; +import {MdExpandLess, MdExpandMore, MdHistory} from 'react-icons/md'; import Collapsable from './Collapsable'; import {AggregateDuration} from './ObjectDuration'; @@ -43,9 +41,9 @@ class TestListItem extends Component { {test.name} {this.state.expanded ? ( - + ) : ( - + )} @@ -64,7 +62,7 @@ class TestListItem extends Component { - + diff --git a/webapp/components/Badge.jsx b/webapp/components/Badge.jsx index 23d813f0..b1da06ae 100644 --- a/webapp/components/Badge.jsx +++ b/webapp/components/Badge.jsx @@ -1,4 +1,5 @@ -import styled, {css} from 'styled-components'; +import {css} from '@emotion/core'; +import styled from '@emotion/styled'; export default styled.span` font-size: 65%; diff --git a/webapp/components/Breadcrumbs.jsx b/webapp/components/Breadcrumbs.jsx index 7d3c4ffa..99010e7c 100644 --- a/webapp/components/Breadcrumbs.jsx +++ b/webapp/components/Breadcrumbs.jsx @@ -1,7 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import {Link} from 'react-router'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; export const Breadcrumbs = styled.div` display: inline-block; diff --git a/webapp/components/BuildCoverage.jsx b/webapp/components/BuildCoverage.jsx index 586623cd..aef59626 100644 --- a/webapp/components/BuildCoverage.jsx +++ b/webapp/components/BuildCoverage.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; import {Link} from 'react-router'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; import Section from '../components/Section'; import {ResultGrid, Column, Header, Row} from '../components/ResultGrid'; @@ -251,9 +251,8 @@ export default class BuildCoverage extends Component { {!!result.build && (

Data from{' '} - {`${ - repo.owner_name - }/${repo.name}#${result.build.number}`} + {`${repo.owner_name}/${repo.name}#${result.build.number}`}

)}

diff --git a/webapp/components/BuildDetailsBase.jsx b/webapp/components/BuildDetailsBase.jsx index 7adbc098..ac09fd14 100644 --- a/webapp/components/BuildDetailsBase.jsx +++ b/webapp/components/BuildDetailsBase.jsx @@ -1,6 +1,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import styled, {css} from 'styled-components'; +import {css} from '@emotion/core'; +import styled from '@emotion/styled'; import AsyncPage from '../components/AsyncPage'; import Badge from '../components/Badge'; @@ -12,7 +13,7 @@ import TabbedNav from '../components/TabbedNav'; import TabbedNavItem from '../components/TabbedNavItem'; import TimeSince from '../components/TimeSince'; -import MdClock from 'react-icons/lib/md/access-time'; +import {MdAccessTime} from 'react-icons/md'; export default class BuildDetailsBase extends AsyncPage { static contextTypes = { @@ -60,7 +61,7 @@ export default class BuildDetailsBase extends AsyncPage { )}

{props.children}
; diff --git a/webapp/components/ObjectAuthor.jsx b/webapp/components/ObjectAuthor.jsx index 37e52415..a6e20f24 100644 --- a/webapp/components/ObjectAuthor.jsx +++ b/webapp/components/ObjectAuthor.jsx @@ -1,9 +1,9 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; import idx from 'idx'; import Gravatar from 'react-gravatar'; -import MdPerson from 'react-icons/lib/md/person'; +import {MdPerson} from 'react-icons/md'; const Avatar = styled.span` img { diff --git a/webapp/components/ObjectResult.jsx b/webapp/components/ObjectResult.jsx index fd1b29a5..ab211c50 100644 --- a/webapp/components/ObjectResult.jsx +++ b/webapp/components/ObjectResult.jsx @@ -1,14 +1,17 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import styled, {css} from 'styled-components'; +import {css} from '@emotion/core'; +import styled from '@emotion/styled'; -import PassedIcon from 'react-icons/lib/md/check-circle'; -import InProgressIcon from 'react-icons/lib/md/av-timer'; -import QueuedIcon from 'react-icons/lib/md/history'; -import AbortedIcon from 'react-icons/lib/md/cancel'; -import ErroredIcon from 'react-icons/lib/md/error'; -import FailedIcon from 'react-icons/lib/md/remove-circle'; -import UnknownIcon from 'react-icons/lib/md/help'; +import { + MdCheckCircle, + MdAvTimer, + MdHistory, + MdCancel, + MdError, + MdRemoveCircle, + MdHelp +} from 'react-icons/md'; export default class ObjectResult extends Component { static propTypes = { @@ -27,21 +30,20 @@ export default class ObjectResult extends Component { let {size} = this.props; switch (status) { case 'queued': - return ; + return ; case 'in_progress': - return ; + return ; default: - if (status === 'finished' && result === 'unknown') - return ; + if (status === 'finished' && result === 'unknown') return ; switch (result) { case 'passed': - return ; + return ; case 'aborted': - return ; + return ; case 'failed': - return ; + return ; case 'errored': - return ; + return ; default: return null; } diff --git a/webapp/components/PageLoadingIndicator.jsx b/webapp/components/PageLoadingIndicator.jsx index 7f528bbd..48cdeeba 100644 --- a/webapp/components/PageLoadingIndicator.jsx +++ b/webapp/components/PageLoadingIndicator.jsx @@ -1,5 +1,5 @@ import React, {Component} from 'react'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; class PageLoadingIndicator extends Component { render() { diff --git a/webapp/components/Panel.jsx b/webapp/components/Panel.jsx index 5697e727..58111fd6 100644 --- a/webapp/components/Panel.jsx +++ b/webapp/components/Panel.jsx @@ -1,4 +1,4 @@ -import styled from 'styled-components'; +import styled from '@emotion/styled'; export default styled.div` background: #fff; diff --git a/webapp/components/RepositoryNav.jsx b/webapp/components/RepositoryNav.jsx index 8968aeed..89076781 100644 --- a/webapp/components/RepositoryNav.jsx +++ b/webapp/components/RepositoryNav.jsx @@ -1,4 +1,4 @@ -import styled from 'styled-components'; +import styled from '@emotion/styled'; export default styled.div` overflow: hidden; diff --git a/webapp/components/RepositoryNavItem.jsx b/webapp/components/RepositoryNavItem.jsx index 0b799897..478658d0 100644 --- a/webapp/components/RepositoryNavItem.jsx +++ b/webapp/components/RepositoryNavItem.jsx @@ -1,5 +1,5 @@ import {Link} from 'react-router'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; const RepositoryNavItem = styled(Link)` cursor: pointer; diff --git a/webapp/components/ResultGrid.jsx b/webapp/components/ResultGrid.jsx index 087215d8..f845fa5b 100644 --- a/webapp/components/ResultGrid.jsx +++ b/webapp/components/ResultGrid.jsx @@ -1,6 +1,6 @@ import React from 'react'; -import {Flex, Box} from 'grid-styled'; -import styled from 'styled-components'; +import {Flex, Box} from '@rebass/grid/emotion'; +import styled from '@emotion/styled'; import media from '../utils/media'; diff --git a/webapp/components/ResultGridRow.jsx b/webapp/components/ResultGridRow.jsx index 80f849b6..0a790079 100644 --- a/webapp/components/ResultGridRow.jsx +++ b/webapp/components/ResultGridRow.jsx @@ -1,4 +1,4 @@ -import styled from 'styled-components'; +import styled from '@emotion/styled'; export default styled.div` display: block; diff --git a/webapp/components/RevisionListItem.jsx b/webapp/components/RevisionListItem.jsx index 295eb4bc..e9d2dbd4 100644 --- a/webapp/components/RevisionListItem.jsx +++ b/webapp/components/RevisionListItem.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; -import {Flex, Box} from 'grid-styled'; +import styled from '@emotion/styled'; +import {Flex, Box} from '@rebass/grid/emotion'; import BuildListItem from './BuildListItem'; import ListItemLink from './ListItemLink'; @@ -41,7 +41,7 @@ export default class RevisionListItem extends Component { - + {revision.message.split('\n')[0]} diff --git a/webapp/components/ScrollView.jsx b/webapp/components/ScrollView.jsx index 3e129aa9..243644ae 100644 --- a/webapp/components/ScrollView.jsx +++ b/webapp/components/ScrollView.jsx @@ -1,4 +1,4 @@ -import styled from 'styled-components'; +import styled from '@emotion/styled'; export default styled.div` position: absolute; diff --git a/webapp/components/Section.jsx b/webapp/components/Section.jsx index 686b48b7..85ed53dc 100644 --- a/webapp/components/Section.jsx +++ b/webapp/components/Section.jsx @@ -1,4 +1,4 @@ -import styled from 'styled-components'; +import styled from '@emotion/styled'; export default styled.div` margin-bottom: 20px; diff --git a/webapp/components/SectionHeading.jsx b/webapp/components/SectionHeading.jsx index 6e0025f2..2f32033a 100644 --- a/webapp/components/SectionHeading.jsx +++ b/webapp/components/SectionHeading.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; export default styled(({...props}) => { return
{props.children}
; diff --git a/webapp/components/SectionSubheading.jsx b/webapp/components/SectionSubheading.jsx index 1f2649a3..a24b1774 100644 --- a/webapp/components/SectionSubheading.jsx +++ b/webapp/components/SectionSubheading.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; export default styled(({...props}) => { return
{props.children}
; diff --git a/webapp/components/Select.jsx b/webapp/components/Select.jsx index 50678afc..3b683741 100644 --- a/webapp/components/Select.jsx +++ b/webapp/components/Select.jsx @@ -1,4 +1,4 @@ -import styled from 'styled-components'; +import styled from '@emotion/styled'; export default styled.select` padding: 4px 8px; diff --git a/webapp/components/StyleViolationList.jsx b/webapp/components/StyleViolationList.jsx index 6b9aaceb..914d0a66 100644 --- a/webapp/components/StyleViolationList.jsx +++ b/webapp/components/StyleViolationList.jsx @@ -1,6 +1,6 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; import Collapsable from './Collapsable'; import {ResultGrid, Column, Header, Row} from './ResultGrid'; diff --git a/webapp/components/SyntaxHighlight.jsx b/webapp/components/SyntaxHighlight.jsx index 0a2b587f..9694727d 100644 --- a/webapp/components/SyntaxHighlight.jsx +++ b/webapp/components/SyntaxHighlight.jsx @@ -2,7 +2,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; import SyntaxHighlighter from 'react-syntax-highlighter'; -import {atomOneLight} from 'react-syntax-highlighter/styles/hljs'; +import {atomOneLight} from 'react-syntax-highlighter/dist/esm/styles/hljs'; const highlightStyle = { ...atomOneLight, diff --git a/webapp/components/TabbedNav.jsx b/webapp/components/TabbedNav.jsx index 98151985..7885dc48 100644 --- a/webapp/components/TabbedNav.jsx +++ b/webapp/components/TabbedNav.jsx @@ -1,4 +1,4 @@ -import styled from 'styled-components'; +import styled from '@emotion/styled'; export default styled.div` margin: 0 0 20px; diff --git a/webapp/components/TabbedNavItem.jsx b/webapp/components/TabbedNavItem.jsx index 8773c71e..a2a1f07e 100644 --- a/webapp/components/TabbedNavItem.jsx +++ b/webapp/components/TabbedNavItem.jsx @@ -1,5 +1,5 @@ import {Link} from 'react-router'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; const TabbedNavItem = styled(Link)` cursor: pointer; diff --git a/webapp/components/TestChart.jsx b/webapp/components/TestChart.jsx index d047affb..e4aad6e0 100644 --- a/webapp/components/TestChart.jsx +++ b/webapp/components/TestChart.jsx @@ -1,6 +1,6 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; import {Header} from './ResultGrid'; diff --git a/webapp/components/TestDetails.jsx b/webapp/components/TestDetails.jsx index 880b30d6..58ab4af2 100644 --- a/webapp/components/TestDetails.jsx +++ b/webapp/components/TestDetails.jsx @@ -1,6 +1,6 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; import {Client} from '../api'; diff --git a/webapp/components/TestList.jsx b/webapp/components/TestList.jsx index e0a47ce0..fc9bbdb3 100644 --- a/webapp/components/TestList.jsx +++ b/webapp/components/TestList.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; -import {Flex, Box} from 'grid-styled'; -import styled from 'styled-components'; +import {Flex, Box} from '@rebass/grid/emotion'; +import styled from '@emotion/styled'; import {Client} from '../api'; diff --git a/webapp/components/ToastIndicator.jsx b/webapp/components/ToastIndicator.jsx index ca8d676a..0e582faa 100644 --- a/webapp/components/ToastIndicator.jsx +++ b/webapp/components/ToastIndicator.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react'; import PropTypes from 'prop-types'; import classNames from 'classnames'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; class ToastIndicator extends Component { static propTypes = { diff --git a/webapp/components/Tree.jsx b/webapp/components/Tree.jsx index 6d90a87f..d9b83fd1 100644 --- a/webapp/components/Tree.jsx +++ b/webapp/components/Tree.jsx @@ -1,5 +1,5 @@ import {Link} from 'react-router'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; import Section from './Section'; diff --git a/webapp/index.jsx b/webapp/index.jsx index b05750a9..d688c887 100644 --- a/webapp/index.jsx +++ b/webapp/index.jsx @@ -2,6 +2,7 @@ import React from 'react'; import {Router, browserHistory} from 'react-router'; import {render} from 'react-dom'; import {Provider} from 'react-redux'; +import {ThemeProvider} from 'emotion-theming'; // import {setAuth} from './actions/auth'; @@ -22,10 +23,6 @@ import store from './store'; // } // } -// import {registerLanguage} from 'react-syntax-highlighter/dist/light'; -// import diff from 'react-syntax-highlighter/dist/languages/diff'; -// registerLanguage('diff', diff); - import * as Sentry from '@sentry/browser'; import {Tracing} from '@sentry/integrations'; @@ -39,9 +36,15 @@ Sentry.init({ ] }); +const theme = { + space: [0, 4, 8, 16, 32, 64, 128, 256] +}; + render( - - - , + + + + + , document.getElementById('root') ); diff --git a/webapp/pages/Dashboard.jsx b/webapp/pages/Dashboard.jsx index 8f627591..3055327d 100644 --- a/webapp/pages/Dashboard.jsx +++ b/webapp/pages/Dashboard.jsx @@ -1,11 +1,11 @@ import React from 'react'; -import {Flex, Box} from 'grid-styled'; +import {Flex, Box} from '@rebass/grid/emotion'; import {Link} from 'react-router'; -import styled from 'styled-components'; +import styled from '@emotion/styled'; import {connect} from 'react-redux'; import PropTypes from 'prop-types'; -import ViewAllIcon from 'react-icons/lib/md/input'; +import {MdInput} from 'react-icons/md'; import {fetchBuilds} from '../actions/builds'; import {subscribe} from '../decorators/stream'; @@ -63,7 +63,7 @@ class RepoListSection extends AsyncComponent { Your Repositories - + @@ -129,7 +129,7 @@ class BuildListSection extends AsyncComponent { Your Builds - + {super.renderContent()} @@ -175,7 +175,7 @@ export class Dashboard extends AsyncPage { return ( - + diff --git a/webapp/pages/GitHubRepositoryList.jsx b/webapp/pages/GitHubRepositoryList.jsx index df8ce036..670708f1 100644 --- a/webapp/pages/GitHubRepositoryList.jsx +++ b/webapp/pages/GitHubRepositoryList.jsx @@ -2,7 +2,7 @@ import React, {Component} from 'react'; import {Link} from 'react-router'; import {connect} from 'react-redux'; import PropTypes from 'prop-types'; -import {Flex, Box} from 'grid-styled'; +import {Flex, Box} from '@rebass/grid/emotion'; import {addIndicator, removeIndicator} from '../actions/indicators'; import {addRepo, removeRepo, updateRepo} from '../actions/repos'; @@ -197,7 +197,7 @@ class GitHubRepositoryList extends AsyncPage { return ( - +
{!this.hasPrivateScope() && (