From 972689c44845e14da44ab7a3271c496dbbc6e208 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sat, 21 Apr 2018 21:18:03 -0700 Subject: [PATCH] Upgrade Prettier --- js/actionCreators.js | 16 ++++++++++++---- js/components/PlaylistWindow/TrackCell.js | 5 ++++- js/mediaMiddleware.js | 4 +++- js/selectors.js | 5 ++++- package.json | 2 +- yarn.lock | 6 +++--- 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/js/actionCreators.js b/js/actionCreators.js index 5bf201ef..85dccd9b 100644 --- a/js/actionCreators.js +++ b/js/actionCreators.js @@ -81,7 +81,9 @@ const loadQueue = new LoadQueue({ threads: 4 }); function playRandomTrack() { return (dispatch, getState) => { - const { playlist: { trackOrder, currentTrack } } = getState(); + const { + playlist: { trackOrder, currentTrack } + } = getState(); if (trackOrder.length === 0) { return; } @@ -548,7 +550,9 @@ export function cropPlaylist() { if (getSelectedTrackObjects(state).length === 0) { return; } - const { playlist: { tracks } } = getState(); + const { + playlist: { tracks } + } = getState(); dispatch({ type: REMOVE_TRACKS, ids: Object.keys(tracks).filter(id => !tracks[id].selected) @@ -558,7 +562,9 @@ export function cropPlaylist() { export function removeSelectedTracks() { return (dispatch, getState) => { - const { playlist: { tracks } } = getState(); + const { + playlist: { tracks } + } = getState(); dispatch({ type: REMOVE_TRACKS, ids: Object.keys(tracks).filter(id => tracks[id].selected) @@ -652,7 +658,9 @@ function findLastIndex(arr, cb) { export function dragSelected(offset) { return (dispatch, getState) => { - const { playlist: { trackOrder, tracks } } = getState(); + const { + playlist: { trackOrder, tracks } + } = getState(); const firstSelected = trackOrder.findIndex( trackId => tracks[trackId] && tracks[trackId].selected ); diff --git a/js/components/PlaylistWindow/TrackCell.js b/js/components/PlaylistWindow/TrackCell.js index 8330c74a..000afe4e 100644 --- a/js/components/PlaylistWindow/TrackCell.js +++ b/js/components/PlaylistWindow/TrackCell.js @@ -59,7 +59,10 @@ class TrackCell extends React.Component { } const mapStateToProps = (state, ownProps) => { - const { display: { skinPlaylistStyle }, playlist: { tracks } } = state; + const { + display: { skinPlaylistStyle }, + playlist: { tracks } + } = state; const current = getCurrentTrackId(state) === ownProps.id; const track = tracks[ownProps.id]; return { skinPlaylistStyle, selected: track.selected, current }; diff --git a/js/mediaMiddleware.js b/js/mediaMiddleware.js index bf4787d8..59a31e94 100644 --- a/js/mediaMiddleware.js +++ b/js/mediaMiddleware.js @@ -22,7 +22,9 @@ import { next as nextTrack } from "./actionCreators"; import { getCurrentTrackId } from "./selectors"; export default media => store => { - const { media: { volume, balance } } = store.getState(); + const { + media: { volume, balance } + } = store.getState(); // Ensure the default state is the canonical value. media.setVolume(volume); diff --git a/js/selectors.js b/js/selectors.js index 6ef94e14..6e5844bd 100644 --- a/js/selectors.js +++ b/js/selectors.js @@ -86,7 +86,10 @@ export const getCurrentTrackNumber = createSelector( export const getCurrentTrackId = state => state.playlist.currentTrack; export const nextTrack = (state, n = 1) => { - const { playlist: { trackOrder }, media: { repeat } } = state; + const { + playlist: { trackOrder }, + media: { repeat } + } = state; const trackCount = getTrackCount(state); if (trackCount === 0) { return null; diff --git a/package.json b/package.json index 5d1e78f2..ec7e814e 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "invariant": "^2.2.3", "jsmediatags": "^3.8.1", "jszip": "^3.1.3", - "prettier": "^1.10.2", + "prettier": "^1.12.1", "prop-types": "^15.5.10", "raven-for-redux": "^1.3.1", "raven-js": "^3.19.1", diff --git a/yarn.lock b/yarn.lock index 18434aaf..a678eb0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5642,9 +5642,9 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.10.2: - version "1.10.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.10.2.tgz#1af8356d1842276a99a5b5529c82dd9e9ad3cc93" +prettier@^1.12.1: + version "1.12.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325" pretty-bytes@^4.0.2: version "4.0.2"