Merge branch 'development' of https://github.com/0xProject/0x-monorepo into website/feature/react-16

3 files changed, 27 insertions, 23 deletions

diff --git a/packages/0x.js/CHANGELOG.json b/packages/0x.js/CHANGELOG.json
index 0f5a10e43..346938958 100644
--- a/packages/0x.js/CHANGELOG.json
+++ b/packages/0x.js/CHANGELOG.json
@@ -7,7 +7,8 @@
                     "Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher`",
                 "pr": 963
             }
-        ]
+        ],
+        "timestamp": 1535133899
     },
     {
         "version": "1.0.1-rc.3",
diff --git a/packages/0x.js/CHANGELOG.md b/packages/0x.js/CHANGELOG.md
index adeaed9eb..e94907353 100644
--- a/packages/0x.js/CHANGELOG.md
+++ b/packages/0x.js/CHANGELOG.md
@@ -5,7 +5,11 @@ Edit the package's CHANGELOG.json file only.
 
 CHANGELOG
 
-## v1.0.1-rc.3 - _August 13, 2018_
+## v1.0.1-rc.4 - _August 24, 2018_
+
+    * Re-organize the exported interface of 0x.js. Remove the `ZeroEx` class, and instead export the same exports as `0x.js`'s sub-packages: `@0xproject/contract-wrappers`, `@0xproject/order-utils` and `@0xproject/order-watcher` (#963)
+
+## v1.0.1-rc.3 - _August 14, 2018_
 
     * Dependencies updated
     * Update ecSignOrderHashAsync to return the signature as a string for immediate use in contracts (#914)
@@ -22,11 +26,11 @@ CHANGELOG
 
     * Dependencies updated
 
-## v1.0.0-rc.2 - _July 19, 2018_
+## v1.0.0-rc.2 - _July 20, 2018_
 
     * Remove `zeroEx.assetData`  and instead re-export it's static functions directly off `ZeroEx`
 
-## v1.0.0-rc.1 - _July 19, 2018_
+## v1.0.0-rc.1 - _July 20, 2018_
 
     * Remove tokenRegistry wrapper (#863)
     * Rename `zeroEx.token` to `zeroEx.erc20Token`, and add `zeroEx.erc721Token` (#863)
@@ -66,7 +70,7 @@ CHANGELOG
     * Renamed createOrderStateWatcher to createOrderWatcherAsync since it is now async (#579)
     * Renamed ZeroExError to ContractWrappersErrors since they now lives in the @0xproject/contract-wrappers subpackage (#579)
 
-## v0.37.2 - _May 4, 2018_
+## v0.37.2 - _May 5, 2018_
 
     * Dependencies updated
 
diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 54a896bfc..b5cb6c7e4 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "1.0.1-rc.3",
+    "version": "1.0.1-rc.4",
     "engines": {
         "node": ">=6.12"
     },
@@ -20,7 +20,6 @@
         "build:all": "run-p build:umd:prod build:commonjs",
         "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*",
         "test:circleci": "run-s test:coverage",
-        "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
@@ -43,11 +42,11 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.5",
-        "@0xproject/dev-utils": "^1.0.4",
-        "@0xproject/migrations": "^1.0.4",
-        "@0xproject/monorepo-scripts": "^1.0.5",
-        "@0xproject/tslint-config": "^1.0.5",
+        "@0xproject/abi-gen": "^1.0.6",
+        "@0xproject/dev-utils": "^1.0.5",
+        "@0xproject/migrations": "^1.0.5",
+        "@0xproject/monorepo-scripts": "^1.0.6",
+        "@0xproject/tslint-config": "^1.0.6",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "^8.0.53",
@@ -74,17 +73,17 @@
         "webpack": "^3.1.0"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.5",
-        "@0xproject/base-contract": "^2.0.0-rc.1",
-        "@0xproject/contract-wrappers": "^1.0.1-rc.3",
-        "@0xproject/order-utils": "^1.0.1-rc.3",
-        "@0xproject/order-watcher": "1.0.1-rc.3",
-        "@0xproject/subproviders": "^1.0.5",
-        "@0xproject/types": "^1.0.1-rc.4",
-        "@0xproject/typescript-typings": "^1.0.4",
-        "@0xproject/utils": "^1.0.5",
-        "@0xproject/web3-wrapper": "^1.2.0",
-        "ethereum-types": "^1.0.4",
+        "@0xproject/assert": "^1.0.6",
+        "@0xproject/base-contract": "^2.0.0",
+        "@0xproject/contract-wrappers": "^1.0.1-rc.4",
+        "@0xproject/order-utils": "^1.0.1-rc.4",
+        "@0xproject/order-watcher": "^1.0.1-rc.4",
+        "@0xproject/subproviders": "^2.0.0",
+        "@0xproject/types": "^1.0.1-rc.5",
+        "@0xproject/typescript-typings": "^1.0.5",
+        "@0xproject/utils": "^1.0.6",
+        "@0xproject/web3-wrapper": "^2.0.0",
+        "ethereum-types": "^1.0.5",
         "ethers": "3.0.22",
         "lodash": "^4.17.5",
         "web3-provider-engine": "14.0.6"