diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-03-04 23:33:58 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-03-04 23:33:58 +0800 |
| commit | 9ac1cce26fcf17d161b7d67b3240728d623a1085 (patch) | |
| tree | b00482542d91e1374f1a470314afc26957d2f35b /packages/utils | |
| parent | 02f82be094dbaf92a1ae6752b9f05dbf6188cf86 (diff) | |
| parent | 0a597c94d6359c34dc0ab2d3cc4e1dfecaecf18a (diff) | |
| download | dexon-sol-tools-9ac1cce26fcf17d161b7d67b3240728d623a1085.tar dexon-sol-tools-9ac1cce26fcf17d161b7d67b3240728d623a1085.tar.gz dexon-sol-tools-9ac1cce26fcf17d161b7d67b3240728d623a1085.tar.bz2 dexon-sol-tools-9ac1cce26fcf17d161b7d67b3240728d623a1085.tar.lz dexon-sol-tools-9ac1cce26fcf17d161b7d67b3240728d623a1085.tar.xz dexon-sol-tools-9ac1cce26fcf17d161b7d67b3240728d623a1085.tar.zst dexon-sol-tools-9ac1cce26fcf17d161b7d67b3240728d623a1085.zip | |
Merge branch 'development' into improveLedgerSubprovider
* development: (28 commits)
Remove unnecessary type assertion
Fix comments
Add comments
Don't need any external packages for 0x connect docs yet
Instead of adding `@0xproject/types` to tsconfig.json, let's only add it when calling TypeDoc
Fix styling
Make prettier ignore postpublish_utils
Add hack comment
Add comment about typeDoc versions
Add support for merging multiple topLevel packages under a single section. For now, we simply merge the two package's children (works well for merging 0x.js types and @0xproject/types)
Because we now include non-0x.js source, the keys changed. Needed to add both for backward compatibility with old doc JSON's
Add support for backward compatibility for TypeDoc versions <0.9.0
Consolidate all same exports together
Add @0xproject/types to 0x.js tsconfig `include` so that TypeDoc also includes these types in the generated doc JSON
Fix small bug where onHover type declarations with comments was taking up the entire window width
Update to custom typeDoc fork with latest version (TS 2.7.0 support) + a bug fix allowing us to defer to the `include` in tsconfig.json on which files to run through TypeDoc
Move web3 typings from devDeps to deps
remove extrenuous comma
Add PR number
Add changelog entries from types and utils
...
# Conflicts:
# packages/subproviders/CHANGELOG.md
Diffstat (limited to 'packages/utils')
| -rw-r--r-- | packages/utils/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | packages/utils/package.json | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 81792bee8..b19656ed7 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -3,6 +3,7 @@ ## v0.4.0 - _TBD, 2018_ * Use `ethers-contracts` as a backend to decode event args (#413) + * Move web3 types from devDep to dep since required when using this package (#429) ## v0.3.2 - _February 9, 2018_ diff --git a/packages/utils/package.json b/packages/utils/package.json index 8b6dbc825..33890f15b 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -25,16 +25,16 @@ "npm-run-all": "^4.1.2", "shx": "^0.2.2", "tslint": "5.8.0", - "typescript": "2.7.1", - "ethers-typescript-typings": "^0.0.1", - "web3-typescript-typings": "^0.9.11" + "typescript": "2.7.1" }, "dependencies": { "@0xproject/types": "^0.2.3", "bignumber.js": "~4.1.0", "ethers-contracts": "^2.2.1", + "ethers-typescript-typings": "^0.0.1", "js-sha3": "^0.7.0", "lodash": "^4.17.4", - "web3": "^0.20.0" + "web3": "^0.20.0", + "web3-typescript-typings": "^0.9.11" } } |