18 files changed, 72 insertions, 17 deletions
diff --git a/src/0x.ts b/src/0x.ts
index 9f955c807..93b710728 100644
--- a/src/0x.ts
+++ b/src/0x.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from './utils/lodash';
 import * as BigNumber from 'bignumber.js';
 import {SchemaValidator, schemas} from '0x-json-schemas';
 import {bigNumberConfigs} from './bignumber_config';
diff --git a/src/contract.ts b/src/contract.ts
index 1aacc65dc..5bf8150ac 100644
--- a/src/contract.ts
+++ b/src/contract.ts
@@ -1,5 +1,5 @@
 import * as Web3 from 'web3';
-import * as _ from 'lodash';
+import {_} from './utils/lodash';
 import promisify = require('es6-promisify');
 import {SchemaValidator, schemas} from '0x-json-schemas';
 import {AbiType} from './types';
diff --git a/src/contract_wrappers/contract_wrapper.ts b/src/contract_wrappers/contract_wrapper.ts
index 19dccc6f2..3b83f269f 100644
--- a/src/contract_wrappers/contract_wrapper.ts
+++ b/src/contract_wrappers/contract_wrapper.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import * as Web3 from 'web3';
 import {BlockAndLogStreamer, Block} from 'ethereumjs-blockstream';
 import {Web3Wrapper} from '../web3_wrapper';
diff --git a/src/contract_wrappers/ether_token_wrapper.ts b/src/contract_wrappers/ether_token_wrapper.ts
index f15e766f0..ba694b408 100644
--- a/src/contract_wrappers/ether_token_wrapper.ts
+++ b/src/contract_wrappers/ether_token_wrapper.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import {Web3Wrapper} from '../web3_wrapper';
 import {ContractWrapper} from './contract_wrapper';
 import {TokenWrapper} from './token_wrapper';
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index bc0ac0634..739e1df3b 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import * as Web3 from 'web3';
 import * as BigNumber from 'bignumber.js';
 import {schemas} from '0x-json-schemas';
diff --git a/src/contract_wrappers/token_registry_wrapper.ts b/src/contract_wrappers/token_registry_wrapper.ts
index 2cc5a9aa0..3b03da2cf 100644
--- a/src/contract_wrappers/token_registry_wrapper.ts
+++ b/src/contract_wrappers/token_registry_wrapper.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import {Web3Wrapper} from '../web3_wrapper';
 import {assert} from '../utils/assert';
 import {Token, TokenRegistryContract, TokenMetadata} from '../types';
diff --git a/src/contract_wrappers/token_transfer_proxy_wrapper.ts b/src/contract_wrappers/token_transfer_proxy_wrapper.ts
index f81845af9..c7419acd6 100644
--- a/src/contract_wrappers/token_transfer_proxy_wrapper.ts
+++ b/src/contract_wrappers/token_transfer_proxy_wrapper.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import {Web3Wrapper} from '../web3_wrapper';
 import {ContractWrapper} from './contract_wrapper';
 import {artifacts} from '../artifacts';
diff --git a/src/contract_wrappers/token_wrapper.ts b/src/contract_wrappers/token_wrapper.ts
index 8dc4e61c5..3f38623aa 100644
--- a/src/contract_wrappers/token_wrapper.ts
+++ b/src/contract_wrappers/token_wrapper.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import * as BigNumber from 'bignumber.js';
 import {schemas} from '0x-json-schemas';
 import {Web3Wrapper} from '../web3_wrapper';
diff --git a/src/utils/abi_decoder.ts b/src/utils/abi_decoder.ts
index a6c45bee7..7d0fa8b94 100644
--- a/src/utils/abi_decoder.ts
+++ b/src/utils/abi_decoder.ts
@@ -1,5 +1,5 @@
 import * as Web3 from 'web3';
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import * as BigNumber from 'bignumber.js';
 import {AbiType, DecodedLogArgs, LogWithDecodedArgs, RawLog, SolidityTypes, ContractEventArgs} from '../types';
 import * as SolidityCoder from 'web3/lib/solidity/coder';
diff --git a/src/utils/assert.ts b/src/utils/assert.ts
index 099f4490f..871553ccf 100644
--- a/src/utils/assert.ts
+++ b/src/utils/assert.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import * as BigNumber from 'bignumber.js';
 import * as Web3 from 'web3';
 import {Web3Wrapper} from '../web3_wrapper';
diff --git a/src/utils/decorators.ts b/src/utils/decorators.ts
index ec750b891..6e803d985 100644
--- a/src/utils/decorators.ts
+++ b/src/utils/decorators.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import {constants} from './constants';
 import {AsyncMethod, ZeroExError} from '../types';
 
diff --git a/src/utils/exchange_transfer_simulator.ts b/src/utils/exchange_transfer_simulator.ts
index db12abd29..b85869351 100644
--- a/src/utils/exchange_transfer_simulator.ts
+++ b/src/utils/exchange_transfer_simulator.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import {ExchangeContractErrs, TradeSide, TransferType} from '../types';
 import {TokenWrapper} from '../contract_wrappers/token_wrapper';
 
diff --git a/src/utils/filter_utils.ts b/src/utils/filter_utils.ts
index e09a95a6e..49dba0ed2 100644
--- a/src/utils/filter_utils.ts
+++ b/src/utils/filter_utils.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import * as Web3 from 'web3';
 import * as uuid from 'uuid/v4';
 import * as ethUtil from 'ethereumjs-util';
diff --git a/src/utils/interval_utils.ts b/src/utils/interval_utils.ts
index 62b79f2f5..66451800f 100644
--- a/src/utils/interval_utils.ts
+++ b/src/utils/interval_utils.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 
 export const intervalUtils = {
     setAsyncExcludingInterval(fn: () => Promise<void>, intervalMs: number) {
diff --git a/src/utils/lodash.ts b/src/utils/lodash.ts
new file mode 100644
index 000000000..67e4e5a9a
--- /dev/null
+++ b/src/utils/lodash.ts
@@ -0,0 +1,55 @@
+import assign from 'lodash-es/assign';
+import map from 'lodash-es/map';
+import values from 'lodash-es/values';
+import isUndefined from 'lodash-es/isUndefined';
+import isNull from 'lodash-es/isNull';
+import includes from 'lodash-es/includes';
+import each from 'lodash-es/each';
+import forEach from 'lodash-es/forEach';
+import filter from 'lodash-es/filter';
+import startsWith from 'lodash-es/startsWith';
+import padStart from 'lodash-es/padStart';
+import find from 'lodash-es/find';
+import zipWith from 'lodash-es/zipWith';
+import every from 'lodash-es/every';
+import isEmpty from 'lodash-es/isEmpty';
+import unzip from 'lodash-es/unzip';
+import pull from 'lodash-es/pull';
+import keys from 'lodash-es/keys';
+import uniq from 'lodash-es/uniq';
+import isArray from 'lodash-es/isArray';
+import isObject from 'lodash-es/isObject';
+import isString from 'lodash-es/isString';
+import isFinite from 'lodash-es/isFinite';
+import isNumber from 'lodash-es/isNumber';
+import isBoolean from 'lodash-es/isBoolean';
+import isFunction from 'lodash-es/isFunction';
+
+export const _ = {
+    assign,
+    map,
+    values,
+    isUndefined,
+    isNull,
+    includes,
+    each,
+    forEach,
+    filter,
+    startsWith,
+    padStart,
+    find,
+    zipWith,
+    every,
+    isEmpty,
+    unzip,
+    pull,
+    keys,
+    uniq,
+    isArray,
+    isObject,
+    isString,
+    isFinite,
+    isNumber,
+    isBoolean,
+    isFunction,
+};
diff --git a/src/utils/order_validation_utils.ts b/src/utils/order_validation_utils.ts
index 1d9aac884..12a24cdea 100644
--- a/src/utils/order_validation_utils.ts
+++ b/src/utils/order_validation_utils.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import {ExchangeContractErrs, SignedOrder, Order, ZeroExError, TradeSide, TransferType} from '../types';
 import {ZeroEx} from '../0x';
 import {TokenWrapper} from '../contract_wrappers/token_wrapper';
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index f2bf74860..2a02c448b 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from '../utils/lodash';
 import * as ethABI from 'ethereumjs-abi';
 import * as ethUtil from 'ethereumjs-util';
 import {Order, SignedOrder, SolidityTypes} from '../types';
diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index ff5d25d9c..521e20631 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import {_} from './utils/lodash';
 import * as Web3 from 'web3';
 import * as BigNumber from 'bignumber.js';
 import promisify = require('es6-promisify');