diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-10-18 18:35:07 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-10-18 18:35:07 +0800 |
| commit | cdd650d0eb83153a992922c6ffff35b494f299d3 (patch) | |
| tree | fc12135e69ae74403a26408d2d7625e8a3fe334e /packages/0x.js | |
| parent | c333d093b585fa0250a6973f2d396eb3cf227334 (diff) | |
| parent | bd8ba14bf46cb901e14f0ee718ac01cdbc833e86 (diff) | |
| download | dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.gz dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.bz2 dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.lz dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.xz dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.tar.zst dexon-sol-tools-cdd650d0eb83153a992922c6ffff35b494f299d3.zip | |
merge development
Diffstat (limited to 'packages/0x.js')
| -rw-r--r-- | packages/0x.js/CHANGELOG.json | 4 | ||||
| -rw-r--r-- | packages/0x.js/package.json | 2 | ||||
| -rw-r--r-- | packages/0x.js/src/index.ts | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json index 4efd8f035..98791139f 100644 --- a/packages/0x.js/CHANGELOG.json +++ b/packages/0x.js/CHANGELOG.json @@ -24,6 +24,10 @@ { "note": "Make web3-provider-engine types a 'dependency' so it's available to users of the library", "pr": 1105 + }, + { + "note": "Export new `AssetData` type from types", + "pr": 1131 } ] }, diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json index a78457e22..c439c8af3 100644 --- a/packages/0x.js/package.json +++ b/packages/0x.js/package.json @@ -68,7 +68,7 @@ "sinon": "^4.0.0", "source-map-support": "^0.5.0", "tslint": "5.11.0", - "typedoc": "0.12.0", + "typedoc": "0.13.0", "typescript": "3.0.1", "uglifyjs-webpack-plugin": "^2.0.1", "webpack": "^4.20.2" diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts index 7fd48da37..2fcfb5ce7 100644 --- a/packages/0x.js/src/index.ts +++ b/packages/0x.js/src/index.ts @@ -79,6 +79,7 @@ export { OrderStateInvalid, OrderState, AssetProxyId, + AssetData, ERC20AssetData, ERC721AssetData, SignatureType, |