From 55479ae8dac08b3f4e2a7aeca69a6de50b90c36e Mon Sep 17 00:00:00 2001 From: sam Date: Sat, 30 Dec 2023 15:33:00 +0100 Subject: [PATCH] fix eslint errors --- frontend/.eslintrc.cjs | 11 +++++++++++ frontend/src/lib/api/entities.ts | 1 + frontend/src/routes/+layout.svelte | 2 ++ frontend/src/routes/@[username]/+page.svelte | 3 +-- frontend/src/routes/@[username]/edit/+layout.ts | 4 ++-- frontend/src/routes/auth/login/CallbackPage.svelte | 8 +++++++- frontend/src/routes/auth/login/discord/+page.svelte | 2 +- frontend/src/routes/auth/login/google/+page.svelte | 2 +- .../auth/login/mastodon/[instance]/+page.svelte | 2 +- .../routes/auth/login/misskey/[instance]/+page.svelte | 2 +- frontend/src/routes/auth/login/tumblr/+page.svelte | 2 +- frontend/src/routes/page/about/+page.svelte | 2 ++ frontend/src/routes/page/changelog/+page.svelte | 2 ++ frontend/src/routes/page/privacy/+page.svelte | 2 ++ frontend/src/routes/page/terms/+page.svelte | 2 ++ frontend/src/routes/settings/+page.svelte | 1 - 16 files changed, 37 insertions(+), 11 deletions(-) diff --git a/frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs index 09dcc6a..4b0d793 100644 --- a/frontend/.eslintrc.cjs +++ b/frontend/.eslintrc.cjs @@ -17,4 +17,15 @@ module.exports = { es2017: true, node: true, }, + rules: { + "no-unused-vars": "off", + "@typescript-eslint/no-unused-vars": [ + "error", + { + argsIgnorePattern: "^_", + destructuredArrayIgnorePattern: "^_", + varsIgnorePattern: "^_", + }, + ], + }, }; diff --git a/frontend/src/lib/api/entities.ts b/frontend/src/lib/api/entities.ts index e245522..5aa5b2a 100644 --- a/frontend/src/lib/api/entities.ts +++ b/frontend/src/lib/api/entities.ts @@ -1,3 +1,4 @@ +/* eslint-disable no-unused-vars */ import { PUBLIC_BASE_URL, PUBLIC_MEDIA_URL } from "$env/static/public"; export const MAX_MEMBERS = 500; diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte index a302e6c..0f35f76 100644 --- a/frontend/src/routes/+layout.svelte +++ b/frontend/src/routes/+layout.svelte @@ -31,6 +31,8 @@ const resp = await apiFetchClient( "/users/@me/settings", "PATCH", + // If this function is run, notice will always be non-null + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion { read_global_notice: data.notice!.id }, 2, ); diff --git a/frontend/src/routes/@[username]/+page.svelte b/frontend/src/routes/@[username]/+page.svelte index 18a74d6..6f06a70 100644 --- a/frontend/src/routes/@[username]/+page.svelte +++ b/frontend/src/routes/@[username]/+page.svelte @@ -4,7 +4,6 @@ import { Alert, - Badge, Button, ButtonGroup, Icon, @@ -15,7 +14,7 @@ ModalFooter, Tooltip, } from "@sveltestrap/sveltestrap"; - import { DateTime, Duration, FixedOffsetZone, Zone } from "luxon"; + import { DateTime, FixedOffsetZone } from "luxon"; import FieldCard from "$lib/components/FieldCard.svelte"; import PronounLink from "$lib/components/PronounLink.svelte"; import PartialMemberCard from "$lib/components/PartialMemberCard.svelte"; diff --git a/frontend/src/routes/@[username]/edit/+layout.ts b/frontend/src/routes/@[username]/edit/+layout.ts index 6d219e4..950d945 100644 --- a/frontend/src/routes/@[username]/edit/+layout.ts +++ b/frontend/src/routes/@[username]/edit/+layout.ts @@ -1,6 +1,6 @@ -import type { PrideFlag, APIError, MeUser, PronounsJson } from "$lib/api/entities"; +import type { PrideFlag, MeUser, PronounsJson } from "$lib/api/entities"; import { apiFetchClient } from "$lib/api/fetch"; -import { error, redirect, type Redirect } from "@sveltejs/kit"; +import { error, redirect } from "@sveltejs/kit"; import pronounsRaw from "$lib/pronouns.json"; const pronouns = pronounsRaw as PronounsJson; diff --git a/frontend/src/routes/auth/login/CallbackPage.svelte b/frontend/src/routes/auth/login/CallbackPage.svelte index 685281a..1d5541a 100644 --- a/frontend/src/routes/auth/login/CallbackPage.svelte +++ b/frontend/src/routes/auth/login/CallbackPage.svelte @@ -64,8 +64,10 @@ ) => Promise; let captchaToken = ""; + // svelte-hcaptcha doesn't have types, so we can't use anything except `any` here. + // eslint-disable-next-line @typescript-eslint/no-explicit-any let captcha: any; - + // eslint-disable-next-line @typescript-eslint/no-explicit-any const captchaSuccess = (token: any) => { captchaToken = token.detail.token; }; @@ -88,6 +90,8 @@ await fastFetch("/auth/force-delete", { method: "GET", headers: { + // We know for sure this value is non-null if this function is run at all + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion "X-Delete-Token": token!, }, }); @@ -105,6 +109,8 @@ await fastFetch("/auth/cancel-delete", { method: "GET", headers: { + // We know for sure this value is non-null if this function is run at all + // eslint-disable-next-line @typescript-eslint/no-non-null-assertion "X-Delete-Token": token!, }, }); diff --git a/frontend/src/routes/auth/login/discord/+page.svelte b/frontend/src/routes/auth/login/discord/+page.svelte index 66feeb8..eb89ac9 100644 --- a/frontend/src/routes/auth/login/discord/+page.svelte +++ b/frontend/src/routes/auth/login/discord/+page.svelte @@ -10,7 +10,7 @@ export let data: PageData; - let callbackPage: any; + let callbackPage: CallbackPage; const signupForm = async (username: string, invite: string, captchaToken: string) => { try { diff --git a/frontend/src/routes/auth/login/google/+page.svelte b/frontend/src/routes/auth/login/google/+page.svelte index 3e3722c..0cbedc3 100644 --- a/frontend/src/routes/auth/login/google/+page.svelte +++ b/frontend/src/routes/auth/login/google/+page.svelte @@ -10,7 +10,7 @@ export let data: PageData; - let callbackPage: any; + let callbackPage: CallbackPage; const signupForm = async (username: string, invite: string, captchaToken: string) => { try { diff --git a/frontend/src/routes/auth/login/mastodon/[instance]/+page.svelte b/frontend/src/routes/auth/login/mastodon/[instance]/+page.svelte index 4241bba..67eb3ed 100644 --- a/frontend/src/routes/auth/login/mastodon/[instance]/+page.svelte +++ b/frontend/src/routes/auth/login/mastodon/[instance]/+page.svelte @@ -10,7 +10,7 @@ export let data: PageData; - let callbackPage: any; + let callbackPage: CallbackPage; const signupForm = async (username: string, invite: string, captchaToken: string) => { try { diff --git a/frontend/src/routes/auth/login/misskey/[instance]/+page.svelte b/frontend/src/routes/auth/login/misskey/[instance]/+page.svelte index b74b0cf..eb250c9 100644 --- a/frontend/src/routes/auth/login/misskey/[instance]/+page.svelte +++ b/frontend/src/routes/auth/login/misskey/[instance]/+page.svelte @@ -10,7 +10,7 @@ export let data: PageData; - let callbackPage: any; + let callbackPage: CallbackPage; const signupForm = async (username: string, invite: string, captchaToken: string) => { try { diff --git a/frontend/src/routes/auth/login/tumblr/+page.svelte b/frontend/src/routes/auth/login/tumblr/+page.svelte index 1316f33..34fdf53 100644 --- a/frontend/src/routes/auth/login/tumblr/+page.svelte +++ b/frontend/src/routes/auth/login/tumblr/+page.svelte @@ -10,7 +10,7 @@ export let data: PageData; - let callbackPage: any; + let callbackPage: CallbackPage; const signupForm = async (username: string, invite: string, captchaToken: string) => { try { diff --git a/frontend/src/routes/page/about/+page.svelte b/frontend/src/routes/page/about/+page.svelte index 82fb6eb..5974c09 100644 --- a/frontend/src/routes/page/about/+page.svelte +++ b/frontend/src/routes/page/about/+page.svelte @@ -1,4 +1,6 @@ diff --git a/frontend/src/routes/page/changelog/+page.svelte b/frontend/src/routes/page/changelog/+page.svelte index 890f472..bd98e56 100644 --- a/frontend/src/routes/page/changelog/+page.svelte +++ b/frontend/src/routes/page/changelog/+page.svelte @@ -1,5 +1,7 @@ diff --git a/frontend/src/routes/page/terms/+page.svelte b/frontend/src/routes/page/terms/+page.svelte index fc3734e..92044e4 100644 --- a/frontend/src/routes/page/terms/+page.svelte +++ b/frontend/src/routes/page/terms/+page.svelte @@ -1,4 +1,6 @@ diff --git a/frontend/src/routes/settings/+page.svelte b/frontend/src/routes/settings/+page.svelte index 58f5650..e2c57db 100644 --- a/frontend/src/routes/settings/+page.svelte +++ b/frontend/src/routes/settings/+page.svelte @@ -25,7 +25,6 @@ Table, } from "@sveltestrap/sveltestrap"; import type { PageData } from "./$types"; - import { onMount } from "svelte"; import { DateTime } from "luxon"; export let data: PageData;