From 2f07ee0a8f1d7b3ab3ad338b426122b1f9bf8430 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 27 Jun 2018 15:47:58 +0300 Subject: Dump assert version and make the order-watcher depend on the old assert version --- package.json | 4 ++-- packages/assert/package.json | 2 +- packages/contract-wrappers/package.json | 2 +- packages/order-utils/package.json | 2 +- packages/order-watcher/package.json | 2 +- packages/sra-report/package.json | 2 +- packages/subproviders/package.json | 2 +- yarn.lock | 14 ++++++++++++-- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 54f53568b..0350c417c 100644 --- a/package.json +++ b/package.json @@ -25,13 +25,13 @@ "build": "wsrun build $PKG --fast-exit -r --stages", "build:monorepo_scripts": "PKG=@0xproject/monorepo-scripts yarn build", "clean": "wsrun clean $PKG --fast-exit -r --parallel", - "remove_node_modules": "lerna clean --yes; rm -rf node_modules", + "remove_node_modules": "lerna clean --yesercrm -rf node_modules", "rebuild": "run-s clean build", "test": "wsrun test $PKG --fast-exit --serial --exclude-missing", "stage_docs": "wsrun docs:stage $PKG --fast-exit --parallel --exclude-missing", "lint": "wsrun lint $PKG --fast-exit --parallel --exclude-missing", "comment:postinstall": "HACK: For some reason `yarn` is not setting up symlinks properly for order-utils. We temporarily set them manually. Remove this after V2 refactor is complete.", - "postinstall": "rm -rf `pwd`/packages/order-utils/node_modules/@0xproject; mkdir `pwd`/packages/order-utils/node_modules/@0xproject; ln -s `pwd`/packages/json-schemas `pwd`/packages/order-utils/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/types `pwd`/packages/order-utils/node_modules/@0xproject/types; rm -f `pwd`/packages/contracts/node_modules/@0xproject/types; ln -s `pwd`/packages/types `pwd`/packages/contracts/node_modules/@0xproject/types; rm -rf `pwd`/packages/fill-scenarios/node_modules/@0xproject; mkdir -p `pwd`/packages/fill-scenarios/node_modules/@0xproject; ln -s `pwd`/packages/types `pwd`/packages/fill-scenarios/node_modules/@0xproject/types; ln -s `pwd`/packages/order-utils `pwd`/packages/fill-scenarios/node_modules/@0xproject/order-utils; rm -rf `pwd`/packages/contract-wrappers/node_modules/@0xproject; mkdir -p `pwd`/packages/contract-wrappers/node_modules/@0xproject; ln -s `pwd`/packages/order-utils `pwd`/packages/contract-wrappers/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/json-schemas `pwd`/packages/contract-wrappers/node_modules/@0xproject/json-schemas" + "postinstall": "rm -rf `pwd`/packages/order-utils/node_modules/@0xproject; mkdir `pwd`/packages/order-utils/node_modules/@0xproject; ln -s `pwd`/packages/json-schemas `pwd`/packages/order-utils/node_modules/@0xproject/json-schemas; ln -s `pwd`/packages/assert `pwd`/packages/order-utils/node_modules/@0xproject/assert; ln -s `pwd`/packages/types `pwd`/packages/order-utils/node_modules/@0xproject/types; rm -f `pwd`/packages/contracts/node_modules/@0xproject/types; ln -s `pwd`/packages/types `pwd`/packages/contracts/node_modules/@0xproject/types; rm -rf `pwd`/packages/fill-scenarios/node_modules/@0xproject; mkdir -p `pwd`/packages/fill-scenarios/node_modules/@0xproject; ln -s `pwd`/packages/types `pwd`/packages/fill-scenarios/node_modules/@0xproject/types; ln -s `pwd`/packages/order-utils `pwd`/packages/fill-scenarios/node_modules/@0xproject/order-utils; rm -rf `pwd`/packages/contract-wrappers/node_modules/@0xproject; mkdir -p `pwd`/packages/contract-wrappers/node_modules/@0xproject; ln -s `pwd`/packages/order-utils `pwd`/packages/contract-wrappers/node_modules/@0xproject/order-utils; ln -s `pwd`/packages/assert `pwd`/packages/contract-wrappers/node_modules/@0xproject/assert; ln -s `pwd`/packages/json-schemas `pwd`/packages/contract-wrappers/node_modules/@0xproject/json-schemas" }, "config": { "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic" diff --git a/packages/assert/package.json b/packages/assert/package.json index a3012498e..c24f73c4b 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/assert", - "version": "0.2.12", + "version": "0.3.0", "engines": { "node": ">=6.12" }, diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index 12302a661..6be62459a 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -77,7 +77,7 @@ "web3-provider-engine": "^14.0.4" }, "dependencies": { - "@0xproject/assert": "^0.2.12", + "@0xproject/assert": "^0.3.0", "@0xproject/base-contract": "^0.3.4", "@0xproject/order-utils": "^1.0.0", "@0xproject/typescript-typings": "^0.4.1", diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index e3c81de44..9931b2ca0 100644 --- a/packages/order-utils/package.json +++ b/packages/order-utils/package.json @@ -72,7 +72,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "^0.2.12", + "@0xproject/assert": "^0.3.0", "@0xproject/base-contract": "^0.3.4", "@0xproject/json-schemas": "1.0.0", "@0xproject/sol-compiler": "^0.5.2", diff --git a/packages/order-watcher/package.json b/packages/order-watcher/package.json index 3854e7355..ae80f16a6 100644 --- a/packages/order-watcher/package.json +++ b/packages/order-watcher/package.json @@ -77,7 +77,7 @@ "typescript": "2.7.1" }, "dependencies": { - "@0xproject/assert": "^0.2.12", + "@0xproject/assert": "0.2.12", "@0xproject/base-contract": "^0.3.4", "@0xproject/contract-wrappers": "0.0.5", "@0xproject/fill-scenarios": "^0.0.4", diff --git a/packages/sra-report/package.json b/packages/sra-report/package.json index 5bc9aea8d..4bd0a4800 100644 --- a/packages/sra-report/package.json +++ b/packages/sra-report/package.json @@ -35,7 +35,7 @@ }, "homepage": "https://github.com/0xProject/0x-monorepo/packages/sra-report/README.md", "dependencies": { - "@0xproject/assert": "^0.2.12", + "@0xproject/assert": "^0.3.0", "@0xproject/types": "^0.8.1", "@0xproject/order-utils": "^0.0.7", "@0xproject/connect": "0.6.15", diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 782d1b046..3495540a9 100644 --- a/packages/subproviders/package.json +++ b/packages/subproviders/package.json @@ -40,7 +40,7 @@ } }, "dependencies": { - "@0xproject/assert": "^0.2.12", + "@0xproject/assert": "^0.3.0", "@0xproject/types": "^0.8.1", "@0xproject/typescript-typings": "^0.4.1", "@0xproject/utils": "^0.7.1", diff --git a/yarn.lock b/yarn.lock index 7523a9726..c43540197 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6,6 +6,16 @@ version "0.3.9" resolved "https://registry.yarnpkg.com/8fold-marked/-/8fold-marked-0.3.9.tgz#bb89c645612f8ccfaffac1ca6e3c11f168c9cf59" +"@0xproject/assert@0.2.12", "@0xproject/assert@^0.2.12": + version "0.2.12" + resolved "https://registry.yarnpkg.com/@0xproject/assert/-/assert-0.2.12.tgz#0e53de4eb598ecc6138aec82d4609c0e46f433b3" + dependencies: + "@0xproject/json-schemas" "^0.8.1" + "@0xproject/typescript-typings" "^0.4.1" + "@0xproject/utils" "^0.7.1" + lodash "4.17.10" + valid-url "1.0.9" + "@0xproject/contract-wrappers@0.0.5", "@0xproject/contract-wrappers@^0.0.5": version "0.0.5" resolved "https://registry.yarnpkg.com/@0xproject/contract-wrappers/-/contract-wrappers-0.0.5.tgz#36f91afb7de51478f9d2e4e0a3c4e685b3d18f28" @@ -66,7 +76,7 @@ "@0xproject/order-watcher@^0.0.6": version "0.0.6" - resolved "https://registry.npmjs.org/@0xproject/order-watcher/-/order-watcher-0.0.6.tgz#85a8fb21e5755bb555f427b12d64d10b89b332e6" + resolved "https://registry.yarnpkg.com/@0xproject/order-watcher/-/order-watcher-0.0.6.tgz#85a8fb21e5755bb555f427b12d64d10b89b332e6" dependencies: "@0xproject/assert" "^0.2.12" "@0xproject/base-contract" "^0.3.4" @@ -12234,7 +12244,7 @@ v8flags@^2.0.2: dependencies: user-home "^1.1.1" -valid-url@^1.0.9: +valid-url@1.0.9, valid-url@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/valid-url/-/valid-url-1.0.9.tgz#1c14479b40f1397a75782f115e4086447433a200" -- cgit v1.2.3