sinonjs / fake-timers

Fake setTimeout and friends (collectively known as "timers"). Useful in your JavaScript tests. Extracted from Sinon.JS
BSD 3-Clause "New" or "Revised" License
806 stars 107 forks source link

Upgrade eslint, add prettier #271

Closed mroderick closed 5 years ago

mroderick commented 5 years ago

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

fatso83 commented 5 years ago

@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 commented 5 years ago

@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 commented 5 years ago

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