Skip to content
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
merged 4 commits into from
Apr 22, 2017

Conversation

flarnie
Copy link
Contributor

@flarnie flarnie commented Apr 22, 2017

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.

This is an easy fix and I'd like this branch to be as similar to master
(v16.0) as possible.
@flarnie flarnie added this to the 15.6 milestone Apr 22, 2017
@flarnie flarnie requested a review from sophiebits April 22, 2017 00:27
Copy link
Collaborator

@sophiebits sophiebits left a 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!

@flarnie
Copy link
Contributor Author

flarnie commented Apr 22, 2017

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.
@flarnie
Copy link
Contributor Author

flarnie commented Apr 22, 2017

The test failures are the same which fail currently on 15-stable, and will soon be fixed by #9486

@flarnie flarnie merged commit ad1d352 into facebook:15.6-dev Apr 22, 2017
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants