Merge branch 'development' into dev-tools-pages

1 files changed, 21 insertions, 20 deletions

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 1a57edd45..38478980f 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
     "name": "0x.js",
-    "version": "1.0.8",
+    "version": "2.0.1",
     "engines": {
         "node": ">=6.12"
     },
@@ -18,7 +18,7 @@
         "build": "yarn build:all",
         "build:ci": "yarn build:commonjs",
         "build:all": "run-p build:umd:prod build:commonjs",
-        "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*",
+        "lint": "tslint --format stylish --project .",
         "test:circleci": "run-s test:coverage",
         "rebuild_and_test": "run-s build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
@@ -42,16 +42,16 @@
     },
     "license": "Apache-2.0",
     "devDependencies": {
-        "@0xproject/abi-gen": "^1.0.13",
-        "@0xproject/dev-utils": "^1.0.12",
-        "@0xproject/migrations": "^1.0.14",
-        "@0xproject/monorepo-scripts": "^1.0.11",
-        "@0xproject/tslint-config": "^1.0.8",
+        "@0x/abi-gen": "^1.0.15",
+        "@0x/abi-gen-wrappers": "^1.0.2",
+        "@0x/contract-addresses": "^1.1.0",
+        "@0x/dev-utils": "^1.0.14",
+        "@0x/migrations": "^2.0.1",
+        "@0x/tslint-config": "^1.0.10",
         "@types/lodash": "4.14.104",
         "@types/mocha": "^2.2.42",
         "@types/node": "*",
         "@types/sinon": "^2.2.2",
-        "@types/web3-provider-engine": "^14.0.0",
         "awesome-typescript-loader": "^5.2.1",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
@@ -67,23 +67,24 @@
         "sinon": "^4.0.0",
         "source-map-support": "^0.5.0",
         "tslint": "5.11.0",
-        "typedoc": "0.12.0",
+        "typedoc": "0.13.0",
         "typescript": "3.0.1",
         "uglifyjs-webpack-plugin": "^2.0.1",
         "webpack": "^4.20.2"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.13",
-        "@0xproject/base-contract": "^3.0.1",
-        "@0xproject/contract-wrappers": "^2.0.2",
-        "@0xproject/order-utils": "^1.0.7",
-        "@0xproject/order-watcher": "^2.1.1",
-        "@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/assert": "^1.0.15",
+        "@0x/base-contract": "^3.0.3",
+        "@0x/contract-wrappers": "^3.0.1",
+        "@0x/order-utils": "^2.0.1",
+        "@0x/order-watcher": "^2.2.1",
+        "@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",
+        "ethereum-types": "^1.1.2",
         "ethers": "~4.0.4",
         "lodash": "^4.17.5",
         "web3-provider-engine": "14.0.6"