diff --git a/.babelrc b/.babelrc index 8194dcfa..f559b444 100644 --- a/.babelrc +++ b/.babelrc @@ -15,9 +15,18 @@ "polyfill": false, "regenerator": true }], - ["babel-plugin-root-import", { - "rootPathSuffix": "./src", - "rootPathPrefix": "~" + ["module-resolver", { + "root": ["."], + "alias": { + "config": "./src/js/config", + "constants": "./src/js/constants", + "components": "./src/js/components", + "actions": "./src/js/actions", + "reducers": "./src/js/reducers", + "support": "./src/js/support", + "utils": "./src/js/utils", + "services": "./src/js/services" + } }], "babel-plugin-styled-components" ], diff --git a/.eslintrc b/.eslintrc index 06239c88..121738b5 100644 --- a/.eslintrc +++ b/.eslintrc @@ -25,16 +25,15 @@ "spaced-comment": 0 }, "plugins": [ - "react", "import", + "react", "jest", "flowtype" ], "settings": { - "import/parser": "babel-eslint", "import/resolver": { - "babel-plugin-root-import": {} - }, + "babel-module": {} + }, "import/ignore": [ "\\.(scss|less|css)$" ] diff --git a/jsonconfig.json b/jsonconfig.json new file mode 100644 index 00000000..040f71ee --- /dev/null +++ b/jsonconfig.json @@ -0,0 +1,16 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "*": [ + "src/*" + ], + "components/*": [ + "./js/config/*" + ], + "config/*": [ + "./js/config/*" + ] + } + } +} \ No newline at end of file diff --git a/package.json b/package.json index 83629876..440f3656 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "babel-cli": "^6.24.1", "babel-eslint": "^8.2.6", "babel-loader": "^7.1.5", - "babel-plugin-root-import": "5", + "babel-plugin-module-resolver": "^3.1.1", "babel-plugin-styled-components": "^1.5.1", "babel-plugin-transform-class-properties": "^6.24.1", "babel-plugin-transform-flow-strip-types": "^6.22.0", @@ -81,11 +81,11 @@ "babel-preset-react": "^6.24.1", "css-loader": "0.28.11", "duplicate-package-checker-webpack-plugin": "^3.0.0", - "eslint": "^4", + "eslint": "^5.3.0", "eslint-config-airbnb": "^17.0.0", - "eslint-import-resolver-babel-plugin-root-import": "^1.1.1", + "eslint-import-resolver-babel-module": "^4.0.0", "eslint-plugin-flowtype": "^2.50.0", - "eslint-plugin-import": "^2.13.0", + "eslint-plugin-import": "^2.14.0", "eslint-plugin-jest": "^21.18.0", "eslint-plugin-jsx-a11y": "^6.1.1", "eslint-plugin-react": "^7.10.0", @@ -94,7 +94,6 @@ "jest": "^23.4.2", "less": "^3.0.1", "less-loader": "4.1.0", - "styled-components-stylefmt": "^0.1.5", "stylelint": "^9.4.0", "stylelint-config-standard": "^18.2.0", "stylelint-config-styled-components": "^0.1.1", diff --git a/src/flowtype/index.js b/src/flowtype/index.js index 74d33214..635c1557 100644 --- a/src/flowtype/index.js +++ b/src/flowtype/index.js @@ -11,25 +11,25 @@ import type { PlainDispatch as ReduxPlainDispatch, } from 'redux'; -import type { Reducers, ReducersState } from '~/js/reducers'; +import type { Reducers, ReducersState } from 'reducers'; // Actions -import type { SelectedAccountAction } from '~/js/actions/SelectedAccountActions'; -import type { AccountAction } from '~/js/actions/AccountsActions'; -import type { DiscoveryAction } from '~/js/actions/DiscoveryActions'; -import type { StorageAction } from '~/js/actions/LocalStorageActions'; -import type { LogAction } from '~/js/actions/LogActions'; -import type { ModalAction } from '~/js/actions/ModalActions'; -import type { NotificationAction } from '~/js/actions/NotificationActions'; -import type { PendingTxAction } from '~/js/actions/PendingTxActions'; -import type { ReceiveAction } from '~/js/actions/ReceiveActions'; -import type { SendFormAction } from '~/js/actions/SendFormActions'; -import type { SummaryAction } from '~/js/actions/SummaryActions'; -import type { TokenAction } from '~/js/actions/TokenActions'; -import type { TrezorConnectAction } from '~/js/actions/TrezorConnectActions'; -import type { WalletAction } from '~/js/actions/WalletActions'; -import type { Web3Action } from '~/js/actions/Web3Actions'; -import type { FiatRateAction } from '~/js/services/CoinmarketcapService'; // this service has no action file, all is written inside one file +import type { SelectedAccountAction } from 'actions/SelectedAccountActions'; +import type { AccountAction } from 'actions/AccountsActions'; +import type { DiscoveryAction } from 'actions/DiscoveryActions'; +import type { StorageAction } from 'actions/LocalStorageActions'; +import type { LogAction } from 'actions/LogActions'; +import type { ModalAction } from 'actions/ModalActions'; +import type { NotificationAction } from 'actions/NotificationActions'; +import type { PendingTxAction } from 'actions/PendingTxActions'; +import type { ReceiveAction } from 'actions/ReceiveActions'; +import type { SendFormAction } from 'actions/SendFormActions'; +import type { SummaryAction } from 'actions/SummaryActions'; +import type { TokenAction } from 'actions/TokenActions'; +import type { TrezorConnectAction } from 'actions/TrezorConnectActions'; +import type { WalletAction } from 'actions/WalletActions'; +import type { Web3Action } from 'actions/Web3Actions'; +import type { FiatRateAction } from 'services/CoinmarketcapService'; // this service has no action file, all is written inside one file import type { Device, @@ -68,7 +68,7 @@ export type UnknownDevice = $Exact<{ +label: string, +features: null, state: ?string, - + remember: boolean; // device should be remembered connected: boolean; // device is connected available: boolean; // device cannot be used because of features.passphrase_protection is different then expected @@ -135,12 +135,12 @@ export type Action = export type State = ReducersState; // reexport reduces types -export type { Coin } from '~/js/reducers/LocalStorageReducer'; -export type { Account } from '~/js/reducers/AccountsReducer'; -export type { Discovery } from '~/js/reducers/DiscoveryReducer'; -export type { Token } from '~/js/reducers/TokensReducer'; -export type { Web3Instance } from '~/js/reducers/Web3Reducer'; -export type { PendingTx } from '~/js/reducers/PendingTxReducer'; +export type { Coin } from 'reducers/LocalStorageReducer'; +export type { Account } from 'reducers/AccountsReducer'; +export type { Discovery } from 'reducers/DiscoveryReducer'; +export type { Token } from 'reducers/TokensReducer'; +export type { Web3Instance } from 'reducers/Web3Reducer'; +export type { PendingTx } from 'reducers/PendingTxReducer'; export type Accounts = $ElementType; export type LocalStorage = $ElementType; diff --git a/src/js/actions/AccountsActions.js b/src/js/actions/AccountsActions.js index 19ab2af7..13dd4853 100644 --- a/src/js/actions/AccountsActions.js +++ b/src/js/actions/AccountsActions.js @@ -1,7 +1,7 @@ /* @flow */ import * as ACCOUNT from './constants/account'; -import type { Action, TrezorDevice } from '~/flowtype'; +import type { Action, TrezorDevice } from 'flowtype'; import type { State } from '../reducers/AccountsReducer'; export type AccountAction = diff --git a/src/js/actions/DiscoveryActions.js b/src/js/actions/DiscoveryActions.js index e7e76445..02562f51 100644 --- a/src/js/actions/DiscoveryActions.js +++ b/src/js/actions/DiscoveryActions.js @@ -14,7 +14,7 @@ import { setBalance as setTokenBalance } from './TokenActions'; import type { ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice, -} from '~/flowtype'; +} from 'flowtype'; import type { Discovery, State } from '../reducers/DiscoveryReducer'; diff --git a/src/js/actions/LocalStorageActions.js b/src/js/actions/LocalStorageActions.js index b66a1b33..443593be 100644 --- a/src/js/actions/LocalStorageActions.js +++ b/src/js/actions/LocalStorageActions.js @@ -11,11 +11,11 @@ import { JSONRequest, httpRequest } from '../utils/networkUtils'; import type { ThunkAction, AsyncAction, GetState, Dispatch, TrezorDevice, -} from '~/flowtype'; +} from 'flowtype'; import type { Config, Coin, TokensCollection } from '../reducers/LocalStorageReducer'; -import AppConfigJSON from '~/data/appConfig.json'; -import Erc20AbiJSON from '~/data/ERC20Abi.json'; +import AppConfigJSON from 'data/appConfig.json'; +import Erc20AbiJSON from 'data/ERC20Abi.json'; export type StorageAction = { type: typeof STORAGE.READY, diff --git a/src/js/actions/LogActions.js b/src/js/actions/LogActions.js index be9b3b13..871c8fe6 100644 --- a/src/js/actions/LogActions.js +++ b/src/js/actions/LogActions.js @@ -5,7 +5,7 @@ import * as LOG from './constants/log'; import type { Action, ThunkAction, GetState, Dispatch, -} from '~/flowtype'; +} from 'flowtype'; import type { LogEntry } from '../reducers/LogReducer'; export type LogAction = { diff --git a/src/js/actions/ModalActions.js b/src/js/actions/ModalActions.js index ba73a0dd..53eee676 100644 --- a/src/js/actions/ModalActions.js +++ b/src/js/actions/ModalActions.js @@ -8,7 +8,7 @@ import * as CONNECT from './constants/TrezorConnect'; import type { ThunkAction, AsyncAction, Action, GetState, Dispatch, TrezorDevice, -} from '~/flowtype'; +} from 'flowtype'; import type { State } from '../reducers/ModalReducer'; export type ModalAction = { diff --git a/src/js/actions/NotificationActions.js b/src/js/actions/NotificationActions.js index ae6c9557..c2fd37c6 100644 --- a/src/js/actions/NotificationActions.js +++ b/src/js/actions/NotificationActions.js @@ -5,7 +5,7 @@ import * as NOTIFICATION from './constants/notification'; import type { Action, AsyncAction, GetState, Dispatch, RouterLocationState, -} from '~/flowtype'; +} from 'flowtype'; import type { CallbackAction } from '../reducers/NotificationReducer'; export type NotificationAction = { diff --git a/src/js/actions/ReceiveActions.js b/src/js/actions/ReceiveActions.js index 60a8a087..239331b6 100644 --- a/src/js/actions/ReceiveActions.js +++ b/src/js/actions/ReceiveActions.js @@ -10,7 +10,7 @@ import type { State } from '../reducers/ReceiveReducer'; import type { TrezorDevice, ThunkAction, AsyncAction, Action, GetState, Dispatch, -} from '~/flowtype'; +} from 'flowtype'; export type ReceiveAction = { type: typeof RECEIVE.INIT, diff --git a/src/js/actions/SelectedAccountActions.js b/src/js/actions/SelectedAccountActions.js index 9d18709a..5887f901 100644 --- a/src/js/actions/SelectedAccountActions.js +++ b/src/js/actions/SelectedAccountActions.js @@ -22,7 +22,7 @@ import type { GetState, Dispatch, State, -} from '~/flowtype'; +} from 'flowtype'; export type SelectedAccountAction = { diff --git a/src/js/actions/SendFormActions.js b/src/js/actions/SendFormActions.js index b1711e6e..3438312b 100644 --- a/src/js/actions/SendFormActions.js +++ b/src/js/actions/SendFormActions.js @@ -28,7 +28,7 @@ import type { AsyncAction, RouterLocationState, TrezorDevice, -} from '~/flowtype'; +} from 'flowtype'; import type { State as AccountState } from '../reducers/SelectedAccountReducer'; import type { Web3Instance } from '../reducers/Web3Reducer'; import type { Config, Coin } from '../reducers/LocalStorageReducer'; diff --git a/src/js/actions/SessionStorageActions.js b/src/js/actions/SessionStorageActions.js index 5aeed2b6..51fcb475 100644 --- a/src/js/actions/SessionStorageActions.js +++ b/src/js/actions/SessionStorageActions.js @@ -6,7 +6,7 @@ import type { ThunkAction, GetState, Dispatch, -} from '~/flowtype'; +} from 'flowtype'; const PREFIX: string = 'trezor:draft-tx:'; diff --git a/src/js/actions/SummaryActions.js b/src/js/actions/SummaryActions.js index 9d3d3c91..203affff 100644 --- a/src/js/actions/SummaryActions.js +++ b/src/js/actions/SummaryActions.js @@ -9,7 +9,7 @@ import { initialState } from '../reducers/SummaryReducer'; import type { ThunkAction, AsyncAction, Action, GetState, Dispatch, -} from '~/flowtype'; +} from 'flowtype'; import type { State } from '../reducers/SummaryReducer'; import type { Token } from '../reducers/TokensReducer'; diff --git a/src/js/actions/TokenActions.js b/src/js/actions/TokenActions.js index 3918fdfa..296159ae 100644 --- a/src/js/actions/TokenActions.js +++ b/src/js/actions/TokenActions.js @@ -6,7 +6,7 @@ import { getTokenInfoAsync, getTokenBalanceAsync } from './Web3Actions'; import type { GetState, AsyncAction, Action, Dispatch, -} from '~/flowtype'; +} from 'flowtype'; import type { State, Token } from '../reducers/TokensReducer'; import type { Account } from '../reducers/AccountsReducer'; import type { NetworkToken } from '../reducers/LocalStorageReducer'; diff --git a/src/js/actions/TrezorConnectActions.js b/src/js/actions/TrezorConnectActions.js index 63318b0f..afd6867d 100644 --- a/src/js/actions/TrezorConnectActions.js +++ b/src/js/actions/TrezorConnectActions.js @@ -32,7 +32,7 @@ import type { AsyncAction, TrezorDevice, RouterLocationState, -} from '~/flowtype'; +} from 'flowtype'; export type TrezorConnectAction = { diff --git a/src/js/actions/WalletActions.js b/src/js/actions/WalletActions.js index 65b4a7d3..e192e68e 100644 --- a/src/js/actions/WalletActions.js +++ b/src/js/actions/WalletActions.js @@ -22,7 +22,7 @@ import type Dispatch, GetState, State, -} from '~/flowtype'; +} from 'flowtype'; export type WalletAction = { type: typeof WALLET.SET_INITIAL_URL, diff --git a/src/js/actions/Web3Actions.js b/src/js/actions/Web3Actions.js index 056f9ab4..99d50735 100644 --- a/src/js/actions/Web3Actions.js +++ b/src/js/actions/Web3Actions.js @@ -21,7 +21,7 @@ import type { GetState, Action, AsyncAction, -} from '~/flowtype'; +} from 'flowtype'; import type { Account } from '../reducers/AccountsReducer'; import type { PendingTx } from '../reducers/PendingTxReducer'; diff --git a/src/js/components/common/Button.js b/src/js/components/common/Button.js index b2e9cd43..6c96c199 100644 --- a/src/js/components/common/Button.js +++ b/src/js/components/common/Button.js @@ -2,7 +2,7 @@ import styled, { css } from 'styled-components'; import PropTypes from 'prop-types'; import React from 'react'; -import colors from '~/js/config/colors'; +import colors from 'config/colors'; const Wrapper = styled.button` padding: 12px 24px; diff --git a/src/js/components/common/Footer.js b/src/js/components/common/Footer.js index 431c7475..baac3557 100644 --- a/src/js/components/common/Footer.js +++ b/src/js/components/common/Footer.js @@ -5,8 +5,8 @@ import { getYear } from 'date-fns'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import colors from '~/js/config/colors'; -import * as LogActions from '~/js/actions/LogActions'; +import colors from 'config/colors'; +import * as LogActions from 'actions/LogActions'; const Wrapper = styled.div` width: 100%; diff --git a/src/js/components/common/Header.js b/src/js/components/common/Header.js index bd10b00f..7e6479d6 100644 --- a/src/js/components/common/Header.js +++ b/src/js/components/common/Header.js @@ -1,7 +1,7 @@ /* @flow */ import React from 'react'; import styled from 'styled-components'; -import colors from '~/js/config/colors'; +import colors from 'config/colors'; const Wrapper = styled.header` width: 100%; diff --git a/src/js/components/common/Heading.js b/src/js/components/common/Heading.js index 5906902f..899bcac8 100644 --- a/src/js/components/common/Heading.js +++ b/src/js/components/common/Heading.js @@ -1,5 +1,5 @@ import styled, { css } from 'styled-components'; -import colors from '~/js/config/colors'; +import colors from 'config/colors'; const baseStyles = css` -webkit-font-smoothing: antialiased; diff --git a/src/js/components/common/Log.js b/src/js/components/common/Log.js index 8e516de4..910730d4 100644 --- a/src/js/components/common/Log.js +++ b/src/js/components/common/Log.js @@ -4,10 +4,10 @@ import React from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; -import * as LogActions from '~/js/actions/LogActions'; -import type { State, Dispatch } from '~/flowtype'; +import * as LogActions from 'actions/LogActions'; +import type { State, Dispatch } from 'flowtype'; const Log = (props: Props): ?React$Element => { if (!props.log.opened) return null; diff --git a/src/js/components/common/Notification.js b/src/js/components/common/Notification.js index 9722dd66..622d4e7d 100644 --- a/src/js/components/common/Notification.js +++ b/src/js/components/common/Notification.js @@ -2,13 +2,13 @@ import React from 'react'; -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import * as NOTIFICATION from '~/js/actions/constants/notification'; -import * as NotificationActions from '~/js/actions/NotificationActions'; -import type { Action, State, Dispatch } from '~/flowtype'; +import * as NOTIFICATION from 'actions/constants/notification'; +import * as NotificationActions from 'actions/NotificationActions'; +import type { Action, State, Dispatch } from 'flowtype'; import Loader from './LoaderCircle'; type Props = { diff --git a/src/js/components/landing/ConnectDevice.js b/src/js/components/landing/ConnectDevice.js index 8d9afefb..71d22c2e 100644 --- a/src/js/components/landing/ConnectDevice.js +++ b/src/js/components/landing/ConnectDevice.js @@ -2,9 +2,9 @@ import React, { Component } from 'react'; import TrezorConnect from 'trezor-connect'; -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; -import type { State, TrezorDevice } from '~/flowtype'; +import type { State, TrezorDevice } from 'flowtype'; type Props = { transport: $PropertyType<$ElementType, 'transport'>; diff --git a/src/js/components/landing/InstallBridge.js b/src/js/components/landing/InstallBridge.js index 0ab6a9c3..57171754 100644 --- a/src/js/components/landing/InstallBridge.js +++ b/src/js/components/landing/InstallBridge.js @@ -1,6 +1,6 @@ /* @flow */ -import installers from '~/js/constants/bridge'; +import installers from 'constants/bridge'; import React, { Component } from 'react'; import Select from 'react-select'; import Preloader from './Preloader'; diff --git a/src/js/components/landing/LandingPage.js b/src/js/components/landing/LandingPage.js index 3ae8c115..76552a1a 100644 --- a/src/js/components/landing/LandingPage.js +++ b/src/js/components/landing/LandingPage.js @@ -3,7 +3,7 @@ import React from 'react'; import Preloader from './Preloader'; -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; import ConnectDevice from './ConnectDevice'; import InstallBridge from './InstallBridge'; import LocalStorageError from './LocalStorageError'; diff --git a/src/js/components/landing/index.js b/src/js/components/landing/index.js index 39c84f4e..e7fae9ef 100644 --- a/src/js/components/landing/index.js +++ b/src/js/components/landing/index.js @@ -8,7 +8,7 @@ import { connect } from 'react-redux'; import LandingPage from './LandingPage'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/flowtype'; +import type { State, Dispatch } from 'flowtype'; export type StateProps = { localStorage: $ElementType, diff --git a/src/js/components/modal/ConfirmAddress.js b/src/js/components/modal/ConfirmAddress.js index f3bb1a85..a87a6af0 100644 --- a/src/js/components/modal/ConfirmAddress.js +++ b/src/js/components/modal/ConfirmAddress.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; -import { findAccount } from '~/js/reducers/AccountsReducer'; +import { findAccount } from 'reducers/AccountsReducer'; import type { Props } from './index'; diff --git a/src/js/components/modal/DuplicateDevice.js b/src/js/components/modal/DuplicateDevice.js index c047b9fe..5d5de6e0 100644 --- a/src/js/components/modal/DuplicateDevice.js +++ b/src/js/components/modal/DuplicateDevice.js @@ -2,7 +2,7 @@ import React, { Component } from 'react'; -import { getNewInstance } from '~/js/reducers/DevicesReducer'; +import { getNewInstance } from 'reducers/DevicesReducer'; import type { Props } from './index'; type State = { diff --git a/src/js/components/modal/index.js b/src/js/components/modal/index.js index 1386d11c..0f5837dd 100644 --- a/src/js/components/modal/index.js +++ b/src/js/components/modal/index.js @@ -10,8 +10,8 @@ import { CSSTransition, Transition } from 'react-transition-group'; import { UI } from 'trezor-connect'; -import { default as ModalActions } from '~/js/actions/ModalActions'; -import { default as ReceiveActions } from '~/js/actions/ReceiveActions'; +import { default as ModalActions } from 'actions/ModalActions'; +import { default as ReceiveActions } from 'actions/ReceiveActions'; import Pin from './Pin'; import InvalidPin from './InvalidPin'; @@ -22,12 +22,12 @@ import ConfirmAddress, { ConfirmUnverifiedAddress } from './ConfirmAddress'; import RememberDevice, { ForgetDevice } from './RememberDevice'; import DuplicateDevice from './DuplicateDevice'; -import * as RECEIVE from '~/js/actions/constants/receive'; -import * as MODAL from '~/js/actions/constants/modal'; -import * as CONNECT from '~/js/actions/constants/TrezorConnect'; +import * as RECEIVE from 'actions/constants/receive'; +import * as MODAL from 'actions/constants/modal'; +import * as CONNECT from 'actions/constants/TrezorConnect'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/flowtype'; +import type { State, Dispatch } from 'flowtype'; type OwnProps = { } diff --git a/src/js/components/wallet/account/SelectedAccount.js b/src/js/components/wallet/account/SelectedAccount.js index 6f5f9e4e..1fdd6c92 100644 --- a/src/js/components/wallet/account/SelectedAccount.js +++ b/src/js/components/wallet/account/SelectedAccount.js @@ -2,13 +2,13 @@ import * as React from 'react'; -import { Notification } from '~/js/components/common/Notification'; +import { Notification } from 'components/common/Notification'; import type { State, TrezorDevice, Action, ThunkAction, -} from '~/flowtype'; -import type { Account } from '~/js/reducers/AccountsReducer'; -import type { Discovery } from '~/js/reducers/DiscoveryReducer'; +} from 'flowtype'; +import type { Account } from 'reducers/AccountsReducer'; +import type { Discovery } from 'reducers/DiscoveryReducer'; export type StateProps = { className: string; diff --git a/src/js/components/wallet/account/receive/Receive.js b/src/js/components/wallet/account/receive/Receive.js index bd92bc10..cd3217f5 100644 --- a/src/js/components/wallet/account/receive/Receive.js +++ b/src/js/components/wallet/account/receive/Receive.js @@ -1,13 +1,13 @@ /* @flow */ import React, { Component } from 'react'; import styled from 'styled-components'; -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; import Tooltip from 'rc-tooltip'; import { QRCode } from 'react-qr-svg'; import SelectedAccount from '../SelectedAccount'; -import { Notification } from '~/js/components/common/Notification'; +import { Notification } from 'components/common/Notification'; import type { Props } from './index'; diff --git a/src/js/components/wallet/account/receive/index.js b/src/js/components/wallet/account/receive/index.js index 535bb667..12579224 100644 --- a/src/js/components/wallet/account/receive/index.js +++ b/src/js/components/wallet/account/receive/index.js @@ -5,12 +5,12 @@ import React, { Component, PropTypes } from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import { default as ReceiveActions } from '~/js/actions/ReceiveActions'; -import * as TokenActions from '~/js/actions/TokenActions'; +import { default as ReceiveActions } from 'actions/ReceiveActions'; +import * as TokenActions from 'actions/TokenActions'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; import Receive from './Receive'; -import type { State, Dispatch } from '~/flowtype'; +import type { State, Dispatch } from 'flowtype'; import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps, diff --git a/src/js/components/wallet/account/send/PendingTransactions.js b/src/js/components/wallet/account/send/PendingTransactions.js index c04ea709..e7783bdd 100644 --- a/src/js/components/wallet/account/send/PendingTransactions.js +++ b/src/js/components/wallet/account/send/PendingTransactions.js @@ -3,13 +3,13 @@ import React from 'react'; import ColorHash from 'color-hash'; -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; import ScaleText from 'react-scale-text'; -import { findAccountTokens } from '~/js/reducers/TokensReducer'; +import { findAccountTokens } from 'reducers/TokensReducer'; -import type { Coin } from '~/js/reducers/LocalStorageReducer'; -import type { Token } from '~/js/reducers/TokensReducer'; +import type { Coin } from 'reducers/LocalStorageReducer'; +import type { Token } from 'reducers/TokensReducer'; import type { Props as BaseProps } from './index'; type Props = { diff --git a/src/js/components/wallet/account/send/SendForm.js b/src/js/components/wallet/account/send/SendForm.js index 7af77fa7..aadf9e9b 100644 --- a/src/js/components/wallet/account/send/SendForm.js +++ b/src/js/components/wallet/account/send/SendForm.js @@ -3,18 +3,18 @@ import React, { Component } from 'react'; import styled from 'styled-components'; import Select from 'react-select'; -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; import AdvancedForm from './AdvancedForm'; import PendingTransactions from './PendingTransactions'; import { FeeSelectValue, FeeSelectOption } from './FeeSelect'; import SelectedAccount from '../SelectedAccount'; -import { findAccountTokens } from '~/js/reducers/TokensReducer'; -import { calculate, validation } from '~/js/actions/SendFormActions'; +import { findAccountTokens } from 'reducers/TokensReducer'; +import { calculate, validation } from 'actions/SendFormActions'; -import { findToken } from '~/js/reducers/TokensReducer'; +import { findToken } from 'reducers/TokensReducer'; import type { Props } from './index'; -import type { Token } from '~/flowtype'; +import type { Token } from 'flowtype'; export default class SendContainer extends Component { componentWillReceiveProps(newProps: Props) { diff --git a/src/js/components/wallet/account/send/index.js b/src/js/components/wallet/account/send/index.js index 57360d19..629b4dea 100644 --- a/src/js/components/wallet/account/send/index.js +++ b/src/js/components/wallet/account/send/index.js @@ -5,12 +5,12 @@ import * as React from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import { default as SendFormActions } from '~/js/actions/SendFormActions'; -import * as SessionStorageActions from '~/js/actions/SessionStorageActions'; +import { default as SendFormActions } from 'actions/SendFormActions'; +import * as SessionStorageActions from 'actions/SessionStorageActions'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; import SendForm from './SendForm'; -import type { State, Dispatch } from '~/flowtype'; +import type { State, Dispatch } from 'flowtype'; import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount'; type OwnProps = { } diff --git a/src/js/components/wallet/account/sign/SignVerify.js b/src/js/components/wallet/account/sign/SignVerify.js index 20a9b4b5..566cfa69 100644 --- a/src/js/components/wallet/account/sign/SignVerify.js +++ b/src/js/components/wallet/account/sign/SignVerify.js @@ -1,8 +1,8 @@ import React from 'react'; import styled from 'styled-components'; -import { H2 } from '~/js/components/common/Heading'; -import colors from '~/js/config/colors'; +import { H2 } from 'components/common/Heading'; +import colors from 'config/colors'; const Wrapper = styled.div` display: flex; diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js index 3a573ebd..52d1877a 100644 --- a/src/js/components/wallet/account/summary/Summary.js +++ b/src/js/components/wallet/account/summary/Summary.js @@ -1,20 +1,20 @@ /* @flow */ import styled from 'styled-components'; import React, { Component } from 'react'; -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; import BigNumber from 'bignumber.js'; import { Async as AsyncSelect } from 'react-select'; import Tooltip from 'rc-tooltip'; -import { resolveAfter } from '~/js/utils/promiseUtils'; +import { resolveAfter } from 'utils/promiseUtils'; import SelectedAccount from '../SelectedAccount'; -import { Notification } from '~/js/components/common/Notification'; +import { Notification } from 'components/common/Notification'; import SummaryDetails from './SummaryDetails.js'; import SummaryTokens from './SummaryTokens.js'; -import * as stateUtils from '~/js/reducers/utils'; +import * as stateUtils from 'reducers/utils'; import type { Props } from './index'; -import type { NetworkToken } from '~/js/reducers/LocalStorageReducer'; +import type { NetworkToken } from 'reducers/LocalStorageReducer'; const StyledH2 = styled(H2)` padding: 20px 48px; diff --git a/src/js/components/wallet/account/summary/SummaryDetails.js b/src/js/components/wallet/account/summary/SummaryDetails.js index 1f3e219a..edae60c3 100644 --- a/src/js/components/wallet/account/summary/SummaryDetails.js +++ b/src/js/components/wallet/account/summary/SummaryDetails.js @@ -5,7 +5,7 @@ import React from 'react'; import BigNumber from 'bignumber.js'; import type { Props as BaseProps } from './index'; -import type { Coin } from '~/js/reducers/LocalStorageReducer'; +import type { Coin } from 'reducers/LocalStorageReducer'; type Props = { // coin: $PropertyType<$ElementType, 'coin'>, diff --git a/src/js/components/wallet/account/summary/SummaryTokens.js b/src/js/components/wallet/account/summary/SummaryTokens.js index 25d9b97e..c6dc05c6 100644 --- a/src/js/components/wallet/account/summary/SummaryTokens.js +++ b/src/js/components/wallet/account/summary/SummaryTokens.js @@ -4,7 +4,7 @@ import React from 'react'; import ColorHash from 'color-hash'; import ScaleText from 'react-scale-text'; -import * as stateUtils from '~/js/reducers/utils'; +import * as stateUtils from 'reducers/utils'; import BigNumber from 'bignumber.js'; import type { Props as BaseProps } from './index'; diff --git a/src/js/components/wallet/account/summary/index.js b/src/js/components/wallet/account/summary/index.js index 1f36377c..b4fefd9a 100644 --- a/src/js/components/wallet/account/summary/index.js +++ b/src/js/components/wallet/account/summary/index.js @@ -7,10 +7,10 @@ import { connect } from 'react-redux'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; import Summary from './Summary'; -import * as SummaryActions from '~/js/actions/SummaryActions'; -import * as TokenActions from '~/js/actions/TokenActions'; +import * as SummaryActions from 'actions/SummaryActions'; +import * as TokenActions from 'actions/TokenActions'; -import type { State, Dispatch } from '~/flowtype'; +import type { State, Dispatch } from 'flowtype'; import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../SelectedAccount'; type OwnProps = { } diff --git a/src/js/components/wallet/aside/AccountSelection.js b/src/js/components/wallet/aside/AccountSelection.js index 091f48a4..f2dd03af 100644 --- a/src/js/components/wallet/aside/AccountSelection.js +++ b/src/js/components/wallet/aside/AccountSelection.js @@ -5,13 +5,13 @@ import React, { PureComponent } from 'react'; import { Link, NavLink } from 'react-router-dom'; import BigNumber from 'bignumber.js'; -import { findDeviceAccounts } from '~/js/reducers/AccountsReducer'; -import * as stateUtils from '~/js/reducers/utils'; -import Loader from '~/js/components/common/LoaderCircle'; +import { findDeviceAccounts } from 'reducers/AccountsReducer'; +import * as stateUtils from 'reducers/utils'; +import Loader from 'components/common/LoaderCircle'; import Tooltip from 'rc-tooltip'; import type { Props } from './index'; -import type { TrezorDevice, Accounts } from '~/flowtype'; +import type { TrezorDevice, Accounts } from 'flowtype'; const AccountSelection = (props: Props): ?React$Element => { const selected = props.wallet.selectedDevice; diff --git a/src/js/components/wallet/aside/Aside.js b/src/js/components/wallet/aside/Aside.js index 49d5646c..07325589 100644 --- a/src/js/components/wallet/aside/Aside.js +++ b/src/js/components/wallet/aside/Aside.js @@ -12,7 +12,7 @@ import CoinSelection from './CoinSelection'; import StickyContainer from './StickyContainer'; import type { Props } from './index'; -import type { TrezorDevice } from '~/flowtype'; +import type { TrezorDevice } from 'flowtype'; type TransitionMenuProps = { diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js index 10445424..3723d668 100644 --- a/src/js/components/wallet/aside/CoinSelection.js +++ b/src/js/components/wallet/aside/CoinSelection.js @@ -5,7 +5,7 @@ import React from 'react'; import { Link, NavLink } from 'react-router-dom'; import type { Props } from './index'; -import type { TrezorDevice } from '~/flowtype'; +import type { TrezorDevice } from 'flowtype'; const CoinSelection = (props: Props): React$Element => { const { location } = props.router; diff --git a/src/js/components/wallet/aside/DeviceSelection.js b/src/js/components/wallet/aside/DeviceSelection.js index 5059305d..c44b38e1 100644 --- a/src/js/components/wallet/aside/DeviceSelection.js +++ b/src/js/components/wallet/aside/DeviceSelection.js @@ -6,7 +6,7 @@ import Select from 'react-select'; import TrezorConnect from 'trezor-connect'; import type { Props } from './index'; -import type { TrezorDevice } from '~/flowtype'; +import type { TrezorDevice } from 'flowtype'; export const DeviceSelect = (props: Props) => { const { devices } = props; diff --git a/src/js/components/wallet/aside/StickyContainer.js b/src/js/components/wallet/aside/StickyContainer.js index 221493b3..b3714a4f 100644 --- a/src/js/components/wallet/aside/StickyContainer.js +++ b/src/js/components/wallet/aside/StickyContainer.js @@ -5,7 +5,7 @@ import * as React from 'react'; import raf from 'raf'; -import { getViewportHeight, getScrollY } from '~/js/utils/windowUtils'; +import { getViewportHeight, getScrollY } from 'utils/windowUtils'; type Props = { location: string, diff --git a/src/js/components/wallet/aside/index.js b/src/js/components/wallet/aside/index.js index 5245681a..950cc897 100644 --- a/src/js/components/wallet/aside/index.js +++ b/src/js/components/wallet/aside/index.js @@ -6,13 +6,13 @@ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import { withRouter } from 'react-router-dom'; -import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions'; -import { toggleDeviceDropdown } from '~/js/actions/WalletActions'; +import * as TrezorConnectActions from 'actions/TrezorConnectActions'; +import { toggleDeviceDropdown } from 'actions/WalletActions'; import Aside from './Aside'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/flowtype'; +import type { State, Dispatch } from 'flowtype'; type OwnProps = { diff --git a/src/js/components/wallet/index.js b/src/js/components/wallet/index.js index f5dc4572..b1c46eda 100644 --- a/src/js/components/wallet/index.js +++ b/src/js/components/wallet/index.js @@ -15,7 +15,7 @@ import Notifications from '../common/Notification'; import Log from '../common/Log'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '~/flowtype'; +import type { State, Dispatch } from 'flowtype'; type WalletContainerProps = { wallet: $ElementType, diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/components/wallet/pages/Acquire.js index 1a3b768a..cd3f6f06 100644 --- a/src/js/components/wallet/pages/Acquire.js +++ b/src/js/components/wallet/pages/Acquire.js @@ -4,10 +4,10 @@ import React from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import { Notification } from '~/js/components/common/Notification'; -import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions'; +import { Notification } from 'components/common/Notification'; +import * as TrezorConnectActions from 'actions/TrezorConnectActions'; -import type { State, Dispatch } from '~/flowtype'; +import type { State, Dispatch } from 'flowtype'; type Props = { acquiring: boolean; diff --git a/src/js/components/wallet/pages/Bootloader.js b/src/js/components/wallet/pages/Bootloader.js index ab62488e..77457187 100644 --- a/src/js/components/wallet/pages/Bootloader.js +++ b/src/js/components/wallet/pages/Bootloader.js @@ -1,7 +1,7 @@ /* @flow */ import React from 'react'; -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; diff --git a/src/js/components/wallet/pages/Dashboard.js b/src/js/components/wallet/pages/Dashboard.js index 7335a712..d526dbaf 100644 --- a/src/js/components/wallet/pages/Dashboard.js +++ b/src/js/components/wallet/pages/Dashboard.js @@ -2,8 +2,8 @@ import React from 'react'; import styled from 'styled-components'; import { connect } from 'react-redux'; -import { H2 } from '~/js/components/common/Heading'; -import DashboardImg from '~/images/dashboard.png'; +import { H2 } from 'components/common/Heading'; +import DashboardImg from 'images/dashboard.png'; const Wrapper = styled.div` display: flex; diff --git a/src/js/components/wallet/pages/DeviceSettings.js b/src/js/components/wallet/pages/DeviceSettings.js index fb2cc68f..2a27021e 100644 --- a/src/js/components/wallet/pages/DeviceSettings.js +++ b/src/js/components/wallet/pages/DeviceSettings.js @@ -1,10 +1,10 @@ import React from 'react'; import styled from 'styled-components'; -import { H2 } from '~/js/components/common/Heading'; -import Icon from '~/js/components/common/Icon'; -import colors from '~/js/config/colors'; -import Button from '~/js/components/common/Button'; -import ICONS from '~/js/constants/icons'; +import { H2 } from 'components/common/Heading'; +import Icon from 'components/common/Icon'; +import colors from 'config/colors'; +import Button from 'components/common/Button'; +import ICONS from 'constants/icons'; import { connect } from 'react-redux'; const Section = styled.section` diff --git a/src/js/components/wallet/pages/Initialize.js b/src/js/components/wallet/pages/Initialize.js index d3ba5502..3bca865c 100644 --- a/src/js/components/wallet/pages/Initialize.js +++ b/src/js/components/wallet/pages/Initialize.js @@ -1,5 +1,5 @@ /* @flow */ -import { H2 } from '~/js/components/common/Heading'; +import { H2 } from 'components/common/Heading'; import React from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; diff --git a/src/js/components/wallet/pages/UnreadableDevice.js b/src/js/components/wallet/pages/UnreadableDevice.js index 8a93135e..beef9c18 100644 --- a/src/js/components/wallet/pages/UnreadableDevice.js +++ b/src/js/components/wallet/pages/UnreadableDevice.js @@ -4,10 +4,10 @@ import React from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import { Notification } from '~/js/components/common/Notification'; -import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions'; +import { Notification } from 'components/common/Notification'; +import * as TrezorConnectActions from 'actions/TrezorConnectActions'; -import type { State, Dispatch } from '~/flowtype'; +import type { State, Dispatch } from 'flowtype'; type Props = { acquiring: boolean; diff --git a/src/js/index.js b/src/js/index.js index 3779d71a..8fabf37f 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -1,11 +1,11 @@ /* @flow */ import React from 'react'; import { render } from 'react-dom'; -import baseStyles from '~/js/support/BaseStyles'; +import baseStyles from 'support/BaseStyles'; import store from './store'; import App from './router'; import { onBeforeUnload } from './actions/WalletActions'; -import styles from '~/styles/index.less'; +import styles from 'styles/index.less'; const root: ?HTMLElement = document.getElementById('root'); if (root) { diff --git a/src/js/reducers/AccountsReducer.js b/src/js/reducers/AccountsReducer.js index 9a029d03..e17893bf 100644 --- a/src/js/reducers/AccountsReducer.js +++ b/src/js/reducers/AccountsReducer.js @@ -5,7 +5,7 @@ import * as CONNECT from '../actions/constants/TrezorConnect'; import * as WALLET from '../actions/constants/wallet'; import * as ACCOUNT from '../actions/constants/account'; -import type { Action, TrezorDevice } from '~/flowtype'; +import type { Action, TrezorDevice } from 'flowtype'; import type { AccountCreateAction, AccountSetBalanceAction, diff --git a/src/js/reducers/DevicesReducer.js b/src/js/reducers/DevicesReducer.js index b62e9c86..97816341 100644 --- a/src/js/reducers/DevicesReducer.js +++ b/src/js/reducers/DevicesReducer.js @@ -6,7 +6,7 @@ import type { Device } from 'trezor-connect'; import * as CONNECT from '../actions/constants/TrezorConnect'; import * as WALLET from '../actions/constants/wallet'; -import type { Action, TrezorDevice } from '~/flowtype'; +import type { Action, TrezorDevice } from 'flowtype'; export type State = Array; diff --git a/src/js/reducers/DiscoveryReducer.js b/src/js/reducers/DiscoveryReducer.js index 020bf03a..991cffca 100644 --- a/src/js/reducers/DiscoveryReducer.js +++ b/src/js/reducers/DiscoveryReducer.js @@ -8,7 +8,7 @@ import * as ACCOUNT from '../actions/constants/account'; import * as CONNECT from '../actions/constants/TrezorConnect'; import * as WALLET from '../actions/constants/wallet'; -import type { Action, TrezorDevice } from '~/flowtype'; +import type { Action, TrezorDevice } from 'flowtype'; import type { DiscoveryStartAction, DiscoveryWaitingAction, diff --git a/src/js/reducers/FiatRateReducer.js b/src/js/reducers/FiatRateReducer.js index 97302be4..160de571 100644 --- a/src/js/reducers/FiatRateReducer.js +++ b/src/js/reducers/FiatRateReducer.js @@ -3,7 +3,7 @@ import { RATE_UPDATE } from '../services/CoinmarketcapService'; -import type { Action } from '~/flowtype'; +import type { Action } from 'flowtype'; import type { FiatRateAction } from '../services/CoinmarketcapService'; export type Fiat = { diff --git a/src/js/reducers/LocalStorageReducer.js b/src/js/reducers/LocalStorageReducer.js index 5498bb7e..3b57dba7 100644 --- a/src/js/reducers/LocalStorageReducer.js +++ b/src/js/reducers/LocalStorageReducer.js @@ -3,7 +3,7 @@ import * as STORAGE from '../actions/constants/localStorage'; -import type { Action } from '~/flowtype'; +import type { Action } from 'flowtype'; export type Coin = { name: string; diff --git a/src/js/reducers/LogReducer.js b/src/js/reducers/LogReducer.js index bd3038fa..5516e3ad 100644 --- a/src/js/reducers/LogReducer.js +++ b/src/js/reducers/LogReducer.js @@ -2,7 +2,7 @@ import * as LOG from '../actions/constants/log'; -import type { Action } from '~/flowtype'; +import type { Action } from 'flowtype'; export type LogEntry = { time: number; diff --git a/src/js/reducers/ModalReducer.js b/src/js/reducers/ModalReducer.js index ae68258b..47338d44 100644 --- a/src/js/reducers/ModalReducer.js +++ b/src/js/reducers/ModalReducer.js @@ -6,7 +6,7 @@ import * as RECEIVE from '../actions/constants/receive'; import * as MODAL from '../actions/constants/modal'; import * as CONNECT from '../actions/constants/TrezorConnect'; -import type { Action, TrezorDevice } from '~/flowtype'; +import type { Action, TrezorDevice } from 'flowtype'; export type State = { opened: false; diff --git a/src/js/reducers/NotificationReducer.js b/src/js/reducers/NotificationReducer.js index 2c3a569e..d2171f3d 100644 --- a/src/js/reducers/NotificationReducer.js +++ b/src/js/reducers/NotificationReducer.js @@ -5,7 +5,7 @@ import { LOCATION_CHANGE } from 'react-router-redux'; import * as NOTIFICATION from '../actions/constants/notification'; import { DEVICE } from 'trezor-connect'; -import type { Action } from '~/flowtype'; +import type { Action } from 'flowtype'; export type CallbackAction = { label: string; diff --git a/src/js/reducers/PendingTxReducer.js b/src/js/reducers/PendingTxReducer.js index db1fb989..8e093cd1 100644 --- a/src/js/reducers/PendingTxReducer.js +++ b/src/js/reducers/PendingTxReducer.js @@ -5,7 +5,7 @@ import * as PENDING from '../actions/constants/pendingTx'; import * as SEND from '../actions/constants/send'; import * as WEB3 from '../actions/constants/web3'; -import type { Action } from '~/flowtype'; +import type { Action } from 'flowtype'; import type { SendTxAction } from '../actions/SendFormActions'; export type PendingTx = { diff --git a/src/js/reducers/ReceiveReducer.js b/src/js/reducers/ReceiveReducer.js index a95d545e..f57beca6 100644 --- a/src/js/reducers/ReceiveReducer.js +++ b/src/js/reducers/ReceiveReducer.js @@ -4,7 +4,7 @@ import { UI } from 'trezor-connect'; import * as RECEIVE from '../actions/constants/receive'; import * as ACCOUNT from '../actions/constants/account'; -import type { Action } from '~/flowtype'; +import type { Action } from 'flowtype'; export type State = { diff --git a/src/js/reducers/SelectedAccountReducer.js b/src/js/reducers/SelectedAccountReducer.js index 705fb3a8..c6a65efd 100644 --- a/src/js/reducers/SelectedAccountReducer.js +++ b/src/js/reducers/SelectedAccountReducer.js @@ -11,7 +11,7 @@ import type { PendingTx, Discovery, Web3Instance, -} from '~/flowtype'; +} from 'flowtype'; export type State = { location?: string; diff --git a/src/js/reducers/SendFormReducer.js b/src/js/reducers/SendFormReducer.js index 7d2b41ef..84453927 100644 --- a/src/js/reducers/SendFormReducer.js +++ b/src/js/reducers/SendFormReducer.js @@ -10,7 +10,7 @@ import * as WALLET from '../actions/constants/wallet'; import { getFeeLevels } from '../actions/SendFormActions'; -import type { Action } from '~/flowtype'; +import type { Action } from 'flowtype'; import type { Web3UpdateGasPriceAction, } from '../actions/Web3Actions'; diff --git a/src/js/reducers/SummaryReducer.js b/src/js/reducers/SummaryReducer.js index 88b7394f..fe35f06d 100644 --- a/src/js/reducers/SummaryReducer.js +++ b/src/js/reducers/SummaryReducer.js @@ -3,7 +3,7 @@ import * as ACCOUNT from '../actions/constants/account'; import * as SUMMARY from '../actions/constants/summary'; -import type { Action } from '~/flowtype'; +import type { Action } from 'flowtype'; import type { NetworkToken } from './LocalStorageReducer'; export type State = { diff --git a/src/js/reducers/TokensReducer.js b/src/js/reducers/TokensReducer.js index 729db026..d0a04b3a 100644 --- a/src/js/reducers/TokensReducer.js +++ b/src/js/reducers/TokensReducer.js @@ -5,7 +5,7 @@ import * as CONNECT from '../actions/constants/TrezorConnect'; import * as WALLET from '../actions/constants/wallet'; import * as TOKEN from '../actions/constants/token'; -import type { Action, TrezorDevice } from '~/flowtype'; +import type { Action, TrezorDevice } from 'flowtype'; import type { Account } from './AccountsReducer'; export type Token = { diff --git a/src/js/reducers/TrezorConnectReducer.js b/src/js/reducers/TrezorConnectReducer.js index 285b7730..b971d648 100644 --- a/src/js/reducers/TrezorConnectReducer.js +++ b/src/js/reducers/TrezorConnectReducer.js @@ -6,7 +6,7 @@ import type { Device } from 'trezor-connect'; import * as CONNECT from '../actions/constants/TrezorConnect'; import * as WALLET from '../actions/constants/wallet'; -import type { Action, TrezorDevice } from '~/flowtype'; +import type { Action, TrezorDevice } from 'flowtype'; export type SelectedDevice = { id: string; // could be device path if unacquired or features.device_id diff --git a/src/js/reducers/WalletReducer.js b/src/js/reducers/WalletReducer.js index 0187c14a..2317a770 100644 --- a/src/js/reducers/WalletReducer.js +++ b/src/js/reducers/WalletReducer.js @@ -9,7 +9,7 @@ import * as WALLET from '../actions/constants/wallet'; import * as CONNECT from '../actions/constants/TrezorConnect'; -import type { Action, RouterLocationState, TrezorDevice } from '~/flowtype'; +import type { Action, RouterLocationState, TrezorDevice } from 'flowtype'; type State = { ready: boolean; diff --git a/src/js/reducers/Web3Reducer.js b/src/js/reducers/Web3Reducer.js index fc6ffd20..ab95c61e 100644 --- a/src/js/reducers/Web3Reducer.js +++ b/src/js/reducers/Web3Reducer.js @@ -7,7 +7,7 @@ import type { ContractFactory } from 'web3'; import * as STORAGE from '../actions/constants/localStorage'; import * as WEB3 from '../actions/constants/web3'; -import type { Action } from '~/flowtype'; +import type { Action } from 'flowtype'; import type { Web3UpdateBlockAction, Web3UpdateGasPriceAction, diff --git a/src/js/reducers/utils/index.js b/src/js/reducers/utils/index.js index 17068816..e088d5fa 100644 --- a/src/js/reducers/utils/index.js +++ b/src/js/reducers/utils/index.js @@ -1,9 +1,9 @@ /* @flow */ -import * as LogActions from '~/js/actions/LogActions'; -import * as STORAGE from '~/js/actions/constants/localStorage'; -import * as WALLET from '~/js/actions/constants/wallet'; +import * as LogActions from 'actions/LogActions'; +import * as STORAGE from 'actions/constants/localStorage'; +import * as WALLET from 'actions/constants/wallet'; import BigNumber from 'bignumber.js'; import type { @@ -22,7 +22,7 @@ import type { Token, PendingTx, Web3Instance, -} from '~/flowtype'; +} from 'flowtype'; export const getSelectedDevice = (state: State): ?TrezorDevice => { const locationState = state.router.location.state; diff --git a/src/js/router/index.js b/src/js/router/index.js index 3d684345..54ddca20 100644 --- a/src/js/router/index.js +++ b/src/js/router/index.js @@ -5,7 +5,7 @@ import { Provider } from 'react-redux'; import { ConnectedRouter } from 'react-router-redux'; import store, { history } from '../store'; -import ErrorBoundary from '~/js/support/ErrorBoundary'; +import ErrorBoundary from 'support/ErrorBoundary'; import LandingPageContainer from '../components/landing'; import WalletContainer from '../components/wallet'; diff --git a/src/js/services/CoinmarketcapService.js b/src/js/services/CoinmarketcapService.js index 93400b3e..8911d6d3 100644 --- a/src/js/services/CoinmarketcapService.js +++ b/src/js/services/CoinmarketcapService.js @@ -14,7 +14,7 @@ import type { Action, AsyncAction, GetState, -} from '~/flowtype'; +} from 'flowtype'; import type { Config, FiatValueTicker } from '../reducers/LocalStorageReducer'; export const RATE_UPDATE: 'rate__update' = 'rate__update'; diff --git a/src/js/services/LocalStorageService.js b/src/js/services/LocalStorageService.js index 1ec620e2..3265a732 100644 --- a/src/js/services/LocalStorageService.js +++ b/src/js/services/LocalStorageService.js @@ -25,9 +25,9 @@ import type { Action, AsyncAction, GetState, -} from '~/flowtype'; +} from 'flowtype'; -import type { TrezorDevice } from '~/flowtype'; +import type { TrezorDevice } from 'flowtype'; import type { Account } from '../reducers/AccountsReducer'; import type { Token } from '../reducers/TokensReducer'; import type { PendingTx } from '../reducers/PendingTxReducer'; diff --git a/src/js/services/LogService.js b/src/js/services/LogService.js index 0b81408d..3f308992 100644 --- a/src/js/services/LogService.js +++ b/src/js/services/LogService.js @@ -16,7 +16,7 @@ import type { Action, AsyncAction, GetState, -} from '~/flowtype'; +} from 'flowtype'; const exclude: Array = [ ADD, OPEN, CLOSE, diff --git a/src/js/services/RouterService.js b/src/js/services/RouterService.js index a92d4e14..00b31cf4 100644 --- a/src/js/services/RouterService.js +++ b/src/js/services/RouterService.js @@ -19,7 +19,7 @@ import type { GetState, RouterLocationState, TrezorDevice, -} from '~/flowtype'; +} from 'flowtype'; /** * Middleware used for init application and managing router path. diff --git a/src/js/services/TrezorConnectService.js b/src/js/services/TrezorConnectService.js index 24520efe..a6d8fbd3 100644 --- a/src/js/services/TrezorConnectService.js +++ b/src/js/services/TrezorConnectService.js @@ -26,7 +26,7 @@ import type { AsyncAction, GetState, RouterLocationState, -} from '~/flowtype'; +} from 'flowtype'; const TrezorConnectService: Middleware = (api: MiddlewareAPI) => (next: MiddlewareDispatch) => (action: Action): Action => { const prevState: $ElementType = api.getState().connect; diff --git a/src/js/services/WalletService.js b/src/js/services/WalletService.js index 7c08c0a7..1eb653ba 100644 --- a/src/js/services/WalletService.js +++ b/src/js/services/WalletService.js @@ -15,7 +15,7 @@ import type { MiddlewareAPI, MiddlewareDispatch, Action, -} from '~/flowtype'; +} from 'flowtype'; /** * Middleware diff --git a/src/js/store/index.js b/src/js/store/index.js index 8a20502c..1c5a9ec6 100644 --- a/src/js/store/index.js +++ b/src/js/store/index.js @@ -14,7 +14,7 @@ import services from '../services'; import Raven from 'raven-js'; import RavenMiddleware from 'redux-raven-middleware'; -import type { Action, GetState, Store } from '~/flowtype'; +import type { Action, GetState, Store } from 'flowtype'; export const history: History = createHistory({ queryKey: false }); diff --git a/yarn.lock b/yarn.lock index 949f4427..5ee37c96 100644 --- a/yarn.lock +++ b/yarn.lock @@ -347,13 +347,6 @@ text-table "^0.2.0" webpack-log "^1.1.2" -JSONStream@^0.8.4: - version "0.8.4" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-0.8.4.tgz#91657dfe6ff857483066132b4618b62e8f4887bd" - dependencies: - jsonparse "0.0.5" - through ">=2.2.7 <3" - abab@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/abab/-/abab-1.0.4.tgz#5faad9c2c07f60dd76770f71cf025b62a63cfd4e" @@ -392,17 +385,13 @@ acorn-globals@^4.1.0: dependencies: acorn "^5.0.0" -acorn-jsx@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" +acorn-jsx@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-4.1.1.tgz#e8e41e48ea2fe0c896740610ab6a4ffd8add225e" dependencies: - acorn "^3.0.4" - -acorn@^3.0.4: - version "3.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" + acorn "^5.0.3" -acorn@^5.0.0, acorn@^5.5.0, acorn@^5.5.3, acorn@^5.6.2: +acorn@^5.0.0, acorn@^5.0.3, acorn@^5.5.3, acorn@^5.6.0, acorn@^5.6.2: version "5.7.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8" @@ -412,10 +401,6 @@ add-dom-event-listener@1.x: dependencies: object-assign "4.x" -ajv-keywords@^2.1.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" - ajv-keywords@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a" @@ -431,7 +416,7 @@ ajv@^4.9.1: co "^4.6.0" json-stable-stringify "^1.0.1" -ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: +ajv@^5.1.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" dependencies: @@ -440,7 +425,7 @@ ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: fast-json-stable-stringify "^2.0.0" json-schema-traverse "^0.3.0" -ajv@^6.0.1: +ajv@^6.0.1, ajv@^6.5.0: version "6.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360" dependencies: @@ -726,7 +711,7 @@ atob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a" -autoprefixer@^6.0.0, autoprefixer@^6.3.1: +autoprefixer@^6.3.1: version "6.7.7" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" dependencies: @@ -791,7 +776,7 @@ babel-cli@^6.24.1: optionalDependencies: chokidar "^1.6.1" -babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: +babel-code-frame@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" dependencies: @@ -1050,11 +1035,15 @@ babel-plugin-jest-hoist@^23.2.0: version "23.2.0" resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.2.0.tgz#e61fae05a1ca8801aadee57a6d66b8cefaf44167" -babel-plugin-root-import@5: - version "5.1.0" - resolved "https://registry.yarnpkg.com/babel-plugin-root-import/-/babel-plugin-root-import-5.1.0.tgz#80ea1cd5945b463a5e3f7e204a69478c573e328c" +babel-plugin-module-resolver@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.1.1.tgz#881cf67e3d4b8400d5eaaefc1be44d2dc1fe404f" dependencies: - slash "^1.0.0" + find-babel-config "^1.1.0" + glob "^7.1.2" + pkg-up "^2.0.0" + reselect "^3.0.1" + resolve "^1.4.0" babel-plugin-styled-components@^1.5.1: version "1.5.1" @@ -1551,7 +1540,7 @@ babel-template@^6.16.0, babel-template@^6.24.1, babel-template@^6.26.0: babylon "^6.18.0" lodash "^4.17.4" -babel-traverse@^6.0.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0: +babel-traverse@^6.0.0, babel-traverse@^6.18.0, babel-traverse@^6.24.1, babel-traverse@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.26.0.tgz#46a9cbd7edcc62c8e5c064e2d2d8d0f4035766ee" dependencies: @@ -1589,7 +1578,7 @@ babylon@7.0.0-beta.44: version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d" -babylon@^6.12.0, babylon@^6.17.3, babylon@^6.18.0: +babylon@^6.17.3, babylon@^6.18.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3" @@ -1601,7 +1590,7 @@ bail@^1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/bail/-/bail-1.0.3.tgz#63cfb9ddbac829b02a3128cd53224be78e6c21a3" -balanced-match@^0.4.0, balanced-match@^0.4.2: +balanced-match@^0.4.2: version "0.4.2" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" @@ -1659,10 +1648,6 @@ bindings@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7" -bindings@~1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.2.1.tgz#14ad6113812d2d37d72e67b4cacb4bb726505f11" - bip66@^1.1.3: version "1.1.5" resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22" @@ -1675,7 +1660,7 @@ block-stream@*: dependencies: inherits "~2.0.0" -bluebird@^3.0.5, bluebird@^3.5.1: +bluebird@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" @@ -1827,7 +1812,7 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^1.1.1, browserslist@^1.1.3, browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: +browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: version "1.7.7" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" dependencies: @@ -1986,7 +1971,7 @@ camelcase@^1.0.2: version "1.2.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39" -camelcase@^2.0.0, camelcase@^2.0.1: +camelcase@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f" @@ -2003,10 +1988,6 @@ caniuse-api@^1.5.2: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-db@^1.0.30000187: - version "1.0.30000877" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000877.tgz#29ea435fdbe8a671cc5b027a75e28a816c17c340" - caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: version "1.0.30000770" resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000770.tgz#cf68ae1cb8a82f6d3c35df41c62dc6973e470244" @@ -2249,14 +2230,6 @@ cliui@^2.1.0: right-align "^0.1.1" wordwrap "0.0.2" -cliui@^3.0.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" - wrap-ansi "^2.0.0" - cliui@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc" @@ -2348,10 +2321,6 @@ color-convert@^1.3.0, color-convert@^1.9.0: dependencies: color-name "^1.1.1" -color-diff@^0.1.3: - version "0.1.7" - resolved "https://registry.yarnpkg.com/color-diff/-/color-diff-0.1.7.tgz#6db78cd9482a8e459d40821eaf4b503283dcb8e2" - color-hash@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/color-hash/-/color-hash-1.0.3.tgz#c0e7952f06d022e548e65da239512bd67d3809ee" @@ -2374,21 +2343,6 @@ color@^0.11.0: color-convert "^1.3.0" color-string "^0.3.0" -colorguard@^1.2.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colorguard/-/colorguard-1.2.1.tgz#249647c9702481d9143384fc9813662311afde98" - dependencies: - chalk "^1.1.1" - color-diff "^0.1.3" - log-symbols "^1.0.2" - object-assign "^4.0.1" - pipetteur "^2.0.0" - plur "^2.0.0" - postcss "^5.0.4" - postcss-reporter "^1.2.1" - text-table "^0.2.0" - yargs "^1.2.6" - colormin@^1.0.5: version "1.1.2" resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133" @@ -2429,10 +2383,6 @@ commander@^2.11.0: version "2.12.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.12.1.tgz#468635c4168d06145b9323356d1da84d14ac4a7a" -commander@^2.9.0: - version "2.17.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf" - commander@~2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" @@ -2489,15 +2439,6 @@ concat-stream@^1.5.0: readable-stream "^2.2.2" typedarray "^0.0.6" -concat-stream@^1.6.0: - version "1.6.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" - dependencies: - buffer-from "^1.0.0" - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - connect-history-api-fallback@^1.3.0: version "1.5.0" resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz#b06873934bc5e344fef611a196a6faae0aee015a" @@ -2584,18 +2525,6 @@ core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" -cosmiconfig@^2.1.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-2.2.2.tgz#6173cebd56fac042c1f4390edf7af6c07c7cb892" - dependencies: - is-directory "^0.3.1" - js-yaml "^3.4.3" - minimist "^1.2.0" - object-assign "^4.1.0" - os-homedir "^1.0.1" - parse-json "^2.2.0" - require-from-string "^1.1.0" - cosmiconfig@^5.0.0: version "5.0.6" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39" @@ -2649,7 +2578,7 @@ cross-spawn@^4.0.0: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1, cross-spawn@^5.1.0: +cross-spawn@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" dependencies: @@ -2704,20 +2633,6 @@ css-color-keywords@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/css-color-keywords/-/css-color-keywords-1.0.0.tgz#fea2616dc676b2962686b3af8dbdbe180b244e05" -css-color-list@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/css-color-list/-/css-color-list-0.0.1.tgz#8718e8695ae7a2cc8787be8715f1c008a7f28b15" - dependencies: - css-color-names "0.0.1" - -css-color-names@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.1.tgz#5d0548fa256456ede4a9a0c2ac7ab19d3eb1ad81" - -css-color-names@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.3.tgz#de0cef16f4d8aa8222a320d5b6d7e9bbada7b9f6" - css-color-names@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" @@ -2741,15 +2656,6 @@ css-loader@0.28.11: postcss-value-parser "^3.3.0" source-list-map "^2.0.0" -css-rule-stream@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/css-rule-stream/-/css-rule-stream-1.1.0.tgz#3786e7198983d965a26e31957e09078cbb7705a2" - dependencies: - css-tokenize "^1.0.1" - duplexer2 "0.0.2" - ldjson-stream "^1.2.1" - through2 "^0.6.3" - css-select@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" @@ -2775,13 +2681,6 @@ css-to-react-native@^2.0.3: fbjs "^0.8.5" postcss-value-parser "^3.3.0" -css-tokenize@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/css-tokenize/-/css-tokenize-1.0.1.tgz#4625cb1eda21c143858b7f81d6803c1d26fc14be" - dependencies: - inherits "^2.0.1" - readable-stream "^1.0.33" - css-what@2.1: version "2.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.0.tgz#9467d032c38cfaefb9f2d79501253062f87fa1bd" @@ -2894,14 +2793,7 @@ dateformat@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" -deasync@^0.1.11: - version "0.1.13" - resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.13.tgz#815c2b69bbd1117cae570152cd895661c09f20ea" - dependencies: - bindings "~1.2.1" - nan "^2.0.7" - -debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9: +debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -3062,7 +2954,7 @@ detect-node@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127" -diff@^3.1.0, diff@^3.2.0, diff@^3.3.1, diff@^3.4.0, diff@^3.5.0: +diff@^3.2.0, diff@^3.3.1, diff@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" @@ -3111,23 +3003,6 @@ doctrine@^2.1.0: dependencies: esutils "^2.0.2" -doiuse@^2.4.1: - version "2.6.0" - resolved "https://registry.yarnpkg.com/doiuse/-/doiuse-2.6.0.tgz#1892d10b61a9a356addbf2b614933e81f8bb3834" - dependencies: - browserslist "^1.1.1" - caniuse-db "^1.0.30000187" - css-rule-stream "^1.1.0" - duplexer2 "0.0.2" - jsonfilter "^1.1.2" - ldjson-stream "^1.2.1" - lodash "^4.0.0" - multimatch "^2.0.0" - postcss "^5.0.8" - source-map "^0.4.2" - through2 "^0.6.3" - yargs "^3.5.4" - dom-align@1.x: version "1.6.7" resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.6.7.tgz#6858138efb6b77405ce99146d0be5e4f7282813f" @@ -3217,12 +3092,6 @@ drbg.js@^1.0.1: create-hash "^1.1.2" create-hmac "^1.1.4" -duplexer2@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db" - dependencies: - readable-stream "~1.1.9" - duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" @@ -3259,16 +3128,6 @@ editions@^1.3.3: version "1.3.4" resolved "https://registry.yarnpkg.com/editions/-/editions-1.3.4.tgz#3662cb592347c3168eb8e498a0ff73271d67f50b" -editorconfig@^0.13.2: - version "0.13.3" - resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.13.3.tgz#e5219e587951d60958fd94ea9a9a008cdeff1b34" - dependencies: - bluebird "^3.0.5" - commander "^2.9.0" - lru-cache "^3.2.0" - semver "^5.1.0" - sigmund "^1.0.1" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -3374,7 +3233,7 @@ error@^7.0.2: string-template "~0.2.1" xtend "~4.0.0" -es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.6.1: +es-abstract@^1.10.0, es-abstract@^1.4.3, es-abstract@^1.5.1, es-abstract@^1.6.1: version "1.12.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165" dependencies: @@ -3460,20 +3319,12 @@ eslint-config-airbnb@^17.0.0: object.assign "^4.1.0" object.entries "^1.0.4" -eslint-import-resolver-babel-plugin-root-import@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-plugin-root-import/-/eslint-import-resolver-babel-plugin-root-import-1.1.1.tgz#b060f1177557918389f7ed476e5b36a43854a381" - dependencies: - eslint-import-resolver-node "^0.2.1" - json5 "^0.5.0" - -eslint-import-resolver-node@^0.2.1: - version "0.2.3" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.2.3.tgz#5add8106e8c928db2cba232bcd9efa846e3da16c" +eslint-import-resolver-babel-module@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-babel-module/-/eslint-import-resolver-babel-module-4.0.0.tgz#1c596f7fb9815050292c8750d523b27a5444b4bf" dependencies: - debug "^2.2.0" - object-assign "^4.0.1" - resolve "^1.1.6" + pkg-up "^2.0.0" + resolve "^1.4.0" eslint-import-resolver-node@^0.3.1: version "0.3.2" @@ -3495,9 +3346,9 @@ eslint-plugin-flowtype@^2.50.0: dependencies: lodash "^4.17.10" -eslint-plugin-import@^2.13.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.13.0.tgz#df24f241175e312d91662dc91ca84064caec14ed" +eslint-plugin-import@^2.14.0: + version "2.14.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.14.0.tgz#6b17626d2e3e6ad52cfce8807a845d15e22111a8" dependencies: contains-path "^0.1.0" debug "^2.6.8" @@ -3540,7 +3391,7 @@ 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" -eslint-scope@3.7.1, eslint-scope@^3.7.1: +eslint-scope@3.7.1: version "3.7.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.1.tgz#3d63c3edfda02e06e01a452ad88caacc7cdcb6e8" dependencies: @@ -3554,59 +3405,64 @@ eslint-scope@^4.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-utils@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.3.1.tgz#9a851ba89ee7c460346f97cf8939c7298827e512" + eslint-visitor-keys@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d" -eslint@^4: - version "4.19.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300" +eslint@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.3.0.tgz#53695aca5213968aacdf970ccb231e42a2b285f8" dependencies: - ajv "^5.3.0" - babel-code-frame "^6.22.0" + ajv "^6.5.0" + babel-code-frame "^6.26.0" chalk "^2.1.0" - concat-stream "^1.6.0" - cross-spawn "^5.1.0" + cross-spawn "^6.0.5" debug "^3.1.0" doctrine "^2.1.0" - eslint-scope "^3.7.1" + eslint-scope "^4.0.0" + eslint-utils "^1.3.1" eslint-visitor-keys "^1.0.0" - espree "^3.5.4" - esquery "^1.0.0" + espree "^4.0.0" + esquery "^1.0.1" esutils "^2.0.2" file-entry-cache "^2.0.0" functional-red-black-tree "^1.0.1" glob "^7.1.2" - globals "^11.0.1" - ignore "^3.3.3" + globals "^11.7.0" + ignore "^4.0.2" imurmurhash "^0.1.4" - inquirer "^3.0.6" - is-resolvable "^1.0.0" - js-yaml "^3.9.1" + inquirer "^5.2.0" + is-resolvable "^1.1.0" + js-yaml "^3.11.0" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.3.0" - lodash "^4.17.4" - minimatch "^3.0.2" + lodash "^4.17.5" + minimatch "^3.0.4" mkdirp "^0.5.1" natural-compare "^1.4.0" optionator "^0.8.2" path-is-inside "^1.0.2" pluralize "^7.0.0" progress "^2.0.0" - regexpp "^1.0.1" + regexpp "^2.0.0" require-uncached "^1.0.3" - semver "^5.3.0" + semver "^5.5.0" + string.prototype.matchall "^2.0.0" strip-ansi "^4.0.0" - strip-json-comments "~2.0.1" - table "4.0.2" - text-table "~0.2.0" + strip-json-comments "^2.0.1" + table "^4.0.3" + text-table "^0.2.0" -espree@^3.5.4: - version "3.5.4" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7" +espree@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/espree/-/espree-4.0.0.tgz#253998f20a0f82db5d866385799d912a83a36634" dependencies: - acorn "^5.5.0" - acorn-jsx "^3.0.0" + acorn "^5.6.0" + acorn-jsx "^4.1.1" esprima@^2.6.0: version "2.7.3" @@ -3624,7 +3480,7 @@ esprima@~4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804" -esquery@^1.0.0: +esquery@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" dependencies: @@ -3859,7 +3715,7 @@ extend@~3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444" -external-editor@^2.0.4, external-editor@^2.1.0: +external-editor@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5" dependencies: @@ -4032,6 +3888,13 @@ finalhandler@1.1.1: statuses "~1.4.0" unpipe "~1.0.0" +find-babel-config@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-1.1.0.tgz#acc01043a6749fec34429be6b64f542ebb5d6355" + dependencies: + json5 "^0.5.1" + path-exists "^3.0.0" + find-cache-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f" @@ -4218,10 +4081,6 @@ functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" -gather-stream@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/gather-stream/-/gather-stream-1.0.0.tgz#b33994af457a8115700d410f317733cbe7a0904b" - gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" @@ -4243,10 +4102,6 @@ get-stdin@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" -get-stdin@^5.0.0: - version "5.0.1" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-5.0.1.tgz#122e161591e21ff4c52530305693f20e6393a398" - get-stdin@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b" @@ -4345,7 +4200,7 @@ global@^4.3.0: min-document "^2.19.0" process "~0.5.1" -globals@^11.0.1, globals@^11.1.0: +globals@^11.1.0, globals@^11.7.0: version "11.7.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.7.0.tgz#a583faa43055b1aca771914bf68258e2fc125673" @@ -4364,7 +4219,7 @@ globby@^5.0.0: pify "^2.0.0" pinkie-promise "^2.0.0" -globby@^6.0.0, globby@^6.1.0: +globby@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" dependencies: @@ -4828,10 +4683,6 @@ ignore-walk@^3.0.1: dependencies: minimatch "^3.0.4" -ignore@^3.2.0, ignore@^3.3.3: - version "3.3.10" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043" - ignore@^3.3.5: version "3.3.7" resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" @@ -4840,6 +4691,10 @@ ignore@^4.0.0: version "4.0.5" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.5.tgz#333535a20325ba4852c4ddb135d47392aa035e6d" +ignore@^4.0.2: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + image-size@~0.5.0: version "0.5.5" resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" @@ -4865,7 +4720,7 @@ indent-string@^2.1.0: dependencies: repeating "^2.0.0" -indent-string@^3.0.0, indent-string@^3.2.0: +indent-string@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" @@ -4896,25 +4751,6 @@ ini@^1.3.4, ini@~1.3.0: version "1.3.5" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" -inquirer@^3.0.6: - version "3.3.0" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9" - dependencies: - ansi-escapes "^3.0.0" - chalk "^2.0.0" - cli-cursor "^2.1.0" - cli-width "^2.0.0" - external-editor "^2.0.4" - figures "^2.0.0" - lodash "^4.3.0" - mute-stream "0.0.7" - run-async "^2.2.0" - rx-lite "^4.0.8" - rx-lite-aggregates "^4.0.8" - string-width "^2.1.0" - strip-ansi "^4.0.0" - through "^2.3.6" - inquirer@^5.1.0, inquirer@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726" @@ -4974,10 +4810,6 @@ ipaddr.js@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b" -irregular-plurals@^1.0.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/irregular-plurals/-/irregular-plurals-1.4.0.tgz#2ca9b033651111855412f16be5d77c62a458a766" - is-absolute-url@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" @@ -5237,7 +5069,7 @@ is-regexp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069" -is-resolvable@^1.0.0: +is-resolvable@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" @@ -5705,7 +5537,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -js-yaml@^3.4.3, js-yaml@^3.7.0, js-yaml@^3.9.0, js-yaml@^3.9.1: +js-yaml@^3.11.0, js-yaml@^3.7.0, js-yaml@^3.9.0: version "3.12.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" dependencies: @@ -5848,23 +5680,10 @@ json5@^0.5.0, json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" -jsonfilter@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/jsonfilter/-/jsonfilter-1.1.2.tgz#21ef7cedc75193813c75932e96a98be205ba5a11" - dependencies: - JSONStream "^0.8.4" - minimist "^1.1.0" - stream-combiner "^0.2.1" - through2 "^0.6.3" - jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" -jsonparse@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-0.0.5.tgz#330542ad3f0a654665b778f3eb2d9a9fa507ac64" - jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -5923,10 +5742,6 @@ kleur@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/kleur/-/kleur-2.0.1.tgz#7cc64b0d188d0dcbc98bdcdfdda2cc10619ddce8" -known-css-properties@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.2.0.tgz#899c94be368e55b42d7db8d5be7d73a4a4a41454" - known-css-properties@^0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.6.1.tgz#31b5123ad03d8d1a3f36bd4155459c981173478b" @@ -5941,13 +5756,6 @@ lcid@^1.0.0: dependencies: invert-kv "^1.0.0" -ldjson-stream@^1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/ldjson-stream/-/ldjson-stream-1.2.1.tgz#91beceda5ac4ed2b17e649fb777e7abfa0189c2b" - dependencies: - split2 "^0.2.1" - through2 "^0.6.1" - left-pad@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" @@ -6128,15 +5936,11 @@ lodash.sortby@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" -lodash.unescape@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c" - lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" -lodash@^4.0.0, lodash@^4.1.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0: +lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.10, lodash@^4.17.2, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@^4.3.0: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -6215,12 +6019,6 @@ lowercase-keys@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" -lru-cache@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-3.2.0.tgz#71789b3b7f5399bec8565dda38aa30d2a097efee" - dependencies: - pseudomap "^1.0.1" - lru-cache@^4.0.1, lru-cache@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.1.tgz#622e32e82488b49279114a4f9ecf45e7cd6bba55" @@ -6288,7 +6086,7 @@ math-expression-evaluator@^1.2.14: version "1.2.17" resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac" -mathml-tag-names@^2.0.0, mathml-tag-names@^2.0.1: +mathml-tag-names@^2.0.1: version "2.1.0" resolved "https://registry.yarnpkg.com/mathml-tag-names/-/mathml-tag-names-2.1.0.tgz#490b70e062ee24636536e3d9481e333733d00f2c" @@ -6532,7 +6330,7 @@ minimist@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de" -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: +minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" @@ -6620,14 +6418,14 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@^2.0.7, nan@^2.9.2: - version "2.10.0" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" - nan@^2.2.1, nan@^2.3.0: version "2.8.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a" +nan@^2.9.2: + version "2.10.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" + nanomatch@^1.2.9: version "1.2.9" resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2" @@ -6968,10 +6766,6 @@ once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0: dependencies: wrappy "1" -onecolor@^3.0.4: - version "3.0.5" - resolved "https://registry.yarnpkg.com/onecolor/-/onecolor-3.0.5.tgz#36eff32201379efdf1180fb445e51a8e2425f9f6" - onetime@^1.0.0: version "1.1.0" resolved "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" @@ -7025,16 +6819,10 @@ os-browserify@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" -os-homedir@^1.0.0, os-homedir@^1.0.1: +os-homedir@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" -os-locale@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9" - dependencies: - lcid "^1.0.0" - os-locale@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" @@ -7311,13 +7099,6 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" -pipetteur@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/pipetteur/-/pipetteur-2.0.3.tgz#1955760959e8d1a11cb2a50ec83eec470633e49f" - dependencies: - onecolor "^3.0.4" - synesthesia "^1.0.1" - pkg-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" @@ -7330,11 +7111,11 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.1.0" -plur@^2.0.0, plur@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/plur/-/plur-2.1.2.tgz#7482452c1a0f508e3e344eaec312c91c29dc655a" +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" dependencies: - irregular-plurals "^1.0.0" + find-up "^2.1.0" pluralize@^7.0.0: version "7.0.0" @@ -7423,12 +7204,6 @@ postcss-html@^0.31.0: dependencies: htmlparser2 "^3.9.2" -postcss-less@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-0.14.0.tgz#c631b089c6cce422b9a10f3a958d2bedd3819324" - dependencies: - postcss "^5.0.21" - postcss-less@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-2.0.0.tgz#5d190b8e057ca446d60fe2e2587ad791c9029fb8" @@ -7442,7 +7217,7 @@ postcss-markdown@^0.31.0: remark "^9.0.0" unist-util-find-all-after "^1.0.2" -postcss-media-query-parser@^0.2.0, postcss-media-query-parser@^0.2.3: +postcss-media-query-parser@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz#27b39c6f4d94f81b1a73b8f76351c609e5cef244" @@ -7577,24 +7352,6 @@ postcss-reduce-transforms@^1.0.3: postcss "^5.0.8" postcss-value-parser "^3.0.1" -postcss-reporter@^1.2.1, postcss-reporter@^1.3.3: - version "1.4.1" - resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-1.4.1.tgz#c136f0a5b161915f379dd3765c61075f7e7b9af2" - dependencies: - chalk "^1.0.0" - lodash "^4.1.0" - log-symbols "^1.0.2" - postcss "^5.0.0" - -postcss-reporter@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-3.0.0.tgz#09ea0f37a444c5693878606e09b018ebeff7cf8f" - dependencies: - chalk "^1.0.0" - lodash "^4.1.0" - log-symbols "^1.0.2" - postcss "^5.0.0" - postcss-reporter@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-5.0.0.tgz#a14177fd1342829d291653f2786efd67110332c3" @@ -7621,19 +7378,13 @@ postcss-sass@^0.3.0: gonzales-pe "4.2.3" postcss "6.0.22" -postcss-scss@^0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-0.4.1.tgz#ad771b81f0f72f5f4845d08aa60f93557653d54c" - dependencies: - postcss "^5.2.13" - postcss-scss@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1" dependencies: postcss "^7.0.0" -postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.1.1, postcss-selector-parser@^2.2.2: +postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: version "2.2.3" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90" dependencies: @@ -7649,13 +7400,6 @@ postcss-selector-parser@^3.1.0: indexes-of "^1.0.1" uniq "^1.0.1" -postcss-sorting@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-sorting/-/postcss-sorting-2.1.0.tgz#32b1e9afa913bb225a6ad076d503d8f983bb4a82" - dependencies: - lodash "^4.17.4" - postcss "^5.2.17" - postcss-styled@^0.31.0: version "0.31.0" resolved "https://registry.yarnpkg.com/postcss-styled/-/postcss-styled-0.31.0.tgz#ab532a2b3c469dfcca306a7623c4d4a98bb077d5" @@ -7701,7 +7445,7 @@ postcss@6.0.22: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^5.0.0, postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.18, postcss@^5.0.2, postcss@^5.0.20, postcss@^5.0.21, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.13, postcss@^5.2.16, postcss@^5.2.17, postcss@^5.2.4, postcss@^5.2.5: +postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16: version "5.2.18" resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" dependencies: @@ -7857,7 +7601,7 @@ ps-tree@^1.0.1, ps-tree@^1.1.0: dependencies: event-stream "~3.3.0" -pseudomap@^1.0.1, pseudomap@^1.0.2: +pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -8195,12 +7939,6 @@ read-chunk@^2.1.0: pify "^3.0.0" safe-buffer "^5.1.1" -read-file-stdin@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/read-file-stdin/-/read-file-stdin-0.2.1.tgz#25eccff3a153b6809afacb23ee15387db9e0ee61" - dependencies: - gather-stream "^1.0.0" - read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -8258,7 +7996,7 @@ read-pkg@^3.0.0: string_decoder "~1.0.3" util-deprecate "~1.0.1" -readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0": +readable-stream@1.0: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" dependencies: @@ -8267,15 +8005,6 @@ readable-stream@1.0, "readable-stream@>=1.0.33-1 <1.1.0-0": isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@^1.0.33, readable-stream@~1.1.9: - version "1.1.14" - resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.1" - isarray "0.0.1" - string_decoder "~0.10.x" - readable-stream@^2.0.1, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" @@ -8430,9 +8159,15 @@ regex-not@^1.0.0, regex-not@^1.0.2: extend-shallow "^3.0.2" safe-regex "^1.1.0" -regexpp@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab" +regexp.prototype.flags@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c" + dependencies: + define-properties "^1.1.2" + +regexpp@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365" regexpu-core@^1.0.0: version "1.0.0" @@ -8617,10 +8352,6 @@ require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" -require-from-string@^1.1.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" - require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" @@ -8636,6 +8367,10 @@ requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" +reselect@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147" + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -8679,7 +8414,7 @@ resolve@^1.1.6: dependencies: path-parse "^1.0.5" -resolve@^1.5.0, resolve@^1.6.0: +resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0: version "1.8.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" dependencies: @@ -8759,16 +8494,6 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rx-lite-aggregates@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz#753b87a89a11c95467c4ac1626c4efc4e05c67be" - dependencies: - rx-lite "*" - -rx-lite@*, rx-lite@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" - rxjs@^5.4.2, rxjs@^5.5.2: version "5.5.10" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045" @@ -8850,11 +8575,7 @@ selfsigned@^1.9.1: version "5.4.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e" -semver@5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" - -semver@^5.1.0, semver@^5.4.1, semver@^5.5.0: +semver@^5.4.1, semver@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" @@ -8991,10 +8712,6 @@ shortid@^2.2.8: version "2.2.8" resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.8.tgz#033b117d6a2e975804f6f0969dbe7d3d0b355131" -sigmund@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590" - signal-exit@^3.0.0, signal-exit@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" @@ -9119,7 +8836,7 @@ source-map@0.5.x, source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, sourc version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" -source-map@^0.4.2, source-map@^0.4.4: +source-map@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: @@ -9166,10 +8883,6 @@ spdy@^3.4.1: select-hose "^2.0.0" spdy-transport "^2.0.18" -specificity@^0.3.0: - version "0.3.2" - resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.3.2.tgz#99e6511eceef0f8d9b57924937aac2cb13d13c42" - specificity@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/specificity/-/specificity-0.4.0.tgz#301b1ab5455987c37d6d94f8c956ef9d9fb48c1d" @@ -9180,12 +8893,6 @@ split-string@^3.0.1, split-string@^3.0.2: dependencies: extend-shallow "^3.0.0" -split2@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/split2/-/split2-0.2.1.tgz#02ddac9adc03ec0bb78c1282ec079ca6e85ae900" - dependencies: - through2 "~0.6.1" - split@0.3: version "0.3.3" resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f" @@ -9235,10 +8942,6 @@ static-extend@^0.1.1: version "1.4.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" -stdin@0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/stdin/-/stdin-0.0.1.tgz#d3041981aaec3dfdbc77a1b38d6372e38f5fb71e" - stealthy-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" @@ -9250,13 +8953,6 @@ stream-browserify@^2.0.1: inherits "~2.0.1" readable-stream "^2.0.2" -stream-combiner@^0.2.1: - version "0.2.2" - resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.2.2.tgz#aec8cbac177b56b6f4fa479ced8c1912cee52858" - dependencies: - duplexer "~0.1.1" - through "~2.3.4" - stream-combiner@~0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/stream-combiner/-/stream-combiner-0.0.4.tgz#4d5e433c185261dde623ca3f44c586bcf5c4ad14" @@ -9320,6 +9016,16 @@ string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string.prototype.matchall@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz#2af8fe3d2d6dc53ca2a59bd376b089c3c152b3c8" + dependencies: + define-properties "^1.1.2" + es-abstract "^1.10.0" + function-bind "^1.1.1" + has-symbols "^1.0.0" + regexp.prototype.flags "^1.2.0" + string.prototype.padend@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0" @@ -9410,7 +9116,7 @@ strip-indent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" -strip-json-comments@~2.0.1: +strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -9418,24 +9124,6 @@ style-search@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/style-search/-/style-search-0.1.0.tgz#7958c793e47e32e07d2b5cafe5c0bf8e12e77902" -styled-components-stylefmt@^0.1.5: - version "0.1.5" - resolved "https://registry.yarnpkg.com/styled-components-stylefmt/-/styled-components-stylefmt-0.1.5.tgz#90f54a8c0a8b0eb640977759bff592482f6f751a" - dependencies: - babel-traverse "^6.26.0" - babylon "^6.18.0" - chalk "^2.3.0" - deasync "^0.1.11" - detect-newline "^2.1.0" - diff "^3.4.0" - escape-string-regexp "^1.0.5" - globby "^7.1.1" - indent-string "^3.2.0" - minimist "^1.2.0" - postcss "^5.2.17" - stylefmt "^5.3.2" - stylelint-processor-styled-components "^0.1.2" - styled-components@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-3.3.3.tgz#09e702055ab11f7a8eab8229b1c0d0b855095686" @@ -9455,40 +9143,6 @@ styled-normalize@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/styled-normalize/-/styled-normalize-8.0.0.tgz#54881c9389540bf9fb2a3d34dca2e2d4d68601f2" -stylefmt@^5.3.2: - version "5.3.2" - resolved "https://registry.yarnpkg.com/stylefmt/-/stylefmt-5.3.2.tgz#32013437aa54d8c5253cbc107ac914dfb5ee9eea" - dependencies: - chalk "^1.1.3" - css-color-list "0.0.1" - diff "^3.1.0" - editorconfig "^0.13.2" - globby "^6.1.0" - minimist "^1.2.0" - postcss "^5.2.5" - postcss-scss "^0.4.0" - postcss-sorting "^2.0.1" - postcss-value-parser "^3.3.0" - stdin "0.0.1" - stylelint "^7.5.0" - stylelint-order "0.4.x" - -stylehacks@^2.3.2: - version "2.3.2" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-2.3.2.tgz#64c83e0438a68c9edf449e8c552a7d9ab6009b0b" - dependencies: - browserslist "^1.1.3" - chalk "^1.1.1" - log-symbols "^1.0.2" - minimist "^1.2.0" - plur "^2.1.2" - postcss "^5.0.18" - postcss-reporter "^1.3.3" - postcss-selector-parser "^2.0.0" - read-file-stdin "^0.2.1" - text-table "^0.2.0" - write-file-stdout "0.0.2" - stylelint-config-recommended@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/stylelint-config-recommended/-/stylelint-config-recommended-2.1.0.tgz#f526d5c771c6811186d9eaedbed02195fee30858" @@ -9503,23 +9157,6 @@ stylelint-config-styled-components@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/stylelint-config-styled-components/-/stylelint-config-styled-components-0.1.1.tgz#b408388d7c687833ab4be4c4e6522d97d2827ede" -stylelint-order@0.4.x: - version "0.4.4" - resolved "https://registry.yarnpkg.com/stylelint-order/-/stylelint-order-0.4.4.tgz#db7dfca0541b5062010c7e2e21e745791fc088ac" - dependencies: - lodash "^4.17.4" - postcss "^5.2.16" - stylelint "^7.9.0" - -stylelint-processor-styled-components@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/stylelint-processor-styled-components/-/stylelint-processor-styled-components-0.1.2.tgz#b760efb49fe56fe625ca99b4b9b2b2fab4dc507c" - dependencies: - babel-traverse "^6.16.0" - babylon "^6.12.0" - typescript "~2.3.2" - typescript-eslint-parser "^3.0.0" - stylelint-processor-styled-components@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/stylelint-processor-styled-components/-/stylelint-processor-styled-components-1.3.2.tgz#092cf8fb064b31c6d0d3bedf0c4844349e1e8f0f" @@ -9528,50 +9165,6 @@ stylelint-processor-styled-components@^1.3.2: babylon "^7.0.0-beta.40" postcss "^6.0.14" -stylelint@^7.5.0, stylelint@^7.9.0: - version "7.13.0" - resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-7.13.0.tgz#111f97b6da72e775c80800d6bb6f5f869997785d" - dependencies: - autoprefixer "^6.0.0" - balanced-match "^0.4.0" - chalk "^2.0.1" - colorguard "^1.2.0" - cosmiconfig "^2.1.1" - debug "^2.6.0" - doiuse "^2.4.1" - execall "^1.0.0" - file-entry-cache "^2.0.0" - get-stdin "^5.0.0" - globby "^6.0.0" - globjoin "^0.1.4" - html-tags "^2.0.0" - ignore "^3.2.0" - imurmurhash "^0.1.4" - known-css-properties "^0.2.0" - lodash "^4.17.4" - log-symbols "^1.0.2" - mathml-tag-names "^2.0.0" - meow "^3.3.0" - micromatch "^2.3.11" - normalize-selector "^0.2.0" - pify "^2.3.0" - postcss "^5.0.20" - postcss-less "^0.14.0" - postcss-media-query-parser "^0.2.0" - postcss-reporter "^3.0.0" - postcss-resolve-nested-selector "^0.1.1" - postcss-scss "^0.4.0" - postcss-selector-parser "^2.1.1" - postcss-value-parser "^3.1.1" - resolve-from "^3.0.0" - specificity "^0.3.0" - string-width "^2.0.0" - style-search "^0.1.0" - stylehacks "^2.3.2" - sugarss "^0.2.0" - svg-tags "^1.0.0" - table "^4.0.1" - stylelint@^9.4.0: version "9.4.0" resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.4.0.tgz#2f2b82ae9db53a06735ae0724f41b134fdb84a10" @@ -9629,12 +9222,6 @@ stylis@^3.0.0, stylis@^3.5.0: version "3.5.3" resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.3.tgz#99fdc46afba6af4deff570825994181a5e6ce546" -sugarss@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-0.2.0.tgz#ac34237563327c6ff897b64742bf6aec190ad39e" - dependencies: - postcss "^5.2.4" - sugarss@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44" @@ -9701,24 +9288,7 @@ symbol-tree@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6" -synesthesia@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/synesthesia/-/synesthesia-1.0.1.tgz#5ef95ea548c0d5c6e6f9bb4b0d0731dff864a777" - dependencies: - css-color-names "0.0.3" - -table@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36" - dependencies: - ajv "^5.2.3" - ajv-keywords "^2.1.0" - chalk "^2.1.0" - lodash "^4.17.4" - slice-ansi "1.0.0" - string-width "^2.1.1" - -table@^4.0.1: +table@^4.0.1, table@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc" dependencies: @@ -9783,7 +9353,7 @@ test-exclude@^4.2.1: read-pkg-up "^1.0.1" require-main-filename "^1.0.1" -text-table@^0.2.0, text-table@~0.2.0: +text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -9795,13 +9365,6 @@ throat@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a" -through2@^0.6.1, through2@^0.6.3, through2@~0.6.1: - version "0.6.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48" - dependencies: - readable-stream ">=1.0.33-1 <1.1.0-0" - xtend ">=4.0.0 <4.1.0-0" - through2@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be" @@ -9809,7 +9372,7 @@ through2@^2.0.0: readable-stream "^2.1.5" xtend "~4.0.1" -through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3, through@~2.3.1, through@~2.3.4: +through@2, through@^2.3.6, through@~2.3, through@~2.3.1: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -9975,17 +9538,6 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript-eslint-parser@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-3.0.0.tgz#dd0435b303abc841464c02d00184d7b39bd488b5" - dependencies: - lodash.unescape "4.0.1" - semver "5.3.0" - -typescript@~2.3.2: - version "2.3.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.3.4.tgz#3d38321828231e434f287514959c37a82b629f42" - ua-parser-js@^0.7.18: version "0.7.18" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed" @@ -10597,10 +10149,6 @@ window-size@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" -window-size@^0.1.4: - version "0.1.4" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.4.tgz#f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876" - wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" @@ -10646,10 +10194,6 @@ write-file-atomic@^2.1.0: imurmurhash "^0.1.4" signal-exit "^3.0.2" -write-file-stdout@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/write-file-stdout/-/write-file-stdout-0.0.2.tgz#c252d7c7c5b1b402897630e3453c7bfe690d9ca1" - write@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757" @@ -10678,11 +10222,11 @@ xmlhttprequest@*: version "1.8.0" resolved "https://registry.yarnpkg.com/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz#67fe075c5c24fef39f9d65f5f7b7fe75171968fc" -"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" -y18n@^3.2.0, y18n@^3.2.1: +y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" @@ -10727,10 +10271,6 @@ yargs@11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^1.2.6: - version "1.3.3" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.3.3.tgz#054de8b61f22eefdb7207059eaef9d6b83fb931a" - yargs@^11.0.0, yargs@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" @@ -10748,18 +10288,6 @@ yargs@^11.0.0, yargs@^11.1.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^3.5.4: - version "3.32.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" - dependencies: - camelcase "^2.0.1" - cliui "^3.0.3" - decamelize "^1.1.1" - os-locale "^1.4.0" - string-width "^1.0.1" - window-size "^0.1.4" - y18n "^3.2.0" - yargs@~1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/yargs/-/yargs-1.2.6.tgz#9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"