diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-05-22 04:38:12 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-05-22 04:38:12 +0800 |
| commit | 0fdf32cf6f0f1def41a1733687e977feb3a652f5 (patch) | |
| tree | b62110db354e7e221548b6dd95215ffbf00573af /packages/0x.js | |
| parent | c70540e7f4ead1f25d1436de3b4dcda06c3e1e68 (diff) | |
| parent | a26cc7c14d4e59102d5f84d534f75c42b8683cad (diff) | |
| download | dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.gz dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.bz2 dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.lz dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.xz dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.tar.zst dexon-sol-tools-0fdf32cf6f0f1def41a1733687e977feb3a652f5.zip | |
merge development
Diffstat (limited to 'packages/0x.js')
| -rw-r--r-- | packages/0x.js/package.json | 9 | ||||
| -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, 7 insertions, 4 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index dab284dc7..2fff1c058 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -2,7 +2,7 @@ "name": "0x.js", "version": "0.37.2", "engines": { - "node" : ">=6.12" + "node": ">=6.12" }, "description": "A javascript library for interacting with the 0x protocol", "keywords": [ @@ -69,10 +69,10 @@ "license": "Apache-2.0", "devDependencies": { "@0xproject/abi-gen": "^0.2.13", - "@0xproject/sol-compiler": "^0.4.3", "@0xproject/dev-utils": "^0.4.1", "@0xproject/migrations": "^0.0.5", "@0xproject/monorepo-scripts": "^0.1.19", + "@0xproject/sol-compiler": "^0.4.3", "@0xproject/tslint-config": "^0.4.17", "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", @@ -85,6 +85,7 @@ "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "json-loader": "^0.5.4", + "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "nyc": "^11.0.1", @@ -102,11 +103,11 @@ "@0xproject/assert": "^0.2.9", "@0xproject/base-contract": "^0.3.1", "@0xproject/contract-wrappers": "^0.0.1", - "@0xproject/order-watcher": "^0.0.1", "@0xproject/order-utils": "^0.0.4", + "@0xproject/order-watcher": "^0.0.1", + "@0xproject/sol-compiler": "^0.4.3", "@0xproject/types": "^0.6.3", "@0xproject/typescript-typings": "^0.3.1", - "@0xproject/sol-compiler": "^0.4.3", "@0xproject/utils": "^0.6.1", "@0xproject/web3-wrapper": "^0.6.3", "ethers": "^3.0.15", diff --git a/packages/0x.js/test/0x.js_test.ts b/packages/0x.js/test/0x.js_test.ts index ce2fa34bf..509d3f9f2 100644 --- a/packages/0x.js/test/0x.js_test.ts +++ b/packages/0x.js/test/0x.js_test.ts @@ -3,6 +3,7 @@ import { BlockchainLifecycle, devConstants, web3Factory } from '@0xproject/dev-u import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import * as _ from 'lodash'; +import 'make-promises-safe'; import 'mocha'; import * as path from 'path'; import * as Sinon from 'sinon'; diff --git a/packages/0x.js/test/artifacts_test.ts b/packages/0x.js/test/artifacts_test.ts index 40c5983bd..ca554a4f5 100644 --- a/packages/0x.js/test/artifacts_test.ts +++ b/packages/0x.js/test/artifacts_test.ts @@ -1,5 +1,6 @@ import { web3Factory } from '@0xproject/dev-utils'; import * as fs from 'fs'; +import 'make-promises-safe'; import { ZeroEx } from '../src'; |