Merge branch 'development' into feature/orderExpired

1 files changed, 9 insertions, 14 deletions

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 539a78f37..4fe11a8dc 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "0x.js",
-  "version": "0.23.0",
+  "version": "0.25.1",
   "description": "A javascript library for interacting with the 0x protocol",
   "keywords": [
     "0x.js",
@@ -13,11 +13,9 @@
   "types": "lib/src/index.d.ts",
   "scripts": {
     "prebuild": "npm run clean",
-    "build": "run-p build:umd:prod build:commonjs",
-    "prepublishOnly": "run-p build",
-    "postpublish": "run-s release docs:json upload_docs_json",
-    "release": "publish-release --assets _bundles/index.js,_bundles/index.min.js --tag $(git describe --tags) --owner 0xProject --repo 0x.js",
-    "upload_docs_json": "aws s3 cp docs/index.json s3://0xjs-docs-jsons/$(git describe --tags).json --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type aplication/json",
+    "build": "run-p build:umd:prod build:commonjs; exit 0;",
+    "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_DIR",
+    "upload_docs_json": "aws s3 cp docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type aplication/json",
     "lint": "tslint src/**/*.ts test/**/*.ts",
     "test:circleci": "run-s test:coverage report_test_coverage; if [ $CIRCLE_BRANCH = \"development\" ]; then yarn test:umd; fi",
     "test": "run-s clean test:commonjs",
@@ -25,9 +23,6 @@
     "test:coverage": "nyc npm run test --all",
     "report_test_coverage": "nyc report --reporter=text-lcov | coveralls",
     "update_contracts": "for i in ${npm_package_config_artifacts}; do copyfiles -u 4 ../contracts/build/contracts/$i.json ../0x.js/src/artifacts; done;",
-    "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json docs/index.json .",
-    "docs:generate": "typedoc --out docs .",
-    "docs:open": "opn docs/index.html",
     "clean": "shx rm -rf _bundles lib test_temp",
     "build:umd:dev": "webpack",
     "build:umd:prod": "NODE_ENV=production webpack",
@@ -49,6 +44,7 @@
     "node": ">=6.0.0"
   },
   "devDependencies": {
+    "@0xproject/tslint-config": "^0.1.0",
     "@types/bintrees": "^1.0.2",
     "@types/jsonschema": "^1.1.1",
     "@types/lodash": "^4.14.64",
@@ -77,8 +73,7 @@
     "sinon": "^4.0.0",
     "source-map-support": "^0.5.0",
     "truffle-hdwallet-provider": "^0.0.3",
-    "tslint": "~5.5.0",
-    "tslint-config-0xproject": "^0.0.2",
+    "tslint": "5.8.0",
     "typedoc": "~0.8.0",
     "types-bn": "^0.0.1",
     "types-ethereumjs-util": "0xProject/types-ethereumjs-util",
@@ -88,10 +83,11 @@
     "webpack": "^3.1.0"
   },
   "dependencies": {
-    "0x-json-schemas": "^0.6.1",
-    "@0xproject/assert": "0.0.3",
+    "@0xproject/assert": "^0.0.4",
+    "@0xproject/json-schemas": "^0.6.7",
     "bignumber.js": "~4.1.0",
     "bintrees": "^1.0.2",
+    "bn.js": "4.11.8",
     "compare-versions": "^3.0.1",
     "es6-promisify": "^5.0.0",
     "ethereumjs-abi": "^0.6.4",
@@ -100,7 +96,6 @@
     "find-versions": "^2.0.0",
     "js-sha3": "^0.6.1",
     "lodash": "^4.17.4",
-    "publish-release": "^1.3.3",
     "uuid": "^3.1.0",
     "web3": "^0.20.0"
   }