From 387363283ca03ac1d6c9be5b7be2107790bbf79d Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 22 Jan 2018 21:53:32 +0100 Subject: Remove truffle from tests --- packages/contracts/package.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 3a140b23e..9df12d8a3 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -8,9 +8,12 @@ "test": "test" }, "scripts": { - "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", + "build": + "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;", + "test": "run-s build compile run_mocha", + "run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --exit", + "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", @@ -44,6 +47,7 @@ "copyfiles": "^1.2.0", "dirty-chai": "^2.0.1", "mocha": "^4.0.1", + "npm-run-all": "^4.1.2", "solc": "^0.4.18", "truffle": "^4.0.1", "tslint": "5.8.0", -- cgit From 2f65fadeaabf350c5fa6d2e822dc211f0632ae2e Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Mon, 22 Jan 2018 22:28:09 +0100 Subject: Add --bail to mocha config --- packages/contracts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 9df12d8a3..05df63004 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -11,7 +11,7 @@ "build": "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;", "test": "run-s build compile run_mocha", - "run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --exit", + "run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --bail --exit", "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", -- cgit From 1e9147b8bb45a251eefdead23573a9e8d68fc34b Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Thu, 25 Jan 2018 15:12:46 +0100 Subject: Normalize the dependencies --- packages/contracts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 05df63004..49f7d85cc 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -52,7 +52,7 @@ "truffle": "^4.0.1", "tslint": "5.8.0", "types-bn": "^0.0.1", - "types-ethereumjs-util": "0xProject/types-ethereumjs-util", + "types-ethereumjs-util": "0xproject/types-ethereumjs-util", "typescript": "~2.6.1", "web3-typescript-typings": "^0.9.7", "yargs": "^10.0.3" -- cgit From e56b2ceebb5e18aff0daf8951f3bd854c84bc433 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 26 Jan 2018 11:08:54 +0100 Subject: Remove truffle as a dependency --- packages/contracts/package.json | 1 - 1 file changed, 1 deletion(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 49f7d85cc..81a893c5c 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -49,7 +49,6 @@ "mocha": "^4.0.1", "npm-run-all": "^4.1.2", "solc": "^0.4.18", - "truffle": "^4.0.1", "tslint": "5.8.0", "types-bn": "^0.0.1", "types-ethereumjs-util": "0xproject/types-ethereumjs-util", -- cgit From 0043c5e1ac43159ec996eaa80457810cce3298c0 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 30 Jan 2018 14:47:22 +0100 Subject: Fix glob patterns --- packages/contracts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 81a893c5c..24b4cdc8f 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -9,7 +9,7 @@ }, "scripts": { "build": - "rm -rf ./lib; copyfiles ./build/**/* ./deploy/solc/solc_bin/* ./deploy/test/fixtures/contracts/**/* ./deploy/test/fixtures/contracts/* ./lib; tsc;", + "rm -rf ./lib; copyfiles './build/**/*' './deploy/solc/solc_bin/*' './deploy/test/fixtures/contracts/**/*' './deploy/test/fixtures/contracts/*' ./lib; tsc;", "test": "run-s build compile run_mocha", "run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --bail --exit", "compile:comment": -- cgit From 218a8729686064356d0133462c73eceed97000b4 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 30 Jan 2018 15:13:03 +0100 Subject: Remove a semicolon --- packages/contracts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 24b4cdc8f..44f1d0af9 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -9,7 +9,7 @@ }, "scripts": { "build": - "rm -rf ./lib; copyfiles './build/**/*' './deploy/solc/solc_bin/*' './deploy/test/fixtures/contracts/**/*' './deploy/test/fixtures/contracts/*' ./lib; tsc;", + "rm -rf ./lib; copyfiles './build/**/*' './deploy/solc/solc_bin/*' './deploy/test/fixtures/contracts/**/*' './deploy/test/fixtures/contracts/*' ./lib; tsc", "test": "run-s build compile run_mocha", "run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --bail --exit", "compile:comment": -- cgit From 4f6168a982a5e0702a96a2d04b966eca22793d7a Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 30 Jan 2018 15:45:55 +0100 Subject: Separate npm scripts in contracts --- packages/contracts/package.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 44f1d0af9..e953a9d2b 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -8,8 +8,9 @@ "test": "test" }, "scripts": { - "build": - "rm -rf ./lib; copyfiles './build/**/*' './deploy/solc/solc_bin/*' './deploy/test/fixtures/contracts/**/*' './deploy/test/fixtures/contracts/*' ./lib; tsc", + "prebuild": "run-s clean copy_artifacts", + "copy_artifacts": "copyfiles './build/**/*' './deploy/solc/solc_bin/*' './deploy/test/fixtures/contracts/**/*' './deploy/test/fixtures/contracts/*' ./lib", + "build": "tsc", "test": "run-s build compile run_mocha", "run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --bail --exit", "compile:comment": -- cgit From 7ad314472d27e8a6c6ee8242f4f335d414709f4d Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 30 Jan 2018 16:28:25 +0100 Subject: Change order --- packages/contracts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/contracts/package.json') diff --git a/packages/contracts/package.json b/packages/contracts/package.json index e953a9d2b..d2f4df0b4 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -11,7 +11,7 @@ "prebuild": "run-s clean copy_artifacts", "copy_artifacts": "copyfiles './build/**/*' './deploy/solc/solc_bin/*' './deploy/test/fixtures/contracts/**/*' './deploy/test/fixtures/contracts/*' ./lib", "build": "tsc", - "test": "run-s build compile run_mocha", + "test": "run-s compile build run_mocha", "run_mocha": "mocha 'lib/test/**/*.js' --timeout 10000 --bail --exit", "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846", -- cgit