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

5 files changed, 26 insertions, 13 deletions

diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json
index f09870cac..a72ca6d63 100644
--- a/packages/sol-resolver/CHANGELOG.json
+++ b/packages/sol-resolver/CHANGELOG.json
@@ -1,5 +1,14 @@
 [
     {
+        "timestamp": 1539871071,
+        "version": "1.0.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "timestamp": 1538693146,
         "version": "1.0.14",
         "changes": [
diff --git a/packages/sol-resolver/CHANGELOG.md b/packages/sol-resolver/CHANGELOG.md
index ef9033dde..671d3ea84 100644
--- a/packages/sol-resolver/CHANGELOG.md
+++ b/packages/sol-resolver/CHANGELOG.md
@@ -5,6 +5,10 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.15 - _October 18, 2018_
+
+    * Dependencies updated
+
 ## v1.0.14 - _October 4, 2018_
 
     * Dependencies updated
@@ -41,7 +45,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.5 - _August 14, 2018_
 
     * Fix a bug where RelativeFSResolver would crash when trying to read a directory (#909)
     * Fix a bug where NpmResolver would crash when trying to read a directory (#961)
diff --git a/packages/sol-resolver/README.md b/packages/sol-resolver/README.md
index 8487947f0..2ab336bc9 100644
--- a/packages/sol-resolver/README.md
+++ b/packages/sol-resolver/README.md
@@ -1,23 +1,23 @@
-## @0xproject/sol-resolver
+## @0x/sol-resolver
 
 A Solidity import resolver used by [sol-compiler](https://github.com/0xProject/0x-monorepo/tree/development/packages/sol-compiler).
 
 ## Installation
 
 ```bash
-yarn add @0xproject/sol-resolver
+yarn add @0x/sol-resolver
 ```
 
 **Import**
 
 ```javascript
-import { Resolver } from '@0xproject/sol-resolver';
+import { Resolver } from '@0x/sol-resolver';
 ```
 
 or
 
 ```javascript
-var Resolver = require('@0xproject/sol-resolver').Resolver;
+var Resolver = require('@0x/sol-resolver').Resolver;
 ```
 
 ## Contributing
@@ -45,13 +45,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0xproject/sol-resolver yarn build
+PKG=@0x/sol-resolver yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/sol-resolver yarn watch
+PKG=@0x/sol-resolver yarn watch
 ```
 
 ### Clean
diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json
index 2c86d556a..4bd63f406 100644
--- a/packages/sol-resolver/package.json
+++ b/packages/sol-resolver/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/sol-resolver",
-    "version": "1.0.14",
+    "name": "@0x/sol-resolver",
+    "version": "1.0.15",
     "engines": {
         "node": ">=6.12"
     },
@@ -23,15 +23,15 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md",
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.9",
         "make-promises-safe": "^1.1.0",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
         "lodash": "^4.17.5"
     },
     "publishConfig": {
diff --git a/packages/sol-resolver/tslint.json b/packages/sol-resolver/tslint.json
index ffaefe83a..dd9053357 100644
--- a/packages/sol-resolver/tslint.json
+++ b/packages/sol-resolver/tslint.json
@@ -1,3 +1,3 @@
 {
-    "extends": ["@0xproject/tslint-config"]
+    "extends": ["@0x/tslint-config"]
 }