From c71ee3056dc466bcc9b4071dd477724a70e2a525 Mon Sep 17 00:00:00 2001 From: Nathaniel Tampus Date: Fri, 12 May 2023 19:23:00 +0800 Subject: [PATCH] fix eslint config --- .eslintrc | 4 ++-- client/src/app/layout.tsx | 6 ++++-- client/src/context/ContextProvider.tsx | 3 ++- client/src/lib/auth.ts | 4 +++- package.json | 4 ++-- server/src/middleware/session.ts | 2 ++ server/src/socket/game.socket.ts | 2 ++ 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.eslintrc b/.eslintrc index 35cccac..3aec9ed 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,8 +1,8 @@ { - "extends": ["next/core-web-vitals", "prettier"], + "extends": ["eslint:recommended", "next/core-web-vitals", "prettier"], "settings": { "next": { - "rootDir": "./client" + "rootDir": "client/" } } } diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx index c972a7d..22ae904 100644 --- a/client/src/app/layout.tsx +++ b/client/src/app/layout.tsx @@ -1,7 +1,9 @@ import "@/styles/globals.css"; -import Header from "@/components/Header"; +import type { ReactNode } from "react"; + import Footer from "@/components/Footer"; +import Header from "@/components/Header"; import AuthModal from "@/components/auth/AuthModal"; import ContextProvider from "@/context/ContextProvider"; @@ -34,7 +36,7 @@ export const metadata = { metadataBase: new URL(process.env.VERCEL ? "https://ches.su" : "http://localhost:3000") }; -export default function RootLayout({ children }: { children: React.ReactNode }) { +export default function RootLayout({ children }: { children: ReactNode }) { return ( diff --git a/client/src/context/ContextProvider.tsx b/client/src/context/ContextProvider.tsx index 95a15bd..58b9bb1 100644 --- a/client/src/context/ContextProvider.tsx +++ b/client/src/context/ContextProvider.tsx @@ -1,12 +1,13 @@ "use client"; import type { User } from "@chessu/types"; +import type { ReactNode } from "react"; import { useEffect, useState } from "react"; import { fetchSession } from "@/lib/auth"; import { SessionContext } from "./session"; -export default function ContextProvider({ children }: { children: React.ReactNode }) { +export default function ContextProvider({ children }: { children: ReactNode }) { const [user, setUser] = useState({}); async function getSession() { diff --git a/client/src/lib/auth.ts b/client/src/lib/auth.ts index 86d528f..1b9f820 100644 --- a/client/src/lib/auth.ts +++ b/client/src/lib/auth.ts @@ -11,7 +11,9 @@ export const fetchSession = async () => { const user: User = await res.json(); return user; } - } catch (err) {} + } catch (err) { + // do nothing + } }; export const setGuestSession = async (name: string) => { diff --git a/package.json b/package.json index a000313..824959f 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ ], "scripts": { "dev": "concurrently \"npm run dev -w client\" \"npm run dev -w server\"", - "lint": "eslint .", - "lint-fix": "eslint --fix .", + "lint": "eslint . --ignore-path .gitignore", + "lint-fix": "eslint --fix . --ignore-path .gitignore", "format": "prettier --write . --ignore-path .gitignore" }, "devDependencies": { diff --git a/server/src/middleware/session.ts b/server/src/middleware/session.ts index 05ef2a0..69eb243 100644 --- a/server/src/middleware/session.ts +++ b/server/src/middleware/session.ts @@ -9,11 +9,13 @@ import { db } from "../db/index.js"; const PGSession = PGSimple(session); declare module "express-session" { + // eslint-disable-next-line no-unused-vars interface SessionData { user: User; } } declare module "http" { + // eslint-disable-next-line no-unused-vars interface IncomingMessage { session: Session & { user: User; diff --git a/server/src/socket/game.socket.ts b/server/src/socket/game.socket.ts index 8dfe978..93a33fe 100644 --- a/server/src/socket/game.socket.ts +++ b/server/src/socket/game.socket.ts @@ -152,6 +152,7 @@ export async function claimAbandoned(this: Socket, type: "win" | "draw") { activeGames.splice(activeGames.indexOf(game), 1); } +// eslint-disable-next-line no-unused-vars export async function getLatestGame(this: Socket) { const game = activeGames.find((g) => g.code === Array.from(this.rooms)[1]); if (game) this.emit("receivedLatestGame", game); @@ -219,6 +220,7 @@ export async function sendMove(this: Socket, m: { from: string; to: string; prom } } +// eslint-disable-next-line no-unused-vars export async function joinAsPlayer(this: Socket) { const game = activeGames.find((g) => g.code === Array.from(this.rooms)[1]); if (!game) return;