aboutsummaryrefslogtreecommitdiffstats
path: root/packages/react-docs
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-09-26 20:55:52 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-09-26 20:55:52 +0800
commit5d73eebf6abe52763ea6984f85102157abea5b6c (patch)
tree8cec1c58fe22ba62d979dbc1c6ff366e81985b8d /packages/react-docs
parentf3deabccf4e6caec57351a09f82b3f786122b5ea (diff)
parent13aa98f0f3431e4ea4db07794a06304c237e8d45 (diff)
downloaddexon-sol-tools-5d73eebf6abe52763ea6984f85102157abea5b6c.tar
dexon-sol-tools-5d73eebf6abe52763ea6984f85102157abea5b6c.tar.gz
dexon-sol-tools-5d73eebf6abe52763ea6984f85102157abea5b6c.tar.bz2
dexon-sol-tools-5d73eebf6abe52763ea6984f85102157abea5b6c.tar.lz
dexon-sol-tools-5d73eebf6abe52763ea6984f85102157abea5b6c.tar.xz
dexon-sol-tools-5d73eebf6abe52763ea6984f85102157abea5b6c.tar.zst
dexon-sol-tools-5d73eebf6abe52763ea6984f85102157abea5b6c.zip
Merge branch 'development' into feature/ts-ethers
Diffstat (limited to 'packages/react-docs')
-rw-r--r--packages/react-docs/CHANGELOG.json27
-rw-r--r--packages/react-docs/CHANGELOG.md12
-rw-r--r--packages/react-docs/package.json10
-rw-r--r--packages/react-docs/src/components/signature.tsx21
-rw-r--r--packages/react-docs/src/types.ts2
-rw-r--r--packages/react-docs/src/utils/typedoc_utils.ts5
6 files changed, 62 insertions, 15 deletions
diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index d1e846bb1..82aaf4e32 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,5 +1,32 @@
[
{
+ "timestamp": 1537907159,
+ "version": "1.0.11",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
+ "timestamp": 1537875740,
+ "version": "1.0.10",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
+ "timestamp": 1537541580,
+ "version": "1.0.9",
+ "changes": [
+ {
+ "note": "Dependencies updated"
+ }
+ ]
+ },
+ {
"timestamp": 1536142250,
"version": "1.0.8",
"changes": [
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index 679f00097..8f5cc0cfd 100644
--- a/packages/react-docs/CHANGELOG.md
+++ b/packages/react-docs/CHANGELOG.md
@@ -5,6 +5,18 @@ Edit the package's CHANGELOG.json file only.
CHANGELOG
+## v1.0.11 - _September 25, 2018_
+
+ * Dependencies updated
+
+## v1.0.10 - _September 25, 2018_
+
+ * Dependencies updated
+
+## v1.0.9 - _September 21, 2018_
+
+ * Dependencies updated
+
## v1.0.8 - _September 5, 2018_
* Dependencies updated
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 345522074..be80f8028 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
{
"name": "@0xproject/react-docs",
- "version": "1.0.8",
+ "version": "1.0.11",
"engines": {
"node": ">=6.12"
},
@@ -23,7 +23,7 @@
"url": "https://github.com/0xProject/0x-monorepo.git"
},
"devDependencies": {
- "@0xproject/dev-utils": "^1.0.7",
+ "@0xproject/dev-utils": "^1.0.10",
"@0xproject/tslint-config": "^1.0.7",
"@types/compare-versions": "^3.0.0",
"copyfiles": "^2.0.0",
@@ -33,11 +33,11 @@
"typescript": "3.0.1"
},
"dependencies": {
- "@0xproject/react-shared": "^1.0.9",
- "@0xproject/utils": "^1.0.8",
+ "@0xproject/react-shared": "^1.0.12",
+ "@0xproject/utils": "^1.0.11",
"@types/lodash": "4.14.104",
"@types/material-ui": "^0.20.0",
- "@types/node": "^8.0.53",
+ "@types/node": "*",
"@types/react": "*",
"@types/react-dom": "*",
"@types/react-scroll": "1.5.3",
diff --git a/packages/react-docs/src/components/signature.tsx b/packages/react-docs/src/components/signature.tsx
index bf9c8be24..4f10f4665 100644
--- a/packages/react-docs/src/components/signature.tsx
+++ b/packages/react-docs/src/components/signature.tsx
@@ -134,14 +134,19 @@ function renderTypeParameter(
): React.ReactNode {
const typeParam = (
<span>
- {`<${typeParameter.name} extends `}
- <Type
- type={typeParameter.type}
- sectionName={sectionName}
- typeDefinitionByName={typeDefinitionByName}
- docsInfo={docsInfo}
- isInPopover={isInPopover}
- />
+ {`<${typeParameter.name}`}
+ {!_.isUndefined(typeParameter.type) && (
+ <span>
+ {' extends '}
+ <Type
+ type={typeParameter.type}
+ sectionName={sectionName}
+ typeDefinitionByName={typeDefinitionByName}
+ docsInfo={docsInfo}
+ isInPopover={isInPopover}
+ />
+ </span>
+ )}
{`>`}
</span>
);
diff --git a/packages/react-docs/src/types.ts b/packages/react-docs/src/types.ts
index f9cb5e26a..29f5664f5 100644
--- a/packages/react-docs/src/types.ts
+++ b/packages/react-docs/src/types.ts
@@ -150,7 +150,7 @@ export interface Parameter {
export interface TypeParameter {
name: string;
- type: Type;
+ type?: Type;
}
export interface Type {
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index f44945369..e3e9c11fb 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -419,7 +419,10 @@ export class TypeDocUtils {
return func;
}
private _convertTypeParameter(entity: TypeDocNode, sectionName: string): TypeParameter {
- const type = this._convertType(entity.type, sectionName);
+ let type;
+ if (!_.isUndefined(entity.type)) {
+ type = this._convertType(entity.type, sectionName);
+ }
const parameter = {
name: entity.name,
type,