Skip to content

Commit

Permalink
update deps and xo (segmentio#517)
Browse files Browse the repository at this point in the history
  • Loading branch information
mshwery authored Mar 12, 2019
1 parent f7091d6 commit 469a339
Show file tree
Hide file tree
Showing 87 changed files with 2,614 additions and 1,365 deletions.
2 changes: 1 addition & 1 deletion docs/gatsby-browser.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const { NODE_ENV = 'development' } = process.env

// eslint-disable-next-line import/prefer-default-export
export const onRouteUpdate = () => {
if (!window.analytics || typeof window.analytics.page !== 'function') {
if (NODE_ENV === 'development') {
console.warn('Unable to locate analytics.js')
}

return
}

Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/ColorExamples.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
// eslint-disable-next-line import/no-unresolved
import { Pane, Heading, ThemeConsumer } from 'evergreen-ui'
import ColorGroup from './ColorGroup'

Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/ColorGroup.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
// eslint-disable-next-line import/no-unresolved
import { Pane, Heading } from 'evergreen-ui'
import Swatch from './Swatch'

Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/IconSearch.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import { filter } from 'fuzzaldrin-plus'
// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
// eslint-disable-next-line import/no-unresolved
import { Pane, SearchInput, IconNames, Text, Icon } from 'evergreen-ui'

const iconKeys = Object.keys(IconNames)
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/Layout.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react' // eslint-disable-line no-unused-vars
import React from 'react'
import PropTypes from 'prop-types'
import Helmet from 'react-helmet'
import absolutePath from '../absolutePath'
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/Page.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Helmet from 'react-helmet'
import PropTypes from 'prop-types'
import { Link } from 'gatsby'
import { Location, navigate } from '@reach/router'
// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
// eslint-disable-next-line import/no-unresolved
import { Button, IconButton, Tooltip } from 'evergreen-ui'
import IA from '../IA'
import DocsMDXProvider from './DocsMDXProvider'
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/Playground.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
import ReactDOM from 'react-dom'
import PropTypes from 'prop-types'
import uniqueId from 'lodash/uniqueId'
// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
// eslint-disable-next-line import/no-unresolved
import * as components from 'evergreen-ui'
import Component from '@reactions/component'
import { LiveProvider, LiveEditor, LiveError, LivePreview } from 'react-live'
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/Swatch.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
// eslint-disable-next-line import/no-unresolved
import { Pane, Heading, Text, Code, Popover } from 'evergreen-ui'

function uppercaseColor(color) {
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/TextStylePreview.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import PropTypes from 'prop-types'
// eslint-disable-next-line import/no-extraneous-dependencies, import/no-unresolved
// eslint-disable-next-line import/no-unresolved
import { Pane } from 'evergreen-ui'

export default class TextStylePreview extends React.Component {
Expand Down
1 change: 0 additions & 1 deletion docs/src/components/examples/AdvancedTable.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'
import { filter } from 'fuzzaldrin-plus'
// eslint-disable-next-line import/no-extraneous-dependencies
import {
Table,
Popover,
Expand Down
2 changes: 1 addition & 1 deletion docs/src/components/examples/VirtualTable.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React, { Fragment } from 'react'
import faker from 'faker'
// eslint-disable-next-line import/no-extraneous-dependencies
import {
Table,
Pane,
Expand Down Expand Up @@ -35,6 +34,7 @@ const users = range(1000)
content: faker.random.arrayElement(randomLengthContent)
}
}

return item
})

Expand Down
1 change: 0 additions & 1 deletion docs/src/pages/get-started/introduction.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable react/jsx-curly-brace-presence */
import React from 'react'
import Helmet from 'react-helmet'
import TopBar from '../../components/TopBar'
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"@storybook/addon-options": "^3.4.11",
"@storybook/addons": "^3.4.11",
"@storybook/react": "^3.4.11",
"ava": "1.0.0-rc.1",
"ava": "^1.3.1",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-plugin-add-react-displayname": "^0.0.5",
Expand All @@ -100,10 +100,10 @@
"react-dom": "^16.5.2",
"react-test-renderer": "^16.5.2",
"sinon": "^7.0.0",
"size-limit": "^0.20.1",
"size-limit": "^0.21.1",
"starwars-names": "^1.6.0",
"url-loader": "^1.1.2",
"xo": "^0.23.0"
"xo": "^0.24.0"
},
"xo": {
"parser": "babel-eslint",
Expand Down
1 change: 1 addition & 0 deletions src/autocomplete/stories/index.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const items = [
if (nameA < nameB) {
return -1
}

if (nameA > nameB) {
return 1
}
Expand Down
2 changes: 1 addition & 1 deletion src/avatar/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Avatar } from './src/Avatar' // eslint-disable-line import/prefer-default-export
export { default as Avatar } from './src/Avatar'
1 change: 1 addition & 0 deletions src/avatar/src/Avatar.js
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ class Avatar extends PureComponent {
if (size <= sizeLimitOneCharacter) {
initials = initials.substring(0, 1)
}

const colorProps = this.getColorProps()

return (
Expand Down
1 change: 1 addition & 0 deletions src/avatar/src/utils/hash.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ export default function hashCode(s) {
// Convert to 32bit integer
hash &= hash
}

return Math.abs(hash)
}
2 changes: 1 addition & 1 deletion src/checkbox/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Checkbox } from './src/Checkbox' // eslint-disable-line import/prefer-default-export
export { default as Checkbox } from './src/Checkbox'
2 changes: 1 addition & 1 deletion src/combobox/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Combobox } from './src/Combobox' // eslint-disable-line import/prefer-default-export
export { default as Combobox } from './src/Combobox'
1 change: 1 addition & 0 deletions src/combobox/src/Combobox.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ export default class Combobox extends PureComponent {
isOpenedByButton: false
})
}

if (e.target.value.trim() === '') {
// Prevent the selected item from sticking around
clearSelection()
Expand Down
1 change: 1 addition & 0 deletions src/combobox/stories/index.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const items = starWarsNames.all.sort((a, b) => {
if (nameA < nameB) {
return -1
}

if (nameA > nameB) {
return 1
}
Expand Down
2 changes: 1 addition & 1 deletion src/corner-dialog/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as CornerDialog } from './src/CornerDialog' // eslint-disable-line import/prefer-default-export
export { default as CornerDialog } from './src/CornerDialog'
2 changes: 2 additions & 0 deletions src/corner-dialog/src/CornerDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,15 @@ export default class CornerDialog extends PureComponent {
if (typeof children === 'function') {
return children({ close: this.handleClose })
}

if (typeof children === 'string') {
return (
<Paragraph size={400} color="muted">
{children}
</Paragraph>
)
}

return children
}

Expand Down
2 changes: 1 addition & 1 deletion src/dialog/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Dialog } from './src/Dialog' // eslint-disable-line import/prefer-default-export
export { default as Dialog } from './src/Dialog'
2 changes: 2 additions & 0 deletions src/dialog/src/Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -212,9 +212,11 @@ class Dialog extends React.Component {
if (typeof children === 'function') {
return children({ close })
}

if (typeof children === 'string') {
return <Paragraph>{children}</Paragraph>
}

return children
}

Expand Down
1 change: 1 addition & 0 deletions src/dialog/stories/index.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const comboboxItems = starWarsNames.all.sort((a, b) => {
if (nameA < nameB) {
return -1
}

if (nameA > nameB) {
return 1
}
Expand Down
2 changes: 1 addition & 1 deletion src/file-picker/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as FilePicker } from './src/FilePicker' // eslint-disable-line import/prefer-default-export
export { default as FilePicker } from './src/FilePicker'
1 change: 0 additions & 1 deletion src/file-picker/test/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable import/no-extraneous-dependencies */
import React from 'react'
import test from 'ava'
import render from 'react-test-renderer'
Expand Down
1 change: 1 addition & 0 deletions src/icon/src/Icon.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ class Icon extends PureComponent {
if (icon == null) {
return null
}

if (typeof icon !== 'string') {
return icon
}
Expand Down
2 changes: 1 addition & 1 deletion src/image/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Image } from './src/Image' // eslint-disable-line import/prefer-default-export
export { default as Image } from './src/Image'
4 changes: 4 additions & 0 deletions src/layers/src/Pane.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,19 @@ class Pane extends PureComponent {
) {
return `1px solid ${theme.colors.border[borderSideProperty]}`
}

if (borderSideProperty === true) {
return `1px solid ${theme.colors.border.default}`
}

if (borderSideProperty === false) {
return null
}

if (Object.prototype.hasOwnProperty.call(theme.colors.border, border)) {
return `1px solid ${theme.colors.border[border]}`
}

if (border === true) {
return `1px solid ${theme.colors.border.default}`
}
Expand Down
2 changes: 1 addition & 1 deletion src/manager/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Manager } from './src/Manager' // eslint-disable-line import/prefer-default-export
export { default as Manager } from './src/Manager'
2 changes: 1 addition & 1 deletion src/menu/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Menu } from './src/Menu' // eslint-disable-line import/prefer-default-export
export { default as Menu } from './src/Menu'
2 changes: 1 addition & 1 deletion src/menu/src/MenuItem.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class MenuItem extends React.PureComponent {

if (process.env.NODE_ENV !== 'production') {
warning(
typeof this.props.onClick === 'function',
'onClick' in this.props,
'<Menu.Item> expects `onSelect` prop, but you passed `onClick`.'
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/overlay/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Overlay } from './src/Overlay' // eslint-disable-line import/prefer-default-export
export { default as Overlay } from './src/Overlay'
2 changes: 1 addition & 1 deletion src/popover/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Popover } from './src/Popover' // eslint-disable-line import/prefer-default-export
export { default as Popover } from './src/Popover'
2 changes: 1 addition & 1 deletion src/portal/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Portal } from './src/Portal' // eslint-disable-line import/prefer-default-export
export { default as Portal } from './src/Portal'
4 changes: 2 additions & 2 deletions src/portal/src/Portal.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ export default class Portal extends Component {
if (!portalContainer) {
portalContainer = document.createElement('div')
portalContainer.setAttribute('evergreen-portal-container', '')
document.body.appendChild(portalContainer)
document.body.append(portalContainer)
}

this.el = document.createElement('div')
portalContainer.appendChild(this.el)
portalContainer.append(this.el)
}

componentWillUnmount() {
Expand Down
2 changes: 1 addition & 1 deletion src/positioner/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Positioner } from './src/Positioner' // eslint-disable-line import/prefer-default-export
export { default as Positioner } from './src/Positioner'
5 changes: 5 additions & 0 deletions src/positioner/src/getPosition.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ const getTransformOrigin = ({ rect, position, dimensions, targetCenter }) => {
/* Syntax: x-offset | y-offset */
return `${centerX}px ${dimensions.height}px `
}

/* Syntax: x-offset | y-offset */
return `${centerX}px 0px `
}
Expand Down Expand Up @@ -268,6 +269,7 @@ function getPosition({
rect: leftRect
}
}

if (fitsOnRight) {
return {
position: Position.RIGHT,
Expand All @@ -283,6 +285,7 @@ function getPosition({
rect: rightRect
}
}

if (fitsOnLeft) {
return {
position: Position.LEFT,
Expand Down Expand Up @@ -357,6 +360,7 @@ function getPosition({
rect: topRect
}
}

if (bottomRectFitsOnBottom) {
return {
position: flipHorizontal(position),
Expand All @@ -372,6 +376,7 @@ function getPosition({
rect: bottomRect
}
}

if (topRectFitsOnTop) {
return {
position: flipHorizontal(position),
Expand Down
1 change: 1 addition & 0 deletions src/scales/src/majorScale.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ export default function majorScale(x) {
`majorScale only accepts integers as input, instead ${x} was passed.`
)
}

return x * 8
}
1 change: 1 addition & 0 deletions src/scales/src/minorScale.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,6 @@ export default function minorScale(x) {
`minorScale only accepts integers as input, instead ${x} was passed.`
)
}

return x * 4
}
2 changes: 1 addition & 1 deletion src/search-input/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as SearchInput } from './src/SearchInput' // eslint-disable-line import/prefer-default-export
export { default as SearchInput } from './src/SearchInput'
2 changes: 1 addition & 1 deletion src/segmented-control/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as SegmentedControl } from './src/SegmentedControl' // eslint-disable-line import/prefer-default-export
export { default as SegmentedControl } from './src/SegmentedControl'
1 change: 1 addition & 0 deletions src/select-menu/src/Option.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export default class Option extends PureComponent {
if (disabled) {
textProps.color = 'muted'
}

if (isSelected) {
textProps.color = 'selected'
}
Expand Down
2 changes: 2 additions & 0 deletions src/select-menu/stories/index.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ storiesOf('select-menu', module).add('SelectMenu', () => (
} else if (selectedItemsLength > 1) {
selectedNames = selectedItemsLength.toString() + ' selected...'
}

setState({
selected,
selectedNames
Expand All @@ -120,6 +121,7 @@ storiesOf('select-menu', module).add('SelectMenu', () => (
} else if (selectedItemsLength > 1) {
selectedNames = selectedItemsLength.toString() + ' selected...'
}

setState({ selected: selectedItems, selectedNames })
}}
>
Expand Down
2 changes: 1 addition & 1 deletion src/side-sheet/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as SideSheet } from './src/SideSheet' // eslint-disable-line import/prefer-default-export
export { default as SideSheet } from './src/SideSheet'
1 change: 1 addition & 0 deletions src/side-sheet/src/SheetClose.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ const getSheetCloseClassName = position => {
...sharedStyles
}).toString()
}

return sheetCloseClassNameCache[position]
}

Expand Down
2 changes: 1 addition & 1 deletion src/spinner/index.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export { default as Spinner } from './src/Spinner' // eslint-disable-line import/prefer-default-export
export { default as Spinner } from './src/Spinner'
Loading

0 comments on commit 469a339

Please sign in to comment.