Merge remote-tracking branch 'origin/development' into feature/utils/prettybignum

7 files changed, 149 insertions, 29 deletions

diff --git a/packages/sol-resolver/CHANGELOG.json b/packages/sol-resolver/CHANGELOG.json
index 42d4c7ed1..a72ca6d63 100644
--- a/packages/sol-resolver/CHANGELOG.json
+++ b/packages/sol-resolver/CHANGELOG.json
@@ -1,5 +1,95 @@
 [
     {
+        "timestamp": 1539871071,
+        "version": "1.0.15",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1538693146,
+        "version": "1.0.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1538475601,
+        "version": "1.0.13",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1538157789,
+        "version": "1.0.12",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "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": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1535377027,
+        "version": "1.0.7",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
+        "timestamp": 1535133899,
+        "version": "1.0.6",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ]
+    },
+    {
         "version": "1.0.5",
         "changes": [
             {
diff --git a/packages/sol-resolver/CHANGELOG.md b/packages/sol-resolver/CHANGELOG.md
index 1427ec3fe..671d3ea84 100644
--- a/packages/sol-resolver/CHANGELOG.md
+++ b/packages/sol-resolver/CHANGELOG.md
@@ -5,7 +5,47 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.5 - _August 13, 2018_
+## v1.0.15 - _October 18, 2018_
+
+    * Dependencies updated
+
+## v1.0.14 - _October 4, 2018_
+
+    * Dependencies updated
+
+## v1.0.13 - _October 2, 2018_
+
+    * Dependencies updated
+
+## v1.0.12 - _September 28, 2018_
+
+    * Dependencies updated
+
+## 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
+
+## v1.0.7 - _August 27, 2018_
+
+    * Dependencies updated
+
+## v1.0.6 - _August 24, 2018_
+
+    * Dependencies updated
+
+## 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 85d11e9e7..4d4d0be0e 100644
--- a/packages/sol-resolver/package.json
+++ b/packages/sol-resolver/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/sol-resolver",
-    "version": "1.0.5",
+    "name": "@0x/sol-resolver",
+    "version": "1.0.15",
     "engines": {
         "node": ">=6.12"
     },
@@ -8,11 +8,10 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "watch_without_deps": "tsc -w",
-        "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
-        "clean": "shx rm -rf lib scripts",
-        "lint": "tslint --project .",
-        "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
+        "build": "tsc -b",
+        "build:ci": "yarn build",
+        "clean": "shx rm -rf lib",
+        "lint": "tslint --format stylish --project ."
     },
     "repository": {
         "type": "git",
@@ -24,17 +23,15 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/resolver/README.md",
     "devDependencies": {
-        "@0xproject/monorepo-scripts": "^1.0.5",
-        "@0xproject/tslint-config": "^1.0.5",
-        "copyfiles": "^2.0.0",
+        "@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.0.1-rc.4",
-        "@0xproject/typescript-typings": "^1.0.4",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
         "lodash": "^4.17.5"
     },
     "publishConfig": {
diff --git a/packages/sol-resolver/src/monorepo_scripts/postpublish.ts b/packages/sol-resolver/src/monorepo_scripts/postpublish.ts
deleted file mode 100644
index dcb99d0f7..000000000
--- a/packages/sol-resolver/src/monorepo_scripts/postpublish.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);
diff --git a/packages/sol-resolver/tsconfig.json b/packages/sol-resolver/tsconfig.json
index f5f4b37c2..56689eaa3 100644
--- a/packages/sol-resolver/tsconfig.json
+++ b/packages/sol-resolver/tsconfig.json
@@ -1,7 +1,8 @@
 {
     "extends": "../../tsconfig",
     "compilerOptions": {
-        "outDir": "lib"
+        "outDir": "lib",
+        "rootDir": "src"
     },
     "include": ["src/**/*"]
 }
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"]
 }