From 60f026e6fdac855daef3ab8b2e8e2ade9d3d26af Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Thu, 16 Aug 2018 08:45:43 -0700
Subject: Export Web3ProviderEngine directly instead of indirectly via
 subproviders

---
 packages/0x.js/package.json |  5 +++--
 packages/0x.js/src/index.ts | 10 +++-------
 2 files changed, 6 insertions(+), 9 deletions(-)

(limited to 'packages')

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 49dca2923..006c1ed27 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -78,8 +78,8 @@
         "@0xproject/base-contract": "^2.0.0-rc.1",
         "@0xproject/contract-wrappers": "^1.0.1-rc.3",
         "@0xproject/order-utils": "^1.0.1-rc.3",
-        "@0xproject/sol-compiler": "^1.0.5",
         "@0xproject/order-watcher": "1.0.1-rc.3",
+        "@0xproject/sol-compiler": "^1.0.5",
         "@0xproject/subproviders": "^1.0.5",
         "@0xproject/types": "^1.0.1-rc.4",
         "@0xproject/typescript-typings": "^1.0.4",
@@ -87,7 +87,8 @@
         "@0xproject/web3-wrapper": "^1.2.0",
         "ethereum-types": "^1.0.4",
         "ethers": "3.0.22",
-        "lodash": "^4.17.5"
+        "lodash": "^4.17.5",
+        "web3-provider-engine": "14.0.6"
     },
     "publishConfig": {
         "access": "public"
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 5ac3da00d..aa59d81cc 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -47,13 +47,9 @@ export { ContractWrapper } from '@0xproject/contract-wrappers/lib/src/contract_w
 
 export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher';
 
-export {
-    Web3ProviderEngine,
-    RPCSubprovider,
-    Callback,
-    JSONRPCRequestPayloadWithMethod,
-    ErrorCallback,
-} from '@0xproject/subproviders';
+export import Web3ProviderEngine = require('web3-provider-engine');
+
+export { RPCSubprovider, Callback, JSONRPCRequestPayloadWithMethod, ErrorCallback } from '@0xproject/subproviders';
 
 export { AbiDecoder } from '@0xproject/utils';
 
-- 
cgit