diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2017-11-15 01:29:46 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2017-11-15 01:29:46 +0800 |
| commit | 9bb5e6f5ce199acde620a0fb8f36f585e1c763e9 (patch) | |
| tree | 125f6d75b0e664208d5fef11694d9e982a932c45 /packages/assert | |
| parent | 56b5619d24b44d23f770b58b0c9e1d4a63b89aca (diff) | |
| parent | 05de07496fe3f9089b4c96b0594b234afc436304 (diff) | |
| download | dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.gz dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.bz2 dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.lz dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.xz dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.tar.zst dexon-0x-contracts-9bb5e6f5ce199acde620a0fb8f36f585e1c763e9.zip | |
Merge branch 'development' into feature/addJsonSchemas
* development:
Improve description
Alphabetize
Add exit 0 to 0x.js build command
Add snapshot save and revert to order_state_watcher_test.ts
Fix changelog
Use tslint v5.8.0 everywhere and use the tslint-config sub-package instead of the old repo as a dep. in the rest of the sub-packages.
Add tslint-config sub-package
Fix tslint issue
Public interface has changed, moved to minor version
Update changelog
Renamed canceled to cancelled
Diffstat (limited to 'packages/assert')
| -rw-r--r-- | packages/assert/package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/assert/package.json b/packages/assert/package.json index 51b88f58b..d82ce19e4 100644 --- a/packages/assert/package.json +++ b/packages/assert/package.json @@ -24,6 +24,7 @@ }, "homepage": "https://github.com/0xProject/0x.js/packages/assert/README.md", "devDependencies": { + "@0xproject/tslint-config": "0.0.2", "@types/lodash": "^4.14.78", "@types/mocha": "^2.2.42", "@types/valid-url": "^1.0.2", @@ -33,8 +34,7 @@ "mocha": "^4.0.1", "npm-run-all": "^4.1.1", "shx": "^0.2.2", - "tslint": "~5.5.0", - "tslint-config-0xproject": "^0.0.2", + "tslint": "5.8.0", "typescript": "^2.4.2" }, "dependencies": { |