Merge branch 'development' into feature/testnet-faucets/queue-by-network

* development: (24 commits)
  Fix Remco's github name in CODEOWNERS
  Fix ABI error message
  Stop using definite assignment assertion cause prettier doesn't handle that
  Special-case ZRXToken snake case conversion
  Fix linter errors
  Generate contract wrappers on pre-build
  Add missing async
  Remove noImplicitThis
  Tslint disable no-consecutive-blank-lines in generated files
  Change compiled sources in contracts
  Change utils
  Change tests
  Add base_contract.ts
  Remove generated files
  .gitignore gemerated files
  Change the list of generated wrappers
  Change contract templates
  Add indices for index parameters so that their names don't collide
  Use abi-gen for events in 0x.js
  Fix artifacts path
  ...

1 files changed, 22 insertions, 13 deletions

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index c3c8854da..161945443 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -9,26 +9,13 @@ export {
     ExchangeContractErrs,
     ContractEvent,
     Token,
-    ExchangeEvents,
-    TokenEvents,
     IndexedFilterValues,
     BlockRange,
     OrderCancellationRequest,
     OrderFillRequest,
-    LogErrorContractEventArgs,
-    LogCancelContractEventArgs,
-    LogFillContractEventArgs,
-    ExchangeContractEventArgs,
-    TransferContractEventArgs,
-    ApprovalContractEventArgs,
-    TokenContractEventArgs,
-    EtherTokenContractEventArgs,
-    WithdrawalContractEventArgs,
-    DepositContractEventArgs,
     ContractEventArgs,
     Web3Provider,
     ZeroExConfig,
-    EtherTokenEvents,
     MethodOpts,
     OrderTransactionOpts,
     TransactionOpts,
@@ -50,4 +37,26 @@ export {
     TransactionReceiptWithDecodedLogs,
 } from '@0xproject/types';
 
+export {
+    EtherTokenContractEventArgs,
+    WithdrawalContractEventArgs,
+    DepositContractEventArgs,
+    EtherTokenEvents,
+} from './contract_wrappers/generated/ether_token';
+
+export {
+    TransferContractEventArgs,
+    ApprovalContractEventArgs,
+    TokenContractEventArgs,
+    TokenEvents,
+} from './contract_wrappers/generated/token';
+
+export {
+    LogErrorContractEventArgs,
+    LogCancelContractEventArgs,
+    LogFillContractEventArgs,
+    ExchangeContractEventArgs,
+    ExchangeEvents,
+} from './contract_wrappers/generated/exchange';
+
 export { TransactionReceipt } from '@0xproject/types';