diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-07 18:21:44 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-07 18:21:44 +0800 |
| commit | 10478a6b2fd1f2a01597a88afde9cf582640a849 (patch) | |
| tree | 3ebbb29656cf59b2547ec3c5a3c5b90ee6264483 /packages/contracts/package.json | |
| parent | cf8fdd3a701f21bfc3b2ec8397fa65948f5cdc78 (diff) | |
| parent | e0bc01eea1c20e0afda296f331c6a475e062b59c (diff) | |
| download | dexon-0x-contracts-10478a6b2fd1f2a01597a88afde9cf582640a849.tar.gz dexon-0x-contracts-10478a6b2fd1f2a01597a88afde9cf582640a849.tar.zst dexon-0x-contracts-10478a6b2fd1f2a01597a88afde9cf582640a849.zip | |
Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils
* v2-prototype: (66 commits)
Run prettier
Remove unused variable
Fix linting issues
Change shouldRenderHeader prop to shouldHideHeader
Get build and tests to pass
typo
Apply prettier
Update contracts tests after rebase
Apply various fixes based on PR feedback
Document debug_increaseTime method and fix typo in devnet README
Use an enum for ProviderType in contracts/src/utils/web3_wrapper
Update contracts package README
Update relevant changelogs
Remove global gas estimate buffer
Add Async suffix to relevant assertions
Fix linter errors
Update package.json and yarn.lock
Update more things to work with both Geth and Ganache
Small fixes and cleanup
Add additional gas to calls to fillOrderNoThrow
...
# Conflicts:
# packages/order-watcher/src/order_watcher/order_watcher.ts
# packages/react-docs/src/components/type.tsx
# packages/website/ts/components/ui/lifecycle_raised_button.tsx
# packages/website/ts/components/wallet/wallet.tsx
Diffstat (limited to 'packages/contracts/package.json')
| -rw-r--r-- | packages/contracts/package.json | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/packages/contracts/package.json b/packages/contracts/package.json index 3b9fda227..3f9160fa7 100644 --- a/packages/contracts/package.json +++ b/packages/contracts/package.json @@ -22,8 +22,8 @@ "compile": "sol-compiler", "clean": "shx rm -rf lib src/contract_wrappers/generated", "generate_contract_wrappers": - "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'", - "lint": "tslint --project .", + "abi-gen --abis ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers", + "lint": "tslint --project . --exclude **/src/contract_wrappers/**/* --exclude **/lib/**/*", "coverage:report:text": "istanbul report text", "coverage:report:html": "istanbul report html && open coverage/index.html", "coverage:report:lcov": "istanbul report lcov", @@ -61,7 +61,6 @@ "make-promises-safe": "^1.1.0", "mocha": "^4.0.1", "npm-run-all": "^4.1.2", - "prettier": "^1.11.1", "shx": "^0.2.2", "solc": "^0.4.24", "tslint": "5.8.0", |