Merge branch 'development' into dev-tools-pages

10 files changed, 51 insertions, 24 deletions

diff --git a/packages/dev-utils/CHANGELOG.json b/packages/dev-utils/CHANGELOG.json
index d412d0afe..269cdc934 100644
--- a/packages/dev-utils/CHANGELOG.json
+++ b/packages/dev-utils/CHANGELOG.json
@@ -1,5 +1,24 @@
 [
     {
+        "version": "1.0.14",
+        "changes": [
+            {
+                "note": "Dependencies updated"
+            }
+        ],
+        "timestamp": 1541740904
+    },
+    {
+        "version": "1.0.13",
+        "changes": [
+            {
+                "note": "Make web3-provider-engine types a 'dependency' so it's available to users of the library",
+                "pr": 1105
+            }
+        ],
+        "timestamp": 1539871071
+    },
+    {
         "version": "1.0.12",
         "changes": [
             {
diff --git a/packages/dev-utils/CHANGELOG.md b/packages/dev-utils/CHANGELOG.md
index 00301d9c9..ee614a904 100644
--- a/packages/dev-utils/CHANGELOG.md
+++ b/packages/dev-utils/CHANGELOG.md
@@ -5,6 +5,14 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
+## v1.0.14 - _November 9, 2018_
+
+    * Dependencies updated
+
+## v1.0.13 - _October 18, 2018_
+
+    * Make web3-provider-engine types a 'dependency' so it's available to users of the library (#1105)
+
 ## v1.0.12 - _October 4, 2018_
 
     * Dependencies updated
@@ -37,7 +45,7 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.4 - _August 13, 2018_
+## v1.0.4 - _August 14, 2018_
 
     * Dependencies updated
 
diff --git a/packages/dev-utils/README.md b/packages/dev-utils/README.md
index 1c3bd3a3f..73b0b8816 100644
--- a/packages/dev-utils/README.md
+++ b/packages/dev-utils/README.md
@@ -16,14 +16,14 @@ Boolean env variables should be either `true` or `false`. Defaults to `false` if
 ## Install
 
 ```bash
-yarn add @0xproject/dev-utils
+yarn add @0x/dev-utils
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
 
 ```json
 "compilerOptions": {
-    "typeRoots": ["node_modules/@0xproject/typescript-typings/types", "node_modules/@types"],
+    "typeRoots": ["node_modules/@0x/typescript-typings/types", "node_modules/@types"],
 }
 ```
 
@@ -52,13 +52,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/dev-utils yarn build
+PKG=@0x/dev-utils yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0xproject/dev-utils yarn watch
+PKG=@0x/dev-utils yarn watch
 ```
 
 ### Clean
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index c4298c2d2..e1b3201d3 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/dev-utils",
-    "version": "1.0.12",
+    "name": "@0x/dev-utils",
+    "version": "1.0.14",
     "engines": {
         "node": ">=6.12"
     },
@@ -17,7 +17,7 @@
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
         "clean": "shx rm -rf lib",
-        "lint": "tslint --project ."
+        "lint": "tslint --format stylish --project ."
     },
     "license": "Apache-2.0",
     "repository": {
@@ -29,11 +29,9 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/dev-utils/README.md",
     "devDependencies": {
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/tslint-config": "^1.0.10",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
-        "chai": "^4.0.1",
-        "copyfiles": "^2.0.0",
         "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
@@ -43,12 +41,14 @@
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/subproviders": "^2.0.7",
-        "@0xproject/types": "^1.1.4",
-        "@0xproject/typescript-typings": "^3.0.2",
-        "@0xproject/utils": "^2.0.2",
-        "@0xproject/web3-wrapper": "^3.0.3",
-        "ethereum-types": "^1.0.11",
+        "@0x/subproviders": "^2.1.1",
+        "@0x/types": "^1.2.1",
+        "@0x/typescript-typings": "^3.0.4",
+        "@0x/utils": "^2.0.4",
+        "@0x/web3-wrapper": "^3.1.1",
+        "@types/web3-provider-engine": "^14.0.0",
+        "chai": "^4.0.1",
+        "ethereum-types": "^1.1.2",
         "lodash": "^4.17.5"
     },
     "publishConfig": {
diff --git a/packages/dev-utils/src/blockchain_lifecycle.ts b/packages/dev-utils/src/blockchain_lifecycle.ts
index a48cb0856..e9687787f 100644
--- a/packages/dev-utils/src/blockchain_lifecycle.ts
+++ b/packages/dev-utils/src/blockchain_lifecycle.ts
@@ -1,5 +1,5 @@
-import { logUtils } from '@0xproject/utils';
-import { NodeType, Web3Wrapper } from '@0xproject/web3-wrapper';
+import { logUtils } from '@0x/utils';
+import { NodeType, Web3Wrapper } from '@0x/web3-wrapper';
 import * as _ from 'lodash';
 
 // HACK(albrow): 🐉 We have to do this so that debug.setHead works correctly.
diff --git a/packages/dev-utils/src/callback_error_reporter.ts b/packages/dev-utils/src/callback_error_reporter.ts
index e69ce1c05..b993bf22a 100644
--- a/packages/dev-utils/src/callback_error_reporter.ts
+++ b/packages/dev-utils/src/callback_error_reporter.ts
@@ -1,7 +1,7 @@
 import * as chai from 'chai';
 import * as _ from 'lodash';
 
-import { DoneCallback } from '@0xproject/types';
+import { DoneCallback } from '@0x/types';
 
 const expect = chai.expect;
 
diff --git a/packages/dev-utils/src/web3_factory.ts b/packages/dev-utils/src/web3_factory.ts
index 7c86d3df4..b22bcc88b 100644
--- a/packages/dev-utils/src/web3_factory.ts
+++ b/packages/dev-utils/src/web3_factory.ts
@@ -4,7 +4,7 @@ import {
     GanacheSubprovider,
     RPCSubprovider,
     Web3ProviderEngine,
-} from '@0xproject/subproviders';
+} from '@0x/subproviders';
 import * as fs from 'fs';
 import * as _ from 'lodash';
 
diff --git a/packages/dev-utils/test/blockchain_lifecycle_test.ts b/packages/dev-utils/test/blockchain_lifecycle_test.ts
index 7d5e15fbe..d7e54f0e8 100644
--- a/packages/dev-utils/test/blockchain_lifecycle_test.ts
+++ b/packages/dev-utils/test/blockchain_lifecycle_test.ts
@@ -1,4 +1,4 @@
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as chai from 'chai';
 import 'mocha';
 
diff --git a/packages/dev-utils/test/rpc_test.ts b/packages/dev-utils/test/rpc_test.ts
index dfbc0f7b2..f8cea4580 100644
--- a/packages/dev-utils/test/rpc_test.ts
+++ b/packages/dev-utils/test/rpc_test.ts
@@ -1,4 +1,4 @@
-import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { Web3Wrapper } from '@0x/web3-wrapper';
 import * as chai from 'chai';
 import { BlockParamLiteral } from 'ethereum-types';
 import 'mocha';
diff --git a/packages/dev-utils/tslint.json b/packages/dev-utils/tslint.json
index 015dce851..631f46bca 100644
--- a/packages/dev-utils/tslint.json
+++ b/packages/dev-utils/tslint.json
@@ -1,5 +1,5 @@
 {
-    "extends": ["@0xproject/tslint-config"],
+    "extends": ["@0x/tslint-config"],
     "rules": {
         "completed-docs": false
     }