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/0x.js/package.json | |
parent | 5468358f2142549c68ffae0085ce7d31ea271ea4 (diff) | |
parent | 7d9c357409c25996f9c448dffd69007f69b9d8d6 (diff) | |
download | dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.gz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.bz2 dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.lz dexon-sol-tools-2f7c19e80d31cbcc09c6e87841682e8f35f0ecd5.tar.xz 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/0x.js/package.json')
-rw-r--r-- | packages/0x.js/package.json | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index 3c2322227..0d988d0af 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -1,6 +1,6 @@ { "name": "0x.js", - "version": "0.33.1", + "version": "0.33.6", "description": "A javascript library for interacting with the 0x protocol", "keywords": [ "0x.js", @@ -34,7 +34,10 @@ "config": { "artifacts": "TokenTransferProxy Exchange TokenRegistry Token EtherToken", "postpublish": { - "assets": ["_bundles/index.js", "_bundles/index.min.js"], + "assets": [ + "packages/0x.js/_bundles/index.js", + "packages/0x.js/_bundles/index.min.js" + ], "docPublishConfigs": { "extraFileIncludes": ["../types/src/index.ts"], "s3BucketPath": "s3://doc-jsons/0xjs/", @@ -51,13 +54,13 @@ "node": ">=6.0.0" }, "devDependencies": { - "@0xproject/abi-gen": "^0.2.5", - "@0xproject/dev-utils": "^0.2.1", - "@0xproject/monorepo-scripts": "^0.1.12", - "@0xproject/tslint-config": "^0.4.10", + "@0xproject/abi-gen": "^0.2.7", + "@0xproject/dev-utils": "^0.3.2", + "@0xproject/monorepo-scripts": "^0.1.14", + "@0xproject/tslint-config": "^0.4.12", "@types/bintrees": "^1.0.2", "@types/jsonschema": "^1.1.1", - "@types/lodash": "^4.14.86", + "@types/lodash": "4.14.104", "@types/mocha": "^2.2.42", "@types/node": "^8.0.53", "@types/sinon": "^2.2.2", @@ -65,9 +68,9 @@ "awesome-typescript-loader": "^3.1.3", "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", "json-loader": "^0.5.4", @@ -90,26 +93,26 @@ "webpack": "^3.1.0" }, "dependencies": { - "@0xproject/assert": "^0.2.0", - "@0xproject/base-contract": "^0.0.3", - "@0xproject/json-schemas": "^0.7.14", - "@0xproject/types": "^0.3.1", - "@0xproject/utils": "^0.4.1", - "@0xproject/web3-wrapper": "^0.2.1", + "@0xproject/assert": "^0.2.3", + "@0xproject/base-contract": "^0.0.5", + "@0xproject/json-schemas": "^0.7.17", + "@0xproject/types": "^0.4.1", + "@0xproject/utils": "^0.4.3", + "@0xproject/web3-wrapper": "^0.3.1", "bintrees": "^1.0.2", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", "ethereumjs-blockstream": "^2.0.6", "ethereumjs-util": "^5.1.1", "ethers-contracts": "^2.2.1", - "ethers-typescript-typings": "^0.0.2", + "ethers-typescript-typings": "^0.0.4", "js-sha3": "^0.7.0", "lodash": "^4.17.4", "uuid": "^3.1.0", "web3": "^0.20.0", - "web3-typescript-typings": "^0.10.0" + "web3-typescript-typings": "^0.10.2" }, "publishConfig": { - "access": "public" + "access": "public" } } |