Merge branch 'development' into dev-dropdown

* development: (120 commits)
  Exit with non-error code at end of publishRelease
  Publish
  Updated CHANGELOGS
  Fix prettier
  Update changelog files for RC packages
  Skip doc generation for local publishes since we test this in a separate CI test
  Fix typo
  Use absolute path
  Run yarn a second time if the first fails
  Try relative to root dir
  Fix command
  Move md files to lib folder during build
  Change exit code to failure
  Fix sra-spec `main` and `types` in package.json
  Actual relative path
  Try relative path
  Issue #1025 BlockParam unroll
  Fix command
  Move md files to lib folder during build
  Fix sra-spec `main` and `types` in package.json
  ...

1 files changed, 19 insertions, 20 deletions

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 54a896bfc..c3adb496e 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.6",
     "engines": {
         "node": ">=6.12"
     },
@@ -12,15 +12,14 @@
         "tokens",
         "exchange"
     ],
-    "main": "lib/src/index.js",
-    "types": "lib/src/index.d.ts",
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
     "scripts": {
         "watch_without_deps": "tsc -w",
         "build": "yarn build:all",
         "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.7",
+        "@0xproject/dev-utils": "^1.0.6",
+        "@0xproject/migrations": "^1.0.6",
+        "@0xproject/monorepo-scripts": "^1.0.7",
+        "@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.7",
+        "@0xproject/base-contract": "^2.0.1",
+        "@0xproject/contract-wrappers": "^1.0.1-rc.5",
+        "@0xproject/order-utils": "^1.0.1-rc.6",
+        "@0xproject/order-watcher": "^1.0.1-rc.5",
+        "@0xproject/subproviders": "^2.0.1",
+        "@0xproject/types": "^1.0.1-rc.6",
+        "@0xproject/typescript-typings": "^1.0.5",
+        "@0xproject/utils": "^1.0.7",
+        "@0xproject/web3-wrapper": "^2.0.1",
+        "ethereum-types": "^1.0.5",
         "ethers": "3.0.22",
         "lodash": "^4.17.5",
         "web3-provider-engine": "14.0.6"