diff options
author | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-03-20 19:52:22 +0800 |
commit | 2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5 (patch) | |
tree | 60d846e22cf80416f0dd43ead8dd494c5735152f /packages/contracts | |
parent | 5468358f2142549c68ffae0085ce7d31ea271ea4 (diff) | |
parent | 7d9c357409c25996f9c448dffd69007f69b9d8d6 (diff) | |
download | dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.gz dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.bz2 dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.lz dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.xz dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.zst dexon-0x-contracts-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.zip |
Merge branch 'development' into addExtraDocs
* development: (29 commits)
Set Lodash dep to an exact version since newer versions introduced breaking changes
Update Kovan Ethertoken Address
Update deployer version since manual re-publish
Add new entry into CHANGELOG
Fix bad merge
Update yarn.lock
Change title
Add Blake and Zach to About page
Re-size Jacob and Tom's images
Manually publish 0x.js back to a working state
Publish
Publish
Fix 0x.js assets
Remove assets from connect and _bundles from packages that don't generate the folder
Publish
Fix packages that aren't working as expected
Make new packages default to public on publish
Add new public packages to top-level README
Update top-level package.json
Fix incorrect new versions
...
# Conflicts:
# packages/0x.js/package.json
# packages/connect/package.json
# packages/json-schemas/package.json
# packages/sol-cov/package.json
Diffstat (limited to 'packages/contracts')
-rw-r--r-- | packages/contracts/package.json | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 2bb3b2465..377fba473 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "contracts", - "version": "2.1.15", + "version": "2.1.19", "description": "Smart contract components of 0x protocol", "main": "index.js", "directories": { @@ -40,21 +40,21 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/contracts/README.md", "devDependencies": { - "@0xproject/dev-utils": "^0.2.1", - "@0xproject/tslint-config": "^0.4.10", + "@0xproject/dev-utils": "^0.3.2", + "@0xproject/tslint-config": "^0.4.12", "@types/bluebird": "^3.5.3", - "@types/lodash": "^4.14.86", + "@types/lodash": "4.14.104", "@types/node": "^8.0.53", "@types/request-promise-native": "^1.0.2", "@types/yargs": "^10.0.0", "chai": "^4.0.1", "chai-as-promised": "^7.1.0", - "chai-as-promised-typescript-typings": "^0.0.10", + "chai-as-promised-typescript-typings": "^0.0.12", "chai-bignumber": "^2.0.1", - "chai-typescript-typings": "^0.0.4", + "chai-typescript-typings": "^0.0.6", "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", - "ethers-typescript-typings": "^0.0.2", + "ethers-typescript-typings": "^0.0.4", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "prettier": "^1.11.1", @@ -64,16 +64,16 @@ "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", "typescript": "2.7.1", - "web3-typescript-typings": "^0.10.0", + "web3-typescript-typings": "^0.10.2", "yargs": "^10.0.3" }, "dependencies": { - "0x.js": "^0.33.1", - "@0xproject/deployer": "^0.2.1", - "@0xproject/json-schemas": "^0.7.14", - "@0xproject/types": "^0.3.1", - "@0xproject/utils": "^0.4.1", - "@0xproject/web3-wrapper": "^0.2.1", + "0x.js": "^0.33.6", + "@0xproject/deployer": "^0.3.3", + "@0xproject/json-schemas": "^0.7.17", + "@0xproject/types": "^0.4.1", + "@0xproject/utils": "^0.4.3", + "@0xproject/web3-wrapper": "^0.3.1", "bluebird": "^3.5.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", |