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.

Sign up for GitHub

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

Jump to bottom

[yarn] Upgrade the dependencies #277

Merged
merged 1 commit into from
May 8, 2017
Merged

[yarn] Upgrade the dependencies #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
},
"homepage": "https://github.com/argos-ci/argos#readme",
"dependencies": {
"@risingstack/trace": "^3.6.2",
"@risingstack/trace": "^3.8.0",
"amqplib": "^0.5.1",
"assets-webpack-plugin": "^3.5.1",
"aws-sdk": "^2.45.0",
"aws-sdk": "^2.49.0",
"babel-cli": "^6.24.1",
"babel-core": "^6.24.1",
"babel-loader": "^7.0.0",
Expand All @@ -62,7 +62,7 @@
"classnames": "^2.2.5",
"clear-require": "^2.0.0",
"compression": "^1.6.2",
"connect-redis": "^3.2.0",
"connect-redis": "^3.3.0",
"convict": "^3.0.0",
"ejs": "^2.5.6",
"enzyme": "^2.8.2",
Expand All @@ -74,16 +74,16 @@
"file-loader": "^0.11.1",
"force-case-sensitivity-webpack-plugin": "^0.2.1",
"github": "^9.2.0",
"graphql": "^0.9.3",
"graphql": "^0.9.6",
"heroku-node-settings": "^1.0.2",
"html-minifier": "^3.4.3",
"html-minifier": "^3.4.4",
"image-diff": "^1.6.3",
"image-webpack-loader": "^3.3.0",
"jss": "^6.5.0",
"knex": "^0.13.0",
"lodash": "^4.17.4",
"marked": "^0.3.6",
"material-ui": "1.0.0-alpha.12",
"material-ui": "1.0.0-alpha.13",
"mime": "^1.3.4",
"minimist": "^1.2.0",
"morgan": "^1.8.1",
Expand All @@ -99,7 +99,7 @@
"promirepl": "^1.0.1",
"prop-types": "^15.5.8",
"raven": "^1.2.1",
"raven-js": "^3.14.2",
"raven-js": "^3.15.0",
"raw-loader": "^0.5.1",
"react": "^15.5.4",
"react-addons-test-utils": "^15.5.1",
Expand All @@ -112,12 +112,12 @@
"redux": "^3.6.0",
"redux-logger": "^3.0.1",
"redux-observable": "^0.14.1",
"rxjs": "^5.3.0",
"sinon": "^2.1.0",
"rxjs": "^5.3.1",
"sinon": "^2.2.0",
"tmp": "^0.0.31",
"uuid": "^3.0.1",
"warning": "^3.0.0",
"webpack": "^2.4.1",
"webpack": "^2.5.1",
"whatwg-fetch": "^2.0.3"
},
"devDependencies": {
Expand All @@ -131,10 +131,10 @@
"eslint-plugin-import": "^2.1.0",
"eslint-plugin-jsx-a11y": "^3.0.2",
"eslint-plugin-mocha": "^4.9.0",
"eslint-plugin-react": "^6.10.3",
"eslint-plugin-react": "^7.0.0",
"factory-girl": "^4.2.2",
"foreman": "^2.0.0",
"jest": "^19.0.2",
"jest": "^20.0.0",
"nock": "^9.0.13",
"nodemon": "^1.11.0",
"react-test-renderer": "^15.5.4",
Expand Down
10 changes: 5 additions & 5 deletions src/modules/components/WatchTaskContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import { withStyles, createStyleSheet } from 'material-ui/styles'
import Layout from 'material-ui/Layout'
import Grid from 'material-ui/Grid'

const styleSheet = createStyleSheet('WatchTaskContainer', theme => ({
root: {
Expand All @@ -13,16 +13,16 @@ const styleSheet = createStyleSheet('WatchTaskContainer', theme => ({

function WatchTaskContainer(props) {
return (
<Layout
<Grid
container
justify="center"
className={props.classes.root}
align="center"
>
<Layout item>
<Grid item>
{props.children}
</Layout>
</Layout>
</Grid>
</Grid>
)
}

Expand Down
16 changes: 8 additions & 8 deletions src/review/modules/AppBar/AppBar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import { connect } from 'react-redux'
import { Link as LinkRouter } from 'react-router'
import Toolbar from 'material-ui/Toolbar'
import Avatar from 'material-ui/Avatar'
import Layout from 'material-ui/Layout'
import Grid from 'material-ui/Grid'
import Typography from 'material-ui/Typography'
import { Menu, MenuItem } from 'material-ui/Menu'
import Menu, { MenuItem } from 'material-ui/Menu'
import { withStyles, createStyleSheet } from 'material-ui/styles'
import recompact from 'modules/recompact'
import Link from 'modules/components/Link'
Expand Down Expand Up @@ -71,16 +71,16 @@ class ReviewAppBar extends Component {
aria-owns="review-app-bar-menu"
aria-haspopup="true"
>
<Layout container align="center">
<Layout item>
<Grid container align="center">
<Grid item>
<Typography colorInherit>
{user.name}
</Typography>
</Layout>
<Layout item>
</Grid>
<Grid item>
<Avatar src={`https://github.com/${user.login}.png?size=${AVATAR_SIZE}`} />
</Layout>
</Layout>
</Grid>
</Grid>
</Link>
) : null}
{user ? (
Expand Down
14 changes: 7 additions & 7 deletions src/review/modules/components/AuthorizationNotice.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import { withStyles, createStyleSheet } from 'material-ui/styles'
import Paper from 'material-ui/Paper'
import Layout from 'material-ui/Layout'
import Grid from 'material-ui/Grid'
import Button from 'material-ui/Button'
import recompact from 'modules/recompact'
import Link from 'modules/components/Link'
Expand All @@ -22,11 +22,11 @@ function AuthorizationNotice({ authorizationStatus, classes, user }) {

return (
<Paper className={classes.paper}>
<Layout container align="center" justify="center">
<Layout item xs={12} sm>
<Grid container align="center" justify="center">
<Grid item xs={12} sm>
Your GitHub authentification is outdated, please authenticate to fix it.
</Layout>
<Layout item>
</Grid>
<Grid item>
<Button
accent
compact
Expand All @@ -36,8 +36,8 @@ function AuthorizationNotice({ authorizationStatus, classes, user }) {
>
Authenticate to GitHub
</Button>
</Layout>
</Layout>
</Grid>
</Grid>
</Paper>
)
}
Expand Down
20 changes: 10 additions & 10 deletions src/review/routes/build/BuildScreenshotItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import classnames from 'classnames'
import { withStyles, createStyleSheet } from 'material-ui/styles'
import { Paper } from 'material-ui/Paper'
import Layout from 'material-ui/Layout'
import Paper from 'material-ui/Paper'
import Grid from 'material-ui/Grid'
import Typography from 'material-ui/Typography'
import IconButton from 'material-ui/IconButton'
import Collapse from 'material-ui/transitions/Collapse'
Expand Down Expand Up @@ -87,8 +87,8 @@ function BuildScreenshotItem(props) {
</IconButton>
</div>
<Collapse in={expandIn} transitionDuration="auto" unmountOnExit>
<Layout container>
<Layout item xs={4}>
<Grid container>
<Grid item xs={4}>
{baseScreenshot ? (
<a
href={getS3Url(baseScreenshot.s3Id, screenshotsBucket)}
Expand All @@ -102,8 +102,8 @@ function BuildScreenshotItem(props) {
/>
</a>
) : null}
</Layout>
<Layout item xs={4}>
</Grid>
<Grid item xs={4}>
<a
href={getS3Url(compareScreenshot.s3Id, screenshotsBucket)}
target="_blank"
Expand All @@ -115,8 +115,8 @@ function BuildScreenshotItem(props) {
src={getS3Url(compareScreenshot.s3Id, screenshotsBucket)}
/>
</a>
</Layout>
<Layout item xs={4}>
</Grid>
<Grid item xs={4}>
{s3Id && (
<a
href={getS3Url(s3Id, screenshotsBucket)}
Expand All @@ -130,8 +130,8 @@ function BuildScreenshotItem(props) {
/>
</a>
)}
</Layout>
</Layout>
</Grid>
</Grid>
</Collapse>
</Paper>
</ItemStatus>
Expand Down
10 changes: 5 additions & 5 deletions src/review/routes/build/BuildScreenshots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import Typography from 'material-ui/Typography'
import Layout from 'material-ui/Layout'
import Grid from 'material-ui/Grid'
import recompact from 'modules/recompact'
import BuildScreenshotItem from 'review/routes/build/BuildScreenshotItem'

Expand All @@ -16,13 +16,13 @@ function BuildScreenshots(props) {
<Typography type="headline" component="h3" gutterBottom>
Screenshots
</Typography>
<Layout container direction="column">
<Grid container direction="column">
{fetch.output.data.build.screenshotDiffs.map(screenshotDiff => (
<Layout item key={screenshotDiff.id}>
<Grid item key={screenshotDiff.id}>
<BuildScreenshotItem screenshotDiff={screenshotDiff} />
</Layout>
</Grid>
))}
</Layout>
</Grid>
</div>
)
}
Expand Down
14 changes: 7 additions & 7 deletions src/review/routes/build/BuildSummaryBody.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import PropTypes from 'prop-types'
import { withStyles, createStyleSheet } from 'material-ui/styles'
import Layout from 'material-ui/Layout'
import Grid from 'material-ui/Grid'
import Link from 'modules/components/Link'
import ItemStatus from 'review/modules/components/ItemStatus'
import BuildActions from 'review/routes/build/BuildActions'
Expand Down Expand Up @@ -61,8 +61,8 @@ export function BuildSummaryBodyView(props) {
return (
<ItemStatus status={status}>
<div className={classes.itemStatusChild}>
<Layout container>
<Layout item xs={12} sm>
<Grid container>
<Grid item xs={12} sm>
<ul className={classes.list}>
<li>{`Job status: ${status}`}</li>
<li>
Expand All @@ -78,11 +78,11 @@ export function BuildSummaryBodyView(props) {
{compare}
<li>{`Date: ${new Intl.DateTimeFormat().format(new Date(createdAt))}`}</li>
</ul>
</Layout>
<Layout item>
</Grid>
<Grid item>
<BuildActions build={build} />
</Layout>
</Layout>
</Grid>
</Grid>
</div>
</ItemStatus>
)
Expand Down
20 changes: 8 additions & 12 deletions src/review/routes/dashboard/Dashboard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,10 @@ import PropTypes from 'prop-types'
import { Link as LinkRouter } from 'react-router'
import { connect } from 'react-redux'
import Typography from 'material-ui/Typography'
import Layout from 'material-ui/Layout'
import Grid from 'material-ui/Grid'
import Avatar from 'material-ui/Avatar'
import Paper from 'material-ui/Paper'
import {
List,
ListItem,
ListItemText,
} from 'material-ui/List'
import List, { ListItem, ListItemText } from 'material-ui/List'
import { withStyles, createStyleSheet } from 'material-ui/styles'
import recompact from 'modules/recompact'
import WatchTask from 'modules/components/WatchTask'
Expand Down Expand Up @@ -40,13 +36,13 @@ function Dashboard(props) {
<AuthorizationNotice />
<ScrollView>
<LayoutBody margin>
<Layout container gutter={24}>
<Layout item xs={12}>
<Grid container gutter={24}>
<Grid item xs={12}>
<Typography type="display1" component="h2">
Dashboard
</Typography>
</Layout>
<Layout item xs={12}>
</Grid>
<Grid item xs={12}>
<Paper className={classes.paper}>
<WatchTask task={fetch}>
{(data) => {
Expand Down Expand Up @@ -78,8 +74,8 @@ function Dashboard(props) {
}}
</WatchTask>
</Paper>
</Layout>
</Layout>
</Grid>
</Grid>
</LayoutBody>
</ScrollView>
</ViewContainer>
Expand Down
20 changes: 10 additions & 10 deletions src/review/routes/profile/Account.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import PropTypes from 'prop-types'
import { connect } from 'react-redux'
import Typography from 'material-ui/Typography'
import Button from 'material-ui/Button'
import { List } from 'material-ui/List'
import List from 'material-ui/List'
import Paper from 'material-ui/Paper'
import Layout from 'material-ui/Layout'
import Grid from 'material-ui/Grid'
import recompact from 'modules/recompact'
import Link from 'modules/components/Link'
import ViewContainer from 'modules/components/ViewContainer'
Expand All @@ -24,14 +24,14 @@ function Account(props) {
<ReviewAppBar />
<ScrollView>
<LayoutBody margin>
<Layout container gutter={24}>
<Layout item xs>
<Grid container gutter={24}>
<Grid item xs>
<Typography type="display1" component="h2">
{user.name}
</Typography>
</Layout>
</Grid>
{!user.privateSync && (
<Layout item>
<Grid item>
<Button
raised
accent
Expand All @@ -40,9 +40,9 @@ function Account(props) {
>
Synchronize private repositories
</Button>
</Layout>
</Grid>
)}
<Layout item xs={12}>
<Grid item xs={12}>
<Paper>
<WatchTask task={account.fetch}>
{data => (
Expand All @@ -58,8 +58,8 @@ function Account(props) {
)}
</WatchTask>
</Paper>
</Layout>
</Layout>
</Grid>
</Grid>
</LayoutBody>
</ScrollView>
</ViewContainer>
Expand Down