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

Upgrade eslint, add prettier #271

Merged
merged 1 commit into from
Oct 10, 2019
Merged

Conversation

mroderick
Copy link
Member

This PR replaces #262, as dependabot doesn't know how to upgrade when new dependencies are needed.

  • Upgrade and add related plugins and configs
  • Fix/disable lint violations

* Upgrade and add related plugins and configs
* Fix/disable lint violations
@fatso83 fatso83 merged commit 5402aac into sinonjs:master Oct 10, 2019
@mroderick mroderick deleted the upgrade-eslint branch October 10, 2019 11:20
@fatso83
Copy link
Contributor

fatso83 commented Oct 10, 2019

@mroderick Merging this with all the prettier changes made a conflicting mess out of #237 (which no longer had any conflicts). Could we revert this, merge #237 and then re-merge (a rebased version of) this? I tried cleaning up by quickly resetting the branch, but it's protected (yeah, yeah, yeah), so I couldn't do this without anyone noticing ...

@mroderick
Copy link
Member Author

@mroderick Merging this with all the prettier changes made a conflicting mess out of #237 (which no longer had any conflicts). Could we revert this, merge #237 and then re-merge (a rebased version of) this? I tried cleaning up by quickly resetting the branch, but it's protected (yeah, yeah, yeah), so I couldn't do this without anyone noticing ...

Sure, go ahead!

@fatso83
Copy link
Contributor

fatso83 commented Oct 10, 2019

Ha, seems @dominykas beat me to it, and actually fixed the conflicts.

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