diff options
author | Fabio Berger <me@fabioberger.com> | 2018-06-22 16:32:06 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-22 16:32:06 +0800 |
commit | 0515c6acded983bba05320895ea2c2891f37055c (patch) | |
tree | e35dc84b3c785241b82e8bfe4605cd288a467301 /packages/0x.js | |
parent | 5c0bae20701391fffae914c35add9cebe8eaa4e5 (diff) | |
parent | 4012e31115dd0571d742b42a48094f41fd53a460 (diff) | |
download | dexon-sol-tools-0515c6acded983bba05320895ea2c2891f37055c.tar dexon-sol-tools-0515c6acded983bba05320895ea2c2891f37055c.tar.gz dexon-sol-tools-0515c6acded983bba05320895ea2c2891f37055c.tar.bz2 dexon-sol-tools-0515c6acded983bba05320895ea2c2891f37055c.tar.lz dexon-sol-tools-0515c6acded983bba05320895ea2c2891f37055c.tar.xz dexon-sol-tools-0515c6acded983bba05320895ea2c2891f37055c.tar.zst dexon-sol-tools-0515c6acded983bba05320895ea2c2891f37055c.zip |
Merge pull request #752 from 0xProject/make-promises-safe-preloader
Use make-promises-safe as a preloader instead of manually importing
Diffstat (limited to 'packages/0x.js')
-rw-r--r-- | packages/0x.js/package.json | 2 | ||||
-rw-r--r-- | packages/0x.js/test/0x.js_test.ts | 1 | ||||
-rw-r--r-- | packages/0x.js/test/artifacts_test.ts | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 2aeb1ddf2..12fbf0347 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -30,7 +30,7 @@ "clean": "shx rm -rf _bundles lib test_temp scripts src/generated_contract_wrappers", "build:umd:prod": "NODE_ENV=production webpack", "build:commonjs": "tsc && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", - "run_mocha": "mocha --require source-map-support/register lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit", + "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit", "manual:postpublish": "yarn build; node ./scripts/postpublish.js", "docs:stage": "node scripts/stage_docs.js", "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES", diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts index 5d2eb6d7e..425fc6380 100644 --- a/packages/0x.js/test/0x.js_test.ts +++ b/packages/0x.js/test/0x.js_test.ts @@ -3,7 +3,6 @@ import { BlockchainLifecycle } from '@0xproject/dev-utils'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; -import 'make-promises-safe'; import 'mocha'; import { ApprovalContractEventArgs, LogWithDecodedArgs, TokenEvents, ZeroEx } from '../src'; diff --git a/packages/0x.js/test/artifacts_test.ts b/packages/0x.js/test/artifacts_test.ts index fd7066aac..e65b85ad6 100644 --- a/packages/0x.js/test/artifacts_test.ts +++ b/packages/0x.js/test/artifacts_test.ts @@ -1,5 +1,4 @@ import { web3Factory } from '@0xproject/dev-utils'; -import 'make-promises-safe'; import { ZeroEx } from '../src'; |