aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js
diff options
context:
space:
mode:
authorKadinsky <kandinsky454@protonmail.ch>2018-10-18 19:14:32 +0800
committerGitHub <noreply@github.com>2018-10-18 19:14:32 +0800
commit47dc384ea36fecbcf01eb9b3f20936331b43a0c6 (patch)
treee53a0c2d20b9f3271916144528f2214b32a3a83a /packages/0x.js
parentc333d093b585fa0250a6973f2d396eb3cf227334 (diff)
parente7c6f2a35795610645598deba2c14ceeda6acc89 (diff)
downloaddexon-0x-contracts-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.tar.gz
dexon-0x-contracts-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.tar.zst
dexon-0x-contracts-47dc384ea36fecbcf01eb9b3f20936331b43a0c6.zip
Merge pull request #1140 from 0xProject/reSkinReferenceDocs
Move Doc Reference Pages & Wiki into Developer Section of Website
Diffstat (limited to 'packages/0x.js')
-rw-r--r--packages/0x.js/CHANGELOG.json4
-rw-r--r--packages/0x.js/package.json2
-rw-r--r--packages/0x.js/src/index.ts1
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,