diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-11-29 05:21:15 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-11-29 05:21:15 +0800 |
| commit | 15ce862334be14a7effcd55840ca96e425912df8 (patch) | |
| tree | b51f48dfb6a0dc66745b62521c108472210dcfaa /packages/0x.js/package.json | |
| parent | 72a00ac2df47ff793d74c2a82c7f403f501e784a (diff) | |
| parent | da0af12834b16c960d9ebf2936eec450825ba987 (diff) | |
| download | dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.gz dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.bz2 dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.lz dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.xz dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.tar.zst dexon-sol-tools-15ce862334be14a7effcd55840ca96e425912df8.zip | |
Merge branch 'development' into fix/refactorDocs
* development: (30 commits)
Export TransactionOpts type
Make website private
Publish
Update CHANGELOG
Change interval to 1h
Rename
Add ifExists to cleanupJobInterval
Add a cleanup job to an order watcher
Improve the comment
Add CHANGELOG comment
Add a HACK comment
Normalise subprovider names
Remove a comment
Fix a typo
Pin testrpc version
Remove gas params from tests
Add fake gas estimate suprovider for tests
Revert "Fix website linter errors"
Fix website linter errors
Fix tests
...
# Conflicts:
# packages/website/ts/utils/constants.ts
Diffstat (limited to 'packages/0x.js/package.json')
| -rw-r--r-- | packages/0x.js/package.json | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 024cb0fe9..4b1dd478c 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "0.26.1", + "version": "0.27.0", "description": "A javascript library for interacting with the 0x protocol", "keywords": [ "0x.js", @@ -44,7 +44,7 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/tslint-config": "^0.1.1", + "@0xproject/tslint-config": "^0.2.0", "@types/bintrees": "^1.0.2", "@types/jsonschema": "^1.1.1", "@types/lodash": "^4.14.64", @@ -61,7 +61,7 @@ "copyfiles": "^1.2.0", "coveralls": "^3.0.0", "dirty-chai": "^2.0.1", - "ethereumjs-testrpc": "4.0.1", + "ethereumjs-testrpc": "6.0.3", "json-loader": "^0.5.4", "mocha": "^4.0.0", "npm-run-all": "^4.0.2", @@ -83,8 +83,8 @@ "webpack": "^3.1.0" }, "dependencies": { - "@0xproject/assert": "^0.0.5", - "@0xproject/json-schemas": "^0.6.8", + "@0xproject/assert": "^0.0.6", + "@0xproject/json-schemas": "^0.6.9", "bignumber.js": "~4.1.0", "bintrees": "^1.0.2", "bn.js": "4.11.8", |