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

prefer file local prettier #876

Merged
merged 1 commit into from
Sep 25, 2018
Merged

prefer file local prettier #876

merged 1 commit into from
Sep 25, 2018

Conversation

maeldur
Copy link
Contributor

@maeldur maeldur commented Aug 15, 2018

I brought in the file from prettier-vscode to have vetur behave the same way as that extension

I've tested this change with no prettier, an older version of prettier, and a newer one and it seems to work ok.. is there more formal testing i should do?

@maeldur
Copy link
Contributor Author

maeldur commented Aug 15, 2018

Btw, thanks for the awesome extension and really appreciate the work you did in #873! hopefully this takes us to 1/15 😄

@maeldur maeldur changed the title prefer file local prettier #523 prefer file local prettier Aug 15, 2018
@maeldur
Copy link
Contributor Author

maeldur commented Sep 8, 2018

@octref any comments on this PR? thanks in advance

Copy link
Member

@octref octref left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Rebase on master
  • Add copyright notice, since this code is largely from vscode-prettier
  • requireLocalPkg for prettier-eslint too

@octref
Copy link
Member

octref commented Sep 24, 2018

Sorry for the late response. Mostly look good. Once you make the requested changes I'll pull it in.

@maeldur maeldur force-pushed the master branch 3 times, most recently from 99e2b84 to 47c6ea0 Compare September 25, 2018 00:10
@maeldur
Copy link
Contributor Author

maeldur commented Sep 25, 2018

Hi @octref, changes made.

re: copyright, I added an entry into ThirdPartyNotices with the LICENSE from prettier-vscode. is that what you meant? If not, let me know if there's something else I can do.

@octref
Copy link
Member

octref commented Sep 25, 2018

@maeldur Thanks for adding it to the ThirdPartyNotice. In the requirePkg.ts file's top, please also include something like (use y to permalink to the file in a specific commit)

/**
 * Adapted from https://github.com/prettier/prettier-vscode/blob/1843acb5defac7898862a1df61cb67c7a8355d69/src/requirePkg.ts
 */

@maeldur
Copy link
Contributor Author

maeldur commented Sep 25, 2018

@octref thanks for the review - added. i went 9 digits into the sha for the blob but if you prefer the long one i'll use the whole thing.

@octref
Copy link
Member

octref commented Sep 25, 2018

Thanks again. I just made a release. I'll try to bring in prettyhtml and make a new release again.

@octref octref merged commit 4e83011 into vuejs:master Sep 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants