diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-11-23 04:22:22 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-11-23 04:22:22 +0800 |
| commit | f74408f390199b239ce707ef6db3773045c9863d (patch) | |
| tree | a87fb0f5312dad68b816c597eeb58d411e97bbcd /packages/0x.js/package.json | |
| parent | f5e0fd8de5a3201ac17a8dde68aec3314674f1c4 (diff) | |
| parent | 0e03ef385b03f5b2f916f38001553b1c1c18c383 (diff) | |
| download | dexon-sol-tools-f74408f390199b239ce707ef6db3773045c9863d.tar dexon-sol-tools-f74408f390199b239ce707ef6db3773045c9863d.tar.gz dexon-sol-tools-f74408f390199b239ce707ef6db3773045c9863d.tar.bz2 dexon-sol-tools-f74408f390199b239ce707ef6db3773045c9863d.tar.lz dexon-sol-tools-f74408f390199b239ce707ef6db3773045c9863d.tar.xz dexon-sol-tools-f74408f390199b239ce707ef6db3773045c9863d.tar.zst dexon-sol-tools-f74408f390199b239ce707ef6db3773045c9863d.zip | |
Merge branch 'development' into addWebsite
* development: (33 commits)
Last renames
Refactor while condition
Fix tests
Fix tests
Fix a typo
Fix test:circleci command
Check if transactionReceipt exists before normalizing it
Address nits
Remove old comment
Fix async callbacks
Check if callback exists
Rename
Pass callback down
Remove custom heap and use bintrees
Add expirationMarginMs
Add defaults
Fix typos
Rename orderLifetime to orderLifetimeS
Reference types directly
Add ifExists suffix
...
Diffstat (limited to 'packages/0x.js/package.json')
| -rw-r--r-- | packages/0x.js/package.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index b439a58ef..26f9273db 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -17,7 +17,7 @@ "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR", "upload_docs_json": "aws s3 cp docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type aplication/json", "lint": "tslint src/**/*.ts test/**/*.ts", - "test:circleci": "run-s test:coverage report_test_coverage; if [ $CIRCLE_BRANCH = \"development\" ]; then yarn test:umd; fi", + "test:circleci": "run-s test:coverage report_test_coverage && if [ $CIRCLE_BRANCH = \"development\" ]; then yarn test:umd; fi", "test": "run-s clean test:commonjs", "test:umd": "./scripts/test_umd.sh", "test:coverage": "nyc npm run test --all", @@ -45,6 +45,7 @@ }, "devDependencies": { "@0xproject/tslint-config": "^0.1.1", + "@types/bintrees": "^1.0.2", "@types/jsonschema": "^1.1.1", "@types/lodash": "^4.14.64", "@types/mocha": "^2.2.41", @@ -85,6 +86,7 @@ "@0xproject/assert": "^0.0.5", "@0xproject/json-schemas": "^0.6.8", "bignumber.js": "~4.1.0", + "bintrees": "^1.0.2", "bn.js": "4.11.8", "compare-versions": "^3.0.1", "es6-promisify": "^5.0.0", |