use eslint@9

undefined-moe · undefined-moe · commit 0be116328642 · 2025-06-06T04:24:02.000+08:00
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,87 @@
+/* eslint-disable max-len */
+import { defineConfig, globalIgnores } from 'eslint/config';
+import globals from 'globals';
+import react from '@hydrooj/eslint-config';
+
+export default defineConfig([globalIgnores([
+    '**/dist',
+    '**/*.d.ts',
+    '**/node_modules',
+    '**/.*.js',
+]), {
+    extends: [react],
+
+    languageOptions: {
+        ecmaVersion: 5,
+        sourceType: 'module',
+    },
+
+    settings: {
+        'import/parsers': {
+            '@typescript-eslint/parser': ['.ts', '.js', '.jsx', '.tsx'],
+        },
+    },
+
+    rules: {
+        '@typescript-eslint/no-invalid-this': 1,
+
+        'simple-import-sort/imports': ['warn', {
+            groups: [
+                ['^\\u0000'],
+                [
+                    '^(node:)?(assert|buffer|child_process|cluster|console|constants|crypto|dgram|dns|domain|events|fs|http|https|module|net|os|path|punycode|querystring|readline|repl|stream|string_decoder|sys|timers|tls|tty|url|util|vm|zlib|freelist|v8|process|async_hooks|http2|perf_hooks)(/.*|$)',
+                    '^(?!@?hydrooj)(@?\\w.+)',
+                    '^@?hydrooj',
+                    '^',
+                    '^\\.',
+                ]],
+        }],
+    },
+}, {
+    files: [
+        '**/packages/ui/**/*.{cjs,ts,tsx}',
+    ],
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+        },
+        parserOptions: {
+            sourceType: 'module',
+            ecmaVersion: 2020,
+            ecmaFeatures: {
+                impliedStrict: true,
+                experimentalObjectRestSpread: true,
+                jsx: true,
+                defaultParams: true,
+                legacyDecorators: true,
+                allowImportExportEverywhere: true,
+            },
+        },
+    },
+
+    settings: {
+        'react-x': {
+            version: '18.3.1',
+        },
+    },
+
+    rules: {
+        'github/array-foreach': 0,
+        '@typescript-eslint/no-invalid-this': 0,
+
+        // FIXME A bug with eslint-parser
+        // 'template-curly-spacing': 'off',
+
+        '@stylistic/indent': [
+            'warn',
+            2,
+            { SwitchCase: 1 },
+        ],
+        'function-paren-newline': 'off',
+        'no-mixed-operators': 'off',
+        'no-await-in-loop': 'off',
+        'no-lonely-if': 'off',
+        'no-script-url': 'off',
+    },
+}]);
diff --git a/package.json b/package.json
@@ -16,18 +16,18 @@
   },
   "devDependencies": {
     "@expo-google-fonts/noto-sans-sc": "^0.2.3",
-    "@hydrooj/eslint-config": "^1.1.1",
+    "@hydrooj/eslint-config": "^2.0.0",
     "@hydrooj/register": "^1.0.3",
     "@hydrooj/utils": "^1.4.29",
     "@neutralinojs/neu": "^11.3.0",
     "@types/node": "^20.17.1",
     "@yao-pkg/pkg": "^5.16.1",
     "chardet": "^2.1.0",
     "dejavu-fonts-ttf": "^2.37.3",
-    "eslint": "^8.57.1",
-    "eslint-import-resolver-typescript": "^3.6.3",
+    "eslint": "^9.28.0",
+    "eslint-import-resolver-typescript": "^4.4.2",
     "iconv-lite": "^0.6.3",
-    "typescript": "5.4.5"
+    "typescript": "5.8.3"
   },
   "resolutions": {
     "formidable": "patch:formidable@npm%3A2.1.2#~/.yarn/patches/formidable-npm-2.1.2-40ba18d67f.patch",
diff --git a/packages/server/handler/balloon.ts b/packages/server/handler/balloon.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-await-in-loop */
 import { Context } from 'cordis';
 import { ValidationError } from '@hydrooj/framework';
 import { Logger } from '../utils';
diff --git a/packages/server/handler/commands.ts b/packages/server/handler/commands.ts
@@ -1,5 +1,3 @@
-/* eslint-disable no-empty-pattern */
-/* eslint-disable no-await-in-loop */
 import { Context } from 'cordis';
 import { BadRequestError } from '@hydrooj/framework';
 import { config } from '../config';
diff --git a/packages/server/handler/misc.ts b/packages/server/handler/misc.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-await-in-loop */
 // @ts-ignore
 import { Context } from 'cordis';
 import { Registry } from 'prom-client';
diff --git a/packages/server/handler/printer.ts b/packages/server/handler/printer.ts
@@ -1,4 +1,3 @@
-/* eslint-disable no-await-in-loop */
 import path from 'path';
 import { Context } from 'cordis';
 import { BadRequestError, Handler, ValidationError } from '@hydrooj/framework';
diff --git a/packages/server/utils/commandRunner.ts b/packages/server/utils/commandRunner.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-loop-func */
 import child from 'child_process';
 import fs from 'fs';
 import { homedir } from 'os';
@@ -42,6 +41,7 @@ export async function executeOnHost(host: string, command: string, timeout = 100
     logger.info('executing', command, 'on', host);
     return await asyncCommand([
         'ssh', '-o', 'StrictHostKeyChecking no', '-o', `IdentityFile ${customKeyfile || keyfile}`,
+        '-o', 'UserKnownHostsFile /dev/null',
         `root@${host}`,
         'bash', '-c', `'echo $(echo ${Buffer.from(command).toString('base64')} | base64 -d | bash)'`,
     ], timeout);
diff --git a/packages/server/utils/index.ts b/packages/server/utils/index.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-loop-func */
-/* eslint-disable no-await-in-loop */
 import { gunzipSync } from 'zlib';
 import { decode } from 'base16384';
 import Logger from 'reggol';
diff --git a/packages/ui/app/App.tsx b/packages/ui/app/App.tsx
@@ -1,5 +1,5 @@
-import React from 'react';
 import { AppShell, Container } from '@mantine/core';
+import React from 'react';
 import {
   HashRouter, Outlet, Route, Routes,
 } from 'react-router-dom';
diff --git a/packages/ui/app/Resolver.tsx b/packages/ui/app/Resolver.tsx
@@ -1,7 +1,7 @@
-import React from 'react';
 import {
   Card, Center,
 } from '@mantine/core';
+import React from 'react';
 
 export default function Monitor() {
   return (
diff --git a/packages/ui/app/components/BalloonsModal.tsx b/packages/ui/app/components/BalloonsModal.tsx
@@ -1,5 +1,3 @@
-import React, { useState } from 'react';
-import { getBalloonName } from '@hydrooj/xcpc-tools/utils/color';
 import {
   Accordion,
   ActionIcon,
@@ -9,6 +7,8 @@ import {
 import { useDisclosure } from '@mantine/hooks';
 import { notifications } from '@mantine/notifications';
 import { IconCheck, IconCopy, IconX } from '@tabler/icons-react';
+import React, { useState } from 'react';
+import { getBalloonName } from '@hydrooj/xcpc-tools/utils/color';
 
 export function BalloonsClient({ clients, refresh }) {
   const [adding, setAdding] = useState(false);
diff --git a/packages/ui/app/components/BalloonsTable.tsx b/packages/ui/app/components/BalloonsTable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   ActionIcon, Badge, Group, LoadingOverlay, Table,
   ThemeIcon, Tooltip,
@@ -7,6 +6,7 @@ import { notifications } from '@mantine/notifications';
 import {
   IconCheck, IconHourglassEmpty, IconPrinter, IconRefresh,
 } from '@tabler/icons-react';
+import React from 'react';
 
 function BalloonRow({ balloon, refresh }) {
   const [loading, setLoading] = React.useState(false);
diff --git a/packages/ui/app/components/Header.tsx b/packages/ui/app/components/Header.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   Container,
   Group, rem,
@@ -7,6 +6,7 @@ import {
 import {
   IconBalloonFilled, IconDeviceHeartMonitor, IconHome, IconPrinter, IconTerminal2,
 } from '@tabler/icons-react';
+import React from 'react';
 import { useLocation, useNavigate } from 'react-router-dom';
 
 const iconStyle = { width: rem(18), height: rem(18) };
diff --git a/packages/ui/app/components/MonitorBatchModel.tsx b/packages/ui/app/components/MonitorBatchModel.tsx
@@ -1,10 +1,10 @@
-import React, { useState } from 'react';
 import {
   Button, LoadingOverlay, Modal, Textarea,
   TextInput,
 } from '@mantine/core';
 import { useDisclosure } from '@mantine/hooks';
 import { notifications } from '@mantine/notifications';
+import React, { useState } from 'react';
 
 export function MonitorBatchModal({ refresh }) {
   const [opened, { open, close }] = useDisclosure(false);
diff --git a/packages/ui/app/components/MonitorDisplay.tsx b/packages/ui/app/components/MonitorDisplay.tsx
@@ -1,9 +1,9 @@
-import React from 'react';
 import {
   Card, Center, Grid, Group,
   HoverCard, Table, Text, ThemeIcon, Title, Tooltip,
 } from '@mantine/core';
 import { IconCheck, IconX } from '@tabler/icons-react';
+import React from 'react';
 import { MonitorInfoButton } from './MonitorInfo';
 
 export function MonitorCards({ monitors, openMonitorInfo }) {
diff --git a/packages/ui/app/components/MonitorInfo.tsx b/packages/ui/app/components/MonitorInfo.tsx
@@ -1,4 +1,3 @@
-import React, { useState } from 'react';
 import {
   ActionIcon, Button, Card, Fieldset, FocusTrap,
   Grid, Group, LoadingOverlay, Tabs, Text, TextInput, Title, Tooltip,
@@ -9,6 +8,7 @@ import {
   IconDeviceComputerCamera, IconDeviceDesktop, IconInfoCircle, IconX,
 } from '@tabler/icons-react';
 import mpegts from 'mpegts.js';
+import React, { useState } from 'react';
 
 function VideoPlayer({ client, type = 'camera' }) {
   const videoRef = React.useRef(null);
diff --git a/packages/ui/app/components/PrintAdd.tsx b/packages/ui/app/components/PrintAdd.tsx
@@ -1,9 +1,9 @@
-import React, { useState } from 'react';
 import {
   Button, Fieldset, FileInput, FocusTrap, LoadingOverlay, Modal, Select, TextInput,
 } from '@mantine/core';
 import { useDisclosure } from '@mantine/hooks';
 import { notifications } from '@mantine/notifications';
+import React, { useState } from 'react';
 import { ext2Lang, Languages } from '../utils';
 
 export function PrintClientAdd({ refresh }) {
diff --git a/packages/ui/app/components/PrintClientInfo.tsx b/packages/ui/app/components/PrintClientInfo.tsx
@@ -1,10 +1,10 @@
-import React from 'react';
 import {
   Accordion, ActionIcon, Badge, Button, Center, Group, Modal, Table, Text, ThemeIcon, Tooltip,
 } from '@mantine/core';
 import { useClipboard, useDisclosure } from '@mantine/hooks';
 import { notifications } from '@mantine/notifications';
 import { IconCheck, IconCopy, IconX } from '@tabler/icons-react';
+import React from 'react';
 
 function PrintersInfo({ client, refresh }) {
   const [opened, { open, close }] = useDisclosure(false);
diff --git a/packages/ui/app/components/PrintTasksTable.tsx b/packages/ui/app/components/PrintTasksTable.tsx
@@ -1,4 +1,3 @@
-import React from 'react';
 import {
   ActionIcon, Group, LoadingOverlay, Table, Text,
   ThemeIcon,
@@ -9,6 +8,7 @@ import { notifications } from '@mantine/notifications';
 import {
   IconCheck, IconEye, IconHourglassEmpty, IconPrinter, IconRefresh, IconX,
 } from '@tabler/icons-react';
+import React from 'react';
 
 function PrintTaskRow({ colorCode, task, refresh }) {
   const [loading, setLoading] = React.useState(false);
diff --git a/packages/ui/app/index.tsx b/packages/ui/app/index.tsx
@@ -2,13 +2,13 @@ import '@mantine/core/styles.css';
 import '@mantine/notifications/styles.css';
 import '@mantine/nprogress/styles.css';
 
-import React from 'react';
-import ReactDOM from 'react-dom/client';
 import { MantineProvider } from '@mantine/core';
 import { ModalsProvider } from '@mantine/modals';
 import { Notifications } from '@mantine/notifications';
 import { NavigationProgress } from '@mantine/nprogress';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import React from 'react';
+import ReactDOM from 'react-dom/client';
 import App from './App';
 
 const queryClient = new QueryClient();
diff --git a/packages/ui/app/pages/Balloon.tsx b/packages/ui/app/pages/Balloon.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
 import {
   Card, Center, Group, LoadingOverlay, Text, Title,
 } from '@mantine/core';
 import { useQuery } from '@tanstack/react-query';
+import React from 'react';
 import { BallonColorChecker, BalloonsClient } from '../components/BalloonsModal';
 import { BalloonsTable } from '../components/BalloonsTable';
 
@@ -25,7 +25,7 @@ export default function Print() {
           <BalloonsClient clients={query.data?.clients || []} refresh={query.refetch} />
         </Group>
       </Group>
-      {(!(query.isLoading || query.isFetching) && (!(query.data?.balloons || []).length) ? (
+      {(!query.isLoading && !query.isFetching && (!(query.data?.balloons || []).length) ? (
         <Center mt="md">
           <Text c="dimmed">No balloons found</Text>
         </Center>
diff --git a/packages/ui/app/pages/Commands.tsx b/packages/ui/app/pages/Commands.tsx
@@ -1,8 +1,8 @@
-import React from 'react';
 import {
   Button, Card, Divider, Group, Textarea, Title,
 } from '@mantine/core';
 import { notifications } from '@mantine/notifications';
+import React from 'react';
 
 export default function Commands() {
   const [command, setCommand] = React.useState('');
diff --git a/packages/ui/app/pages/Dashboard.tsx b/packages/ui/app/pages/Dashboard.tsx
@@ -1,11 +1,11 @@
-import React, { useEffect } from 'react';
 import {
   Group, Paper, SimpleGrid, Text,
 } from '@mantine/core';
 import {
   IconBalloon, IconChecklist, IconMailCheck, IconMailForward, IconPrinter, IconSend2, IconUser, IconUserCheck, IconUserX,
 } from '@tabler/icons-react';
 import { useQuery } from '@tanstack/react-query';
+import React, { useEffect } from 'react';
 
 export function StatsCard({ title, value, Icon }) {
   return (
diff --git a/packages/ui/app/pages/Monitor.tsx b/packages/ui/app/pages/Monitor.tsx
diff --git a/packages/ui/app/pages/Print.tsx b/packages/ui/app/pages/Print.tsx
diff --git a/packages/ui/build.ts b/packages/ui/build.ts
diff --git a/packages/ui/package.json b/packages/ui/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* eslint-disable no-await-in-loop */`
`2`	`1`	`import { Context } from 'cordis';`
`3`	`2`	`import { ValidationError } from '@hydrooj/framework';`
`4`	`3`	`import { Logger } from '../utils';`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/* eslint-disable no-empty-pattern */`
`2`		`-/* eslint-disable no-await-in-loop */`
`3`	`1`	`import { Context } from 'cordis';`
`4`	`2`	`import { BadRequestError } from '@hydrooj/framework';`
`5`	`3`	`import { config } from '../config';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* eslint-disable no-await-in-loop */`
`2`	`1`	`// @ts-ignore`
`3`	`2`	`import { Context } from 'cordis';`
`4`	`3`	`import { Registry } from 'prom-client';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-/* eslint-disable no-await-in-loop */`
`2`	`1`	`import path from 'path';`
`3`	`2`	`import { Context } from 'cordis';`
`4`	`3`	`import { BadRequestError, Handler, ValidationError } from '@hydrooj/framework';`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-/* eslint-disable @typescript-eslint/no-loop-func */`
`2`		`-/* eslint-disable no-await-in-loop */`
`3`	`1`	`import { gunzipSync } from 'zlib';`
`4`	`2`	`import { decode } from 'base16384';`
`5`	`3`	`import Logger from 'reggol';`