Merge remote-tracking branch 'origin/development' into feature/utils/prettybignum

1 files changed, 23 insertions, 40 deletions

diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index b94f59e29..a6a84b940 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0xproject/order-utils",
-    "version": "1.0.1-rc.3",
+    "name": "@0x/order-utils",
+    "version": "2.0.0",
     "engines": {
         "node": ">=6.12"
     },
@@ -8,37 +8,21 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch_without_deps": "yarn pre_build && tsc -w",
-        "build": "run-s pre_build transpile copy_monorepo_scripts",
-        "pre_build": "run-s update_artifacts_v2_beta generate_contract_wrappers",
-        "transpile": "tsc",
-        "copy_monorepo_scripts": "copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
-        "generate_contract_wrappers": "abi-gen --abis 'lib/src/artifacts/@(Exchange|IWallet|IValidator|DummyERC20Token|ERC20Proxy|ERC20Token).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers",
-        "update_artifacts_v2_beta": "for i in ${npm_package_config_contracts_v2_beta}; do copyfiles -u 4 ../migrations/artifacts/2.0.0-beta-testnet/$i.json lib/src/artifacts; done;",
+        "build": "yarn tsc -b",
+        "build:ci": "yarn build",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
         "test:circleci": "yarn test:coverage",
         "run_mocha": "mocha --require source-map-support/register --require make-promises-safe lib/test/**/*_test.js --bail --exit",
         "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 scripts lib/src/artifacts src/generated_contract_wrappers",
-        "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*",
-        "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
-        "docs:stage": "node scripts/stage_docs.js",
-        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
-        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
+        "clean": "shx rm -rf lib generated_docs",
+        "lint": "tslint --format stylish --project .",
+        "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --tsconfig typedoc-tsconfig.json --json $JSON_FILE_PATH $PROJECT_FILES"
     },
     "config": {
-        "contracts_v2_beta": "IWallet IValidator Exchange ERC20Proxy ERC20Token DummyERC20Token",
         "postpublish": {
-            "docPublishConfigs": {
-                "extraFileIncludes": [
-                    "../types/src/index.ts",
-                    "../ethereum-types/src/index.ts"
-                ],
-                "s3BucketPath": "s3://doc-jsons/order-utils/",
-                "s3StagingBucketPath": "s3://staging-doc-jsons/order-utils/"
-            }
+            "assets": []
         }
     },
     "license": "Apache-2.0",
@@ -51,15 +35,13 @@
     },
     "homepage": "https://github.com/0xProject/0x-monorepo/packages/order-utils/README.md",
     "devDependencies": {
-        "@0xproject/dev-utils": "^1.0.4",
-        "@0xproject/monorepo-scripts": "^1.0.5",
-        "@0xproject/tslint-config": "^1.0.5",
+        "@0x/dev-utils": "^1.0.13",
+        "@0x/tslint-config": "^1.0.9",
         "@types/bn.js": "^4.11.0",
         "@types/lodash": "4.14.104",
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^2.0.1",
-        "copyfiles": "^2.0.0",
         "dirty-chai": "^2.0.1",
         "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
@@ -67,24 +49,25 @@
         "shx": "^0.2.2",
         "sinon": "^4.0.0",
         "tslint": "5.11.0",
-        "typedoc": "0xProject/typedoc",
+        "typedoc": "0.13.0",
         "typescript": "3.0.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^1.0.5",
-        "@0xproject/base-contract": "^2.0.0-rc.1",
-        "@0xproject/json-schemas": "^1.0.1-rc.4",
-        "@0xproject/sol-compiler": "^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",
-        "@types/node": "^8.0.53",
+        "@0x/abi-gen-wrappers": "^1.0.1",
+        "@0x/assert": "^1.0.14",
+        "@0x/base-contract": "^3.0.2",
+        "@0x/contract-artifacts": "^1.0.1",
+        "@0x/json-schemas": "^2.0.0",
+        "@0x/types": "^1.2.0",
+        "@0x/typescript-typings": "^3.0.3",
+        "@0x/utils": "^2.0.3",
+        "@0x/web3-wrapper": "^3.1.0",
+        "@types/node": "*",
         "bn.js": "^4.11.8",
-        "ethereum-types": "^1.0.4",
+        "ethereum-types": "^1.1.1",
         "ethereumjs-abi": "0.6.5",
         "ethereumjs-util": "^5.1.1",
-        "ethers": "3.0.22",
+        "ethers": "~4.0.4",
         "lodash": "^4.17.5"
     },
     "publishConfig": {