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/contract-wrappers/package.json | |
| parent | cf8fdd3a701f21bfc3b2ec8397fa65948f5cdc78 (diff) | |
| parent | e0bc01eea1c20e0afda296f331c6a475e062b59c (diff) | |
| download | dexon-sol-tools-10478a6b2fd1f2a01597a88afde9cf582640a849.tar dexon-sol-tools-10478a6b2fd1f2a01597a88afde9cf582640a849.tar.gz dexon-sol-tools-10478a6b2fd1f2a01597a88afde9cf582640a849.tar.bz2 dexon-sol-tools-10478a6b2fd1f2a01597a88afde9cf582640a849.tar.lz dexon-sol-tools-10478a6b2fd1f2a01597a88afde9cf582640a849.tar.xz dexon-sol-tools-10478a6b2fd1f2a01597a88afde9cf582640a849.tar.zst dexon-sol-tools-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/contract-wrappers/package.json')
| -rw-r--r-- | packages/contract-wrappers/package.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json index d5ec86fc6..71c2ee780 100644 --- a/packages/contract-wrappers/package.json +++ b/packages/contract-wrappers/package.json @@ -15,7 +15,7 @@ "build": "yarn pre_build && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts", "pre_build": "run-s generate_contract_wrappers update_test_artifacts update_compact_artifacts", "generate_contract_wrappers": "abi-gen --abis 'src/compact_artifacts/@(Exchange|Token|TokenTransferProxy|EtherToken|TokenRegistry|DummyToken).json' --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 .", + "lint": "tslint --project . --exclude **/src/contract_wrappers/**/* --exclude **/lib/**/*", "test:circleci": "run-s test:coverage", "test": "yarn run_mocha", "rebuild_and_test": "run-s build test", @@ -69,7 +69,6 @@ "npm-run-all": "^4.1.2", "nyc": "^11.0.1", "opn-cli": "^3.1.0", - "prettier": "^1.11.1", "shx": "^0.2.2", "sinon": "^4.0.0", "source-map-support": "^0.5.0", |