From b610c1caac5d4ac4d11d8d8b3593142dd4921670 Mon Sep 17 00:00:00 2001 From: Jacob <55346310+Kathund@users.noreply.github.com> Date: Thu, 2 Oct 2025 12:36:42 +0000 Subject: [PATCH] fix: eslint (#378) * fix: eslint script closes #345 * format: eslint oneclient * fix eslint script again :pleading: --- .../frontend/src/components/SkinViewer.tsx | 5 +- .../components/overlay/RemoveAccountModal.tsx | 7 ++- .../overlay/RemoveSkinCapeModal.tsx | 2 +- .../frontend/src/routes/app/accountSkin.tsx | 40 ++++++++------- .../src/routes/app/settings/developer.tsx | 2 +- .../src/routes/onboarding/account.tsx | 50 ++++++++++--------- .../src/routes/onboarding/language.tsx | 9 ++-- .../routes/onboarding/preferences/index.tsx | 8 +-- .../frontend/src/routes/onboarding/route.tsx | 4 +- .../src/routes/app/cluster/settings.tsx | 6 +-- .../frontend/src/routes/app/index.tsx | 4 +- .../src/routes/app/settings/minecraft.tsx | 6 +-- eslint.config.js | 19 ++++--- package.json | 6 ++- 14 files changed, 92 insertions(+), 76 deletions(-) diff --git a/apps/oneclient/frontend/src/components/SkinViewer.tsx b/apps/oneclient/frontend/src/components/SkinViewer.tsx index c86b3dad..1feb9dd5 100644 --- a/apps/oneclient/frontend/src/components/SkinViewer.tsx +++ b/apps/oneclient/frontend/src/components/SkinViewer.tsx @@ -50,7 +50,7 @@ export function SkinViewer({ enableZoom = true, enableRotate = true, enablePan = true, - elytra = false + elytra = false, }: SkinViewerProps) { const canvasRef = useRef(null); const viewerRef = useRef(null); @@ -78,13 +78,12 @@ export function SkinViewer({ viewer.controls.object.position.set(x, y, z); viewer.controls.object.lookAt(viewer.controls.target); }; - setAngle(playerRotatePhi, playerRotateTheta) + setAngle(playerRotatePhi, playerRotateTheta); viewer.playerWrapper.translateX(translateRotateX); viewer.playerWrapper.translateY(translateRotateY); viewer.playerWrapper.translateZ(translateRotateZ); - viewer.animation = animation; viewer.autoRotate = autoRotate; diff --git a/apps/oneclient/frontend/src/components/overlay/RemoveAccountModal.tsx b/apps/oneclient/frontend/src/components/overlay/RemoveAccountModal.tsx index a9439b1b..9b81a1d3 100644 --- a/apps/oneclient/frontend/src/components/overlay/RemoveAccountModal.tsx +++ b/apps/oneclient/frontend/src/components/overlay/RemoveAccountModal.tsx @@ -14,7 +14,12 @@ export function RemoveAccountModal({ Are you sure? -

Do you want to remove {profile.username} from you're accounts?

+

+ Do you want to remove + {profile.username} + {' '} + from you're accounts? +

This cannot be undone

diff --git a/apps/oneclient/frontend/src/components/overlay/RemoveSkinCapeModal.tsx b/apps/oneclient/frontend/src/components/overlay/RemoveSkinCapeModal.tsx index 7221c5af..cdd04b03 100644 --- a/apps/oneclient/frontend/src/components/overlay/RemoveSkinCapeModal.tsx +++ b/apps/oneclient/frontend/src/components/overlay/RemoveSkinCapeModal.tsx @@ -1,7 +1,7 @@ import { Button } from '@onelauncher/common/components'; import { Overlay } from './Overlay'; -export function RemoveSkinCapeModal({ onPress }: { onPress: () => void; }) { +export function RemoveSkinCapeModal({ onPress }: { onPress: () => void }) { return ( Are you sure? diff --git a/apps/oneclient/frontend/src/routes/app/accountSkin.tsx b/apps/oneclient/frontend/src/routes/app/accountSkin.tsx index 1ac2594d..b7b72c23 100644 --- a/apps/oneclient/frontend/src/routes/app/accountSkin.tsx +++ b/apps/oneclient/frontend/src/routes/app/accountSkin.tsx @@ -6,6 +6,7 @@ import { Overlay } from '@/components/overlay/Overlay'; import { usePlayerProfile } from '@/hooks/usePlayerProfile'; import { bindings } from '@/main'; import { getSkinUrl } from '@/utils/minecraft'; +import { toast } from '@/utils/toast'; import { useCommandSuspense } from '@onelauncher/common'; import { Button } from '@onelauncher/common/components'; import { useQueryClient } from '@tanstack/react-query'; @@ -17,7 +18,6 @@ import { Download01Icon, PlusIcon, Trash01Icon } from '@untitled-theme/icons-rea import { useEffect, useState } from 'react'; import { DialogTrigger } from 'react-aria-components'; import { CrouchAnimation, FlyingAnimation, HitAnimation, IdleAnimation, WalkingAnimation } from 'skinview3d'; -import { toast } from '@/utils/toast'; interface Skin { is_slim: boolean; @@ -113,7 +113,7 @@ function RouteComponent() { fetchSkins(); - setCapes([{ url: "", id: "" }, ...loggedInUser.capes.map(cape => ({ url: cape.url, id: cape.id }))]); + setCapes([{ url: '', id: '' }, ...loggedInUser.capes.map(cape => ({ url: cape.url, id: cape.id }))]); }, [loggedInUser]); const { data: profile } = usePlayerProfile(currentAccount?.id); const [animation, setAnimation] = useState(animations[0].animation); @@ -145,14 +145,14 @@ function RouteComponent() { title: 'Import Skin', message: `Importing skin from ${username}`, }); - const { id } = await bindings.core.convertUsernameUUID(username) ?? { id: '', username: '' } + const { id } = await bindings.core.convertUsernameUUID(username); if (id === '') return toast({ type: 'error', title: 'Import Skin', message: `${username} doesn't exist`, }); - const playerProfile = await bindings.core.fetchMinecraftProfile(id) + const playerProfile = await bindings.core.fetchMinecraftProfile(id); if (playerProfile.skin_url) setSkins([...skins, { is_slim: playerProfile.is_slim, skin_url: playerProfile.skin_url }]); toast({ @@ -160,7 +160,7 @@ function RouteComponent() { title: 'Import Skin', message: `Imported skin from ${username}`, }); - } + }; const [shouldShowElytra, setShouldShowElytra] = useState(false); @@ -170,11 +170,13 @@ function RouteComponent() { return; await bindings.core.changeSkin(currentAccount.access_token, selectedSkin.skin_url, selectedSkin.is_slim ? 'slim' : 'classic'); if (selectedCape === '') { - await bindings.core.removeCape(currentAccount.access_token) - } else { - const capeData = capes.find((cape) => cape.url === selectedCape) - if (!capeData) return - await bindings.core.changeCape(currentAccount.access_token, capeData.id) + await bindings.core.removeCape(currentAccount.access_token); + } + else { + const capeData = capes.find(cape => cape.url === selectedCape); + if (!capeData) + return; + await bindings.core.changeCape(currentAccount.access_token, capeData.id); } queryClient.invalidateQueries({ queryKey: ['getDefaultUser'], @@ -363,16 +365,16 @@ function RenderSkin({ skin, selected, animation, setSelectedSkin, setSkins, cape {selected.skin_url === skin.skin_url ? <> : ( - - + + - - setSkins(prev => prev.filter(skinData => skinData.skin_url !== skin.skin_url))} /> - - - )} + + setSkins(prev => prev.filter(skinData => skinData.skin_url !== skin.skin_url))} /> + + + )} - )} - - } + {currentAccount + ? ( + <> + + + ) + : ( + <> + {profile + ? ( + <> + + + ) + : ( + + )} + + )} ); } diff --git a/apps/oneclient/frontend/src/routes/onboarding/language.tsx b/apps/oneclient/frontend/src/routes/onboarding/language.tsx index f0e26c49..50e08b4f 100644 --- a/apps/oneclient/frontend/src/routes/onboarding/language.tsx +++ b/apps/oneclient/frontend/src/routes/onboarding/language.tsx @@ -21,15 +21,14 @@ const languageList: Array = [ }, ]; - function RouteComponent() { return ( -
-
- Language selection illustration +
+
+ Language selection illustration
-
+

Language

Choose your preferred language.

diff --git a/apps/oneclient/frontend/src/routes/onboarding/preferences/index.tsx b/apps/oneclient/frontend/src/routes/onboarding/preferences/index.tsx index 39adfe28..f8d037c7 100644 --- a/apps/oneclient/frontend/src/routes/onboarding/preferences/index.tsx +++ b/apps/oneclient/frontend/src/routes/onboarding/preferences/index.tsx @@ -1,9 +1,9 @@ -import { createFileRoute } from '@tanstack/react-router' +import { createFileRoute } from '@tanstack/react-router'; export const Route = createFileRoute('/onboarding/preferences/')({ - component: RouteComponent, -}) + component: RouteComponent, +}); function RouteComponent() { - return
Hello "/onboarding/preferences/"!
+ return
Hello "/onboarding/preferences/"!
; } diff --git a/apps/oneclient/frontend/src/routes/onboarding/route.tsx b/apps/oneclient/frontend/src/routes/onboarding/route.tsx index 0d6fc2a2..4c4046cc 100644 --- a/apps/oneclient/frontend/src/routes/onboarding/route.tsx +++ b/apps/oneclient/frontend/src/routes/onboarding/route.tsx @@ -189,8 +189,8 @@ export function OnboardingNavigation() { )}
- - + +
diff --git a/apps/onelauncher/frontend/src/routes/app/cluster/settings.tsx b/apps/onelauncher/frontend/src/routes/app/cluster/settings.tsx index c3277183..86dfeece 100644 --- a/apps/onelauncher/frontend/src/routes/app/cluster/settings.tsx +++ b/apps/onelauncher/frontend/src/routes/app/cluster/settings.tsx @@ -18,7 +18,7 @@ function RouteComponent() { enabled: !!cluster.data?.setting_profile_name, }); - const save = useCommand('updateClusterProfile', () => bindings.core.updateClusterProfile(cluster.data?.name as string, _result.data!), { + const save = useCommand('updateClusterProfile', () => bindings.core.updateClusterProfile(cluster.data?.name as string, _result.data), { enabled: false, subscribed: false, }); @@ -36,9 +36,9 @@ function RouteComponent() {

Minecraft Settings

- + - +
diff --git a/apps/onelauncher/frontend/src/routes/app/index.tsx b/apps/onelauncher/frontend/src/routes/app/index.tsx index e8f90ab3..82b0cceb 100644 --- a/apps/onelauncher/frontend/src/routes/app/index.tsx +++ b/apps/onelauncher/frontend/src/routes/app/index.tsx @@ -223,7 +223,9 @@ function ClusterCard({
{/* */} - +
diff --git a/apps/onelauncher/frontend/src/routes/app/settings/minecraft.tsx b/apps/onelauncher/frontend/src/routes/app/settings/minecraft.tsx index 789d73d2..f2b75003 100644 --- a/apps/onelauncher/frontend/src/routes/app/settings/minecraft.tsx +++ b/apps/onelauncher/frontend/src/routes/app/settings/minecraft.tsx @@ -16,7 +16,7 @@ export const Route = createFileRoute('/app/settings/minecraft')({ function RouteComponent() { const result = useCommand('readSettings', bindings.core.readSettings); - const save = useCommand('writeSettings', () => bindings.core.writeSettings(result.data!), { + const save = useCommand('writeSettings', () => bindings.core.writeSettings(result.data), { enabled: false, subscribed: false, }); @@ -31,11 +31,11 @@ function RouteComponent() {

Minecraft Settings

- + {/* */} - +
diff --git a/eslint.config.js b/eslint.config.js index b2ce183f..506bef24 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -2,12 +2,21 @@ import { defineConfig } from '@flowr/eslint'; // @ts-ignore -- No types for this package import { tanstackConfig } from '@tanstack/eslint-config'; +const ignores = [ + '*.rs', + '**/migrations/**', + 'apps/onelauncher/old_frontend', + 'apps/*/desktop/capabilities', + 'apps/*/desktop/gen', + '**/*.gen.*', +]; + export default defineConfig( { typescript: true, react: true, query: true, - ignores: ['*.rs', '**/migrations/**'], + ignores, toml: { overrides: { 'toml/array-element-newline': ['error', 'always'], @@ -24,12 +33,7 @@ export default defineConfig( return config; }), { - ignores: [ - 'apps/onelauncher/old_frontend', - 'apps/*/desktop/capabilities', - 'apps/*/desktop/gen', - '**/*.gen.*', - ], + ignores, // overrides: [ // { // files: ['vite.config.js'], @@ -40,6 +44,7 @@ export default defineConfig( // ], }, { + ignores, rules: { 'sort-imports': 'off', // Replaced by perfectionist/sort-named-imports', 'import/order': 'off', // Replaced by perfectionist/sort-named-imports', diff --git a/package.json b/package.json index 92af9cfc..dfa444e5 100644 --- a/package.json +++ b/package.json @@ -34,10 +34,12 @@ "web_common": "pnpm --filter @onelauncher/common -- ", "scripts": "pnpm --filter @onelauncher/scripts -- ", "format": "pnpm format:es && pnpm format:rs", - "format:es": "pnpm lint:es --fix", + "format:es": "pnpm lint:apps:es --fix && pnpm lint:packages:es --fix", "format:rs": "cargo +nightly fmt && cargo clippy --fix", "lint": "pnpm lint:es && pnpm lint:rs", - "lint:es": "eslint . --cache", + "lint:es": "pnpm lint:apps:es && pnpm lint:packages:es", + "lint:apps:es": "pnpm exec eslint apps/ --cache", + "lint:packages:es": "pnpm exec eslint packages/ --cache", "lint:rs": "cargo +nightly fmt --check && cargo clippy -- -D warnings", "prepare": "husky" },