From 8e2dce10f7cdf0c333fabb3e2d3b39b652ad111f Mon Sep 17 00:00:00 2001 From: Jacob Date: Mon, 29 Dec 2025 13:44:06 +0800 Subject: [PATCH] fix(OneClient): Eslint --- apps/oneclient/desktop/Cargo.toml | 9 ++++++-- apps/oneclient/frontend/src/bindings.gen.ts | 12 +++++----- .../components/Bundle/DownloadModButton.tsx | 2 +- .../src/components/Bundle/ModCard.tsx | 6 ++--- .../frontend/src/components/DownloadMods.tsx | 2 +- .../frontend/src/components/Stepper.tsx | 2 +- apps/oneclient/frontend/src/routes/__root.tsx | 3 +++ .../frontend/src/routes/app/account/route.tsx | 5 ++--- .../frontend/src/routes/app/account/skins.tsx | 22 +++++++++---------- .../preferences/versionCategory.tsx | 4 +++- apps/onelauncher/desktop/Cargo.toml | 9 ++++++-- 11 files changed, 45 insertions(+), 31 deletions(-) diff --git a/apps/oneclient/desktop/Cargo.toml b/apps/oneclient/desktop/Cargo.toml index 40a130fb..7dab2fbf 100644 --- a/apps/oneclient/desktop/Cargo.toml +++ b/apps/oneclient/desktop/Cargo.toml @@ -84,5 +84,10 @@ custom-protocol = [ "tauri/custom-protocol" ] [target.'cfg(target_os = "macos")'.dependencies] objc2 = "0.6.3" -objc2-app-kit = { version = "0.3.2", features = ["NSWindow", "NSButton", "NSControl", "NSView"] } -objc2-foundation = { version = "0.3.2", features = ["NSObject"] } +objc2-app-kit = { version = "0.3.2", features = [ + "NSWindow", + "NSButton", + "NSControl", + "NSView" +] } +objc2-foundation = { version = "0.3.2", features = [ "NSObject" ] } diff --git a/apps/oneclient/frontend/src/bindings.gen.ts b/apps/oneclient/frontend/src/bindings.gen.ts index 35c48117..52779b34 100644 --- a/apps/oneclient/frontend/src/bindings.gen.ts +++ b/apps/oneclient/frontend/src/bindings.gen.ts @@ -303,10 +303,9 @@ export type VersionType = */ "old_beta" -const ARGS_MAP = { 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'core':'{"getLogByName":["id","name"],"getClusterById":["id"],"getLogs":["id"],"setDiscordRPCMessage":["message"],"getClusters":[],"getWorlds":["id"],"createSettingsProfile":["name"],"getUsers":[],"isClusterRunning":["cluster_id"],"fetchMinecraftProfile":["uuid"],"getPackage":["provider","slug"],"getScreenshots":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getUsersFromAuthor":["provider","author"],"getLinkedPackages":["cluster_id"],"openMsaLogin":[],"getDefaultUser":["fallback"],"downloadExternalPackage":["package","cluster_id","force","skip_compatibility"],"writeSettings":["setting"],"getUser":["uuid"],"readSettings":[],"fetchLoggedInProfile":["access_token"],"getLoadersForVersion":["mc_version"],"open":["input"],"killProcess":["pid"],"installModpack":["modpack","cluster_id"],"setClusterStage":["id","stage"],"getRunningProcesses":[],"getProfileOrDefault":["name"],"updateClusterProfile":["name","profile"],"removeCluster":["id"],"getGameVersions":[],"getPackageBody":["provider","body"],"getMultiplePackages":["provider","slugs"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"changeSkin":["access_token","skin_url","skin_variant"],"changeCape":["access_token","cape_uuid"],"removeUser":["uuid"],"setDefaultUser":["uuid"],"launchCluster":["id","uuid","search_for_java"],"updateClusterById":["id","request"],"createCluster":["options"],"getGlobalProfile":[],"searchPackages":["provider","query"],"removePackage":["cluster_id","package_hash"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"removeCape":["access_token"],"convertUsernameUUID":["username_uuid"]}', 'debug':'{"getArch":[],"getBuildTimestamp":[],"getPlatform":[],"getType":[],"getLocale":[],"getOsVersion":[],"openDevTools":[],"getGitCommitHash":[],"isInDev":[],"getPackageVersion":[],"getFamily":[]}', 'oneclient':'{"installUpdate":[],"getClustersGroupedByMajor":[],"checkForUpdate":[],"getBundlesFor":["cluster_id"],"getVersions":[]}', 'events':'{"process":["event"],"ingress":["event"],"message":["event"]}' } -export type Router = { 'events': { ingress: (event: IngressPayload) => Promise, -message: (event: MessagePayload) => Promise, -process: (event: ProcessPayload) => Promise }, +const ARGS_MAP = { 'debug':'{"getArch":[],"getBuildTimestamp":[],"getPlatform":[],"getType":[],"getLocale":[],"getOsVersion":[],"openDevTools":[],"getGitCommitHash":[],"isInDev":[],"getPackageVersion":[],"getFamily":[]}', 'folders':'{"fromCluster":["folder_name"],"openCluster":["folder_name"]}', 'events':'{"process":["event"],"ingress":["event"],"message":["event"]}', 'core':'{"getLogByName":["id","name"],"getClusterById":["id"],"getLogs":["id"],"setDiscordRPCMessage":["message"],"getClusters":[],"getWorlds":["id"],"createSettingsProfile":["name"],"getUsers":[],"isClusterRunning":["cluster_id"],"fetchMinecraftProfile":["uuid"],"getPackage":["provider","slug"],"getScreenshots":["id"],"getRunningProcessesByClusterId":["cluster_id"],"getUsersFromAuthor":["provider","author"],"getLinkedPackages":["cluster_id"],"openMsaLogin":[],"getDefaultUser":["fallback"],"downloadExternalPackage":["package","cluster_id","force","skip_compatibility"],"writeSettings":["setting"],"getUser":["uuid"],"readSettings":[],"fetchLoggedInProfile":["access_token"],"getLoadersForVersion":["mc_version"],"open":["input"],"killProcess":["pid"],"installModpack":["modpack","cluster_id"],"setClusterStage":["id","stage"],"getRunningProcesses":[],"getProfileOrDefault":["name"],"updateClusterProfile":["name","profile"],"removeCluster":["id"],"getGameVersions":[],"getPackageBody":["provider","body"],"getMultiplePackages":["provider","slugs"],"getPackageVersions":["provider","slug","mc_version","loader","offset","limit"],"downloadPackage":["provider","package_id","version_id","cluster_id","skip_compatibility"],"changeSkin":["access_token","skin_url","skin_variant"],"changeCape":["access_token","cape_uuid"],"removeUser":["uuid"],"setDefaultUser":["uuid"],"launchCluster":["id","uuid","search_for_java"],"updateClusterById":["id","request"],"createCluster":["options"],"getGlobalProfile":[],"searchPackages":["provider","query"],"removePackage":["cluster_id","package_hash"],"uploadSkinBytes":["access_token","skin_data","image_format","skin_variant"],"removeCape":["access_token"],"convertUsernameUUID":["username_uuid"]}', 'oneclient':'{"installUpdate":[],"getClustersGroupedByMajor":[],"checkForUpdate":[],"getBundlesFor":["cluster_id"],"getVersions":[]}' } +export type Router = { 'folders': { fromCluster: (folderName: string) => Promise, +openCluster: (folderName: string) => Promise }, 'debug': { openDevTools: () => Promise, isInDev: () => Promise, getArch: () => Promise, @@ -372,8 +371,9 @@ removeCape: (accessToken: string) => Promise, convertUsernameUUID: (usernameUuid: string) => Promise, setDiscordRPCMessage: (message: string) => Promise, open: (input: string) => Promise }, -'folders': { fromCluster: (folderName: string) => Promise, -openCluster: (folderName: string) => Promise } }; +'events': { ingress: (event: IngressPayload) => Promise, +message: (event: MessagePayload) => Promise, +process: (event: ProcessPayload) => Promise } }; export type { InferCommandOutput } diff --git a/apps/oneclient/frontend/src/components/Bundle/DownloadModButton.tsx b/apps/oneclient/frontend/src/components/Bundle/DownloadModButton.tsx index dc17e967..17f6b1aa 100644 --- a/apps/oneclient/frontend/src/components/Bundle/DownloadModButton.tsx +++ b/apps/oneclient/frontend/src/components/Bundle/DownloadModButton.tsx @@ -12,7 +12,7 @@ export function DownloadModButton({ cluster, file }: { cluster: ClusterModel; fi const [pkg, version] = file.kind.Managed; if (version.dependencies.length > 0) for (const dependency of version.dependencies) - if (dependency.dependency_type === "required") { + if (dependency.dependency_type === 'required') { const slug = dependency.project_id ?? ''; const versions = await bindings.core.getPackageVersions(pkg.provider, slug, cluster.mc_version, cluster.mc_loader, 0, 1); await bindings.core.downloadPackage(pkg.provider, slug, versions.items[0].version_id, cluster.id, null); diff --git a/apps/oneclient/frontend/src/components/Bundle/ModCard.tsx b/apps/oneclient/frontend/src/components/Bundle/ModCard.tsx index b1b684be..83b3e1c6 100644 --- a/apps/oneclient/frontend/src/components/Bundle/ModCard.tsx +++ b/apps/oneclient/frontend/src/components/Bundle/ModCard.tsx @@ -125,7 +125,7 @@ export function ModCard({ file, cluster }: ModCardProps) { } return mods?.includes(file) ?? false; - }, [installedPackages, mods, file]); + }, [installedPackages, kind, mods, file]); const [isSelected, setSelected] = useState(isInstalled); useEffect(() => { @@ -137,7 +137,7 @@ export function ModCard({ file, cluster }: ModCardProps) { const [pkg, version] = kind.Managed; if (version.dependencies.length > 0) for (const dependency of version.dependencies) - if (dependency.dependency_type === "required") { + if (dependency.dependency_type === 'required') { const slug = dependency.project_id ?? ''; const versions = await bindings.core.getPackageVersions(pkg.provider, slug, cluster.mc_version, cluster.mc_loader, 0, 1); await bindings.core.downloadPackage(pkg.provider, slug, versions.items[0].version_id, cluster.id, null); @@ -155,7 +155,7 @@ export function ModCard({ file, cluster }: ModCardProps) { if ('Managed' in kind) { const [_, version] = kind.Managed; const primary = version.files.find(f => f.primary) ?? version.files[0]; - hash = primary?.sha1; + hash = primary.sha1; } else { hash = kind.External.sha1; diff --git a/apps/oneclient/frontend/src/components/DownloadMods.tsx b/apps/oneclient/frontend/src/components/DownloadMods.tsx index f20b3eb3..b50b2b1e 100644 --- a/apps/oneclient/frontend/src/components/DownloadMods.tsx +++ b/apps/oneclient/frontend/src/components/DownloadMods.tsx @@ -117,7 +117,7 @@ function DownloadingMods({ mods, setOpen, nextPath }: { mods: ModDataArray; setO const cluster = await bindings.core.getClusterById(mod.clusterId); if (!cluster) continue; - if (dependency.dependency_type === "required") { + if (dependency.dependency_type === 'required') { const slug = dependency.project_id ?? ''; const versions = await bindings.core.getPackageVersions(mod.provider, slug, cluster.mc_version, cluster.mc_loader, 0, 1); if (versions.items.length !== 0) diff --git a/apps/oneclient/frontend/src/components/Stepper.tsx b/apps/oneclient/frontend/src/components/Stepper.tsx index 05ddd090..ad3a3dbc 100644 --- a/apps/oneclient/frontend/src/components/Stepper.tsx +++ b/apps/oneclient/frontend/src/components/Stepper.tsx @@ -14,7 +14,7 @@ export function Stepper({ steps, currentStepIndex }: VerticalStepperProps) { className={twMerge('after:transition-all after:duration-300 after:text-brand transition-all duration-300 relative flex items-center cursor-pointer py-2 pl-4 font-medium text-gray-400 text-base partial-leftline-0% data-active:text-white data-active:text-lg data-active:partial-leftline-100% data-complete:partial-leftline-100%')} data-active={index === currentStepIndex || null} data-complete={index < currentStepIndex || null} - key={index} + key={step.path} > {step.title} diff --git a/apps/oneclient/frontend/src/routes/__root.tsx b/apps/oneclient/frontend/src/routes/__root.tsx index f6b6503f..4c6f0d67 100644 --- a/apps/oneclient/frontend/src/routes/__root.tsx +++ b/apps/oneclient/frontend/src/routes/__root.tsx @@ -77,8 +77,10 @@ function useDiscordRPC() { function useAutoUpdate() { useEffect(() => { const unlistenPromise = listenForUpdateEvents(async (event) => { + // eslint-disable-next-line no-console -- Used for debugging - aka important console.log('Updater event:', event); if (event.status === 'updateAvailable') { + // eslint-disable-next-line no-console -- Used for debugging - aka important console.log('Update available, installing...'); try { await installUpdate(); @@ -91,6 +93,7 @@ function useAutoUpdate() { checkForUpdate().then((update) => { if (update) + // eslint-disable-next-line no-console -- Used for debugging - aka important console.log('Update found on initial check:', update.version); }).catch(e => console.error('Failed to check for update:', e)); diff --git a/apps/oneclient/frontend/src/routes/app/account/route.tsx b/apps/oneclient/frontend/src/routes/app/account/route.tsx index 770b19cb..be727467 100644 --- a/apps/oneclient/frontend/src/routes/app/account/route.tsx +++ b/apps/oneclient/frontend/src/routes/app/account/route.tsx @@ -28,7 +28,6 @@ export const Route = createFileRoute('/app/account')({ queryFn: () => bindings.core.fetchLoggedInProfile(profile.access_token), }); - const profileData = await query; const playerDataQuery = context.queryClient.ensureQueryData({ @@ -36,13 +35,13 @@ export const Route = createFileRoute('/app/account')({ queryFn: () => bindings.core.fetchMinecraftProfile(profileData.id), }); - const playerData = await playerDataQuery + const playerData = await playerDataQuery; return { profileData, profile, validSearch, - playerData + playerData, }; }, }); diff --git a/apps/oneclient/frontend/src/routes/app/account/skins.tsx b/apps/oneclient/frontend/src/routes/app/account/skins.tsx index 2b1d5dc3..714e78d7 100644 --- a/apps/oneclient/frontend/src/routes/app/account/skins.tsx +++ b/apps/oneclient/frontend/src/routes/app/account/skins.tsx @@ -132,7 +132,7 @@ function RouteComponent() { setSkins(prev => [...prev, skinData]); setSelectedSkin(skinData); - setSelectedCape(skinData.cape_url ?? '') + setSelectedCape(skinData.cape_url ?? ''); }, [loaded]); const importFromURL = (url: string) => { @@ -362,16 +362,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))} /> + + + )}