Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/improve-linting

31 files changed, 62 insertions, 52 deletions

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 327536119..478cd69c1 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -15,9 +15,11 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
-        "prebuild": "run-s clean generate_contract_wrappers",
-        "build": "run-p build:umd:prod build:commonjs; exit 0;",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "yarn pre_build && yarn build:all && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "build:all": "run-p build:umd:prod build:commonjs; exit 0;",
+        "pre_build": "run-s generate_contract_wrappers copy_artifacts",
+        "copy_artifacts": "copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts",
         "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
         "lint": "tslint --project . --exclude **/src/contract_wrappers/generated/**/*",
         "test:circleci": "run-s test:coverage",
diff --git a/packages/abi-gen/package.json b/packages/abi-gen/package.json
index e02b930ed..19977fc86 100644
--- a/packages/abi-gen/package.json
+++ b/packages/abi-gen/package.json
@@ -8,7 +8,7 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "lint": "tslint --project .",
         "clean": "shx rm -rf lib scripts",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
diff --git a/packages/assert/package.json b/packages/assert/package.json
index 6f525f504..9e4fcbbf0 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -8,7 +8,7 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib test_temp scripts",
         "lint": "tslint --project .",
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
index 81d8442e1..d51362040 100644
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -8,7 +8,7 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
         "test": "yarn run_mocha",
diff --git a/packages/connect/package.json b/packages/connect/package.json
index 1545fe25f..5079467e4 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -15,7 +15,7 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib test_temp scripts",
         "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index ca70ad2dd..d5ec86fc6 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -11,8 +11,9 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
-        "prebuild": "run-s clean generate_contract_wrappers",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "yarn pre_build && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "pre_build": "run-s generate_contract_wrappers update_test_artifacts update_compact_artifacts",
         "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
         "lint": "tslint --project .",
         "test:circleci": "run-s test:coverage",
@@ -20,9 +21,9 @@
         "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",
-        "update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/1.0.0/$i.json test/artifacts; done;",
+        "update_compact_artifacts": "copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts",
+        "update_test_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/1.0.0/$i.json test/artifacts; done;",
         "clean": "shx rm -rf _bundles lib test_temp scripts test/artifacts src/contract_wrappers/generated",
-        "build": "tsc && yarn update_artifacts && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 5982d76bf..3b9fda227 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -11,10 +11,10 @@
         "test": "test"
     },
     "scripts": {
-        "watch": "tsc -w",
-        "prebuild": "run-s clean compile copy_artifacts generate_contract_wrappers",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "yarn pre_build && tsc",
+        "pre_build": "run-s compile copy_artifacts generate_contract_wrappers",
         "copy_artifacts": "copyfiles -u 4 '../migrations/artifacts/2.0.0/**/*' ./lib/src/artifacts;",
-        "build": "tsc",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index db794dab3..e4beacd15 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -8,7 +8,7 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s clean build test",
diff --git a/packages/ethereum-types/package.json b/packages/ethereum-types/package.json
index 0c9519994..61ae58a37 100644
--- a/packages/ethereum-types/package.json
+++ b/packages/ethereum-types/package.json
@@ -8,7 +8,7 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
         "lint": "tslint --project .",
diff --git a/packages/fill-scenarios/package.json b/packages/fill-scenarios/package.json
index f7b71d07a..27ab83636 100644
--- a/packages/fill-scenarios/package.json
+++ b/packages/fill-scenarios/package.json
@@ -5,9 +5,9 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "watch": "yarn update_contract_wrappers && tsc -w",
-        "build": "yarn update_contract_wrappers && tsc",
-        "update_contract_wrappers": "run-s clean update_artifacts generate_contract_wrappers",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "yarn pre_build && tsc",
+        "pre_build": "run-s update_artifacts generate_contract_wrappers",
         "update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/2.0.0/$i.json lib/artifacts; done;",
         "generate_contract_wrappers": "abi-gen --abis 'lib/artifacts/@(Exchange|ERC20Token|DummyERC20Token).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers && prettier --write 'src/generated_contract_wrappers/**.ts'",
         "copy_monorepo_scripts": "copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index 1439fe471..cb4b998f4 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -8,7 +8,7 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "lint": "tslint --project .",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s clean build test",
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index 25547de66..ff8cea62c 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -9,10 +9,11 @@
     "scripts": {
         "watch": "tsc -w",
         "lint": "tslint --project . --exclude **/src/contract_wrappers/**/*",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "yarn pre_build && tsc",
+        "pre_build": "run-s compile generate_contract_wrappers copy_artifacts",
         "clean": "shx rm -rf lib artifacts src/contract_wrappers",
-        "prebuild": "run-s clean compile generate_contract_wrappers copy_artifacts",
         "copy_artifacts": "copyfiles './artifacts/**/*' './contracts/**/*' ./lib",
-        "build": "tsc",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index 6e247861b..3279533de 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -8,10 +8,10 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
-        "prebuild": "run-s clean copy_artifacts generate_contract_wrappers",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "yarn pre_build && tsc",
+        "pre_build": "run-s copy_artifacts generate_contract_wrappers",
         "copy_artifacts": "copyfiles 'artifacts/**/*' ./lib",
-        "build": "tsc",
         "clean": "shx rm -rf lib src/contract_wrappers",
         "lint": "tslint --project . --exclude **/src/v2/contract_wrappers/**/* --exclude **/src/v1/contract_wrappers/**/*",
         "migrate:v1": "run-s build compile:v1 script:migrate:v1",
diff --git a/packages/monorepo-scripts/package.json b/packages/monorepo-scripts/package.json
index 2bbf4df11..5a6d7b25a 100644
--- a/packages/monorepo-scripts/package.json
+++ b/packages/monorepo-scripts/package.json
@@ -8,10 +8,10 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
+        "build": "tsc",
         "lint": "tslint --project .",
         "clean": "shx rm -rf lib",
-        "build": "tsc",
         "test:publish": "run-s build script:publish",
         "find_unused_deps": "run-s build script:find_unused_deps",
         "remove_tags": "run-s build script:remove_tags",
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index cebe43fe8..95de69bf7 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -8,8 +8,9 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
-        "build": "run-s clean update_artifacts generate_contract_wrappers transpile copy_monorepo_scripts",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "run-s pre_build transpile copy_monorepo_scripts",
+        "pre_build": "run-s update_artifacts 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).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers && prettier --write 'src/generated_contract_wrappers/**.ts'",
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index b3c0d30a5..c329a50be 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -12,8 +12,9 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
-        "prebuild": "run-s clean generate_contract_wrappers",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "yarn pre_build && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "pre_build": "run-s update_test_artifacts update_compact_artifacts generate_contract_wrappers",
         "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken).json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/generated_contract_wrappers --backend ethers && prettier --write 'src/generated_contract_wrappers/**.ts'",
         "lint": "tslint --project . --exclude **/src/generated_contract_wrappers/**/*",
         "test:circleci": "run-s test:coverage",
@@ -21,9 +22,9 @@
         "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",
-        "update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/1.0.0/$i.json test/artifacts; done;",
+        "update_compact_artifacts": "copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts",
+        "update_test_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/1.0.0/$i.json test/artifacts; done;",
         "clean": "shx rm -rf _bundles lib test_temp scripts test/artifacts src/generated_contract_wrappers",
-        "build": "tsc && yarn update_artifacts && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
diff --git a/packages/react-docs-example/package.json b/packages/react-docs-example/package.json
index a0538b933..76e780c44 100644
--- a/packages/react-docs-example/package.json
+++ b/packages/react-docs-example/package.json
@@ -10,7 +10,7 @@
         "lint": "tslint --project .",
         "build": "tsc",
         "build:example": "NODE_ENV=production webpack",
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "clean": "shx rm -rf lib; shx rm -f public/bundle*",
         "dev": "webpack-dev-server --open",
         "deploy_example": "npm run build:example; aws s3 sync ./public/. s3://react-docs-example --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"
diff --git a/packages/react-docs/package.json b/packages/react-docs/package.json
index 3d9ef08e8..5e8492d25 100644
--- a/packages/react-docs/package.json
+++ b/packages/react-docs/package.json
@@ -10,7 +10,7 @@
     "scripts": {
         "lint": "tslint --project .",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "clean": "shx rm -rf lib scripts",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
diff --git a/packages/react-shared/package.json b/packages/react-shared/package.json
index eb964a0f4..d6f748580 100644
--- a/packages/react-shared/package.json
+++ b/packages/react-shared/package.json
@@ -10,7 +10,7 @@
     "scripts": {
         "lint": "tslint --project .",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "clean": "shx rm -rf lib scripts",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
     },
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 968139a86..0bd51972d 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -8,8 +8,10 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
-        "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "yarn pre_build && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "pre_build": "run-s update_contract_fixtures",
+        "update_contract_fixtures": "copyfiles 'test/fixtures/contracts/**/*' ./lib",
         "test": "yarn run_mocha",
         "rebuild_and_test": "run-s build test",
         "run_mocha": "mocha lib/test/*_test.js --bail --exit",
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index a159afed7..616b30912 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -8,7 +8,9 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "yarn pre_build && tsc -w",
+        "build": "yarn pre_build && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "pre_build": "run-s copy_test_fixtures",
         "lint": "tslint --project .",
         "test": "run-s compile_test run_mocha",
         "rebuild_and_test": "run-s clean build test",
@@ -17,7 +19,7 @@
         "test:circleci": "yarn test:coverage",
         "run_mocha": "mocha lib/test/**/*_test.js --exit",
         "clean": "shx rm -rf lib scripts test/fixtures/artifacts src/artifacts",
-        "build": "copyfiles 'test/fixtures/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "copy_test_fixtures": "copyfiles 'test/fixtures/**/*' ./lib",
         "compile_test": "sol-compiler compile",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
         "docs:stage": "node scripts/stage_docs.js",
diff --git a/packages/sol-resolver/package.json b/packages/sol-resolver/package.json
index 64a0f19ab..6c2ed8f8b 100644
--- a/packages/sol-resolver/package.json
+++ b/packages/sol-resolver/package.json
@@ -8,8 +8,8 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
-        "build": "yarn clean && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "watch_without_deps": "tsc -w",
+        "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
         "lint": "tslint --project .",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
index a459ec180..d2cc7f32a 100644
--- a/packages/sra-report/package.json
+++ b/packages/sra-report/package.json
@@ -8,7 +8,7 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "clean": "shx rm -rf lib scripts",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "lint": "tslint --project .",
diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
index 3a28e5e8d..743bd6669 100644
--- a/packages/subproviders/package.json
+++ b/packages/subproviders/package.json
@@ -8,9 +8,9 @@
     "types": "lib/src/index.d.ts",
     "license": "Apache-2.0",
     "scripts": {
-        "watch": "tsc -w",
-        "clean": "shx rm -rf lib scripts",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "clean": "shx rm -rf lib scripts",
         "lint": "tslint --project .",
         "run_mocha_unit": "mocha lib/test/unit/**/*_test.js --timeout 10000 --bail --exit",
         "run_mocha_integration": "mocha lib/test/integration/**/*_test.js --timeout 10000 --bail --exit",
diff --git a/packages/testnet-faucets/package.json b/packages/testnet-faucets/package.json
index 06f8d3e84..2d1252596 100644
--- a/packages/testnet-faucets/package.json
+++ b/packages/testnet-faucets/package.json
@@ -8,7 +8,7 @@
     "description": "A faucet micro-service that dispenses test ERC20 tokens or Ether",
     "main": "server.js",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "node ../../node_modules/gulp/bin/gulp.js build",
         "dev": "node ../../node_modules/gulp/bin/gulp.js run",
         "start": "node ./server/server.js",
diff --git a/packages/tslint-config/package.json b/packages/tslint-config/package.json
index a64feb836..452ac48a4 100644
--- a/packages/tslint-config/package.json
+++ b/packages/tslint-config/package.json
@@ -7,7 +7,7 @@
     "description": "Lint rules related to 0xProject for TSLint",
     "main": "tslint.json",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
         "lint": "tslint --project .",
diff --git a/packages/types/package.json b/packages/types/package.json
index 95b7721d3..fd2073db3 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -8,7 +8,7 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
         "lint": "tslint --project .",
diff --git a/packages/typescript-typings/package.json b/packages/typescript-typings/package.json
index 4bae1f437..0dde47c97 100644
--- a/packages/typescript-typings/package.json
+++ b/packages/typescript-typings/package.json
@@ -6,7 +6,7 @@
     },
     "description": "0x project typescript type definitions",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 1 './lib/**/*' ./scripts",
         "clean": "shx rm -rf scripts",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js"
diff --git a/packages/utils/package.json b/packages/utils/package.json
index 89daadbec..3828fa9ee 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -8,7 +8,7 @@
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
         "lint": "tslint --project .",
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index e98b247b4..694f07e45 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -8,7 +8,7 @@
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
     "scripts": {
-        "watch": "tsc -w",
+        "watch_without_deps": "tsc -w",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
         "lint": "tslint --project .",
diff --git a/packages/website/package.json b/packages/website/package.json
index 54780f600..5287414c7 100644
--- a/packages/website/package.json
+++ b/packages/website/package.json
@@ -10,7 +10,7 @@
         "build": "NODE_ENV=production webpack; exit 0;",
         "clean": "shx rm -f public/bundle*",
         "lint": "tslint --project . 'ts/**/*.ts' 'ts/**/*.tsx'",
-        "watch": "webpack-dev-server --content-base public --https",
+        "watch_without_deps": "webpack-dev-server --content-base public --https",
         "deploy_dogfood": "npm run build; aws s3 sync ./public/. s3://dogfood.0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
         "deploy_staging": "npm run build; aws s3 sync ./public/. s3://staging-0xproject --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers",
         "deploy_live": "npm run build; aws s3 sync ./public/. s3://0xproject.com --profile 0xproject --region us-east-1 --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers"