From c4538cada7017a838c268ba1f01824a4e1e25928 Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Mon, 4 Jun 2018 13:36:34 -0700
Subject: Don't automatically rebuild when running yarn test

---
 packages/0x.js/package.json             | 3 ++-
 packages/assert/package.json            | 3 ++-
 packages/base-contract/package.json     | 3 ++-
 packages/connect/package.json           | 3 ++-
 packages/contract-wrappers/package.json | 3 ++-
 packages/contracts/package.json         | 3 ++-
 packages/dev-utils/package.json         | 3 ++-
 packages/json-schemas/package.json      | 3 ++-
 packages/metacoin/package.json          | 3 ++-
 packages/order-utils/package.json       | 3 ++-
 packages/order-watcher/package.json     | 3 ++-
 packages/sol-compiler/package.json      | 3 ++-
 packages/sol-cov/package.json           | 3 ++-
 packages/sra-report/package.json        | 3 ++-
 packages/web3-wrapper/package.json      | 3 ++-
 15 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 1324a73d1..0ee2efa34 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -21,7 +21,8 @@
         "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",
-        "test": "run-s clean test:commonjs",
+        "test": "run-s test:commonjs",
+        "rebuild-and-test": "run-s clean test",
         "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 _bundles lib test_temp scripts src/contract_wrappers/generated",
diff --git a/packages/assert/package.json b/packages/assert/package.json
index e26c88fd7..bec4a9137 100644
--- a/packages/assert/package.json
+++ b/packages/assert/package.json
@@ -14,7 +14,8 @@
         "lint": "tslint --project .",
         "run_mocha": "mocha lib/test/**/*_test.js --exit",
         "prepublishOnly": "run-p build",
-        "test": "run-s clean build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s clean build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
         "test:circleci": "yarn test:coverage",
diff --git a/packages/base-contract/package.json b/packages/base-contract/package.json
index c01a133e4..62e37d80b 100644
--- a/packages/base-contract/package.json
+++ b/packages/base-contract/package.json
@@ -11,7 +11,8 @@
         "watch": "tsc -w",
         "build": "tsc && copyfiles -u 2 './lib/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
-        "test": "run-s clean build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s clean build test",
         "test:circleci": "yarn test:coverage",
         "run_mocha": "mocha lib/test/**/*_test.js --bail --exit",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
diff --git a/packages/connect/package.json b/packages/connect/package.json
index d1e392606..fa91bf632 100644
--- a/packages/connect/package.json
+++ b/packages/connect/package.json
@@ -21,7 +21,8 @@
         "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
         "lint": "tslint --project .",
         "run_mocha": "mocha lib/test/**/*_test.js --exit",
-        "test": "run-s clean build copy_test_fixtures run_mocha",
+        "test": "run-s copy_test_fixtures run_mocha",
+        "rebuild-and-test": "run-s clean build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
         "test:circleci": "yarn test:coverage",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 61e92903f..66ad00cd6 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -16,7 +16,8 @@
         "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",
-        "test": "run-s clean build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s clean 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;",
diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index eee2b04d3..8e37a7819 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -15,7 +15,8 @@
         "prebuild": "run-s clean compile copy_artifacts generate_contract_wrappers",
         "copy_artifacts": "copyfiles -u 4 '../migrations/artifacts/2.0.0/**/*' ./lib/src/artifacts;",
         "build": "tsc",
-        "test": "run-s build run_mocha",
+        "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",
         "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit",
         "compile": "sol-compiler",
diff --git a/packages/dev-utils/package.json b/packages/dev-utils/package.json
index 47a13733b..997340010 100644
--- a/packages/dev-utils/package.json
+++ b/packages/dev-utils/package.json
@@ -10,7 +10,8 @@
     "scripts": {
         "watch": "tsc -w",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
-        "test": "run-s clean build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s clean build test",
         "test:circleci": "yarn test:coverage",
         "run_mocha": "mocha lib/test/**/*_test.js --bail --exit",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
diff --git a/packages/json-schemas/package.json b/packages/json-schemas/package.json
index 603e5ab73..75d01a1e9 100644
--- a/packages/json-schemas/package.json
+++ b/packages/json-schemas/package.json
@@ -10,7 +10,8 @@
     "scripts": {
         "watch": "tsc -w",
         "lint": "tslint --project .",
-        "test": "run-s clean build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s clean build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
         "test:circleci": "yarn test:coverage",
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index a85bf8f77..ca6361eba 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -13,7 +13,8 @@
         "prebuild": "run-s clean compile generate_contract_wrappers copy_artifacts",
         "copy_artifacts": "copyfiles './artifacts/**/*' './contracts/**/*' ./lib",
         "build": "tsc",
-        "test": "run-s build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s clean build test",
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
         "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit",
         "generate_contract_wrappers": "abi-gen --abis 'artifacts/Metacoin.json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers && prettier --write 'src/contract_wrappers/**.ts'",
diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index 2d7e7ba66..5a04c58f7 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -14,7 +14,8 @@
         "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'",
         "update_artifacts": "for i in ${npm_package_config_contracts}; do copyfiles -u 4 ../migrations/artifacts/2.0.0/$i.json lib/src/artifacts; done;",
-        "test": "run-s build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s build test",
         "test:circleci": "yarn test:coverage",
         "run_mocha": "mocha lib/test/**/*_test.js --bail --exit",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index fcc40d56d..3efb92ae5 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -17,7 +17,8 @@
         "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 .",
         "test:circleci": "run-s test:coverage",
-        "test": "run-s clean build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s clean 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;",
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 60ed3655f..8d26179b5 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -10,7 +10,8 @@
     "scripts": {
         "watch": "tsc -w",
         "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
-        "test": "run-s build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s build test",
         "run_mocha": "mocha 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",
diff --git a/packages/sol-cov/package.json b/packages/sol-cov/package.json
index 4d92a610b..d10d277b9 100644
--- a/packages/sol-cov/package.json
+++ b/packages/sol-cov/package.json
@@ -10,7 +10,8 @@
     "scripts": {
         "watch": "tsc -w",
         "lint": "tslint --project .",
-        "test": "run-s clean build compile_test run_mocha",
+        "test": "run-s compile_test run_mocha",
+        "rebuild-and-test": "run-s clean build test",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
         "coverage:report:lcov": "nyc report --reporter=text-lcov > coverage/lcov.info",
         "test:circleci": "yarn test:coverage",
diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json
index 8903f5c81..27bf715a8 100644
--- a/packages/sra-report/package.json
+++ b/packages/sra-report/package.json
@@ -12,7 +12,8 @@
         "clean": "shx rm -rf lib scripts",
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "lint": "tslint --project .",
-        "test": "run-s clean build copy_test_environments copy_test_fixtures run_mocha",
+        "test": "run-s copy_test_environments copy_test_fixtures run_mocha",
+        "rebuild-and-test": "run-s clean build test",
         "copy_test_fixtures": "copyfiles -u 2 './test/fixtures/**/*.json' ./lib/test/fixtures",
         "copy_test_environments": "copyfiles -u 2 './test/environments/**/*.json' ./lib/test/environments",
         "run_mocha": "mocha lib/test/**/*_test.js --exit",
diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
index 9baaba391..01f0f3a26 100644
--- a/packages/web3-wrapper/package.json
+++ b/packages/web3-wrapper/package.json
@@ -12,7 +12,8 @@
         "build": "tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "clean": "shx rm -rf lib scripts",
         "lint": "tslint --project .",
-        "test": "run-s clean build run_mocha",
+        "test": "yarn run_mocha",
+        "rebuild-and-test": "run-s clean build test",
         "test:circleci": "yarn test:coverage",
         "run_mocha": "mocha lib/test/**/*_test.js --bail --exit",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
-- 
cgit v1.2.3


From ecdfde8c38c2b2f5985c1524d1d2b3af74d7b07d Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Mon, 4 Jun 2018 18:22:52 -0700
Subject: Remove common-js/umd differentiation from 0x.js/package.json

---
 packages/0x.js/package.json | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index 0ee2efa34..e9aa95265 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -17,18 +17,15 @@
     "scripts": {
         "watch": "tsc -w",
         "prebuild": "run-s clean generate_contract_wrappers",
-        "build": "run-p build:umd:prod build:commonjs; exit 0;",
+        "build": "tsc && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "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",
-        "test": "run-s test:commonjs",
-        "rebuild-and-test": "run-s clean test",
+        "test": "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",
         "clean": "shx rm -rf _bundles lib test_temp scripts src/contract_wrappers/generated",
-        "build:umd:prod": "NODE_ENV=production webpack",
-        "build:commonjs": "tsc && copyfiles -u 2 './src/compact_artifacts/**/*.json' ./lib/src/compact_artifacts && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
-        "test:commonjs": "run-s build:commonjs run_mocha",
         "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --timeout 10000 --bail --exit",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
         "docs:stage": "node scripts/stage_docs.js",
-- 
cgit v1.2.3


From 44b62852682df3095890246506308259adb05542 Mon Sep 17 00:00:00 2001
From: Alex Browne <stephenalexbrowne@gmail.com>
Date: Mon, 4 Jun 2018 18:28:27 -0700
Subject: Remove duplicate cleans in package.json when clean is called in
 prebuild

---
 packages/0x.js/package.json             | 2 +-
 packages/contract-wrappers/package.json | 2 +-
 packages/metacoin/package.json          | 2 +-
 packages/order-watcher/package.json     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/0x.js/package.json b/packages/0x.js/package.json
index e9aa95265..4de046a07 100644
--- a/packages/0x.js/package.json
+++ b/packages/0x.js/package.json
@@ -21,7 +21,7 @@
         "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",
-        "test": "run_mocha",
+        "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",
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 66ad00cd6..1cef3d8cf 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -17,7 +17,7 @@
         "lint": "tslint --project .",
         "test:circleci": "run-s test:coverage",
         "test": "yarn run_mocha",
-        "rebuild-and-test": "run-s clean build test",
+        "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;",
diff --git a/packages/metacoin/package.json b/packages/metacoin/package.json
index ca6361eba..19582327a 100644
--- a/packages/metacoin/package.json
+++ b/packages/metacoin/package.json
@@ -14,7 +14,7 @@
         "copy_artifacts": "copyfiles './artifacts/**/*' './contracts/**/*' ./lib",
         "build": "tsc",
         "test": "yarn run_mocha",
-        "rebuild-and-test": "run-s clean build test",
+        "rebuild-and-test": "run-s build test",
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
         "run_mocha": "mocha lib/test/**/*_test.js lib/test/global_hooks.js --bail --exit",
         "generate_contract_wrappers": "abi-gen --abis 'artifacts/Metacoin.json' --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers --backend ethers && prettier --write 'src/contract_wrappers/**.ts'",
diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json
index 3efb92ae5..44954165d 100644
--- a/packages/order-watcher/package.json
+++ b/packages/order-watcher/package.json
@@ -18,7 +18,7 @@
         "lint": "tslint --project .",
         "test:circleci": "run-s test:coverage",
         "test": "yarn run_mocha",
-        "rebuild-and-test": "run-s clean build test",
+        "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;",
-- 
cgit v1.2.3