From 9298c4a55264b20865ac51137c77f89c3ae4bf74 Mon Sep 17 00:00:00 2001 From: Cooper Date: Sat, 13 Jul 2024 18:13:40 +0000 Subject: [PATCH] pnpm lint and update packages --- package.json | 2 +- pnpm-lock.yaml | 22 +++++++++---------- .../player/atoms/settings/CaptionsView.tsx | 4 ++-- .../settings/OpensubtitlesCaptionsView.tsx | 2 +- .../player/atoms/settings/SettingsMenu.tsx | 8 +++---- .../atoms/settings/SourceCaptionsView.tsx | 2 +- src/components/player/display/base.ts | 5 ++++- src/components/player/hooks/useCaptions.ts | 2 +- 8 files changed, 25 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index 2b8aad0e..d1fac832 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "postcss": "^8.4.39", "postcss-rtl": "^2.0.0", "postcss-rtlcss": "^4.0.9", - "prettier": "^3.3.2", + "prettier": "^3.3.3", "prettier-plugin-tailwindcss": "^0.5.14", "rollup-plugin-visualizer": "^5.12.0", "tailwind-scrollbar": "^3.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a2832410..143008bf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -255,7 +255,7 @@ importers: version: 6.9.0(eslint@8.57.0) eslint-plugin-prettier: specifier: ^5.1.3 - version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.2) + version: 5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3) eslint-plugin-react: specifier: 7.33.2 version: 7.33.2(eslint@8.57.0) @@ -281,11 +281,11 @@ importers: specifier: ^4.0.9 version: 4.0.9(postcss@8.4.39) prettier: - specifier: ^3.3.2 - version: 3.3.2 + specifier: ^3.3.3 + version: 3.3.3 prettier-plugin-tailwindcss: specifier: ^0.5.14 - version: 0.5.14(prettier@3.3.2) + version: 0.5.14(prettier@3.3.3) rollup-plugin-visualizer: specifier: ^5.12.0 version: 5.12.0(@rollup/wasm-node@4.18.1) @@ -3238,8 +3238,8 @@ packages: prettier-plugin-svelte: optional: true - prettier@3.3.2: - resolution: {integrity: sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==} + prettier@3.3.3: + resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==} engines: {node: '>=14'} hasBin: true @@ -6445,10 +6445,10 @@ snapshots: safe-regex-test: 1.0.3 string.prototype.includes: 2.0.0 - eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.2): + eslint-plugin-prettier@5.1.3(eslint-config-prettier@9.1.0(eslint@8.57.0))(eslint@8.57.0)(prettier@3.3.3): dependencies: eslint: 8.57.0 - prettier: 3.3.2 + prettier: 3.3.3 prettier-linter-helpers: 1.0.0 synckit: 0.8.8 optionalDependencies: @@ -7510,11 +7510,11 @@ snapshots: dependencies: fast-diff: 1.3.0 - prettier-plugin-tailwindcss@0.5.14(prettier@3.3.2): + prettier-plugin-tailwindcss@0.5.14(prettier@3.3.3): dependencies: - prettier: 3.3.2 + prettier: 3.3.3 - prettier@3.3.2: {} + prettier@3.3.3: {} pretty-bytes@5.6.0: {} diff --git a/src/components/player/atoms/settings/CaptionsView.tsx b/src/components/player/atoms/settings/CaptionsView.tsx index 05dcb41e..6a776790 100644 --- a/src/components/player/atoms/settings/CaptionsView.tsx +++ b/src/components/player/atoms/settings/CaptionsView.tsx @@ -126,8 +126,8 @@ export function CaptionsView({ } const selectedLanguagePretty = selectedCaptionLanguage - ? getPrettyLanguageNameFromLocale(selectedCaptionLanguage) ?? - t("player.menus.subtitles.unknownLanguage") + ? (getPrettyLanguageNameFromLocale(selectedCaptionLanguage) ?? + t("player.menus.subtitles.unknownLanguage")) : undefined; return ( diff --git a/src/components/player/atoms/settings/OpensubtitlesCaptionsView.tsx b/src/components/player/atoms/settings/OpensubtitlesCaptionsView.tsx index 160d9009..8c8010c6 100644 --- a/src/components/player/atoms/settings/OpensubtitlesCaptionsView.tsx +++ b/src/components/player/atoms/settings/OpensubtitlesCaptionsView.tsx @@ -30,7 +30,7 @@ export function OpenSubtitlesCaptionView({ const captions = useMemo( () => - captionList.length !== 0 ? captionList : getHlsCaptionList?.() ?? [], + captionList.length !== 0 ? captionList : (getHlsCaptionList?.() ?? []), [captionList, getHlsCaptionList], ); diff --git a/src/components/player/atoms/settings/SettingsMenu.tsx b/src/components/player/atoms/settings/SettingsMenu.tsx index b79545ce..4162e2ea 100644 --- a/src/components/player/atoms/settings/SettingsMenu.tsx +++ b/src/components/player/atoms/settings/SettingsMenu.tsx @@ -35,13 +35,13 @@ export function SettingsMenu({ id }: { id: string }) { const { toggleLastUsed } = useCaptions(); const selectedLanguagePretty = selectedCaptionLanguage - ? getPrettyLanguageNameFromLocale(selectedCaptionLanguage) ?? - t("player.menus.subtitles.unknownLanguage") + ? (getPrettyLanguageNameFromLocale(selectedCaptionLanguage) ?? + t("player.menus.subtitles.unknownLanguage")) : undefined; const selectedAudioLanguagePretty = currentAudioTrack - ? getPrettyLanguageNameFromLocale(currentAudioTrack.language) ?? - t("player.menus.subtitles.unknownLanguage") + ? (getPrettyLanguageNameFromLocale(currentAudioTrack.language) ?? + t("player.menus.subtitles.unknownLanguage")) : undefined; const source = usePlayerStore((s) => s.source); diff --git a/src/components/player/atoms/settings/SourceCaptionsView.tsx b/src/components/player/atoms/settings/SourceCaptionsView.tsx index 3d24a366..164cd98d 100644 --- a/src/components/player/atoms/settings/SourceCaptionsView.tsx +++ b/src/components/player/atoms/settings/SourceCaptionsView.tsx @@ -62,7 +62,7 @@ export function SourceCaptionsView({ const captions = useMemo( () => - captionList.length !== 0 ? captionList : getHlsCaptionList?.() ?? [], + captionList.length !== 0 ? captionList : (getHlsCaptionList?.() ?? []), [captionList, getHlsCaptionList], ); diff --git a/src/components/player/display/base.ts b/src/components/player/display/base.ts index ebaa12da..1fb1dcba 100644 --- a/src/components/player/display/base.ts +++ b/src/components/player/display/base.ts @@ -266,7 +266,10 @@ export function makeVideoElementDisplayInterface(): DisplayInterface { videoElement.addEventListener("canplay", () => emit("loading", false)); videoElement.addEventListener("waiting", () => emit("loading", true)); videoElement.addEventListener("volumechange", () => - emit("volumechange", videoElement?.muted ? 0 : videoElement?.volume ?? 0), + emit( + "volumechange", + videoElement?.muted ? 0 : (videoElement?.volume ?? 0), + ), ); videoElement.addEventListener("timeupdate", () => emit("time", videoElement?.currentTime ?? 0), diff --git a/src/components/player/hooks/useCaptions.ts b/src/components/player/hooks/useCaptions.ts index 52184058..0ae0e613 100644 --- a/src/components/player/hooks/useCaptions.ts +++ b/src/components/player/hooks/useCaptions.ts @@ -31,7 +31,7 @@ export function useCaptions() { const captions = useMemo( () => - captionList.length !== 0 ? captionList : getHlsCaptionList?.() ?? [], + captionList.length !== 0 ? captionList : (getHlsCaptionList?.() ?? []), [captionList, getHlsCaptionList], );