aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2018-03-05 13:20:15 +0800
committerFabio Berger <me@fabioberger.com>2018-03-05 13:20:15 +0800
commit1817f6eaf63a5fa4302ad9ef41ad13b1555a8733 (patch)
tree1cfcfb9ba09a16890d982a61b0e7159ba97face8 /packages/website
parentdf4db8fa4c19d2ef0a311d201061ba732ce0eb97 (diff)
parent699c0c3e05d3a882c8a59fec4f035ec25cb43c9e (diff)
downloaddexon-sol-tools-1817f6eaf63a5fa4302ad9ef41ad13b1555a8733.tar
dexon-sol-tools-1817f6eaf63a5fa4302ad9ef41ad13b1555a8733.tar.gz
dexon-sol-tools-1817f6eaf63a5fa4302ad9ef41ad13b1555a8733.tar.bz2
dexon-sol-tools-1817f6eaf63a5fa4302ad9ef41ad13b1555a8733.tar.lz
dexon-sol-tools-1817f6eaf63a5fa4302ad9ef41ad13b1555a8733.tar.xz
dexon-sol-tools-1817f6eaf63a5fa4302ad9ef41ad13b1555a8733.tar.zst
dexon-sol-tools-1817f6eaf63a5fa4302ad9ef41ad13b1555a8733.zip
Merge branch 'development' into extractDocs
* development: (22 commits) Fix bugs in postpublish_utils.js Update @0xproject/utils in top-level package.json Changelog tweaks Publish Updated CHANGELOGS Fix typo Add PR number to changelog entry Add changelog update to subproviders package Add `numberOfAccounts` param to `LedgerSubprovider` method `getAccountsAsync` and add tests Remove unnecessary type assertion Move web3 typings from devDeps to deps remove extrenuous comma Add PR number Add changelog entries from types and utils Add changelog entry to subproviders Remove extra comma Move web3 and ethers types to deps for utils package Make web3 typings a dep for web3Wrapper Make web3 typings a dep for subproviders reorder deps ... # Conflicts: # packages/website/package.json
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/package.json12
-rw-r--r--packages/website/ts/utils/typedoc_utils.ts2
2 files changed, 7 insertions, 7 deletions
diff --git a/packages/website/package.json b/packages/website/package.json
index da08ea032..e6790abbc 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/website",
- "version": "0.0.16",
+ "version": "0.0.17",
"private": true,
"description": "Website and 0x portal dapp",
"scripts": {
@@ -18,10 +18,10 @@
"author": "Fabio Berger",
"license": "Apache-2.0",
"dependencies": {
- "0x.js": "^0.32.4",
- "@0xproject/subproviders": "^0.5.0",
"@0xproject/react-shared": "^0.0.1",
- "@0xproject/utils": "^0.3.4",
+ "@0xproject/subproviders": "^0.6.0",
+ "@0xproject/utils": "^0.4.0",
+ "0x.js": "^0.33.0",
"accounting": "^0.4.1",
"basscss": "^8.0.3",
"blockies": "^0.0.2",
@@ -88,7 +88,7 @@
"copy-webpack-plugin": "^4.0.1",
"copyfiles": "^1.2.0",
"css-loader": "0.23.x",
- "ethers-typescript-typings": "^0.0.1",
+ "ethers-typescript-typings": "^0.0.2",
"exports-loader": "0.6.x",
"imports-loader": "0.6.x",
"json-loader": "^0.5.4",
@@ -100,7 +100,7 @@
"tslint": "5.8.0",
"tslint-config-0xproject": "^0.0.2",
"typescript": "2.7.1",
- "web3-typescript-typings": "^0.9.11",
+ "web3-typescript-typings": "^0.10.0",
"webpack": "^3.1.0",
"webpack-dev-middleware": "^1.10.0",
"webpack-dev-server": "^2.5.0"
diff --git a/packages/website/ts/utils/typedoc_utils.ts b/packages/website/ts/utils/typedoc_utils.ts
index eb4b05e04..ce7df4dbb 100644
--- a/packages/website/ts/utils/typedoc_utils.ts
+++ b/packages/website/ts/utils/typedoc_utils.ts
@@ -186,7 +186,7 @@ export const typeDocUtils = {
// Versions >0.9.0 have it as type TypeDocNode
const indexSignature =
doesIndexSignatureExist && isIndexSignatureArray
- ? ((entity.indexSignature as TypeDocNode[])[0] as TypeDocNode)
+ ? (entity.indexSignature as TypeDocNode[])[0]
: (entity.indexSignature as TypeDocNode);
const indexSignatureIfExists = doesIndexSignatureExist
? typeDocUtils._convertIndexSignature(indexSignature, sections, sectionName, docId)