aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-02-28 07:08:52 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-02-28 07:08:52 +0800
commit30e4613d0a5817b880feba3a2c7ad9900c8d287b (patch)
treeaccf863288e64f32814c3633b3c23450bb8e9973
parent7aa070f9eaef734274df6e6eaa4590fe30d52899 (diff)
downloaddexon-sol-tools-30e4613d0a5817b880feba3a2c7ad9900c8d287b.tar.gz
dexon-sol-tools-30e4613d0a5817b880feba3a2c7ad9900c8d287b.tar.zst
dexon-sol-tools-30e4613d0a5817b880feba3a2c7ad9900c8d287b.zip
Upgrate prettier
-rw-r--r--CONTRIBUTING.md14
-rw-r--r--PULL_REQUEST_TEMPLATE.md18
-rw-r--r--README.md8
-rw-r--r--package.json2
-rw-r--r--packages/connect/README.md4
-rw-r--r--packages/contracts/README.md10
-rw-r--r--packages/json-schemas/CHANGELOG.md2
-rw-r--r--packages/subproviders/README.md8
-rw-r--r--packages/website/README.md10
-rw-r--r--packages/website/md/docs/smart_contracts/introduction.md8
-rw-r--r--yarn.lock6
11 files changed, 45 insertions, 45 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index e8828ff6b..2bb71e855 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -8,9 +8,9 @@ If you'd like to contribute to 0x protocol, please fork the repo, fix, commit an
We encourage a “PR early” approach so create the PR as early as possible even without the fix/feature ready, so that devs and other contributors know you have picked up the issue. These early PRs should indicate an 'in progress' status by adding the '[WIP]' prefix to the PR title. Please make sure your contributions adhere to our coding guidelines:
-* Pull requests adding features or refactoring should be opened against the `development` branch
-* Pull requests fixing bugs in the latest release version should be opened again the `master` branch
-* Write [good commit messages](https://chris.beams.io/posts/git-commit/)
+* Pull requests adding features or refactoring should be opened against the `development` branch
+* Pull requests fixing bugs in the latest release version should be opened again the `master` branch
+* Write [good commit messages](https://chris.beams.io/posts/git-commit/)
### Code quality
@@ -31,10 +31,10 @@ We also use [Prettier](https://prettier.io/) to auto-format our code. Be sure to
If using the Atom text editor, we recommend you install the following packages:
-* [atom-typescript](https://atom.io/packages/atom-typescript)
-* [linter-tslint](https://atom.io/packages/linter-tslint)
-* [prettier-atom](https://atom.io/packages/prettier-atom)
-* [language-ethereum](https://atom.io/packages/language-ethereum)
+* [atom-typescript](https://atom.io/packages/atom-typescript)
+* [linter-tslint](https://atom.io/packages/linter-tslint)
+* [prettier-atom](https://atom.io/packages/prettier-atom)
+* [language-ethereum](https://atom.io/packages/language-ethereum)
Our CI will also run TSLint and Prettier as a part of the test run when you submit your PR. Make sure that the CI tests pass for your contribution.
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 96eae1691..481b1d536 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -24,9 +24,9 @@
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
-* [ ] Bug fix (non-breaking change which fixes an issue)
-* [ ] New feature (non-breaking change which adds functionality)
-* [ ] Breaking change (fix or feature that would cause existing functionality to change)
+* [ ] Bug fix (non-breaking change which fixes an issue)
+* [ ] New feature (non-breaking change which adds functionality)
+* [ ] Breaking change (fix or feature that would cause existing functionality to change)
## Checklist:
@@ -34,9 +34,9 @@
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-* [ ] Change requires a change to the documentation.
-* [ ] Added tests to cover my changes.
-* [ ] Added new entries to the relevant CHANGELOGs.
-* [ ] Updated the new versions of the changed packages in the relevant CHANGELOGs.
-* [ ] Labeled this PR with the 'WIP' label if it is a work in progress.
-* [ ] Labeled this PR with the labels corresponding to the changed package.
+* [ ] Change requires a change to the documentation.
+* [ ] Added tests to cover my changes.
+* [ ] Added new entries to the relevant CHANGELOGs.
+* [ ] Updated the new versions of the changed packages in the relevant CHANGELOGs.
+* [ ] Labeled this PR with the 'WIP' label if it is a work in progress.
+* [ ] Labeled this PR with the labels corresponding to the changed package.
diff --git a/README.md b/README.md
index 775f7cdf3..8ade618b5 100644
--- a/README.md
+++ b/README.md
@@ -48,10 +48,10 @@ This repository contains all the 0x developer tools written in TypeScript. Our h
Dedicated documentation pages:
-* [0x.js Library](https://0xproject.com/docs/0xjs)
-* [0x Connect](https://0xproject.com/docs/connect)
-* [Smart contracts](https://0xproject.com/docs/contracts)
-* [Standard Relayer API](https://github.com/0xProject/standard-relayer-api/blob/master/README.md)
+* [0x.js Library](https://0xproject.com/docs/0xjs)
+* [0x Connect](https://0xproject.com/docs/connect)
+* [Smart contracts](https://0xproject.com/docs/contracts)
+* [Standard Relayer API](https://github.com/0xProject/standard-relayer-api/blob/master/README.md)
## Contributing
diff --git a/package.json b/package.json
index 9c3825822..e130cbcc8 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"async-child-process": "^1.1.1",
"ethereumjs-testrpc": "^6.0.3",
"lerna": "^2.5.1",
- "prettier": "1.9.2",
+ "prettier": "^1.11.0",
"publish-release": "0xproject/publish-release",
"semver-sort": "^0.0.4"
}
diff --git a/packages/connect/README.md b/packages/connect/README.md
index 63faf5271..7302322e6 100644
--- a/packages/connect/README.md
+++ b/packages/connect/README.md
@@ -10,8 +10,8 @@ yarn add @0xproject/connect
## Usage
-* [Docs](https://0xproject.com/docs/connect)
-* [Tutorials](https://0xproject.com/wiki#connect)
+* [Docs](https://0xproject.com/docs/connect)
+* [Tutorials](https://0xproject.com/wiki#connect)
## Contributing
diff --git a/packages/contracts/README.md b/packages/contracts/README.md
index 11b9e5056..c209edf02 100644
--- a/packages/contracts/README.md
+++ b/packages/contracts/README.md
@@ -4,11 +4,11 @@ Smart contracts that implement the 0x protocol.
## Usage
-* [Docs](https://0xproject.com/docs/contracts)
-* [Overview of 0x protocol architecture](https://0xproject.com/wiki#Architecture)
-* [0x smart contract interactions](https://0xproject.com/wiki#Contract-Interactions)
-* [Deployed smart contract addresses](https://0xproject.com/wiki#Deployed-Addresses)
-* [0x protocol message format](https://0xproject.com/wiki#Message-Format)
+* [Docs](https://0xproject.com/docs/contracts)
+* [Overview of 0x protocol architecture](https://0xproject.com/wiki#Architecture)
+* [0x smart contract interactions](https://0xproject.com/wiki#Contract-Interactions)
+* [Deployed smart contract addresses](https://0xproject.com/wiki#Deployed-Addresses)
+* [0x protocol message format](https://0xproject.com/wiki#Message-Format)
## Contributing
diff --git a/packages/json-schemas/CHANGELOG.md b/packages/json-schemas/CHANGELOG.md
index 9a9fc12de..7fdae6cf3 100644
--- a/packages/json-schemas/CHANGELOG.md
+++ b/packages/json-schemas/CHANGELOG.md
@@ -2,7 +2,7 @@
## v0.7.10 - _February 9, 2018_
-* Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
+* Fix publishing issue where .npmignore was not properly excluding undesired content (#389)
## v0.7.0 - _December 20, 2017_
diff --git a/packages/subproviders/README.md b/packages/subproviders/README.md
index 954729713..39e4a46e7 100644
--- a/packages/subproviders/README.md
+++ b/packages/subproviders/README.md
@@ -96,10 +96,10 @@ yarn run test:unit
In order to run the integration tests, make sure you have a Ledger Nano S available.
-* Plug it into your computer
-* Unlock the device
-* Open the on-device Ethereum app
-* Make sure "browser support" is disabled
+* Plug it into your computer
+* Unlock the device
+* Open the on-device Ethereum app
+* Make sure "browser support" is disabled
Then run:
diff --git a/packages/website/README.md b/packages/website/README.md
index 7d3187781..042df52de 100644
--- a/packages/website/README.md
+++ b/packages/website/README.md
@@ -58,11 +58,11 @@ yarn lint
##### Toolkit
-* [Material Design Icon Font](http://zavoloklom.github.io/material-design-iconic-font/icons.html#directional)
-* [BassCSS toolkit](http://basscss.com/)
-* [Material-UI component library](http://www.material-ui.com/#/)
+* [Material Design Icon Font](http://zavoloklom.github.io/material-design-iconic-font/icons.html#directional)
+* [BassCSS toolkit](http://basscss.com/)
+* [Material-UI component library](http://www.material-ui.com/#/)
##### Recommended Atom packages:
-* [atom-typescript](https://atom.io/packages/atom-typescript)
-* [linter-tslint](https://atom.io/packages/linter-tslint)
+* [atom-typescript](https://atom.io/packages/atom-typescript)
+* [linter-tslint](https://atom.io/packages/linter-tslint)
diff --git a/packages/website/md/docs/smart_contracts/introduction.md b/packages/website/md/docs/smart_contracts/introduction.md
index 20396289b..566a573b6 100644
--- a/packages/website/md/docs/smart_contracts/introduction.md
+++ b/packages/website/md/docs/smart_contracts/introduction.md
@@ -2,7 +2,7 @@ Welcome to the [0x smart contracts](https://github.com/0xProject/contracts) docu
### Helpful wiki articles:
-* [Overview of 0x protocol architecture](https://0xproject.com/wiki#Architecture)
-* [0x smart contract interactions](https://0xproject.com/wiki#Contract-Interactions)
-* [Deployed smart contract addresses](https://0xproject.com/wiki#Deployed-Addresses)
-* [0x protocol message format](https://0xproject.com/wiki#Message-Format)
+* [Overview of 0x protocol architecture](https://0xproject.com/wiki#Architecture)
+* [0x smart contract interactions](https://0xproject.com/wiki#Contract-Interactions)
+* [Deployed smart contract addresses](https://0xproject.com/wiki#Deployed-Addresses)
+* [0x protocol message format](https://0xproject.com/wiki#Message-Format)
diff --git a/yarn.lock b/yarn.lock
index ddcaa3f9e..a334b14e5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6967,9 +6967,9 @@ preserve@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-prettier@1.9.2:
- version "1.9.2"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
+prettier@^1.11.0:
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.0.tgz#c024f70cab158c993f50fc0c25ffe738cb8b0f85"
pretty-bytes@^1.0.4:
version "1.0.4"