update eslint

Author: kaishuu0123

.eslintignore

@@ -0,0 +1,59 @@
+import { FlatCompat } from '@eslint/eslintrc'
+import js from '@eslint/js'
+import eslintPluginReact from 'eslint-plugin-react'
+
+const compat = new FlatCompat()
+
+export default [
+  {
+    ignores: ['**/{node_modules,dist,out,.gitignore}/**']
+  },
+  js.configs.recommended,
+  ...compat.extends(
+    '@electron-toolkit/eslint-config-ts/recommended',
+    '@electron-toolkit/eslint-config-prettier'
+  ),
+  {
+    files: ['**/*.{js,jsx,mjs,cjs,ts,tsx}'],
+    plugins: {
+      ...eslintPluginReact.configs.flat.recommended,
+      ...eslintPluginReact.configs.flat['jsx-runtime']
+    },
+    rules: {
+      '@typescript-eslint/no-unused-vars': [
+        'error',
+        {
+          args: 'all',
+          argsIgnorePattern: '^_',
+          caughtErrors: 'all',
+          caughtErrorsIgnorePattern: '^_',
+          destructuredArrayIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          ignoreRestSiblings: true
+        }
+      ]
+    }
+  },
+  {
+    files: ['src/renderer/src/**/*.{ts,tsx}'],
+    rules: {
+      '@typescript-eslint/explicit-function-return-type': 'off',
+      'react/prop-types': 'off'
+    }
+  }
+  // extends: [
+  //   'eslint:recommended',
+  //   'plugin:react/recommended',
+  //   'plugin:react/jsx-runtime',
+  //   '@electron-toolkit/eslint-config-ts/recommended',
+  //   '@electron-toolkit/eslint-config-prettier'
+  // ],
+  // overrides: [
+  //   {
+  //     files: ['src/renderer/src/components/**/*.ts'],
+  //     rules: {
+  //       'react/prop-types': 'off'
+  //     }
+  //   }
+  // ]
+]

.eslintrc.cjs

@@ -9,7 +9,7 @@
   "homepage": "https://github.com/kaishuu0123/leavepad",
   "scripts": {
     "format": "prettier --write .",
-    "lint": "eslint . --ext .js,.jsx,.cjs,.mjs,.ts,.tsx,.cts,.mts --fix",
+    "lint": "eslint . --fix",
     "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
     "typecheck": "npm run typecheck:node && npm run typecheck:web",
@@ -70,7 +70,7 @@
     "electron": "^31.0.2",
     "electron-builder": "^24.13.3",
     "electron-vite": "^2.3.0",
-    "eslint": "^8.57.0",
+    "eslint": "^9.14.0",
     "eslint-plugin-react": "^7.34.3",
     "lucide-react": "^0.452.0",
     "postcss": "^8.4.47",

eslint.config.mjs

@@ -40,15 +40,15 @@ class DbSingleton {
     }
   }
 
-  static getInstance() {
+  static getInstance(): DbSingleton {
     if (!DbSingleton.instance) {
       DbSingleton.instance = new DbSingleton()
       // ... any one time initialization goes here ...
     }
     return DbSingleton.instance
   }
 
-  public async initDbs() {
+  public async initDbs(): Promise<void> {
     await this.dbs.notesDb.read()
     await this.dbs.settingsDb.read()
     await this.dbs.appStateDb.read()

package.json

@@ -4,7 +4,7 @@ import { uuidv7 } from 'uuidv7'
 import { AppState, Note, NoteEditorSettings } from '../types'
 import { dbInstance } from './db_singleton'
 
-export const registerIpcHandles = (ipcMain) => {
+export const registerIpcHandles = (ipcMain): void => {
   const { notesDb, settingsDb, appStateDb } = dbInstance.dbs
 
   ipcMain.handle('get-notes', (): Note[] => {

src/main/db_singleton.ts

@@ -4,32 +4,32 @@ import { AppState, Note, NoteEditorSettings } from '../types'
 
 // Custom APIs for renderer
 const api = {
-  getNotes: () => {
+  getNotes: (): Promise<Note[]> => {
     return ipcRenderer.invoke('get-notes')
   },
-  getNote: (noteId: string) => {
+  getNote: (noteId: string): Promise<Note> => {
     return ipcRenderer.invoke('get-note', noteId)
   },
-  createNote: async () => {
+  createNote: async (): Promise<Note> => {
     const note = await ipcRenderer.invoke('create-note')
     return note
   },
-  updateNote: (willUpdateNote: Note) => {
+  updateNote: (willUpdateNote: Note): Promise<Note> => {
     return ipcRenderer.invoke('update-note', willUpdateNote)
   },
-  deleteNote: (noteId: string) => {
+  deleteNote: (noteId: string): Promise<void> => {
     return ipcRenderer.invoke('delete-note', noteId)
   },
-  updateSettings: (settings: NoteEditorSettings) => {
-    ipcRenderer.invoke('update-settings', settings)
+  updateSettings: (settings: NoteEditorSettings): Promise<void> => {
+    return ipcRenderer.invoke('update-settings', settings)
   },
-  getSettings: () => {
+  getSettings: (): Promise<NoteEditorSettings> => {
     return ipcRenderer.invoke('get-settings')
   },
-  getAppState: () => {
+  getAppState: (): Promise<AppState> => {
     return ipcRenderer.invoke('get-app-state')
   },
-  updateAppState: (appState: AppState) => {
+  updateAppState: (appState: AppState): Promise<void> => {
     return ipcRenderer.invoke('update-app-state', appState)
   }
 }

src/main/ipcHandles.ts

@@ -53,7 +53,6 @@ initializeNoteEditor()
 
 function App(): JSX.Element {
   const { t } = useTranslation()
-  // @ts-ignore
   const _ipcHandle = (): void => window.electron.ipcRenderer.send('ping')
   const editorRef = useRef<editor.IStandaloneCodeEditor | undefined>(undefined)
   const [notes, setNotes] = useAtom(notesAtom)

src/preload/index.ts

@@ -9,7 +9,7 @@ import jsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker'
 import cssWorker from 'monaco-editor/esm/vs/language/css/css.worker?worker'
 import htmlWorker from 'monaco-editor/esm/vs/language/html/html.worker?worker'
 import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
-import { ForwardedRef, forwardRef, useEffect } from 'react'
+import { ForwardedRef, forwardRef } from 'react'
 
 export function initializeNoteEditor() {
   self.MonacoEnvironment = {
@@ -74,10 +74,9 @@ function NoteEditor(
         monaco.editor.remeasureFonts()
       })
 
-      // for DEBUG
-      // @ts-ignore
+      // @ts-ignore for DEBUG
       window.editor = monacoEditor
-      // @ts-ignore
+      // @ts-ignore for DEBUG
       window.monaco = monaco
     }
   }

src/renderer/src/App.tsx

@@ -1,8 +1,8 @@
-import * as React from "react"
-import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"
+import * as React from 'react'
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog'
 
-import { cn } from "@renderer/lib/utils"
-import { buttonVariants } from "@renderer/components/ui/button"
+import { cn } from '@renderer/lib/utils'
+import { buttonVariants } from '@renderer/components/ui/button'
 
 const AlertDialog = AlertDialogPrimitive.Root
 
@@ -16,7 +16,7 @@ const AlertDialogOverlay = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Overlay
     className={cn(
-      "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+      'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
       className
     )}
     {...props}
@@ -34,7 +34,7 @@ const AlertDialogContent = React.forwardRef<
     <AlertDialogPrimitive.Content
       ref={ref}
       className={cn(
-        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+        'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
         className
       )}
       {...props}
@@ -43,41 +43,26 @@ const AlertDialogContent = React.forwardRef<
 ))
 AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName
 
-const AlertDialogHeader = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
-  <div
-    className={cn(
-      "flex flex-col space-y-2 text-center sm:text-left",
-      className
-    )}
-    {...props}
-  />
+const AlertDialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+  <div className={cn('flex flex-col space-y-2 text-center sm:text-left', className)} {...props} />
 )
-AlertDialogHeader.displayName = "AlertDialogHeader"
+AlertDialogHeader.displayName = 'AlertDialogHeader'
 
-const AlertDialogFooter = ({
-  className,
-  ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
+const AlertDialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
   <div
-    className={cn(
-      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
-      className
-    )}
+    className={cn('flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', className)}
     {...props}
   />
 )
-AlertDialogFooter.displayName = "AlertDialogFooter"
+AlertDialogFooter.displayName = 'AlertDialogFooter'
 
 const AlertDialogTitle = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Title>,
   React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
 >(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Title
     ref={ref}
-    className={cn("text-lg font-semibold", className)}
+    className={cn('text-lg font-semibold', className)}
     {...props}
   />
 ))
@@ -89,22 +74,17 @@ const AlertDialogDescription = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Description
     ref={ref}
-    className={cn("text-sm text-muted-foreground", className)}
+    className={cn('text-sm text-muted-foreground', className)}
     {...props}
   />
 ))
-AlertDialogDescription.displayName =
-  AlertDialogPrimitive.Description.displayName
+AlertDialogDescription.displayName = AlertDialogPrimitive.Description.displayName
 
 const AlertDialogAction = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Action>,
   React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action>
 >(({ className, ...props }, ref) => (
-  <AlertDialogPrimitive.Action
-    ref={ref}
-    className={cn(buttonVariants(), className)}
-    {...props}
-  />
+  <AlertDialogPrimitive.Action ref={ref} className={cn(buttonVariants(), className)} {...props} />
 ))
 AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName
 
@@ -114,11 +94,7 @@ const AlertDialogCancel = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <AlertDialogPrimitive.Cancel
     ref={ref}
-    className={cn(
-      buttonVariants({ variant: "outline" }),
-      "mt-2 sm:mt-0",
-      className
-    )}
+    className={cn(buttonVariants({ variant: 'outline' }), 'mt-2 sm:mt-0', className)}
     {...props}
   />
 ))
@@ -135,5 +111,5 @@ export {
   AlertDialogTitle,
   AlertDialogDescription,
   AlertDialogAction,
-  AlertDialogCancel,
+  AlertDialogCancel
 }