diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-01-25 23:42:58 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-01-25 23:42:58 +0800 |
| commit | 71d68f975cd7bc089f0cbef4e5888a73eab4ee42 (patch) | |
| tree | 9482602fc23d2baec3fff1fb97750ad45adc6eca /package.json | |
| parent | ec3d8a034fe763d8255935985b1fb97aff6c177b (diff) | |
| parent | f58f0ddb67555c3f0c7252ea3e003824984c48ad (diff) | |
| download | dexon-sol-tools-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar dexon-sol-tools-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar.gz dexon-sol-tools-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar.bz2 dexon-sol-tools-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar.lz dexon-sol-tools-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar.xz dexon-sol-tools-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.tar.zst dexon-sol-tools-71d68f975cd7bc089f0cbef4e5888a73eab4ee42.zip | |
Merge branch 'development' into feature/portal-ledger-support
* development: (437 commits)
Publish
Update yarn.lock
Update the CHANGELOG
Fix the bug making it impossible to specify the custom ZRX address
Fix fill/cancel order by looking for NoError instead of empty blockchainErr given the BlockchainErrs type refactor
Add a comment about a yarn bug
Add our mainnet and kovan nodes as backups for Portal requests
Fix bug hiding the user info from topBar
Add dev-utils package to top level README
Prettier newline
Prettier
Allow Token symbols to be alphanumeric
Update CHANGELOG, rebase on development
Should not -> cannot
Reject negative amounts in isValidBaseUnitAmount
Re-add changelog for 0x.js
Fix prettier
Update yarn.lock
Move tests to a separate folder
Change file layout
...
# Conflicts:
# packages/website/README.md
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/package.json b/package.json index 54a2148d2..dcb48c10d 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,26 @@ { "private": true, "name": "0x.js", - "workspaces": [ - "packages/*" - ], + "workspaces": ["packages/*"], "scripts": { "testrpc": "testrpc -p 8545 --networkId 50 -m \"${npm_package_config_mnemonic}\"", + "prettier": "prettier --write '**/*.{ts,tsx,json,md}'", + "prettier:ci": "prettier --list-different '**/*.{ts,tsx,json,md}'", "lerna:run": "lerna run", - "lerna:publish": "lerna run clean; lerna run build; lerna publish --registry=https://registry.npmjs.org/" + "lerna:rebuild": "lerna run clean; lerna run build;", + "lerna:publish": + "yarn install; lerna run clean; lerna run build; lerna publish --registry=https://registry.npmjs.org/" }, "config": { - "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic" + "mnemonic": "concert load couple harbor equip island argue ramp clarify fence smart topic" }, "devDependencies": { - "lerna": "^2.5.1", + "@0xproject/utils": "^0.2.0", "async-child-process": "^1.1.1", - "semver-sort": "^0.0.4", + "ethereumjs-testrpc": "^6.0.3", + "lerna": "^2.5.1", + "prettier": "1.9.2", "publish-release": "0xproject/publish-release", - "ethereumjs-testrpc": "6.0.3" + "semver-sort": "^0.0.4" } } |