Skip to content

Commit

Permalink
fix(Build): circular dependency issue fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Philip London committed Jan 26, 2020
1 parent 55ab98c commit 9687bee
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import * as AT from './actionTypes'
import * as Currencies from 'blockchain-wallet-v4/src/exchange/currencies'
import { RemoteDataType } from 'data/types'
import { String } from 'index'
import { RemoteDataType } from 'core/types'

// Types

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as AT from './actionTypes'
import { RemoteDataType } from 'data/types'
import { RemoteDataType } from 'core/types'

export type EmailSmsStepType = 'edit' | 'verify'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as AT from './actionTypes'
import { NabuApiErrorType } from 'data/types'
import { NabuApiErrorType } from 'core/types'
import { ProfileActionTypes } from './types'

export const clearSession = () => ({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as AT from './actionTypes'
import { AxiosError } from 'axios'
import { CampaignsType, NabuApiErrorType, RemoteDataType } from 'data/types'
import { CampaignsType } from 'data/types'
import { NabuApiErrorType, RemoteDataType } from 'core/types'

// Types

Expand Down
1 change: 0 additions & 1 deletion packages/blockchain-wallet-v4-frontend/src/data/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ export type AppActionTypes = ComponentsActionTypes | ModuleActionTypes

export * from './components/types'
export * from './modules/types'
export * from 'blockchain-wallet-v4/src'
// Import via `import { AppActionTypes } from 'data/types'`
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { actions, selectors } from 'data'
import { bindActionCreators, compose, Dispatch } from 'redux'
import { connect } from 'react-redux'
import { RemoteDataType, UserTiersType } from 'data/types'
import { RemoteDataType } from 'core/types'
import { UserTiersType } from 'data/types'
import LinkFromExchangeAccount from './template'
import modalEnhancer from 'providers/ModalEnhancer'
import React from 'react'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { actions, selectors } from 'data'
import { AppActionTypes, NabuApiErrorType, RemoteDataType, UserCampaignsType, UserDataType } from 'data/types'
import { AppActionTypes, UserCampaignsType, UserDataType } from 'data/types'
import { bindActionCreators, Dispatch } from 'redux'
import { connect } from 'react-redux'
import { FormattedMessage } from 'react-intl'
import { lift } from 'ramda'
import { NabuApiErrorType, RemoteDataType } from 'core/types'
import { RootState } from 'data/rootReducer'
import { Text } from 'blockchain-info-components'
import EmailRequired from 'components/EmailRequired'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,3 @@ export {
Remote,
utils
}

export * from './network/types'
export * from './remote/types'
42 changes: 42 additions & 0 deletions packages/blockchain-wallet-v4/src/types/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import * as Address from './Address'
import * as AddressBook from './AddressBook'
import * as AddressBookEntry from './AddressBookEntry'
import * as AddressLabel from './AddressLabel'
import * as AddressLabelMap from './AddressLabelMap'
import * as AddressMap from './AddressMap'
import * as Cache from './Cache'
import * as HDAccount from './HDAccount'
import * as HDAccountList from './HDAccountList'
import * as HDWallet from './HDWallet'
import * as HDWalletList from './HDWalletList'
import * as KVStoreEntry from './KVStoreEntry'
import * as Options from './Options'
import * as TXNames from './TXNames'
import * as TXNotes from './TXNotes'
import * as Wallet from './Wallet'
import * as Wrapper from './Wrapper'
import serializer from './Serializer'

export {
Wallet,
Address,
AddressLabel,
HDWallet,
HDAccount,
Wrapper,
Cache,
serializer,
AddressMap,
AddressLabelMap,
HDWalletList,
HDAccountList,
AddressBookEntry,
AddressBook,
TXNotes,
TXNames,
Options,
KVStoreEntry
}

export * from '../network/types'
export * from '../remote/types'
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"strict": true,
"target": "es6",
"paths": {
"core/*": ["blockchain-wallet-v4/src/*"],
"blockchain-wallet-v4": ["blockchain-wallet-v4/src/"],
"components/*": ["blockchain-wallet-v4-frontend/src/components/*"],
"data": ["blockchain-wallet-v4-frontend/src/data/"],
Expand Down

0 comments on commit 9687bee

Please sign in to comment.