merge v2-prototype

6 files changed, 32 insertions, 18 deletions

diff --git a/packages/react-docs/CHANGELOG.json b/packages/react-docs/CHANGELOG.json
index 4db9b44ca..f4af828d7 100644
--- a/packages/react-docs/CHANGELOG.json
+++ b/packages/react-docs/CHANGELOG.json
@@ -1,9 +1,19 @@
 [
     {
+        "version": "0.0.17",
+        "changes": [
+            {
+                "note": "Nest MD files under versions so that you can update them for future versions",
+                "pr": 844
+            }
+        ]
+    },
+    {
+        "timestamp": 1531919263,
         "version": "0.0.16",
         "changes": [
             {
-                "note": "Nest MD files under versions so that you can update them for future versions"
+                "note": "Dependencies updated"
             }
         ]
     },
diff --git a/packages/react-docs/CHANGELOG.md b/packages/react-docs/CHANGELOG.md
index c438a535a..3215c9fb7 100644
--- a/packages/react-docs/CHANGELOG.md
+++ b/packages/react-docs/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v0.0.16 - _July 18, 2018_
+
+    * Dependencies updated
+
 ## v0.0.15 - _July 9, 2018_
 
     * Dependencies updated
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index db2eca1af..1ca0e0157 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@0xproject/react-docs",
-    "version": "0.0.15",
+    "version": "0.0.16",
     "engines": {
         "node": ">=6.12"
     },
@@ -25,7 +25,7 @@
         "url": "https://github.com/0xProject/0x-monorepo.git"
     },
     "devDependencies": {
-        "@0xproject/dev-utils": "^0.4.5",
+        "@0xproject/dev-utils": "^0.4.6",
         "@0xproject/monorepo-scripts": "^0.2.2",
         "@0xproject/tslint-config": "^0.4.21",
         "@types/compare-versions": "^3.0.0",
@@ -36,8 +36,8 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/react-shared": "^0.2.2",
-        "@0xproject/utils": "^0.7.2",
+        "@0xproject/react-shared": "^0.2.3",
+        "@0xproject/utils": "^0.7.3",
         "@types/lodash": "4.14.104",
         "@types/material-ui": "0.18.0",
         "@types/node": "^8.0.53",
diff --git a/packages/react-docs/src/docs_info.ts b/packages/react-docs/src/docs_info.ts
index 810674d51..b37942da6 100644
--- a/packages/react-docs/src/docs_info.ts
+++ b/packages/react-docs/src/docs_info.ts
@@ -28,7 +28,7 @@ export class DocsInfo {
     public sectionNameToMarkdownByVersion: SectionNameToMarkdownByVersion;
     public contractsByVersionByNetworkId?: ContractsByVersionByNetworkId;
     public typeConfigs: DocsInfoTypeConfigs;
-    private _docsInfo: DocsInfoConfig;
+    private readonly _docsInfo: DocsInfoConfig;
     constructor(config: DocsInfoConfig) {
         this.id = config.id;
         this.type = config.type;
diff --git a/packages/react-docs/src/utils/doxity_utils.ts b/packages/react-docs/src/utils/doxity_utils.ts
index 374ee07dd..6815daa0c 100644
--- a/packages/react-docs/src/utils/doxity_utils.ts
+++ b/packages/react-docs/src/utils/doxity_utils.ts
@@ -31,8 +31,8 @@ export const doxityUtils = {
                     comment: doxityConstructor.details,
                     returnComment: doxityConstructor.return,
                     callPath: '',
-                    parameters: this._convertParameters(doxityConstructor.inputs),
-                    returnType: this._convertType(doxityContractObj.name),
+                    parameters: doxityUtils._convertParameters(doxityConstructor.inputs),
+                    returnType: doxityUtils._convertType(doxityContractObj.name),
                 };
                 constructors.push(constructor);
             }
@@ -40,7 +40,7 @@ export const doxityUtils = {
             const doxityMethods: DoxityAbiDoc[] = _.filter<DoxityAbiDoc>(
                 doxityContractObj.abiDocs,
                 (abiDoc: DoxityAbiDoc) => {
-                    return this._isMethod(abiDoc);
+                    return doxityUtils._isMethod(abiDoc);
                 },
             );
             const methods: SolidityMethod[] = _.map<DoxityAbiDoc, SolidityMethod>(
@@ -52,10 +52,10 @@ export const doxityUtils = {
                         // no-op. It's already undefined
                     } else if (outputs.length === 1) {
                         const outputsType = outputs[0].type;
-                        returnTypeIfExists = this._convertType(outputsType);
+                        returnTypeIfExists = doxityUtils._convertType(outputsType);
                     } else {
                         const outputsType = `[${_.map(outputs, output => output.type).join(', ')}]`;
-                        returnTypeIfExists = this._convertType(outputsType);
+                        returnTypeIfExists = doxityUtils._convertType(outputsType);
                     }
                     // For ZRXToken, we want to convert it to zrxToken, rather then simply zRXToken
                     const callPath =
@@ -70,7 +70,7 @@ export const doxityUtils = {
                         comment: doxityMethod.details,
                         returnComment: doxityMethod.return,
                         callPath,
-                        parameters: this._convertParameters(doxityMethod.inputs),
+                        parameters: doxityUtils._convertParameters(doxityMethod.inputs),
                         returnType: returnTypeIfExists,
                     };
                     return method;
@@ -80,7 +80,7 @@ export const doxityUtils = {
             const doxityProperties: DoxityAbiDoc[] = _.filter<DoxityAbiDoc>(
                 doxityContractObj.abiDocs,
                 (abiDoc: DoxityAbiDoc) => {
-                    return this._isProperty(abiDoc);
+                    return doxityUtils._isProperty(abiDoc);
                 },
             );
             const properties = _.map<DoxityAbiDoc, Property>(doxityProperties, (doxityProperty: DoxityAbiDoc) => {
@@ -92,7 +92,7 @@ export const doxityUtils = {
                 }
                 const property = {
                     name: doxityProperty.name,
-                    type: this._convertType(typeName),
+                    type: doxityUtils._convertType(typeName),
                     comment: doxityProperty.details,
                 };
                 return property;
@@ -105,7 +105,7 @@ export const doxityUtils = {
             const events = _.map(doxityEvents, doxityEvent => {
                 const event = {
                     name: doxityEvent.name,
-                    eventArgs: this._convertEventArgs(doxityEvent.inputs),
+                    eventArgs: doxityUtils._convertEventArgs(doxityEvent.inputs),
                 };
                 return event;
             });
@@ -129,7 +129,7 @@ export const doxityUtils = {
                 name: input.name,
                 comment: input.description,
                 isOptional: false,
-                type: this._convertType(input.type),
+                type: doxityUtils._convertType(input.type),
             };
             return parameter;
         });
@@ -167,7 +167,7 @@ export const doxityUtils = {
             const eventArg = {
                 isIndexed: input.indexed,
                 name: input.name,
-                type: this._convertType(input.type),
+                type: doxityUtils._convertType(input.type),
             };
             return eventArg;
         });
diff --git a/packages/react-docs/src/utils/typedoc_utils.ts b/packages/react-docs/src/utils/typedoc_utils.ts
index 5633d9040..a6d938e94 100644
--- a/packages/react-docs/src/utils/typedoc_utils.ts
+++ b/packages/react-docs/src/utils/typedoc_utils.ts
@@ -235,7 +235,7 @@ export const typeDocUtils = {
                       childTypeIfExists = {
                           name: child.name,
                           typeDocType: TypeDocTypes.Reflection,
-                          method: this._convertMethod(child, isConstructor, sections, sectionName, docId),
+                          method: typeDocUtils._convertMethod(child, isConstructor, sections, sectionName, docId),
                       };
                   }
                   const c: CustomTypeChild = {