From 29437c5761aa0b5d5cf1e9fba29471d2afddeefc Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 15 Oct 2018 12:26:23 +0100 Subject: chore: Export stats type from 0x.js --- packages/0x.js/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/0x.js/src') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 6eb1fd8ee..7301b22e2 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -49,7 +49,7 @@ export { ValidateOrderFillableOpts, } from '@0xproject/contract-wrappers'; -export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher'; +export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig, Stats } from '@0xproject/order-watcher'; export import Web3ProviderEngine = require('web3-provider-engine'); -- cgit v1.2.3 From 40512ea608b2daa156b867390318e78d91598671 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 15 Oct 2018 12:38:02 +0100 Subject: chore: Export Stats from types, not indirectly from OrderWatcher --- packages/0x.js/src/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/0x.js/src') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 7301b22e2..ce3f616aa 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -49,7 +49,7 @@ export { ValidateOrderFillableOpts, } from '@0xproject/contract-wrappers'; -export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig, Stats } from '@0xproject/order-watcher'; +export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher'; export import Web3ProviderEngine = require('web3-provider-engine'); @@ -78,6 +78,7 @@ export { ERC721AssetData, SignatureType, OrderRelevantState, + Stats, } from '@0xproject/types'; export { -- cgit v1.2.3 From f0e483798339b24b599c408949265cca54d7e58b Mon Sep 17 00:00:00 2001 From: Alex Browne Date: Mon, 15 Oct 2018 13:30:12 -0700 Subject: Fix failing doc generation tests --- packages/0x.js/src/globals.d.ts | 6 ------ packages/0x.js/src/index.ts | 23 ++++++++++++++--------- 2 files changed, 14 insertions(+), 15 deletions(-) delete mode 100644 packages/0x.js/src/globals.d.ts (limited to 'packages/0x.js/src') diff --git a/packages/0x.js/src/globals.d.ts b/packages/0x.js/src/globals.d.ts deleted file mode 100644 index 94e63a32d..000000000 --- a/packages/0x.js/src/globals.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -declare module '*.json' { - const json: any; - /* tslint:disable */ - export default json; - /* tslint:enable */ -} diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index ce3f616aa..7fd48da37 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -1,3 +1,5 @@ +export { ContractAddresses } from '@0xproject/contract-addresses'; + export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtils } from '@0xproject/order-utils'; export { @@ -18,6 +20,16 @@ export { TransactionOpts, OrderStatus, OrderInfo, + EventCallback, + DecodedLogEvent, + TransactionEncoder, + BalanceAndAllowance, + OrderAndTraderInfo, + TraderInfo, + ValidateOrderFillableOpts, +} from '@0xproject/contract-wrappers'; + +export { WETH9Events, WETH9WithdrawalEventArgs, WETH9ApprovalEventArgs, @@ -38,16 +50,9 @@ export { ExchangeSignatureValidatorApprovalEventArgs, ExchangeFillEventArgs, ExchangeCancelEventArgs, - ExchangeEvents, - EventCallback, - DecodedLogEvent, ExchangeEventArgs, - TransactionEncoder, - BalanceAndAllowance, - OrderAndTraderInfo, - TraderInfo, - ValidateOrderFillableOpts, -} from '@0xproject/contract-wrappers'; + ExchangeEvents, +} from '@0xproject/abi-gen-wrappers'; export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher'; -- cgit v1.2.3 From 009b5b575c35b1f09f690eee46b4d274caeebfcb Mon Sep 17 00:00:00 2001 From: fragosti Date: Tue, 16 Oct 2018 17:00:18 -0700 Subject: feat: export AssetData from utils --- packages/0x.js/src/index.ts | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/0x.js/src') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 7fd48da37..2fcfb5ce7 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -79,6 +79,7 @@ export { OrderStateInvalid, OrderState, AssetProxyId, + AssetData, ERC20AssetData, ERC721AssetData, SignatureType, -- cgit v1.2.3 From 9f924e459c43c023e35ab7222cd9824cc0e67411 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 18 Oct 2018 21:51:56 +1100 Subject: chore: change package org from 0xproject to 0x --- packages/0x.js/src/index.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'packages/0x.js/src') diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 2fcfb5ce7..2df360b96 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -1,6 +1,6 @@ -export { ContractAddresses } from '@0xproject/contract-addresses'; +export { ContractAddresses } from '@0x/contract-addresses'; -export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtils } from '@0xproject/order-utils'; +export { assetDataUtils, signatureUtils, generatePseudoRandomSalt, orderHashUtils } from '@0x/order-utils'; export { ContractWrappers, @@ -27,7 +27,7 @@ export { OrderAndTraderInfo, TraderInfo, ValidateOrderFillableOpts, -} from '@0xproject/contract-wrappers'; +} from '@0x/contract-wrappers'; export { WETH9Events, @@ -52,9 +52,9 @@ export { ExchangeCancelEventArgs, ExchangeEventArgs, ExchangeEvents, -} from '@0xproject/abi-gen-wrappers'; +} from '@0x/abi-gen-wrappers'; -export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher'; +export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0x/order-watcher'; export import Web3ProviderEngine = require('web3-provider-engine'); @@ -64,11 +64,11 @@ export { JSONRPCRequestPayloadWithMethod, ErrorCallback, MetamaskSubprovider, -} from '@0xproject/subproviders'; +} from '@0x/subproviders'; -export { AbiDecoder } from '@0xproject/utils'; +export { AbiDecoder } from '@0x/utils'; -export { BigNumber } from '@0xproject/utils'; +export { BigNumber } from '@0x/utils'; export { ExchangeContractErrs, @@ -85,7 +85,7 @@ export { SignatureType, OrderRelevantState, Stats, -} from '@0xproject/types'; +} from '@0x/types'; export { BlockParamLiteral, -- cgit v1.2.3