diff options
Diffstat (limited to 'packages')
86 files changed, 121 insertions, 45 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index dab284dc7..2fff1c058 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -2,7 +2,7 @@ "name": "0x.js", "version": "0.37.2", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "A javascript library for interacting with the 0x protocol", "keywords": [ @@ -69,10 +69,10 @@ "license": "Apache-2.0", "devDependencies": { "@0xproject/abi-gen": "^0.2.13", - "@0xproject/sol-compiler": "^0.4.3", "@0xproject/dev-utils": "^0.4.1", "@0xproject/migrations": "^0.0.5", "@0xproject/monorepo-scripts": "^0.1.19", + "@0xproject/sol-compiler": "^0.4.3", "@0xproject/tslint-config": "^0.4.17", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", @@ -85,6 +85,7 @@ "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "json-loader": "^0.5.4", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", @@ -102,11 +103,11 @@ "@0xproject/assert": "^0.2.9", "@0xproject/base-contract": "^0.3.1", "@0xproject/contract-wrappers": "^0.0.1", - "@0xproject/order-watcher": "^0.0.1", "@0xproject/order-utils": "^0.0.4", + "@0xproject/order-watcher": "^0.0.1", + "@0xproject/sol-compiler": "^0.4.3", "@0xproject/types": "^0.6.3", "@0xproject/typescript-typings": "^0.3.1", - "@0xproject/sol-compiler": "^0.4.3", "@0xproject/utils": "^0.6.1", "@0xproject/web3-wrapper": "^0.6.3", "ethers": "^3.0.15", diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts index ce2fa34bf..509d3f9f2 100644 --- a/packages/0x.js/test/0x.js_test.ts +++ b/packages/0x.js/test/0x.js_test.ts @@ -3,6 +3,7 @@ import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-u import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import * as path from 'path'; import * as Sinon from 'sinon'; diff --git a/packages/0x.js/test/artifacts_test.ts b/packages/0x.js/test/artifacts_test.ts index 40c5983bd..ca554a4f5 100644 --- a/packages/0x.js/test/artifacts_test.ts +++ b/packages/0x.js/test/artifacts_test.ts @@ -1,5 +1,6 @@ import { web3Factory } from '@0xproject/dev-utils'; import * as fs from 'fs'; +import 'make-promises-safe'; import { ZeroEx } from '../src'; diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json index d0cd946f0..ca666dc9b 100644 --- a/packages/abi-gen/package.json +++ b/packages/abi-gen/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/abi-gen", "version": "0.2.13", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Generate contract wrappers from ABI and handlebars templates", "main": "lib/index.js", @@ -47,6 +47,7 @@ "@types/node": "^8.0.53", "@types/yargs": "^10.0.0", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", diff --git a/packages/assert/package.json b/packages/assert/package.json index c6d77c1bd..e3ac0d3ed 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/assert", "version": "0.2.9", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Provides a standard way of performing type and schema validation across 0x projects", "main": "lib/src/index.js", @@ -38,6 +38,7 @@ "chai": "^4.0.1", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", diff --git a/packages/assert/test/assert_test.ts b/packages/assert/test/assert_test.ts index 1d9a34ed9..58d3e53b5 100644 --- a/packages/assert/test/assert_test.ts +++ b/packages/assert/test/assert_test.ts @@ -2,6 +2,7 @@ import { schemas } from '@0xproject/json-schemas'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import * as dirtyChai from 'dirty-chai'; +import 'make-promises-safe'; import 'mocha'; import { assert } from '../src/index'; diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json index 8a048112c..ca59dc4c8 100644 --- a/packages/base-contract/package.json +++ b/packages/base-contract/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/base-contract", "version": "0.3.1", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "0x Base TS contract", "main": "lib/src/index.js", @@ -34,6 +34,7 @@ "@types/lodash": "4.14.104", "chai": "^4.0.1", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "shx": "^0.2.2", diff --git a/packages/base-contract/test/utils_test.ts b/packages/base-contract/test/utils_test.ts index c083704f4..316b0b310 100644 --- a/packages/base-contract/test/utils_test.ts +++ b/packages/base-contract/test/utils_test.ts @@ -1,5 +1,6 @@ import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; +import 'make-promises-safe'; import 'mocha'; import { formatABIDataItem } from '../src/utils'; diff --git a/packages/connect/package.json b/packages/connect/package.json index d52fb450e..65aa50a42 100644 --- a/packages/connect/package.json +++ b/packages/connect/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/connect", "version": "0.6.12", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "A javascript library for interacting with the standard relayer api", "keywords": [ @@ -74,6 +74,7 @@ "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "fetch-mock": "^5.13.1", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", diff --git a/packages/connect/test/http_client_test.ts b/packages/connect/test/http_client_test.ts index 311dc96e6..30028ec41 100644 --- a/packages/connect/test/http_client_test.ts +++ b/packages/connect/test/http_client_test.ts @@ -3,6 +3,7 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as dirtyChai from 'dirty-chai'; import * as fetchMock from 'fetch-mock'; +import 'make-promises-safe'; import 'mocha'; import { HttpClient } from '../src/index'; diff --git a/packages/connect/test/orderbook_channel_message_parsers_test.ts b/packages/connect/test/orderbook_channel_message_parsers_test.ts index 3e1f44384..630c95da9 100644 --- a/packages/connect/test/orderbook_channel_message_parsers_test.ts +++ b/packages/connect/test/orderbook_channel_message_parsers_test.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as dirtyChai from 'dirty-chai'; +import 'make-promises-safe'; import 'mocha'; import { orderbookChannelMessageParser } from '../src/utils/orderbook_channel_message_parser'; diff --git a/packages/connect/test/ws_orderbook_channel_test.ts b/packages/connect/test/ws_orderbook_channel_test.ts index ce404d934..b84629221 100644 --- a/packages/connect/test/ws_orderbook_channel_test.ts +++ b/packages/connect/test/ws_orderbook_channel_test.ts @@ -1,6 +1,7 @@ import * as chai from 'chai'; import * as dirtyChai from 'dirty-chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import { WebSocketOrderbookChannel } from '../src/ws_orderbook_channel'; diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 5042a14e7..6cb16c2c0 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -45,10 +45,10 @@ }, "devDependencies": { "@0xproject/abi-gen": "^0.2.13", - "@0xproject/sol-compiler": "^0.4.3", "@0xproject/dev-utils": "^0.4.1", "@0xproject/migrations": "^0.0.5", "@0xproject/monorepo-scripts": "^0.1.19", + "@0xproject/sol-compiler": "^0.4.3", "@0xproject/subproviders": "^0.10.1", "@0xproject/tslint-config": "^0.4.17", "@types/lodash": "4.14.104", @@ -62,6 +62,7 @@ "chai-bignumber": "^2.0.1", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", diff --git a/packages/contract-wrappers/test/artifacts_test.ts b/packages/contract-wrappers/test/artifacts_test.ts index 5d7261e09..446b8f9d1 100644 --- a/packages/contract-wrappers/test/artifacts_test.ts +++ b/packages/contract-wrappers/test/artifacts_test.ts @@ -1,5 +1,6 @@ import { web3Factory } from '@0xproject/dev-utils'; import * as fs from 'fs'; +import 'make-promises-safe'; import { ContractWrappers } from '../src'; diff --git a/packages/contract-wrappers/test/ether_token_wrapper_test.ts b/packages/contract-wrappers/test/ether_token_wrapper_test.ts index e9a9705b1..974db34b1 100644 --- a/packages/contract-wrappers/test/ether_token_wrapper_test.ts +++ b/packages/contract-wrappers/test/ether_token_wrapper_test.ts @@ -3,6 +3,7 @@ import { DoneCallback } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import 'mocha'; import { diff --git a/packages/contract-wrappers/test/exchange_transfer_simulator_test.ts b/packages/contract-wrappers/test/exchange_transfer_simulator_test.ts index b4ea91181..77c73ba8f 100644 --- a/packages/contract-wrappers/test/exchange_transfer_simulator_test.ts +++ b/packages/contract-wrappers/test/exchange_transfer_simulator_test.ts @@ -2,6 +2,7 @@ import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils'; import { BlockParamLiteral, Token } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; +import 'make-promises-safe'; import { ContractWrappers, ExchangeContractErrs } from '../src'; import { TradeSide, TransferType } from '../src/types'; diff --git a/packages/contract-wrappers/test/exchange_wrapper_test.ts b/packages/contract-wrappers/test/exchange_wrapper_test.ts index fc0a23485..99384e0fa 100644 --- a/packages/contract-wrappers/test/exchange_wrapper_test.ts +++ b/packages/contract-wrappers/test/exchange_wrapper_test.ts @@ -6,6 +6,7 @@ import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import { diff --git a/packages/contract-wrappers/test/order_validation_test.ts b/packages/contract-wrappers/test/order_validation_test.ts index d28549ba2..2acdece3e 100644 --- a/packages/contract-wrappers/test/order_validation_test.ts +++ b/packages/contract-wrappers/test/order_validation_test.ts @@ -4,6 +4,7 @@ import { OrderError } from '@0xproject/order-utils'; import { BlockParamLiteral } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; +import 'make-promises-safe'; import * as Sinon from 'sinon'; import { ContractWrappers, ContractWrappersError, ExchangeContractErrs, SignedOrder, Token } from '../src'; diff --git a/packages/contract-wrappers/test/subscription_test.ts b/packages/contract-wrappers/test/subscription_test.ts index 64262ad9c..65c76e47f 100644 --- a/packages/contract-wrappers/test/subscription_test.ts +++ b/packages/contract-wrappers/test/subscription_test.ts @@ -2,6 +2,7 @@ import { BlockchainLifecycle, callbackErrorReporter, devConstants } from '@0xpro import { DoneCallback } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import * as Sinon from 'sinon'; diff --git a/packages/contract-wrappers/test/token_registry_wrapper_test.ts b/packages/contract-wrappers/test/token_registry_wrapper_test.ts index a21efed21..0e9ddd245 100644 --- a/packages/contract-wrappers/test/token_registry_wrapper_test.ts +++ b/packages/contract-wrappers/test/token_registry_wrapper_test.ts @@ -2,6 +2,7 @@ import { BlockchainLifecycle, devConstants } from '@0xproject/dev-utils'; import { schemas, SchemaValidator } from '@0xproject/json-schemas'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import { ContractWrappers, Token } from '../src'; diff --git a/packages/contract-wrappers/test/token_transfer_proxy_wrapper_test.ts b/packages/contract-wrappers/test/token_transfer_proxy_wrapper_test.ts index 0b66985aa..0110e437f 100644 --- a/packages/contract-wrappers/test/token_transfer_proxy_wrapper_test.ts +++ b/packages/contract-wrappers/test/token_transfer_proxy_wrapper_test.ts @@ -1,4 +1,5 @@ import * as chai from 'chai'; +import 'make-promises-safe'; import { ContractWrappers } from '../src'; diff --git a/packages/contract-wrappers/test/token_wrapper_test.ts b/packages/contract-wrappers/test/token_wrapper_test.ts index 053901c85..9280f65cb 100644 --- a/packages/contract-wrappers/test/token_wrapper_test.ts +++ b/packages/contract-wrappers/test/token_wrapper_test.ts @@ -3,6 +3,7 @@ import { EmptyWalletSubprovider } from '@0xproject/subproviders'; import { DoneCallback, Provider } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; +import 'make-promises-safe'; import 'mocha'; import Web3ProviderEngine = require('web3-provider-engine'); diff --git a/packages/contracts/package.json b/packages/contracts/package.json index a253e76d4..9c7142cdb 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -3,7 +3,7 @@ "name": "contracts", "version": "2.1.28", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Smart contract components of 0x protocol", "main": "index.js", @@ -53,6 +53,7 @@ "chai-bignumber": "^2.0.1", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "prettier": "^1.11.1", diff --git a/packages/contracts/test/asset_proxy/authorizable.ts b/packages/contracts/test/asset_proxy/authorizable.ts index 39672bea9..636b9096b 100644 --- a/packages/contracts/test/asset_proxy/authorizable.ts +++ b/packages/contracts/test/asset_proxy/authorizable.ts @@ -1,6 +1,7 @@ import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import * as Web3 from 'web3'; import { MixinAuthorizableContract } from '../../src/contract_wrappers/generated/mixin_authorizable'; diff --git a/packages/contracts/test/ether_token.ts b/packages/contracts/test/ether_token.ts index 213c7c8a6..418fbc45e 100644 --- a/packages/contracts/test/ether_token.ts +++ b/packages/contracts/test/ether_token.ts @@ -3,6 +3,7 @@ import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-u import { BigNumber, promisify } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import { WETH9Contract } from '../src/contract_wrappers/generated/weth9'; import { artifacts } from '../src/utils/artifacts'; diff --git a/packages/contracts/test/exchange/core.ts b/packages/contracts/test/exchange/core.ts index 5633fcd7e..be3252800 100644 --- a/packages/contracts/test/exchange/core.ts +++ b/packages/contracts/test/exchange/core.ts @@ -3,7 +3,7 @@ import { BlockchainLifecycle } from '@0xproject/dev-utils'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import ethUtil = require('ethereumjs-util'); -import * as _ from 'lodash'; +import 'make-promises-safe'; import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token'; import { DummyERC721TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c721_token'; diff --git a/packages/contracts/test/exchange/wrapper.ts b/packages/contracts/test/exchange/wrapper.ts index 44145b4f0..0b79308dd 100644 --- a/packages/contracts/test/exchange/wrapper.ts +++ b/packages/contracts/test/exchange/wrapper.ts @@ -4,6 +4,7 @@ import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import * as Web3 from 'web3'; import { DummyERC20TokenContract } from '../../src/contract_wrappers/generated/dummy_e_r_c20_token'; diff --git a/packages/contracts/test/multi_sig_with_time_lock.ts b/packages/contracts/test/multi_sig_with_time_lock.ts index d39fa6d09..8e58006ac 100644 --- a/packages/contracts/test/multi_sig_with_time_lock.ts +++ b/packages/contracts/test/multi_sig_with_time_lock.ts @@ -3,6 +3,7 @@ import { BlockchainLifecycle, web3Factory } from '@0xproject/dev-utils'; import { AbiDecoder, BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import * as Web3 from 'web3'; import * as multiSigWalletJSON from '../../build/contracts/MultiSigWalletWithTimeLock.json'; diff --git a/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts b/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts index 65cd5c5a8..dcd206b1c 100644 --- a/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts +++ b/packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts @@ -9,6 +9,7 @@ import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-u import { AbiDecoder, BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import * as Web3 from 'web3'; import { MultiSigWalletContract } from '../src/contract_wrappers/generated/multi_sig_wallet'; diff --git a/packages/contracts/test/token_registry.ts b/packages/contracts/test/token_registry.ts index 1cae3da52..9e4f7ca3b 100644 --- a/packages/contracts/test/token_registry.ts +++ b/packages/contracts/test/token_registry.ts @@ -5,6 +5,7 @@ import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; import ethUtil = require('ethereumjs-util'); import * as _ from 'lodash'; +import 'make-promises-safe'; import * as Web3 from 'web3'; import { TokenRegistryContract } from '../src/contract_wrappers/generated/token_registry'; diff --git a/packages/contracts/test/tutorials/arbitrage.ts b/packages/contracts/test/tutorials/arbitrage.ts index c65e050ad..723ddb066 100644 --- a/packages/contracts/test/tutorials/arbitrage.ts +++ b/packages/contracts/test/tutorials/arbitrage.ts @@ -4,6 +4,7 @@ // import { BigNumber } from '@0xproject/utils'; // import { Web3Wrapper } from '@0xproject/web3-wrapper'; // import * as chai from 'chai'; +// import 'make-promises-safe'; // import ethUtil = require('ethereumjs-util'); // import * as Web3 from 'web3'; diff --git a/packages/contracts/test/unlimited_allowance_token.ts b/packages/contracts/test/unlimited_allowance_token.ts index 8721930be..8851a04ef 100644 --- a/packages/contracts/test/unlimited_allowance_token.ts +++ b/packages/contracts/test/unlimited_allowance_token.ts @@ -3,6 +3,7 @@ import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-u import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import * as Web3 from 'web3'; import { DummyERC20TokenContract } from '../src/contract_wrappers/generated/dummy_e_r_c20_token'; diff --git a/packages/contracts/test/zrx_token.ts b/packages/contracts/test/zrx_token.ts index 5de751780..7a72f85dc 100644 --- a/packages/contracts/test/zrx_token.ts +++ b/packages/contracts/test/zrx_token.ts @@ -3,6 +3,7 @@ import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-u import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import * as Web3 from 'web3'; import { ZRXTokenContract } from '../src/contract_wrappers/generated/zrx_token'; diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json index 93edd80ca..49964c82a 100644 --- a/packages/dev-utils/package.json +++ b/packages/dev-utils/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/dev-utils", "version": "0.4.1", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "0x dev TS utils", "main": "lib/src/index.js", @@ -35,6 +35,7 @@ "@types/mocha": "^2.2.42", "chai": "^4.0.1", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", diff --git a/packages/dev-utils/test/blockchain_lifecycle_test.ts b/packages/dev-utils/test/blockchain_lifecycle_test.ts index 2cfad9644..857a6b50e 100644 --- a/packages/dev-utils/test/blockchain_lifecycle_test.ts +++ b/packages/dev-utils/test/blockchain_lifecycle_test.ts @@ -1,6 +1,7 @@ import { BlockParamLiteral } from '@0xproject/types'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import 'mocha'; import { BlockchainLifecycle, web3Factory } from '../src'; diff --git a/packages/dev-utils/test/rpc_test.ts b/packages/dev-utils/test/rpc_test.ts index b6998f604..45d1226c2 100644 --- a/packages/dev-utils/test/rpc_test.ts +++ b/packages/dev-utils/test/rpc_test.ts @@ -1,6 +1,7 @@ import { BlockParamLiteral } from '@0xproject/types'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import 'mocha'; import { web3Factory } from '../src'; diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json index 2f1a46c97..ee426c7a1 100644 --- a/packages/fill-scenarios/package.json +++ b/packages/fill-scenarios/package.json @@ -29,6 +29,7 @@ "@0xproject/tslint-config": "^0.4.17", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json index 6db04b35b..aece885ec 100644 --- a/packages/json-schemas/package.json +++ b/packages/json-schemas/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/json-schemas", "version": "0.7.23", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "0x-related json schemas", "main": "lib/src/index.js", @@ -61,6 +61,7 @@ "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "lodash.foreach": "^4.5.0", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", diff --git a/packages/json-schemas/test/schema_test.ts b/packages/json-schemas/test/schema_test.ts index 7b058781d..ac6a68b59 100644 --- a/packages/json-schemas/test/schema_test.ts +++ b/packages/json-schemas/test/schema_test.ts @@ -2,6 +2,7 @@ import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import * as dirtyChai from 'dirty-chai'; import forEach = require('lodash.foreach'); +import 'make-promises-safe'; import 'mocha'; import { schemas, SchemaValidator } from '../src/index'; diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json index e8ed6f100..83d083b3f 100644 --- a/packages/metacoin/package.json +++ b/packages/metacoin/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/metacoin", "version": "0.0.6", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "private": true, "description": "Example solidity project using 0x dev tools", @@ -45,6 +45,7 @@ "chai-as-promised": "^7.1.0", "chai-bignumber": "^2.0.1", "dirty-chai": "^2.0.1", + "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", diff --git a/packages/metacoin/test/metacoin_test.ts b/packages/metacoin/test/metacoin_test.ts index 8369632c2..d1331a4dc 100644 --- a/packages/metacoin/test/metacoin_test.ts +++ b/packages/metacoin/test/metacoin_test.ts @@ -4,6 +4,7 @@ import { LogWithDecodedArgs } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import * as MetacoinArtifact from '../artifacts/Metacoin.json'; import { MetacoinContract, TransferContractEventArgs } from '../src/contract_wrappers/metacoin'; diff --git a/packages/migrations/package.json b/packages/migrations/package.json index fa488a9e9..ab5204d86 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/migrations", "version": "0.0.5", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "0x smart contract migrations", "main": "lib/index.js", @@ -10,13 +10,12 @@ "scripts": { "watch": "tsc -w", "prebuild": "run-s clean compile copy_artifacts generate_contract_wrappers", - "copy_artifacts": "copyfiles -u 4 'artifacts/1.0.0/**/*' ./lib/src/artifacts", + "copy_artifacts": "copyfiles 'artifacts/1.0.0/**/*' ./lib", "build": "tsc", "clean": "shx rm -rf lib", "lint": "tslint --project .", "migrate": "run-s build compile script:migrate", "script:migrate": "node ./lib/migrate.js", - "copy_artifacts": "copyfiles 'artifacts/1.0.0/**/*' ./lib", "generate_contract_wrappers": "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers && prettier --write 'src/contract_wrappers/**.ts'", "compile": "sol-compiler" }, @@ -28,16 +27,17 @@ "devDependencies": { "@0xproject/abi-gen": "^0.2.13", "@0xproject/dev-utils": "^0.4.1", - "@0xproject/types": "^0.6.3", "@0xproject/tslint-config": "^0.4.17", + "@0xproject/types": "^0.6.3", + "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1" }, "dependencies": { - "@0xproject/sol-compiler": "^0.4.3", "@0xproject/base-contract": "^0.3.1", + "@0xproject/sol-compiler": "^0.4.3", "@0xproject/typescript-typings": "^0.3.1", "@0xproject/utils": "^0.6.1", "@0xproject/web3-wrapper": "^0.6.3", diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json index 1291e7586..4fa9497b9 100644 --- a/packages/monorepo-scripts/package.json +++ b/packages/monorepo-scripts/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/monorepo-scripts", "version": "0.1.19", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Helper scripts for the monorepo", "main": "lib/index.js", @@ -36,6 +36,7 @@ "@types/rimraf": "^2.0.2", "depcheck": "^0.6.9", "lerna-get-packages": "^1.0.0", + "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index 35a486a6b..63caaec34 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/order-utils", "version": "0.0.4", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "0x order utils", "main": "lib/src/index.js", @@ -52,6 +52,7 @@ "chai-bignumber": "^2.0.1", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "shx": "^0.2.2", diff --git a/packages/order-utils/test/assert_test.ts b/packages/order-utils/test/assert_test.ts index dfd19bf86..033fd6732 100644 --- a/packages/order-utils/test/assert_test.ts +++ b/packages/order-utils/test/assert_test.ts @@ -1,5 +1,6 @@ import { web3Factory } from '@0xproject/dev-utils'; import * as chai from 'chai'; +import 'make-promises-safe'; import 'mocha'; import { assert } from '../src/assert'; diff --git a/packages/order-utils/test/order_hash_test.ts b/packages/order-utils/test/order_hash_test.ts index b6dda1a43..db5489509 100644 --- a/packages/order-utils/test/order_hash_test.ts +++ b/packages/order-utils/test/order_hash_test.ts @@ -1,6 +1,7 @@ import { web3Factory } from '@0xproject/dev-utils'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; +import 'make-promises-safe'; import 'mocha'; import { constants, getOrderHashHex } from '../src'; diff --git a/packages/order-utils/test/signature_utils_test.ts b/packages/order-utils/test/signature_utils_test.ts index 553ec2e53..4b4de9217 100644 --- a/packages/order-utils/test/signature_utils_test.ts +++ b/packages/order-utils/test/signature_utils_test.ts @@ -3,6 +3,7 @@ import { JSONRPCErrorCallback, JSONRPCRequestPayload } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import * as Sinon from 'sinon'; diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 50aaffd7f..d65d3f175 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -46,10 +46,10 @@ }, "devDependencies": { "@0xproject/abi-gen": "^0.2.13", - "@0xproject/sol-compiler": "^0.4.3", "@0xproject/dev-utils": "^0.4.1", "@0xproject/migrations": "^0.0.5", "@0xproject/monorepo-scripts": "^0.1.19", + "@0xproject/sol-compiler": "^0.4.3", "@0xproject/tslint-config": "^0.4.17", "@types/bintrees": "^1.0.2", "@types/lodash": "4.14.104", @@ -63,6 +63,7 @@ "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "json-loader": "^0.5.4", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", @@ -75,9 +76,9 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/contract-wrappers": "^0.0.1", "@0xproject/assert": "^0.2.9", "@0xproject/base-contract": "^0.3.1", + "@0xproject/contract-wrappers": "^0.0.1", "@0xproject/fill-scenarios": "^0.0.1", "@0xproject/json-schemas": "^0.7.23", "@0xproject/order-utils": "^0.0.4", diff --git a/packages/order-watcher/test/event_watcher_test.ts b/packages/order-watcher/test/event_watcher_test.ts index b4eca315e..ba77d50dd 100644 --- a/packages/order-watcher/test/event_watcher_test.ts +++ b/packages/order-watcher/test/event_watcher_test.ts @@ -3,6 +3,7 @@ import { DoneCallback, LogEntry, LogEntryEvent } from '@0xproject/types'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import * as Sinon from 'sinon'; diff --git a/packages/order-watcher/test/expiration_watcher_test.ts b/packages/order-watcher/test/expiration_watcher_test.ts index 0a2524d78..8b006f58a 100644 --- a/packages/order-watcher/test/expiration_watcher_test.ts +++ b/packages/order-watcher/test/expiration_watcher_test.ts @@ -6,6 +6,7 @@ import { DoneCallback, Token } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import * as Sinon from 'sinon'; diff --git a/packages/order-watcher/test/global_hooks.ts b/packages/order-watcher/test/global_hooks.ts index 53b3ef545..03eab0e13 100644 --- a/packages/order-watcher/test/global_hooks.ts +++ b/packages/order-watcher/test/global_hooks.ts @@ -1,5 +1,6 @@ import { devConstants } from '@0xproject/dev-utils'; import { runMigrationsAsync } from '@0xproject/migrations'; +import 'make-promises-safe'; import * as path from 'path'; import { constants } from './utils/constants'; diff --git a/packages/order-watcher/test/order_watcher_test.ts b/packages/order-watcher/test/order_watcher_test.ts index 8c9249f58..dc8e544b1 100644 --- a/packages/order-watcher/test/order_watcher_test.ts +++ b/packages/order-watcher/test/order_watcher_test.ts @@ -15,6 +15,7 @@ import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import { OrderWatcher } from '../src/order_watcher/order_watcher'; diff --git a/packages/order-watcher/test/remaining_fillable_calculator_test.ts b/packages/order-watcher/test/remaining_fillable_calculator_test.ts index 7ec3f1ebc..ea116175b 100644 --- a/packages/order-watcher/test/remaining_fillable_calculator_test.ts +++ b/packages/order-watcher/test/remaining_fillable_calculator_test.ts @@ -2,6 +2,7 @@ import { ECSignature, SignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; import * as chai from 'chai'; +import 'make-promises-safe'; import 'mocha'; import { RemainingFillableCalculator } from '@0xproject/order-utils'; diff --git a/packages/react-docs-example/package.json b/packages/react-docs-example/package.json index 4c26dd3bd..2cbf3ef73 100644 --- a/packages/react-docs-example/package.json +++ b/packages/react-docs-example/package.json @@ -3,7 +3,7 @@ "name": "@0xproject/react-docs-example", "version": "0.0.11", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "An example app using react-docs", "scripts": { @@ -39,6 +39,7 @@ "json-loader": "^0.5.4", "less": "^2.7.2", "less-loader": "^2.2.3", + "make-promises-safe": "^1.1.0", "raw-loader": "^0.5.1", "shx": "^0.2.2", "source-map-loader": "^0.2.3", diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json index cf3575fea..9245cfb1e 100644 --- a/packages/react-docs/package.json +++ b/packages/react-docs/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/react-docs", "version": "0.0.11", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "React documentation component for rendering TypeDoc & Doxity generated JSON", "main": "lib/index.js", @@ -29,6 +29,7 @@ "@0xproject/monorepo-scripts": "^0.1.19", "@0xproject/tslint-config": "^0.4.17", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "^5.9.1", "typescript": "2.7.1" diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json index 32ef636a6..af0920d27 100644 --- a/packages/react-shared/package.json +++ b/packages/react-shared/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/react-shared", "version": "0.1.6", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "0x shared react components", "main": "lib/index.js", @@ -29,6 +29,7 @@ "@0xproject/monorepo-scripts": "^0.1.19", "@0xproject/tslint-config": "^0.4.17", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "^5.9.1", "typescript": "2.7.1" diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json index 42f5dd0a9..31a10f8b7 100644 --- a/packages/sol-compiler/package.json +++ b/packages/sol-compiler/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/sol-compiler", "version": "0.4.3", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Solidity compiler wrapper and artifactor", "main": "lib/src/index.js", @@ -59,6 +59,7 @@ "chai-as-promised": "^7.1.0", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", diff --git a/packages/sol-compiler/test/compiler_test.ts b/packages/sol-compiler/test/compiler_test.ts index d0f121897..dc8eb1c4e 100644 --- a/packages/sol-compiler/test/compiler_test.ts +++ b/packages/sol-compiler/test/compiler_test.ts @@ -1,5 +1,6 @@ import { DoneCallback } from '@0xproject/types'; import * as chai from 'chai'; +import 'make-promises-safe'; import 'mocha'; import { Compiler } from '../src/compiler'; diff --git a/packages/sol-compiler/test/compiler_utils_test.ts b/packages/sol-compiler/test/compiler_utils_test.ts index 4fe7b994e..a6143a719 100644 --- a/packages/sol-compiler/test/compiler_utils_test.ts +++ b/packages/sol-compiler/test/compiler_utils_test.ts @@ -1,6 +1,7 @@ import * as chai from 'chai'; import * as dirtyChai from 'dirty-chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import { diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json index dc6ea42cd..28ceae0fa 100644 --- a/packages/sol-cov/package.json +++ b/packages/sol-cov/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/sol-cov", "version": "0.0.10", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Generate coverage reports for Solidity code", "main": "lib/src/index.js", @@ -68,6 +68,7 @@ "chai": "^4.0.1", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", diff --git a/packages/sol-cov/test/collect_contracts_data_test.ts b/packages/sol-cov/test/collect_contracts_data_test.ts index c7c1dfe32..d84ac5a39 100644 --- a/packages/sol-cov/test/collect_contracts_data_test.ts +++ b/packages/sol-cov/test/collect_contracts_data_test.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import * as path from 'path'; diff --git a/packages/sol-cov/test/collect_coverage_entries_test.ts b/packages/sol-cov/test/collect_coverage_entries_test.ts index c7b9d44b1..82012edfa 100644 --- a/packages/sol-cov/test/collect_coverage_entries_test.ts +++ b/packages/sol-cov/test/collect_coverage_entries_test.ts @@ -1,6 +1,7 @@ import * as chai from 'chai'; import * as fs from 'fs'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import * as path from 'path'; diff --git a/packages/sol-cov/test/instructions_test.ts b/packages/sol-cov/test/instructions_test.ts index 195dfce2f..f66612f5f 100644 --- a/packages/sol-cov/test/instructions_test.ts +++ b/packages/sol-cov/test/instructions_test.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as fs from 'fs'; +import 'make-promises-safe'; import 'mocha'; import * as path from 'path'; diff --git a/packages/sol-cov/test/source_maps_test.ts b/packages/sol-cov/test/source_maps_test.ts index 5820bedd7..071f5a057 100644 --- a/packages/sol-cov/test/source_maps_test.ts +++ b/packages/sol-cov/test/source_maps_test.ts @@ -1,6 +1,7 @@ import * as chai from 'chai'; import * as fs from 'fs'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import * as path from 'path'; diff --git a/packages/sol-cov/test/utils_test.ts b/packages/sol-cov/test/utils_test.ts index 6fc8fcfe1..9a0227773 100644 --- a/packages/sol-cov/test/utils_test.ts +++ b/packages/sol-cov/test/utils_test.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as dirtyChai from 'dirty-chai'; +import 'make-promises-safe'; import 'mocha'; import { utils } from '../src/utils'; diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json index ad42dfa6c..54d8308de 100644 --- a/packages/sol-resolver/package.json +++ b/packages/sol-resolver/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/sol-resolver", "version": "0.0.4", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Import resolver for smart contracts dependencies", "main": "lib/index.js", @@ -27,6 +27,7 @@ "@0xproject/monorepo-scripts": "^0.1.19", "@0xproject/tslint-config": "^0.4.17", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1" diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 5d2245cc1..9622acd2e 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/sra-report", "version": "0.0.14", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Generate reports for standard relayer API compliance", "main": "lib/src/index.js", @@ -54,6 +54,7 @@ "chai-as-promised": "^7.1.0", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "nock": "^9.2.3", "npm-run-all": "^4.1.2", diff --git a/packages/sra-report/test/postman_collection_v0_test.ts b/packages/sra-report/test/postman_collection_v0_test.ts index dfb16b10d..5a2fc2520 100644 --- a/packages/sra-report/test/postman_collection_v0_test.ts +++ b/packages/sra-report/test/postman_collection_v0_test.ts @@ -1,3 +1,4 @@ +import 'make-promises-safe'; import 'mocha'; import * as nock from 'nock'; diff --git a/packages/sra-report/test/test_runner.ts b/packages/sra-report/test/test_runner.ts index 91ef6aa4e..5ea3cdc4d 100644 --- a/packages/sra-report/test/test_runner.ts +++ b/packages/sra-report/test/test_runner.ts @@ -2,6 +2,7 @@ import * as chai from 'chai'; import * as chaiAsPromised from 'chai-as-promised'; import * as dirtyChai from 'dirty-chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import { NewmanRunExecution, diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index d9eda98f3..21e47b85a 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/subproviders", "version": "0.10.1", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "main": "lib/src/index.js", "types": "lib/src/index.d.ts", @@ -68,6 +68,7 @@ "chai-as-promised": "^7.1.0", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", diff --git a/packages/subproviders/test/integration/ledger_subprovider_test.ts b/packages/subproviders/test/integration/ledger_subprovider_test.ts index f1c634a77..70fd2cfce 100644 --- a/packages/subproviders/test/integration/ledger_subprovider_test.ts +++ b/packages/subproviders/test/integration/ledger_subprovider_test.ts @@ -7,6 +7,7 @@ import TransportNodeHid from '@ledgerhq/hw-transport-node-hid'; import * as chai from 'chai'; import * as ethUtils from 'ethereumjs-util'; import * as _ from 'lodash'; +import 'make-promises-safe'; import Web3 = require('web3'); import Web3ProviderEngine = require('web3-provider-engine'); import RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); diff --git a/packages/subproviders/test/unit/ledger_subprovider_test.ts b/packages/subproviders/test/unit/ledger_subprovider_test.ts index 892c2acd0..6455454cb 100644 --- a/packages/subproviders/test/unit/ledger_subprovider_test.ts +++ b/packages/subproviders/test/unit/ledger_subprovider_test.ts @@ -2,6 +2,7 @@ import { JSONRPCResponsePayload } from '@0xproject/types'; import * as chai from 'chai'; import * as ethUtils from 'ethereumjs-util'; import * as _ from 'lodash'; +import 'make-promises-safe'; import Web3 = require('web3'); import Web3ProviderEngine = require('web3-provider-engine'); diff --git a/packages/subproviders/test/unit/mnemonic_wallet_subprovider_test.ts b/packages/subproviders/test/unit/mnemonic_wallet_subprovider_test.ts index 93300f47d..52b636ac2 100644 --- a/packages/subproviders/test/unit/mnemonic_wallet_subprovider_test.ts +++ b/packages/subproviders/test/unit/mnemonic_wallet_subprovider_test.ts @@ -2,6 +2,7 @@ import { JSONRPCResponsePayload } from '@0xproject/types'; import * as chai from 'chai'; import * as ethUtils from 'ethereumjs-util'; import * as _ from 'lodash'; +import 'make-promises-safe'; import Web3ProviderEngine = require('web3-provider-engine'); import { GanacheSubprovider, MnemonicWalletSubprovider } from '../../src/'; diff --git a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts index 1a3db7672..f4aa926d7 100644 --- a/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts +++ b/packages/subproviders/test/unit/nonce_tracker_subprovider_test.ts @@ -1,6 +1,7 @@ import * as chai from 'chai'; import * as fs from 'fs'; import * as _ from 'lodash'; +import 'make-promises-safe'; import * as path from 'path'; import Web3ProviderEngine = require('web3-provider-engine'); import FixtureSubprovider = require('web3-provider-engine/subproviders/fixture'); diff --git a/packages/subproviders/test/unit/private_key_wallet_subprovider_test.ts b/packages/subproviders/test/unit/private_key_wallet_subprovider_test.ts index 5c1b5cd25..864f977ea 100644 --- a/packages/subproviders/test/unit/private_key_wallet_subprovider_test.ts +++ b/packages/subproviders/test/unit/private_key_wallet_subprovider_test.ts @@ -2,6 +2,7 @@ import { JSONRPCResponsePayload } from '@0xproject/types'; import * as chai from 'chai'; import * as ethUtils from 'ethereumjs-util'; import * as _ from 'lodash'; +import 'make-promises-safe'; import Web3ProviderEngine = require('web3-provider-engine'); import { GanacheSubprovider, PrivateKeyWalletSubprovider } from '../../src/'; diff --git a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts index 9115186f4..f9c47f141 100644 --- a/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts +++ b/packages/subproviders/test/unit/redundant_rpc_subprovider_test.ts @@ -1,6 +1,7 @@ import { DoneCallback, JSONRPCResponsePayload } from '@0xproject/types'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import Web3 = require('web3'); import Web3ProviderEngine = require('web3-provider-engine'); import RpcSubprovider = require('web3-provider-engine/subproviders/rpc'); diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 693e980ed..db5fe75c7 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -3,7 +3,7 @@ "name": "@0xproject/testnet-faucets", "version": "1.0.29", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether", "main": "server.js", @@ -39,6 +39,7 @@ "@types/lodash": "4.14.104", "awesome-typescript-loader": "^3.1.3", "gulp": "^3.9.1", + "make-promises-safe": "^1.1.0", "nodemon": "^1.11.0", "shx": "^0.2.2", "source-map-loader": "^0.1.6", diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json index d7e62fc51..317ae4591 100644 --- a/packages/tslint-config/package.json +++ b/packages/tslint-config/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/tslint-config", "version": "0.4.17", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Lint rules related to 0xProject for TSLint", "main": "tslint.json", @@ -37,6 +37,7 @@ "@0xproject/monorepo-scripts": "^0.1.19", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "typescript": "2.7.1" }, diff --git a/packages/types/package.json b/packages/types/package.json index 2d79af6fd..edd17c42c 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/types", "version": "0.6.3", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "0x types", "main": "lib/index.js", @@ -27,6 +27,7 @@ "@0xproject/monorepo-scripts": "^0.1.19", "@0xproject/tslint-config": "^0.4.17", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "shx": "^0.2.2", "tslint": "5.8.0", "typescript": "2.7.1" diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json index 5a7268126..986acfcee 100644 --- a/packages/typescript-typings/package.json +++ b/packages/typescript-typings/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/typescript-typings", "version": "0.3.1", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "0x project typescript type definitions", "scripts": { @@ -31,6 +31,7 @@ "devDependencies": { "@0xproject/monorepo-scripts": "^0.1.19", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "shx": "^0.2.2" }, "publishConfig": { diff --git a/packages/utils/package.json b/packages/utils/package.json index d39077148..66dc682fa 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/utils", "version": "0.6.1", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "0x TS utils", "main": "lib/index.js", @@ -28,6 +28,7 @@ "@0xproject/tslint-config": "^0.4.17", "@types/lodash": "4.14.104", "copyfiles": "^1.2.0", + "make-promises-safe": "^1.1.0", "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json index c0fa45433..ed2fce7dc 100644 --- a/packages/web3-wrapper/package.json +++ b/packages/web3-wrapper/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/web3-wrapper", "version": "0.6.3", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "Wraps around web3 and gives a nicer interface", "main": "lib/src/index.js", @@ -52,6 +52,7 @@ "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "ganache-core": "0xProject/ganache-core", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", diff --git a/packages/web3-wrapper/test/web3_wrapper_test.ts b/packages/web3-wrapper/test/web3_wrapper_test.ts index 2bf3badaa..326efe654 100644 --- a/packages/web3-wrapper/test/web3_wrapper_test.ts +++ b/packages/web3-wrapper/test/web3_wrapper_test.ts @@ -1,5 +1,6 @@ import * as chai from 'chai'; import * as Ganache from 'ganache-core'; +import 'make-promises-safe'; import 'mocha'; import { Web3Wrapper } from '../src'; diff --git a/packages/website/package.json b/packages/website/package.json index f1b2a1750..3ef66d269 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -2,7 +2,7 @@ "name": "@0xproject/website", "version": "0.0.32", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "private": true, "description": "Website and 0x portal dapp", @@ -80,6 +80,7 @@ "imports-loader": "0.6.x", "json-loader": "^0.5.4", "less-loader": "^2.2.3", + "make-promises-safe": "^1.1.0", "raw-loader": "^0.5.1", "shx": "^0.2.2", "source-map-loader": "^0.1.6", diff --git a/packages/website/ts/components/top_bar/top_bar.tsx b/packages/website/ts/components/top_bar/top_bar.tsx index 2c3273dee..f2d0c6177 100644 --- a/packages/website/ts/components/top_bar/top_bar.tsx +++ b/packages/website/ts/components/top_bar/top_bar.tsx @@ -152,12 +152,6 @@ export class TopBar extends React.Component<TopBarProps, TopBarState> { primaryText={this.props.translate.get(Key.Web3Wrapper, Deco.CapWords)} /> </Link>, - <Link key="subMenuItem-order-utils" to={WebsitePaths.OrderUtils} className="text-decoration-none"> - <MenuItem - style={{ fontSize: styles.menuItem.fontSize }} - primaryText={this.props.translate.get(Key.OrderUtils, Deco.CapWords)} - /> - </Link>, <Link key="subMenuItem-sol-compiler" to={WebsitePaths.SolCompiler} className="text-decoration-none"> <MenuItem style={{ fontSize: styles.menuItem.fontSize }} diff --git a/packages/website/ts/pages/about/about.tsx b/packages/website/ts/pages/about/about.tsx index 24ea7614f..ac67ca968 100644 --- a/packages/website/ts/pages/about/about.tsx +++ b/packages/website/ts/pages/about/about.tsx @@ -151,7 +151,7 @@ const teamRow5: ProfileInfo[] = [ }, { name: 'Francesco Agosti', - title: 'Engineer', + title: 'Senior Frontend Engineer', description: `Full-stack engineer. Previously senior software engineer at Yelp. Computer Science at Duke.`, image: 'images/team/fragosti.png', linkedIn: 'https://www.linkedin.com/in/fragosti/', |