Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/discharge

7 files changed, 25 insertions, 12 deletions

diff --git a/packages/sol-doc/CHANGELOG.json b/packages/sol-doc/CHANGELOG.json
index c0b094ba0..e117ff291 100644
--- a/packages/sol-doc/CHANGELOG.json
+++ b/packages/sol-doc/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1539871071,
+        "version": "1.0.3",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "1.0.2",
         "changes": [
             {
diff --git a/packages/sol-doc/CHANGELOG.md b/packages/sol-doc/CHANGELOG.md
index 437c2e7be..9adc02b19 100644
--- a/packages/sol-doc/CHANGELOG.md
+++ b/packages/sol-doc/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.3 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v1.0.2 - _October 4, 2018_
 
     * Dependencies updated
diff --git a/packages/sol-doc/package.json b/packages/sol-doc/package.json
index b9fe9f56d..de10b9e17 100644
--- a/packages/sol-doc/package.json
+++ b/packages/sol-doc/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/sol-doc",
-    "version": "1.0.2",
+    "name": "@0x/sol-doc",
+    "version": "1.0.3",
     "description": "Solidity documentation generator",
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.js",
@@ -25,16 +25,16 @@
     "author": "F. Eugene Aumson",
     "license": "Apache-2.0",
     "dependencies": {
-        "@0xproject/sol-compiler": "^1.1.7",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/utils": "^2.0.2",
-        "ethereum-types": "^1.0.11",
+        "@0x/sol-compiler": "^1.1.8",
+        "@0x/types": "^1.2.0",
+        "@0x/utils": "^2.0.3",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-util": "^5.1.1",
         "lodash": "^4.17.10",
         "yargs": "^12.0.2"
     },
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "chai": "^4.1.2",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.2",
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 686e9ca34..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;
diff --git a/packages/sol-doc/test/solidity_doc_generator_test.ts b/packages/sol-doc/test/solidity_doc_generator_test.ts
index f166fb143..a49f29d02 100644
--- a/packages/sol-doc/test/solidity_doc_generator_test.ts
+++ b/packages/sol-doc/test/solidity_doc_generator_test.ts
@@ -3,7 +3,7 @@ import * as _ from 'lodash';
 import * as chai from 'chai';
 import 'mocha';
 
-import { DocAgnosticFormat, Event, SolidityMethod } from '@0xproject/types';
+import { DocAgnosticFormat, Event, SolidityMethod } from '@0x/types';
 
 import { SolDoc } from '../src/sol_doc';
 
diff --git a/packages/sol-doc/tslint.json b/packages/sol-doc/tslint.json
index ffaefe83a..dd9053357 100644
--- a/packages/sol-doc/tslint.json
+++ b/packages/sol-doc/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }