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

fix: guess line ending before preprocess #4957

Merged
merged 3 commits into from Aug 9, 2018

Conversation

@ikatyang
Copy link
Member

commented Aug 8, 2018

Fixes #4956

I originally thought it worked this way, but apparently not.

  • I’ve added tests to confirm my change works.
  • (If changing the API or CLI) I’ve documented the changes I’ve made (in the docs/ directory)
  • I’ve read the contributing guidelines.

cc @kachkaev

@kachkaev

This comment has been minimized.

Copy link
Contributor

commented Aug 8, 2018

This should work as a fix by the look of the diff. I don't have a Windows machine near me now, but I can test your custom version of Prettier in VSTS. How urgent is that? Can this quickly jump into 1.14.2 or shall we wait for a week or so till there is a bundle of fixes?

@kachkaev

This comment has been minimized.

Copy link
Contributor

commented Aug 8, 2018

Shame that I did not report it an hour earlier! Looks like I was writing the issue right when you were releasing 1.14.1 😅

@ikatyang

This comment has been minimized.

Copy link
Member Author

commented Aug 8, 2018

I was writing the changelog, I should wait for this PR to release 1.14.1.. 😭

I'm not sure when should we release the next version but you could install it from GitHub after this PR merged as a temporary workaround.

@j-f1

This comment has been minimized.

Copy link
Member

commented Aug 8, 2018

You could also do 1.14.2.

@j-f1
j-f1 approved these changes Aug 8, 2018
Copy link
Member

left a comment

This fixes the lint error in GitHub Desktop!

@ikatyang

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2018

OK, let's release 1.14.2, hope this is the last patch in 1.14.

@ikatyang ikatyang added this to the 1.14.2 milestone Aug 9, 2018

@ikatyang ikatyang merged commit 53c83f9 into prettier:master Aug 9, 2018

10 checks passed

ci/circleci: build_prod Your tests passed on CircleCI!
Details
ci/circleci: checkout_code Your tests passed on CircleCI!
Details
ci/circleci: test_prod_node4 Your tests passed on CircleCI!
Details
ci/circleci: test_prod_node9 Your tests passed on CircleCI!
Details
ci/circleci: test_prod_standalone Your tests passed on CircleCI!
Details
codecov/patch 100% of diff hit (target 80%)
Details
codecov/project 96.47% (+0.01%) compared to 3842cbb
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
deploy/netlify Deploy preview ready!
Details

@ikatyang ikatyang deleted the ikatyang:fix/yaml/crlf branch Aug 9, 2018

@ikatyang

This comment has been minimized.

Copy link
Member Author

commented Aug 9, 2018

@kachkaev

This comment has been minimized.

Copy link
Contributor

commented Aug 9, 2018

Upgrading to 1.14.2 solved the issue, many thanks once again @ikatyang! 🎉

@lock lock bot locked as resolved and limited conversation to collaborators Nov 7, 2018

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
3 participants
You can’t perform that action at this time.