-
Notifications
You must be signed in to change notification settings - Fork 45.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Run 'prettier' on the v15.6 branch #9487
Merged
flarnie
merged 4 commits into
facebook:15.6-dev
from
flarnie:run-prettier-on-15.6-branch
Apr 22, 2017
Merged
Run 'prettier' on the v15.6 branch #9487
flarnie
merged 4 commits into
facebook:15.6-dev
from
flarnie:run-prettier-on-15.6-branch
Apr 22, 2017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This is an easy fix and I'd like this branch to be as similar to master (v16.0) as possible.
sophiebits
approved these changes
Apr 22, 2017
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Want to include the package.json/yarn.lock change here too? lgtm!
Thanks - adding the package.json/yarn.lock changes now. |
Checking in the updated `package.json` and `yarn.lock` for the 15.6 branch. Oddly, running `yarn prettier` updated more files. I thought the previous commit had covered all `prettier` syntax updates. Will commit the new changes in a separate commit.
More syntax updates to get `prettier` checks passing on the `15.6-dev` branch, and eventually, on 15-stable.
Something with running `prettier` moves or changes these comments in a way that they were no longer being applied. We tweaked them so that both 'prettier' and 'eslint' pass.
The test failures are the same which fail currently on 15-stable, and will soon be fixed by #9486 |
flarnie
added a commit
to flarnie/react
that referenced
this pull request
Jun 7, 2017
* Run 'prettier' on the v15.6 branch This is an easy fix and I'd like this branch to be as similar to master (v16.0) as possible. * `npm install --save-dev prettier && yarn prettier` Checking in the updated `package.json` and `yarn.lock` for the 15.6 branch. Oddly, running `yarn prettier` updated more files. I thought the previous commit had covered all `prettier` syntax updates. Will commit the new changes in a separate commit. * Ran prettier More syntax updates to get `prettier` checks passing on the `15.6-dev` branch, and eventually, on 15-stable. * Tweak eslint ignore comments to get linter passing Something with running `prettier` moves or changes these comments in a way that they were no longer being applied. We tweaked them so that both 'prettier' and 'eslint' pass.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is an easy fix and I'd like this branch to be as similar to master
(v16.0) as possible.
Either this or we should disable the 'prettier' test for the 15.x branches.