From 661f9fc39cb556f6238cdb9cf01ddf747e35a73e Mon Sep 17 00:00:00 2001 From: Szymon Lesisz Date: Fri, 18 May 2018 18:38:02 +0200 Subject: [PATCH] allow es6 imports from '~/' as ./src --- src/js/components/common/Footer.js | 4 ++-- src/js/components/common/Log.js | 4 ++-- src/js/components/common/Notification.js | 6 +++--- src/js/components/landing/ConnectDevice.js | 2 +- src/js/components/landing/index.js | 2 +- src/js/components/modal/ConfirmAddress.js | 4 ++-- src/js/components/modal/DuplicateDevice.js | 2 +- src/js/components/modal/Passphrase.js | 2 +- src/js/components/modal/index.js | 12 ++++++------ .../components/wallet/account/AbstractAccount.js | 14 +++++++------- .../components/wallet/account/receive/Receive.js | 2 +- src/js/components/wallet/account/receive/index.js | 8 ++++---- .../wallet/account/send/PendingTransactions.js | 8 ++++---- src/js/components/wallet/account/send/SendForm.js | 4 ++-- src/js/components/wallet/account/send/index.js | 6 +++--- .../components/wallet/account/summary/Summary.js | 14 +++++++------- .../wallet/account/summary/SummaryDetails.js | 2 +- src/js/components/wallet/account/summary/index.js | 8 ++++---- src/js/components/wallet/aside/AccountSelection.js | 8 ++++---- src/js/components/wallet/aside/Aside.js | 4 ++-- src/js/components/wallet/aside/CoinSelection.js | 2 +- src/js/components/wallet/aside/DeviceSelection.js | 4 ++-- src/js/components/wallet/aside/StickyContainer.js | 2 +- src/js/components/wallet/aside/index.js | 6 +++--- src/js/components/wallet/index.js | 2 +- src/js/components/wallet/pages/Acquire.js | 6 +++--- 26 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/js/components/common/Footer.js b/src/js/components/common/Footer.js index 84165aef..441319db 100644 --- a/src/js/components/common/Footer.js +++ b/src/js/components/common/Footer.js @@ -5,8 +5,8 @@ import React from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import * as LogActions from '../../actions/LogActions'; -import type { State, Dispatch } from '../../flowtype'; +import * as LogActions from '~/js/actions/LogActions'; +import type { State, Dispatch } from '~/js/flowtype'; type Props = { toggle: typeof LogActions.toggle diff --git a/src/js/components/common/Log.js b/src/js/components/common/Log.js index fddd440c..83acda9c 100644 --- a/src/js/components/common/Log.js +++ b/src/js/components/common/Log.js @@ -5,8 +5,8 @@ import React from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import * as LogActions from '../../actions/LogActions'; -import type { State, Dispatch } from '../../flowtype'; +import * as LogActions from '~/js/actions/LogActions'; +import type { State, Dispatch } from '~/js/flowtype'; type Props = { log: $ElementType, diff --git a/src/js/components/common/Notification.js b/src/js/components/common/Notification.js index 09b4029c..05cc3e3c 100644 --- a/src/js/components/common/Notification.js +++ b/src/js/components/common/Notification.js @@ -5,9 +5,9 @@ import React from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import * as NOTIFICATION from '../../actions/constants/notification'; -import * as NotificationActions from '../../actions/NotificationActions'; -import type { Action, State, Dispatch } from '../../flowtype'; +import * as NOTIFICATION from '~/js/actions/constants/notification'; +import * as NotificationActions from '~/js/actions/NotificationActions'; +import type { Action, State, Dispatch } from '~/js/flowtype'; type Props = { notifications: $ElementType, diff --git a/src/js/components/landing/ConnectDevice.js b/src/js/components/landing/ConnectDevice.js index ec0923f4..177acb30 100644 --- a/src/js/components/landing/ConnectDevice.js +++ b/src/js/components/landing/ConnectDevice.js @@ -4,7 +4,7 @@ import React, { Component } from 'react'; import TrezorConnect from 'trezor-connect'; -import type { State, TrezorDevice } from '../../flowtype'; +import type { State, TrezorDevice } from '~/js/flowtype'; type Props = { transport: $PropertyType<$ElementType, 'transport'>; diff --git a/src/js/components/landing/index.js b/src/js/components/landing/index.js index 1c66c0e3..e1bbb9a4 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 '~/js/flowtype'; export type StateProps = { localStorage: $ElementType, diff --git a/src/js/components/modal/ConfirmAddress.js b/src/js/components/modal/ConfirmAddress.js index 8c37cc01..ac68783e 100644 --- a/src/js/components/modal/ConfirmAddress.js +++ b/src/js/components/modal/ConfirmAddress.js @@ -2,8 +2,8 @@ 'use strict'; import React, { Component } from 'react'; -import { findAccount } from '../../reducers/AccountsReducer'; -import { findSelectedDevice } from '../../reducers/TrezorConnectReducer'; +import { findAccount } from '~/js/reducers/AccountsReducer'; +import { findSelectedDevice } from '~/js/reducers/TrezorConnectReducer'; import type { Props } from './index'; diff --git a/src/js/components/modal/DuplicateDevice.js b/src/js/components/modal/DuplicateDevice.js index 7dada1f3..fb28c9aa 100644 --- a/src/js/components/modal/DuplicateDevice.js +++ b/src/js/components/modal/DuplicateDevice.js @@ -2,7 +2,7 @@ 'use strict'; import React, { Component } from 'react'; -import { getNewInstance } from '../../reducers/TrezorConnectReducer' +import { getNewInstance } from '~/js/reducers/TrezorConnectReducer' import type { Props } from './index'; type State = { diff --git a/src/js/components/modal/Passphrase.js b/src/js/components/modal/Passphrase.js index ad91450c..24a01254 100644 --- a/src/js/components/modal/Passphrase.js +++ b/src/js/components/modal/Passphrase.js @@ -3,7 +3,7 @@ import React, { Component } from 'react'; import raf from 'raf'; -import { findSelectedDevice } from '../../reducers/TrezorConnectReducer'; +import { findSelectedDevice } from '~/js/reducers/TrezorConnectReducer'; import type { Props } from './index'; type State = { diff --git a/src/js/components/modal/index.js b/src/js/components/modal/index.js index d75c1559..2dc69948 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 '../../actions/ModalActions'; -import { default as ReceiveActions } from '../../actions/ReceiveActions'; +import { default as ModalActions } from '~/js/actions/ModalActions'; +import { default as ReceiveActions } from '~/js/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 '../../actions/constants/receive'; -import * as MODAL from '../../actions/constants/modal'; -import * as CONNECT from '../../actions/constants/TrezorConnect'; +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 type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '../../flowtype'; +import type { State, Dispatch } from '~/js/flowtype'; type OwnProps = { } diff --git a/src/js/components/wallet/account/AbstractAccount.js b/src/js/components/wallet/account/AbstractAccount.js index f281bbc6..1981acc3 100644 --- a/src/js/components/wallet/account/AbstractAccount.js +++ b/src/js/components/wallet/account/AbstractAccount.js @@ -2,15 +2,15 @@ 'use strict'; import React, { Component } from 'react'; -import { Notification } from '../../common/Notification'; -import { findDevice } from '../../../reducers/TrezorConnectReducer'; +import { Notification } from '~/js/common/Notification'; +import { findDevice } from '~/js/reducers/TrezorConnectReducer'; -// import * as AbstractAccountActions from '../../actions/AbstractAccountActions'; -import { default as AbstractAccountActions } from '../../../actions/AbstractAccountActions'; +// import * as AbstractAccountActions from '~/js/actions/AbstractAccountActions'; +import { default as AbstractAccountActions } from '~/js/actions/AbstractAccountActions'; -import type { State, TrezorDevice, Action, ThunkAction } from '../../../flowtype'; -import type { Account } from '../../../reducers/AccountsReducer'; -import type { Discovery } from '../../../reducers/DiscoveryReducer'; +import type { State, TrezorDevice, Action, ThunkAction } from '~/js/flowtype'; +import type { Account } from '~/js/reducers/AccountsReducer'; +import type { Discovery } from '~/js/reducers/DiscoveryReducer'; export type StateProps = { abstractAccount: $ElementType, diff --git a/src/js/components/wallet/account/receive/Receive.js b/src/js/components/wallet/account/receive/Receive.js index 7ad4f33c..c6f5ea8a 100644 --- a/src/js/components/wallet/account/receive/Receive.js +++ b/src/js/components/wallet/account/receive/Receive.js @@ -7,7 +7,7 @@ import Tooltip from 'rc-tooltip'; import { QRCode } from 'react-qr-svg'; import AbstractAccount from '../AbstractAccount'; -import { Notification } from '../../../common/Notification'; +import { Notification } from '~/js/common/Notification'; import type { AccountState } from '../AbstractAccount'; 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 34b10bf0..90ba15c2 100644 --- a/src/js/components/wallet/account/receive/index.js +++ b/src/js/components/wallet/account/receive/index.js @@ -5,13 +5,13 @@ import React, { Component, PropTypes } from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; -import { default as ReceiveActions } from '../../../../actions/ReceiveActions'; -import { default as AbstractAccountActions } from '../../../../actions/AbstractAccountActions'; -import * as TokenActions from '../../../../actions/TokenActions'; +import { default as ReceiveActions } from '~/js/actions/ReceiveActions'; +import { default as AbstractAccountActions } from '~/js/actions/AbstractAccountActions'; +import * as TokenActions from '~/js/actions/TokenActions'; import Receive from './Receive'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '../../../../flowtype'; +import type { State, Dispatch } from '~/js/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 af154f12..968eb976 100644 --- a/src/js/components/wallet/account/send/PendingTransactions.js +++ b/src/js/components/wallet/account/send/PendingTransactions.js @@ -5,11 +5,11 @@ import React from 'react'; import ColorHash from 'color-hash'; import ScaleText from 'react-scale-text'; -import { findAccountTokens } from '../../../../reducers/TokensReducer'; +import { findAccountTokens } from '~/js/reducers/TokensReducer'; -import type { Coin } from '../../../../reducers/LocalStorageReducer'; -import type { Account } from '../../../../reducers/AccountsReducer'; -import type { Token } from '../../../../reducers/TokensReducer'; +import type { Coin } from '~/js/reducers/LocalStorageReducer'; +import type { Account } from '~/js/reducers/AccountsReducer'; +import type { Token } from '~/js/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 4b23782e..579db49c 100644 --- a/src/js/components/wallet/account/send/SendForm.js +++ b/src/js/components/wallet/account/send/SendForm.js @@ -6,9 +6,9 @@ import Select from 'react-select'; import AdvancedForm from './AdvancedForm'; import PendingTransactions from './PendingTransactions'; import { FeeSelectValue, FeeSelectOption } from './FeeSelect'; -import { Notification } from '../../../common/Notification'; +import { Notification } from '~/js/common/Notification'; import AbstractAccount from '../AbstractAccount'; -import { findAccountTokens } from '../../../../reducers/TokensReducer'; +import { findAccountTokens } from '~/js/reducers/TokensReducer'; import type { Props } from './index'; import type { AccountState } from '../AbstractAccount'; diff --git a/src/js/components/wallet/account/send/index.js b/src/js/components/wallet/account/send/index.js index 8909f9b6..45aa9945 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 '../../../../actions/SendFormActions'; -import { default as AbstractAccountActions } from '../../../../actions/AbstractAccountActions'; +import { default as SendFormActions } from '~/js/actions/SendFormActions'; +import { default as AbstractAccountActions } from '~/js/actions/AbstractAccountActions'; import SendForm from './SendForm'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '../../../../flowtype'; +import type { State, Dispatch } from '~/js/flowtype'; import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../AbstractAccount'; type OwnProps = { } diff --git a/src/js/components/wallet/account/summary/Summary.js b/src/js/components/wallet/account/summary/Summary.js index 746c7ff5..a7d30d2e 100644 --- a/src/js/components/wallet/account/summary/Summary.js +++ b/src/js/components/wallet/account/summary/Summary.js @@ -6,20 +6,20 @@ import BigNumber from 'bignumber.js'; import { Async } from 'react-select'; import Tooltip from 'rc-tooltip'; -import { resolveAfter } from '../../../../utils/promiseUtils'; +import { resolveAfter } from '~/js/utils/promiseUtils'; import AbstractAccount from '../AbstractAccount'; -import { Notification } from '../../../common/Notification'; +import { Notification } from '~/js/common/Notification'; import SummaryDetails from './SummaryDetails.js'; import SummaryTokens from './SummaryTokens.js'; import type { Props } from './index'; import type { AccountState } from '../AbstractAccount'; -import type { TrezorDevice } from '../../../../flowtype'; -import type { NetworkToken } from '../../../../reducers/LocalStorageReducer'; -import type { Account } from '../../../../reducers/AccountsReducer'; -import type { Discovery } from '../../../../reducers/DiscoveryReducer'; -import { findAccountTokens } from '../../../../reducers/TokensReducer'; +import type { TrezorDevice } from '~/js/flowtype'; +import type { NetworkToken } from '~/js/reducers/LocalStorageReducer'; +import type { Account } from '~/js/reducers/AccountsReducer'; +import type { Discovery } from '~/js/reducers/DiscoveryReducer'; +import { findAccountTokens } from '~/js/reducers/TokensReducer'; export default class Summary extends AbstractAccount { render() { diff --git a/src/js/components/wallet/account/summary/SummaryDetails.js b/src/js/components/wallet/account/summary/SummaryDetails.js index 017f3981..b4598960 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 '../../../../reducers/LocalStorageReducer'; +import type { Coin } from '~/js/reducers/LocalStorageReducer'; type Props = { // coin: $PropertyType<$ElementType, 'coin'>, diff --git a/src/js/components/wallet/account/summary/index.js b/src/js/components/wallet/account/summary/index.js index 24b5216a..76fefd97 100644 --- a/src/js/components/wallet/account/summary/index.js +++ b/src/js/components/wallet/account/summary/index.js @@ -6,12 +6,12 @@ import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; import Summary from './Summary'; -import { default as AbstractAccountActions } from '../../../../actions/AbstractAccountActions'; -import * as SummaryActions from '../../../../actions/SummaryActions'; -import * as TokenActions from '../../../../actions/TokenActions'; +import { default as AbstractAccountActions } from '~/js/actions/AbstractAccountActions'; +import * as SummaryActions from '~/js/actions/SummaryActions'; +import * as TokenActions from '~/js/actions/TokenActions'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '../../../../flowtype'; +import type { State, Dispatch } from '~/js/flowtype'; import type { StateProps as BaseStateProps, DispatchProps as BaseDispatchProps } from '../AbstractAccount'; type OwnProps = { } diff --git a/src/js/components/wallet/aside/AccountSelection.js b/src/js/components/wallet/aside/AccountSelection.js index d8f03f88..ede01ade 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 '../../../reducers/AccountsReducer'; -import { findSelectedDevice } from '../../../reducers/TrezorConnectReducer'; -import Loader from '../../common/LoaderCircle'; +import { findDeviceAccounts } from '~/js/reducers/AccountsReducer'; +import { findSelectedDevice } from '~/js/reducers/TrezorConnectReducer'; +import Loader from '~/js/common/LoaderCircle'; import Tooltip from 'rc-tooltip'; import type { Props } from './index'; -import type { TrezorDevice } from '../../../flowtype'; +import type { TrezorDevice } from '~/js/flowtype'; const AccountSelection = (props: Props): ?React$Element => { diff --git a/src/js/components/wallet/aside/Aside.js b/src/js/components/wallet/aside/Aside.js index 332d3394..ddb548ab 100644 --- a/src/js/components/wallet/aside/Aside.js +++ b/src/js/components/wallet/aside/Aside.js @@ -10,10 +10,10 @@ import { DeviceSelect, DeviceDropdown } from './DeviceSelection'; import AccountSelection from './AccountSelection'; import CoinSelection from './CoinSelection'; import StickyContainer from './StickyContainer'; -import { findSelectedDevice } from '../../../reducers/TrezorConnectReducer'; +import { findSelectedDevice } from '~/js/reducers/TrezorConnectReducer'; import type { Props } from './index'; -import type { TrezorDevice } from '../../../flowtype'; +import type { TrezorDevice } from '~/js/flowtype'; type TransitionMenuProps = { diff --git a/src/js/components/wallet/aside/CoinSelection.js b/src/js/components/wallet/aside/CoinSelection.js index c877ded9..a6f12fa0 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 '~/js/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 425b6187..7285aa31 100644 --- a/src/js/components/wallet/aside/DeviceSelection.js +++ b/src/js/components/wallet/aside/DeviceSelection.js @@ -5,10 +5,10 @@ import React, { Component } from 'react'; import Select from 'react-select'; import TrezorConnect from 'trezor-connect'; -import { findSelectedDevice } from '../../../reducers/TrezorConnectReducer'; +import { findSelectedDevice } from '~/js/reducers/TrezorConnectReducer'; import type { Props } from './index'; -import type { TrezorDevice } from '../../../flowtype'; +import type { TrezorDevice } from '~/js/flowtype'; export const DeviceSelect = (props: Props) => { diff --git a/src/js/components/wallet/aside/StickyContainer.js b/src/js/components/wallet/aside/StickyContainer.js index 1c33c19a..56eb3358 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 '../../../utils/windowUtils'; +import { getViewportHeight, getScrollY } from '~/js/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 63dd8035..f5838230 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 '../../../actions/TrezorConnectActions'; -import { toggleDeviceDropdown } from '../../../actions/WalletActions'; +import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions'; +import { toggleDeviceDropdown } from '~/js/actions/WalletActions'; import Aside from './Aside'; import type { MapStateToProps, MapDispatchToProps } from 'react-redux'; -import type { State, Dispatch } from '../../../flowtype'; +import type { State, Dispatch } from '~/js/flowtype'; type OwnProps = { diff --git a/src/js/components/wallet/index.js b/src/js/components/wallet/index.js index b4f215e5..4c2f17c0 100644 --- a/src/js/components/wallet/index.js +++ b/src/js/components/wallet/index.js @@ -16,7 +16,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 '~/js/flowtype'; type WalletContainerProps = { wallet: $ElementType, diff --git a/src/js/components/wallet/pages/Acquire.js b/src/js/components/wallet/pages/Acquire.js index 2e7b895f..92b6e1c7 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 '../../common/Notification'; -import * as TrezorConnectActions from '../../../actions/TrezorConnectActions'; +import { Notification } from '~/js/common/Notification'; +import * as TrezorConnectActions from '~/js/actions/TrezorConnectActions'; -import type { State, Dispatch } from '../../../flowtype'; +import type { State, Dispatch } from '~/js/flowtype'; type Props = { connect: $ElementType, acquireDevice: typeof TrezorConnectActions.acquire