aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2017-06-21 20:11:06 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2017-06-21 20:11:06 +0800
commita1c363a8af3cbfa2d843aaf7ddd05390db7b8f9b (patch)
tree7f4d4ee9ad766860288d22ee7875f70f0d951af0
parent40a7be0690c81d2e42543aa075ef8da6606e7b7e (diff)
downloaddexon-sol-tools-a1c363a8af3cbfa2d843aaf7ddd05390db7b8f9b.tar
dexon-sol-tools-a1c363a8af3cbfa2d843aaf7ddd05390db7b8f9b.tar.gz
dexon-sol-tools-a1c363a8af3cbfa2d843aaf7ddd05390db7b8f9b.tar.bz2
dexon-sol-tools-a1c363a8af3cbfa2d843aaf7ddd05390db7b8f9b.tar.lz
dexon-sol-tools-a1c363a8af3cbfa2d843aaf7ddd05390db7b8f9b.tar.xz
dexon-sol-tools-a1c363a8af3cbfa2d843aaf7ddd05390db7b8f9b.tar.zst
dexon-sol-tools-a1c363a8af3cbfa2d843aaf7ddd05390db7b8f9b.zip
Fall back to import x = require() syntax
-rw-r--r--src/0x.ts2
-rw-r--r--src/contract_wrappers/contract_wrapper.ts4
-rw-r--r--src/contract_wrappers/exchange_wrapper.ts10
-rw-r--r--src/contract_wrappers/token_registry_wrapper.ts4
-rw-r--r--src/contract_wrappers/token_wrapper.ts2
-rw-r--r--src/types.ts2
-rw-r--r--src/utils/assert.ts14
-rw-r--r--src/utils/decorators.ts2
-rw-r--r--src/utils/utils.ts4
-rw-r--r--src/web3_wrapper.ts2
-rw-r--r--test/0x.js_test.ts4
-rw-r--r--test/schema_test.ts2
-rw-r--r--test/token_registry_wrapper_test.ts2
-rw-r--r--test/utils/order_factory.ts4
-rw-r--r--test/utils/token_utils.ts6
-rw-r--r--tsconfig.json1
16 files changed, 32 insertions, 33 deletions
diff --git a/src/0x.ts b/src/0x.ts
index eee74b21b..71acf0438 100644
--- a/src/0x.ts
+++ b/src/0x.ts
@@ -1,4 +1,4 @@
-import isUndefined from 'lodash/isUndefined';
+import isUndefined = require('lodash/isUndefined');
import * as BigNumber from 'bignumber.js';
import {bigNumberConfigs} from './bignumber_config';
import * as ethUtil from 'ethereumjs-util';
diff --git a/src/contract_wrappers/contract_wrapper.ts b/src/contract_wrappers/contract_wrapper.ts
index dd403ce8b..f5d2cd4eb 100644
--- a/src/contract_wrappers/contract_wrapper.ts
+++ b/src/contract_wrappers/contract_wrapper.ts
@@ -1,5 +1,5 @@
-import includes from 'lodash/includes';
-import isUndefined from 'lodash/isUndefined';
+import includes = require('lodash/includes');
+import isUndefined = require('lodash/isUndefined');
import contract = require('truffle-contract');
import {Web3Wrapper} from '../web3_wrapper';
import {ZeroExError, Artifact, ContractInstance} from '../types';
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index 4f9d03539..6d42dc110 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -1,8 +1,8 @@
-import map from 'lodash/map';
-import isEmpty from 'lodash/isEmpty';
-import find from 'lodash/find';
-import isUndefined from 'lodash/isUndefined';
-import unzip from 'lodash/unzip';
+import map = require('lodash/map');
+import isEmpty = require('lodash/isEmpty');
+import find = require('lodash/find');
+import isUndefined = require('lodash/isUndefined');
+import unzip = require('lodash/unzip');
import * as BigNumber from 'bignumber.js';
import promisify = require('es6-promisify');
import {Web3Wrapper} from '../web3_wrapper';
diff --git a/src/contract_wrappers/token_registry_wrapper.ts b/src/contract_wrappers/token_registry_wrapper.ts
index dd27192a7..971b2d43c 100644
--- a/src/contract_wrappers/token_registry_wrapper.ts
+++ b/src/contract_wrappers/token_registry_wrapper.ts
@@ -1,5 +1,5 @@
-import map from 'lodash/map';
-import isUndefined from 'lodash/isUndefined';
+import map = require('lodash/map');
+import isUndefined = require('lodash/isUndefined');
import {Web3Wrapper} from '../web3_wrapper';
import {Token, TokenRegistryContract, TokenMetadata} from '../types';
import {assert} from '../utils/assert';
diff --git a/src/contract_wrappers/token_wrapper.ts b/src/contract_wrappers/token_wrapper.ts
index ea24b5901..5db7248e8 100644
--- a/src/contract_wrappers/token_wrapper.ts
+++ b/src/contract_wrappers/token_wrapper.ts
@@ -1,4 +1,4 @@
-import isUndefined from 'lodash/isUndefined';
+import isUndefined = require('lodash/isUndefined');
import * as BigNumber from 'bignumber.js';
import {Web3Wrapper} from '../web3_wrapper';
import {assert} from '../utils/assert';
diff --git a/src/types.ts b/src/types.ts
index e08d7f963..d59ed67cf 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -1,4 +1,4 @@
-import reduce from 'lodash/reduce';
+import reduce = require('lodash/reduce');
import * as Web3 from 'web3';
// Utility function to create a K:V from a list of strings
diff --git a/src/utils/assert.ts b/src/utils/assert.ts
index c4f1915e7..efc7ed366 100644
--- a/src/utils/assert.ts
+++ b/src/utils/assert.ts
@@ -1,10 +1,10 @@
-import uniq from 'lodash/uniq';
-import isEmpty from 'lodash/isEmpty';
-import isObject from 'lodash/isObject';
-import isFinite from 'lodash/isFinite';
-import isString from 'lodash/isString';
-import isBoolean from 'lodash/isBoolean';
-import isUndefined from 'lodash/isUndefined';
+import uniq = require('lodash/uniq');
+import isEmpty = require('lodash/isEmpty');
+import isObject = require('lodash/isObject');
+import isFinite = require('lodash/isFinite');
+import isString = require('lodash/isString');
+import isBoolean = require('lodash/isBoolean');
+import isUndefined = require('lodash/isUndefined');
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 f8786dbbe..b06e96747 100644
--- a/src/utils/decorators.ts
+++ b/src/utils/decorators.ts
@@ -1,4 +1,4 @@
-import includes from 'lodash/includes';
+import includes = require('lodash/includes');
import {constants} from './constants';
import {AsyncMethod, ZeroExError} from '../types';
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index e4e7b77ab..2db611ccb 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,5 +1,5 @@
-import map from 'lodash/map';
-import includes from 'lodash/includes';
+import map = require('lodash/map');
+import includes = require('lodash/includes');
import * as BN from 'bn.js';
import * as ethABI from 'ethereumjs-abi';
import * as ethUtil from 'ethereumjs-util';
diff --git a/src/web3_wrapper.ts b/src/web3_wrapper.ts
index 7218b5739..d7cf6df58 100644
--- a/src/web3_wrapper.ts
+++ b/src/web3_wrapper.ts
@@ -1,4 +1,4 @@
-import includes from 'lodash/includes';
+import includes = require('lodash/includes');
import * as Web3 from 'web3';
import * as BigNumber from 'bignumber.js';
import promisify = require('es6-promisify');
diff --git a/test/0x.js_test.ts b/test/0x.js_test.ts
index b8e387f04..e50a6018c 100644
--- a/test/0x.js_test.ts
+++ b/test/0x.js_test.ts
@@ -1,5 +1,5 @@
-import each from 'lodash/each';
-import assign from 'lodash/assign';
+import each = require('lodash/each');
+import assign = require('lodash/assign');
import * as chai from 'chai';
import {chaiSetup} from './utils/chai_setup';
import 'mocha';
diff --git a/test/schema_test.ts b/test/schema_test.ts
index 28abdc2c3..72b08581a 100644
--- a/test/schema_test.ts
+++ b/test/schema_test.ts
@@ -1,5 +1,5 @@
import 'mocha';
-import forEach from 'lodash/forEach';
+import forEach = require('lodash/forEach');
import * as chai from 'chai';
import * as BigNumber from 'bignumber.js';
import promisify = require('es6-promisify');
diff --git a/test/token_registry_wrapper_test.ts b/test/token_registry_wrapper_test.ts
index 74a02aa40..d7c8a7a95 100644
--- a/test/token_registry_wrapper_test.ts
+++ b/test/token_registry_wrapper_test.ts
@@ -1,4 +1,4 @@
-import each from 'lodash/each';
+import each = require('lodash/each');
import 'mocha';
import * as chai from 'chai';
import {chaiSetup} from './utils/chai_setup';
diff --git a/test/utils/order_factory.ts b/test/utils/order_factory.ts
index ec16df22d..939d5df20 100644
--- a/test/utils/order_factory.ts
+++ b/test/utils/order_factory.ts
@@ -1,5 +1,5 @@
-import assign from 'lodash/assign';
-import isUndefined from 'lodash/isUndefined';
+import assign = require('lodash/assign');
+import isUndefined = require('lodash/isUndefined');
import * as BigNumber from 'bignumber.js';
import {ZeroEx, SignedOrder} from '../../src';
diff --git a/test/utils/token_utils.ts b/test/utils/token_utils.ts
index 658cfe864..00fa55260 100644
--- a/test/utils/token_utils.ts
+++ b/test/utils/token_utils.ts
@@ -1,6 +1,6 @@
-import find from 'lodash/find';
-import filter from 'lodash/filter';
-import isUndefined from 'lodash/isUndefined';
+import find = require('lodash/find');
+import filter = require('lodash/filter');
+import isUndefined = require('lodash/isUndefined');
import {Token, ZeroExError} from '../../src';
const PROTOCOL_TOKEN_SYMBOL = 'ZRX';
diff --git a/tsconfig.json b/tsconfig.json
index beecbbf0b..e26c01048 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -8,7 +8,6 @@
"declaration": true,
"noImplicitAny": true,
"experimentalDecorators": true,
- "allowSyntheticDefaultImports": true,
"strictNullChecks": true
},
"include": [