From 4b9501318d8933f949fa0f87956e9cf5298d5726 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 16 Jan 2018 20:12:42 +0100 Subject: Move deployer to a separate package --- packages/contracts/package.json | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 1cf716f92..7b8f219e3 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -11,14 +11,17 @@ "build": "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;", "test": "npm run build; truffle test", - "compile": "npm run build; node lib/deploy/cli.js compile", + "compile": "node ../deployer/lib/cli.js compile", "clean": "rm -rf ./lib", - "migrate:truffle": "npm run build; truffle migrate", - "migrate": "npm run build; node lib/deploy/cli.js migrate", + "migrate": "node ../deployer/lib/cli.js migrate", "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'", +<<<<<<< HEAD "test:circleci:contracts": "yarn test", "test:circleci:deployer": "yarn test:deployer", "test:deployer": "npm run build; mocha lib/deploy/test/*_test.js" +======= + "test:circleci": "yarn test" +>>>>>>> Move deployer to a separate package }, "repository": { "type": "git", @@ -57,10 +60,18 @@ "yargs": "^10.0.3" }, "dependencies": { +<<<<<<< HEAD "0x.js": "^0.30.0", "@0xproject/json-schemas": "^0.7.3", "@0xproject/utils": "^0.2.0", "@0xproject/web3-wrapper": "^0.1.5", +======= + "0x.js": "^0.29.2", + "@0xproject/deployer": "^0.0.1", + "@0xproject/json-schemas": "^0.7.2", + "@0xproject/utils": "^0.1.3", + "@0xproject/web3-wrapper": "^0.1.4", +>>>>>>> Move deployer to a separate package "bluebird": "^3.5.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", -- cgit v1.2.3 From d99bb3a87c1ea39141d15d182638ee3633ff60d7 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 18 Jan 2018 14:21:15 +0100 Subject: Fix merge conflicts --- packages/contracts/package.json | 6 ------ 1 file changed, 6 deletions(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 7b8f219e3..9daa2c4f2 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -15,13 +15,7 @@ "clean": "rm -rf ./lib", "migrate": "node ../deployer/lib/cli.js migrate", "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'", -<<<<<<< HEAD - "test:circleci:contracts": "yarn test", - "test:circleci:deployer": "yarn test:deployer", - "test:deployer": "npm run build; mocha lib/deploy/test/*_test.js" -======= "test:circleci": "yarn test" ->>>>>>> Move deployer to a separate package }, "repository": { "type": "git", -- cgit v1.2.3 From d41bce36be3cb7a08e2dc6a8692a134236b0e5dc Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 18 Jan 2018 14:23:54 +0100 Subject: Fix merge conflicts --- packages/contracts/package.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 9daa2c4f2..0f70ab308 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -54,18 +54,11 @@ "yargs": "^10.0.3" }, "dependencies": { -<<<<<<< HEAD "0x.js": "^0.30.0", + "@0xproject/deployer": "^0.0.1", "@0xproject/json-schemas": "^0.7.3", "@0xproject/utils": "^0.2.0", "@0xproject/web3-wrapper": "^0.1.5", -======= - "0x.js": "^0.29.2", - "@0xproject/deployer": "^0.0.1", - "@0xproject/json-schemas": "^0.7.2", - "@0xproject/utils": "^0.1.3", - "@0xproject/web3-wrapper": "^0.1.4", ->>>>>>> Move deployer to a separate package "bluebird": "^3.5.0", "bn.js": "^4.11.8", "ethereumjs-abi": "^0.6.4", -- cgit v1.2.3 From ba987b0574211f67a734a21fc885e446a03cad63 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 18 Jan 2018 15:17:17 +0100 Subject: Move tests to a separate folder --- packages/contracts/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 0f70ab308..4040c0d39 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -11,9 +11,9 @@ "build": "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;", "test": "npm run build; truffle test", - "compile": "node ../deployer/lib/cli.js compile", + "compile": "node ../deployer/lib/src/cli.js compile", "clean": "rm -rf ./lib", - "migrate": "node ../deployer/lib/cli.js migrate", + "migrate": "node ../deployer/lib/src/cli.js migrate", "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'", "test:circleci": "yarn test" }, -- cgit v1.2.3 From a45f9b480233d207fa5ba80a8e47cc3193c243d8 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 19 Jan 2018 13:37:41 +0100 Subject: Add a comment about a yarn bug --- packages/contracts/package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 4040c0d39..3049c1666 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -11,6 +11,8 @@ "build": "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;", "test": "npm run build; truffle test", + "compile:comment": + "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", "compile": "node ../deployer/lib/src/cli.js compile", "clean": "rm -rf ./lib", "migrate": "node ../deployer/lib/src/cli.js migrate", @@ -55,7 +57,7 @@ }, "dependencies": { "0x.js": "^0.30.0", - "@0xproject/deployer": "^0.0.1", + "@0xproject/deployer": "*", "@0xproject/json-schemas": "^0.7.3", "@0xproject/utils": "^0.2.0", "@0xproject/web3-wrapper": "^0.1.5", -- cgit v1.2.3