diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-12-16 02:37:03 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-12-16 02:37:03 +0800 |
| commit | b46dd2e0a277340c19fa137a436981cc53c8cb80 (patch) | |
| tree | d2814176fe8ffc5ec6a61534aa77487aae6bcc13 /packages/contracts/package.json | |
| parent | 484dd4c33aa5786def1f0b159f5b51f99a585aa8 (diff) | |
| parent | 3eb08735d4d0fe4b046dd6b74f5ed503cf5c64e3 (diff) | |
| download | dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.gz dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.bz2 dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.lz dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.xz dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.tar.zst dexon-sol-tools-b46dd2e0a277340c19fa137a436981cc53c8cb80.zip | |
Merge branch 'development' into createWethPage
* development: (54 commits)
Fix redundant spaces
Fix tests
Fix website unused vars
Fix connect unused vars
Fix 0x.js unused vars
Dissallow unused vars/imports
Implement first custom linter rule async-suffix
Reuse intervalutils in website
Add a newline
Name a variable
Add a comment
Fix a conditional
Make migrations deterministic
Fix linter error
Fix linter errors
Add a function to init token balances
Rename tokenUtils.getNonProtocolTokens to tokenUtils.getDummyTokens
Add DummyToken to gitignore
Add DummyToken to artifacts list
Increase mocha timeout
...
Diffstat (limited to 'packages/contracts/package.json')
| -rw-r--r-- | packages/contracts/package.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index d2f30933a..c8ccd0a3a 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -15,6 +15,7 @@ "migrate:truffle": "npm run build; truffle migrate", "migrate": "npm run build; node lib/deploy/cli.js migrate", "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'", + "test:circleci": "yarn test; yarn test:deployer", "test:deployer": "npm run build; mocha lib/deploy/test/*_test.js" }, "repository": { @@ -28,10 +29,10 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/contracts/README.md", "devDependencies": { + "@0xproject/dev-utils": "^0.0.1", "@0xproject/tslint-config": "^0.2.1", "@0xproject/types": "^0.1.0", "@types/bluebird": "^3.5.3", - "@types/isomorphic-fetch": "^0.0.34", "@types/lodash": "^4.14.86", "@types/node": "^8.0.53", "@types/request-promise-native": "^1.0.2", @@ -45,7 +46,7 @@ "dirty-chai": "^2.0.1", "mocha": "^4.0.1", "solc": "^0.4.18", - "truffle": "3.4.3", + "truffle": "^4.0.1", "tslint": "5.8.0", "types-bn": "^0.0.1", "types-ethereumjs-util": "0xProject/types-ethereumjs-util", @@ -54,7 +55,7 @@ "yargs": "^10.0.3" }, "dependencies": { - "0x.js": "^0.22.6", + "0x.js": "~0.27.2", "@0xproject/json-schemas": "^0.6.10", "@0xproject/utils": "^0.1.0", "@0xproject/web3-wrapper": "^0.1.0", |