Merge branch 'development'

* development: (957 commits)
  fix(order_utils.py): publish docs to S3, not RTD (#1264)
  fix: make instant package private
  feat: refer to map file in postpublish configs
  feat: add new bundle name to bundle watch
  fix: tslint ignore rule in wrong place
  Update blog post feature
  Fix disclaimer on mobile
  Add smart contract docs to Developer Home
  Add Apache license link
  Fix capitalization in title
  Remove excess semi-colon
  Point directly to README for docs link
  Update icons
  Update LICENSE
  Fix disclaimer
  Add blogpost URL
  Add disclaimer
  Add launch kit to Developer home list of tools
  feat: Deploy contracts to Rinkeby
  fix: fix exceeds block gas limit error
  ...

2 files changed, 13 insertions, 7 deletions

diff --git a/packages/sol-doc/src/cli.ts b/packages/sol-doc/src/cli.ts
index a1847e868..6da132d56 100644
--- a/packages/sol-doc/src/cli.ts
+++ b/packages/sol-doc/src/cli.ts
@@ -1,7 +1,7 @@
 import 'source-map-support/register';
 import * as yargs from 'yargs';
 
-import { logUtils } from '@0xproject/utils';
+import { logUtils } from '@0x/utils';
 
 import { SolDoc } from './sol_doc';
 
diff --git a/packages/sol-doc/src/sol_doc.ts b/packages/sol-doc/src/sol_doc.ts
index 138882c92..e2cfb39e2 100644
--- a/packages/sol-doc/src/sol_doc.ts
+++ b/packages/sol-doc/src/sol_doc.ts
@@ -14,7 +14,7 @@ import {
 import ethUtil = require('ethereumjs-util');
 import * as _ from 'lodash';
 
-import { Compiler, CompilerOptions } from '@0xproject/sol-compiler';
+import { Compiler, CompilerOptions } from '@0x/sol-compiler';
 import {
     CustomType,
     CustomTypeChild,
@@ -27,7 +27,7 @@ import {
     SolidityMethod,
     Type,
     TypeDocTypes,
-} from '@0xproject/types';
+} from '@0x/types';
 
 export class SolDoc {
     private _customTypeHashToName: ObjectMap<string> | undefined;
@@ -324,19 +324,25 @@ export class SolDoc {
             switch (abiDefinition.type) {
                 case 'constructor':
                     docSection.constructors.push(
-                        this._genConstructorDoc(contractName, abiDefinition, compiledContract.devdoc),
+                        // tslint:disable-next-line:no-unnecessary-type-assertion
+                        this._genConstructorDoc(contractName, abiDefinition as ConstructorAbi, compiledContract.devdoc),
                     );
                     break;
                 case 'event':
-                    (docSection.events as Event[]).push(SolDoc._genEventDoc(abiDefinition));
+                    // tslint:disable-next-line:no-unnecessary-type-assertion
+                    (docSection.events as Event[]).push(SolDoc._genEventDoc(abiDefinition as EventAbi));
                     // note that we're not sending devdoc to this._genEventDoc().
                     // that's because the type of the events array doesn't have any fields for documentation!
                     break;
                 case 'function':
-                    docSection.methods.push(this._genMethodDoc(abiDefinition, compiledContract.devdoc));
+                    // tslint:disable-next-line:no-unnecessary-type-assertion
+                    docSection.methods.push(this._genMethodDoc(abiDefinition as MethodAbi, compiledContract.devdoc));
                     break;
                 case 'fallback':
-                    docSection.methods.push(SolDoc._genFallbackDoc(abiDefinition, compiledContract.devdoc));
+                    // tslint:disable-next-line:no-unnecessary-type-assertion
+                    docSection.methods.push(
+                        SolDoc._genFallbackDoc(abiDefinition as FallbackAbi, compiledContract.devdoc),
+                    );
                     break;
                 default:
                     throw new Error(