diff options
Diffstat (limited to 'packages/contracts/package.json')
| -rw-r--r-- | packages/contracts/package.json | 17 |
1 files changed, 14 insertions, 3 deletions
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", |