From ebad033dbf74057b9ac49d664bb3b36601798134 Mon Sep 17 00:00:00 2001 From: Jordan Eldredge Date: Sun, 30 May 2021 14:18:56 -0700 Subject: [PATCH] Upgrade prettier --- packages/webamp/css/equalizer-window.css | 1 - packages/webamp/demo/css/page.css | 2 +- packages/webamp/demo/js/config.ts | 36 +++++++------------ packages/webamp/demo/js/eventLogger.ts | 17 +++++---- packages/webamp/demo/js/index.tsx | 12 +++---- .../js/components/ContextMenuWrapper.tsx | 9 ++--- .../js/components/EqualizerWindow/EqGraph.tsx | 7 ++-- .../components/MilkdropWindow/Visualizer.tsx | 5 ++- .../PlaylistWindow/RunningTimeDisplay.tsx | 7 ++-- .../webamp/js/components/ResizeTarget.tsx | 5 ++- .../webamp/js/components/WindowManager.tsx | 5 ++- packages/webamp/js/constants.ts | 11 +----- packages/webamp/js/hooks.ts | 8 ++--- packages/webamp/js/reducers/windows.ts | 7 ++-- packages/webamp/js/selectors.ts | 7 ++-- packages/webamp/js/utils.ts | 11 +++--- packages/webamp/js/webampLazy.tsx | 6 ++-- packages/webamp/package.json | 2 +- yarn.lock | 5 +++ 19 files changed, 69 insertions(+), 94 deletions(-) diff --git a/packages/webamp/css/equalizer-window.css b/packages/webamp/css/equalizer-window.css index 14a689c8..c9789d98 100644 --- a/packages/webamp/css/equalizer-window.css +++ b/packages/webamp/css/equalizer-window.css @@ -194,4 +194,3 @@ left: 240px; top: 38px; } - diff --git a/packages/webamp/demo/css/page.css b/packages/webamp/demo/css/page.css index f292f41a..e6d1ab5a 100644 --- a/packages/webamp/demo/css/page.css +++ b/packages/webamp/demo/css/page.css @@ -5,7 +5,7 @@ body { font-size: 15px; } -::selection{ +::selection { background: none; } diff --git a/packages/webamp/demo/js/config.ts b/packages/webamp/demo/js/config.ts index fb260444..10293387 100644 --- a/packages/webamp/demo/js/config.ts +++ b/packages/webamp/demo/js/config.ts @@ -48,8 +48,7 @@ export const defaultInitialTracks: URLTrack[] = [ duration: 5.322286, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Diablo_Swing_Orchestra_-_01_-_Heroines.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Diablo_Swing_Orchestra_-_01_-_Heroines.mp3", duration: 322.612245, metaData: { title: "Heroines", @@ -58,8 +57,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Eclectek_-_02_-_We_Are_Going_To_Eclecfunk_Your_Ass.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Eclectek_-_02_-_We_Are_Going_To_Eclecfunk_Your_Ass.mp3", duration: 190.093061, metaData: { title: "We Are Going To Eclecfunk Your Ass", @@ -68,8 +66,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Auto-Pilot_-_03_-_Seventeen.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Auto-Pilot_-_03_-_Seventeen.mp3", duration: 214.622041, metaData: { title: "Seventeen", @@ -78,8 +75,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Muha_-_04_-_Microphone.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Muha_-_04_-_Microphone.mp3", duration: 181.838367, metaData: { title: "Microphone", @@ -88,8 +84,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Just_Plain_Ant_-_05_-_Stumble.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Just_Plain_Ant_-_05_-_Stumble.mp3", duration: 86.047347, metaData: { title: "Stumble", @@ -98,8 +93,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Sleaze_-_06_-_God_Damn.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Sleaze_-_06_-_God_Damn.mp3", duration: 226.795102, metaData: { title: "God Damn", @@ -108,8 +102,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Juanitos_-_07_-_Hola_Hola_Bossa_Nova.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Juanitos_-_07_-_Hola_Hola_Bossa_Nova.mp3", duration: 207.072653, metaData: { title: "Hola Hola Bossa Nova", @@ -118,8 +111,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Entertainment_for_the_Braindead_-_08_-_Resolutions_Chris_Summer_Remix.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Entertainment_for_the_Braindead_-_08_-_Resolutions_Chris_Summer_Remix.mp3", duration: 314.331429, metaData: { title: "Resolutions (Chris Summer Remix)", @@ -128,8 +120,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Nobara_Hayakawa_-_09_-_Trail.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Nobara_Hayakawa_-_09_-_Trail.mp3", duration: 204.042449, metaData: { title: "Trail", @@ -138,8 +129,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Paper_Navy_-_10_-_Tongue_Tied.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/Paper_Navy_-_10_-_Tongue_Tied.mp3", duration: 201.116735, metaData: { title: "Tongue Tied", @@ -148,8 +138,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/60_Tigres_-_11_-_Garage.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/60_Tigres_-_11_-_Garage.mp3", duration: 245.394286, metaData: { title: "Garage", @@ -158,8 +147,7 @@ export const defaultInitialTracks: URLTrack[] = [ }, }, { - url: - "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/CM_aka_Creative_-_12_-_The_Cycle_Featuring_Mista_Mista.mp3", + url: "https://raw.githubusercontent.com/captbaritone/webamp-music/4b556fbf/CM_aka_Creative_-_12_-_The_Cycle_Featuring_Mista_Mista.mp3", duration: 221.44, metaData: { title: "The Cycle (Featuring Mista Mista)", diff --git a/packages/webamp/demo/js/eventLogger.ts b/packages/webamp/demo/js/eventLogger.ts index 9a5b2540..23d04612 100644 --- a/packages/webamp/demo/js/eventLogger.ts +++ b/packages/webamp/demo/js/eventLogger.ts @@ -107,12 +107,11 @@ function logEventFromAction(action: Action): GoogleAnalyticsEvent | null { return null; } -export const loggerMiddleware = () => (next: (action: Action) => void) => ( - action: Action -) => { - const event = logEventFromAction(action); - if (event != null) { - log(event); - } - return next(action); -}; +export const loggerMiddleware = + () => (next: (action: Action) => void) => (action: Action) => { + const event = logEventFromAction(action); + if (event != null) { + log(event); + } + return next(action); + }; diff --git a/packages/webamp/demo/js/index.tsx b/packages/webamp/demo/js/index.tsx index af71bdaf..2458ade4 100644 --- a/packages/webamp/demo/js/index.tsx +++ b/packages/webamp/demo/js/index.tsx @@ -70,9 +70,9 @@ async function main() { about.style.visibility = "hidden"; } if (!WebampLazy.browserIsSupported()) { - (document.getElementById( - "browser-compatibility" - ) as HTMLDivElement).style.display = "block"; + ( + document.getElementById("browser-compatibility") as HTMLDivElement + ).style.display = "block"; (document.getElementById("app") as HTMLDivElement).style.visibility = "hidden"; return; @@ -80,9 +80,9 @@ async function main() { about.classList.add("loaded"); if (isButterchurnSupported()) { - (document.getElementById( - "butterchurn-share" - ) as HTMLDivElement).style.display = "flex"; + ( + document.getElementById("butterchurn-share") as HTMLDivElement + ).style.display = "flex"; } let soundcloudPlaylist = null; if (soundcloudPlaylistId != null) { diff --git a/packages/webamp/js/components/ContextMenuWrapper.tsx b/packages/webamp/js/components/ContextMenuWrapper.tsx index 0bde9fd6..25b3be14 100644 --- a/packages/webamp/js/components/ContextMenuWrapper.tsx +++ b/packages/webamp/js/components/ContextMenuWrapper.tsx @@ -18,10 +18,11 @@ export default function ContextMenuWraper({ renderContents, ...passThroughProps }: Props) { - const [openPosition, setOpenPosition] = useState<{ - x: number; - y: number; - } | null>(null); + const [openPosition, setOpenPosition] = + useState<{ + x: number; + y: number; + } | null>(null); const closeMenu = useCallback(() => { setOpenPosition(null); diff --git a/packages/webamp/js/components/EqualizerWindow/EqGraph.tsx b/packages/webamp/js/components/EqualizerWindow/EqGraph.tsx index 89d23bbc..3bb452de 100644 --- a/packages/webamp/js/components/EqualizerWindow/EqGraph.tsx +++ b/packages/webamp/js/components/EqualizerWindow/EqGraph.tsx @@ -17,9 +17,10 @@ function EqGraph() { const [canvasNode, setCanvasNode] = useState(null); - const canvasCtx = useMemo(() => canvasNode?.getContext("2d") ?? null, [ - canvasNode, - ]); + const canvasCtx = useMemo( + () => canvasNode?.getContext("2d") ?? null, + [canvasNode] + ); const colorPattern = useColorPattern(canvasCtx); useLayoutEffect(() => { diff --git a/packages/webamp/js/components/MilkdropWindow/Visualizer.tsx b/packages/webamp/js/components/MilkdropWindow/Visualizer.tsx index 99ca4154..06ed0628 100644 --- a/packages/webamp/js/components/MilkdropWindow/Visualizer.tsx +++ b/packages/webamp/js/components/MilkdropWindow/Visualizer.tsx @@ -35,9 +35,8 @@ function Visualizer({ analyser, width, height }: Props) { const isEnabledVisualizer = visualizerStyle === VISUALIZERS.MILKDROP; const canvasRef = useRef(null); - const [visualizer, setVisualizer] = useState( - null - ); + const [visualizer, setVisualizer] = + useState(null); // Initialize the visualizer useEffect(() => { diff --git a/packages/webamp/js/components/PlaylistWindow/RunningTimeDisplay.tsx b/packages/webamp/js/components/PlaylistWindow/RunningTimeDisplay.tsx index f8d9f414..95f5c32c 100644 --- a/packages/webamp/js/components/PlaylistWindow/RunningTimeDisplay.tsx +++ b/packages/webamp/js/components/PlaylistWindow/RunningTimeDisplay.tsx @@ -16,9 +16,10 @@ function rightPad(str: string, len: number, fillChar: string): string { const RunningTimeDisplay = () => { const runningTimeMessage = useTypedSelector(Actions.getRunningTimeMessage); - const text = useMemo(() => rightPad(runningTimeMessage, 18, " "), [ - runningTimeMessage, - ]); + const text = useMemo( + () => rightPad(runningTimeMessage, 18, " "), + [runningTimeMessage] + ); return (
{/* This div is probably not strictly needed */} diff --git a/packages/webamp/js/components/ResizeTarget.tsx b/packages/webamp/js/components/ResizeTarget.tsx index 2e115b5e..ca98c943 100644 --- a/packages/webamp/js/components/ResizeTarget.tsx +++ b/packages/webamp/js/components/ResizeTarget.tsx @@ -16,9 +16,8 @@ interface Props { function ResizeTarget(props: Props) { const { currentSize, setWindowSize, widthOnly, ...passThroughProps } = props; const [mouseDown, setMouseDown] = useState(false); - const [mouseStart, setMouseStart] = useState( - null - ); + const [mouseStart, setMouseStart] = + useState(null); useEffect(() => { if (mouseDown === false || mouseStart == null) { return; diff --git a/packages/webamp/js/components/WindowManager.tsx b/packages/webamp/js/components/WindowManager.tsx index 44adfde1..866dc042 100644 --- a/packages/webamp/js/components/WindowManager.tsx +++ b/packages/webamp/js/components/WindowManager.tsx @@ -32,9 +32,8 @@ function useHandleMouseDown(propsWindows: { const browserWindowSize = useTypedSelector(Selectors.getBrowserWindowSize); const updateWindowPositions = useActionCreator(Actions.updateWindowPositions); - const [draggingState, setDraggingState] = useState( - null - ); + const [draggingState, setDraggingState] = + useState(null); // When the mouse is down, attach a listener to track mouse move events. useEffect(() => { diff --git a/packages/webamp/js/constants.ts b/packages/webamp/js/constants.ts index d302a36f..d5a7ff77 100644 --- a/packages/webamp/js/constants.ts +++ b/packages/webamp/js/constants.ts @@ -7,16 +7,7 @@ import { } from "./types"; import baseSkin from "./baseSkin.json"; export const BANDS: Band[] = [ - 60, - 170, - 310, - 600, - 1000, - 3000, - 6000, - 12000, - 14000, - 16000, + 60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000, ]; export const WINDOWS = { diff --git a/packages/webamp/js/hooks.ts b/packages/webamp/js/hooks.ts index 7f400c86..38eadfc8 100644 --- a/packages/webamp/js/hooks.ts +++ b/packages/webamp/js/hooks.ts @@ -162,10 +162,10 @@ export function useActionCreator Action | Thunk>( actionCreator: T ): (...funcArgs: Parameters) => void { const dispatch = useDispatch(); - return useCallback((...args) => dispatch(actionCreator(...args)), [ - dispatch, - actionCreator, - ]); + return useCallback( + (...args) => dispatch(actionCreator(...args)), + [dispatch, actionCreator] + ); } export function useTypedDispatch(): (action: Action | Thunk) => void { diff --git a/packages/webamp/js/reducers/windows.ts b/packages/webamp/js/reducers/windows.ts index 2c5f0395..5ff8f447 100644 --- a/packages/webamp/js/reducers/windows.ts +++ b/packages/webamp/js/reducers/windows.ts @@ -203,11 +203,8 @@ const windows = ( })), }; case LOAD_SERIALIZED_STATE: { - const { - genWindows, - focused, - positionsAreRelative, - } = action.serializedState.windows; + const { genWindows, focused, positionsAreRelative } = + action.serializedState.windows; return { ...state, positionsAreRelative, diff --git a/packages/webamp/js/selectors.ts b/packages/webamp/js/selectors.ts index 797072fc..5a0093f9 100644 --- a/packages/webamp/js/selectors.ts +++ b/packages/webamp/js/selectors.ts @@ -567,9 +567,10 @@ export function getEqualizerAuto(state: AppState): boolean { return state.equalizer.auto; } -export function getBrowserWindowSize( - state: AppState -): { height: number; width: number } { +export function getBrowserWindowSize(state: AppState): { + height: number; + width: number; +} { return state.windows.browserWindowSize; } diff --git a/packages/webamp/js/utils.ts b/packages/webamp/js/utils.ts index bbaff5ce..29a3a8ea 100644 --- a/packages/webamp/js/utils.ts +++ b/packages/webamp/js/utils.ts @@ -163,13 +163,10 @@ export const percentToRange = (percent: number, min: number, max: number) => export const percentToIndex = (percent: number, length: number): number => percentToRange(percent, 0, length - 1); -const rebound = ( - oldMin: number, - oldMax: number, - newMin: number, - newMax: number -) => (oldValue: number): number => - percentToRange(toPercent(oldMin, oldMax, oldValue), newMin, newMax); +const rebound = + (oldMin: number, oldMax: number, newMin: number, newMax: number) => + (oldValue: number): number => + percentToRange(toPercent(oldMin, oldMax, oldValue), newMin, newMax); // Convert an .eqf value to a 0-100 export const normalizeEqBand = rebound(1, 64, 0, 100); diff --git a/packages/webamp/js/webampLazy.tsx b/packages/webamp/js/webampLazy.tsx index e2f60307..6b70fa4e 100644 --- a/packages/webamp/js/webampLazy.tsx +++ b/packages/webamp/js/webampLazy.tsx @@ -195,10 +195,8 @@ class Winamp { // TODO: Make this much cleaner let convertPreset = null; if (__butterchurnOptions != null) { - const { - importConvertPreset, - presetConverterEndpoint, - } = __butterchurnOptions; + const { importConvertPreset, presetConverterEndpoint } = + __butterchurnOptions; if (importConvertPreset != null && presetConverterEndpoint != null) { convertPreset = async (file: File): Promise => { diff --git a/packages/webamp/package.json b/packages/webamp/package.json index e3e738a3..e9528c07 100644 --- a/packages/webamp/package.json +++ b/packages/webamp/package.json @@ -107,7 +107,7 @@ "jest-puppeteer": "^4.4.0", "postcss": "^7.0.18", "postcss-loader": "^3.0.0", - "prettier": "^2.0.4", + "prettier": "^2.3.0", "puppeteer": "^1.15.0", "react-test-renderer": "^17.0.1", "redux-devtools-extension": "^2.13.2", diff --git a/yarn.lock b/yarn.lock index 11aa7fce..2300c459 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11782,6 +11782,11 @@ prettier@^2.0.4, prettier@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.5.tgz#d6d56282455243f2f92cc1716692c08aa31522d4" +prettier@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.0.tgz#b6a5bf1284026ae640f17f7ff5658a7567fc0d18" + integrity sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w== + pretty-error@^2.0.2: version "2.1.1" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"