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/testnet-faucets | |
| parent | 5468358f2142549c68ffae0085ce7d31ea271ea4 (diff) | |
| parent | 7d9c357409c25996f9c448dffd69007f69b9d8d6 (diff) | |
| download | dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.gz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.zst dexon-sol-tools-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/testnet-faucets')
| -rw-r--r-- | packages/testnet-faucets/package.json | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json index 631098967..7159af988 100644 --- a/packages/testnet-faucets/package.json +++ b/packages/testnet-faucets/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@0xproject/testnet-faucets", - "version": "1.0.16", + "version": "1.0.20", "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether", "main": "server.js", "scripts": { @@ -15,9 +15,9 @@ "author": "Fabio Berger", "license": "Apache-2.0", "dependencies": { - "0x.js": "^0.33.1", - "@0xproject/subproviders": "^0.7.0", - "@0xproject/utils": "^0.4.1", + "0x.js": "^0.33.6", + "@0xproject/subproviders": "^0.8.2", + "@0xproject/utils": "^0.4.3", "body-parser": "^1.17.1", "ethereumjs-tx": "^1.3.3", "ethereumjs-util": "^5.1.1", @@ -28,10 +28,10 @@ "web3-provider-engine": "^13.0.1" }, "devDependencies": { - "@0xproject/tslint-config": "^0.4.10", + "@0xproject/tslint-config": "^0.4.12", "@types/body-parser": "^1.16.1", "@types/express": "^4.0.35", - "@types/lodash": "^4.14.86", + "@types/lodash": "4.14.104", "awesome-typescript-loader": "^3.1.3", "gulp": "^3.9.1", "nodemon": "^1.11.0", @@ -41,7 +41,7 @@ "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", "webpack": "^3.1.0", "webpack-node-externals": "^1.6.0" } |