From e7f940daa13c9ea9108176898f2ed27689e50d4a Mon Sep 17 00:00:00 2001 From: "Calum H. (IMB11)" Date: Fri, 1 Aug 2025 15:15:42 +0100 Subject: [PATCH] chore: fix util lint issues --- apps/frontend/.prettierrc | 4 ++++ packages/tooling-config/eslint/base.mjs | 22 +------------------ packages/tooling-config/eslint/common.mjs | 20 +++++++++++++++++ packages/tooling-config/eslint/nuxt.mjs | 17 ++------------ packages/utils/billing.ts | 1 - packages/utils/codemirror.ts | 5 ++--- packages/utils/highlight.ts | 19 ++++++++-------- packages/utils/index.ts | 4 ++-- packages/utils/servers/errors/index.ts | 4 ++-- .../servers/errors/modrinth-server-error.ts | 3 ++- .../errors/modrinth-servers-multi-error.ts | 10 ++++----- packages/utils/servers/types/api.ts | 2 +- packages/utils/servers/types/backup.ts | 2 +- packages/utils/servers/types/common.ts | 6 ++--- packages/utils/servers/types/filesystem.ts | 4 ++-- packages/utils/servers/types/index.ts | 10 ++++----- packages/utils/servers/types/websocket.ts | 2 +- packages/utils/utils.ts | 2 +- 18 files changed, 63 insertions(+), 74 deletions(-) create mode 100644 apps/frontend/.prettierrc create mode 100644 packages/tooling-config/eslint/common.mjs diff --git a/apps/frontend/.prettierrc b/apps/frontend/.prettierrc new file mode 100644 index 000000000..8c662d196 --- /dev/null +++ b/apps/frontend/.prettierrc @@ -0,0 +1,4 @@ +{ + "endOfLine": "auto", + "plugins": ["prettier-plugin-tailwindcss"] +} diff --git a/packages/tooling-config/eslint/base.mjs b/packages/tooling-config/eslint/base.mjs index 387da61e5..6b0da7cbf 100644 --- a/packages/tooling-config/eslint/base.mjs +++ b/packages/tooling-config/eslint/base.mjs @@ -1,12 +1,12 @@ import eslint from '@eslint/js' import tseslint from 'typescript-eslint' import prettierEslint from 'eslint-plugin-prettier/recommended' -import simpleImportSort from 'eslint-plugin-simple-import-sort' export default tseslint.config( eslint.configs.recommended, tseslint.configs.recommendedTypeChecked, prettierEslint, + ...common, { languageOptions: { parserOptions: { @@ -17,24 +17,4 @@ export default tseslint.config( { ignores: ['node_modules/', 'dist/', 'build/'], }, - { - plugins: { - 'simple-import-sort': simpleImportSort, - }, - rules: { - 'simple-import-sort/imports': 'error', - 'simple-import-sort/exports': 'error', - }, - }, - { - rules: { - '@typescript-eslint/no-type-alias': [ - 'error', - { - allowGenerics: 'always', - }, - ], - '@typescript-eslint/ban-ts-comment': 'off', - }, - }, ) diff --git a/packages/tooling-config/eslint/common.mjs b/packages/tooling-config/eslint/common.mjs new file mode 100644 index 000000000..e71e75a86 --- /dev/null +++ b/packages/tooling-config/eslint/common.mjs @@ -0,0 +1,20 @@ +import simpleImportSort from 'eslint-plugin-simple-import-sort' + +export default [ + { + plugins: { + 'simple-import-sort': simpleImportSort, + }, + rules: { + 'simple-import-sort/imports': 'error', + 'simple-import-sort/exports': 'error', + }, + }, + { + rules: { + '@typescript-eslint/no-type-alias': 'off', + '@typescript-eslint/ban-ts-comment': 'off', + '@typescript-eslint/prefer-literal-enum-member': 'off', + }, + }, +] diff --git a/packages/tooling-config/eslint/nuxt.mjs b/packages/tooling-config/eslint/nuxt.mjs index a2cd03e14..cd5318d98 100644 --- a/packages/tooling-config/eslint/nuxt.mjs +++ b/packages/tooling-config/eslint/nuxt.mjs @@ -1,9 +1,10 @@ import { createConfigForNuxt } from '@nuxt/eslint-config/flat' import { fixupPluginRules } from '@eslint/compat' import turboPlugin from 'eslint-plugin-turbo' -import simpleImportSort from 'eslint-plugin-simple-import-sort' +import common from './common.mjs' export const configurationNuxtToAppend = [ + ...common, { name: 'turbo', plugins: { @@ -25,20 +26,6 @@ export const configurationNuxtToAppend = [ }, }, }, - { - plugins: { - 'simple-import-sort': simpleImportSort, - }, - rules: { - 'simple-import-sort/imports': 'error', - 'simple-import-sort/exports': 'error', - }, - }, - { - rules: { - '@typescript-eslint/ban-ts-comment': 'off', - }, - }, ] export default createConfigForNuxt().append(configurationNuxtToAppend) diff --git a/packages/utils/billing.ts b/packages/utils/billing.ts index a24e51ad9..dbf7b3699 100644 --- a/packages/utils/billing.ts +++ b/packages/utils/billing.ts @@ -1,4 +1,3 @@ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-nocheck export const getCurrency = (userCountry) => { diff --git a/packages/utils/codemirror.ts b/packages/utils/codemirror.ts index 9c72ced89..86dc6eefa 100644 --- a/packages/utils/codemirror.ts +++ b/packages/utils/codemirror.ts @@ -1,11 +1,10 @@ -// eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-nocheck import { insertNewlineAndIndent } from '@codemirror/commands' import { deleteMarkupBackward } from '@codemirror/lang-markdown' import { getIndentation, indentString, syntaxTree } from '@codemirror/language' -import { type EditorState, type Transaction } from '@codemirror/state' -import { type EditorView, type Command, type KeyBinding } from '@codemirror/view' +import type { EditorState, Transaction } from '@codemirror/state' +import type { Command, EditorView, KeyBinding } from '@codemirror/view' const toggleBold: Command = ({ state, dispatch }) => { return toggleAround(state, dispatch, '**', '**') diff --git a/packages/utils/highlight.ts b/packages/utils/highlight.ts index 66a7a2392..ec2f01bdf 100644 --- a/packages/utils/highlight.ts +++ b/packages/utils/highlight.ts @@ -1,20 +1,21 @@ import hljs from 'highlight.js/lib/core' -// Scripting -import javascript from 'highlight.js/lib/languages/javascript' -import lua from 'highlight.js/lib/languages/lua' -import python from 'highlight.js/lib/languages/python' -// Coding -import groovy from 'highlight.js/lib/languages/groovy' -import java from 'highlight.js/lib/languages/java' -import kotlin from 'highlight.js/lib/languages/kotlin' -import scala from 'highlight.js/lib/languages/scala' // Configs import gradle from 'highlight.js/lib/languages/gradle' +// Coding +import groovy from 'highlight.js/lib/languages/groovy' import ini from 'highlight.js/lib/languages/ini' +import java from 'highlight.js/lib/languages/java' +// Scripting +import javascript from 'highlight.js/lib/languages/javascript' import json from 'highlight.js/lib/languages/json' +import kotlin from 'highlight.js/lib/languages/kotlin' +import lua from 'highlight.js/lib/languages/lua' import properties from 'highlight.js/lib/languages/properties' +import python from 'highlight.js/lib/languages/python' +import scala from 'highlight.js/lib/languages/scala' import xml from 'highlight.js/lib/languages/xml' import yaml from 'highlight.js/lib/languages/yaml' + import { configuredXss, md } from './parse' /* REGISTRATION */ diff --git a/packages/utils/index.ts b/packages/utils/index.ts index 9369aa69f..0a72bb3a9 100644 --- a/packages/utils/index.ts +++ b/packages/utils/index.ts @@ -4,8 +4,8 @@ export * from './highlight' export * from './licenses' export * from './parse' export * from './projects' +export * from './servers' +export * from './three/skin-rendering' export * from './types' export * from './users' export * from './utils' -export * from './servers' -export * from './three/skin-rendering' diff --git a/packages/utils/servers/errors/index.ts b/packages/utils/servers/errors/index.ts index 48f33c65f..251b762ee 100644 --- a/packages/utils/servers/errors/index.ts +++ b/packages/utils/servers/errors/index.ts @@ -1,3 +1,3 @@ -export * from './modrinth-servers-multi-error' -export * from './modrinth-servers-fetch-error' export * from './modrinth-server-error' +export * from './modrinth-servers-fetch-error' +export * from './modrinth-servers-multi-error' diff --git a/packages/utils/servers/errors/modrinth-server-error.ts b/packages/utils/servers/errors/modrinth-server-error.ts index c0a548a77..230bcbda3 100644 --- a/packages/utils/servers/errors/modrinth-server-error.ts +++ b/packages/utils/servers/errors/modrinth-server-error.ts @@ -1,5 +1,6 @@ import { FetchError } from 'ofetch' -import { V1ErrorInfo } from '../types' + +import type { V1ErrorInfo } from '../types' export class ModrinthServerError extends Error { constructor( diff --git a/packages/utils/servers/errors/modrinth-servers-multi-error.ts b/packages/utils/servers/errors/modrinth-servers-multi-error.ts index f9cfb1d60..198ff0bbb 100644 --- a/packages/utils/servers/errors/modrinth-servers-multi-error.ts +++ b/packages/utils/servers/errors/modrinth-servers-multi-error.ts @@ -17,11 +17,9 @@ export class ModrinthServersMultiError extends Error { } private buildErrorMessage(): string { - return ( - Array.from(this.errors.entries()) - // eslint-disable-next-line @typescript-eslint/no-unused-vars - .map(([_module, error]) => error.message) - .join('\n') - ) + return Array.from(this.errors.entries()) + + .map(([_module, error]) => error.message) + .join('\n') } } diff --git a/packages/utils/servers/types/api.ts b/packages/utils/servers/types/api.ts index a9ba86f10..a478f9a64 100644 --- a/packages/utils/servers/types/api.ts +++ b/packages/utils/servers/types/api.ts @@ -1,4 +1,4 @@ -import { ModrinthServerError } from '../errors' +import type { ModrinthServerError } from '../errors' export interface V1ErrorInfo { context?: string diff --git a/packages/utils/servers/types/backup.ts b/packages/utils/servers/types/backup.ts index 485880bfa..321f368de 100644 --- a/packages/utils/servers/types/backup.ts +++ b/packages/utils/servers/types/backup.ts @@ -1,4 +1,4 @@ -import type { WSBackupTask, WSBackupState } from './websocket' +import type { WSBackupState, WSBackupTask } from './websocket' export interface Backup { id: string diff --git a/packages/utils/servers/types/common.ts b/packages/utils/servers/types/common.ts index deae3b138..973192a4d 100644 --- a/packages/utils/servers/types/common.ts +++ b/packages/utils/servers/types/common.ts @@ -1,7 +1,7 @@ import type { Project } from '../../types' -import { Allocation } from './server' -import { ServerBackup } from './backup' -import { Mod } from './content' +import type { ServerBackup } from './backup' +import type { Mod } from './content' +import type { Allocation } from './server' export type ServerNotice = { id: number diff --git a/packages/utils/servers/types/filesystem.ts b/packages/utils/servers/types/filesystem.ts index 624ade6dd..c1d8da63f 100644 --- a/packages/utils/servers/types/filesystem.ts +++ b/packages/utils/servers/types/filesystem.ts @@ -1,5 +1,5 @@ -import type { FSQueuedOp, FilesystemOp } from './websocket' -import { JWTAuth } from './api' +import type { JWTAuth } from './api' +import type { FilesystemOp, FSQueuedOp } from './websocket' export interface DirectoryItem { name: string diff --git a/packages/utils/servers/types/index.ts b/packages/utils/servers/types/index.ts index 30b251a42..eae1ea964 100644 --- a/packages/utils/servers/types/index.ts +++ b/packages/utils/servers/types/index.ts @@ -1,8 +1,8 @@ export * from './api' -export * from './content' -export * from './server' export * from './backup' -export * from './filesystem' -export * from './websocket' -export * from './stats' export * from './common' +export * from './content' +export * from './filesystem' +export * from './server' +export * from './stats' +export * from './websocket' diff --git a/packages/utils/servers/types/websocket.ts b/packages/utils/servers/types/websocket.ts index 78eea4677..728be8e2f 100644 --- a/packages/utils/servers/types/websocket.ts +++ b/packages/utils/servers/types/websocket.ts @@ -1,5 +1,5 @@ -import type { Stats } from './stats' import type { ServerState } from './server' +import type { Stats } from './stats' export interface WSAuth { url: string diff --git a/packages/utils/utils.ts b/packages/utils/utils.ts index 937827c85..480baac7f 100644 --- a/packages/utils/utils.ts +++ b/packages/utils/utils.ts @@ -1,5 +1,5 @@ // noinspection JSUnusedGlobalSymbols -// eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-nocheck import dayjs from 'dayjs'