chore: change eslint config to sort imports with --fix

.prettierrc

@@ -1,5 +1,4 @@
 {
-  "plugins": ["prettier-plugin-organize-imports"],
   "singleQuote": true,
   "jsxSingleQuote": true,
   "tabWidth": 2,

collab-server/src/server.ts

@@ -1,9 +1,10 @@
-import { Database } from '@hocuspocus/extension-database'
-import { Server } from '@hocuspocus/server'
 import { once } from 'node:events'
 import fs from 'node:fs/promises'
 import path from 'node:path'
 import { DatabaseSync } from 'node:sqlite'
+
+import { Database } from '@hocuspocus/extension-database'
+import { Server } from '@hocuspocus/server'
 import * as Y from 'yjs'
 
 // -- CLI --

eslint.config.mjs

@@ -1,8 +1,10 @@
+import { defineConfig, globalIgnores } from 'eslint/config'
 import nextVitals from 'eslint-config-next/core-web-vitals'
 import nextTs from 'eslint-config-next/typescript'
 import prettier from 'eslint-config-prettier/flat'
 import noRelativeImportPaths from 'eslint-plugin-no-relative-import-paths'
-import { defineConfig, globalIgnores } from 'eslint/config'
+import simpleImportSort from 'eslint-plugin-simple-import-sort'
+import unusedImports from 'eslint-plugin-unused-imports'
 
 const eslintConfig = defineConfig([
   ...nextVitals,
@@ -21,6 +23,19 @@ const eslintConfig = defineConfig([
     'branch-*/',
   ]),
   {
+    plugins: {
+      'simple-import-sort': simpleImportSort,
+      'unused-imports': unusedImports,
+    },
+    rules: {
+      '@typescript-eslint/no-unused-vars': 'off',
+      'simple-import-sort/imports': 'warn',
+      'unused-imports/no-unused-imports': 'warn',
+      'unused-imports/no-unused-vars': ['warn', { argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],
+    },
+  },
+  {
+    // Rules that only make sense in the app
     files: ['src/**/*.{mts,ts,tsx}'],
     plugins: { 'no-relative-import-paths': noRelativeImportPaths },
     rules: {

package.json

@@ -44,10 +44,11 @@
     "eslint-config-next": "16.2.3",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-no-relative-import-paths": "^1.6.1",
+    "eslint-plugin-simple-import-sort": "^13.0.0",
+    "eslint-plugin-unused-imports": "^4.4.1",
     "husky": "^9.1.7",
     "lint-staged": "^16.4.0",
     "prettier": "^3.8.2",
-    "prettier-plugin-organize-imports": "^4.3.0",
     "typescript": "^5"
   },
   "lint-staged": {

src/app/AvatarMenu.tsx

@@ -1,12 +1,13 @@
 'use client'
 
+import Link from 'next/link'
+import { useRouter } from 'next/navigation'
+import { useContext } from 'react'
+
 import AvatarIcon from '@/app/components/AvatarIcon'
 import authClient from '@/lib/client/auth'
 import { ConfigCtx } from '@/lib/contexts'
 import { setIsAdmin } from '@/lib/server/actions'
-import Link from 'next/link'
-import { useRouter } from 'next/navigation'
-import { useContext } from 'react'
 
 export default function AvatarMenu() {
   const session = authClient.useSession()

src/app/[userName]/NewProjectForm.tsx

@@ -1,9 +1,11 @@
 'use client'
 
-import { useServerAction } from '@/lib/client/util'
 import { useRouter } from 'next/navigation'
 import { useState } from 'react'
 import useSWR from 'swr'
+
+import { useServerAction } from '@/lib/client/util'
+
 import { createProject, listTemplates, type TemplateInfo } from './actions'
 
 export function NewProjectForm() {

src/app/[userName]/ProjectRow.tsx

@@ -1,11 +1,13 @@
 'use client'
 
-import { useServerAction } from '@/lib/client/util'
 import { Route } from 'next'
 import Link from 'next/link'
 import { useRouter } from 'next/navigation'
 import { startTransition, useState } from 'react'
-import { deleteProject, renameProject, toggleVisibility, type ProjectInfo } from './actions'
+
+import { useServerAction } from '@/lib/client/util'
+
+import { deleteProject, type ProjectInfo, renameProject, toggleVisibility } from './actions'
 
 export function ProjectRow({ project, username }: { project: ProjectInfo; username: string }) {
   const router = useRouter()

src/app/[userName]/[projectName]/page.tsx

@@ -1,11 +1,12 @@
+import { notFound } from 'next/navigation'
+import z from 'zod'
+
 import Error from '@/app/components/Error'
 import { requireAuth } from '@/lib/server/auth'
 import { getDb } from '@/lib/server/db'
 import { getEditorSessionManager } from '@/lib/server/editorSessions'
 import { canAccessProject } from '@/lib/server/util'
 import { zProjectName, zUserName } from '@/lib/util'
-import { notFound } from 'next/navigation'
-import z from 'zod'
 
 const zParams = z.object({
   userName: zUserName,

src/app/[userName]/[projectName]/preview/[...relPath]/route.ts

@@ -1,12 +1,13 @@
+import type { Route } from 'next'
+import { notFound, redirect } from 'next/navigation'
+import z from 'zod'
+
 import { requireAuth } from '@/lib/server/auth'
 import { getProjectDir } from '@/lib/server/config'
 import { getDb } from '@/lib/server/db'
 import { mintSignedDirToken, signedDirFileUrl } from '@/lib/server/dirToken'
 import { canAccessProject } from '@/lib/server/util'
 import { zProjectName, zUserName } from '@/lib/util'
-import type { Route } from 'next'
-import { notFound, redirect } from 'next/navigation'
-import z from 'zod'
 
 const zParams = z.object({
   userName: zUserName,

src/app/[userName]/actions.ts

@@ -1,16 +1,18 @@
 'use server'
 
+import crypto from 'node:crypto'
+import fs from 'node:fs/promises'
+import path from 'node:path'
+
+import { forbidden } from 'next/navigation'
+import z from 'zod'
+
 import { requireAuth } from '@/lib/server/auth'
 import { getPackageSetsDir, getTemplatesDir, getWorkspacesDir } from '@/lib/server/config'
 import { getDb } from '@/lib/server/db'
 import { existsAsync, serverAction } from '@/lib/server/util'
-import { zProjectId, zProjectName, zTemplateId, type ActionResponse } from '@/lib/util'
+import { type ActionResponse, zProjectId, zProjectName, zTemplateId } from '@/lib/util'
 import { Project } from '@/prisma/generated/client'
-import { forbidden } from 'next/navigation'
-import crypto from 'node:crypto'
-import fs from 'node:fs/promises'
-import path from 'node:path'
-import z from 'zod'
 
 const zTemplateMetadata = z.object({
   name: z.string(),

src/app/[userName]/page.tsx

@@ -1,10 +1,12 @@
-import { requireAuth } from '@/lib/server/auth'
-import { getDb } from '@/lib/server/db'
-import { zUserName } from '@/lib/util'
 import { Route } from 'next'
 import Link from 'next/link'
 import { notFound } from 'next/navigation'
 import z from 'zod'
+
+import { requireAuth } from '@/lib/server/auth'
+import { getDb } from '@/lib/server/db'
+import { zUserName } from '@/lib/util'
+
 import { NewProjectForm } from './NewProjectForm'
 import { ProjectRow } from './ProjectRow'
 

src/app/admin/actions.ts

@@ -1,16 +1,18 @@
 'use server'
 
+import { execFileSync } from 'node:child_process'
+import fs from 'node:fs'
+import path from 'node:path'
+
+import { forbidden } from 'next/navigation'
+import z from 'zod'
+
 import { initAuth, requireAuth } from '@/lib/server/auth'
 import { getConfig, getDataDir, getWorkspacesDir, saveConfig, zGithubAuthConfig } from '@/lib/server/config'
 import { getDb } from '@/lib/server/db'
 import { getEditorSessionManager } from '@/lib/server/editorSessions'
 import { serverAction } from '@/lib/server/util'
-import { zProjectId, zUserId, zUserName, type ActionResponse } from '@/lib/util'
-import { forbidden } from 'next/navigation'
-import { execFileSync } from 'node:child_process'
-import fs from 'node:fs'
-import path from 'node:path'
-import z from 'zod'
+import { type ActionResponse, zProjectId, zUserId, zUserName } from '@/lib/util'
 
 export async function requireAdmin() {
   const session = await requireAuth()

src/app/admin/components/AccessControl.tsx

@@ -1,5 +1,6 @@
 import { getConfig } from '@/lib/server/config'
 import { getDb } from '@/lib/server/db'
+
 import { AllowlistEditor } from './AllowlistEditor'
 import { RegistrationModeControl } from './RegistrationModeControl'
 

src/app/admin/components/AllowlistEditor.tsx

@@ -1,10 +1,11 @@
 'use client'
 
-import { addAllowedUser, removeAllowedUser } from '@/app/admin/actions'
-import { useServerAction } from '@/lib/client/util'
 import { useRouter } from 'next/navigation'
 import { startTransition, useRef } from 'react'
 
+import { addAllowedUser, removeAllowedUser } from '@/app/admin/actions'
+import { useServerAction } from '@/lib/client/util'
+
 export function AllowlistEditor({ users }: { users: string[] }) {
   const router = useRouter()
   const inputRef = useRef<HTMLInputElement>(null)

src/app/admin/components/HealthMonitor.tsx

@@ -1,9 +1,11 @@
 'use client'
 
-import { fetchDiskUsage, fetchHealth } from '@/app/admin/actions'
-import { useServerAction } from '@/lib/client/util'
 import { startTransition, useState } from 'react'
 import useSWR from 'swr'
+
+import { fetchDiskUsage, fetchHealth } from '@/app/admin/actions'
+import { useServerAction } from '@/lib/client/util'
+
 import { formatBytes, formatUptime } from './utils'
 
 const labelStyle = { padding: '4px 12px 4px 0', color: '#666' }

src/app/admin/components/OAuthConfig.tsx

@@ -1,10 +1,11 @@
 'use client'
 
-import { fetchOAuthConfig, updateOAuthConfig } from '@/app/admin/actions'
-import { useServerAction } from '@/lib/client/util'
 import { useState } from 'react'
 import useSWR from 'swr'
 
+import { fetchOAuthConfig, updateOAuthConfig } from '@/app/admin/actions'
+import { useServerAction } from '@/lib/client/util'
+
 export function OAuthConfig() {
   const { data, mutate } = useSWR('adminOAuthConfig', () => fetchOAuthConfig())
   const [editing, setEditing] = useState(false)

src/app/admin/components/RegistrationModeControl.tsx

@@ -1,10 +1,11 @@
 'use client'
 
+import { useRouter } from 'next/navigation'
+import { startTransition, useState } from 'react'
+
 import { setRegistrationMode } from '@/app/admin/actions'
 import { useServerAction } from '@/lib/client/util'
 import type { RegistrationMode } from '@/lib/server/config'
-import { useRouter } from 'next/navigation'
-import { startTransition, useState } from 'react'
 
 const MODES: { value: RegistrationMode; label: string }[] = [
   { value: 'open', label: 'Open registration' },

src/app/admin/components/SessionRow.tsx

@@ -1,11 +1,12 @@
 'use client'
 
+import { useRouter } from 'next/navigation'
+import { startTransition } from 'react'
+
 import { killEditorSession } from '@/app/admin/actions'
 import ProjectLink from '@/app/components/ProjectLink'
 import { useServerAction } from '@/lib/client/util'
 import type { EditorSessionInfo } from '@/lib/server/editorSessions'
-import { useRouter } from 'next/navigation'
-import { startTransition } from 'react'
 
 export function SessionRow({ info }: { info: EditorSessionInfo }) {
   const router = useRouter()

src/app/admin/components/SessionViewer.tsx

@@ -1,5 +1,6 @@
 import { requireAdmin } from '@/app/admin/actions'
 import { getEditorSessionManager } from '@/lib/server/editorSessions'
+
 import { SessionRow } from './SessionRow'
 
 export async function SessionViewer() {

src/app/admin/components/UserManagement.tsx

@@ -1,5 +1,6 @@
 import { requireAdmin } from '@/app/admin/actions'
 import { getDb } from '@/lib/server/db'
+
 import { UserRow } from './UserRow'
 
 export async function UserManagement() {

src/app/admin/components/UserRow.tsx

@@ -1,10 +1,11 @@
 'use client'
 
-import { deleteUser, toggleAdmin } from '@/app/admin/actions'
-import { useServerAction } from '@/lib/client/util'
 import { useRouter } from 'next/navigation'
 import { startTransition, useState } from 'react'
 
+import { deleteUser, toggleAdmin } from '@/app/admin/actions'
+import { useServerAction } from '@/lib/client/util'
+
 type User = { id: string; name: string; isAdmin: boolean }
 
 export function UserRow({ user, isSelf }: { user: User; isSelf: boolean }) {

src/app/api/auth-route/file/route.ts

@@ -1,8 +1,10 @@
-import { verifySignedDirToken } from '@/lib/server/dirToken'
-import { forbidden } from 'next/navigation'
 import fs from 'node:fs/promises'
 import path from 'node:path'
 
+import { forbidden } from 'next/navigation'
+
+import { verifySignedDirToken } from '@/lib/server/dirToken'
+
 /** Queried by Nginx to authorize a `/_file/<token>/<relPath>` request.
  * Any 2xx makes Nginx serve the file named in the `X-Validated-File-Path` response header,
  * whereas other codes cause Nginx to reject the original request. */